[gentoo-commits] repo/gentoo:master commit in: x11-libs/xforms/files/, x11-libs/xforms/

[gentoo-commits] repo/gentoo:master commit in: x11-libs/xforms/files/, x11-libs/xforms/

[David Seifert]

commit:     f034d2ba8860375257ff85d79d75a0fe30d68a19
Author:     Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Fri Nov 27 17:36:37 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Nov 27 17:36:37 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f034d2ba

x11-libs/xforms: port to EAPI 7

Closes: https://github.com/gentoo/gentoo/pull/18430
Closes: https://bugs.gentoo.org/706936
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../xforms/files/xforms-1.2.4-fno-common.patch     | 40 +++++++++++++++++
 x11-libs/xforms/xforms-1.2.4-r1.ebuild             | 51 ++++++++++++++++++++++
 2 files changed, 91 insertions(+)

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 00000000000..fd4ca7714fc
--- /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 00000000000..665d6a64496
--- /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
+}