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