r49679 - in /packages/experimental/gnome-builder/debian: changelog control.in patches/git_fix-32bit-build.patch patches/series rules

[ah at users.alioth.debian.org]

Author: ah
Date: Tue Aug 23 17:40:15 2016
New Revision: 49679

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=49679
Log:
* debian/control*:
  - Limit sysprof build-dependency to where it's currently available.
  - Add sysprof to Recommends:, so it's available if plugin gets enabled.
* debian/rules:
  - Explicitly pass --{enable,disable}-sysprof-plugin based on arch
    we're building on as the plugin defaults to enable (not auto).
* Add debian/patches/git_fix-32bit-build.patch from upstream git.

Added:
    packages/experimental/gnome-builder/debian/patches/git_fix-32bit-build.patch
Modified:
    packages/experimental/gnome-builder/debian/changelog
    packages/experimental/gnome-builder/debian/control.in
    packages/experimental/gnome-builder/debian/patches/series
    packages/experimental/gnome-builder/debian/rules

Modified: packages/experimental/gnome-builder/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-builder/debian/changelog?rev=49679&op=diff
==============================================================================
--- packages/experimental/gnome-builder/debian/changelog	[utf-8] (original)
+++ packages/experimental/gnome-builder/debian/changelog	[utf-8] Tue Aug 23 17:40:15 2016
@@ -1,3 +1,15 @@
+gnome-builder (3.21.90-2) UNRELEASED; urgency=medium
+
+  * debian/control*:
+    - Limit sysprof build-dependency to where it's currently available.
+    - Add sysprof to Recommends:, so it's available if plugin gets enabled.
+  * debian/rules:
+    - Explicitly pass --{enable,disable}-sysprof-plugin based on arch
+      we're building on as the plugin defaults to enable (not auto).
+  * Add debian/patches/git_fix-32bit-build.patch from upstream git.
+
+ -- Andreas Henriksson <andreas at fatal.se>  Tue, 23 Aug 2016 19:26:12 +0200
+
 gnome-builder (3.21.90-1) experimental; urgency=medium
 
   * New upstream beta release.

Modified: packages/experimental/gnome-builder/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-builder/debian/control.in?rev=49679&op=diff
==============================================================================
--- packages/experimental/gnome-builder/debian/control.in	[utf-8] (original)
+++ packages/experimental/gnome-builder/debian/control.in	[utf-8] Tue Aug 23 17:40:15 2016
@@ -30,7 +30,7 @@
                mm-common,
                python-gi-dev (>= 3.21.0),
                python3-dev,
-               sysprof (>= 3.21.90),
+               sysprof (>= 3.21.90) [amd64 i386 ppc64el x32],
                valac (>= 0.30.0.55),
                yelp-tools
 # Don't (re)build libide api docs for now:
@@ -57,7 +57,7 @@
          ${misc:Depends},
          ${python3:Depends},
          ${shlibs:Depends}
-Recommends: python3-jedi, python3-lxml
+Recommends: python3-jedi, python3-lxml, sysprof
 Description: IDE for GNOME
  Builder is a new IDE for GNOME that is focused on bringing the power of
  our platform to more developers than ever before. It is currently under

Added: packages/experimental/gnome-builder/debian/patches/git_fix-32bit-build.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-builder/debian/patches/git_fix-32bit-build.patch?rev=49679&op=file
==============================================================================
--- packages/experimental/gnome-builder/debian/patches/git_fix-32bit-build.patch	(added)
+++ packages/experimental/gnome-builder/debian/patches/git_fix-32bit-build.patch	[utf-8] Tue Aug 23 17:40:15 2016
@@ -0,0 +1,26 @@
+From caa46488fe030dba067485819ddcc998ab4a5b9c Mon Sep 17 00:00:00 2001
+From: Kalev Lember <klember at redhat.com>
+Date: Tue, 23 Aug 2016 12:51:02 +0200
+Subject: gstyle: Fix the build on 32 bit architectures
+
+https://bugzilla.gnome.org/show_bug.cgi?id=770273
+---
+ contrib/gstyle/gstyle-palette.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/contrib/gstyle/gstyle-palette.c b/contrib/gstyle/gstyle-palette.c
+index 98fa593..23b1728 100644
+--- a/contrib/gstyle/gstyle-palette.c
++++ b/contrib/gstyle/gstyle-palette.c
+@@ -996,7 +996,7 @@ gstyle_palette_set_id (GstylePalette *self,
+   if (gstyle_str_empty0 (id))
+     {
+       num_id = g_get_real_time ();
+-      self->id = g_strdup_printf ("gb-cp-%lu", num_id);
++      self->id = g_strdup_printf ("gb-cp-%"G_GINT64_FORMAT, num_id);
+       gstyle_palette_set_changed (self, TRUE);
+     }
+   else if (g_strcmp0 (self->id, id) != 0)
+-- 
+cgit v0.12
+

Modified: packages/experimental/gnome-builder/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-builder/debian/patches/series?rev=49679&op=diff
==============================================================================
--- packages/experimental/gnome-builder/debian/patches/series	[utf-8] (original)
+++ packages/experimental/gnome-builder/debian/patches/series	[utf-8] Tue Aug 23 17:40:15 2016
@@ -1 +1,2 @@
 sysprog-plugin-no-so-ver.patch
+git_fix-32bit-build.patch

Modified: packages/experimental/gnome-builder/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-builder/debian/rules?rev=49679&op=diff
==============================================================================
--- packages/experimental/gnome-builder/debian/rules	[utf-8] (original)
+++ packages/experimental/gnome-builder/debian/rules	[utf-8] Tue Aug 23 17:40:15 2016
@@ -18,6 +18,14 @@
 # package maintainers to append LDFLAGS
 #export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
+# Explicitly disable this plugin which defaults to enabled
+# unless we're on the limited set of architectures that has sysprof.
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+ifneq (,$(filter amd64 i386 ppc64el x32,$(DEB_HOST_ARCH)))
+SYSPROF_PLUGIN = --enable-sysprof-plugin
+else
+SYSPROF_PLUGIN = --disable-sysprof-plugin
+endif
 
 %:
 	dh $@  --with autoreconf,gir,gnome,python3