<!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>[127612] trunk/dports/gnome/gnome-applets</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/127612">127612</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-10-30 10:18:17 -0700 (Thu, 30 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>gnome-applets: update to version 3.14.0, requires python3 for invest applet, drop python variants, use python34.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegnomeappletsPortfile">trunk/dports/gnome/gnome-applets/Portfile</a></li>
<li><a href="#trunkdportsgnomegnomeappletsfilespatchconfigureacdiff">trunk/dports/gnome/gnome-applets/files/patch-configure.ac.diff</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#trunkdportsgnomegnomeapplets">trunk/dports/gnome/gnome-applets/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgnomegnomeapplets"></a>
<div class="propset"><h4>Property changes: trunk/dports/gnome/gnome-applets</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-applets:108276-113174
</span><span class="cx">/users/rmstonecipher/gnome/gnome-applets:102363-103172
</span><span class="cx"> + /branches/mld-qt-481/dports/gnome/gnome-applets: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-applets:108276-113174,127583-127610
</span><span class="cx">/users/rmstonecipher/gnome/gnome-applets:102363-103172
</span><a id="trunkdportsgnomegnomeappletsPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/gnome-applets/Portfile (127611 => 127612)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gnome-applets/Portfile 2014-10-30 17:15:15 UTC (rev 127611)
+++ trunk/dports/gnome/gnome-applets/Portfile 2014-10-30 17:18:17 UTC (rev 127612)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name gnome-applets
</span><del>-version 3.8.1
</del><ins>+version 3.14.0
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> description GNOME panel applets.
</span><span class="cx"> long_description This package contains applets for use with the \
</span><span class="lines">@@ -18,8 +18,8 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 6e08140e241eec4086675452b02ead5684ad321a \
- sha256 c861a0be754024ea2ce6a3474fd367c0f3d69c2ea46f43c382fa7a69f2c40a7d
</del><ins>+checksums rmd160 318ce3956b33d21ed15ffb14075e1060d74a2089 \
+ sha256 0c035749936f5fdd12652c88f688ce723cb4f2228737dbf1fcd20c8f0d516423
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx">
</span><span class="cx"> depends_lib port:gnome-icon-theme \
</span><span class="cx"> port:gtk3 \
</span><del>- port:gconf \
</del><span class="cx"> port:gnome-panel \
</span><span class="cx"> port:libgtop \
</span><span class="cx"> port:gnome-settings-daemon \
</span><span class="lines">@@ -38,13 +37,20 @@
</span><span class="cx"> port:policykit \
</span><span class="cx"> port:gucharmap \
</span><span class="cx"> port:upower \
</span><del>- port:libxml2
</del><ins>+ port:libxml2 \
+ port:py34-gobject3
</ins><span class="cx">
</span><span class="cx"> patchfiles patch-configure.ac.diff
</span><span class="cx">
</span><ins>+# invest applet requires python3
+# use python34
+
+configure.python ${prefix}/bin/python3.4
+set python_framework ${frameworks_dir}/Python.framework/Versions/3.4
+configure.pkg_config_path ${python_framework}/lib/pkgconfig
+
</ins><span class="cx"> post-patch {
</span><del>- reinplace "s|/usr/bin/env python|${configure.python}|" \
- ${worksrcpath}/invest-applet/invest/chart.py \
</del><ins>+ reinplace "s|/usr/bin/python3|${configure.python}|" \
</ins><span class="cx"> ${worksrcpath}/invest-applet/invest/invest-applet.py \
</span><span class="cx"> ${worksrcpath}/invest-applet/invest/invest-chart \
</span><span class="cx"> ${worksrcpath}/invest-applet/invest/test.py
</span><span class="lines">@@ -59,41 +65,18 @@
</span><span class="cx"> use_autoreconf yes
</span><span class="cx"> autoreconf.args -fvi
</span><span class="cx">
</span><del>-variant python26 conflicts python27 description {Use python 2.6} {
- configure.python ${prefix}/bin/python2.6
- depends_lib-append port:py26-gobject3
- set python_framework ${frameworks_dir}/Python.framework/Versions/2.6
- configure.pkg_config_path ${python_framework}/lib/pkgconfig
-}
</del><ins>+configure.args --enable-compile-warnings=minimum \
+ --disable-battstat \
+ --disable-cpufreq \
+ --disable-frequency-selector \
+ --x-includes=${prefix}/include \
+ --x-libraries=${prefix}/lib \
+ --disable-schemas-compile \
+ --disable-silent-rules
</ins><span class="cx">
</span><del>-variant python27 conflicts python26 description {Use python 2.7} {
- configure.python ${prefix}/bin/python2.7
- depends_lib-append port:py27-gobject3
- set python_framework ${frameworks_dir}/Python.framework/Versions/2.7
- configure.pkg_config_path ${python_framework}/lib/pkgconfig
-}
-
-if {![variant_isset python26]} {
- default_variants +python27
-}
-
-configure.args --enable-compile-warnings=minimum \
- --disable-networkmanager \
- --disable-mixer-applet \
- --disable-battstat \
- --disable-cpufreq \
- --disable-frequency-selector \
- --x-includes=${prefix}/include \
- --x-libraries=${prefix}/lib \
- --disable-schemas-compile \
- --disable-schemas-install \
- --disable-silent-rules
-
</del><span class="cx"> post-activate {
</span><span class="cx"> system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span class="cx"> system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
</span><del>- system "export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` && \
- gconftool-2 --makefile-install-rule ${prefix}/etc/gconf/schemas/*.schemas"
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> livecheck.type gnome
</span></span></pre></div>
<a id="trunkdportsgnomegnomeappletsfilespatchconfigureacdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/gnome-applets/files/patch-configure.ac.diff (127611 => 127612)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gnome-applets/files/patch-configure.ac.diff 2014-10-30 17:15:15 UTC (rev 127611)
+++ trunk/dports/gnome/gnome-applets/files/patch-configure.ac.diff 2014-10-30 17:18:17 UTC (rev 127612)
</span><span class="lines">@@ -1,37 +1,19 @@
</span><del>---- configure.ac.orig 2014-08-29 07:49:29.000000000 -0700
-+++ configure.ac 2014-08-29 07:50:15.000000000 -0700
-@@ -44,6 +44,15 @@
- AM_PROG_LIBTOOL
</del><ins>+--- configure.ac.orig 2014-10-28 16:37:39.000000000 -0700
++++ configure.ac 2014-10-29 15:52:28.000000000 -0700
+@@ -42,6 +42,17 @@
</ins><span class="cx"> AC_PATH_XTRA
</span><del>- AM_PATH_PYTHON(2.4)
</del><ins>+ AM_PATH_PYTHON(3)
+
++dnl Override standard python locations with MacPorts version specific ones
</ins><span class="cx"> +
</span><del>-+dnl Override PYTHON_PREFIX, PYTHON_EXEC_PREFIX and pythondir
</del><ins>++AC_SUBST([PYTHON_PREFIX], [`$PYTHON -c 'import sys; print(sys.prefix);'`])
++AC_SUBST([PYTHON_EXEC_PREFIX], [`$PYTHON -c 'import sys; print(sys.exec_prefix)'`])
</ins><span class="cx"> +
</span><del>-+AC_SUBST([PYTHON_PREFIX], [`$PYTHON -c 'import sys; print sys.prefix;'`])
-+AC_SUBST([PYTHON_EXEC_PREFIX], [`$PYTHON -c 'import sys; print sys.exec_prefix;'`])
-+
</del><span class="cx"> +am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
</span><ins>++am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
++
</ins><span class="cx"> +AC_SUBST([pythondir], [$am_cv_python_pythondir])
</span><ins>++AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
</ins><span class="cx"> +
</span><del>- AM_CHECK_PYTHON_HEADERS(HAVE_PYHDRS="yes", HAVE_PYHDRS="no")
-
</del><span class="cx"> X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
</span><del>-@@ -540,7 +549,8 @@
- dnl *** invest-applet specific checks ***
- dnl ***************************************************************************
-
--AM_CONDITIONAL(BUILD_INVEST_APPLET, test "x$HAVE_PYGOBJECT" = "xyes")
-+build_invest_applet=$HAVE_PYGOBJECT
-+AM_CONDITIONAL(BUILD_INVEST_APPLET, test "x$build_invest_applet" = "xyes")
-
- dnl ***************************************************************************
- dnl *** Check if IPv6 is available ***
-@@ -723,7 +733,7 @@
- - drivemount always
- - geyes always
- - gweather $build_libgweather_applets
-- - invest-applet $BUILD_INVEST_APPLET
-+ - invest-applet $build_invest_applet
- - mini-commander $enable_mini_commander
- - modemlights $BUILD_MODEM_LIGHTS
- - mixer $enable_mixer
</del><ins>+ AC_SUBST(X_LIBS)
</ins></span></pre>
</div>
</div>
</body>
</html>