From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- xfce-base/libxfce4ui/Manifest | 5 +- .../files/libxfce4ui-4.15.3-kb-shortcut.patch | 38 ++++++++++++ xfce-base/libxfce4ui/libxfce4ui-4.15.2.ebuild | 67 -------------------- xfce-base/libxfce4ui/libxfce4ui-4.15.3-r1.ebuild | 71 ++++++++++++++++++++++ xfce-base/libxfce4ui/libxfce4ui-4.15.3.ebuild | 67 -------------------- 5 files changed, 111 insertions(+), 137 deletions(-) create mode 100644 xfce-base/libxfce4ui/files/libxfce4ui-4.15.3-kb-shortcut.patch delete mode 100644 xfce-base/libxfce4ui/libxfce4ui-4.15.2.ebuild create mode 100644 xfce-base/libxfce4ui/libxfce4ui-4.15.3-r1.ebuild delete mode 100644 xfce-base/libxfce4ui/libxfce4ui-4.15.3.ebuild (limited to 'xfce-base/libxfce4ui') diff --git a/xfce-base/libxfce4ui/Manifest b/xfce-base/libxfce4ui/Manifest index 5957a58bc769..dfe7e7f39770 100644 --- a/xfce-base/libxfce4ui/Manifest +++ b/xfce-base/libxfce4ui/Manifest @@ -1,7 +1,6 @@ +AUX libxfce4ui-4.15.3-kb-shortcut.patch 1373 BLAKE2B 7a582825c629a0a578d0aa5687f937dc81beec768293ca89211b6a820dc8ad23763c4ec13c8514003ad45ba7ec158bb6b7c6b3f23e53b58078baa34c1edb5217 SHA512 62dbebb708fa7845f9d36ab623dc7590fd37752ba092c6caf6e6635d358281cf7fd76aedf551d0fb36e95d2c6a11fad0c221aa874d7fcad16c19fc131652f264 DIST libxfce4ui-4.14.1.tar.bz2 756175 BLAKE2B d487cc0a04b6053ead6670eeb83cafe1c4098818d5ad6a94a81176720d78cfd65160156961cbb526baa1640ae66a5c6958f707b7078c412d81fcd24cc8cf4013 SHA512 f42f41da3a683a0c56c3b1e7ba420c4f50909d2613e681d053b09b50bc0eb7f750f44c892e94b0ee8b9207983a87c0cadbda1ad93d0df74ae351dc8812025407 -DIST libxfce4ui-4.15.2.tar.bz2 740189 BLAKE2B 77263318afe376a9b50f129c6969fcb540685bb151f78a94f0024e27871cd8fb895d3edc41483ff8f3b8c8c28d24142252155c6ca68b614375c1fc93f08fdb45 SHA512 1ac2dea2200f00846bc5b5f86d02292f345dc904a121df86a662ca1844b1bdd9eea6bf0cd88dda97ff84e30d990b065bd9597cb563dbb75f639e820d41f83dbc DIST libxfce4ui-4.15.3.tar.bz2 756530 BLAKE2B ca2a9d5aae80d22a97b2fe932248756c9f34f71a13342670cdc0ad1c5393eb62d4f5bed8b21a45a60c762a83ebf1458deb7ef629c4dd3c894468ecf16a821dcf SHA512 a0e5a60c54df811fa2815238f9fe506700f6df8a6baa8172a6f8c68f005b54ba94ee31aba87d635fb506700da9c77e25f8c57268018fc8cfa5577f29aab58a6b EBUILD libxfce4ui-4.14.1.ebuild 1704 BLAKE2B 83defd465a237ed31b648de09e2f657c3510d3dec1b52a217b4795be00e6206aa7b14f7b073c16cfe0def3155eb577e0a3b0985bc5a582ab6d0f9c264b47c408 SHA512 69d4fb24cc2a9b56e0fa2bc5d4d754cf8e02be58095a96fa0b459c84a8939b36adbd157c1debd42f116f77f484839d518d561d1218c4d1a0acb2c806c3c471cc -EBUILD libxfce4ui-4.15.2.ebuild 1565 BLAKE2B ee74c6a252293de607b8a79cfe7688cd59a08a7f6eabfd41242096d2116be8d91137190335944a0f3a21b02bd3020e158b76f21b13e0f3c7f8625db3375d482f SHA512 1dbe43388a3b95bfd70bdd04e8d8b5f5e2fd1717d3ee9fb285456cb35b7a441eb05d7ca1b8d544377133efc2ed30ad3372da65c5f10b36f5976afeba90a241af -EBUILD libxfce4ui-4.15.3.ebuild 1565 BLAKE2B ee74c6a252293de607b8a79cfe7688cd59a08a7f6eabfd41242096d2116be8d91137190335944a0f3a21b02bd3020e158b76f21b13e0f3c7f8625db3375d482f SHA512 1dbe43388a3b95bfd70bdd04e8d8b5f5e2fd1717d3ee9fb285456cb35b7a441eb05d7ca1b8d544377133efc2ed30ad3372da65c5f10b36f5976afeba90a241af +EBUILD libxfce4ui-4.15.3-r1.ebuild 1616 BLAKE2B ebc2d2e7089d9a68a08155b6f547e6e82c8d755a406c6a9ea563f8f4ac544ad2918aa4ed07875bfe0a6f3ea9c53601862ffbc8ed665f4e97466cc0adc36c3c5a SHA512 7e0364be788992bd60ae8a1d0493e19c5ccc05d1e4a2fb4f2723d73e7c6dfd1de67ab2cc1c232858f57a69564a38dec50de1a0b1cde6dd6e0f0dd5a89d0da8df MISC metadata.xml 515 BLAKE2B b0ddce75f198a496e2d7f1f658091c1301190aadef8f5a9a65b43e4f1a3c2a915e14329bd512984e13a2189eafb56bf00b571e9c4668fa5026eef01bb718d92c SHA512 ab5ebbf64571d8b5b7c1be3c329fa641ddb7ed5447066d5a207dce7487605bf2f86c13dce27788a17b2262efeec2845d42bf2aa9ca7dc16778b7288b77d29886 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 new file mode 100644 index 000000000000..bfce065fdef4 --- /dev/null +++ b/xfce-base/libxfce4ui/files/libxfce4ui-4.15.3-kb-shortcut.patch @@ -0,0 +1,38 @@ +From 0fc934ebee037a91e032d362d83d991309c4ce88 Mon Sep 17 00:00:00 2001 +From: Harald Judt +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.2.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.15.2.ebuild deleted file mode 100644 index cddd13c8d5ef..000000000000 --- a/xfce-base/libxfce4ui/libxfce4ui-4.15.2.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.3-r1.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.15.3-r1.ebuild new file mode 100644 index 000000000000..9d9f9229dd38 --- /dev/null +++ b/xfce-base/libxfce4ui/libxfce4ui-4.15.3-r1.ebuild @@ -0,0 +1,71 @@ +# 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.3.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.15.3.ebuild deleted file mode 100644 index cddd13c8d5ef..000000000000 --- a/xfce-base/libxfce4ui/libxfce4ui-4.15.3.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 -} -- cgit v1.2.3