[arch-commits] Commit in lib32-colord/trunk (PKGBUILD no-gir.diff)

[Jan Steffens]

    Date: Wednesday, November 4, 2020 @ 11:18:30
  Author: heftig
Revision: 741906

1.4.5-1

Added:
  lib32-colord/trunk/no-gir.diff
Modified:
  lib32-colord/trunk/PKGBUILD	(contents, properties)

-------------+
 PKGBUILD    |   30 +++++++++++++++++++++---------
 no-gir.diff |   40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-11-04 11:14:26 UTC (rev 741905)
+++ PKGBUILD	2020-11-04 11:18:30 UTC (rev 741906)
@@ -5,7 +5,7 @@
 # Contributor: Ionut Biru <ibiru at archlinux.org>
 
 pkgname=lib32-colord
-pkgver=1.4.4
+pkgver=1.4.5
 pkgrel=1
 pkgdesc='System daemon for managing color devices'
 arch=(x86_64)
@@ -32,13 +32,25 @@
   sane
   vala
 )
-source=(git+https://github.com/hughsie/colord#tag=${pkgver})
-sha256sums=(SKIP)
+options=(!emptydirs)
+source=(
+  git+https://github.com/hughsie/colord#tag=${pkgver}
+  no-gir.diff
+)
+sha256sums=(
+  SKIP
+  ad278bbec5c9e11798211e1ceb3c98b262367acfb8cc625cabac478a8d7596e4
+)
 
+prepare() {
+  cd colord
+  git apply -3 ../no-gir.diff
+}
+
 build() {
   export CC='gcc -m32'
   export CXX='g++ -m32'
-  export PKG_CONFIG_PATH=/usr/lib32/pkgconfig
+  export PKG_CONFIG=i686-pc-linux-gnu-pkg-config
 
   arch-meson colord build \
     --libdir=/usr/lib32 \
@@ -48,14 +60,14 @@
     -D tests=false \
     -D libcolordcompat=true \
     -D sane=false \
-    -D vapi=true \
-    -D print-profiles=false \
-    -D daemon-user=colord
-  ninja -C build
+    -D vapi=false \
+    -D print_profiles=false \
+    -D daemon_user=colord
+  meson compile -C build
 }
 
 package() {
-  DESTDIR="${pkgdir}" ninja -C build install
+  DESTDIR="${pkgdir}" meson install -C build
   rm -r "${pkgdir}"/usr/{bin,include,lib,share}
 }
 


Property changes on: lib32-colord/trunk/PKGBUILD
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Added: no-gir.diff
===================================================================
--- no-gir.diff	                        (rev 0)
+++ no-gir.diff	2020-11-04 11:18:30 UTC (rev 741906)
@@ -0,0 +1,40 @@
+diff --git i/lib/colord/meson.build w/lib/colord/meson.build
+index dbb3d19..b3e102b 100644
+--- i/lib/colord/meson.build
++++ w/lib/colord/meson.build
+@@ -146,6 +146,7 @@ pkgg.generate(
+   description : 'colord is a system daemon for managing color devices',
+ )
+ 
++if false
+ libcolord_girtarget = gnome.generate_gir(colord,
+   sources : [
+     'cd-client.c',
+@@ -210,6 +211,7 @@ gnome.generate_vapi('colord',
+   install: true,
+ )
+ endif
++endif
+ 
+ if get_option('installed_tests')
+ con2 = configuration_data()
+diff --git i/lib/colorhug/meson.build w/lib/colorhug/meson.build
+index 9526ea4..71a326b 100644
+--- i/lib/colorhug/meson.build
++++ w/lib/colorhug/meson.build
+@@ -73,6 +73,7 @@ pkgg.generate(
+   description : 'ColorHug is a simple display hardware colorimeter',
+ )
+ 
++if false
+ libcolorhug_gir = gnome.generate_gir(colorhug,
+   sources : [
+     'ch-common.c',
+@@ -107,6 +108,7 @@ libcolorhug_gir = gnome.generate_gir(colorhug,
+   ],
+   install : true
+ )
++endif
+ 
+ if get_option('tests')
+   e = executable(