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

Enable colord.

Browse Source
This commit is contained in:
ajacoutot 2011-11-02 16:42:21 +00:00
parent f5f5630dcb
commit 0d2f894947
4 changed files with 21 additions and 312 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
x11/gnome/settings-daemon/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.63 2011/10/29 08:12:33 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.64 2011/11/02 16:42:21 ajacoutot Exp $
SHARED_ONLY= Yes
@ -6,7 +6,7 @@ COMMENT= GNOME settings daemon
GNOME_PROJECT= gnome-settings-daemon
GNOME_VERSION= 3.2.1
REVISION= 0
REVISION= 1
# GPLv3
PERMIT_PACKAGE_CDROM= Yes
@ -14,19 +14,19 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB += GL X11 Xau Xcomposite Xcursor json
WANTLIB += Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender
WANTLIB += Xxf86vm asn1 atk-1.0 c cairo cairo-gobject
WANTLIB += canberra canberra-gtk3 crypto cups dbus-1 dbus-glib-1
WANTLIB += drm execinfo expat ffi fontconfig freetype gconf-2
WANTLIB += gdbm gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
WANTLIB += gnome-desktop-3 gnomekbd gnomekbdui gobject-2.0 gssapi
WANTLIB += gthread-2.0 gtk-3 krb5 ltdl m notify nspr4 nss3
WANTLIB += nssutil3 ogg pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pcre pixman-1 plc4 plds4 png polkit-gobject-1 pthread
WANTLIB += pthread-stubs pulse pulse-mainloop-glib smime3 sndfile
WANTLIB += softokn3 sqlite3 ssl ssl3 vorbis vorbisfile xcb xcb-render
WANTLIB += xcb-shm xkbfile xklavier xml2 z upower-glib
WANTLIB += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
WANTLIB += Xi Xinerama Xrandr Xrender Xxf86vm asn1 atk-1.0 c cairo
WANTLIB += cairo-gobject canberra canberra-gtk3 colord crypto
WANTLIB += cups dbus-1 dbus-glib-1 drm execinfo expat ffi fontconfig
WANTLIB += freetype gconf-2 gdbm gdk-3 gdk_pixbuf-2.0 gio-2.0
WANTLIB += glib-2.0 gmodule-2.0 gnome-desktop-3 gnomekbd gnomekbdui
WANTLIB += gobject-2.0 gssapi gthread-2.0 gtk-3 json krb5 lcms2
WANTLIB += ltdl m notify nspr4 nss3 nssutil3 ogg pango-1.0 pangocairo-1.0
WANTLIB += pangoft2-1.0 pcre pixman-1 plc4 plds4 png polkit-gobject-1
WANTLIB += pthread pthread-stubs pulse pulse-mainloop-glib smime3
WANTLIB += sndfile softokn3 sqlite3 ssl ssl3 stdc++ upower-glib
WANTLIB += vorbis vorbisfile xcb xcb-render xcb-shm xkbfile xklavier
WANTLIB += xml2 z
MODULES= devel/gettext \
x11/gnome
@ -39,7 +39,8 @@ LIB_DEPENDS= devel/libnotify>=0.7.2 \
print/cups \
audio/pulseaudio \
audio/libcanberra,-gtk3 \
sysutils/upower
sysutils/upower \
graphics/colord
BUILD_DEPENDS= devel/gsettings-desktop-schemas
RUN_DEPENDS= devel/gsettings-desktop-schemas

280
x11/gnome/settings-daemon/patches/patch-configure
View File

@ -1,280 +0,0 @@
$OpenBSD: patch-configure,v 1.5 2011/09/27 15:14:27 ajacoutot Exp $
No colord on OpenBSD.
--- configure.orig Mon Sep 26 17:50:30 2011
+++ configure Tue Sep 27 17:12:16 2011
@@ -17995,98 +17995,7 @@ $as_echo "yes" >&6; }
fi
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for COLORD" >&5
-$as_echo_n "checking for COLORD... " >&6; }
-if test -n "$COLORD_CFLAGS"; then
- pkg_cv_COLORD_CFLAGS="$COLORD_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"colord >= 0.1.12\""; } >&5
- ($PKG_CONFIG --exists --print-errors "colord >= 0.1.12") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_COLORD_CFLAGS=`$PKG_CONFIG --cflags "colord >= 0.1.12" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-if test -n "$COLORD_LIBS"; then
- pkg_cv_COLORD_LIBS="$COLORD_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"colord >= 0.1.12\""; } >&5
- ($PKG_CONFIG --exists --print-errors "colord >= 0.1.12") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_COLORD_LIBS=`$PKG_CONFIG --libs "colord >= 0.1.12" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
- COLORD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "colord >= 0.1.12" 2>&1`
- else
- COLORD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "colord >= 0.1.12" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$COLORD_PKG_ERRORS" >&5
-
- as_fn_error $? "Package requirements (colord >= 0.1.12) were not met:
-
-$COLORD_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables COLORD_CFLAGS
-and COLORD_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
-elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables COLORD_CFLAGS
-and COLORD_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-else
- COLORD_CFLAGS=$pkg_cv_COLORD_CFLAGS
- COLORD_LIBS=$pkg_cv_COLORD_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
-
-
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBCANBERRA" >&5
$as_echo_n "checking for LIBCANBERRA... " >&6; }
@@ -18169,174 +18078,6 @@ else
fi
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LCMS" >&5
-$as_echo_n "checking for LCMS... " >&6; }
-
-if test -n "$LCMS_CFLAGS"; then
- pkg_cv_LCMS_CFLAGS="$LCMS_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lcms2 >= 2.2\""; } >&5
- ($PKG_CONFIG --exists --print-errors "lcms2 >= 2.2") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_LCMS_CFLAGS=`$PKG_CONFIG --cflags "lcms2 >= 2.2" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-if test -n "$LCMS_LIBS"; then
- pkg_cv_LCMS_LIBS="$LCMS_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lcms2 >= 2.2\""; } >&5
- ($PKG_CONFIG --exists --print-errors "lcms2 >= 2.2") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_LCMS_LIBS=`$PKG_CONFIG --libs "lcms2 >= 2.2" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
- LCMS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lcms2 >= 2.2" 2>&1`
- else
- LCMS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lcms2 >= 2.2" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$LCMS_PKG_ERRORS" >&5
-
- have_new_lcms=no
-elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- have_new_lcms=no
-else
- LCMS_CFLAGS=$pkg_cv_LCMS_CFLAGS
- LCMS_LIBS=$pkg_cv_LCMS_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- have_new_lcms=yes
-fi
-if test x$have_new_lcms = xyes; then
-
-$as_echo "#define HAVE_NEW_LCMS 1" >>confdefs.h
-
-else
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LCMS" >&5
-$as_echo_n "checking for LCMS... " >&6; }
-
-if test -n "$LCMS_CFLAGS"; then
- pkg_cv_LCMS_CFLAGS="$LCMS_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lcms2\""; } >&5
- ($PKG_CONFIG --exists --print-errors "lcms2") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_LCMS_CFLAGS=`$PKG_CONFIG --cflags "lcms2" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-if test -n "$LCMS_LIBS"; then
- pkg_cv_LCMS_LIBS="$LCMS_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lcms2\""; } >&5
- ($PKG_CONFIG --exists --print-errors "lcms2") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_LCMS_LIBS=`$PKG_CONFIG --libs "lcms2" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
- LCMS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lcms2" 2>&1`
- else
- LCMS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lcms2" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$LCMS_PKG_ERRORS" >&5
-
- as_fn_error $? "Package requirements (lcms2) were not met:
-
-$LCMS_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables LCMS_CFLAGS
-and LCMS_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
-elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables LCMS_CFLAGS
-and LCMS_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-else
- LCMS_CFLAGS=$pkg_cv_LCMS_CFLAGS
- LCMS_LIBS=$pkg_cv_LCMS_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
-fi

15
x11/gnome/settings-daemon/patches/patch-plugins_Makefile_in
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-plugins_Makefile_in,v 1.1 2011/09/27 09:35:06 ajacoutot Exp $
No colord on OpenBSD.
--- plugins/Makefile.in.orig Tue Sep 27 10:53:25 2011
+++ plugins/Makefile.in Tue Sep 27 10:53:31 2011
@@ -315,7 +315,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
NULL =
enabled_plugins = a11y-keyboard a11y-settings automount background \
- clipboard color cursor datetime dummy power housekeeping \
+ clipboard cursor datetime dummy power housekeeping \
keybindings keyboard media-keys mouse sound wacom xrandr \
xsettings $(NULL) $(am__append_1) $(am__append_3) \
$(am__append_5) $(am__append_7) $(am__append_9)

5
x11/gnome/settings-daemon/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.21 2011/09/27 09:35:06 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.22 2011/11/02 16:42:22 ajacoutot Exp $
include/gnome-settings-daemon-3.0/
include/gnome-settings-daemon-3.0/gnome-settings-daemon/
include/gnome-settings-daemon-3.0/gnome-settings-daemon/gnome-settings-plugin.h
@ -7,6 +7,7 @@ lib/gnome-settings-daemon-3.0/a11y-keyboard.gnome-settings-plugin
lib/gnome-settings-daemon-3.0/a11y-settings.gnome-settings-plugin
lib/gnome-settings-daemon-3.0/background.gnome-settings-plugin
lib/gnome-settings-daemon-3.0/clipboard.gnome-settings-plugin
lib/gnome-settings-daemon-3.0/color.gnome-settings-plugin
lib/gnome-settings-daemon-3.0/cursor.gnome-settings-plugin
lib/gnome-settings-daemon-3.0/housekeeping.gnome-settings-plugin
lib/gnome-settings-daemon-3.0/keybindings.gnome-settings-plugin
@ -19,6 +20,8 @@ lib/gnome-settings-daemon-3.0/liba11y-settings.so
lib/gnome-settings-daemon-3.0/libbackground.so
@comment lib/gnome-settings-daemon-3.0/libclipboard.la
lib/gnome-settings-daemon-3.0/libclipboard.so
@comment lib/gnome-settings-daemon-3.0/libcolor.la
lib/gnome-settings-daemon-3.0/libcolor.so
@comment lib/gnome-settings-daemon-3.0/libcursor.la
lib/gnome-settings-daemon-3.0/libcursor.so
@comment lib/gnome-settings-daemon-3.0/libhousekeeping.la