From 8d5f730b34f25e851d4a620aa8b9f95cb0e1a618 Mon Sep 17 00:00:00 2001 From: David Guglielmi Date: Sat, 31 Mar 2018 18:02:34 +0200 Subject: [PATCH] x11-misc/plank: port to EAPI 6, drop intltool requirement --- x11-misc/plank/Manifest | 8 +- ...ank-0.11.4-drop-intltool-requirement.patch | 554 ++++++++++++++++++ ...k-0.11.3.ebuild => plank-0.11.4-r1.ebuild} | 15 +- 3 files changed, 567 insertions(+), 10 deletions(-) create mode 100644 x11-misc/plank/files/plank-0.11.4-drop-intltool-requirement.patch rename x11-misc/plank/{plank-0.11.3.ebuild => plank-0.11.4-r1.ebuild} (79%) diff --git a/x11-misc/plank/Manifest b/x11-misc/plank/Manifest index 98b5a38..209eece 100644 --- a/x11-misc/plank/Manifest +++ b/x11-misc/plank/Manifest @@ -1,4 +1,4 @@ -DIST plank-0.11.3.tar.xz 1019036 SHA256 7f091e3aca4b13e3507bb573c532973bdf4695289f8d1f095501adbed0f15608 SHA512 1d9057a743bd3bb9bf79e627ec1a4ceca32665c7a48c29dfae2f2d6d20130180e2aba8dad16a8adae0b96c3eb10c9d0dbcc62243770801e348c7d92d4581bf20 WHIRLPOOL bbf0a394bf4ad3e54a23878e3a4ddc3caf812b599554583aaf443c567e5c1709464ff1e8ce1b6023d78c5ddeff0f4f232fc051a96e2a51a649a28c1dc8671ae0 -DIST plank-0.11.4.tar.xz 1022640 SHA256 88b5cd6a84e67395df5e7cc1869521126830be0e8a509b28ee12e2db0b8981b8 SHA512 178d78ecb6a6cc66237b4024a10db135626cd1623717c8e218f0ba3b630af1868bc8c174b5c87ab7762c3b62837d2554cadd44b2731edc03f965441d48ccaa77 WHIRLPOOL d03eb11a6b0c7fd21cb96cb1a76b4de3cba3373f1b76205743ea144ab862bc45d7f45e9ba2fa4d9fa55f8b9488be3d7dd4ec0a72e8ebaec59fbf6c13617d6f10 -EBUILD plank-0.11.3.ebuild 834 SHA256 5148c2d155dcaebc99d8fcc1ee35f3ef231ed3cb9dfea8377c139c74997c7c7e SHA512 bb8394529d02ab7eee2d46f7f61a33e3cb1d97fb99f7b3b43c21989f673ec6e6e9edda190ee8c7a94d66e0e1d57a0ac742ae254028ec88fbd9a9a9c6de7661f1 WHIRLPOOL e4065ca253e5ac46a3d6778473c2fe6eb496654cac636dd253c255a945aa4eabea4c38e55e7d6470444bc9b46875fa7d8edaf9c996f49c969ee2d2ecad1ec388 -EBUILD plank-0.11.4.ebuild 834 SHA256 5148c2d155dcaebc99d8fcc1ee35f3ef231ed3cb9dfea8377c139c74997c7c7e SHA512 bb8394529d02ab7eee2d46f7f61a33e3cb1d97fb99f7b3b43c21989f673ec6e6e9edda190ee8c7a94d66e0e1d57a0ac742ae254028ec88fbd9a9a9c6de7661f1 WHIRLPOOL e4065ca253e5ac46a3d6778473c2fe6eb496654cac636dd253c255a945aa4eabea4c38e55e7d6470444bc9b46875fa7d8edaf9c996f49c969ee2d2ecad1ec388 +AUX plank-0.11.4-drop-intltool-requirement.patch 21276 BLAKE2B 7da9a602e7facfc88b9ec5b53e66560fbcc683f9ee4e576d4179be8fbb7607afb7540ae5501bdc8837111abb4e7d3e95698f23040e4a4f142b44a68e907e85f4 SHA512 566c593bfed46b1b44dfbeb69e1bc21900cb4043cd8f21c2cdec5994bf9666228e43f620df8d4e4d645600bebe28c2e0339d6ecd502035abcc367ad9ade395c7 +DIST plank-0.11.4.tar.xz 1022640 BLAKE2B 9a33759e32fb9af9884b530776ebcb59a67efbf6908ba7a493c6863a3c3f26a919e972600a73c4225ab0ec80b44586ad33fa57446ca1b5d96c7d295a25b73e9a SHA512 178d78ecb6a6cc66237b4024a10db135626cd1623717c8e218f0ba3b630af1868bc8c174b5c87ab7762c3b62837d2554cadd44b2731edc03f965441d48ccaa77 +EBUILD plank-0.11.4-r1.ebuild 887 BLAKE2B abd21fc2936b317debd193559582bc218cfd5c938eef893257288ad2dcf5746da622bcdbdde2a8296061ded322a11971d43c7301343d9308778ca88751f6a527 SHA512 89be2f3512ba75c17352b30b5196c780a2a2749c660971f8b40686f0183ec2c9d7a831a5a674d1eb9b2732890b170da7e6696c90e82e630b0ee178e1f814e874 +EBUILD plank-0.11.4.ebuild 834 BLAKE2B 1b9b4f1ce94a1f14d33ebddd65ae393270ff1896e822a7bfd0f0046debfb3fedd2ecae2b1d88ab7fa7a9ecc8e9ba385b4e62bbf17af256f306497f0d3bbbf689 SHA512 bb8394529d02ab7eee2d46f7f61a33e3cb1d97fb99f7b3b43c21989f673ec6e6e9edda190ee8c7a94d66e0e1d57a0ac742ae254028ec88fbd9a9a9c6de7661f1 diff --git a/x11-misc/plank/files/plank-0.11.4-drop-intltool-requirement.patch b/x11-misc/plank/files/plank-0.11.4-drop-intltool-requirement.patch new file mode 100644 index 0000000..520ea20 --- /dev/null +++ b/x11-misc/plank/files/plank-0.11.4-drop-intltool-requirement.patch @@ -0,0 +1,554 @@ +From 764e2ff83126242b8b69d218c3d91883b0ec423b Mon Sep 17 00:00:00 2001 +From: Rico Tzschichholz +Date: Wed, 29 Mar 2017 15:03:56 +0200 +Subject: Drop intltool requirement and use gettext >= 0.19.6 only + + +diff --git a/autogen.sh b/autogen.sh +index 634216f..b49ccf1 100755 +--- a/autogen.sh ++++ b/autogen.sh +@@ -20,7 +20,6 @@ fi + + set -x + aclocal --install || exit 1 +-intltoolize --force --copy --automake || exit 1 + autoreconf --verbose --force --install -Wno-portability || exit 1 + set +x + +diff --git a/configure.ac b/configure.ac +index bf58be7..da0a788 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -57,6 +57,13 @@ AC_PROG_CXX + AC_PROG_CXX_C_O + AC_PROG_INSTALL + ++GETTEXT_PACKAGE=AC_PACKAGE_NAME ++AC_SUBST(GETTEXT_PACKAGE) ++AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"], [Define the gettext package to be used]) ++ ++AM_GNU_GETTEXT_VERSION([0.19.6]) ++AM_GNU_GETTEXT([external]) ++ + LT_PREREQ([2.2.6]) + LT_INIT([disable-static]) + PKG_PROG_PKG_CONFIG([0.21]) +@@ -347,21 +354,11 @@ fi + + + # ----------------------------------------------------------- +-# Gettext +-# ----------------------------------------------------------- +-GETTEXT_PACKAGE=AC_PACKAGE_NAME +-AC_SUBST(GETTEXT_PACKAGE) +-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"], [Define the gettext package to be used]) +-IT_PROG_INTLTOOL([0.35.0]) +- +- +-# ----------------------------------------------------------- + # Final output + # ----------------------------------------------------------- + AC_CONFIG_FILES([ + Makefile + data/Makefile +-data/net.launchpad.plank.gschema.xml.in + data/apport/Makefile + data/icons/Makefile + data/themes/Makefile +diff --git a/data/Makefile.am b/data/Makefile.am +index 89dfa51..141fbd7 100644 +--- a/data/Makefile.am ++++ b/data/Makefile.am +@@ -12,7 +12,7 @@ endif + EXTRA_DIST = \ + application-default-icon.svg \ + plank.appdata.xml.in \ +- net.launchpad.plank.gschema.xml.in.in \ ++ net.launchpad.plank.gschema.xml.in \ + plank.desktop.in \ + plank.gresource.xml \ + poof.svg \ +@@ -25,20 +25,19 @@ CLEANFILES = \ + $(gsettings_SCHEMAS) \ + gschemas.compiled \ + net.launchpad.plank.gschema.valid \ +- net.launchpad.plank.gschema.xml.in \ + $(NULL) + + applicationsdir = $(datadir)/applications + applications_DATA = plank.desktop + +-@INTLTOOL_DESKTOP_RULE@ +- + appdatadir = $(datadir)/appdata + appdata_DATA = plank.appdata.xml + + gsettings_SCHEMAS = net.launchpad.plank.gschema.xml + +-@INTLTOOL_XML_RULE@ ++%.gschema.xml: %.gschema.xml.in Makefile ++ $(AM_V_GEN) sed -e 's|@GETTEXT_PACKAGE[@]|$(GETTEXT_PACKAGE)|g' \ ++ $< > $@ || rm $@ + + @GSETTINGS_RULES@ + +@@ -47,3 +46,10 @@ gschemas.compiled: Makefile $(gsettings_SCHEMAS:.xml=.valid) + + all-local: gschemas.compiled + ++%.desktop: %.desktop.in ++ $(AM_V_GEN)$(MSGFMT) --desktop --keyword= --keyword=Name \ ++ --keyword=GenericName --keyword=Comment --keyword=Keywords \ ++ --template $< -d $(top_srcdir)/po -o $@ ++ ++%.appdata.xml: %.appdata.xml.in ++ $(AM_V_GEN)$(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@ +diff --git a/data/net.launchpad.plank.gschema.xml.in b/data/net.launchpad.plank.gschema.xml.in +new file mode 100644 +index 0000000..e122aec +--- /dev/null ++++ b/data/net.launchpad.plank.gschema.xml.in +@@ -0,0 +1,143 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ['dock1'] ++ Array of names of active/enabled docks ++ Contains the names of docks which are created and loaded on start up ++ ++ ++ ++ ++ ++ 'center' ++ The alignment for the dock along the monitor's edge ++ Possible values are "fill", "start", "end", and "center". ++ ++ ++ true ++ Automatically pin an application if it seems useful to do ++ If true, automatically pin applications when it seems useful to do. ++ ++ ++ false ++ Only show windows from the current workspace ++ If true, only show unpinned windows from the current workspace in addition to pinned items. ++ ++ ++ [] ++ Dockitem-files Array ++ Array of dockitem-files for this particular dock. This list is automatically updated and managed by Plank. DO NOT MODIFY. ++ ++ ++ ++ 0 ++ Dock hide delay ++ Length of the delay before hiding the dock, in milliseconds. ++ ++ ++ 'intelligent' ++ Hidemode of the dock ++ Possible values are "none", "intelligent", "auto", "dodge-maximized", "window-dodge", and "dodge-active". ++ ++ ++ ++ 48 ++ Icon Size ++ The size of dock items, in pixels. ++ ++ ++ 'center' ++ The alignment of dock items ++ Possible values are "fill", "start", "end", and "center". ++ ++ ++ false ++ Lock dock items ++ If true, prevent drag'n'drop actions and lock dock items in place. ++ ++ ++ '' ++ The name of the monitor for the dock to show on ++ The plug-name of the monitor for the dock to show on (e.g. DVI-I-1, HDMI1, LVDS1). Leave this empty to keep on the primary monitor. ++ ++ ++ ++ 0 ++ Position Offset ++ The dock's position offset from center, in percent. ++ ++ ++ false ++ Only show pinned applications ++ If true, only show pinned applications. Useful for running more than one dock. ++ ++ ++ 'bottom' ++ The position for the dock on the monitor ++ Possible values are "left", "right", "top", and "bottom". ++ ++ ++ false ++ Pressure Reveal ++ If true, use pressure-based revealing of the dock if the input device supports it. ++ ++ ++ false ++ Show the item for the dock itself ++ If true, show the Plank dock item. ++ ++ ++ 'Default' ++ The name of the dock theme for Plank to use ++ Built-in values include "Default", "Matte", "Transparent", and "Gtk+". ++ ++ ++ true ++ Show tooltips when items are hovered ++ If true, tooltips will be shown when dock items are hovered with the cursor. ++ ++ ++ ++ 0 ++ Dock unhide delay ++ Length of the delay before unhiding the dock, in milliseconds. ++ ++ ++ false ++ Zoom dock items when hovered ++ If true, zoom dock items when hovered with the cursor. ++ ++ ++ ++ 150 ++ Icon zoom percentage ++ The amount to zoom dock items, in percent. ++ ++ ++ +diff --git a/data/net.launchpad.plank.gschema.xml.in.in b/data/net.launchpad.plank.gschema.xml.in.in +deleted file mode 100644 +index 3801177..0000000 +--- a/data/net.launchpad.plank.gschema.xml.in.in ++++ /dev/null +@@ -1,143 +0,0 @@ +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ['dock1'] +- <_summary>Array of names of active/enabled docks +- <_description>Contains the names of docks which are created and loaded on start up +- +- +- +- +- +- 'center' +- <_summary>The alignment for the dock along the monitor's edge +- <_description>Possible values are "fill", "start", "end", and "center". +- +- +- true +- <_summary>Automatically pin an application if it seems useful to do +- <_description>If true, automatically pin applications when it seems useful to do. +- +- +- false +- <_summary>Only show windows from the current workspace +- <_description>If true, only show unpinned windows from the current workspace in addition to pinned items. +- +- +- [] +- <_summary>Dockitem-files Array +- <_description>Array of dockitem-files for this particular dock. This list is automatically updated and managed by Plank. DO NOT MODIFY. +- +- +- +- 0 +- <_summary>Dock hide delay +- <_description>Length of the delay before hiding the dock, in milliseconds. +- +- +- 'intelligent' +- <_summary>Hidemode of the dock +- <_description>Possible values are "none", "intelligent", "auto", "dodge-maximized", "window-dodge", and "dodge-active". +- +- +- +- 48 +- <_summary>Icon Size +- <_description>The size of dock items, in pixels. +- +- +- 'center' +- <_summary>The alignment of dock items +- <_description>Possible values are "fill", "start", "end", and "center". +- +- +- false +- <_summary>Lock dock items +- <_description>If true, prevent drag'n'drop actions and lock dock items in place. +- +- +- '' +- <_summary>The name of the monitor for the dock to show on +- <_description>The plug-name of the monitor for the dock to show on (e.g. DVI-I-1, HDMI1, LVDS1). Leave this empty to keep on the primary monitor. +- +- +- +- 0 +- <_summary>Position Offset +- <_description>The dock's position offset from center, in percent. +- +- +- false +- <_summary>Only show pinned applications +- <_description>If true, only show pinned applications. Useful for running more than one dock. +- +- +- 'bottom' +- <_summary>The position for the dock on the monitor +- <_description>Possible values are "left", "right", "top", and "bottom". +- +- +- false +- <_summary>Pressure Reveal +- <_description>If true, use pressure-based revealing of the dock if the input device supports it. +- +- +- false +- <_summary>Show the item for the dock itself +- <_description>If true, show the Plank dock item. +- +- +- 'Default' +- <_summary>The name of the dock theme for Plank to use +- <_description>Built-in values include "Default", "Matte", "Transparent", and "Gtk+". +- +- +- true +- <_summary>Show tooltips when items are hovered +- <_description>If true, tooltips will be shown when dock items are hovered with the cursor. +- +- +- +- 0 +- <_summary>Dock unhide delay +- <_description>Length of the delay before unhiding the dock, in milliseconds. +- +- +- false +- <_summary>Zoom dock items when hovered +- <_description>If true, zoom dock items when hovered with the cursor. +- +- +- +- 150 +- <_summary>Icon zoom percentage +- <_description>The amount to zoom dock items, in percent. +- +- +- +diff --git a/data/plank.appdata.xml.in b/data/plank.appdata.xml.in +index d2c6dbc..7c2ebc6 100644 +--- a/data/plank.appdata.xml.in ++++ b/data/plank.appdata.xml.in +@@ -1,20 +1,20 @@ + +- ++ + + plank.desktop + CC0-1.0 + Plank +- <_summary>Stupidly simple. ++ Stupidly simple. + +- <_p> ++

+ Plank is meant to be the simplest dock on the planet. The goal is to provide just what a dock needs and + absolutely nothing more. +- +- <_p> ++

++

+ It is, however, a library which can be extended to create other dock programs with more advanced features. + Thus, Plank is the underlying technology for Docky (starting in version 3.0.0) and aims to provide all the + core features while Docky extends it to add fancier things like Docklets, painters, settings dialogs, etc. +- ++

+ + + dock +diff --git a/data/plank.desktop.in b/data/plank.desktop.in +index 330c3a4..257950b 100644 +--- a/data/plank.desktop.in ++++ b/data/plank.desktop.in +@@ -1,7 +1,7 @@ + [Desktop Entry] + Name=Plank + GenericName=Dock +-_Comment=Stupidly simple. ++Comment=Stupidly simple. + Categories=Utility; + Type=Application + Exec=plank +diff --git a/po/Makevars b/po/Makevars +new file mode 100644 +index 0000000..07a42ad +--- /dev/null ++++ b/po/Makevars +@@ -0,0 +1,78 @@ ++# Makefile variables for PO directory in any package using GNU gettext. ++ ++# Usually the message domain is the same as the package name. ++DOMAIN = $(PACKAGE) ++ ++# These two variables depend on the location of this directory. ++subdir = po ++top_builddir = .. ++ ++# These options get passed to xgettext. ++XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword=_ --keyword=N_ ++ ++# This is the copyright holder that gets inserted into the header of the ++# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding ++# package. (Note that the msgstr strings, extracted from the package's ++# sources, belong to the copyright holder of the package.) Translators are ++# expected to transfer the copyright for their translations to this person ++# or entity, or to disclaim their copyright. The empty string stands for ++# the public domain; in this case the translators are expected to disclaim ++# their copyright. ++COPYRIGHT_HOLDER = The Plank Developers ++ ++# This tells whether or not to prepend "GNU " prefix to the package ++# name that gets inserted into the header of the $(DOMAIN).pot file. ++# Possible values are "yes", "no", or empty. If it is empty, try to ++# detect it automatically by scanning the files in $(top_srcdir) for ++# "GNU packagename" string. ++PACKAGE_GNU = no ++ ++# This is the email address or URL to which the translators shall report ++# bugs in the untranslated strings: ++# - Strings which are not entire sentences, see the maintainer guidelines ++# in the GNU gettext documentation, section 'Preparing Strings'. ++# - Strings which use unclear terms or require additional context to be ++# understood. ++# - Strings which make invalid assumptions about notation of date, time or ++# money. ++# - Pluralisation problems. ++# - Incorrect English spelling. ++# - Incorrect formatting. ++# It can be your email address, or a mailing list address where translators ++# can write to without being subscribed, or the URL of a web page through ++# which the translators can contact you. ++MSGID_BUGS_ADDRESS = https://bugs.launchpad.net/plank ++ ++# This is the list of locale categories, beyond LC_MESSAGES, for which the ++# message catalogs shall be used. It is usually empty. ++EXTRA_LOCALE_CATEGORIES = ++ ++# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt' ++# context. Possible values are "yes" and "no". Set this to yes if the ++# package uses functions taking also a message context, like pgettext(), or ++# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument. ++USE_MSGCTXT = no ++ ++# These options get passed to msgmerge. ++# Useful options are in particular: ++# --previous to keep previous msgids of translated messages, ++# --quiet to reduce the verbosity. ++MSGMERGE_OPTIONS = ++ ++# These options get passed to msginit. ++# If you want to disable line wrapping when writing PO files, add ++# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and ++# MSGINIT_OPTIONS. ++MSGINIT_OPTIONS = ++ ++# This tells whether or not to regenerate a PO file when $(DOMAIN).pot ++# has changed. Possible values are "yes" and "no". Set this to no if ++# the POT file is checked in the repository and the version control ++# program ignores timestamps. ++PO_DEPENDS_ON_POT = no ++ ++# This tells whether or not to forcibly update $(DOMAIN).pot and ++# regenerate PO files on "make dist". Possible values are "yes" and ++# "no". Set this to no if the POT file and PO files are maintained ++# externally. ++DIST_DEPENDS_ON_UPDATE_PO = no +diff --git a/po/POTFILES.in b/po/POTFILES.in +index f84f451..e4128d8 100644 +--- a/po/POTFILES.in ++++ b/po/POTFILES.in +@@ -1,6 +1,6 @@ + data/plank.appdata.xml.in + data/plank.desktop.in +-[type: gettext/glade]data/ui/preferences.ui ++data/ui/preferences.ui + lib/DragManager.vala + lib/Factories/AbstractMain.vala + lib/Items/ApplicationDockItem.vala +diff --git a/po/POTFILES.skip b/po/POTFILES.skip +index 36093ea..c971cd9 100644 +--- a/po/POTFILES.skip ++++ b/po/POTFILES.skip +@@ -1,5 +1,4 @@ + data/net.launchpad.plank.gschema.xml.in +-data/net.launchpad.plank.gschema.xml.in.in + docklets/Clippy/ClippyDockItem.c + docklets/Clippy/ClippyDocklet.c + docklets/Clock/ClockDockItem.c diff --git a/x11-misc/plank/plank-0.11.3.ebuild b/x11-misc/plank/plank-0.11.4-r1.ebuild similarity index 79% rename from x11-misc/plank/plank-0.11.3.ebuild rename to x11-misc/plank/plank-0.11.4-r1.ebuild index 510c8ea..b447053 100644 --- a/x11-misc/plank/plank-0.11.3.ebuild +++ b/x11-misc/plank/plank-0.11.4-r1.ebuild @@ -1,13 +1,12 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ -EAPI=5 +EAPI=6 VALA_MIN_API_VERSION=0.26 VALA_USE_DEPEND=vapigen -inherit vala autotools-utils gnome2 +inherit vala gnome2 DESCRIPTION="Dock panel famious docky" HOMEPAGE="https://launchpad.net/plank" @@ -27,13 +26,17 @@ RDEPEND=">=dev-libs/glib-2.32:2 x11-libs/libwnck:3" DEPEND="${RDEPEND} $(vala_depend) - dev-util/intltool gnome-base/gnome-common - sys-devel/gettext + >=sys-devel/gettext-0.19.6 virtual/pkgconfig" DOCS=( AUTHORS COPYRIGHT ) +PATCHES=( + "${FILESDIR}"/${P}-drop-intltool-requirement.patch +) + src_prepare() { + default_src_prepare NOCONFIGURE=1 REQUIRED_PKG_CONFIG_VERSION=0.1 ./autogen.sh vala_src_prepare }