From db2a21b3774dd4970df5dab5c25c74c96f43e4dd Mon Sep 17 00:00:00 2001 From: maxice8 Date: Fri, 8 Mar 2019 22:34:27 -0300 Subject: [PATCH] colord: update to 1.4.4. --- .../patches/add-introspection-switch.patch | 197 +++--------------- srcpkgs/colord/patches/fix-gir-cross.patch | 28 --- srcpkgs/colord/template | 10 +- 3 files changed, 29 insertions(+), 206 deletions(-) delete mode 100644 srcpkgs/colord/patches/fix-gir-cross.patch diff --git a/srcpkgs/colord/patches/add-introspection-switch.patch b/srcpkgs/colord/patches/add-introspection-switch.patch index 050dbc50984..5c0dfa91cef 100644 --- a/srcpkgs/colord/patches/add-introspection-switch.patch +++ b/srcpkgs/colord/patches/add-introspection-switch.patch @@ -1,199 +1,50 @@ +diff --git lib/colord/meson.build lib/colord/meson.build +index 61f0518..9f7a246 100644 --- lib/colord/meson.build +++ lib/colord/meson.build -@@ -146,61 +146,63 @@ pkgg.generate( +@@ -146,6 +146,7 @@ pkgg.generate( description : 'colord is a system daemon for managing color devices', ) --libcolord_girtarget = gnome.generate_gir(colord, -- sources : [ -- 'cd-client.c', -- 'cd-client.h', -- 'cd-client-sync.c', -- 'cd-client-sync.h', -- 'cd-color.c', -- 'cd-color.h', -- 'cd-edid.c', -- 'cd-edid.h', -- 'cd-device.c', -- 'cd-device.h', -- 'cd-device-sync.c', -- 'cd-device-sync.h', -- 'cd-enum.c', -- 'cd-enum.h', -- 'cd-icc.c', -- 'cd-icc.h', -- 'cd-it8.c', -- 'cd-it8.h', -- 'cd-math.c', -- 'cd-math.h', -- 'cd-profile.c', -- 'cd-profile.h', -- 'cd-profile-sync.c', -- 'cd-profile-sync.h', -- 'cd-sensor.c', -- 'cd-sensor.h', -- 'cd-sensor-sync.c', -- 'cd-sensor-sync.h', -- 'cd-spectrum.c', -- 'cd-spectrum.h', -- ], -- nsversion : '1.0', -- namespace : 'Colord', -- symbol_prefix : 'cd', -- identifier_prefix : 'Cd', -- export_packages : 'colord', -- extra_args : [ -- '--c-include=colord.h', -- ], -- link_with : colordprivate, -- dependencies : [ -- gio, -- glib, -- lcms, -- ], -- includes : [ -- 'Gio-2.0', -- 'GObject-2.0', -- ], -- install : true --) --libcolord_gir = libcolord_girtarget[0] --libcolord_typelib = libcolord_girtarget[1] +if get_option('introspection') -+ libcolord_girtarget = gnome.generate_gir(colord, -+ sources : [ -+ 'cd-client.c', -+ 'cd-client.h', -+ 'cd-client-sync.c', -+ 'cd-client-sync.h', -+ 'cd-color.c', -+ 'cd-color.h', -+ 'cd-edid.c', -+ 'cd-edid.h', -+ 'cd-device.c', -+ 'cd-device.h', -+ 'cd-device-sync.c', -+ 'cd-device-sync.h', -+ 'cd-enum.c', -+ 'cd-enum.h', -+ 'cd-icc.c', -+ 'cd-icc.h', -+ 'cd-it8.c', -+ 'cd-it8.h', -+ 'cd-math.c', -+ 'cd-math.h', -+ 'cd-profile.c', -+ 'cd-profile.h', -+ 'cd-profile-sync.c', -+ 'cd-profile-sync.h', -+ 'cd-sensor.c', -+ 'cd-sensor.h', -+ 'cd-sensor-sync.c', -+ 'cd-sensor-sync.h', -+ 'cd-spectrum.c', -+ 'cd-spectrum.h', -+ ], -+ nsversion : '1.0', -+ namespace : 'Colord', -+ symbol_prefix : 'cd', -+ identifier_prefix : 'Cd', -+ export_packages : 'colord', -+ extra_args : [ -+ '--c-include=colord.h', -+ ], -+ link_with : colordprivate, -+ dependencies : [ -+ gio, -+ glib, -+ lcms, -+ ], -+ includes : [ -+ 'Gio-2.0', -+ 'GObject-2.0', -+ ], -+ install : true -+ ) -+ libcolord_gir = libcolord_girtarget[0] -+ libcolord_typelib = libcolord_girtarget[1] + libcolord_girtarget = gnome.generate_gir(colord, + sources : [ + 'cd-client.c', +@@ -202,6 +203,7 @@ libcolord_girtarget = gnome.generate_gir(colord, + ) + libcolord_gir = libcolord_girtarget[0] + libcolord_typelib = libcolord_girtarget[1] +endif if get_option('vapi') gnome.generate_vapi('colord', +diff --git lib/colorhug/meson.build lib/colorhug/meson.build +index 03aefb7..b6d2624 100644 --- lib/colorhug/meson.build +++ lib/colorhug/meson.build -@@ -73,36 +73,38 @@ pkgg.generate( +@@ -73,6 +73,7 @@ pkgg.generate( description : 'ColorHug is a simple display hardware colorimeter', ) --libcolorhug_gir = gnome.generate_gir(colorhug, -- sources : [ -- 'ch-common.c', -- 'ch-common.h', -- 'ch-device.c', -- 'ch-device.h', -- 'ch-device-queue.c', -- 'ch-device-queue.h', -- 'ch-hash.c', -- 'ch-hash.h', -- ], -- nsversion : '1.0', -- namespace : 'Colorhug', -- symbol_prefix : 'ch', -- identifier_prefix : 'Ch', -- export_packages : 'colorhug', -- link_with : colorhug, -- dependencies : [ -- gio, -- glib, -- lcms, -- ], -- includes : [ -- 'Gio-2.0', -- 'GObject-2.0', -- 'GUsb-1.0', -- libcolord_gir, -- ], -- install : true --) +if get_option('introspection') -+ libcolorhug_gir = gnome.generate_gir(colorhug, -+ sources : [ -+ 'ch-common.c', -+ 'ch-common.h', -+ 'ch-device.c', -+ 'ch-device.h', -+ 'ch-device-queue.c', -+ 'ch-device-queue.h', -+ 'ch-hash.c', -+ 'ch-hash.h', -+ ], -+ nsversion : '1.0', -+ namespace : 'Colorhug', -+ symbol_prefix : 'ch', -+ identifier_prefix : 'Ch', -+ export_packages : 'colorhug', -+ link_with : colorhug, -+ dependencies : [ -+ gio, -+ glib, -+ lcms, -+ ], -+ includes : [ -+ 'Gio-2.0', -+ 'GObject-2.0', -+ 'GUsb-1.0', -+ libcolord_gir, -+ ], -+ install : true -+ ) + 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') testdatadir = join_paths(meson.source_root(), 'data', 'tests') +diff --git meson_options.txt meson_options.txt +index 52af113..6661e16 100644 --- meson_options.txt +++ meson_options.txt -@@ -14,3 +14,4 @@ option('daemon_user', type : 'string', value : 'root', description : 'User for r +@@ -15,3 +15,4 @@ option('daemon_user', type : 'string', value : 'root', description : 'User for r option('pnp_ids', type : 'string', value : '', description : 'Location of pnp.ids if hwdb is not available') option('man', type : 'boolean', value : true, description : 'Generate man pages') option('docs', type : 'boolean', value : true, description : 'Generate documentation') +option('introspection', type : 'boolean', value : true, description : 'Generation gobject-introspection related files') + diff --git a/srcpkgs/colord/patches/fix-gir-cross.patch b/srcpkgs/colord/patches/fix-gir-cross.patch deleted file mode 100644 index b3efc3af1c1..00000000000 --- a/srcpkgs/colord/patches/fix-gir-cross.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/lib/colord/meson.build b/lib/colord/meson.build -index d0f412b..49139dd 100644 ---- lib/colord/meson.build -+++ lib/colord/meson.build -@@ -187,6 +187,7 @@ if get_option('introspection') - export_packages : 'colord', - extra_args : [ - '--c-include=colord.h', -+ '-DCD_COMPILATION', - ], - link_with : colordprivate, - dependencies : [ - -diff --git a/lib/colorhug/meson.build b/lib/colorhug/meson.build -index e177ef3..f88e8e4 100644 ---- lib/colorhug/meson.build -+++ lib/colorhug/meson.build -@@ -102,6 +102,9 @@ if get_option('introspection') - 'GUsb-1.0', - libcolord_gir, - ], -+ extra_args : [ -+ '-DCD_COMPILATION', -+ ], - install : true - ) - endif - diff --git a/srcpkgs/colord/template b/srcpkgs/colord/template index ed73c79d5d3..19da63017ef 100644 --- a/srcpkgs/colord/template +++ b/srcpkgs/colord/template @@ -1,22 +1,22 @@ # Template file for 'colord' pkgname=colord -version=1.4.3 -revision=2 +version=1.4.4 +revision=1 build_style=meson build_helper="gir" # man pages fail to generate configure_args="-Dsystemd=false -Dsane=true -Dargyllcms_sensor=false -Dman=false -Ddaemon_user=colord -Ddocs=false $(vopt_bool gir introspection) $(vopt_bool vala vapi)" -hostmakedepends="glib-devel pkg-config $(vopt_if vala vala-devel)" +hostmakedepends="glib-devel pkg-config $(vopt_if vala vala)" makedepends="bash-completion lcms2-devel libgudev-devel libgusb-devel polkit-devel sane-devel sqlite-devel" short_desc="System daemon for managing color devices" -maintainer="Rasmus Thomsen " +maintainer="Rasmus Thomsen " license="GPL-2.0-only" homepage="https://www.freedesktop.org/software/colord" distfiles="${homepage}/releases/${pkgname}-${version}.tar.xz" -checksum=9a8e669ee1ea31632bee636cc57353f703c2ea9b64cd6e02bbaabe9a1e549df7 +checksum=9a0fe80160bf88efddb582a9fc0169f56065276dc3882c47dddb9eecd048c0a5 system_accounts="colord" colord_homedir="/var/lib/colord"