[115760] trunk/dports/gnome/gnome-settings-daemon

Fri Jan 10 14:04:07 PST 2014

Revision: 115760
          https://trac.macports.org/changeset/115760
Author:   devans at macports.org
Date:     2014-01-10 14:04:07 -0800 (Fri, 10 Jan 2014)
Log Message:
-----------
gnome-settings-daemon: merge version 3.10.2 from GNOME-3 stable test branch.

Modified Paths:
--------------
    trunk/dports/gnome/gnome-settings-daemon/Portfile
    trunk/dports/gnome/gnome-settings-daemon/files/patch-plugins.diff

Property Changed:
----------------
    trunk/dports/gnome/gnome-settings-daemon/


Property changes on: trunk/dports/gnome/gnome-settings-daemon
___________________________________________________________________
Modified: svn:mergeinfo
   - /users/devans/GNOME-3/stable/dports/gnome/gnome-settings-daemon:108269-113174
   + /users/devans/GNOME-3/stable/dports/gnome/gnome-settings-daemon:108269-115730

Modified: trunk/dports/gnome/gnome-settings-daemon/Portfile
===================================================================

--- trunk/dports/gnome/gnome-settings-daemon/Portfile	2014-01-10 22:01:42 UTC (rev 115759)
+++ trunk/dports/gnome/gnome-settings-daemon/Portfile	2014-01-10 22:04:07 UTC (rev 115760)
@@ -4,8 +4,7 @@
 PortSystem      1.0
 
 name            gnome-settings-daemon
-version         3.8.5
-revision        1
+version         3.10.2
 license         GPL-2 LGPL-2.1
 set branch      [join [lrange [split ${version} .] 0 1] .]
 description     Gnome 3 settings daemon.
@@ -18,8 +17,8 @@
 
 use_xz          yes
 
-checksums       rmd160  93986c863df423c712251c528c86f8d123c3dfe9 \
-                sha256  19420c97296802162fd4e0e0a08e797f5038ec8bd98cffe222362e24c7405784
+checksums       rmd160  759f890c3a322615c94ce5ba8512d98f814f9a40 \
+                sha256  808899c6e434ecb71f42d3ac022dc51f5963bdf2478f4634078483f9e8a78264
 
 depends_build   port:pkgconfig \
                 port:intltool \
@@ -32,7 +31,10 @@
                 port:lcms2 \
                 port:libnotify \
                 port:fontconfig \
+                port:geocode-glib \
+                port:geoclue2 \
                 port:libcanberra \
+                port:libgweather \
                 port:pulseaudio \
                 port:upower \
                 port:xorg-kbproto \
@@ -60,6 +62,7 @@
                 --disable-gudev \
                 --disable-ibus \
                 --disable-smartcard-support \
+                --disable-rfkill \
                 --disable-maintainer-mode \
                 --disable-silent-rules
 

Modified: trunk/dports/gnome/gnome-settings-daemon/files/patch-plugins.diff
===================================================================
--- trunk/dports/gnome/gnome-settings-daemon/files/patch-plugins.diff	2014-01-10 22:01:42 UTC (rev 115759)
+++ trunk/dports/gnome/gnome-settings-daemon/files/patch-plugins.diff	2014-01-10 22:04:07 UTC (rev 115760)
@@ -1,6 +1,6 @@
---- 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 @@
+--- configure.ac.orig	2013-11-12 11:02:04.000000000 -0800
++++ configure.ac	2013-12-13 08:57:55.000000000 -0800
+@@ -82,7 +82,7 @@
  GSD_PLUGIN_LDFLAGS="-export_dynamic -module -avoid-version -no-undefined"
  case $host_os in
    darwin*)
@@ -9,51 +9,30 @@
      ;;
  esac
  AC_SUBST([GSD_PLUGIN_LDFLAGS])
-@@ -241,7 +241,7 @@
+@@ -245,7 +245,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])
+-PKG_CHECK_MODULES(COLOR, [colord >= 1.0.2 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
++dnl PKG_CHECK_MODULES(COLOR, [colord >= 1.0.2 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 @@
+ dnl - datetime
+--- plugins/Makefile.am.orig	2013-11-11 09:25:13.000000000 -0800
++++ plugins/Makefile.am	2013-12-13 09:01:21.000000000 -0800
+@@ -4,11 +4,9 @@
  	a11y-keyboard	\
  	a11y-settings	\
  	clipboard	\
 -	color		\
  	cursor		\
+ 	datetime	\
  	dummy		\
 -	power		\
  	housekeeping    \
  	keyboard	\
  	media-keys	\
-@@ -15,11 +13,13 @@
+@@ -16,11 +14,13 @@
  	remote-display	\
  	screensaver-proxy \
  	sound		\
@@ -69,3 +48,25 @@
  
  if HAVE_PACKAGEKIT
  enabled_plugins += updates
+--- plugins/media-keys/Makefile.am.orig	2013-11-11 09:25:13.000000000 -0800
++++ plugins/media-keys/Makefile.am	2013-12-13 08:52:02.000000000 -0800
+@@ -66,6 +66,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-11-11 09:25:13.000000000 -0800
++++ plugins/screensaver-proxy/Makefile.am	2013-12-13 08:52:02.000000000 -0800
+@@ -20,7 +20,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
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140110/eba4ec6a/attachment-0001.html>
