Date: Friday, January 27, 2023 @ 21:39:39
Author: arojas
Revision: 467462
archrelease: copy kde-unstable to kde-unstable-x86_64
Added:
qt6-base/repos/kde-unstable-x86_64/PKGBUILD
(from rev 467461, qt6-base/kde-unstable/PKGBUILD)
qt6-base/repos/kde-unstable-x86_64/qt6-base-cflags.patch
(from rev 467461, qt6-base/kde-unstable/qt6-base-cflags.patch)
qt6-base/repos/kde-unstable-x86_64/qt6-base-nostrip.patch
(from rev 467461, qt6-base/kde-unstable/qt6-base-nostrip.patch)
Deleted:
qt6-base/repos/kde-unstable-x86_64/PKGBUILD
qt6-base/repos/kde-unstable-x86_64/fix-abi.patch
qt6-base/repos/kde-unstable-x86_64/qt6-base-cflags.patch
qt6-base/repos/kde-unstable-x86_64/qt6-base-nostrip.patch
------------------------+
PKGBUILD | 152 ++++++++++++++++++++++------------------------
fix-abi.patch | 154 -----------------------------------------------
qt6-base-cflags.patch | 92 ++++++++++++++--------------
qt6-base-nostrip.patch | 26 +++----
4 files changed, 133 insertions(+), 291 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2023-01-27 21:30:34 UTC (rev 467461)
+++ PKGBUILD 2023-01-27 21:39:39 UTC (rev 467462)
@@ -1,78 +0,0 @@
-# Maintainer: Antonio Rojas <[email protected]>
-# Maintainer: Felix Yan <[email protected]>
-# Contributor: Andrea Scarpino <[email protected]>
-
-pkgname=qt6-base
-_qtver=6.5.0-beta1
-pkgver=${_qtver/-/}
-pkgrel=3
-arch=(x86_64)
-url='https://www.qt.io'
-license=(GPL3 LGPL3 FDL custom)
-pkgdesc='A cross-platform application and UI framework'
-depends=(libjpeg-turbo xcb-util-keysyms xcb-util-cursor libgl fontconfig
xdg-utils
- shared-mime-info xcb-util-wm libxrender libxi sqlite mesa
vulkan-headers
- tslib libinput libxkbcommon-x11 libproxy libcups double-conversion
brotli libb2 md4c)
-makedepends=(cmake ninja libfbclient mariadb-libs unixodbc postgresql alsa-lib
gst-plugins-base-libs
- gtk3 libpulse cups freetds xmlstarlet)
-optdepends=('qt6-wayland: to run Qt6 applications in a Wayland session'
- 'postgresql-libs: PostgreSQL driver'
- 'mariadb-libs: MariaDB driver'
- 'unixodbc: ODBC driver'
- 'libfbclient: Firebird/iBase driver'
- 'freetds: MS SQL driver'
- 'gtk3: GTK platform plugin'
- 'perl: for syncqt')
-groups=(qt6)
-options=(debug)
-_pkgfn=${pkgname/6-/}-everywhere-src-$_qtver
-source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz
- qt6-base-cflags.patch
- qt6-base-nostrip.patch
- fix-abi.patch)
-sha256sums=('8357aa58c86ade1eeda535177b5e40578662a1a3f75571bfb799e1eae356b2ce'
- '5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78'
- '4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094'
- 'c0b0475c1df4175c7d1420c9833386940097256dcea56c02104fd4d6340f414f')
-
-prepare() {
- patch -d $_pkgfn -p1 < qt6-base-cflags.patch # Use system CFLAGS
- patch -d $_pkgfn -p1 < qt6-base-nostrip.patch # Don't strip binaries with
qmake
- patch -d $_pkgfn -p1 < fix-abi.patch # Fix ABI breakage
-}
-
-build() {
- cmake -B build -S $_pkgfn -G Ninja \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=RelWithDebInfo \
- -DINSTALL_BINDIR=lib/qt6/bin \
- -DINSTALL_PUBLICBINDIR=usr/bin \
- -DINSTALL_LIBEXECDIR=lib/qt6 \
- -DINSTALL_DOCDIR=share/doc/qt6 \
- -DINSTALL_ARCHDATADIR=lib/qt6 \
- -DINSTALL_DATADIR=share/qt6 \
- -DINSTALL_INCLUDEDIR=include/qt6 \
- -DINSTALL_MKSPECSDIR=lib/qt6/mkspecs \
- -DINSTALL_EXAMPLESDIR=share/doc/qt6/examples \
- -DQT_FEATURE_journald=ON \
- -DQT_FEATURE_openssl_linked=ON \
- -DQT_FEATURE_system_sqlite=ON \
- -DQT_FEATURE_system_xcb_xinput=ON \
- -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \
- -DCMAKE_MESSAGE_LOG_LEVEL=STATUS
- cmake --build build
-}
-
-package() {
- depends+=(qt6-translations)
- DESTDIR="$pkgdir" cmake --install build
-
- install -Dm644 $_pkgfn/LICENSES/* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-# Install symlinks for user-facing tools
- cd "$pkgdir"
- mkdir usr/bin
- while read _line; do
- ln -s $_line
- done < "$srcdir"/build/user_facing_tool_links.txt
-}
Copied: qt6-base/repos/kde-unstable-x86_64/PKGBUILD (from rev 467461,
qt6-base/kde-unstable/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2023-01-27 21:39:39 UTC (rev 467462)
@@ -0,0 +1,74 @@
+# Maintainer: Antonio Rojas <[email protected]>
+# Maintainer: Felix Yan <[email protected]>
+# Contributor: Andrea Scarpino <[email protected]>
+
+pkgname=qt6-base
+_qtver=6.5.0-beta2
+pkgver=${_qtver/-/}
+pkgrel=1
+arch=(x86_64)
+url='https://www.qt.io'
+license=(GPL3 LGPL3 FDL custom)
+pkgdesc='A cross-platform application and UI framework'
+depends=(libjpeg-turbo xcb-util-keysyms xcb-util-cursor libgl fontconfig
xdg-utils
+ shared-mime-info xcb-util-wm libxrender libxi sqlite mesa
vulkan-headers
+ tslib libinput libxkbcommon-x11 libproxy libcups double-conversion
brotli libb2 md4c)
+makedepends=(cmake ninja libfbclient mariadb-libs unixodbc postgresql alsa-lib
gst-plugins-base-libs
+ gtk3 libpulse cups freetds xmlstarlet)
+optdepends=('qt6-wayland: to run Qt6 applications in a Wayland session'
+ 'postgresql-libs: PostgreSQL driver'
+ 'mariadb-libs: MariaDB driver'
+ 'unixodbc: ODBC driver'
+ 'libfbclient: Firebird/iBase driver'
+ 'freetds: MS SQL driver'
+ 'gtk3: GTK platform plugin'
+ 'perl: for syncqt')
+groups=(qt6)
+_pkgfn=${pkgname/6-/}-everywhere-src-$_qtver
+source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz
+ qt6-base-cflags.patch
+ qt6-base-nostrip.patch)
+sha256sums=('15f7af35c1cfb7a4cf6103879d61aa5e682f4ed577bb0bb73c56f0d927208a15'
+ '5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78'
+ '4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094')
+
+prepare() {
+ patch -d $_pkgfn -p1 < qt6-base-cflags.patch # Use system CFLAGS
+ patch -d $_pkgfn -p1 < qt6-base-nostrip.patch # Don't strip binaries with
qmake
+}
+
+build() {
+ cmake -B build -S $_pkgfn -G Ninja \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DINSTALL_BINDIR=lib/qt6/bin \
+ -DINSTALL_PUBLICBINDIR=usr/bin \
+ -DINSTALL_LIBEXECDIR=lib/qt6 \
+ -DINSTALL_DOCDIR=share/doc/qt6 \
+ -DINSTALL_ARCHDATADIR=lib/qt6 \
+ -DINSTALL_DATADIR=share/qt6 \
+ -DINSTALL_INCLUDEDIR=include/qt6 \
+ -DINSTALL_MKSPECSDIR=lib/qt6/mkspecs \
+ -DINSTALL_EXAMPLESDIR=share/doc/qt6/examples \
+ -DQT_FEATURE_journald=ON \
+ -DQT_FEATURE_openssl_linked=ON \
+ -DQT_FEATURE_system_sqlite=ON \
+ -DQT_FEATURE_system_xcb_xinput=ON \
+ -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \
+ -DCMAKE_MESSAGE_LOG_LEVEL=STATUS
+ cmake --build build
+}
+
+package() {
+ depends+=(qt6-translations)
+ DESTDIR="$pkgdir" cmake --install build
+
+ install -Dm644 $_pkgfn/LICENSES/* -t "$pkgdir"/usr/share/licenses/$pkgbase
+
+# Install symlinks for user-facing tools
+ cd "$pkgdir"
+ mkdir usr/bin
+ while read _line; do
+ ln -s $_line
+ done < "$srcdir"/build/user_facing_tool_links.txt
+}
Deleted: fix-abi.patch
===================================================================
--- fix-abi.patch 2023-01-27 21:30:34 UTC (rev 467461)
+++ fix-abi.patch 2023-01-27 21:39:39 UTC (rev 467462)
@@ -1,154 +0,0 @@
-From ed82950776e0eb59e7a5c32287ca488256883ba8 Mon Sep 17 00:00:00 2001
-From: Thiago Macieira <[email protected]>
-Date: Fri, 23 Dec 2022 08:42:37 -0300
-Subject: Fix improper ELF versions of certain symbols
-
-They got marked as Qt6_PRIVATE_API because of these private header
-defining classes that don't follow Qt's naming convention ("mutex",
-"condition_variable", "ControlElement"). We have an exclusion for
-classes whose name start with Q.
-
-Introduced by 5d903a64aca37ee7c2836e479e175336e9b7ca87 in the old Perl
-syncqt and ported over.
-
-Fixes: QTBUG-109605
-Fixes: QTBUG-109604
-Change-Id: I69ecc04064514f939896fffd173369623c960bcc
-Reviewed-by: Alexey Edelev <[email protected]>
-(cherry picked from commit 41b38c802b2b6251bdd65f8bf0d2031c304d70f6)
-Reviewed-by: Qt Cherry-pick Bot <[email protected]>
----
- src/corelib/thread/qwaitcondition_p.h | 5 +++++
- src/widgets/widgets/qmdisubwindow_p.h | 4 ++--
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/src/corelib/thread/qwaitcondition_p.h
b/src/corelib/thread/qwaitcondition_p.h
-index 0893e9dd35..cfb36ca30b 100644
---- a/src/corelib/thread/qwaitcondition_p.h
-+++ b/src/corelib/thread/qwaitcondition_p.h
-@@ -19,6 +19,11 @@
- #include <QtCore/QDeadlineTimer>
- #include <QtCore/private/qglobal_p.h>
-
-+// This header always defines a class called "mutex" and one called
-+// "condition_variable", so those mustn't be used to mark ELF symbol
-+// visibility. Don't add more classes to this header!
-+// ELFVERSION:stop
-+
- #include <condition_variable>
- #include <mutex>
-
-diff --git a/src/widgets/widgets/qmdisubwindow_p.h
b/src/widgets/widgets/qmdisubwindow_p.h
-index 60909eb3bc..2a1f83269a 100644
---- a/src/widgets/widgets/qmdisubwindow_p.h
-+++ b/src/widgets/widgets/qmdisubwindow_p.h
-@@ -39,7 +39,7 @@ class QMouseEvent;
-
- namespace QMdi {
- template<typename T>
--class ControlElement : public T
-+class ControlElement : public T // ELFVERSION:ignore
- {
- public:
- ControlElement(QMdiSubWindow *child) : T(child, nullptr)
-@@ -58,7 +58,7 @@ public:
- QPointer<QMdiSubWindow> mdiChild;
- };
-
--class ControlContainer : public QObject
-+class ControlContainer : public QObject // ELFVERSION:ignore
- {
- public:
- ControlContainer(QMdiSubWindow *mdiChild);
---
-cgit v1.2.1
-
-From 4ddb97d2a187e2e32c6c564d64ef53b8e8090369 Mon Sep 17 00:00:00 2001
-From: Alexey Edelev <[email protected]>
-Date: Tue, 03 Jan 2023 18:49:09 +0100
-Subject: [PATCH] Avoid breaking version script generator state
-
-Pass every line to parseVersionScriptContent to not break the
-version script generator state. The parser doesn't collect characters
-from comment block, so the line containing the 'ignore-next' ELFVERSION
-tag produces empty buffer for the further parsing process. Call the
-parseVersionScriptContent function even on empty buffers to make sure
-that 'ignore-next' counts lines correcly.
-
-Pick-to: 6.5
-Fixes: QTBUG-109790
-Change-Id: I5f77893462d397f6738a5da1af6ed8dd8a2df70a
----
-
-diff --git a/src/tools/syncqt/main.cpp b/src/tools/syncqt/main.cpp
-index 4567f7c4..4a82f9b 100644
---- a/src/tools/syncqt/main.cpp
-+++ b/src/tools/syncqt/main.cpp
-@@ -882,6 +882,9 @@
- break;
- }
-
-+ if (buffer.empty())
-+ return;
-+
- std::smatch match;
- std::string symbol;
- if (std::regex_match(buffer, match, VersionScriptSymbolRegex) &&
match[2].str().empty())
-@@ -1103,14 +1106,15 @@
- }
- line.clear();
-
-- if (buffer.empty())
-- continue;
- scannerDebug() << m_currentFilename << ": " << buffer <<
std::endl;
-
- if (m_currentFileType & PrivateHeader) {
- parseVersionScriptContent(buffer, result);
- }
-
-+ if (buffer.empty())
-+ continue;
-+
- ++linesProcessed;
-
- bool skipSymbols =
-From fc54d8661d305eab0a52a1c34a71c79bd3d7c6ae Mon Sep 17 00:00:00 2001
-From: Thiago Macieira <[email protected]>
-Date: Tue, 03 Jan 2023 11:13:05 -0300
-Subject: [PATCH] Fix improper ELF versions of two more classes
-
-They got marked as Qt6_PRIVATE_API because of these ARE private classes,
-however their pointers are used in user code. For QMutexPrivate, because
-we manipulate the pointer in inline code; for QPostEventList, because
-it's used in a virtual member function's parameter list.
-
-Pick-to: 6.5
-Fixes: QTBUG-109605
-Change-Id: I69ecc04064514f939896fffd1736d1fa8d3f1768
----
-
-diff --git a/src/corelib/thread/qmutex_p.h b/src/corelib/thread/qmutex_p.h
-index e5932d0..565de31 100644
---- a/src/corelib/thread/qmutex_p.h
-+++ b/src/corelib/thread/qmutex_p.h
-@@ -36,6 +36,8 @@
-
- QT_BEGIN_NAMESPACE
-
-+// We manipulate the pointer to this class in inline, atomic code,
-+// so syncqt mustn't mark them as private, so ELFVERSION:ignore-next
- class QMutexPrivate
- {
- public:
-diff --git a/src/corelib/thread/qthread_p.h b/src/corelib/thread/qthread_p.h
-index b647964..9aa0b3e 100644
---- a/src/corelib/thread/qthread_p.h
-+++ b/src/corelib/thread/qthread_p.h
-@@ -58,6 +58,7 @@
-
- // This class holds the list of posted events.
- // The list has to be kept sorted by priority
-+// It's used in a virtual in QCoreApplication, so ELFVERSION:ignore-next
- class QPostEventList : public QList<QPostEvent>
- {
- public:
Deleted: qt6-base-cflags.patch
===================================================================
--- qt6-base-cflags.patch 2023-01-27 21:30:34 UTC (rev 467461)
+++ qt6-base-cflags.patch 2023-01-27 21:39:39 UTC (rev 467462)
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
-
- include(g++-base.conf)
-
--QMAKE_LFLAGS_RELEASE += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else {
QMAKE_LFLAGS_RELEASE += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS += -M
- QMAKE_CFLAGS_WARN_ON += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF += -w
--QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else {
QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g
$$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO +=
$$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS))
} else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) }
else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g
$$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO +=
$$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG +=
$$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP += $$QMAKE_CFLAGS_APP
Copied: qt6-base/repos/kde-unstable-x86_64/qt6-base-cflags.patch (from rev
467461, qt6-base/kde-unstable/qt6-base-cflags.patch)
===================================================================
--- qt6-base-cflags.patch (rev 0)
+++ qt6-base-cflags.patch 2023-01-27 21:39:39 UTC (rev 467462)
@@ -0,0 +1,46 @@
+diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
+index a493cd5984..41342f5020 100644
+--- a/mkspecs/common/g++-unix.conf
++++ b/mkspecs/common/g++-unix.conf
+@@ -10,5 +10,6 @@
+
+ include(g++-base.conf)
+
+-QMAKE_LFLAGS_RELEASE += -Wl,-O1
++SYSTEM_LDFLAGS = $$(LDFLAGS)
++!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else {
QMAKE_LFLAGS_RELEASE += -Wl,-O1 }
+ QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined
+diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
+index 1f919d270a..7ef6046326 100644
+--- a/mkspecs/common/gcc-base.conf
++++ b/mkspecs/common/gcc-base.conf
+@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
+ QMAKE_CFLAGS_DEPS += -M
+ QMAKE_CFLAGS_WARN_ON += -Wall -Wextra
+ QMAKE_CFLAGS_WARN_OFF += -w
+-QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE
+-QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
+-QMAKE_CFLAGS_DEBUG += -g
++SYSTEM_CFLAGS = $$(CFLAGS)
++SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
++!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else {
QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
++!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g
$$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO +=
$$QMAKE_CFLAGS_OPTIMIZE -g }
++!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS))
} else { QMAKE_CFLAGS_DEBUG += -g }
+ QMAKE_CFLAGS_SHLIB += $$QMAKE_CFLAGS_PIC
+ QMAKE_CFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_PIC
+ QMAKE_CFLAGS_APP += $$QMAKE_CFLAGS_PIC
+@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS += $$QMAKE_CFLAGS
+ QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS
+ QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON
+ QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF
+-QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_RELEASE
+-QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
+-QMAKE_CXXFLAGS_DEBUG += $$QMAKE_CFLAGS_DEBUG
++SYSTEM_CXXFLAGS = $$(CXXFLAGS)
++SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
++!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) }
else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
++!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g
$$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO +=
$$QMAKE_CFLAGS_OPTIMIZE -g }
++!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG +=
$$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
+ QMAKE_CXXFLAGS_SHLIB += $$QMAKE_CFLAGS_SHLIB
+ QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
+ QMAKE_CXXFLAGS_APP += $$QMAKE_CFLAGS_APP
Deleted: qt6-base-nostrip.patch
===================================================================
--- qt6-base-nostrip.patch 2023-01-27 21:30:34 UTC (rev 467461)
+++ qt6-base-nostrip.patch 2023-01-27 21:39:39 UTC (rev 467462)
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
Copied: qt6-base/repos/kde-unstable-x86_64/qt6-base-nostrip.patch (from rev
467461, qt6-base/kde-unstable/qt6-base-nostrip.patch)
===================================================================
--- qt6-base-nostrip.patch (rev 0)
+++ qt6-base-nostrip.patch 2023-01-27 21:39:39 UTC (rev 467462)
@@ -0,0 +1,13 @@
+diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
+index 99d77156fd..fc840fe9f6 100644
+--- a/mkspecs/common/gcc-base.conf
++++ b/mkspecs/common/gcc-base.conf
+@@ -31,6 +31,8 @@
+ # you can use the manual test in tests/manual/mkspecs.
+ #
+
++CONFIG += nostrip
++
+ QMAKE_CFLAGS_OPTIMIZE = -O2
+ QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
+ QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
