diff options
author | adam <adam@pkgsrc.org> | 2011-01-01 21:39:06 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2011-01-01 21:39:06 +0000 |
commit | 96bbd4a8a479aba4befd66fc21f14adc982b0e51 (patch) | |
tree | 0e0b0d9bf7b87edf1d3a968688d4696f8b394226 /x11/qt4-libs/patches | |
parent | 14d62482101e53f18afcfb92beccb550269255c0 (diff) | |
download | pkgsrc-96bbd4a8a479aba4befd66fc21f14adc982b0e51.tar.gz |
* Replace patch-ab with SUBST to enable LIBTOOL in gui.pro; fixes the problem
with ssse3 extension and other future additions to gui.pro.
* Use CONFIGURE_ARGS instead of 'license-acceptance' file to enable open
source licence.
* qmake.conf for Interix (patch-ai) is no longer needed since PkgSrc's
qmake.conf replaces all mkspecs in pre-configure.
Diffstat (limited to 'x11/qt4-libs/patches')
-rw-r--r-- | x11/qt4-libs/patches/patch-ab | 107 | ||||
-rw-r--r-- | x11/qt4-libs/patches/patch-ai | 85 |
2 files changed, 0 insertions, 192 deletions
diff --git a/x11/qt4-libs/patches/patch-ab b/x11/qt4-libs/patches/patch-ab deleted file mode 100644 index c26e55d0fd2..00000000000 --- a/x11/qt4-libs/patches/patch-ab +++ /dev/null @@ -1,107 +0,0 @@ -$NetBSD: patch-ab,v 1.11 2010/11/15 13:05:45 adam Exp $ - ---- src/gui/gui.pro.orig 2010-11-06 01:55:14.000000000 +0000 -+++ src/gui/gui.pro -@@ -101,7 +101,7 @@ contains(QMAKE_MAC_XARCH, no) { - } else { - win32-g++*|!win32:!win32-icc*:!macx-icc* { - mmx { -- mmx_compiler.commands = $$QMAKE_CXX -c -Winline -+ mmx_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline - - mac { - mmx_compiler.commands += -Xarch_i386 -mmmx -@@ -112,7 +112,7 @@ contains(QMAKE_MAC_XARCH, no) { - - mmx_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} - mmx_compiler.dependency_type = TYPE_C -- mmx_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)} -+ mmx_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}.lo - mmx_compiler.input = MMX_SOURCES - mmx_compiler.variable_out = OBJECTS - mmx_compiler.name = compiling[mmx] ${QMAKE_FILE_IN} -@@ -120,7 +120,7 @@ contains(QMAKE_MAC_XARCH, no) { - QMAKE_EXTRA_COMPILERS += mmx_compiler - } - 3dnow { -- mmx3dnow_compiler.commands = $$QMAKE_CXX -c -Winline -+ mmx3dnow_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline - - mac { - mmx3dnow_compiler.commands += -Xarch_i386 -m3dnow -Xarch_i386 -mmmx -@@ -131,14 +131,14 @@ contains(QMAKE_MAC_XARCH, no) { - - mmx3dnow_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} - mmx3dnow_compiler.dependency_type = TYPE_C -- mmx3dnow_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)} -+ mmx3dnow_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}.lo - mmx3dnow_compiler.input = MMX3DNOW_SOURCES - mmx3dnow_compiler.variable_out = OBJECTS - mmx3dnow_compiler.name = compiling[mmx3dnow] ${QMAKE_FILE_IN} - silent:mmx3dnow_compiler.commands = @echo compiling[mmx3dnow] ${QMAKE_FILE_IN} && $$mmx3dnow_compiler.commands - QMAKE_EXTRA_COMPILERS += mmx3dnow_compiler - sse { -- sse3dnow_compiler.commands = $$QMAKE_CXX -c -Winline -+ sse3dnow_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline - - mac { - sse3dnow_compiler.commands += -Xarch_i386 -m3dnow -Xarch_i386 -msse -@@ -149,7 +149,7 @@ contains(QMAKE_MAC_XARCH, no) { - - sse3dnow_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} - sse3dnow_compiler.dependency_type = TYPE_C -- sse3dnow_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)} -+ sse3dnow_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}.lo - sse3dnow_compiler.input = SSE3DNOW_SOURCES - sse3dnow_compiler.variable_out = OBJECTS - sse3dnow_compiler.name = compiling[sse3dnow] ${QMAKE_FILE_IN} -@@ -158,7 +158,7 @@ contains(QMAKE_MAC_XARCH, no) { - } - } - sse { -- sse_compiler.commands = $$QMAKE_CXX -c -Winline -+ sse_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline - - mac { - sse_compiler.commands += -Xarch_i386 -msse -@@ -169,7 +169,7 @@ contains(QMAKE_MAC_XARCH, no) { - - sse_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} - sse_compiler.dependency_type = TYPE_C -- sse_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)} -+ sse_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}.lo - sse_compiler.input = SSE_SOURCES - sse_compiler.variable_out = OBJECTS - sse_compiler.name = compiling[sse] ${QMAKE_FILE_IN} -@@ -177,7 +177,7 @@ contains(QMAKE_MAC_XARCH, no) { - QMAKE_EXTRA_COMPILERS += sse_compiler - } - sse2 { -- sse2_compiler.commands = $$QMAKE_CXX -c -Winline -+ sse2_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline - - mac { - sse2_compiler.commands += -Xarch_i386 -msse2 -@@ -188,7 +188,7 @@ contains(QMAKE_MAC_XARCH, no) { - - sse2_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} - sse2_compiler.dependency_type = TYPE_C -- sse2_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)} -+ sse2_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}.lo - sse2_compiler.input = SSE2_SOURCES - sse2_compiler.variable_out = OBJECTS - sse2_compiler.name = compiling[sse2] ${QMAKE_FILE_IN} -@@ -215,11 +215,11 @@ contains(QMAKE_MAC_XARCH, no) { - QMAKE_EXTRA_COMPILERS += ssse3_compiler - } - iwmmxt { -- iwmmxt_compiler.commands = $$QMAKE_CXX -c -Winline -+ iwmmxt_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline - iwmmxt_compiler.commands += -mcpu=iwmmxt - iwmmxt_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} - iwmmxt_compiler.dependency_type = TYPE_C -- iwmmxt_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)} -+ iwmmxt_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}.lo - iwmmxt_compiler.input = IWMMXT_SOURCES - iwmmxt_compiler.variable_out = OBJECTS - iwmmxt_compiler.name = compiling[iwmmxt] ${QMAKE_FILE_IN} diff --git a/x11/qt4-libs/patches/patch-ai b/x11/qt4-libs/patches/patch-ai deleted file mode 100644 index 6f8cf9c0584..00000000000 --- a/x11/qt4-libs/patches/patch-ai +++ /dev/null @@ -1,85 +0,0 @@ -$NetBSD: patch-ai,v 1.1.1.1 2006/02/20 12:08:15 adam Exp $ - ---- mkspecs/interix-g++/qmake.conf.orig Tue Oct 12 16:51:42 2004 -+++ mkspecs/interix-g++/qmake.conf -@@ -0,0 +1,80 @@ -+# -+# qmake configuration for interix-g++ -+# -+ -+MAKEFILE_GENERATOR = UNIX -+TEMPLATE = app -+CONFIG += qt warn_on release link_prl -+ -+QMAKE_CC = gcc -+QMAKE_LEX = lex -+QMAKE_LEXFLAGS = -+QMAKE_YACC = yacc -+QMAKE_YACCFLAGS = -d -+QMAKE_CFLAGS = -pipe -I/usr/local/include/bind -+QMAKE_CFLAGS_DEPS = -M -+QMAKE_CFLAGS_WARN_ON = -Wall -W -+QMAKE_CFLAGS_WARN_OFF = -w -+QMAKE_CFLAGS_RELEASE = -O2 -+QMAKE_CFLAGS_DEBUG = -g -+QMAKE_CFLAGS_SHLIB = # nothing -+QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses -+QMAKE_CFLAGS_THREAD = -D_REENTRANT -+ -+QMAKE_CXX = g++ -+QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -+QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS -+QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON -+QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF -+QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE -+QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG -+QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB -+QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC -+QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD -+ -+QMAKE_INCDIR = /usr/local/include -+QMAKE_LIBDIR = /usr/local/lib -+QMAKE_INCDIR_X11 = /usr/X11R6/include -+QMAKE_LIBDIR_X11 = /usr/X11R6/lib -+QMAKE_INCDIR_QT = $(QTDIR)/include -+QMAKE_LIBDIR_QT = $(QTDIR)/lib -+QMAKE_INCDIR_OPENGL = /usr/X11R6/include -+QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib -+ -+QMAKE_LINK = g++ -+QMAKE_LINK_SHLIB = g++ -+QMAKE_LINK_SHLIB_CMD = $$QMAKE_LINK_SHLIB $$QMAKE_LFLAGS_SHLIB $(LFLAGS) $$QMAKE_LFLAGS -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS) -+QMAKE_LFLAGS = -L/usr/local/lib/bind -+QMAKE_LFLAGS_RELEASE = -+QMAKE_LFLAGS_DEBUG = -+QMAKE_LFLAGS_SHLIB = -shared -+QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB -+QMAKE_LFLAGS_SONAME = -Wl,-soname, -+QMAKE_LFLAGS_THREAD = -lpthread -+QMAKE_RPATH = -Wl,-rpath, -+ -+QMAKE_LIBS = -+QMAKE_LIBS_DYNLOAD = -+QMAKE_LIBS_X11 = -lXext -lX11 -lm -lbind -ldb -ldl -+QMAKE_LIBS_X11SM = -lSM -lICE -+QMAKE_LIBS_QT = -lqt -+QMAKE_LIBS_QT_THREAD = -lqt-mt -+QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu -+QMAKE_LIBS_OPENGL_QT = -lGL -lXmu -+QMAKE_LIBS_THREAD = -+ -+QMAKE_MOC = $(QTDIR)/bin/moc -+QMAKE_UIC = $(QTDIR)/bin/uic -+ -+QMAKE_AR = ar cqs -+QMAKE_RANLIB = ranlib -+ -+QMAKE_TAR = tar -cf -+QMAKE_GZIP = gzip -9f -+ -+QMAKE_COPY = cp -f -+QMAKE_MOVE = mv -f -+QMAKE_DEL_FILE = rm -f -+QMAKE_DEL_DIR = rmdir -+QMAKE_CHK_DIR_EXISTS = test -d -+QMAKE_MKDIR = mkdir -p |