diff options
| author |   Chema Alonso Josa <nimiux@gentoo.org> | 2018-02-20 15:50:28 +0100 |
|---|---|---|
| committer | Chema Alonso Josa <nimiux@gentoo.org> | 2018-02-20 15:50:28 +0100 |
| commit | 9fab9dd9d8ecba61635dab7a4f989fded8fadcd1 (patch) | |
| tree | f35339d6bce3f64e938d27ccd6b9a822f359adad /app-emulation/free42/files | |
| parent | media-libs/tiff: Fix CVE-2018-5784 (diff) | |
| download | gentoo-9fab9dd9d8ecba61635dab7a4f989fded8fadcd1.tar.gz gentoo-9fab9dd9d8ecba61635dab7a4f989fded8fadcd1.tar.bz2 gentoo-9fab9dd9d8ecba61635dab7a4f989fded8fadcd1.zip | |
app-emulation/free42: Bumps version to 2.0.15
Package-Manager: Portage-2.3.19, Repoman-2.3.6
Diffstat (limited to 'app-emulation/free42/files')
| -rw-r--r-- | app-emulation/free42/files/free42-2.0.15-fix-build-intel-lib.patch | 12 | ||||
| -rw-r--r-- | app-emulation/free42/files/free42-2.0.15-fix-makefile.patch | 58 |
2 files changed, 70 insertions, 0 deletions
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 new file mode 100644 index 000000000000..a321b1d714b8 --- /dev/null +++ b/app-emulation/free42/files/free42-2.0.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 2018-01-08 02:52:33.000000000 +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 new file mode 100644 index 000000000000..7642316920f4 --- /dev/null +++ b/app-emulation/free42/files/free42-2.0.15-fix-makefile.patch @@ -0,0 +1,58 @@ +diff -Nuar a/gtk/Makefile b/gtk/Makefile +--- a/gtk/Makefile 2018-01-08 02:52:33.000000000 +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,--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 + |