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

[Jan Steffens]

    Date: Thursday, June 3, 2021 @ 20:35:52
  Author: heftig
Revision: 955733

archrelease: copy trunk to multilib-x86_64

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

-------------+
 PKGBUILD    |  155 ++++++++++++++++++++++++++++++----------------------------
 no-gir.diff |   40 --------------
 2 files changed, 82 insertions(+), 113 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-06-03 20:35:28 UTC (rev 955732)
+++ PKGBUILD	2021-06-03 20:35:52 UTC (rev 955733)
@@ -1,73 +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.5
-pkgrel=2
-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
-  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/PKGBUILD (from rev 955732, lib32-colord/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-06-03 20:35:52 UTC (rev 955733)
@@ -0,0 +1,82 @@
+# 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=3
+pkgdesc='System daemon for managing color devices'
+arch=(x86_64)
+url=https://www.freedesktop.org/software/colord
+license=(GPL2)
+depends=(
+  libcolord
+  lib32-glib2
+  lib32-systemd
+  lib32-lcms2
+)
+makedepends=(
+  argyllcms
+  bash-completion
+  git
+  gobject-introspection
+  intltool
+  lib32-dbus
+  lib32-dconf
+  lib32-libgudev
+  lib32-libgusb
+  lib32-polkit
+  lib32-sqlite
+  meson
+  sane
+  vala
+)
+provides=(
+  libcolord.so
+)
+options=(!emptydirs)
+source=(
+  git+https://github.com/hughsie/colord#tag=${pkgver}
+)
+sha256sums=(
+  SKIP
+)
+
+prepare() {
+  cd colord
+  
+  # Allow turning off introspection
+  git cherry-pick -n e73723cabe4d5a2e2b281d2f1ea751b2d75bccc6
+}
+
+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 introspection=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}
+  rm -r "${pkgdir}"/usr/lib32/{colord-plugins,colord-sensors}
+  rm "${pkgdir}"/usr/lib32/libcolor{dprivate,hug}*
+  rm "${pkgdir}"/usr/lib32/pkgconfig/colorhug.pc
+}
+
+# vim: ts=2 sw=2 et:

Deleted: no-gir.diff
===================================================================
--- no-gir.diff	2021-06-03 20:35:28 UTC (rev 955732)
+++ no-gir.diff	2021-06-03 20:35:52 UTC (rev 955733)
@@ -1,40 +0,0 @@
-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(