[119518] trunk/dports/gnome/gnome-control-center

28 Apr 2014

Revision: 119518
          https://trac.macports.org/changeset/119518
Author:   devans@macports.org
Date:     2014-04-28 12:31:50 -0700 (Mon, 28 Apr 2014)
Log Message:
-----------
gnome-control-center: update to version 3.12.1 for darwin >= 13, version 3.8.6 for darwin < 13 due to webkit-gtk3 version limitations.

Modified Paths:
--------------
    trunk/dports/gnome/gnome-control-center/Portfile
    trunk/dports/gnome/gnome-control-center/files/patch-disable-color-panel.diff

Added Paths:
-----------
    trunk/dports/gnome/gnome-control-center/files/patch-disable-color-panel-3.8.6.diff
    trunk/dports/gnome/gnome-control-center/files/patch-disable-shell-test-hostname-3.8.6.diff
    trunk/dports/gnome/gnome-control-center/files/patch-panels-user-accounts-3.8.6.diff

Property Changed:
----------------
    trunk/dports/gnome/gnome-control-center/


Property changes on: trunk/dports/gnome/gnome-control-center
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/mld-qt-481/dports/gnome/gnome-control-center:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/devans/GNOME-3/stable/dports/gnome/gnome-control-center:108269-118732
/users/devans/GNOME-3/unstable/dports/gnome/gnome-control-center:116416-118152
/users/rmstonecipher/gnome/gnome-control-center:102363-103172
   + /branches/mld-qt-481/dports/gnome/gnome-control-center:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/devans/GNOME-3/stable/dports/gnome/gnome-control-center:108269-119508
/users/devans/GNOME-3/unstable/dports/gnome/gnome-control-center:116416-118152
/users/rmstonecipher/gnome/gnome-control-center:102363-103172

Modified: trunk/dports/gnome/gnome-control-center/Portfile
===================================================================

--- trunk/dports/gnome/gnome-control-center/Portfile	2014-04-28 18:57:12 UTC (rev 119517)
+++ trunk/dports/gnome/gnome-control-center/Portfile	2014-04-28 19:31:50 UTC (rev 119518)
@@ -4,8 +4,20 @@
 PortSystem      1.0
 
 name            gnome-control-center
-version         3.8.6
-revision        1
+
+if {${os.platform} eq "darwin" && ${os.major} >= 13} {
+
+set mavericks_or_better yes
+version 3.12.1
+
+} else {
+
+set mavericks_or_better no
+version 3.8.6
+revision 2
+
+}
+
 set branch      [join [lrange [split ${version} .] 0 1] .]
 description     GNOME's main interface for configuration of the various \
                 aspects of your desktop.
@@ -19,6 +31,66 @@
 
 use_xz          yes
 
+if {$mavericks_or_better} {
+
+checksums       rmd160  ca20fc78092f89969fcc9a0f96da8bafa4726b90 \
+                sha256  5297d448eff0ec58f6c0ad9fbd1b94bed0a850496df0ee65571c0622b49c1582
+
+depends_build   port:pkgconfig \
+                port:intltool \
+                port:libxslt \
+                port:gnome-common \
+                port:gtk-doc
+
+depends_lib     port:desktop-file-utils \
+                port:gtk3 \
+                port:gsettings-desktop-schemas \
+                port:gnome-desktop \
+                port:fontconfig \
+                port:policykit \
+                port:libxml2 \
+                port:upower \
+                port:libgtop \
+                port:gnome-settings-daemon \
+                port:gnome-menus \
+                port:gnome-online-accounts \
+                port:accountsservice \
+                port:libcanberra \
+                port:pulseaudio \
+                port:libpwquality \
+                port:kerberos5 \
+                port:grilo \
+                port:shared-mime-info \
+                port:xorg-libX11 \
+                port:xorg-libXxf86misc \
+                port:xorg-libXi
+
+depends_run     port:yelp
+
+# color panel disabled by patch, dependency colord requires libudev
+
+patchfiles      \
+                patch-disable-color-panel.diff \
+                patch-disable-shell-test-hostname.diff \
+                patch-panels-user-accounts.diff
+
+pre-configure {
+    copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
+}
+
+use_autoreconf  yes
+autoreconf.args -fvi
+
+configure.args  --x-includes=${prefix}/include \
+                --x-libraries=${prefix}/lib \
+                --without-cheese \
+                --disable-ibus \
+                --disable-maintainer-mode \
+                --disable-update-mimedb \
+                --disable-silent-rules
+
+} else {
+
 checksums       rmd160  3419412626e2de69c243423f31a0504c49955126 \
                 sha256  8dba7eb3fa720580e84bb1a8241c745abacaa8999bbf9c28902819d5584fa42a
 
@@ -61,10 +133,10 @@
                 patch-background-linker-fix.diff \
                 patch-background-libsocialweb.diff \
                 patch-users-logged-in-check.diff \
-                patch-disable-color-panel.diff \
-                patch-disable-shell-test-hostname.diff \
+                patch-disable-color-panel-3.8.6.diff \
+                patch-disable-shell-test-hostname-3.8.6.diff \
                 patch-disable-power-panel.diff \
-                patch-panels-user-accounts.diff
+                patch-panels-user-accounts-3.8.6.diff
 
 pre-configure {
     copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
@@ -82,6 +154,8 @@
                 --disable-update-mimedb \
                 --disable-silent-rules
 
+}
+
 pre-activate {
     if {![catch {set installed [lindex [registry_active gdm] 0]}]} {
         set _version [lindex $installed 1]
@@ -102,6 +176,13 @@
     system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
 }
 
-# this is the last version that will build on darwin < 13
+if {$mavericks_or_better} {
 
+livecheck.type  gnome
+
+} else {
+
+# Version 3.8.6 is the last version that will build on darwin < 13
 livecheck.type  none
+
+}

Copied: trunk/dports/gnome/gnome-control-center/files/patch-disable-color-panel-3.8.6.diff (from rev 119508, users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/files/patch-disable-color-panel-3.8.6.diff)
===================================================================
--- trunk/dports/gnome/gnome-control-center/files/patch-disable-color-panel-3.8.6.diff	                        (rev 0)
+++ trunk/dports/gnome/gnome-control-center/files/patch-disable-color-panel-3.8.6.diff	2014-04-28 19:31:50 UTC (rev 119518)
@@ -0,0 +1,49 @@
+--- configure.ac.orig	2013-09-13 05:09:33.000000000 -0700
++++ configure.ac	2013-09-16 09:28:36.000000000 -0700
+@@ -146,10 +146,10 @@
+ PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION)
+ PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.9.1
+                   gnome-settings-daemon >= $GSD_REQUIRED_VERSION)
+-PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES
+-                  colord >= $COLORD_REQUIRED_VERSION
+-                  colord-gtk >= $COLORD_GTK_REQUIRED_VERSION
+-                  gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
++dnl PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES
++dnl                   colord >= $COLORD_REQUIRED_VERSION
++dnl                   colord-gtk >= $COLORD_GTK_REQUIRED_VERSION
++dnl                   gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
+ PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES
+                   polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
+ PKG_CHECK_MODULES(PRIVACY_PANEL, $COMMON_MODULES)
+--- panels/Makefile.am.orig	2013-01-25 06:42:18.000000000 -0800
++++ panels/Makefile.am		2013-09-16 09:32:32.000000000 -0700
+@@ -2,7 +2,6 @@
+ 	common \
+ 	background \
+ 	power \
+-	color \
+ 	display \
+ 	mouse \
+ 	notifications \
+--- shell/Makefile.am.orig	2013-09-16 17:47:34.000000000 -0700
++++ shell/Makefile.am	2013-09-16 17:48:10.000000000 -0700
+@@ -51,7 +51,6 @@
+ 	$(top_builddir)/libgd/libgd.la					\
+ 	$(top_builddir)/panels/common/liblanguage.la			\
+ 	$(top_builddir)/panels/background/libbackground.la		\
+-	$(top_builddir)/panels/color/libcolor.la			\
+ 	$(top_builddir)/panels/datetime/libdate_time.la			\
+ 	$(top_builddir)/panels/display/libdisplay.la			\
+ 	$(top_builddir)/panels/info/libinfo.la				\
+--- shell/cc-panel-loader.c.orig	2013-09-16 17:57:33.000000000 -0700
++++ shell/cc-panel-loader.c	2013-09-16 17:58:28.000000000 -0700
+@@ -77,7 +77,9 @@
+ #ifdef BUILD_BLUETOOTH
+   PANEL_TYPE("bluetooth",        cc_bluetooth_panel_get_type    ),
+ #endif
++#ifdef BUILD_COLOR
+   PANEL_TYPE("color",            cc_color_panel_get_type        ),
++#endif
+   PANEL_TYPE("datetime",         cc_date_time_panel_get_type    ),
+   PANEL_TYPE("display",          cc_display_panel_get_type      ),
+   PANEL_TYPE("info",             cc_info_panel_get_type         ),

Modified: trunk/dports/gnome/gnome-control-center/files/patch-disable-color-panel.diff
===================================================================
--- trunk/dports/gnome/gnome-control-center/files/patch-disable-color-panel.diff	2014-04-28 18:57:12 UTC (rev 119517)
+++ trunk/dports/gnome/gnome-control-center/files/patch-disable-color-panel.diff	2014-04-28 19:31:50 UTC (rev 119518)
@@ -1,20 +1,3 @@
---- configure.ac.orig	2013-09-13 05:09:33.000000000 -0700
-+++ configure.ac	2013-09-16 09:28:36.000000000 -0700
-@@ -146,10 +146,10 @@
- PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION)
- PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.9.1
-                   gnome-settings-daemon >= $GSD_REQUIRED_VERSION)
--PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES
--                  colord >= $COLORD_REQUIRED_VERSION
--                  colord-gtk >= $COLORD_GTK_REQUIRED_VERSION
--                  gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
-+dnl PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES
-+dnl                   colord >= $COLORD_REQUIRED_VERSION
-+dnl                   colord-gtk >= $COLORD_GTK_REQUIRED_VERSION
-+dnl                   gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
- PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES
-                   polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
- PKG_CHECK_MODULES(PRIVACY_PANEL, $COMMON_MODULES)
 --- panels/Makefile.am.orig	2013-01-25 06:42:18.000000000 -0800
 +++ panels/Makefile.am		2013-09-16 09:32:32.000000000 -0700
 @@ -2,7 +2,6 @@
@@ -27,7 +10,7 @@
  	notifications \
 --- shell/Makefile.am.orig	2013-09-16 17:47:34.000000000 -0700
 +++ shell/Makefile.am	2013-09-16 17:48:10.000000000 -0700
-@@ -51,7 +51,6 @@
+@@ -52,7 +52,6 @@
  	$(top_builddir)/libgd/libgd.la					\
  	$(top_builddir)/panels/common/liblanguage.la			\
  	$(top_builddir)/panels/background/libbackground.la		\
@@ -47,3 +30,22 @@
    PANEL_TYPE("datetime",         cc_date_time_panel_get_type    ),
    PANEL_TYPE("display",          cc_display_panel_get_type      ),
    PANEL_TYPE("info",             cc_info_panel_get_type         ),
+--- configure.ac.orig	2014-04-16 05:41:24.000000000 -0700
++++ configure.ac	2014-04-24 06:59:38.000000000 -0700
+@@ -142,11 +142,11 @@
+ PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION)
+ PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.99.0
+                   gnome-settings-daemon >= $GSD_REQUIRED_VERSION)
+-PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES
+-                  colord >= $COLORD_REQUIRED_VERSION
+-                  colord-gtk >= $COLORD_GTK_REQUIRED_VERSION
+-                  libsoup-2.4
+-                  gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
++dnl PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES
++dnl                   colord >= $COLORD_REQUIRED_VERSION
++dnl                   colord-gtk >= $COLORD_GTK_REQUIRED_VERSION
++dnl                   libsoup-2.4
++dnl                   gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
+ PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES
+                   polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
+ PKG_CHECK_MODULES(PRIVACY_PANEL, $COMMON_MODULES)

Copied: trunk/dports/gnome/gnome-control-center/files/patch-disable-shell-test-hostname-3.8.6.diff (from rev 119508, users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/files/patch-disable-shell-test-hostname-3.8.6.diff)
===================================================================
--- trunk/dports/gnome/gnome-control-center/files/patch-disable-shell-test-hostname-3.8.6.diff	                        (rev 0)
+++ trunk/dports/gnome/gnome-control-center/files/patch-disable-shell-test-hostname-3.8.6.diff	2014-04-28 19:31:50 UTC (rev 119518)
@@ -0,0 +1,10 @@
+--- shell/Makefile.am.orig	2013-09-16 22:44:57.000000000 -0700
++++ shell/Makefile.am	2013-09-16 22:45:38.000000000 -0700
+@@ -111,6 +111,6 @@
+ 
+ EXTRA_DIST += hostnames-test.txt
+ check-local: test-hostname
+-	$(builddir)/test-hostname $(srcdir)/hostnames-test.txt > /dev/null
++
+ 
+ -include $(top_srcdir)/git.mk

Copied: trunk/dports/gnome/gnome-control-center/files/patch-panels-user-accounts-3.8.6.diff (from rev 119508, users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/files/patch-panels-user-accounts-3.8.6.diff)
===================================================================
--- trunk/dports/gnome/gnome-control-center/files/patch-panels-user-accounts-3.8.6.diff	                        (rev 0)
+++ trunk/dports/gnome/gnome-control-center/files/patch-panels-user-accounts-3.8.6.diff	2014-04-28 19:31:50 UTC (rev 119518)
@@ -0,0 +1,10 @@
+--- panels/user-accounts/Makefile.am.orig	2013-09-16 17:32:09.000000000 -0700
++++ panels/user-accounts/Makefile.am	2013-09-16 17:33:23.000000000 -0700
+@@ -62,7 +62,6 @@
+ 	$(USER_ACCOUNTS_PANEL_LIBS)	\
+ 	$(builddir)/../common/liblanguage.la	\
+ 	-lpwquality			\
+-	-lcrypt				\
+ 	-lm
+ 
+ if BUILD_CHEESE

    

[119518] trunk/dports/gnome/gnome-control-center

devans＠macports.org