Merge remote-tracking branch 'up/f29' into f29-riscv64
Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>
This commit is contained in:
commit
899d05f147
GPG Key ID:
7108702C938B13C1
|
|
@ -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 <sys/time.h>
|
||||
#include <sys/shm.h>
|
||||
#include <sys/socket.h>
|
||||
+#if 0
|
||||
#include <sys/stat.h>
|
||||
+#endif
|
||||
#include <sys/wait.h>
|
||||
#include <netinet/in.h>
|
||||
|
||||
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 <pwd.h>
|
||||
#include <stdlib.h> // for realpath()
|
||||
#include <sys/types.h>
|
||||
+#if 0
|
||||
#include <sys/stat.h>
|
||||
+#endif
|
||||
#include <unistd.h>
|
||||
#include <stdio.h>
|
||||
#include <errno.h>
|
||||
@@ -91,7 +93,9 @@ extern "C" NSString *NSTemporaryDirector
|
||||
# include <sys/syscall.h>
|
||||
# include <sys/sendfile.h>
|
||||
# include <linux/fs.h>
|
||||
+#if 0
|
||||
# include <linux/stat.h>
|
||||
+#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)
|
||||
|
|
@ -46,7 +46,7 @@ BuildRequires: pkgconfig(libsystemd)
|
|||
Name: qt5-qtbase
|
||||
Summary: Qt5 - QtBase components
|
||||
Version: 5.11.1
|
||||
Release: 1.0.riscv64%{?dist}
|
||||
Release: 7.0.riscv64%{?dist}
|
||||
|
||||
# See LGPL_EXCEPTIONS.txt, for exception details
|
||||
License: LGPLv2 with exceptions or GPLv3 with exceptions
|
||||
|
|
@ -112,8 +112,14 @@ 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
|
||||
|
||||
# glibc stat
|
||||
Patch69: qt5-qtbase-glibc.patch
|
||||
|
||||
# add support for RISC-V (riscv64)
|
||||
Patch68: qtbase5-double-conversion-add-riscv.patch
|
||||
Patch80: qtbase5-double-conversion-add-riscv.patch
|
||||
|
||||
## upstream patches
|
||||
|
||||
|
|
@ -365,7 +371,12 @@ Qt5 libraries used for drawing widgets and OpenGL items.
|
|||
%endif
|
||||
# FIXME/REBASE
|
||||
#patch67 -p1 -b .xcberror_filter
|
||||
%patch68 -p1 -b .double_con_riscv
|
||||
%patch68 -p1
|
||||
# workaround for new glibc conflict
|
||||
%if 0%{?fedora} > 28
|
||||
%patch69 -p1 -b .glibc
|
||||
%endif
|
||||
%patch80 -p1 -b .double_con_riscv
|
||||
|
||||
## upstream patches
|
||||
|
||||
|
|
@ -546,6 +557,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 +578,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 +591,7 @@ cat >>${privat_header_file}<<EOF
|
|||
#define QT_FEATURE_sse2 -1
|
||||
#endif
|
||||
EOF
|
||||
%endif
|
||||
|
||||
# install privat headers for qtxcb
|
||||
mkdir -p %{buildroot}%{_qt5_headerdir}/QtXcb
|
||||
|
|
@ -681,7 +696,10 @@ fi
|
|||
%{_qt5_docdir}/global/
|
||||
%{_qt5_importdir}/
|
||||
%{_qt5_translationdir}/
|
||||
%if "%{_qt5_prefix}" != "%{_prefix}"
|
||||
%dir %{_qt5_prefix}/
|
||||
%endif
|
||||
%dir %{_qt5_archdatadir}/
|
||||
%dir %{_qt5_datadir}/
|
||||
%{_qt5_datadir}/qtlogging.ini
|
||||
%dir %{_qt5_libexecdir}/
|
||||
|
|
@ -969,9 +987,29 @@ fi
|
|||
|
||||
|
||||
%changelog
|
||||
* Wed Jun 21 2018 David Abdurachmanov <david.abdurachmanov@gmail.com> - 5.11.1-1.0.riscv64
|
||||
* Sat Oct 20 2018 David Abdurachmanov <david.abdurachmanov@gmail.com> - 5.11.1-7.0.riscv64
|
||||
- add support for RISC-V (riscv64)
|
||||
|
||||
* Thu Jul 26 2018 Than Ngo <than@redhat.com> - 5.11.1-7
|
||||
- fixed FTBFS
|
||||
|
||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.11.1-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Tue Jul 10 2018 Pete Walter <pwalter@fedoraproject.org> - 5.11.1-5
|
||||
- Rebuild for ICU 62
|
||||
|
||||
* Mon Jul 02 2018 Than Ngo <than@redhat.com> - 5.11.1-4
|
||||
- fixed bz#1597110 - BRP mangle shebangs and calculation of provides should ignore backups files
|
||||
|
||||
* Fri Jun 29 2018 Rex Dieter <rdieter@fedoraproject.org> - 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 <than@redhat.com> - 5.11.1-2
|
||||
- fixed #1592146, python3
|
||||
|
||||
* Tue Jun 19 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.11.1-1
|
||||
- 5.11.1
|
||||
- relax qt5-rpm-macros dep
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
#############################################################################
|
||||
##
|
||||
Loading…
Reference in New Issue