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 3153a59..7351f22 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: 80%{?dist} -License: QPL or GPLv2 or GPLv3 +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 Source0: ftp://ftp.trolltech.com/qt/source/qt-x11-free-%{version}.tar.gz Source2: qt.sh @@ -76,6 +77,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 @@ -132,6 +136,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 @@ -168,9 +173,6 @@ BuildRequires: mariadb-connector-c-devel %else BuildRequires: mysql-devel %endif -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} && 0%{?rhel} < 7 @@ -281,83 +283,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 +%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_ @@ -401,7 +406,7 @@ fi echo yes | ./configure \ -prefix $QTDEST \ -docdir %{qt_docdir} \ -%if %{_lib} == lib64 +%if "%{_lib}" == "lib64" -platform linux-g++-64 \ %else -platform linux-g++ \ @@ -446,7 +451,7 @@ echo yes | ./configure \ -xft \ -tablet -make $SMP_MFLAGS src-qmake +%make_build src-qmake %if 0%{?rhel} && 0%{?rhel} < 7 # build sqlite plugin @@ -470,9 +475,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} @@ -642,6 +647,73 @@ 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + * Thu Jan 30 2020 Fedora Release Engineering - 3.3.8b-80 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild