[arch-commits] Commit in dleyna-renderer/trunk (PKGBUILD fix-rpath.diff)

[Jan Steffens]

    Date: Friday, September 3, 2021 @ 21:19:38
  Author: heftig
Revision: 423410

0.7.0+6+g5b26696-1

Modified:
  dleyna-renderer/trunk/PKGBUILD
Deleted:
  dleyna-renderer/trunk/fix-rpath.diff

----------------+
 PKGBUILD       |   18 +++++++++---------
 fix-rpath.diff |   14 --------------
 2 files changed, 9 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-09-03 21:17:37 UTC (rev 423409)
+++ PKGBUILD	2021-09-03 21:19:38 UTC (rev 423410)
@@ -1,8 +1,8 @@
 # Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
 
 pkgname=dleyna-renderer
-pkgver=0.7.0
-pkgrel=2
+pkgver=0.7.0+6+g5b26696
+pkgrel=1
 pkgdesc="Library to discover and manipulate Digital Media Renderers"
 url="https://github.com/phako/dleyna-renderer"
 arch=(x86_64)
@@ -9,11 +9,9 @@
 license=(LGPL2.1)
 depends=(dleyna-connector-dbus gupnp-av gupnp-dlna libsoup)
 makedepends=(git meson docbook-xsl)
-_commit=7032c94c4c41a56fead1668440d75462f25d3ac4  # tags/v0.7.0^0
-source=("git+https://github.com/phako/dleyna-renderer#commit=$_commit"
-        fix-rpath.diff)
-sha256sums=('SKIP'
-            '70b6cc24399248cfaf8582932351c911d60a885784c9aeb70df027ff358e8c4d')
+_commit=5b26696fcd26e348c38ca556869fdcb8049e7ce1  # master
+source=("git+https://github.com/phako/dleyna-renderer#commit=$_commit")
+sha256sums=('SKIP')
 
 pkgver() {
   cd $pkgname
@@ -22,7 +20,9 @@
 
 prepare() {
   cd $pkgname
-  git apply -3 ../fix-rpath.diff
+
+  # Fixup tag so master is a descendant
+  git tag -f 0.7.0 04a4f2bcb3e4bdd622867c60c90499ed76f1e712
 }
 
 build() {
@@ -35,5 +35,5 @@
 }
 
 package() {
-  DESTDIR="$pkgdir" meson install -C build
+  meson install -C build --destdir "$pkgdir"
 }

Deleted: fix-rpath.diff
===================================================================
--- fix-rpath.diff	2021-09-03 21:17:37 UTC (rev 423409)
+++ fix-rpath.diff	2021-09-03 21:19:38 UTC (rev 423410)
@@ -1,14 +0,0 @@
-diff --git i/server/meson.build w/server/meson.build
-index 6c78742..c1b482e 100644
---- i/server/meson.build
-+++ w/server/meson.build
-@@ -8,7 +8,8 @@ renderer_service = executable(
-         renderer_dep,
-     ],
-     install: true,
--    install_dir: join_paths(get_option('prefix'), get_option('libexecdir'))
-+    install_dir: join_paths(get_option('prefix'), get_option('libexecdir')),
-+    install_rpath: join_paths(get_option('prefix'), get_option('libdir'), 'dleyna-renderer')
- )
- 
- configure_file(