<!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>[145114] users/devans/GNOME-3/stable/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/145114">145114</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2016-01-26 00:53:29 -0800 (Tue, 26 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>GNOME-3/stable: gnome-control-center, reorganize/simplify Portfile logic, update autogen.sh to latest upstream version.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomecontrolcenterPortfile">users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomecontrolcenterfilesautogensh">users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/files/autogen.sh</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="usersdevansGNOME3stabledportsgnomegnomecontrolcenterPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/Portfile (145113 => 145114)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/Portfile 2016-01-26 07:48:02 UTC (rev 145113)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/Portfile 2016-01-26 08:53:29 UTC (rev 145114)
</span><span class="lines">@@ -4,20 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name gnome-control-center
</span><del>-
-if {${os.platform} eq "darwin" && ${os.major} >= 13} {
-
- set mavericks_or_better yes
- version 3.18.2
-
-} else {
-
- set mavericks_or_better no
- version 3.8.6
- revision 6
-
-}
-
</del><ins>+version 3.18.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">@@ -31,12 +18,10 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-if {$mavericks_or_better} {
-
- checksums rmd160 2ae8793c99356095b1c07b8d87547481c8739234 \
</del><ins>+checksums rmd160 2ae8793c99356095b1c07b8d87547481c8739234 \
</ins><span class="cx"> sha256 36fe6157247d2b7c8a98dbb3dbcde1c3a6f9e5e8fcc9ccf357e2b2417578f8ad
</span><span class="cx">
</span><del>- depends_build port:pkgconfig \
</del><ins>+depends_build port:pkgconfig \
</ins><span class="cx"> port:intltool \
</span><span class="cx"> port:libxslt \
</span><span class="cx"> port:gnome-common \
</span><span class="lines">@@ -45,7 +30,7 @@
</span><span class="cx"> port:libtool \
</span><span class="cx"> port:gtk-doc
</span><span class="cx">
</span><del>- depends_lib port:desktop-file-utils \
</del><ins>+depends_lib port:desktop-file-utils \
</ins><span class="cx"> port:gtk3 \
</span><span class="cx"> port:gsettings-desktop-schemas \
</span><span class="cx"> port:gnome-desktop \
</span><span class="lines">@@ -68,23 +53,23 @@
</span><span class="cx"> port:xorg-libXxf86misc \
</span><span class="cx"> port:xorg-libXi
</span><span class="cx">
</span><del>- depends_run port:yelp
</del><ins>+depends_run port:yelp
</ins><span class="cx">
</span><span class="cx"> # color panel disabled by patch, dependency colord requires libudev
</span><span class="cx">
</span><del>- patchfiles patch-disable-color-panel.diff \
</del><ins>+patchfiles patch-disable-color-panel.diff \
</ins><span class="cx"> patch-disable-shell-test-hostname.diff \
</span><span class="cx"> patch-panels-user-accounts.diff
</span><span class="cx">
</span><span class="cx"> # reconfigure using upstream autogen.sh for intltool 0.51 compatibility
</span><span class="cx">
</span><del>- post-patch {
- xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
- }
</del><ins>+post-patch {
+ xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
+}
</ins><span class="cx">
</span><del>- configure.cmd ./autogen.sh
</del><ins>+configure.cmd ./autogen.sh
</ins><span class="cx">
</span><del>- configure.args --x-includes=${prefix}/include \
</del><ins>+configure.args --x-includes=${prefix}/include \
</ins><span class="cx"> --x-libraries=${prefix}/lib \
</span><span class="cx"> --without-cheese \
</span><span class="cx"> --disable-ibus \
</span><span class="lines">@@ -92,104 +77,39 @@
</span><span class="cx"> --disable-update-mimedb \
</span><span class="cx"> --disable-silent-rules
</span><span class="cx">
</span><del>-} else {
-
- checksums rmd160 3419412626e2de69c243423f31a0504c49955126 \
- sha256 8dba7eb3fa720580e84bb1a8241c745abacaa8999bbf9c28902819d5584fa42a
-
- depends_build port:pkgconfig \
- port:intltool \
- port:libxslt \
- port:gnome-common \
- port:autoconf \
- port:automake \
- port:libtool \
- 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:libsocialweb \
- 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
-# power panel disabled by patch, doesn't support upower 0.99 API
-
- patchfiles patch-display-new-config-model.diff \
- patch-output-is-laptop.diff \
- patch-background-linker-fix.diff \
- patch-background-libsocialweb.diff \
- patch-users-logged-in-check.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-3.8.6.diff
-
-# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
-
- post-patch {
- xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
- }
-
- configure.cmd ./autogen.sh
-
- configure.args --x-includes=${prefix}/include \
- --x-libraries=${prefix}/lib \
- --with-libsocialweb \
- --without-cheese \
- --disable-ibus \
- --disable-maintainer-mode \
- --disable-update-mimedb \
- --disable-silent-rules
-
-}
-
-pre-activate {
- if {![catch {set installed [lindex [registry_active gdm] 0]}]} {
- set _version [lindex $installed 1]
- if {[vercmp $_version 3.0.0] < 0} {
- registry_deactivate_composite gdm "" [list ports_nodepcheck 1]
- }
- }
- if {![catch {set installed [lindex [registry_active gnome-media] 0]}]} {
- set _version [lindex $installed 1]
- if {[vercmp $_version 3.10.0] < 0} {
- registry_deactivate_composite gnome-media "" [list ports_nodepcheck 1]
- }
- }
-}
-
</del><span class="cx"> post-activate {
</span><span class="cx"> system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
</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>-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
-
</del><ins>+platform darwin {
+ if {${configure.cxx_stdlib} eq "libstdc++"} {
+ version 3.8.6
+ revision 6
+ checksums rmd160 3419412626e2de69c243423f31a0504c49955126 \
+ sha256 8dba7eb3fa720580e84bb1a8241c745abacaa8999bbf9c28902819d5584fa42a
+ depends_lib-delete \
+ port:grilo \
+ port:samba3
+ depends_lib-append \
+ port:gnome-menus \
+ port:libsocialweb
+ # color panel disabled by patch, dependency colord requires libudev
+ # power panel disabled by patch, doesn't support upower 0.99 API
+ patchfiles patch-display-new-config-model.diff \
+ patch-output-is-laptop.diff \
+ patch-background-linker-fix.diff \
+ patch-background-libsocialweb.diff \
+ patch-users-logged-in-check.diff \
+ patch-disable-color-panel-${version}.diff \
+ patch-disable-shell-test-hostname-${version}.diff \
+ patch-disable-power-panel.diff \
+ patch-panels-user-accounts-${version}.diff
+ configure.args-append \
+ --with-libsocialweb
+ # Version 3.8.6 is the last version that will build on platforms supporting libstdc++
+ livecheck.type none
+ } else {
+ livecheck.type gnome
+ }
</ins><span class="cx"> }
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegnomecontrolcenterfilesautogensh"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/files/autogen.sh (145113 => 145114)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/files/autogen.sh 2016-01-26 07:48:02 UTC (rev 145113)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/files/autogen.sh 2016-01-26 08:53:29 UTC (rev 145114)
</span><span class="lines">@@ -4,14 +4,13 @@
</span><span class="cx"> srcdir=`dirname $0`
</span><span class="cx"> test -z "$srcdir" && srcdir=.
</span><span class="cx">
</span><del>-PKG_NAME="control-center"
</del><span class="cx"> ACLOCAL_FLAGS="-I libgd $ACLOCAL_FLAGS"
</span><span class="cx">
</span><span class="cx"> (test -f $srcdir/configure.ac \
</span><span class="cx"> && test -f $srcdir/autogen.sh \
</span><span class="cx"> && test -d $srcdir/shell) || {
</span><span class="cx"> echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
</span><del>- echo " top-level $PKG_NAME directory"
</del><ins>+ echo " top-level gnome-control-center directory"
</ins><span class="cx"> exit 1
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>