[113290] trunk/dports/gnome/gnome-panel
devans at macports.org
devans at macports.org
Wed Nov 13 03:02:10 PST 2013
Revision: 113290
https://trac.macports.org/changeset/113290
Author: devans at macports.org
Date: 2013-11-13 03:02:10 -0800 (Wed, 13 Nov 2013)
Log Message:
-----------
gnome-panel: merge version 3.8.0 from GNOME-3 test branch.
Modified Paths:
--------------
trunk/dports/gnome/gnome-panel/Portfile
Added Paths:
-----------
trunk/dports/gnome/gnome-panel/files/patch-configure.diff
Removed Paths:
-------------
trunk/dports/gnome/gnome-panel/files/gmodule.patch
Property Changed:
----------------
trunk/dports/gnome/gnome-panel/
Property changes on: trunk/dports/gnome/gnome-panel
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/mld-qt-481/dports/gnome/gnome-panel:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/devans/GNOME-3/stable/dports/gnome/gnome-panel:108276-113174
/users/rmstonecipher/gnome/gnome-panel:102363-103172
Modified: trunk/dports/gnome/gnome-panel/Portfile
===================================================================
--- trunk/dports/gnome/gnome-panel/Portfile 2013-11-13 11:01:48 UTC (rev 113289)
+++ trunk/dports/gnome/gnome-panel/Portfile 2013-11-13 11:02:10 UTC (rev 113290)
@@ -4,7 +4,7 @@
PortSystem 1.0
name gnome-panel
-version 2.32.1
+version 3.8.0
set branch [join [lrange [split ${version} .] 0 1] .]
maintainers devans openmaintainer
categories gnome
@@ -18,56 +18,52 @@
homepage http://www.gnome.org/
master_sites gnome:sources/${name}/${branch}/
-use_bzip2 yes
+use_xz yes
-checksums rmd160 03a440cee7e219b42a0375ae2d2d53fbd17b604b \
- sha256 8f7828eb7a21c817a73b697844a4e20256059b32386414a10f97d51e7d9fca5f
+checksums rmd160 b6bd10681666b0aece2e47ce81cf2f0297dc0004 \
+ sha256 d1cda458a38cb4f7d2a50c61b1a72f4bf4c39cab65ae0e6cfdc4e0c122252e7a
depends_build port:pkgconfig \
- port:intltool \
- port:gnome-common \
- port:gnome-doc-utils \
- port:gtk-doc \
- port:shared-mime-info
+ port:intltool
depends_lib port:desktop-file-utils \
+ port:gtk3 \
+ port:gconf \
+ port:dconf \
port:gnome-desktop \
port:gnome-menus \
- port:policykit-gnome \
- port:libbonoboui \
- port:libcanberra \
+ port:telepathy-glib \
+ port:policykit \
port:libgweather \
port:librsvg \
- port:libwnck
+ port:libwnck3 \
+ port:xorg-libX11 \
+ port:xorg-libXau \
+ port:xorg-libice \
+ port:xorg-libsm \
+ port:xorg-libXrandr
depends_run port:gnome-settings-daemon \
port:yelp
-patchfiles gmodule.patch
+patchfiles patch-configure.diff
-use_autoreconf yes
-autoreconf.args -fvi
-
-configure.args --x-includes=${prefix}/include \
- --x-libraries=${prefix}/lib \
- --with-in-process-applets=all \
- --disable-scrollkeeper \
+configure.cflags-append \
+ -Wno-format-nonliteral
+
+configure.args --with-in-process-applets=all \
+ --enable-introspection=yes \
+ --enable-telepathy-glib \
--disable-silent-rules \
- --disable-bonobo \
--disable-network-manager \
--disable-eds \
--disable-schemas-install \
- --enable-introspection=yes
+ --disable-schemas-compile
# gobject-introspection uses g-ir-scanner, which uses $CC from env
build.args-append CC="${configure.cc} ${configure.cc_archflags}"
-variant python25 conflicts python26 python27 description {Build using Python 2.5} {
- configure.python ${prefix}/bin/python2.5
- depends_build-append port:python25
-}
-
variant python26 conflicts python25 python27 description {Build using Python 2.6} {
configure.python ${prefix}/bin/python2.6
depends_build-append port:python26
@@ -78,7 +74,7 @@
depends_build-append port:python27
}
-if {![variant_isset python25] && ![variant_isset python26]} {
+if {![variant_isset python26]} {
default_variants +python27
}
@@ -87,14 +83,14 @@
configure.args-delete --disable-eds
}
+if {[variant_isset eds]} {
+ universal_variant no
+}
+
post-activate {
- system " \
- export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`&&\
- gconftool-2 --makefile-install-rule \
- ${prefix}/etc/gconf/schemas/*.schemas"
- system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
- system "${prefix}/bin/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"
}
livecheck.type gnome
Deleted: trunk/dports/gnome/gnome-panel/files/gmodule.patch
===================================================================
--- trunk/dports/gnome/gnome-panel/files/gmodule.patch 2013-11-13 11:01:48 UTC (rev 113289)
+++ trunk/dports/gnome/gnome-panel/files/gmodule.patch 2013-11-13 11:02:10 UTC (rev 113290)
@@ -1,11 +0,0 @@
---- configure.ac.orig 2013-06-29 13:37:57.000000000 -0700
-+++ configure.ac 2013-06-29 13:39:14.000000000 -0700
-@@ -76,7 +76,7 @@ dnl pkg-config dependency checks
-
- PKG_CHECK_MODULES(EGG_SMCLIENT, ice sm gtk+-2.0)
-
--PKG_CHECK_MODULES(PANEL, gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED libcanberra-gtk dbus-glib-1 >= $DBUS_GLIB_REQUIRED)
-+PKG_CHECK_MODULES(PANEL, gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gmodule-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED libcanberra-gtk dbus-glib-1 >= $DBUS_GLIB_REQUIRED)
- AC_SUBST(PANEL_CFLAGS)
- AC_SUBST(PANEL_LIBS)
-
Copied: trunk/dports/gnome/gnome-panel/files/patch-configure.diff (from rev 113174, users/devans/GNOME-3/stable/dports/gnome/gnome-panel/files/patch-configure.diff)
===================================================================
--- trunk/dports/gnome/gnome-panel/files/patch-configure.diff (rev 0)
+++ trunk/dports/gnome/gnome-panel/files/patch-configure.diff 2013-11-13 11:02:10 UTC (rev 113290)
@@ -0,0 +1,14 @@
+--- configure.orig 2013-09-25 09:14:35.000000000 -0700
++++ configure 2013-09-26 10:15:03.000000000 -0700
+@@ -13100,9 +13100,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;'`
+
+
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131113/1a9a7f78/attachment.html>
More information about the macports-changes
mailing list