[gentoo-commits] repo/gentoo:master commit in: app-emulation/free42/, app-emulation/free42/files/
commit: 664ffc257eae19cc4d48eaf4e39d34071157f53c Author: Bernard Cafarelli gentoo org> AuthorDate: Sun Nov 6 21:23:21 2022 + Commit: Bernard Cafarelli gentoo org> CommitDate: Sun Nov 6 21:23:21 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=664ffc25 app-emulation/free42: add 3.0.16 Closes: https://bugs.gentoo.org/747217 Signed-off-by: Bernard Cafarelli gentoo.org> app-emulation/free42/Manifest | 1 + .../files/free42-3.0.16-fix-build-intel-lib.patch | 65 ++ app-emulation/free42/free42-3.0.16.ebuild | 46 +++ 3 files changed, 112 insertions(+) diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest index 7aeb6b9463a2..6095a36cf7f9 100644 --- a/app-emulation/free42/Manifest +++ b/app-emulation/free42/Manifest @@ -1,3 +1,4 @@ DIST free42-nologo-2.5.24.tgz 7423183 BLAKE2B e10425af8d5c30be6ab5b728130bbe3068c414e24f033b65623951f915bcfeea0672857ff8def3e9f2766aba79411a1022d4b83592281567de38e82613d8a832 SHA512 a0702c3e4b2f3f38f73c54de4e51da8d1dc90585b253d1ae087d59dfabbe83be9c80086df8540cb6420dae8c6e766cd1ccce875d9bcb94ecbc85791e3fa89b8b DIST free42-nologo-3.0.13.tgz 7458844 BLAKE2B 3b09aaf0dc177ddc9db49a0f09c91f7c6a3346303266ed280fa57403e6864a4d88471dcab8c0e1ddf1b96653d4609f83f4102fc169902a70098b3260f48d9099 SHA512 6037e86962157a2293915d2bd9343f7ddcddcbb346e98fe339a7ef1784c98249fb55c69c0cf6370a79db4628197ac851d4c4c05ec610a2911fa9c3b00a6d077d DIST free42-nologo-3.0.14.tgz 7459191 BLAKE2B 35da329a6883fc8e83b59310b3df458111f90e25d032610af38c932cba0b4c33eddb63fe04902516c8f5b178ae7bd83d5775ebf63a9889dbbeb71fd99be3fe8d SHA512 d8ae0b5fd5004b6989365b9ed0ce037ae88ad59112022c8c552752bee613476b193f29199ce43c685eb30ab64a4d33aa33eb0a91c0c5ff0c09102bfc5c0e2d07 +DIST free42-nologo-3.0.16.tgz 7460148 BLAKE2B 2fd4baf38c30436bcc9e97698389a8fb6c9b457171a5ddbd117b32eaab02fc290132c26640201c5ae411f5701ec768a7744be64168ab5edab4c646397e6ced94 SHA512 909a461e2396b5a532b757c4305fea6623bd7102210940c457a9facda5404f7fb82918ced9f66fd13992bd0f2c7558f38c7b4693b9fd2434cff739af48c28a0e diff --git a/app-emulation/free42/files/free42-3.0.16-fix-build-intel-lib.patch b/app-emulation/free42/files/free42-3.0.16-fix-build-intel-lib.patch new file mode 100644 index ..283c6c1435be --- /dev/null +++ b/app-emulation/free42/files/free42-3.0.16-fix-build-intel-lib.patch @@ -0,0 +1,65 @@ +diff -Naur free42-nologo-3.0.16.orig/gtk/build-intel-lib.sh free42-nologo-3.0.16/gtk/build-intel-lib.sh +--- free42-nologo-3.0.16.orig/gtk/build-intel-lib.sh 2022-10-29 17:03:11.0 +0200 free42-nologo-3.0.16/gtk/build-intel-lib.sh2022-11-06 22:09:42.384802729 +0100 +@@ -10,13 +10,6 @@ + fi + fi + +-which gcc >/dev/null +-if [ $? -eq 0 ]; then +- CC=gcc +-else +- CC=cc +-fi +- + # Hack to support FreeBSD; not 100% sure what this does, but it produces a + # library that passes all tests. + +@@ -64,8 +57,11 @@ + ;; + esac + ++patch -p0 <../intel-lib-custom-cc.patch ++ + cd LIBRARY +-$MK $OS_ARG CC=$CC CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0 $ENDIAN_ARG ++echo $MK $OS_ARG A=a CC=$CC CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0 $ENDIAN_ARG ++$MK $OS_ARG A=a CC=$CC CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0 $ENDIAN_ARG + 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 -Naur free42-nologo-3.0.16.orig/gtk/intel-lib-custom-cc.patch free42-nologo-3.0.16/gtk/intel-lib-custom-cc.patch +--- free42-nologo-3.0.16.orig/gtk/intel-lib-custom-cc.patch1970-01-01 01:00:00.0 +0100 free42-nologo-3.0.16/gtk/intel-lib-custom-cc.patch 2022-11-06 22:18:35.428433045 +0100 +@@ -0,0 +1,31 @@ ++diff -Naur orig/LIBRARY/makefile.iml_head LIBRARY/makefile.iml_head ++--- orig/LIBRARY/makefile.iml_head2011-07-12 17:26:21.0 +0200 + LIBRARY/makefile.iml_head 2022-11-06 22:18:17.048411637 +0100 ++@@ -527,12 +527,8 @@ ++ CC_TYPES := gcc cl ++ INTEL_CC_LIST := icc icl ++ ++-CC_NAME_INDEX := $(call GetIndex,$(CC_NAME),$(CC_NAME_LIST)) ++-ifeq ($(CC_NAME_INDEX),) ++-$(error "Unknown CC_NAME ($(CC_NAME)). Must be one of $(CC_NAME_LIST)) ++-endif ++ ++-CC_INDEX := $(call GetIndex,$(CC_NAME),$(CC_NAME_LIST)) +++CC_INDEX := 3 ++ CC_TYPE := $(word $(CC_INDEX),$(CC_TYPE_LIST)) ++ CC_TYPE_INDEX := $(call GetIndex,$(CC_TYPE),$(CC_TYPES)) ++ ++@@ -543,13 +539,6 @@ ++ _CPP := $(CC_NAME) $(call CcNameSelect,-EP,-EP,-E -P,-EP) ++ _CC := $(CC_NAME) $(call CcNameSelect,, -nologo,, -nologo) ++ ++-ifeq ($(origin CC),default) ++-CC := $(_CC) ++-endif ++-ifeq ($(origin CPP),default) ++-CPP := $(_CPP) ++-endif ++- ++ CselCc = $(call Cset,$1,$(call CcTypeSelect,$2,$3)) ++ ++ QOP
[gentoo-commits] repo/gentoo:master commit in: app-emulation/free42/, app-emulation/free42/files/
commit: 52a3a6ab2d4e56e83b2700607c484f941228440a Author: Bernard Cafarelli gentoo org> AuthorDate: Fri Sep 23 18:49:24 2022 + Commit: Bernard Cafarelli gentoo org> CommitDate: Fri Sep 23 19:23:33 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52a3a6ab app-emulation/free42: add 3.0.14 Signed-off-by: Bernard Cafarelli gentoo.org> app-emulation/free42/Manifest | 1 + .../free42/files/free42-3.0.14-fix-makefile.patch | 26 app-emulation/free42/free42-3.0.14.ebuild | 46 ++ 3 files changed, 73 insertions(+) diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest index 68fe4c86baff..ba008cd83f86 100644 --- a/app-emulation/free42/Manifest +++ b/app-emulation/free42/Manifest @@ -2,3 +2,4 @@ DIST free42-nologo-2.5.24.tgz 7423183 BLAKE2B e10425af8d5c30be6ab5b728130bbe3068 DIST free42-nologo-3.0.10.tgz 7455117 BLAKE2B 9e1e1e0e9f5a05be936440305f0301c2faa3e4e59cc30afed25a59aacb2215265a214043a6114e0d4d854cdffceaf2a422025a1cad41eb715c2e39eebeef2f2e SHA512 dde1f71f2a64a670a40782b2144192292a3086bac297625eb7e1cbec9cad09433b5d0dc56efbfd0d567a9d533442f249166f73bc89cbb595085db3002f4b23c7 DIST free42-nologo-3.0.11a.tgz 7457251 BLAKE2B 22be3d7d84d30ae347d7c24eba1339217cb7ebeae94454b35acdc0c4f6e1c0557858bf866e90bb4008ef78a88c34b2226312ea0ed3a3cadb2c07bb42cc0d5ea9 SHA512 8cac8fb23c26f5dcc7951e875931340eedc4cc63614ea8413d1ca75f1c2a8133f9c18ea4e837fbc9771f127563ae01e6f011e6b4c0d97b4c8b8738c924be8762 DIST free42-nologo-3.0.13.tgz 7458844 BLAKE2B 3b09aaf0dc177ddc9db49a0f09c91f7c6a3346303266ed280fa57403e6864a4d88471dcab8c0e1ddf1b96653d4609f83f4102fc169902a70098b3260f48d9099 SHA512 6037e86962157a2293915d2bd9343f7ddcddcbb346e98fe339a7ef1784c98249fb55c69c0cf6370a79db4628197ac851d4c4c05ec610a2911fa9c3b00a6d077d +DIST free42-nologo-3.0.14.tgz 7459191 BLAKE2B 35da329a6883fc8e83b59310b3df458111f90e25d032610af38c932cba0b4c33eddb63fe04902516c8f5b178ae7bd83d5775ebf63a9889dbbeb71fd99be3fe8d SHA512 d8ae0b5fd5004b6989365b9ed0ce037ae88ad59112022c8c552752bee613476b193f29199ce43c685eb30ab64a4d33aa33eb0a91c0c5ff0c09102bfc5c0e2d07 diff --git a/app-emulation/free42/files/free42-3.0.14-fix-makefile.patch b/app-emulation/free42/files/free42-3.0.14-fix-makefile.patch new file mode 100644 index ..6e46ed540320 --- /dev/null +++ b/app-emulation/free42/files/free42-3.0.14-fix-makefile.patch @@ -0,0 +1,26 @@ +diff -Naur free42-nologo-3.0.14.orig/gtk/Makefile free42-nologo-3.0.14/gtk/Makefile +--- free42-nologo-3.0.14.orig/gtk/Makefile 2022-08-13 23:55:44.0 +0200 free42-nologo-3.0.14/gtk/Makefile 2022-09-23 20:46:30.096874563 +0200 +@@ -40,10 +40,11 @@ +-DDECIMAL_GLOBAL_EXCEPTION_FLAGS=1 \ +-DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1 + +-CXXFLAGS = $(CFLAGS) \ ++CXXFLAGS := $(CFLAGS) \ +-fno-exceptions \ +-fno-rtti \ +- -D_WCHAR_T_DEFINED ++ -D_WCHAR_T_DEFINED \ ++ ${CXXFLAGS} + + LIBS = gcc111libbid.a $(shell $(PKG_CONFIG) --libs gtk+-3.0) + +@@ -118,7 +119,7 @@ + ./keymap2cc + + gcc111libbid.a: +- sh ./build-intel-lib.sh ++ +sh ./build-intel-lib.sh + ln -s IntelRDFPMathLib20U1/TESTS/readtest.c + + symlinks: diff --git a/app-emulation/free42/free42-3.0.14.ebuild b/app-emulation/free42/free42-3.0.14.ebuild new file mode 100644 index ..9bbccf08da85 --- /dev/null +++ b/app-emulation/free42/free42-3.0.14.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +MY_PV="${PN}-nologo-${PV}" + +DESCRIPTION="An HP-42S Calculator Simulator" +HOMEPAGE="https://thomasokken.com/free42/"; +SRC_URI="https://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+:3 + alsa? ( media-libs/alsa-lib )" + +RDEPEND="${DEPEND}" + +DOCS=( CREDITS HISTORY README ) +S="${WORKDIR}/${MY_PV}" + +PATCHES=( + "${FILESDIR}/${PN}-3.0.14-fix-makefile.patch" + "${FILESDIR}/${PN}-2.5.3-fix-build-intel-lib.patch" +) + +src_compile() { + local myconf + use alsa && myconf="AUDIO_ALSA=yes" + emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" ${myconf} -C gtk + emake -C gtk clean + emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" BCD_MATH=1 ${myconf} -C gtk +} + +src_install() { + default + dobin gtk/free42bin gtk/free42dec +}
[gentoo-commits] repo/gentoo:master commit in: app-emulation/free42/, app-emulation/free42/files/
commit: 616381a6994965ffc78f409b610e3c41ef0264a9 Author: Bernard Cafarelli gentoo org> AuthorDate: Thu Feb 18 08:51:25 2021 + Commit: Bernard Cafarelli gentoo org> CommitDate: Thu Feb 18 08:51:33 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=616381a6 app-emulation/free42: drop old Closes: https://bugs.gentoo.org/769026 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Bernard Cafarelli gentoo.org> app-emulation/free42/Manifest | 2 - .../files/free42-2.0.10-fix-build-intel-lib.patch | 12 .../free42/files/free42-2.0.10-fix-makefile.patch | 67 -- app-emulation/free42/free42-2.0.20.ebuild | 50 app-emulation/free42/free42-2.5.22.ebuild | 50 5 files changed, 181 deletions(-) diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest index 1fc5e05f4e8..b76a025ba88 100644 --- a/app-emulation/free42/Manifest +++ b/app-emulation/free42/Manifest @@ -1,4 +1,2 @@ -DIST free42-nologo-2.0.20.tgz 7390214 BLAKE2B 306f3378bcbb44fa7982c5d9c29bfbea62e915ca50ca5e5216f46fbf483f110a1288d4800991a74622a042517496ff8dd94c3fa3249e8bb4181957e6b23d5ea3 SHA512 9b540fbc50df2f94b135b5e778354f330df77a54ef2ad99b257b5b91d1e3e8d1241e8a834522fc46fe33571ea2695ad8889b427dbcf653870672e89cd56d60f5 -DIST free42-nologo-2.5.22.tgz 7418457 BLAKE2B 18086ef181d846291b9f8762c9c293997e3d61e92a80e5556c41b7a777c4324151b0662d6b8a79e9b191b83312c97e46691e90577eed276ea315a12d73c5a5d4 SHA512 16c7cfb44f0fac12e3516b065f085af884b2652af9c1acb61251c8ede5c45b34f65bc8a3e53f0aa685ff5e1a74c7a17d9c8f76bc89537d790f878d8924a1080c DIST free42-nologo-2.5.24.tgz 7423183 BLAKE2B e10425af8d5c30be6ab5b728130bbe3068c414e24f033b65623951f915bcfeea0672857ff8def3e9f2766aba79411a1022d4b83592281567de38e82613d8a832 SHA512 a0702c3e4b2f3f38f73c54de4e51da8d1dc90585b253d1ae087d59dfabbe83be9c80086df8540cb6420dae8c6e766cd1ccce875d9bcb94ecbc85791e3fa89b8b DIST free42-nologo-2.5.25.tgz 7423321 BLAKE2B 23d69045df8e7a96669a14e5760da4e1f8578b050ff6ddb19b000c8254b04883449c38e78c5af93a9341485363ae52ce41e6398b9954a6eac61aae6276e20488 SHA512 cedc05ad60cf56b4634e0b1525ef75fac8ad16ce14ae80752fda12a6373cc2cf42d4b696e99c121b1dc42087e477ca2d948f173c9128acc91d5bc266259b2836 diff --git a/app-emulation/free42/files/free42-2.0.10-fix-build-intel-lib.patch b/app-emulation/free42/files/free42-2.0.10-fix-build-intel-lib.patch deleted file mode 100644 index 543595c6a1a..000 --- a/app-emulation/free42/files/free42-2.0.10-fix-build-intel-lib.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nuar a/gtk/build-intel-lib.sh b/gtk/build-intel-lib.sh a/gtk/build-intel-lib.sh -+++ b/gtk/build-intel-lib.sh -@@ -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.10-fix-makefile.patch b/app-emulation/free42/files/free42-2.0.10-fix-makefile.patch deleted file mode 100644 index 0fb915df298..000 --- a/app-emulation/free42/files/free42-2.0.10-fix-makefile.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff -Nuar a/gtk/Makefile b/gtk/Makefile a/gtk/Makefile -+++ b/gtk/Makefile -@@ -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 ski
[gentoo-commits] repo/gentoo:master commit in: app-emulation/free42/, app-emulation/free42/files/
commit: bfd43bba307da0c19a7aa0038ad9e12ab3ea2bb6 Author: Bernard Cafarelli gentoo org> AuthorDate: Sun Feb 2 19:13:38 2020 + Commit: Bernard Cafarelli gentoo org> CommitDate: Sun Feb 2 19:21:42 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfd43bba app-emulation/free42: drop old Package-Manager: Portage-2.3.86, Repoman-2.3.20 Signed-off-by: Bernard Cafarelli gentoo.org> app-emulation/free42/Manifest | 3 -- .../free42/files/free42-2.5.3-fix-makefile.patch | 62 -- app-emulation/free42/free42-2.5.10.ebuild | 53 -- app-emulation/free42/free42-2.5.11.ebuild | 53 -- app-emulation/free42/free42-2.5.12.ebuild | 50 - 5 files changed, 221 deletions(-) diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest index 64ccb30bfa1..1efbc90b0f9 100644 --- a/app-emulation/free42/Manifest +++ b/app-emulation/free42/Manifest @@ -1,5 +1,2 @@ DIST free42-nologo-2.0.20.tgz 7390214 BLAKE2B 306f3378bcbb44fa7982c5d9c29bfbea62e915ca50ca5e5216f46fbf483f110a1288d4800991a74622a042517496ff8dd94c3fa3249e8bb4181957e6b23d5ea3 SHA512 9b540fbc50df2f94b135b5e778354f330df77a54ef2ad99b257b5b91d1e3e8d1241e8a834522fc46fe33571ea2695ad8889b427dbcf653870672e89cd56d60f5 -DIST free42-nologo-2.5.10.tgz 7408769 BLAKE2B eec27805199b80ce659517479bbaefe871f8e4d2fc06c138e4741d63748acdef7e04b54324ff679a820ca451fcfa34e4202edf196e426679adabe397313f8f37 SHA512 309ee3779b792208ab887b91e43c4bf7a61862b02e3c250fd09367c154345878ad80c2c949138cb5d0c5d7031ebb0d4c6d192962866b6b68fce220ab2d651b42 -DIST free42-nologo-2.5.11.tgz 7408708 BLAKE2B a7eedafb15ff52e52774b7750bd00cba0b94176d90572cf60c1b927d47a879ea834704b424b2dfcd467c3ae08566a0269d0b5b7a1418e5c4399f7c4e86dd7198 SHA512 389bacf4af420fe4bb8174d15b049f73004f9cecdfd98b1c4aafbe2076c77ba1ce1f4a7df762f4622ccbec2ffbaffc218d0afe576a977d1c583e4a4ca20eff46 -DIST free42-nologo-2.5.12.tgz 7409287 BLAKE2B 9d2e244c1d7c7c728bfde6331badee412573239e3470e84f30776f62f9c6224ff3dc3d3cea8574349aeebd171c6682cfbc12b9bbdd2decbce6b6223aae705a1f SHA512 d93d55dfedfb33f91868f92e6ab9c1db48ff05e932c6628df5bb8237192aaeb104a2da56422cecfeab2ccc24d41fb518f6901ce2424739450d56a5ae7f90cda1 DIST free42-nologo-2.5.14.tgz 7410951 BLAKE2B 5d8087269da86a2c8c00378a3bc51d2f85e2458283ab84dbee3f6d84a373423581b983faef184e794f3c2effd3bde568a4df627a29720d8cb3970e27ddc9c3ca SHA512 0e2ed3f13448d0ea60255d5e45831fcf14efef831f7c2fef59348bd15e1e4b0c42d1b24693de4e35d350367057bc14995767e8e099eb3ed46320c6f6ba97fe69 diff --git a/app-emulation/free42/files/free42-2.5.3-fix-makefile.patch b/app-emulation/free42/files/free42-2.5.3-fix-makefile.patch deleted file mode 100644 index fc5abc33bfd..000 --- a/app-emulation/free42/files/free42-2.5.3-fix-makefile.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff -Naur free42-nologo-2.5.3.orig/gtk/Makefile free42-nologo-2.5.3/gtk/Makefile free42-nologo-2.5.3.orig/gtk/Makefile 2019-09-01 17:44:47.0 +0200 -+++ free42-nologo-2.5.3/gtk/Makefile 2019-09-04 00:27:16.761482125 +0200 -@@ -15,7 +15,7 @@ - # along with this program; if not, see http://www.gnu.org/licenses/. - ### - --CFLAGS = -MMD \ -+CFLAGS := -MMD \ --Wall \ --Wno-parentheses \ --Wno-write-strings \ -@@ -34,15 +34,17 @@ --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 $(shell pkg-config --libs gtk+-2.0) -lXmu -lX11 -+MYLDFLAGS = -L/usr/X11R6/lib -+LIBS = gcc111libbid.a -ldl -lpthread -lX11 -lXmu $(shell pkg-config --libs gtk+-2.0) - - ifeq "$(shell uname -s)" "FreeBSD" - ifdef AUDIO_ALSA -@@ -54,6 +56,8 @@ - CFLAGS += -DF42_BIG_ENDIAN -DBID_BIG_ENDIAN - 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 \ -@@ -95,7 +99,7 @@ - endif - - $(EXE): $(OBJS) -- $(CXX) -o $(EXE) $(LDFLAGS) $(OBJS) $(LIBS) -+ $(CXX) -o $(EXE) $(MYLDFLAGS) $(OBJS) $(LIBS) - - $(SRCS) skin2cc.cc keymap2cc.cc skin2cc.conf: symlinks - -@@ -119,7 +123,7 @@ - - symlinks: - for fn in `cd ../common; /bin/ls`; do ln -s ../common/$$fn; done -- sh ./build-intel-lib.sh -+ +sh ./build-intel-lib.sh - ln -s IntelRDFPMathLib20U1/TESTS/readtest.c - touch symlinks - diff --git a/
[gentoo-commits] repo/gentoo:master commit in: app-emulation/free42/, app-emulation/free42/files/
commit: 90c2a12c86d1fe1fd6391ca6191df4a076f648c3 Author: Bernard Cafarelli gentoo org> AuthorDate: Sun Feb 2 19:21:32 2020 + Commit: Bernard Cafarelli gentoo org> CommitDate: Sun Feb 2 19:21:42 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90c2a12c app-emulation/free42: 2.5.16 bump Package-Manager: Portage-2.3.86, Repoman-2.3.20 Signed-off-by: Bernard Cafarelli gentoo.org> app-emulation/free42/Manifest | 1 + .../free42/files/free42-2.5.16-fix-makefile.patch | 39 + app-emulation/free42/free42-2.5.16.ebuild | 50 ++ 3 files changed, 90 insertions(+) diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest index 1efbc90b0f9..608ae9f5dcc 100644 --- a/app-emulation/free42/Manifest +++ b/app-emulation/free42/Manifest @@ -1,2 +1,3 @@ DIST free42-nologo-2.0.20.tgz 7390214 BLAKE2B 306f3378bcbb44fa7982c5d9c29bfbea62e915ca50ca5e5216f46fbf483f110a1288d4800991a74622a042517496ff8dd94c3fa3249e8bb4181957e6b23d5ea3 SHA512 9b540fbc50df2f94b135b5e778354f330df77a54ef2ad99b257b5b91d1e3e8d1241e8a834522fc46fe33571ea2695ad8889b427dbcf653870672e89cd56d60f5 DIST free42-nologo-2.5.14.tgz 7410951 BLAKE2B 5d8087269da86a2c8c00378a3bc51d2f85e2458283ab84dbee3f6d84a373423581b983faef184e794f3c2effd3bde568a4df627a29720d8cb3970e27ddc9c3ca SHA512 0e2ed3f13448d0ea60255d5e45831fcf14efef831f7c2fef59348bd15e1e4b0c42d1b24693de4e35d350367057bc14995767e8e099eb3ed46320c6f6ba97fe69 +DIST free42-nologo-2.5.16.tgz 7412652 BLAKE2B bdea95adca140eecbb192706a5e611c1ad5d248b47aa609ac2733eb018ea74e7661a1797acf9458aa07b6015df7376b3ef329685cff984d364c2f5e26f7d213b SHA512 5adfe5ce09e3aecae7f05d3880234eb903eb48b36ee10e88be87a8941752323f97067b97cb85699fc03591fc355024eb6cd621f64c31e6e5c6dd4d5027f1ba34 diff --git a/app-emulation/free42/files/free42-2.5.16-fix-makefile.patch b/app-emulation/free42/files/free42-2.5.16-fix-makefile.patch new file mode 100644 index 000..f59a700628d --- /dev/null +++ b/app-emulation/free42/files/free42-2.5.16-fix-makefile.patch @@ -0,0 +1,39 @@ +diff -Naur free42-nologo-2.5.16.orig/gtk/Makefile free42-nologo-2.5.16/gtk/Makefile +--- free42-nologo-2.5.16.orig/gtk/Makefile 2020-01-25 05:16:45.0 +0100 free42-nologo-2.5.16/gtk/Makefile 2020-02-02 20:18:50.460458652 +0100 +@@ -15,7 +15,7 @@ + # along with this program; if not, see http://www.gnu.org/licenses/. + ### + +-CFLAGS = -MMD \ ++CFLAGS := -MMD \ +-Wall \ +-Wno-parentheses \ +-Wno-write-strings \ +@@ -34,12 +34,14 @@ +-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} + + LIBS = gcc111libbid.a $(shell pkg-config --libs gtk+-3.0) + +@@ -114,7 +116,7 @@ + ./keymap2cc + + gcc111libbid.a: +- sh ./build-intel-lib.sh ++ +sh ./build-intel-lib.sh + ln -s IntelRDFPMathLib20U1/TESTS/readtest.c + + symlinks: diff --git a/app-emulation/free42/free42-2.5.16.ebuild b/app-emulation/free42/free42-2.5.16.ebuild new file mode 100644 index 000..bd3148a0b38 --- /dev/null +++ b/app-emulation/free42/free42-2.5.16.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +MY_PV="${PN}-nologo-${PV}" + +DESCRIPTION="An HP-42S Calculator Simulator" +HOMEPAGE="https://thomasokken.com/free42/"; +SRC_URI="https://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+:3 + alsa? ( media-libs/alsa-lib )" + +RDEPEND="${DEPEND}" + +DOCS=( CREDITS HISTORY README ) +S="${WORKDIR}/${MY_PV}" + +PATCHES=( + "${FILESDIR}/${PN}-2.5.16-fix-makefile.patch" + "${FILESDIR}/${PN}-2.5.3-fix-build-intel-lib.patch" +) + +src_prepare() { + default +} + +src_compile() { + local myconf + use alsa && myconf="AUDIO_ALSA=yes" + emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" ${myconf} -C gtk + emake -C gtk clean + emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" BCD_MATH=1 ${myconf} -C gtk +} + +src_install() { + default + dobin gtk/free42bin gtk/free42dec +}
[gentoo-commits] repo/gentoo:master commit in: app-emulation/free42/, app-emulation/free42/files/
commit: 5cb2573130f31ad428c1eeb27f9043329f0e78a0 Author: Bernard Cafarelli gentoo org> AuthorDate: Fri Nov 29 17:05:55 2019 + Commit: Bernard Cafarelli gentoo org> CommitDate: Fri Nov 29 17:06:10 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cb25731 app-emulation/free42: 2.5.12 bump, switches to GTK 3 Package-Manager: Portage-2.3.80, Repoman-2.3.19 Signed-off-by: Bernard Cafarelli gentoo.org> app-emulation/free42/Manifest | 1 + .../free42/files/free42-2.5.12-fix-makefile.patch | 45 +++ app-emulation/free42/free42-2.5.12.ebuild | 50 ++ 3 files changed, 96 insertions(+) diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest index f6a6e147618..eb7d07fa4a7 100644 --- a/app-emulation/free42/Manifest +++ b/app-emulation/free42/Manifest @@ -1,3 +1,4 @@ DIST free42-nologo-2.0.20.tgz 7390214 BLAKE2B 306f3378bcbb44fa7982c5d9c29bfbea62e915ca50ca5e5216f46fbf483f110a1288d4800991a74622a042517496ff8dd94c3fa3249e8bb4181957e6b23d5ea3 SHA512 9b540fbc50df2f94b135b5e778354f330df77a54ef2ad99b257b5b91d1e3e8d1241e8a834522fc46fe33571ea2695ad8889b427dbcf653870672e89cd56d60f5 DIST free42-nologo-2.5.10.tgz 7408769 BLAKE2B eec27805199b80ce659517479bbaefe871f8e4d2fc06c138e4741d63748acdef7e04b54324ff679a820ca451fcfa34e4202edf196e426679adabe397313f8f37 SHA512 309ee3779b792208ab887b91e43c4bf7a61862b02e3c250fd09367c154345878ad80c2c949138cb5d0c5d7031ebb0d4c6d192962866b6b68fce220ab2d651b42 DIST free42-nologo-2.5.11.tgz 7408708 BLAKE2B a7eedafb15ff52e52774b7750bd00cba0b94176d90572cf60c1b927d47a879ea834704b424b2dfcd467c3ae08566a0269d0b5b7a1418e5c4399f7c4e86dd7198 SHA512 389bacf4af420fe4bb8174d15b049f73004f9cecdfd98b1c4aafbe2076c77ba1ce1f4a7df762f4622ccbec2ffbaffc218d0afe576a977d1c583e4a4ca20eff46 +DIST free42-nologo-2.5.12.tgz 7409287 BLAKE2B 9d2e244c1d7c7c728bfde6331badee412573239e3470e84f30776f62f9c6224ff3dc3d3cea8574349aeebd171c6682cfbc12b9bbdd2decbce6b6223aae705a1f SHA512 d93d55dfedfb33f91868f92e6ab9c1db48ff05e932c6628df5bb8237192aaeb104a2da56422cecfeab2ccc24d41fb518f6901ce2424739450d56a5ae7f90cda1 diff --git a/app-emulation/free42/files/free42-2.5.12-fix-makefile.patch b/app-emulation/free42/files/free42-2.5.12-fix-makefile.patch new file mode 100644 index 000..8a8fa437ba2 --- /dev/null +++ b/app-emulation/free42/files/free42-2.5.12-fix-makefile.patch @@ -0,0 +1,45 @@ +diff -Naur free42-nologo-2.5.12.orig/gtk/Makefile free42-nologo-2.5.12/gtk/Makefile +--- free42-nologo-2.5.12.orig/gtk/Makefile 2019-11-28 20:11:51.0 +0100 free42-nologo-2.5.12/gtk/Makefile 2019-11-29 17:59:58.292516949 +0100 +@@ -15,7 +15,7 @@ + # along with this program; if not, see http://www.gnu.org/licenses/. + ### + +-CFLAGS = -MMD \ ++CFLAGS := -MMD \ +-Wall \ +-Wno-parentheses \ +-Wno-write-strings \ +@@ -34,7 +34,8 @@ +-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} + + ### + ### Note that there are deprecation warnings while compiling shell_main.cc ### +@@ -46,10 +47,11 @@ + ### GTK+ 3.22 for testing. ### + ### + +-CXXFLAGS = $(CFLAGS) \ ++CXXFLAGS := $(CFLAGS) \ +-fno-exceptions \ +-fno-rtti \ +- -D_WCHAR_T_DEFINED ++ -D_WCHAR_T_DEFINED \ ++ ${CFLAGS} + + LIBS = gcc111libbid.a $(shell pkg-config --libs gtk+-3.0) + +@@ -125,7 +127,7 @@ + + symlinks: + for fn in `cd ../common; /bin/ls`; do ln -s ../common/$$fn; done +- sh ./build-intel-lib.sh ++ +sh ./build-intel-lib.sh + ln -s IntelRDFPMathLib20U1/TESTS/readtest.c + touch symlinks + diff --git a/app-emulation/free42/free42-2.5.12.ebuild b/app-emulation/free42/free42-2.5.12.ebuild new file mode 100644 index 000..a50835ba399 --- /dev/null +++ b/app-emulation/free42/free42-2.5.12.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +MY_PV="${PN}-nologo-${PV}" + +DESCRIPTION="An HP-42S Calculator Simulator" +HOMEPAGE="https://thomasokken.com/free42/"; +SRC_URI="https://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+:3 + alsa? ( media-libs/alsa-lib )" + +RDEPEND="${DEPEND}" + +DOCS=( CREDITS HISTORY README ) +S="${WORKDIR}/${MY_PV}" + +PATC
[gentoo-commits] repo/gentoo:master commit in: app-emulation/free42/, app-emulation/free42/files/
commit: 961385ab4aad30f9c6f2c73cfcba21556d2051db Author: Marty E. Plummer startmail com> AuthorDate: Sun Apr 8 21:29:48 2018 + Commit: José María Alonso gentoo org> CommitDate: Sun Apr 8 21:30:33 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=961385ab app-emulation/free42: Clean duplicate patches Closes: https://github.com/gentoo/gentoo/pull/7894 Package-Manager: Portage-2.3.24, Repoman-2.3.6 .../files/free42-2.0.10-fix-build-intel-lib.patch | 4 +- .../free42/files/free42-2.0.10-fix-makefile.patch | 4 +- .../files/free42-2.0.17-fix-build-intel-lib.patch | 12 - .../free42/files/free42-2.0.17-fix-makefile.patch | 58 -- app-emulation/free42/free42-2.0.10.ebuild | 4 +- app-emulation/free42/free42-2.0.17.ebuild | 4 +- 6 files changed, 8 insertions(+), 78 deletions(-) diff --git a/app-emulation/free42/files/free42-2.0.10-fix-build-intel-lib.patch b/app-emulation/free42/files/free42-2.0.10-fix-build-intel-lib.patch index a321b1d714b..543595c6a1a 100644 --- a/app-emulation/free42/files/free42-2.0.10-fix-build-intel-lib.patch +++ b/app-emulation/free42/files/free42-2.0.10-fix-build-intel-lib.patch @@ -1,6 +1,6 @@ diff -Nuar a/gtk/build-intel-lib.sh b/gtk/build-intel-lib.sh a/gtk/build-intel-lib.sh 2018-01-08 02:52:33.0 +0100 -+++ b/gtk/build-intel-lib.sh 2018-01-13 19:43:23.709997784 +0100 +--- a/gtk/build-intel-lib.sh b/gtk/build-intel-lib.sh @@ -4,7 +4,7 @@ cd IntelRDFPMathLib20U1 patch -p0 <../intel-lib-linux.patch diff --git a/app-emulation/free42/files/free42-2.0.10-fix-makefile.patch b/app-emulation/free42/files/free42-2.0.10-fix-makefile.patch index 7642316920f..c033bbc60ce 100644 --- a/app-emulation/free42/files/free42-2.0.10-fix-makefile.patch +++ b/app-emulation/free42/files/free42-2.0.10-fix-makefile.patch @@ -1,6 +1,6 @@ diff -Nuar a/gtk/Makefile b/gtk/Makefile a/gtk/Makefile 2018-01-08 02:52:33.0 +0100 -+++ b/gtk/Makefile 2018-01-13 19:40:49.059998446 +0100 +--- a/gtk/Makefile b/gtk/Makefile @@ -15,11 +15,11 @@ # along with this program; if not, see http://www.gnu.org/licenses/. ### diff --git a/app-emulation/free42/files/free42-2.0.17-fix-build-intel-lib.patch b/app-emulation/free42/files/free42-2.0.17-fix-build-intel-lib.patch deleted file mode 100644 index a321b1d714b..000 --- a/app-emulation/free42/files/free42-2.0.17-fix-build-intel-lib.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nuar a/gtk/build-intel-lib.sh b/gtk/build-intel-lib.sh a/gtk/build-intel-lib.sh 2018-01-08 02:52:33.0 +0100 -+++ b/gtk/build-intel-lib.sh 2018-01-13 19:43:23.709997784 +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.17-fix-makefile.patch b/app-emulation/free42/files/free42-2.0.17-fix-makefile.patch deleted file mode 100644 index 7642316920f..000 --- a/app-emulation/free42/files/free42-2.0.17-fix-makefile.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff -Nuar a/gtk/Makefile b/gtk/Makefile a/gtk/Makefile 2018-01-08 02:52:33.0 +0100 -+++ b/gtk/Makefile 2018-01-13 19:40:49.059998446 +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,-
[gentoo-commits] repo/gentoo:master commit in: app-emulation/free42/, app-emulation/free42/files/
commit: 4923fcd0a158aea5c306365348b014b1a5d94f64 Author: Chema Alonso Josa gentoo org> AuthorDate: Thu Mar 8 21:04:05 2018 + Commit: José María Alonso gentoo org> CommitDate: Thu Mar 8 21:04:05 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4923fcd0 app-emulation/free42: Drops old versions Package-Manager: Portage-2.3.19, Repoman-2.3.6 app-emulation/free42/Manifest | 2 - .../files/free42-2.0.15-fix-build-intel-lib.patch | 12 - .../free42/files/free42-2.0.15-fix-makefile.patch | 58 -- .../files/free42-2.0.6-fix-build-intel-lib.patch | 12 - .../free42/files/free42-2.0.6-fix-makefile.patch | 58 -- app-emulation/free42/free42-2.0.15.ebuild | 49 -- app-emulation/free42/free42-2.0.6.ebuild | 49 -- 7 files changed, 240 deletions(-) diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest index 833f56593ea..7ee23b5f829 100644 --- a/app-emulation/free42/Manifest +++ b/app-emulation/free42/Manifest @@ -1,4 +1,2 @@ DIST free42-nologo-2.0.10.tgz 7389429 BLAKE2B a633a78ed5974e327aafa9d783c04bdcaa895940580c595c9c67ab0181ec7000efaa92021a485199268341f15f4c4bafe3964d4118c068e8abbfa2f358045b5a SHA512 4f03b9b206ef17e71295f0baac96ca26f34a00844cee6cad254f8ab798d3d0c724788200f3f207a3301f62eb0960707a23e6bcbb2ac924a78b0f0e1c78e70e6d -DIST free42-nologo-2.0.15.tgz 7389800 BLAKE2B f78a925459f7eea3347d5394cdde47cd7318770895ea0c375b14c5855ff9d08db86c72324122c15792db8e457fa6bfb8039a911de240e23269bf87def58381cf SHA512 533528b651b408156fb069e4969f35a1d365be84a7fc63d0d40a35ace75592dd88cc20def3dff2de4b7a7e3eeaeab99bb89ad333135be90dab13b52ac6af804b DIST free42-nologo-2.0.17.tgz 7389996 BLAKE2B cc7c7bbe43eafc190fe0ce8921e032c2042290fe54a3153ba7568dae315de1356a9ee7f8ded4528788c677537138a5bd5556ad79dbd67ab8e41dd881a258312e SHA512 f73bfb2984fa4301c04d905fde6723583a57a1f663e012f965037067a7259961c0134fecb456118ec4b45956f7c8ccc16f0ec1db62e4cc705dc74ea563225872 -DIST free42-nologo-2.0.6.tgz 7348647 BLAKE2B 708c88b4903358c23989d515c61884ffc9feae3d43fc54f1ac8a18779cfe8aa2d0e1a2ec667e24f78da58cd94ad515399191b7dc968adbc59bb97517b34680be SHA512 078a79cc4dfa36ae7342be5b90350f4b7269f4e71777f2620c2043510d6313acbc1fa9415b75f8b01bebb2de747b9af8a26738f877c34a4d82a1fdd52c75a61d diff --git a/app-emulation/free42/files/free42-2.0.15-fix-build-intel-lib.patch b/app-emulation/free42/files/free42-2.0.15-fix-build-intel-lib.patch deleted file mode 100644 index a321b1d714b..000 --- a/app-emulation/free42/files/free42-2.0.15-fix-build-intel-lib.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nuar a/gtk/build-intel-lib.sh b/gtk/build-intel-lib.sh a/gtk/build-intel-lib.sh 2018-01-08 02:52:33.0 +0100 -+++ b/gtk/build-intel-lib.sh 2018-01-13 19:43:23.709997784 +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.15-fix-makefile.patch b/app-emulation/free42/files/free42-2.0.15-fix-makefile.patch deleted file mode 100644 index 7642316920f..000 --- a/app-emulation/free42/files/free42-2.0.15-fix-makefile.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff -Nuar a/gtk/Makefile b/gtk/Makefile a/gtk/Makefile 2018-01-08 02:52:33.0 +0100 -+++ b/gtk/Makefile 2018-01-13 19:40:49.059998446 +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
[gentoo-commits] repo/gentoo:master commit in: app-emulation/free42/, app-emulation/free42/files/
commit: fca4bf16855ed8c1c72079662e9546f356f3b1f4 Author: Chema Alonso Josa gentoo org> AuthorDate: Tue Jan 30 20:25:40 2018 + Commit: José María Alonso gentoo org> CommitDate: Tue Jan 30 20:25:40 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fca4bf16 app-emulation/free42: Drops old version 2.0.8 Package-Manager: Portage-2.3.19, Repoman-2.3.6 app-emulation/free42/Manifest | 1 - .../files/free42-2.0.8-fix-build-intel-lib.patch | 12 - .../free42/files/free42-2.0.8-fix-makefile.patch | 58 -- app-emulation/free42/free42-2.0.8.ebuild | 49 -- 4 files changed, 120 deletions(-) diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest index ac6866f07ec..5b013b2944a 100644 --- a/app-emulation/free42/Manifest +++ b/app-emulation/free42/Manifest @@ -1,3 +1,2 @@ DIST free42-nologo-2.0.10.tgz 7389429 BLAKE2B a633a78ed5974e327aafa9d783c04bdcaa895940580c595c9c67ab0181ec7000efaa92021a485199268341f15f4c4bafe3964d4118c068e8abbfa2f358045b5a SHA512 4f03b9b206ef17e71295f0baac96ca26f34a00844cee6cad254f8ab798d3d0c724788200f3f207a3301f62eb0960707a23e6bcbb2ac924a78b0f0e1c78e70e6d DIST free42-nologo-2.0.6.tgz 7348647 BLAKE2B 708c88b4903358c23989d515c61884ffc9feae3d43fc54f1ac8a18779cfe8aa2d0e1a2ec667e24f78da58cd94ad515399191b7dc968adbc59bb97517b34680be SHA512 078a79cc4dfa36ae7342be5b90350f4b7269f4e71777f2620c2043510d6313acbc1fa9415b75f8b01bebb2de747b9af8a26738f877c34a4d82a1fdd52c75a61d -DIST free42-nologo-2.0.8.tgz 7388038 BLAKE2B e2065ae71cf0be55d7de295965d7c884d2db6bd8aad6eefe85d04028dacf114c7d6cfc90f02b78a220f118ee26fd3b8fa830a802015da5c56f695621bf4ec5ff SHA512 3da4045ddf8a9993369a25344f5d4f472283a7affd4d5640a47dbce4debe4e071b83ad7858f79113d8be2255fc11df8b22edb4c66471945d341e8ffb79495fee diff --git a/app-emulation/free42/files/free42-2.0.8-fix-build-intel-lib.patch b/app-emulation/free42/files/free42-2.0.8-fix-build-intel-lib.patch deleted file mode 100644 index df2736f01e3..000 --- a/app-emulation/free42/files/free42-2.0.8-fix-build-intel-lib.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nuar a/gtk/build-intel-lib.sh b/gtk/build-intel-lib.sh a/gtk/build-intel-lib.sh 2017-12-26 19:48:08.0 +0100 -+++ b/gtk/build-intel-lib.sh 2017-12-26 21:09:52.949997834 +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.8-fix-makefile.patch b/app-emulation/free42/files/free42-2.0.8-fix-makefile.patch deleted file mode 100644 index 2cb44245c3b..000 --- a/app-emulation/free42/files/free42-2.0.8-fix-makefile.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff -Nuar a/gtk/Makefile b/gtk/Makefile a/gtk/Makefile 2017-12-26 19:48:08.0 +0100 -+++ b/gtk/Makefile 2017-12-26 21:07:20.279998488 +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) $(MYLDFL
[gentoo-commits] repo/gentoo:master commit in: app-emulation/free42/, app-emulation/free42/files/
commit: f89924d9a0b2006a310b182892b78eb310f9d253 Author: Chema Alonso Josa gentoo org> AuthorDate: Tue Dec 26 20:20:08 2017 + Commit: José María Alonso gentoo org> CommitDate: Tue Dec 26 20:20:31 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f89924d9 app-emulation/free42: Drops old version 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 deletions(-) diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest index 8a214a25ce3..4c76c28eb24 100644 --- a/app-emulation/free42/Manifest +++ b/app-emulation/free42/Manifest @@ -1,3 +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 DIST free42-nologo-2.0.8.tgz 7388038 BLAKE2B e2065ae71cf0be55d7de295965d7c884d2db6bd8aad6eefe85d04028dacf114c7d6cfc90f02b78a220f118ee26fd3b8fa830a802015da5c56f695621bf4ec5ff SHA512 3da4045ddf8a9993369a25344f5d4f472283a7affd4d5640a47dbce4debe4e071b83ad7858f79113d8be2255fc11df8b22edb4c66471945d341e8ffb79495fee 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 deleted file mode 100644 index 04fc844599e..000 --- a/app-emulation/free42/files/free42-2.0.7-fix-build-intel-lib.patch +++ /dev/null @@ -1,12 +0,0 @@ -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.0 +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 deleted file mode 100644 index ccf18766bae..000 --- a/app-emulation/free42/files/free42-2.0.7-fix-makefile.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff -Nuar a/gtk/Makefile b/gtk/Makefile a/gtk/Makefile 2017-11-29 06:03:45.0 +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) $(MYLDFLA
[gentoo-commits] repo/gentoo:master commit in: app-emulation/free42/, app-emulation/free42/files/
commit: 99d8f4f4b659fd077accc6127534e8eb0ba9044e Author: Chema Alonso Josa gentoo org> AuthorDate: Tue Dec 26 20:15:22 2017 + Commit: José María Alonso gentoo org> CommitDate: Tue Dec 26 20:15:48 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99d8f4f4 app-emulation/free42: Bumps version to 2.0.8 Package-Manager: Portage-2.3.13, Repoman-2.3.3 app-emulation/free42/Manifest | 1 + .../files/free42-2.0.8-fix-build-intel-lib.patch | 12 + .../free42/files/free42-2.0.8-fix-makefile.patch | 58 ++ app-emulation/free42/free42-2.0.8.ebuild | 49 ++ 4 files changed, 120 insertions(+) diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest index f31517cf680..8a214a25ce3 100644 --- a/app-emulation/free42/Manifest +++ b/app-emulation/free42/Manifest @@ -1,2 +1,3 @@ DIST free42-nologo-2.0.6.tgz 7348647 BLAKE2B 708c88b4903358c23989d515c61884ffc9feae3d43fc54f1ac8a18779cfe8aa2d0e1a2ec667e24f78da58cd94ad515399191b7dc968adbc59bb97517b34680be SHA512 078a79cc4dfa36ae7342be5b90350f4b7269f4e71777f2620c2043510d6313acbc1fa9415b75f8b01bebb2de747b9af8a26738f877c34a4d82a1fdd52c75a61d DIST free42-nologo-2.0.7.tgz 7354850 BLAKE2B 6be2f2ea912a1d47bdf8c9016e8a32e5203d982e34cbe5ef6624eac078297cd967cf08ae2bdeb7c6ad158f96e77032f449a47f01c3c8d8e312f6d46e20237cf0 SHA512 1adfccb37bdf35ecd57a6da1633ceb3bcfd0681efbc34fc9a4e4580ce235e35db9281de0d9ba659ecd33ef2b3a17eae596047b6790ffbf3e5e5ebfad600dcb8b +DIST free42-nologo-2.0.8.tgz 7388038 BLAKE2B e2065ae71cf0be55d7de295965d7c884d2db6bd8aad6eefe85d04028dacf114c7d6cfc90f02b78a220f118ee26fd3b8fa830a802015da5c56f695621bf4ec5ff SHA512 3da4045ddf8a9993369a25344f5d4f472283a7affd4d5640a47dbce4debe4e071b83ad7858f79113d8be2255fc11df8b22edb4c66471945d341e8ffb79495fee diff --git a/app-emulation/free42/files/free42-2.0.8-fix-build-intel-lib.patch b/app-emulation/free42/files/free42-2.0.8-fix-build-intel-lib.patch new file mode 100644 index 000..df2736f01e3 --- /dev/null +++ b/app-emulation/free42/files/free42-2.0.8-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-12-26 19:48:08.0 +0100 b/gtk/build-intel-lib.sh 2017-12-26 21:09:52.949997834 +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.8-fix-makefile.patch b/app-emulation/free42/files/free42-2.0.8-fix-makefile.patch new file mode 100644 index 000..2cb44245c3b --- /dev/null +++ b/app-emulation/free42/files/free42-2.0.8-fix-makefile.patch @@ -0,0 +1,58 @@ +diff -Nuar a/gtk/Makefile b/gtk/Makefile +--- a/gtk/Makefile 2017-12-26 19:48:08.0 +0100 b/gtk/Makefile 2017-12-26 21:07:20.279998488 +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) $(OB
[gentoo-commits] repo/gentoo:master commit in: app-emulation/free42/, app-emulation/free42/files/
commit: e5a1125db5fc54b0675459cd9e3101566214f225 Author: Chema Alonso Josa gentoo org> AuthorDate: Sun Nov 19 21:47:26 2017 + Commit: José María Alonso gentoo org> CommitDate: Sun Nov 19 21:47:26 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5a1125d app-emulation/free42: Drops old version 1.5.15 Package-Manager: Portage-2.3.8, Repoman-2.3.3 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 -- app-emulation/free42/metadata.xml | 30 +-- 5 files changed, 15 insertions(+), 133 deletions(-) diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest index 9d7011700d1..21cdbba3ae3 100644 --- a/app-emulation/free42/Manifest +++ b/app-emulation/free42/Manifest @@ -1,2 +1 @@ -DIST free42-1.5.15.tgz 22683600 SHA256 2dda0558141cd26d4b04aa96608c85eadb0770c4f2b660889d4b2a6f3a880c21 SHA512 fc09fcb0efaa6502776517b22cd0015ea7ac7d128b80bd740f64272b6c7aa41f5509dd7e0166dc18043790b4bef725a37a6a7210308a67aeaed02622f9e6daef WHIRLPOOL 5f6f5b33ccb2c320515fbc4e67ee52c6bc6c25fdbc8cf24c05772a90be87fed03f48dfa363b195071c4bc722428fb116d246e9df2eaddba20742648891ad7769 DIST free42-nologo-2.0.6.tgz 7348647 SHA256 862135da3066576d71dbfedc1e41e97230e656ef2f0db3a5b87ba96650c12b9a SHA512 078a79cc4dfa36ae7342be5b90350f4b7269f4e71777f2620c2043510d6313acbc1fa9415b75f8b01bebb2de747b9af8a26738f877c34a4d82a1fdd52c75a61d WHIRLPOOL 5740055edfbafc6f91ba9d3a8b1dc259511dc99b1e5d06a78cf03976b71928c5423d57cd023c9d878108394f3b0992a3bf532f06e69089b976a8ca789dcae9ed 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 deleted file mode 100644 index 6464714a001..000 --- a/app-emulation/free42/files/free42-1.5.15-fix-build-intel-lib.patch +++ /dev/null @@ -1,12 +0,0 @@ -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.0 +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 deleted file mode 100644 index d64efb21a6d..000 --- a/app-emulation/free42/files/free42-1.5.15-fix-makefile.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff -Nuar a/gtk/Makefile b/gtk/Makefile a/gtk/Makefile 2017-04-01 20:02:45.0 +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: symlink
[gentoo-commits] repo/gentoo:master commit in: app-emulation/free42/, app-emulation/free42/files/
commit: a8f71fb43837b1d25e6e3c42a29e1d970e46d380 Author: Chema Alonso Josa gentoo org> AuthorDate: Fri May 5 08:04:50 2017 + Commit: José María Alonso gentoo org> CommitDate: Fri May 5 08:04:50 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8f71fb4 app-emulation/free42: Drops old version Package-Manager: Portage-2.3.5, Repoman-2.3.1 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 | 58 -- app-emulation/free42/free42-1.5.13.ebuild | 47 -- 4 files changed, 118 deletions(-) diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest index 37b124916f1..5305755acf9 100644 --- a/app-emulation/free42/Manifest +++ b/app-emulation/free42/Manifest @@ -1,2 +1 @@ -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.13-fix-build-intel-lib.patch b/app-emulation/free42/files/free42-1.5.13-fix-build-intel-lib.patch deleted file mode 100644 index 23641b552f2..000 --- a/app-emulation/free42/files/free42-1.5.13-fix-build-intel-lib.patch +++ /dev/null @@ -1,12 +0,0 @@ -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.0 +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 deleted file mode 100644 index bc7cf3f1c8c..000 --- a/app-emulation/free42/files/free42-1.5.13-fix-makefile.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff -Nuar a/gtk/Makefile b/gtk/Makefile a/gtk/Makefile 2017-01-22 22:03:38.0 +0100 -+++ b/gtk/Makefile 2017-02-02 15:08:32.589997985 +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-1.5.13.ebuild b/app-emulation/free42/free42-1.5.13.
[gentoo-commits] repo/gentoo:master commit in: app-emulation/free42/, app-emulation/free42/files/
commit: bc79adca4e28808496352f811155de4112694c86 Author: Chema Alonso Josa gentoo org> AuthorDate: Tue Apr 4 12:51:08 2017 + Commit: José María Alonso gentoo org> CommitDate: Tue Apr 4 12:51:27 2017 + 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 000..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.0 +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 000..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.0 +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.e
[gentoo-commits] repo/gentoo:master commit in: app-emulation/free42/, app-emulation/free42/files/
commit: 183014e4cb4202d64e8ea58227be62571bc9fd87 Author: Chema Alonso Josa gentoo org> AuthorDate: Tue Jan 3 09:26:12 2017 + Commit: José María Alonso gentoo org> CommitDate: Tue Jan 3 09:26:12 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=183014e4 app-emulation/free42: Drops old version Package-Manager: portage-2.3.0 app-emulation/free42/Manifest | 1 - .../free42/files/free42-1.5.8-fix-makefile.patch | 29 -- app-emulation/free42/free42-1.5.8.ebuild | 46 -- 3 files changed, 76 deletions(-) diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest index 4625ec1..55cb679 100644 --- a/app-emulation/free42/Manifest +++ b/app-emulation/free42/Manifest @@ -1,4 +1,3 @@ DIST free42-1.5.10.tgz 22616956 SHA256 960d94cce3d67047d8968b4ee8b4d324bf1257002d67f971bd1f6e2552a870d1 SHA512 dfdcbdb051aa7cf7a60c27e44ae8dc5458dd418e08cd71e79eff443d09f8021efacc87e06531f312521e5b1f5af0aa72e77b0ce18b8d657499ad174b6a12578e WHIRLPOOL 8324418ab0047e05136937aa6741a4faa518f39eae203eec181958fdc6aa42f577c66716deb81b0dc6d833f79e4e49cfda37fc80e3917f0157583feac1b66985 DIST free42-1.5.12.tgz 22691715 SHA256 77f053fbfc597229f4e7d4e66d80aad0252e18bd8c3e05c757c02af5c4cdf268 SHA512 85e595f14e1ee5cf498dc9aa641edb841db450dbeca67b4a5c7853e7c2d655e3d40ca9332d0fed70c3a3e397553bc4655f87a27aefca4c0eb89d16a6fafae843 WHIRLPOOL 5c0d762660d239c6157a18bbd353734d4af9afb5d665cc75c200e92509457b898693540732be05afeb0514c5c2604207a97c0adbb22121789170de94f538de84 DIST free42-1.5.7.tgz 8159655 SHA256 63c868880e0c18374f4b309dc19e2ea36b9463471d2d77563f53036eea645316 SHA512 fb18712643f73388512fc4dc069d55ef3597f5e6a4e1b47bcd12ab05224027c4ec981ade2398fd8c1e4534003ee6c4de2b7402bade66a3dbe90a46299e7132a3 WHIRLPOOL 0504da8589d3dbf9270a914b2cb6ad86982b926f40abee43d6bbe3f8ec997efe8b0ae50b9d61952e5acd3f2a70d34e16cf0e665cec06d555b0c92438c7a32a43 -DIST free42-1.5.8.tgz 45400324 SHA256 f8ffa54a5f77b5061e1a983962e989fc6679f7e128d996a0550922e366855f2f SHA512 1abaeea314b55f456b65eef530fe692534d92dde95876982c6df1715853055632a4a2305774dc691ca0af28632a393d8d9872bd86353c09d57d2dc8a0ef6cfe2 WHIRLPOOL 9b0abef9d548f09e567e8debe15f9a0635038d6ef655a64885ebc02eb241a0f577ca40b4bdc39c881fe8b2c6f4d97e5575c715a05ccc06df37f90bc5d28d16e8 diff --git a/app-emulation/free42/files/free42-1.5.8-fix-makefile.patch b/app-emulation/free42/files/free42-1.5.8-fix-makefile.patch deleted file mode 100644 index 0874232.. --- a/app-emulation/free42/files/free42-1.5.8-fix-makefile.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -Nuar a/gtk/Makefile b/gtk/Makefile a/gtk/Makefile 2016-04-27 06:04:12.0 +0200 -+++ b/gtk/Makefile 2016-07-22 10:33:06.730040039 +0200 -@@ -19,7 +19,6 @@ - -Wall \ - -Wno-parentheses \ - -Wno-write-strings \ -- -g \ - -I/usr/X11R6/include \ - -fno-exceptions \ - -fno-rtti \ -@@ -30,13 +29,14 @@ - -DDECIMAL_GLOBAL_ROUNDING_ACCESS_FUNCTIONS=1 \ - -DDECIMAL_GLOBAL_EXCEPTION_FLAGS=1 \ - -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1 \ -- -D_WCHAR_T_DEFINED -+ -D_WCHAR_T_DEFINED \ -+ ${CXXFLAGS} - --LDFLAGS = -L/usr/X11R6/lib -+LDFLAGS := -L/usr/X11R6/lib ${LDFLAGS} - ifeq "$(shell uname -s)" "Darwin" - LIBS := gcc111libbid-mac-x64.a -lXmu $(shell pkg-config --libs gtk+-2.0) - else --LIBS := gcc111libbid-$(shell uname -m).a -lXmu $(shell pkg-config --libs gtk+-2.0) -+LIBS := gcc111libbid-$(shell uname -m).a -lXmu -lX11 -ldl -lpthread $(shell pkg-config --libs gtk+-2.0) - endif - - ifeq "$(shell uname -s)" "Linux" diff --git a/app-emulation/free42/free42-1.5.8.ebuild b/app-emulation/free42/free42-1.5.8.ebuild deleted file mode 100644 index 3f19945.. --- a/app-emulation/free42/free42-1.5.8.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -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() { - sed -i -e 's/print_gif_name\[FILENAMELEN\]/print_gif_name\[1000\]/' \ - "${S}/gtk/shell_main.cc" || die - epatch "${FILESDIR}"/${P}-fix-makefile.patch -} - -src_compile() { - local myconf - use alsa && myconf="AUDIO_ALSA=yes" - emake CXX="$(tc-getCXX)" BCD_MATH=1 ${myconf} -C "${S}/gtk" -} - -src_install() { - dodoc CREDITS HISTORY README TODO - dobin gtk/free42dec -}
[gentoo-commits] repo/gentoo:master commit in: app-emulation/free42/, app-emulation/free42/files/
commit: f4f82b34b1622ae8eb575ac97924fe773ce1a022 Author: Chema Alonso Josa gentoo org> AuthorDate: Thu Nov 24 11:13:42 2016 + Commit: José María Alonso gentoo org> CommitDate: Thu Nov 24 11:13:42 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4f82b34 app-emulation/free42: Bumps version to 1.5.12 Package-Manager: portage-2.3.0 app-emulation/free42/Manifest | 1 + .../files/free42-1.5.12-fix-build-intel-lib.patch | 12 ++ .../free42/files/free42-1.5.12-fix-makefile.patch | 38 + app-emulation/free42/free42-1.5.12.ebuild | 48 ++ 4 files changed, 99 insertions(+) diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest index 55490b1..4625ec1 100644 --- a/app-emulation/free42/Manifest +++ b/app-emulation/free42/Manifest @@ -1,3 +1,4 @@ DIST free42-1.5.10.tgz 22616956 SHA256 960d94cce3d67047d8968b4ee8b4d324bf1257002d67f971bd1f6e2552a870d1 SHA512 dfdcbdb051aa7cf7a60c27e44ae8dc5458dd418e08cd71e79eff443d09f8021efacc87e06531f312521e5b1f5af0aa72e77b0ce18b8d657499ad174b6a12578e WHIRLPOOL 8324418ab0047e05136937aa6741a4faa518f39eae203eec181958fdc6aa42f577c66716deb81b0dc6d833f79e4e49cfda37fc80e3917f0157583feac1b66985 +DIST free42-1.5.12.tgz 22691715 SHA256 77f053fbfc597229f4e7d4e66d80aad0252e18bd8c3e05c757c02af5c4cdf268 SHA512 85e595f14e1ee5cf498dc9aa641edb841db450dbeca67b4a5c7853e7c2d655e3d40ca9332d0fed70c3a3e397553bc4655f87a27aefca4c0eb89d16a6fafae843 WHIRLPOOL 5c0d762660d239c6157a18bbd353734d4af9afb5d665cc75c200e92509457b898693540732be05afeb0514c5c2604207a97c0adbb22121789170de94f538de84 DIST free42-1.5.7.tgz 8159655 SHA256 63c868880e0c18374f4b309dc19e2ea36b9463471d2d77563f53036eea645316 SHA512 fb18712643f73388512fc4dc069d55ef3597f5e6a4e1b47bcd12ab05224027c4ec981ade2398fd8c1e4534003ee6c4de2b7402bade66a3dbe90a46299e7132a3 WHIRLPOOL 0504da8589d3dbf9270a914b2cb6ad86982b926f40abee43d6bbe3f8ec997efe8b0ae50b9d61952e5acd3f2a70d34e16cf0e665cec06d555b0c92438c7a32a43 DIST free42-1.5.8.tgz 45400324 SHA256 f8ffa54a5f77b5061e1a983962e989fc6679f7e128d996a0550922e366855f2f SHA512 1abaeea314b55f456b65eef530fe692534d92dde95876982c6df1715853055632a4a2305774dc691ca0af28632a393d8d9872bd86353c09d57d2dc8a0ef6cfe2 WHIRLPOOL 9b0abef9d548f09e567e8debe15f9a0635038d6ef655a64885ebc02eb241a0f577ca40b4bdc39c881fe8b2c6f4d97e5575c715a05ccc06df37f90bc5d28d16e8 diff --git a/app-emulation/free42/files/free42-1.5.12-fix-build-intel-lib.patch b/app-emulation/free42/files/free42-1.5.12-fix-build-intel-lib.patch new file mode 100644 index ..23641b5 --- /dev/null +++ b/app-emulation/free42/files/free42-1.5.12-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.0 +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.12-fix-makefile.patch b/app-emulation/free42/files/free42-1.5.12-fix-makefile.patch new file mode 100644 index ..3fe1baf --- /dev/null +++ b/app-emulation/free42/files/free42-1.5.12-fix-makefile.patch @@ -0,0 +1,38 @@ +diff -Nuar a/gtk/Makefile b/gtk/Makefile +--- a/gtk/Makefile 2016-09-04 18:56:12.0 +0200 b/gtk/Makefile 2016-09-24 16:13:34.824116365 +0200 +@@ -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,14 +26,16 @@ +-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 ++LDFLAGS := -L/usr/X11R6/lib ${LDFLAGS} +-LIBS = gcc111libbid.a -lXmu $(shell pkg-config --libs gtk+-2.0) ++LIBS = gcc111libbid.a -lX11 -ldl -lXmu $(shell pkg-config --libs
[gentoo-commits] repo/gentoo:master commit in: app-emulation/free42/, app-emulation/free42/files/
commit: ae20937aa36bfc25fdc96639bd45859a0778e8a0 Author: Chema Alonso Josa gentoo org> AuthorDate: Sat Sep 24 19:10:04 2016 + Commit: José María Alonso gentoo org> CommitDate: Sat Sep 24 19:10:26 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae20937a app-emulation/free42: Bump to version 1.5.10 Package-Manager: portage-2.2.28 app-emulation/free42/Manifest | 1 + .../files/free42-1.5.10-fix-build-intel-lib.patch | 12 ++ .../free42/files/free42-1.5.10-fix-makefile.patch | 38 + app-emulation/free42/free42-1.5.10.ebuild | 47 ++ 4 files changed, 98 insertions(+) diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest index 9a2b8a6..55490b1 100644 --- a/app-emulation/free42/Manifest +++ b/app-emulation/free42/Manifest @@ -1,2 +1,3 @@ +DIST free42-1.5.10.tgz 22616956 SHA256 960d94cce3d67047d8968b4ee8b4d324bf1257002d67f971bd1f6e2552a870d1 SHA512 dfdcbdb051aa7cf7a60c27e44ae8dc5458dd418e08cd71e79eff443d09f8021efacc87e06531f312521e5b1f5af0aa72e77b0ce18b8d657499ad174b6a12578e WHIRLPOOL 8324418ab0047e05136937aa6741a4faa518f39eae203eec181958fdc6aa42f577c66716deb81b0dc6d833f79e4e49cfda37fc80e3917f0157583feac1b66985 DIST free42-1.5.7.tgz 8159655 SHA256 63c868880e0c18374f4b309dc19e2ea36b9463471d2d77563f53036eea645316 SHA512 fb18712643f73388512fc4dc069d55ef3597f5e6a4e1b47bcd12ab05224027c4ec981ade2398fd8c1e4534003ee6c4de2b7402bade66a3dbe90a46299e7132a3 WHIRLPOOL 0504da8589d3dbf9270a914b2cb6ad86982b926f40abee43d6bbe3f8ec997efe8b0ae50b9d61952e5acd3f2a70d34e16cf0e665cec06d555b0c92438c7a32a43 DIST free42-1.5.8.tgz 45400324 SHA256 f8ffa54a5f77b5061e1a983962e989fc6679f7e128d996a0550922e366855f2f SHA512 1abaeea314b55f456b65eef530fe692534d92dde95876982c6df1715853055632a4a2305774dc691ca0af28632a393d8d9872bd86353c09d57d2dc8a0ef6cfe2 WHIRLPOOL 9b0abef9d548f09e567e8debe15f9a0635038d6ef655a64885ebc02eb241a0f577ca40b4bdc39c881fe8b2c6f4d97e5575c715a05ccc06df37f90bc5d28d16e8 diff --git a/app-emulation/free42/files/free42-1.5.10-fix-build-intel-lib.patch b/app-emulation/free42/files/free42-1.5.10-fix-build-intel-lib.patch new file mode 100644 index ..23641b5 --- /dev/null +++ b/app-emulation/free42/files/free42-1.5.10-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.0 +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.10-fix-makefile.patch b/app-emulation/free42/files/free42-1.5.10-fix-makefile.patch new file mode 100644 index ..3fe1baf --- /dev/null +++ b/app-emulation/free42/files/free42-1.5.10-fix-makefile.patch @@ -0,0 +1,38 @@ +diff -Nuar a/gtk/Makefile b/gtk/Makefile +--- a/gtk/Makefile 2016-09-04 18:56:12.0 +0200 b/gtk/Makefile 2016-09-24 16:13:34.824116365 +0200 +@@ -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,14 +26,16 @@ +-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 ++LDFLAGS := -L/usr/X11R6/lib ${LDFLAGS} +-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" diff --git a/app-emulation/free42/free42-1.5.10.ebuild b/app-emulation/free42/free42-1.5.10.ebuild new file mode 100644 index ..d1950de --- /dev/null +++ b/app-emulation/free42/free42-1.5.10.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +#
[gentoo-commits] repo/gentoo:master commit in: app-emulation/free42/, app-emulation/free42/files/
commit: b88f37e89a1417d30dc3feaec6e3e2179c22acf0 Author: Chema Alonso Josa gentoo org> AuthorDate: Fri Jul 22 08:48:53 2016 + Commit: José María Alonso gentoo org> CommitDate: Fri Jul 22 08:48:53 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b88f37e8 app-emulation/free42: Drop old Package-Manager: portage-2.2.28 app-emulation/free42/Manifest | 1 - .../free42/files/free42-1.5.5-fix-makefile.patch | 30 -- app-emulation/free42/free42-1.5.5.ebuild | 46 -- 3 files changed, 77 deletions(-) diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest index 99606ea..9a2b8a6 100644 --- a/app-emulation/free42/Manifest +++ b/app-emulation/free42/Manifest @@ -1,3 +1,2 @@ -DIST free42-1.5.5.tgz 8160228 SHA256 2c5a16aa470de76185135c307add9b920a712e31269c471dd246b6cf9283e050 SHA512 97833c99a24c2b1f427b237469868d57734b919b6c69521b45de480bd5274f5427caac13b9ccf3b79674d63dabdeda58a8db4c23a184b72b04279acbdf7eff8f WHIRLPOOL d435befbf2d39d1ef7907c7913e474da5c4997dfb84177be3ea0b3fc1d9c9b0ea41590810e78d38eb082216b28c907fe39613823d866b6a1ab4d531a6af2 DIST free42-1.5.7.tgz 8159655 SHA256 63c868880e0c18374f4b309dc19e2ea36b9463471d2d77563f53036eea645316 SHA512 fb18712643f73388512fc4dc069d55ef3597f5e6a4e1b47bcd12ab05224027c4ec981ade2398fd8c1e4534003ee6c4de2b7402bade66a3dbe90a46299e7132a3 WHIRLPOOL 0504da8589d3dbf9270a914b2cb6ad86982b926f40abee43d6bbe3f8ec997efe8b0ae50b9d61952e5acd3f2a70d34e16cf0e665cec06d555b0c92438c7a32a43 DIST free42-1.5.8.tgz 45400324 SHA256 f8ffa54a5f77b5061e1a983962e989fc6679f7e128d996a0550922e366855f2f SHA512 1abaeea314b55f456b65eef530fe692534d92dde95876982c6df1715853055632a4a2305774dc691ca0af28632a393d8d9872bd86353c09d57d2dc8a0ef6cfe2 WHIRLPOOL 9b0abef9d548f09e567e8debe15f9a0635038d6ef655a64885ebc02eb241a0f577ca40b4bdc39c881fe8b2c6f4d97e5575c715a05ccc06df37f90bc5d28d16e8 diff --git a/app-emulation/free42/files/free42-1.5.5-fix-makefile.patch b/app-emulation/free42/files/free42-1.5.5-fix-makefile.patch deleted file mode 100644 index 8f73b44..000 --- a/app-emulation/free42/files/free42-1.5.5-fix-makefile.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -Nuar a/gtk/Makefile b/gtk/Makefile a/gtk/Makefile 2014-06-21 19:46:55.0 +0200 -+++ b/gtk/Makefile 2014-06-24 00:03:38.719906032 +0200 -@@ -19,7 +19,6 @@ - -Wall \ - -Wno-parentheses \ - -Wno-write-strings \ -- -g \ - -I/usr/X11R6/include \ - -fno-exceptions \ - -fno-rtti \ -@@ -30,14 +29,11 @@ - -DDECIMAL_GLOBAL_ROUNDING_ACCESS_FUNCTIONS=1 \ - -DDECIMAL_GLOBAL_EXCEPTION_FLAGS=1 \ - -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1 \ -- -D_WCHAR_T_DEFINED -+ -D_WCHAR_T_DEFINED \ -+ ${CXXFLAGS} - --LDFLAGS = -L/usr/X11R6/lib --LIBS := gcc111libbid-$(shell uname -m).a -lXmu $(shell pkg-config --libs gtk+-2.0) -- --ifeq "$(shell uname -s)" "Linux" --LDFLAGS += -Wl,--hash-style=both --endif -+LDFLAGS := -L/usr/X11R6/lib ${LDFLAGS} -+LIBS := gcc111libbid-$(shell uname -m).a -lXmu -lX11 -ldl -lpthread $(shell pkg-config --libs gtk+-2.0) - - 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 \ diff --git a/app-emulation/free42/free42-1.5.5.ebuild b/app-emulation/free42/free42-1.5.5.ebuild deleted file mode 100644 index 608ed31..000 --- a/app-emulation/free42/free42-1.5.5.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -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}-nologo-${PV}" - -src_prepare() { - sed -i -e 's/print_gif_name\[FILENAMELEN\]/print_gif_name\[1000\]/' \ - "${S}/gtk/shell_main.cc" || die - epatch "${FILESDIR}"/${P}-fix-makefile.patch -} - -src_compile() { - local myconf - use alsa && myconf="AUDIO_ALSA=yes" - emake CXX="$(tc-getCXX)" BCD_MATH=1 ${myconf} -C "${S}/gtk" -} - -src_install() { - dodoc CREDITS HISTORY README TODO - dobin gtk/free42dec -}
[gentoo-commits] repo/gentoo:master commit in: app-emulation/free42/, app-emulation/free42/files/
commit: b34ead896b11b268b16d9fae8144596a7cda41c1 Author: Chema Alonso Josa gentoo org> AuthorDate: Fri Jul 22 08:37:35 2016 + Commit: José María Alonso gentoo org> CommitDate: Fri Jul 22 08:37:35 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b34ead89 app-emulation/free42: Bump to version 1.5.8 Package-Manager: portage-2.2.28 app-emulation/free42/Manifest | 1 + .../free42/files/free42-1.5.8-fix-makefile.patch | 29 ++ app-emulation/free42/free42-1.5.8.ebuild | 46 ++ 3 files changed, 76 insertions(+) diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest index a164de1..99606ea 100644 --- a/app-emulation/free42/Manifest +++ b/app-emulation/free42/Manifest @@ -1,2 +1,3 @@ DIST free42-1.5.5.tgz 8160228 SHA256 2c5a16aa470de76185135c307add9b920a712e31269c471dd246b6cf9283e050 SHA512 97833c99a24c2b1f427b237469868d57734b919b6c69521b45de480bd5274f5427caac13b9ccf3b79674d63dabdeda58a8db4c23a184b72b04279acbdf7eff8f WHIRLPOOL d435befbf2d39d1ef7907c7913e474da5c4997dfb84177be3ea0b3fc1d9c9b0ea41590810e78d38eb082216b28c907fe39613823d866b6a1ab4d531a6af2 DIST free42-1.5.7.tgz 8159655 SHA256 63c868880e0c18374f4b309dc19e2ea36b9463471d2d77563f53036eea645316 SHA512 fb18712643f73388512fc4dc069d55ef3597f5e6a4e1b47bcd12ab05224027c4ec981ade2398fd8c1e4534003ee6c4de2b7402bade66a3dbe90a46299e7132a3 WHIRLPOOL 0504da8589d3dbf9270a914b2cb6ad86982b926f40abee43d6bbe3f8ec997efe8b0ae50b9d61952e5acd3f2a70d34e16cf0e665cec06d555b0c92438c7a32a43 +DIST free42-1.5.8.tgz 45400324 SHA256 f8ffa54a5f77b5061e1a983962e989fc6679f7e128d996a0550922e366855f2f SHA512 1abaeea314b55f456b65eef530fe692534d92dde95876982c6df1715853055632a4a2305774dc691ca0af28632a393d8d9872bd86353c09d57d2dc8a0ef6cfe2 WHIRLPOOL 9b0abef9d548f09e567e8debe15f9a0635038d6ef655a64885ebc02eb241a0f577ca40b4bdc39c881fe8b2c6f4d97e5575c715a05ccc06df37f90bc5d28d16e8 diff --git a/app-emulation/free42/files/free42-1.5.8-fix-makefile.patch b/app-emulation/free42/files/free42-1.5.8-fix-makefile.patch new file mode 100644 index 000..0874232 --- /dev/null +++ b/app-emulation/free42/files/free42-1.5.8-fix-makefile.patch @@ -0,0 +1,29 @@ +diff -Nuar a/gtk/Makefile b/gtk/Makefile +--- a/gtk/Makefile 2016-04-27 06:04:12.0 +0200 b/gtk/Makefile 2016-07-22 10:33:06.730040039 +0200 +@@ -19,7 +19,6 @@ + -Wall \ + -Wno-parentheses \ + -Wno-write-strings \ +- -g \ + -I/usr/X11R6/include \ + -fno-exceptions \ + -fno-rtti \ +@@ -30,13 +29,14 @@ + -DDECIMAL_GLOBAL_ROUNDING_ACCESS_FUNCTIONS=1 \ + -DDECIMAL_GLOBAL_EXCEPTION_FLAGS=1 \ + -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1 \ +- -D_WCHAR_T_DEFINED ++ -D_WCHAR_T_DEFINED \ ++ ${CXXFLAGS} + +-LDFLAGS = -L/usr/X11R6/lib ++LDFLAGS := -L/usr/X11R6/lib ${LDFLAGS} + ifeq "$(shell uname -s)" "Darwin" + LIBS := gcc111libbid-mac-x64.a -lXmu $(shell pkg-config --libs gtk+-2.0) + else +-LIBS := gcc111libbid-$(shell uname -m).a -lXmu $(shell pkg-config --libs gtk+-2.0) ++LIBS := gcc111libbid-$(shell uname -m).a -lXmu -lX11 -ldl -lpthread $(shell pkg-config --libs gtk+-2.0) + endif + + ifeq "$(shell uname -s)" "Linux" diff --git a/app-emulation/free42/free42-1.5.8.ebuild b/app-emulation/free42/free42-1.5.8.ebuild new file mode 100644 index 000..90f4f0e --- /dev/null +++ b/app-emulation/free42/free42-1.5.8.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +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() { + sed -i -e 's/print_gif_name\[FILENAMELEN\]/print_gif_name\[1000\]/' \ + "${S}/gtk/shell_main.cc" || die + epatch "${FILESDIR}"/${P}-fix-makefile.patch +} + +src_compile() { + local myconf + use alsa && myconf="AUDIO_ALSA=yes" + emake CXX="$(tc-getCXX)" BCD_MATH=1 ${myconf} -C "${S}/gtk" +} + +src_install() { + dodoc CREDITS HISTORY README TODO + dobin gtk/free42dec +}
[gentoo-commits] repo/gentoo:master commit in: app-emulation/free42/, app-emulation/free42/files/
commit: d56d23414fe0afeb55727b3aeb073b6ec8ad1448 Author: José María Alonso Josa gentoo org> AuthorDate: Thu Mar 17 11:46:07 2016 + Commit: José María Alonso gentoo org> CommitDate: Thu Mar 17 11:46:49 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d56d2341 app-emulation/free42: Bump to version 1.5.7 Package-Manager: portage-2.2.26 app-emulation/free42/Manifest | 1 + .../free42/files/free42-1.5.7-fix-makefile.patch | 34 app-emulation/free42/free42-1.5.7.ebuild | 46 ++ 3 files changed, 81 insertions(+) diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest index bf0e040..a164de1 100644 --- a/app-emulation/free42/Manifest +++ b/app-emulation/free42/Manifest @@ -1 +1,2 @@ DIST free42-1.5.5.tgz 8160228 SHA256 2c5a16aa470de76185135c307add9b920a712e31269c471dd246b6cf9283e050 SHA512 97833c99a24c2b1f427b237469868d57734b919b6c69521b45de480bd5274f5427caac13b9ccf3b79674d63dabdeda58a8db4c23a184b72b04279acbdf7eff8f WHIRLPOOL d435befbf2d39d1ef7907c7913e474da5c4997dfb84177be3ea0b3fc1d9c9b0ea41590810e78d38eb082216b28c907fe39613823d866b6a1ab4d531a6af2 +DIST free42-1.5.7.tgz 8159655 SHA256 63c868880e0c18374f4b309dc19e2ea36b9463471d2d77563f53036eea645316 SHA512 fb18712643f73388512fc4dc069d55ef3597f5e6a4e1b47bcd12ab05224027c4ec981ade2398fd8c1e4534003ee6c4de2b7402bade66a3dbe90a46299e7132a3 WHIRLPOOL 0504da8589d3dbf9270a914b2cb6ad86982b926f40abee43d6bbe3f8ec997efe8b0ae50b9d61952e5acd3f2a70d34e16cf0e665cec06d555b0c92438c7a32a43 diff --git a/app-emulation/free42/files/free42-1.5.7-fix-makefile.patch b/app-emulation/free42/files/free42-1.5.7-fix-makefile.patch new file mode 100644 index 000..ebb99c9 --- /dev/null +++ b/app-emulation/free42/files/free42-1.5.7-fix-makefile.patch @@ -0,0 +1,34 @@ +diff -Nuar a/gtk/Makefile b/gtk/Makefile +--- a/gtk/Makefile 2016-02-28 20:14:13.0 +0100 b/gtk/Makefile 2016-03-17 12:39:42.67704 +0100 +@@ -19,7 +19,6 @@ + -Wall \ + -Wno-parentheses \ + -Wno-write-strings \ +- -g \ + -I/usr/X11R6/include \ + -fno-exceptions \ + -fno-rtti \ +@@ -30,18 +29,14 @@ + -DDECIMAL_GLOBAL_ROUNDING_ACCESS_FUNCTIONS=1 \ + -DDECIMAL_GLOBAL_EXCEPTION_FLAGS=1 \ + -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1 \ +- -D_WCHAR_T_DEFINED ++ -D_WCHAR_T_DEFINED \ ++ ${CXXFLAGS} + +-LDFLAGS = -L/usr/X11R6/lib ++LDFLAGS := -L/usr/X11R6/lib ${LDFLAGS} + ifeq "$(shell uname -s)" "Darwin" + LIBS := gcc111libbid-mac-x64.a -lXmu $(shell pkg-config --libs gtk+-2.0) + else +-LIBS := gcc111libbid-$(shell uname -m).a -lXmu $(shell pkg-config --libs gtk+-2.0) +-endif +- +-ifeq "$(shell uname -s)" "Linux" +-LDFLAGS += -Wl,--hash-style=both +-LIBS += -lpthread ++LIBS := gcc111libbid-$(shell uname -m).a -lXmu -lX11 -ldl -lpthread $(shell pkg-config --libs gtk+-2.0) + endif + + SRCS = shell_main.cc shell_skin.cc skins.cc keymap.cc shell_loadimage.cc \ diff --git a/app-emulation/free42/free42-1.5.7.ebuild b/app-emulation/free42/free42-1.5.7.ebuild new file mode 100644 index 000..30caa5d --- /dev/null +++ b/app-emulation/free42/free42-1.5.7.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +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}-nologo-${PV}" + +src_prepare() { + sed -i -e 's/print_gif_name\[FILENAMELEN\]/print_gif_name\[1000\]/' \ + "${S}/gtk/shell_main.cc" || die + epatch "${FILESDIR}"/${P}-fix-makefile.patch +} + +src_compile() { + local myconf + use alsa && myconf="AUDIO_ALSA=yes" + emake CXX="$(tc-getCXX)" BCD_MATH=1 ${myconf} -C "${S}/gtk" +} + +src_install() { + dodoc CREDITS HISTORY README TODO + dobin gtk/free42dec +}