From ed34e81d8408b12cbb9af76ffec61996706dce73 Mon Sep 17 00:00:00 2001 From: Adam Feldman Date: Mon, 6 Apr 2020 16:25:20 -0400 Subject: app-arch/engrampa: Fix #707298 Closes: https://bugs.gentoo.org/707298 Package-Manager: Portage-2.3.96, Repoman-2.3.21 Signed-off-by: Adam Feldman --- app-arch/engrampa/engrampa-1.22.3-r1.ebuild | 72 ++++++++++++++++++++++ app-arch/engrampa/engrampa-1.22.3.ebuild | 69 --------------------- .../files/engrampa-1.22.3-gcc-10-fno-common.patch | 22 +++++++ 3 files changed, 94 insertions(+), 69 deletions(-) create mode 100644 app-arch/engrampa/engrampa-1.22.3-r1.ebuild delete mode 100644 app-arch/engrampa/engrampa-1.22.3.ebuild create mode 100644 app-arch/engrampa/files/engrampa-1.22.3-gcc-10-fno-common.patch (limited to 'app-arch/engrampa') diff --git a/app-arch/engrampa/engrampa-1.22.3-r1.ebuild b/app-arch/engrampa/engrampa-1.22.3-r1.ebuild new file mode 100644 index 000000000000..92299844e0fa --- /dev/null +++ b/app-arch/engrampa/engrampa-1.22.3-r1.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +MATE_LA_PUNT="yes" + +inherit eutils mate + +if [[ ${PV} != 9999 ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~x86" +fi + +DESCRIPTION="Engrampa archive manager for MATE" +LICENSE="FDL-1.1+ GPL-2+ LGPL-2+" +SLOT="0" + +IUSE="caja magic packagekit" + +RDEPEND=" + >=dev-libs/glib-2.50:2 + >=dev-libs/json-glib-0.14 + virtual/libintl + x11-libs/gdk-pixbuf:2 + >=x11-libs/gtk+-3.22:3[X] + x11-libs/pango + caja? ( >=mate-base/caja-1.17.1 ) + magic? ( sys-apps/file ) + packagekit? ( app-admin/packagekit-base ) + !!app-arch/mate-file-archiver" + +DEPEND="${RDEPEND} + app-text/yelp-tools + dev-util/glib-utils + >=dev-util/intltool-0.50.1 + sys-devel/gettext + virtual/pkgconfig +" + +src_configure() { + mate_src_configure \ + --disable-run-in-place \ + $(use_enable caja caja-actions) \ + $(use_enable magic) \ + $(use_enable packagekit) +} + +PATCHES=( + "${FILESDIR}/${P}-gcc-10-fno-common.patch" +) + +src_install() { + mate_src_install +} + +pkg_postinst() { + mate_pkg_postinst + optfeature "Support for 7-zip" app-arch/p7zip + optfeature "Support for ace" app-arch/unace + optfeature "Support for arj" app-arch/arj + optfeature "Support for cpio" app-arch/cpio + optfeature "Support for deb" app-arch/dpkg + optfeature "Support for iso" app-cdr/cdrtools + optfeature "Support for jar,zip" app-arch/zip app-arch/unzip + optfeature "Support for lha" app-arch/lha + optfeature "Support for lzma" app-arch/xz-utils + optfeature "Support for lzop" app-arch/lzop + optfeature "Support for rar" app-arch/unrar + optfeature "Support for rpm" app-arch/rpm + optfeature "Support for unstuff" app-arch/stuffit + optfeature "Support for zoo" app-arch/zoo +} diff --git a/app-arch/engrampa/engrampa-1.22.3.ebuild b/app-arch/engrampa/engrampa-1.22.3.ebuild deleted file mode 100644 index d5caa2ad5aac..000000000000 --- a/app-arch/engrampa/engrampa-1.22.3.ebuild +++ /dev/null @@ -1,69 +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 eutils mate - -if [[ ${PV} != 9999 ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~x86" -fi - -DESCRIPTION="Engrampa archive manager for MATE" -LICENSE="FDL-1.1+ GPL-2+ LGPL-2+" -SLOT="0" - -IUSE="caja magic packagekit" - -RDEPEND=" - >=dev-libs/glib-2.50:2 - >=dev-libs/json-glib-0.14 - virtual/libintl - x11-libs/gdk-pixbuf:2 - >=x11-libs/gtk+-3.22:3[X] - x11-libs/pango - caja? ( >=mate-base/caja-1.17.1 ) - magic? ( sys-apps/file ) - packagekit? ( app-admin/packagekit-base ) - !!app-arch/mate-file-archiver" - -DEPEND="${RDEPEND} - app-text/yelp-tools - dev-util/glib-utils - >=dev-util/intltool-0.50.1 - sys-devel/gettext - virtual/pkgconfig -" - -src_configure() { - mate_src_configure \ - --disable-run-in-place \ - $(use_enable caja caja-actions) \ - $(use_enable magic) \ - $(use_enable packagekit) -} - -src_install() { - mate_src_install -} - -pkg_postinst() { - mate_pkg_postinst - optfeature "Support for 7-zip" app-arch/p7zip - optfeature "Support for ace" app-arch/unace - optfeature "Support for arj" app-arch/arj - optfeature "Support for cpio" app-arch/cpio - optfeature "Support for deb" app-arch/dpkg - optfeature "Support for iso" app-cdr/cdrtools - optfeature "Support for jar,zip" app-arch/zip app-arch/unzip - optfeature "Support for lha" app-arch/lha - optfeature "Support for lzma" app-arch/xz-utils - optfeature "Support for lzop" app-arch/lzop - optfeature "Support for rar" app-arch/unrar - optfeature "Support for rpm" app-arch/rpm - optfeature "Support for unstuff" app-arch/stuffit - optfeature "Support for zoo" app-arch/zoo -} - diff --git a/app-arch/engrampa/files/engrampa-1.22.3-gcc-10-fno-common.patch b/app-arch/engrampa/files/engrampa-1.22.3-gcc-10-fno-common.patch new file mode 100644 index 000000000000..61e23e087cf6 --- /dev/null +++ b/app-arch/engrampa/files/engrampa-1.22.3-gcc-10-fno-common.patch @@ -0,0 +1,22 @@ +From 623bd665371e3afd9dc6fa29f9e1cfe735681358 Mon Sep 17 00:00:00 2001 +From: rbuj +Date: Wed, 29 Jan 2020 15:52:44 +0100 +Subject: [PATCH] Fix build using gcc 10 -fno-common flag + +--- + src/main.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/main.c b/src/main.c +index 56e75ea0..a9e297dc 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -33,8 +33,6 @@ + + #include "fr-init.h" + +-gint ForceDirectoryCreation; +- + static char **remaining_args; + static char *add_to = NULL; + static int add; -- cgit v1.2.3-65-gdbad