From 5c069eda7a1abbc86acab82c91553d638ffbf52bd432a4bc1b596cc9997806de Mon Sep 17 00:00:00 2001
From: Scott Reeves <sreeves@suse.com>
Date: Mon, 20 Aug 2018 18:40:08 +0000
Subject: [PATCH] Accepting request 630657 from GNOME:Next

New stable rel

OBS-URL: https://build.opensuse.org/request/show/630657
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/pango?expand=0&rev=195
---
 pango-1.42.3.tar.xz          |  3 ---
 pango-1.42.4.tar.xz          |  3 +++
 pango-emoji-bsc1103877.patch | 17 -----------------
 pango.changes                |  9 +++++++++
 pango.spec                   |  5 +----
 5 files changed, 13 insertions(+), 24 deletions(-)
 delete mode 100644 pango-1.42.3.tar.xz
 create mode 100644 pango-1.42.4.tar.xz
 delete mode 100644 pango-emoji-bsc1103877.patch

diff --git a/pango-1.42.3.tar.xz b/pango-1.42.3.tar.xz
deleted file mode 100644
index af221af..0000000
--- a/pango-1.42.3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fb3d875305d5143f02cde5c72fec3903e60dc35844759dc14b2df4955b5dde3a
-size 833264
diff --git a/pango-1.42.4.tar.xz b/pango-1.42.4.tar.xz
new file mode 100644
index 0000000..b6a13fd
--- /dev/null
+++ b/pango-1.42.4.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1d2b74cd63e8bd41961f2f8d952355aa0f9be6002b52c8aa7699d9f5da597c9d
+size 833876
diff --git a/pango-emoji-bsc1103877.patch b/pango-emoji-bsc1103877.patch
deleted file mode 100644
index 2cb95e7..0000000
--- a/pango-emoji-bsc1103877.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: pango-1.42.3/pango/pango-emoji.c
-===================================================================
---- pango-1.42.3.orig/pango/pango-emoji.c
-+++ pango-1.42.3/pango/pango-emoji.c
-@@ -253,6 +253,12 @@ _pango_emoji_iter_next (PangoEmojiIter *
-     if (iter->is_emoji == PANGO_EMOJI_TYPE_IS_EMOJI (current_emoji_type))
-     {
-       iter->is_emoji = !PANGO_EMOJI_TYPE_IS_EMOJI (current_emoji_type);
-+
-+      /* Make sure we make progress.  Weird sequences, like a VC15 followed
-+       * by VC16, can trick us into stalling otherwise. */
-+      if (iter->start == iter->end)
-+        iter->end = g_utf8_next_char (iter->end);
-+
-       return TRUE;
-     }
-   }
diff --git a/pango.changes b/pango.changes
index 8e1ee5c..261f888 100644
--- a/pango.changes
+++ b/pango.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Aug 20 18:18:25 UTC 2018 - bjorn.lie@gmail.com
+
+- Update to version 1.42.4:
+  + Prevent an assertion with invalid Unicode sequences.
+  + Fix build failure in C89 mode.
+  + Fix build failure on Mac OS X 10.5 and earlier.
+- Drop pango-emoji-bsc1103877.patch: Fixed upstream.
+
 -------------------------------------------------------------------
 Sat Aug 18 00:01:23 UTC 2018 - sreeves@suse.com
 
diff --git a/pango.spec b/pango.spec
index 32af1df..efc014e 100644
--- a/pango.spec
+++ b/pango.spec
@@ -17,7 +17,7 @@
 
 
 Name:           pango
-Version:        1.42.3
+Version:        1.42.4
 Release:        0
 Summary:        Library for Layout and Rendering of Text
 License:        LGPL-2.1-or-later
@@ -26,8 +26,6 @@ URL:            http://www.pango.org/
 Source0:        https://download.gnome.org/sources/pango/1.42/%{name}-%{version}.tar.xz
 Source2:        macros.pango
 Source99:       baselibs.conf
-#PATCH-FIX-UPSTREAM pango-emoji-bsc1103877.patch sreeves@suse.com -- Fix CVE-2018-15120 denial of service parsing emoji
-Patch0:         pango-emoji-bsc1103877.patch
 
 BuildRequires:  gcc-c++
 BuildRequires:  gtk-doc
@@ -121,7 +119,6 @@ to develop applications that require these.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %meson \