From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DB20F139083 for ; Sun, 10 Dec 2017 13:24:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 32EFCE1112; Sun, 10 Dec 2017 13:24:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 00349E1112 for ; Sun, 10 Dec 2017 13:24:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7169133BEBE for ; Sun, 10 Dec 2017 13:24:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DA87AAE6B for ; Sun, 10 Dec 2017 13:24:04 +0000 (UTC) From: "José María Alonso" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "José María Alonso" Message-ID: <1512912237.2c7f79b001b83723254fba87569fdbaf515503cf.nimiux@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/free42/files/, app-emulation/free42/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/free42/Manifest app-emulation/free42/files/free42-2.0.7-fix-build-intel-lib.patch app-emulation/free42/files/free42-2.0.7-fix-makefile.patch app-emulation/free42/free42-2.0.7.ebuild X-VCS-Directories: app-emulation/free42/files/ app-emulation/free42/ X-VCS-Committer: nimiux X-VCS-Committer-Name: José María Alonso X-VCS-Revision: 2c7f79b001b83723254fba87569fdbaf515503cf X-VCS-Branch: master Date: Sun, 10 Dec 2017 13:24:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4ba20856-7ff6-41a7-ba52-9047d1f63bfc X-Archives-Hash: 8866fd0987620d295805fa51ace106b4 commit: 2c7f79b001b83723254fba87569fdbaf515503cf Author: Chema Alonso Josa gentoo org> AuthorDate: Sun Dec 10 13:23:18 2017 +0000 Commit: José María Alonso gentoo org> CommitDate: Sun Dec 10 13:23:57 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c7f79b0 app-emulation/free42: Bumps version to 2.0.7 Package-Manager: Portage-2.3.13, Repoman-2.3.3 app-emulation/free42/Manifest | 1 + .../files/free42-2.0.7-fix-build-intel-lib.patch | 12 +++++ .../free42/files/free42-2.0.7-fix-makefile.patch | 58 ++++++++++++++++++++++ app-emulation/free42/free42-2.0.7.ebuild | 49 ++++++++++++++++++ 4 files changed, 120 insertions(+) diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest index 6543a8b94b1..f31517cf680 100644 --- a/app-emulation/free42/Manifest +++ b/app-emulation/free42/Manifest @@ -1 +1,2 @@ DIST free42-nologo-2.0.6.tgz 7348647 BLAKE2B 708c88b4903358c23989d515c61884ffc9feae3d43fc54f1ac8a18779cfe8aa2d0e1a2ec667e24f78da58cd94ad515399191b7dc968adbc59bb97517b34680be SHA512 078a79cc4dfa36ae7342be5b90350f4b7269f4e71777f2620c2043510d6313acbc1fa9415b75f8b01bebb2de747b9af8a26738f877c34a4d82a1fdd52c75a61d +DIST free42-nologo-2.0.7.tgz 7354850 BLAKE2B 6be2f2ea912a1d47bdf8c9016e8a32e5203d982e34cbe5ef6624eac078297cd967cf08ae2bdeb7c6ad158f96e77032f449a47f01c3c8d8e312f6d46e20237cf0 SHA512 1adfccb37bdf35ecd57a6da1633ceb3bcfd0681efbc34fc9a4e4580ce235e35db9281de0d9ba659ecd33ef2b3a17eae596047b6790ffbf3e5e5ebfad600dcb8b diff --git a/app-emulation/free42/files/free42-2.0.7-fix-build-intel-lib.patch b/app-emulation/free42/files/free42-2.0.7-fix-build-intel-lib.patch new file mode 100644 index 00000000000..04fc844599e --- /dev/null +++ b/app-emulation/free42/files/free42-2.0.7-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 2017-11-29 06:03:45.000000000 +0100 ++++ b/gtk/build-intel-lib.sh 2017-12-10 13:57:27.485971521 +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.7-fix-makefile.patch b/app-emulation/free42/files/free42-2.0.7-fix-makefile.patch new file mode 100644 index 00000000000..ccf18766bae --- /dev/null +++ b/app-emulation/free42/files/free42-2.0.7-fix-makefile.patch @@ -0,0 +1,58 @@ +diff -Nuar a/gtk/Makefile b/gtk/Makefile +--- a/gtk/Makefile 2017-11-29 06:03:45.000000000 +0100 ++++ b/gtk/Makefile 2017-12-10 14:01:06.715970583 +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.7.ebuild b/app-emulation/free42/free42-2.0.7.ebuild new file mode 100644 index 00000000000..6e2ba52edf2 --- /dev/null +++ b/app-emulation/free42/free42-2.0.7.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2017 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}" + +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 + dobin gtk/free42dec +}