Gentoo Archives: gentoo-commits

From: "JosA MarAa Alonso (nimiux)" <nimiux@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-emulation/free42/files: free42-1.4.77-fix-makefile.patch
Date: Mon, 23 Jun 2014 21:47:43
Message-Id: 20140623214740.A0E5E2004F@flycatcher.gentoo.org
1 nimiux 14/06/23 21:47:40
2
3 Modified: free42-1.4.77-fix-makefile.patch
4 Log:
5 Fix bug #514502
6
7 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key D628E536)
8
9 Revision Changes Path
10 1.2 app-emulation/free42/files/free42-1.4.77-fix-makefile.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/free42/files/free42-1.4.77-fix-makefile.patch?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/free42/files/free42-1.4.77-fix-makefile.patch?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/free42/files/free42-1.4.77-fix-makefile.patch?r1=1.1&r2=1.2
15
16 Index: free42-1.4.77-fix-makefile.patch
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/app-emulation/free42/files/free42-1.4.77-fix-makefile.patch,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- free42-1.4.77-fix-makefile.patch 21 Jan 2013 19:10:55 -0000 1.1
23 +++ free42-1.4.77-fix-makefile.patch 23 Jun 2014 21:47:40 -0000 1.2
24 @@ -1,20 +1,20 @@
25 -diff -Nur a/gtk/Makefile b/gtk/Makefile
26 +diff -Nuar a/gtk/Makefile b/gtk/Makefile
27 --- a/gtk/Makefile 2013-01-06 07:27:27.000000000 +0100
28 -+++ b/gtk/Makefile 2013-01-21 19:37:26.051512802 +0100
29 -@@ -15,14 +15,10 @@
30 ++++ b/gtk/Makefile 2014-06-23 23:41:29.669913497 +0200
31 +@@ -15,13 +15,9 @@
32 # along with this program; if not, see http://www.gnu.org/licenses/.
33 ###############################################################################
34
35 -CXXFLAGS := -MMD -Wall -Wno-parentheses -Wno-write-strings -g -I/usr/X11R6/include -fno-exceptions -fno-rtti $(shell pkg-config --cflags gtk+-2.0) -DVERSION="\"$(shell cat ../VERSION)\""
36 -LDFLAGS = -L/usr/X11R6/lib
37 -+CXXFLAGS := -MMD -Wall -Wno-parentheses -Wno-write-strings -I/usr/X11R6/include -fno-exceptions -fno-rtti $(shell pkg-config --cflags gtk+-2.0) -DVERSION="\"$(shell cat ../VERSION)\"" ${CXXFLAGS}
38 -+LDFLAGS := -L/usr/X11R6/lib ${LDFLAGS}
39 - LIBS := -lXmu $(shell pkg-config --libs gtk+-2.0)
40 -
41 +-LIBS := -lXmu $(shell pkg-config --libs gtk+-2.0)
42 +-
43 -ifeq "$(shell uname -s)" "Linux"
44 -LDFLAGS += -Wl,--hash-style=both
45 -endif
46 --
47 ++CXXFLAGS := -MMD -Wall -Wno-parentheses -Wno-write-strings -I/usr/X11R6/include -fno-exceptions -fno-rtti $(shell pkg-config --cflags gtk+-2.0) -DVERSION="\"$(shell cat ../VERSION)\"" ${CXXFLAGS}
48 ++LDFLAGS := -L/usr/X11R6/lib ${LDFLAGS}
49 ++LIBS := -lXmu -lX11 -ldl -lpthread $(shell pkg-config --libs gtk+-2.0)
50 +
51 SRCS = shell_main.cc shell_skin.cc skins.cc keymap.cc shell_loadimage.cc \
52 shell_spool.cc core_main.cc core_commands1.cc core_commands2.cc \
53 - core_commands3.cc core_commands4.cc core_commands5.cc \