The following commit has been merged in the master branch:
commit 68da1e3b954daba9974076e090b378ea82eda098
Author: Rene Engelhard <r...@debian.org>
Date: Sun Apr 22 18:25:27 2012 +0200
fix gtk3 build with gcc 4.4
diff --git a/changelog b/changelog
index 10cee99..87305c3 100644
--- a/changelog
+++ b/changelog
@@ -1,6 +1,8 @@
libreoffice (1:3.5.2-5) UNRELEASED; urgency=low
[ Rene Engelhard ]
+ * debian/patches/gcc-4.4.dif: fix gtk3 build with gcc 4.4
+
* debian/rules:
- build-depend on new g++-mingw-w64-i686 instead of the whole thing
- use gcc 4.4 on mipsel
@@ -11,7 +13,7 @@ libreoffice (1:3.5.2-5) UNRELEASED; urgency=low
[ Björn Michaelsen ]
* add visio mimetype to libreoffice draw desktop file
- -- Rene Engelhard <r...@debian.org> Sat, 21 Apr 2012 10:52:56 +0200
+ -- Rene Engelhard <r...@debian.org> Sun, 22 Apr 2012 18:22:33 +0200
libreoffice (1:3.5.2-4) unstable; urgency=medium
diff --git a/patches/gcc-4.4.diff b/patches/gcc-4.4.diff
new file mode 100644
index 0000000..d06df05
--- /dev/null
+++ b/patches/gcc-4.4.diff
@@ -0,0 +1,33 @@
+--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx-old 2012-04-22
16:06:51.611916299 +0000
++++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx 2012-04-22
16:07:57.005983725 +0000
+@@ -622,7 +622,7 @@
+ {
+ if ( !pSpinVal )
+ {
+- std::fprintf( stderr, "Tried to draw CTRL_SPINBUTTONS, but the
SpinButtons data structure didn't exist!\n" );
++ fprintf( stderr, "Tried to draw CTRL_SPINBUTTONS, but the
SpinButtons data structure didn't exist!\n" );
+ return;
+ }
+ areaRect = pSpinVal->maUpperRect;
+@@ -1310,10 +1310,10 @@
+ }
+ aInfo.m_eWidth = WIDTH_ULTRA_CONDENSED;
+
+- std::fprintf( stderr, "font name BEFORE system match: \"%s\"\n",
aFamily.getStr() );
++ fprintf( stderr, "font name BEFORE system match: \"%s\"\n",
aFamily.getStr() );
+ // match font to e.g. resolve "Sans"
+ psp::PrintFontManager::get().matchFont( aInfo, rSettings.GetUILocale() );
+- std::fprintf( stderr, "font match %s, name AFTER: \"%s\"\n",
++ fprintf( stderr, "font match %s, name AFTER: \"%s\"\n",
+ aInfo.m_nID != 0 ? "succeeded" : "failed",
+ rtl::OUStringToOString( aInfo.m_aStyleName,
RTL_TEXTENCODING_ISO_8859_1 ).getStr() );
+
+@@ -1422,7 +1422,7 @@
+ gchar* pThemeName = NULL;
+ g_object_get( pSettings, "gtk-theme-name", &pThemeName, (char *)NULL );
+ #if OSL_DEBUG_LEVEL > 1
+- std::fprintf( stderr, "Theme name is \"%s\"\n", pThemeName );
++ fprintf( stderr, "Theme name is \"%s\"\n", pThemeName );
+ #endif
+
+
diff --git a/patches/series b/patches/series
index 45cb627..6c29963 100644
--- a/patches/series
+++ b/patches/series
@@ -37,3 +37,4 @@ gcc-4.7-amd64.diff
icu-4.9.diff
tests-fix-build-with-jdk7.diff
lp-926940-visio-mime-for-draw.diff
+gcc-4.4.diff
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1sm3wn-0006lu...@vasks.debian.org
