summaryrefslogtreecommitdiffstats
path: root/mageia/dependencies/qt3/qt3-3.3.6-fix-xorg7.0.patch
diff options
context:
space:
mode:
authorFrancois Andriot <francois.andriot@free.fr>2012-08-02 11:13:00 +0200
committerFrancois Andriot <francois.andriot@free.fr>2012-08-02 11:13:00 +0200
commit0704427510fa18d90170cf13d1fd81e446a1d3b0 (patch)
treef88eb0400bf4608d95808aeea656185634b9c0fc /mageia/dependencies/qt3/qt3-3.3.6-fix-xorg7.0.patch
parent9f07f141355cd13d40a39a2f123c6516209c5fcf (diff)
downloadtde-packaging-0704427510fa18d90170cf13d1fd81e446a1d3b0.tar.gz
tde-packaging-0704427510fa18d90170cf13d1fd81e446a1d3b0.zip
Mageia: initial QT3 version for TDE 3.5.13
Diffstat (limited to 'mageia/dependencies/qt3/qt3-3.3.6-fix-xorg7.0.patch')
-rw-r--r--mageia/dependencies/qt3/qt3-3.3.6-fix-xorg7.0.patch57
1 files changed, 57 insertions, 0 deletions
diff --git a/mageia/dependencies/qt3/qt3-3.3.6-fix-xorg7.0.patch b/mageia/dependencies/qt3/qt3-3.3.6-fix-xorg7.0.patch
new file mode 100644
index 000000000..b360a40e4
--- /dev/null
+++ b/mageia/dependencies/qt3/qt3-3.3.6-fix-xorg7.0.patch
@@ -0,0 +1,57 @@
+--- qt-x11-free-3.3.6/mkspecs/linux-g++-32/qmake.conf.xorg7.1 2006-03-08 11:48:20.000000000 -0500
++++ qt-x11-free-3.3.6/mkspecs/linux-g++-32/qmake.conf 2006-09-01 13:14:19.000000000 -0400
+@@ -40,12 +40,12 @@ QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_T
+
+ QMAKE_INCDIR =
+ QMAKE_LIBDIR =
+-QMAKE_INCDIR_X11 = /usr/X11R6/include
+-QMAKE_LIBDIR_X11 = /usr/X11R6/lib
++QMAKE_INCDIR_X11 = /usr/include
++QMAKE_LIBDIR_X11 = /usr/lib
+ QMAKE_INCDIR_QT = $(QTDIR)/include
+ QMAKE_LIBDIR_QT = $(QTDIR)/lib
+-QMAKE_INCDIR_OPENGL = /usr/X11R6/include
+-QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib
++QMAKE_INCDIR_OPENGL = /usr/include
++QMAKE_LIBDIR_OPENGL = /usr/lib
+
+ QMAKE_LINK = g++
+ QMAKE_LINK_SHLIB = g++
+--- qt-x11-free-3.3.6/mkspecs/linux-g++-64/qmake.conf.xorg7.1 2006-09-01 12:50:46.000000000 -0400
++++ qt-x11-free-3.3.6/mkspecs/linux-g++-64/qmake.conf 2006-09-01 12:50:46.000000000 -0400
+@@ -43,12 +43,12 @@ QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_T
+
+ QMAKE_INCDIR =
+ QMAKE_LIBDIR =
+-QMAKE_INCDIR_X11 = /usr/X11R6/include
+-QMAKE_LIBDIR_X11 = /usr/X11R6/lib64
++QMAKE_INCDIR_X11 = /usr/include
++QMAKE_LIBDIR_X11 = /usr/lib64
+ QMAKE_INCDIR_QT = $(QTDIR)/include
+ QMAKE_LIBDIR_QT = $(QTDIR)/lib64
+-QMAKE_INCDIR_OPENGL = /usr/X11R6/include
+-QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib64
++QMAKE_INCDIR_OPENGL = /usr/include
++QMAKE_LIBDIR_OPENGL = /usr/lib64
+
+ QMAKE_LINK = g++
+ QMAKE_LINK_SHLIB = g++
+--- qt-x11-free-3.3.6/mkspecs/linux-g++/qmake.conf.xorg7.1 2006-09-01 12:50:46.000000000 -0400
++++ qt-x11-free-3.3.6/mkspecs/linux-g++/qmake.conf 2006-09-01 13:13:00.000000000 -0400
+@@ -40,12 +40,12 @@ QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_T
+
+ QMAKE_INCDIR =
+ QMAKE_LIBDIR =
+-QMAKE_INCDIR_X11 = /usr/X11R6/include
+-QMAKE_LIBDIR_X11 = /usr/X11R6/lib
++QMAKE_INCDIR_X11 = /usr/include
++QMAKE_LIBDIR_X11 = /usr/lib
+ QMAKE_INCDIR_QT = $(QTDIR)/include
+ QMAKE_LIBDIR_QT = $(QTDIR)/lib
+-QMAKE_INCDIR_OPENGL = /usr/X11R6/include
+-QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib
++QMAKE_INCDIR_OPENGL = /usr/include
++QMAKE_LIBDIR_OPENGL = /usr/lib
+
+ QMAKE_LINK = g++
+ QMAKE_LINK_SHLIB = g++