[SCM] LibreOffice packaging repository branch, ubuntu-raring-4.0, updated. libreoffice_3.6.4_rc3-1-283-ge775875
The following commit has been merged in the ubuntu-raring-4.0 branch:
commit fc2781bd454804b7a4a829dd4c559b916c30a0ca
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Thu Dec 6 23:52:50 2012 +0100
sync gtk3-hack-explicit-gmodule.diff and make-package-modules-not-suck.diff from debian-experimental-4.0
diff --git a/patches/gtk3-hack-explicit-gmodule.diff b/patches/gtk3-hack-explicit-gmodule.diff
index c87eb64..08188bf 100644
--- a/patches/gtk3-hack-explicit-gmodule.diff
+++ b/patches/gtk3-hack-explicit-gmodule.diff
@@ -1,10 +1,8 @@
For whatever reason we get undefined referenced to g_module_*.
-Index: libreoffice-4.0.0.0-alpha1/vcl/Library_vclplug_gtk3.mk
-===================================================================
---- libreoffice-4.0.0.0-alpha1.orig/vcl/Library_vclplug_gtk3.mk 2012-11-20 13:53:34.000000000 +0100
-+++ libreoffice-4.0.0.0-alpha1/vcl/Library_vclplug_gtk3.mk 2012-11-21 20:44:24.310157249 +0100
-@@ -43,6 +43,7 @@
+--- 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
+@@ -52,6 +52,7 @@ $(eval $(call gb_Library_use_sdk_api,vclplug_gtk3))
$(eval $(call gb_Library_add_libs,vclplug_gtk3,\
$(GTK3_LIBS) \
$(GTHREAD_LIBS) \
@@ -12,11 +10,9 @@ Index: libreoffice-4.0.0.0-alpha1/vcl/Library_vclplug_gtk3.mk
-lX11 \
-lXext \
-lSM \
-Index: libreoffice-4.0.0.0-alpha1/configure.ac
-===================================================================
---- libreoffice-4.0.0.0-alpha1.orig/configure.ac 2012-11-21 20:42:48.000000000 +0100
-+++ libreoffice-4.0.0.0-alpha1/configure.ac 2012-11-21 20:44:24.318157248 +0100
-@@ -9413,10 +9413,13 @@
+--- a/configure.ac-old 2012-04-01 23:57:57.091193585 +0200
++++ a/configure.ac 2012-04-01 23:58:51.926693332 +0200
+@@ -9346,10 +9349,13 @@ if test "x$enable_gtk3" = "xyes"; then
else
AC_MSG_ERROR([gtk3 libraries of the correct versions, not found])
fi
@@ -29,12 +25,10 @@ Index: libreoffice-4.0.0.0-alpha1/configure.ac
+AC_SUBST(GMODULE_CFLAGS)
AC_MSG_CHECKING([which VCLplugs shall be built])
- ENABLE_GTK=""
-Index: libreoffice-4.0.0.0-alpha1/config_host.mk.in
-===================================================================
---- libreoffice-4.0.0.0-alpha1.orig/config_host.mk.in 2012-11-21 20:42:48.000000000 +0100
-+++ libreoffice-4.0.0.0-alpha1/config_host.mk.in 2012-11-21 20:44:24.318157248 +0100
-@@ -239,6 +239,8 @@
+ if test "$GUIBASE" != "unx" -o "$enable_headless" = "yes"; then
+--- a/config_host.mk.in-old 2012-04-06 14:20:21.155740997 +0200
++++ b/config_host.mk.in 2012-04-06 14:20:56.683738867 +0200
+@@ -175,6 +175,8 @@
export GTHREAD_LIBS=$(gb_SPACE)@GTHREAD_LIBS@
export GTK3_CFLAGS=$(gb_SPACE)@GTK3_CFLAGS@
export GTK3_LIBS=$(gb_SPACE)@GTK3_LIBS@
diff --git a/patches/make-package-modules-not-suck.diff b/patches/make-package-modules-not-suck.diff
index 2b7a988..632f263 100644
--- a/patches/make-package-modules-not-suck.diff
+++ b/patches/make-package-modules-not-suck.diff
@@ -113,9 +113,9 @@ index 024ec68..a46e972 100644
Files = (gid_File_Dat_Root4,
gid_File_Filter_Eme,
- gid_File_Filter_Sdfilt,
+ gid_File_Filter_Svgio,
gid_File_Filter_Icg,
gid_File_Filter_Egi,
- gid_File_Filter_Epb,
@@ -210,9 +210,6 @@ Module gid_Module_Root_Files_4
gid_File_Lib_Cui,
gid_File_Lib_Sdbt,
--
LibreOffice packaging repository
Reply to: