[127610] users/devans/GNOME-3/stable/dports/gnome/gnome-applets

devans at macports.org devans at macports.org
Thu Oct 30 10:00:16 PDT 2014


Revision: 127610
          https://trac.macports.org/changeset/127610
Author:   devans at macports.org
Date:     2014-10-30 10:00:16 -0700 (Thu, 30 Oct 2014)
Log Message:
-----------
GNOME-3/stable: gnome-applets, update to version 3.14.0, requires python3 for invest applet, drop python variants, use python34.

Modified Paths:
--------------
    users/devans/GNOME-3/stable/dports/gnome/gnome-applets/Portfile
    users/devans/GNOME-3/stable/dports/gnome/gnome-applets/files/patch-configure.ac.diff

Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-applets/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-applets/Portfile	2014-10-30 16:55:47 UTC (rev 127609)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-applets/Portfile	2014-10-30 17:00:16 UTC (rev 127610)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 
 name                gnome-applets
-version             3.8.1
+version             3.14.0
 set branch          [join [lrange [split ${version} .] 0 1] .]
 description         GNOME panel applets.
 long_description    This package contains applets for use with the \
@@ -18,8 +18,8 @@
 
 use_xz              yes
 
-checksums           rmd160  6e08140e241eec4086675452b02ead5684ad321a \
-                    sha256  c861a0be754024ea2ce6a3474fd367c0f3d69c2ea46f43c382fa7a69f2c40a7d
+checksums           rmd160  318ce3956b33d21ed15ffb14075e1060d74a2089 \
+                    sha256  0c035749936f5fdd12652c88f688ce723cb4f2228737dbf1fcd20c8f0d516423
 
 depends_build       port:pkgconfig \
                     port:intltool \
@@ -29,7 +29,6 @@
 
 depends_lib         port:gnome-icon-theme \
                     port:gtk3 \
-                    port:gconf \
                     port:gnome-panel \
                     port:libgtop \
                     port:gnome-settings-daemon \
@@ -38,13 +37,20 @@
                     port:policykit \
                     port:gucharmap \
                     port:upower \
-                    port:libxml2
+                    port:libxml2 \
+                    port:py34-gobject3
 
 patchfiles          patch-configure.ac.diff
 
+# 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
+
 post-patch {
-    reinplace "s|/usr/bin/env python|${configure.python}|" \
-        ${worksrcpath}/invest-applet/invest/chart.py \
+    reinplace "s|/usr/bin/python3|${configure.python}|" \
         ${worksrcpath}/invest-applet/invest/invest-applet.py \
         ${worksrcpath}/invest-applet/invest/invest-chart \
         ${worksrcpath}/invest-applet/invest/test.py
@@ -59,41 +65,18 @@
 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-gobject3
-    set python_framework      ${frameworks_dir}/Python.framework/Versions/2.6
-    configure.pkg_config_path ${python_framework}/lib/pkgconfig
-}
+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
 
-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
-
 post-activate {
    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
    system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
-   system "export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` && \
-        gconftool-2 --makefile-install-rule ${prefix}/etc/gconf/schemas/*.schemas"
 }
 
 livecheck.type      gnome

Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-applets/files/patch-configure.ac.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-applets/files/patch-configure.ac.diff	2014-10-30 16:55:47 UTC (rev 127609)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-applets/files/patch-configure.ac.diff	2014-10-30 17:00:16 UTC (rev 127610)
@@ -1,37 +1,19 @@
---- 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
+--- 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 @@
  AC_PATH_XTRA
- AM_PATH_PYTHON(2.4)
+ AM_PATH_PYTHON(3)
+ 
++dnl Override standard python locations with MacPorts version specific ones
 +
-+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)'`])
 +
-+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
++am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
++
 +AC_SUBST([pythondir], [$am_cv_python_pythondir])
++AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
 +
- AM_CHECK_PYTHON_HEADERS(HAVE_PYHDRS="yes", HAVE_PYHDRS="no")
- 
  X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
-@@ -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
+ AC_SUBST(X_LIBS)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141030/ea32ea6f/attachment-0001.html>


More information about the macports-changes mailing list