<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[119518] trunk/dports/gnome/gnome-control-center</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/119518">119518</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-04-28 12:31:50 -0700 (Mon, 28 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegnomecontrolcenterPortfile">trunk/dports/gnome/gnome-control-center/Portfile</a></li>
<li><a href="#trunkdportsgnomegnomecontrolcenterfilespatchdisablecolorpaneldiff">trunk/dports/gnome/gnome-control-center/files/patch-disable-color-panel.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegnomecontrolcenterfilespatchdisablecolorpanel386diff">trunk/dports/gnome/gnome-control-center/files/patch-disable-color-panel-3.8.6.diff</a></li>
<li><a href="#trunkdportsgnomegnomecontrolcenterfilespatchdisableshelltesthostname386diff">trunk/dports/gnome/gnome-control-center/files/patch-disable-shell-test-hostname-3.8.6.diff</a></li>
<li><a href="#trunkdportsgnomegnomecontrolcenterfilespatchpanelsuseraccounts386diff">trunk/dports/gnome/gnome-control-center/files/patch-panels-user-accounts-3.8.6.diff</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#trunkdportsgnomegnomecontrolcenter">trunk/dports/gnome/gnome-control-center/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgnomegnomecontrolcenter"></a>
<div class="propset"><h4>Property changes: trunk/dports/gnome/gnome-control-center</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/users/devans/GNOME-3/stable/dports/gnome/gnome-control-center:108269-118732
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/gnome-control-center:116416-118152
</span><span class="cx">/users/rmstonecipher/gnome/gnome-control-center:102363-103172
</span><span class="cx"> + /branches/mld-qt-481/dports/gnome/gnome-control-center:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><span class="cx">/users/devans/GNOME-3/stable/dports/gnome/gnome-control-center:108269-119508
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/gnome-control-center:116416-118152
</span><span class="cx">/users/rmstonecipher/gnome/gnome-control-center:102363-103172
</span><a id="trunkdportsgnomegnomecontrolcenterPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/gnome-control-center/Portfile (119517 => 119518)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -4,8 +4,20 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name gnome-control-center
</span><del>-version 3.8.6
-revision 1
</del><ins>+
+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
+
+}
+
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> description GNOME's main interface for configuration of the various \
</span><span class="cx"> aspects of your desktop.
</span><span class="lines">@@ -19,6 +31,66 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><ins>+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 {
+
</ins><span class="cx"> checksums rmd160 3419412626e2de69c243423f31a0504c49955126 \
</span><span class="cx"> sha256 8dba7eb3fa720580e84bb1a8241c745abacaa8999bbf9c28902819d5584fa42a
</span><span class="cx">
</span><span class="lines">@@ -61,10 +133,10 @@
</span><span class="cx"> patch-background-linker-fix.diff \
</span><span class="cx"> patch-background-libsocialweb.diff \
</span><span class="cx"> patch-users-logged-in-check.diff \
</span><del>- patch-disable-color-panel.diff \
- patch-disable-shell-test-hostname.diff \
</del><ins>+ patch-disable-color-panel-3.8.6.diff \
+ patch-disable-shell-test-hostname-3.8.6.diff \
</ins><span class="cx"> patch-disable-power-panel.diff \
</span><del>- patch-panels-user-accounts.diff
</del><ins>+ patch-panels-user-accounts-3.8.6.diff
</ins><span class="cx">
</span><span class="cx"> pre-configure {
</span><span class="cx"> copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
</span><span class="lines">@@ -82,6 +154,8 @@
</span><span class="cx"> --disable-update-mimedb \
</span><span class="cx"> --disable-silent-rules
</span><span class="cx">
</span><ins>+}
+
</ins><span class="cx"> pre-activate {
</span><span class="cx"> if {![catch {set installed [lindex [registry_active gdm] 0]}]} {
</span><span class="cx"> set _version [lindex $installed 1]
</span><span class="lines">@@ -102,6 +176,13 @@
</span><span class="cx"> system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span class="cx"> }
</span><span class="cx">
</span><del>-# this is the last version that will build on darwin < 13
</del><ins>+if {$mavericks_or_better} {
</ins><span class="cx">
</span><ins>+livecheck.type gnome
+
+} else {
+
+# Version 3.8.6 is the last version that will build on darwin < 13
</ins><span class="cx"> livecheck.type none
</span><ins>+
+}
</ins></span></pre></div>
<a id="trunkdportsgnomegnomecontrolcenterfilespatchdisablecolorpanel386difffromrev119508usersdevansGNOME3stabledportsgnomegnomecontrolcenterfilespatchdisablecolorpanel386diff"></a>
<div class="copfile"><h4>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) (0 => 119518)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,49 @@
</span><ins>+--- 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 ),
</ins></span></pre></div>
<a id="trunkdportsgnomegnomecontrolcenterfilespatchdisablecolorpaneldiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/gnome-control-center/files/patch-disable-color-panel.diff (119517 => 119518)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,20 +1,3 @@
</span><del>---- 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)
</del><span class="cx"> --- panels/Makefile.am.orig 2013-01-25 06:42:18.000000000 -0800
</span><span class="cx"> +++ panels/Makefile.am 2013-09-16 09:32:32.000000000 -0700
</span><span class="cx"> @@ -2,7 +2,6 @@
</span><span class="lines">@@ -27,7 +10,7 @@
</span><span class="cx"> notifications \
</span><span class="cx"> --- shell/Makefile.am.orig 2013-09-16 17:47:34.000000000 -0700
</span><span class="cx"> +++ shell/Makefile.am 2013-09-16 17:48:10.000000000 -0700
</span><del>-@@ -51,7 +51,6 @@
</del><ins>+@@ -52,7 +52,6 @@
</ins><span class="cx"> $(top_builddir)/libgd/libgd.la \
</span><span class="cx"> $(top_builddir)/panels/common/liblanguage.la \
</span><span class="cx"> $(top_builddir)/panels/background/libbackground.la \
</span><span class="lines">@@ -47,3 +30,22 @@
</span><span class="cx"> PANEL_TYPE("datetime", cc_date_time_panel_get_type ),
</span><span class="cx"> PANEL_TYPE("display", cc_display_panel_get_type ),
</span><span class="cx"> PANEL_TYPE("info", cc_info_panel_get_type ),
</span><ins>+--- 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)
</ins></span></pre></div>
<a id="trunkdportsgnomegnomecontrolcenterfilespatchdisableshelltesthostname386difffromrev119508usersdevansGNOME3stabledportsgnomegnomecontrolcenterfilespatchdisableshelltesthostname386diff"></a>
<div class="copfile"><h4>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) (0 => 119518)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+--- 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
</ins></span></pre></div>
<a id="trunkdportsgnomegnomecontrolcenterfilespatchpanelsuseraccounts386difffromrev119508usersdevansGNOME3stabledportsgnomegnomecontrolcenterfilespatchpanelsuseraccounts386diff"></a>
<div class="copfile"><h4>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) (0 => 119518)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+--- 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
</ins></span></pre>
</div>
</div>
</body>
</html>