[Lunar-commits] <moonbase> openoffice-src: adding a patch to fix a crash in non-gnome DE/WM, got it from openoffice Issue 96170, along with some other tidying up.

Dennis 'stumbles' Veatch stumbles at lunar-linux.org
Sun Feb 22 19:53:49 CET 2009


commit f8644b9a5380e11a031360b1e453c42ca152c3b3
Author: Dennis 'stumbles' Veatch <stumbles at lunar-linux.org>
Date:   Sun Feb 22 13:53:49 2009 -0500

    openoffice-src: adding a patch to fix a crash in non-gnome DE/WM, got it from
    openoffice Issue 96170, along with some other tidying up.
---
 x11-apps/openoffice-src/BUILD.x86_64   |   82 ++++++++++++++++++--------------
 x11-apps/openoffice-src/DEPENDS.x86_64 |    4 +-
 x11-apps/openoffice-src/DETAILS.x86_64 |    3 +
 3 files changed, 51 insertions(+), 38 deletions(-)

diff --git a/x11-apps/openoffice-src/BUILD.x86_64 b/x11-apps/openoffice-src/BUILD.x86_64
index 50846f5..584ef3d 100644
--- a/x11-apps/openoffice-src/BUILD.x86_64
+++ b/x11-apps/openoffice-src/BUILD.x86_64
@@ -1,12 +1,22 @@
-(                                                                                                                       
+(
+
+  patch_it $SOURCE_CACHE/$SOURCE8 0  &&
 
   if module_installed qt3; then
-   . /etc/profile.d/qt3.rc     
-  fi &&                        
+   . /etc/profile.d/qt3.rc
+  fi &&
 
   if module_installed kdelibs3; then
-   . /etc/profile.d/kde3.rc         
-  fi &&                             
+   . /etc/profile.d/kde3.rc
+  fi &&
+
+  if module_installed qt4; then
+   . /etc/profile.d/qt4.rc
+  fi &&
+
+  if module_installed kdelibs4; then
+   . /etc/profile.d/kde4.rc
+  fi &&
 
   . /etc/profile.d/pkgconfig.rc &&
 
@@ -16,54 +26,54 @@
 
   # There are symlinks left over if openoffice-bin is installed and
   # they do not get removed and the BUILD will tank near the end of
-  # the compile, this takes care of that.                          
-  for FILE in ${RM_DESK_TOP} ; do                                  
-      rm -f /usr/share/applications/${FILE}.desktop || exit 1      
-    done &&                                                        
+  # the compile, this takes care of that.
+  for FILE in ${RM_DESK_TOP} ; do
+      rm -f /usr/share/applications/${FILE}.desktop || exit 1
+    done &&
 
   sedit "/^ARCH_FLAGS\*=/d" solenv/inc/unxlngi{4,6}.mk &&
-  ARCH_FLAGS=$CXXFLAGS                                   
+  ARCH_FLAGS=$CXXFLAGS
 
   # All of the options have been carefully chosen. Don't edit them unless you
-  # really know what you're doing                                            
+  # really know what you're doing
 
   OPTS="$OPTS --prefix=$OO_DIR --enable-dbus --disable-dbgutil --disable-static-gtk \
-              --disable-fontooo --disable-odk --disable-debug --enable-opengl \      
-              --disable-mathmldtd --enable-cairo --with-mozilla-version=1.7.5 \      
-              --enable-mozilla --enable-binfilter --enable-xrender-link       \      
-              --without-fonts --without-ppds --without-afms   \                      
-              --with-system-stdlibs --with-system-zlib --enable-minimizer     \      
-              --with-system-jpeg --with-system-expat --with-system-freetype   \      
-              --with-system-libxml --with-system-db --disable-symbols --enable-Xaw \ 
+              --disable-fontooo --disable-odk --disable-debug --enable-opengl \
+              --disable-mathmldtd --enable-cairo --with-mozilla-version=1.7.5 \
+              --enable-mozilla --enable-binfilter --enable-xrender-link       \
+              --without-fonts --without-ppds --without-afms   \
+              --with-system-stdlibs --with-system-zlib --enable-minimizer     \
+              --with-system-jpeg --with-system-expat --with-system-freetype   \
+              --with-system-libxml --with-system-db --disable-symbols --enable-Xaw \
               --with-system-xrender-headers --with-epm=internal --enable-pdfimport   \
-              --with-use-shell=bash --with-x --with-package-format=native     \       
-              --with-build-version=LunarLinux --enable-presenter-console \            
-              --enable-wiki-publisher --enable-ogltrans --enable-report-builder \     
-              --with-system-cairo --with-lang=en --with-dict=ENUS" &&                 
+              --with-use-shell=bash --with-x --with-package-format=native     \
+              --with-build-version=LunarLinux --enable-presenter-console \
+              --enable-wiki-publisher --enable-ogltrans --enable-report-builder \
+              --with-system-cairo --with-lang=en --with-dict=ENUS" &&
 
   if module_installed sane-backends ; then
     OPTS="$OPTS --with-system-sane-header";
-  fi &&                                    
+  fi &&
 
   if module_installed sun-jdk ; then
     JAVA_VERSION="`installed_version sun-jdk`";
     OPTS="$OPTS --with-jdk-home=/usr/lib/jdk${JAVA_VERSION}";
-   elif module_installed j2sdk ; then                        
-    JAVA_VERSION="`installed_version j2sdk`";                
+   elif module_installed j2sdk ; then
+    JAVA_VERSION="`installed_version j2sdk`";
     OPTS="$OPTS --with-jdk-home=/usr/lib/j2sdk${JAVA_VERSION}";
-   elif module_installed  sun-jre ; then                       
-    JAVA_VERSION="`installed_version sun-jre`";                
-    OPTS="$OPTS --with-jdk-home=/usr/lib/jre${JAVA_VERSION}";  
-  fi &&                                                        
+   elif module_installed  sun-jre ; then
+    JAVA_VERSION="`installed_version sun-jre`";
+    OPTS="$OPTS --with-jdk-home=/usr/lib/jre${JAVA_VERSION}";
+  fi &&
 
   # Apply mandatory and optional patches
 
   patch_it $SOURCE2 0 &&
 
   # As long as OOo-src does not compile against nss it needs its own mozilla
-  # tarball (and it also compiles its own mozilla)                          
-  mkdir -p $SOURCE_DIRECTORY/moz/download &&                                
-  cp $SOURCE_CACHE/$SOURCE3 $SOURCE_DIRECTORY/moz/download/ &&              
+  # tarball (and it also compiles its own mozilla)
+  mkdir -p $SOURCE_DIRECTORY/moz/download &&
+  cp $SOURCE_CACHE/$SOURCE3 $SOURCE_DIRECTORY/moz/download/ &&
 
   cd $SOURCE_DIRECTORY/config_office &&
 
@@ -71,15 +81,15 @@
   default_config &&
 
   # OOo might fail if those are set to some strange values
-  umask 0022 &&                                           
-  unset LANG LC_ALL &&                                    
+  umask 0022 &&
+  unset LANG LC_ALL &&
 
   cd $SOURCE_DIRECTORY &&
 
   ./bootstrap &&
  # sedit "s/-lxml2/-lxml2\ -lexpat/g" LinuxX86Env.Set.sh &&
-  source LinuxX86-64Env.Set.sh &&                          
-  dmake &&                                                 
+  source LinuxX86-64Env.Set.sh &&
+  dmake &&
 
   prepare_install &&
 
diff --git a/x11-apps/openoffice-src/DEPENDS.x86_64 b/x11-apps/openoffice-src/DEPENDS.x86_64
index 9a01fb6..96b48b9 100644
--- a/x11-apps/openoffice-src/DEPENDS.x86_64
+++ b/x11-apps/openoffice-src/DEPENDS.x86_64
@@ -37,8 +37,8 @@ optional_depends "libwpd"                  \
                  "For WordPerfect support"  
 
 optional_depends "icu4c"                  \
-                 "--with-system-icu"    \  
-                 "--without-system-icu" \  
+                 "--with-system-icu"    \
+                 "--without-system-icu" \
                  "For icu support"         
 
 optional_depends "boost"                  \
diff --git a/x11-apps/openoffice-src/DETAILS.x86_64 b/x11-apps/openoffice-src/DETAILS.x86_64
index 137cc94..b9cfded 100644
--- a/x11-apps/openoffice-src/DETAILS.x86_64
+++ b/x11-apps/openoffice-src/DETAILS.x86_64
@@ -7,6 +7,7 @@
          SOURCE5=OOo_${VERSION}_src_system.tar.bz2
          SOURCE6=OOo_${VERSION}_src_extensions.tar.bz2
          SOURCE7=OOo_${VERSION}_src_binfilter.tar.bz2
+         SOURCE8=OO-3..0.1-kde-GObject.patch
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/OOO300_m15
       SOURCE_URL=http://ftp.rz.tu-bs.de/pub/mirror/OpenOffice.org/stable/${VERSION}/
      SOURCE2_URL=$PATCH_URL/
@@ -15,6 +16,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/OOO300_m15
      SOURCE5_URL=http://ftp.rz.tu-bs.de/pub/mirror/OpenOffice.org/stable/${VERSION}/
      SOURCE6_URL=http://ftp.rz.tu-bs.de/pub/mirror/OpenOffice.org/stable/${VERSION}/
      SOURCE7_URL=http://ftp.rz.tu-bs.de/pub/mirror/OpenOffice.org/stable/${VERSION}/
+     SOURCE8_URL=$PATCH_URL
       SOURCE_VFY=sha1:2da6b2cf0b75873477f22cc9d69a4f0c8b43b435
      SOURCE2_VFY=sha1:58c824ef969b017be5fcd7e4290d7681453aa354
      SOURCE3_VFY=sha1:bb2a89b95d7626a63a3787208e0abb99ea595d24
@@ -22,6 +24,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/OOO300_m15
      SOURCE5_VFY=sha1:8c73821b542c9c96b071550fe0e3e813e21a1246
      SOURCE6_VFY=sha1:c695982d166422a838560ef7b134a5665bc61198
      SOURCE7_VFY=sha1:d84518159538ef736271177b7ebe4697fc4b811d
+     SOURCE8_VFY=sha1:b02c888b771b87d35a63a545810b396a340c87d2
         WEB_SITE=http://www.openoffice.org
          ENTERED=20030805
          UPDATED=20090130


More information about the Lunar-commits mailing list