From eee156e480a0f5b5f89e94c9f59bb90e4bdd3cf9 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 16 May 2019 11:46:04 +0200 Subject: [PATCH] guake: update to 3.6.3. --- srcpkgs/guake/patches/Makefile.patch | 20 +++++++++++ srcpkgs/guake/patches/guake-3.4.0-paths.patch | 14 -------- srcpkgs/guake/template | 33 ++++++------------- 3 files changed, 30 insertions(+), 37 deletions(-) create mode 100644 srcpkgs/guake/patches/Makefile.patch delete mode 100644 srcpkgs/guake/patches/guake-3.4.0-paths.patch diff --git a/srcpkgs/guake/patches/Makefile.patch b/srcpkgs/guake/patches/Makefile.patch new file mode 100644 index 00000000000..0954d42ddf4 --- /dev/null +++ b/srcpkgs/guake/patches/Makefile.patch @@ -0,0 +1,20 @@ +--- Makefile 2019-05-13 11:17:56.000000000 +0200 ++++ - 2019-05-16 12:20:46.201213757 +0200 +@@ -86,7 +86,7 @@ + + @if [ -f guake/paths.py.dev ]; then rm -f guake/paths.py.dev; fi + @if [ -f guake/paths.py ]; then mv guake/paths.py guake/paths.py.dev; fi +- @cp -f guake/paths.py.in guake/paths.py ++ -@cp -f guake/paths.py.in guake/paths.py + @sed -i -e 's|{{ LOCALE_DIR }}|"$(localedir)"|g' guake/paths.py + @sed -i -e 's|{{ IMAGE_DIR }}|"$(IMAGE_DIR)"|g' guake/paths.py + @sed -i -e 's|{{ GLADE_DIR }}|"$(GLADE_DIR)"|g' guake/paths.py +@@ -397,7 +397,7 @@ + + generate-paths: + @echo "Generating path.py..." +- @cp -f guake/paths.py.in guake/paths.py ++ -@cp -f guake/paths.py.in guake/paths.py + @# Generic + @sed -i -e 's|{{ LOGIN_DESTOP_PATH }}|""|g' guake/paths.py + @sed -i -e 's|{{ AUTOSTART_FOLDER }}|""|g' guake/paths.py diff --git a/srcpkgs/guake/patches/guake-3.4.0-paths.patch b/srcpkgs/guake/patches/guake-3.4.0-paths.patch deleted file mode 100644 index 23240906e38..00000000000 --- a/srcpkgs/guake/patches/guake-3.4.0-paths.patch +++ /dev/null @@ -1,14 +0,0 @@ -https://bugs.gentoo.org/667878 -https://github.com/Guake/guake/issues/1436 - ---- guake/paths.py -+++ guake/paths.py -@@ -35,7 +35,7 @@ - - - def get_data_files_dir(): -- d = os.path.dirname(os.path.dirname(sys.modules["guake"].__file__)) -+ d = os.path.dirname(sys.modules["guake"].__file__) - p = os.path.basename(os.path.abspath(os.path.join(d, ".."))) - if p in ["site-packages", "dist-packages"]: - # current "guake" package has been installed in a prefix structure (/usr, /usr/local or diff --git a/srcpkgs/guake/template b/srcpkgs/guake/template index 3c9999d3457..d3490e55e1b 100644 --- a/srcpkgs/guake/template +++ b/srcpkgs/guake/template @@ -1,29 +1,28 @@ # Template file for 'guake' pkgname=guake -version=3.5.0 +version=3.6.3 revision=1 archs=noarch build_style=python3-module +wrksrc="Guake-${version}" pycompile_module="guake" hostmakedepends="python3-setuptools" makedepends="python3-devel python3-pbr" depends="desktop-file-utils libkeybinder3 libnotify python3-dbus python3-gobject - python3-pbr vte3" + python3-pbr vte3 libwnck" checkdepends="python3-flake8 python3-pylint python3-pytest python3-pipenv" short_desc="Drop-down terminal for GNOME" maintainer="Orphaned " license="GPL-2.0-or-later" homepage="http://guake-project.org/" -distfiles="https://github.com/Guake/guake/archive/${version}.tar.gz" -checksum=6de0c1f7bfe07eded14a50a6841f1d762a025f1826a1054ae1b5b0328faec108 - -post_extract() { - export PBR_VERSION=5.1.3 - make generate-paths generate-mo -} +distfiles="${PYPI_SITE}/G/Guake/Guake-${version}.tar.gz" +checksum=dabfb58070c721b3e2d8fc9621afdd9de74ed7929d2453a9d08058baab5b7791 pre_build() { - export PBR_VERSION=5.1.3 + GUAKE_SCHEMA_DIR="/usr/share/glib-2.0/schemas" + make generate-desktop generate-mo prefix=/usr COMPILE_SCHEMA=0 + make generate-paths prefix=/usr DATA_DIR='$(datadir)/guake' DEV_SCHEMA_DIR='$(gsettingsschemadir)' COMPILE_SCHEMA=0 + sed -i -e '/^SCHEMA_DIR/s|get_default_schema_dir()|"'"${GUAKE_SCHEMA_DIR}"'"|g' guake/paths.py } do_check() { @@ -32,17 +31,5 @@ do_check() { } pre_install() { - export PBR_VERSION=5.1.1 - make prefix=/usr DESTDIR=${DESTDIR} install-locale -} - -post_install() { - vmkdir usr/share/applications - vmkdir usr/share/pixmaps - ln -s ../guake/data/guake.template.desktop \ - ${DESTDIR}/usr/share/applications/guake.desktop - ln -s ../guake/data/guake-prefs.template.desktop \ - ${DESTDIR}/usr/share/applications/guake-prefs.desktop - ln -s ../guake/data/pixmaps/guake.png \ - ${DESTDIR}/usr/share/pixmaps/guake.png + make prefix=/usr DESTDIR=${DESTDIR} COMPILE_SCHEMA=0 install-locale install-schemas }