From 666722fb84f36ef335598ebeeec630af5d2fd4ab Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Mon, 29 Mar 2010 11:08:42 +0000 Subject: libs/graphite: build fix for GCC 4.3.2 git-svn-id: svn://tug.org/texlive/trunk@17608 c570f23f-e606-0410-a88d-b1316a301751 --- .../libs/graphite/engine-2.3.1-PATCHES/ChangeLog | 7 ++++++ .../engine-2.3.1-PATCHES/patch-05-copy-constr | 29 ++++++++++++++++++++++ .../engine-2.3.1/include/graphite/Segment.h | 2 +- .../graphite/engine-2.3.1/src/segment/Segment.cpp | 2 +- 4 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 Build/source/libs/graphite/engine-2.3.1-PATCHES/patch-05-copy-constr (limited to 'Build/source/libs/graphite') diff --git a/Build/source/libs/graphite/engine-2.3.1-PATCHES/ChangeLog b/Build/source/libs/graphite/engine-2.3.1-PATCHES/ChangeLog index 8998fd069cc..cb8d82074a5 100644 --- a/Build/source/libs/graphite/engine-2.3.1-PATCHES/ChangeLog +++ b/Build/source/libs/graphite/engine-2.3.1-PATCHES/ChangeLog @@ -1,3 +1,10 @@ +2010-03-29 Peter Breitenlohner + + * patch-05-copy-constr (new): Declare copy constructor's source + as const. Required by g++-4.3.2 for OpenSolaris x86_64. + Reported by Apostolos Syropoulos . + Patch proposed by Jonathan Kew . + 2010-02-21 Peter Breitenlohner * patch-03-SIZEOF_WCHAR_T (new): MinGW32 fix. diff --git a/Build/source/libs/graphite/engine-2.3.1-PATCHES/patch-05-copy-constr b/Build/source/libs/graphite/engine-2.3.1-PATCHES/patch-05-copy-constr new file mode 100644 index 00000000000..0ecba6a43d4 --- /dev/null +++ b/Build/source/libs/graphite/engine-2.3.1-PATCHES/patch-05-copy-constr @@ -0,0 +1,29 @@ + Declare copy constructor's source as const. + Required by g++-4.3.2 for OpenSolaris x86_64. + Reported by Apostolos Syropoulos . + Patch proposed by Jonathan Kew . + +diff -ur engine-2.3.1.orig/include/graphite/Segment.h engine-2.3.1/include/graphite/Segment.h +--- engine-2.3.1.orig/include/graphite/Segment.h 2009-01-29 09:33:19.000000000 +0100 ++++ engine-2.3.1/include/graphite/Segment.h 2010-03-29 12:24:52.380352551 +0200 +@@ -64,7 +64,7 @@ + virtual ~Segment(); + + // Basic copy constructor: +- Segment(Segment & seg); ++ Segment(const Segment & seg); + + // For making modified copies of segments: + static Segment * LineContextSegment(Segment & seg, bool fStartLine, bool fEndLine); +diff -ur engine-2.3.1.orig/src/segment/Segment.cpp engine-2.3.1/src/segment/Segment.cpp +--- engine-2.3.1.orig/src/segment/Segment.cpp 2008-08-21 16:24:32.000000000 +0200 ++++ engine-2.3.1/src/segment/Segment.cpp 2010-03-29 12:24:50.067202026 +0200 +@@ -433,7 +433,7 @@ + /*---------------------------------------------------------------------------------------------- + Basic copy method. + ----------------------------------------------------------------------------------------------*/ +-Segment::Segment(Segment & seg) ++Segment::Segment(const Segment & seg) + { + int islout; + diff --git a/Build/source/libs/graphite/engine-2.3.1/include/graphite/Segment.h b/Build/source/libs/graphite/engine-2.3.1/include/graphite/Segment.h index 1595d1358ad..dc5557a36e6 100644 --- a/Build/source/libs/graphite/engine-2.3.1/include/graphite/Segment.h +++ b/Build/source/libs/graphite/engine-2.3.1/include/graphite/Segment.h @@ -64,7 +64,7 @@ public: virtual ~Segment(); // Basic copy constructor: - Segment(Segment & seg); + Segment(const Segment & seg); // For making modified copies of segments: static Segment * LineContextSegment(Segment & seg, bool fStartLine, bool fEndLine); diff --git a/Build/source/libs/graphite/engine-2.3.1/src/segment/Segment.cpp b/Build/source/libs/graphite/engine-2.3.1/src/segment/Segment.cpp index 669864780a6..c2e71c4afaa 100644 --- a/Build/source/libs/graphite/engine-2.3.1/src/segment/Segment.cpp +++ b/Build/source/libs/graphite/engine-2.3.1/src/segment/Segment.cpp @@ -433,7 +433,7 @@ void Segment::InitWhiteSpaceSegment(int nNewDepth) /*---------------------------------------------------------------------------------------------- Basic copy method. ----------------------------------------------------------------------------------------------*/ -Segment::Segment(Segment & seg) +Segment::Segment(const Segment & seg) { int islout; -- cgit v1.2.3