gentoo resync : 28.11.2020

6 files changed, 121 insertions, 0 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 1bc44b94aac4..389f38ad1200 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/spread-sheet-widget/Manifest b/x11-libs/spread-sheet-widget/Manifest
index 12dd6ca0a2dc..32010cac4f15 100644
--- a/x11-libs/spread-sheet-widget/Manifest
+++ b/x11-libs/spread-sheet-widget/Manifest
@@ -1,3 +1,5 @@
 DIST spread-sheet-widget-0.3.tar.gz 501469 BLAKE2B 92acf196966271086b02ad3a172d0f439a84701b3074677be87c84643c6a9180685121370611b21f1c9d65ed0aeacccce169a6f53d9f7f418f5e8469744fb19b SHA512 1b667c901e42f00e7862dab70fd9df65e69aaa09d1f9eb0e7d83ccbeb74239b24188ff096b5645150ee8c98f4881501402704db96642a41b804674cbb95d1bcc
+DIST spread-sheet-widget-0.6.tar.gz 522827 BLAKE2B 0e68fff897915b9a74fb954d604efde4180c82550d5af7ec43cdb3bc843fefa5eaf33994e95dcd65cadf5f04c24e1d0a7f08f0c7465a35c62c434c42c48bd366 SHA512 7a5b436cb0411fa4759b467935b7e14a15ae83c971a449525ef19cb50584ef9293efb1f6160e3b373b5bf7b48c2688c36f8396b5942599ebcb8e2957e07179b9
 EBUILD spread-sheet-widget-0.3-r1.ebuild 472 BLAKE2B 64bf85bd487ad0d34e01b8f27abbe8690c67a3cf42edfe3ec5b22b57c700bd75213723b094d41dbb4085309fab262a0167dbea4f6c98db54313dbcd7fea47ae1 SHA512 7724b9fb842137f3c01a20c50d02095cb7d38f6a647d774605e16661bc7fb018d99a438c82914e69cd55e92feb1145517e00af6258b20ab1aa4f56383ae10ed6
+EBUILD spread-sheet-widget-0.6.ebuild 474 BLAKE2B 3cffa9ca357d614ff54d2d281c4a9043d6aa366c26c1dff6184532f671c87979bbd8a1c6a64516c34fecb396b9dc92324a79cbd49099a255a2e536f141acf409 SHA512 a26c6cb70cef9279c222d177f893ef4f70e6ae502edda28f0251baee79fe752ea423e9ba93c0297e7d6ecab8bfb073502fbf471a545d2fa9444fa15993c32ed6
 MISC metadata.xml 783 BLAKE2B 352fc49d73a0037151ccb02d9d14d03a9f71eddbdf1add8e7b805cf398fbe7dae6d7a6bd985ef84bc34092f0fa4fb525d6cc4ad39f76cfb5944cf9897b68568f SHA512 9bc392c1064f078db2e1356c0736db3660339f81d20dbfa9039f01f0e8907c660285ed5a8c98b62feafe2e902351d52bdc2bc2c6538c5f7c1c8e79cf08e5df83
diff --git a/x11-libs/spread-sheet-widget/spread-sheet-widget-0.6.ebuild b/x11-libs/spread-sheet-widget/spread-sheet-widget-0.6.ebuild
new file mode 100644
index 000000000000..87e31eee3ade
--- /dev/null
+++ b/x11-libs/spread-sheet-widget/spread-sheet-widget-0.6.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="GNU Spread Sheet Widget"
+HOMEPAGE="https://www.gnu.org/software/ssw/"
+SRC_URI="mirror://gnu-alpha/ssw/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="x11-libs/gtk+:3"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
+}
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
+}