From 106aa6e9989ddf9cc5c97810c6b1038aa142708b Mon Sep 17 00:00:00 2001 From: Adam Feldman Date: Mon, 6 Apr 2020 18:14:04 -0400 Subject: mate-extra/mate-utils: Fix #709976 Closes: https://bugs.gentoo.org/709976 Package-Manager: Portage-2.3.96, Repoman-2.3.21 Signed-off-by: Adam Feldman --- .../mate-utils-1.22.2-gcc-10-fno-common.patch | 37 ++++++++++++ mate-extra/mate-utils/mate-utils-1.22.2-r1.ebuild | 69 ++++++++++++++++++++++ mate-extra/mate-utils/mate-utils-1.22.2.ebuild | 65 -------------------- 3 files changed, 106 insertions(+), 65 deletions(-) create mode 100644 mate-extra/mate-utils/files/mate-utils-1.22.2-gcc-10-fno-common.patch create mode 100644 mate-extra/mate-utils/mate-utils-1.22.2-r1.ebuild delete mode 100644 mate-extra/mate-utils/mate-utils-1.22.2.ebuild (limited to 'mate-extra') 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 000000000000..052c1a27bbe1 --- /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 +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.2-r1.ebuild b/mate-extra/mate-utils/mate-utils-1.22.2-r1.ebuild new file mode 100644 index 000000000000..63022e807b7b --- /dev/null +++ b/mate-extra/mate-utils/mate-utils-1.22.2-r1.ebuild @@ -0,0 +1,69 @@ +# 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" + +PATCHES=( + "${FILESDIR}/${P}-gcc-10-fno-common.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.2.ebuild b/mate-extra/mate-utils/mate-utils-1.22.2.ebuild deleted file mode 100644 index e739dfd98991..000000000000 --- 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) -} -- cgit v1.2.3-65-gdbad