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 13C43139694 for ; Tue, 4 Apr 2017 12:51:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3C567E0D09; Tue, 4 Apr 2017 12:51:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 080FDE0D09 for ; Tue, 4 Apr 2017 12:51:34 +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 871D234162D for ; Tue, 4 Apr 2017 12:51:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F338E71DC for ; Tue, 4 Apr 2017 12:51:31 +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: <1491310287.bc79adca4e28808496352f811155de4112694c86.nimiux@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/free42/, app-emulation/free42/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/free42/Manifest app-emulation/free42/files/free42-1.5.15-fix-build-intel-lib.patch app-emulation/free42/files/free42-1.5.15-fix-makefile.patch app-emulation/free42/free42-1.5.15.ebuild X-VCS-Directories: app-emulation/free42/ app-emulation/free42/files/ X-VCS-Committer: nimiux X-VCS-Committer-Name: José María Alonso X-VCS-Revision: bc79adca4e28808496352f811155de4112694c86 X-VCS-Branch: master Date: Tue, 4 Apr 2017 12:51:31 +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: 37766c15-2523-4d44-8a8b-1075907eeb42 X-Archives-Hash: 92c77f2a7fe85d2ca737636d6076e89f commit: bc79adca4e28808496352f811155de4112694c86 Author: Chema Alonso Josa gentoo org> AuthorDate: Tue Apr 4 12:51:08 2017 +0000 Commit: José María Alonso gentoo org> CommitDate: Tue Apr 4 12:51:27 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc79adca app-emulation/free42: Bumps version to 1.5.15 Package-Manager: Portage-2.3.3, Repoman-2.3.1 app-emulation/free42/Manifest | 1 + .../files/free42-1.5.15-fix-build-intel-lib.patch | 12 +++++ .../free42/files/free42-1.5.15-fix-makefile.patch | 58 ++++++++++++++++++++++ app-emulation/free42/free42-1.5.15.ebuild | 47 ++++++++++++++++++ 4 files changed, 118 insertions(+) diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest index 252073ff56f..37b124916f1 100644 --- a/app-emulation/free42/Manifest +++ b/app-emulation/free42/Manifest @@ -1 +1,2 @@ DIST free42-1.5.13.tgz 22684310 SHA256 27caa84aa77257290ae27dfe04236bbf75126b197067a9c1cf7723cccbe65fd9 SHA512 b12b5be7a7d8241cb38046bef163143e71d9910c829179509daa00c47077a12c9b506bb0203bad1202e0200ae3a73cf4171d1dedd401c28fd18f1129199c4c1e WHIRLPOOL 588ea795af49fc235b4250f5f648930cb09b048cb7d44182c72622b285b76110816a20228d96ab94ee3b2bb8d55690d24d136e1524cb24630866161202d7373f +DIST free42-1.5.15.tgz 22683600 SHA256 2dda0558141cd26d4b04aa96608c85eadb0770c4f2b660889d4b2a6f3a880c21 SHA512 fc09fcb0efaa6502776517b22cd0015ea7ac7d128b80bd740f64272b6c7aa41f5509dd7e0166dc18043790b4bef725a37a6a7210308a67aeaed02622f9e6daef WHIRLPOOL 5f6f5b33ccb2c320515fbc4e67ee52c6bc6c25fdbc8cf24c05772a90be87fed03f48dfa363b195071c4bc722428fb116d246e9df2eaddba20742648891ad7769 diff --git a/app-emulation/free42/files/free42-1.5.15-fix-build-intel-lib.patch b/app-emulation/free42/files/free42-1.5.15-fix-build-intel-lib.patch new file mode 100644 index 00000000000..6464714a001 --- /dev/null +++ b/app-emulation/free42/files/free42-1.5.15-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-04-01 20:02:45.000000000 +0200 ++++ b/gtk/build-intel-lib.sh 2017-04-04 13:55:43.719038089 +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.15-fix-makefile.patch b/app-emulation/free42/files/free42-1.5.15-fix-makefile.patch new file mode 100644 index 00000000000..d64efb21a6d --- /dev/null +++ b/app-emulation/free42/files/free42-1.5.15-fix-makefile.patch @@ -0,0 +1,58 @@ +diff -Nuar a/gtk/Makefile b/gtk/Makefile +--- a/gtk/Makefile 2017-04-01 20:02:45.000000000 +0200 ++++ b/gtk/Makefile 2017-04-04 13:59:04.969034463 +0200 +@@ -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-1.5.15.ebuild b/app-emulation/free42/free42-1.5.15.ebuild new file mode 100644 index 00000000000..4e80cf4e96a --- /dev/null +++ b/app-emulation/free42/free42-1.5.15.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +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 +}