From c3b20dc648cfd02d3a26bbd6fab0db5a7d39fc05 Mon Sep 17 00:00:00 2001
From: Aqua-sama <aqua@iserlohn-fortress.net>
Date: Tue, 16 Jan 2018 15:41:45 +0100
Subject: Fixed build scripts for use with the mercurial repository

---
 linux/makepkg/PKGBUILD         | 65 ++++++++++++++++++++++++++++++++++++++++++
 linux/makepkg/PKGBUILD.aqua    | 58 -------------------------------------
 linux/makepkg/PKGBUILD.generic | 47 ------------------------------
 3 files changed, 65 insertions(+), 105 deletions(-)
 create mode 100644 linux/makepkg/PKGBUILD
 delete mode 100644 linux/makepkg/PKGBUILD.aqua
 delete mode 100644 linux/makepkg/PKGBUILD.generic

(limited to 'linux')

diff --git a/linux/makepkg/PKGBUILD b/linux/makepkg/PKGBUILD
new file mode 100644
index 0000000..95a0a54
--- /dev/null
+++ b/linux/makepkg/PKGBUILD
@@ -0,0 +1,65 @@
+# Maintainer: Aqua-sama <aqua@iserlohn-fortress.net>
+
+pkgname=smolbote-hg
+pkgver=0.0.0
+pkgrel=1
+pkgdesc='Yet another no-frills browser'
+url="https://neueland.iserlohn-fortress.net/smolbote"
+
+arch=('x86_64')
+license=('GPL3')
+
+# -hg replace the old -git package
+replaces=('smolbote-git')
+
+depends=('qt5-webengine' 'libconfig')
+makedepends=('mercurial' 'cmake' 'pkg-config' 'ninja' 'qt5-webengine' 'libconfig')
+
+# this is the central repository
+source=("smolbote-hg::hg+https://neueland.iserlohn-fortress.net/smolbote.hg")
+# if you're test building, you want to hg serve your own repo
+#source=("smolbote-hg::hg+http://localhost:8000")
+sha512sums=('SKIP')
+
+# any patches go here
+#prepare() {
+#}
+
+pkgver() {
+    cd smolbote-hg
+    printf "r%s.%s" "$(hg identify -n)" "$(hg identify -i)"
+}
+
+build() {
+    rm -rf "$pkgname-$pkgver"
+    mkdir "$pkgname-$pkgver"
+    cd "$pkgname-$pkgver"
+
+    # CMake Options
+    # build type
+    _cmake_options="-DCMAKE_BUILD_TYPE=Release"
+
+    # install prefix, or where should the binary be installed
+    _cmake_options="$_cmake_options -DCMAKE_INSTALL_PREFIX=$pkgdir/usr/local"
+
+    # compiler
+    _cmake_options="$_cmake_options -DCMAKE_C_COMPILER=/usr/bin/clang"
+    _cmake_options="$_cmake_options -DCMAKE_CXX_COMPILER=/usr/bin/clang++"
+
+    # use libc++ instead of libstdc++
+    #_cmake_options="$_cmake_options -DUseLibCpp=On"
+
+    # build system
+    _cmake_options="$_cmake_options -GNinja"
+
+    # Generate a makefile
+    cmake $_cmake_options "$srcdir/smolbote-hg"
+
+    # build
+    ninja
+}
+
+package() {
+    cd "$pkgname-$pkgver"
+    ninja install
+}
diff --git a/linux/makepkg/PKGBUILD.aqua b/linux/makepkg/PKGBUILD.aqua
deleted file mode 100644
index 72b8536..0000000
--- a/linux/makepkg/PKGBUILD.aqua
+++ /dev/null
@@ -1,58 +0,0 @@
-# Maintainer: Aqua-sama <aqua@iserlohn-fortress.net>
-
-pkgname=smolbote-git
-pkgver=0.0.0
-pkgrel=1
-pkgdesc='Yet another no-frills browser'
-url="https://neueland.iserlohn-fortress.net/smolbote"
-
-arch=('x86_64')
-license=('GPL3')
-
-depends=('qt5-webengine' 'libconfig')
-makedepends=('git' 'cmake' 'pkg-config' 'ninja' 'qt5-webengine' 'libconfig')
-
-source=("smolbote-git::git+git://neueland.iserlohn-fortress.net/smolbote.git")
-sha512sums=('SKIP')
-
-# any patches go here
-#prepare() {
-#}
-
-pkgver() {
-    cd smolbote-git
-    echo "$(git describe --long --tags | tr - .)"
-}
-
-build() {
-    rm -rf "$pkgname-$pkgver"
-    mkdir "$pkgname-$pkgver"
-    cd "$pkgname-$pkgver"
-
-    # CMake Options
-    # build type
-    _cmake_options="-DCMAKE_BUILD_TYPE=Release"
-
-    # install prefix, or where should the binary be installed
-    _cmake_options="$_cmake_options -DCMAKE_INSTALL_PREFIX=$pkgdir/usr/local"
-
-    # compiler
-    _cmake_options="$_cmake_options -DCMAKE_CXX_COMPILER=/usr/bin/clang++"
-
-    # use libc++ instead of libstdc++
-    #_cmake_options="$_cmake_options -DUseLibCpp=On"
-
-    # build system
-    _cmake_options="$_cmake_options -GNinja"
-
-    # Generate a makefile
-    cmake $_cmake_options "$srcdir/smolbote-git"
-
-    # build
-    ninja
-}
-
-package() {
-    cd "$pkgname-$pkgver"
-    ninja install
-}
diff --git a/linux/makepkg/PKGBUILD.generic b/linux/makepkg/PKGBUILD.generic
deleted file mode 100644
index 98f132f..0000000
--- a/linux/makepkg/PKGBUILD.generic
+++ /dev/null
@@ -1,47 +0,0 @@
-# Maintainer: Aqua-sama <aqua@iserlohn-fortress.net>
-
-pkgname=smolbote-git
-pkgver=0.0.0
-pkgrel=1
-pkgdesc='Yet another no-frills browser'
-url="https://neueland.iserlohn-fortress.net/smolbote"
-
-arch=('x86_64')
-license=('GPL3')
-
-depends=('qt5-base' 'qt5-webengine')
-makedepends=('git' 'cmake' 'libconfig' 'pkg-config')
-
-source=("smolbote-git::git+git://neueland.iserlohn-fortress.net/smolbote.git")
-sha512sums=('SKIP')
-
-# any patches go here
-#prepare() {
-#}
-
-pkgver() {
-    cd smolbote-git
-    echo "$(git describe --long --tags | tr - .)"
-}
-
-build() {
-    rm -rf "$pkgname-$pkgver"
-    mkdir "$pkgname-$pkgver"
-    cd "$pkgname-$pkgver"
-
-    # Generate a makefile
-    # Adjust the install prefix as necessary, default is /usr/local/bin
-    cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local "$srcdir/smolbote-git"
-
-    # Use this if you want to link with libc++ instead
-    # This requires clang, since gcc doesn't understand the concept of not using libstdc++
-    #cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_CXX_COMPILER=/usr/bin/clang++ -DUseLibCpp=On "$srcdir/smolbote-git"
-
-    # build, with 4 threads
-    make
-}
-
-package() {
-    cd "$pkgname-$pkgver"
-    make DESTDIR="$pkgdir/" install
-}
-- 
cgit v1.2.1