[113292] trunk/dports/gnome/gnome-applets
devans at macports.org
devans at macports.org
Wed Nov 13 03:02:48 PST 2013
Revision: 113292
https://trac.macports.org/changeset/113292
Author: devans at macports.org
Date: 2013-11-13 03:02:47 -0800 (Wed, 13 Nov 2013)
Log Message:
-----------
gnome-applets: merge version 3.5.92 from GNOME-3 test branch.
Modified Paths:
--------------
trunk/dports/gnome/gnome-applets/Portfile
Added Paths:
-----------
trunk/dports/gnome/gnome-applets/files/patch-configure.in.diff
Removed Paths:
-------------
trunk/dports/gnome/gnome-applets/files/patch-configure.diff
Property Changed:
----------------
trunk/dports/gnome/gnome-applets/
Property changes on: trunk/dports/gnome/gnome-applets
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/mld-qt-481/dports/gnome/gnome-applets:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/devans/GNOME-3/stable/dports/gnome/gnome-applets:108276-113174
/users/rmstonecipher/gnome/gnome-applets:102363-103172
Modified: trunk/dports/gnome/gnome-applets/Portfile
===================================================================
--- trunk/dports/gnome/gnome-applets/Portfile 2013-11-13 11:02:25 UTC (rev 113291)
+++ trunk/dports/gnome/gnome-applets/Portfile 2013-11-13 11:02:47 UTC (rev 113292)
@@ -4,7 +4,7 @@
PortSystem 1.0
name gnome-applets
-version 2.32.0
+version 3.5.92
set branch [join [lrange [split ${version} .] 0 1] .]
description GNOME panel applets.
long_description This package contains applets for use with the \
@@ -16,73 +16,78 @@
homepage http://www.gnome.org/
master_sites gnome:sources/${name}/${branch}/
-use_bzip2 yes
+use_xz yes
-checksums rmd160 9a2a9e37a865c0cd88003cfd0d07272d61d9fcd3 \
- sha256 3b2611b3253ed5418f37c83d710918e93476a783637ddb4ef7e5eab7a83a4c1b
+checksums rmd160 aff6f3b134e5ddac18d7bc7f7bc1255645ac87fb \
+ sha256 f6178cb702a39a4103fcb97e9a266bf6d05f05ac5064818f119c023d76170e83
depends_build port:pkgconfig \
port:intltool \
- port:gnome-doc-utils
+ port:gnome-doc-utils \
+ port:gnome-common
depends_lib port:gnome-icon-theme \
+ port:gtk3 \
port:gconf \
- port:libpanel-applet2 \
port:gnome-panel \
- port:gnome-desktop \
port:libgtop \
- port:libgnomekbd \
port:gnome-settings-daemon \
- port:libwnck \
+ port:libwnck3 \
port:libnotify \
- port:policykit-gnome \
+ port:policykit \
port:gucharmap \
port:libxml2 \
port:libgweather \
- port:gstreamer010-gst-plugins-base
+ port:rarian
-patchfiles patch-configure.diff
+patchfiles patch-configure.in.diff
-variant python25 conflicts python26 python27 description {Use python 2.5} {
- configure.python ${prefix}/bin/python2.5
- depends_lib-append port:py25-pygtk
- set python_framework ${frameworks_dir}/Python.framework/Versions/2.5
- configure.pkg_config_path ${python_framework}/lib/pkgconfig
+post-patch {
+ reinplace "s|/usr/bin/env python|${configure.python}|" \
+ ${worksrcpath}/invest-applet/invest/chart.py \
+ ${worksrcpath}/invest-applet/invest/invest-applet.py \
+ ${worksrcpath}/invest-applet/invest/invest-chart \
+ ${worksrcpath}/invest-applet/invest/test.py
}
-variant python26 conflicts python25 python27 description {Use python 2.6} {
+use_autoreconf yes
+autoreconf.args -fvi
+
+variant python26 conflicts python27 description {Use python 2.6} {
configure.python ${prefix}/bin/python2.6
- depends_lib-append port:py26-pygtk
+ depends_lib-append port:py26-gobject
set python_framework ${frameworks_dir}/Python.framework/Versions/2.6
configure.pkg_config_path ${python_framework}/lib/pkgconfig
}
-variant python27 conflicts python25 python26 description {Use python 2.7} {
+variant python27 conflicts python26 description {Use python 2.7} {
configure.python ${prefix}/bin/python2.7
- depends_lib-append port:py27-pygtk
+ depends_lib-append port:py27-gobject
set python_framework ${frameworks_dir}/Python.framework/Versions/2.7
configure.pkg_config_path ${python_framework}/lib/pkgconfig
}
-if {![variant_isset python25] && ![variant_isset python26]} {
+if {![variant_isset python26]} {
default_variants +python27
}
configure.args --without-hal \
- --enable-mixer-applet \
+ --disable-networkmanager \
+ --disable-mixer-applet \
--disable-battstat \
--disable-cpufreq \
--disable-frequency-selector \
--x-includes=${prefix}/include \
--x-libraries=${prefix}/lib \
--disable-scrollkeeper \
- --disable-schemas-install
+ --disable-schemas-install \
+ --disable-silent-rules
post-activate {
system "scrollkeeper-update"
- system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
+ system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
system "export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` && \
gconftool-2 --makefile-install-rule ${prefix}/etc/gconf/schemas/*.schemas"
}
-livecheck.type gnome
+livecheck.type gnome-with-unstable
Deleted: trunk/dports/gnome/gnome-applets/files/patch-configure.diff
===================================================================
--- trunk/dports/gnome/gnome-applets/files/patch-configure.diff 2013-11-13 11:02:25 UTC (rev 113291)
+++ trunk/dports/gnome/gnome-applets/files/patch-configure.diff 2013-11-13 11:02:47 UTC (rev 113292)
@@ -1,14 +0,0 @@
---- configure.orig 2010-09-27 01:59:15.000000000 -0700
-+++ configure 2013-05-09 12:05:27.000000000 -0700
-@@ -13217,9 +13217,9 @@
-
-
-
-- PYTHON_PREFIX='${prefix}'
-+ PYTHON_PREFIX=`$PYTHON -c 'import sys; print sys.prefix;'`
-
-- PYTHON_EXEC_PREFIX='${exec_prefix}'
-+ PYTHON_EXEC_PREFIX=`$PYTHON -c 'import sys; print sys.exec_prefix;'`
-
-
-
Copied: trunk/dports/gnome/gnome-applets/files/patch-configure.in.diff (from rev 113174, users/devans/GNOME-3/stable/dports/gnome/gnome-applets/files/patch-configure.in.diff)
===================================================================
--- trunk/dports/gnome/gnome-applets/files/patch-configure.in.diff (rev 0)
+++ trunk/dports/gnome/gnome-applets/files/patch-configure.in.diff 2013-11-13 11:02:47 UTC (rev 113292)
@@ -0,0 +1,30 @@
+--- 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)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131113/c833e91d/attachment.html>
More information about the macports-changes
mailing list