[arch-commits] Commit in lib32-colord/repos/multilib-x86_64 (3 files)

[Jan Steffens]

    Date: Wednesday, November 4, 2020 @ 11:18:48
  Author: heftig
Revision: 741907

archrelease: copy trunk to multilib-x86_64

Added:
  lib32-colord/repos/multilib-x86_64/PKGBUILD
    (from rev 741906, lib32-colord/trunk/PKGBUILD)
  lib32-colord/repos/multilib-x86_64/no-gir.diff
    (from rev 741906, lib32-colord/trunk/no-gir.diff)
Deleted:
  lib32-colord/repos/multilib-x86_64/PKGBUILD

-------------+
 PKGBUILD    |  136 +++++++++++++++++++++++++++++++---------------------------
 no-gir.diff |   40 +++++++++++++++++
 2 files changed, 114 insertions(+), 62 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-11-04 11:18:30 UTC (rev 741906)
+++ PKGBUILD	2020-11-04 11:18:48 UTC (rev 741907)
@@ -1,62 +0,0 @@
-# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
-# Contributor: jtts <jussaar at mbnet.fi>
-# Contributor: josephgbr <rafael.f.f1 at gmail.com>
-# Contributor: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-
-pkgname=lib32-colord
-pkgver=1.4.4
-pkgrel=1
-pkgdesc='System daemon for managing color devices'
-arch=(x86_64)
-url=https://www.freedesktop.org/software/colord
-license=(GPL2)
-depends=(
-  colord
-  lib32-dconf
-  lib32-libgudev
-  lib32-libgusb
-  lib32-lcms2
-  lib32-polkit
-  lib32-sqlite
-  lib32-dbus
-)
-makedepends=(
-  argyllcms
-  bash-completion
-  git
-  gobject-introspection
-  intltool
-  meson
-  python2
-  sane
-  vala
-)
-source=(git+https://github.com/hughsie/colord#tag=${pkgver})
-sha256sums=(SKIP)
-
-build() {
-  export CC='gcc -m32'
-  export CXX='g++ -m32'
-  export PKG_CONFIG_PATH=/usr/lib32/pkgconfig
-
-  arch-meson colord build \
-    --libdir=/usr/lib32 \
-    -D bash-completion=false \
-    -D docs=false \
-    -D man=false \
-    -D tests=false \
-    -D libcolordcompat=true \
-    -D sane=false \
-    -D vapi=true \
-    -D print-profiles=false \
-    -D daemon-user=colord
-  ninja -C build
-}
-
-package() {
-  DESTDIR="${pkgdir}" ninja -C build install
-  rm -r "${pkgdir}"/usr/{bin,include,lib,share}
-}
-
-# vim: ts=2 sw=2 et:

Copied: lib32-colord/repos/multilib-x86_64/PKGBUILD (from rev 741906, lib32-colord/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-11-04 11:18:48 UTC (rev 741907)
@@ -0,0 +1,74 @@
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor: jtts <jussaar at mbnet.fi>
+# Contributor: josephgbr <rafael.f.f1 at gmail.com>
+# Contributor: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+
+pkgname=lib32-colord
+pkgver=1.4.5
+pkgrel=1
+pkgdesc='System daemon for managing color devices'
+arch=(x86_64)
+url=https://www.freedesktop.org/software/colord
+license=(GPL2)
+depends=(
+  colord
+  lib32-dconf
+  lib32-libgudev
+  lib32-libgusb
+  lib32-lcms2
+  lib32-polkit
+  lib32-sqlite
+  lib32-dbus
+)
+makedepends=(
+  argyllcms
+  bash-completion
+  git
+  gobject-introspection
+  intltool
+  meson
+  python2
+  sane
+  vala
+)
+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=i686-pc-linux-gnu-pkg-config
+
+  arch-meson colord build \
+    --libdir=/usr/lib32 \
+    -D bash-completion=false \
+    -D docs=false \
+    -D man=false \
+    -D tests=false \
+    -D libcolordcompat=true \
+    -D sane=false \
+    -D vapi=false \
+    -D print_profiles=false \
+    -D daemon_user=colord
+  meson compile -C build
+}
+
+package() {
+  DESTDIR="${pkgdir}" meson install -C build
+  rm -r "${pkgdir}"/usr/{bin,include,lib,share}
+}
+
+# vim: ts=2 sw=2 et:

Copied: lib32-colord/repos/multilib-x86_64/no-gir.diff (from rev 741906, lib32-colord/trunk/no-gir.diff)
===================================================================
--- no-gir.diff	                        (rev 0)
+++ no-gir.diff	2020-11-04 11:18:48 UTC (rev 741907)
@@ -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(