Date: Wednesday, March 29, 2017 @ 19:34:02 Author: heftig Revision: 291805
archrelease: copy trunk to gnome-unstable-x86_64, gnome-unstable-i686 Added: gobject-introspection/repos/gnome-unstable-i686/ gobject-introspection/repos/gnome-unstable-i686/0001-giscanner-fix-EOF-check-with-flex-2.6.1.patch (from rev 291804, gobject-introspection/trunk/0001-giscanner-fix-EOF-check-with-flex-2.6.1.patch) gobject-introspection/repos/gnome-unstable-i686/PKGBUILD (from rev 291804, gobject-introspection/trunk/PKGBUILD) gobject-introspection/repos/gnome-unstable-x86_64/ gobject-introspection/repos/gnome-unstable-x86_64/0001-giscanner-fix-EOF-check-with-flex-2.6.1.patch (from rev 291804, gobject-introspection/trunk/0001-giscanner-fix-EOF-check-with-flex-2.6.1.patch) gobject-introspection/repos/gnome-unstable-x86_64/PKGBUILD (from rev 291804, gobject-introspection/trunk/PKGBUILD) --------------------------------------------------------------------------+ gnome-unstable-i686/0001-giscanner-fix-EOF-check-with-flex-2.6.1.patch | 87 ++++++++++ gnome-unstable-i686/PKGBUILD | 52 +++++ gnome-unstable-x86_64/0001-giscanner-fix-EOF-check-with-flex-2.6.1.patch | 87 ++++++++++ gnome-unstable-x86_64/PKGBUILD | 52 +++++ 4 files changed, 278 insertions(+) Copied: gobject-introspection/repos/gnome-unstable-i686/0001-giscanner-fix-EOF-check-with-flex-2.6.1.patch (from rev 291804, gobject-introspection/trunk/0001-giscanner-fix-EOF-check-with-flex-2.6.1.patch) =================================================================== --- gnome-unstable-i686/0001-giscanner-fix-EOF-check-with-flex-2.6.1.patch (rev 0) +++ gnome-unstable-i686/0001-giscanner-fix-EOF-check-with-flex-2.6.1.patch 2017-03-29 19:34:02 UTC (rev 291805) @@ -0,0 +1,87 @@ +From 740f5325360e5219b5129401fda90dd34d6cf47c Mon Sep 17 00:00:00 2001 +From: Jan de Groot <j...@archlinux.org> +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 + Copied: gobject-introspection/repos/gnome-unstable-i686/PKGBUILD (from rev 291804, gobject-introspection/trunk/PKGBUILD) =================================================================== --- gnome-unstable-i686/PKGBUILD (rev 0) +++ gnome-unstable-i686/PKGBUILD 2017-03-29 19:34:02 UTC (rev 291805) @@ -0,0 +1,52 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> + +pkgbase=gobject-introspection +pkgname=('gobject-introspection' 'gobject-introspection-runtime') +pkgdesc="Introspection system for GObject-based libraries" +pkgver=1.52.0 +pkgrel=1 +url="https://wiki.gnome.org/Projects/GObjectIntrospection" +arch=('x86_64' 'i686') +license=('LGPL' 'GPL') +depends=('python' 'python-mako') +makedepends=('cairo' 'git' 'gtk-doc') +options=('!emptydirs') +_commit=c942279c7c5e2b42c2f060372e15cbf54a5c353f # tags/1.52.0^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') + +pkgver() { + cd $pkgbase + git describe --tags | sed 's/-/+/g' +} + +prepare() { + cd $pkgbase + patch -Np1 -i ../0001-giscanner-fix-EOF-check-with-flex-2.6.1.patch + NOCONFIGURE=1 ./autogen.sh +} + +build() { + cd $pkgbase + ./configure --prefix=/usr --disable-static --enable-doctool --enable-gtk-doc + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make +} + +package_gobject-introspection-runtime() { + pkgdesc+=" (runtime library)" + depends=('glib2') + cd $pkgbase + make DESTDIR="$pkgdir" install-libLTLIBRARIES install-typelibsDATA +} + +package_gobject-introspection() { + depends+=("gobject-introspection-runtime=$pkgver") + + cd $pkgbase + make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" uninstall-libLTLIBRARIES uninstall-typelibsDATA +} Copied: gobject-introspection/repos/gnome-unstable-x86_64/0001-giscanner-fix-EOF-check-with-flex-2.6.1.patch (from rev 291804, gobject-introspection/trunk/0001-giscanner-fix-EOF-check-with-flex-2.6.1.patch) =================================================================== --- gnome-unstable-x86_64/0001-giscanner-fix-EOF-check-with-flex-2.6.1.patch (rev 0) +++ gnome-unstable-x86_64/0001-giscanner-fix-EOF-check-with-flex-2.6.1.patch 2017-03-29 19:34:02 UTC (rev 291805) @@ -0,0 +1,87 @@ +From 740f5325360e5219b5129401fda90dd34d6cf47c Mon Sep 17 00:00:00 2001 +From: Jan de Groot <j...@archlinux.org> +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 + Copied: gobject-introspection/repos/gnome-unstable-x86_64/PKGBUILD (from rev 291804, gobject-introspection/trunk/PKGBUILD) =================================================================== --- gnome-unstable-x86_64/PKGBUILD (rev 0) +++ gnome-unstable-x86_64/PKGBUILD 2017-03-29 19:34:02 UTC (rev 291805) @@ -0,0 +1,52 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> + +pkgbase=gobject-introspection +pkgname=('gobject-introspection' 'gobject-introspection-runtime') +pkgdesc="Introspection system for GObject-based libraries" +pkgver=1.52.0 +pkgrel=1 +url="https://wiki.gnome.org/Projects/GObjectIntrospection" +arch=('x86_64' 'i686') +license=('LGPL' 'GPL') +depends=('python' 'python-mako') +makedepends=('cairo' 'git' 'gtk-doc') +options=('!emptydirs') +_commit=c942279c7c5e2b42c2f060372e15cbf54a5c353f # tags/1.52.0^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') + +pkgver() { + cd $pkgbase + git describe --tags | sed 's/-/+/g' +} + +prepare() { + cd $pkgbase + patch -Np1 -i ../0001-giscanner-fix-EOF-check-with-flex-2.6.1.patch + NOCONFIGURE=1 ./autogen.sh +} + +build() { + cd $pkgbase + ./configure --prefix=/usr --disable-static --enable-doctool --enable-gtk-doc + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make +} + +package_gobject-introspection-runtime() { + pkgdesc+=" (runtime library)" + depends=('glib2') + cd $pkgbase + make DESTDIR="$pkgdir" install-libLTLIBRARIES install-typelibsDATA +} + +package_gobject-introspection() { + depends+=("gobject-introspection-runtime=$pkgver") + + cd $pkgbase + make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" uninstall-libLTLIBRARIES uninstall-typelibsDATA +}