nimiux 14/06/23 21:47:40 Modified: free42-1.4.77-fix-makefile.patch Log: Fix bug #514502 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key D628E536)
Revision Changes Path 1.2 app-emulation/free42/files/free42-1.4.77-fix-makefile.patch 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 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 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 Index: free42-1.4.77-fix-makefile.patch =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/free42/files/free42-1.4.77-fix-makefile.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- free42-1.4.77-fix-makefile.patch 21 Jan 2013 19:10:55 -0000 1.1 +++ free42-1.4.77-fix-makefile.patch 23 Jun 2014 21:47:40 -0000 1.2 @@ -1,20 +1,20 @@ -diff -Nur a/gtk/Makefile b/gtk/Makefile +diff -Nuar a/gtk/Makefile b/gtk/Makefile --- a/gtk/Makefile 2013-01-06 07:27:27.000000000 +0100 -+++ b/gtk/Makefile 2013-01-21 19:37:26.051512802 +0100 -@@ -15,14 +15,10 @@ ++++ b/gtk/Makefile 2014-06-23 23:41:29.669913497 +0200 +@@ -15,13 +15,9 @@ # along with this program; if not, see http://www.gnu.org/licenses/. ############################################################################### -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)\"" -LDFLAGS = -L/usr/X11R6/lib -+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} -+LDFLAGS := -L/usr/X11R6/lib ${LDFLAGS} - LIBS := -lXmu $(shell pkg-config --libs gtk+-2.0) - +-LIBS := -lXmu $(shell pkg-config --libs gtk+-2.0) +- -ifeq "$(shell uname -s)" "Linux" -LDFLAGS += -Wl,--hash-style=both -endif -- ++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} ++LDFLAGS := -L/usr/X11R6/lib ${LDFLAGS} ++LIBS := -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 \ - core_commands3.cc core_commands4.cc core_commands5.cc \
