Djam/libreoffice
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/libreoffice.git synced 2025-02-23 18:43:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

LOG Drop patches that we don't need

Browse source
This commit is contained in:
Andrey Bondrov 2013-09-18 21:15:50 +11:00
parent 88a668b444
commit e03e7890fd
3 changed files with 0 additions and 101 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libreoffice-3.5.2-no-slackwareicons.patch
View file

@ -1,11 +0,0 @@
--- libreoffice-3.5.2/sysui/desktop/slackware/makefile.mk.bero 2012-04-06 16:49:47.906638015 +0200
+++ libreoffice-3.5.2/sysui/desktop/slackware/makefile.mk 2012-04-06 16:49:52.325637730 +0200
@@ -46,7 +46,7 @@ MENUFILES=$(PKGDIR)$/{$(PRODUCTLIST)}$(P
.INCLUDE : target.mk
-.IF "$(OS)" == "LINUX"
+.IF "$(OS)" == "SLACKWARELINUX"
ALLTAR : $(MENUFILES)

34
libreoffice-3.6.2-non-fatal-error-during-test.patch
View file

@ -1,34 +0,0 @@
--- libreoffice-3.6.2/sdext/source/pdfimport/test/tests.cxx.bero 2012-10-04 23:33:04.147833308 +0200
+++ libreoffice-3.6.2/sdext/source/pdfimport/test/tests.cxx 2012-10-04 23:38:50.599208470 +0200
@@ -78,6 +78,7 @@
#include <basegfx/polygon/b2dpolygonclipper.hxx>
#include <vector>
+#include <iostream>
#include <boost/unordered_map.hpp>
#include <cassert>
@@ -125,12 +126,17 @@ namespace
CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE( "A4 page size (in 100th of points): Height" , m_aPageSize.Height, 59500, 0.0000001 );
CPPUNIT_ASSERT_MESSAGE( "endPage() called", m_bPageEnded );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "Num pages equal one", m_nNumPages, (sal_Int32) 1 );
- CPPUNIT_ASSERT_MESSAGE( "Correct hyperlink bounding box",
- rtl::math::approxEqual(m_aHyperlinkBounds.X1,34.7 ) &&
- rtl::math::approxEqual(m_aHyperlinkBounds.Y1,386.0) &&
- rtl::math::approxEqual(m_aHyperlinkBounds.X2,166.7) &&
- rtl::math::approxEqual(m_aHyperlinkBounds.Y2,406.2) );
- CPPUNIT_ASSERT_EQUAL_MESSAGE( "Correct hyperlink URI", m_aURI, ::rtl::OUString("http://download.openoffice.org/") );
+ if(!(rtl::math::approxEqual(m_aHyperlinkBounds.X1,34.7 ) &&
+ rtl::math::approxEqual(m_aHyperlinkBounds.Y1,386.0) &&
+ rtl::math::approxEqual(m_aHyperlinkBounds.X2,166.7) &&
+ rtl::math::approxEqual(m_aHyperlinkBounds.Y2,406.2) )) {
+ std::cerr << "WARNING: hyperlink bounding box seems incorrect or inaccurate!" << std::endl
+ << " X1 (should be 34.7): " << m_aHyperlinkBounds.X1 << std::endl
+ << " Y1 (should be 386.0): " << m_aHyperlinkBounds.Y1 << std::endl
+ << " X2 (should be 166.7): " << m_aHyperlinkBounds.X2 << std::endl
+ << " Y2 (should be 406.2): " << m_aHyperlinkBounds.Y2 << std::endl;
+ } // Correct hyperlink bounding box
+ //CPPUNIT_ASSERT_EQUAL_MESSAGE( "Correct hyperlink URI", m_aURI, ::rtl::OUString("http://download.openoffice.org/") );
const char* sText = " \n \nThis is a testtext\nNew paragraph,\nnew line\n"
"Hyperlink, this is\n?\nThis is more text\noutline mode\n?\nNew paragraph\n";

56
libreoffice-4.0.0-orcus_boost153.patch
View file

@ -1,56 +0,0 @@
From faf72664d11deaa570a0f8c7e702ff07bf5914c8 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Sun, 17 Feb 2013 10:49:34 +0000
Subject: Missing include in liborcus when building against Boost 1.53.0
Change-Id: Ie6c944d53d6e2fcdd161f674e32c9fbfd761d844
---
diff --git a/liborcus/UnpackedTarball_orcus.mk b/liborcus/UnpackedTarball_orcus.mk
index ca5232d..de0788a 100644
--- a/liborcus/UnpackedTarball_orcus.mk
+++ b/liborcus/UnpackedTarball_orcus.mk
@@ -18,6 +18,10 @@ orcus_patches :=
orcus_patches += liborcus_0.1.0-configure.patch
# disable boost "auto lib" in MSVC build
orcus_patches += liborcus_0.1.0-boost_disable_auto_lib.patch
+# <https://gitorious.org/orcus/orcus/merge_requests/2#
+# f60d6eecee72349993a392a9a63ddf3383d3b8c8-
+# f60d6eecee72349993a392a9a63ddf3383d3b8c8@2>:
+orcus_patches += liborcus_0.1.0-boost-include.patch.1
$(eval $(call gb_UnpackedTarball_fix_end_of_line,orcus,\
vsprojects/liborcus-static-nozip/liborcus-static-nozip.vcproj \
diff --git a/liborcus/liborcus_0.1.0-boost-include.patch.1 b/liborcus/liborcus_0.1.0-boost-include.patch.1
new file mode 100644
index 0000000..07558b0
--- a/dev/null
+++ b/liborcus/liborcus_0.1.0-boost-include.patch.1
@@ -0,0 +1,26 @@
+From f60d6eecee72349993a392a9a63ddf3383d3b8c8 Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <sbergman@redhat.com>
+Date: Sat, 16 Feb 2013 13:25:44 +0100
+Subject: [PATCH] Missing include <boost/noncopyable.hpp>
+
+(at least when compiling against Boost 1.53.0)
+---
+ src/liborcus/dom_tree.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/liborcus/dom_tree.cpp b/src/liborcus/dom_tree.cpp
+index ecf7beb..14725ad 100644
+--- a/src/liborcus/dom_tree.cpp
++++ b/src/liborcus/dom_tree.cpp
+@@ -34,6 +34,8 @@
+ #include <iostream>
+ #include <sstream>
+
++#include <boost/noncopyable.hpp>
++
+ using namespace std;
+
+ namespace orcus {
+--
+1.8.1.2
+
--
cgit v0.9.0.2-2-gbebe