[openoffice.org/f14/master] needs a bit more

Caolan McNamara caolanm at fedoraproject.org
Mon Nov 1 14:26:47 UTC 2010


commit 8e41ef538d51ab88d7e2cd340f22bdd87756fd54
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Nov 1 14:26:36 2010 +0000

    needs a bit more

 0001-include-redland.h-instead-of-librdf.h.patch |   27 +++++++++++++++++++--
 1 files changed, 24 insertions(+), 3 deletions(-)
---
diff --git a/0001-include-redland.h-instead-of-librdf.h.patch b/0001-include-redland.h-instead-of-librdf.h.patch
index 62ccc36..ecb3e5c 100644
--- a/0001-include-redland.h-instead-of-librdf.h.patch
+++ b/0001-include-redland.h-instead-of-librdf.h.patch
@@ -21,6 +21,27 @@ index 3d2acf0..106b4bc 100644
  
  #include <com/sun/star/lang/XServiceInfo.hpp>
  #include <com/sun/star/lang/XInitialization.hpp>
--- 
-1.7.3.1
-
+diff --git a/configure.in b/configure.in
+index 4d27ac0..282a6b5 100644
+--- a/configure.in
++++ b/configure.in
+@@ -5308,6 +5308,7 @@ else
+ 	SYSTEM_REDLAND=NO
+ fi
+ AC_SUBST(SYSTEM_REDLAND)
++AC_SUBST(REDLAND_CFLAGS)
+ AC_SUBST(REDLAND_LIBS)
+ 
+ dnl ===================================================================
+diff --git a/set_soenv.in b/set_soenv.in
+index 969a928..2e42f66 100644
+--- a/set_soenv.in
++++ b/set_soenv.in
+@@ -1933,6 +1933,7 @@ ToFile( "BUILD_UNOWINREG",   "@BUILD_UNOWINREG@",  "e" );
+ ToFile( "USE_XINERAMA",      "@USE_XINERAMA@",     "e" );
+ ToFile( "XINERAMA_LINK",     "@XINERAMA_LINK@",    "e" );
+ ToFile( "SYSTEM_REDLAND",    "@SYSTEM_REDLAND@",   "e" );
++ToFile( "REDLAND_CFLAGS",    "@REDLAND_CFLAGS@",   "e" );
+ ToFile( "REDLAND_LIBS",      "@REDLAND_LIBS@",     "e" );
+ ToFile( "SYSTEM_HUNSPELL",   "@SYSTEM_HUNSPELL@",  "e" );
+ ToFile( "HUNSPELL_CFLAGS",   "@HUNSPELL_CFLAGS@",  "e" );


More information about the scm-commits mailing list