Date: Tuesday, September 12, 2017 @ 21:07:46 Author: heftig Revision: 305384
1.54.0-1 Modified: gobject-introspection/trunk/PKGBUILD Deleted: gobject-introspection/trunk/0001-giscanner-fix-EOF-check-with-flex-2.6.1.patch ----------------------------------------------------+ 0001-giscanner-fix-EOF-check-with-flex-2.6.1.patch | 87 ------------------- PKGBUILD | 11 -- 2 files changed, 4 insertions(+), 94 deletions(-) Deleted: 0001-giscanner-fix-EOF-check-with-flex-2.6.1.patch =================================================================== --- 0001-giscanner-fix-EOF-check-with-flex-2.6.1.patch 2017-09-12 21:06:27 UTC (rev 305383) +++ 0001-giscanner-fix-EOF-check-with-flex-2.6.1.patch 2017-09-12 21:07:46 UTC (rev 305384) @@ -1,87 +0,0 @@ -From 740f5325360e5219b5129401fda90dd34d6cf47c Mon Sep 17 00:00:00 2001 -From: Jan de Groot <[email protected]> -Date: Thu, 20 Oct 2016 12:14:19 +0000 -Subject: [PATCH] giscanner: fix EOF check with flex >= 2.6.1 - -It looks like flex 2.6.1 changed [1] the return code for EOF in -yyinput. Therefore, use the right value depending on the version of -flex which generates the lexer. - -[1] https://github.com/westes/flex/commit/f863c9490e6912ffcaeb12965fb3a567a10745ff ---- - giscanner/scannerlexer.l | 21 +++++++++++++++------ - 1 file changed, 15 insertions(+), 6 deletions(-) - -diff --git a/giscanner/scannerlexer.l b/giscanner/scannerlexer.l -index 21ef570..bd546d5 100644 ---- a/giscanner/scannerlexer.l -+++ b/giscanner/scannerlexer.l -@@ -59,6 +59,15 @@ static void process_linemarks (GISourceScanner *scanner, gboolean has_line); - static int check_identifier (GISourceScanner *scanner, const char *); - static int parse_ignored_macro (void); - static void print_error (GISourceScanner *scanner); -+ -+#if (YY_FLEX_MAJOR_VERSION > 2) \ -+ || ((YY_FLEX_MAJOR_VERSION == 2) && (YY_FLEX_MINOR_VERSION > 6)) \ -+ || ((YY_FLEX_MAJOR_VERSION == 2) && (YY_FLEX_MINOR_VERSION == 6) && (YY_FLEX_SUBMINOR_VERSION >= 1)) -+#define IS_EOF 0 -+#else -+#define IS_EOF EOF -+#endif -+ - %} - - %option nounput -@@ -270,7 +279,7 @@ parse_comment (GISourceScanner *scanner) - c1 = input(); - c2 = input(); - -- if (c2 != EOF && (c1 == '*' && c2 != '*' && c2 != '/')) { -+ if (c2 != IS_EOF && (c1 == '*' && c2 != '*' && c2 != '/')) { - /* - * Store GTK-Doc comment blocks, - * starts with one '/' followed by exactly two '*' and not followed by a '/' -@@ -283,7 +292,7 @@ parse_comment (GISourceScanner *scanner) - - comment_lineno = lineno; - -- while (c2 != EOF && !(c1 == '*' && c2 == '/')) -+ while (c2 != IS_EOF && !(c1 == '*' && c2 == '/')) - { - if (!skip) - g_string_append_c (string, c1); -@@ -311,7 +320,7 @@ parse_comment (GISourceScanner *scanner) - /* - * Ignore all other comment blocks - */ -- while (c2 != EOF && !(c1 == '*' && c2 == '/')) -+ while (c2 != IS_EOF && !(c1 == '*' && c2 == '/')) - { - if (c1 == '\n') - lineno++; -@@ -436,19 +445,19 @@ parse_ignored_macro (void) - int c; - int nest; - -- while ((c = input ()) != EOF && isspace (c)) -+ while ((c = input ()) != IS_EOF && isspace (c)) - ; - if (c != '(') - return FALSE; - - nest = 0; -- while ((c = input ()) != EOF && (nest > 0 || c != ')')) { -+ while ((c = input ()) != IS_EOF && (nest > 0 || c != ')')) { - if (c == '(') - nest++; - else if (c == ')') - nest--; - else if (c == '"') { -- while ((c = input ()) != EOF && c != '"') { -+ while ((c = input ()) != IS_EOF && c != '"') { - if (c == '\\') - c = input (); - } --- -2.10.0 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-09-12 21:06:27 UTC (rev 305383) +++ PKGBUILD 2017-09-12 21:07:46 UTC (rev 305384) @@ -3,7 +3,7 @@ pkgbase=gobject-introspection pkgname=(gobject-introspection gobject-introspection-runtime) -pkgver=1.53.7 +pkgver=1.54.0 pkgrel=1 pkgdesc="Introspection system for GObject-based libraries" url="https://wiki.gnome.org/Projects/GObjectIntrospection"; @@ -12,11 +12,9 @@ depends=(python python-mako) makedepends=(cairo git gtk-doc) options=(!emptydirs) -_commit=f22ad3e4f09a1ada9b8887235c8cb8822a03e88f # tags/1.53.7^0 -source=("git+https://git.gnome.org/browse/gobject-introspection#commit=$_commit"; - 0001-giscanner-fix-EOF-check-with-flex-2.6.1.patch) -sha256sums=('SKIP' - 'e1333f2eddf23e4d750aa1c39e5fea8264d0586d1916f11188dbd07d4449d81f') +_commit=230b258b0fb0279e9f8b500d6a9cfa1313162ced # tags/1.54.0^0 +source=("git+https://git.gnome.org/browse/gobject-introspection#commit=$_commit";) +sha256sums=('SKIP') pkgver() { cd $pkgbase @@ -25,7 +23,6 @@ prepare() { cd $pkgbase - patch -Np1 -i ../0001-giscanner-fix-EOF-check-with-flex-2.6.1.patch NOCONFIGURE=1 ./autogen.sh }
