[Libreoffice-commits] .: graphite/graphite-removeobsolete.patch graphite/makefile.mk

[Caolán McNamara]

 graphite/graphite-removeobsolete.patch |   34 +++++++++++++++++++++++++++++++++
 graphite/makefile.mk                   |    4 ++-
 2 files changed, 37 insertions(+), 1 deletion(-)

New commits:
commit eafa1847f4777a7afd16a179c3860a7d6323a022
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Nov 24 12:32:25 2010 +0000

    make possible to build with c++0x, remove obsolete method

diff --git a/graphite/graphite-removeobsolete.patch b/graphite/graphite-removeobsolete.patch
new file mode 100644
index 0000000..3dcfb36
--- /dev/null
+++ b/graphite/graphite-removeobsolete.patch
@@ -0,0 +1,34 @@
+--- misc/silgraphite-2.3.1.orig/engine/include/graphite/Segment.h
++++ misc/build/silgraphite-2.3.1/engine/include/graphite/Segment.h
+@@ -142,7 +142,6 @@
+ 		LineBrk lbStart, LineBrk lbEnd, SegEnd est,
+ 		bool fStartLine, bool fEndLine, bool fWsRtl);
+ 	void DestroyContents();
+-	void SwapWith(Segment * pgrseg);
+ 	void ClearAltEndLineSeg();
+ 
+ 	ITextSource * GetString(); // client is responsible to Release()
+--- misc/silgraphite-2.3.1.orig/engine/src/segment/Segment.cpp
++++ misc/build/silgraphite-2.3.1/engine/src/segment/Segment.cpp
+@@ -569,21 +569,6 @@
+ }
+ 
+ /*----------------------------------------------------------------------------------------------
+-	Swap the guts of the two segments.
+-	OBSOLETE
+-----------------------------------------------------------------------------------------------*/
+-void Segment::SwapWith(Segment * pgrseg)
+-{
+-	int crefThis = m_cref;
+-	int crefOther = pgrseg->m_cref;
+-
+-	std::swap(*this, *pgrseg);
+-
+-	m_cref = crefThis;
+-	pgrseg->m_cref = crefOther;
+-}
+-
+-/*----------------------------------------------------------------------------------------------
+ 	Delete the pointer to the alternate-end-of-line segment.
+ ----------------------------------------------------------------------------------------------*/
+ void Segment::ClearAltEndLineSeg()
diff --git a/graphite/makefile.mk b/graphite/makefile.mk
index b9ecb7a..1134a29 100644
--- a/graphite/makefile.mk
+++ b/graphite/makefile.mk
@@ -47,7 +47,9 @@ all:
 .IF "$(ENABLE_GRAPHITE)"=="TRUE"
 TARFILE_NAME=silgraphite-2.3.1
 TARFILE_MD5=d35724900f6a4105550293686688bbb3
-PATCH_FILES=graphite-2.3.1.patch
+PATCH_FILES=\
+    graphite-2.3.1.patch \
+    graphite-removeobsolete.patch
 
 # convert line-endings to avoid problems when patching
 CONVERTFILES=\