From da57f1c6376ba402b5aa55c9a61b23b6aac040d0 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Mon, 4 May 2015 22:08:16 +0200 Subject: [PATCH 01/52] updated gcc5-buildkey patch for GCC 5 (supersedes gcc4-buildkey) (#1218091) * Mon May 04 2015 Kevin Kofler - 3.3.8b-64 - updated gcc5-buildkey patch for GCC 5 (supersedes gcc4-buildkey) (#1218091) --- ...ldkey.patch => qt-x11-free-3.3.8b-gcc5-buildkey.patch | 8 ++++---- qt3.spec | 9 ++++++--- 2 files changed, 10 insertions(+), 7 deletions(-) rename qt-x11-free-3.3.8b-gcc4-buildkey.patch => qt-x11-free-3.3.8b-gcc5-buildkey.patch (68%) diff --git a/qt-x11-free-3.3.8b-gcc4-buildkey.patch b/qt-x11-free-3.3.8b-gcc5-buildkey.patch similarity index 68% rename from qt-x11-free-3.3.8b-gcc4-buildkey.patch rename to qt-x11-free-3.3.8b-gcc5-buildkey.patch index ed002bc..855dc14 100644 --- a/qt-x11-free-3.3.8b-gcc4-buildkey.patch +++ b/qt-x11-free-3.3.8b-gcc5-buildkey.patch @@ -1,12 +1,12 @@ -diff -ur qt-x11-free-3.3.8b/configure qt-x11-free-3.3.8b-gcc4-buildkey/configure +diff -ur qt-x11-free-3.3.8b/configure qt-x11-free-3.3.8b-gcc5-buildkey/configure --- qt-x11-free-3.3.8b/configure 2008-01-15 20:09:15.000000000 +0100 -+++ qt-x11-free-3.3.8b-gcc4-buildkey/configure 2008-02-18 02:41:01.000000000 +0100 ++++ qt-x11-free-3.3.8b-gcc5-buildkey/configure 2015-05-04 22:03:24.000000000 +0200 @@ -3081,16 +3081,16 @@ g++*) # GNU C++ QMAKE_CONF_COMPILER=`grep "QMAKE_CXX[^_A-Z0-9a-z]" $QMAKESPEC/qmake.conf | sed "s,.* *= *\(.*\)$,\1,"` - COMPILER_VERSION=`${QMAKE_CONF_COMPILER} --version 2>/dev/null` -+ COMPILER_VERSION=`${QMAKE_CONF_COMPILER} --version 2>/dev/null | sed 's,^[^0-9]*,,g'` ++ COMPILER_VERSION=`${QMAKE_CONF_COMPILER} -dumpversion 2>/dev/null` case "$COMPILER_VERSION" in - *2.95.*) + 2.95.*) @@ -18,7 +18,7 @@ diff -ur qt-x11-free-3.3.8b/configure qt-x11-free-3.3.8b-gcc4-buildkey/configure ;; - *4.*) - COMPILER_VERSION="4" -+ 4.*) ++ 5.*|4.*) + COMPILER_VERSION="4.*" ;; *) diff --git a/qt3.spec b/qt3.spec index 062b30f..b6266e0 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: 63%{?dist} +Release: 64%{?dist} License: QPL or GPLv2 or GPLv3 Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -30,7 +30,7 @@ Patch12: qt-uic-nostdlib.patch Patch13: qt-x11-free-3.3.6-qfontdatabase_x11.patch Patch14: qt-x11-free-3.3.3-gl.patch Patch19: qt-3.3.3-gtkstyle.patch -Patch20: qt-x11-free-3.3.8b-gcc4-buildkey.patch +Patch20: qt-x11-free-3.3.8b-gcc5-buildkey.patch Patch24: qt-x11-free-3.3.5-uic.patch Patch25: qt-x11-free-3.3.8b-uic-multilib.patch Patch27: qt-3.3.6-fontrendering-ml_IN-209097.patch @@ -290,7 +290,7 @@ rm -fv mkspecs/linux-g++*/qmake.conf.strip %patch13 -p1 -b .fonts %patch14 -p1 -b .gl %patch19 -p1 -b .gtk -%patch20 -p1 -b .gcc4-buildkey +%patch20 -p1 -b .gcc5-buildkey %patch24 -p1 -b .uic %patch25 -p1 -b .uic-multilib %patch27 -p1 -b .fontrendering-ml_IN-bz#209097 @@ -645,6 +645,9 @@ rm -rf %{buildroot} %changelog +* Mon May 04 2015 Kevin Kofler - 3.3.8b-64 +- updated gcc5-buildkey patch for GCC 5 (supersedes gcc4-buildkey) (#1218091) + * Tue Apr 21 2015 Kevin Kofler - 3.3.8b-63 - backport CVE-2015-1860 (GIF handler buffer overflow, #1210675) fix from Qt 4 From a657918da90003630f151ee7f7d590eee4843f2b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 18 Jun 2015 21:48:06 +0000 Subject: [PATCH 02/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- qt3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt3.spec b/qt3.spec index b6266e0..00b4b8c 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: 64%{?dist} +Release: 65%{?dist} License: QPL or GPLv2 or GPLv3 Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -645,6 +645,9 @@ rm -rf %{buildroot} %changelog +* Thu Jun 18 2015 Fedora Release Engineering - 3.3.8b-65 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Mon May 04 2015 Kevin Kofler - 3.3.8b-64 - updated gcc5-buildkey patch for GCC 5 (supersedes gcc4-buildkey) (#1218091) From 8001a588f751d54c0bc5e8a01fb473411dd7f284 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 4 Feb 2016 21:44:45 +0000 Subject: [PATCH 03/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- qt3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt3.spec b/qt3.spec index 00b4b8c..b877a4a 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: 65%{?dist} +Release: 66%{?dist} License: QPL or GPLv2 or GPLv3 Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -645,6 +645,9 @@ rm -rf %{buildroot} %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 3.3.8b-66 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Thu Jun 18 2015 Fedora Release Engineering - 3.3.8b-65 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 2d56125b365ee403ca104ae2e00b135474cf7a3d Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 10 Feb 2016 12:33:32 -0600 Subject: [PATCH 04/52] update gccX-buildkey.patch --- ...key.patch => qt-x11-free-3.3.8b-gcc6-buildkey.patch | 10 +++++----- qt3.spec | 9 ++++++--- 2 files changed, 11 insertions(+), 8 deletions(-) rename qt-x11-free-3.3.8b-gcc5-buildkey.patch => qt-x11-free-3.3.8b-gcc6-buildkey.patch (62%) diff --git a/qt-x11-free-3.3.8b-gcc5-buildkey.patch b/qt-x11-free-3.3.8b-gcc6-buildkey.patch similarity index 62% rename from qt-x11-free-3.3.8b-gcc5-buildkey.patch rename to qt-x11-free-3.3.8b-gcc6-buildkey.patch index 855dc14..f6900f9 100644 --- a/qt-x11-free-3.3.8b-gcc5-buildkey.patch +++ b/qt-x11-free-3.3.8b-gcc6-buildkey.patch @@ -1,7 +1,7 @@ -diff -ur qt-x11-free-3.3.8b/configure qt-x11-free-3.3.8b-gcc5-buildkey/configure ---- qt-x11-free-3.3.8b/configure 2008-01-15 20:09:15.000000000 +0100 -+++ qt-x11-free-3.3.8b-gcc5-buildkey/configure 2015-05-04 22:03:24.000000000 +0200 -@@ -3081,16 +3081,16 @@ +diff -up qt-x11-free-3.3.8b/configure.gcc5-buildkey qt-x11-free-3.3.8b/configure +--- qt-x11-free-3.3.8b/configure.gcc5-buildkey 2008-01-15 13:09:15.000000000 -0600 ++++ qt-x11-free-3.3.8b/configure 2016-02-10 12:31:42.360400101 -0600 +@@ -3081,16 +3081,16 @@ case "$COMPILER" in g++*) # GNU C++ QMAKE_CONF_COMPILER=`grep "QMAKE_CXX[^_A-Z0-9a-z]" $QMAKESPEC/qmake.conf | sed "s,.* *= *\(.*\)$,\1,"` @@ -18,7 +18,7 @@ diff -ur qt-x11-free-3.3.8b/configure qt-x11-free-3.3.8b-gcc5-buildkey/configure ;; - *4.*) - COMPILER_VERSION="4" -+ 5.*|4.*) ++ 6.*|5.*|4.*) + COMPILER_VERSION="4.*" ;; *) diff --git a/qt3.spec b/qt3.spec index b877a4a..82c4c80 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: 66%{?dist} +Release: 67%{?dist} License: QPL or GPLv2 or GPLv3 Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -30,7 +30,7 @@ Patch12: qt-uic-nostdlib.patch Patch13: qt-x11-free-3.3.6-qfontdatabase_x11.patch Patch14: qt-x11-free-3.3.3-gl.patch Patch19: qt-3.3.3-gtkstyle.patch -Patch20: qt-x11-free-3.3.8b-gcc5-buildkey.patch +Patch20: qt-x11-free-3.3.8b-gcc6-buildkey.patch Patch24: qt-x11-free-3.3.5-uic.patch Patch25: qt-x11-free-3.3.8b-uic-multilib.patch Patch27: qt-3.3.6-fontrendering-ml_IN-209097.patch @@ -290,7 +290,7 @@ rm -fv mkspecs/linux-g++*/qmake.conf.strip %patch13 -p1 -b .fonts %patch14 -p1 -b .gl %patch19 -p1 -b .gtk -%patch20 -p1 -b .gcc5-buildkey +%patch20 -p1 -b .gcc6-buildkey %patch24 -p1 -b .uic %patch25 -p1 -b .uic-multilib %patch27 -p1 -b .fontrendering-ml_IN-bz#209097 @@ -645,6 +645,9 @@ rm -rf %{buildroot} %changelog +* Wed Feb 10 2016 Rex Dieter 3.3.8b-67 +- update gccX-buildkey.patch + * Thu Feb 04 2016 Fedora Release Engineering - 3.3.8b-66 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 7239f33b43e56f2e0cde794f1fe4b47583e4a7a1 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 10 Feb 2016 12:34:13 -0600 Subject: [PATCH 05/52] include 'gcc -dumpversion' output to aid in future interation/debugging of gcc-buildkey.patch --- qt3.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/qt3.spec b/qt3.spec index 82c4c80..64a5645 100644 --- a/qt3.spec +++ b/qt3.spec @@ -290,6 +290,7 @@ rm -fv mkspecs/linux-g++*/qmake.conf.strip %patch13 -p1 -b .fonts %patch14 -p1 -b .gl %patch19 -p1 -b .gtk +gcc -dumpversion ||: %patch20 -p1 -b .gcc6-buildkey %patch24 -p1 -b .uic %patch25 -p1 -b .uic-multilib From 470ea4af7c5ce8e6d23949e719b87cf31dc3bc76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Mon, 28 Mar 2016 15:59:24 +0300 Subject: [PATCH 06/52] qt.sh: Avoid unnecessary command invocations https://bugzilla.redhat.com/show_bug.cgi?id=1321577 --- qt.sh | 7 ++++--- qt3.spec | 5 ++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/qt.sh b/qt.sh index df8d24e..5b7c94c 100755 --- a/qt.sh +++ b/qt.sh @@ -20,9 +20,10 @@ for QTDIR in ${QT_PREFIXES} ; do done unset QT_PREFIXES -if ! echo ${PATH} | /bin/grep -q $QTDIR/bin ; then - PATH=$QTDIR/bin:${PATH} -fi +case :$PATH: in + *:$QTDIR/bin:*) ;; + *) PATH=$QTDIR/bin:$PATH ;; +esac QTINC="$QTDIR/include" QTLIB="$QTDIR/lib" diff --git a/qt3.spec b/qt3.spec index 64a5645..1e621a1 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: 67%{?dist} +Release: 68%{?dist} License: QPL or GPLv2 or GPLv3 Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -646,6 +646,9 @@ rm -rf %{buildroot} %changelog +* Mon Mar 28 2016 Ville Skyttä - 3.3.8b-68 +- qt.sh: Avoid unnecessary command invocations + * Wed Feb 10 2016 Rex Dieter 3.3.8b-67 - update gccX-buildkey.patch From baf2c4789b6033a85913eadc2568e1349dd56f36 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 11:19:03 +0000 Subject: [PATCH 07/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- qt3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt3.spec b/qt3.spec index 1e621a1..d87b16f 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: 68%{?dist} +Release: 69%{?dist} License: QPL or GPLv2 or GPLv3 Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -646,6 +646,9 @@ rm -rf %{buildroot} %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 3.3.8b-69 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Mon Mar 28 2016 Ville Skyttä - 3.3.8b-68 - qt.sh: Avoid unnecessary command invocations From c18fe071d3b2148794e25190e4b64961e507d420 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Wed, 12 Jul 2017 15:11:33 +0200 Subject: [PATCH 08/52] perl dependency renamed to perl-interpreter --- qt3.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt3.spec b/qt3.spec index d87b16f..62e7cee 100644 --- a/qt3.spec +++ b/qt3.spec @@ -135,7 +135,7 @@ BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: zlib-devel BuildRequires: giflib-devel -BuildRequires: perl +BuildRequires: perl-interpreter BuildRequires: sed BuildRequires: findutils BuildRequires: cups-devel From 913cd56658bafdd7be3811a1510d08c9ddf6eebf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 12:41:57 +0000 Subject: [PATCH 09/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- qt3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt3.spec b/qt3.spec index 62e7cee..5138560 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: 69%{?dist} +Release: 70%{?dist} License: QPL or GPLv2 or GPLv3 Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -646,6 +646,9 @@ rm -rf %{buildroot} %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 3.3.8b-70 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 3.3.8b-69 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 6b1be4907cb38f88b1a7fe19dc60e965d34f6c0d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 07:17:47 +0000 Subject: [PATCH 10/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- qt3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt3.spec b/qt3.spec index 5138560..c6d0aa2 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: 70%{?dist} +Release: 71%{?dist} License: QPL or GPLv2 or GPLv3 Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -646,6 +646,9 @@ rm -rf %{buildroot} %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 3.3.8b-71 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 3.3.8b-70 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From d43c6db4a32df984916a59c51bf277142ffea13a Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Mon, 13 Nov 2017 15:26:54 +0100 Subject: [PATCH 11/52] - backport mysql driver mariadb fix - BR: mariadb-connector-c-devel (f28+, #1494085) --- qt-x11-free-3.3.8b-mariadb.patch | 54 ++++++++++++++++++++++++++++++++ qt3.spec | 16 +++++++++- 2 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 qt-x11-free-3.3.8b-mariadb.patch diff --git a/qt-x11-free-3.3.8b-mariadb.patch b/qt-x11-free-3.3.8b-mariadb.patch new file mode 100644 index 0000000..7aed136 --- /dev/null +++ b/qt-x11-free-3.3.8b-mariadb.patch @@ -0,0 +1,54 @@ +diff -up qt-x11-free-3.3.8b/src/sql/drivers/mysql/qsql_mysql.cpp.me qt-x11-free-3.3.8b/src/sql/drivers/mysql/qsql_mysql.cpp +--- qt-x11-free-3.3.8b/src/sql/drivers/mysql/qsql_mysql.cpp.me 2017-11-10 18:08:22.850898663 +0100 ++++ qt-x11-free-3.3.8b/src/sql/drivers/mysql/qsql_mysql.cpp 2017-11-13 15:02:41.565493236 +0100 +@@ -350,30 +350,38 @@ int QMYSQLResult::numRowsAffected() + static void qServerEnd() + { + #ifndef Q_NO_MYSQL_EMBEDDED +-# if MYSQL_VERSION_ID >= 40000 ++#if !defined(MARIADB_BASE_VERSION) && !defined(MARIADB_VERSION_ID) ++# if MYSQL_VERSION_ID > 40000 ++# if (MYSQL_VERSION_ID >= 40110 && MYSQL_VERSION_ID < 50000) || MYSQL_VERSION_ID >= 50003 ++ mysql_library_end(); ++# else + mysql_server_end(); +-# endif // MYSQL_VERSION_ID +-#endif // Q_NO_MYSQL_EMBEDDED ++# endif ++# endif ++#endif ++#endif + } + + static void qServerInit() + { + #ifndef Q_NO_MYSQL_EMBEDDED + # if MYSQL_VERSION_ID >= 40000 +- if ( qMySqlInitHandledByUser || qMySqlConnectionCount > 1 ) ++ if (qMySqlInitHandledByUser || qMySqlConnectionCount > 1) + return; + +- // this should only be called once +- // has no effect on client/server library +- // but is vital for the embedded lib +- if ( mysql_server_init( 0, 0, 0 ) ) { +-# ifdef QT_CHECK_RANGE +- qWarning( "QMYSQLDriver::qServerInit: unable to start server." ); +-# endif ++# if (MYSQL_VERSION_ID >= 40110 && MYSQL_VERSION_ID < 50000) || MYSQL_VERSION_ID >= 50003 ++ if (mysql_library_init(0, 0, 0)) { ++# else ++ if (mysql_server_init(0, 0, 0)) { ++# endif ++ qWarning("QMYSQLDriver::qServerInit: unable to start server."); + } +- + # endif // MYSQL_VERSION_ID + #endif // Q_NO_MYSQL_EMBEDDED ++ ++#if defined(MARIADB_BASE_VERSION) || defined(MARIADB_VERSION_ID) ++ qAddPostRoutine(mysql_server_end); ++#endif + } + + QMYSQLDriver::QMYSQLDriver( QObject * parent, const char * name ) diff --git a/qt3.spec b/qt3.spec index c6d0aa2..fb389ec 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: 71%{?dist} +Release: 72%{?dist} License: QPL or GPLv2 or GPLv3 Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -72,6 +72,9 @@ Patch51: qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch Patch52: qt-x11-free-3.3.8b-fix-key-release-event-with-imm.diff Patch53: qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch +# mariadb support +Patch60: qt-x11-free-3.3.8b-mariadb.patch + # qt-copy patches Patch100: 0038-dragobject-dont-prefer-unknown.patch Patch101: 0047-fix-kmenu-width.diff @@ -158,7 +161,11 @@ BuildRequires: xorg-x11-proto-devel BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGLU-devel BuildRequires: desktop-file-utils +%if 0%{?fedora} > 27 || 0%{?rhel} > 7 +BuildRequires: mariadb-connector-c-devel +%else BuildRequires: mysql-devel +%endif BuildRequires: postgresql-devel BuildRequires: unixODBC-devel %if 0%{?rhel} < 7 @@ -331,6 +338,9 @@ sed -i.KDE3_PLUGIN_PATH \ %patch53 -p1 -b .resetinputcontext %endif +# mariadb +%patch60 -p1 -b .mariadb + # qt-copy patches %patch100 -p0 -b .0038-dragobject-dont-prefer-unknown %patch101 -p0 -b .0047-fix-kmenu-width @@ -646,6 +656,10 @@ rm -rf %{buildroot} %changelog +* Mon Nov 13 2017 Than Ngo - 3.3.8b-72 +- backport mysql driver mariadb fix +- BR: mariadb-connector-c-devel (f28+, #1494085) + * Thu Aug 03 2017 Fedora Release Engineering - 3.3.8b-71 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From a0243625f7d72a7a445dd5199a1026a91852930a Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Fri, 9 Feb 2018 09:05:52 +0100 Subject: [PATCH 12/52] Escape macros in %changelog Reference: https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/Y2ZUKK2B7T2IKXPMODNF6HB2O5T5TS6H/ Signed-off-by: Igor Gnatenko --- qt3.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/qt3.spec b/qt3.spec index fb389ec..5dbfd8e 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: 72%{?dist} +Release: 73%{?dist} License: QPL or GPLv2 or GPLv3 Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -656,6 +656,9 @@ rm -rf %{buildroot} %changelog +* Fri Feb 09 2018 Igor Gnatenko - 3.3.8b-73 +- Escape macros in %%changelog + * Mon Nov 13 2017 Than Ngo - 3.3.8b-72 - backport mysql driver mariadb fix - BR: mariadb-connector-c-devel (f28+, #1494085) @@ -858,7 +861,7 @@ rm -rf %{buildroot} - fix obsolete/provides of version/release * Thu Mar 13 2008 Kevin Kofler 3.3.8b-10 -- fix %{?epoch:%{epoch}:} idiom not to add a ':' after it +- fix %%{?epoch:%%{epoch}:} idiom not to add a ':' after it * Wed Mar 12 2008 Kevin Kofler 3.3.8b-9 - rename to qt3 on Fedora >= 9 @@ -1914,13 +1917,13 @@ rm -rf %{buildroot} - fix compilation of the NSPlugin add-on * Fri Mar 3 2000 Bill Nottingham -- fix %postun script +- fix %%postun script * Fri Feb 18 2000 Bernhard Rosenkränzer - beta1 - get rid of qt-ImageIO, the functionality is now in the main Qt library - remove qt-Network, the functionality is now in the main Qt library -- add changes-2.1.0 to %doc +- add changes-2.1.0 to %%doc * Thu Feb 17 2000 Preston Brown - no refcount check on postun script, we want it to happen even on upgrades From ece42c9bfdddf0ba5629a7e1fef44edf4feec1f4 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 00:29:16 +0100 Subject: [PATCH 13/52] Remove BuildRoot definition None of currently supported distributions need that. It was needed last for EL5 which is EOL now Signed-off-by: Igor Gnatenko --- qt3.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/qt3.spec b/qt3.spec index 5dbfd8e..a374519 100644 --- a/qt3.spec +++ b/qt3.spec @@ -9,7 +9,6 @@ Version: 3.3.8b Release: 73%{?dist} License: QPL or GPLv2 or GPLv3 Group: System Environment/Libraries -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Url: http://www.troll.no Source0: ftp://ftp.trolltech.com/qt/source/qt-x11-free-%{version}.tar.gz Source2: qt.sh From b445d4f9bb7455eb49cd9a22ede6680d707cac35 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 07:35:29 +0100 Subject: [PATCH 14/52] Remove %clean section None of currently supported distributions need that. Last one was EL5 which is EOL for a while. Signed-off-by: Igor Gnatenko --- qt3.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/qt3.spec b/qt3.spec index a374519..b095275 100644 --- a/qt3.spec +++ b/qt3.spec @@ -557,9 +557,6 @@ install -m 644 tools/assistant/images/linguist.png %{buildroot}%{_datadir}/pixma mkdir -p %{buildroot}%{qtdir}/plugins/styles -%clean -rm -rf %{buildroot} - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig From 45b8c902d46da439eb55fd338643be7924456e08 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Thu, 31 May 2018 11:56:02 +0200 Subject: [PATCH 15/52] Fix CVE-2016-10040 (stack overflow in QXmlSimpleReader, #1409603) * Thu May 31 2018 Kevin Kofler - 3.3.8b-74 - Fix CVE-2016-10040 (stack overflow in QXmlSimpleReader due to a too high entityCharacterLimit in the CVE-2013-4549 patch) (#1409603) See also the change Than Ngo committed to Qt 4: https://src.fedoraproject.org/rpms/qt/c/37a2aba837ee6a148cd3441a7ce82737e04d54ac --- qt-x11-free-3.3.8b-CVE-2013-4549.patch | 2 +- qt3.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/qt-x11-free-3.3.8b-CVE-2013-4549.patch b/qt-x11-free-3.3.8b-CVE-2013-4549.patch index 09e3a83..b76730c 100644 --- a/qt-x11-free-3.3.8b-CVE-2013-4549.patch +++ b/qt-x11-free-3.3.8b-CVE-2013-4549.patch @@ -96,7 +96,7 @@ diff -ur qt-x11-free-3.3.8b/src/xml/qxml.h qt-x11-free-3.3.8b-CVE-2013-4549/src/ + // for the DTD currently being parsed. + static const uint dtdRecursionLimit = 2U; + // The maximum amount of characters an entity value may contain, after expansion. -+ static const uint entityCharacterLimit = 65536U; ++ static const uint entityCharacterLimit = 4096U; + const QString &string(); void stringClear(); diff --git a/qt3.spec b/qt3.spec index b095275..b313cc0 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: 73%{?dist} +Release: 74%{?dist} License: QPL or GPLv2 or GPLv3 Group: System Environment/Libraries Url: http://www.troll.no @@ -652,6 +652,10 @@ mkdir -p %{buildroot}%{qtdir}/plugins/styles %changelog +* Thu May 31 2018 Kevin Kofler - 3.3.8b-74 +- Fix CVE-2016-10040 (stack overflow in QXmlSimpleReader due to a too high + entityCharacterLimit in the CVE-2013-4549 patch) (#1409603) + * Fri Feb 09 2018 Igor Gnatenko - 3.3.8b-73 - Escape macros in %%changelog From 530e2901871e1a7c481e0298a22c30ae130ef2bc Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 10 Jul 2018 01:31:04 -0500 Subject: [PATCH 16/52] Remove needless use of %defattr --- qt3.spec | 9 --------- 1 file changed, 9 deletions(-) diff --git a/qt3.spec b/qt3.spec index b313cc0..caa4d69 100644 --- a/qt3.spec +++ b/qt3.spec @@ -562,7 +562,6 @@ mkdir -p %{buildroot}%{qtdir}/plugins/styles %postun -p /sbin/ldconfig %files -%defattr(-,root,root,-) %doc FAQ LICENSE* README* changes* %dir %{qtdir} %dir %{qtdir}/bin @@ -584,13 +583,11 @@ mkdir -p %{buildroot}%{qtdir}/plugins/styles %{qtdir}/lib/libqt*.so.* %files config -%defattr(-,root,root,-) %{qtdir}/bin/qtconfig %{_datadir}/applications/*qtconfig*.desktop %{_datadir}/pixmaps/qtconfig3.png %files devel -%defattr(-,root,root,-) %{qt_docdir}/ %{qtdir}/bin/moc %{qtdir}/bin/uic @@ -620,31 +617,25 @@ mkdir -p %{buildroot}%{qtdir}/plugins/styles %{_datadir}/pixmaps/assistant3.png %files devel-docs -%defattr(-,root,root,-) %doc examples %doc tutorial %{_mandir}/*/* %if 0%{?rhel} < 7 %files sqlite -%defattr(-,root,root,-) %{qtdir}/plugins/sqldrivers/libqsqlite.so %endif %files ODBC -%defattr(-,root,root,-) %{qtdir}/plugins/sqldrivers/libqsqlodbc.so %files PostgreSQL -%defattr(-,root,root,-) %{qtdir}/plugins/sqldrivers/libqsqlpsql.so %files MySQL -%defattr(-,root,root,-) %{qtdir}/plugins/sqldrivers/libqsqlmysql.so %files designer -%defattr(-,root,root,-) %{qtdir}/templates %{qtdir}/bin/designer %{_datadir}/applications/*designer*.desktop From 23fb5485d0ddf7f06e2eb8df8fb7ea962d412e4c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 03:07:04 +0000 Subject: [PATCH 17/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_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 caa4d69..870af5f 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: 74%{?dist} +Release: 75%{?dist} License: QPL or GPLv2 or GPLv3 Group: System Environment/Libraries Url: http://www.troll.no @@ -643,6 +643,9 @@ mkdir -p %{buildroot}%{qtdir}/plugins/styles %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 3.3.8b-75 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu May 31 2018 Kevin Kofler - 3.3.8b-74 - Fix CVE-2016-10040 (stack overflow in QXmlSimpleReader due to a too high entityCharacterLimit in the CVE-2013-4549 patch) (#1409603) From 5d2d8d50ca6ace929856f7792e2ccc3de8dc0b6e Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 18 Jul 2018 11:23:40 +0200 Subject: [PATCH 18/52] add BuildRequires: gcc Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- qt3.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/qt3.spec b/qt3.spec index 870af5f..0663fa7 100644 --- a/qt3.spec +++ b/qt3.spec @@ -130,6 +130,7 @@ Patch303: qt-x11-free-3.3.8b-CVE-2015-1860.patch # not sure what this is for anymore? -- rex Requires: coreutils +BuildRequires: gcc BuildRequires: desktop-file-utils BuildRequires: libmng-devel BuildRequires: glibc-devel From 8fe1c8f43a9bd0a98c524d7ecf246c928b5444e0 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 20 Jul 2018 09:43:42 -0500 Subject: [PATCH 19/52] BR: gcc-c++ --- qt3.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/qt3.spec b/qt3.spec index 0663fa7..9f1475d 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: 75%{?dist} +Release: 76%{?dist} License: QPL or GPLv2 or GPLv3 Group: System Environment/Libraries Url: http://www.troll.no @@ -130,7 +130,7 @@ Patch303: qt-x11-free-3.3.8b-CVE-2015-1860.patch # not sure what this is for anymore? -- rex Requires: coreutils -BuildRequires: gcc +BuildRequires: gcc-c++ BuildRequires: desktop-file-utils BuildRequires: libmng-devel BuildRequires: glibc-devel @@ -644,6 +644,9 @@ mkdir -p %{buildroot}%{qtdir}/plugins/styles %changelog +* Fri Jul 20 2018 Rex Dieter - 3.3.8b-76 +- BR: gcc-c++ + * Sat Jul 14 2018 Fedora Release Engineering - 3.3.8b-75 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From b078a391af9b452bec6b7b5bf4d3a7d535d920e4 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Thu, 6 Sep 2018 10:13:46 +0200 Subject: [PATCH 20/52] BuildRequires: s/postgresql-devel/libpq-devel/ That's because we moved libpq.so.5 into libpq package. Related: rhbz#1618698, rhbz#1623764 --- qt3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt3.spec b/qt3.spec index 9f1475d..8bee803 100644 --- a/qt3.spec +++ b/qt3.spec @@ -166,7 +166,10 @@ BuildRequires: mariadb-connector-c-devel %else BuildRequires: mysql-devel %endif -BuildRequires: postgresql-devel +BuildRequires: libpq-devel +# This is resolved in newer Qt by not requiring PG server +# related headers. +BuildRequires: postgresql-server-devel BuildRequires: unixODBC-devel %if 0%{?rhel} < 7 BuildRequires: sqlite2-devel From e31b9254f6c1bd52af3329fd5920549e0b73a6d6 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Sat, 5 Jan 2019 05:05:51 +0100 Subject: [PATCH 21/52] Hardcode the compiler version in the build key once and for all * Sat Jan 05 2019 Kevin Kofler - 3.3.8b-77 - Hardcode the compiler version in the build key once and for all It does not make sense to have to mess with the build key again and again at each GCC major version, nor does the current situation where even a point release of GCC will change the build key (because the build key patch has not been updated since GCC 6) make any sense whatsoever. GCC major versions no longer carry any ABI meaning as in the days of GCC 2.95 vs. 3.0. And nobody really uses a GCC older than 4.* anymore. So we just hardcode the compiler version in the build key to "4.*". --- qt-x11-free-3.3.8b-gcc6-buildkey.patch | 25 ---------------------- qt-x11-free-3.3.8b-hardcode-buildkey.patch | 25 ++++++++++++++++++++++ qt3.spec | 9 +++++--- 3 files changed, 31 insertions(+), 28 deletions(-) delete mode 100644 qt-x11-free-3.3.8b-gcc6-buildkey.patch create mode 100644 qt-x11-free-3.3.8b-hardcode-buildkey.patch diff --git a/qt-x11-free-3.3.8b-gcc6-buildkey.patch b/qt-x11-free-3.3.8b-gcc6-buildkey.patch deleted file mode 100644 index f6900f9..0000000 --- a/qt-x11-free-3.3.8b-gcc6-buildkey.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -up qt-x11-free-3.3.8b/configure.gcc5-buildkey qt-x11-free-3.3.8b/configure ---- qt-x11-free-3.3.8b/configure.gcc5-buildkey 2008-01-15 13:09:15.000000000 -0600 -+++ qt-x11-free-3.3.8b/configure 2016-02-10 12:31:42.360400101 -0600 -@@ -3081,16 +3081,16 @@ case "$COMPILER" in - g++*) - # GNU C++ - QMAKE_CONF_COMPILER=`grep "QMAKE_CXX[^_A-Z0-9a-z]" $QMAKESPEC/qmake.conf | sed "s,.* *= *\(.*\)$,\1,"` -- COMPILER_VERSION=`${QMAKE_CONF_COMPILER} --version 2>/dev/null` -+ COMPILER_VERSION=`${QMAKE_CONF_COMPILER} -dumpversion 2>/dev/null` - case "$COMPILER_VERSION" in -- *2.95.*) -+ 2.95.*) - COMPILER_VERSION="2.95.*" - ;; -- *3.*) -+ 3.*) - COMPILER_VERSION="3.*" - ;; -- *4.*) -- COMPILER_VERSION="4" -+ 6.*|5.*|4.*) -+ COMPILER_VERSION="4.*" - ;; - *) - ;; diff --git a/qt-x11-free-3.3.8b-hardcode-buildkey.patch b/qt-x11-free-3.3.8b-hardcode-buildkey.patch new file mode 100644 index 0000000..e213648 --- /dev/null +++ b/qt-x11-free-3.3.8b-hardcode-buildkey.patch @@ -0,0 +1,25 @@ +diff -ur qt-x11-free-3.3.8b/configure qt-x11-free-3.3.8b-hardcode-buildkey/configure +--- qt-x11-free-3.3.8b/configure 2008-01-15 20:09:15.000000000 +0100 ++++ qt-x11-free-3.3.8b-hardcode-buildkey/configure 2019-01-05 04:57:37.066254942 +0100 +@@ -3081,20 +3081,7 @@ + g++*) + # GNU C++ + QMAKE_CONF_COMPILER=`grep "QMAKE_CXX[^_A-Z0-9a-z]" $QMAKESPEC/qmake.conf | sed "s,.* *= *\(.*\)$,\1,"` +- COMPILER_VERSION=`${QMAKE_CONF_COMPILER} --version 2>/dev/null` +- case "$COMPILER_VERSION" in +- *2.95.*) +- COMPILER_VERSION="2.95.*" +- ;; +- *3.*) +- COMPILER_VERSION="3.*" +- ;; +- *4.*) +- COMPILER_VERSION="4" +- ;; +- *) +- ;; +- esac ++ COMPILER_VERSION="4.*" + [ ! -z "$COMPILER_VERSION" ] && COMPILER="g++-${COMPILER_VERSION}" + ;; + *) diff --git a/qt3.spec b/qt3.spec index 8bee803..9f958e4 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: 76%{?dist} +Release: 77%{?dist} License: QPL or GPLv2 or GPLv3 Group: System Environment/Libraries Url: http://www.troll.no @@ -29,7 +29,7 @@ Patch12: qt-uic-nostdlib.patch Patch13: qt-x11-free-3.3.6-qfontdatabase_x11.patch Patch14: qt-x11-free-3.3.3-gl.patch Patch19: qt-3.3.3-gtkstyle.patch -Patch20: qt-x11-free-3.3.8b-gcc6-buildkey.patch +Patch20: qt-x11-free-3.3.8b-hardcode-buildkey.patch Patch24: qt-x11-free-3.3.5-uic.patch Patch25: qt-x11-free-3.3.8b-uic-multilib.patch Patch27: qt-3.3.6-fontrendering-ml_IN-209097.patch @@ -301,7 +301,7 @@ rm -fv mkspecs/linux-g++*/qmake.conf.strip %patch14 -p1 -b .gl %patch19 -p1 -b .gtk gcc -dumpversion ||: -%patch20 -p1 -b .gcc6-buildkey +%patch20 -p1 -b .hardcode-buildkey %patch24 -p1 -b .uic %patch25 -p1 -b .uic-multilib %patch27 -p1 -b .fontrendering-ml_IN-bz#209097 @@ -647,6 +647,9 @@ mkdir -p %{buildroot}%{qtdir}/plugins/styles %changelog +* Sat Jan 05 2019 Kevin Kofler - 3.3.8b-77 +- Hardcode the compiler version in the build key once and for all + * Fri Jul 20 2018 Rex Dieter - 3.3.8b-76 - BR: gcc-c++ From 9c2752a41538930c3c531d9510896823fdcd0129 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Sat, 5 Jan 2019 05:26:06 +0100 Subject: [PATCH 22/52] Rename the struct Param in qsqlextension_p.h that conflicts with PostgreSQL 11 --- qt-x11-free-3.3.8b-postgresql11.patch | 57 +++++++++++++++++++++++++++ qt3.spec | 7 +++- 2 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 qt-x11-free-3.3.8b-postgresql11.patch diff --git a/qt-x11-free-3.3.8b-postgresql11.patch b/qt-x11-free-3.3.8b-postgresql11.patch new file mode 100644 index 0000000..ad9c4cc --- /dev/null +++ b/qt-x11-free-3.3.8b-postgresql11.patch @@ -0,0 +1,57 @@ +diff -ur qt-x11-free-3.3.8b/src/sql/qsqlextension_p.cpp qt-x11-free-3.3.8b-postgresql11/src/sql/qsqlextension_p.cpp +--- qt-x11-free-3.3.8b/src/sql/qsqlextension_p.cpp 2008-01-15 20:09:13.000000000 +0100 ++++ qt-x11-free-3.3.8b-postgresql11/src/sql/qsqlextension_p.cpp 2019-01-05 05:21:29.839087511 +0100 +@@ -68,7 +68,7 @@ + if ( index.contains( (int)values.count() ) ) { + index[ (int)values.count() ] = placeholder; + } +- values[ placeholder ] = Param( val, tp ); ++ values[ placeholder ] = Parame( val, tp ); + } + + void QSqlExtension::bindValue( int pos, const QVariant& val, QSql::ParameterType tp ) +@@ -76,7 +76,7 @@ + bindm = BindByPosition; + index[ pos ] = QString::number( pos ); + QString nm = QString::number( pos ); +- values[ nm ] = Param( val, tp ); ++ values[ nm ] = Parame( val, tp ); + } + + void QSqlExtension::addBindValue( const QVariant& val, QSql::ParameterType tp ) +@@ -130,7 +130,7 @@ + + QMap QSqlExtension::boundValues() const + { +- QMap::ConstIterator it; ++ QMap::ConstIterator it; + QMap m; + if ( bindm == BindByName ) { + for ( it = values.begin(); it != values.end(); ++it ) +diff -ur qt-x11-free-3.3.8b/src/sql/qsqlextension_p.h qt-x11-free-3.3.8b-postgresql11/src/sql/qsqlextension_p.h +--- qt-x11-free-3.3.8b/src/sql/qsqlextension_p.h 2008-01-15 20:09:13.000000000 +0100 ++++ qt-x11-free-3.3.8b-postgresql11/src/sql/qsqlextension_p.h 2019-01-05 05:20:59.605555077 +0100 +@@ -71,11 +71,11 @@ + #define QM_TEMPLATE_EXTERN_SQL Q_TEMPLATE_EXTERN + #endif + +-struct Param { +- Param( const QVariant& v = QVariant(), QSql::ParameterType t = QSql::In ): value( v ), typ( t ) {} ++struct Parame { ++ Parame( const QVariant& v = QVariant(), QSql::ParameterType t = QSql::In ): value( v ), typ( t ) {} + QVariant value; + QSql::ParameterType typ; +- Q_DUMMY_COMPARISON_OPERATOR(Param) ++ Q_DUMMY_COMPARISON_OPERATOR(Parame) + }; + + struct Holder { +@@ -114,7 +114,7 @@ + int bindCount; + + QMap index; +- typedef QMap ValueMap; ++ typedef QMap ValueMap; + ValueMap values; + + // convenience container for QSqlQuery diff --git a/qt3.spec b/qt3.spec index 9f958e4..1493eea 100644 --- a/qt3.spec +++ b/qt3.spec @@ -28,7 +28,8 @@ Patch8: qt-x11-free-3.3.3-qembed.patch Patch12: qt-uic-nostdlib.patch Patch13: qt-x11-free-3.3.6-qfontdatabase_x11.patch Patch14: qt-x11-free-3.3.3-gl.patch -Patch19: qt-3.3.3-gtkstyle.patch +Patch19: qt-3.3.3-gtkstyle.patch +# hardcode the compiler version in the build key once and for all Patch20: qt-x11-free-3.3.8b-hardcode-buildkey.patch Patch24: qt-x11-free-3.3.5-uic.patch Patch25: qt-x11-free-3.3.8b-uic-multilib.patch @@ -64,6 +65,8 @@ Patch46: qt-3.3.8-libpng15.patch Patch47: qt-x11-free-3.3.8b-#1037297.patch # search for FreeType using pkg-config, fixes FTBFS with freetype >= 2.5.1 Patch48: qt-x11-free-3.3.8b-freetype251.patch +# rename the struct Param in qsqlextension_p.h that conflicts with PostgreSQL 11 +Patch49: qt-x11-free-3.3.8b-postgresql11.patch # immodule patches Patch50: qt-x11-immodule-unified-qt3.3.8-20071116.diff.bz2 @@ -332,6 +335,7 @@ sed -i.KDE3_PLUGIN_PATH \ %endif %patch47 -p1 -b .#1037297 %patch48 -p1 -b .freetype251 +%patch49 -p1 -b .postgresql11 # immodule patches %if %{immodule} @@ -649,6 +653,7 @@ mkdir -p %{buildroot}%{qtdir}/plugins/styles %changelog * Sat Jan 05 2019 Kevin Kofler - 3.3.8b-77 - Hardcode the compiler version in the build key once and for all +- Rename the struct Param in qsqlextension_p.h that conflicts with PostgreSQL 11 * Fri Jul 20 2018 Rex Dieter - 3.3.8b-76 - BR: gcc-c++ From 5b71c9a6cd715a4760fd295843f8a7d62247092c Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 08:26:27 +0100 Subject: [PATCH 23/52] Fix RHEL conditions 0%{?rhel} on Fedora expands to 0 which makes condition 0 < 7 true. You don't want that. Signed-off-by: Igor Gnatenko --- qt3.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/qt3.spec b/qt3.spec index 1493eea..a930e6e 100644 --- a/qt3.spec +++ b/qt3.spec @@ -121,7 +121,7 @@ Patch303: qt-x11-free-3.3.8b-CVE-2015-1860.patch %define plugin_odbc -plugin-sql-odbc # sqlite plugins -%if 0%{?rhel} < 7 +%if 0%{?rhel} && 0%{?rhel} < 7 %define plugin_sqlite -plugin-sql-sqlite %else %define plugin_sqlite %{nil} @@ -174,7 +174,7 @@ BuildRequires: libpq-devel # related headers. BuildRequires: postgresql-server-devel BuildRequires: unixODBC-devel -%if 0%{?rhel} < 7 +%if 0%{?rhel} && 0%{?rhel} < 7 BuildRequires: sqlite2-devel %endif @@ -457,7 +457,7 @@ echo yes | ./configure \ make $SMP_MFLAGS src-qmake -%if 0%{?rhel} < 7 +%if 0%{?rhel} && 0%{?rhel} < 7 # build sqlite plugin pushd plugins/src/sqldrivers/sqlite qmake -o Makefile sqlite.pro @@ -629,7 +629,7 @@ mkdir -p %{buildroot}%{qtdir}/plugins/styles %doc tutorial %{_mandir}/*/* -%if 0%{?rhel} < 7 +%if 0%{?rhel} && 0%{?rhel} < 7 %files sqlite %{qtdir}/plugins/sqldrivers/libqsqlite.so %endif From 67fd462912ad6d3e8a61ef4f8c28389e3de56628 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:20 +0100 Subject: [PATCH 24/52] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- qt3.spec | 9 --------- 1 file changed, 9 deletions(-) diff --git a/qt3.spec b/qt3.spec index a930e6e..03176cc 100644 --- a/qt3.spec +++ b/qt3.spec @@ -8,7 +8,6 @@ Summary: The shared library for the Qt 3 GUI toolkit Version: 3.3.8b Release: 77%{?dist} License: QPL or GPLv2 or GPLv3 -Group: System Environment/Libraries Url: http://www.troll.no Source0: ftp://ftp.trolltech.com/qt/source/qt-x11-free-%{version}.tar.gz Source2: qt.sh @@ -180,13 +179,11 @@ BuildRequires: sqlite2-devel %package config Summary: Graphical configuration tool for programs using Qt 3 -Group: User Interface/Desktops Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %package devel Summary: Development files for the Qt 3 GUI toolkit -Group: Development/Libraries Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: libXrender-devel Requires: libXrandr-devel @@ -204,32 +201,26 @@ Requires: mesa-libGLU-devel %package devel-docs Summary: Documentation for the Qt 3 GUI toolkit -Group: Development/Libraries Requires: %{name}-devel = %{?epoch:%{epoch}:}%{version}-%{release} %package ODBC Summary: ODBC drivers for Qt 3's SQL classes -Group: System Environment/Libraries Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %package MySQL Summary: MySQL drivers for Qt 3's SQL classes -Group: System Environment/Libraries Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %package PostgreSQL Summary: PostgreSQL drivers for Qt 3's SQL classes -Group: System Environment/Libraries Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %package sqlite Summary: sqlite drivers for Qt 3's SQL classes -Group: System Environment/Libraries Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %package designer Summary: Interface designer (IDE) for the Qt 3 toolkit -Group: Development/Tools Requires: %{name}-devel = %{?epoch:%{epoch}:}%{version}-%{release} %description From 86f98a6136df32e878e90089e624cc7127e16c58 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 2 Feb 2019 10:40:26 +0000 Subject: [PATCH 25/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_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 03176cc..7cac871 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: 77%{?dist} +Release: 78%{?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 @@ -642,6 +642,9 @@ mkdir -p %{buildroot}%{qtdir}/plugins/styles %changelog +* Sat Feb 02 2019 Fedora Release Engineering - 3.3.8b-78 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jan 05 2019 Kevin Kofler - 3.3.8b-77 - Hardcode the compiler version in the build key once and for all - Rename the struct Param in qsqlextension_p.h that conflicts with PostgreSQL 11 From a6bd273325399352e4d58dfc41f695ca73ddbe83 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 17:45:54 +0000 Subject: [PATCH 26/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_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 7cac871..155ee98 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: 78%{?dist} +Release: 79%{?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 @@ -642,6 +642,9 @@ mkdir -p %{buildroot}%{qtdir}/plugins/styles %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 3.3.8b-79 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sat Feb 02 2019 Fedora Release Engineering - 3.3.8b-78 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 299114f7e9c1a8ccbb47d5b247f15a2a9625cce6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 16:52:30 +0000 Subject: [PATCH 27/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_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 155ee98..3153a59 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: 79%{?dist} +Release: 80%{?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 @@ -642,6 +642,9 @@ mkdir -p %{buildroot}%{qtdir}/plugins/styles %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 3.3.8b-80 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Jul 26 2019 Fedora Release Engineering - 3.3.8b-79 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From f9cc7dd823c43ba9322935d45bf4d920de051b3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 2 Apr 2020 13:15:54 +0200 Subject: [PATCH 28/52] Fix string quoting for rpm >= 4.16 --- qt3.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt3.spec b/qt3.spec index 3153a59..2b73004 100644 --- a/qt3.spec +++ b/qt3.spec @@ -401,7 +401,7 @@ fi echo yes | ./configure \ -prefix $QTDEST \ -docdir %{qt_docdir} \ -%if %{_lib} == lib64 +%if "%{_lib}" == "lib64" -platform linux-g++-64 \ %else -platform linux-g++ \ From c5ffe87a0ae9d5893724d1caa8c5bb5903b821b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 2 Apr 2020 13:35:31 +0200 Subject: [PATCH 29/52] Bump release --- qt3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt3.spec b/qt3.spec index 2b73004..d468529 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: 80%{?dist} +Release: 81%{?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 @@ -642,6 +642,9 @@ mkdir -p %{buildroot}%{qtdir}/plugins/styles %changelog +* Thu Apr 02 2020 Björn Esser - 3.3.8b-81 +- Fix string quoting for rpm >= 4.16 + * Thu Jan 30 2020 Fedora Release Engineering - 3.3.8b-80 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From b1e1d03856324ecd5fa5e2ee2c091cf7ac0340af Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Thu, 16 Jul 2020 10:50:42 +0200 Subject: [PATCH 30/52] fixed 1839125 - compile with PostgreSQL 12, FTBFS --- qt-x11-free-3.3.8b-PostgreSQL12.patch | 14 ++++++++++++++ qt3.spec | 11 ++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 qt-x11-free-3.3.8b-PostgreSQL12.patch diff --git a/qt-x11-free-3.3.8b-PostgreSQL12.patch b/qt-x11-free-3.3.8b-PostgreSQL12.patch new file mode 100644 index 0000000..b4b0162 --- /dev/null +++ b/qt-x11-free-3.3.8b-PostgreSQL12.patch @@ -0,0 +1,14 @@ +diff -up qt-x11-free-3.3.8b/src/sql/drivers/psql/qsql_psql.cpp.me qt-x11-free-3.3.8b/src/sql/drivers/psql/qsql_psql.cpp +--- qt-x11-free-3.3.8b/src/sql/drivers/psql/qsql_psql.cpp.me 2020-07-16 10:21:41.403226592 +0200 ++++ qt-x11-free-3.3.8b/src/sql/drivers/psql/qsql_psql.cpp 2020-07-16 10:23:00.754291164 +0200 +@@ -147,8 +147,10 @@ static QVariant::Type qDecodePSQLType( i + case FLOAT8OID : + type = QVariant::Double; + break; ++#ifdef ABSTIMEOID + case ABSTIMEOID : + case RELTIMEOID : ++#endif + case DATEOID : + type = QVariant::Date; + break; diff --git a/qt3.spec b/qt3.spec index d468529..063fad4 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: 81%{?dist} +Release: 82%{?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 @@ -76,6 +76,9 @@ Patch53: qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputco # mariadb support Patch60: qt-x11-free-3.3.8b-mariadb.patch +# compile with PostgreSQL 12 +Patch70: qt-x11-free-3.3.8b-PostgreSQL12.patch + # qt-copy patches Patch100: 0038-dragobject-dont-prefer-unknown.patch Patch101: 0047-fix-kmenu-width.diff @@ -339,6 +342,9 @@ sed -i.KDE3_PLUGIN_PATH \ # mariadb %patch60 -p1 -b .mariadb +# PostgreSQL 12 +%patch70 -p1 -b .PostgreSQL12 + # qt-copy patches %patch100 -p0 -b .0038-dragobject-dont-prefer-unknown %patch101 -p0 -b .0047-fix-kmenu-width @@ -642,6 +648,9 @@ mkdir -p %{buildroot}%{qtdir}/plugins/styles %changelog +* Thu Jul 16 2020 Than Ngo - 3.3.8b-82 +- fixed 1839125 - compile with PostgreSQL 12, FTBFS + * Thu Apr 02 2020 Björn Esser - 3.3.8b-81 - Fix string quoting for rpm >= 4.16 From 42e8870785b77b8e0372b6920ddad755e609fb14 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Tue, 21 Jul 2020 11:42:43 +0200 Subject: [PATCH 31/52] Use make macros, https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro --- qt3.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/qt3.spec b/qt3.spec index 063fad4..9917b82 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: 82%{?dist} +Release: 83%{?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 @@ -452,7 +452,7 @@ echo yes | ./configure \ -xft \ -tablet -make $SMP_MFLAGS src-qmake +%make_build src-qmake %if 0%{?rhel} && 0%{?rhel} < 7 # build sqlite plugin @@ -476,9 +476,9 @@ pushd plugins/src/sqldrivers/odbc qmake -o Makefile "LIBS+=-lodbc" odbc.pro popd -make $SMP_MFLAGS src-moc -make $SMP_MFLAGS sub-src -make $SMP_MFLAGS sub-tools UIC="$QTDIR/bin/uic -nostdlib -L $QTDIR/plugins" +%make_build src-moc +%make_build sub-src +%make_build sub-tools UIC="$QTDIR/bin/uic -nostdlib -L $QTDIR/plugins" %install rm -rf %{buildroot} @@ -648,6 +648,9 @@ mkdir -p %{buildroot}%{qtdir}/plugins/styles %changelog +* Tue Jul 21 2020 Than Ngo - 3.3.8b-83 +- Use make macros, https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro + * Thu Jul 16 2020 Than Ngo - 3.3.8b-82 - fixed 1839125 - compile with PostgreSQL 12, FTBFS From ab456393d31f5a058d0bba1b5bbd18d3e8899ba6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 05:09:09 +0000 Subject: [PATCH 32/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_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 9917b82..cc458fd 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: 83%{?dist} +Release: 84%{?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 @@ -648,6 +648,9 @@ mkdir -p %{buildroot}%{qtdir}/plugins/styles %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 3.3.8b-84 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jul 21 2020 Than Ngo - 3.3.8b-83 - Use make macros, https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro From ceeb1ab8f4a1eb10141a616857eeb86fd0dd5148 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 8 Jan 2021 20:14:25 +0000 Subject: [PATCH 33/52] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- qt3.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/qt3.spec b/qt3.spec index cc458fd..cfd5566 100644 --- a/qt3.spec +++ b/qt3.spec @@ -135,6 +135,7 @@ Patch303: qt-x11-free-3.3.8b-CVE-2015-1860.patch # not sure what this is for anymore? -- rex Requires: coreutils +BuildRequires: make BuildRequires: gcc-c++ BuildRequires: desktop-file-utils BuildRequires: libmng-devel From 62590056a5a0906b4bfaa5473062ca72259fcb25 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 14:41:33 +0000 Subject: [PATCH 34/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_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 cfd5566..15bdd74 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: 84%{?dist} +Release: 85%{?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 @@ -649,6 +649,9 @@ mkdir -p %{buildroot}%{qtdir}/plugins/styles %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 3.3.8b-85 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 3.3.8b-84 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From d29f55697ecb14e7979109cb3ffe150ac3ed92b0 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Mon, 8 Feb 2021 10:27:27 +0100 Subject: [PATCH 35/52] rebuild for libpq ABI fix Related: rhbz#1908268 --- qt3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt3.spec b/qt3.spec index 15bdd74..2863555 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: 85%{?dist} +Release: 86%{?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 @@ -649,6 +649,9 @@ mkdir -p %{buildroot}%{qtdir}/plugins/styles %changelog +* Mon Feb 08 2021 Pavel Raiskup - 3.3.8b-86 +- rebuild for libpq ABI fix rhbz#1908268 + * Wed Jan 27 2021 Fedora Release Engineering - 3.3.8b-85 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 79097bf559a725a495eef11a74a7579167d35a13 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 10:46:29 +0000 Subject: [PATCH 36/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_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 2863555..ee8cc90 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: 86%{?dist} +Release: 87%{?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 @@ -649,6 +649,9 @@ mkdir -p %{buildroot}%{qtdir}/plugins/styles %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 3.3.8b-87 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon Feb 08 2021 Pavel Raiskup - 3.3.8b-86 - rebuild for libpq ABI fix rhbz#1908268 From c7d7d3b1cf95cc2d4a3c722dc89c74980d4a77e0 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Thu, 16 Sep 2021 12:43:49 +0200 Subject: [PATCH 37/52] Fix FTBFS --- qt3.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/qt3.spec b/qt3.spec index ee8cc90..a2247b6 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: 87%{?dist} +Release: 88%{?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,7 +172,7 @@ BuildRequires: mariadb-connector-c-devel %else BuildRequires: mysql-devel %endif -BuildRequires: libpq-devel +BuildRequires: postgresql-private-devel # This is resolved in newer Qt by not requiring PG server # related headers. BuildRequires: postgresql-server-devel @@ -649,6 +649,9 @@ mkdir -p %{buildroot}%{qtdir}/plugins/styles %changelog +* Thu Sep 16 2021 Than Ngo - 3.3.8b-88 +- Fix FTBFS + * Fri Jul 23 2021 Fedora Release Engineering - 3.3.8b-87 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 486c9d0481882b77fa7cd5801851e43d7d644b26 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Tue, 11 Jan 2022 13:21:00 +0100 Subject: [PATCH 38/52] Rebuild for Postgresql 14 --- qt3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt3.spec b/qt3.spec index a2247b6..cfa68f3 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: 88%{?dist} +Release: 89%{?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 @@ -649,6 +649,9 @@ mkdir -p %{buildroot}%{qtdir}/plugins/styles %changelog +* Tue Jan 11 2022 Than Ngo - 3.3.8b-89 +- Rebuild for Postgresql 14 + * Thu Sep 16 2021 Than Ngo - 3.3.8b-88 - Fix FTBFS From ea8d257a8076a2de13e69d8e4929bdee8ae60c43 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 17:04:58 +0000 Subject: [PATCH 39/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_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 cfa68f3..ea8959c 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: 89%{?dist} +Release: 90%{?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 @@ -649,6 +649,9 @@ mkdir -p %{buildroot}%{qtdir}/plugins/styles %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 3.3.8b-90 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Jan 11 2022 Than Ngo - 3.3.8b-89 - Rebuild for Postgresql 14 From eaed1b2c7611c7a2eb5759ffbd09f15c8724897d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 00:03:33 +0000 Subject: [PATCH 40/52] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_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 ea8959c..e9b70c9 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: 90%{?dist} +Release: 91%{?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 @@ -649,6 +649,9 @@ mkdir -p %{buildroot}%{qtdir}/plugins/styles %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 3.3.8b-91 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Fri Jan 21 2022 Fedora Release Engineering - 3.3.8b-90 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 14b1643e518bf00bc9a83a120a21ffa337dc78fa Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Fri, 9 Sep 2022 15:47:09 +0200 Subject: [PATCH 41/52] 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 42/52] 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 43/52] 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 44/52] 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 45/52] 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 46/52] 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 47/52] 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 48/52] 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 49/52] 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 50/52] 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 51/52] 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 52/52] 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