[gentoo-commits] repo/gentoo:master commit in: app-emulation/plus42/files/, app-emulation/plus42/

["Bernard Cafarelli" <voyageur@gentoo.org>]

commit:     b7b4a593afb2ecb7e3f96c78626ab2ef76e97ada
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  6 21:29:18 2022 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Sun Nov  6 21:29:18 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7b4a593

app-emulation/plus42: add 1.0.12

Closes: https://bugs.gentoo.org/847031
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>

 app-emulation/plus42/Manifest                      |  1 +
 .../files/plus42-1.0.12-fix-build-intel-lib.patch  | 65 ++++++++++++++++++++++
 app-emulation/plus42/plus42-1.0.12.ebuild          | 50 +++++++++++++++++
 3 files changed, 116 insertions(+)

diff --git a/app-emulation/plus42/Manifest b/app-emulation/plus42/Manifest
index 9eb537e8a8d3..0435510e248f 100644
--- a/app-emulation/plus42/Manifest
+++ b/app-emulation/plus42/Manifest
@@ -1,2 +1,3 @@
 DIST plus42-upstream-1.0.10.tgz 7585424 BLAKE2B c27f5e653e07986a092efc34ed6aaf7de2b1e6c20db3300fc6bd35337032a57b4623cf9d5ecb1b0e56e1a7b6d92a4b5d04be0b9dea9fade9d0e7efe86901ca8d SHA512 d504988c5bfcf1e554ee7478c5c6d0cc7472e3ba9904fb45d2ea77bf05307e0def79002785551b6a876d714d5d4279728b329c63c7108a935b06967c65441083
+DIST plus42-upstream-1.0.12.tgz 7587652 BLAKE2B 22238d0e0b315f682063803d01cc2c1e943b152d8dd37998fbf81827d311f13b43e7529bf9fc229697b865dfe630ff1024052e119b5753386ac9a06db0f2c0e4 SHA512 31e380ab45d11a2e1a02ade6b9ce61aa756ee20ad8424eb404986ff536be8e91dea63b00baea607d7f0e41e0406d2bbab9f91123a637a2c87bbfe25bcabbbaa7
 DIST plus42-upstream-1.0.9.tgz 7585218 BLAKE2B e6c09c985fcf3f037a0c1dc1f4f445ef18c4f73962ffbf46939b91d5a96c9f079bd36b328b30fcae42f0bc13ebee7a1f56e51762f225f41fb715ab88e8b93d56 SHA512 77c06cf33d375f513c6806910f6b8bdda865853e7890922174364a7d2a07e35a6bbae2e62800c7658be01fe8b3aafbfc7f53a19451475b411865fe69bef090d8

diff --git a/app-emulation/plus42/files/plus42-1.0.12-fix-build-intel-lib.patch b/app-emulation/plus42/files/plus42-1.0.12-fix-build-intel-lib.patch
new file mode 100644
index 000000000000..283c6c1435be
--- /dev/null
+++ b/app-emulation/plus42/files/plus42-1.0.12-fix-build-intel-lib.patch
@@ -0,0 +1,65 @@
+diff -Naur free42-nologo-3.0.16.orig/gtk/build-intel-lib.sh free42-nologo-3.0.16/gtk/build-intel-lib.sh
+--- free42-nologo-3.0.16.orig/gtk/build-intel-lib.sh	2022-10-29 17:03:11.000000000 +0200
++++ free42-nologo-3.0.16/gtk/build-intel-lib.sh	2022-11-06 22:09:42.384802729 +0100
+@@ -10,13 +10,6 @@
+   fi
+ fi
+ 
+-which gcc >/dev/null
+-if [ $? -eq 0 ]; then
+-  CC=gcc
+-else
+-  CC=cc
+-fi
+-
+ # Hack to support FreeBSD; not 100% sure what this does, but it produces a
+ # library that passes all tests.
+ 
+@@ -64,8 +57,11 @@
+     ;;
+ esac
+ 
++patch -p0 <../intel-lib-custom-cc.patch
++
+ cd LIBRARY
+-$MK $OS_ARG CC=$CC CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0 $ENDIAN_ARG
++echo $MK $OS_ARG A=a CC=$CC CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0 $ENDIAN_ARG
++$MK $OS_ARG A=a CC=$CC CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0 $ENDIAN_ARG
+ mv libbid.a ../../gcc111libbid.a
+ cd ../..
+ ( echo '#ifdef FREE42_FPTEST'; echo 'const char *readtest_lines[] = {'; tr -d '\r' < IntelRDFPMathLib20U1/TESTS/readtest.in | sed 's/^\(.*\)$/"\1",/'; echo '0 };'; echo '#endif' ) > readtest_lines.cc
+diff -Naur free42-nologo-3.0.16.orig/gtk/intel-lib-custom-cc.patch free42-nologo-3.0.16/gtk/intel-lib-custom-cc.patch
+--- free42-nologo-3.0.16.orig/gtk/intel-lib-custom-cc.patch	1970-01-01 01:00:00.000000000 +0100
++++ free42-nologo-3.0.16/gtk/intel-lib-custom-cc.patch	2022-11-06 22:18:35.428433045 +0100
+@@ -0,0 +1,31 @@
++diff -Naur orig/LIBRARY/makefile.iml_head LIBRARY/makefile.iml_head
++--- orig/LIBRARY/makefile.iml_head	2011-07-12 17:26:21.000000000 +0200
+++++ LIBRARY/makefile.iml_head	2022-11-06 22:18:17.048411637 +0100
++@@ -527,12 +527,8 @@
++ CC_TYPES      := gcc cl
++ INTEL_CC_LIST := icc icl
++ 
++-CC_NAME_INDEX := $(call GetIndex,$(CC_NAME),$(CC_NAME_LIST))
++-ifeq ($(CC_NAME_INDEX),)
++-    $(error "Unknown CC_NAME ($(CC_NAME)). Must be one of $(CC_NAME_LIST))
++-endif
++ 
++-CC_INDEX      := $(call GetIndex,$(CC_NAME),$(CC_NAME_LIST))
+++CC_INDEX      := 3
++ CC_TYPE       := $(word $(CC_INDEX),$(CC_TYPE_LIST))
++ CC_TYPE_INDEX := $(call GetIndex,$(CC_TYPE),$(CC_TYPES))
++ 
++@@ -543,13 +539,6 @@
++ _CPP := $(CC_NAME) $(call CcNameSelect,-EP,-EP,-E -P,-EP)
++ _CC  := $(CC_NAME) $(call CcNameSelect,, -nologo,, -nologo)
++ 
++-ifeq ($(origin CC),default)
++-    CC := $(_CC)
++-endif
++-ifeq ($(origin CPP),default)
++-    CPP := $(_CPP)
++-endif
++-
++ CselCc         = $(call Cset,$1,$(call CcTypeSelect,$2,$3))
++ 
++ QOPT           := $(call CselCc, QOPT,        -, /Q      )

diff --git a/app-emulation/plus42/plus42-1.0.12.ebuild b/app-emulation/plus42/plus42-1.0.12.ebuild
new file mode 100644
index 000000000000..3812fdade255
--- /dev/null
+++ b/app-emulation/plus42/plus42-1.0.12.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+MY_PV="${PN}-upstream-${PV}"
+
+DESCRIPTION="An Enhanced HP-42S Calculator Simulator"
+HOMEPAGE="https://thomasokken.com/plus42/"
+SRC_URI="https://thomasokken.com/plus42/upstream/${MY_PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa"
+
+DEPEND="app-accessibility/at-spi2-core
+	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}-1.0.9-fix-makefile.patch"
+	"${FILESDIR}/${PN}-1.0.12-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/plus42bin gtk/plus42dec
+}