r54336 - in /packages/unstable/gnome-builder/debian: changelog gnome-builder.install patches/ patches/fix-build-with-multiarch.patch patches/git_protect-against-spurious-builds.patch patches/series

Wed Oct 11 23:06:38 UTC 2017

Author: jbicha
Date: Wed Oct 11 23:06:38 2017
New Revision: 54336

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=54336
Log:
Add 2 patches

* Add git_protect-against-spurious-builds.patch:
  - Cherry-pick fix for excessive build notifications
* Add fix-build-with-multiarch.patch, modify gnome-builder.install:
  - Install Ide.py to the correct non-multiarch directory

Added:
    packages/unstable/gnome-builder/debian/patches/
    packages/unstable/gnome-builder/debian/patches/fix-build-with-multiarch.patch
    packages/unstable/gnome-builder/debian/patches/git_protect-against-spurious-builds.patch
    packages/unstable/gnome-builder/debian/patches/series
Modified:
    packages/unstable/gnome-builder/debian/changelog
    packages/unstable/gnome-builder/debian/gnome-builder.install

Modified: packages/unstable/gnome-builder/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-builder/debian/changelog?rev=54336&op=diff
==============================================================================

--- packages/unstable/gnome-builder/debian/changelog	[utf-8] (original)
+++ packages/unstable/gnome-builder/debian/changelog	[utf-8] Wed Oct 11 23:06:38 2017
@@ -2,6 +2,10 @@
 
   * New upstream release
   * debian/control.in: Bump the build-dependencies
+  * Add git_protect-against-spurious-builds.patch:
+    - Cherry-pick fix for excessive build notifications
+  * Add fix-build-with-multiarch.patch, modify gnome-builder.install:
+    - Install Ide.py to the correct non-multiarch directory
   * Bump Standards-Version to 4.1.1
 
  -- Jeremy Bicha <jbicha at debian.org>  Tue, 03 Oct 2017 18:32:31 -0400

Modified: packages/unstable/gnome-builder/debian/gnome-builder.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-builder/debian/gnome-builder.install?rev=54336&op=diff
==============================================================================
--- packages/unstable/gnome-builder/debian/gnome-builder.install	[utf-8] (original)
+++ packages/unstable/gnome-builder/debian/gnome-builder.install	[utf-8] Wed Oct 11 23:06:38 2017
@@ -8,7 +8,7 @@
 usr/lib/*/gnome-builder/girepository-1.0/*.typelib
 #usr/lib/*/gnome-builder/pkgconfig/
 usr/lib/*/gnome-builder/plugins/
-usr/lib/*/python3*/dist-packages/gi/overrides/
+usr/lib/python3*/dist-packages/gi/overrides/
 usr/share/appdata/org.gnome.Builder.*
 usr/share/applications/org.gnome.Builder.*
 usr/share/dbus-1/services/org.gnome.Builder.*

Added: packages/unstable/gnome-builder/debian/patches/fix-build-with-multiarch.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-builder/debian/patches/fix-build-with-multiarch.patch?rev=54336&op=file
==============================================================================
--- packages/unstable/gnome-builder/debian/patches/fix-build-with-multiarch.patch	(added)
+++ packages/unstable/gnome-builder/debian/patches/fix-build-with-multiarch.patch	[utf-8] Wed Oct 11 23:06:38 2017
@@ -0,0 +1,28 @@
+From 2a4bbc80b67ab41ce430458ec8baa7454bffc775 Mon Sep 17 00:00:00 2001
+From: Jeremy Bicha <jbicha at ubuntu.com>
+Date: Wed, 11 Oct 2017 17:43:18 -0400
+Subject: [PATCH] build: Fix build with multiarch
+
+The Python gi override should be installed to a non-multiarch directory
+on Debian-based distros.
+---
+ libide/meson.build | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/libide/meson.build b/libide/meson.build
+index 5818619c0..0ebb2a729 100644
+--- a/libide/meson.build
++++ b/libide/meson.build
+@@ -694,9 +694,6 @@ except ImportError:
+   purelibdir = sysconfig.get_path('purelib')
+   overridedir = os.path.join(purelibdir, 'gi', 'overrides')
+ 
+-if overridedir.startswith(libdir): # Should always be True..
+-  overridedir = overridedir[len(libdir) + 1:]
+-
+ print(overridedir)
+ '''
+ 
+-- 
+2.14.1
+

Added: packages/unstable/gnome-builder/debian/patches/git_protect-against-spurious-builds.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-builder/debian/patches/git_protect-against-spurious-builds.patch?rev=54336&op=file
==============================================================================
--- packages/unstable/gnome-builder/debian/patches/git_protect-against-spurious-builds.patch	(added)
+++ packages/unstable/gnome-builder/debian/patches/git_protect-against-spurious-builds.patch	[utf-8] Wed Oct 11 23:06:38 2017
@@ -0,0 +1,47 @@
+From 8044f3adf4ab52d38919f0e633e944a7e8d93751 Mon Sep 17 00:00:00 2001
+From: Christian Hergert <chergert at redhat.com>
+Date: Wed, 4 Oct 2017 17:55:54 -0700
+Subject: pipeline: protect against spurious builds
+
+If this is an automated build operation, such as those by
+fetching build flags, try to protect ourselves against spurious
+builds.
+
+A full rebuild or normal build request should still progress as
+normal. This simply checks for advancing up to CONFIGURE when
+there was a previous failure.
+
+Any UI element (such as clicking Build or activating the
+"build" action) will still result in a proper build.
+---
+ libide/buildsystem/ide-build-pipeline.c | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git a/libide/buildsystem/ide-build-pipeline.c b/libide/buildsystem/ide-build-pipeline.c
+index 649389f..92e1e2e 100644
+--- a/libide/buildsystem/ide-build-pipeline.c
++++ b/libide/buildsystem/ide-build-pipeline.c
+@@ -1539,6 +1539,22 @@ ide_build_pipeline_do_flush (gpointer data)
+   g_assert (G_IS_TASK (task_data->task));
+ 
+   /*
++   * If this build request could cause us to spin while we are continually
++   * failing to reach the CONFIGURE stage, protect ourselves as early as we
++   * can. We'll defer to a rebuild request to cause the full thing to build.
++   */
++  if (self->failed &&
++      task_data->type == TASK_BUILD &&
++      task_data->phase <= IDE_BUILD_PHASE_CONFIGURE)
++    {
++      g_task_return_new_error (task,
++                               G_IO_ERROR,
++                               G_IO_ERROR_FAILED,
++                               "The build pipeline is in a failed state and requires a rebuild");
++      IDE_RETURN (G_SOURCE_REMOVE);
++    }
++
++  /*
+    * Now mark the pipeline as busy to protect ourself from anything recursively
+    * calling into the pipeline.
+    */
+

Added: packages/unstable/gnome-builder/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-builder/debian/patches/series?rev=54336&op=file
==============================================================================
--- packages/unstable/gnome-builder/debian/patches/series	(added)
+++ packages/unstable/gnome-builder/debian/patches/series	[utf-8] Wed Oct 11 23:06:38 2017
@@ -0,0 +1,2 @@
+git_protect-against-spurious-builds.patch
+fix-build-with-multiarch.patch


