From 18c4c30a44e271dd5820018e17c47981d192355f Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Sat, 23 Jun 2018 11:33:57 +0200 Subject: [PATCH] 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 + + ############################################################################# + ##