[ooo-build-commit] Branch 'ooo-build-3-2' - 2 commits - configure.in patches/dev300

René Engelhard rene at kemper.freedesktop.org
Wed Jan 20 11:41:27 PST 2010


 configure.in                                         |    2 
 patches/dev300/vcl-system-graphite-with-stlport.diff |  129 ++++++++-----------
 2 files changed, 59 insertions(+), 72 deletions(-)

New commits:
commit 2b320db712c81a7cd52c8e87dca9f9c86fbf74c4
Author: Rene Engelhard <rene at debian.org>
Date:   Wed Jan 20 20:39:40 2010 +0100

    m10=rc3
    
    * configure.in:

diff --git a/configure.in b/configure.in
index 912f610..b5fc409 100644
--- a/configure.in
+++ b/configure.in
@@ -1502,7 +1502,7 @@ elif test "$with_tag" = "OOO310_m11" ; then
    UPSTREAM_VERSION=3.1.0
 elif test "$with_tag" = "OOO310_m18" ; then
    UPSTREAM_VERSION=3.1.1
-elif test "$with_tag" = "OOO320_m9" ; then
+elif test "$with_tag" = "OOO320_m10" ; then
    UPSTREAM_VERSION=3.2.0
 fi
 if test -n "$UPSTREAM_VERSION"; then
commit 4ccb69f8f662d63e5741e8ce12f6f4595773a45c
Author: Rene Engelhard <rene at debian.org>
Date:   Wed Jan 20 20:38:49 2010 +0100

    update graphite with STLport patch
    
    * patches/dev300/vcl-system-graphite-with-stlport.diff:

diff --git a/patches/dev300/vcl-system-graphite-with-stlport.diff b/patches/dev300/vcl-system-graphite-with-stlport.diff
index 1868fea..59c092c 100644
--- a/patches/dev300/vcl-system-graphite-with-stlport.diff
+++ b/patches/dev300/vcl-system-graphite-with-stlport.diff
@@ -1,7 +1,6 @@
-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 @@
+--- 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 )
@@ -14,9 +13,9 @@ diff -r 46d4c7655bac -r db9687bbeaf0 configure.in
      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
+diff -ru vcl.orig/inc/vcl/graphite_adaptors.hxx vcl/inc/vcl/graphite_adaptors.hxx
+--- vcl.orig/inc/vcl/graphite_adaptors.hxx	2010-01-07 11:50:10.000000000 +0000
++++ vcl/inc/vcl/graphite_adaptors.hxx	2010-01-11 16:00:47.000000000 +0000
 @@ -58,10 +58,11 @@
  #include "vcl/dllapi.h"
  
@@ -39,9 +38,9 @@ diff -r 46d4c7655bac -r db9687bbeaf0 vcl/inc/vcl/graphite_adaptors.hxx
  
      FreetypeServerFont& mrFont;
      FontProperties        maFontProperties;
-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
+diff -ru vcl.orig/inc/vcl/graphite_features.hxx vcl/inc/vcl/graphite_features.hxx
+--- vcl.orig/inc/vcl/graphite_features.hxx	2010-01-07 11:50:10.000000000 +0000
++++ vcl/inc/vcl/graphite_features.hxx	2010-01-11 16:00:47.000000000 +0000
 @@ -32,10 +32,11 @@
  // Parse a string of features specified as ; separated pairs.
  // e.g.
@@ -55,9 +54,9 @@ diff -r 46d4c7655bac -r db9687bbeaf0 vcl/inc/vcl/graphite_features.hxx
  
  namespace grutils
  {
-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
+diff -ru vcl.orig/inc/vcl/graphite_layout.hxx vcl/inc/vcl/graphite_layout.hxx
+--- vcl.orig/inc/vcl/graphite_layout.hxx	2010-01-07 11:50:10.000000000 +0000
++++ vcl/inc/vcl/graphite_layout.hxx	2010-01-11 16:00:47.000000000 +0000
 @@ -43,11 +43,13 @@
  #include <vector>
  #include <utility>
@@ -72,10 +71,10 @@ diff -r 46d4c7655bac -r db9687bbeaf0 vcl/inc/vcl/graphite_layout.hxx
  // Platform
  #include <vcl/sallayout.hxx>
  #include <vcl/dllapi.h>
-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 @@
+diff -ru vcl.orig/source/glyphs/graphite_adaptors.cxx vcl/source/glyphs/graphite_adaptors.cxx
+--- vcl.orig/source/glyphs/graphite_adaptors.cxx	2010-01-07 11:50:09.000000000 +0000
++++ vcl/source/glyphs/graphite_adaptors.cxx	2010-01-11 16:00:47.000000000 +0000
+@@ -169,7 +169,7 @@
      mpFeatures = NULL;
  }
  
@@ -84,9 +83,9 @@ diff -r 46d4c7655bac -r db9687bbeaf0 vcl/source/glyphs/graphite_adaptors.cxx
  {
      face_name_out = maFontProperties.szFaceName;
      bold_out = maFontProperties.fBold;
-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
+diff -ru vcl.orig/source/glyphs/graphite_cache.cxx vcl/source/glyphs/graphite_cache.cxx
+--- vcl.orig/source/glyphs/graphite_cache.cxx	2010-01-07 11:50:09.000000000 +0000
++++ vcl/source/glyphs/graphite_cache.cxx	2010-01-11 16:00:47.000000000 +0000
 @@ -36,8 +36,10 @@
  #include <tools/debug.hxx>
  #include <vcl/sallayout.hxx>
@@ -98,9 +97,9 @@ diff -r 46d4c7655bac -r db9687bbeaf0 vcl/source/glyphs/graphite_cache.cxx
  
  #include <rtl/ustring.hxx>
  #include <vcl/graphite_layout.hxx>
-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
+diff -ru vcl.orig/source/glyphs/graphite_features.cxx vcl/source/glyphs/graphite_features.cxx
+--- vcl.orig/source/glyphs/graphite_features.cxx	2010-01-07 11:50:09.000000000 +0000
++++ vcl/source/glyphs/graphite_features.cxx	2010-01-11 16:00:47.000000000 +0000
 @@ -91,7 +91,7 @@
                  gr::isocode aLang = maLang;
                  for (size_t i = pos; i < nFeatEnd; i++)
@@ -128,9 +127,9 @@ diff -r 46d4c7655bac -r db9687bbeaf0 vcl/source/glyphs/graphite_features.cxx
          validValues = font.getFeatureSettings(i);
      gr::FeatureSettingIterator j = validValues.first;
      while (j != validValues.second)
-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
+diff -ru vcl.orig/source/glyphs/graphite_layout.cxx vcl/source/glyphs/graphite_layout.cxx
+--- vcl.orig/source/glyphs/graphite_layout.cxx	2010-01-07 11:50:09.000000000 +0000
++++ vcl/source/glyphs/graphite_layout.cxx	2010-01-11 16:00:47.000000000 +0000
 @@ -66,11 +66,13 @@
  #include <unicode/uscript.h>
  
@@ -174,9 +173,9 @@ diff -r 46d4c7655bac -r db9687bbeaf0 vcl/source/glyphs/graphite_layout.cxx
          bool bBold;
          bool bItalic;
          UniqueCacheInfo(aFace, bBold, bItalic);
-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
+diff -ru vcl.orig/source/glyphs/graphite_textsrc.cxx vcl/source/glyphs/graphite_textsrc.cxx
+--- vcl.orig/source/glyphs/graphite_textsrc.cxx	2010-01-07 11:50:09.000000000 +0000
++++ vcl/source/glyphs/graphite_textsrc.cxx	2010-01-11 16:00:47.000000000 +0000
 @@ -138,16 +138,16 @@
      return unknown;
  }
@@ -207,9 +206,9 @@ diff -r 46d4c7655bac -r db9687bbeaf0 vcl/source/glyphs/graphite_textsrc.cxx
      range1 = propertyRange(char_idx1),
      range2 = propertyRange(char_idx2);
  
-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
+diff -ru vcl.orig/source/glyphs/graphite_textsrc.hxx vcl/source/glyphs/graphite_textsrc.hxx
+--- vcl.orig/source/glyphs/graphite_textsrc.hxx	2010-01-07 11:50:09.000000000 +0000
++++ vcl/source/glyphs/graphite_textsrc.hxx	2010-01-11 16:00:47.000000000 +0000
 @@ -62,9 +62,11 @@
  #include "vcl/dllapi.h"
  
@@ -231,9 +230,9 @@ diff -r 46d4c7655bac -r db9687bbeaf0 vcl/source/glyphs/graphite_textsrc.hxx
          virtual size_t  getFontFeatures(gr::toffset ich, gr::FeatureSetting * prgfset);
          virtual bool    sameSegment(gr::toffset ich1, gr::toffset ich2);
  
-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
+diff -ru vcl.orig/util/makefile2.pmk vcl/util/makefile2.pmk
+--- vcl.orig/util/makefile2.pmk	2010-01-07 11:50:11.000000000 +0000
++++ vcl/util/makefile2.pmk	2010-01-11 16:00:47.000000000 +0000
 @@ -36,3 +36,10 @@
  .IF "$(GUIBASE)"=="aqua"
  CFLAGSCXX+=$(OBJCXXFLAGS)
@@ -245,51 +244,26 @@ diff -r 46d4c7655bac -r db9687bbeaf0 vcl/util/makefile2.pmk
 +CDEFS += -DGRAPHITEADAPTSTL
 +.ENDIF
 +.ENDIF
-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,32 @@
+--- /dev/null	2009-11-23 08:25:49.916291467 +0000
++++ vcl/inc/pregraphitestl.h	2010-01-12 09:49:26.000000000 +0000
+@@ -0,0 +1,30 @@
 +#if defined(GRAPHITEADAPTSTL) && defined(std)
++#   include <ostream>
++#   include <istream>
++#   include <fstream>
++#   include <iostream>
++#   include <vector>
++#   include <algorithm>
 +#   define std_was_redefined_as_stlport std
 +#   undef std
-+#   undef _STLP_CONFIG_H
-+#   undef _STLP_STRING
-+#   undef _STLP_IOSTREAM
-+#   undef _STLP_IOSFWD
-+#   undef _STLP_IOMANIP
-+#   undef _STLP_ALGORITHM
-+#   undef _STLP_VECTOR
-+#   undef _STLP_SET
-+#   undef _STLP_MAP
-+#   define _STLP_DONT_REDEFINE_STD 1
-+#   define _STLP_WHOLE_NATIVE_STD 1
++#   define _STLP_OUTERMOST_HEADER_ID 0xdeadbeaf
 +#   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)
++#   include _STLP_NATIVE_HEADER(algorithm)
 +#   include _STLP_NATIVE_HEADER(string)
 +#   include _STLP_NATIVE_HEADER(streambuf)
 +#   include _STLP_NATIVE_HEADER(ios)
@@ -298,7 +272,20 @@ diff -r db9687bbeaf0 -r 9c2f5f658223 vcl/inc/pregraphitestl.h
 +#   include _STLP_NATIVE_HEADER(ostream)
 +#   include _STLP_NATIVE_HEADER(istream)
 +#   include _STLP_NATIVE_HEADER(iostream)
++#   include _STLP_NATIVE_HEADER(vector)
 +#   pragma GCC visibility pop
 +#endif
 +//sil_std resolves to the std that Graphite was built with
 +namespace sil_std = std;
+--- /dev/null	2009-11-23 08:25:49.916291467 +0000
++++ vcl/inc/postgraphitestl.h	2010-01-12 10:46:40.000000000 +0000
+@@ -0,0 +1,9 @@
++#ifdef std_was_redefined_as_stlport
++//  put things back the way they were
++#   define std std_was_redefined_as_stlport
++#   undef _STLP_OUTERMOST_HEADER_ID
++//  force config to be re-read
++#   undef _STLP_NOTHROW_INHERENTLY
++#   undef _STLP_CONFIG_H
++#   include <stddef.h>
++#endif


More information about the ooo-build-commit mailing list