1 |
commit: 184d8d86965e8ae157422e20eaaaa8986857c688 |
2 |
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Sep 3 22:32:42 2019 +0000 |
4 |
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Sep 3 22:41:19 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=184d8d86 |
7 |
|
8 |
app-emulation/free42: 2.5.3 bump |
9 |
|
10 |
Package-Manager: Portage-2.3.75, Repoman-2.3.17 |
11 |
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org> |
12 |
|
13 |
app-emulation/free42/Manifest | 1 + |
14 |
.../files/free42-2.5.3-fix-build-intel-lib.patch | 12 +++++ |
15 |
.../free42/files/free42-2.5.3-fix-makefile.patch | 62 ++++++++++++++++++++++ |
16 |
app-emulation/free42/free42-2.5.3.ebuild | 53 ++++++++++++++++++ |
17 |
4 files changed, 128 insertions(+) |
18 |
|
19 |
diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest |
20 |
index 908e2b67ee4..6c9718655ca 100644 |
21 |
--- a/app-emulation/free42/Manifest |
22 |
+++ b/app-emulation/free42/Manifest |
23 |
@@ -2,3 +2,4 @@ DIST free42-nologo-2.0.20.tgz 7390214 BLAKE2B 306f3378bcbb44fa7982c5d9c29bfbea62 |
24 |
DIST free42-nologo-2.2.1.tgz 7398286 BLAKE2B 041c9672305b712efab8e7d5eb73bc0bd159b5fd61e9ecf39d5ce691aff045be4a6a4c635c0948e610e51832db64b388bdd001eb57aad41724e27dff4cf95a0a SHA512 2ed735ff161ea14ca5be97131b69065410faa699ed05d3eb94abbb9653c694d83fc4e45ea2bcf0c2a7894f89e731ee7839105dc1d58d6a6326047c9bd55da5d7 |
25 |
DIST free42-nologo-2.4.2.tgz 7403471 BLAKE2B a2dba75bbdb8ceaee2f11dbc053ce50d71e0b5f46165fb61c6d3441326dc43b2afcdc2b99cbb638bbc59e19c5da948ce748b76ff4c612d5ed44e706583b159fb SHA512 046a42aebf1b4220acb9227dc365c26349b7a69c39d765b5ab59c83d9fc644055324c6288aaf87e6f9265310b5969335bc8be7035a84935fd7dda29bd9caf5a7 |
26 |
DIST free42-nologo-2.4.tgz 7402688 BLAKE2B 5e1a46977a3e385fc44f09b5e0088cf73f4a67c3657110311e95795a5b7beb2583dc56bee14e0f578f6ee3517acc78b311b2da0e1671c38d7a5bb150c1e30197 SHA512 a74efd40a952892f346bb4c4096b6e0c00c337e782696de1064d626ea1bbc8aa5a9b557ad233ac92bd27ce8fe4202837e72eddf8f0b31c9320e8c150c6c0b408 |
27 |
+DIST free42-nologo-2.5.3.tgz 7406566 BLAKE2B a8fcad4738b46e5725e323eb7c16929c32fe0c72eccadf2f692950a3ee952f3b8f7e1e46d6e4eee4e822ca5a3b2c42adb09e2b43f0480c954aef87dc81b1edd3 SHA512 9a96bc5453f938ba806117ac3162db4f87d3584662c8a1aae370f17a06c1e92167adb2c2bb9bbd17b91473f272f8c031c7ffc1944247962571a94cb7063f0904 |
28 |
|
29 |
diff --git a/app-emulation/free42/files/free42-2.5.3-fix-build-intel-lib.patch b/app-emulation/free42/files/free42-2.5.3-fix-build-intel-lib.patch |
30 |
new file mode 100644 |
31 |
index 00000000000..e1e2ea89897 |
32 |
--- /dev/null |
33 |
+++ b/app-emulation/free42/files/free42-2.5.3-fix-build-intel-lib.patch |
34 |
@@ -0,0 +1,12 @@ |
35 |
+diff -Naur free42-nologo-2.5.3.orig/gtk/build-intel-lib.sh free42-nologo-2.5.3/gtk/build-intel-lib.sh |
36 |
+--- free42-nologo-2.5.3.orig/gtk/build-intel-lib.sh 2019-09-01 17:44:47.000000000 +0200 |
37 |
++++ free42-nologo-2.5.3/gtk/build-intel-lib.sh 2019-09-03 23:58:30.604579443 +0200 |
38 |
+@@ -65,7 +65,7 @@ |
39 |
+ esac |
40 |
+ |
41 |
+ cd LIBRARY |
42 |
+-$MK $OS_ARG CC=$CC CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0 $ENDIAN_ARG |
43 |
++$MK $OS_ARG A=a CC=$CC CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0 $ENDIAN_ARG |
44 |
+ mv libbid.a ../../gcc111libbid.a |
45 |
+ cd ../.. |
46 |
+ ( 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 |
47 |
|
48 |
diff --git a/app-emulation/free42/files/free42-2.5.3-fix-makefile.patch b/app-emulation/free42/files/free42-2.5.3-fix-makefile.patch |
49 |
new file mode 100644 |
50 |
index 00000000000..fc5abc33bfd |
51 |
--- /dev/null |
52 |
+++ b/app-emulation/free42/files/free42-2.5.3-fix-makefile.patch |
53 |
@@ -0,0 +1,62 @@ |
54 |
+diff -Naur free42-nologo-2.5.3.orig/gtk/Makefile free42-nologo-2.5.3/gtk/Makefile |
55 |
+--- free42-nologo-2.5.3.orig/gtk/Makefile 2019-09-01 17:44:47.000000000 +0200 |
56 |
++++ free42-nologo-2.5.3/gtk/Makefile 2019-09-04 00:27:16.761482125 +0200 |
57 |
+@@ -15,7 +15,7 @@ |
58 |
+ # along with this program; if not, see http://www.gnu.org/licenses/. |
59 |
+ ############################################################################### |
60 |
+ |
61 |
+-CFLAGS = -MMD \ |
62 |
++CFLAGS := -MMD \ |
63 |
+ -Wall \ |
64 |
+ -Wno-parentheses \ |
65 |
+ -Wno-write-strings \ |
66 |
+@@ -34,15 +34,17 @@ |
67 |
+ -DDECIMAL_GLOBAL_ROUNDING=1 \ |
68 |
+ -DDECIMAL_GLOBAL_ROUNDING_ACCESS_FUNCTIONS=1 \ |
69 |
+ -DDECIMAL_GLOBAL_EXCEPTION_FLAGS=1 \ |
70 |
+- -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1 |
71 |
++ -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1 \ |
72 |
++ ${CFLAGS} |
73 |
+ |
74 |
+-CXXFLAGS = $(CFLAGS) \ |
75 |
++CXXFLAGS := $(CFLAGS) \ |
76 |
+ -fno-exceptions \ |
77 |
+ -fno-rtti \ |
78 |
+- -D_WCHAR_T_DEFINED |
79 |
++ -D_WCHAR_T_DEFINED \ |
80 |
++ ${CXXFLAGS} |
81 |
+ |
82 |
+-LDFLAGS = -L/usr/X11R6/lib |
83 |
+-LIBS = gcc111libbid.a $(shell pkg-config --libs gtk+-2.0) -lXmu -lX11 |
84 |
++MYLDFLAGS = -L/usr/X11R6/lib |
85 |
++LIBS = gcc111libbid.a -ldl -lpthread -lX11 -lXmu $(shell pkg-config --libs gtk+-2.0) |
86 |
+ |
87 |
+ ifeq "$(shell uname -s)" "FreeBSD" |
88 |
+ ifdef AUDIO_ALSA |
89 |
+@@ -54,6 +56,8 @@ |
90 |
+ CFLAGS += -DF42_BIG_ENDIAN -DBID_BIG_ENDIAN |
91 |
+ endif |
92 |
+ |
93 |
++MYLDFLAGS += ${LDFLAGS} |
94 |
++ |
95 |
+ SRCS = shell_main.cc shell_skin.cc skins.cc keymap.cc shell_loadimage.cc \ |
96 |
+ shell_spool.cc core_main.cc core_commands1.cc core_commands2.cc \ |
97 |
+ core_commands3.cc core_commands4.cc core_commands5.cc \ |
98 |
+@@ -95,7 +99,7 @@ |
99 |
+ endif |
100 |
+ |
101 |
+ $(EXE): $(OBJS) |
102 |
+- $(CXX) -o $(EXE) $(LDFLAGS) $(OBJS) $(LIBS) |
103 |
++ $(CXX) -o $(EXE) $(MYLDFLAGS) $(OBJS) $(LIBS) |
104 |
+ |
105 |
+ $(SRCS) skin2cc.cc keymap2cc.cc skin2cc.conf: symlinks |
106 |
+ |
107 |
+@@ -119,7 +123,7 @@ |
108 |
+ |
109 |
+ symlinks: |
110 |
+ for fn in `cd ../common; /bin/ls`; do ln -s ../common/$$fn; done |
111 |
+- sh ./build-intel-lib.sh |
112 |
++ +sh ./build-intel-lib.sh |
113 |
+ ln -s IntelRDFPMathLib20U1/TESTS/readtest.c |
114 |
+ touch symlinks |
115 |
+ |
116 |
|
117 |
diff --git a/app-emulation/free42/free42-2.5.3.ebuild b/app-emulation/free42/free42-2.5.3.ebuild |
118 |
new file mode 100644 |
119 |
index 00000000000..67e64a2dd93 |
120 |
--- /dev/null |
121 |
+++ b/app-emulation/free42/free42-2.5.3.ebuild |
122 |
@@ -0,0 +1,53 @@ |
123 |
+# Copyright 1999-2019 Gentoo Authors |
124 |
+# Distributed under the terms of the GNU General Public License v2 |
125 |
+ |
126 |
+EAPI=7 |
127 |
+ |
128 |
+inherit toolchain-funcs |
129 |
+ |
130 |
+MY_PV="${PN}-nologo-${PV}" |
131 |
+ |
132 |
+DESCRIPTION="An HP-42S Calculator Simulator" |
133 |
+HOMEPAGE="http://thomasokken.com/free42/" |
134 |
+SRC_URI="http://thomasokken.com/free42/upstream/${MY_PV}.tgz" |
135 |
+ |
136 |
+LICENSE="GPL-2" |
137 |
+SLOT="0" |
138 |
+KEYWORDS="~amd64 ~x86" |
139 |
+IUSE="+alsa" |
140 |
+ |
141 |
+DEPEND="dev-libs/atk |
142 |
+ x11-libs/cairo |
143 |
+ x11-libs/gdk-pixbuf |
144 |
+ x11-libs/gtk+:2 |
145 |
+ x11-libs/pango |
146 |
+ alsa? ( media-libs/alsa-lib )" |
147 |
+ |
148 |
+RDEPEND="${DEPEND} |
149 |
+ x11-libs/libX11 |
150 |
+ x11-libs/libXmu" |
151 |
+ |
152 |
+DOCS=( CREDITS HISTORY README ) |
153 |
+S="${WORKDIR}/${MY_PV}" |
154 |
+ |
155 |
+PATCHES=( |
156 |
+ "${FILESDIR}/${PN}-2.5.3-fix-makefile.patch" |
157 |
+ "${FILESDIR}/${PN}-2.5.3-fix-build-intel-lib.patch" |
158 |
+) |
159 |
+ |
160 |
+src_prepare() { |
161 |
+ default |
162 |
+} |
163 |
+ |
164 |
+src_compile() { |
165 |
+ local myconf |
166 |
+ use alsa && myconf="AUDIO_ALSA=yes" |
167 |
+ emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" ${myconf} -C gtk |
168 |
+ emake -C gtk clean |
169 |
+ emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" BCD_MATH=1 ${myconf} -C gtk |
170 |
+} |
171 |
+ |
172 |
+src_install() { |
173 |
+ default |
174 |
+ dobin gtk/free42bin gtk/free42dec |
175 |
+} |