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

Update to gnome-settings-daemon-3.2.0.

Browse Source
This commit is contained in:
ajacoutot 2011-09-27 09:35:06 +00:00
parent 9068400749
commit 1217a20982
7 changed files with 185 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.54 2011/09/26 13:23:15 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.55 2011/09/27 09:35:06 ajacoutot Exp $
SHARED_ONLY= Yes
COMMENT= GNOME settings daemon
GNOME_PROJECT= gnome-settings-daemon
GNOME_VERSION= 3.0.3
REVISION= 3
GNOME_VERSION= 3.2.0
# GPLv3
PERMIT_PACKAGE_CDROM= Yes
@ -16,7 +15,7 @@ PERMIT_DISTFILES_FTP= Yes
WANTLIB += GL ICE ORBit-2 SM X11 X11-xcb Xau Xcomposite Xcursor
WANTLIB += Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender
WANTLIB += Xtst Xxf86misc Xxf86vm asn1 atk-1.0 c cairo cairo-gobject
WANTLIB += Xtst 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
@ -26,7 +25,7 @@ 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
WANTLIB += xcb-shm xkbfile xklavier xml2 z upower-glib
MODULES= devel/gettext \
x11/gnome
@ -38,7 +37,8 @@ LIB_DEPENDS= devel/libnotify>=0.7.2 \
security/nss \
print/cups \
audio/pulseaudio \
audio/libcanberra,-gtk3
audio/libcanberra,-gtk3 \
sysutils/upower
BUILD_DEPENDS= devel/gsettings-desktop-schemas
RUN_DEPENDS= devel/gsettings-desktop-schemas
@ -55,7 +55,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
CONFIGURE_ARGS= --disable-static \
--disable-packagekit \
--disable-gudev
--disable-gudev \
--with-pnpids=${LOCALBASE}/share/libgnome-desktop-3.0/pnp.ids
FAKE_FLAGS+= desktopdir=${PREFIX}/share/examples/gnome-settings-daemon/xdg/autostart \
sysconfdir=${PREFIX}/share/examples/gnome-settings-daemon \

10
x11/gnome/settings-daemon/distinfo
View File

@ -1,5 +1,5 @@
MD5 (gnome/gnome-settings-daemon-3.0.3.tar.xz) = +A0g0OzYZ1rUExZmiN7KMQ==
RMD160 (gnome/gnome-settings-daemon-3.0.3.tar.xz) = xvETafm+cS13fSPSHJ7R5QqLv8Y=
SHA1 (gnome/gnome-settings-daemon-3.0.3.tar.xz) = pfR+rMw/54NaOuG4Y4B+WALw814=
SHA256 (gnome/gnome-settings-daemon-3.0.3.tar.xz) = nG47tcSzqYq4OpF7e+FVeNEYMTMPfy3u7Pu2JVaOPgM=
SIZE (gnome/gnome-settings-daemon-3.0.3.tar.xz) = 1309172
MD5 (gnome/gnome-settings-daemon-3.2.0.tar.xz) = QYyIBDBSnJHgUDwiyNuHdA==
RMD160 (gnome/gnome-settings-daemon-3.2.0.tar.xz) = TJbIwhzyhOrKJuuSfiK5y9uQoI8=
SHA1 (gnome/gnome-settings-daemon-3.2.0.tar.xz) = 7ocjXbHYfTrWNN9ZhdEy9nWnALE=
SHA256 (gnome/gnome-settings-daemon-3.2.0.tar.xz) = qFJCzmC5ybs/utEk7gZDCkCPOfox0tTqKdwXnbckRHs=
SIZE (gnome/gnome-settings-daemon-3.2.0.tar.xz) = 1441240

104
x11/gnome/settings-daemon/patches/patch-configure Normal file
View File

@ -0,0 +1,104 @@
$OpenBSD: patch-configure,v 1.4 2011/09/27 09:35:06 ajacoutot Exp $
No colord on OpenBSD.
--- configure.orig Mon Sep 26 18:17:54 2011
+++ configure Mon Sep 26 18:18:18 2011
@@ -17995,97 +17995,6 @@ $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

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

@ -0,0 +1,15 @@
$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)

24
x11/gnome/settings-daemon/patches/patch-plugins_power_gsd-backlight-helper_c Normal file
View File

@ -0,0 +1,24 @@
$OpenBSD: patch-plugins_power_gsd-backlight-helper_c,v 1.1 2011/09/27 09:35:06 ajacoutot Exp $
XXX make gnome-power-backlight-helper do nothing and return 0.
--- plugins/power/gsd-backlight-helper.c.orig Wed Sep 7 12:29:58 2011
+++ plugins/power/gsd-backlight-helper.c Tue Sep 27 10:56:35 2011
@@ -132,6 +132,7 @@ out:
int
main (int argc, char *argv[])
{
+#ifndef __OpenBSD__
GOptionContext *context;
gint uid;
gint euid;
@@ -267,5 +268,9 @@ out:
g_free (filename_file);
g_free (contents);
return retval;
+#else
+ g_print ("This program does nothing on OpenBSD (no support for sysfs(2)).\n");
+ return 0;
+#endif
}

16
x11/gnome/settings-daemon/patches/patch-plugins_print-notifications_gsd-printer_c Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-plugins_print-notifications_gsd-printer_c,v 1.1 2011/09/27 09:35:06 ajacoutot Exp $
Fix build if some locale defines are missing.
--- plugins/print-notifications/gsd-printer.c.orig Tue Sep 13 10:52:26 2011
+++ plugins/print-notifications/gsd-printer.c Tue Sep 27 11:28:16 2011
@@ -771,7 +771,9 @@ set_default_paper_size (const gchar *printer_name,
}
/* Set default PaperSize according to the locale */
+#ifdef LC_PAPER
locale = setlocale (LC_PAPER, NULL);
+#endif
if (!locale)
locale = setlocale (LC_MESSAGES, NULL);

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

@ -1,14 +1,13 @@
@comment $OpenBSD: PLIST,v 1.20 2011/09/26 10:53:42 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.21 2011/09/27 09:35:06 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
include/gnome-settings-daemon-3.0/gnome-settings-daemon/gsd-enums.h
lib/gnome-settings-daemon-3.0/
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/automount.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/cursor.gnome-settings-plugin
lib/gnome-settings-daemon-3.0/housekeeping.gnome-settings-plugin
lib/gnome-settings-daemon-3.0/keybindings.gnome-settings-plugin
lib/gnome-settings-daemon-3.0/keyboard.gnome-settings-plugin
@ -16,12 +15,12 @@ lib/gnome-settings-daemon-3.0/keyboard.gnome-settings-plugin
lib/gnome-settings-daemon-3.0/liba11y-keyboard.so
@comment lib/gnome-settings-daemon-3.0/liba11y-settings.la
lib/gnome-settings-daemon-3.0/liba11y-settings.so
@comment lib/gnome-settings-daemon-3.0/libautomount.la
lib/gnome-settings-daemon-3.0/libautomount.so
@comment lib/gnome-settings-daemon-3.0/libbackground.la
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/libcursor.la
lib/gnome-settings-daemon-3.0/libcursor.so
@comment lib/gnome-settings-daemon-3.0/libhousekeeping.la
lib/gnome-settings-daemon-3.0/libhousekeeping.so
@comment lib/gnome-settings-daemon-3.0/libkeybindings.la
@ -32,6 +31,8 @@ lib/gnome-settings-daemon-3.0/libkeyboard.so
lib/gnome-settings-daemon-3.0/libmedia-keys.so
@comment lib/gnome-settings-daemon-3.0/libmouse.la
lib/gnome-settings-daemon-3.0/libmouse.so
@comment lib/gnome-settings-daemon-3.0/libpower.la
lib/gnome-settings-daemon-3.0/libpower.so
@comment lib/gnome-settings-daemon-3.0/libprint-notifications.la
lib/gnome-settings-daemon-3.0/libprint-notifications.so
@comment lib/gnome-settings-daemon-3.0/libsmartcard.la
@ -46,6 +47,7 @@ lib/gnome-settings-daemon-3.0/libxrandr.so
lib/gnome-settings-daemon-3.0/libxsettings.so
lib/gnome-settings-daemon-3.0/media-keys.gnome-settings-plugin
lib/gnome-settings-daemon-3.0/mouse.gnome-settings-plugin
lib/gnome-settings-daemon-3.0/power.gnome-settings-plugin
lib/gnome-settings-daemon-3.0/print-notifications.gnome-settings-plugin
lib/gnome-settings-daemon-3.0/smartcard.gnome-settings-plugin
lib/gnome-settings-daemon-3.0/sound.gnome-settings-plugin
@ -53,7 +55,9 @@ lib/gnome-settings-daemon-3.0/wacom.gnome-settings-plugin
lib/gnome-settings-daemon-3.0/xrandr.gnome-settings-plugin
lib/gnome-settings-daemon-3.0/xsettings.gnome-settings-plugin
lib/pkgconfig/gnome-settings-daemon.pc
@bin libexec/gnome-fallback-mount-helper
@bin libexec/gnome-settings-daemon
@bin libexec/gsd-backlight-helper
@bin libexec/gsd-datetime-mechanism
@bin libexec/gsd-locate-pointer
@bin libexec/gsd-printer
@ -76,11 +80,14 @@ share/examples/gnome-settings-daemon/xdg/
@sample ${SYSCONFDIR}/xdg/
share/examples/gnome-settings-daemon/xdg/autostart/
@sample ${SYSCONFDIR}/xdg/autostart/
share/examples/gnome-settings-daemon/xdg/autostart/gnome-fallback-mount-helper.desktop
@sample ${SYSCONFDIR}/xdg/autostart/gnome-fallback-mount-helper.desktop
share/examples/gnome-settings-daemon/xdg/autostart/gnome-settings-daemon.desktop
@sample ${SYSCONFDIR}/xdg/autostart/gnome-settings-daemon.desktop
share/glib-2.0/schemas/org.gnome.settings-daemon.enums.xml
share/glib-2.0/schemas/org.gnome.settings-daemon.peripherals.gschema.xml
share/glib-2.0/schemas/org.gnome.settings-daemon.peripherals.wacom.gschema.xml
share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.color.gschema.xml
share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.gschema.xml
share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.housekeeping.gschema.xml
share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.keyboard.gschema.xml
@ -92,7 +99,6 @@ share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.xsettings.gschema.xml
share/gnome-settings-daemon/
share/gnome-settings-daemon-3.0/
share/gnome-settings-daemon-3.0/input-device-example.sh
share/gnome-settings-daemon/acme.ui
share/gnome-settings-daemon/gsd-a11y-preferences-dialog.ui
share/gnome-settings-daemon/icons/
share/gnome-settings-daemon/icons/hicolor/
@ -104,20 +110,10 @@ share/gnome-settings-daemon/icons/hicolor/64x64/devices/kbd-numlock-off.png
share/gnome-settings-daemon/icons/hicolor/64x64/devices/kbd-numlock-on.png
share/gnome-settings-daemon/icons/hicolor/64x64/devices/kbd-scrolllock-off.png
share/gnome-settings-daemon/icons/hicolor/64x64/devices/kbd-scrolllock-on.png
share/icons/hicolor/16x16/actions/touchpad-disabled.png
share/icons/hicolor/16x16/actions/touchpad-enabled.png
share/icons/hicolor/16x16/apps/gsd-xrandr.png
share/icons/hicolor/22x22/actions/touchpad-disabled.png
share/icons/hicolor/22x22/actions/touchpad-enabled.png
share/icons/hicolor/22x22/apps/gsd-xrandr.png
share/icons/hicolor/24x24/actions/touchpad-disabled.png
share/icons/hicolor/24x24/actions/touchpad-enabled.png
share/icons/hicolor/24x24/apps/gsd-xrandr.png
share/icons/hicolor/32x32/actions/touchpad-disabled.png
share/icons/hicolor/32x32/actions/touchpad-enabled.png
share/icons/hicolor/32x32/apps/gsd-xrandr.png
share/icons/hicolor/scalable/actions/touchpad-disabled.svg
share/icons/hicolor/scalable/actions/touchpad-enabled.svg
share/icons/hicolor/scalable/apps/gsd-xrandr.svg
share/locale/af/LC_MESSAGES/gnome-settings-daemon.mo
share/locale/am/LC_MESSAGES/gnome-settings-daemon.mo
@ -210,6 +206,7 @@ share/locale/zh_CN/LC_MESSAGES/gnome-settings-daemon.mo
share/locale/zh_HK/LC_MESSAGES/gnome-settings-daemon.mo
share/locale/zh_TW/LC_MESSAGES/gnome-settings-daemon.mo
share/locale/zu/LC_MESSAGES/gnome-settings-daemon.mo
share/polkit-1/actions/org.gnome.settings-daemon.plugins.power.policy
share/polkit-1/actions/org.gnome.settingsdaemon.datetimemechanism.policy
@exec %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null
@unexec-delete %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null