[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.5.2-1-9-g967e161
The following commit has been merged in the master branch:
commit 967e161e289730d807214e0e1ab34e34312ffd1e
Author: Rene Engelhard <rene@debian.org>
Date: Sat Apr 7 00:31:12 2012 +0200
fix gcc-4.7-*.diff (quilt gets confused by a/dev/null)
diff --git a/patches/gcc-4.7-amd64.diff b/patches/gcc-4.7-amd64.diff
index b843158..32ff244 100644
--- a/patches/gcc-4.7-amd64.diff
+++ b/patches/gcc-4.7-amd64.diff
@@ -94,7 +94,7 @@ unchanged:
} // namespace x86_64
unchanged:
---- a/dev/null
+--- /dev/null
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx
@@ -0,0 +1,170 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
@@ -268,7 +268,7 @@ unchanged:
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
unchanged:
---- a/dev/null
+--- /dev/null
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.hxx
@@ -0,0 +1,49 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
diff --git a/patches/gcc-4.7-i386.diff b/patches/gcc-4.7-i386.diff
index 8319e56..55f341f 100644
--- a/patches/gcc-4.7-i386.diff
+++ b/patches/gcc-4.7-i386.diff
@@ -8,7 +8,7 @@ Subject: Adapt cpp_uno/gcc3_linux_intel to GCC 4.7
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx
new file mode 100644
index 0000000..4c6370f
---- a/dev/null
+--- /dev/null
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx
@@ -0,0 +1,154 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
@@ -168,7 +168,7 @@ index 0000000..4c6370f
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.hxx b/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.hxx
new file mode 100644
index 0000000..de498a3
---- a/dev/null
+--- /dev/null
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.hxx
@@ -0,0 +1,49 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
--
LibreOffice packaging repository
Reply to: