[gentoo-commits] repo/gentoo:master commit in: app-emulation/plus42/files/
commit: db3e7e74f686f125227c6e1ad5d573c83cdaa360 Author: Bernard Cafarelli gentoo org> AuthorDate: Sat May 4 07:55:15 2024 + Commit: Bernard Cafarelli gentoo org> CommitDate: Sat May 4 07:55:25 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db3e7e74 app-emulation/plus42: also handle unset $AR Closes: https://bugs.gentoo.org/931146 Signed-off-by: Bernard Cafarelli gentoo.org> app-emulation/plus42/files/plus42-1.0.12-fix-build-intel-lib.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 304f20ec83b2..c9cde2fbda2c 100644 --- 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 @@ -23,7 +23,7 @@ diff -Naur free42-nologo-3.0.16.orig/gtk/build-intel-lib.sh free42-nologo-3.0.16 + cd LIBRARY -$MK $OS_ARG CC=$CC CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0 $ENDIAN_ARG -+$MK $OS_ARG A=a AR_CMD="$AR rv" CC=$CC CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0 $ENDIAN_ARG ++$MK $OS_ARG A=a AR_CMD="${AR:-ar} rv" 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
[gentoo-commits] repo/gentoo:master commit in: app-emulation/plus42/files/
commit: 514bb15cc632a995579fe881184b00543639e745 Author: Bernard Cafarelli gentoo org> AuthorDate: Fri May 3 11:26:04 2024 + Commit: Bernard Cafarelli gentoo org> CommitDate: Fri May 3 11:26:40 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=514bb15c app-emulation/plus42: properly call $AR Closes: https://bugs.gentoo.org/931079 Signed-off-by: Bernard Cafarelli gentoo.org> app-emulation/plus42/files/plus42-1.0.12-fix-build-intel-lib.patch | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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 index 283c6c1435be..304f20ec83b2 100644 --- 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 @@ -15,7 +15,7 @@ diff -Naur free42-nologo-3.0.16.orig/gtk/build-intel-lib.sh free42-nologo-3.0.16 # Hack to support FreeBSD; not 100% sure what this does, but it produces a # library that passes all tests. -@@ -64,8 +57,11 @@ +@@ -64,8 +57,10 @@ ;; esac @@ -23,8 +23,7 @@ diff -Naur free42-nologo-3.0.16.orig/gtk/build-intel-lib.sh free42-nologo-3.0.16 + 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 ++$MK $OS_ARG A=a AR_CMD="$AR rv" 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
[gentoo-commits] repo/gentoo:master commit in: app-emulation/plus42/files/
commit: ba6c91660bfe2b69e9dd3a8bcb3d3d4452f12a8a Author: Michael Mair-Keimberger levelnine at> AuthorDate: Sun Jan 8 15:11:46 2023 + Commit: Conrad Kostecki gentoo org> CommitDate: Sun Jan 8 22:09:33 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba6c9166 app-emulation/plus42: remove unused patch Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/29017 Signed-off-by: Conrad Kostecki gentoo.org> .../plus42/files/plus42-1.0.4-fix-build-intel-lib.patch | 12 1 file changed, 12 deletions(-) diff --git a/app-emulation/plus42/files/plus42-1.0.4-fix-build-intel-lib.patch b/app-emulation/plus42/files/plus42-1.0.4-fix-build-intel-lib.patch deleted file mode 100644 index e1e2ea89897a.. --- a/app-emulation/plus42/files/plus42-1.0.4-fix-build-intel-lib.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur free42-nologo-2.5.3.orig/gtk/build-intel-lib.sh free42-nologo-2.5.3/gtk/build-intel-lib.sh free42-nologo-2.5.3.orig/gtk/build-intel-lib.sh2019-09-01 17:44:47.0 +0200 -+++ free42-nologo-2.5.3/gtk/build-intel-lib.sh 2019-09-03 23:58:30.604579443 +0200 -@@ -65,7 +65,7 @@ - esac - - cd LIBRARY --$MK $OS_ARG 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
[gentoo-commits] repo/gentoo:master commit in: app-emulation/plus42/files/, app-emulation/plus42/
commit: b7b4a593afb2ecb7e3f96c78626ab2ef76e97ada Author: Bernard Cafarelli gentoo org> AuthorDate: Sun Nov 6 21:29:18 2022 + Commit: Bernard Cafarelli gentoo org> CommitDate: Sun Nov 6 21:29:18 2022 + 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 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 ..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.0 +0200 free42-nologo-3.0.16/gtk/build-intel-lib.sh2022-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.patch1970-01-01 01:00:00.0 +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_head2011-07-12 17:26:21.0 +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 ..3812fdade255 --- /dev/null +++ b/app-emulation/plus42/plus42-1.0.12.ebuild @@ -0,0 +1,50 @@ +# Copyright
[gentoo-commits] repo/gentoo:master commit in: app-emulation/plus42/files/, app-emulation/plus42/
commit: 133ed284e0e2803cc78717aa75cc458e4d901015 Author: Bernard Cafarelli gentoo org> AuthorDate: Fri Sep 23 19:03:22 2022 + Commit: Bernard Cafarelli gentoo org> CommitDate: Fri Sep 23 19:23:35 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=133ed284 app-emulation/plus42: drop 1.0.4, 1.0.6 Signed-off-by: Bernard Cafarelli gentoo.org> app-emulation/plus42/Manifest | 2 - .../plus42/files/plus42-1.0.4-fix-makefile.patch | 38 app-emulation/plus42/plus42-1.0.4.ebuild | 50 -- app-emulation/plus42/plus42-1.0.6.ebuild | 50 -- 4 files changed, 140 deletions(-) diff --git a/app-emulation/plus42/Manifest b/app-emulation/plus42/Manifest index 7f5e6f432139..9eb537e8a8d3 100644 --- a/app-emulation/plus42/Manifest +++ b/app-emulation/plus42/Manifest @@ -1,4 +1,2 @@ DIST plus42-upstream-1.0.10.tgz 7585424 BLAKE2B c27f5e653e07986a092efc34ed6aaf7de2b1e6c20db3300fc6bd35337032a57b4623cf9d5ecb1b0e56e1a7b6d92a4b5d04be0b9dea9fade9d0e7efe86901ca8d SHA512 d504988c5bfcf1e554ee7478c5c6d0cc7472e3ba9904fb45d2ea77bf05307e0def79002785551b6a876d714d5d4279728b329c63c7108a935b06967c65441083 -DIST plus42-upstream-1.0.4.tgz 7583399 BLAKE2B 801c125e8b320a2ae2220595aa6244451f55938db644beb5e619c7789b506ada86b4f22e62c724af19da1240aa6c0fad791e2d6176eb4787435f16c1a44aaccc SHA512 a9c23b582047767fe0c57f35fdb4dfb72d7fdf480106a64f1d1151541c5d08e8a1a973156b0e2e5e9ca2f4f74acfbde2a1d69590c02f480d52dec20981be6c6e -DIST plus42-upstream-1.0.6.tgz 7583604 BLAKE2B 3cfdf41ee3ba627cfe5191cf9c0e452917b8511931206fd46df8516a225c7e0e447d8410348d9ab324269a3182dd9c4708ac881f46ae5058fdd4784acec82e2d SHA512 9f4573de916ba20fae4400f50cbf64b9bfbc452b4b51e4c674cffd5129cac9c9828eee33ab613abed6d94c5863797c17e3bd78b0df50bbaa8e0f9594450713ab DIST plus42-upstream-1.0.9.tgz 7585218 BLAKE2B e6c09c985fcf3f037a0c1dc1f4f445ef18c4f73962ffbf46939b91d5a96c9f079bd36b328b30fcae42f0bc13ebee7a1f56e51762f225f41fb715ab88e8b93d56 SHA512 77c06cf33d375f513c6806910f6b8bdda865853e7890922174364a7d2a07e35a6bbae2e62800c7658be01fe8b3aafbfc7f53a19451475b411865fe69bef090d8 diff --git a/app-emulation/plus42/files/plus42-1.0.4-fix-makefile.patch b/app-emulation/plus42/files/plus42-1.0.4-fix-makefile.patch deleted file mode 100644 index be7b40fbcd48.. --- a/app-emulation/plus42/files/plus42-1.0.4-fix-makefile.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -Naur plus42-upstream-1.0.4.orig/gtk/Makefile plus42-upstream-1.0.4/gtk/Makefile plus42-upstream-1.0.4.orig/gtk/Makefile2022-05-17 11:47:13.0 +0200 -+++ plus42-upstream-1.0.4/gtk/Makefile 2022-05-22 21:41:34.492591806 +0200 -@@ -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 \ -@@ -35,11 +35,13 @@ --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} - --CXXFLAGS = $(CFLAGS) \ -+CXXFLAGS := $(CFLAGS) \ --fno-rtti \ -- -D_WCHAR_T_DEFINED -+ -D_WCHAR_T_DEFINED \ -+ ${CXXFLAGS} - - LIBS = gcc111libbid.a $(shell pkg-config --libs gtk+-3.0) - -@@ -118,7 +120,7 @@ - ./keymap2cc - - gcc111libbid.a: -- sh ./build-intel-lib.sh -+ +sh ./build-intel-lib.sh - ln -s IntelRDFPMathLib20U1/TESTS/readtest.c - - symlinks: diff --git a/app-emulation/plus42/plus42-1.0.4.ebuild b/app-emulation/plus42/plus42-1.0.4.ebuild deleted file mode 100644 index 8239110a87e8.. --- a/app-emulation/plus42/plus42-1.0.4.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# 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="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}-1.0.4-fix-makefile.patch" - "${FILESDIR}/${PN}-1.0.4-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)"
[gentoo-commits] repo/gentoo:master commit in: app-emulation/plus42/files/, app-emulation/plus42/
commit: 83dbb4dd6c6ab25423b5bf69b0043ab710ff6bb3 Author: Bernard Cafarelli gentoo org> AuthorDate: Mon Jul 4 17:41:18 2022 + Commit: Bernard Cafarelli gentoo org> CommitDate: Mon Jul 4 17:42:04 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83dbb4dd app-emulation/plus42: add 1.0.9 Signed-off-by: Bernard Cafarelli gentoo.org> app-emulation/plus42/Manifest | 1 + .../plus42/files/plus42-1.0.9-fix-makefile.patch | 25 +++ app-emulation/plus42/plus42-1.0.9.ebuild | 50 ++ 3 files changed, 76 insertions(+) diff --git a/app-emulation/plus42/Manifest b/app-emulation/plus42/Manifest index f522f663e83d..efe80441b319 100644 --- a/app-emulation/plus42/Manifest +++ b/app-emulation/plus42/Manifest @@ -1,2 +1,3 @@ DIST plus42-upstream-1.0.4.tgz 7583399 BLAKE2B 801c125e8b320a2ae2220595aa6244451f55938db644beb5e619c7789b506ada86b4f22e62c724af19da1240aa6c0fad791e2d6176eb4787435f16c1a44aaccc SHA512 a9c23b582047767fe0c57f35fdb4dfb72d7fdf480106a64f1d1151541c5d08e8a1a973156b0e2e5e9ca2f4f74acfbde2a1d69590c02f480d52dec20981be6c6e DIST plus42-upstream-1.0.6.tgz 7583604 BLAKE2B 3cfdf41ee3ba627cfe5191cf9c0e452917b8511931206fd46df8516a225c7e0e447d8410348d9ab324269a3182dd9c4708ac881f46ae5058fdd4784acec82e2d SHA512 9f4573de916ba20fae4400f50cbf64b9bfbc452b4b51e4c674cffd5129cac9c9828eee33ab613abed6d94c5863797c17e3bd78b0df50bbaa8e0f9594450713ab +DIST plus42-upstream-1.0.9.tgz 7585218 BLAKE2B e6c09c985fcf3f037a0c1dc1f4f445ef18c4f73962ffbf46939b91d5a96c9f079bd36b328b30fcae42f0bc13ebee7a1f56e51762f225f41fb715ab88e8b93d56 SHA512 77c06cf33d375f513c6806910f6b8bdda865853e7890922174364a7d2a07e35a6bbae2e62800c7658be01fe8b3aafbfc7f53a19451475b411865fe69bef090d8 diff --git a/app-emulation/plus42/files/plus42-1.0.9-fix-makefile.patch b/app-emulation/plus42/files/plus42-1.0.9-fix-makefile.patch new file mode 100644 index ..b66c15b89b5a --- /dev/null +++ b/app-emulation/plus42/files/plus42-1.0.9-fix-makefile.patch @@ -0,0 +1,25 @@ +diff -Naur plus42-upstream-1.0.9.orig/gtk/Makefile plus42-upstream-1.0.9/gtk/Makefile +--- plus42-upstream-1.0.9.orig/gtk/Makefile2022-06-19 14:44:32.0 +0200 plus42-upstream-1.0.9/gtk/Makefile 2022-07-04 19:37:35.533799322 +0200 +@@ -40,9 +40,10 @@ +-DDECIMAL_GLOBAL_EXCEPTION_FLAGS=1 \ +-DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1 + +-CXXFLAGS = $(CFLAGS) \ ++CXXFLAGS := $(CFLAGS) \ +-fno-rtti \ +- -D_WCHAR_T_DEFINED ++ -D_WCHAR_T_DEFINED \ ++ ${CXXFLAGS} + + LIBS = gcc111libbid.a $(shell $(PKG_CONFIG) --libs gtk+-3.0) + +@@ -121,7 +122,7 @@ + ./keymap2cc + + gcc111libbid.a: +- sh ./build-intel-lib.sh ++ +sh ./build-intel-lib.sh + ln -s IntelRDFPMathLib20U1/TESTS/readtest.c + + symlinks: diff --git a/app-emulation/plus42/plus42-1.0.9.ebuild b/app-emulation/plus42/plus42-1.0.9.ebuild new file mode 100644 index ..b73a2da34bf8 --- /dev/null +++ b/app-emulation/plus42/plus42-1.0.9.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="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}-1.0.9-fix-makefile.patch" + "${FILESDIR}/${PN}-1.0.4-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 +}