From 18c4c30a44e271dd5820018e17c47981d192355f Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Sat, 23 Jun 2018 11:33:57 +0200 Subject: [PATCH 1/6] fixed #1592146, python3 --- qt5-qtbase.spec | 9 ++++++++- qtbase-everywhere-src-5.11.1-python3.patch | 9 +++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 qtbase-everywhere-src-5.11.1-python3.patch diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index 3f59232..f1b6180 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -46,7 +46,7 @@ BuildRequires: pkgconfig(libsystemd) Name: qt5-qtbase Summary: Qt5 - QtBase components Version: 5.11.1 -Release: 1%{?dist} +Release: 2%{?dist} # See LGPL_EXCEPTIONS.txt, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -112,6 +112,9 @@ Patch65: qtbase-opensource-src-5.9.0-mysql.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1497564 Patch67: https://bugreports.qt.io/secure/attachment/66353/xcberror_filter.patch +# python3 +Patch68: qtbase-everywhere-src-5.11.1-python3.patch + ## upstream patches # Do not check any files in %%{_qt5_plugindir}/platformthemes/ for requires. @@ -362,6 +365,7 @@ Qt5 libraries used for drawing widgets and OpenGL items. %endif # FIXME/REBASE #patch67 -p1 -b .xcberror_filter +%patch68 -p1 -b .python3 ## upstream patches @@ -965,6 +969,9 @@ fi %changelog +* Sat Jun 23 2018 Than Ngo - 5.11.1-2 +- fixed #1592146, python3 + * Tue Jun 19 2018 Rex Dieter - 5.11.1-1 - 5.11.1 - relax qt5-rpm-macros dep diff --git a/qtbase-everywhere-src-5.11.1-python3.patch b/qtbase-everywhere-src-5.11.1-python3.patch new file mode 100644 index 0000000..40dfd47 --- /dev/null +++ b/qtbase-everywhere-src-5.11.1-python3.patch @@ -0,0 +1,9 @@ +diff -up qtbase-everywhere-src-5.11.1/mkspecs/features/uikit/devices.py.me qtbase-everywhere-src-5.11.1/mkspecs/features/uikit/devices.py +--- qtbase-everywhere-src-5.11.1/mkspecs/features/uikit/devices.py.me 2018-06-23 11:29:21.750066271 +0200 ++++ qtbase-everywhere-src-5.11.1/mkspecs/features/uikit/devices.py 2018-06-23 11:30:07.457292033 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python3 + + ############################################################################# + ## From 5459b1473322531f52f90312a48f262d38f80814 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 29 Jun 2018 13:37:29 -0500 Subject: [PATCH 2/6] apply sse2-related multilib hack on < f29 only safer %_qt5_prefix, %qt5_archdatadir ownership rebuild for %_qt5_prefix = %_prefix --- qt5-qtbase.spec | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index f1b6180..6cfc668 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -46,7 +46,7 @@ BuildRequires: pkgconfig(libsystemd) Name: qt5-qtbase Summary: Qt5 - QtBase components Version: 5.11.1 -Release: 2%{?dist} +Release: 3%{?dist} # See LGPL_EXCEPTIONS.txt, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -546,6 +546,7 @@ popd mkdir -p %{buildroot}%{_sysconfdir}/xdg/qtchooser pushd %{buildroot}%{_sysconfdir}/xdg/qtchooser echo "%{_qt5_bindir}" > 5-%{__isa_bits}.conf +## FIXME/TODO: verify qtchooser (still) happy if _qt5_prefix uses %%_prefix instead of %%_libdir/qt5 echo "%{_qt5_prefix}" >> 5-%{__isa_bits}.conf # alternatives targets touch default.conf 5.conf @@ -566,6 +567,8 @@ popd install -p -m755 -D %{SOURCE6} %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/10-qt5-check-opengl2.sh +# f29+ enables sse2 unconditionally on ix86 -- rex +%if 0%{?fedora} < 29 # fix bz#1442553 multilib issue privat_header_file=%{buildroot}%{_qt5_headerdir}/QtCore/%{version}/QtCore/private/qconfig_p.h grep -v QT_FEATURE_sse2 $privat_header_file > ${privat_header_file}.me @@ -577,6 +580,7 @@ cat >>${privat_header_file}< - 5.11.1-3 +- apply sse2-related multilib hack on < f29 only +- safer %%_qt5_prefix, %%qt5_archdatadir ownership +- rebuild for %%_qt5_prefix = %%_prefix + * Sat Jun 23 2018 Than Ngo - 5.11.1-2 - fixed #1592146, python3 From 87e04827368971623ab7c618765a67cc9299226f Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Mon, 2 Jul 2018 16:17:33 +0200 Subject: [PATCH 3/6] fixed bz#1597110 - BRP mangle shebangs and calculation of provides should ignore backups files --- qt5-qtbase.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index 6cfc668..097c1e2 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -46,7 +46,7 @@ BuildRequires: pkgconfig(libsystemd) Name: qt5-qtbase Summary: Qt5 - QtBase components Version: 5.11.1 -Release: 3%{?dist} +Release: 4%{?dist} # See LGPL_EXCEPTIONS.txt, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -365,7 +365,7 @@ Qt5 libraries used for drawing widgets and OpenGL items. %endif # FIXME/REBASE #patch67 -p1 -b .xcberror_filter -%patch68 -p1 -b .python3 +%patch68 -p1 ## upstream patches @@ -976,6 +976,9 @@ fi %changelog +* Mon Jul 02 2018 Than Ngo - 5.11.1-4 +- fixed bz#1597110 - BRP mangle shebangs and calculation of provides should ignore backups files + * Fri Jun 29 2018 Rex Dieter - 5.11.1-3 - apply sse2-related multilib hack on < f29 only - safer %%_qt5_prefix, %%qt5_archdatadir ownership From eda8c137f0fdf921ad8766f63a5b9c141edfe009 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Tue, 10 Jul 2018 21:58:34 +0100 Subject: [PATCH 4/6] Rebuild for ICU 62 --- qt5-qtbase.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index 097c1e2..840713b 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -46,7 +46,7 @@ BuildRequires: pkgconfig(libsystemd) Name: qt5-qtbase Summary: Qt5 - QtBase components Version: 5.11.1 -Release: 4%{?dist} +Release: 5%{?dist} # See LGPL_EXCEPTIONS.txt, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -976,6 +976,9 @@ fi %changelog +* Tue Jul 10 2018 Pete Walter - 5.11.1-5 +- Rebuild for ICU 62 + * Mon Jul 02 2018 Than Ngo - 5.11.1-4 - fixed bz#1597110 - BRP mangle shebangs and calculation of provides should ignore backups files From 23d23a8648dc44addcf4f8c9d6988a19ab466906 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 03:07:56 +0000 Subject: [PATCH 5/6] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- qt5-qtbase.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index 840713b..44a5855 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -46,7 +46,7 @@ BuildRequires: pkgconfig(libsystemd) Name: qt5-qtbase Summary: Qt5 - QtBase components Version: 5.11.1 -Release: 5%{?dist} +Release: 6%{?dist} # See LGPL_EXCEPTIONS.txt, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -976,6 +976,9 @@ fi %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 5.11.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Tue Jul 10 2018 Pete Walter - 5.11.1-5 - Rebuild for ICU 62 From 4ac28c2742433ed0b982a6702412e57f207a0280 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Fri, 27 Jul 2018 11:40:55 +0200 Subject: [PATCH 6/6] fixed FTBFS --- qt5-qtbase-glibc.patch | 53 ++++++++++++++++++++++++++++++++++++++++++ qt5-qtbase.spec | 12 +++++++++- 2 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 qt5-qtbase-glibc.patch diff --git a/qt5-qtbase-glibc.patch b/qt5-qtbase-glibc.patch new file mode 100644 index 0000000..022b698 --- /dev/null +++ b/qt5-qtbase-glibc.patch @@ -0,0 +1,53 @@ +diff -up qtbase-everywhere-src-5.11.1/mkspecs/linux-g++/qplatformdefs.h.glibc qtbase-everywhere-src-5.11.1/mkspecs/linux-g++/qplatformdefs.h +--- qtbase-everywhere-src-5.11.1/mkspecs/linux-g++/qplatformdefs.h.glibc 2018-06-15 09:29:31.000000000 +0200 ++++ qtbase-everywhere-src-5.11.1/mkspecs/linux-g++/qplatformdefs.h 2018-07-26 15:40:56.887961897 +0200 +@@ -72,7 +72,9 @@ + #include + #include + #include ++#if 0 + #include ++#endif + #include + #include + +diff -up qtbase-everywhere-src-5.11.1/src/corelib/io/qfilesystemengine_unix.cpp.glibc qtbase-everywhere-src-5.11.1/src/corelib/io/qfilesystemengine_unix.cpp +--- qtbase-everywhere-src-5.11.1/src/corelib/io/qfilesystemengine_unix.cpp.glibc 2018-06-15 09:29:31.000000000 +0200 ++++ qtbase-everywhere-src-5.11.1/src/corelib/io/qfilesystemengine_unix.cpp 2018-07-26 16:34:54.346840184 +0200 +@@ -50,7 +50,9 @@ + #include + #include // for realpath() + #include ++#if 0 + #include ++#endif + #include + #include + #include +@@ -91,7 +93,9 @@ extern "C" NSString *NSTemporaryDirector + # include + # include + # include ++#if 0 + # include ++#endif + + // in case linux/fs.h is too old and doesn't define it: + #ifndef FICLONE +@@ -105,13 +109,13 @@ extern "C" NSString *NSTemporaryDirector + # undef SYS_renameat2 + # undef SYS_statx + # undef STATX_BASIC_STATS +-# else +-# if !QT_CONFIG(renameat2) && defined(SYS_renameat2) ++# else ++# if 0 && !QT_CONFIG(renameat2) && defined(SYS_renameat2) + static int renameat2(int oldfd, const char *oldpath, int newfd, const char *newpath, unsigned flags) + { return syscall(SYS_renameat2, oldfd, oldpath, newfd, newpath, flags); } + # endif + +-# if !QT_CONFIG(statx) && defined(SYS_statx) ++# if 0 && !QT_CONFIG(statx) && defined(SYS_statx) + static int statx(int dirfd, const char *pathname, int flag, unsigned mask, struct statx *statxbuf) + { return syscall(SYS_statx, dirfd, pathname, flag, mask, statxbuf); } + # elif !QT_CONFIG(statx) && !defined(SYS_statx) diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index 44a5855..de8d42a 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -46,7 +46,7 @@ BuildRequires: pkgconfig(libsystemd) Name: qt5-qtbase Summary: Qt5 - QtBase components Version: 5.11.1 -Release: 6%{?dist} +Release: 7%{?dist} # See LGPL_EXCEPTIONS.txt, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -115,6 +115,9 @@ Patch67: https://bugreports.qt.io/secure/attachment/66353/xcberror_filter.patch # python3 Patch68: qtbase-everywhere-src-5.11.1-python3.patch +# glibc stat +Patch69: qt5-qtbase-glibc.patch + ## upstream patches # Do not check any files in %%{_qt5_plugindir}/platformthemes/ for requires. @@ -366,6 +369,10 @@ Qt5 libraries used for drawing widgets and OpenGL items. # FIXME/REBASE #patch67 -p1 -b .xcberror_filter %patch68 -p1 +# workaround for new glibc conflict +%if 0%{?fedora} > 28 +%patch69 -p1 -b .glibc +%endif ## upstream patches @@ -976,6 +983,9 @@ fi %changelog +* Thu Jul 26 2018 Than Ngo - 5.11.1-7 +- fixed FTBFS + * Sat Jul 14 2018 Fedora Release Engineering - 5.11.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild