From 1ad784a5f01ad54b144fbff74d88dab13d4f1e49ad0a4c9b9489efb8cccc77c4 Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux <christophe@krop.fr>
Date: Thu, 14 Nov 2019 08:34:35 +0000
Subject: [PATCH] Accepting request 748159 from home:Vogtinator:qt5.14

Qt 5.14 Beta 3

OBS-URL: https://build.opensuse.org/request/show/748159
OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.14/libqt5-qtbase?expand=0&rev=4
---
 libqt5-Fix-Gujarati-font.patch            | 16 ----------------
 libqt5-qtbase.changes                     |  9 +++++++++
 libqt5-qtbase.spec                        |  8 +++-----
 qtbase-everywhere-src-5.14.0-beta2.tar.xz |  3 ---
 qtbase-everywhere-src-5.14.0-beta3.tar.xz |  3 +++
 5 files changed, 15 insertions(+), 24 deletions(-)
 delete mode 100644 libqt5-Fix-Gujarati-font.patch
 delete mode 100644 qtbase-everywhere-src-5.14.0-beta2.tar.xz
 create mode 100644 qtbase-everywhere-src-5.14.0-beta3.tar.xz

diff --git a/libqt5-Fix-Gujarati-font.patch b/libqt5-Fix-Gujarati-font.patch
deleted file mode 100644
index 340719a..0000000
--- a/libqt5-Fix-Gujarati-font.patch
+++ /dev/null
@@ -1,16 +0,0 @@
----
- src/gui/text/qtextengine.cpp |    1 +
- 1 file changed, 1 insertion(+)
-
-Index: qtbase-opensource-src-5.9.1/src/gui/text/qtextengine.cpp
-===================================================================
---- qtbase-opensource-src-5.9.1.orig/src/gui/text/qtextengine.cpp
-+++ qtbase-opensource-src-5.9.1/src/gui/text/qtextengine.cpp
-@@ -1723,6 +1723,7 @@ void QTextEngine::itemize() const
-             case QChar::Script_Katakana:
-             case QChar::Script_Bopomofo:
-             case QChar::Script_Han:
-+            case QChar::Script_Gujarati:
-                 analysis[i].script = QChar::Script_Common;
-                 break;
-             default:
diff --git a/libqt5-qtbase.changes b/libqt5-qtbase.changes
index aab1418..56c5290 100644
--- a/libqt5-qtbase.changes
+++ b/libqt5-qtbase.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Nov 12 13:00:31 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Update to 5.14.0-beta3:
+  * New bugfix release
+  * No changelog available
+- Drop libqt5-Fix-Gujarati-font.patch, didn't apply anymore:
+  * Was probably fixed upstream a loooong time ago (QTBUG-44568)
+
 -------------------------------------------------------------------
 Thu Oct 24 13:22:25 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
 
diff --git a/libqt5-qtbase.spec b/libqt5-qtbase.spec
index 1076acd..1c3653d 100644
--- a/libqt5-qtbase.spec
+++ b/libqt5-qtbase.spec
@@ -36,16 +36,16 @@
 %endif
 
 Name:           libqt5-qtbase
-Version:        5.14.0~beta2
+Version:        5.14.0~beta3
 Release:        0
 Summary:        C++ Program Library, Core Components
 License:        LGPL-2.1-with-Qt-Company-Qt-exception-1.1 or LGPL-3.0-only
 Group:          System/Libraries
 Url:            https://www.qt.io
 %define base_name libqt5
-%define real_version 5.14.0-beta2
+%define real_version 5.14.0-beta3
 %define so_version 5.14.0
-%define tar_version qtbase-everywhere-src-5.14.0-beta2
+%define tar_version qtbase-everywhere-src-5.14.0-beta3
 Source:         https://download.qt.io/development_releases/qt/5.14/%{real_version}/submodules/%{tar_version}.tar.xz
 # to get mtime of file:
 Source1:        libqt5-qtbase.changes
@@ -53,8 +53,6 @@ Source2:        macros.qt5
 Source3:        baselibs.conf
 Source99:       libqt5-qtbase-rpmlintrc
 # patches 0-1000 are openSUSE and/or non-upstream(able) patches #
-# PATCH-FIX-SUSE libqt5-Fix-Gujarati-font.patch bnc#878292 fix broken Gujarati font rendering
-Patch3:         libqt5-Fix-Gujarati-font.patch
 # PATCH-FIX-OPENSUSE disable-rc4-ciphers-bnc865241.diff bnc#865241-- Exclude rc4 ciphers from being used by default
 Patch6:         disable-rc4-ciphers-bnc865241.diff
 Patch8:         tell-the-truth-about-private-api.patch
diff --git a/qtbase-everywhere-src-5.14.0-beta2.tar.xz b/qtbase-everywhere-src-5.14.0-beta2.tar.xz
deleted file mode 100644
index bd94e1b..0000000
--- a/qtbase-everywhere-src-5.14.0-beta2.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ea1f660569cc7235d4c32fdf2cfce6687e3beef336446a7b680a9ea9a49f24bf
-size 49655856
diff --git a/qtbase-everywhere-src-5.14.0-beta3.tar.xz b/qtbase-everywhere-src-5.14.0-beta3.tar.xz
new file mode 100644
index 0000000..560e693
--- /dev/null
+++ b/qtbase-everywhere-src-5.14.0-beta3.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:107f8937242f71a1b40c12a5f985a552a1e03359740df0458449b5c3d0a7fc61
+size 49675132