From d3e98555e649ad670039888e96ffcc63206b8825 Mon Sep 17 00:00:00 2001 From: Ariadne Conill Date: Tue, 10 Aug 2021 12:21:57 -0600 Subject: Revert "community/qt5-qtbase: fix -dbg (#12889)" This reverts commit 9238f96475ab45281ce3d0cdfbf37efcbdeb8888. --- community/qt5-qtbase/APKBUILD | 14 ++++----- community/qt5-qtbase/qt5-base-cflags.patch | 46 ----------------------------- community/qt5-qtbase/qt5-base-nostrip.patch | 13 -------- 3 files changed, 5 insertions(+), 68 deletions(-) delete mode 100644 community/qt5-qtbase/qt5-base-cflags.patch delete mode 100644 community/qt5-qtbase/qt5-base-nostrip.patch diff --git a/community/qt5-qtbase/APKBUILD b/community/qt5-qtbase/APKBUILD index db36559b256..80ac863d68b 100644 --- a/community/qt5-qtbase/APKBUILD +++ b/community/qt5-qtbase/APKBUILD @@ -1,16 +1,16 @@ # Maintainer: Bart Ribbers pkgname=qt5-qtbase pkgver=5.15.3_git20210713 -pkgrel=1 +pkgrel=2 _commit="663d240a18f5acac82fd2bd0fd4a33c4f47b260a" pkgdesc="Qt5 - QtBase components" url="https://qt.io/developers/" arch="all" license="LGPL-2.1-only AND LGPL-3.0-only AND GPL-3.0-only AND Qt-GPL-exception-1.0" -_sub="$pkgname-sqlite $pkgname-odbc $pkgname-postgresql - $pkgname-mysql $pkgname-tds $pkgname-x11" +_sub="$pkgname-sqlite $pkgname-odbc $pkgname-postgresql $pkgname-mysql + $pkgname-tds $pkgname-x11 $pkgname-dbg" depends="xdg-utils" -depends_dev=" +depends_dev="$_sub dbus-dev fontconfig-dev freetype-dev @@ -59,7 +59,7 @@ makedepends="$depends_dev xcb-util-renderutil-dev xcb-util-wm-dev " -subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc $_sub" +subpackages="$pkgname-dev $pkgname-doc $_sub" provides="qtbase" builddir="$srcdir/qtbase-$_commit" @@ -73,8 +73,6 @@ esac source="https://invent.kde.org/qt/qt/qtbase/-/archive/$_commit/qtbase-$_commit.tar.gz qt-musl-iconv-no-bom.patch - qt5-base-cflags.patch - qt5-base-nostrip.patch " _qt5_prefix=/usr/lib/qt5 @@ -240,6 +238,4 @@ x11() { sha512sums=" fb67bbc097c5181fe27736f546df2ac3f53d99a1cd19f9227eaec1fdfbc62288cfd1fea75268f3d431a8cdd1bf7e581b189b8f08a56453205783190bbabf87d4 qtbase-663d240a18f5acac82fd2bd0fd4a33c4f47b260a.tar.gz 7d68421a14f0259535c977d8a521c98918193c107b76ac664571b12f5b0d7588a0d0e1297af412a26753a393b21f3f44c3274fa8ab5bc87f03705a3a03acb444 qt-musl-iconv-no-bom.patch -fa3dddfe42b7f0ade45bd0530badfc3a3800adbd3798bd814597527713c9fe360a242f7cf39312f4cc3c88e9bd7aba233bd6674c0fc78e694a1fd868474c4240 qt5-base-cflags.patch -af061bb56d5079d11407e6eb352fa4af7fefa6aed7f8cc40b5b2d591ef7ff04e9da6c6d534ca1904355ea7552951a1610fdcefb04ef9d696cb2b23ad6a0606e8 qt5-base-nostrip.patch " diff --git a/community/qt5-qtbase/qt5-base-cflags.patch b/community/qt5-qtbase/qt5-base-cflags.patch deleted file mode 100644 index c33aa78e7e9..00000000000 --- a/community/qt5-qtbase/qt5-base-cflags.patch +++ /dev/null @@ -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 += $$(CPPFLAGS) $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE } -+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$(CPPFLAGS) -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 += $$(CPPFLAGS) $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE } -+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$(CPPFLAGS) -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 diff --git a/community/qt5-qtbase/qt5-base-nostrip.patch b/community/qt5-qtbase/qt5-base-nostrip.patch deleted file mode 100644 index 17d24b4b655..00000000000 --- a/community/qt5-qtbase/qt5-base-nostrip.patch +++ /dev/null @@ -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 -- cgit v1.2.3