forked from pool/libqt5-qtbase
e25a4c083c
- Add patch to restore compatibility with akonadi's PGSQL backend (see https://bugs.archlinux.org/task/62997): * 0001-Revert-Always-escape-the-table-names-when-creating-t.patch - Disable libzstd support again, it breaks various existing codebases (QTBUG-76521) - Update to 5.13.0: * New bugfix release * No changelog available * For more details about Qt 5.13 please see: * http://code.qt.io/cgit/qt/qtbase.git/plain/dist/changes-5.13.0/?h=5.13 - Remove patches, now upstream: * 0001-Add-quoting-to-deal-with-empty-CMAKE_CXX_STANDARD_LI.patch - Add patches to improve compatibility with Krita: * 0001-Fix-notification-of-QDockWidget-when-it-gets-undocke.patch * 0002-Synthesize-Enter-LeaveEvent-for-accepted-QTabletEven.patch * 0003-Add-an-ID-for-recognition-of-UGEE-tablets.patch - Revert yet another commit to fix linker errors: * 0001-Revert-qmake-link-qt-libraries-by-full-path.patch - Enable libzstd support - Revert some commits in the hope of fixing some broken paths (QTBUG-76255): * 0001-Revert-Fix-QMAKE_PRL_INSTALL_REPLACE-for-macOS.patch * 0002-Revert-Replace-absolute-Qt-lib-dir-in-.prl-files.patch * 0003-Revert-Fix-prl-replacements-if-libdir-is-in-QMAKE_DE.patch - Add patch to fix some cmake module config files (QTBUG-76244): OBS-URL: https://build.opensuse.org/request/show/712125 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtbase?expand=0&rev=97
35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
From a473f90a3637255d8443ab8621b57a3e9d90b031 Mon Sep 17 00:00:00 2001
|
|
From: Fabian Vogt <fabian@ritter-vogt.de>
|
|
Date: Thu, 6 Jun 2019 20:05:27 +0200
|
|
Subject: [PATCH 1/3] Revert "Fix QMAKE_PRL_INSTALL_REPLACE for macOS"
|
|
|
|
This reverts commit 015d7f16cb0b6812950caa3bcde3b6758403ae34.
|
|
---
|
|
mkspecs/features/qt_common.prf | 8 ++------
|
|
1 file changed, 2 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf
|
|
index e64dfa98c2..17a07dbab9 100644
|
|
--- a/mkspecs/features/qt_common.prf
|
|
+++ b/mkspecs/features/qt_common.prf
|
|
@@ -49,14 +49,10 @@ contains(TEMPLATE, .*lib) {
|
|
lib_replace.match = $$rplbase/lib
|
|
lib_replace.replace = $$qqt_libdir
|
|
}
|
|
+ !equals(qt_libdir, $$rplbase/lib): \
|
|
+ lib_replace.match = \\($$lib_replace.match\\)\\|\\($$qt_libdir\\)
|
|
lib_replace.CONFIG = path
|
|
QMAKE_PRL_INSTALL_REPLACE += lib_replace
|
|
- !equals(qt_libdir, $$rplbase/lib) {
|
|
- qtlibdir_replace.match = $$qt_libdir
|
|
- qtlibdir_replace.replace = $$qqt_libdir
|
|
- qtlibdir_replace.CONFIG = path
|
|
- QMAKE_PRL_INSTALL_REPLACE += qtlibdir_replace
|
|
- }
|
|
}
|
|
|
|
# The remainder of this file must not apply to host tools/libraries,
|
|
--
|
|
2.21.0
|
|
|