cpet
/
freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

graphics/colord: Update to 1.4.6 

This update adds many options including COMPLETIONS, DOCS, MANPAGES,
SANE, and an argyllcms SENSOR option.

Significantly, it removes the docbook-utils dependency, which brought
the entire LaTeX system with it. This unfortunate dependency added
literally hours to the build time of colord and everything which
required it (in particular, gtk30 and the entire GNOME DE).

The comical part is that docbook-utils haven't actually been used by
colord in nearly 5 years; our port was simply never updated to remove
that dependency. Mercifully, this is now fixed.

Many thanks to Antoine for running multiple exp-runs caused by me not
having my act together.

PR:		267239
This commit is contained in:
Sean Champ 2022-12-19 12:36:29 -07:00 committed by Adam Weinberger
parent 291bc8da83
commit 0ceac973c8
7 changed files with 91 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
graphics/colord/Makefile
View File

@ -1,6 +1,5 @@
PORTNAME= colord
PORTVERSION= 1.3.5
PORTREVISION= 2
PORTVERSION= 1.4.6
CATEGORIES= graphics
MASTER_SITES= https://www.freedesktop.org/software/colord/releases/
@ -10,73 +9,84 @@ WWW= https://www.freedesktop.org/software/colord
LICENSE= GPLv2
BUILD_DEPENDS= spotread:graphics/argyllcms
LIB_DEPENDS= libdbus-1.so:devel/dbus \
liblcms2.so:graphics/lcms2
RUN_DEPENDS= spotread:graphics/argyllcms
libgusb.so:devel/libgusb \
libgudev-1.0.so:devel/libgudev \
liblcms2.so:graphics/lcms2 \
libpolkit-gobject-1.so:sysutils/polkit
RUN_DEPENDS= hwdata>0:misc/hwdata
USERS= colord
GROUPS= colord
USES= gettext gmake gnome libtool localbase pathfix pkgconfig sqlite \
USES= gettext gnome libtool localbase meson pathfix pkgconfig sqlite \
tar:xz
USE_GNOME= glib20 intlhack introspection:build
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
MAKE_JOBS_UNSAFE=yes
CONFIGURE_ARGS= --disable-udev \
MAKE_JOBS_UNSAFE= yes
MAKE_ENV= PYTHONDONTWRITEBYTECODE=1
MESON_ARGS= -Dsystemd=false -Dudev_rules=false \
-Ddaemon_user=colord -Dlibcolordcompat=true \
-Dpnp_ids=${LOCALBASE}/share/hwdata/hwdata/pnp.ids \
--localstatedir=/var \
--enable-gtk-doc-html=no \
--disable-bash-completion \
--disable-gusb \
--disable-sane \
--with-daemon-user=colord \
--disable-systemd-login \
--enable-libcolordcompat
INSTALL_TARGET= install-strip
GLIB_SCHEMAS= org.freedesktop.ColorHelper.gschema.xml
OPTIONS_SUB= yes
OPTIONS_DEFINE= POLKIT MANPAGES PPROFILES VALA
OPTIONS_DEFAULT=POLKIT VALA
OPTIONS_DEFINE= DOCS COMPLETION MANPAGES PPROFILES SANE SENSOR TESTS VALA
OPTIONS_DEFAULT=COMPLETION MANPAGES VALA TESTS
COMPLETION_DESC=Build and install shell completions
PPROFILES_DESC= Build extra print profiles (long build time)
POLKIT_DESC= Build with Polkit support
SANE_DESC= Enable SANE support
SENSOR_DESC= Enable ArgyllCMS sensor
TESTS_DESC= Build self tests
VALA_DESC= Build Vala language bindings
DOCS_MESON_TRUE= docs
COMPLETION_MESON_TRUE= bash_completion
MANPAGES_MESON_TRUE= man
PPROFILES_MESON_TRUE= print_profiles
SANE_MESON_TRUE= sane
SENSOR_MESON_TRUE= argyllcms_sensor
TESTS_MESON_TRUE= tests
VALA_MESON_TRUE= vapi
COMPLETION_BUILD_DEPENDS= bash-completion>=2.0:shells/bash-completion
DOCS_BUILD_DEPENDS= gtkdoc-scan:textproc/gtk-doc
POLKIT_LIB_DEPENDS= libpolkit-gobject-1.so:sysutils/polkit
POLKIT_CONFIGURE_ENABLE= polkit
MANPAGES_BUILD_DEPENDS= docbook2html:textproc/docbook-utils \
docbook-sgml>0:textproc/docbook-sgml
PPROFILES_CONFIGURE_ENABLE= print-profiles
VALA_CONFIGURE_ENABLE= vala
MANPAGES_BUILD_DEPENDS= xsltproc:textproc/libxslt \
docbook-xsl-ns>0:textproc/docbook-xsl-ns
SANE_LIB_DEPENDS= libsane.so:graphics/sane-backends
SENSOR_BUILD_DEPENDS= spotread:graphics/argyllcms
SENSOR_RUN_DEPENDS= spotread:graphics/argyllcms
VALA_USES= vala:build
MAKE_ENV= PYTHONDONTWRITEBYTECODE=1
.include <bsd.port.options.mk>
GNOME_HTML_DIR= ${PREFIX}/share/gtk-doc/html
post-patch:
@${REINPLACE_CMD} -e 's|-Wclobbered||g' \
-e 's|-Wempty-body||g' \
-e 's|-Wignored-qualifiers||g' \
-e 's|-Wtype-limits||g' \
-e 's|-Wmissing-parameter-type||g' \
${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|lib/color|db/color|g' \
@${REINPLACE_CMD} -e 's|lib/color\>|db/color|g' \
-e 's|/usr/share/color|${PREFIX}/share/color|g' \
-e 's|LOCALSTATEDIR "/lib/|LOCALSTATEDIR "/db/|g' \
${WRKSRC}/src/cd-main.c \
${WRKSRC}/lib/colord/cd-icc-store.c \
${WRKSRC}/src/cd-profile.c
@${REINPLACE_CMD} -e 's|/usr/share|${LOCALBASE}/share|g' \
${WRKSRC}/lib/colord/cd-edid.c
.if ! ${PORT_OPTIONS:MMANPAGES}
@${REINPLACE_CMD} -e "s|2MAN_TRUE=$$|2MAN_TRUE='#'|g ; \
s|2MAN_FALSE='#'|2MAN_FALSE=|g" ${WRKSRC}/configure
.endif
@${REINPLACE_CMD} -e 's|@@DOCBOOK_MANPAGE_XSL@@|${LOCALBASE}/share/xsl/docbook-ns/manpages/docbook.xsl|' \
${WRKSRC}/man/meson.build
post-install:
@${MKDIR} ${STAGEDIR}/var/db/colord/icc
@${FIND} ${STAGEDIR}/var/lib -type d | ${TAIL} -r | ${XARGS} ${RMDIR}
post-stage-DOCS-on:
cd ${WRKSRC}; ${COPYTREE_SHARE} NEWS ${STAGEDIR}${DOCSDIR}
add-plist-docs: ${STAGE_COOKIE}
cd ${STAGEDIR}; ${FIND} ${DOCSDIR:C@^/@@} -type f | ${SED} -e 's@^@/@' >> ${TMPPLIST}
cd ${STAGEDIR}; ${FIND} ${PREFIX:C@^/@@}/share/gtk-doc/html -mindepth 2 -type f | ${SED} -e 's@^@/@' >> ${TMPPLIST}
.include <bsd.port.mk>

6
graphics/colord/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1516460331
SHA256 (colord-1.3.5.tar.xz) = 2daa8ffd2a532d7094927cd1a4af595b8310cea66f7707edcf6ab743460feed2
SIZE (colord-1.3.5.tar.xz) = 1263488
TIMESTAMP = 1664763215
SHA256 (colord-1.4.6.tar.xz) = 7407631a27bfe5d1b672e7ae42777001c105d860b7b7392283c8c6300de88e6f
SIZE (colord-1.4.6.tar.xz) = 1872528

10
graphics/colord/files/patch-Makefile.in
View File

@ -1,10 +0,0 @@
--- Makefile.in.orig 2016-12-26 19:58:23.811313000 +0100
+++ Makefile.in 2016-12-26 19:58:44.434394000 +0100
@@ -92,7 +92,6 @@
@HAVE_DAEMON_TRUE@am__append_1 = \
@HAVE_DAEMON_TRUE@ man \
@HAVE_DAEMON_TRUE@ policy \
-@HAVE_DAEMON_TRUE@ rules \
@HAVE_DAEMON_TRUE@ src
subdir = .

11
graphics/colord/files/patch-configure
View File

@ -1,11 +0,0 @@
--- configure.orig 2013-04-11 10:05:05.000000000 +0000
+++ configure 2013-04-11 10:06:38.000000000 +0000
@@ -17763,7 +17763,7 @@
fi
# per-machine directory
-CD_SYSTEM_PROFILES_DIR="\$(localstatedir)/lib/colord/icc"
+CD_SYSTEM_PROFILES_DIR="\$(localstatedir)/db/colord/icc"
ac_config_files="$ac_config_files Makefile etc/Makefile contrib/Makefile contrib/session-helper/Makefile contrib/colord-sane/Makefile examples/Makefile man/Makefile doc/Makefile doc/api/Makefile doc/api/dbus/Makefile doc/api/version.xml data/Makefile data/figures/Makefile data/profiles/Makefile data/ti1/Makefile data/org.freedesktop.ColorManager.conf data/tests/Makefile policy/Makefile rules/Makefile rules/69-cd-sensors.rules po/Makefile.in src/Makefile src/plugins/Makefile src/sensors/Makefile client/Makefile lib/Makefile lib/colord/cd-version.h lib/colord/colord.pc lib/colord/Makefile lib/colorhug/Makefile lib/colorhug/colorhug.pc lib/colorhug/ch-version.h lib/dtp94/Makefile lib/huey/Makefile lib/munki/Makefile"

10
graphics/colord/files/patch-man_meson.build Normal file
View File

@ -0,0 +1,10 @@
--- man/meson.build.orig 2022-02-16 15:35:10 UTC
+++ man/meson.build
@@ -1,6 +1,6 @@
xsltproc = find_program('xsltproc')
-stylesheet_url = 'http://docbook.sourceforge.net/release/xsl-ns/current/manpages/docbook.xsl'
+stylesheet_url = '@@DOCBOOK_MANPAGE_XSL@@'
ret = run_command(xsltproc, '--nonet', stylesheet_url)
if ret.returncode() != 0
error('Cannot build man pages without docbook-xsl-ns')

15
graphics/colord/files/patch-src_Makefile_in
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-src_Makefile_in,v 1.6 2013/03/31 19:41:23 ajacoutot Exp $
--- src/Makefile.in.orig Thu Mar 28 11:16:10 2013
+++ src/Makefile.in Sat Mar 30 16:25:48 2013
@@ -1774,11 +1774,6 @@ cd-resources.h: colord.gresource.xml
$(srcdir)/colord.gresource.xml
install-data-hook:
- if test -w $(DESTDIR)$(prefix)/; then \
- mkdir -p $(DESTDIR)$(CD_SYSTEM_PROFILES_DIR); \
- chown $(daemon_user) $(DESTDIR)$(localstatedir)/lib/colord; \
- chmod 0755 $(DESTDIR)$(localstatedir)/lib/colord; \
- fi
-include $(top_srcdir)/git.mk

36
graphics/colord/pkg-plist
View File

@ -3,7 +3,6 @@ bin/cd-fix-profile
bin/cd-iccdump
bin/cd-it8
bin/colormgr
etc/dbus-1/system.d/org.freedesktop.ColorManager.conf
include/colord-1/colord-private.h
include/colord-1/colord-session/cd-session.h
include/colord-1/colord.h
@ -34,29 +33,46 @@ include/colord-1/colord/cd-sensor.h
include/colord-1/colord/cd-spectrum.h
include/colord-1/colord/cd-transform.h
include/colord-1/colord/cd-version.h
lib/colord-sensors/libcolord_sensor_argyll.a
lib/colord-sensors/libcolord_sensor_argyll.so
lib/colord-sensors/libcolord_sensor_dummy.a
include/colord-1/colorhug/ch-common.h
include/colord-1/colorhug/ch-device-queue.h
include/colord-1/colorhug/ch-device.h
include/colord-1/colorhug/ch-hash.h
include/colord-1/colorhug/ch-inhx32.h
include/colord-1/colorhug/ch-math.h
include/colord-1/colorhug/ch-version.h
include/colord-1/colorhug/colorhug.h
%%SENSOR%%lib/colord-sensors/libcolord_sensor_argyll.a
%%SENSOR%%lib/colord-sensors/libcolord_sensor_argyll.so
lib/colord-plugins/libcolord_sensor_camera.so
lib/colord-plugins/libcolord_sensor_scanner.so
%%SANE%%lib/colord-plugins/libcolord_sensor_sane.so
lib/colord-sensors/libcolord_sensor_dtp94.so
lib/colord-sensors/libcolord_sensor_colorhug.so
lib/colord-sensors/libcolord_sensor_dummy.so
lib/colord-sensors/libcolord_sensor_huey.so
lib/girepository-1.0/Colord-1.0.typelib
lib/libcolord.a
lib/girepository-1.0/Colorhug-1.0.typelib
lib/libcolord.so
lib/libcolord.so.2
lib/libcolord.so.2.0.5
lib/libcolordcompat.a
lib/libcolorhug.so
lib/libcolorhug.so.2
lib/libcolorhug.so.2.0.5
lib/libcolordcompat.so
lib/libcolordprivate.a
lib/libcolordprivate.so
lib/libcolordprivate.so.2
lib/libcolordprivate.so.2.0.5
@comment lib/systemd/user/colord-session.service
libdata/pkgconfig/colord.pc
libdata/pkgconfig/colorhug.pc
libexec/colord
libexec/colord-session
%%SANE%%libexec/colord-sane
%%MANPAGES%%man/man1/cd-create-profile.1.gz
%%MANPAGES%%man/man1/cd-fix-profile.1.gz
%%MANPAGES%%man/man1/cd-it8.1.gz
%%MANPAGES%%man/man1/colormgr.1.gz
%%COMPLETION%%share/bash-completion/completions/colormgr
share/color/icc/colord/AdobeRGB1998.icc
share/color/icc/colord/AppleRGB.icc
share/color/icc/colord/BestRGB.icc
@ -70,6 +86,7 @@ share/color/icc/colord/DonRGB4.icc
share/color/icc/colord/ECI-RGBv1.icc
share/color/icc/colord/ECI-RGBv2.icc
share/color/icc/colord/EktaSpacePS5.icc
share/color/icc/colord/Rec709.icc
%%PPROFILES%%share/color/icc/colord/FOGRA27L_coated.icc
%%PPROFILES%%share/color/icc/colord/FOGRA28L_webcoated.icc
%%PPROFILES%%share/color/icc/colord/FOGRA29L_uncoated.icc
@ -149,7 +166,9 @@ share/dbus-1/interfaces/org.freedesktop.ColorManager.Sensor.xml
share/dbus-1/interfaces/org.freedesktop.ColorManager.xml
share/dbus-1/services/org.freedesktop.ColorHelper.service
share/dbus-1/system-services/org.freedesktop.ColorManager.service
share/dbus-1/system.d/org.freedesktop.ColorManager.conf
share/gir-1.0/Colord-1.0.gir
share/gir-1.0/Colorhug-1.0.gir
share/locale/as/LC_MESSAGES/colord.mo
share/locale/bn_IN/LC_MESSAGES/colord.mo
share/locale/ca/LC_MESSAGES/colord.mo
@ -163,10 +182,12 @@ share/locale/es/LC_MESSAGES/colord.mo
share/locale/eu/LC_MESSAGES/colord.mo
share/locale/fi/LC_MESSAGES/colord.mo
share/locale/fr/LC_MESSAGES/colord.mo
share/locale/fur/LC_MESSAGES/colord.mo
share/locale/gl/LC_MESSAGES/colord.mo
share/locale/gu/LC_MESSAGES/colord.mo
share/locale/he/LC_MESSAGES/colord.mo
share/locale/hi/LC_MESSAGES/colord.mo
share/locale/hr/LC_MESSAGES/colord.mo
share/locale/hu/LC_MESSAGES/colord.mo
share/locale/id/LC_MESSAGES/colord.mo
share/locale/is/LC_MESSAGES/colord.mo
@ -202,5 +223,6 @@ share/locale/zh_CN/LC_MESSAGES/colord.mo
share/locale/zh_TW/LC_MESSAGES/colord.mo
share/polkit-1/actions/org.freedesktop.color.policy
%%VALA%%share/vala/vapi/colord.vapi
%%VALA%%share/vala/vapi/colord.deps
@dir(colord,colord,0755) /var/db/colord/icc
@dir(colord,colord,0755) /var/db/colord