From 88c53c97d4c1d4c785306b904277ebc6c9c456993d70f3bd0cb114473c62361d Mon Sep 17 00:00:00 2001 From: Christophe Marin Date: Wed, 11 Oct 2023 11:50:11 +0000 Subject: [PATCH] Accepting request 1116657 from home:krop:Qt6:Release Qt 6.6.0. Not built yet OBS-URL: https://build.opensuse.org/request/show/1116657 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt6/qt6-base?expand=0&rev=73 --- ...ip-binaries-when-building-with-qmake.patch | 39 +++++++++++++++++++ qt6-base.changes | 12 ++++++ qt6-base.spec | 9 +++-- qtbase-everywhere-src-6.5.3.tar.xz | 3 -- qtbase-everywhere-src-6.6.0.tar.xz | 3 ++ 5 files changed, 60 insertions(+), 6 deletions(-) create mode 100644 0001-Don-t-strip-binaries-when-building-with-qmake.patch delete mode 100644 qtbase-everywhere-src-6.5.3.tar.xz create mode 100644 qtbase-everywhere-src-6.6.0.tar.xz diff --git a/0001-Don-t-strip-binaries-when-building-with-qmake.patch b/0001-Don-t-strip-binaries-when-building-with-qmake.patch new file mode 100644 index 0000000..8078ebe --- /dev/null +++ b/0001-Don-t-strip-binaries-when-building-with-qmake.patch @@ -0,0 +1,39 @@ +From e43300d226ca98dbda1b1b69c3a1aaf8543f0a16 Mon Sep 17 00:00:00 2001 +From: Christophe Marin +Date: Wed, 4 Oct 2023 09:24:42 +0200 +Subject: [PATCH] Don't strip binaries when building with qmake + +Change-Id: I134f83b0a4fb1636d15f527585f8e9c9892f9057 +--- + mkspecs/common/gcc-base.conf | 2 ++ + mkspecs/common/linux.conf | 4 ++-- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf +index ae58326289..3a686cf18c 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 +diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf +index 544cc22715..b809cffeeb 100644 +--- a/mkspecs/common/linux.conf ++++ b/mkspecs/common/linux.conf +@@ -48,5 +48,5 @@ QMAKE_OBJCOPY = objcopy + QMAKE_NM = nm -P + QMAKE_RANLIB = + +-QMAKE_STRIP = strip +-QMAKE_STRIPFLAGS_LIB += --strip-unneeded ++QMAKE_STRIP = ++QMAKE_STRIPFLAGS_LIB += +-- +2.42.0 + diff --git a/qt6-base.changes b/qt6-base.changes index 5aa8d03..e1b5c8b 100644 --- a/qt6-base.changes +++ b/qt6-base.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Oct 10 09:39:48 UTC 2023 - Christophe Marin + +- Update to 6.6.0 + * https://www.qt.io/blog/qt-6.6-released + +------------------------------------------------------------------- +Wed Oct 4 07:25:51 UTC 2023 - Christophe Marin + +- Add patch to fix creation of -debuginfo packages for qmake builds: + * 0001-Don-t-strip-binaries-when-building-with-qmake.patch + ------------------------------------------------------------------- Thu Sep 28 07:34:06 UTC 2023 - Christophe Marin diff --git a/qt6-base.spec b/qt6-base.spec index 4c77541..578d25f 100644 --- a/qt6-base.spec +++ b/qt6-base.spec @@ -16,8 +16,8 @@ # -%define real_version 6.5.3 -%define short_version 6.5 +%define real_version 6.6.0 +%define short_version 6.6 %define tar_name qtbase-everywhere-src %define tar_suffix %{nil} # @@ -30,7 +30,7 @@ %global with_gles 1 %endif Name: qt6-base%{?pkg_suffix} -Version: 6.5.3 +Version: 6.6.0 Release: 0 Summary: Qt 6 core components (Core, Gui, Widgets, Network...) # Legal: qtpaths is BSD-3-Clause @@ -46,6 +46,7 @@ Patch101: 0001-CMake-Install-objects-files-into-ARCHDATADIR.patch %if 0%{?suse_version} == 1500 Patch102: 0001-Require-GCC-12.patch %endif +Patch103: 0001-Don-t-strip-binaries-when-building-with-qmake.patch ## BuildRequires: cmake >= 3.18.3 BuildRequires: cups-devel @@ -853,6 +854,7 @@ rm -r %{buildroot}%{_qt6_mkspecsdir}/features/uikit %{_bindir}/qdbusxml2cpp6 %{_bindir}/qmake6 %{_bindir}/qt-cmake6 +%{_bindir}/qt-cmake-create6 %{_bindir}/qt-configure-module6 %{_bindir}/qtpaths6 %{_qt6_bindir}/androiddeployqt @@ -861,6 +863,7 @@ rm -r %{buildroot}%{_qt6_mkspecsdir}/features/uikit %{_qt6_bindir}/qdbusxml2cpp %{_qt6_bindir}/qmake %{_qt6_bindir}/qt-cmake +%{_qt6_bindir}/qt-cmake-create %{_qt6_bindir}/qt-configure-module %{_qt6_bindir}/qtpaths %{_qt6_cmakedir}/Qt6/ diff --git a/qtbase-everywhere-src-6.5.3.tar.xz b/qtbase-everywhere-src-6.5.3.tar.xz deleted file mode 100644 index f30e981..0000000 --- a/qtbase-everywhere-src-6.5.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:df2f4a230be4ea04f9798f2c19ab1413a3b8ec6a80bef359f50284235307b546 -size 47142456 diff --git a/qtbase-everywhere-src-6.6.0.tar.xz b/qtbase-everywhere-src-6.6.0.tar.xz new file mode 100644 index 0000000..ba4c471 --- /dev/null +++ b/qtbase-everywhere-src-6.6.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:039d53312acb5897a9054bd38c9ccbdab72500b71fdccdb3f4f0844b0dd39e0e +size 48350308