[109399] users/devans/GNOME-3/stable/dports/gnome/gnome-settings-daemon

devans at macports.org devans at macports.org
Wed Aug 14 15:40:03 PDT 2013


Revision: 109399
          https://trac.macports.org/changeset/109399
Author:   devans at macports.org
Date:     2013-08-14 15:40:03 -0700 (Wed, 14 Aug 2013)
Log Message:
-----------
devans/GNOME-3/stable/dports: update gnome-settings-daemon to version 3.8.4.

Modified Paths:
--------------
    users/devans/GNOME-3/stable/dports/gnome/gnome-settings-daemon/Portfile

Added Paths:
-----------
    users/devans/GNOME-3/stable/dports/gnome/gnome-settings-daemon/files/
    users/devans/GNOME-3/stable/dports/gnome/gnome-settings-daemon/files/patch-plugins.diff

Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-settings-daemon/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-settings-daemon/Portfile	2013-08-14 22:38:24 UTC (rev 109398)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-settings-daemon/Portfile	2013-08-14 22:40:03 UTC (rev 109399)
@@ -4,11 +4,10 @@
 PortSystem      1.0
 
 name            gnome-settings-daemon
-version         2.32.1
-revision        1
+version         3.8.4
 license         GPL-2 LGPL-2.1
 set branch      [join [lrange [split ${version} .] 0 1] .]
-description     Gnome 2 settings daemon.
+description     Gnome 3 settings daemon.
 long_description ${description}
 maintainers     devans openmaintainer
 categories      gnome
@@ -16,39 +15,63 @@
 homepage        http://www.gnome.org/
 master_sites    gnome:sources/${name}/${branch}/
 
-use_bzip2       yes
+use_xz          yes
 
-checksums       sha256  0074b3fec3ad6e3ab91a05dc20906b06101ea8bca0cd2caf394a5cc141b05e86 \
-                rmd160  71aef9419eeca5f9fa59bb55990327c307f9ca31
+checksums       rmd160  13e06ef143fd22961d06984144a7c47101a04920 \
+                sha256  03ad56a8d517faf0754efcf2e7e26257e9ddbe32ef2931f3579138659cc178bc
 
-depends_build   port:gnome-doc-utils \
+depends_build   port:pkgconfig \
                 port:intltool \
-                port:pkgconfig
+                port:docbook-xsl \
+                port:docbook-xml
 
-depends_lib     port:gtk2 \
-                port:gconf \
+depends_lib     port:gtk3 \
+                port:gsettings-desktop-schemas \
                 port:gnome-desktop \
-                port:libgnomekbd \
+                port:lcms2 \
                 port:libnotify \
                 port:fontconfig \
-                port:policykit
+                port:libcanberra \
+                port:pulseaudio \
+                port:upower \
+                port:xorg-kbproto \
+                port:xorg-libXi \
+                port:xorg-libXtst \
+                port:xorg-libXfixes \
+                port:xorg-libXrandr \
+                port:xorg-libxkbfile
 
-depends_run     port:xmodmap
+#
+# the following plugins are disabled by patch
+#
+# color (requires colord)
+# power (requires X server support for Xtst extension and segfaults when it doesn't find it)
+# xrandr (works but tries to take over control of display causing problems with Mac OS X)
+#
 
-pre-configure {
-    reinplace "s|-bundle|-bundle -undefined dynamic_lookup|g" ${worksrcpath}/configure
+pre-patch {
+    copy ${worksrcpath}/configure.ac ${worksrcpath}/configure.ac.orig
+    copy ${worksrcpath}/plugins/Makefile.am ${worksrcpath}/plugins/Makefile.am.orig
 }
 
+patchfiles      patch-plugins.diff
+
+use_autoreconf  yes
+autoreconf.args -ivf
+
+configure.optflags  -g -O0
+
 configure.args  --x-includes=${prefix}/include \
                 --x-libraries=${prefix}/lib \
-                --disable-pulse \
+                --disable-gudev \
+                --disable-ibus \
                 --disable-smartcard-support \
-                --disable-schemas-install
+                --disable-maintainer-mode \
+                --disable-silent-rules
 
 post-activate    {
-    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
-    system "export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` && \
-        gconftool-2 --makefile-install-rule ${prefix}/etc/gconf/schemas/*.schemas"
+    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
+    system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
 }
 
 livecheck.type  gnome

Added: users/devans/GNOME-3/stable/dports/gnome/gnome-settings-daemon/files/patch-plugins.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-settings-daemon/files/patch-plugins.diff	                        (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-settings-daemon/files/patch-plugins.diff	2013-08-14 22:40:03 UTC (rev 109399)
@@ -0,0 +1,71 @@
+--- configure.ac.orig	2013-07-19 09:07:40.000000000 -0700
++++ configure.ac	2013-07-24 11:08:09.000000000 -0700
+@@ -78,7 +78,7 @@
+ GSD_PLUGIN_LDFLAGS="-export_dynamic -module -avoid-version -no-undefined"
+ case $host_os in
+   darwin*)
+-    GSD_PLUGIN_LDFLAGS="${GSD_PLUGIN_LDFLAGS} -Wl,-bundle_loader,\$(top_builddir)/gnome-settings-daemon/gnome-settings-daemon"
++    GSD_PLUGIN_LDFLAGS="${GSD_PLUGIN_LDFLAGS} -Wl,-bundle_loader,\$(top_builddir)/gnome-settings-daemon/.libs/gnome-settings-daemon"
+     ;;
+ esac
+ AC_SUBST([GSD_PLUGIN_LDFLAGS])
+@@ -241,7 +241,7 @@
+ dnl - color
+ dnl ---------------------------------------------------------------------------
+ 
+-PKG_CHECK_MODULES(COLOR, [colord >= 0.1.9 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
++dnl PKG_CHECK_MODULES(COLOR, [colord >= 0.1.9 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
+ 
+ dnl ---------------------------------------------------------------------------
+ dnl - wacom (disabled for s390/s390x and non Linux platforms)
+--- plugins/media-keys/Makefile.am.orig	2013-07-24 12:18:39.000000000 -0700
++++ plugins/media-keys/Makefile.am	2013-07-24 12:21:19.000000000 -0700
+@@ -61,6 +61,7 @@
+ 
+ libmedia_keys_la_LIBADD  = 		\
+ 	$(top_builddir)/plugins/common/libcommon.la			\
++	$(top_builddir)/gnome-settings-daemon/libgsd.la                 \
+ 	$(top_builddir)/plugins/media-keys/gvc/libgvc.la		\
+ 	$(MEDIA_KEYS_LIBS)						\
+ 	$(SETTINGS_PLUGIN_LIBS)						\
+--- plugins/screensaver-proxy/Makefile.am.orig	2013-07-24 12:34:25.000000000 -0700
++++ plugins/screensaver-proxy/Makefile.am	2013-07-24 12:36:18.000000000 -0700
+@@ -19,7 +19,8 @@
+ 
+ libscreensaver_proxy_la_LDFLAGS = $(GSD_PLUGIN_LDFLAGS)
+ 
+-libscreensaver_proxy_la_LIBADD  = $(SETTINGS_PLUGIN_LIBS)
++libscreensaver_proxy_la_LIBADD  = $(SETTINGS_PLUGIN_LIBS) \
++				  $(top_builddir)/gnome-settings-daemon/libgsd.la
+ 
+ libexec_PROGRAMS = gsd-test-screensaver-proxy
+ 
+--- plugins/Makefile.am.orig	2013-07-19 09:07:29.000000000 -0700
++++ plugins/Makefile.am	2013-07-27 13:48:33.000000000 -0700
+@@ -4,10 +4,8 @@
+ 	a11y-keyboard	\
+ 	a11y-settings	\
+ 	clipboard	\
+-	color		\
+ 	cursor		\
+ 	dummy		\
+-	power		\
+ 	housekeeping    \
+ 	keyboard	\
+ 	media-keys	\
+@@ -15,11 +13,13 @@
+ 	remote-display	\
+ 	screensaver-proxy \
+ 	sound		\
+-	xrandr		\
+ 	xsettings	\
+ 	$(NULL)
+ 
+-disabled_plugins = $(NULL)
++disabled_plugins = color \
++                   power \
++		   xrandr \
++		   $(NULL)
+ 
+ if HAVE_PACKAGEKIT
+ enabled_plugins += updates
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130814/7443482e/attachment.html>


More information about the macports-changes mailing list