From 14b1643e518bf00bc9a83a120a21ffa337dc78fa Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Fri, 9 Sep 2022 15:47:09 +0200 Subject: [PATCH 01/12] fixed bz#2120316 - qt3 shouldn't require postgresql-private-devel --- qt3.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/qt3.spec b/qt3.spec index e9b70c9..cdb89f5 100644 --- a/qt3.spec +++ b/qt3.spec @@ -6,7 +6,7 @@ Name: qt3 Summary: The shared library for the Qt 3 GUI toolkit Version: 3.3.8b -Release: 91%{?dist} +Release: 92%{?dist} License: QPL or GPLv2 or GPLv3 Url: http://www.troll.no Source0: ftp://ftp.trolltech.com/qt/source/qt-x11-free-%{version}.tar.gz @@ -172,9 +172,6 @@ BuildRequires: mariadb-connector-c-devel %else BuildRequires: mysql-devel %endif -BuildRequires: postgresql-private-devel -# This is resolved in newer Qt by not requiring PG server -# related headers. BuildRequires: postgresql-server-devel BuildRequires: unixODBC-devel %if 0%{?rhel} && 0%{?rhel} < 7 @@ -649,6 +646,9 @@ mkdir -p %{buildroot}%{qtdir}/plugins/styles %changelog +* Fri Sep 09 2022 Than Ngo - 3.3.8b-92 +- fixed bz#2120316 - qt3 shouldn't require postgresql-private-devel + * Sat Jul 23 2022 Fedora Release Engineering - 3.3.8b-91 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 57c87220b85406bc0ee763dbe4a3566d21a7be2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sloup?= Date: Wed, 16 Nov 2022 11:36:34 +0100 Subject: [PATCH 02/12] Rebuild for PostgreSQL 15 (side-tag) --- qt3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt3.spec b/qt3.spec index cdb89f5..bda7b2f 100644 --- a/qt3.spec +++ b/qt3.spec @@ -6,7 +6,7 @@ Name: qt3 Summary: The shared library for the Qt 3 GUI toolkit Version: 3.3.8b -Release: 92%{?dist} +Release: 93%{?dist} License: QPL or GPLv2 or GPLv3 Url: http://www.troll.no Source0: ftp://ftp.trolltech.com/qt/source/qt-x11-free-%{version}.tar.gz @@ -646,6 +646,9 @@ mkdir -p %{buildroot}%{qtdir}/plugins/styles %changelog +* Wed Nov 16 2022 Ondřej Sloup - 3.3.8b-93 +- Rebuild for new PostgreSQL 15 + * Fri Sep 09 2022 Than Ngo - 3.3.8b-92 - fixed bz#2120316 - qt3 shouldn't require postgresql-private-devel From c14a39ea3d9377aa3493d2aa33f79577c3108e08 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 19:01:54 +0000 Subject: [PATCH 03/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- qt3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt3.spec b/qt3.spec index bda7b2f..f0cf022 100644 --- a/qt3.spec +++ b/qt3.spec @@ -6,7 +6,7 @@ Name: qt3 Summary: The shared library for the Qt 3 GUI toolkit Version: 3.3.8b -Release: 93%{?dist} +Release: 94%{?dist} License: QPL or GPLv2 or GPLv3 Url: http://www.troll.no Source0: ftp://ftp.trolltech.com/qt/source/qt-x11-free-%{version}.tar.gz @@ -646,6 +646,9 @@ mkdir -p %{buildroot}%{qtdir}/plugins/styles %changelog +* Fri Jan 20 2023 Fedora Release Engineering - 3.3.8b-94 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Nov 16 2022 Ondřej Sloup - 3.3.8b-93 - Rebuild for new PostgreSQL 15 From 2ebb8446034ca4b09e962218c1beab99e9c09568 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 16:02:14 +0000 Subject: [PATCH 04/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- qt3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt3.spec b/qt3.spec index f0cf022..203fbda 100644 --- a/qt3.spec +++ b/qt3.spec @@ -6,7 +6,7 @@ Name: qt3 Summary: The shared library for the Qt 3 GUI toolkit Version: 3.3.8b -Release: 94%{?dist} +Release: 95%{?dist} License: QPL or GPLv2 or GPLv3 Url: http://www.troll.no Source0: ftp://ftp.trolltech.com/qt/source/qt-x11-free-%{version}.tar.gz @@ -646,6 +646,9 @@ mkdir -p %{buildroot}%{qtdir}/plugins/styles %changelog +* Fri Jul 21 2023 Fedora Release Engineering - 3.3.8b-95 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Fri Jan 20 2023 Fedora Release Engineering - 3.3.8b-94 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From ce7c7af404b07860dc0f54cc4a8659498954f070 Mon Sep 17 00:00:00 2001 From: Lukas Javorsky Date: Thu, 30 Nov 2023 09:38:16 +0000 Subject: [PATCH 05/12] Rebuilt for PostgreSQL 16 (BZ#2251109) For more info see the Fedora Change: https://fedoraproject.org/wiki/Changes/PostgreSQL_16 --- qt3.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/qt3.spec b/qt3.spec index 203fbda..7e8e13e 100644 --- a/qt3.spec +++ b/qt3.spec @@ -6,7 +6,7 @@ Name: qt3 Summary: The shared library for the Qt 3 GUI toolkit Version: 3.3.8b -Release: 95%{?dist} +Release: 96%{?dist} License: QPL or GPLv2 or GPLv3 Url: http://www.troll.no Source0: ftp://ftp.trolltech.com/qt/source/qt-x11-free-%{version}.tar.gz @@ -646,6 +646,10 @@ mkdir -p %{buildroot}%{qtdir}/plugins/styles %changelog +* Thu Nov 30 2023 Lukas Javorsky - 3.3.8b-96 +- Rebuilt for PostgreSQL 16 (BZ#2251109) +- For more info see the Fedora Change: https://fedoraproject.org/wiki/Changes/PostgreSQL_16 + * Fri Jul 21 2023 Fedora Release Engineering - 3.3.8b-95 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From e3caef4c477e8894cdee4b5da49f81f0efd1d222 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 09:44:46 +0000 Subject: [PATCH 06/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- qt3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt3.spec b/qt3.spec index 7e8e13e..290250a 100644 --- a/qt3.spec +++ b/qt3.spec @@ -6,7 +6,7 @@ Name: qt3 Summary: The shared library for the Qt 3 GUI toolkit Version: 3.3.8b -Release: 96%{?dist} +Release: 97%{?dist} License: QPL or GPLv2 or GPLv3 Url: http://www.troll.no Source0: ftp://ftp.trolltech.com/qt/source/qt-x11-free-%{version}.tar.gz @@ -646,6 +646,9 @@ mkdir -p %{buildroot}%{qtdir}/plugins/styles %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 3.3.8b-97 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Nov 30 2023 Lukas Javorsky - 3.3.8b-96 - Rebuilt for PostgreSQL 16 (BZ#2251109) - For more info see the Fedora Change: https://fedoraproject.org/wiki/Changes/PostgreSQL_16 From cd8c4498a0db1ef5ef5d919d81319f99ea46f46c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jan 2024 14:08:13 +0000 Subject: [PATCH 07/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- qt3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt3.spec b/qt3.spec index 290250a..245ba77 100644 --- a/qt3.spec +++ b/qt3.spec @@ -6,7 +6,7 @@ Name: qt3 Summary: The shared library for the Qt 3 GUI toolkit Version: 3.3.8b -Release: 97%{?dist} +Release: 98%{?dist} License: QPL or GPLv2 or GPLv3 Url: http://www.troll.no Source0: ftp://ftp.trolltech.com/qt/source/qt-x11-free-%{version}.tar.gz @@ -646,6 +646,9 @@ mkdir -p %{buildroot}%{qtdir}/plugins/styles %changelog +* Fri Jan 26 2024 Fedora Release Engineering - 3.3.8b-98 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Jan 22 2024 Fedora Release Engineering - 3.3.8b-97 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 96e6d306d54f25c57670a5ce87858f5295efcbea Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:49 +0200 Subject: [PATCH 08/12] Eliminate use of obsolete %patchN syntax (#2283636) --- qt3.spec | 108 +++++++++++++++++++++++++++---------------------------- 1 file changed, 54 insertions(+), 54 deletions(-) diff --git a/qt3.spec b/qt3.spec index 245ba77..2f5459d 100644 --- a/qt3.spec +++ b/qt3.spec @@ -282,86 +282,86 @@ for the Qt 3 toolkit. %prep %setup -q -n qt-x11-free-%{version} -%patch1 -p1 -b .cjk -%patch2 -p1 -b .ndebug -%patch3 -p1 -b .makefile -%patch4 -p1 -b .umask -%patch5 -p1 -b .strip +%patch -P1 -p1 -b .cjk +%patch -P2 -p1 -b .ndebug +%patch -P3 -p1 -b .makefile +%patch -P4 -p1 -b .umask +%patch -P5 -p1 -b .strip # drop backup file(s), else they get installed too, http://bugzilla.redhat.com/639459 rm -fv mkspecs/linux-g++*/qmake.conf.strip -%patch7 -p1 -b .quiet -%patch8 -p1 -b .qembed -%patch12 -p1 -b .nostdlib -%patch13 -p1 -b .fonts -%patch14 -p1 -b .gl -%patch19 -p1 -b .gtk +%patch -P7 -p1 -b .quiet +%patch -P8 -p1 -b .qembed +%patch -P12 -p1 -b .nostdlib +%patch -P13 -p1 -b .fonts +%patch -P14 -p1 -b .gl +%patch -P19 -p1 -b .gtk gcc -dumpversion ||: -%patch20 -p1 -b .hardcode-buildkey -%patch24 -p1 -b .uic -%patch25 -p1 -b .uic-multilib -%patch27 -p1 -b .fontrendering-ml_IN-bz#209097 -%patch29 -p1 -b .fontrendering-as_IN-bz#209972 -%patch31 -p1 -b .fontrendering-te_IN-bz#211259 -%patch32 -p1 -b .fontrendering-bz#214371 -%patch33 -p1 -b .fontrendering-#214570 -%patch34 -p1 -b .fontrendering-#209974 -%patch35 -p1 -b .fontrendering-ml_IN-217657 -%patch37 -p1 -b .fontrendering-gu-228452 -%patch38 -p1 -b .odbc +%patch -P20 -p1 -b .hardcode-buildkey +%patch -P24 -p1 -b .uic +%patch -P25 -p1 -b .uic-multilib +%patch -P27 -p1 -b .fontrendering-ml_IN-bz#209097 +%patch -P29 -p1 -b .fontrendering-as_IN-bz#209972 +%patch -P31 -p1 -b .fontrendering-te_IN-bz#211259 +%patch -P32 -p1 -b .fontrendering-bz#214371 +%patch -P33 -p1 -b .fontrendering-#214570 +%patch -P34 -p1 -b .fontrendering-#209974 +%patch -P35 -p1 -b .fontrendering-ml_IN-217657 +%patch -P37 -p1 -b .fontrendering-gu-228452 +%patch -P38 -p1 -b .odbc # it's not 100% clear to me if this is safe for all archs -- Rex %ifarch %{arm} -%patch39 -p1 -b .arm +%patch -P39 -p1 -b .arm %endif -%patch40 -p1 -b .sane_defaults +%patch -P40 -p1 -b .sane_defaults sed -i.KDE3_PLUGIN_PATH \ -e "s|@@KDE3_PLUGIN_PATH@@|%{_libdir}/kde3/plugins|" \ src/kernel/qapplication.cpp -%patch41 -p1 -b .cstddef -%patch42 -p1 -b .qlocale-aliasing -%patch43 -p1 -b .system-sqlite2 -%patch44 -p1 -b .qimage-parentheses -%patch45 -p1 -b .system-zlib-header +%patch -P41 -p1 -b .cstddef +%patch -P42 -p1 -b .qlocale-aliasing +%patch -P43 -p1 -b .system-sqlite2 +%patch -P44 -p1 -b .qimage-parentheses +%patch -P45 -p1 -b .system-zlib-header %if 0%{?fedora} > 16 || 0%{?rhel} > 6 # This patch works ONLY with libpng >= 1.5. -%patch46 -p0 -b .libpng15 +%patch -P46 -p0 -b .libpng15 %endif -%patch47 -p1 -b .#1037297 -%patch48 -p1 -b .freetype251 -%patch49 -p1 -b .postgresql11 +%patch -P47 -p1 -b .#1037297 +%patch -P48 -p1 -b .freetype251 +%patch -P49 -p1 -b .postgresql11 # immodule patches %if %{immodule} -%patch50 -p1 -%patch51 -p1 -b .quiet -%patch52 -p1 -b .fix-key-release-event-with-imm -%patch53 -p1 -b .resetinputcontext +%patch -P50 -p1 +%patch -P51 -p1 -b .quiet +%patch -P52 -p1 -b .fix-key-release-event-with-imm +%patch -P53 -p1 -b .resetinputcontext %endif # mariadb -%patch60 -p1 -b .mariadb +%patch -P60 -p1 -b .mariadb # PostgreSQL 12 -%patch70 -p1 -b .PostgreSQL12 +%patch -P70 -p1 -b .PostgreSQL12 # qt-copy patches -%patch100 -p0 -b .0038-dragobject-dont-prefer-unknown -%patch101 -p0 -b .0047-fix-kmenu-width -%patch102 -p0 -b .0048-qclipboard_hack_80072 -%patch103 -p0 -b .0056-khotkeys_input_84434 -%patch105 -p0 -b .0073-xinerama-aware-qpopup -%patch107 -p0 -b .0079-compositing-types -%patch108 -p0 -b .0080-net-wm-sync-request -%patch110 -p0 -b .0084-compositing-properties +%patch -P100 -p0 -b .0038-dragobject-dont-prefer-unknown +%patch -P101 -p0 -b .0047-fix-kmenu-width +%patch -P102 -p0 -b .0048-qclipboard_hack_80072 +%patch -P103 -p0 -b .0056-khotkeys_input_84434 +%patch -P105 -p0 -b .0073-xinerama-aware-qpopup +%patch -P107 -p0 -b .0079-compositing-types +%patch -P108 -p0 -b .0080-net-wm-sync-request +%patch -P110 -p0 -b .0084-compositing-properties # upstream patches -%patch200 -p1 -b .fullscreen -%patch201 -p1 -b .gcc34 +%patch -P200 -p1 -b .fullscreen +%patch -P201 -p1 -b .gcc34 # security patches -%patch300 -p1 -b .CVE-2013-4549 -%patch301 -p1 -b .CVE-2014-0190 -%patch302 -p1 -b .CVE-2015-0295 -%patch303 -p1 -b .CVE-2015-1860 +%patch -P300 -p1 -b .CVE-2013-4549 +%patch -P301 -p1 -b .CVE-2014-0190 +%patch -P302 -p1 -b .CVE-2015-0295 +%patch -P303 -p1 -b .CVE-2015-1860 # convert to UTF-8 iconv -f iso-8859-1 -t utf-8 < doc/man/man3/qdial.3qt > doc/man/man3/qdial.3qt_ From bad1af80b01ebfb4bdd10dec0bde61ed23059a24 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 17:45:26 +0000 Subject: [PATCH 09/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- qt3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt3.spec b/qt3.spec index 2f5459d..3bd8053 100644 --- a/qt3.spec +++ b/qt3.spec @@ -6,7 +6,7 @@ Name: qt3 Summary: The shared library for the Qt 3 GUI toolkit Version: 3.3.8b -Release: 98%{?dist} +Release: 99%{?dist} License: QPL or GPLv2 or GPLv3 Url: http://www.troll.no Source0: ftp://ftp.trolltech.com/qt/source/qt-x11-free-%{version}.tar.gz @@ -646,6 +646,9 @@ mkdir -p %{buildroot}%{qtdir}/plugins/styles %changelog +* Fri Jul 19 2024 Fedora Release Engineering - 3.3.8b-99 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri Jan 26 2024 Fedora Release Engineering - 3.3.8b-98 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 6b6a5e152c6dad84d6877d1f8487588bce669bbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 7 Aug 2024 10:03:49 +0200 Subject: [PATCH 10/12] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- qt3.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/qt3.spec b/qt3.spec index 3bd8053..f50d92a 100644 --- a/qt3.spec +++ b/qt3.spec @@ -6,8 +6,9 @@ Name: qt3 Summary: The shared library for the Qt 3 GUI toolkit Version: 3.3.8b -Release: 99%{?dist} -License: QPL or GPLv2 or GPLv3 +Release: 100%{?dist} +# Automatically converted from old format: QPL or GPLv2 or GPLv3 - review is highly recommended. +License: QPL-1.0 OR GPL-2.0-only OR GPL-3.0-only Url: http://www.troll.no Source0: ftp://ftp.trolltech.com/qt/source/qt-x11-free-%{version}.tar.gz Source2: qt.sh @@ -646,6 +647,9 @@ mkdir -p %{buildroot}%{qtdir}/plugins/styles %changelog +* Wed Aug 07 2024 Miroslav Suchý - 3.3.8b-100 +- convert license to SPDX + * Fri Jul 19 2024 Fedora Release Engineering - 3.3.8b-99 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 825c74fdd5c341f48b7e852e4d07d4f4ca44ac65 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 21:29:29 +0000 Subject: [PATCH 11/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- qt3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt3.spec b/qt3.spec index f50d92a..14a63de 100644 --- a/qt3.spec +++ b/qt3.spec @@ -6,7 +6,7 @@ Name: qt3 Summary: The shared library for the Qt 3 GUI toolkit Version: 3.3.8b -Release: 100%{?dist} +Release: 101%{?dist} # Automatically converted from old format: QPL or GPLv2 or GPLv3 - review is highly recommended. License: QPL-1.0 OR GPL-2.0-only OR GPL-3.0-only Url: http://www.troll.no @@ -647,6 +647,9 @@ mkdir -p %{buildroot}%{qtdir}/plugins/styles %changelog +* Sat Jan 18 2025 Fedora Release Engineering - 3.3.8b-101 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Aug 07 2024 Miroslav Suchý - 3.3.8b-100 - convert license to SPDX From 22a7ed9fe36fc707cad143b440a0362c630900bc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 11:29:15 +0000 Subject: [PATCH 12/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- qt3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt3.spec b/qt3.spec index 14a63de..7351f22 100644 --- a/qt3.spec +++ b/qt3.spec @@ -6,7 +6,7 @@ Name: qt3 Summary: The shared library for the Qt 3 GUI toolkit Version: 3.3.8b -Release: 101%{?dist} +Release: 102%{?dist} # Automatically converted from old format: QPL or GPLv2 or GPLv3 - review is highly recommended. License: QPL-1.0 OR GPL-2.0-only OR GPL-3.0-only Url: http://www.troll.no @@ -647,6 +647,9 @@ mkdir -p %{buildroot}%{qtdir}/plugins/styles %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 3.3.8b-102 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sat Jan 18 2025 Fedora Release Engineering - 3.3.8b-101 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild