From 6957f5c65b02bba533954eabc0b62f5de36be206 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 10 Apr 2018 17:26:49 +0100 Subject: gentoo resync : 10.04.2018 --- app-emulation/free42/Manifest | 12 ++--- .../files/free42-2.0.10-fix-build-intel-lib.patch | 4 +- .../free42/files/free42-2.0.10-fix-makefile.patch | 4 +- .../files/free42-2.0.17-fix-build-intel-lib.patch | 12 ----- .../free42/files/free42-2.0.17-fix-makefile.patch | 58 ---------------------- app-emulation/free42/free42-2.0.10.ebuild | 4 +- app-emulation/free42/free42-2.0.17.ebuild | 4 +- app-emulation/free42/free42-2.0.20.ebuild | 50 +++++++++++++++++++ 8 files changed, 64 insertions(+), 84 deletions(-) delete mode 100644 app-emulation/free42/files/free42-2.0.17-fix-build-intel-lib.patch delete mode 100644 app-emulation/free42/files/free42-2.0.17-fix-makefile.patch create mode 100644 app-emulation/free42/free42-2.0.20.ebuild (limited to 'app-emulation/free42') diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest index fe06992a0d2e..6178207deb49 100644 --- a/app-emulation/free42/Manifest +++ b/app-emulation/free42/Manifest @@ -1,9 +1,9 @@ -AUX free42-2.0.10-fix-build-intel-lib.patch 690 BLAKE2B f385747de929bb5963f9dccd8b44c79cc3b57a2842650792f1b20e31ff59ec30ab4cc8ec27f15b8fd134005b568da1e928722c04ff9e58d30751b7b761403b93 SHA512 5888aa234e102135659599babcc3bf765d1076813e6a1b6600236a698fc369f8800212da60027fa2c3428f8c49934563f0f602828f059d57367b2b6e9387147c -AUX free42-2.0.10-fix-makefile.patch 1742 BLAKE2B 89e7ca26a56b335b15da74d97cd2ef57495cdb09c8cb1189246e31df171fc16f4dc043e60dcb7854c9ea593d38c6c5d89a01818a93e4033544736e7e2ecb66e8 SHA512 36906f03461ac391766b833fe0ccd59919799fe33e3cf4bd975a03f18d1f6ef26934a34e1df2eeb6d42afa147b7bfb5bf93d8ea13283033c96c49d284df52862 -AUX free42-2.0.17-fix-build-intel-lib.patch 690 BLAKE2B f385747de929bb5963f9dccd8b44c79cc3b57a2842650792f1b20e31ff59ec30ab4cc8ec27f15b8fd134005b568da1e928722c04ff9e58d30751b7b761403b93 SHA512 5888aa234e102135659599babcc3bf765d1076813e6a1b6600236a698fc369f8800212da60027fa2c3428f8c49934563f0f602828f059d57367b2b6e9387147c -AUX free42-2.0.17-fix-makefile.patch 1742 BLAKE2B 89e7ca26a56b335b15da74d97cd2ef57495cdb09c8cb1189246e31df171fc16f4dc043e60dcb7854c9ea593d38c6c5d89a01818a93e4033544736e7e2ecb66e8 SHA512 36906f03461ac391766b833fe0ccd59919799fe33e3cf4bd975a03f18d1f6ef26934a34e1df2eeb6d42afa147b7bfb5bf93d8ea13283033c96c49d284df52862 +AUX free42-2.0.10-fix-build-intel-lib.patch 618 BLAKE2B 9039cdf8c78ff198ea9a4927621f7e23f362fffbd537a0a988030713fe061398d2b7b2fc6120cda280249807d9aee448095b1f5cdfb824909d7d381650daafbd SHA512 192eb5e78c50ce52449c5b859369ab7258a98162c5d924ab8b8f3566f52be7a3c4aba95c3cafd60af82d5dcf1b1ad784cf3fe6bf432839baa1b4ca994ddf416b +AUX free42-2.0.10-fix-makefile.patch 1670 BLAKE2B 6170b3a2a1f397ab10f1d36fe26f55e2c430066fbf7f292240ee359d38b670b68b9f17696f466e4f913af314662de8cffb13b211adbd0977cfa20b331fe52f8a SHA512 8b234cd643dd760b290c3d6054afa799371d249dc23eba889a168eed413037b6463e5f2b1219b9dd4c350d3338aff5adf27b2ea413d229b961ed40d8388c6617 DIST free42-nologo-2.0.10.tgz 7389429 BLAKE2B a633a78ed5974e327aafa9d783c04bdcaa895940580c595c9c67ab0181ec7000efaa92021a485199268341f15f4c4bafe3964d4118c068e8abbfa2f358045b5a SHA512 4f03b9b206ef17e71295f0baac96ca26f34a00844cee6cad254f8ab798d3d0c724788200f3f207a3301f62eb0960707a23e6bcbb2ac924a78b0f0e1c78e70e6d DIST free42-nologo-2.0.17.tgz 7389996 BLAKE2B cc7c7bbe43eafc190fe0ce8921e032c2042290fe54a3153ba7568dae315de1356a9ee7f8ded4528788c677537138a5bd5556ad79dbd67ab8e41dd881a258312e SHA512 f73bfb2984fa4301c04d905fde6723583a57a1f663e012f965037067a7259961c0134fecb456118ec4b45956f7c8ccc16f0ec1db62e4cc705dc74ea563225872 -EBUILD free42-2.0.10.ebuild 1042 BLAKE2B 7019cd43b5bf6029a900fa386aa6300185a279d6b746d36211413da76107309f425257273b70db78f89349adf37a2b14f31369059d3562e8ab6f015ae6b2c34b SHA512 2556155fff2e04f13be2561dc46b1dd4f8f860a5d29c5062635c767c8a163eac795a736e4f948134faeaab88f6d7b7574e52b8242bbd1ffd0dd3f3f84235ec01 -EBUILD free42-2.0.17.ebuild 1043 BLAKE2B e9540db8064286d4589f9bfd706bbfdced536e6ca5a715423d875dfb4b5c0bed54fc9368b5cc269fc15d982d77f642135a95691db1134d0095ab1e88c72e9621 SHA512 976c7d226fb3ddf1c2008658d1b8608e823722adcabaf7656bf3f75b8f8ab565b3698047ccd528a228f152648c6d0d2606e4b1b13e75d7266cbd3674bdc7facb +DIST free42-nologo-2.0.20.tgz 7390214 BLAKE2B 306f3378bcbb44fa7982c5d9c29bfbea62e915ca50ca5e5216f46fbf483f110a1288d4800991a74622a042517496ff8dd94c3fa3249e8bb4181957e6b23d5ea3 SHA512 9b540fbc50df2f94b135b5e778354f330df77a54ef2ad99b257b5b91d1e3e8d1241e8a834522fc46fe33571ea2695ad8889b427dbcf653870672e89cd56d60f5 +EBUILD free42-2.0.10.ebuild 1058 BLAKE2B 2aea0b1798c337318ea685808d0f2c44f78f7730fd5aebc107b90a42c4b1fa8a9924c34cbd2f1e494087fd5033f6071cf665c63e2289ad1a23568b2210595d1b SHA512 494fec4edfd65644cb55c53d31ab4789f2dd5cc051529fcbc8bc909eaa4a305ad02143b2c04745cdd11be1a0b7dececf2c595907ba883bbb39e7a1929b8f1539 +EBUILD free42-2.0.17.ebuild 1059 BLAKE2B 24d3dc679871c3708019e8f35d5984393e1b9d55030314565c1b38fccdc6ef0fc76e9344c5824e185256c59d8b96207a8b6574d844d34403169cab127c4ee580 SHA512 b6e0cce9b10fbcd9d5eeb35f2dca5cc3cf346d0aafa56e27355eb5fd47268189b8b4585564496f7badaa0647b276b0dbac8f418b0ceaf69a3cf3962ef3565085 +EBUILD free42-2.0.20.ebuild 950 BLAKE2B 9bc7e94b50e067507c33a467b99fd860c88b4d7cc7fddbd949a05b6584bd21f08657c22ff9c7d33cbf1ee5898d830c973d597db94dbd14e5895b1294e0c272c0 SHA512 c5e9ef21556bd9580f304f88c28c76a019cebafc340655152a02febc4e5ae87dbc9f8966e57b589e1e0020ae02166fc9e86fafecd74f3966b6672407c13482be MISC metadata.xml 540 BLAKE2B de6a28fadb4dba9dac7c9aadbbd0972cb9583c8b1aac154ed9247199287c060adbf5df8a0639b7e4ff218da84a5e1c19e855e2c11688124c76c1cc07fca1e393 SHA512 88a7488f445dc2233eecb68e9100751da821c45ddb6c60a18600dabe7278681a3625abd59ed7088bc526d0853529c98bb84fdd76796a5cdd4a5379bd6e17b7cb diff --git a/app-emulation/free42/files/free42-2.0.10-fix-build-intel-lib.patch b/app-emulation/free42/files/free42-2.0.10-fix-build-intel-lib.patch index a321b1d714b8..543595c6a1a1 100644 --- a/app-emulation/free42/files/free42-2.0.10-fix-build-intel-lib.patch +++ b/app-emulation/free42/files/free42-2.0.10-fix-build-intel-lib.patch @@ -1,6 +1,6 @@ diff -Nuar a/gtk/build-intel-lib.sh b/gtk/build-intel-lib.sh ---- a/gtk/build-intel-lib.sh 2018-01-08 02:52:33.000000000 +0100 -+++ b/gtk/build-intel-lib.sh 2018-01-13 19:43:23.709997784 +0100 +--- a/gtk/build-intel-lib.sh ++++ b/gtk/build-intel-lib.sh @@ -4,7 +4,7 @@ cd IntelRDFPMathLib20U1 patch -p0 <../intel-lib-linux.patch diff --git a/app-emulation/free42/files/free42-2.0.10-fix-makefile.patch b/app-emulation/free42/files/free42-2.0.10-fix-makefile.patch index 7642316920f4..c033bbc60ceb 100644 --- a/app-emulation/free42/files/free42-2.0.10-fix-makefile.patch +++ b/app-emulation/free42/files/free42-2.0.10-fix-makefile.patch @@ -1,6 +1,6 @@ diff -Nuar a/gtk/Makefile b/gtk/Makefile ---- a/gtk/Makefile 2018-01-08 02:52:33.000000000 +0100 -+++ b/gtk/Makefile 2018-01-13 19:40:49.059998446 +0100 +--- a/gtk/Makefile ++++ b/gtk/Makefile @@ -15,11 +15,11 @@ # along with this program; if not, see http://www.gnu.org/licenses/. ############################################################################### diff --git a/app-emulation/free42/files/free42-2.0.17-fix-build-intel-lib.patch b/app-emulation/free42/files/free42-2.0.17-fix-build-intel-lib.patch deleted file mode 100644 index a321b1d714b8..000000000000 --- a/app-emulation/free42/files/free42-2.0.17-fix-build-intel-lib.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nuar a/gtk/build-intel-lib.sh b/gtk/build-intel-lib.sh ---- a/gtk/build-intel-lib.sh 2018-01-08 02:52:33.000000000 +0100 -+++ b/gtk/build-intel-lib.sh 2018-01-13 19:43:23.709997784 +0100 -@@ -4,7 +4,7 @@ - cd IntelRDFPMathLib20U1 - patch -p0 <../intel-lib-linux.patch - cd LIBRARY --make CC=gcc CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0 -+make A=a CC=gcc CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0 - 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 --git a/app-emulation/free42/files/free42-2.0.17-fix-makefile.patch b/app-emulation/free42/files/free42-2.0.17-fix-makefile.patch deleted file mode 100644 index 7642316920f4..000000000000 --- a/app-emulation/free42/files/free42-2.0.17-fix-makefile.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff -Nuar a/gtk/Makefile b/gtk/Makefile ---- a/gtk/Makefile 2018-01-08 02:52:33.000000000 +0100 -+++ b/gtk/Makefile 2018-01-13 19:40:49.059998446 +0100 -@@ -15,11 +15,11 @@ - # along with this program; if not, see http://www.gnu.org/licenses/. - ############################################################################### - --CFLAGS = -MMD \ -+CFLAGS := -MMD \ - -Wall \ - -Wno-parentheses \ - -Wno-write-strings \ -- -g \ -+ -Wno-error=narrowing \ - -I/usr/X11R6/include \ - $(shell pkg-config --cflags gtk+-2.0) \ - -DVERSION="\"$(shell cat ../VERSION)\"" \ -@@ -27,21 +27,25 @@ - -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-exceptions \ - -fno-rtti \ -- -D_WCHAR_T_DEFINED -+ -D_WCHAR_T_DEFINED \ -+ ${CXXFLAGS} - --LDFLAGS = -L/usr/X11R6/lib --LIBS = gcc111libbid.a -lXmu $(shell pkg-config --libs gtk+-2.0) -+MYLDFLAGS = -L/usr/X11R6/lib -+LIBS = gcc111libbid.a -lX11 -ldl -lXmu $(shell pkg-config --libs gtk+-2.0) - - ifeq "$(shell uname -s)" "Linux" --LDFLAGS += -Wl,--hash-style=both -+MYLDFLAGS += -Wl,--hash-style=both - LIBS += -lpthread - endif - -+MYLDFLAGS += ${LDFLAGS} -+ - SRCS = shell_main.cc shell_skin.cc skins.cc keymap.cc shell_loadimage.cc \ - shell_spool.cc core_main.cc core_commands1.cc core_commands2.cc \ - core_commands3.cc core_commands4.cc core_commands5.cc \ -@@ -83,7 +87,7 @@ - endif - - $(EXE): $(OBJS) -- $(CXX) -o $(EXE) $(LDFLAGS) $(OBJS) $(LIBS) -+ $(CXX) -o $(EXE) $(MYLDFLAGS) $(OBJS) $(LIBS) - - $(SRCS) skin2cc.cc keymap2cc.cc skin2cc.conf: symlinks - diff --git a/app-emulation/free42/free42-2.0.10.ebuild b/app-emulation/free42/free42-2.0.10.ebuild index 467f13b38067..5d440a08b23e 100644 --- a/app-emulation/free42/free42-2.0.10.ebuild +++ b/app-emulation/free42/free42-2.0.10.ebuild @@ -32,8 +32,8 @@ S="${WORKDIR}/${MY_PV}" src_prepare() { sed -i -e 's/print_gif_name\[FILENAMELEN\]/print_gif_name\[1000\]/' \ "${S}/gtk/shell_main.cc" || die - epatch "${FILESDIR}"/${P}-fix-makefile.patch - epatch "${FILESDIR}"/${P}-fix-build-intel-lib.patch + epatch "${FILESDIR}/${PN}-2.0.10-fix-makefile.patch" + epatch "${FILESDIR}/${PN}-2.0.10-fix-build-intel-lib.patch" eapply_user } diff --git a/app-emulation/free42/free42-2.0.17.ebuild b/app-emulation/free42/free42-2.0.17.ebuild index 78b6e63cfd39..417714d3504f 100644 --- a/app-emulation/free42/free42-2.0.17.ebuild +++ b/app-emulation/free42/free42-2.0.17.ebuild @@ -32,8 +32,8 @@ S="${WORKDIR}/${MY_PV}" src_prepare() { sed -i -e 's/print_gif_name\[FILENAMELEN\]/print_gif_name\[1000\]/' \ "${S}/gtk/shell_main.cc" || die - epatch "${FILESDIR}"/${P}-fix-makefile.patch - epatch "${FILESDIR}"/${P}-fix-build-intel-lib.patch + epatch "${FILESDIR}/${PN}-2.0.10-fix-makefile.patch" + epatch "${FILESDIR}/${PN}-2.0.10-fix-build-intel-lib.patch" eapply_user } diff --git a/app-emulation/free42/free42-2.0.20.ebuild b/app-emulation/free42/free42-2.0.20.ebuild new file mode 100644 index 000000000000..e19a9ce48c9a --- /dev/null +++ b/app-emulation/free42/free42-2.0.20.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit eutils toolchain-funcs + +MY_PV="${PN}-nologo-${PV}" + +DESCRIPTION="An HP-42S Calculator Simulator" +HOMEPAGE="http://thomasokken.com/free42/" +SRC_URI="http://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+:2 + x11-libs/pango + alsa? ( media-libs/alsa-lib )" + +RDEPEND="${DEPEND} + x11-libs/libX11 + x11-libs/libXmu" + +S="${WORKDIR}/${MY_PV}" + +PATCHES=( + "${FILESDIR}/${PN}-2.0.10-fix-makefile.patch" + "${FILESDIR}/${PN}-2.0.10-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)" BCD_MATH=1 ${myconf} -C "${S}/gtk" +} + +src_install() { + dodoc CREDITS HISTORY README + dobin gtk/free42dec +} -- cgit v1.2.3