qt4: add forgotten patch, thanks XorA

diff --git a/packages/qt/qt4-x11-free-4.1.1/fix-mkspecs.patch b/packages/qt/qt4-x11-free-4.1.1/fix-mkspecs.patch
new file mode 100644 (file)
index 0000000..e927df9
--- /dev/null
+++ b/packages/qt/qt4-x11-free-4.1.1/fix-mkspecs.patch
@@ -0,0 +1,102 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- qt-x11-opensource-src-4.1.1/mkspecs/linux-g++/qmake.conf~fix-qmakespec
++++ qt-x11-opensource-src-4.1.1/mkspecs/linux-g++/qmake.conf
+@@ -8,7 +8,7 @@
+ QT                    += core gui
+ QMAKE_INCREMENTAL_STYLE = sublib
+ 
+-QMAKE_CC              = gcc
++QMAKE_CC              = $(OE_QMAKE_CC)
+ QMAKE_LEX             = flex
+ QMAKE_LEXFLAGS                =
+ QMAKE_YACC            = yacc
+@@ -16,19 +16,19 @@
+ QMAKE_YACCFLAGS_MANGLE  = -p $base -b $base
+ QMAKE_YACC_HEADER       = $base.tab.h
+ QMAKE_YACC_SOURCE       = $base.tab.c
+-QMAKE_CFLAGS          = -pipe
++QMAKE_CFLAGS          = -pipe $(OE_QMAKE_CFLAGS)
+ QMAKE_CFLAGS_DEPS     = -M
+ QMAKE_CFLAGS_WARN_ON  = -Wall -W
+ QMAKE_CFLAGS_WARN_OFF = -w
+-QMAKE_CFLAGS_RELEASE  = -O2
++QMAKE_CFLAGS_RELEASE  = -O2 
+ QMAKE_CFLAGS_DEBUG    = -g
+ QMAKE_CFLAGS_SHLIB    = -fPIC
+ QMAKE_CFLAGS_YACC     = -Wno-unused -Wno-parentheses
+ QMAKE_CFLAGS_THREAD   = -D_REENTRANT
+ QMAKE_CFLAGS_HIDESYMS   = -fvisibility=hidden
+ 
+-QMAKE_CXX             = g++
+-QMAKE_CXXFLAGS                = $$QMAKE_CFLAGS
++QMAKE_CXX             = $(OE_QMAKE_CXX)
++QMAKE_CXXFLAGS                = $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS)
+ QMAKE_CXXFLAGS_DEPS   = $$QMAKE_CFLAGS_DEPS
+ QMAKE_CXXFLAGS_WARN_ON        = $$QMAKE_CFLAGS_WARN_ON
+ QMAKE_CXXFLAGS_WARN_OFF       = $$QMAKE_CFLAGS_WARN_OFF
+@@ -41,37 +41,37 @@
+ 
+ QMAKE_INCDIR          =
+ QMAKE_LIBDIR          =
+-QMAKE_INCDIR_X11      = /usr/X11R6/include
+-QMAKE_LIBDIR_X11      = /usr/X11R6/lib
+-QMAKE_INCDIR_QT               = $$[QT_INSTALL_HEADERS]
+-QMAKE_LIBDIR_QT               = $$[QT_INSTALL_LIBS]
+-QMAKE_INCDIR_OPENGL   = /usr/X11R6/include
+-QMAKE_LIBDIR_OPENGL   = /usr/X11R6/lib
++QMAKE_INCDIR_X11      =
++QMAKE_LIBDIR_X11      =
++QMAKE_INCDIR_QT               = $(OE_QMAKE_INCDIR_QT)
++QMAKE_LIBDIR_QT               = $(OE_QMAKE_LIBDIR_QT)
++QMAKE_INCDIR_OPENGL   =
++QMAKE_LIBDIR_OPENGL   =
+ 
+-QMAKE_LINK            = g++
+-QMAKE_LINK_SHLIB      = g++
+-QMAKE_LFLAGS          =
++QMAKE_LINK            = $(OE_QMAKE_LINK)
++QMAKE_LINK_SHLIB      = $(OE_QMAKE_LINK)
++QMAKE_LFLAGS          = $(OE_QMAKE_LDFLAGS)
+ QMAKE_LFLAGS_RELEASE  =
+ QMAKE_LFLAGS_DEBUG    =
+ QMAKE_LFLAGS_SHLIB    = -shared
+ QMAKE_LFLAGS_PLUGIN   = $$QMAKE_LFLAGS_SHLIB
+ QMAKE_LFLAGS_SONAME   = -Wl,-soname,
+ QMAKE_LFLAGS_THREAD   =
+-QMAKE_RPATH           = -Wl,-rpath,
++QMAKE_RPATH           = -Wl,-rpath-link,
+ 
+ QMAKE_LIBS            =
+ QMAKE_LIBS_DYNLOAD    = -ldl
+-QMAKE_LIBS_X11                = -lXext -lX11 -lm
+-QMAKE_LIBS_X11SM      = -lSM -lICE
++QMAKE_LIBS_X11                = $(OE_QMAKE_LIBS_X11)
++QMAKE_LIBS_X11SM      = $(OE_QMAKE_LIBS_X11SM)
+ QMAKE_LIBS_NIS                = -lnsl
+ QMAKE_LIBS_OPENGL     = -lGLU -lGL
+ QMAKE_LIBS_OPENGL_QT  = -lGL
+ QMAKE_LIBS_THREAD     = -lpthread
+ 
+-QMAKE_MOC             = $$[QT_INSTALL_BINS]/moc
+-QMAKE_UIC             = $$[QT_INSTALL_BINS]/uic
++QMAKE_MOC             = $(OE_QMAKE_MOC)
++QMAKE_UIC             = $(OE_QMAKE_UIC)
+ 
+-QMAKE_AR              = ar cqs
++QMAKE_AR              = $(OE_QMAKE_AR) cqs
+ QMAKE_RANLIB          =
+ 
+ QMAKE_TAR             = tar -cf
+@@ -83,7 +83,7 @@
+ QMAKE_MOVE            = mv -f
+ QMAKE_DEL_FILE                = rm -f
+ QMAKE_DEL_DIR         = rmdir
+-QMAKE_STRIP             = strip
++QMAKE_STRIP             = $(OE_QMAKE_STRIP)
+ QMAKE_STRIPFLAGS_LIB  += --strip-unneeded
+ QMAKE_CHK_DIR_EXISTS  = test -d
+ QMAKE_MKDIR           = mkdir -p