diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2010-11-24 12:32:25 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2010-11-24 12:32:25 +0000 |
| commit | bd5d223a36ee7ee4621c838e83acd41b39e51fb3 (patch) | |
| tree | aa54fc976cb645fb2b5b2d0803cde23277abdc02 /graphite | |
| parent | b89a5faa5851cd1fed4c1321f4d5f8188484ff28 (diff) | |
make possible to build with c++0x, remove obsolete method
Diffstat (limited to 'graphite')
| -rw-r--r-- | graphite/graphite-removeobsolete.patch | 34 | ||||
| -rw-r--r-- | graphite/makefile.mk | 4 |
2 files changed, 37 insertions, 1 deletions
diff --git a/graphite/graphite-removeobsolete.patch b/graphite/graphite-removeobsolete.patch new file mode 100644 index 000000000000..3dcfb36a10c3 --- /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 b9ecb7aea396..1134a29a4403 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=\ |