summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2010-03-29 11:08:42 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2010-03-29 11:08:42 +0000
commit666722fb84f36ef335598ebeeec630af5d2fd4ab (patch)
treedfb01a4c6a291b45671900c887c3f3bc2152c421 /Build
parent6f35fc77f9a3976595098f4a55135df333e36058 (diff)
libs/graphite: build fix for GCC 4.3.2
git-svn-id: svn://tug.org/texlive/trunk@17608 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/libs/graphite/engine-2.3.1-PATCHES/ChangeLog7
-rw-r--r--Build/source/libs/graphite/engine-2.3.1-PATCHES/patch-05-copy-constr29
-rw-r--r--Build/source/libs/graphite/engine-2.3.1/include/graphite/Segment.h2
-rw-r--r--Build/source/libs/graphite/engine-2.3.1/src/segment/Segment.cpp2
4 files changed, 38 insertions, 2 deletions
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 <peb@mppmu.mpg.de>
+
+ * 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 <asyropoulos@gmail.com>.
+ Patch proposed by Jonathan Kew <jfkthame@googlemail.com>.
+
2010-02-21 Peter Breitenlohner <peb@mppmu.mpg.de>
* 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 <asyropoulos@gmail.com>.
+ Patch proposed by Jonathan Kew <jfkthame@googlemail.com>.
+
+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;