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

[devans at macports.org]

Revision: 119077
          https://trac.macports.org/changeset/119077
Author:   devans at macports.org
Date:     2014-04-16 11:13:23 -0700 (Wed, 16 Apr 2014)
Log Message:
-----------
gnome-settings-daemon: update to version 3.12.1.

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

Modified: trunk/dports/gnome/gnome-settings-daemon/Portfile
===================================================================
--- trunk/dports/gnome/gnome-settings-daemon/Portfile	2014-04-16 17:45:14 UTC (rev 119076)
+++ trunk/dports/gnome/gnome-settings-daemon/Portfile	2014-04-16 18:13:23 UTC (rev 119077)
@@ -5,7 +5,7 @@
 PortGroup       active_variants 1.1
 
 name            gnome-settings-daemon
-version         3.12.0.1
+version         3.12.1
 license         GPL-2 LGPL-2.1
 set branch      [join [lrange [split ${version} .] 0 1] .]
 description     Gnome 3 settings daemon.
@@ -18,8 +18,8 @@
 
 use_xz          yes
 
-checksums       rmd160  72dd744bea115ea73e7ffad79e7e2768f138f048 \
-                sha256  c21cfcee008da6935ed7f7e814a788a951ba67cc728e43f888b174701cd96847
+checksums       rmd160  d6ac569f239355498f6b30c5373b21f31b2a4b97 \
+                sha256  639df1fb978c765009d574d0fb892abbf35f1e875ba71e801cb0dd555a15f23c
 
 depends_build   port:pkgconfig \
                 port:intltool \

Modified: trunk/dports/gnome/gnome-settings-daemon/files/patch-plugins.diff
===================================================================
--- trunk/dports/gnome/gnome-settings-daemon/files/patch-plugins.diff	2014-04-16 17:45:14 UTC (rev 119076)
+++ trunk/dports/gnome/gnome-settings-daemon/files/patch-plugins.diff	2014-04-16 18:13:23 UTC (rev 119077)
@@ -1,23 +1,3 @@
---- 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*)
--    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])
-@@ -245,7 +245,7 @@
- dnl - color
- dnl ---------------------------------------------------------------------------
- 
--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 - datetime
 --- plugins/Makefile.am.orig	2013-12-17 01:29:53.000000000 -0800
 +++ plugins/Makefile.am	2014-01-24 12:46:28.000000000 -0800
 @@ -4,22 +4,23 @@
@@ -80,16 +60,6 @@
  	$(CURSOR_LIBS)					\
  	$(SETTINGS_PLUGIN_LIBS)
  
---- plugins/keyboard/Makefile.am.orig	2014-01-24 12:01:28.000000000 -0800
-+++ plugins/keyboard/Makefile.am	2014-01-24 12:02:57.000000000 -0800
-@@ -43,6 +43,7 @@
- 
- libkeyboard_la_LIBADD  =				\
- 	$(top_builddir)/plugins/common/libcommon.la	\
-+	$(top_builddir)/gnome-settings-daemon/libgsd.la \
- 	$(SETTINGS_PLUGIN_LIBS)				\
- 	$(XF86MISC_LIBS)				\
- 	$(KEYBOARD_LIBS)				\
 --- plugins/mouse/Makefile.am.orig	2014-01-24 12:12:34.000000000 -0800
 +++ plugins/mouse/Makefile.am	2014-01-24 12:13:16.000000000 -0800
 @@ -28,6 +28,7 @@
@@ -100,3 +70,33 @@
  	$(SETTINGS_PLUGIN_LIBS)
  
  plugin_in_files = mouse.gnome-settings-plugin.in
+--- configure.ac.orig	2014-04-16 04:57:10.000000000 -0700
++++ configure.ac	2014-04-16 11:04:58.000000000 -0700
+@@ -82,7 +82,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])
+@@ -248,7 +248,7 @@
+ dnl - color
+ dnl ---------------------------------------------------------------------------
+ 
+-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 - datetime
+--- plugins/keyboard/Makefile.am.orig	2014-03-04 08:15:05.000000000 -0800
++++ plugins/keyboard/Makefile.am	2014-04-16 11:04:58.000000000 -0700
+@@ -37,6 +37,7 @@
+ 
+ libkeyboard_la_LIBADD  =				\
+ 	$(top_builddir)/plugins/common/libcommon.la	\
++	$(top_builddir)/gnome-settings-daemon/libgsd.la \
+ 	$(SETTINGS_PLUGIN_LIBS)				\
+ 	$(XF86MISC_LIBS)				\
+ 	$(KEYBOARD_LIBS)				\
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140416/c33f50be/attachment.html>