r42500 - in /desktop/experimental/gobject-introspection/debian: changelog control patches/0001-Hide-more-symbols-that-shouldn-t-be-exported.patch patches/0002-Export-missing-g_typelib_error_quark.patch patches/series

ah at users.alioth.debian.org ah at users.alioth.debian.org
Fri Sep 5 21:05:16 UTC 2014


Author: ah
Date: Fri Sep  5 21:05:16 2014
New Revision: 42500

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=42500
Log:
* New upstream development release.
* Add debian/patches/0001-Hide-more-symbols-that-shouldn-t-be-exported.patch
  and debian/patches/0002-Export-missing-g_typelib_error_quark.patch
  - fix what seems to be mistakenly exported and a missing symbol from
    conversion to "Export Symbols Using Compiler Directives"
    see https://bugzilla.gnome.org/show_bug.cgi?id=732669

Added:
    desktop/experimental/gobject-introspection/debian/patches/0001-Hide-more-symbols-that-shouldn-t-be-exported.patch
    desktop/experimental/gobject-introspection/debian/patches/0002-Export-missing-g_typelib_error_quark.patch
Modified:
    desktop/experimental/gobject-introspection/debian/changelog
    desktop/experimental/gobject-introspection/debian/control
    desktop/experimental/gobject-introspection/debian/patches/series

Modified: desktop/experimental/gobject-introspection/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gobject-introspection/debian/changelog?rev=42500&op=diff
==============================================================================
--- desktop/experimental/gobject-introspection/debian/changelog	[utf-8] (original)
+++ desktop/experimental/gobject-introspection/debian/changelog	[utf-8] Fri Sep  5 21:05:16 2014
@@ -1,3 +1,14 @@
+gobject-introspection (1.41.91-1) experimental; urgency=medium
+
+  * New upstream development release.
+  * Add debian/patches/0001-Hide-more-symbols-that-shouldn-t-be-exported.patch
+    and debian/patches/0002-Export-missing-g_typelib_error_quark.patch
+    - fix what seems to be mistakenly exported and a missing symbol from
+      conversion to "Export Symbols Using Compiler Directives"
+      see https://bugzilla.gnome.org/show_bug.cgi?id=732669
+
+ -- Andreas Henriksson <andreas at fatal.se>  Fri, 05 Sep 2014 12:37:03 -0700
+
 gobject-introspection (1.41.4-1) experimental; urgency=medium
 
   [ Martin Pitt ]

Modified: desktop/experimental/gobject-introspection/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gobject-introspection/debian/control?rev=42500&op=diff
==============================================================================
--- desktop/experimental/gobject-introspection/debian/control	[utf-8] (original)
+++ desktop/experimental/gobject-introspection/debian/control	[utf-8] Fri Sep  5 21:05:16 2014
@@ -2,6 +2,7 @@
 # 
 # Modifications should be made to debian/control.in instead.
 # This file is regenerated automatically in the clean target.
+
 Source: gobject-introspection
 Section: devel
 Priority: optional

Added: desktop/experimental/gobject-introspection/debian/patches/0001-Hide-more-symbols-that-shouldn-t-be-exported.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gobject-introspection/debian/patches/0001-Hide-more-symbols-that-shouldn-t-be-exported.patch?rev=42500&op=file
==============================================================================
--- desktop/experimental/gobject-introspection/debian/patches/0001-Hide-more-symbols-that-shouldn-t-be-exported.patch	(added)
+++ desktop/experimental/gobject-introspection/debian/patches/0001-Hide-more-symbols-that-shouldn-t-be-exported.patch	[utf-8] Fri Sep  5 21:05:16 2014
@@ -0,0 +1,44 @@
+From d907629eaacbc8146b8bae4ec6c3b00187df0baf Mon Sep 17 00:00:00 2001
+From: Andreas Henriksson <andreas at fatal.se>
+Date: Fri, 5 Sep 2014 13:30:02 -0700
+Subject: [PATCH 1/2] Hide more symbols that shouldn't be exported
+
+This fixes some fallouts from commit d281b07c4aba18d3
+"build: Export Symbols Using Compiler Directives"
+---
+ Makefile-cmph.am         | 2 +-
+ Makefile-girepository.am | 6 +++++-
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile-cmph.am b/Makefile-cmph.am
+index a2edcf6..5e2133a 100644
+--- a/Makefile-cmph.am
++++ b/Makefile-cmph.am
+@@ -1,6 +1,6 @@
+ EXTRA_LTLIBRARIES += libcmph.la
+ 
+-libcmph_la_CPPFLAGS = -Icmph $(GLIB_CFLAGS)
++libcmph_la_CPPFLAGS = -Icmph $(GLIB_CFLAGS) $(GI_HIDDEN_VISIBILITY_CFLAGS)
+ libcmph_la_LIBADD = -lm $(GLIB_LIBS)
+ 
+ libcmph_la_SOURCES = \
+diff --git a/Makefile-girepository.am b/Makefile-girepository.am
+index 8a857d6..44b508d 100644
+--- a/Makefile-girepository.am
++++ b/Makefile-girepository.am
+@@ -30,7 +30,11 @@ noinst_LTLIBRARIES += libgirepository-internals.la libgirepository-gthash.la
+ 
+ libgirepository_gthash_la_SOURCES =				\
+ 	girepository/gthash.c
+-libgirepository_gthash_la_CFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository
++libgirepository_gthash_la_CFLAGS =	\
++	$(GIREPO_CFLAGS)	\
++	$(GI_HIDDEN_VISIBILITY_CFLAGS)	\
++	-I$(top_srcdir)/girepository
++
+ libgirepository_gthash_la_LIBADD = libcmph.la $(GIREPO_LIBS)
+ 
+ libgirepository_internals_la_SOURCES =				\
+-- 
+2.1.0
+

Added: desktop/experimental/gobject-introspection/debian/patches/0002-Export-missing-g_typelib_error_quark.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gobject-introspection/debian/patches/0002-Export-missing-g_typelib_error_quark.patch?rev=42500&op=file
==============================================================================
--- desktop/experimental/gobject-introspection/debian/patches/0002-Export-missing-g_typelib_error_quark.patch	(added)
+++ desktop/experimental/gobject-introspection/debian/patches/0002-Export-missing-g_typelib_error_quark.patch	[utf-8] Fri Sep  5 21:05:16 2014
@@ -0,0 +1,31 @@
+From 3120916c3756c0af4e48c8de2085217945d62f78 Mon Sep 17 00:00:00 2001
+From: Andreas Henriksson <andreas at fatal.se>
+Date: Fri, 5 Sep 2014 13:43:33 -0700
+Subject: [PATCH 2/2] Export missing g_typelib_error_quark
+
+This symbol went missing in the conversion to -fvisibility=hidden
+in commit d281b07c4aba18d30c4365ef
+"build: Export Symbols Using Compiler Directives"
+
+Maybe it was mistakenly exported from the start since it's
+from an internal header...
+---
+ girepository/gitypelib-internal.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/girepository/gitypelib-internal.h b/girepository/gitypelib-internal.h
+index e367cfa..cdfffdd 100644
+--- a/girepository/gitypelib-internal.h
++++ b/girepository/gitypelib-internal.h
+@@ -1259,7 +1259,7 @@ typedef enum
+  */
+ #define G_TYPELIB_ERROR (g_typelib_error_quark ())
+ 
+-GQuark g_typelib_error_quark (void);
++GI_AVAILABLE_IN_ALL GQuark g_typelib_error_quark (void);
+ 
+ 
+ GI_AVAILABLE_IN_ALL
+-- 
+2.1.0
+

Modified: desktop/experimental/gobject-introspection/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gobject-introspection/debian/patches/series?rev=42500&op=diff
==============================================================================
--- desktop/experimental/gobject-introspection/debian/patches/series	[utf-8] (original)
+++ desktop/experimental/gobject-introspection/debian/patches/series	[utf-8] Fri Sep  5 21:05:16 2014
@@ -1,2 +1,4 @@
 #needed only until all packages are moved to mutliarch paths
 pre_multiarch_compat
+0001-Hide-more-symbols-that-shouldn-t-be-exported.patch
+0002-Export-missing-g_typelib_error_quark.patch




More information about the pkg-gnome-commits mailing list