[124859] trunk/dports/gnome/gnome-applets

29 Aug 2014

Revision: 124859
          https://trac.macports.org/changeset/124859
Author:   devans@macports.org
Date:     2014-08-29 08:41:24 -0700 (Fri, 29 Aug 2014)
Log Message:
-----------
gnome-applets: update to version 3.8.0, dependencies, configuration.

Modified Paths:
--------------
    trunk/dports/gnome/gnome-applets/Portfile

Added Paths:
-----------
    trunk/dports/gnome/gnome-applets/files/patch-configure.ac.diff

Removed Paths:
-------------
    trunk/dports/gnome/gnome-applets/files/patch-configure.in.diff

Modified: trunk/dports/gnome/gnome-applets/Portfile
===================================================================

--- 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)
@@ -4,8 +4,7 @@
 PortSystem      1.0
 
 name            gnome-applets
-version         3.5.92
-revision        2
+version         3.8.0
 set branch      [join [lrange [split ${version} .] 0 1] .]
 description     GNOME panel applets.
 long_description This package contains applets for use with the \
@@ -19,13 +18,14 @@
 
 use_xz          yes
 
-checksums       rmd160  aff6f3b134e5ddac18d7bc7f7bc1255645ac87fb \
-                sha256  f6178cb702a39a4103fcb97e9a266bf6d05f05ac5064818f119c023d76170e83
+checksums       rmd160  5eea874006b5c726fac94a2152749a628d924c82 \
+                sha256  c6dadf0050bbd5d8a1449236066244fecfaa1f11f9c6e526a2778b956ad0469f
 
 depends_build   port:pkgconfig \
                 port:intltool \
-                port:gnome-doc-utils \
-                port:gnome-common
+                port:gnome-common \
+                port:yelp-tools \
+                port:itstool
 
 depends_lib     port:gnome-icon-theme \
                 port:gtk3 \
@@ -37,15 +37,11 @@
                 port:libnotify \
                 port:policykit \
                 port:gucharmap \
-                port:libxml2 \
-                port:rarian
+                port:upower \
+                port:libxml2
 
-patchfiles      patch-configure.in.diff
+patchfiles      patch-configure.ac.diff
 
-configure.cflags-append \
-                -Wno-format-nonliteral \
-                -Wno-missing-prototypes
-
 post-patch {
     reinplace "s|/usr/bin/env python|${configure.python}|" \
         ${worksrcpath}/invest-applet/invest/chart.py \
@@ -65,14 +61,14 @@
 
 variant python26 conflicts python27 description {Use python 2.6} {
     configure.python          ${prefix}/bin/python2.6
-    depends_lib-append        port:py26-gobject
+    depends_lib-append        port:py26-gobject3
     set python_framework      ${frameworks_dir}/Python.framework/Versions/2.6
     configure.pkg_config_path ${python_framework}/lib/pkgconfig
 }
 
 variant python27 conflicts python26 description {Use python 2.7} {
     configure.python          ${prefix}/bin/python2.7
-    depends_lib-append        port:py27-gobject
+    depends_lib-append        port:py27-gobject3
     set python_framework      ${frameworks_dir}/Python.framework/Versions/2.7
     configure.pkg_config_path ${python_framework}/lib/pkgconfig
 }
@@ -81,7 +77,7 @@
     default_variants +python27
 }
 
-configure.args  --without-hal \
+configure.args  --enable-compile-warnings=minimum \
                 --disable-networkmanager \
                 --disable-mixer-applet \
                 --disable-battstat \
@@ -89,15 +85,15 @@
                 --disable-frequency-selector \
                 --x-includes=${prefix}/include \
                 --x-libraries=${prefix}/lib \
-                --disable-scrollkeeper \
+                --disable-schemas-compile \
                 --disable-schemas-install \
                 --disable-silent-rules
 
 post-activate {
-   system "scrollkeeper-update"
    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-with-unstable
+livecheck.type  gnome

Copied: trunk/dports/gnome/gnome-applets/files/patch-configure.ac.diff (from rev 124843, trunk/dports/gnome/gnome-applets/files/patch-configure.in.diff)
===================================================================
--- 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)
@@ -0,0 +1,46 @@
+--- 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

Deleted: trunk/dports/gnome/gnome-applets/files/patch-configure.in.diff
===================================================================
--- 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)
@@ -1,30 +0,0 @@
---- 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)

    

devans＠macports.org

tags

participants (1)