[gentoo-commits] repo/gentoo:master commit in: x11-misc/colord/files/, x11-misc/colord/

2024-03-01 Thread Sam James
commit: 107eb89b10059098953c805aa775ddbd2ffaaff0
Author: Sam James  gentoo  org>
AuthorDate: Sat Mar  2 00:55:33 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar  2 00:55:33 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=107eb89b

x11-misc/colord: backport systemd permission fixes

Signed-off-by: Sam James  gentoo.org>

 x11-misc/colord/colord-1.4.7-r1.ebuild | 130 +
 .../files/colord-1.4.7-systemd-permissions.patch   |  51 
 2 files changed, 181 insertions(+)

diff --git a/x11-misc/colord/colord-1.4.7-r1.ebuild 
b/x11-misc/colord/colord-1.4.7-r1.ebuild
new file mode 100644
index ..e6bb102d0a39
--- /dev/null
+++ b/x11-misc/colord/colord-1.4.7-r1.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+VALA_USE_DEPEND="vapigen"
+
+inherit bash-completion-r1 meson-multilib tmpfiles udev vala
+
+DESCRIPTION="System service to accurately color manage input and output 
devices"
+HOMEPAGE="https://www.freedesktop.org/software/colord/;
+SRC_URI="https://www.freedesktop.org/software/colord/releases/${P}.tar.xz;
+
+LICENSE="GPL-2+"
+SLOT="0/2" # subslot = libcolord soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~sparc ~x86"
+
+IUSE="gtk-doc argyllcms examples extra-print-profiles +introspection scanner 
selinux systemd test vala"
+RESTRICT="!test? ( test ) test" # Tests try to read and write files in /tmp
+REQUIRED_USE="vala? ( introspection )"
+
+DEPEND="
+   >=dev-libs/glib-2.58.0:2[${MULTILIB_USEDEP}]
+   >=media-libs/lcms-2.6:2=[${MULTILIB_USEDEP}]
+   dev-db/sqlite:3=[${MULTILIB_USEDEP}]
+   >=dev-libs/libgusb-0.2.7[introspection?,${MULTILIB_USEDEP}]
+
+   dev-libs/libgudev:=[${MULTILIB_USEDEP}]
+   virtual/libudev:=[${MULTILIB_USEDEP}]
+   virtual/udev
+
+   systemd? ( >=sys-apps/systemd-44:0= )
+   scanner? (
+   media-gfx/sane-backends
+   sys-apps/dbus
+   )
+   >=sys-auth/polkit-0.114
+   argyllcms? ( media-gfx/argyllcms )
+   introspection? ( >=dev-libs/gobject-introspection-1.56:= )
+"
+RDEPEND="${DEPEND}
+   acct-group/colord
+   acct-user/colord
+   selinux? ( sec-policy/selinux-colord )
+"
+BDEPEND="
+   acct-group/colord
+   acct-user/colord
+   app-text/docbook-xsl-ns-stylesheets
+   dev-libs/libxslt
+   >=sys-devel/gettext-0.17
+   virtual/pkgconfig
+   extra-print-profiles? ( media-gfx/argyllcms )
+   gtk-doc? (
+   dev-util/gtk-doc
+   app-text/docbook-xml-dtd:4.1.2
+   )
+   vala? ( $(vala_depend) )
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.4.7-systemd-permissions.patch
+)
+
+pkg_setup() {
+   use vala && vala_setup
+}
+
+src_prepare() {
+   default
+
+   # Test requires a running session
+   # https://github.com/hughsie/colord/issues/94
+   sed -i -e "/test('colord-test-daemon'/d" lib/colord/meson.build || die
+
+   # Adapt to Gentoo paths
+   sed -i \
+   -e "s|find_program('spotread'|find_program('argyll-spotread'|" \
+   -e "s|find_program('colprof'|find_program('argyll-colprof'|" \
+   meson.build || die
+
+   # meson gnome.generate_vapi properly handles VAPIGEN and other vala
+   # environment variables. It is counter-productive to check for an
+   # unversioned vapigen, as that breaks versioned VAPIGEN usages.
+   sed -i -e "/find_program('vapigen')/d" meson.build || die
+}
+
+multilib_src_configure() {
+   local emesonargs=(
+   $(meson_native_true daemon)
+   -Dbash_completion=false
+   $(meson_native_true udev_rules) # Install udev rules only from 
native build
+   $(meson_native_use_bool systemd)
+   -Dlibcolordcompat=true
+   $(meson_native_use_bool argyllcms argyllcms_sensor)
+   $(meson_native_use_bool scanner sane)
+   $(meson_native_use_bool introspection)
+   $(meson_native_use_bool vala vapi)
+   $(meson_native_use_bool extra-print-profiles print_profiles)
+   $(meson_use test tests)
+   -Dinstalled_tests=false
+   -Ddaemon_user=colord
+   $(meson_native_true man)
+   $(meson_use gtk-doc docs)
+   --localstatedir="${EPREFIX}"/var
+   )
+   meson_src_configure
+}
+
+multilib_src_install_all() {
+   newbashcomp data/colormgr colormgr
+
+   # Ensure config and profile directories exist and /var/lib/colord/*
+   # is writable by colord user
+   keepdir /var/lib/color{,d}/icc
+   fowners colord:colord /var/lib/colord{,/icc}
+
+   if use examples; then
+   docinto examples
+   dodoc examples/*.c
+   fi
+}
+
+pkg_postinst() {
+   udev_reload
+   

[gentoo-commits] repo/gentoo:master commit in: x11-misc/colord/files/, x11-misc/colord/

2023-12-01 Thread Sam James
commit: 17ee1596c7eb55a81cfbb018ca62f9900a7e0eac
Author: Sam James  gentoo  org>
AuthorDate: Sat Dec  2 05:13:20 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Dec  2 05:13:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17ee1596

x11-misc/colord: fix modern c issue (32-bit ptr truncation)

Closes: https://bugs.gentoo.org/918990
Signed-off-by: Sam James  gentoo.org>

 x11-misc/colord/colord-1.4.6-r2.ebuild | 129 +
 .../files/colord-1.4.6-FILE_OFFSET_BITS.patch  |  38 ++
 .../files/colord-1.4.6-time_t-ptr-truncation.patch |  35 ++
 3 files changed, 202 insertions(+)

diff --git a/x11-misc/colord/colord-1.4.6-r2.ebuild 
b/x11-misc/colord/colord-1.4.6-r2.ebuild
new file mode 100644
index ..20e350ceb6e5
--- /dev/null
+++ b/x11-misc/colord/colord-1.4.6-r2.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+VALA_USE_DEPEND="vapigen"
+
+inherit bash-completion-r1 meson-multilib tmpfiles udev vala
+
+DESCRIPTION="System service to accurately color manage input and output 
devices"
+HOMEPAGE="https://www.freedesktop.org/software/colord/;
+SRC_URI="https://www.freedesktop.org/software/colord/releases/${P}.tar.xz;
+
+LICENSE="GPL-2+"
+SLOT="0/2" # subslot = libcolord soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~sparc ~x86"
+
+IUSE="gtk-doc argyllcms examples extra-print-profiles +introspection scanner 
selinux systemd test vala"
+RESTRICT="!test? ( test ) test" # Tests try to read and write files in /tmp
+REQUIRED_USE="vala? ( introspection )"
+
+DEPEND="
+   >=dev-libs/glib-2.58.0:2[${MULTILIB_USEDEP}]
+   >=media-libs/lcms-2.6:2=[${MULTILIB_USEDEP}]
+   dev-db/sqlite:3=[${MULTILIB_USEDEP}]
+   >=dev-libs/libgusb-0.2.7[introspection?,${MULTILIB_USEDEP}]
+
+   dev-libs/libgudev:=[${MULTILIB_USEDEP}]
+   virtual/libudev:=[${MULTILIB_USEDEP}]
+   virtual/udev
+
+   systemd? ( >=sys-apps/systemd-44:0= )
+   scanner? (
+   media-gfx/sane-backends
+   sys-apps/dbus
+   )
+   >=sys-auth/polkit-0.114
+   argyllcms? ( media-gfx/argyllcms )
+   introspection? ( >=dev-libs/gobject-introspection-1.56:= )
+"
+RDEPEND="${DEPEND}
+   acct-group/colord
+   acct-user/colord
+   selinux? ( sec-policy/selinux-colord )
+"
+BDEPEND="
+   acct-group/colord
+   acct-user/colord
+   app-text/docbook-xsl-ns-stylesheets
+   dev-libs/libxslt
+   >=sys-devel/gettext-0.17
+   virtual/pkgconfig
+   extra-print-profiles? ( media-gfx/argyllcms )
+   gtk-doc? (
+   dev-util/gtk-doc
+   app-text/docbook-xml-dtd:4.1.2
+   )
+   vala? ( $(vala_depend) )
+"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-lcms2-corruption.patch
+   "${FILESDIR}"/${P}-time_t-ptr-truncation.patch
+   "${FILESDIR}"/${P}-FILE_OFFSET_BITS.patch
+)
+
+src_prepare() {
+   default
+   use vala && vala_src_prepare
+
+   # Test requires a running session
+   # https://github.com/hughsie/colord/issues/94
+   sed -i -e "/test('colord-test-daemon'/d" lib/colord/meson.build || die
+
+   # Adapt to Gentoo paths
+   sed -i \
+   -e "s|find_program('spotread'|find_program('argyll-spotread'|" \
+   -e "s|find_program('colprof'|find_program('argyll-colprof'|" \
+   meson.build || die
+
+   # meson gnome.generate_vapi properly handles VAPIGEN and other vala
+   # environment variables. It is counter-productive to check for an
+   # unversioned vapigen, as that breaks versioned VAPIGEN usages.
+   sed -i -e "/find_program('vapigen')/d" meson.build || die
+}
+
+multilib_src_configure() {
+   local emesonargs=(
+   $(meson_native_true daemon)
+   -Dbash_completion=false
+   $(meson_native_true udev_rules) # Install udev rules only from 
native build
+   $(meson_native_use_bool systemd)
+   -Dlibcolordcompat=true
+   $(meson_native_use_bool argyllcms argyllcms_sensor)
+   $(meson_native_use_bool scanner sane)
+   $(meson_native_use_bool introspection)
+   $(meson_native_use_bool vala vapi)
+   $(meson_native_use_bool extra-print-profiles print_profiles)
+   $(meson_use test tests)
+   -Dinstalled_tests=false
+   -Ddaemon_user=colord
+   $(meson_native_true man)
+   $(meson_use gtk-doc docs)
+   --localstatedir="${EPREFIX}"/var
+   )
+   meson_src_configure
+}
+
+multilib_src_install_all() {
+   newbashcomp data/colormgr colormgr
+
+   # Ensure config and profile directories exist and /var/lib/colord/*
+   # is writable by colord user
+   keepdir /var/lib/color{,d}/icc
+   fowners colord:colord 

[gentoo-commits] repo/gentoo:master commit in: x11-misc/colord/files/, x11-misc/colord/

2021-04-18 Thread Matt Turner
commit: e9f060d99869a65b2bcefe819672a34318cdd4f5
Author: Daniel Brandt  spahan  ch>
AuthorDate: Sun Apr 18 16:22:37 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Apr 18 21:46:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9f060d9

x11-misc/colord: Version bump to 1.4.5

* Re-add multilib support (mattst88)
* Various bug fixing (mattst88)

Closes: https://bugs.gentoo.org/738908
Signed-off-by: Daniel Brandt  spahan.ch>
Signed-off-by: Matt Turner  gentoo.org>

 x11-misc/colord/Manifest   |   1 +
 x11-misc/colord/colord-1.4.5.ebuild| 135 +
 .../1.4.5-build-Fix-building-without-vapi.patch|  53 
 ...on-t-use-exact-floating-point-comparisons.patch |  39 ++
 4 files changed, 228 insertions(+)

diff --git a/x11-misc/colord/Manifest b/x11-misc/colord/Manifest
index 44de5bad81b..b954e9b2b18 100644
--- a/x11-misc/colord/Manifest
+++ b/x11-misc/colord/Manifest
@@ -1 +1,2 @@
 DIST colord-1.3.5.tar.xz 1263488 BLAKE2B 
de70f3f76e81d3cec826f444e4c6a1603c03b7d97fedcd04a0b9e1977d1e487d7e1327c8b2738b3cf74e9717fb6803d543786c749d3a244faa1a6480e77e3436
 SHA512 
a0084ad2c08ae88c8023b8bade68f6cf25e13c77a6a37ef127b2914e86b06e6a7a783f9ab3585243d975dbbe1120d5daae13bdb586aefe519bf675458683025f
+DIST colord-1.4.5.tar.xz 1869084 BLAKE2B 
34c886bade6f71b0b81bbed216695d839873fba46423f6422b80ef2f62e88a403edd1686bb705ef78bcaeb352477e0581d784ccd388961cd42d880661b4b31ab
 SHA512 
b6cc8087ceff4a99b7d764087208cc72e1219d9f6bb52bd3e3eb13bb62e3c1e99aefef36237dceff46925ab7680c76795f59057b7a4d1c8a123de6270708e03c

diff --git a/x11-misc/colord/colord-1.4.5.ebuild 
b/x11-misc/colord/colord-1.4.5.ebuild
new file mode 100644
index 000..d98cb5325f1
--- /dev/null
+++ b/x11-misc/colord/colord-1.4.5.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit bash-completion-r1 meson multilib-minimal systemd udev vala
+
+DESCRIPTION="System service to accurately color manage input and output 
devices"
+HOMEPAGE="https://www.freedesktop.org/software/colord/;
+SRC_URI="https://www.freedesktop.org/software/colord/releases/${P}.tar.xz;
+
+LICENSE="GPL-2+"
+SLOT="0/2" # subslot = libcolord soname version
+KEYWORDS="~amd64 ~x86"
+
+IUSE="gtk-doc argyllcms examples extra-print-profiles +introspection scanner 
systemd test +udev vala"
+RESTRICT="!test? ( test ) test" # Tests try to read and write files in /tmp
+REQUIRED_USE="
+   scanner? ( udev )
+   vala? ( introspection )
+"
+
+DEPEND="
+   >=dev-libs/glib-2.58.0:2[${MULTILIB_USEDEP}]
+   >=media-libs/lcms-2.6:2=[${MULTILIB_USEDEP}]
+   dev-db/sqlite:3=[${MULTILIB_USEDEP}]
+   >=dev-libs/libgusb-0.2.7[${MULTILIB_USEDEP}]
+   udev? (
+   dev-libs/libgudev:=[${MULTILIB_USEDEP}]
+   virtual/libudev:=[${MULTILIB_USEDEP}]
+   virtual/udev
+   )
+   systemd? ( >=sys-apps/systemd-44:0= )
+   scanner? (
+   media-gfx/sane-backends
+   sys-apps/dbus
+   )
+   >=sys-auth/polkit-0.104
+   argyllcms? ( media-gfx/argyllcms )
+   introspection? ( >=dev-libs/gobject-introspection-0.9.8:= )
+"
+RDEPEND="${DEPEND}
+   acct-group/colord
+   acct-user/colord
+"
+BDEPEND="
+   acct-group/colord
+   acct-user/colord
+   dev-libs/libxslt
+   >=dev-util/intltool-0.35
+   >=sys-devel/gettext-0.17
+   virtual/pkgconfig
+   extra-print-profiles? ( media-gfx/argyllcms )
+   vala? ( $(vala_depend) )
+"
+# These dependencies are required to build native build-time programs.
+BDEPEND="${BDEPEND}
+   dev-libs/glib:2
+   media-libs/lcms
+"
+
+PATCHES=(
+   
"${FILESDIR}"/${PV}-tests-Don-t-use-exact-floating-point-comparisons.patch
+   "${FILESDIR}"/${PV}-build-Fix-building-without-vapi.patch
+)
+
+src_prepare() {
+   default
+   use vala && vala_src_prepare
+
+   # Test requires a running session
+   # https://github.com/hughsie/colord/issues/94
+   sed -i -e "/test('colord-test-daemon'/d" lib/colord/meson.build || die
+
+   # Adapt to Gentoo paths
+   sed -i \
+   -e "s|find_program('spotread'|find_program('argyll-spotread'|" \
+   -e "s|find_program('colprof'|find_program('argyll-colprof'|" \
+   meson.build || die
+
+   # meson gnome.generate_vapi properly handles VAPIGEN and other vala
+   # environment variables. It is counter-productive to check for an
+   # unversioned vapigen, as that breaks versioned VAPIGEN usages.
+   sed -i -e "/find_program('vapigen')/d" meson.build || die
+}
+
+multilib_src_configure() {
+   local emesonargs=(
+   -Ddaemon=$(multilib_is_native_abi && echo true || echo false)
+   -Dexamples=false
+   -Dbash_completion=false
+   $(meson_use udev udev_rules)
+