Date: Friday, September 13, 2019 @ 12:34:29 Author: heftig Revision: 362516
3.34.0-1 Added: gpaste/trunk/build.diff Modified: gpaste/trunk/PKGBUILD ------------+ PKGBUILD | 30 ++++++++++++++---------------- build.diff | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 16 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-09-13 12:11:18 UTC (rev 362515) +++ PKGBUILD 2019-09-13 12:34:29 UTC (rev 362516) @@ -1,7 +1,7 @@ # Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> pkgname=gpaste -pkgver=3.32.0 +pkgver=3.34.0 pkgrel=1 pkgdesc="Clipboard management system" url="https://www.imagination-land.org/tags/GPaste.html" @@ -8,11 +8,14 @@ license=(BSD) arch=(x86_64) depends=(gtk3) -makedepends=(intltool vala appstream-glib gobject-introspection gnome-shell gnome-control-center git) +makedepends=(vala appstream-glib gobject-introspection gnome-shell + gnome-control-center git meson) optdepends=("wgetpaste: Upload clipboard contents") -_commit=74805fe91a1ff8884109a6d7887460a2c823e54d # tags/v3.32.0^0 -source=("git+https://github.com/keruspe/gpaste#commit=$_commit") -sha256sums=('SKIP') +_commit=82c2be95052b51f67ebecffbca325b983d2ee6e1 # tags/v3.34.0^0 +source=("git+https://github.com/keruspe/gpaste#commit=$_commit" + build.diff) +sha256sums=('SKIP' + '236d50bac1a3e86f19b39a74b6b7c14c1545d0396200d7dad993beed663484ef') pkgver() { cd $pkgname @@ -21,24 +24,19 @@ prepare() { cd $pkgname - NOCONFIGURE=1 ./autogen.sh + patch -Np1 -i ../build.diff } build() { - cd $pkgname - ./configure --prefix=/usr --libexecdir=/usr/lib --sysconfdir=/etc \ - --enable-vala - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - make + arch-meson $pkgname build + ninja -C build } check() { - cd $pkgname - make check + meson test -C build --print-errorlogs } package() { - cd $pkgname - make DESTDIR="$pkgdir" install - install -Dt "$pkgdir/usr/share/licenses/$pkgname" COPYING + DESTDIR="$pkgdir" meson install -C build + install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 $pkgname/COPYING } Added: build.diff =================================================================== --- build.diff (rev 0) +++ build.diff 2019-09-13 12:34:29 UTC (rev 362516) @@ -0,0 +1,44 @@ +diff --git i/data/systemd/meson.build w/data/systemd/meson.build +index a42f7179..dec3f95d 100644 +--- i/data/systemd/meson.build ++++ w/data/systemd/meson.build +@@ -2,10 +2,14 @@ configure_file( + input: 'org.gnome.GPaste.Ui.systemd.in', + configuration: conf, + output: 'org.gnome.GPaste.Ui.service', ++ install: get_option('systemd'), ++ install_dir: userunit_dir, + ) + + configure_file( + input: 'org.gnome.GPaste.systemd.in', + configuration: conf, + output: 'org.gnome.GPaste.service', +-) +\ No newline at end of file ++ install: get_option('systemd'), ++ install_dir: userunit_dir, ++) +diff --git i/src/libgpaste/meson.build w/src/libgpaste/meson.build +index 1a1b0ca5..68a116cc 100644 +--- i/src/libgpaste/meson.build ++++ w/src/libgpaste/meson.build +@@ -143,14 +143,17 @@ libgpaste_inc = include_directories( + 'util', + ) + ++libgpaste_symbols_file = meson.current_source_dir() / 'libgpaste.sym' ++ + libgpaste = library( + 'gpaste', + sources: libgpaste_sources, + version: gpaste_soversion, + dependencies: libgpaste_deps, + install: true, + install_dir: get_option('libdir'), +- include_directories : libgpaste_inc, ++ include_directories : libgpaste_inc, ++ link_args: ['-Wl,--version-script=' + libgpaste_symbols_file], + ) + + libgpaste_internal_dep = declare_dependency(