app-emulation/free42: 2.5.12 bump, switches to GTK 3

Package-Manager: Portage-2.3.80, Repoman-2.3.19
Signed-off-by: Bernard Cafarelli <voyageur@gentoo.org>

diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest
index f6a6e14761817e99f827e68826db5bb0ba137000..eb7d07fa4a7cb6f4304ec9d8529c322f422820fd 100644 (file)
--- a/app-emulation/free42/Manifest
+++ b/app-emulation/free42/Manifest
@@ -1,3 +1,4 @@
 DIST free42-nologo-2.0.20.tgz 7390214 BLAKE2B 306f3378bcbb44fa7982c5d9c29bfbea62e915ca50ca5e5216f46fbf483f110a1288d4800991a74622a042517496ff8dd94c3fa3249e8bb4181957e6b23d5ea3 SHA512 9b540fbc50df2f94b135b5e778354f330df77a54ef2ad99b257b5b91d1e3e8d1241e8a834522fc46fe33571ea2695ad8889b427dbcf653870672e89cd56d60f5
 DIST free42-nologo-2.5.10.tgz 7408769 BLAKE2B eec27805199b80ce659517479bbaefe871f8e4d2fc06c138e4741d63748acdef7e04b54324ff679a820ca451fcfa34e4202edf196e426679adabe397313f8f37 SHA512 309ee3779b792208ab887b91e43c4bf7a61862b02e3c250fd09367c154345878ad80c2c949138cb5d0c5d7031ebb0d4c6d192962866b6b68fce220ab2d651b42
 DIST free42-nologo-2.5.11.tgz 7408708 BLAKE2B a7eedafb15ff52e52774b7750bd00cba0b94176d90572cf60c1b927d47a879ea834704b424b2dfcd467c3ae08566a0269d0b5b7a1418e5c4399f7c4e86dd7198 SHA512 389bacf4af420fe4bb8174d15b049f73004f9cecdfd98b1c4aafbe2076c77ba1ce1f4a7df762f4622ccbec2ffbaffc218d0afe576a977d1c583e4a4ca20eff46
+DIST free42-nologo-2.5.12.tgz 7409287 BLAKE2B 9d2e244c1d7c7c728bfde6331badee412573239e3470e84f30776f62f9c6224ff3dc3d3cea8574349aeebd171c6682cfbc12b9bbdd2decbce6b6223aae705a1f SHA512 d93d55dfedfb33f91868f92e6ab9c1db48ff05e932c6628df5bb8237192aaeb104a2da56422cecfeab2ccc24d41fb518f6901ce2424739450d56a5ae7f90cda1

diff --git a/app-emulation/free42/files/free42-2.5.12-fix-makefile.patch b/app-emulation/free42/files/free42-2.5.12-fix-makefile.patch
new file mode 100644 (file)
index 0000000..8a8fa43
--- /dev/null
+++ b/app-emulation/free42/files/free42-2.5.12-fix-makefile.patch
@@ -0,0 +1,45 @@
+diff -Naur free42-nologo-2.5.12.orig/gtk/Makefile free42-nologo-2.5.12/gtk/Makefile
+--- free42-nologo-2.5.12.orig/gtk/Makefile     2019-11-28 20:11:51.000000000 +0100
++++ free42-nologo-2.5.12/gtk/Makefile  2019-11-29 17:59:58.292516949 +0100
+@@ -15,7 +15,7 @@
+ # along with this program; if not, see http://www.gnu.org/licenses/.
+ ###############################################################################
+ 
+-CFLAGS = -MMD \
++CFLAGS := -MMD \
+        -Wall \
+        -Wno-parentheses \
+        -Wno-write-strings \
+@@ -34,7 +34,8 @@
+        -DDECIMAL_GLOBAL_ROUNDING=1 \
+        -DDECIMAL_GLOBAL_ROUNDING_ACCESS_FUNCTIONS=1 \
+        -DDECIMAL_GLOBAL_EXCEPTION_FLAGS=1 \
+-       -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1
++       -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1 \
++       ${CFLAGS}
+ 
+ ###############################################################################
+ ### Note that there are deprecation warnings while compiling shell_main.cc  ###
+@@ -46,10 +47,11 @@
+ ### GTK+ 3.22 for testing.                                                  ###
+ ###############################################################################
+ 
+-CXXFLAGS = $(CFLAGS) \
++CXXFLAGS := $(CFLAGS) \
+        -fno-exceptions \
+        -fno-rtti \
+-       -D_WCHAR_T_DEFINED
++       -D_WCHAR_T_DEFINED \
++       ${CFLAGS}
+ 
+ LIBS = gcc111libbid.a $(shell pkg-config --libs gtk+-3.0)
+ 
+@@ -125,7 +127,7 @@
+ 
+ symlinks:
+       for fn in `cd ../common; /bin/ls`; do ln -s ../common/$$fn; done
+-      sh ./build-intel-lib.sh
++      +sh ./build-intel-lib.sh
+       ln -s IntelRDFPMathLib20U1/TESTS/readtest.c
+       touch symlinks
+ 

diff --git a/app-emulation/free42/free42-2.5.12.ebuild b/app-emulation/free42/free42-2.5.12.ebuild
new file mode 100644 (file)
index 0000000..a50835b
--- /dev/null
+++ b/app-emulation/free42/free42-2.5.12.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_PV="${PN}-nologo-${PV}"
+
+DESCRIPTION="An HP-42S Calculator Simulator"
+HOMEPAGE="https://thomasokken.com/free42/"
+SRC_URI="https://thomasokken.com/free42/upstream/${MY_PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa"
+
+DEPEND="dev-libs/atk
+       x11-libs/cairo
+       x11-libs/gdk-pixbuf
+       x11-libs/gtk+:3
+       alsa? ( media-libs/alsa-lib )"
+
+RDEPEND="${DEPEND}"
+
+DOCS=( CREDITS HISTORY README )
+S="${WORKDIR}/${MY_PV}"
+
+PATCHES=(
+       "${FILESDIR}/${PN}-2.5.12-fix-makefile.patch"
+       "${FILESDIR}/${PN}-2.5.3-fix-build-intel-lib.patch"
+)
+
+src_prepare() {
+       default
+}
+
+src_compile() {
+       local myconf
+       use alsa && myconf="AUDIO_ALSA=yes"
+       emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" ${myconf} -C gtk
+       emake -C gtk clean
+       emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" BCD_MATH=1 ${myconf} -C gtk
+}
+
+src_install() {
+       default
+       dobin gtk/free42bin gtk/free42dec
+}