| 1 |
pesa 11/10/29 17:09:12 |
| 2 |
|
| 3 |
Added: qmf-use-standard-install-paths.patch |
| 4 |
Log: |
| 5 |
Initial commit of QMF, dependency of qt-mobility. Ebuild written by me and imported from qting-edge overlay. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha71/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 net-libs/qmf/files/qmf-use-standard-install-paths.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/qmf/files/qmf-use-standard-install-paths.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/qmf/files/qmf-use-standard-install-paths.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: qmf-use-standard-install-paths.patch |
| 16 |
=================================================================== |
| 17 |
diff -Naur qmf-9999.orig/benchmarks/tst_messageserver/tst_messageserver.pro qmf-9999/benchmarks/tst_messageserver/tst_messageserver.pro |
| 18 |
--- qmf-9999.orig/benchmarks/tst_messageserver/tst_messageserver.pro 2011-10-28 00:16:42.818798066 +0200 |
| 19 |
+++ qmf-9999/benchmarks/tst_messageserver/tst_messageserver.pro 2011-10-28 00:16:58.461602502 +0200 |
| 20 |
@@ -3,7 +3,7 @@ |
| 21 |
CONFIG += qmfmessageserver qmfclient |
| 22 |
|
| 23 |
TARGET = tst_messageserver |
| 24 |
-target.path += $$QMF_INSTALL_ROOT/tests |
| 25 |
+target.path += $$[QT_INSTALL_DATA]/tests |
| 26 |
|
| 27 |
BASE=../../ |
| 28 |
include($$BASE/common.pri) |
| 29 |
diff -Naur qmf-9999.orig/examples/listfilterplugin/listfilterplugin.pro qmf-9999/examples/listfilterplugin/listfilterplugin.pro |
| 30 |
--- qmf-9999.orig/examples/listfilterplugin/listfilterplugin.pro 2011-10-28 00:16:42.863797501 +0200 |
| 31 |
+++ qmf-9999/examples/listfilterplugin/listfilterplugin.pro 2011-10-28 00:16:58.461602503 +0200 |
| 32 |
@@ -3,7 +3,7 @@ |
| 33 |
CONFIG += qmfclient plugin |
| 34 |
QT = core |
| 35 |
|
| 36 |
-target.path += $$QMF_INSTALL_ROOT/plugins/contentmanagers |
| 37 |
+target.path += $$[QT_INSTALL_PLUGINS]/contentmanagers |
| 38 |
|
| 39 |
DEFINES += PLUGIN_INTERNAL |
| 40 |
|
| 41 |
diff -Naur qmf-9999.orig/examples/messagingaccounts/messagingaccounts.pro qmf-9999/examples/messagingaccounts/messagingaccounts.pro |
| 42 |
--- qmf-9999.orig/examples/messagingaccounts/messagingaccounts.pro 2011-10-28 00:16:42.907796951 +0200 |
| 43 |
+++ qmf-9999/examples/messagingaccounts/messagingaccounts.pro 2011-10-28 00:16:58.461602503 +0200 |
| 44 |
@@ -1,6 +1,6 @@ |
| 45 |
TEMPLATE = app |
| 46 |
TARGET = messagingaccounts |
| 47 |
-target.path += $$QMF_INSTALL_ROOT/bin |
| 48 |
+target.path += $$[QT_INSTALL_BINS] |
| 49 |
CONFIG += qmfclient qmfmessageserver |
| 50 |
|
| 51 |
DEPENDPATH += . |
| 52 |
diff -Naur qmf-9999.orig/examples/qtmail/app/app.pro qmf-9999/examples/qtmail/app/app.pro |
| 53 |
--- qmf-9999.orig/examples/qtmail/app/app.pro 2011-10-28 00:16:42.875797352 +0200 |
| 54 |
+++ qmf-9999/examples/qtmail/app/app.pro 2011-10-28 00:16:58.461602503 +0200 |
| 55 |
@@ -1,7 +1,7 @@ |
| 56 |
TEMPLATE = app |
| 57 |
TARGET = qtmail |
| 58 |
CONFIG += qmfutil qmfclient qmfmessageserver |
| 59 |
-target.path += $$QMF_INSTALL_ROOT/bin |
| 60 |
+target.path += $$[QT_INSTALL_BINS] |
| 61 |
|
| 62 |
DEPENDPATH += . |
| 63 |
|
| 64 |
diff -Naur qmf-9999.orig/examples/qtmail/libs/qmfutil/qmfutil.pro qmf-9999/examples/qtmail/libs/qmfutil/qmfutil.pro |
| 65 |
--- qmf-9999.orig/examples/qtmail/libs/qmfutil/qmfutil.pro 2011-10-28 00:16:42.905796975 +0200 |
| 66 |
+++ qmf-9999/examples/qtmail/libs/qmfutil/qmfutil.pro 2011-10-28 00:16:58.461602503 +0200 |
| 67 |
@@ -3,7 +3,7 @@ |
| 68 |
CONFIG += qmfclient |
| 69 |
TARGET = qmfutil |
| 70 |
|
| 71 |
-target.path += $$QMF_INSTALL_ROOT/lib |
| 72 |
+target.path += $$[QT_INSTALL_LIBS] |
| 73 |
|
| 74 |
DEFINES += QMFUTIL_INTERNAL |
| 75 |
|
| 76 |
diff -Naur qmf-9999.orig/examples/qtmail/plugins/composers/email/email.pro qmf-9999/examples/qtmail/plugins/composers/email/email.pro |
| 77 |
--- qmf-9999.orig/examples/qtmail/plugins/composers/email/email.pro 2011-10-28 00:16:42.865797477 +0200 |
| 78 |
+++ qmf-9999/examples/qtmail/plugins/composers/email/email.pro 2011-10-28 00:16:58.462602491 +0200 |
| 79 |
@@ -2,7 +2,7 @@ |
| 80 |
TARGET = emailcomposer |
| 81 |
CONFIG += qmfclient qmfutil plugin |
| 82 |
|
| 83 |
-target.path += $$QMF_INSTALL_ROOT/plugins/composers |
| 84 |
+target.path += $$[QT_INSTALL_PLUGINS]/composers |
| 85 |
|
| 86 |
DEFINES += PLUGIN_INTERNAL |
| 87 |
|
| 88 |
diff -Naur qmf-9999.orig/examples/qtmail/plugins/viewers/generic/generic.pro qmf-9999/examples/qtmail/plugins/viewers/generic/generic.pro |
| 89 |
--- qmf-9999.orig/examples/qtmail/plugins/viewers/generic/generic.pro 2011-10-28 00:16:42.866797465 +0200 |
| 90 |
+++ qmf-9999/examples/qtmail/plugins/viewers/generic/generic.pro 2011-10-28 00:16:58.462602491 +0200 |
| 91 |
@@ -2,7 +2,7 @@ |
| 92 |
TARGET = genericviewer |
| 93 |
CONFIG += qmfclient qmfutil plugin |
| 94 |
|
| 95 |
-target.path += $$QMF_INSTALL_ROOT/plugins/viewers |
| 96 |
+target.path += $$[QT_INSTALL_PLUGINS]/viewers |
| 97 |
|
| 98 |
# Use webkit to render mail if available |
| 99 |
contains(QT_CONFIG,webkit){ |
| 100 |
diff -Naur qmf-9999.orig/examples/serverobserver/serverobserver.pro qmf-9999/examples/serverobserver/serverobserver.pro |
| 101 |
--- qmf-9999.orig/examples/serverobserver/serverobserver.pro 2011-10-28 00:16:42.863797501 +0200 |
| 102 |
+++ qmf-9999/examples/serverobserver/serverobserver.pro 2011-10-28 00:16:58.462602491 +0200 |
| 103 |
@@ -1,6 +1,6 @@ |
| 104 |
TEMPLATE = app |
| 105 |
TARGET = serverobserver |
| 106 |
-target.path += $$QMF_INSTALL_ROOT/bin |
| 107 |
+target.path += $$[QT_INSTALL_BINS] |
| 108 |
CONFIG += qmfclient qmfmessageserver |
| 109 |
|
| 110 |
DEPENDPATH += . |
| 111 |
diff -Naur qmf-9999.orig/src/libraries/qmfclient/qmfclient.pro qmf-9999/src/libraries/qmfclient/qmfclient.pro |
| 112 |
--- qmf-9999.orig/src/libraries/qmfclient/qmfclient.pro 2011-10-28 00:16:42.839797803 +0200 |
| 113 |
+++ qmf-9999/src/libraries/qmfclient/qmfclient.pro 2011-10-28 00:16:58.463602479 +0200 |
| 114 |
@@ -4,8 +4,7 @@ |
| 115 |
INSTALLS += target |
| 116 |
CONFIG += link_pkgconfig |
| 117 |
|
| 118 |
-simulator:macx:target.path += $$QMF_INSTALL_ROOT/Library/Frameworks |
| 119 |
-else:target.path += $$QMF_INSTALL_ROOT/lib |
| 120 |
+target.path += $$[QT_INSTALL_LIBS] |
| 121 |
|
| 122 |
DEFINES += QT_BUILD_QCOP_LIB QMF_INTERNAL |
| 123 |
win32: { |
| 124 |
@@ -221,7 +220,7 @@ |
| 125 |
libqtopiamail-zh_CN.ts \ |
| 126 |
libqtopiamail-zh_TW.ts |
| 127 |
|
| 128 |
-header_files.path=$$QMF_INSTALL_ROOT/include/qmfclient |
| 129 |
+header_files.path=$$[QT_INSTALL_HEADERS]/qmfclient |
| 130 |
header_files.files=$$PUBLIC_HEADERS |
| 131 |
|
| 132 |
INSTALLS += header_files |
| 133 |
@@ -236,7 +235,7 @@ |
| 134 |
CONFIG += create_pc create_prl |
| 135 |
QMAKE_PKGCONFIG_LIBDIR = $$target.path |
| 136 |
QMAKE_PKGCONFIG_INCDIR = $$header_files.path |
| 137 |
- QMAKE_PKGCONFIG_DESTDIR = pkgconfig |
| 138 |
+ QMAKE_PKGCONFIG_DESTDIR = ../pkgconfig |
| 139 |
LIBS += -licui18n -licuuc -licudata |
| 140 |
PRIVATE_HEADERS += support/qcharsetdetector_p.h \ |
| 141 |
support/qcharsetdetector.h |
| 142 |
diff -Naur qmf-9999.orig/src/libraries/qmfmessageserver/qmfmessageserver.pro qmf-9999/src/libraries/qmfmessageserver/qmfmessageserver.pro |
| 143 |
--- qmf-9999.orig/src/libraries/qmfmessageserver/qmfmessageserver.pro 2011-10-28 00:16:42.862797514 +0200 |
| 144 |
+++ qmf-9999/src/libraries/qmfmessageserver/qmfmessageserver.pro 2011-10-28 00:16:58.463602479 +0200 |
| 145 |
@@ -3,7 +3,7 @@ |
| 146 |
CONFIG += qmfclient |
| 147 |
TARGET = qmfmessageserver |
| 148 |
|
| 149 |
-target.path += $$QMF_INSTALL_ROOT/lib |
| 150 |
+target.path += $$[QT_INSTALL_LIBS] |
| 151 |
|
| 152 |
QT = core network |
| 153 |
!contains(DEFINES,QMF_NO_MESSAGE_SERVICE_EDITOR):QT += gui |
| 154 |
@@ -48,7 +48,7 @@ |
| 155 |
qmailtransport.cpp \ |
| 156 |
qmailheartbeattimer_qtimer.cpp # NB: There are multiple implementations |
| 157 |
|
| 158 |
-header_files.path=$$QMF_INSTALL_ROOT/include/qmfmessageserver |
| 159 |
+header_files.path=$$[QT_INSTALL_HEADERS]/qmfmessageserver |
| 160 |
header_files.files=$$PUBLIC_HEADERS |
| 161 |
|
| 162 |
INSTALLS += header_files |
| 163 |
@@ -57,6 +57,6 @@ |
| 164 |
CONFIG += create_pc create_prl |
| 165 |
QMAKE_PKGCONFIG_LIBDIR = $$target.path |
| 166 |
QMAKE_PKGCONFIG_INCDIR = $$header_files.path |
| 167 |
- QMAKE_PKGCONFIG_DESTDIR = pkgconfig |
| 168 |
+ QMAKE_PKGCONFIG_DESTDIR = ../pkgconfig |
| 169 |
} |
| 170 |
include(../../../common.pri) |
| 171 |
diff -Naur qmf-9999.orig/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.pro qmf-9999/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.pro |
| 172 |
--- qmf-9999.orig/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.pro 2011-10-28 00:16:42.831797902 +0200 |
| 173 |
+++ qmf-9999/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.pro 2011-10-28 00:16:58.463602479 +0200 |
| 174 |
@@ -3,7 +3,7 @@ |
| 175 |
CONFIG += qmfclient plugin |
| 176 |
QT = core |
| 177 |
|
| 178 |
-target.path += $$QMF_INSTALL_ROOT/plugins/contentmanagers |
| 179 |
+target.path += $$[QT_INSTALL_PLUGINS]/contentmanagers |
| 180 |
|
| 181 |
DEFINES += PLUGIN_INTERNAL |
| 182 |
|
| 183 |
diff -Naur qmf-9999.orig/src/plugins/messageservices/imap/imap.pro qmf-9999/src/plugins/messageservices/imap/imap.pro |
| 184 |
--- qmf-9999.orig/src/plugins/messageservices/imap/imap.pro 2011-10-28 00:16:42.824797989 +0200 |
| 185 |
+++ qmf-9999/src/plugins/messageservices/imap/imap.pro 2011-10-28 00:16:58.463602479 +0200 |
| 186 |
@@ -2,7 +2,7 @@ |
| 187 |
TARGET = imap |
| 188 |
CONFIG += qmfmessageserver qmfclient plugin |
| 189 |
|
| 190 |
-target.path += $$QMF_INSTALL_ROOT/plugins/messageservices |
| 191 |
+target.path += $$[QT_INSTALL_PLUGINS]/messageservices |
| 192 |
|
| 193 |
QT += core network |
| 194 |
|
| 195 |
diff -Naur qmf-9999.orig/src/plugins/messageservices/pop/pop.pro qmf-9999/src/plugins/messageservices/pop/pop.pro |
| 196 |
--- qmf-9999.orig/src/plugins/messageservices/pop/pop.pro 2011-10-28 00:16:42.829797928 +0200 |
| 197 |
+++ qmf-9999/src/plugins/messageservices/pop/pop.pro 2011-10-28 00:16:58.464602466 +0200 |
| 198 |
@@ -2,7 +2,7 @@ |
| 199 |
TARGET = pop |
| 200 |
CONFIG += qmfclient qmfmessageserver plugin |
| 201 |
|
| 202 |
-target.path = $$QMF_INSTALL_ROOT/plugins/messageservices |
| 203 |
+target.path = $$[QT_INSTALL_PLUGINS]/messageservices |
| 204 |
|
| 205 |
QT = core network |
| 206 |
|
| 207 |
diff -Naur qmf-9999.orig/src/plugins/messageservices/qmfsettings/qmfsettings.pro qmf-9999/src/plugins/messageservices/qmfsettings/qmfsettings.pro |
| 208 |
--- qmf-9999.orig/src/plugins/messageservices/qmfsettings/qmfsettings.pro 2011-10-28 00:16:42.827797953 +0200 |
| 209 |
+++ qmf-9999/src/plugins/messageservices/qmfsettings/qmfsettings.pro 2011-10-28 00:16:58.464602466 +0200 |
| 210 |
@@ -2,7 +2,7 @@ |
| 211 |
TARGET = qmfsettings |
| 212 |
CONFIG += qmfclient qmfmessageserver plugin |
| 213 |
|
| 214 |
-target.path += $$QMF_INSTALL_ROOT/plugins/messageservices |
| 215 |
+target.path += $$[QT_INSTALL_PLUGINS]/messageservices |
| 216 |
|
| 217 |
QT = core network |
| 218 |
|
| 219 |
diff -Naur qmf-9999.orig/src/plugins/messageservices/smtp/smtp.pro qmf-9999/src/plugins/messageservices/smtp/smtp.pro |
| 220 |
--- qmf-9999.orig/src/plugins/messageservices/smtp/smtp.pro 2011-10-28 00:16:42.826797965 +0200 |
| 221 |
+++ qmf-9999/src/plugins/messageservices/smtp/smtp.pro 2011-10-28 00:16:58.464602466 +0200 |
| 222 |
@@ -3,7 +3,7 @@ |
| 223 |
|
| 224 |
CONFIG += qmfclient qmfmessageserver plugin |
| 225 |
|
| 226 |
-target.path += $$QMF_INSTALL_ROOT/plugins/messageservices |
| 227 |
+target.path += $$[QT_INSTALL_PLUGINS]/messageservices |
| 228 |
|
| 229 |
QT = core network |
| 230 |
|
| 231 |
diff -Naur qmf-9999.orig/src/tools/messageserver/messageserver.pro qmf-9999/src/tools/messageserver/messageserver.pro |
| 232 |
--- qmf-9999.orig/src/tools/messageserver/messageserver.pro 2011-10-28 00:16:42.832797889 +0200 |
| 233 |
+++ qmf-9999/src/tools/messageserver/messageserver.pro 2011-10-28 00:16:58.464602466 +0200 |
| 234 |
@@ -14,7 +14,7 @@ |
| 235 |
QT = core |
| 236 |
!contains(DEFINES,QMF_NO_MESSAGE_SERVICE_EDITOR):QT += gui |
| 237 |
|
| 238 |
-target.path += $$QMF_INSTALL_ROOT/bin |
| 239 |
+target.path += $$[QT_INSTALL_BINS] |
| 240 |
|
| 241 |
DEPENDPATH += . |
| 242 |
|
| 243 |
diff -Naur qmf-9999.orig/tests/tests.pri qmf-9999/tests/tests.pri |
| 244 |
--- qmf-9999.orig/tests/tests.pri 2011-10-28 00:16:42.804798239 +0200 |
| 245 |
+++ qmf-9999/tests/tests.pri 2011-10-28 00:17:11.873434831 +0200 |
| 246 |
@@ -4,14 +4,14 @@ |
| 247 |
QMAKE_MACOSX_DEPLOYMENT_TARGET=10.5 |
| 248 |
} |
| 249 |
|
| 250 |
-target.path+=$$QMF_INSTALL_ROOT/tests |
| 251 |
+target.path+=$$[QT_INSTALL_DATA]/tests |
| 252 |
|
| 253 |
QMFPATH=../../src/libraries/qmfclient |
| 254 |
DEPENDPATH += . |
| 255 |
INCLUDEPATH += . $$QMFPATH $$QMFPATH/support |
| 256 |
LIBS += -L$$QMFPATH/build |
| 257 |
macx:LIBS += -F$$QMFPATH/build |
| 258 |
-!symbian:QMAKE_LFLAGS += -Wl,-rpath,$$QMFPATH |
| 259 |
+!symbian:QMAKE_LFLAGS += -Wl,-rpath,\\\$$ORIGIN/$$QMFPATH/build |
| 260 |
|
| 261 |
symbian { |
| 262 |
TARGET.CAPABILITY = ReadUserData WriteUserData ReadDeviceData WriteDeviceData |
| 263 |
@@ -19,3 +19,5 @@ |
| 264 |
|
| 265 |
include(../common.pri) |
| 266 |
|
| 267 |
+DESTDIR = |
| 268 |
+ |
| 269 |
diff -Naur qmf-9999.orig/tests/tests.pro qmf-9999/tests/tests.pro |
| 270 |
--- qmf-9999.orig/tests/tests.pro 2011-10-28 00:16:42.807798203 +0200 |
| 271 |
+++ qmf-9999/tests/tests.pro 2011-10-28 00:16:58.465602453 +0200 |
| 272 |
@@ -31,6 +31,6 @@ |
| 273 |
|
| 274 |
# Install test file description |
| 275 |
test_description.files = tests.xml |
| 276 |
-test_description.path = $$QMF_INSTALL_ROOT/tests |
| 277 |
+test_description.path = $$[QT_INSTALL_DATA]/tests |
| 278 |
|
| 279 |
INSTALLS += test_description |
| 280 |
diff -Naur qmf-9999.orig/tests/tst_python_email/tst_python_email.pro qmf-9999/tests/tst_python_email/tst_python_email.pro |
| 281 |
--- qmf-9999.orig/tests/tst_python_email/tst_python_email.pro 2011-10-28 00:16:42.812798139 +0200 |
| 282 |
+++ qmf-9999/tests/tst_python_email/tst_python_email.pro 2011-10-28 00:16:58.476602315 +0200 |
| 283 |
@@ -5,7 +5,7 @@ |
| 284 |
!symbian { |
| 285 |
DEFINES += SRCDIR=\\\"$$_PRO_FILE_PWD_\\\" |
| 286 |
|
| 287 |
- testdata.path = $$QMF_INSTALL_ROOT/tests/testdata |
| 288 |
+ testdata.path = $$[QT_INSTALL_DATA]/tests/testdata |
| 289 |
testdata.files = testdata/* |
| 290 |
|
| 291 |
INSTALLS += testdata |
Archives