r53574 - in /packages/unstable/gnome-builder/debian: changelog patches/git_gdb-fix-mips-build.patch patches/series

jbicha at users.alioth.debian.org jbicha at users.alioth.debian.org
Thu Sep 7 19:41:24 UTC 2017


Author: jbicha
Date: Thu Sep  7 19:41:24 2017
New Revision: 53574

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=53574
Log:
Fix build failure on mips* architectures

Added:
    packages/unstable/gnome-builder/debian/patches/git_gdb-fix-mips-build.patch
Modified:
    packages/unstable/gnome-builder/debian/changelog
    packages/unstable/gnome-builder/debian/patches/series

Modified: packages/unstable/gnome-builder/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-builder/debian/changelog?rev=53574&op=diff
==============================================================================
--- packages/unstable/gnome-builder/debian/changelog	[utf-8] (original)
+++ packages/unstable/gnome-builder/debian/changelog	[utf-8] Thu Sep  7 19:41:24 2017
@@ -1,3 +1,10 @@
+gnome-builder (3.25.92-2) UNRELEASED; urgency=medium
+
+  * Add git_gdb-fix-mips-build.patch:
+    - Fix build failure on mips* architectures
+
+ -- Jeremy Bicha <jbicha at debian.org>  Thu, 07 Sep 2017 15:40:07 -0400
+
 gnome-builder (3.25.92-1) unstable; urgency=medium
 
   * New upstream release

Added: packages/unstable/gnome-builder/debian/patches/git_gdb-fix-mips-build.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-builder/debian/patches/git_gdb-fix-mips-build.patch?rev=53574&op=file
==============================================================================
--- packages/unstable/gnome-builder/debian/patches/git_gdb-fix-mips-build.patch	(added)
+++ packages/unstable/gnome-builder/debian/patches/git_gdb-fix-mips-build.patch	[utf-8] Thu Sep  7 19:41:24 2017
@@ -0,0 +1,103 @@
+From 723a5d477fa9e626959a259f623e1611f7939502 Mon Sep 17 00:00:00 2001
+From: Christian Hergert <chergert at redhat.com>
+Date: Thu, 7 Sep 2017 12:14:59 -0700
+Subject: gdb: avoid use of mips
+
+mips is an integer constant on GCC/mips. So we need ot be careful
+to not use it here.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=787402
+---
+ plugins/gdb/gdbwire.c | 22 +++++++++++-----------
+ plugins/gdb/gdbwire.h |  2 +-
+ 2 files changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/plugins/gdb/gdbwire.c b/plugins/gdb/gdbwire.c
+index 8a4845a..9776bf6 100644
+--- a/plugins/gdb/gdbwire.c
++++ b/plugins/gdb/gdbwire.c
+@@ -3,7 +3,7 @@
+  *
+  * This file is an amalgamation of the source files from GDBWIRE.
+  *
+- * It was created using gdbwire 1.0 and git revision b5ae67f.
++ * It was created using gdbwire 1.0 and git revision 3c5983c.
+  *
+  * GDBWIRE is free software: you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+@@ -1685,7 +1685,7 @@ struct gdbwire_mi_parser {
+     /* The GDB/MI lexer state */
+     yyscan_t mils;
+     /* The GDB/MI push parser state */
+-    gdbwire_mi_pstate *mips;
++    gdbwire_mi_pstate *mipst;
+     /* The client parser callbacks */
+     struct gdbwire_mi_parser_callbacks callbacks;
+ };
+@@ -1716,8 +1716,8 @@ gdbwire_mi_parser_create(struct gdbwire_mi_parser_callbacks callbacks)
+     }
+ 
+     /* Create a new push parser state instance */
+-    parser->mips = gdbwire_mi_pstate_new();
+-    if (!parser->mips) {
++    parser->mipst = gdbwire_mi_pstate_new();
++    if (!parser->mipst) {
+         gdbwire_mi_lex_destroy(parser->mils);
+         gdbwire_string_destroy(parser->buffer);
+         free(parser);
+@@ -1726,7 +1726,7 @@ gdbwire_mi_parser_create(struct gdbwire_mi_parser_callbacks callbacks)
+ 
+     /* Ensure that the callbacks are non null */
+     if (!callbacks.gdbwire_mi_output_callback) {
+-        gdbwire_mi_pstate_delete(parser->mips);
++        gdbwire_mi_pstate_delete(parser->mipst);
+         gdbwire_mi_lex_destroy(parser->mils);
+         gdbwire_string_destroy(parser->buffer);
+         free(parser);
+@@ -1754,9 +1754,9 @@ void gdbwire_mi_parser_destroy(struct gdbwire_mi_parser *parser)
+         }
+ 
+         /* Free the push parser instance */
+-        if (parser->mips) {
+-            gdbwire_mi_pstate_delete(parser->mips);
+-            parser->mips = NULL;
++        if (parser->mipst) {
++            gdbwire_mi_pstate_delete(parser->mipst);
++            parser->mipst = NULL;
+         }
+ 
+         free(parser);
+@@ -1807,7 +1807,7 @@ gdbwire_mi_parser_parse_line(struct gdbwire_mi_parser *parser,
+         pattern = gdbwire_mi_lex(parser->mils);
+         if (pattern == 0)
+             break;
+-        mi_status = gdbwire_mi_push_parse(parser->mips, pattern, NULL,
++        mi_status = gdbwire_mi_push_parse(parser->mipst, pattern, NULL,
+             parser->mils, &output);
+     } while (mi_status == YYPUSH_MORE);
+ 
+@@ -1819,8 +1819,8 @@ gdbwire_mi_parser_parse_line(struct gdbwire_mi_parser *parser,
+      * - 0 if parsing was successful (return is due to end-of-input).
+      * - 1 if parsing failed because of invalid input, i.e., input
+      *     that contains a syntax error or that causes YYABORT to be invoked.
+-     * - 2 if parsing failed due to memory exhaustion. 
+-     * - YYPUSH_MORE if more input is required to finish parsing the grammar. 
++     * - 2 if parsing failed due to memory exhaustion.
++     * - YYPUSH_MORE if more input is required to finish parsing the grammar.
+      * Anything besides this would be unexpected.
+      *
+      * The grammar is designed to accept an infinate list of GDB/MI
+diff --git a/plugins/gdb/gdbwire.h b/plugins/gdb/gdbwire.h
+index 4e96082..f5506b5 100644
+--- a/plugins/gdb/gdbwire.h
++++ b/plugins/gdb/gdbwire.h
+@@ -3,7 +3,7 @@
+  *
+  * This file is an amalgamation of the source files from GDBWIRE.
+  *
+- * It was created using gdbwire 1.0 and git revision b5ae67f.
++ * It was created using gdbwire 1.0 and git revision 3c5983c.
+  *
+  * GDBWIRE is free software: you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+

Modified: packages/unstable/gnome-builder/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-builder/debian/patches/series?rev=53574&op=diff
==============================================================================
--- packages/unstable/gnome-builder/debian/patches/series	[utf-8] (original)
+++ packages/unstable/gnome-builder/debian/patches/series	[utf-8] Thu Sep  7 19:41:24 2017
@@ -1 +1,2 @@
 revert-require-libgit2-glib25.patch
+git_gdb-fix-mips-build.patch




More information about the pkg-gnome-commits mailing list