Changeset 127612 for trunk/dports/gnome


Ignore:
Timestamp:
Oct 30, 2014, 5:18:17 PM (5 years ago)
Author:
devans@…
Message:

gnome-applets: update to version 3.14.0, requires python3 for invest applet, drop python variants, use python34.

Location:
trunk/dports/gnome/gnome-applets
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/gnome/gnome-applets

  • trunk/dports/gnome/gnome-applets/Portfile

    r127582 r127612  
    55
    66name                gnome-applets
    7 version             3.8.1
     7version             3.14.0
    88set branch          [join [lrange [split ${version} .] 0 1] .]
    99description         GNOME panel applets.
     
    1919use_xz              yes
    2020
    21 checksums           rmd160  6e08140e241eec4086675452b02ead5684ad321a \
    22                     sha256  c861a0be754024ea2ce6a3474fd367c0f3d69c2ea46f43c382fa7a69f2c40a7d
     21checksums           rmd160  318ce3956b33d21ed15ffb14075e1060d74a2089 \
     22                    sha256  0c035749936f5fdd12652c88f688ce723cb4f2228737dbf1fcd20c8f0d516423
    2323
    2424depends_build       port:pkgconfig \
     
    3030depends_lib         port:gnome-icon-theme \
    3131                    port:gtk3 \
    32                     port:gconf \
    3332                    port:gnome-panel \
    3433                    port:libgtop \
     
    3938                    port:gucharmap \
    4039                    port:upower \
    41                     port:libxml2
     40                    port:libxml2 \
     41                    port:py34-gobject3
    4242
    4343patchfiles          patch-configure.ac.diff
    4444
     45# invest applet requires python3
     46# use python34
     47
     48configure.python    ${prefix}/bin/python3.4
     49set python_framework ${frameworks_dir}/Python.framework/Versions/3.4
     50configure.pkg_config_path ${python_framework}/lib/pkgconfig
     51
    4552post-patch {
    46     reinplace "s|/usr/bin/env python|${configure.python}|" \
    47         ${worksrcpath}/invest-applet/invest/chart.py \
     53    reinplace "s|/usr/bin/python3|${configure.python}|" \
    4854        ${worksrcpath}/invest-applet/invest/invest-applet.py \
    4955        ${worksrcpath}/invest-applet/invest/invest-chart \
     
    6066autoreconf.args     -fvi
    6167
    62 variant python26 conflicts python27 description {Use python 2.6} {
    63     configure.python          ${prefix}/bin/python2.6
    64     depends_lib-append        port:py26-gobject3
    65     set python_framework      ${frameworks_dir}/Python.framework/Versions/2.6
    66     configure.pkg_config_path ${python_framework}/lib/pkgconfig
    67 }
    68 
    69 variant python27 conflicts python26 description {Use python 2.7} {
    70     configure.python          ${prefix}/bin/python2.7
    71     depends_lib-append        port:py27-gobject3
    72     set python_framework      ${frameworks_dir}/Python.framework/Versions/2.7
    73     configure.pkg_config_path ${python_framework}/lib/pkgconfig
    74 }
    75 
    76 if {![variant_isset python26]} {
    77     default_variants +python27
    78 }
    79 
    80 configure.args  --enable-compile-warnings=minimum \
    81                 --disable-networkmanager \
    82                 --disable-mixer-applet \
    83                 --disable-battstat \
    84                 --disable-cpufreq \
    85                 --disable-frequency-selector \
    86                 --x-includes=${prefix}/include \
    87                 --x-libraries=${prefix}/lib \
    88                 --disable-schemas-compile \
    89                 --disable-schemas-install \
    90                 --disable-silent-rules
     68configure.args      --enable-compile-warnings=minimum \
     69                    --disable-battstat \
     70                    --disable-cpufreq \
     71                    --disable-frequency-selector \
     72                    --x-includes=${prefix}/include \
     73                    --x-libraries=${prefix}/lib \
     74                    --disable-schemas-compile \
     75                    --disable-silent-rules
    9176
    9277post-activate {
    9378   system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
    9479   system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
    95    system "export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` && \
    96         gconftool-2 --makefile-install-rule ${prefix}/etc/gconf/schemas/*.schemas"
    9780}
    9881
  • trunk/dports/gnome/gnome-applets/files/patch-configure.ac.diff

    r124910 r127612  
    1 --- configure.ac.orig   2014-08-29 07:49:29.000000000 -0700
    2 +++ configure.ac        2014-08-29 07:50:15.000000000 -0700
    3 @@ -44,6 +44,15 @@
    4  AM_PROG_LIBTOOL
     1--- configure.ac.orig   2014-10-28 16:37:39.000000000 -0700
     2+++ configure.ac        2014-10-29 15:52:28.000000000 -0700
     3@@ -42,6 +42,17 @@
    54 AC_PATH_XTRA
    6  AM_PATH_PYTHON(2.4)
     5 AM_PATH_PYTHON(3)
     6 
     7+dnl Override standard python locations with MacPorts version specific ones
    78+
    8 +dnl Override PYTHON_PREFIX, PYTHON_EXEC_PREFIX and pythondir
    9 +
    10 +AC_SUBST([PYTHON_PREFIX], [`$PYTHON -c 'import sys; print sys.prefix;'`])
    11 +AC_SUBST([PYTHON_EXEC_PREFIX], [`$PYTHON -c 'import sys; print sys.exec_prefix;'`])
     9+AC_SUBST([PYTHON_PREFIX], [`$PYTHON -c 'import sys; print(sys.prefix);'`])
     10+AC_SUBST([PYTHON_EXEC_PREFIX], [`$PYTHON -c 'import sys; print(sys.exec_prefix)'`])
    1211+
    1312+am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
     13+am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
     14+
    1415+AC_SUBST([pythondir], [$am_cv_python_pythondir])
     16+AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
    1517+
    16  AM_CHECK_PYTHON_HEADERS(HAVE_PYHDRS="yes", HAVE_PYHDRS="no")
    17  
    1818 X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
    19 @@ -540,7 +549,8 @@
    20  dnl *** invest-applet specific checks                                       ***
    21  dnl ***************************************************************************
    22  
    23 -AM_CONDITIONAL(BUILD_INVEST_APPLET, test "x$HAVE_PYGOBJECT" = "xyes")
    24 +build_invest_applet=$HAVE_PYGOBJECT
    25 +AM_CONDITIONAL(BUILD_INVEST_APPLET, test "x$build_invest_applet" = "xyes")
    26  
    27  dnl ***************************************************************************
    28  dnl *** Check if IPv6 is available                                          ***
    29 @@ -723,7 +733,7 @@
    30          - drivemount                   always
    31          - geyes                        always
    32          - gweather                     $build_libgweather_applets
    33 -        - invest-applet                $BUILD_INVEST_APPLET
    34 +        - invest-applet                $build_invest_applet
    35          - mini-commander               $enable_mini_commander
    36          - modemlights                  $BUILD_MODEM_LIGHTS
    37          - mixer                        $enable_mixer
     19 AC_SUBST(X_LIBS)
Note: See TracChangeset for help on using the changeset viewer.