Gentoo Archives: gentoo-commits

From: "José María Alonso" <nimiux@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/free42/files/
Date: Thu, 02 Feb 2017 14:18:07
Message-Id: 1486045064.b2a49de72b3773221adb89fce881dc25a22495a9.nimiux@gentoo
1 commit: b2a49de72b3773221adb89fce881dc25a22495a9
2 Author: Chema Alonso Josa <nimiux <AT> gentoo <DOT> org>
3 AuthorDate: Thu Feb 2 14:17:07 2017 +0000
4 Commit: José María Alonso <nimiux <AT> gentoo <DOT> org>
5 CommitDate: Thu Feb 2 14:17:44 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2a49de7
7
8 app-emulation/free42: Removes compiler warning.
9
10 Fixes bug #595076
11
12 Package-Manager: portage-2.3.3
13
14 app-emulation/free42/files/free42-1.5.13-fix-makefile.patch | 13 +++++++------
15 1 file changed, 7 insertions(+), 6 deletions(-)
16
17 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
18 index 29c3bb5..bc7cf3f 100644
19 --- a/app-emulation/free42/files/free42-1.5.13-fix-makefile.patch
20 +++ b/app-emulation/free42/files/free42-1.5.13-fix-makefile.patch
21 @@ -1,7 +1,7 @@
22 diff -Nuar a/gtk/Makefile b/gtk/Makefile
23 ---- a/gtk/Makefile 2016-10-04 03:45:02.000000000 +0200
24 -+++ b/gtk/Makefile 2016-11-26 22:06:25.599990576 +0100
25 -@@ -15,11 +15,10 @@
26 +--- a/gtk/Makefile 2017-01-22 22:03:38.000000000 +0100
27 ++++ b/gtk/Makefile 2017-02-02 15:08:32.589997985 +0100
28 +@@ -15,11 +15,11 @@
29 # along with this program; if not, see http://www.gnu.org/licenses/.
30 ###############################################################################
31
32 @@ -11,10 +11,11 @@ diff -Nuar a/gtk/Makefile b/gtk/Makefile
33 -Wno-parentheses \
34 -Wno-write-strings \
35 - -g \
36 ++ -Wno-error=narrowing \
37 -I/usr/X11R6/include \
38 $(shell pkg-config --cflags gtk+-2.0) \
39 -DVERSION="\"$(shell cat ../VERSION)\"" \
40 -@@ -27,21 +26,25 @@
41 +@@ -27,21 +27,25 @@
42 -DDECIMAL_GLOBAL_ROUNDING=1 \
43 -DDECIMAL_GLOBAL_ROUNDING_ACCESS_FUNCTIONS=1 \
44 -DDECIMAL_GLOBAL_EXCEPTION_FLAGS=1 \
45 @@ -31,8 +32,8 @@ diff -Nuar a/gtk/Makefile b/gtk/Makefile
46 + ${CXXFLAGS}
47
48 -LDFLAGS = -L/usr/X11R6/lib
49 -+MYLDFLAGS = -L/usr/X11R6/lib
50 -LIBS = gcc111libbid.a -lXmu $(shell pkg-config --libs gtk+-2.0)
51 ++MYLDFLAGS = -L/usr/X11R6/lib
52 +LIBS = gcc111libbid.a -lX11 -ldl -lXmu $(shell pkg-config --libs gtk+-2.0)
53
54 ifeq "$(shell uname -s)" "Linux"
55 @@ -46,7 +47,7 @@ diff -Nuar a/gtk/Makefile b/gtk/Makefile
56 SRCS = shell_main.cc shell_skin.cc skins.cc keymap.cc shell_loadimage.cc \
57 shell_spool.cc core_main.cc core_commands1.cc core_commands2.cc \
58 core_commands3.cc core_commands4.cc core_commands5.cc \
59 -@@ -83,7 +86,7 @@
60 +@@ -83,7 +87,7 @@
61 endif
62
63 $(EXE): $(OBJS)