1
0
mirror of https://github.com/dguglielmi/sunny-overlay.git synced 2025-12-06 18:12:39 +01:00

Compare commits

..

2 Commits

9 changed files with 170 additions and 620 deletions

View File

@@ -1,5 +1,7 @@
DIST gpaste-3.24.6.tar.gz 163896 BLAKE2B c2dd0283be301a150a9b484e239b07629b2b280b088e55fc0ee0d5d27c1c15d4594932f4090757f433134cf0d35bccc46448617df073d7f22ff2b5085a4e0690 SHA512 8bd3213df3c576c783dc93bf2500b50071f93816698e470a77bb09df23fc017c0120e8021c5604b8d2788ad583ccd51599a70e5e318079be584cfa24549e19b2
DIST gpaste-3.30.2.tar.gz 175087 BLAKE2B a819347f7f5db972d32543d1e7b0fad3813bbe344ab4ec178386954e81debe88f56d8ad140b88b3e0d611cc3ffad42756d6dad7a06074e560919ed51c54027e6 SHA512 1c1df57f22ff43bc11867f4f3acd94933c843a77fbb55ca2d6e9d69d17f6e294addcff6b50f618efc53abaa9ed744dd337ccd3748cbb7bf8696040182c71669c
EBUILD gpaste-3.24.6.ebuild 1335 BLAKE2B 8040f4993d3ad20a4503795135c85e4d4cde4c56078638d4b6ca717b7cc47bcf7bb1ab536b6644c8129e38fbf5c38b539671c1d7e227d4426eee950f23767c83 SHA512 16f65a7a9cddaedc894736365c025c16c60f971fb26a79d1cbea64f539dd856243b7ae0e8ce04083e962fe3ae018ccfb9d983c575a1081e1c650831495a7e40d
EBUILD gpaste-3.30.2.ebuild 1335 BLAKE2B 8040f4993d3ad20a4503795135c85e4d4cde4c56078638d4b6ca717b7cc47bcf7bb1ab536b6644c8129e38fbf5c38b539671c1d7e227d4426eee950f23767c83 SHA512 16f65a7a9cddaedc894736365c025c16c60f971fb26a79d1cbea64f539dd856243b7ae0e8ce04083e962fe3ae018ccfb9d983c575a1081e1c650831495a7e40d
DIST gpaste-3.32.0.tar.gz 181159 BLAKE2B 664151a5cb9653158ad8c137951fbfc402c400421bbd0324598804135aa654407ff0e67ccd8c4f9c025423aa609df3278e64ac50af09033933ef3f0e26d88032 SHA512 f60983c50742c05bf42347ffdaeb00ad1bb691f7d752d8773545dd59f7bf7485e095e26e799983261ee41180b66631e99fa4b6c196057c1ec47e2e138dfa8160
DIST gpaste-3.34.0.tar.gz 181692 BLAKE2B 0c50db12cba8f959b39b677881d0471ceba565f30fe6d36cf07d0f900c8ea13e80bfaeac711574689e8c77dc20e07f141e36d40ace80118473a9da30df7a2b9d SHA512 3ed74409b134e85477013f917fa3c326460ab30ed070463de5f5194741667e1bf00358ecc7c24de26c794208400f22d00876e0db043c5122796900a0545c7491
EBUILD gpaste-3.30.2.ebuild 1530 BLAKE2B e6f98051b6bc7275d47fc3b1bff81d6cf531ac0f684086000b5b92f1a6f2b71a40c5e564be8e0f72ecfdc7f86aa3f6a19789a91c65741f3916613e5eb1b428ea SHA512 ac2ff5696250f563650eb585be2602cc3943dd11b00cd6b244a23b781e566985b33c769938c271ddc8873e948e9b65f1af0ef5e3c552fdf6d53cfe6459a40609
EBUILD gpaste-3.32.0.ebuild 1530 BLAKE2B cb415f57936c2b786be9c8dfdd9c560a365e9554c8c1af73e376dc76f60333573ca613b778d3c08c3f6c58d5a6b13e266c57bf3501010ffe0cd324ef76cffd51 SHA512 12e3b7b021f27b3012658da0f9eb7da8b766502e8c57c80a1ef5fd8314d8e9c2cd344c9f46688688a729c801e157b35b97ad7bd7e51b8e162ae2b15234d9f260
EBUILD gpaste-3.34.0.ebuild 1519 BLAKE2B 4e29f29b3720093984b184814f8cc2e5ff2f97264e4edb09761cd01d3d91b4cb968fd826c2dd0b13b988731bbcb1cb066cf2354bdf13bbab0fd9909a9a7b2dc4 SHA512 d2720632842535db4309959cbb727763028077eaac62d14a679e3ef6901a8c141c66c3ba2e0239a324d517b3ab6769066739cc176cd4263897d1467307143ee8
MISC metadata.xml 595 BLAKE2B 7a8327f78e0e4cb106350051ff89a5677401e9ffa2d833e424da1f14a89c3147e59be124e6e0a26a3609f57c8a6078a00b6fce6a8f36889bafa5021539c0d89a SHA512 8fca7baa9d40775abe8ce7db98c5fc8e882d96e6200db5d84b6b1964369d6c499e344b30826c405368a18ca0f2caeab94d8dc44f648fe10f317075d82f60ca3d

View File

@@ -1,9 +1,9 @@
# Copyright 1999-2018 Gentoo Foundation
# Copyright 1999-2019 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
VALA_MIN_API_VERSION="0.30"
VALA_MIN_API_VERSION="0.42"
VALA_USE_DEPEND="vapigen"
inherit eutils autotools gnome2-utils vala vcs-snapshot
@@ -15,21 +15,25 @@ SRC_URI="https://github.com/Keruspe/GPaste/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="gnome vala"
IUSE="X bash-completion gnome vala zsh-completion"
CDEPEND="
dev-libs/appstream-glib
>=dev-libs/glib-2.48:2
>=dev-libs/gobject-introspection-1.48.0
>=dev-libs/gjs-1.54.0
>=dev-libs/glib-2.58:2
>=dev-libs/gobject-introspection-1.58.0
sys-apps/dbus
>=x11-libs/gdk-pixbuf-2.34:2
>=x11-libs/gtk+-3.20:3
>=x11-libs/gdk-pixbuf-2.38:2
>=x11-libs/gtk+-3.24:3
X? (
x11-libs/libX11
x11-libs/libXi
)
gnome? (
gnome-base/gnome-control-center:2
media-libs/clutter
x11-libs/pango
>=x11-wm/mutter-3.30.0:0/3
)
"
RDEPEND="${CDEPEND}
@@ -54,8 +58,11 @@ src_prepare() {
src_configure() {
econf \
$(use_enable X x-keybinder) \
$(use_enable bash-completion) \
$(use_enable vala) \
$(use_enable gnome gnome-shell-extension) \
$(use_enable zsh-completion) \
--disable-static \
--disable-schemas-compile
}

View File

@@ -1,9 +1,9 @@
# Copyright 1999-2018 Gentoo Foundation
# Copyright 1999-2019 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
VALA_MIN_API_VERSION="0.30"
VALA_MIN_API_VERSION="0.42"
VALA_USE_DEPEND="vapigen"
inherit eutils autotools gnome2-utils vala vcs-snapshot
@@ -15,21 +15,25 @@ SRC_URI="https://github.com/Keruspe/GPaste/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="gnome vala"
IUSE="X bash-completion gnome vala zsh-completion"
CDEPEND="
dev-libs/appstream-glib
>=dev-libs/glib-2.48:2
>=dev-libs/gobject-introspection-1.48.0
>=dev-libs/gjs-1.54.0
>=dev-libs/glib-2.58:2
>=dev-libs/gobject-introspection-1.58.0
sys-apps/dbus
>=x11-libs/gdk-pixbuf-2.34:2
>=x11-libs/gtk+-3.20:3
>=x11-libs/gdk-pixbuf-2.38:2
>=x11-libs/gtk+-3.24:3
X? (
x11-libs/libX11
x11-libs/libXi
)
gnome? (
gnome-base/gnome-control-center:2
media-libs/clutter
x11-libs/pango
>=x11-wm/mutter-3.32.0:0/4
)
"
RDEPEND="${CDEPEND}
@@ -54,8 +58,11 @@ src_prepare() {
src_configure() {
econf \
$(use_enable X x-keybinder) \
$(use_enable bash-completion) \
$(use_enable vala) \
$(use_enable gnome gnome-shell-extension) \
$(use_enable zsh-completion) \
--disable-static \
--disable-schemas-compile
}

View File

@@ -0,0 +1,85 @@
# Copyright 1999-2019 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
VALA_MIN_API_VERSION="0.42"
VALA_USE_DEPEND="vapigen"
inherit eutils autotools gnome2-utils vala vcs-snapshot
DESCRIPTION="Clipboard management system"
HOMEPAGE="https://github.com/Keruspe/GPaste"
SRC_URI="https://github.com/Keruspe/GPaste/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS=""
IUSE="X bash-completion gnome vala zsh-completion"
CDEPEND="
dev-libs/appstream-glib
>=dev-libs/gjs-1.54.0
>=dev-libs/glib-2.58:2
>=dev-libs/gobject-introspection-1.58.0
sys-apps/dbus
>=x11-libs/gdk-pixbuf-2.38:2
>=x11-libs/gtk+-3.24:3
X? (
x11-libs/libX11
x11-libs/libXi
)
gnome? (
gnome-base/gnome-control-center:2
media-libs/clutter
x11-libs/pango
>=x11-wm/mutter-3.34.0:0/5
)
"
RDEPEND="${CDEPEND}
gnome? (
gnome-base/gnome-shell
)
"
DEPEND="${CDEPEND}
virtual/pkgconfig
vala? ( $(vala_depend) )
"
src_prepare() {
default
eautoreconf
vala_src_prepare
if ! use gnome ; then
echo "" > data/control-center.mk || die
fi
}
src_configure() {
econf \
$(use_enable X x-keybinder) \
$(use_enable bash-completion) \
$(use_enable vala) \
$(use_enable gnome gnome-shell-extension) \
$(use_enable zsh-completion) \
--disable-static \
--disable-schemas-compile
}
src_install() {
default
prune_libtool_files
}
pkg_preinst() {
gnome2_schemas_savelist
}
pkg_postinst() {
gnome2_schemas_update
}
pkg_postrm() {
gnome2_schemas_update
}

View File

@@ -1,4 +1,3 @@
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 875 BLAKE2B 1b027068971058e7e1bb2e60b0a0531c79e50ec9913e9c836edacb2bd7b17c48d8e509a53cbd747d164b088b819af76f1a049ab75f88fd755b3ce171548d1b18 SHA512 39bf4f7744de38f30598e5dee6db1f7ea1ab3fa1056f59dbc9a12d089259ec9dc2b8f7bb7e51778678cca5e4374d1d1f08ac52b7df0a5f06314714b42b82c975
EBUILD plank-0.11.4.ebuild 834 BLAKE2B 1b9b4f1ce94a1f14d33ebddd65ae393270ff1896e822a7bfd0f0046debfb3fedd2ecae2b1d88ab7fa7a9ecc8e9ba385b4e62bbf17af256f306497f0d3bbbf689 SHA512 bb8394529d02ab7eee2d46f7f61a33e3cb1d97fb99f7b3b43c21989f673ec6e6e9edda190ee8c7a94d66e0e1d57a0ac742ae254028ec88fbd9a9a9c6de7661f1
AUX plank-0.11.89-allow-building-with-gettext-0.20.patch 1653 BLAKE2B d391c5053e091b8f54eb6cc6900d4535c08249011abe836242edb58a94fbe215bb5e3e3e0566b8deb33c51f5b45b98202249f711ce6881089c66f9b7a1a185ae SHA512 8847ef839d8d0b03ee71ebdd137a4d0d41117e002edf3ca863d27afbdfb197d8267459fd59980aeddb56ffd99f4a2fa1573c10070c05338a7dbf215a43923416
DIST plank-0.11.89.tar.xz 593940 BLAKE2B b772cd8f728773be435327bf4cd36261d46b704305cc2a407f39bd8cefa77ad8e3b1f269dbbc96e45c9ab9e93ee1f5daf6c5c506c21380dfff378905a083188a SHA512 de78bcfb0614924980100b8f3067e10469163dffc34b2b7f2f2a5fa7798c5eea032bdc81a5136f17d93f485c7a4de680eb397835d2d1928ec1db06dd8b12ac40
EBUILD plank-0.11.89.ebuild 882 BLAKE2B 7691010b41faacac7b8145da0a01b3a8a1f8e908268c598140961c26717c6eeba4ed53933418d0e06173decd373ac25bba30cc4fe8638c988df9024de8cea266 SHA512 54bbf5b19d66f0399dfda043190ca92bb3c980e4ff5ed71fceaa458caad2e53fca625bd76a4e0354530e65e903d2e5b2eabeae65b2c50a2d030848c153676637

View File

@@ -1,554 +0,0 @@
From 764e2ff83126242b8b69d218c3d91883b0ec423b Mon Sep 17 00:00:00 2001
From: Rico Tzschichholz <ricotz@ubuntu.com>
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 @@
+<schemalist>
+ <enum id="PlankHideType">
+ <value nick="none" value="0"/>
+ <value nick="intelligent" value="1"/>
+ <value nick="auto" value="2"/>
+ <value nick="dodge-maximized" value="3"/>
+ <value nick="window-dodge" value="4"/>
+ <value nick="dodge-active" value="5"/>
+ </enum>
+
+ <enum id="GtkAlignType">
+ <value nick="fill" value="0"/>
+ <value nick="start" value="1"/>
+ <value nick="end" value="2"/>
+ <value nick="center" value="3"/>
+ </enum>
+
+ <enum id="GtkPositionType">
+ <value nick="left" value="0"/>
+ <value nick="right" value="1"/>
+ <value nick="top" value="2"/>
+ <value nick="bottom" value="3"/>
+ </enum>
+
+
+ <schema id="net.launchpad.plank" path="/net/launchpad/plank/" gettext-domain="@GETTEXT_PACKAGE@">
+ <child name="docks" schema="net.launchpad.plank.dock.settings"/>
+
+ <key name="enabled-docks" type="as">
+ <default>['dock1']</default>
+ <summary>Array of names of active/enabled docks</summary>
+ <description>Contains the names of docks which are created and loaded on start up</description>
+ </key>
+ </schema>
+
+ <schema id="net.launchpad.plank.dock.settings" gettext-domain="@GETTEXT_PACKAGE@">
+ <key name="alignment" enum='GtkAlignType'>
+ <default>'center'</default>
+ <summary>The alignment for the dock along the monitor's edge</summary>
+ <description>Possible values are "fill", "start", "end", and "center".</description>
+ </key>
+ <key name="auto-pinning" type="b">
+ <default>true</default>
+ <summary>Automatically pin an application if it seems useful to do</summary>
+ <description>If true, automatically pin applications when it seems useful to do.</description>
+ </key>
+ <key name="current-workspace-only" type="b">
+ <default>false</default>
+ <summary>Only show windows from the current workspace</summary>
+ <description>If true, only show unpinned windows from the current workspace in addition to pinned items.</description>
+ </key>
+ <key name="dock-items" type="as">
+ <default>[]</default>
+ <summary>Dockitem-files Array</summary>
+ <description>Array of dockitem-files for this particular dock. This list is automatically updated and managed by Plank. DO NOT MODIFY.</description>
+ </key>
+ <key name="hide-delay" type="i">
+ <range min="0"/>
+ <default>0</default>
+ <summary>Dock hide delay</summary>
+ <description>Length of the delay before hiding the dock, in milliseconds.</description>
+ </key>
+ <key name="hide-mode" enum='PlankHideType'>
+ <default>'intelligent'</default>
+ <summary>Hidemode of the dock</summary>
+ <description>Possible values are "none", "intelligent", "auto", "dodge-maximized", "window-dodge", and "dodge-active".</description>
+ </key>
+ <key name="icon-size" type="i">
+ <range min="24" max="128"/>
+ <default>48</default>
+ <summary>Icon Size</summary>
+ <description>The size of dock items, in pixels.</description>
+ </key>
+ <key name="items-alignment" enum='GtkAlignType'>
+ <default>'center'</default>
+ <summary>The alignment of dock items</summary>
+ <description>Possible values are "fill", "start", "end", and "center".</description>
+ </key>
+ <key name="lock-items" type="b">
+ <default>false</default>
+ <summary>Lock dock items</summary>
+ <description>If true, prevent drag'n'drop actions and lock dock items in place.</description>
+ </key>
+ <key name="monitor" type="s">
+ <default>''</default>
+ <summary>The name of the monitor for the dock to show on</summary>
+ <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.</description>
+ </key>
+ <key name="offset" type="i">
+ <range min="-100" max="100"/>
+ <default>0</default>
+ <summary>Position Offset</summary>
+ <description>The dock's position offset from center, in percent.</description>
+ </key>
+ <key name="pinned-only" type="b">
+ <default>false</default>
+ <summary>Only show pinned applications</summary>
+ <description>If true, only show pinned applications. Useful for running more than one dock.</description>
+ </key>
+ <key name="position" enum='GtkPositionType'>
+ <default>'bottom'</default>
+ <summary>The position for the dock on the monitor</summary>
+ <description>Possible values are "left", "right", "top", and "bottom".</description>
+ </key>
+ <key name="pressure-reveal" type="b">
+ <default>false</default>
+ <summary>Pressure Reveal</summary>
+ <description>If true, use pressure-based revealing of the dock if the input device supports it.</description>
+ </key>
+ <key name="show-dock-item" type="b">
+ <default>false</default>
+ <summary>Show the item for the dock itself</summary>
+ <description>If true, show the Plank dock item.</description>
+ </key>
+ <key name="theme" type="s">
+ <default>'Default'</default>
+ <summary>The name of the dock theme for Plank to use</summary>
+ <description>Built-in values include "Default", "Matte", "Transparent", and "Gtk+".</description>
+ </key>
+ <key name="tooltips-enabled" type="b">
+ <default>true</default>
+ <summary>Show tooltips when items are hovered</summary>
+ <description>If true, tooltips will be shown when dock items are hovered with the cursor.</description>
+ </key>
+ <key name="unhide-delay" type="i">
+ <range min="0"/>
+ <default>0</default>
+ <summary>Dock unhide delay</summary>
+ <description>Length of the delay before unhiding the dock, in milliseconds.</description>
+ </key>
+ <key name="zoom-enabled" type="b">
+ <default>false</default>
+ <summary>Zoom dock items when hovered</summary>
+ <description>If true, zoom dock items when hovered with the cursor.</description>
+ </key>
+ <key name="zoom-percent" type="i">
+ <range min="100" max="200"/>
+ <default>150</default>
+ <summary>Icon zoom percentage</summary>
+ <description>The amount to zoom dock items, in percent.</description>
+ </key>
+ </schema>
+</schemalist>
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 @@
-<schemalist>
- <enum id="PlankHideType">
- <value nick="none" value="0"/>
- <value nick="intelligent" value="1"/>
- <value nick="auto" value="2"/>
- <value nick="dodge-maximized" value="3"/>
- <value nick="window-dodge" value="4"/>
- <value nick="dodge-active" value="5"/>
- </enum>
-
- <enum id="GtkAlignType">
- <value nick="fill" value="0"/>
- <value nick="start" value="1"/>
- <value nick="end" value="2"/>
- <value nick="center" value="3"/>
- </enum>
-
- <enum id="GtkPositionType">
- <value nick="left" value="0"/>
- <value nick="right" value="1"/>
- <value nick="top" value="2"/>
- <value nick="bottom" value="3"/>
- </enum>
-
-
- <schema id="net.launchpad.plank" path="/net/launchpad/plank/">
- <child name="docks" schema="net.launchpad.plank.dock.settings"/>
-
- <key name="enabled-docks" type="as">
- <default>['dock1']</default>
- <_summary>Array of names of active/enabled docks</_summary>
- <_description>Contains the names of docks which are created and loaded on start up</_description>
- </key>
- </schema>
-
- <schema id="net.launchpad.plank.dock.settings" gettext-domain="@GETTEXT_PACKAGE@">
- <key name="alignment" enum='GtkAlignType'>
- <default>'center'</default>
- <_summary>The alignment for the dock along the monitor's edge</_summary>
- <_description>Possible values are "fill", "start", "end", and "center".</_description>
- </key>
- <key name="auto-pinning" type="b">
- <default>true</default>
- <_summary>Automatically pin an application if it seems useful to do</_summary>
- <_description>If true, automatically pin applications when it seems useful to do.</_description>
- </key>
- <key name="current-workspace-only" type="b">
- <default>false</default>
- <_summary>Only show windows from the current workspace</_summary>
- <_description>If true, only show unpinned windows from the current workspace in addition to pinned items.</_description>
- </key>
- <key name="dock-items" type="as">
- <default>[]</default>
- <_summary>Dockitem-files Array</_summary>
- <_description>Array of dockitem-files for this particular dock. This list is automatically updated and managed by Plank. DO NOT MODIFY.</_description>
- </key>
- <key name="hide-delay" type="i">
- <range min="0"/>
- <default>0</default>
- <_summary>Dock hide delay</_summary>
- <_description>Length of the delay before hiding the dock, in milliseconds.</_description>
- </key>
- <key name="hide-mode" enum='PlankHideType'>
- <default>'intelligent'</default>
- <_summary>Hidemode of the dock</_summary>
- <_description>Possible values are "none", "intelligent", "auto", "dodge-maximized", "window-dodge", and "dodge-active".</_description>
- </key>
- <key name="icon-size" type="i">
- <range min="24" max="128"/>
- <default>48</default>
- <_summary>Icon Size</_summary>
- <_description>The size of dock items, in pixels.</_description>
- </key>
- <key name="items-alignment" enum='GtkAlignType'>
- <default>'center'</default>
- <_summary>The alignment of dock items</_summary>
- <_description>Possible values are "fill", "start", "end", and "center".</_description>
- </key>
- <key name="lock-items" type="b">
- <default>false</default>
- <_summary>Lock dock items</_summary>
- <_description>If true, prevent drag'n'drop actions and lock dock items in place.</_description>
- </key>
- <key name="monitor" type="s">
- <default>''</default>
- <_summary>The name of the monitor for the dock to show on</_summary>
- <_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.</_description>
- </key>
- <key name="offset" type="i">
- <range min="-100" max="100"/>
- <default>0</default>
- <_summary>Position Offset</_summary>
- <_description>The dock's position offset from center, in percent.</_description>
- </key>
- <key name="pinned-only" type="b">
- <default>false</default>
- <_summary>Only show pinned applications</_summary>
- <_description>If true, only show pinned applications. Useful for running more than one dock.</_description>
- </key>
- <key name="position" enum='GtkPositionType'>
- <default>'bottom'</default>
- <_summary>The position for the dock on the monitor</_summary>
- <_description>Possible values are "left", "right", "top", and "bottom".</_description>
- </key>
- <key name="pressure-reveal" type="b">
- <default>false</default>
- <_summary>Pressure Reveal</_summary>
- <_description>If true, use pressure-based revealing of the dock if the input device supports it.</_description>
- </key>
- <key name="show-dock-item" type="b">
- <default>false</default>
- <_summary>Show the item for the dock itself</_summary>
- <_description>If true, show the Plank dock item.</_description>
- </key>
- <key name="theme" type="s">
- <default>'Default'</default>
- <_summary>The name of the dock theme for Plank to use</_summary>
- <_description>Built-in values include "Default", "Matte", "Transparent", and "Gtk+".</_description>
- </key>
- <key name="tooltips-enabled" type="b">
- <default>true</default>
- <_summary>Show tooltips when items are hovered</_summary>
- <_description>If true, tooltips will be shown when dock items are hovered with the cursor.</_description>
- </key>
- <key name="unhide-delay" type="i">
- <range min="0"/>
- <default>0</default>
- <_summary>Dock unhide delay</_summary>
- <_description>Length of the delay before unhiding the dock, in milliseconds.</_description>
- </key>
- <key name="zoom-enabled" type="b">
- <default>false</default>
- <_summary>Zoom dock items when hovered</_summary>
- <_description>If true, zoom dock items when hovered with the cursor.</_description>
- </key>
- <key name="zoom-percent" type="i">
- <range min="100" max="200"/>
- <default>150</default>
- <_summary>Icon zoom percentage</_summary>
- <_description>The amount to zoom dock items, in percent.</_description>
- </key>
- </schema>
-</schemalist>
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 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Rico Tzschichholz <ricotz@ubuntu.com> -->
+<!-- Copyright 2016 Rico Tzschichholz <ricotz@ubuntu.com> -->
<component type="desktop">
<id>plank.desktop</id>
<metadata_license>CC0-1.0</metadata_license>
<name>Plank</name>
- <_summary>Stupidly simple.</_summary>
+ <summary>Stupidly simple.</summary>
<description>
- <_p>
+ <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>
- <_p>
+ </p>
+ <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.
- </_p>
+ </p>
</description>
<keywords>
<keyword>dock</keyword>
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

View File

@@ -0,0 +1,43 @@
From 248cc4ae060775c187667e5ce192c3a8f1aff506 Mon Sep 17 00:00:00 2001
From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Sun, 1 Sep 2019 11:11:22 +0200
Subject: =?UTF-8?q?build:=20Allow=20building=20with=20gettext=20=E2=89=A5?=
=?UTF-8?q?=200.20?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The use of AM_GNU_GETTEXT_VERSION in configure.ac instructs autopoint to
copy po/Makefile.in.in from the exact gettext version. It is fine if the
version of gettext installed on the system has the same minor version
number with the requested version, but it fails if you have a newer
version of gettext because of the mismatch between autoconf macros and
Makefile.in.in.
*** error: gettext infrastructure mismatch: using a Makefile.in.in
from gettext version 0.19 but the autoconf macros are from gettext
version 0.20
Instead of specifying the exact version with AM_GNU_GETTEXT_VERSION, we
can use AM_GNU_GETTEXT_REQUIRE_VERSION to ask autopoint to simply use
the gettext version installed on the system to prevent the mismatch.
diff --git a/configure.ac b/configure.ac
index a5fde4f..b2aaa4a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,8 +61,10 @@ 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])
+# FIXME: Remove AM_GNU_GETTEXT_VERSION once autoreconf supports REQUIRE_VERSION
+AM_GNU_GETTEXT_VERSION([0.19.6])
+AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.6])
LT_PREREQ([2.2.6])
LT_INIT([disable-static])
--
cgit v0.10.2

View File

@@ -1,39 +0,0 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
VALA_MIN_API_VERSION=0.26
VALA_USE_DEPEND=vapigen
inherit vala autotools-utils gnome2
DESCRIPTION="Dock panel famious docky"
HOMEPAGE="https://launchpad.net/plank"
SRC_URI="http://launchpad.net/${PN}/1.0/${PV}/+download/${P}.tar.xz"
LICENSE="LGPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="+introspection doc static-libs"
RDEPEND=">=dev-libs/glib-2.32:2
dev-libs/libgee:0.8
x11-libs/gtk+:3
x11-libs/bamf
x11-libs/libX11
dev-libs/libdbusmenu
x11-libs/libwnck:3"
DEPEND="${RDEPEND}
$(vala_depend)
dev-util/intltool
gnome-base/gnome-common
sys-devel/gettext
virtual/pkgconfig"
DOCS=( AUTHORS COPYRIGHT )
src_prepare() {
NOCONFIGURE=1 REQUIRED_PKG_CONFIG_VERSION=0.1 ./autogen.sh
vala_src_prepare
}

View File

@@ -1,4 +1,4 @@
# Copyright 1999-2018 Gentoo Foundation
# Copyright 1999-2019 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -32,7 +32,7 @@ DEPEND="${RDEPEND}
DOCS=( AUTHORS COPYRIGHT )
PATCHES=(
"${FILESDIR}"/${P}-drop-intltool-requirement.patch
"${FILESDIR}"/${P}-allow-building-with-gettext-0.20.patch
)
src_prepare() {