[arch-commits] Commit in qt5-base/trunk (PKGBUILD emoji.diff)

[Jan Steffens]

    Date: Wednesday, September 20, 2017 @ 09:41:43
  Author: heftig
Revision: 305902

5.9.1-5

Modified:
  qt5-base/trunk/PKGBUILD
Deleted:
  qt5-base/trunk/emoji.diff

------------+
 PKGBUILD   |    7 ++-----
 emoji.diff |   13 -------------
 2 files changed, 2 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-09-20 09:40:56 UTC (rev 305901)
+++ PKGBUILD	2017-09-20 09:41:43 UTC (rev 305902)
@@ -6,7 +6,7 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.9.1
 pkgver=${_qtver/-/}
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -29,11 +29,10 @@
 source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
         qtbug-61731.patch::"https://github.com/qt/qtbase/commit/386af91c.patch"
         qtcreatorbug-18448.patch::"https://github.com/qt/qtbase/commit/2a9f678f.patch"
-        emoji.diff harmony-fix.diff)
+        harmony-fix.diff)
 sha256sums=('bc9a21e9f6fff9629019fdf9f989f064751d5073c3a28dc596def92f4d4275c6'
             'b164a873894cfc783980e883082d2b22b5aab00166c6751f66e78d4c41c3e2e3'
             '5f878d144ac18097376dce154a411449cde181ddce2d93501114f890c9cdb1c3'
-            'c103d811ecce25d076f4f3c5ec1e94f1eceb19a4c6818de00f9a22c5b36699bc'
             '8451c0a86e887492b706950ce533c616e687b790c54e86fb1f405dc2074737a3')
 
 prepare() {
@@ -57,8 +56,6 @@
   patch -p1 -i ../qtbug-61731.patch
   # Fix doc navigation
   patch -p1 -i ../qtcreatorbug-18448.patch
-  # Emoji!
-  patch -p1 -i ../emoji.diff
   # Freetype 2.8.1
   patch -p1 -i ../harmony-fix.diff
 }

Deleted: emoji.diff
===================================================================
--- emoji.diff	2017-09-20 09:40:56 UTC (rev 305901)
+++ emoji.diff	2017-09-20 09:41:43 UTC (rev 305902)
@@ -1,13 +0,0 @@
-diff -u -r qtbase-opensource-src-5.9.1/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp qtbase-opensource-src-5.9.1-emoji/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp
---- qtbase-opensource-src-5.9.1/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp	2017-06-28 11:54:29.000000000 +0200
-+++ qtbase-opensource-src-5.9.1-emoji/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp	2017-09-15 12:19:03.581896442 +0200
-@@ -749,6 +749,9 @@
-         FcPatternAddWeak(pattern, FC_FAMILY, value, FcTrue);
-     }
- 
-+    value.u.s = (const FcChar8 *)"emoji";
-+    FcPatternAddWeak(pattern, FC_FAMILY, value, FcTrue);
-+
-     FcConfigSubstitute(0, pattern, FcMatchPattern);
-     FcDefaultSubstitute(pattern);
-