Update to colord-0.1.22.

This commit is contained in:
ajacoutot 2012-08-04 15:00:16 +00:00
parent 977ddcba1f
commit 848712095b
11 changed files with 31 additions and 78 deletions

View File

@ -1,20 +1,13 @@
# $OpenBSD: Makefile,v 1.14 2012/05/28 16:38:35 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.15 2012/08/04 15:00:16 ajacoutot Exp $
COMMENT-main= device color profile management daemon
COMMENT-gtk= GTK integration for libcolord
COMMENT= device color profile management daemon
V= 0.1.21
DISTNAME= colord-${V}
DISTNAME= colord-0.1.22
EXTRACT_SUFX= .tar.xz
PKGNAME-main= ${DISTNAME}
PKGNAME-gtk= colord-gtk-${V}
REVISION-main= 1
SHARED_LIBS += colord 0.1 # 1.11
SHARED_LIBS += colord-gtk 0.0 # 1.11
CATEGORIES= graphics x11
CATEGORIES= graphics print
HOMEPAGE= http://www.freedesktop.org/software/colord/
@ -26,19 +19,11 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB += ffi gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
WANTLIB += lcms2 m pcre z
WANTLIB-main += ${WANTLIB}
WANTLIB-main += c polkit-gobject-1 pthread sqlite3
WANTLIB += c ffi gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
WANTLIB += lcms2 m pcre polkit-gobject-1 pthread sqlite3 z
MASTER_SITES= http://www.freedesktop.org/software/colord/releases/
PSEUDO_FLAVORS= no_gtk bootstrap
FLAVOR?=
MULTI_PACKAGES= -main -gtk
MODULES= devel/gettext \
textproc/intltool
@ -46,7 +31,7 @@ BUILD_DEPENDS= lang/vala \
devel/gobject-introspection \
textproc/docbook2x
LIB_DEPENDS-main=sysutils/polkit \
LIB_DEPENDS= sysutils/polkit \
graphics/lcms2
# technically not needed, however it is handy to have some profiles to
@ -70,22 +55,6 @@ CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
FAKE_FLAGS= sysconfdir="${PREFIX}/share/examples/colord"
.include <bsd.port.arch.mk>
.if ${BUILD_PACKAGES:M-gtk}
WANTLIB-gtk += ${WANTLIB}
WANTLIB-gtk += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
WANTLIB-gtk += Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 cairo cairo-gobject
WANTLIB-gtk += colord drm expat fontconfig freetype gdk-3 gdk_pixbuf-2.0
WANTLIB-gtk += gtk-3 pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1
WANTLIB-gtk += png pthread-stubs stdc++ xcb xcb-render xcb-shm
LIB_DEPENDS-gtk=graphics/colord,-main \
x11/gtk+3
CONFIGURE_ARGS += --enable-gtk
.else
CONFIGURE_ARGS += --disable-gtk
.endif
pre-configure:
${SUBST_CMD} ${WRKSRC}/etc/colord.conf.in \
${WRKSRC}/src/{cd-profile-store.c,cd-profile.c}
@ -97,6 +66,6 @@ pre-configure:
${WRKSRC}/configure
post-install:
rm -rf ${WRKINST}/lib
rm -r ${WRKINST}/lib
.include <bsd.port.mk>

View File

@ -1,5 +1,2 @@
MD5 (colord-0.1.21.tar.xz) = gCisDQeO+yWEYC55Md0Gsg==
RMD160 (colord-0.1.21.tar.xz) = sbCrwB7LR4ANAVlktNAaSNMf/N0=
SHA1 (colord-0.1.21.tar.xz) = 2/mBvuxw6BxFz0axUPQm/B61bCQ=
SHA256 (colord-0.1.21.tar.xz) = NguJaw0qNZcKDNQuRI6jJ9eJ8wn/lQIhkMTTO7iwLDA=
SIZE (colord-0.1.21.tar.xz) = 553424
SHA256 (colord-0.1.22.tar.xz) = 98SdjDWmAkVLBo1mxjp5VtwiEXWXXUSJ1kue7sUQavo=
SIZE (colord-0.1.22.tar.xz) = 546956

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-configure,v 1.4 2012/05/28 08:45:38 ajacoutot Exp $
$OpenBSD: patch-configure,v 1.5 2012/08/04 15:00:16 ajacoutot Exp $
Fix DATADIRNAME: see LOCALBASE/share/aclocal/glib-gettext.m4.
/var/lib -> /var/db
--- configure.orig Tue May 22 13:42:11 2012
+++ configure Mon May 28 10:09:33 2012
@@ -13565,6 +13565,9 @@ else
--- configure.orig Tue Jun 26 12:52:59 2012
+++ configure Sat Jul 28 11:35:56 2012
@@ -13555,6 +13555,9 @@ else
fi
;;
@ -16,12 +16,12 @@ Fix DATADIRNAME: see LOCALBASE/share/aclocal/glib-gettext.m4.
*)
DATADIRNAME=lib
;;
@@ -16912,7 +16915,7 @@ $as_echo "#define HAVE_GTK 1" >>confdefs.h
fi
@@ -16806,7 +16809,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/colord-sane/Makefile contrib/colord-sane/org.freedesktop.colord-sane.conf examples/Makefile man/Makefile doc/Makefile doc/api/Makefile doc/api/dbus/Makefile doc/api/version.xml data/Makefile data/org.freedesktop.ColorManager.conf data/tests/Makefile policy/Makefile rules/Makefile rules/69-cd-sensors.rules po/Makefile.in src/Makefile src/sensors/Makefile client/Makefile libcolord/cd-version.h libcolord/colord.pc libcolord/Makefile libcolord-gtk/colord-gtk.pc libcolord-gtk/Makefile"
ac_config_files="$ac_config_files Makefile etc/Makefile contrib/Makefile contrib/colord-sane/Makefile contrib/colord-sane/org.freedesktop.colord-sane.conf examples/Makefile man/Makefile doc/Makefile doc/api/Makefile doc/api/dbus/Makefile doc/api/version.xml data/Makefile data/org.freedesktop.ColorManager.conf data/tests/Makefile policy/Makefile rules/Makefile rules/69-cd-sensors.rules po/Makefile.in src/Makefile src/sensors/Makefile client/Makefile libcolord/cd-version.h libcolord/colord.pc libcolord/Makefile"

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_Makefile_in,v 1.2 2012/05/28 08:45:38 ajacoutot Exp $
--- src/Makefile.in.orig Tue May 22 13:42:11 2012
+++ src/Makefile.in Mon May 28 10:09:33 2012
@@ -1418,11 +1418,6 @@ uninstall-am: uninstall-dist_introspectionDATA \
$OpenBSD: patch-src_Makefile_in,v 1.3 2012/08/04 15:00:16 ajacoutot Exp $
--- src/Makefile.in.orig Tue Jun 26 12:52:59 2012
+++ src/Makefile.in Sat Jul 28 11:35:57 2012
@@ -1416,11 +1416,6 @@ uninstall-am: uninstall-dist_introspectionDATA \
install-data-hook:

View File

@ -1,10 +1,10 @@
$OpenBSD: patch-src_cd-profile-store_c,v 1.2 2012/03/19 08:59:00 ajacoutot Exp $
$OpenBSD: patch-src_cd-profile-store_c,v 1.3 2012/08/04 15:00:16 ajacoutot Exp $
/var/lib -> /var/db
--- src/cd-profile-store.c.orig Sat Mar 10 09:43:32 2012
+++ src/cd-profile-store.c Sun Mar 18 20:24:56 2012
@@ -193,8 +193,8 @@ cd_profile_store_add_profile (CdProfileStore *profile_
--- src/cd-profile-store.c.orig Tue Jun 26 12:56:11 2012
+++ src/cd-profile-store.c Sat Jul 28 11:35:57 2012
@@ -214,8 +214,8 @@ cd_profile_store_add_profile (CdProfileStore *profile_
/* is system wide? */
profile = cd_profile_new ();
@ -15,7 +15,7 @@ $OpenBSD: patch-src_cd-profile-store_c,v 1.2 2012/03/19 08:59:00 ajacoutot Exp $
cd_profile_set_is_system_wide (profile, TRUE);
/* parse the profile name */
@@ -565,7 +565,7 @@ cd_profile_store_search (CdProfileStore *profile_store
@@ -588,7 +588,7 @@ cd_profile_store_search (CdProfileStore *profile_store
if (ret)
success = TRUE;
ret = cd_profile_store_search_path (profile_store,

View File

@ -1,2 +0,0 @@
This package contains extra functionality for colord that can be used
when running GTK applications.

View File

@ -1,3 +1,3 @@
@comment $OpenBSD: PFRAG.shared-main,v 1.1 2012/05/28 15:52:26 ajacoutot Exp $
@comment $OpenBSD: PFRAG.shared,v 1.6 2012/08/04 15:00:16 ajacoutot Exp $
lib/colord-sensors/libcolord_sensor_dummy.so
@lib lib/libcolord.so.${LIBcolord_VERSION}

View File

@ -1,2 +0,0 @@
@comment $OpenBSD: PFRAG.shared-gtk,v 1.1 2012/05/28 15:52:26 ajacoutot Exp $
@lib lib/libcolord-gtk.so.${LIBcolord-gtk_VERSION}

View File

@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST-main,v 1.1 2012/05/28 15:52:26 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.9 2012/08/04 15:00:16 ajacoutot Exp $
@pkgpath graphics/colord
@pkgpath graphics/colord,-main
@newgroup _colord:694
@newuser _colord:694:_colord:daemon:colord Daemon:/nonexistent:/sbin/nologin
@extraunexec rm -f /var/db/colord/mapping.db
@ -39,6 +40,8 @@ lib/pkgconfig/colord.pc
@man man/man1/cd-create-profile.1
@man man/man1/cd-fix-profile.1
@man man/man1/colormgr.1
share/color/
share/color/icc/
share/color/icc/colord/
share/color/icc/colord/crayons.icc
share/color/icc/colord/x11-colors.icc

View File

@ -1,12 +0,0 @@
@comment $OpenBSD: PLIST-gtk,v 1.1 2012/05/28 15:52:26 ajacoutot Exp $
%%SHARED%%
include/colord-1/colord-gtk/
include/colord-1/colord-gtk.h
include/colord-1/colord-gtk/cd-sample-window.h
include/colord-1/colord-gtk/cd-window-sync.h
include/colord-1/colord-gtk/cd-window.h
lib/girepository-1.0/ColordGtk-1.0.typelib
lib/libcolord-gtk.a
lib/libcolord-gtk.la
lib/pkgconfig/colord-gtk.pc
share/gir-1.0/ColordGtk-1.0.gir