File ooo-build-3.0.0.10-extensions-hack.diff of Package OpenOffice_org-bootstrap

Overview Repositories Revisions Requests Users Attributes Meta

File ooo-build-3.0.0.10-extensions-hack.diff of Package OpenOffice_org-bootstrap

--- patches/dev300/apply
+++ patches/dev300/apply
@@ -44,12 +44,12 @@
 # Sdk patches: a special distro; applied only when building with the sdk tarball unpacked
 Sdk : SdkFixes
 # special fragmented build patch distro
-Piece : PieceBits
+Piece : PieceBits, ExtensionFixes, NovellOnlyExtensionFixes
 #Localize
 Localize : LocalizeFixes
 # patches touching swext which is not in the OpenOffice2 alias yet.
 # FIXME: Get this cleaned up
-Extensions : ExtensionFixes
+Extensions : 
 UnstableWP : UnstableLibwpd
 
 # Novell
@@ -2893,6 +2893,10 @@
 [ ExtensionFixes ]
 pdfimport-lax-restrictions.diff, i#90468, thorsten
 
+[ PieceBits ]
+piece-config-office-extensions.diff
+
+
 [ NovellOnlyWin32 ]
 i92372.diff, i#92372, n#353143, tml
 
--- patches/dev300/piece-config-office-extensions.diff
+++ patches/dev300/piece-config-office-extensions.diff
@@ -0,0 +1,53 @@
+--- configure.in.old	2009-02-27 19:04:39.000000000 +0100
++++ configure.in	2009-02-27 19:18:31.000000000 +0100
+@@ -5707,24 +5707,12 @@ AC_SUBST(POPPLER_CFLAGS)
+ AC_SUBST(POPPLER_LIBS)
+ 
+ if test "$ENABLE_PRESENTER_SCREEN" = "YES" -o "$ENABLE_MINIMIZER" = "YES" -o "$ENABLE_PDFIMPORT" = "YES"; then
+-  AC_MSG_CHECKING([for sdext module])
+-  if test -d ./sdext; then
+-   AC_MSG_RESULT([OK])
+-  else
+-   AC_MSG_ERROR([not existing. get it (did you get the -extensions tarball?)])
+-  fi
+   BUILD_TYPE="$BUILD_TYPE SDEXT"
+ fi
+ 
+ AC_MSG_CHECKING([whether to build the Wiki Publisher extension])
+ if test -n "$enable_wiki_publisher" -a "$enable_wiki_publisher" != "no" && test  "$WITH_JAVA" != "no"; then
+   AC_MSG_RESULT([yes])
+-  AC_MSG_CHECKING([for swext module])
+-  if test -d ./swext; then
+-   AC_MSG_RESULT([OK])
+-  else
+-   AC_MSG_ERROR([not existing. get it (did you get the -extensions tarball?)])
+-  fi
+   ENABLE_MEDIAWIKI=YES
+   AC_MSG_CHECKING([which Apache commons-* libs to use])
+   if test "$with_system_apache_commons" == "yes"; then
+@@ -5747,12 +5747,6 @@ AC_MSG_CHECKING([whether to build the Re
+ if test -n "$enable_report_builder" -a "$enable_report_builder" != "no" && test "$WITH_JAVA" != "no"; then
+   AC_MSG_RESULT([yes])
+   ENABLE_REPORTBUILDER=YES
+-  AC_MSG_CHECKING([for reportbuilder module])
+-  if test -d ./reportbuilder; then
+-    AC_MSG_RESULT([OK])
+-  else
+-    AC_MSG_ERROR([not existing. get it (did you get the -extensions tarball?)])
+-  fi
+   AC_MSG_CHECKING([which jfreereport libs to use])
+   if test "$with_system_jfreereport" == "yes"; then
+    	SYSTEM_JFREEREPORT=YES
+@@ -5962,12 +5950,6 @@ if test -n "$enable_report_builder" -a "
+ 
+   else
+      AC_MSG_RESULT([internal])
+-     AC_MSG_CHECKING([for jfreereport module])
+-     if test -d ./jfreereport; then
+-      AC_MSG_RESULT([OK]) 
+-     else
+-      AC_MSG_ERROR([not existing. get it (did you get the -extensions tarball?)])
+-     fi
+      SYSTEM_JFREEREPORT=NO
+      BUILD_TYPE="$BUILD_TYPE JFREEREPORT"
+   fi

Places

File ooo-build-3.0.0.10-extensions-hack.diff of Package OpenOffice_org-bootstrap

Places