commit: 4c62f9063edb25e7749f663b4dcc1e998bb191e2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Wed Dec 16 13:23:55 2020 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Wed Dec 16 13:28:38 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c62f906
xfce-base/libxfce4ui: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> xfce-base/libxfce4ui/Manifest | 4 -- .../files/libxfce4ui-4.15.3-kb-shortcut.patch | 38 ----------- xfce-base/libxfce4ui/libxfce4ui-4.15.3-r1.ebuild | 71 --------------------- xfce-base/libxfce4ui/libxfce4ui-4.15.4.ebuild | 67 -------------------- xfce-base/libxfce4ui/libxfce4ui-4.15.5.ebuild | 67 -------------------- xfce-base/libxfce4ui/libxfce4ui-4.15.6.ebuild | 73 ---------------------- xfce-base/libxfce4ui/metadata.xml | 1 - 7 files changed, 321 deletions(-) diff --git a/xfce-base/libxfce4ui/Manifest b/xfce-base/libxfce4ui/Manifest index 2314b6bcc76..fd1ad792069 100644 --- a/xfce-base/libxfce4ui/Manifest +++ b/xfce-base/libxfce4ui/Manifest @@ -1,6 +1,2 @@ DIST libxfce4ui-4.14.1.tar.bz2 756175 BLAKE2B d487cc0a04b6053ead6670eeb83cafe1c4098818d5ad6a94a81176720d78cfd65160156961cbb526baa1640ae66a5c6958f707b7078c412d81fcd24cc8cf4013 SHA512 f42f41da3a683a0c56c3b1e7ba420c4f50909d2613e681d053b09b50bc0eb7f750f44c892e94b0ee8b9207983a87c0cadbda1ad93d0df74ae351dc8812025407 -DIST libxfce4ui-4.15.3.tar.bz2 756530 BLAKE2B ca2a9d5aae80d22a97b2fe932248756c9f34f71a13342670cdc0ad1c5393eb62d4f5bed8b21a45a60c762a83ebf1458deb7ef629c4dd3c894468ecf16a821dcf SHA512 a0e5a60c54df811fa2815238f9fe506700f6df8a6baa8172a6f8c68f005b54ba94ee31aba87d635fb506700da9c77e25f8c57268018fc8cfa5577f29aab58a6b -DIST libxfce4ui-4.15.4.tar.bz2 825895 BLAKE2B 46687dea72d17a3693c31f69bd4d1961397bf00d9395935778c8c5b90e6e56585fa2e64fe4be817ad44994841218d7cce98ade033914c56ea82a04ae7e1b70e7 SHA512 af2545f6d72df1a13d926a52b5124c52f34fbee0b2db6664292f74bcc3d93cb42263eab57beb9f882be42b6530649b2c7e42d496817f1b34b7d2b67b29e6deb1 -DIST libxfce4ui-4.15.5.tar.bz2 813220 BLAKE2B 5925ea1e25abf485e04902b47da6e09d228297b7137dbeedb8c60655e2005ded37138d12482f8321928994f2bfb8d351bb18f2eb47f288d810f58ce75e378c06 SHA512 daa666826e2b4d876025a3c93b6caf40b063b456660116f5c4c8b2beb9a9eb26d6228785cc7e6435d2a38b68c15261fc872a8cf3e03af0969342e3396a6b2a49 -DIST libxfce4ui-4.15.6.tar.bz2 823475 BLAKE2B 11193a72be188dc205ad24d7ea06ac21f93679d58bed273d78ff04180226eab14fd211bd2feba9b3ade20539364f90229bdfe226c2b1e4b6f6a17f7444feb26d SHA512 608daf350b8fb43ae4eb70b6d7e684528bcc90360f6d29b182da4f04bc51f5c191e27369dfa1554b6840dbdefbe132cfc66935b6f2d88dcc62f67f929b9423ec DIST libxfce4ui-4.15.7.tar.bz2 807676 BLAKE2B 0280d0e35244740d016fc4cd8afebb5a70348226011473117c3b7124abcc597baf8015754bb8aaa2fa3f0560d1a98d68f319c5b5870e1c8f5543c0a9458eb541 SHA512 0fd05bbaa42d3f3a0df552fb7419ebc390e6292f4bae58d4c9d6137421cdd55f17756e51c3adcd5ad6e7c92f277b9485ea1d791ef1295ac3d65d86201fc33a6a diff --git a/xfce-base/libxfce4ui/files/libxfce4ui-4.15.3-kb-shortcut.patch b/xfce-base/libxfce4ui/files/libxfce4ui-4.15.3-kb-shortcut.patch deleted file mode 100644 index bfce065fdef..00000000000 --- a/xfce-base/libxfce4ui/files/libxfce4ui-4.15.3-kb-shortcut.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 0fc934ebee037a91e032d362d83d991309c4ce88 Mon Sep 17 00:00:00 2001 -From: Harald Judt <[email protected]> -Date: Sat, 4 Jul 2020 00:22:31 +0200 -Subject: [PATCH] Always return GTK_RESPONSE_OK for accepted shortcut keys - (fixes #20) - -Commit a41dcb19 replaced the deprecated gtk_keyboard_ungrab code but -also erroneously put the gtk_dialog_response call inside the -gdk_seat_grab check, while it should be inside the shortcut_accepted -check. This commit restores the original logic, thus properly setting -the accepted shortcut key and closing the dialog. - -Closes !4 ---- - libxfce4kbd-private/xfce-shortcut-dialog.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/libxfce4kbd-private/xfce-shortcut-dialog.c b/libxfce4kbd-private/xfce-shortcut-dialog.c -index 427855a..ae9c195 100644 ---- a/libxfce4kbd-private/xfce-shortcut-dialog.c -+++ b/libxfce4kbd-private/xfce-shortcut-dialog.c -@@ -424,10 +424,10 @@ xfce_shortcut_dialog_key_released (XfceShortcutDialog *dialog, - TRUE, NULL, NULL, NULL, NULL)) - { - gdk_seat_ungrab (seat); -- -- /* Exit dialog with positive response */ -- gtk_dialog_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); - } -+ -+ /* Exit dialog with positive response */ -+ gtk_dialog_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); - } - else - { --- -2.26.2 - diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.15.3-r1.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.15.3-r1.ebuild deleted file mode 100644 index 9d9f9229dd3..00000000000 --- a/xfce-base/libxfce4ui/libxfce4ui-4.15.3-r1.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit xdg-utils vala - -DESCRIPTION="Unified widget and session management libs for Xfce" -HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"; -SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"; - -LICENSE="LGPL-2+ GPL-2+" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="debug glade introspection libgtop startup-notification vala" -REQUIRED_USE="vala? ( introspection )" - -RDEPEND=">=dev-libs/glib-2.42:2 - >=x11-libs/gtk+-3.22:3[introspection?] - x11-libs/libX11 - x11-libs/libICE - x11-libs/libSM - >=xfce-base/libxfce4util-4.12:=[introspection?] - >=xfce-base/xfconf-4.12:= - glade? ( dev-util/glade:3.10 ) - introspection? ( dev-libs/gobject-introspection:= ) - libgtop? ( gnome-base/libgtop ) - startup-notification? ( x11-libs/startup-notification )" -DEPEND="${RDEPEND}" -BDEPEND="dev-lang/perl - dev-util/intltool - sys-devel/gettext - virtual/pkgconfig - vala? ( $(vala_depend) )" - -PATCHES=( - "${FILESDIR}"/${P}-kb-shortcut.patch -) - -src_prepare() { - # stupid vala.eclass... - default -} - -src_configure() { - local myconf=( - $(use_enable introspection) - $(use_enable libgtop glibtop) - $(use_enable startup-notification) - $(use_enable vala) - $(use_enable glade gladeui2) - --with-vendor-info=Gentoo - ) - - use vala && vala_src_prepare - econf "${myconf[@]}" -} - -src_install() { - default - - find "${D}" -name '*.la' -delete || die -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.15.4.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.15.4.ebuild deleted file mode 100644 index cddd13c8d5e..00000000000 --- a/xfce-base/libxfce4ui/libxfce4ui-4.15.4.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit xdg-utils vala - -DESCRIPTION="Unified widget and session management libs for Xfce" -HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"; -SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"; - -LICENSE="LGPL-2+ GPL-2+" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="debug glade introspection libgtop startup-notification vala" -REQUIRED_USE="vala? ( introspection )" - -RDEPEND=">=dev-libs/glib-2.42:2 - >=x11-libs/gtk+-3.22:3[introspection?] - x11-libs/libX11 - x11-libs/libICE - x11-libs/libSM - >=xfce-base/libxfce4util-4.12:=[introspection?] - >=xfce-base/xfconf-4.12:= - glade? ( dev-util/glade:3.10 ) - introspection? ( dev-libs/gobject-introspection:= ) - libgtop? ( gnome-base/libgtop ) - startup-notification? ( x11-libs/startup-notification )" -DEPEND="${RDEPEND}" -BDEPEND="dev-lang/perl - dev-util/intltool - sys-devel/gettext - virtual/pkgconfig - vala? ( $(vala_depend) )" - -src_prepare() { - # stupid vala.eclass... - default -} - -src_configure() { - local myconf=( - $(use_enable introspection) - $(use_enable libgtop glibtop) - $(use_enable startup-notification) - $(use_enable vala) - $(use_enable glade gladeui2) - --with-vendor-info=Gentoo - ) - - use vala && vala_src_prepare - econf "${myconf[@]}" -} - -src_install() { - default - - find "${D}" -name '*.la' -delete || die -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.15.5.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.15.5.ebuild deleted file mode 100644 index cddd13c8d5e..00000000000 --- a/xfce-base/libxfce4ui/libxfce4ui-4.15.5.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit xdg-utils vala - -DESCRIPTION="Unified widget and session management libs for Xfce" -HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"; -SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"; - -LICENSE="LGPL-2+ GPL-2+" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="debug glade introspection libgtop startup-notification vala" -REQUIRED_USE="vala? ( introspection )" - -RDEPEND=">=dev-libs/glib-2.42:2 - >=x11-libs/gtk+-3.22:3[introspection?] - x11-libs/libX11 - x11-libs/libICE - x11-libs/libSM - >=xfce-base/libxfce4util-4.12:=[introspection?] - >=xfce-base/xfconf-4.12:= - glade? ( dev-util/glade:3.10 ) - introspection? ( dev-libs/gobject-introspection:= ) - libgtop? ( gnome-base/libgtop ) - startup-notification? ( x11-libs/startup-notification )" -DEPEND="${RDEPEND}" -BDEPEND="dev-lang/perl - dev-util/intltool - sys-devel/gettext - virtual/pkgconfig - vala? ( $(vala_depend) )" - -src_prepare() { - # stupid vala.eclass... - default -} - -src_configure() { - local myconf=( - $(use_enable introspection) - $(use_enable libgtop glibtop) - $(use_enable startup-notification) - $(use_enable vala) - $(use_enable glade gladeui2) - --with-vendor-info=Gentoo - ) - - use vala && vala_src_prepare - econf "${myconf[@]}" -} - -src_install() { - default - - find "${D}" -name '*.la' -delete || die -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.15.6.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.15.6.ebuild deleted file mode 100644 index ba60530e9b5..00000000000 --- a/xfce-base/libxfce4ui/libxfce4ui-4.15.6.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit xdg-utils vala - -DESCRIPTION="Unified widget and session management libs for Xfce" -HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"; -SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"; - -LICENSE="LGPL-2+ GPL-2+" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="debug glade introspection startup-notification system-info vala" -REQUIRED_USE="vala? ( introspection )" - -RDEPEND=">=dev-libs/glib-2.50:2 - >=x11-libs/gtk+-3.22:3[introspection?] - x11-libs/libX11 - x11-libs/libICE - x11-libs/libSM - >=xfce-base/libxfce4util-4.12:=[introspection?] - >=xfce-base/xfconf-4.12:= - glade? ( dev-util/glade:3.10 ) - introspection? ( dev-libs/gobject-introspection:= ) - startup-notification? ( x11-libs/startup-notification ) - system-info? ( - dev-libs/libgudev - gnome-base/libgtop - media-libs/libepoxy - )" -DEPEND="${RDEPEND}" -BDEPEND="dev-lang/perl - dev-util/intltool - sys-devel/gettext - virtual/pkgconfig - vala? ( $(vala_depend) )" - -src_prepare() { - # stupid vala.eclass... - default -} - -src_configure() { - local myconf=( - $(use_enable introspection) - $(use_enable system-info glibtop) - $(use_enable system-info epoxy) - $(use_enable system-info gudev) - $(use_enable startup-notification) - $(use_enable vala) - $(use_enable glade gladeui2) - --with-vendor-info=Gentoo - ) - - use vala && vala_src_prepare - econf "${myconf[@]}" -} - -src_install() { - emake -j1 DESTDIR="${D}" install - - find "${D}" -name '*.la' -delete || die -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/xfce-base/libxfce4ui/metadata.xml b/xfce-base/libxfce4ui/metadata.xml index b44a362a8f7..dec4318de65 100644 --- a/xfce-base/libxfce4ui/metadata.xml +++ b/xfce-base/libxfce4ui/metadata.xml @@ -8,7 +8,6 @@ <use> <flag name="glade">Build support for Glade 3's GtkBuilder implementation</flag> <flag name="gtk2">Build deprecated GTK+2 libxfce4ui-1 library.</flag> - <flag name="libgtop">Enable system information via <pkg>gnome-base/libgtop</pkg>.</flag> <flag name="system-info">Enable system information in xfce4-about.</flag> </use> </pkgmetadata>
