diff options
Diffstat (limited to 'x11/qt4-libs/patches/patch-af')
| -rw-r--r-- | x11/qt4-libs/patches/patch-af | 42 |
1 files changed, 26 insertions, 16 deletions
diff --git a/x11/qt4-libs/patches/patch-af b/x11/qt4-libs/patches/patch-af index a3f0df745e2..0348c3bb949 100644 --- a/x11/qt4-libs/patches/patch-af +++ b/x11/qt4-libs/patches/patch-af @@ -1,21 +1,31 @@ -$NetBSD: patch-af,v 1.1.1.1 2006/02/20 12:08:15 adam Exp $ +$NetBSD: patch-af,v 1.2 2007/03/18 17:34:41 adam Exp $ ---- qmake/Makefile.unix.orig 2005-12-16 12:51:54.000000000 +0100 +--- qmake/Makefile.unix.orig 2006-11-27 17:26:04.000000000 +0000 +++ qmake/Makefile.unix -@@ -37,14 +37,14 @@ DEPEND_SRC=project.cpp property.cpp meta - @SOURCE_PATH@/src/corelib/io/qsettings.cpp @SOURCE_PATH@/src/corelib/kernel/qvariant.cpp \ - @QMAKE_QTSRCS@ $(COMMERCIAL_DEPEND_SRC) +@@ -3,7 +3,7 @@ BUILD_PATH = @BUILD_PATH@ + QTOBJS = @QMAKE_QTOBJS@ + QTSRCS = @QMAKE_QTSRCS@ + QMAKESPEC = @QMAKESPEC@ +-LFLAGS = @QMAKE_LFLAGS@ ++LFLAGS = @QMAKE_LFLAGS@ ${LDFLAGS} --CXXFLAGS = @QMAKE_CXXFLAGS@ \ -+CXXFLAGS += @QMAKE_CXXFLAGS@ \ - -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \ - -I@SOURCE_PATH@/src/corelib/arch/generic -I@BUILD_PATH@/include -I@BUILD_PATH@/include/QtCore \ - -I@SOURCE_PATH@/include -I@SOURCE_PATH@/include/QtCore -I@BUILD_PATH@/src/corelib/global \ - -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT -DQT_NO_STL -DQT_BUILD_QMAKE \ - -DQT_NO_COMPRESS -I@QMAKESPEC@ -DHAVE_QCONFIG_CPP -DQT_NO_THREAD -DQT_NO_QOBJECT \ + #qmake code + OBJS=project.o property.o main.o makefile.o unixmake2.o unixmake.o \ +@@ -45,7 +45,7 @@ DEPEND_SRC=project.cpp property.cpp meta + $(SOURCE_PATH)/src/corelib/global/qlibraryinfo.cpp $(SOURCE_PATH)/src/3rdparty/md5/md5.cpp \ + $(QTSRCS) $(COMMERCIAL_DEPEND_SRC) + +-CPPFLAGS = -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \ ++CPPFLAGS += -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \ + -I$(SOURCE_PATH)/src/corelib/arch/generic -I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore \ + -I$(SOURCE_PATH)/include -I$(SOURCE_PATH)/include/QtCore -I$(BUILD_PATH)/src/corelib/global \ + -I$(SOURCE_PATH)/src/3rdparty/md5 \ +@@ -53,7 +53,7 @@ CPPFLAGS = -I. -Igenerators -Igenerators + -DQT_NO_COMPRESS -I$(QMAKESPEC) -DHAVE_QCONFIG_CPP -DQT_NO_THREAD -DQT_NO_QOBJECT \ -DQT_NO_GEOM_VARIANT $(OPENSOURCE_CXXFLAGS) --LFLAGS=@QMAKE_LFLAGS@ -+LFLAGS=@QMAKE_LFLAGS@ ${LDFLAGS} - first all: @BUILD_PATH@/bin/qmake - qmake: @BUILD_PATH@/bin/qmake +-CXXFLAGS = @QMAKE_CXXFLAGS@ $(CPPFLAGS) ++CXXFLAGS += @QMAKE_CXXFLAGS@ $(CPPFLAGS) + + first all: $(BUILD_PATH)/bin/qmake + qmake: $(BUILD_PATH)/bin/qmake |