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

Overview Repositories Revisions Requests Users Attributes Meta

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

--- patches/dev300/apply
+++ patches/dev300/apply
@@ -42,12 +42,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 : 
 
 # Novell
 NovellBase : LinuxCommon, NovellOnly, NovellOnlyUnix, \
@@ -2686,6 +2686,10 @@
 pdfimport-system-poppler.diff, i#92920, cmc
 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 @@
+--- config_office/configure.in.old	2008-09-25 22:18:53.000000000 +0200
++++ config_office/configure.in	2008-09-25 22:23:27.000000000 +0200
+@@ -5605,24 +5605,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 (or Extensions3)])
+-   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 (or Extensions3)])
+-  fi
+   ENABLE_MEDIAWIKI=YES
+   AC_MSG_CHECKING([which Apache commons-* libs to use])
+   if test "$with_system_apache_commons" == "yes"; then
+@@ -5688,12 +5676,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 (or Extensions3)])
+-  fi
+   AC_MSG_CHECKING([which jfreereport libs to use])
+   if test "$with_system_jfreereport" == "yes"; then
+    	SYSTEM_JFREEREPORT=YES
+@@ -5755,12 +5737,6 @@ if test -n "$enable_report_builder" -a "
+                [AC_MSG_ERROR(jcommon-serializer.jar not found.)], [])
+   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 (or Extensions3)])
+-     fi
+      SYSTEM_JFREEREPORT=NO
+      BUILD_TYPE="$BUILD_TYPE JFREEREPORT"
+   fi

Places

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

Places