[arch-commits] Commit in gpaste/trunk (PKGBUILD build.diff)

[Jan Steffens]

    Date: Sunday, March 8, 2020 @ 19:30:44
  Author: heftig
Revision: 377187

3.36.0-1

Modified:
  gpaste/trunk/PKGBUILD
Deleted:
  gpaste/trunk/build.diff

------------+
 PKGBUILD   |   11 ++++-------
 build.diff |   44 --------------------------------------------
 2 files changed, 4 insertions(+), 51 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-08 19:26:58 UTC (rev 377186)
+++ PKGBUILD	2020-03-08 19:30:44 UTC (rev 377187)
@@ -1,7 +1,7 @@
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
 
 pkgname=gpaste
-pkgver=3.34.1
+pkgver=3.36.0
 pkgrel=1
 pkgdesc="Clipboard management system"
 url="https://www.imagination-land.org/tags/GPaste.html"
@@ -11,11 +11,9 @@
 makedepends=(vala appstream-glib gobject-introspection gnome-shell
              gnome-control-center git meson)
 optdepends=("wgetpaste: Upload clipboard contents")
-_commit=f03463cbaf6a9666a76fb05f04d6d9baad13b9eb  # tags/v3.34.1^0
-source=("git+https://github.com/keruspe/gpaste#commit=$_commit"
-        build.diff)
-sha256sums=('SKIP'
-            '236d50bac1a3e86f19b39a74b6b7c14c1545d0396200d7dad993beed663484ef')
+_commit=f59487f4f08aa6f3d2b771173e5474a6dcf63450  # tags/v3.36.0^0
+source=("git+https://github.com/keruspe/gpaste#commit=$_commit")
+sha256sums=('SKIP')
 
 pkgver() {
   cd $pkgname
@@ -24,7 +22,6 @@
 
 prepare() {
   cd $pkgname
-  patch -Np1 -i ../build.diff
 }
 
 build() {

Deleted: build.diff
===================================================================
--- build.diff	2020-03-08 19:26:58 UTC (rev 377186)
+++ build.diff	2020-03-08 19:30:44 UTC (rev 377187)
@@ -1,44 +0,0 @@
-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(