r50102 - in /desktop/unstable/nautilus/debian: changelog patches/ patches/0001-Revert-configure.ac-link-against-libgd-dynamically.patch patches/0002-tagged-entry-Fix-missing-GResource-when-using-static.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Mon Sep  5 14:16:56 2016
New Revision: 50102

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=50102
Log:
Link statically against libgd. Patches cherry-picked from upstream Git.

Added:
    desktop/unstable/nautilus/debian/patches/
    desktop/unstable/nautilus/debian/patches/0001-Revert-configure.ac-link-against-libgd-dynamically.patch
    desktop/unstable/nautilus/debian/patches/0002-tagged-entry-Fix-missing-GResource-when-using-static.patch
    desktop/unstable/nautilus/debian/patches/series
Modified:
    desktop/unstable/nautilus/debian/changelog

Modified: desktop/unstable/nautilus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/changelog?rev=50102&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/changelog	[utf-8] (original)
+++ desktop/unstable/nautilus/debian/changelog	[utf-8] Mon Sep  5 14:16:56 2016
@@ -5,6 +5,7 @@
     - Bump libglib2.0-dev to (>= 2.49.1).
     - Add libgnome-autoar-0-dev (>= 0.1).
     - Drop intltool.
+  * Link statically against libgd. Patches cherry-picked from upstream Git.
 
  -- Michael Biebl <biebl at debian.org>  Sun, 04 Sep 2016 22:40:34 +0200
 

Added: desktop/unstable/nautilus/debian/patches/0001-Revert-configure.ac-link-against-libgd-dynamically.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/0001-Revert-configure.ac-link-against-libgd-dynamically.patch?rev=50102&op=file
==============================================================================
--- desktop/unstable/nautilus/debian/patches/0001-Revert-configure.ac-link-against-libgd-dynamically.patch	(added)
+++ desktop/unstable/nautilus/debian/patches/0001-Revert-configure.ac-link-against-libgd-dynamically.patch	[utf-8] Mon Sep  5 14:16:56 2016
@@ -0,0 +1,28 @@
+From 02be44857711d3f76e40f5f070ffcf3f400b58d9 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess at hadess.net>
+Date: Mon, 29 Aug 2016 12:43:07 +0200
+Subject: [PATCH] Revert "configure.ac: link against libgd dynamically"
+
+This reverts commit 43f2065add00c029584ced89b4c4ea391f9b52b3. This will
+be fixed another way.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=770121
+---
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.ac b/configure.ac
+index 424feaf..9ea0f78 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -313,6 +313,7 @@ AM_CONDITIONAL(ENABLE_UPDATE_MIMEDB, test x$enable_update_mimedb = xyes)
+ LIBGD_INIT([
+   gtk-hacks
+   notification
++  static
+   _view-common
+   tagged-entry
+ ])
+-- 
+2.9.3
+

Added: desktop/unstable/nautilus/debian/patches/0002-tagged-entry-Fix-missing-GResource-when-using-static.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/0002-tagged-entry-Fix-missing-GResource-when-using-static.patch?rev=50102&op=file
==============================================================================
--- desktop/unstable/nautilus/debian/patches/0002-tagged-entry-Fix-missing-GResource-when-using-static.patch	(added)
+++ desktop/unstable/nautilus/debian/patches/0002-tagged-entry-Fix-missing-GResource-when-using-static.patch	[utf-8] Mon Sep  5 14:16:56 2016
@@ -0,0 +1,42 @@
+From 752f65e91ea0d9a2ee8a2d21343bbd97bd0d038a Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess at hadess.net>
+Date: Tue, 30 Aug 2016 11:19:12 +0200
+Subject: [PATCH] tagged-entry: Fix missing GResource when using static library
+
+gcc seems to be stripping away the "unused"
+gd_tagged_entry_get_resource() when linking it. Call the function to
+avoid the function being stripped away.
+
+See https://bugzilla.gnome.org/show_bug.cgi?id=770121
+
+https://bugzilla.gnome.org/show_bug.cgi?id=770555
+---
+ libgd/gd-tagged-entry.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/libgd/libgd/gd-tagged-entry.c b/libgd/libgd/gd-tagged-entry.c
+index b94fe85..1eae2b7 100644
+--- a/libgd/libgd/gd-tagged-entry.c
++++ b/libgd/libgd/gd-tagged-entry.c
+@@ -23,6 +23,7 @@
+ #include "gd-tagged-entry.h"
+ 
+ #include <math.h>
++#include <libgd/gd-tagged-entry-resources.h>
+ 
+ #define BUTTON_INTERNAL_SPACING 6
+ 
+@@ -915,8 +916,10 @@ static void
+ gd_tagged_entry_add_default_style (void)
+ {
+   GtkCssProvider *provider;
++  GResource *do_not_optimize_away_get_resource G_GNUC_UNUSED;
+ 
+   provider = gtk_css_provider_new ();
++  do_not_optimize_away_get_resource = gd_tagged_entry_get_resource ();
+   gtk_css_provider_load_from_resource
+     (provider, "/org/gnome/libgd/tagged-entry/default.css");
+ 
+-- 
+2.9.3
+

Added: desktop/unstable/nautilus/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/series?rev=50102&op=file
==============================================================================
--- desktop/unstable/nautilus/debian/patches/series	(added)
+++ desktop/unstable/nautilus/debian/patches/series	[utf-8] Mon Sep  5 14:16:56 2016
@@ -0,0 +1,2 @@
+0001-Revert-configure.ac-link-against-libgd-dynamically.patch
+0002-tagged-entry-Fix-missing-GResource-when-using-static.patch