[113247] trunk/dports/gnome/alacarte
devans at macports.org
devans at macports.org
Tue Nov 12 23:27:58 PST 2013
Revision: 113247
https://trac.macports.org/changeset/113247
Author: devans at macports.org
Date: 2013-11-12 23:27:58 -0800 (Tue, 12 Nov 2013)
Log Message:
-----------
alacarte: merge version 3.10.0 from GNOME-3 test branch.
Modified Paths:
--------------
trunk/dports/gnome/alacarte/Portfile
trunk/dports/gnome/alacarte/files/patch-Makefile.in.diff
trunk/dports/gnome/alacarte/files/patch-configure.diff
Added Paths:
-----------
trunk/dports/gnome/alacarte/files/patch-Alacarte-MenuEditor.py.diff
Property Changed:
----------------
trunk/dports/gnome/alacarte/
Property changes on: trunk/dports/gnome/alacarte
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/mld-qt-481/dports/gnome/alacarte:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/devans/GNOME-3/stable/dports/gnome/alacarte:108276-113174
/users/rmstonecipher/gnome/alacarte:102363-103172
Modified: trunk/dports/gnome/alacarte/Portfile
===================================================================
--- trunk/dports/gnome/alacarte/Portfile 2013-11-13 07:27:46 UTC (rev 113246)
+++ trunk/dports/gnome/alacarte/Portfile 2013-11-13 07:27:58 UTC (rev 113247)
@@ -1,12 +1,11 @@
# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
# $Id$
-PortSystem 1.0
+PortSystem 1.0
name alacarte
-version 0.13.2
+version 3.10.0
epoch 1
-revision 5
license GPL-2+
set branch [join [lrange [split ${version} .] 0 1] .]
description A simple freedesktop.org compliant menu editor for use with GNOME
@@ -20,11 +19,10 @@
homepage http://www.gnome.org/
master_sites gnome:sources/${name}/${branch}/
-use_bzip2 yes
+use_xz yes
-checksums md5 de84e437babebe036ab8dc9a518282ca \
- sha1 6eb6a0f308be0da84ead38fbfae0b247743f6038 \
- rmd160 97924d34e9d460267b6118a01488b635551a8aaa
+checksums rmd160 2ad11884d64d337d36cf222e29e1fe7781ea660b \
+ sha256 bdc91981859a5076ae38a213892074e1263629835702920d47f6ee2bb76179f1
supported_archs noarch
@@ -32,50 +30,53 @@
port:intltool
depends_lib port:desktop-file-utils \
- port:gtk2 \
+ port:gtk3 \
port:gnome-menus
depends_run port:gnome-settings-daemon \
port:yelp
patchfiles patch-Makefile.in.diff \
- patch-configure.diff
+ patch-configure.diff \
+ patch-Alacarte-MenuEditor.py.diff
-variant python25 conflicts python26 python27 description {Use python 2.5} {
- configure.python ${prefix}/bin/python2.5
- depends_lib-append port:py25-pygtk
+post-destroot {
+ move ${destroot}${prefix}/bin/alacarte.py ${destroot}${prefix}/bin/alacarte
}
-variant python26 conflicts python25 python27 description {Use python 2.6} {
- configure.python ${prefix}/bin/python2.6
- depends_lib-append port:py26-pygtk
+# python3 is not supported
+
+variant python26 description {Use python 2.6} {
+ depends_lib-append port:py26-gobject3
+ configure.python ${prefix}/bin/python2.6
+ set python_prefix ${frameworks_dir}/Python.framework/Versions/2.6
+ configure.pkg_config_path ${python_prefix}/lib/pkgconfig
}
-variant python27 conflicts python25 python26 description {Use python 2.7} {
- configure.python ${prefix}/bin/python2.7
- depends_lib-append port:py27-pygtk
+variant python27 description {Use python 2.7} {
+ depends_lib-append port:py27-gobject3
+ configure.python ${prefix}/bin/python2.7
+ set python_prefix ${frameworks_dir}/Python.framework/Versions/2.7
+ configure.pkg_config_path ${python_prefix}/lib/pkgconfig
}
-if {![variant_isset python25] && ![variant_isset python26]} {
+if {![variant_isset python26]} {
default_variants +python27
}
-post-destroot {
- file rename ${destroot}${prefix}/bin/alacarte.py ${destroot}${prefix}/bin/alacarte
-}
-
notes "
Be sure to set the following environment variables:
export XDG_DATA_DIRS=${prefix}/share
export XDG_CONFIG_DIRS=${prefix}/etc/xdg
+ export XDG_MENU_PREFIX=gnome-
Alacarte needs them to find installed applications and menus to edit.
"
post-activate {
system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
- 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"
}
livecheck.type gnome
Copied: trunk/dports/gnome/alacarte/files/patch-Alacarte-MenuEditor.py.diff (from rev 113174, users/devans/GNOME-3/stable/dports/gnome/alacarte/files/patch-Alacarte-MenuEditor.py.diff)
===================================================================
--- trunk/dports/gnome/alacarte/files/patch-Alacarte-MenuEditor.py.diff (rev 0)
+++ trunk/dports/gnome/alacarte/files/patch-Alacarte-MenuEditor.py.diff 2013-11-13 07:27:58 UTC (rev 113247)
@@ -0,0 +1,11 @@
+--- Alacarte/MenuEditor.py.orig 2013-11-06 20:24:01.000000000 -0800
++++ Alacarte/MenuEditor.py 2013-11-06 20:25:00.000000000 -0800
+@@ -24,7 +24,7 @@
+ from Alacarte import util
+
+ def get_default_menu():
+- prefix = os.environ.get('XDG_MENU_PREFIX', '')
++ prefix = os.environ.get('XDG_MENU_PREFIX', 'gnome-')
+ return prefix + 'applications.menu'
+
+ class MenuEditor(object):
Modified: trunk/dports/gnome/alacarte/files/patch-Makefile.in.diff
===================================================================
--- trunk/dports/gnome/alacarte/files/patch-Makefile.in.diff 2013-11-13 07:27:46 UTC (rev 113246)
+++ trunk/dports/gnome/alacarte/files/patch-Makefile.in.diff 2013-11-13 07:27:58 UTC (rev 113247)
@@ -1,6 +1,6 @@
---- Makefile.in.orig 2010-09-15 02:55:40.000000000 -0700
-+++ Makefile.in 2010-09-15 11:52:04.000000000 -0700
-@@ -253,8 +253,8 @@
+--- Makefile.in.orig 2013-09-24 10:08:35.000000000 -0700
++++ Makefile.in 2013-11-06 16:10:24.000000000 -0800
+@@ -356,8 +356,8 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = data po Alacarte
@@ -11,14 +11,14 @@
DISTCLEANFILES = ChangeLog
EXTRA_DIST = \
alacarte.in \
-@@ -785,11 +785,11 @@
- uninstall uninstall-am uninstall-binSCRIPTS
+@@ -867,11 +867,11 @@
+ tags-am uninstall uninstall-am uninstall-binSCRIPTS
-alacarte: alacarte.in
+alacarte.py: alacarte.in
- sed -e s!\@PYTHON\@!@PYTHON@! \
- -e s!\@PYOPTIONS\@!-OOt! \
+ $(AM_V_GEN)sed -e s!\@PYTHON\@!@PYTHON@! \
+ -e s!\@PYOPTIONS\@!-OOt! \
< $< > $@
-alacarte: Makefile
+alacarte.py: Makefile
Modified: trunk/dports/gnome/alacarte/files/patch-configure.diff
===================================================================
--- trunk/dports/gnome/alacarte/files/patch-configure.diff 2013-11-13 07:27:46 UTC (rev 113246)
+++ trunk/dports/gnome/alacarte/files/patch-configure.diff 2013-11-13 07:27:58 UTC (rev 113247)
@@ -1,50 +1,50 @@
---- configure.orig 2011-10-21 23:02:10.000000000 -0700
-+++ configure 2011-10-21 23:07:17.000000000 -0700
-@@ -5736,9 +5736,9 @@
+--- configure.orig 2013-09-24 10:08:36.000000000 -0700
++++ configure 2013-11-06 16:10:24.000000000 -0800
+@@ -5861,9 +5861,9 @@
- PYTHON_PREFIX='${prefix}'
-+ PYTHON_PREFIX=`$PYTHON -c 'import sys; print sys.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;'`
++ PYTHON_EXEC_PREFIX=`$PYTHON -c 'import sys; print(sys.exec_prefix);'`
-@@ -5811,9 +5811,9 @@
+@@ -5936,9 +5936,9 @@
- PYTHON_PREFIX='${prefix}'
-+ PYTHON_PREFIX=`$PYTHON -c 'import sys; print sys.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;'`
++ PYTHON_EXEC_PREFIX=`$PYTHON -c 'import sys; print(sys.exec_prefix);'`
-@@ -5886,9 +5886,9 @@
+@@ -6011,9 +6011,9 @@
- PYTHON_PREFIX='${prefix}'
-+ PYTHON_PREFIX=`$PYTHON -c 'import sys; print sys.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;'`
++ PYTHON_EXEC_PREFIX=`$PYTHON -c 'import sys; print(sys.exec_prefix);'`
-@@ -5961,9 +5961,9 @@
+@@ -6086,9 +6086,9 @@
- PYTHON_PREFIX='${prefix}'
-+ PYTHON_PREFIX=`$PYTHON -c 'import sys; print sys.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;'`
++ 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/20131112/767b1466/attachment.html>
More information about the macports-changes
mailing list