[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.5.2_rc2-1-3-gb55e5ec
The following commit has been merged in the master branch:
commit b55e5ec8d2c1aa00458943e4ac8830db2a00ee05
Author: Rene Engelhard <rene@debian.org>
Date: Mon Apr 2 00:25:10 2012 +0200
add hack to fix gtk3 build breakage by explicit gmodule link...
diff --git a/changelog b/changelog
index 17fd240..c1bf4cf 100644
--- a/changelog
+++ b/changelog
@@ -1,12 +1,17 @@
libreoffice (1:3.5.2~rc2-2) UNRELEASED; urgency=low
+ * debian/patches/gtk3-hack-explicit-gmodule.diff: explicitely link to
+ gmodule, as we otherwise get undefined references to g_mdoule_ in the
+ gtk3 VCLplug...
+
* debian/rules:
- enable Base stuff on s390x again, libebook1.2-dev available now
* debian/uno-libs3.lintian-overrides:
- override shlibs-declares-dependency-on-other-package and
symbols-declares-dependency-on-other-package
- -- Rene Engelhard <rene@debian.org> Sun, 01 Apr 2012 22:52:41 +0200
+
+ -- Rene Engelhard <rene@debian.org> Mon, 02 Apr 2012 00:11:02 +0200
libreoffice (1:3.5.2~rc2-1) unstable; urgency=low
diff --git a/patches/gtk3-hack-explicit-gmodule.diff b/patches/gtk3-hack-explicit-gmodule.diff
new file mode 100644
index 0000000..0d5386c
--- /dev/null
+++ b/patches/gtk3-hack-explicit-gmodule.diff
@@ -0,0 +1,39 @@
+For whatever reason we get undefined referenced to g_module_*.
+
+--- a/vcl/Library_vclplug_gtk3.mk-old 2012-04-01 23:57:18.435192769 +0200
++++ b/vcl/Library_vclplug_gtk3.mk 2012-04-02 00:07:03.610693627 +0200
+@@ -55,6 +55,7 @@
+ $(eval $(call gb_Library_add_libs,vclplug_gtk3,\
+ $$(GTK3_LIBS) \
+ $$(GTHREAD_LIBS) \
++ $$(GMODULE_LIBS) \
+ ))
+
+ $(eval $(call gb_Library_add_linked_libs,vclplug_gtk3,\
+--- a/configure.in-old 2012-04-01 23:57:57.091193585 +0200
++++ a/configure.in 2012-04-01 23:58:51.926693332 +0200
+@@ -6996,10 +6996,13 @@
+ else
+ AC_MSG_ERROR([gtk3 libraries of the correct versions, not found])
+ fi
++ PKG_CHECK_MODULES(GMODULE, gmodule-2.0,,AC_MSG_ERROR([requirements to build the gtk3-plugin not met. Use --disable-gtk3 or install the missing packages]))
+ fi
+ AC_SUBST(GTK3_LIBS)
+ AC_SUBST(GTK3_CFLAGS)
+ AC_SUBST(ENABLE_GTK3)
++AC_SUBST(GMODULE_LIBS)
++AC_SUBST(GMODULE_CFLAGS)
+
+ AC_MSG_CHECKING([which VCLplugs shall be built])
+ ENABLE_GTK=""
+--- a/set_soenv.in-old 2012-04-02 00:02:17.578693138 +0200
++++ b/set_soenv.in 2012-04-02 00:02:52.858693628 +0200
+@@ -1486,6 +1486,8 @@
+ ToFile( "ENABLE_GTK3", "@ENABLE_GTK3@", "e" );
+ ToFile( "GTK3_CFLAGS", "@GTK3_CFLAGS@", "e" );
+ ToFile( "GTK3_LIBS", "@GTK3_LIBS@", "e" );
++ToFile( "GMODULE_CFLAGS", "@GMODULE_CFLAGS@", "e" );
++ToFile( "GMODULE_LIBS", "@GMODULE_LIBS@", "e" );
+ ToFile( "GTHREAD_CFLAGS", "@GTHREAD_CFLAGS@", "e" );
+ ToFile( "GTHREAD_LIBS", "@GTHREAD_LIBS@", "e" );
+ ToFile( "ENABLE_SYSTRAY_GTK", "@ENABLE_SYSTRAY_GTK@", "e" );
diff --git a/patches/series b/patches/series
index d62d428..c7f9509 100644
--- a/patches/series
+++ b/patches/series
@@ -30,3 +30,4 @@ move-binfilter-mimetypes-in-extra-desktop-file.diff
pythonloader.uno.so-libpyuno-and-pyuno-are-duplicate.diff
armhf-bridges-doubles.diff
debian-hardened-buildflags.diff
+gtk3-hack-explicit-gmodule.diff
--
LibreOffice packaging repository
Reply to: