[ooo-build-commit] 2 commits - patches/dev300
René Engelhard
rene at kemper.freedesktop.org
Mon Jan 4 12:55:39 PST 2010
patches/dev300/vcl-system-graphite-with-stlport.diff | 142 +++++++++----------
1 file changed, 74 insertions(+), 68 deletions(-)
New commits:
commit 09547033ed2988f76a252d081b9f976c0e394da0
Author: Rene Engelhard <rene at debian.org>
Date: Mon Jan 4 21:51:30 2010 +0100
fix applying of vcl-system-graphite-with-stlport.diff
* patches/dev300/vcl-system-graphite-with-stlport.diff: merge two preraphitestlk.h hunks
diff --git a/patches/dev300/vcl-system-graphite-with-stlport.diff b/patches/dev300/vcl-system-graphite-with-stlport.diff
index 6247612..4f9536f 100644
--- a/patches/dev300/vcl-system-graphite-with-stlport.diff
+++ b/patches/dev300/vcl-system-graphite-with-stlport.diff
@@ -284,7 +284,9 @@ diff -r db9687bbeaf0 -r 9c2f5f658223 vcl/inc/pregraphitestl.h
+# undef _STLP_MAP
+# define _STLP_DONT_REDEFINE_STD 1
+# define _STLP_WHOLE_NATIVE_STD 1
++# pragma GCC visibility push(default)
+# include _STLP_NATIVE_HEADER(exception_defines.h)
++# include _STLP_NATIVE_HEADER(limits)
+# include _STLP_NATIVE_HEADER(memory)
+# include _STLP_NATIVE_HEADER(exception)
+# include _STLP_NATIVE_HEADER(iosfwd)
@@ -296,27 +298,7 @@ diff -r db9687bbeaf0 -r 9c2f5f658223 vcl/inc/pregraphitestl.h
+# include _STLP_NATIVE_HEADER(ostream)
+# include _STLP_NATIVE_HEADER(istream)
+# include _STLP_NATIVE_HEADER(iostream)
++# pragma GCC visibility pop
+#endif
+//sil_std resolves to the std that Graphite was built with
+namespace sil_std = std;
-diff -r 9c2f5f658223 -r db11666c34f8 vcl/inc/pregraphitestl.h
---- vcl/inc/pregraphitestl.h Thu Dec 17 13:57:53 2009 +0000
-+++ vcl/inc/pregraphitestl.h Mon Jan 04 15:12:01 2010 +0000
-@@ -12,7 +12,9 @@
- # undef _STLP_MAP
- # define _STLP_DONT_REDEFINE_STD 1
- # define _STLP_WHOLE_NATIVE_STD 1
-+# pragma GCC visibility push(default)
- # include _STLP_NATIVE_HEADER(exception_defines.h)
-+# include _STLP_NATIVE_HEADER(limits)
- # include _STLP_NATIVE_HEADER(memory)
- # include _STLP_NATIVE_HEADER(exception)
- # include _STLP_NATIVE_HEADER(iosfwd)
-@@ -24,6 +26,7 @@
- # include _STLP_NATIVE_HEADER(ostream)
- # include _STLP_NATIVE_HEADER(istream)
- # include _STLP_NATIVE_HEADER(iostream)
-+# pragma GCC visibility pop
- #endif
- //sil_std resolves to the std that Graphite was built with
- namespace sil_std = std;
commit 4b99cc01f43cbb387e894ef9ff1a33aad6100ffb
Author: Rene Engelhard <rene at debian.org>
Date: Mon Jan 4 19:53:42 2010 +0100
update system-graphite with STLport buildfix
* patches/dev300/vcl-system-graphite-with-stlport.diff: update from i106157
diff --git a/patches/dev300/vcl-system-graphite-with-stlport.diff b/patches/dev300/vcl-system-graphite-with-stlport.diff
index 4c4437e..6247612 100644
--- a/patches/dev300/vcl-system-graphite-with-stlport.diff
+++ b/patches/dev300/vcl-system-graphite-with-stlport.diff
@@ -1,6 +1,22 @@
-diff -ru vcl.orig/inc/vcl/graphite_adaptors.hxx vcl/inc/vcl/graphite_adaptors.hxx
---- vcl.orig/inc/vcl/graphite_adaptors.hxx 2009-10-20 14:54:38.000000000 +0100
-+++ vcl/inc/vcl/graphite_adaptors.hxx 2009-10-21 16:41:45.000000000 +0100
+diff -r 46d4c7655bac -r db9687bbeaf0 configure.in
+--- configure.in Thu Dec 17 12:42:19 2009 +0000
++++ configure.in Thu Dec 17 13:56:08 2009 +0000
+@@ -4571,12 +4571,6 @@
+ AC_MSG_RESULT([external])
+ SYSTEM_GRAPHITE=YES
+ PKG_CHECK_MODULES( GRAPHITE, silgraphite )
+- AC_MSG_CHECKING([STL compatibility])
+- if test "$WITH_STLPORT" != "no"; then
+- AC_MSG_ERROR([to use system graphite you need to use --without-stlport])
+- else
+- AC_MSG_RESULT([OK])
+- fi
+ else
+ AC_MSG_RESULT([internal])
+ SYSTEM_GRAPHITE=NO
+diff -r 46d4c7655bac -r db9687bbeaf0 vcl/inc/vcl/graphite_adaptors.hxx
+--- vcl/inc/vcl/graphite_adaptors.hxx Thu Dec 17 12:42:19 2009 +0000
++++ vcl/inc/vcl/graphite_adaptors.hxx Thu Dec 17 13:56:08 2009 +0000
@@ -58,10 +58,11 @@
#include "vcl/dllapi.h"
@@ -23,9 +39,9 @@ diff -ru vcl.orig/inc/vcl/graphite_adaptors.hxx vcl/inc/vcl/graphite_adaptors.hx
FreetypeServerFont& mrFont;
FontProperties maFontProperties;
-diff -ru vcl.orig/inc/vcl/graphite_features.hxx vcl/inc/vcl/graphite_features.hxx
---- vcl.orig/inc/vcl/graphite_features.hxx 2009-10-20 14:54:38.000000000 +0100
-+++ vcl/inc/vcl/graphite_features.hxx 2009-10-21 16:40:45.000000000 +0100
+diff -r 46d4c7655bac -r db9687bbeaf0 vcl/inc/vcl/graphite_features.hxx
+--- vcl/inc/vcl/graphite_features.hxx Thu Dec 17 12:42:19 2009 +0000
++++ vcl/inc/vcl/graphite_features.hxx Thu Dec 17 13:56:08 2009 +0000
@@ -32,10 +32,11 @@
// Parse a string of features specified as ; separated pairs.
// e.g.
@@ -39,9 +55,9 @@ diff -ru vcl.orig/inc/vcl/graphite_features.hxx vcl/inc/vcl/graphite_features.hx
namespace grutils
{
-diff -ru vcl.orig/inc/vcl/graphite_layout.hxx vcl/inc/vcl/graphite_layout.hxx
---- vcl.orig/inc/vcl/graphite_layout.hxx 2009-10-20 14:54:38.000000000 +0100
-+++ vcl/inc/vcl/graphite_layout.hxx 2009-10-21 16:42:05.000000000 +0100
+diff -r 46d4c7655bac -r db9687bbeaf0 vcl/inc/vcl/graphite_layout.hxx
+--- vcl/inc/vcl/graphite_layout.hxx Thu Dec 17 12:42:19 2009 +0000
++++ vcl/inc/vcl/graphite_layout.hxx Thu Dec 17 13:56:08 2009 +0000
@@ -43,11 +43,13 @@
#include <vector>
#include <utility>
@@ -56,10 +72,10 @@ diff -ru vcl.orig/inc/vcl/graphite_layout.hxx vcl/inc/vcl/graphite_layout.hxx
// Platform
#include <vcl/sallayout.hxx>
#include <vcl/dllapi.h>
-diff -ru vcl.orig/source/glyphs/graphite_adaptors.cxx vcl/source/glyphs/graphite_adaptors.cxx
---- vcl.orig/source/glyphs/graphite_adaptors.cxx 2009-10-20 14:54:38.000000000 +0100
-+++ vcl/source/glyphs/graphite_adaptors.cxx 2009-10-21 16:29:35.000000000 +0100
-@@ -169,7 +169,7 @@
+diff -r 46d4c7655bac -r db9687bbeaf0 vcl/source/glyphs/graphite_adaptors.cxx
+--- vcl/source/glyphs/graphite_adaptors.cxx Thu Dec 17 12:42:19 2009 +0000
++++ vcl/source/glyphs/graphite_adaptors.cxx Thu Dec 17 13:56:08 2009 +0000
+@@ -171,7 +171,7 @@
mpFeatures = NULL;
}
@@ -68,9 +84,9 @@ diff -ru vcl.orig/source/glyphs/graphite_adaptors.cxx vcl/source/glyphs/graphite
{
face_name_out = maFontProperties.szFaceName;
bold_out = maFontProperties.fBold;
-diff -ru vcl.orig/source/glyphs/graphite_cache.cxx vcl/source/glyphs/graphite_cache.cxx
---- vcl.orig/source/glyphs/graphite_cache.cxx 2009-10-20 14:54:38.000000000 +0100
-+++ vcl/source/glyphs/graphite_cache.cxx 2009-10-21 16:39:14.000000000 +0100
+diff -r 46d4c7655bac -r db9687bbeaf0 vcl/source/glyphs/graphite_cache.cxx
+--- vcl/source/glyphs/graphite_cache.cxx Thu Dec 17 12:42:19 2009 +0000
++++ vcl/source/glyphs/graphite_cache.cxx Thu Dec 17 13:56:08 2009 +0000
@@ -36,8 +36,10 @@
#include <tools/debug.hxx>
#include <vcl/sallayout.hxx>
@@ -82,9 +98,9 @@ diff -ru vcl.orig/source/glyphs/graphite_cache.cxx vcl/source/glyphs/graphite_ca
#include <rtl/ustring.hxx>
#include <vcl/graphite_layout.hxx>
-diff -ru vcl.orig/source/glyphs/graphite_features.cxx vcl/source/glyphs/graphite_features.cxx
---- vcl.orig/source/glyphs/graphite_features.cxx 2009-10-20 14:54:38.000000000 +0100
-+++ vcl/source/glyphs/graphite_features.cxx 2009-10-21 16:29:40.000000000 +0100
+diff -r 46d4c7655bac -r db9687bbeaf0 vcl/source/glyphs/graphite_features.cxx
+--- vcl/source/glyphs/graphite_features.cxx Thu Dec 17 12:42:19 2009 +0000
++++ vcl/source/glyphs/graphite_features.cxx Thu Dec 17 13:56:08 2009 +0000
@@ -91,7 +91,7 @@
gr::isocode aLang = maLang;
for (size_t i = pos; i < nFeatEnd; i++)
@@ -112,9 +128,9 @@ diff -ru vcl.orig/source/glyphs/graphite_features.cxx vcl/source/glyphs/graphite
validValues = font.getFeatureSettings(i);
gr::FeatureSettingIterator j = validValues.first;
while (j != validValues.second)
-diff -ru vcl.orig/source/glyphs/graphite_layout.cxx vcl/source/glyphs/graphite_layout.cxx
---- vcl.orig/source/glyphs/graphite_layout.cxx 2009-10-20 14:54:38.000000000 +0100
-+++ vcl/source/glyphs/graphite_layout.cxx 2009-10-21 16:42:41.000000000 +0100
+diff -r 46d4c7655bac -r db9687bbeaf0 vcl/source/glyphs/graphite_layout.cxx
+--- vcl/source/glyphs/graphite_layout.cxx Thu Dec 17 12:42:19 2009 +0000
++++ vcl/source/glyphs/graphite_layout.cxx Thu Dec 17 13:56:08 2009 +0000
@@ -66,11 +66,13 @@
#include <unicode/uscript.h>
@@ -158,9 +174,9 @@ diff -ru vcl.orig/source/glyphs/graphite_layout.cxx vcl/source/glyphs/graphite_l
bool bBold;
bool bItalic;
UniqueCacheInfo(aFace, bBold, bItalic);
-diff -ru vcl.orig/source/glyphs/graphite_textsrc.cxx vcl/source/glyphs/graphite_textsrc.cxx
---- vcl.orig/source/glyphs/graphite_textsrc.cxx 2009-10-20 14:54:38.000000000 +0100
-+++ vcl/source/glyphs/graphite_textsrc.cxx 2009-10-21 16:37:42.000000000 +0100
+diff -r 46d4c7655bac -r db9687bbeaf0 vcl/source/glyphs/graphite_textsrc.cxx
+--- vcl/source/glyphs/graphite_textsrc.cxx Thu Dec 17 12:42:19 2009 +0000
++++ vcl/source/glyphs/graphite_textsrc.cxx Thu Dec 17 13:56:08 2009 +0000
@@ -138,16 +138,16 @@
return unknown;
}
@@ -191,9 +207,9 @@ diff -ru vcl.orig/source/glyphs/graphite_textsrc.cxx vcl/source/glyphs/graphite_
range1 = propertyRange(char_idx1),
range2 = propertyRange(char_idx2);
-diff -ru vcl.orig/source/glyphs/graphite_textsrc.hxx vcl/source/glyphs/graphite_textsrc.hxx
---- vcl.orig/source/glyphs/graphite_textsrc.hxx 2009-10-20 14:54:38.000000000 +0100
-+++ vcl/source/glyphs/graphite_textsrc.hxx 2009-10-21 16:42:20.000000000 +0100
+diff -r 46d4c7655bac -r db9687bbeaf0 vcl/source/glyphs/graphite_textsrc.hxx
+--- vcl/source/glyphs/graphite_textsrc.hxx Thu Dec 17 12:42:19 2009 +0000
++++ vcl/source/glyphs/graphite_textsrc.hxx Thu Dec 17 13:56:08 2009 +0000
@@ -62,9 +62,11 @@
#include "vcl/dllapi.h"
@@ -215,9 +231,9 @@ diff -ru vcl.orig/source/glyphs/graphite_textsrc.hxx vcl/source/glyphs/graphite_
virtual size_t getFontFeatures(gr::toffset ich, gr::FeatureSetting * prgfset);
virtual bool sameSegment(gr::toffset ich1, gr::toffset ich2);
-diff -ru vcl.orig/util/makefile2.pmk vcl/util/makefile2.pmk
---- vcl.orig/util/makefile2.pmk 2009-10-20 14:54:39.000000000 +0100
-+++ vcl/util/makefile2.pmk 2009-10-21 16:48:11.000000000 +0100
+diff -r 46d4c7655bac -r db9687bbeaf0 vcl/util/makefile2.pmk
+--- vcl/util/makefile2.pmk Thu Dec 17 12:42:19 2009 +0000
++++ vcl/util/makefile2.pmk Thu Dec 17 13:56:08 2009 +0000
@@ -36,3 +36,10 @@
.IF "$(GUIBASE)"=="aqua"
CFLAGSCXX+=$(OBJCXXFLAGS)
@@ -229,8 +245,30 @@ diff -ru vcl.orig/util/makefile2.pmk vcl/util/makefile2.pmk
+CDEFS += -DGRAPHITEADAPTSTL
+.ENDIF
+.ENDIF
---- /dev/null 2009-10-21 13:36:00.040005413 +0100
-+++ vcl/inc/pregraphitestl.h 2009-10-21 16:45:01.000000000 +0100
+diff -r db9687bbeaf0 -r 9c2f5f658223 vcl/inc/postgraphitestl.h
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ vcl/inc/postgraphitestl.h Thu Dec 17 13:57:53 2009 +0000
+@@ -0,0 +1,17 @@
++#ifdef std_was_redefined_as_stlport
++// put things back the way they were
++# define std std_was_redefined_as_stlport
++# undef _STLP_DONT_REDEFINE_STD
++# undef _STLP_WHOLE_NATIVE_STD
++# undef _STLP_STRING
++# undef _STLP_IOSTREAM
++# undef _STLP_IOSFWD
++# undef _STLP_IOMANIP
++# undef _STLP_ALGORITHM
++# undef _STLP_VECTOR
++# undef _STLP_SET
++# undef _STLP_MAP
++// force config to be re-read
++# undef _STLP_CONFIG_H
++# include <stddef.h>
++#endif
+diff -r db9687bbeaf0 -r 9c2f5f658223 vcl/inc/pregraphitestl.h
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ vcl/inc/pregraphitestl.h Thu Dec 17 13:57:53 2009 +0000
@@ -0,0 +1,29 @@
+#if defined(GRAPHITEADAPTSTL) && defined(std)
+# define std_was_redefined_as_stlport std
@@ -261,38 +299,24 @@ diff -ru vcl.orig/util/makefile2.pmk vcl/util/makefile2.pmk
+#endif
+//sil_std resolves to the std that Graphite was built with
+namespace sil_std = std;
---- /dev/null 2009-10-21 13:36:00.040005413 +0100
-+++ vcl/inc/postgraphitestl.h 2009-10-21 16:39:03.000000000 +0100
-@@ -0,0 +1,17 @@
-+#ifdef std_was_redefined_as_stlport
-+// put things back the way they were
-+# define std std_was_redefined_as_stlport
-+# undef _STLP_DONT_REDEFINE_STD
-+# undef _STLP_WHOLE_NATIVE_STD
-+# undef _STLP_STRING
-+# undef _STLP_IOSTREAM
-+# undef _STLP_IOSFWD
-+# undef _STLP_IOMANIP
-+# undef _STLP_ALGORITHM
-+# undef _STLP_VECTOR
-+# undef _STLP_SET
-+# undef _STLP_MAP
-+// force config to be re-read
-+# undef _STLP_CONFIG_H
-+# include <stddef.h>
-+#endif
---- configure.in.orig 2009-10-21 16:57:59.000000000 +0100
-+++ configure.in 2009-10-21 16:58:08.000000000 +0100
-@@ -4562,12 +4562,6 @@
- AC_MSG_RESULT([external])
- SYSTEM_GRAPHITE=YES
- PKG_CHECK_MODULES( GRAPHITE, silgraphite )
-- AC_MSG_CHECKING([STL compatibility])
-- if test "$WITH_STLPORT" != "no"; then
-- AC_MSG_ERROR([to use system graphite you need to use --without-stlport])
-- else
-- AC_MSG_RESULT([OK])
-- fi
- else
- AC_MSG_RESULT([internal])
- SYSTEM_GRAPHITE=NO
+diff -r 9c2f5f658223 -r db11666c34f8 vcl/inc/pregraphitestl.h
+--- vcl/inc/pregraphitestl.h Thu Dec 17 13:57:53 2009 +0000
++++ vcl/inc/pregraphitestl.h Mon Jan 04 15:12:01 2010 +0000
+@@ -12,7 +12,9 @@
+ # undef _STLP_MAP
+ # define _STLP_DONT_REDEFINE_STD 1
+ # define _STLP_WHOLE_NATIVE_STD 1
++# pragma GCC visibility push(default)
+ # include _STLP_NATIVE_HEADER(exception_defines.h)
++# include _STLP_NATIVE_HEADER(limits)
+ # include _STLP_NATIVE_HEADER(memory)
+ # include _STLP_NATIVE_HEADER(exception)
+ # include _STLP_NATIVE_HEADER(iosfwd)
+@@ -24,6 +26,7 @@
+ # include _STLP_NATIVE_HEADER(ostream)
+ # include _STLP_NATIVE_HEADER(istream)
+ # include _STLP_NATIVE_HEADER(iostream)
++# pragma GCC visibility pop
+ #endif
+ //sil_std resolves to the std that Graphite was built with
+ namespace sil_std = std;
More information about the ooo-build-commit
mailing list