From a9252fe03cbb8e023fa9d7053b00f0576c33de0054f4431505dc453d87a05dc9 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Sat, 18 Aug 2012 10:10:01 +0000
Subject: [PATCH] Accepting request 131108 from GNOME:Next

Update to 8.31

OBS-URL: https://build.opensuse.org/request/show/131108
OBS-URL: https://build.opensuse.org/package/show/Base:System/pcre?expand=0&rev=41
---
 pcre-8.30.tar.bz2     |  3 ---
 pcre-8.31.tar.bz2     |  3 +++
 pcre-visibility.patch | 20 +++++++++++++-------
 pcre.changes          | 19 +++++++++++++++++++
 pcre.spec             |  2 +-
 5 files changed, 36 insertions(+), 11 deletions(-)
 delete mode 100644 pcre-8.30.tar.bz2
 create mode 100644 pcre-8.31.tar.bz2

diff --git a/pcre-8.30.tar.bz2 b/pcre-8.30.tar.bz2
deleted file mode 100644
index 4b9e354..0000000
--- a/pcre-8.30.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c1113fd7db934e97ad8b3917d432e5b642e9eb9afd127eb797804937c965f4ac
-size 1248556
diff --git a/pcre-8.31.tar.bz2 b/pcre-8.31.tar.bz2
new file mode 100644
index 0000000..8cc16b5
--- /dev/null
+++ b/pcre-8.31.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5778a02535473c7ee7838ea598c19f451e63cf5eec0bf0307a688301c9078c3c
+size 1257162
diff --git a/pcre-visibility.patch b/pcre-visibility.patch
index f0863d6..1ba3e1b 100644
--- a/pcre-visibility.patch
+++ b/pcre-visibility.patch
@@ -1,3 +1,5 @@
+Index: configure.ac
+===================================================================
 --- configure.ac.orig
 +++ configure.ac
 @@ -45,8 +45,12 @@ AC_CONFIG_MACRO_DIR([m4])
@@ -24,6 +26,8 @@
  AC_PROG_LN_S
  
  PCRE_MAJOR="pcre_major"
+Index: m4/visibility.m4
+===================================================================
 --- /dev/null
 +++ m4/visibility.m4
 @@ -0,0 +1,89 @@
@@ -116,9 +120,11 @@
 +  AC_DEFINE_UNQUOTED([HAVE_VISIBILITY], [$HAVE_VISIBILITY],
 +    [Define to 1 or 0, depending whether the compiler supports simple visibility declarations.])
 +])
+Index: Makefile.am
+===================================================================
 --- Makefile.am.orig
 +++ Makefile.am
-@@ -178,6 +178,9 @@ BUILT_SOURCES = pcre_chartables.c
+@@ -179,6 +179,9 @@ BUILT_SOURCES = pcre_chartables.c
  # Build the 8 bit library if it is enabled.
  if WITH_PCRE8
  lib_LTLIBRARIES += libpcre.la
@@ -128,7 +134,7 @@
  libpcre_la_SOURCES = \
    pcre_byte_order.c \
    pcre_compile.c \
-@@ -211,6 +214,7 @@ endif # WITH_PCRE8
+@@ -212,6 +215,7 @@ endif # WITH_PCRE8
  # Build the 16 bit library if it is enabled.
  if WITH_PCRE16
  lib_LTLIBRARIES += libpcre16.la
@@ -136,7 +142,7 @@
  libpcre16_la_SOURCES = \
    pcre16_byte_order.c \
    pcre16_chartables.c \
-@@ -266,10 +270,10 @@ EXTRA_DIST += \
+@@ -267,10 +271,10 @@ EXTRA_DIST += \
    sljit/sljitUtils.c
  
  if WITH_PCRE8
@@ -149,7 +155,7 @@
  endif # WITH_PCRE16
  
  CLEANFILES += pcre_chartables.c
-@@ -291,9 +295,10 @@ endif # WITH_JIT
+@@ -292,9 +296,10 @@ endif # WITH_JIT
  ## A version of the main pcre library that has a posix re API.
  if WITH_PCRE8
  lib_LTLIBRARIES += libpcreposix.la
@@ -161,7 +167,7 @@
  libpcreposix_la_LIBADD = libpcre.la
  endif # WITH_PCRE8
  
-@@ -301,12 +306,13 @@ endif # WITH_PCRE8
+@@ -302,12 +307,13 @@ endif # WITH_PCRE8
  if WITH_PCRE_CPP
  
  lib_LTLIBRARIES += libpcrecpp.la
@@ -176,11 +182,11 @@
  libpcrecpp_la_LIBADD = libpcre.la
  
  TESTS += pcrecpp_unittest
-@@ -350,6 +356,7 @@ if WITH_PCRE8
+@@ -351,6 +357,7 @@ if WITH_PCRE8
  TESTS += RunGrepTest
  dist_noinst_SCRIPTS += RunGrepTest
  bin_PROGRAMS += pcregrep
 +pcregrep_CFLAGS = -fwhole-program
  pcregrep_SOURCES = pcregrep.c
  pcregrep_LDADD = $(LIBZ) $(LIBBZ2)
- pcregrep_LDADD += libpcreposix.la
+ pcregrep_LDADD += libpcre.la libpcreposix.la
diff --git a/pcre.changes b/pcre.changes
index a69234c..c8045c9 100644
--- a/pcre.changes
+++ b/pcre.changes
@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Fri Aug 17 14:18:53 UTC 2012 - dimstar@opensuse.org
+
+- Upate to version 8.31:
+  + The JIT compiler now supports partial matching and the (*MARK)
+    and (*COMMIT) verbs
+  + PCRE_INFO_MAXLOOKBEHIND can be used to find the longest
+    lookbehing in a pattern.
+  + There should be a performance improvement when using the heap
+    instead of the stack for recursion
+  + pcregrep can now be linked with libedit as an alternative to
+    libreadline
+  + pcregrep now has a --file-list option where the list of files
+    to scan is given as a file
+  + pcregrep now recognizes binary files and there are related
+    options
+  + The Unicode tables have been updated to 6.1.0
+- Rebase pcre-visibility.patch.
+
 -------------------------------------------------------------------
 Thu Jul 19 17:18:04 UTC 2012 - jengelh@inai.de
 
diff --git a/pcre.spec b/pcre.spec
index 00e42a4..9ed2d01 100644
--- a/pcre.spec
+++ b/pcre.spec
@@ -20,7 +20,7 @@ Name:           pcre
 BuildRequires:  gcc-c++
 BuildRequires:  libtool
 BuildRequires:  pkg-config
-Version:        8.30
+Version:        8.31
 Release:        0
 Summary:        A library for Perl-compatible regular expressions
 License:        BSD-3-Clause