<!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>[124859] 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/124859">124859</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-08-29 08:41:24 -0700 (Fri, 29 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>gnome-applets: update to version 3.8.0, dependencies, configuration.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegnomeappletsPortfile">trunk/dports/gnome/gnome-applets/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegnomeappletsfilespatchconfigureacdiff">trunk/dports/gnome/gnome-applets/files/patch-configure.ac.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegnomeappletsfilespatchconfigureindiff">trunk/dports/gnome/gnome-applets/files/patch-configure.in.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgnomegnomeappletsPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/gnome-applets/Portfile (124858 => 124859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gnome-applets/Portfile 2014-08-29 15:08:46 UTC (rev 124858)
+++ trunk/dports/gnome/gnome-applets/Portfile 2014-08-29 15:41:24 UTC (rev 124859)
</span><span class="lines">@@ -4,8 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name gnome-applets
</span><del>-version 3.5.92
-revision 2
</del><ins>+version 3.8.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">@@ -19,13 +18,14 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 aff6f3b134e5ddac18d7bc7f7bc1255645ac87fb \
- sha256 f6178cb702a39a4103fcb97e9a266bf6d05f05ac5064818f119c023d76170e83
</del><ins>+checksums rmd160 5eea874006b5c726fac94a2152749a628d924c82 \
+ sha256 c6dadf0050bbd5d8a1449236066244fecfaa1f11f9c6e526a2778b956ad0469f
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span><del>- port:gnome-doc-utils \
- port:gnome-common
</del><ins>+ port:gnome-common \
+ port:yelp-tools \
+ port:itstool
</ins><span class="cx">
</span><span class="cx"> depends_lib port:gnome-icon-theme \
</span><span class="cx"> port:gtk3 \
</span><span class="lines">@@ -37,15 +37,11 @@
</span><span class="cx"> port:libnotify \
</span><span class="cx"> port:policykit \
</span><span class="cx"> port:gucharmap \
</span><del>- port:libxml2 \
- port:rarian
</del><ins>+ port:upower \
+ port:libxml2
</ins><span class="cx">
</span><del>-patchfiles patch-configure.in.diff
</del><ins>+patchfiles patch-configure.ac.diff
</ins><span class="cx">
</span><del>-configure.cflags-append \
- -Wno-format-nonliteral \
- -Wno-missing-prototypes
-
</del><span class="cx"> post-patch {
</span><span class="cx"> reinplace "s|/usr/bin/env python|${configure.python}|" \
</span><span class="cx"> ${worksrcpath}/invest-applet/invest/chart.py \
</span><span class="lines">@@ -65,14 +61,14 @@
</span><span class="cx">
</span><span class="cx"> variant python26 conflicts python27 description {Use python 2.6} {
</span><span class="cx"> configure.python ${prefix}/bin/python2.6
</span><del>- depends_lib-append port:py26-gobject
</del><ins>+ depends_lib-append port:py26-gobject3
</ins><span class="cx"> set python_framework ${frameworks_dir}/Python.framework/Versions/2.6
</span><span class="cx"> configure.pkg_config_path ${python_framework}/lib/pkgconfig
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant python27 conflicts python26 description {Use python 2.7} {
</span><span class="cx"> configure.python ${prefix}/bin/python2.7
</span><del>- depends_lib-append port:py27-gobject
</del><ins>+ depends_lib-append port:py27-gobject3
</ins><span class="cx"> set python_framework ${frameworks_dir}/Python.framework/Versions/2.7
</span><span class="cx"> configure.pkg_config_path ${python_framework}/lib/pkgconfig
</span><span class="cx"> }
</span><span class="lines">@@ -81,7 +77,7 @@
</span><span class="cx"> default_variants +python27
</span><span class="cx"> }
</span><span class="cx">
</span><del>-configure.args --without-hal \
</del><ins>+configure.args --enable-compile-warnings=minimum \
</ins><span class="cx"> --disable-networkmanager \
</span><span class="cx"> --disable-mixer-applet \
</span><span class="cx"> --disable-battstat \
</span><span class="lines">@@ -89,15 +85,15 @@
</span><span class="cx"> --disable-frequency-selector \
</span><span class="cx"> --x-includes=${prefix}/include \
</span><span class="cx"> --x-libraries=${prefix}/lib \
</span><del>- --disable-scrollkeeper \
</del><ins>+ --disable-schemas-compile \
</ins><span class="cx"> --disable-schemas-install \
</span><span class="cx"> --disable-silent-rules
</span><span class="cx">
</span><span class="cx"> post-activate {
</span><del>- system "scrollkeeper-update"
</del><span class="cx"> system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><ins>+ system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
</ins><span class="cx"> system "export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` && \
</span><span class="cx"> gconftool-2 --makefile-install-rule ${prefix}/etc/gconf/schemas/*.schemas"
</span><span class="cx"> }
</span><span class="cx">
</span><del>-livecheck.type gnome-with-unstable
</del><ins>+livecheck.type gnome
</ins></span></pre></div>
<a id="trunkdportsgnomegnomeappletsfilespatchconfigureacdifffromrev124843trunkdportsgnomegnomeappletsfilespatchconfigureindiff"></a>
<div class="copfile"><h4>Copied: trunk/dports/gnome/gnome-applets/files/patch-configure.ac.diff (from rev 124843, trunk/dports/gnome/gnome-applets/files/patch-configure.in.diff) (0 => 124859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gnome-applets/files/patch-configure.ac.diff (rev 0)
+++ trunk/dports/gnome/gnome-applets/files/patch-configure.ac.diff 2014-08-29 15:41:24 UTC (rev 124859)
</span><span class="lines">@@ -0,0 +1,46 @@
</span><ins>+--- 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
+ AC_PATH_XTRA
+ AM_PATH_PYTHON(2.4)
++
++dnl Override PYTHON_PREFIX, PYTHON_EXEC_PREFIX and pythondir
++
++AC_SUBST([PYTHON_PREFIX], [`$PYTHON -c 'import sys; print sys.prefix;'`])
++AC_SUBST([PYTHON_EXEC_PREFIX], [`$PYTHON -c 'import sys; print sys.exec_prefix;'`])
++
++am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
++AC_SUBST([pythondir], [$am_cv_python_pythondir])
++
+ AM_CHECK_PYTHON_HEADERS(HAVE_PYHDRS="yes", HAVE_PYHDRS="no")
+
+ X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
+@@ -124,7 +133,7 @@
+
+ AC_ARG_WITH([libpanel-applet-dir], [], [LIBPANEL_APPLET_DIR=$withval], [LIBPANEL_APPLET_DIR=""])
+ if test "$LIBPANEL_APPLET_DIR" == ""; then
+- LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=libpanel_applet_dir libpanel-applet`
++ LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=libpanel_applet_dir libpanelapplet-4.0`
+ fi
+
+ AC_MSG_NOTICE([installing applets in $LIBPANEL_APPLET_DIR])
+@@ -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
</ins></span></pre></div>
<a id="trunkdportsgnomegnomeappletsfilespatchconfigureindiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/gnome/gnome-applets/files/patch-configure.in.diff (124858 => 124859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gnome-applets/files/patch-configure.in.diff 2014-08-29 15:08:46 UTC (rev 124858)
+++ trunk/dports/gnome/gnome-applets/files/patch-configure.in.diff 2014-08-29 15:41:24 UTC (rev 124859)
</span><span class="lines">@@ -1,30 +0,0 @@
</span><del>---- configure.in.orig 2013-09-11 06:04:34.000000000 -0700
-+++ configure.in 2013-09-11 06:06:29.000000000 -0700
-@@ -46,6 +46,15 @@
- AM_PROG_LIBTOOL
- AC_PATH_XTRA
- AM_PATH_PYTHON(2.4)
-+
-+dnl Override PYTHON_PREFIX, PYTHON_EXEC_PREFIX and pythondir
-+
-+AC_SUBST([PYTHON_PREFIX], [`$PYTHON -c 'import sys; print sys.prefix;'`])
-+AC_SUBST([PYTHON_EXEC_PREFIX], [`$PYTHON -c 'import sys; print sys.exec_prefix;'`])
-+
-+am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
-+AC_SUBST([pythondir], [$am_cv_python_pythondir])
-+
- AM_CHECK_PYTHON_HEADERS(HAVE_PYHDRS="yes", HAVE_PYHDRS="no")
-
- X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
-@@ -251,9 +260,9 @@
-
- dnl -- check for libgweather (required for gweather applet) ------------------
- build_libgweather_applets=false
--PKG_CHECK_MODULES(LIBGWEATHER, gweather-3.0 >= $GWEATHER_REQUIRED,
-+PKG_CHECK_MODULES(LIBGWEATHER, gweather-3.0 >= $GWEATHER_REQUIRED gweather-3.0 <= 3.7,
- build_libgweather_applets=true,
-- AC_MSG_WARN([libgweather not found. Not building the weather applet.]))
-+ AC_MSG_WARN([libgweather not found or version > 3.7. Not building the weather applet.]))
- AC_SUBST(LIBGWEATHER_CFLAGS)
- AC_SUBST(LIBGWEATHER_LIBS)
- AM_CONDITIONAL(BUILD_LIBGWEATHER_APPLETS, $build_libgweather_applets)
</del></span></pre>
</div>
</div>
</body>
</html>