1 |
commit: a6c4fdf84d1158c9c87af32e587a2726796f66d7 |
2 |
Author: Chema Alonso Josa <nimiux <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Feb 2 11:38:05 2017 +0000 |
4 |
Commit: José María Alonso <nimiux <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Feb 2 11:38:25 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6c4fdf8 |
7 |
|
8 |
app-emulation/free42: Bumps version to 1.5.13 |
9 |
|
10 |
Package-Manager: portage-2.3.3 |
11 |
|
12 |
app-emulation/free42/Manifest | 1 + |
13 |
.../files/free42-1.5.13-fix-build-intel-lib.patch | 12 +++++ |
14 |
.../free42/files/free42-1.5.13-fix-makefile.patch | 57 ++++++++++++++++++++++ |
15 |
app-emulation/free42/free42-1.5.13.ebuild | 48 ++++++++++++++++++ |
16 |
4 files changed, 118 insertions(+) |
17 |
|
18 |
diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest |
19 |
index 26d5173..5ddb477 100644 |
20 |
--- a/app-emulation/free42/Manifest |
21 |
+++ b/app-emulation/free42/Manifest |
22 |
@@ -1 +1,2 @@ |
23 |
DIST free42-1.5.12.tgz 22691715 SHA256 77f053fbfc597229f4e7d4e66d80aad0252e18bd8c3e05c757c02af5c4cdf268 SHA512 85e595f14e1ee5cf498dc9aa641edb841db450dbeca67b4a5c7853e7c2d655e3d40ca9332d0fed70c3a3e397553bc4655f87a27aefca4c0eb89d16a6fafae843 WHIRLPOOL 5c0d762660d239c6157a18bbd353734d4af9afb5d665cc75c200e92509457b898693540732be05afeb0514c5c2604207a97c0adbb22121789170de94f538de84 |
24 |
+DIST free42-1.5.13.tgz 22684310 SHA256 27caa84aa77257290ae27dfe04236bbf75126b197067a9c1cf7723cccbe65fd9 SHA512 b12b5be7a7d8241cb38046bef163143e71d9910c829179509daa00c47077a12c9b506bb0203bad1202e0200ae3a73cf4171d1dedd401c28fd18f1129199c4c1e WHIRLPOOL 588ea795af49fc235b4250f5f648930cb09b048cb7d44182c72622b285b76110816a20228d96ab94ee3b2bb8d55690d24d136e1524cb24630866161202d7373f |
25 |
|
26 |
diff --git a/app-emulation/free42/files/free42-1.5.13-fix-build-intel-lib.patch b/app-emulation/free42/files/free42-1.5.13-fix-build-intel-lib.patch |
27 |
new file mode 100644 |
28 |
index 00000000..23641b5 |
29 |
--- /dev/null |
30 |
+++ b/app-emulation/free42/files/free42-1.5.13-fix-build-intel-lib.patch |
31 |
@@ -0,0 +1,12 @@ |
32 |
+diff -Nuar a/gtk/build-intel-lib.sh b/gtk/build-intel-lib.sh |
33 |
+--- a/gtk/build-intel-lib.sh 2016-09-04 18:56:12.000000000 +0200 |
34 |
++++ b/gtk/build-intel-lib.sh 2016-09-24 19:39:49.284126118 +0200 |
35 |
+@@ -4,7 +4,7 @@ |
36 |
+ cd IntelRDFPMathLib20U1 |
37 |
+ patch -p0 <../intel-lib-linux.patch |
38 |
+ cd LIBRARY |
39 |
+-make CC=gcc CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0 |
40 |
++make A=a CC=gcc CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0 |
41 |
+ mv libbid.a ../../gcc111libbid.a |
42 |
+ cd ../.. |
43 |
+ ( 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 |
44 |
|
45 |
diff --git a/app-emulation/free42/files/free42-1.5.13-fix-makefile.patch b/app-emulation/free42/files/free42-1.5.13-fix-makefile.patch |
46 |
new file mode 100644 |
47 |
index 00000000..29c3bb5 |
48 |
--- /dev/null |
49 |
+++ b/app-emulation/free42/files/free42-1.5.13-fix-makefile.patch |
50 |
@@ -0,0 +1,57 @@ |
51 |
+diff -Nuar a/gtk/Makefile b/gtk/Makefile |
52 |
+--- a/gtk/Makefile 2016-10-04 03:45:02.000000000 +0200 |
53 |
++++ b/gtk/Makefile 2016-11-26 22:06:25.599990576 +0100 |
54 |
+@@ -15,11 +15,10 @@ |
55 |
+ # along with this program; if not, see http://www.gnu.org/licenses/. |
56 |
+ ############################################################################### |
57 |
+ |
58 |
+-CFLAGS = -MMD \ |
59 |
++CFLAGS := -MMD \ |
60 |
+ -Wall \ |
61 |
+ -Wno-parentheses \ |
62 |
+ -Wno-write-strings \ |
63 |
+- -g \ |
64 |
+ -I/usr/X11R6/include \ |
65 |
+ $(shell pkg-config --cflags gtk+-2.0) \ |
66 |
+ -DVERSION="\"$(shell cat ../VERSION)\"" \ |
67 |
+@@ -27,21 +26,25 @@ |
68 |
+ -DDECIMAL_GLOBAL_ROUNDING=1 \ |
69 |
+ -DDECIMAL_GLOBAL_ROUNDING_ACCESS_FUNCTIONS=1 \ |
70 |
+ -DDECIMAL_GLOBAL_EXCEPTION_FLAGS=1 \ |
71 |
+- -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1 |
72 |
++ -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1 \ |
73 |
++ ${CFLAGS} |
74 |
+ |
75 |
+-CXXFLAGS = $(CFLAGS) \ |
76 |
++CXXFLAGS := $(CFLAGS) \ |
77 |
+ -fno-exceptions \ |
78 |
+ -fno-rtti \ |
79 |
+- -D_WCHAR_T_DEFINED |
80 |
++ -D_WCHAR_T_DEFINED \ |
81 |
++ ${CXXFLAGS} |
82 |
+ |
83 |
+-LDFLAGS = -L/usr/X11R6/lib |
84 |
++MYLDFLAGS = -L/usr/X11R6/lib |
85 |
+-LIBS = gcc111libbid.a -lXmu $(shell pkg-config --libs gtk+-2.0) |
86 |
++LIBS = gcc111libbid.a -lX11 -ldl -lXmu $(shell pkg-config --libs gtk+-2.0) |
87 |
+ |
88 |
+ ifeq "$(shell uname -s)" "Linux" |
89 |
+-LDFLAGS += -Wl,--hash-style=both |
90 |
++MYLDFLAGS += -Wl,--hash-style=both |
91 |
+ LIBS += -lpthread |
92 |
+ endif |
93 |
+ |
94 |
++MYLDFLAGS += ${LDFLAGS} |
95 |
++ |
96 |
+ SRCS = shell_main.cc shell_skin.cc skins.cc keymap.cc shell_loadimage.cc \ |
97 |
+ shell_spool.cc core_main.cc core_commands1.cc core_commands2.cc \ |
98 |
+ core_commands3.cc core_commands4.cc core_commands5.cc \ |
99 |
+@@ -83,7 +86,7 @@ |
100 |
+ endif |
101 |
+ |
102 |
+ $(EXE): $(OBJS) |
103 |
+- $(CXX) -o $(EXE) $(LDFLAGS) $(OBJS) $(LIBS) |
104 |
++ $(CXX) -o $(EXE) $(MYLDFLAGS) $(OBJS) $(LIBS) |
105 |
+ |
106 |
+ $(SRCS) skin2cc.cc keymap2cc.cc skin2cc.conf: symlinks |
107 |
+ |
108 |
|
109 |
diff --git a/app-emulation/free42/free42-1.5.13.ebuild b/app-emulation/free42/free42-1.5.13.ebuild |
110 |
new file mode 100644 |
111 |
index 00000000..6e7ef59 |
112 |
--- /dev/null |
113 |
+++ b/app-emulation/free42/free42-1.5.13.ebuild |
114 |
@@ -0,0 +1,48 @@ |
115 |
+# Copyright 1999-2017 Gentoo Foundation |
116 |
+# Distributed under the terms of the GNU General Public License v2 |
117 |
+# $Id$ |
118 |
+ |
119 |
+EAPI=6 |
120 |
+ |
121 |
+inherit eutils toolchain-funcs |
122 |
+ |
123 |
+DESCRIPTION="An HP-42S Calculator Simulator" |
124 |
+HOMEPAGE="http://thomasokken.com/free42/" |
125 |
+SRC_URI="mirror://gentoo/${P}.tgz" |
126 |
+ |
127 |
+LICENSE="GPL-2" |
128 |
+SLOT="0" |
129 |
+KEYWORDS="~amd64 ~x86" |
130 |
+IUSE="alsa" |
131 |
+ |
132 |
+DEPEND="dev-libs/atk |
133 |
+ x11-libs/cairo |
134 |
+ x11-libs/gdk-pixbuf |
135 |
+ x11-libs/gtk+:2 |
136 |
+ x11-libs/pango |
137 |
+ alsa? ( media-libs/alsa-lib )" |
138 |
+ |
139 |
+RDEPEND="${DEPEND} |
140 |
+ x11-libs/libX11 |
141 |
+ x11-libs/libXmu" |
142 |
+ |
143 |
+S="${WORKDIR}/${PN}" |
144 |
+ |
145 |
+src_prepare() { |
146 |
+ default |
147 |
+ sed -i -e 's/print_gif_name\[FILENAMELEN\]/print_gif_name\[1000\]/' \ |
148 |
+ "${S}/gtk/shell_main.cc" || die |
149 |
+ epatch "${FILESDIR}"/${P}-fix-makefile.patch |
150 |
+ epatch "${FILESDIR}"/${P}-fix-build-intel-lib.patch |
151 |
+} |
152 |
+ |
153 |
+src_compile() { |
154 |
+ local myconf |
155 |
+ use alsa && myconf="AUDIO_ALSA=yes" |
156 |
+ emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" BCD_MATH=1 ${myconf} -C "${S}/gtk" |
157 |
+} |
158 |
+ |
159 |
+src_install() { |
160 |
+ dodoc CREDITS HISTORY README TODO |
161 |
+ dobin gtk/free42dec |
162 |
+} |