View | Details | Raw Unified | Return to bug 267239 | Differences between
and this patch

Collapse All | Expand All

(-)b/graphics/colord/Makefile (-39 / +49 lines)
Lines 1-6 Link Here
1
PORTNAME=	colord
1
PORTNAME=	colord
2
PORTVERSION=	1.3.5
2
PORTVERSION=	1.4.6
3
PORTREVISION=	2
4
CATEGORIES=	graphics
3
CATEGORIES=	graphics
5
MASTER_SITES=	https://www.freedesktop.org/software/colord/releases/
4
MASTER_SITES=	https://www.freedesktop.org/software/colord/releases/
6
5
Lines 10-82 WWW= https://www.freedesktop.org/software/colord Link Here
10
9
11
LICENSE=	GPLv2
10
LICENSE=	GPLv2
12
11
13
BUILD_DEPENDS=	spotread:graphics/argyllcms
14
LIB_DEPENDS=	libdbus-1.so:devel/dbus \
12
LIB_DEPENDS=	libdbus-1.so:devel/dbus \
15
		liblcms2.so:graphics/lcms2
13
		libgusb.so:devel/libgusb \
16
RUN_DEPENDS=	spotread:graphics/argyllcms
14
		libgudev-1.0.so:devel/libgudev \
15
		liblcms2.so:graphics/lcms2 \
16
		libpolkit-gobject-1.so:sysutils/polkit
17
RUN_DEPENDS=	hwdata>0:misc/hwdata
17
18
18
USERS=		colord
19
USERS=		colord
19
GROUPS=		colord
20
GROUPS=		colord
20
21
21
USES=		gettext gmake gnome libtool localbase pathfix pkgconfig sqlite \
22
USES=		gettext gnome libtool localbase meson pathfix pkgconfig sqlite \
22
		tar:xz
23
		tar:xz
23
USE_GNOME=	glib20 intlhack introspection:build
24
USE_GNOME=	glib20 intlhack introspection:build
24
GNU_CONFIGURE=	yes
25
25
USE_LDCONFIG=	yes
26
USE_LDCONFIG=	yes
26
MAKE_JOBS_UNSAFE=yes
27
MAKE_JOBS_UNSAFE=	yes
27
CONFIGURE_ARGS=	--disable-udev \
28
MAKE_ENV=	PYTHONDONTWRITEBYTECODE=1
29
MESON_ARGS=	-Dsystemd=false -Dudev_rules=false \
30
		-Ddaemon_user=colord -Dlibcolordcompat=true \
31
		-Dpnp_ids=${LOCALBASE}/share/hwdata/hwdata/pnp.ids \
28
		--localstatedir=/var \
32
		--localstatedir=/var \
29
		--enable-gtk-doc-html=no \
33
30
		--disable-bash-completion \
31
		--disable-gusb \
32
		--disable-sane \
33
		--with-daemon-user=colord \
34
		--disable-systemd-login \
35
		--enable-libcolordcompat
36
INSTALL_TARGET=	install-strip
34
INSTALL_TARGET=	install-strip
37
35
38
GLIB_SCHEMAS=	org.freedesktop.ColorHelper.gschema.xml
36
GLIB_SCHEMAS=	org.freedesktop.ColorHelper.gschema.xml
39
37
40
OPTIONS_SUB=	yes
38
OPTIONS_SUB=	yes
41
OPTIONS_DEFINE=	POLKIT MANPAGES PPROFILES VALA
39
OPTIONS_DEFINE=	DOCS COMPLETION MANPAGES PPROFILES SANE SENSOR TESTS VALA
42
OPTIONS_DEFAULT=POLKIT VALA
40
OPTIONS_DEFAULT=COMPLETION MANPAGES VALA TESTS
43
41
42
COMPLETION_DESC=Build and install shell completions
44
PPROFILES_DESC=	Build extra print profiles (long build time)
43
PPROFILES_DESC=	Build extra print profiles (long build time)
45
POLKIT_DESC=	Build with Polkit support
44
SANE_DESC=	Enable SANE support
45
SENSOR_DESC=	Enable ArgyllCMS sensor
46
TESTS_DESC=	Build self tests
46
VALA_DESC=	Build Vala language bindings
47
VALA_DESC=	Build Vala language bindings
47
48
49
DOCS_MESON_TRUE=		docs
50
COMPLETION_MESON_TRUE=		bash_completion
51
MANPAGES_MESON_TRUE=		man
52
PPROFILES_MESON_TRUE=		print_profiles
53
SANE_MESON_TRUE=		sane
54
SENSOR_MESON_TRUE=		argyllcms_sensor
55
TESTS_MESON_TRUE=		tests
56
VALA_MESON_TRUE=		vapi
57
58
COMPLETION_BUILD_DEPENDS=	bash-completion>=2.0:shells/bash-completion
59
DOCS_BUILD_DEPENDS=		gtkdoc-scan:textproc/gtk-doc
48
POLKIT_LIB_DEPENDS=		libpolkit-gobject-1.so:sysutils/polkit
60
POLKIT_LIB_DEPENDS=		libpolkit-gobject-1.so:sysutils/polkit
49
POLKIT_CONFIGURE_ENABLE=	polkit
61
POLKIT_CONFIGURE_ENABLE=	polkit
50
62
MANPAGES_BUILD_DEPENDS=		xsltproc:textproc/libxslt \
51
MANPAGES_BUILD_DEPENDS=		docbook2html:textproc/docbook-utils \
63
				docbook-xsl-ns>0:textproc/docbook-xsl-ns
52
				docbook-sgml>0:textproc/docbook-sgml
64
SANE_LIB_DEPENDS=		libsane.so:graphics/sane-backends
53
PPROFILES_CONFIGURE_ENABLE=	print-profiles
65
SENSOR_BUILD_DEPENDS=		spotread:graphics/argyllcms
54
VALA_CONFIGURE_ENABLE=		vala
66
SENSOR_RUN_DEPENDS=		spotread:graphics/argyllcms
55
VALA_USES=			vala:build
67
VALA_USES=			vala:build
56
MAKE_ENV=		PYTHONDONTWRITEBYTECODE=1
57
68
58
.include <bsd.port.options.mk>
69
GNOME_HTML_DIR=		${PREFIX}/share/gtk-doc/html
59
70
60
post-patch:
71
post-patch:
61
	@${REINPLACE_CMD} -e 's|-Wclobbered||g' \
72
	@${REINPLACE_CMD} -e 's|lib/color\>|db/color|g' \
62
		-e 's|-Wempty-body||g' \
63
		-e 's|-Wignored-qualifiers||g' \
64
		-e 's|-Wtype-limits||g' \
65
		-e 's|-Wmissing-parameter-type||g' \
66
		${WRKSRC}/configure
67
	@${REINPLACE_CMD} -e 's|lib/color|db/color|g' \
68
		-e 's|/usr/share/color|${PREFIX}/share/color|g' \
73
		-e 's|/usr/share/color|${PREFIX}/share/color|g' \
74
		-e 's|LOCALSTATEDIR "/lib/|LOCALSTATEDIR "/db/|g' \
69
		${WRKSRC}/src/cd-main.c \
75
		${WRKSRC}/src/cd-main.c \
70
		${WRKSRC}/lib/colord/cd-icc-store.c \
76
		${WRKSRC}/lib/colord/cd-icc-store.c \
71
		${WRKSRC}/src/cd-profile.c
77
		${WRKSRC}/src/cd-profile.c
72
	@${REINPLACE_CMD} -e 's|/usr/share|${LOCALBASE}/share|g' \
78
	@${REINPLACE_CMD} -e 's|@@DOCBOOK_MANPAGE_XSL@@|${LOCALBASE}/share/xsl/docbook-ns/manpages/docbook.xsl|' \
73
		${WRKSRC}/lib/colord/cd-edid.c
79
		${WRKSRC}/man/meson.build
74
.if ! ${PORT_OPTIONS:MMANPAGES}
75
	@${REINPLACE_CMD} -e "s|2MAN_TRUE=$$|2MAN_TRUE='#'|g ; \
76
		s|2MAN_FALSE='#'|2MAN_FALSE=|g" ${WRKSRC}/configure
77
.endif
78
80
79
post-install:
81
post-install:
80
	@${MKDIR} ${STAGEDIR}/var/db/colord/icc
82
	@${MKDIR} ${STAGEDIR}/var/db/colord/icc
83
	@${FIND} ${STAGEDIR}/var/lib -type d | ${TAIL} -r | ${XARGS} ${RMDIR}
84
85
post-stage-DOCS-on:
86
	cd ${WRKSRC}; ${COPYTREE_SHARE} NEWS ${STAGEDIR}${DOCSDIR}
87
88
add-plist-docs: ${STAGE_COOKIE}
89
	cd ${STAGEDIR}; ${FIND} ${DOCSDIR:C@^/@@} -type f | ${SED} -e 's@^@/@' >> ${TMPPLIST}
90
	cd ${STAGEDIR}; ${FIND} ${PREFIX:C@^/@@}/share/gtk-doc/html -mindepth 2 -type f | ${SED} -e 's@^@/@' >> ${TMPPLIST}
81
91
82
.include <bsd.port.mk>
92
.include <bsd.port.mk>
(-)b/graphics/colord/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1516460331
1
TIMESTAMP = 1664763215
2
SHA256 (colord-1.3.5.tar.xz) = 2daa8ffd2a532d7094927cd1a4af595b8310cea66f7707edcf6ab743460feed2
2
SHA256 (colord-1.4.6.tar.xz) = 7407631a27bfe5d1b672e7ae42777001c105d860b7b7392283c8c6300de88e6f
3
SIZE (colord-1.3.5.tar.xz) = 1263488
3
SIZE (colord-1.4.6.tar.xz) = 1872528
(-)a/graphics/colord/files/patch-Makefile.in (-10 lines)
Removed Link Here
1
--- Makefile.in.orig	2016-12-26 19:58:23.811313000 +0100
2
+++ Makefile.in	2016-12-26 19:58:44.434394000 +0100
3
@@ -92,7 +92,6 @@
4
 @HAVE_DAEMON_TRUE@am__append_1 = \
5
 @HAVE_DAEMON_TRUE@	man						\
6
 @HAVE_DAEMON_TRUE@	policy						\
7
-@HAVE_DAEMON_TRUE@	rules						\
8
 @HAVE_DAEMON_TRUE@	src
9
 
10
 subdir = .
(-)a/graphics/colord/files/patch-configure (-11 lines)
Removed Link Here
1
--- configure.orig	2013-04-11 10:05:05.000000000 +0000
2
+++ configure	2013-04-11 10:06:38.000000000 +0000
3
@@ -17763,7 +17763,7 @@
4
 fi
5
 
6
 # per-machine directory
7
-CD_SYSTEM_PROFILES_DIR="\$(localstatedir)/lib/colord/icc"
8
+CD_SYSTEM_PROFILES_DIR="\$(localstatedir)/db/colord/icc"
9
 
10
 
11
 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"
(-)b/graphics/colord/files/patch-man_meson.build (+10 lines)
Added Link Here
1
--- man/meson.build.orig	2022-02-16 15:35:10 UTC
2
+++ man/meson.build
3
@@ -1,6 +1,6 @@
4
 xsltproc = find_program('xsltproc')
5
 
6
-stylesheet_url = 'http://docbook.sourceforge.net/release/xsl-ns/current/manpages/docbook.xsl'
7
+stylesheet_url = '@@DOCBOOK_MANPAGE_XSL@@'
8
 ret = run_command(xsltproc, '--nonet', stylesheet_url)
9
 if ret.returncode() != 0
10
   error('Cannot build man pages without docbook-xsl-ns')
(-)a/graphics/colord/files/patch-src_Makefile_in (-15 lines)
Removed Link Here
1
$OpenBSD: patch-src_Makefile_in,v 1.6 2013/03/31 19:41:23 ajacoutot Exp $
2
--- src/Makefile.in.orig	Thu Mar 28 11:16:10 2013
3
+++ src/Makefile.in	Sat Mar 30 16:25:48 2013
4
@@ -1774,11 +1774,6 @@ cd-resources.h: colord.gresource.xml
5
 		$(srcdir)/colord.gresource.xml
6
 
7
 install-data-hook:
8
-	if test -w $(DESTDIR)$(prefix)/; then \
9
-		mkdir -p $(DESTDIR)$(CD_SYSTEM_PROFILES_DIR); \
10
-		chown $(daemon_user) $(DESTDIR)$(localstatedir)/lib/colord; \
11
-		chmod 0755 $(DESTDIR)$(localstatedir)/lib/colord; \
12
-	fi
13
 
14
 -include $(top_srcdir)/git.mk
15
 
(-)b/graphics/colord/pkg-plist (-7 / +29 lines)
Lines 3-9 bin/cd-fix-profile Link Here
3
bin/cd-iccdump
3
bin/cd-iccdump
4
bin/cd-it8
4
bin/cd-it8
5
bin/colormgr
5
bin/colormgr
6
etc/dbus-1/system.d/org.freedesktop.ColorManager.conf
7
include/colord-1/colord-private.h
6
include/colord-1/colord-private.h
8
include/colord-1/colord-session/cd-session.h
7
include/colord-1/colord-session/cd-session.h
9
include/colord-1/colord.h
8
include/colord-1/colord.h
Lines 34-62 include/colord-1/colord/cd-sensor.h Link Here
34
include/colord-1/colord/cd-spectrum.h
33
include/colord-1/colord/cd-spectrum.h
35
include/colord-1/colord/cd-transform.h
34
include/colord-1/colord/cd-transform.h
36
include/colord-1/colord/cd-version.h
35
include/colord-1/colord/cd-version.h
37
lib/colord-sensors/libcolord_sensor_argyll.a
36
include/colord-1/colorhug/ch-common.h
38
lib/colord-sensors/libcolord_sensor_argyll.so
37
include/colord-1/colorhug/ch-device-queue.h
39
lib/colord-sensors/libcolord_sensor_dummy.a
38
include/colord-1/colorhug/ch-device.h
39
include/colord-1/colorhug/ch-hash.h
40
include/colord-1/colorhug/ch-inhx32.h
41
include/colord-1/colorhug/ch-math.h
42
include/colord-1/colorhug/ch-version.h
43
include/colord-1/colorhug/colorhug.h
44
%%SENSOR%%lib/colord-sensors/libcolord_sensor_argyll.a
45
%%SENSOR%%lib/colord-sensors/libcolord_sensor_argyll.so
46
lib/colord-plugins/libcolord_sensor_camera.so
47
lib/colord-plugins/libcolord_sensor_scanner.so
48
%%SANE%%lib/colord-plugins/libcolord_sensor_sane.so
49
lib/colord-sensors/libcolord_sensor_dtp94.so
50
lib/colord-sensors/libcolord_sensor_colorhug.so
40
lib/colord-sensors/libcolord_sensor_dummy.so
51
lib/colord-sensors/libcolord_sensor_dummy.so
52
lib/colord-sensors/libcolord_sensor_huey.so
41
lib/girepository-1.0/Colord-1.0.typelib
53
lib/girepository-1.0/Colord-1.0.typelib
42
lib/libcolord.a
54
lib/girepository-1.0/Colorhug-1.0.typelib
43
lib/libcolord.so
55
lib/libcolord.so
44
lib/libcolord.so.2
56
lib/libcolord.so.2
45
lib/libcolord.so.2.0.5
57
lib/libcolord.so.2.0.5
46
lib/libcolordcompat.a
58
lib/libcolorhug.so
59
lib/libcolorhug.so.2
60
lib/libcolorhug.so.2.0.5
47
lib/libcolordcompat.so
61
lib/libcolordcompat.so
48
lib/libcolordprivate.a
49
lib/libcolordprivate.so
62
lib/libcolordprivate.so
50
lib/libcolordprivate.so.2
63
lib/libcolordprivate.so.2
51
lib/libcolordprivate.so.2.0.5
64
lib/libcolordprivate.so.2.0.5
52
@comment lib/systemd/user/colord-session.service
65
@comment lib/systemd/user/colord-session.service
53
libdata/pkgconfig/colord.pc
66
libdata/pkgconfig/colord.pc
67
libdata/pkgconfig/colorhug.pc
54
libexec/colord
68
libexec/colord
55
libexec/colord-session
69
libexec/colord-session
70
%%SANE%%libexec/colord-sane
56
%%MANPAGES%%man/man1/cd-create-profile.1.gz
71
%%MANPAGES%%man/man1/cd-create-profile.1.gz
57
%%MANPAGES%%man/man1/cd-fix-profile.1.gz
72
%%MANPAGES%%man/man1/cd-fix-profile.1.gz
58
%%MANPAGES%%man/man1/cd-it8.1.gz
73
%%MANPAGES%%man/man1/cd-it8.1.gz
59
%%MANPAGES%%man/man1/colormgr.1.gz
74
%%MANPAGES%%man/man1/colormgr.1.gz
75
%%COMPLETION%%share/bash-completion/completions/colormgr
60
share/color/icc/colord/AdobeRGB1998.icc
76
share/color/icc/colord/AdobeRGB1998.icc
61
share/color/icc/colord/AppleRGB.icc
77
share/color/icc/colord/AppleRGB.icc
62
share/color/icc/colord/BestRGB.icc
78
share/color/icc/colord/BestRGB.icc
Lines 70-75 share/color/icc/colord/DonRGB4.icc Link Here
70
share/color/icc/colord/ECI-RGBv1.icc
86
share/color/icc/colord/ECI-RGBv1.icc
71
share/color/icc/colord/ECI-RGBv2.icc
87
share/color/icc/colord/ECI-RGBv2.icc
72
share/color/icc/colord/EktaSpacePS5.icc
88
share/color/icc/colord/EktaSpacePS5.icc
89
share/color/icc/colord/Rec709.icc
73
%%PPROFILES%%share/color/icc/colord/FOGRA27L_coated.icc
90
%%PPROFILES%%share/color/icc/colord/FOGRA27L_coated.icc
74
%%PPROFILES%%share/color/icc/colord/FOGRA28L_webcoated.icc
91
%%PPROFILES%%share/color/icc/colord/FOGRA28L_webcoated.icc
75
%%PPROFILES%%share/color/icc/colord/FOGRA29L_uncoated.icc
92
%%PPROFILES%%share/color/icc/colord/FOGRA29L_uncoated.icc
Lines 149-155 share/dbus-1/interfaces/org.freedesktop.ColorManager.Sensor.xml Link Here
149
share/dbus-1/interfaces/org.freedesktop.ColorManager.xml
166
share/dbus-1/interfaces/org.freedesktop.ColorManager.xml
150
share/dbus-1/services/org.freedesktop.ColorHelper.service
167
share/dbus-1/services/org.freedesktop.ColorHelper.service
151
share/dbus-1/system-services/org.freedesktop.ColorManager.service
168
share/dbus-1/system-services/org.freedesktop.ColorManager.service
169
share/dbus-1/system.d/org.freedesktop.ColorManager.conf
152
share/gir-1.0/Colord-1.0.gir
170
share/gir-1.0/Colord-1.0.gir
171
share/gir-1.0/Colorhug-1.0.gir
153
share/locale/as/LC_MESSAGES/colord.mo
172
share/locale/as/LC_MESSAGES/colord.mo
154
share/locale/bn_IN/LC_MESSAGES/colord.mo
173
share/locale/bn_IN/LC_MESSAGES/colord.mo
155
share/locale/ca/LC_MESSAGES/colord.mo
174
share/locale/ca/LC_MESSAGES/colord.mo
Lines 163-172 share/locale/es/LC_MESSAGES/colord.mo Link Here
163
share/locale/eu/LC_MESSAGES/colord.mo
182
share/locale/eu/LC_MESSAGES/colord.mo
164
share/locale/fi/LC_MESSAGES/colord.mo
183
share/locale/fi/LC_MESSAGES/colord.mo
165
share/locale/fr/LC_MESSAGES/colord.mo
184
share/locale/fr/LC_MESSAGES/colord.mo
185
share/locale/fur/LC_MESSAGES/colord.mo
166
share/locale/gl/LC_MESSAGES/colord.mo
186
share/locale/gl/LC_MESSAGES/colord.mo
167
share/locale/gu/LC_MESSAGES/colord.mo
187
share/locale/gu/LC_MESSAGES/colord.mo
168
share/locale/he/LC_MESSAGES/colord.mo
188
share/locale/he/LC_MESSAGES/colord.mo
169
share/locale/hi/LC_MESSAGES/colord.mo
189
share/locale/hi/LC_MESSAGES/colord.mo
190
share/locale/hr/LC_MESSAGES/colord.mo
170
share/locale/hu/LC_MESSAGES/colord.mo
191
share/locale/hu/LC_MESSAGES/colord.mo
171
share/locale/id/LC_MESSAGES/colord.mo
192
share/locale/id/LC_MESSAGES/colord.mo
172
share/locale/is/LC_MESSAGES/colord.mo
193
share/locale/is/LC_MESSAGES/colord.mo
Lines 202-206 share/locale/zh_CN/LC_MESSAGES/colord.mo Link Here
202
share/locale/zh_TW/LC_MESSAGES/colord.mo
223
share/locale/zh_TW/LC_MESSAGES/colord.mo
203
share/polkit-1/actions/org.freedesktop.color.policy
224
share/polkit-1/actions/org.freedesktop.color.policy
204
%%VALA%%share/vala/vapi/colord.vapi
225
%%VALA%%share/vala/vapi/colord.vapi
226
%%VALA%%share/vala/vapi/colord.deps
205
@dir(colord,colord,0755) /var/db/colord/icc
227
@dir(colord,colord,0755) /var/db/colord/icc
206
@dir(colord,colord,0755) /var/db/colord
228
@dir(colord,colord,0755) /var/db/colord

Return to bug 267239