[arch-commits] Commit in grilo-plugins/trunk (PKGBUILD luafiles.diff)

Jan Steffens heftig at archlinux.org
Fri Jul 27 11:43:55 UTC 2018


    Date: Friday, July 27, 2018 @ 11:43:55
  Author: heftig
Revision: 329589

0.3.7-1

Modified:
  grilo-plugins/trunk/PKGBUILD
Deleted:
  grilo-plugins/trunk/luafiles.diff

---------------+
 PKGBUILD      |   18 +++++++-----------
 luafiles.diff |   29 -----------------------------
 2 files changed, 7 insertions(+), 40 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-07-27 11:24:20 UTC (rev 329588)
+++ PKGBUILD	2018-07-27 11:43:55 UTC (rev 329589)
@@ -2,10 +2,10 @@
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
 
 pkgname=grilo-plugins
-pkgver=0.3.5+12+g7ecf4b2
+pkgver=0.3.7
 pkgrel=1
 pkgdesc="A collection of plugins for the Grilo framework"
-url="https://git.gnome.org/browse/grilo-plugins"
+url="https://gitlab.gnome.org/GNOME/grilo-plugins"
 arch=(x86_64)
 license=(LGPL)
 depends=(grilo lua libmediaart libgdata tracker gom libdmapsharing chromaprint gst-plugins-bad
@@ -15,11 +15,9 @@
 optdepends=('dleyna-server: DLNA plugin'
             'tracker-miners: Tracker plugin')
 groups=(gnome)
-_commit=7ecf4b230c7b0144e579f89b594bf2ce871d19f1  # master
-source=("git+https://git.gnome.org/browse/grilo-plugins#commit=$_commit"
-        luafiles.diff)
-sha256sums=('SKIP'
-            '73b388d9564ae8c1d3f464831082acffd46b35bdc85a3a8bdb25f408f9c6dc48')
+_commit=41820b5c4e78f0a3a25441b1ad478a8a9a598953  # tags/grilo-plugins-0.3.7^0
+source=("git+https://gitlab.gnome.org/GNOME/grilo-plugins.git#commit=$_commit")
+sha256sums=('SKIP')
 
 pkgver() {
   cd $pkgname
@@ -28,7 +26,6 @@
 
 prepare() {
   cd $pkgname
-  patch -Np1 -i ../luafiles.diff
 }
 
 build() {
@@ -37,11 +34,10 @@
 }
 
 check() {
-  cd build
   # Unreliable tests using websites...
-  meson test || :
+  meson test -C build || :
 }
 
 package() {
-  DESTDIR="$pkgdir" ninja -C build install
+  DESTDIR="$pkgdir" meson install -C build
 }

Deleted: luafiles.diff
===================================================================
--- luafiles.diff	2018-07-27 11:24:20 UTC (rev 329588)
+++ luafiles.diff	2018-07-27 11:43:55 UTC (rev 329589)
@@ -1,29 +0,0 @@
-diff --git i/src/lua-factory/sources/meson.build w/src/lua-factory/sources/meson.build
-index 6d66d4ef148cefde..99b408266ca23350 100644
---- i/src/lua-factory/sources/meson.build
-+++ w/src/lua-factory/sources/meson.build
-@@ -30,20 +30,22 @@ resources = [
-     'grl-itunes-podcast',
- ]
- 
-+luafactoryinstalldir = join_paths(get_option('datadir'), luafactorydir)
-+
- foreach s: sources
-     f = s + '.lua'
-     install_data(f,
--        install_dir: luafactorydir)
-+        install_dir: luafactoryinstalldir)
- endforeach
- 
- foreach r: resources
-     input = r + '.gresource.xml'
-     output = r + '.gresource'
-     custom_target(output,
-         output: output,
-         input: input,
-         install: true,
--        install_dir: luafactorydir,
-+        install_dir: luafactoryinstalldir,
-         command: [glib_compile_resources,
-             '--sourcedir', meson.current_source_dir(),
-             '--target', '@OUTPUT@',



More information about the arch-commits mailing list