commit: 5608e262420ba168eb32f6f9c04d8cfbf2513a15 Author: Adam Feldman <NP-Hardass <AT> gentoo <DOT> org> AuthorDate: Wed Sep 2 05:43:12 2020 +0000 Commit: Adam Feldman <np-hardass <AT> gentoo <DOT> org> CommitDate: Wed Sep 2 05:55:38 2020 +0000 URL: https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=5608e262
mate-extra/mate-utils: Sync with ::gentoo Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Adam Feldman <NP-Hardass <AT> gentoo.org> mate-extra/mate-utils/Manifest | 2 - .../mate-utils-1.22.2-gcc-10-fno-common.patch | 37 ++++++++++++ mate-extra/mate-utils/mate-utils-1.22.1-r1.ebuild | 68 ---------------------- ...s-1.22.0.ebuild => mate-utils-1.22.2-r1.ebuild} | 4 ++ mate-extra/mate-utils/mate-utils-1.22.2.ebuild | 65 --------------------- ...s-1.24.0.ebuild => mate-utils-1.24.0-r1.ebuild} | 3 +- 6 files changed, 43 insertions(+), 136 deletions(-) diff --git a/mate-extra/mate-utils/Manifest b/mate-extra/mate-utils/Manifest index cd12a5d..3f09230 100644 --- a/mate-extra/mate-utils/Manifest +++ b/mate-extra/mate-utils/Manifest @@ -1,4 +1,2 @@ -DIST mate-utils-1.22.0.tar.xz 7300112 BLAKE2B 8a613b6dcb99e652ad6b44bd64ad9b2f9c809713b5fb904059b64234b51e2a06b2290dcf14d7dde82e8011be2ca395fe74d87bcae5b903b196d55bb50e8fdf07 SHA512 248c6e4108900768a4e8b272d20ac9b2d70e8bf77375f4669a099f4d8386c2e8affeafb772d209f00906f96f20d7ee347167ef4837186f44d8aaad85ef855f70 -DIST mate-utils-1.22.1.tar.xz 7284496 BLAKE2B 83e7e39a0daadae595ab2cc90ad250f61a294afc896df28bf17259cec619af4b0c9d1927c07b03a0cdd7449174af258227678299823169e2cb4d9c4d3ec98c92 SHA512 0f70f088de80440ff6954c899eab75c2bf22d332293c1ec61bf8391396ed31a2ab126279dc4d9dab6f4932225120309bc52e122bcd5a8dc17abccfd6e480390d DIST mate-utils-1.22.2.tar.xz 7306448 BLAKE2B 0fb28f85e39ac58c1e78e6f5f4c6d01e72a2b8c32197739b93ec3f17617b4676fdfe251b81e3b5b01c44f69136d9bfc8d12d64fff832d5a9f1c30591b2facebb SHA512 bf33019ebd1dc4ff6010ba0824981334b7065a62dfc7a73170487df5f165ad20831a900ef4e4e0641ca130aa618f82aa27606f0a48c2cb9907ea7ef118f02a60 DIST mate-utils-1.24.0.tar.xz 7930068 BLAKE2B 0e2c82afbc2d8a90b8c31d56d9bfbb3a477b1e9cd67108e52c96f4087d09336ed9e6980551e39b43797743b9ef86cc2beabfa84fd7a5820e38122e0d0a7c968d SHA512 d8945c85936a55d22f3ed94c9858ba84cadf552a63cdd2d9eec9120111ad71526ac88772f8e4b7a6a460b691574534e52706fba35a0395b1d894b27eece9e92c diff --git a/mate-extra/mate-utils/files/mate-utils-1.22.2-gcc-10-fno-common.patch b/mate-extra/mate-utils/files/mate-utils-1.22.2-gcc-10-fno-common.patch new file mode 100644 index 0000000..052c1a2 --- /dev/null +++ b/mate-extra/mate-utils/files/mate-utils-1.22.2-gcc-10-fno-common.patch @@ -0,0 +1,37 @@ +From d2d4902a68b8eabf4dc26a8ba49019e5ea6040c6 Mon Sep 17 00:00:00 2001 +From: rbuj <[email protected]> +Date: Wed, 29 Jan 2020 16:22:09 +0100 +Subject: [PATCH] Fix build using gcc 10 -fno-common flag + +Closes #258 +--- + baobab/src/baobab.c | 2 ++ + baobab/src/baobab.h | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/baobab/src/baobab.c b/baobab/src/baobab.c +index 07af1a1d..d4edde1f 100644 +--- a/baobab/src/baobab.c ++++ b/baobab/src/baobab.c +@@ -42,6 +42,8 @@ + static void push_iter_in_stack (GtkTreeIter *); + static GtkTreeIter pop_iter_from_stack (void); + ++BaobabApplication baobab; ++ + static gint currentdepth = 0; + static GtkTreeIter currentiter; + static GtkTreeIter firstiter; +diff --git a/baobab/src/baobab.h b/baobab/src/baobab.h +index b8d01817..76b22d6a 100644 +--- a/baobab/src/baobab.h ++++ b/baobab/src/baobab.h +@@ -99,7 +99,7 @@ struct _BaobabApplication { + }; + + /* Application singleton */ +-BaobabApplication baobab; ++extern BaobabApplication baobab; + + struct chan_data { + guint64 size; diff --git a/mate-extra/mate-utils/mate-utils-1.22.1-r1.ebuild b/mate-extra/mate-utils/mate-utils-1.22.1-r1.ebuild deleted file mode 100644 index eda9351..0000000 --- a/mate-extra/mate-utils/mate-utils-1.22.1-r1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MATE_LA_PUNT="yes" - -inherit mate - -if [[ ${PV} != 9999 ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~x86" -fi - -DESCRIPTION="Utilities for the MATE desktop" -LICENSE="FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+" -SLOT="0" - -IUSE="X applet debug ipv6 test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/atk - >=dev-libs/glib-2.50:2 - >=gnome-base/libgtop-2.12:2= - >=media-libs/libcanberra-0.4[gtk3] - sys-libs/zlib - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - >=x11-libs/gtk+-3.22:3 - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXext - x11-libs/pango - applet? ( >=mate-base/mate-panel-1.17.0 )" - -DEPEND="${RDEPEND} - app-text/rarian - >=app-text/scrollkeeper-dtd-1:1.0 - app-text/yelp-tools - dev-util/glib-utils - dev-util/gtk-doc - dev-util/gtk-doc-am - >=dev-util/intltool-0.50.1 - gnome-base/librsvg - sys-devel/gettext - virtual/pkgconfig - x11-base/xorg-proto" - -PATCHES=( "${FILESDIR}/${PN}-1.22.1-make-inkscape-optional.patch" ) - -src_prepare() { - # Make apps visible in all DEs. - LC_ALL=C find . -iname '*.desktop.in*' -exec \ - sed -e '/OnlyShowIn/d' -i {} + || die - - mate_src_prepare -} - -src_configure() { - mate_src_configure \ - --disable-maintainer-flags \ - --enable-zlib \ - --enable-debug=$(usex debug yes minimum) \ - $(use_with X x) \ - $(use_enable applet gdict-applet) \ - $(use_enable ipv6) -} diff --git a/mate-extra/mate-utils/mate-utils-1.22.0.ebuild b/mate-extra/mate-utils/mate-utils-1.22.2-r1.ebuild similarity index 95% rename from mate-extra/mate-utils/mate-utils-1.22.0.ebuild rename to mate-extra/mate-utils/mate-utils-1.22.2-r1.ebuild index 1d7235c..b58cd08 100644 --- a/mate-extra/mate-utils/mate-utils-1.22.0.ebuild +++ b/mate-extra/mate-utils/mate-utils-1.22.2-r1.ebuild @@ -46,6 +46,10 @@ DEPEND="${RDEPEND} virtual/pkgconfig x11-base/xorg-proto" +PATCHES=( + "${FILESDIR}/${P}-gcc-10-fno-common.patch" +) + src_prepare() { # Make apps visible in all DEs. LC_ALL=C find . -iname '*.desktop.in*' -exec \ diff --git a/mate-extra/mate-utils/mate-utils-1.22.2.ebuild b/mate-extra/mate-utils/mate-utils-1.22.2.ebuild deleted file mode 100644 index e739dfd..0000000 --- a/mate-extra/mate-utils/mate-utils-1.22.2.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MATE_LA_PUNT="yes" - -inherit mate - -if [[ ${PV} != 9999 ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~x86" -fi - -DESCRIPTION="Utilities for the MATE desktop" -LICENSE="FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+" -SLOT="0" - -IUSE="X applet debug ipv6 test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/atk - >=dev-libs/glib-2.50:2 - >=gnome-base/libgtop-2.12:2= - >=media-libs/libcanberra-0.4[gtk3] - sys-libs/zlib - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - >=x11-libs/gtk+-3.22:3 - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXext - x11-libs/pango - applet? ( >=mate-base/mate-panel-1.17.0 )" - -DEPEND="${RDEPEND} - app-text/rarian - >=app-text/scrollkeeper-dtd-1:1.0 - app-text/yelp-tools - dev-util/glib-utils - dev-util/gtk-doc - dev-util/gtk-doc-am - >=dev-util/intltool-0.50.1 - sys-devel/gettext - virtual/pkgconfig - x11-base/xorg-proto" - -src_prepare() { - # Make apps visible in all DEs. - LC_ALL=C find . -iname '*.desktop.in*' -exec \ - sed -e '/OnlyShowIn/d' -i {} + || die - - mate_src_prepare -} - -src_configure() { - mate_src_configure \ - --disable-maintainer-flags \ - --enable-zlib \ - --enable-debug=$(usex debug yes minimum) \ - $(use_with X x) \ - $(use_enable applet gdict-applet) \ - $(use_enable ipv6) -} diff --git a/mate-extra/mate-utils/mate-utils-1.24.0.ebuild b/mate-extra/mate-utils/mate-utils-1.24.0-r1.ebuild similarity index 96% rename from mate-extra/mate-utils/mate-utils-1.24.0.ebuild rename to mate-extra/mate-utils/mate-utils-1.24.0-r1.ebuild index c6f2825..28df90e 100644 --- a/mate-extra/mate-utils/mate-utils-1.24.0.ebuild +++ b/mate-extra/mate-utils/mate-utils-1.24.0-r1.ebuild @@ -8,7 +8,7 @@ MATE_LA_PUNT="yes" inherit mate if [[ ${PV} != 9999 ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~x86" + KEYWORDS="amd64 ~arm ~arm64 x86" fi DESCRIPTION="Utilities for the MATE desktop" @@ -63,6 +63,7 @@ src_prepare() { src_configure() { mate_src_configure \ + --disable-static \ --enable-zlib \ --enable-debug=$(usex debug yes minimum) \ $(use_with X x) \
