From 85754019f46e7376a7c0874a5f3fb203a6b00ba1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Va=CC=81clav=20Slavi=CC=81k?= <vaclav@slavik.io>
Date: Mon, 2 Jun 2014 15:58:26 +0200
Subject: [PATCH] Update to 0.19.

---
 Gettext.Tools.nuspec                          |  2 +-
 Makefile                                      |  4 +-
 patches/gettext-php-fix-newdocs-parsing.patch | 48 -------------------
 3 files changed, 3 insertions(+), 51 deletions(-)
 delete mode 100644 patches/gettext-php-fix-newdocs-parsing.patch

diff --git a/Gettext.Tools.nuspec b/Gettext.Tools.nuspec
index 87ad88f..3fdb58d 100644
--- a/Gettext.Tools.nuspec
+++ b/Gettext.Tools.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>Gettext.Tools</id>
-        <version>0.18.3.201</version>
+        <version>0.19</version>
         <title>GNU gettext tools for Windows</title>
         <authors>Vaclav Slavik</authors>
         <licenseUrl>https://github.com/vslavik/gettext-tools-windows/blob/master/LICENSE</licenseUrl>
diff --git a/Makefile b/Makefile
index 02b38bd..eb471c0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 
-GETTEXT_VERSION  = 0.18.3.2
+GETTEXT_VERSION  = 0.19
 LIBICONV_VERSION = 1.14
 EXPAT_VERSION    = 2.1.0
 
 # version of the gettext-tools-windows package; usually same as GETTEXT_VERSION
-PACKAGE_VERSION  = $(GETTEXT_VERSION)-1
+PACKAGE_VERSION  = $(GETTEXT_VERSION)
 
 EXPAT_FLAGS       = --disable-static
 
diff --git a/patches/gettext-php-fix-newdocs-parsing.patch b/patches/gettext-php-fix-newdocs-parsing.patch
deleted file mode 100644
index baad210..0000000
--- a/patches/gettext-php-fix-newdocs-parsing.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Reported-by: Byrial Jensen <address@hidden>
----
- gettext-tools/src/x-php.c          |   15 ++++++-
- 3 files changed, 93 insertions(+), 3 deletions(-)
- create mode 100755 gettext-tools/tests/xgettext-php-5
-
-diff --git a/gettext-tools/src/x-php.c b/gettext-tools/src/x-php.c
-index 4781005..b2174f8 100644
---- a/gettext-tools/src/x-php.c
-+++ b/gettext-tools/src/x-php.c
-@@ -1161,12 +1161,18 @@ phase4_get (token_ty *tp)
-                 int c3 = phase1_getc ();
-                 if (c3 == '<')
-                   {
--                    /* Start of here document.
-+                    /* Start of here and now document.
-                        Parse whitespace, then label, then newline.  */
-                     do
-                       c = phase3_getc ();
-                     while (c == ' ' || c == '\t' || c == '\n' || c == '\r');
- 
-+                    /* a nowdoc encloses the label into single quotes */
-+                    if (c == '\'')
-+                      {
-+                        c = phase3_getc ();
-+                      }
-+
-                     bufpos = 0;
-                     do
-                       {
-@@ -1178,9 +1184,14 @@ phase4_get (token_ty *tp)
-                         buffer[bufpos++] = c;
-                         c = phase3_getc ();
-                       }
--                    while (c != EOF && c != '\n' && c != '\r');
-+                    while (c != EOF && c != '\n' && c != '\r' && c != '\'');
-                     /* buffer[0..bufpos-1] now contains the label.  */
- 
-+                    if (c == '\'') /* eat the nowdoc single quote */
-+                      {
-+                        c = phase3_getc ();
-+                      }
-+
-                     /* Now skip the here document.  */
-                     for (;;)
-                       {
--- 
-1.7.9.2