debian/patches/03_export-symbols.patch:

* debian/patches/03_export-symbols.patch:
  + Only export ^cairo_* symbols for libcairo-gobject and
    libcairo-script-interpreter (in addition to libcairo).
    Fixes a FTBFS in the architectures that are still using
    gcc-4.4, as one symbol isn't being exported there (since
    that gcc doesn't support -flto).

4 files changed, 38 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index 99450a5..adbd0d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+cairo (1.10.2-6) UNRELEASED; urgency=low
+
+  * debian/patches/03_export-symbols.patch:
+    + Only export ^cairo_* symbols for libcairo-gobject and
+      libcairo-script-interpreter (in addition to libcairo).
+      Fixes a FTBFS in the architectures that are still using
+      gcc-4.4, as one symbol isn't being exported there (since
+      that gcc doesn't support -flto).
+
+ -- Emilio Pozuelo Monfort <pochu@debian.org>  Sat, 26 Mar 2011 09:54:44 +0000
+
 cairo (1.10.2-5) unstable; urgency=low
 
   * debian/control,
diff --git a/debian/patches/03_export-symbols.patch b/debian/patches/03_export-symbols.patch
index 21fe9cd..5f1c2d4 100644
--- a/debian/patches/03_export-symbols.patch
+++ b/debian/patches/03_export-symbols.patch
@@ -11,3 +11,28 @@ Index: cairo/src/Makefile.am
  libcairo_la_LIBADD = $(CAIRO_LIBS) \
  	$(cairo_cxx_lib)
  libcairo_la_DEPENDENCIES = $(cairo_def_dependency) $(cairo_cxx_lib)
+diff --git a/util/cairo-gobject/Makefile.am b/util/cairo-gobject/Makefile.am
+index 22c1a27..5a15950 100644
+--- a/util/cairo-gobject/Makefile.am
++++ b/util/cairo-gobject/Makefile.am
+@@ -10,6 +10,6 @@ libcairo_gobject_la_SOURCES = \
+ 	$(NULL)
+ 
+ libcairo_gobject_la_CFLAGS = $(CAIRO_CFLAGS) $(GOBJECT_CFLAGS)
+-libcairo_gobject_la_LDFLAGS = -version-info $(CAIRO_LIBTOOL_VERSION_INFO) -no-undefined $(export_symbols)
++libcairo_gobject_la_LDFLAGS = -version-info $(CAIRO_LIBTOOL_VERSION_INFO) -no-undefined $(export_symbols) -export-symbols-regex \^cairo_.*
+ libcairo_gobject_la_LIBADD = $(top_builddir)/src/libcairo.la $(CAIRO_LIBS) $(GOBJECT_LIBS)
+ 
+diff --git a/util/cairo-script/Makefile.am b/util/cairo-script/Makefile.am
+index d7e4427..8d4181b 100644
+--- a/util/cairo-script/Makefile.am
++++ b/util/cairo-script/Makefile.am
+@@ -18,7 +18,7 @@ libcairo_script_interpreter_la_SOURCES = \
+ 	cairo-script-stack.c \
+ 	$(NULL)
+ libcairo_script_interpreter_la_CFLAGS = $(CAIRO_CFLAGS)
+-libcairo_script_interpreter_la_LDFLAGS = -version-info $(CAIRO_LIBTOOL_VERSION_INFO) -no-undefined $(export_symbols)
++libcairo_script_interpreter_la_LDFLAGS = -version-info $(CAIRO_LIBTOOL_VERSION_INFO) -no-undefined $(export_symbols) -export-symbols-regex \^cairo_.*
+ libcairo_script_interpreter_la_LIBADD = $(top_builddir)/src/libcairo.la $(CAIRO_LIBS) -lz
+ 
+ csi_replay_SOURCES = csi-replay.c
diff --git a/util/cairo-gobject/Makefile.am b/util/cairo-gobject/Makefile.am
index 22c1a27..5a15950 100644
--- a/util/cairo-gobject/Makefile.am
+++ b/util/cairo-gobject/Makefile.am
@@ -10,6 +10,6 @@ libcairo_gobject_la_SOURCES = \
 	$(NULL)
 
 libcairo_gobject_la_CFLAGS = $(CAIRO_CFLAGS) $(GOBJECT_CFLAGS)
-libcairo_gobject_la_LDFLAGS = -version-info $(CAIRO_LIBTOOL_VERSION_INFO) -no-undefined $(export_symbols)
+libcairo_gobject_la_LDFLAGS = -version-info $(CAIRO_LIBTOOL_VERSION_INFO) -no-undefined $(export_symbols) -export-symbols-regex \^cairo_.*
 libcairo_gobject_la_LIBADD = $(top_builddir)/src/libcairo.la $(CAIRO_LIBS) $(GOBJECT_LIBS)
 
diff --git a/util/cairo-script/Makefile.am b/util/cairo-script/Makefile.am
index d7e4427..8d4181b 100644
--- a/util/cairo-script/Makefile.am
+++ b/util/cairo-script/Makefile.am
@@ -18,7 +18,7 @@ libcairo_script_interpreter_la_SOURCES = \
 	cairo-script-stack.c \
 	$(NULL)
 libcairo_script_interpreter_la_CFLAGS = $(CAIRO_CFLAGS)
-libcairo_script_interpreter_la_LDFLAGS = -version-info $(CAIRO_LIBTOOL_VERSION_INFO) -no-undefined $(export_symbols)
+libcairo_script_interpreter_la_LDFLAGS = -version-info $(CAIRO_LIBTOOL_VERSION_INFO) -no-undefined $(export_symbols) -export-symbols-regex \^cairo_.*
 libcairo_script_interpreter_la_LIBADD = $(top_builddir)/src/libcairo.la $(CAIRO_LIBS) -lz
 
 csi_replay_SOURCES = csi-replay.c