| 1 |
ayoy 10/02/20 09:55:07 |
| 2 |
|
| 3 |
Added: qt-4.6-nox11r6.patch |
| 4 |
Log: |
| 5 |
Remove X11R6 from include dirs and libdirs in mkspecs (bug #305001) |
| 6 |
(Portage version: 2.2_rc62/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 x11-libs/qt-core/files/qt-4.6-nox11r6.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-core/files/qt-4.6-nox11r6.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-core/files/qt-4.6-nox11r6.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: qt-4.6-nox11r6.patch |
| 15 |
=================================================================== |
| 16 |
diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf |
| 17 |
index 1ae5608..9c603a6 100644 |
| 18 |
--- a/mkspecs/common/linux.conf |
| 19 |
+++ b/mkspecs/common/linux.conf |
| 20 |
@@ -7,12 +7,12 @@ QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_THREAD |
| 21 |
|
| 22 |
QMAKE_INCDIR = |
| 23 |
QMAKE_LIBDIR = |
| 24 |
-QMAKE_INCDIR_X11 = /usr/X11R6/include |
| 25 |
-QMAKE_LIBDIR_X11 = /usr/X11R6/lib |
| 26 |
+QMAKE_INCDIR_X11 = /usr/include |
| 27 |
+QMAKE_LIBDIR_X11 = /usr/lib |
| 28 |
QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] |
| 29 |
QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] |
| 30 |
-QMAKE_INCDIR_OPENGL = /usr/X11R6/include |
| 31 |
-QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib |
| 32 |
+QMAKE_INCDIR_OPENGL = /usr/include |
| 33 |
+QMAKE_LIBDIR_OPENGL = /usr/lib |
| 34 |
QMAKE_INCDIR_OPENGL_ES1 = $$QMAKE_INCDIR_OPENGL |
| 35 |
QMAKE_LIBDIR_OPENGL_ES1 = $$QMAKE_LIBDIR_OPENGL |
| 36 |
QMAKE_INCDIR_OPENGL_ES1CL = $$QMAKE_INCDIR_OPENGL |
| 37 |
diff --git a/mkspecs/linux-cxx/qmake.conf b/mkspecs/linux-cxx/qmake.conf |
| 38 |
index 633b738..a37c05b 100644 |
| 39 |
--- a/mkspecs/linux-cxx/qmake.conf |
| 40 |
+++ b/mkspecs/linux-cxx/qmake.conf |
| 41 |
@@ -37,12 +37,12 @@ QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC |
| 42 |
|
| 43 |
QMAKE_INCDIR = |
| 44 |
QMAKE_LIBDIR = |
| 45 |
-QMAKE_INCDIR_X11 = /usr/X11R6/include |
| 46 |
-QMAKE_LIBDIR_X11 = /usr/X11R6/lib |
| 47 |
+QMAKE_INCDIR_X11 = /usr/include |
| 48 |
+QMAKE_LIBDIR_X11 = /usr/lib |
| 49 |
QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] |
| 50 |
QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] |
| 51 |
-QMAKE_INCDIR_OPENGL = /usr/X11R6/include |
| 52 |
-QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib |
| 53 |
+QMAKE_INCDIR_OPENGL = /usr/include |
| 54 |
+QMAKE_LIBDIR_OPENGL = /usr/lib |
| 55 |
|
| 56 |
QMAKE_LINK = cxx |
| 57 |
QMAKE_LINK_SHLIB = cxx |
| 58 |
diff --git a/mkspecs/linux-ecc-64/qmake.conf b/mkspecs/linux-ecc-64/qmake.conf |
| 59 |
index 359d44b..2d3f9a5 100644 |
| 60 |
--- a/mkspecs/linux-ecc-64/qmake.conf |
| 61 |
+++ b/mkspecs/linux-ecc-64/qmake.conf |
| 62 |
@@ -39,12 +39,12 @@ QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD |
| 63 |
|
| 64 |
QMAKE_INCDIR = |
| 65 |
QMAKE_LIBDIR = |
| 66 |
-QMAKE_INCDIR_X11 = /usr/X11R6/include |
| 67 |
-QMAKE_LIBDIR_X11 = /usr/X11R6/lib |
| 68 |
+QMAKE_INCDIR_X11 = /usr/include |
| 69 |
+QMAKE_LIBDIR_X11 = /usr/lib |
| 70 |
QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] |
| 71 |
QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] |
| 72 |
-QMAKE_INCDIR_OPENGL = /usr/X11R6/include |
| 73 |
-QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib |
| 74 |
+QMAKE_INCDIR_OPENGL = /usr/include |
| 75 |
+QMAKE_LIBDIR_OPENGL = /usr/lib |
| 76 |
|
| 77 |
QMAKE_LINK = ecpc |
| 78 |
QMAKE_LINK_SHLIB = ecpc |
| 79 |
diff --git a/mkspecs/linux-g++-64/qmake.conf b/mkspecs/linux-g++-64/qmake.conf |
| 80 |
index 4f8794f..cf7be62 100644 |
| 81 |
--- a/mkspecs/linux-g++-64/qmake.conf |
| 82 |
+++ b/mkspecs/linux-g++-64/qmake.conf |
| 83 |
@@ -17,7 +17,7 @@ QMAKE_LFLAGS = -m64 |
| 84 |
include(../common/g++.conf) |
| 85 |
include(../common/linux.conf) |
| 86 |
|
| 87 |
-QMAKE_LIBDIR_X11 = /usr/X11R6/lib64 |
| 88 |
-QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib64 |
| 89 |
+QMAKE_LIBDIR_X11 = /usr/lib64 |
| 90 |
+QMAKE_LIBDIR_OPENGL = /usr/lib64 |
| 91 |
|
| 92 |
load(qt_config) |
| 93 |
diff --git a/mkspecs/linux-icc-64/qmake.conf b/mkspecs/linux-icc-64/qmake.conf |
| 94 |
index 7962026..9b4bade 100644 |
| 95 |
--- a/mkspecs/linux-icc-64/qmake.conf |
| 96 |
+++ b/mkspecs/linux-icc-64/qmake.conf |
| 97 |
@@ -12,5 +12,5 @@ include(../linux-icc/qmake.conf) |
| 98 |
|
| 99 |
# Change the all LIBDIR variables to use lib64 instead of lib |
| 100 |
|
| 101 |
-QMAKE_LIBDIR_X11 = /usr/X11R6/lib64 |
| 102 |
-QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib64 |
| 103 |
+QMAKE_LIBDIR_X11 = /usr/lib64 |
| 104 |
+QMAKE_LIBDIR_OPENGL = /usr/lib64 |
| 105 |
diff --git a/mkspecs/linux-icc/qmake.conf b/mkspecs/linux-icc/qmake.conf |
| 106 |
index 965de0c..b778a89 100644 |
| 107 |
--- a/mkspecs/linux-icc/qmake.conf |
| 108 |
+++ b/mkspecs/linux-icc/qmake.conf |
| 109 |
@@ -45,12 +45,12 @@ QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD |
| 110 |
|
| 111 |
QMAKE_INCDIR = |
| 112 |
QMAKE_LIBDIR = |
| 113 |
-QMAKE_INCDIR_X11 = /usr/X11R6/include |
| 114 |
-QMAKE_LIBDIR_X11 = /usr/X11R6/lib |
| 115 |
+QMAKE_INCDIR_X11 = /usr/include |
| 116 |
+QMAKE_LIBDIR_X11 = /usr/lib |
| 117 |
QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] |
| 118 |
QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] |
| 119 |
-QMAKE_INCDIR_OPENGL = /usr/X11R6/include |
| 120 |
-QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib |
| 121 |
+QMAKE_INCDIR_OPENGL = /usr/include |
| 122 |
+QMAKE_LIBDIR_OPENGL = /usr/lib |
| 123 |
|
| 124 |
QMAKE_LINK = icpc |
| 125 |
QMAKE_LINK_SHLIB = icpc |
| 126 |
diff --git a/mkspecs/linux-kcc/qmake.conf b/mkspecs/linux-kcc/qmake.conf |
| 127 |
index 009c486..0e3d301 100644 |
| 128 |
--- a/mkspecs/linux-kcc/qmake.conf |
| 129 |
+++ b/mkspecs/linux-kcc/qmake.conf |
| 130 |
@@ -48,12 +48,12 @@ QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD |
| 131 |
|
| 132 |
QMAKE_INCDIR = |
| 133 |
QMAKE_LIBDIR = |
| 134 |
-QMAKE_INCDIR_X11 = /usr/X11R6/include |
| 135 |
-QMAKE_LIBDIR_X11 = /usr/X11R6/lib |
| 136 |
+QMAKE_INCDIR_X11 = /usr/include |
| 137 |
+QMAKE_LIBDIR_X11 = /usr/lib |
| 138 |
QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] |
| 139 |
QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] |
| 140 |
-QMAKE_INCDIR_OPENGL = /usr/X11R6/include |
| 141 |
-QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib |
| 142 |
+QMAKE_INCDIR_OPENGL = /usr/include |
| 143 |
+QMAKE_LIBDIR_OPENGL = /usr/lib |
| 144 |
|
| 145 |
QMAKE_LINK = KCC |
| 146 |
QMAKE_LINK_SHLIB = KCC |
| 147 |
diff --git a/mkspecs/linux-pgcc/qmake.conf b/mkspecs/linux-pgcc/qmake.conf |
| 148 |
index 756f1af..2c40635 100644 |
| 149 |
--- a/mkspecs/linux-pgcc/qmake.conf |
| 150 |
+++ b/mkspecs/linux-pgcc/qmake.conf |
| 151 |
@@ -39,12 +39,12 @@ QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD |
| 152 |
|
| 153 |
QMAKE_INCDIR = |
| 154 |
QMAKE_LIBDIR = |
| 155 |
-QMAKE_INCDIR_X11 = /usr/X11R6/include |
| 156 |
-QMAKE_LIBDIR_X11 = /usr/X11R6/lib |
| 157 |
+QMAKE_INCDIR_X11 = /usr/include |
| 158 |
+QMAKE_LIBDIR_X11 = /usr/lib |
| 159 |
QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] |
| 160 |
QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] |
| 161 |
-QMAKE_INCDIR_OPENGL = /usr/X11R6/include |
| 162 |
-QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib |
| 163 |
+QMAKE_INCDIR_OPENGL = /usr/include |
| 164 |
+QMAKE_LIBDIR_OPENGL = /usr/lib |
| 165 |
|
| 166 |
QMAKE_LINK = pgCC |
| 167 |
QMAKE_LINK_SHLIB = pgCC |
Archives