diff options
Diffstat (limited to 'app-emulation/free42')
-rw-r--r-- | app-emulation/free42/Manifest | 6 | ||||
-rw-r--r-- | app-emulation/free42/files/free42-3.0.14-fix-makefile.patch | 26 | ||||
-rw-r--r-- | app-emulation/free42/files/free42-3.0.16-fix-build-intel-lib.patch | 64 | ||||
-rw-r--r-- | app-emulation/free42/free42-3.1.3.ebuild (renamed from app-emulation/free42/free42-3.0.10.ebuild) | 14 | ||||
-rw-r--r-- | app-emulation/free42/free42-3.1.7.ebuild (renamed from app-emulation/free42/free42-3.0.7.ebuild) | 17 | ||||
-rw-r--r-- | app-emulation/free42/free42-3.1.8.ebuild (renamed from app-emulation/free42/free42-3.0.9.ebuild) | 17 |
6 files changed, 110 insertions, 34 deletions
diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest index 0528b26cba69..5df084dd5ee5 100644 --- a/app-emulation/free42/Manifest +++ b/app-emulation/free42/Manifest @@ -1,4 +1,4 @@ DIST free42-nologo-2.5.24.tgz 7423183 BLAKE2B e10425af8d5c30be6ab5b728130bbe3068c414e24f033b65623951f915bcfeea0672857ff8def3e9f2766aba79411a1022d4b83592281567de38e82613d8a832 SHA512 a0702c3e4b2f3f38f73c54de4e51da8d1dc90585b253d1ae087d59dfabbe83be9c80086df8540cb6420dae8c6e766cd1ccce875d9bcb94ecbc85791e3fa89b8b -DIST free42-nologo-3.0.10.tgz 7455117 BLAKE2B 9e1e1e0e9f5a05be936440305f0301c2faa3e4e59cc30afed25a59aacb2215265a214043a6114e0d4d854cdffceaf2a422025a1cad41eb715c2e39eebeef2f2e SHA512 dde1f71f2a64a670a40782b2144192292a3086bac297625eb7e1cbec9cad09433b5d0dc56efbfd0d567a9d533442f249166f73bc89cbb595085db3002f4b23c7 -DIST free42-nologo-3.0.7.tgz 7452538 BLAKE2B 4f51f11b14ca205687be2fe5f805039bdd7bd0a5588a7f9fff63013f1d775f2ebe6f9045f2c09474bc7ff622d9d2dbbad2be2ee6429032b7b17fff1a513afb87 SHA512 93dc71dcb52172fa69cb68336d4d0ca7552725d4a267393c88eb0e646918a6c00653bbd89941d62cbc61ed28a917d25d36ee94e0e1b7983c8b513aa239a2e3ab -DIST free42-nologo-3.0.9.tgz 7453540 BLAKE2B 7535690fba17e233071690048a84a713ba027fe20384b6868a2740887dec29b0ac57febc82c219fd8b8788e0ce4a9debdd1cecfd583d4a6c7099b1a4440c4e52 SHA512 7481172f289973e38e3da89f1f19c0684dbdddf874e025728fbc01119b918fb529b0ec7beb2722e0b2083636f35529a751f85c93f742ee89055ffaf2b640d4ff +DIST free42-nologo-3.1.3.tgz 7461009 BLAKE2B 915954de24a31f89f112d0d5e13ed01bd6a1e341549c8a86f463858e4071fc0a4751e94a6a257d561da570fd3705250d740c741925ee2b022a50966b8d5b16f8 SHA512 5ad6e6702a789c81d8942c4030606e44112fc21f1af6e5e23f21825115cabbc03cbcb142351d5d0451f5bf8d603d653b783ebe1293fa7ebfb04c93dfdea3455d +DIST free42-nologo-3.1.7.tgz 7464073 BLAKE2B 0cff2d3292f45fc7341f8ed084c931da6a635498a62b7a20cc250df64a16d44a1c18a260e701971e2e7d68e11b1b84aa301405cd08c5e11b39e31f59a78647cc SHA512 2464385acf58aa17091d94ae81dde8e6e7f543c728c31cc03f1bc45a9ed5af9b27a3db41624222fd29ea61fe18541af9350e3e4369c54744c7b2a4dc799034fc +DIST free42-nologo-3.1.8.tgz 7464179 BLAKE2B 122175508b2da42f101fae37d7c1627ef802d6e21af9cfb4114b657591f0ba1011a109ec3d75823911d3342fdd02e84a58553e616cd0b4c6288b5d39d9648250 SHA512 ef350d963a11c1a195024f57532a22771a3d0d9b7058bf38557e81c943e7cbd8b500472275b7094be3f7f01c3edf557cf3a3ee2d493cb756d108211b7391a4bc diff --git a/app-emulation/free42/files/free42-3.0.14-fix-makefile.patch b/app-emulation/free42/files/free42-3.0.14-fix-makefile.patch new file mode 100644 index 000000000000..6e46ed540320 --- /dev/null +++ b/app-emulation/free42/files/free42-3.0.14-fix-makefile.patch @@ -0,0 +1,26 @@ +diff -Naur free42-nologo-3.0.14.orig/gtk/Makefile free42-nologo-3.0.14/gtk/Makefile +--- free42-nologo-3.0.14.orig/gtk/Makefile 2022-08-13 23:55:44.000000000 +0200 ++++ free42-nologo-3.0.14/gtk/Makefile 2022-09-23 20:46:30.096874563 +0200 +@@ -40,10 +40,11 @@ + -DDECIMAL_GLOBAL_EXCEPTION_FLAGS=1 \ + -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1 + +-CXXFLAGS = $(CFLAGS) \ ++CXXFLAGS := $(CFLAGS) \ + -fno-exceptions \ + -fno-rtti \ +- -D_WCHAR_T_DEFINED ++ -D_WCHAR_T_DEFINED \ ++ ${CXXFLAGS} + + LIBS = gcc111libbid.a $(shell $(PKG_CONFIG) --libs gtk+-3.0) + +@@ -118,7 +119,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/free42/files/free42-3.0.16-fix-build-intel-lib.patch b/app-emulation/free42/files/free42-3.0.16-fix-build-intel-lib.patch new file mode 100644 index 000000000000..c9cde2fbda2c --- /dev/null +++ b/app-emulation/free42/files/free42-3.0.16-fix-build-intel-lib.patch @@ -0,0 +1,64 @@ +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,10 @@ + ;; + 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 ++$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 +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/free42/free42-3.0.10.ebuild b/app-emulation/free42/free42-3.1.3.ebuild index 4d023edda773..1fd58bbcf2cf 100644 --- a/app-emulation/free42/free42-3.0.10.ebuild +++ b/app-emulation/free42/free42-3.1.3.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit toolchain-funcs @@ -16,7 +16,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="+alsa" -DEPEND="dev-libs/atk +DEPEND="app-accessibility/at-spi2-core x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 @@ -28,14 +28,10 @@ DOCS=( CREDITS HISTORY README ) S="${WORKDIR}/${MY_PV}" PATCHES=( - "${FILESDIR}/${PN}-2.5.16-fix-makefile.patch" - "${FILESDIR}/${PN}-2.5.3-fix-build-intel-lib.patch" + "${FILESDIR}/${PN}-3.0.14-fix-makefile.patch" + "${FILESDIR}/${PN}-3.0.16-fix-build-intel-lib.patch" ) -src_prepare() { - default -} - src_compile() { local myconf use alsa && myconf="AUDIO_ALSA=yes" diff --git a/app-emulation/free42/free42-3.0.7.ebuild b/app-emulation/free42/free42-3.1.7.ebuild index d25a89b2d1c4..063f0e457429 100644 --- a/app-emulation/free42/free42-3.0.7.ebuild +++ b/app-emulation/free42/free42-3.1.7.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit toolchain-funcs @@ -10,32 +10,27 @@ 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" +S=${WORKDIR}/${MY_PV} LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="+alsa" -DEPEND="dev-libs/atk +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}-2.5.16-fix-makefile.patch" - "${FILESDIR}/${PN}-2.5.3-fix-build-intel-lib.patch" + "${FILESDIR}/${PN}-3.0.14-fix-makefile.patch" + "${FILESDIR}/${PN}-3.0.16-fix-build-intel-lib.patch" ) -src_prepare() { - default -} - src_compile() { local myconf use alsa && myconf="AUDIO_ALSA=yes" diff --git a/app-emulation/free42/free42-3.0.9.ebuild b/app-emulation/free42/free42-3.1.8.ebuild index 4d023edda773..063f0e457429 100644 --- a/app-emulation/free42/free42-3.0.9.ebuild +++ b/app-emulation/free42/free42-3.1.8.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit toolchain-funcs @@ -10,32 +10,27 @@ 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" +S=${WORKDIR}/${MY_PV} LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="+alsa" -DEPEND="dev-libs/atk +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}-2.5.16-fix-makefile.patch" - "${FILESDIR}/${PN}-2.5.3-fix-build-intel-lib.patch" + "${FILESDIR}/${PN}-3.0.14-fix-makefile.patch" + "${FILESDIR}/${PN}-3.0.16-fix-build-intel-lib.patch" ) -src_prepare() { - default -} - src_compile() { local myconf use alsa && myconf="AUDIO_ALSA=yes" |