rpms/openoffice.org/F-7 openoffice.org-1.9.97.rh156067.noversionedsysui.patch, NONE, 1.1 openoffice.org-2.1.0.ooo78148.lingucomponent.systemhunspell.patch, NONE, 1.1 workspace.ppc64one.patch, NONE, 1.1 openoffice.org-1.9.97.rh156067.noversionedicons.patch, 1.2, NONE openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemhunspell.patch, 1.4, NONE

Caolan McNamara (caolanm) fedora-extras-commits at redhat.com
Thu Jul 26 20:25:24 UTC 2007 

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19888

Added Files:
	openoffice.org-1.9.97.rh156067.noversionedsysui.patch 
	openoffice.org-2.1.0.ooo78148.lingucomponent.systemhunspell.patch 
	workspace.ppc64one.patch 
Removed Files:
	openoffice.org-1.9.97.rh156067.noversionedicons.patch 
	openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemhunspell.patch 
Log Message:
extra bits

openoffice.org-1.9.97.rh156067.noversionedsysui.patch:

--- NEW FILE openoffice.org-1.9.97.rh156067.noversionedsysui.patch ---
Index: desktop/productversion.mk
===================================================================
RCS file: /cvs/gsl/sysui/desktop/productversion.mk,v
retrieving revision 1.18.2.2
diff -u -r1.18.2.2 productversion.mk
--- openoffice.org.orig/sysui/desktop/productversion.mk	8 May 2007 11:35:10 -0000	1.18.2.2
+++ openoffice.org/sysui/desktop/productversion.mk	18 May 2007 17:58:28 -0000
@@ -67,7 +67,7 @@
 PRODUCTVERSION.openoffice.org = $(PRODUCTVERSION)
 PKGVERSION.openoffice.org = $(PKGVERSION)
-UNIXFILENAME.openoffice.org = $(PRODUCTNAME.openoffice.org:l)$(PRODUCTVERSION.openoffice.org)
+UNIXFILENAME.openoffice.org = $(PRODUCTNAME.openoffice.org:l)
 ICONPREFIX.openoffice.org = $(UNIXFILENAME.openoffice.org:s/.//g)
 
 PRODUCTNAME.broffice.org = BrOffice.org
 PRODUCTVERSION.broffice.org = $(PRODUCTVERSION)
Index: desktop/share/makefile.mk
===================================================================
RCS file: /cvs/gsl/sysui/desktop/share/makefile.mk,v
retrieving revision 1.3
diff -u -p -r1.3 makefile.mk
--- openoffice.org.orig/sysui/desktop/share/makefile.mk	21 Jan 2005 11:19:32 -0000	1.3
+++ openoffice.org/sysui/desktop/share/makefile.mk	27 Apr 2005 10:11:04 -0000
@@ -144,9 +144,9 @@
 	@$(MKDIRHIER) $(@:db).$(INPATH)
 	@echo Creating desktop entries for $(@:f) ..
 	@echo ---------------------------------
-	@$(PERL) brand.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -u '$${{UNIXPRODUCTNAME}}$${{PRODUCTVERSION}}' --iconprefix '$${{WITHOUTDOTUNIXPRODUCTNAME}}${ICONVERSION}-' $< $(@:db).$(INPATH)
-	@$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH) --ext "desktop" --key "Name" $(ULFDIR)$/launcher_name.ulf
-	@$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH) --ext "desktop" --key "Comment" $(ULFDIR)$/launcher_comment.ulf
+	@$(PERL) brand.pl -p '$${{PRODUCTNAME}}' -u '$${{UNIXPRODUCTNAME}}' --iconprefix '$${{WITHOUTDOTUNIXPRODUCTNAME}}-' $< $(@:db).$(INPATH)
+	@$(PERL) translate.pl -p '$${{PRODUCTNAME}}' -d $(@:db).$(INPATH) --ext "desktop" --key "Name" $(ULFDIR)$/launcher_name.ulf
+	@$(PERL) translate.pl -p '$${{PRODUCTNAME}}' -d $(@:db).$(INPATH) --ext "desktop" --key "Comment" $(ULFDIR)$/launcher_comment.ulf
 .IF "$(WITH_LIBSN)"=="YES"
 	@$(foreach,i,$(LAUNCHERLIST) $(shell echo "StartupNotify=true" >> $(@:db).$(INPATH)/$i.desktop))
 .ENDIF

openoffice.org-2.1.0.ooo78148.lingucomponent.systemhunspell.patch:

--- NEW FILE openoffice.org-2.1.0.ooo78148.lingucomponent.systemhunspell.patch ---
Index: source/editeng/unolingu.cxx
===================================================================
RCS file: /cvs/graphics/svx/source/editeng/unolingu.cxx,v
retrieving revision 1.31.22.1
diff -u -r1.31.22.1 unolingu.cxx
--- openoffice.org.orig/svx/source/editeng/unolingu.cxx	22 Nov 2006 11:39:00 -0000	1.31.22.1
+++ openoffice.org/svx/source/editeng/unolingu.cxx	29 Nov 2006 19:11:38 -0000
@@ -526,12 +526,13 @@
     // 1: regular OOo dictionary path
 	// 2: user-dictionary path (where OOo linguistic by bad choice places downloaded dictionaries
 	//	  when the permissions for the share tree are missing. E.g. in user installations.)
-	const USHORT nDirectories = 3;
-    String aDirectories[ 3 /*nDirectories*/ ];
+	const USHORT nDirectories = 4;
+    String aDirectories[ 4 /*nDirectories*/ ];
     aDirectories[0] = linguistic::GetFileURL( SvtPathOptions::PATH_LINGUISTIC, String::CreateFromAscii( "x" ) );
     aDirectories[1] = linguistic::GetFileURL( SvtPathOptions::PATH_LINGUISTIC, String::CreateFromAscii( "ooo" ) );
     //!! warning: see bUseFile below when changing this index !!
 	aDirectories[2] = linguistic::GetFileURL( SvtPathOptions::PATH_USERDICTIONARY, String::CreateFromAscii( "x" ) );
+    aDirectories[3] = String::CreateFromAscii( "file:///usr/share/myspell" );
 	//
     aDirectories[0].Erase( aDirectories[0].Len() - 2, 2 );	// erase /x from URL
     aDirectories[2].Erase( aDirectories[2].Len() - 2, 2 );	// erase /x from URL
Index: source/spellcheck/spell/sspellimp.cxx
===================================================================
RCS file: /cvs/whiteboard/lingucomponent/source/spellcheck/spell/sspellimp.cxx,v
retrieving revision 1.18
diff -u -r1.18 sspellimp.cxx
--- openoffice.org.orig/lingucomponent/source/spellcheck/spell/sspellimp.cxx	16 Sep 2006 16:12:16 -0000	1.18
+++ openoffice.org/lingucomponent/source/spellcheck/spell/sspellimp.cxx	29 Nov 2006 19:42:18 -0000
@@ -160,14 +160,15 @@
 
         int numusr;          // number of user dictionary entries
         int numshr;          // number of shared dictionary entries
+        int numsys;          // number of system dictionary entries
         dictentry * spdict;  // shared dict entry pointer
         dictentry * updict;  // user dict entry pointer
         SvtPathOptions aPathOpt;
 
+	std::vector<dictentry *> postsyspdict;
 	std::vector<dictentry *> postspdict;
 	std::vector<dictentry *> postupdict;
 
-
 	if (!numdict) {
 
             // invoke a dictionary manager to get the user dictionary list
@@ -214,14 +215,42 @@
 		postspdict.push_back(&spdict[i]);
             }
 
+            numsys = 0;
+            const OUString sSystemDictPath(A2OU("file:///usr/share/myspell"));
+            osl::Directory aSystemDicts(sSystemDictPath);
+            if (aSystemDicts.open() == osl::FileBase::E_None)
+            {
+                DirectoryItem aItem;
+                FileStatus aFileStatus(FileStatusMask_FileURL);
+                while (aSystemDicts.getNextItem(aItem) == osl::FileBase::E_None)
+                {
+                    aItem.getFileStatus(aFileStatus);
+                    rtl::OUString sPath = aFileStatus.getFileURL();
+                    if (sPath.lastIndexOf(A2OU(".dic")) == sPath.getLength()-4)
+                    {
+                        sal_Int32 nStartIndex = sPath.lastIndexOf(sal_Unicode('/')) + 1;
+                        sal_Int32 nIndex = nStartIndex;
+                        OUString sLang = sPath.getToken( 0, '_', nIndex );
+                        OUString sRegion = sPath.getToken( 0, '.', nIndex );
+			sPath = sPath.copy(nStartIndex, nIndex - nStartIndex - 1);
+			dictentry *entry = new dictentry;
+			entry->filename = strdup(OUStringToOString(sPath, RTL_TEXTENCODING_UTF8).getStr());
+			entry->lang = strdup(OUStringToOString(sLang, RTL_TEXTENCODING_UTF8).getStr());
+			entry->region = strdup(OUStringToOString(sRegion, RTL_TEXTENCODING_UTF8).getStr());
+			postsyspdict.push_back(entry);
+                    }
+                }
+            }
+
 	    numusr = postupdict.size();
             numshr = postspdict.size();
+            numsys = postsyspdict.size();
 
             // we really should merge these and remove duplicates but since 
             // users can name their dictionaries anything they want it would
             // be impossible to know if a real duplication exists unless we
             // add some unique key to each myspell dictionary
-            numdict = numshr + numusr;
+            numdict = numsys + numshr + numusr;
 
             if (numdict) {
 	        aDicts = new Hunspell* [numdict];
@@ -270,6 +299,31 @@
                     aDNames[k] = aPathOpt.GetLinguisticPath() + A2OU("/ooo/") + A2OU(postspdict[i]->filename);
                     k++;
                 }
+
+                // now add the system dictionaries
+                for (i = 0; i < numsys; i++) {
+	            Locale nLoc( A2OU(postsyspdict[i]->lang), A2OU(postsyspdict[i]->region), OUString() );
+                    newloc = 1;
+	            for (j = 0; j < numlocs; j++) {
+                        if (nLoc == pLocale[j]) newloc = 0;
+                    }
+                    if (newloc) {
+                        pLocale[numlocs] = nLoc;
+                        numlocs++;
+                    }
+                    aDLocs[k] = nLoc;
+                    aDicts[k] = NULL;
+                    aDEncs[k] = 0;
+                    aDNames[k] = sSystemDictPath + A2OU("/") + A2OU(postsyspdict[i]->filename);
+
+		    free(postsyspdict[i]->filename);
+		    free(postsyspdict[i]->lang);
+		    free(postsyspdict[i]->region);
+		    delete postsyspdict[i];
+
+                    k++;
+                }
+
 
                 aSuppLocales.realloc(numlocs);
 
Index: configure.in
===================================================================
RCS file: /cvs/tools/config_office/configure.in,v
retrieving revision 1.192.2.3
diff -u -r1.192.2.3 configure.in
--- openoffice.org.orig/config_office/configure.in	19 Jan 2007 12:55:19 -0000	1.192.2.3
+++ openoffice.org/config_office/configure.in	6 Jun 2007 14:11:02 -0000
@@ -3985,14 +3985,16 @@
     AC_CHECK_HEADER(hunspell/hunspell.hxx, [ HUNSPELL_CFLAGS=-I/usr/include/hunspell ],
         [AC_MSG_ERROR(hunspell headers not found.)], [])
        ], [])
-    AC_CHECK_LIB(hunspell, main, [],
+    AC_CHECK_LIB(hunspell-1.1, main, [],
            [ AC_MSG_ERROR(hunspell library not found.) ], [])
+    HUNSPELL_LIBS="-lhunspell-1.1"
 else
     AC_MSG_RESULT([internal])
     SYSTEM_HUNSPELL=NO
 fi
 AC_SUBST(SYSTEM_HUNSPELL)
 AC_SUBST(HUNSPELL_CFLAGS)
+AC_SUBST(HUNSPELL_LIBS)
 
 dnl ===================================================================
 dnl Checking for altlinuxhyph
Index: set_soenv.in
===================================================================
RCS file: /cvs/tools/config_office/set_soenv.in,v
retrieving revision 1.130.2.3
diff -u -r1.130.2.3 set_soenv.in
--- openoffice.org.orig/config_office/set_soenv.in	19 Jan 2007 12:55:33 -0000	1.130.2.3
+++ openoffice.org/config_office/set_soenv.in	6 Jun 2007 14:11:03 -0000
@@ -1852,6 +1852,7 @@
 ToFile( "XINERAMA_LINK",     "@XINERAMA_LINK@",    "e" );
 ToFile( "SYSTEM_HUNSPELL",   "@SYSTEM_HUNSPELL@",  "e" );
 ToFile( "HUNSPELL_CFLAGS",   "@HUNSPELL_CFLAGS@",  "e" );
+ToFile( "HUNSPELL_LIBS",     "@HUNSPELL_LIBS@",    "e" );
 ToFile( "SYSTEM_HYPH",       "@SYSTEM_HYPH@",      "e" );
 ToFile( "SYSTEM_MYTHES",     "@SYSTEM_MYTHES@",    "e" );
 ToFile( "PAM",               "@PAM@",              "e" );
Index: source/hyphenator/altlinuxhyph/hyphen/makefile.mk
===================================================================
RCS file: /cvs/whiteboard/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk,v
retrieving revision 1.11.34.1
diff -u -r1.11.34.1 makefile.mk
--- openoffice.org.orig/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk	1 Feb 2007 19:08:18 -0000	1.11.34.1
+++ openoffice.org/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk	6 Jun 2007 14:12:05 -0000
@@ -97,10 +97,10 @@
 		$(LNGLIB) \
 		$(HNJLIB)
 
-.IF "$(SYSTEM_MYSPELL)" != "YES"
+.IF "$(SYSTEM_HUNSPELL)" != "YES"
 SHL1STDLIBS+=   $(ULINGULIB)
 .ELSE
-SHL1STDLIBS+=   $(MYSPELL_LIBS)
+SHL1STDLIBS+=   $(HUNSPELL_LIBS)
 .ENDIF
 
 
Index: source/lingutil/makefile.mk
===================================================================
RCS file: /cvs/whiteboard/lingucomponent/source/lingutil/makefile.mk,v
retrieving revision 1.6
diff -u -r1.6 makefile.mk
--- openoffice.org.orig/lingucomponent/source/lingutil/makefile.mk	7 Sep 2005 19:40:54 -0000	1.6
+++ openoffice.org/lingucomponent/source/lingutil/makefile.mk	6 Jun 2007 14:12:05 -0000
@@ -43,9 +43,9 @@
 
 .INCLUDE : settings.mk
 
-.IF "$(SYSTEM_MYSPELL)" == "YES"
+.IF "$(SYSTEM_HUNSPELL)" == "YES"
 @all:
-	@echo "Nothing to do here; using system myspell..."
+	@echo "Nothing to do here; using system hunspell..."
 .ENDIF
 
 SLOFILES=	\
Index: source/spellcheck/spell/makefile.mk
===================================================================
RCS file: /cvs/whiteboard/lingucomponent/source/spellcheck/spell/makefile.mk,v
retrieving revision 1.13.34.1
diff -u -r1.13.34.1 makefile.mk
--- openoffice.org.orig/lingucomponent/source/spellcheck/spell/makefile.mk	1 Feb 2007 19:08:29 -0000	1.13.34.1
+++ openoffice.org/lingucomponent/source/spellcheck/spell/makefile.mk	6 Jun 2007 14:12:06 -0000
@@ -40,11 +40,6 @@
 ENABLE_EXCEPTIONS=TRUE
 USE_DEFFILE=TRUE
 
-.IF "$(MYSPELLLIB)"==""
-.ELSE
- at echo "Build Hunspell instead of system Myspell."
-.ENDIF
-
 .IF "$(HUNSPELLLIB)"==""
 .IF "$(GUI)"=="UNX"
 HUNSPELLLIB=-lhunspell
@@ -108,11 +103,12 @@
 		$(SALLIB)		\
 		$(UCBHELPERLIB)	\
 		$(UNOTOOLSLIB)	\
-		$(LNGLIB) \
-                $(HUNSPELLLIB)
+		$(LNGLIB)
 
 .IF "$(SYSTEM_HUNSPELL)" != "YES"
-SHL1STDLIBS+=   $(ULINGULIB)
+SHL1STDLIBS+=   $(ULINGULIB) $(HUNSPELLLIB)
+.ELSE
+SHL1STDLIBS+=   $(HUNSPELL_LIBS)
 .ENDIF
 
 # build DLL
Index: source/thesaurus/libnth/makefile.mk
===================================================================
RCS file: /cvs/whiteboard/lingucomponent/source/thesaurus/libnth/makefile.mk,v
retrieving revision 1.7.34.1
diff -u -r1.7.34.1 makefile.mk
--- openoffice.org.orig/lingucomponent/source/thesaurus/libnth/makefile.mk	1 Feb 2007 19:08:41 -0000	1.7.34.1
+++ openoffice.org/lingucomponent/source/thesaurus/libnth/makefile.mk	6 Jun 2007 14:12:06 -0000
@@ -66,22 +66,22 @@
 
 # --- Files --------------------------------------------------------
 
-.IF "$(SYSTEM_MYSPELL)" == "YES" && "$(SYSTEM_MYTHES)" == "YES"
-CXXFLAGS += $(MYSPELL_CFLAGS)
-CFLAGSCXX += $(MYSPELL_CFLAGS)
-CFLAGSCC += $(MYSPELL_CFLAGS)
-.ENDIF
-.IF "$(SYSTEM_MYSPELL)" == "YES" && "$(SYSTEM_MYTHES)" != "YES"
-CXXFLAGS += -I..$/mythes $(MYSPELL_CFLAGS)
-CFLAGSCXX += -I..$/mythes $(MYSPELL_CFLAGS)
-CFLAGSCC += -I..$/mythes $(MYSPELL_CFLAGS)
+.IF "$(SYSTEM_HUNSPELL)" == "YES" && "$(SYSTEM_MYTHES)" == "YES"
+CXXFLAGS += $(HUNSPELL_CFLAGS)
+CFLAGSCXX += $(HUNSPELL_CFLAGS)
+CFLAGSCC += $(HUNSPELL_CFLAGS)
+.ENDIF
+.IF "$(SYSTEM_HUNSPELL)" == "YES" && "$(SYSTEM_MYTHES)" != "YES"
+CXXFLAGS += -I..$/mythes $(HUNSPELL_CFLAGS)
+CFLAGSCXX += -I..$/mythes $(HUNSPELL_CFLAGS)
+CFLAGSCC += -I..$/mythes $(HUNSPELL_CFLAGS)
 .ENDIF
 .IF "$(SYSTEM_MYPSPELL)" != "YES" && "$(SYSTEM_MYTHES)" == "YES"
 CXXFLAGS += -I..$/..$/lingutil
 CFLAGSCXX += -I..$/..$/lingutil
 CFLAGSCC += -I..$/..$/lingutil
 .ENDIF
-.IF "$(SYSTEM_MYSPELL)" != "YES" && "$(SYSTEM_MYTHES)" != "YES"
+.IF "$(SYSTEM_HUNSPELL)" != "YES" && "$(SYSTEM_MYTHES)" != "YES"
 CXXFLAGS += -I..$/mythes -I..$/..$/lingutil
 CFLAGSCXX += -I..$/mythes -I..$/..$/lingutil
 CFLAGSCC += -I..$/mythes -I..$/..$/lingutil
@@ -117,10 +117,10 @@
 		$(LNGLIB) \
                 $(MYTHESLIB)
 
-.IF "$(SYSTEM_MYSPELL)" != "YES"
+.IF "$(SYSTEM_HUNSPELL)" != "YES"
 SHL1STDLIBS+=   $(ULINGULIB)
 .ELSE
-SHL1STDLIBS+=   $(MYSPELL_LIBS)
+SHL1STDLIBS+=   $(HUNSPELL_LIBS)
 .ENDIF
 # build DLL
 SHL1LIBS=		$(SLB)$/$(TARGET).lib

workspace.ppc64one.patch:

--- NEW FILE workspace.ppc64one.patch ---
Index: tools/config_office/configure.in
diff -u tools/config_office/configure.in:1.204 tools/config_office/configure.in:1.204.4.1
--- tools/config_office/configure.in:1.204	Thu May 10 09:40:23 2007
+++ tools/config_office/configure.in	Tue May 29 07:16:04 2007
@@ -5064,6 +5064,10 @@
 AC_SUBST(USE_XINERAMA)
 AC_SUBST(XINERAMA_LINK)
 
+AC_CHECK_SIZEOF(long)
+SIZEOF_LONG=$ac_cv_sizeof_long
+AC_SUBST(SIZEOF_LONG)
+
 dnl ===================================================================
 dnl Test for the presence of Ant and that it works
 dnl ===================================================================
Index: tools/config_office/set_soenv.in
diff -u tools/config_office/set_soenv.in:1.144 tools/config_office/set_soenv.in:1.144.4.1
--- tools/config_office/set_soenv.in:1.144	Thu May 10 09:40:35 2007
+++ tools/config_office/set_soenv.in	Tue May 29 07:16:04 2007
@@ -441,23 +441,40 @@
       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc".$ds."native_threads";
    }
    elsif ($platform =~ m/^powerpc/)
-   {  print "Setting Linux PPC specific values... ";
-      $outfile        = "LinuxPPCEnv.Set"; 
+   {
+      if (($platform =~ m/^powerpc64/) && ('@SIZEOF_LONG@' eq '8')) {
+         print "Setting Linux PPC64 specific values... ";
+         $outfile = "LinuxPPC64Env.Set"; 
+         $OUTPATH = "unxlngppc64";
+         $CPUNAME = "POWERPC64";
+
+         if ( $JDK eq "gcj" ) {
+            $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64";
+            $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64".$ds."client";
+            $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64".$ds."native_threads";
+         }
+      }
+      else {
+         print "Setting Linux PPC specific values... ";
+         $outfile = "LinuxPPCEnv.Set"; 
+         $OUTPATH = "unxlngppc";
+         $CPUNAME = "POWERPC";
+
+         if ( $JDK eq "gcj" ) {
+            $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
+            $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."client";
+            $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads";
+         }
+      }
+
       $CPU            = "P";
-      $CPUNAME        = "POWERPC";
-      $OUTPATH        = "unxlngppc";
+
+# the "standard" ppc j2sdk is IBMJava2-ppc-142
       if ( $JDK ne "gcj" ) {
-# j2sdk is IBMJava2-ppc-142
           $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."bin";
           $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."bin".$ds."classic";
           $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."bin";
       }
-      else {
-# j2sdk has sun-style locations
-          $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
-          $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."client";
-          $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads";
-      }
    }
    elsif ($platform =~ m/^s390/)
    {  print "Setting Linux S/390 specific values... ";
@@ -821,6 +838,8 @@
 $LIB64                = $ds."lib";
 $LIB64               .= "64"
 if ($platform =~ m/x86_64-.*-linux-gnu/);
+$LIB64               .= "64" 
+if (($platform =~ m/powerpc64-.*-linux-gnu/) && ('@SIZEOF_LONG@' eq '8'));
 $INC                  = $ds."inc";
 $INCLUDE              = $ds."include";
 $DEV                  = $ds."dev";
Index: tools/solenv/bin/modules/installer/epmfile.pm
diff -u tools/solenv/bin/modules/installer/epmfile.pm:1.64 tools/solenv/bin/modules/installer/epmfile.pm:1.64.20.1
--- tools/solenv/bin/modules/installer/epmfile.pm:1.64	Thu May 10 06:56:33 2007
+++ tools/solenv/bin/modules/installer/epmfile.pm	Tue Jun  5 04:31:17 2007
@@ -2074,9 +2074,10 @@
 
 		my $target = "";
 		if ( $installer::globals::compiler =~ /unxlngi/) { $target = "i586"; }
-		if ( $installer::globals::compiler =~ /unxlngx/) { $target = "x86_64"; }
-		if ( $installer::globals::compiler =~ /unxlngs/) { $target = "sparc"; }
-		if ( $installer::globals::compiler =~ /unxlngppc/) {$target = "ppc"; }
+		elsif ( $installer::globals::compiler =~ /unxlngx/) { $target = "x86_64"; }
+		elsif ( $installer::globals::compiler =~ /unxlngs/) { $target = "sparc"; }
+		elsif ( $installer::globals::compiler =~ /unxlngppc64/) {$target = "ppc64"; }
+		elsif ( $installer::globals::compiler =~ /unxlngppc/) {$target = "ppc"; }
 		
 		my $systemcall = "$rpmcommand -bb $specfilename --target $target 2\>\&1 |";
 
@@ -2256,9 +2257,10 @@
 	{
 		my $rpmdir;
 		if ( $installer::globals::compiler =~ /unxlngi/) { $rpmdir = "$installer::globals::epmoutpath/RPMS/i586"; }
-		if ( $installer::globals::compiler =~ /unxlngx/) { $rpmdir = "$installer::globals::epmoutpath/RPMS/x86_64"; }
-		if ( $installer::globals::compiler =~ /unxlngs/) { $rpmdir = "$installer::globals::epmoutpath/RPMS/sparc"; }
-		if ( $installer::globals::compiler =~ /unxlngppc/) { $rpmdir = "$installer::globals::epmoutpath/RPMS/ppc"; }
+		elsif ( $installer::globals::compiler =~ /unxlngx/) { $rpmdir = "$installer::globals::epmoutpath/RPMS/x86_64"; }
+		elsif ( $installer::globals::compiler =~ /unxlngs/) { $rpmdir = "$installer::globals::epmoutpath/RPMS/sparc"; }
+		elsif ( $installer::globals::compiler =~ /unxlngppc64/) { $rpmdir = "$installer::globals::epmoutpath/RPMS/ppc64"; }
+		elsif ( $installer::globals::compiler =~ /unxlngppc/) { $rpmdir = "$installer::globals::epmoutpath/RPMS/ppc"; }
 
 		my $systemcall = "mv $rpmdir/* $newdir";	# moving the rpms into the directory "RPMS"
 
@@ -2284,6 +2286,7 @@
 		installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS/i586");
 		installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS/i386");
 		installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS/sparc");
+		installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS/ppc64");
 		installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS/ppc");
 		installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS");
 
Index: tools/solenv/inc/unx.mk
diff -u tools/solenv/inc/unx.mk:1.33 tools/solenv/inc/unx.mk:1.33.338.1
--- tools/solenv/inc/unx.mk:1.33	Wed Jul 19 02:26:37 2006
+++ tools/solenv/inc/unx.mk	Tue May 29 07:18:59 2007
@@ -115,10 +115,14 @@
 .INCLUDE : unxlngppc.mk
 .ENDIF
 
-.IF "$(COM)$(CVER)$(OS)$(CPU)$(GLIBC)" == "GCCC300LINUXP2REDHAT60"
+.IF "$(COM)$(CVER)$(OS)$(CPU)$(GLIBC)$(CPUNAME)" == "GCCC300LINUXP2REDHAT60POWERPC"
 .INCLUDE : unxlngppc4.mk
 .ENDIF
 
+.IF "$(COM)$(CVER)$(OS)$(CPU)$(GLIBC)$(CPUNAME)" == "GCCC300LINUXP2REDHAT60POWERPC64"
+.INCLUDE : unxlngppc64.mk
+.ENDIF
+
 .IF "$(COM)$(CVER)$(OS)$(CPU)$(GLIBC)" == "GCCC300LINUX32REDHAT60"
 .INCLUDE : unxlngs3904.mk
 .ENDIF
Index: tools/solenv/inc/unxlngppc4.mk
diff -u tools/solenv/inc/unxlngppc4.mk:1.26 tools/solenv/inc/unxlngppc4.mk:1.26.74.1
--- tools/solenv/inc/unxlngppc4.mk:1.26	Fri Mar  9 01:10:02 2007
+++ tools/solenv/inc/unxlngppc4.mk	Thu May 31 03:28:15 2007
@@ -106,7 +106,7 @@
 CFLAGSDBGUTIL=
 
 # Compiler flags for enabling optimizations
-CFLAGSOPT=-O2 -fno-strict-aliasing
+CFLAGSOPT=-Os -fno-strict-aliasing
 
 # Compiler flags for disabling optimizations
 # don't change - required to work around optimization bugs
Index: tools/solenv/inc/unxlngppc64.mk
diff -u /dev/null tools/solenv/inc/unxlngppc64.mk:1.1.2.2
--- /dev/null	Wed Jun 13 02:42:41 2007
+++ tools/solenv/inc/unxlngppc64.mk	Fri Jun  1 05:05:04 2007
@@ -0,0 +1,40 @@
+#*************************************************************************
+#
+#   OpenOffice.org - a multi-platform office productivity suite
+#
+#   $RCSfile$
+#
+#   $Revision$
+#
+#   last change: $Author$ $Date$
+#
+#   The Contents of this file are made available subject to
+#   the terms of GNU Lesser General Public License Version 2.1.
+#
+#
+#     GNU Lesser General Public License Version 2.1
+#     =============================================
+#     Copyright 2005 by Sun Microsystems, Inc.
+#     901 San Antonio Road, Palo Alto, CA 94303, USA
+#
+#     This library is free software; you can redistribute it and/or
+#     modify it under the terms of the GNU Lesser General Public
+#     License version 2.1, as published by the Free Software Foundation.
+#
+#     This library is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#     Lesser General Public License for more details.
+#
+#     You should have received a copy of the GNU Lesser General Public
+#     License along with this library; if not, write to the Free Software
+#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+#     MA  02111-1307  USA
+#
+#*************************************************************************
+# mk file for linux ppc64, inherit from ppc and add some flags
+
+.INCLUDE : unxlngppc4.mk
+
+CDEFS+=-DPOWERPC64
+CFLAGSCXX+=-mminimal-toc
Index: udk/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx
[...1709 lines suppressed...]
+											pThis->getBridge()->getCpp2Uno() );
+				}
+			}
+			else // pure out
+			{
+				uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
+										pThis->getBridge()->getCpp2Uno() );
+			}
+			// destroy temp cpp param => cpp: every param was constructed
+			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
+			
+			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
+		}
+		// return value
+		if (pCppReturn && pUnoReturn != pCppReturn)
+		{
+			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
+									pThis->getBridge()->getCpp2Uno() );
+			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
+		}
+	}
+ 	catch (...)
+ 	{
+  		// fill uno exception
+		fillUnoException( CPPU_CURRENT_NAMESPACE::__cxa_get_globals()->caughtExceptions, 
+                                  *ppUnoExc, pThis->getBridge()->getCpp2Uno() );
+        
+		// temporary params
+		for ( ; nTempIndizes--; )
+		{
+			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
+			// destroy temp cpp param => cpp: every param was constructed
+			uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
+			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
+		}
+		// return type
+		if (pReturnTypeDescr)
+			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
+	}
+}
+
+}
+
+namespace bridges { namespace cpp_uno { namespace shared {
+
+void unoInterfaceProxyDispatch(
+	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
+	void * pReturn, void * pArgs[], uno_Any ** ppException )
+{
+	// is my surrogate
+        bridges::cpp_uno::shared::UnoInterfaceProxy * pThis 
+            = static_cast< bridges::cpp_uno::shared::UnoInterfaceProxy *> (pUnoI);
+	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
+	
+	switch (pMemberDescr->eTypeClass)
+	{
+	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
+	{
+
+        VtableSlot aVtableSlot(
+            getVtableSlot(
+                reinterpret_cast<
+                    typelib_InterfaceAttributeTypeDescription const * >(
+                        pMemberDescr)));
+
+		if (pReturn)
+		{
+			// dependent dispatch
+			cpp_call(
+				pThis, aVtableSlot,
+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
+				0, 0, // no params
+				pReturn, pArgs, ppException );
+		}
+		else
+		{
+			// is SET
+			typelib_MethodParameter aParam;
+			aParam.pTypeRef =
+				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
+			aParam.bIn		= sal_True;
+			aParam.bOut		= sal_False;
+
+			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
+			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
+			typelib_typedescriptionreference_new(
+				&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
+			
+			// dependent dispatch
+                        aVtableSlot.index += 1; //get then set method
+			cpp_call(
+				pThis, aVtableSlot,
+				pReturnTypeRef,
+				1, &aParam,
+				pReturn, pArgs, ppException );
+			
+			typelib_typedescriptionreference_release( pReturnTypeRef );
+		}
+		
+		break;
+	}
+	case typelib_TypeClass_INTERFACE_METHOD:
+	{
+
+        VtableSlot aVtableSlot(
+            getVtableSlot(
+                reinterpret_cast<
+                    typelib_InterfaceMethodTypeDescription const * >(
+                        pMemberDescr)));
+		switch (aVtableSlot.index)
+		{
+			// standard calls
+		case 1: // acquire uno interface
+			(*pUnoI->acquire)( pUnoI );
+			*ppException = 0;
+			break;
+		case 2: // release uno interface
+			(*pUnoI->release)( pUnoI );
+			*ppException = 0;
+			break;
+		case 0: // queryInterface() opt
+		{
+			typelib_TypeDescription * pTD = 0;
+			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
+			if (pTD)
+			{
+                uno_Interface * pInterface = 0;
+                (*pThis->pBridge->getUnoEnv()->getRegisteredInterface)(
+                    pThis->pBridge->getUnoEnv(),
+                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
+			
+                if (pInterface)
+                {
+                    ::uno_any_construct(
+                        reinterpret_cast< uno_Any * >( pReturn ),
+                        &pInterface, pTD, 0 );
+                    (*pInterface->release)( pInterface );
+                    TYPELIB_DANGER_RELEASE( pTD );
+                    *ppException = 0;
+                    break;
+                }
+                TYPELIB_DANGER_RELEASE( pTD );
+            }
+		} // else perform queryInterface()
+		default:
+			// dependent dispatch
+			cpp_call(
+				pThis, aVtableSlot,
+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
+				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
+				pReturn, pArgs, ppException );
+		}
+		break;
+	}
+	default:
+	{
+		::com::sun::star::uno::RuntimeException aExc(
+			OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
+			::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
+		
+		Type const & rExcType = ::getCppuType( &aExc );
+		// binary identical null reference
+		::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
+	}
+	}
+}
+
+} } }
Index: porting/sal/osl/unx/system.h
diff -u porting/sal/osl/unx/system.h:1.36 porting/sal/osl/unx/system.h:1.36.12.1
--- porting/sal/osl/unx/system.h:1.36	Thu May 10 02:16:48 2007
+++ porting/sal/osl/unx/system.h	Thu May 31 03:33:15 2007
@@ -97,7 +97,9 @@
 #	if __BYTE_ORDER == __LITTLE_ENDIAN
 #		define _LITTLE_ENDIAN
 #	elif __BYTE_ORDER == __BIG_ENDIAN
-#		define _BIG_ENDIAN
+#               ifndef _BIG_ENDIAN
+#               define _BIG_ENDIAN
+#               endif
 #	elif __BYTE_ORDER == __PDP_ENDIAN
 #		define _PDP_ENDIAN
 #	endif
Index: bin/modules/installer/globals.pm
===================================================================
RCS file: /cvs/tools/solenv/bin/modules/installer/globals.pm,v
retrieving revision 1.62.2.3
diff -u -r1.62.2.3 globals.pm
--- openoffice.org.orig/solenv/bin/modules/installer/globals.pm	24 Jan 2007 16:34:05 -0000	1.62.2.3
+++ openoffice.org/solenv/bin/modules/installer/globals.pm	13 Jun 2007 13:51:05 -0000
@@ -224,7 +224,7 @@
 	$nopatchfilecollector = "";
 	
 	$unomaxservices = 25;
-	$javamaxservices = 15;
+	$javamaxservices = 1;
 	
 	$one_cab_file = 0;
 	$fix_number_of_cab_files = 1;


--- openoffice.org-1.9.97.rh156067.noversionedicons.patch DELETED ---


--- openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemhunspell.patch DELETED ---

More information about the scm-commits mailing list