From 6422a2a35a879488231e001cda44f4333deeb868 Mon Sep 17 00:00:00 2001 From: Aqua-sama Date: Wed, 24 Oct 2018 13:54:46 +0200 Subject: Update PKGBUILD to use meson --- linux/makepkg/PKGBUILD | 48 ++++++++++++++++++------------------------------ 1 file changed, 18 insertions(+), 30 deletions(-) (limited to 'linux') diff --git a/linux/makepkg/PKGBUILD b/linux/makepkg/PKGBUILD index 8897ee7..4b2aa06 100644 --- a/linux/makepkg/PKGBUILD +++ b/linux/makepkg/PKGBUILD @@ -5,10 +5,6 @@ pkgdesc='Yet another no-frills browser' pkgver=r0 pkgrel=1 -_tag="" -_describe="" -_commit="" -_branch="master" url="https://neueland.iserlohn-fortress.net/smolbote" install="smolbote.install" @@ -18,10 +14,10 @@ license=('GPL3') depends=('qt5-webengine>=5.11.0' 'boost-libs>=1.66.0') optdepends=('firejail: launch a sandboxed instance') -makedepends=('git' 'cmake' 'pkg-config' 'asciidoctor' 'python') +makedepends=('git' 'meson' 'pkg-config' 'asciidoctor') # this is the central repository -source=("git+https://neueland.iserlohn-fortress.net/gitea/aqua/smolbote.git#branch=master" +source=("git+https://neueland.iserlohn-fortress.net/gitea/aqua/smolbote.git#branch=testing-meson" "git+https://github.com/itay-grudev/SingleApplication.git" "git+https://github.com/ulfalizer/Kconfiglib.git") @@ -33,48 +29,40 @@ sha512sums=('SKIP' # BB1C090188E3E32B375C13FD095DE26BC16D2E98) prepare() { - cd smolbote + cd $srcdir/smolbote git submodule init git config submodule.3rd-party/SingleApplication/SingleApplication.git.url $srcdir/SingleApplication git submodule update 3rd-party/SingleApplication/SingleApplication.git git config submodule.tools/Kconfiglib.url $srcdir/Kconfiglib git submodule update tools/Kconfiglib - - _tag="r$(git rev-list --count HEAD)" - _describe="r$(git rev-list --count HEAD)-$(git rev-parse --short HEAD)" - _commit=$(git rev-parse HEAD) - # makepkg branches off the cloned repository into makepkg - #_branch=$(git rev-parse --abbrev-ref HEAD) - - msg2 "[$(pwd)]: build $_branch:$_commit" } pkgver() { cd smolbote - echo $_describe | sed 's/\([^-]*-g\)/r\1/;s/-/./g' + echo r$(git rev-list --count HEAD)-$(git rev-parse --short HEAD) | sed 's/\([^-]*-g\)/r\1/;s/-/./g' } build() { - # generate makefile - # see doc/Building.asciidoc for list of options - cmake -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr/local \ - -Dpoi_Version="$_tag" \ - -Dpoi_Describe="$pkgver" \ - -Dpoi_Build="$_branch:$_commit" \ - $srcdir/smolbote - - # if you want to manually customize the build, you can use ccmake here - #ccmake . + if [ ! -d $srcdir/build ]; then + mkdir $srcdir/build + fi + cd $srcdir/smolbote + + # For a list of configureable options, check smolbote/meson_options.txt, or + # run `meson configure` in $srcdir/build + meson --buildtype=release --prefix=/usr/local --auto-features=disabled $srcdir/build # Build - make - make manpage + cd $srcdir/build + meson configure -DPlasma=enabled + meson configure -Dmanpage=enabled + ninja } package() { # Install - DESTDIR="$pkgdir" make install + cd $srcdir/build + DESTDIR="$pkgdir" ninja install } -- cgit v1.2.1