diff options
| author |   Chris Mayo <aklhfex@gmail.com> | 2017-01-19 20:11:52 +0000 |
|---|---|---|
| committer |   David Seifert <soap@gentoo.org> | 2017-01-20 10:57:40 +0100 |
| commit | a86031ea832f089e34eb518858d1df8d9c426655 (patch) | |
| tree | 0a4669e2fa80bbca28b38926f7b2625f1d1ce837 /x11-misc/menumaker/files | |
| parent | media-libs/libass: x86 stable wrt bug #596422 (diff) | |
| download | gentoo-a86031ea832f089e34eb518858d1df8d9c426655.tar.gz gentoo-a86031ea832f089e34eb518858d1df8d9c426655.tar.bz2 gentoo-a86031ea832f089e34eb518858d1df8d9c426655.zip | |
x11-misc/menumaker: bump to 0.99.10
Package-Manager: portage-2.3.3
Closes: https://github.com/gentoo/gentoo/pull/3547
Diffstat (limited to 'x11-misc/menumaker/files')
| -rw-r--r-- | x11-misc/menumaker/files/menumaker-0.99.10-AM_PATH_PYTHON.patch | 100 |
1 files changed, 100 insertions, 0 deletions
diff --git a/x11-misc/menumaker/files/menumaker-0.99.10-AM_PATH_PYTHON.patch b/x11-misc/menumaker/files/menumaker-0.99.10-AM_PATH_PYTHON.patch new file mode 100644 index 000000000000..8e645a8b2fbc --- /dev/null +++ b/x11-misc/menumaker/files/menumaker-0.99.10-AM_PATH_PYTHON.patch @@ -0,0 +1,100 @@ +Use AM_PATH_PYTHON instead of broken hacks + +--- a/configure.ac ++++ b/configure.ac +@@ -1,23 +1,13 @@ +-AC_INIT(MenuMaker, 0.99.10) ++AC_INIT([MenuMaker], [0.99.10]) + + AM_INIT_AUTOMAKE + +-#AZ_PYTHON_DEFAULT ++AM_PATH_PYTHON + +-#AZ_PYTHON_WITH +- +-#if test -z "$PYTHON"; then +-# AZ_PYTHON_PATH +-#fi +- +-#AZ_PYTHON_VERSION_ENSURE([2.7]) +- +-#AZ_PYTHON_RUN +- +-AX_PYTHON +- +-AC_CONFIG_FILES([Makefile]) +-AC_CONFIG_FILES([doc/Makefile]) +-AC_CONFIG_FILES([Config.py]) ++AC_CONFIG_FILES([ ++ Makefile ++ doc/Makefile ++ Config.py ++]) + + AC_OUTPUT +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,15 +1,53 @@ +-ACLOCAL_AMFLAGS = -I m4 +- + SUBDIRS = doc + + dist_bin_SCRIPTS = mmaker + +-nobase_dist_pkgdata_DATA = *.py MenuMaker/*.py Prophet/*.py Prophet/Desktop/*.py Prophet/Legacy/*.py Prophet/Debian/*.py Prophet/Debian/menu/* ++python_PYTHON = \ ++ Config.py \ ++ Keywords.py \ ++ Paths.py ++ ++pythonMenuMakerdir = $(pythondir)/MenuMaker ++pythonMenuMaker_PYTHON = \ ++ MenuMaker/BlackBox.py \ ++ MenuMaker/CLI.py \ ++ MenuMaker/Deskmenu.py \ ++ MenuMaker/FluxBox.py \ ++ MenuMaker/IceWM.py \ ++ MenuMaker/__init__.py \ ++ MenuMaker/OpenBox3.py \ ++ MenuMaker/PekWM.py \ ++ MenuMaker/WindowMaker.py \ ++ MenuMaker/xBox.py \ ++ MenuMaker/Xfce4.py ++ ++pythonProphetdir = $(pythondir)/Prophet ++pythonProphet_PYTHON = \ ++ Prophet/Categories.py \ ++ Prophet/__init__.py ++ ++pythonProphetDesktopdir = $(pythondir)/Prophet/Desktop ++pythonProphetDesktop_PYTHON = \ ++ Prophet/Desktop/__init__.py ++ ++pythonProphetLegacydir = $(pythondir)/Prophet/Legacy ++pythonProphetLegacy_PYTHON = \ ++ Prophet/Legacy/Development.py \ ++ Prophet/Legacy/Editor.py \ ++ Prophet/Legacy/Emulator.py \ ++ Prophet/Legacy/Graphics.py \ ++ Prophet/Legacy/__init__.py \ ++ Prophet/Legacy/Multimedia.py \ ++ Prophet/Legacy/Network.py \ ++ Prophet/Legacy/Shell.py + +-install-exec-local : +- echo "#!/usr/bin/env $(PYTHON_BIN)" > $(DESTDIR)/$(bindir)/mmaker +- echo "import sys; sys.path = ['$(pkgdatadir)'] + sys.path" >> $(DESTDIR)/$(bindir)/mmaker +- echo "import MenuMaker.CLI" >> $(DESTDIR)/$(bindir)/mmaker ++pythonProphetDebiandir = $(pythondir)/Prophet/Debian ++pythonProphetDebian_PYTHON = \ ++ Prophet/Debian/__init__.py + +-install-data-local : +- $(PYTHON) -c 'import compileall; compileall.compile_dir(dir="$(DESTDIR)/$(pkgdatadir)", ddir="$(pkgdatadir)")' ++pythonProphetDebianMenudir = $(pythondir)/Prophet/Debian/menu ++dist_pythonProphetDebianMenu_DATA = \ ++ Prophet/Debian/menu/debian-2.2r5 \ ++ Prophet/Debian/menu/debian-8.1 \ ++ Prophet/Debian/menu/ubuntu-5.04 \ ++ Prophet/Debian/menu/ubuntu-5.10 |