commit: a6c4fdf84d1158c9c87af32e587a2726796f66d7
Author: Chema Alonso Josa <nimiux <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 2 11:38:05 2017 +0000
Commit: José María Alonso <nimiux <AT> gentoo <DOT> org>
CommitDate: Thu Feb 2 11:38:25 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6c4fdf8
app-emulation/free42: Bumps version to 1.5.13
Package-Manager: portage-2.3.3
app-emulation/free42/Manifest | 1 +
.../files/free42-1.5.13-fix-build-intel-lib.patch | 12 +++++
.../free42/files/free42-1.5.13-fix-makefile.patch | 57 ++++++++++++++++++++++
app-emulation/free42/free42-1.5.13.ebuild | 48 ++++++++++++++++++
4 files changed, 118 insertions(+)
diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest
index 26d5173..5ddb477 100644
--- a/app-emulation/free42/Manifest
+++ b/app-emulation/free42/Manifest
@@ -1 +1,2 @@
DIST free42-1.5.12.tgz 22691715 SHA256
77f053fbfc597229f4e7d4e66d80aad0252e18bd8c3e05c757c02af5c4cdf268 SHA512
85e595f14e1ee5cf498dc9aa641edb841db450dbeca67b4a5c7853e7c2d655e3d40ca9332d0fed70c3a3e397553bc4655f87a27aefca4c0eb89d16a6fafae843
WHIRLPOOL
5c0d762660d239c6157a18bbd353734d4af9afb5d665cc75c200e92509457b898693540732be05afeb0514c5c2604207a97c0adbb22121789170de94f538de84
+DIST free42-1.5.13.tgz 22684310 SHA256
27caa84aa77257290ae27dfe04236bbf75126b197067a9c1cf7723cccbe65fd9 SHA512
b12b5be7a7d8241cb38046bef163143e71d9910c829179509daa00c47077a12c9b506bb0203bad1202e0200ae3a73cf4171d1dedd401c28fd18f1129199c4c1e
WHIRLPOOL
588ea795af49fc235b4250f5f648930cb09b048cb7d44182c72622b285b76110816a20228d96ab94ee3b2bb8d55690d24d136e1524cb24630866161202d7373f
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
new file mode 100644
index 00000000..23641b5
--- /dev/null
+++ b/app-emulation/free42/files/free42-1.5.13-fix-build-intel-lib.patch
@@ -0,0 +1,12 @@
+diff -Nuar a/gtk/build-intel-lib.sh b/gtk/build-intel-lib.sh
+--- a/gtk/build-intel-lib.sh 2016-09-04 18:56:12.000000000 +0200
++++ b/gtk/build-intel-lib.sh 2016-09-24 19:39:49.284126118 +0200
+@@ -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-1.5.13-fix-makefile.patch
b/app-emulation/free42/files/free42-1.5.13-fix-makefile.patch
new file mode 100644
index 00000000..29c3bb5
--- /dev/null
+++ b/app-emulation/free42/files/free42-1.5.13-fix-makefile.patch
@@ -0,0 +1,57 @@
+diff -Nuar a/gtk/Makefile b/gtk/Makefile
+--- a/gtk/Makefile 2016-10-04 03:45:02.000000000 +0200
++++ b/gtk/Makefile 2016-11-26 22:06:25.599990576 +0100
+@@ -15,11 +15,10 @@
+ # along with this program; if not, see http://www.gnu.org/licenses/.
+
###############################################################################
+
+-CFLAGS = -MMD \
++CFLAGS := -MMD \
+ -Wall \
+ -Wno-parentheses \
+ -Wno-write-strings \
+- -g \
+ -I/usr/X11R6/include \
+ $(shell pkg-config --cflags gtk+-2.0) \
+ -DVERSION="\"$(shell cat ../VERSION)\"" \
+@@ -27,21 +26,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
++MYLDFLAGS = -L/usr/X11R6/lib
+-LIBS = gcc111libbid.a -lXmu $(shell pkg-config --libs gtk+-2.0)
++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 +86,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-1.5.13.ebuild
b/app-emulation/free42/free42-1.5.13.ebuild
new file mode 100644
index 00000000..6e7ef59
--- /dev/null
+++ b/app-emulation/free42/free42-1.5.13.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="An HP-42S Calculator Simulator"
+HOMEPAGE="http://thomasokken.com/free42/";
+SRC_URI="mirror://gentoo/${P}.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}/${PN}"
+
+src_prepare() {
+ default
+ 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
+}
+
+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 TODO
+ dobin gtk/free42dec
+}
