gentoo resync : 28.11.2020

3 files changed, 93 insertions, 0 deletions

diff --git a/x11-libs/xforms/Manifest b/x11-libs/xforms/Manifest
index 158a13375bd0..30fccdb11645 100644
--- a/x11-libs/xforms/Manifest
+++ b/x11-libs/xforms/Manifest
@@ -1,3 +1,5 @@
+AUX xforms-1.2.4-fno-common.patch 1265 BLAKE2B d75cab39e1adaad1ee3f9c9ab49e2520832421592f9879bee6be68e0306cbcf26d2a70767322efe4881e47c091898d1be1e112337731cfc1624f3453115fc028 SHA512 1ebb08da290d7d33963afa65115b8acaf92a8ab3686fb35310e2c33ab0f2af3528abd97eafe379c89d5877e8542db7623034a4366e18732a5bd08a160a221d77
 DIST xforms-1.2.4.tar.gz 1438503 BLAKE2B 5027fbd06d001f3291419e5d4e71f7c55e97394b7bda5bf0b4796ba34d7804e7b0bdd12271c082de150d7718039fc3ec6da1b1c530f6a36dcc3a7841c2cd416d SHA512 58669a64b2390da4f4c8b76b1dc34c2e6a4094ebbcfa7f75e0846db4d5c4455d772d9ef59e5aff09edd777957140015faea129c180600634a8d0962b01b912aa
+EBUILD xforms-1.2.4-r1.ebuild 933 BLAKE2B ec2236daf220976875c1c00833898af118988233c3751b7253f5e7949a1a75f174f0821c4dc639c2e3c05e2c29d29b9b92bb7b63620420c92f4bc59d18517b07 SHA512 71e3fe0e65def205163cec44d31e3d203ec6e39194c38cab03ab8277c4e96196abc737c54cd79a45b785a594e998321da2376f2f36a6927d8f2f7c80b1ed0e03
 EBUILD xforms-1.2.4.ebuild 900 BLAKE2B d78daacd5dc30239ee5f97d5919eac394a25e844d7f20933fcf1f415349d3111e01c555c139da68eecc89f233ff8fa1c96dbe2322eab2a664761f7317348b262 SHA512 b2d0194145754648b26e0d96acf9605f788527a443d5012e1f05bbc9426c716531235c4a29511a7aedd1cdec09efe0876a602af870651de0f5e5ca9bf61a75b0
 MISC metadata.xml 251 BLAKE2B f3c965f619454b2d17e1039b6c218308c83af9214f41a5b18244ce9bd811b0a0b6e0227fdaac9b1659a2e2467e6b992b771ff6cf431220648363ab8173ee76f2 SHA512 e8203a24b5e739dcf0d94742215ee6ccdccbd00bb43001f9df58d27100fa427b01937065e1d7399e3552532b09179611e06099e3af14aac5fcf9ddc4ca5463da
diff --git a/x11-libs/xforms/files/xforms-1.2.4-fno-common.patch b/x11-libs/xforms/files/xforms-1.2.4-fno-common.patch
new file mode 100644
index 000000000000..fd4ca7714fcf
--- /dev/null
+++ b/x11-libs/xforms/files/xforms-1.2.4-fno-common.patch
@@ -0,0 +1,40 @@
+Description: Fix FTBFS with GCC 10
+Author: Paul Wise <pabs@debian.org>
+Bug-Debian: https://bugs.debian.org/957439
+Origin: upstream, extracted from two separate commits:
+ https://git.savannah.nongnu.org/cgit/xforms.git/commit/?id=9806bce102d0c079c2c486b25ae6bdac3c98eecf
+ https://git.savannah.nongnu.org/cgit/xforms.git/commit/?id=2c1a9f151baf50887a517280645ec23379fb96f8
+--- a/fdesign/sp_spinner.c
++++ b/fdesign/sp_spinner.c
+@@ -29,7 +29,7 @@
+ #include "spec/spinner_spec.h"
+ 
+ static FD_spinnerattrib * spn_attrib;
+-FL_OBJECT *curobj;
++static FL_OBJECT *curobj;
+ 
+ 
+ /***************************************
+--- a/fdesign/sp_twheel.c
++++ b/fdesign/sp_twheel.c
+@@ -38,7 +38,7 @@
+ #include "spec/twheel_spec.h"
+ 
+ static FD_twheelattrib * twheel_attrib;
+-FL_OBJECT * curobj;
++static FL_OBJECT * curobj;
+ 
+ 
+ /***************************************
+--- a/lib/objects.c
++++ b/lib/objects.c
+@@ -36,6 +36,9 @@
+ 
+ #define TRANSLATE_Y( obj, form )    ( form->h - obj->h - obj->y )
+ 
++extern FL_OBJECT * fli_handled_obj;        /*  defined in  events.c */
++extern FL_OBJECT * fli_handled_parent;     /*  defined in  events.c */
++
+ extern FL_FORM * fli_fast_free_object;     /* defined in forms.c */
+ 
+ extern FL_OBJECT * fli_handled_obj;        /* defined in  events.c */
diff --git a/x11-libs/xforms/xforms-1.2.4-r1.ebuild b/x11-libs/xforms/xforms-1.2.4-r1.ebuild
new file mode 100644
index 000000000000..665d6a64496f
--- /dev/null
+++ b/x11-libs/xforms/xforms-1.2.4-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_P="${P/-/_}"
+
+DESCRIPTION="A graphical user interface toolkit for X"
+HOMEPAGE="http://xforms-toolkit.org/"
+SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+IUSE="doc opengl"
+
+RDEPEND="
+	virtual/jpeg:0=
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXpm
+	opengl? ( virtual/opengl )"
+
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
+
+DOCS=( ChangeLog README )
+
+src_prepare() {
+	default
+	AT_M4DIR=config eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable doc docs) \
+		$(use_enable opengl gl) \
+		--disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}