diff options
author | Andreas Proschofsky <suka@gentoo.org> | 2005-04-15 06:48:57 +0000 |
---|---|---|
committer | Andreas Proschofsky <suka@gentoo.org> | 2005-04-15 06:48:57 +0000 |
commit | aab82580b6b20e22caf1268a9d389a4ecd6f260e (patch) | |
tree | 9d4c19df0f2d1d85575f07b1d54b2429dd74e357 | |
parent | repoman: Trim trailing whitespace (diff) | |
download | gentoo-2-aab82580b6b20e22caf1268a9d389a4ecd6f260e.tar.gz gentoo-2-aab82580b6b20e22caf1268a9d389a4ecd6f260e.tar.bz2 gentoo-2-aab82580b6b20e22caf1268a9d389a4ecd6f260e.zip |
cleanup
(Portage version: 2.0.51.19)
13 files changed, 0 insertions, 990 deletions
diff --git a/app-office/openoffice-ximian/files/1.1.3/gcc-instlib.patch b/app-office/openoffice-ximian/files/1.1.3/gcc-instlib.patch deleted file mode 100644 index 99e424abed01..000000000000 --- a/app-office/openoffice-ximian/files/1.1.3/gcc-instlib.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN solenv/bin/gccinstlib.pl oo_1.1.2_src/solenv/bin/gccinstlib.pl ---- solenv/bin/gccinstlib.pl 2004-03-16 11:15:42.000000000 +0100 -+++ solenv/bin/gccinstlib.pl 2004-09-27 10:36:02.338394960 +0200 -@@ -63,7 +63,7 @@ - # - #************************************************************************* - --$ENV{'LC_MESSAGES'} = 'C'; -+$ENV{'LC_ALL'} = 'C'; - - %SearchDirs = GetGccSearchDirs (); - diff --git a/app-office/openoffice-ximian/files/1.1.3/gcc34-sal-link-to-libsupc++.diff b/app-office/openoffice-ximian/files/1.1.3/gcc34-sal-link-to-libsupc++.diff deleted file mode 100644 index dd823ee024c3..000000000000 --- a/app-office/openoffice-ximian/files/1.1.3/gcc34-sal-link-to-libsupc++.diff +++ /dev/null @@ -1,13 +0,0 @@ ---- sal/util/makefile.mk.foo 2004-12-21 14:38:37.314521336 -0500 -+++ sal/util/makefile.mk 2004-12-21 14:46:52.495159848 -0500 -@@ -146,6 +146,10 @@ - SHL1STDLIBS+=-init InitLibrary -term ExitLibrary - .ENDIF # MAC - -+.IF "$(OS)"=="LINUX" -+SHL1STDLIBS+= -Wl,-Bstatic -lsupc++ -Wl,-Bdynamic -lgcc_s -+.ENDIF -+ - .IF "$(GUI)"=="UNX" - .IF "$(OS)"=="SOLARIS" - # libposix4.so (SunOS 5.6) <-> librt.so (SunOS >= 5.7) diff --git a/app-office/openoffice-ximian/files/1.1.3/gcc34_2.patch.bz2 b/app-office/openoffice-ximian/files/1.1.3/gcc34_2.patch.bz2 Binary files differdeleted file mode 100644 index 4a9aaf3dfd3a..000000000000 --- a/app-office/openoffice-ximian/files/1.1.3/gcc34_2.patch.bz2 +++ /dev/null diff --git a/app-office/openoffice-ximian/files/1.1.3/gentoo-1.3.7.patch b/app-office/openoffice-ximian/files/1.1.3/gentoo-1.3.7.patch deleted file mode 100644 index 2c45b3a6c5f0..000000000000 --- a/app-office/openoffice-ximian/files/1.1.3/gentoo-1.3.7.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- patches/OOO_1_1_3/apply.orig 2004-12-02 00:07:00.659646960 +0100 -+++ patches/OOO_1_1_3/apply 2004-12-02 00:07:18.119992584 +0100 -@@ -27,9 +27,10 @@ - PLD : PLDOnly, LinuxCommon, KDECommon, GlobalDesktopFiles, NonArkCommon - KDE : LinuxCommon, KDEOnly - Ark : ArkOnly, LinuxCommon, GlobalDesktopFiles --Gentoo : LinuxCommon, GlobalDesktopFiles, NonArkCommon, GentooOnly --GentooGNOME : Gentoo, GnomeVFS, NovellOnly --GentooKDE : Gentoo, KDECommon -+GentooBase : LinuxCommon, GlobalDesktopFiles, NonArkCommon -+Gentoo: GentooBase -+GentooGNOME : GentooBase, GnomeVFS, NovellOnly -+GentooKDE : GentooBase, KDECommon - - # somewhat odder: - Win32 : VCLPlug, Common, ODKFixes, VBABits, Win32Only -@@ -747,8 +747,6 @@ - sc-autofilter-empty-nonempty.diff - # Improves the standard filter options and menu. bxc #62187 #62495 Issue#35579 - sc-standard-filter-options.diff --# Paste just to clip size bxc #62158 Issue#35580 --sc-paste-limitedsize.diff - # Hides the filtered rows when height of rows are changed bxc #62161 Issue#35581 - sc-filter-hide-filteredrows.diff - # allows not to delete nonfiltered rows while deleting filtered ones bxc #62186 Issue#35582 -@@ -1121,14 +1121,6 @@ - - ######################################################## - --[ GentooOnly ] --gcc34-gnome.diff --gcc34-main.diff --gcc34-nojava-fix.diff --gcc34-nptl-fix.diff -- --######################################################## -- - [ TestLayout ] - # the beginnings of layout - gui-window-layout.diff diff --git a/app-office/openoffice-ximian/files/1.1.3/hardened-link.patch b/app-office/openoffice-ximian/files/1.1.3/hardened-link.patch deleted file mode 100644 index 83c707dc106d..000000000000 --- a/app-office/openoffice-ximian/files/1.1.3/hardened-link.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ur solenv.orig/inc/unxlngi4.mk solenv/inc/unxlngi4.mk ---- solenv.orig/inc/unxlngi4.mk 2004-10-23 20:09:29.344518376 +0200 -+++ solenv/inc/unxlngi4.mk 2004-10-23 20:09:43.084429592 +0200 -@@ -156,8 +156,8 @@ - LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH) - - # linker flags for linking applications --LINKFLAGSAPPGUI= -Wl,-export-dynamic --LINKFLAGSAPPCUI= -Wl,-export-dynamic -+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,-z,execheap -+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,-z,execheap - - # linker flags for linking shared libraries - LINKFLAGSSHLGUI= -shared diff --git a/app-office/openoffice-ximian/files/1.1.3/javafix.patch b/app-office/openoffice-ximian/files/1.1.3/javafix.patch deleted file mode 100644 index e2d9ccf723b1..000000000000 --- a/app-office/openoffice-ximian/files/1.1.3/javafix.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx -+++ connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx -@@ -184,7 +184,12 @@ - { - jfieldID id = t.pEnv->GetFieldID(java_sql_DriverPropertyInfo::getMyClass(),"choices","[Ljava/lang/String;"); - if(id) -- return copyArrayAndDelete(t.pEnv,(jobjectArray)t.pEnv->GetObjectField( object, id), ::rtl::OUString(),java_lang_String(NULL,NULL)); -+ return copyArrayAndDelete( -+ t.pEnv, -+ (jobjectArray)t.pEnv->GetObjectField( object, id), -+ static_cast< const ::rtl::OUString* >( NULL ), -+ static_cast< const java_lang_String* >( NULL ) -+ ); - } //t.pEnv - return Sequence< ::rtl::OUString>(); - } ---- connectivity/source/inc/java/tools.hxx -+++ connectivity/source/inc/java/tools.hxx -@@ -101,7 +101,7 @@ - - java_util_Properties* createStringPropertyArray(JNIEnv *pEnv,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - -- template<class T,class JT> ::com::sun::star::uno::Sequence< T > copyArrayAndDelete(JNIEnv *pEnv,jobjectArray _Array,const T& _rD1,const JT& _rD2) -+ template<class T,class JT> ::com::sun::star::uno::Sequence< T > copyArrayAndDelete(JNIEnv *pEnv,jobjectArray _Array, const T*, const JT* ) - { - ::com::sun::star::uno::Sequence< T > xOut; - if(_Array) diff --git a/app-office/openoffice-ximian/files/1.1.3/nojvmfwk-fix.patch b/app-office/openoffice-ximian/files/1.1.3/nojvmfwk-fix.patch deleted file mode 100644 index b01c845632aa..000000000000 --- a/app-office/openoffice-ximian/files/1.1.3/nojvmfwk-fix.patch +++ /dev/null @@ -1,178 +0,0 @@ ---- patches/vclplug/psprint-nojvmfwk.diff 2004/12/03 12:47:25 1.1 -+++ patches/vclplug/psprint-nojvmfwk.diff 2004/12/03 13:11:12 1.1.2.3 -@@ -0,0 +1,146 @@ -+Index: psprint/source/helper/helper.cxx -+=================================================================== -+--- psprint/source/helper/helper.cxx.orig 2004-12-03 12:51:50.722009016 +0000 -++++ psprint/source/helper/helper.cxx 2004-12-03 12:52:00.583509840 +0000 -+@@ -73,7 +73,7 @@ -+ #include <rtl/bootstrap.hxx> -+ #include <sal/config.h> -+ #ifdef SOLAR_JAVA -+-#include <jvmfwk/framework.h> -++#include "jvmaccess/javainfo.hxx" -+ #endif // SOLAR_JAVA -+ -+ #ifdef MACOSX -+@@ -247,36 +247,87 @@ const OUString& psp::getFontPath() -+ -+ // append jre/jdk fonts if possible -+ OString aJREpath; -+- -+-#ifdef SOLAR_JAVA -+- JavaInfo * pInfo = NULL; -+- javaFrameworkError jerr = jfw_getSelectedJRE( & pInfo); -+- if (jerr == JFW_E_NONE && pInfo != NULL) -+- { -+- OUString aSys; -+- if( osl_getSystemPathFromFileURL( pInfo->sLocation, &aSys.pData ) == osl_File_E_None ) -+- aJREpath = OUStringToOString( aSys, osl_getThreadTextEncoding() ); -+- } -+- jfw_freeJavaInfo(pInfo); -+-#endif -+- -+- if( aJREpath.getLength() > 0 ) -++ if( aUserPath.getLength() ) -+ { -+- OString aTestPath( aJREpath ); -+- aTestPath += "/jre/lib/fonts"; -+- if( access( aTestPath.getStr(), R_OK ) ) -++ OUString aJavaRc( aUserPath ); -++ aJavaRc += OUString( RTL_CONSTASCII_USTRINGPARAM( "/user/config/" SAL_CONFIGFILE( "java" ) ) ); -++ Config aConfig( aJavaRc ); -++ aConfig.SetGroup( "Java" ); -++ aJREpath = aConfig.ReadKey( "Home" ); -++ if( ! aJREpath.getLength() ) -++ { -++ aJavaRc = aNetPath; -++ aJavaRc += OUString( RTL_CONSTASCII_USTRINGPARAM( "/share/config/" SAL_CONFIGFILE("java") ) ); -++ Config aShareConfig( aJavaRc ); -++ aShareConfig.SetGroup( "Java" ); -++ aJREpath = aShareConfig.ReadKey( "Home" ); -++ } -++ -++ if( aJREpath.compareTo( "file:", 5 ) == 0 ) -+ { -+- aTestPath = aJREpath; -+- aTestPath += "/lib/fonts"; -++ OUString aURL( OStringToOUString( aJREpath, osl_getThreadTextEncoding() ) ); -++ OUString aSys; -++ if( osl_getSystemPathFromFileURL( aURL.pData, &aSys.pData ) == osl_File_E_None ) -++ aJREpath = OUStringToOString( aSys, osl_getThreadTextEncoding() ); -++ } -++ -++ if( aJREpath.getLength() > 0 ) -++ { -++ OString aTestPath( aJREpath ); -++ aTestPath += "/jre/lib/fonts"; -+ if( access( aTestPath.getStr(), R_OK ) ) -+- aJREpath = OString(); -++ { -++ aTestPath = aJREpath; -++ aTestPath += "/lib/fonts"; -++ if( access( aTestPath.getStr(), R_OK ) ) -++ aJREpath = OString(); -++ else -++ aJREpath = aTestPath; -++ } -+ else -+ aJREpath = aTestPath; -+ } -+- else -+- aJREpath = aTestPath; -+ } -+ -++#ifdef SOLAR_JAVA -++ // if no javarc (e.g. in setup) exists or it failed try the UDK method -++ if( ! aJREpath.getLength() ) -++ { -++ OString aJavaLib; -++ try -++ { -++ OUString aLib; -++ if (osl::FileBase::getSystemPathFromFileURL( -++ jvmaccess::JavaInfo::createBestInfo(true). -++ getRuntimeLibLocation(), -++ aLib) -++ == osl::FileBase::E_None) -++ aLib.convertToString( -++ &aJavaLib, osl_getThreadTextEncoding(), -++ RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR -++ | RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR); -++ } -++ catch (jvmaccess::JavaInfo::InitException &) -++ {} -++ -++ if (aJavaLib.getLength() != 0) -++ { -++ sal_Int32 nIndex; -++ while( ( nIndex = aJavaLib.lastIndexOf( '/' ) ) != -1 ) -++ { -++ aJavaLib = aJavaLib.copy( 0, nIndex ); -++ OString aTmpPath = aJavaLib; -++ aTmpPath += "/lib/fonts"; -++ if( access( aTmpPath.getStr(), R_OK ) == 0 ) -++ { -++ aJREpath = aTmpPath; -++ break; -++ } -++ } -++ } -++ } -++#endif // SOLAR_JAVA -++ -+ if( aJREpath.getLength() ) -+ { -+ aPath += OUString( RTL_CONSTASCII_USTRINGPARAM( ";" ) ); -+Index: psprint/prj/build.lst -+=================================================================== -+--- psprint/prj/build.lst.orig 2004-12-03 12:40:47.820785320 +0000 -++++ psprint/prj/build.lst 2004-12-03 12:52:14.974322104 +0000 -+@@ -1,4 +1,4 @@ -+-pp psprint : tools unotools cpputools jvmaccess SO:print_header jvmfwk NULL -++pp psprint : tools unotools cpputools jvmaccess SO:print_header NULL -+ pp psprint usr1 - all pp_mkout NULL -+ pp psprint\source\fontsubset nmake - all pp_fontsset NULL -+ pp psprint\source\printer nmake - u pp_printer NULL -+Index: psprint/util/makefile.mk -+=================================================================== -+--- psprint/util/makefile.mk.orig 2004-12-03 12:40:47.863778784 +0000 -++++ psprint/util/makefile.mk 2004-12-03 13:10:17.206797760 +0000 -+@@ -105,7 +105,7 @@ SHL1STDLIBS=$(UNOTOOLSLIB) \ -+ $(SALLIB) \ -+ -lX11 -+ .IF "$(SOLAR_JAVA)"!="" -+-SHL1STDLIBS+=$(JVMFWKLIB) -++SHL1STDLIBS+=$(JVMACCESSLIB) -+ .ENDIF -+ -+ SHL1DEF= $(MISC)$/$(SHL1TARGET).def ---- patches/OOO_1_1_3/apply 2004/12/02 20:17:41 1.83.2.35 -+++ patches/OOO_1_1_3/apply 2004/12/03 12:47:25 1.83.2.36 -@@ -45,12 +45,6 @@ - # - [ VCLPlug ] - psprint-m46-backport.diff --# Newer psprint (fixes various CUPS bugs) --psprint-m46-to-m62.diff --# default encoding ADOBE_STANDARD is new so revert to MS_1252 --psprint-defaultencoding.diff --# revert FONTCONFIG_FONTS change to ENABLE_FONTCONFIG --psprint-fontconfigvar.diff - vcl-inc.diff - vcl-prj.diff - vcl-source-app.diff -@@ -90,6 +84,14 @@ - sj2-win-handle.diff - dbaccess-win-handle.diff - -+# Newer psprint (fixes various CUPS bugs) -+psprint-m46-to-m62.diff -+# default encoding ADOBE_STANDARD is new so revert to MS_1252 -+psprint-defaultencoding.diff -+# revert FONTCONFIG_FONTS change to ENABLE_FONTCONFIG -+psprint-fontconfigvar.diff -+# revert back to old JDK path detection method -+psprint-nojvmfwk.diff - # Use the right colors for menus/menuitems #????? - vcl-unx-gtk-menu-style.diff diff --git a/app-office/openoffice-ximian/files/1.1.3/nptl.patch b/app-office/openoffice-ximian/files/1.1.3/nptl.patch deleted file mode 100644 index 996a7ceec67d..000000000000 --- a/app-office/openoffice-ximian/files/1.1.3/nptl.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- tools/source/solar/solar.c.orig -+++ tools/source/solar/solar.c -@@ -577,7 +577,7 @@ - - { - char* p = NULL; -- InfoMemoryAccess( p ); -+ /*InfoMemoryAccess( p );*/ - p = (char*)&p; - InfoMemoryAccess( p ); - InfoMemoryTypeAccess( t_short ); -*** sal/osl/unx/process.c.orig ---- sal/osl/unx/process.c -@@ -1017,11 +1017,6 @@ - for (i = 0; data.m_pszEnv[i] != NULL; i++) - putenv(data.m_pszEnv[i]); - --#if defined(LINUX) -- /* mfe: linux likes to have just one thread when the exec family is called */ -- /* this np function has this purpose ... */ -- pthread_kill_other_threads_np(); --#endif - OSL_TRACE("ChildStatusProc : starting '%s'",data.m_pszArgs[0]); - - /* Connect std IO to pipe ends */ diff --git a/app-office/openoffice-ximian/files/1.1.3/pthreadlink-fix.patch b/app-office/openoffice-ximian/files/1.1.3/pthreadlink-fix.patch deleted file mode 100644 index 381221095037..000000000000 --- a/app-office/openoffice-ximian/files/1.1.3/pthreadlink-fix.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -ur solenv.orig/inc/unxlngi4.mk solenv/inc/unxlngi4.mk ---- solenv.orig/inc/unxlngi4.mk 2004-10-23 20:07:59.714144264 +0200 -+++ solenv/inc/unxlngi4.mk 2004-10-23 20:08:36.190599000 +0200 -@@ -151,13 +151,13 @@ - LINK*=$(CC) - - # default linker flags --LINKFLAGSDEFS*=-z defs -+LINKFLAGSDEFS*=-Wl,-z,defs - LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\' --LINKFLAGS=-O2 -Bsymbolic -z combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH) -+LINKFLAGS=-Wl,-O2 -Bsymbolic,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH) - - # linker flags for linking applications --LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec --LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -+LINKFLAGSAPPGUI= -Wl,-export-dynamic -+LINKFLAGSAPPCUI= -Wl,-export-dynamic - - # linker flags for linking shared libraries - LINKFLAGSSHLGUI= -shared -@@ -198,8 +198,8 @@ - - LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive - --LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -lstdc++ --LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) -+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -lpthread -lstdc++ -+LIBSTLPORTST=$(STATIC) -lstlport_gcc -lpthread $(DYNAMIC) - - #FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC) - diff --git a/app-office/openoffice-ximian/files/1.1.3/pyunolink-fix.patch b/app-office/openoffice-ximian/files/1.1.3/pyunolink-fix.patch deleted file mode 100644 index 6d8ce6323868..000000000000 --- a/app-office/openoffice-ximian/files/1.1.3/pyunolink-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- pyuno.orig/source/module/makefile.mk 2005-01-18 11:59:23.462336464 +0100 -+++ pyuno/source/module/makefile.mk 2005-01-18 11:59:42.289474304 +0100 -@@ -82,9 +82,9 @@ - # so this library cannot be checked - SHL1NOCHECK=yes - PYUNORC=pyunorc --.IF "$(OS)"=="SOLARIS" || "$(OS)"=="MACOSX" -+#.IF "$(OS)"=="SOLARIS" || "$(OS)"=="MACOSX" - PYTHONLIB=-lpython --.ENDIF -+#.ENDIF - .ELSE - # on windows, the python executable also uses the shared library, - # so we link pyuno directly to it diff --git a/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.3.7 b/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.3.7 deleted file mode 100644 index e5f7c9f80c4e..000000000000 --- a/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.3.7 +++ /dev/null @@ -1,7 +0,0 @@ -MD5 9df288bb534964d4b96efdf7bf029456 OOo_1.1.3-1_source.tar.gz 215360913 -MD5 4c01c84f1212369ceb369567ed06d1a2 STLport-4.6.2.tar.gz 755958 -MD5 0a6dec3329bd1a2662990162b23a87e3 ooo-build-1.3.7.tar.gz 2939935 -MD5 c3d8c9f5ae2abbe1b7091817265b9ef3 libwpd-snap-20040823.tar.gz 447710 -MD5 07af8dbf461df3e01a30124009f3e1ec OOo-gentoo-splash-1.1.tar.bz2 57631 -MD5 be79d3cb5f64d2c0ac8a75e65a59cb09 ooo-icons-OOO_1_1-10.tar.gz 1563326 -MD5 05ff784fff01c54cd3dd7b975b46bae2 ooo-KDE_icons-OOO_1_1-0.3.tar.gz 1017540 diff --git a/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.3.7-r1 b/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.3.7-r1 deleted file mode 100644 index e5f7c9f80c4e..000000000000 --- a/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.3.7-r1 +++ /dev/null @@ -1,7 +0,0 @@ -MD5 9df288bb534964d4b96efdf7bf029456 OOo_1.1.3-1_source.tar.gz 215360913 -MD5 4c01c84f1212369ceb369567ed06d1a2 STLport-4.6.2.tar.gz 755958 -MD5 0a6dec3329bd1a2662990162b23a87e3 ooo-build-1.3.7.tar.gz 2939935 -MD5 c3d8c9f5ae2abbe1b7091817265b9ef3 libwpd-snap-20040823.tar.gz 447710 -MD5 07af8dbf461df3e01a30124009f3e1ec OOo-gentoo-splash-1.1.tar.bz2 57631 -MD5 be79d3cb5f64d2c0ac8a75e65a59cb09 ooo-icons-OOO_1_1-10.tar.gz 1563326 -MD5 05ff784fff01c54cd3dd7b975b46bae2 ooo-KDE_icons-OOO_1_1-0.3.tar.gz 1017540 diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.3.7-r1.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.3.7-r1.ebuild deleted file mode 100644 index 82bb19b70e48..000000000000 --- a/app-office/openoffice-ximian/openoffice-ximian-1.3.7-r1.ebuild +++ /dev/null @@ -1,621 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.3.7-r1.ebuild,v 1.1 2005/04/12 17:51:35 suka Exp $ - -# Notes: -# -# This will take a HELL of a long time to compile, be warned. -# According to openoffice.org, it takes approximately 12 hours on a -# P3/600 with 256mb ram. And thats where building is its only task. -# -# It takes about 6 hours on my P4 1.8 with 512mb memory, and the -# build only needs about 2.1GB of disk space - Azarah. -# -# You will also need a bucketload of diskspace ... in the order of -# 4-5 gb free to store all the compiled files and installation -# directories. -# -# The information on how to build and what is required comes from: -# http://www.openoffice.org/dev_docs/source/build_linux.html -# http://tools.openoffice.org/ext_comp.html -# -# Todo: -# -# Get support going for installing a custom language pack. Also -# need to be able to install more than one language pack. - -inherit eutils fdo-mime flag-o-matic toolchain-funcs - -IUSE="curl gnome hardened java kde nptl zlib" - -OO_VER="1.1.3" -PATCHLEVEL="OOO_1_1_3" -ICON_VER="OOO_1_1-10" -KDE_ICON_VER="OOO_1_1-0.3" -KDE_ICON_PATH="documents/159/1975" -INSTDIR="/opt/Ximian-OpenOffice" -PATCHDIR="${WORKDIR}/ooo-build-${PV}" -S="${WORKDIR}/OOo_${OO_VER}_src" -DESCRIPTION="Ximian-ized version of OpenOffice.org, a full office productivity suite." - -SRC_URI="mirror://openoffice/stable/${OO_VER}/OOo_${OO_VER}-1_source.tar.gz - http://www.stlport.org/archive/STLport-4.6.2.tar.gz - http://ooo.ximian.com/packages/${PATCHLEVEL}/ooo-build-${PV}.tar.gz - http://ooo.ximian.com/packages/libwpd-snap-20040823.tar.gz - mirror://gentoo/OOo-gentoo-splash-1.1.tar.bz2 - gnome? ( http://ooo.ximian.com/packages/ooo-icons-${ICON_VER}.tar.gz ) - !kde? ( http://ooo.ximian.com/packages/ooo-icons-${ICON_VER}.tar.gz ) - kde? ( http://kde.openoffice.org/files/${KDE_ICON_PATH}/ooo-KDE_icons-${KDE_ICON_VER}.tar.gz )" - -HOMEPAGE="http://ooo.ximian.com" - -LICENSE="|| ( LGPL-2 SISSL-1.1 )" -SLOT="0" -KEYWORDS="~x86 ~ppc ~sparc" - -RDEPEND="!app-office/openoffice-ximian-bin - virtual/x11 - virtual/libc - virtual/lpr - >=dev-lang/perl-5.0 - gnome? ( >=x11-libs/gtk+-2.0 - >=gnome-base/gnome-vfs-2.0 - >=dev-libs/libxml2-2.0 ) - kde? ( kde-base/kdelibs ) - >=media-libs/libart_lgpl-2.3.13 - >=x11-libs/startup-notification-0.5 - >=media-libs/freetype-2.1.4 - media-libs/fontconfig - media-gfx/imagemagick - media-libs/libpng - sys-devel/flex - sys-devel/bison - app-arch/zip - app-arch/unzip - dev-libs/expat - java? ( >=virtual/jre-1.4.1 ) - ppc? ( >=sys-devel/gcc-3.2.1 ) - linguas_ja? ( >=media-fonts/kochi-substitute-20030809-r3 ) - linguas_zh_CN? ( >=media-fonts/arphicfonts-0.1-r2 ) - linguas_zh_TW? ( >=media-fonts/arphicfonts-0.1-r2 )" - -DEPEND="${RDEPEND} - >=sys-apps/findutils-4.1.20-r1 - app-shells/tcsh - dev-util/pkgconfig - dev-util/intltool - curl? ( net-misc/curl ) - zlib? ( sys-libs/zlib ) - sys-libs/pam - !dev-util/dmake - java? ( >=virtual/jdk-1.4.1 ) - !java? ( dev-libs/libxslt )" - -PROVIDE="virtual/ooo" - -pkg_setup() { - - if use java - then - if [ -z "${JDK_HOME}" ] || [ ! -d "${JDK_HOME}" ] - then - eerror "In order to compile java sources you have to set the" - eerror "\$JDK_HOME environment properly." - eerror "" - eerror "You can achieve this by using the java-config tool:" - eerror " emerge java-config" - die "Couldn't find a valid JDK home" - fi - fi - - ewarn - ewarn " It is important to note that OpenOffice.org is a very fragile " - ewarn " build when it comes to CFLAGS. A number of flags have already " - ewarn " been filtered out. If you experience difficulty merging this " - ewarn " package and use agressive CFLAGS, lower the CFLAGS and try to " - ewarn " merge again. " - ewarn - ewarn " Please note that this package now uses the LINGUAS environment " - ewarn " variable to provide localization. The old LANGUAGE=ENUS|PORT..." - ewarn " system does NOT work anymore." - ewarn - - set_languages -} - -set_languages () { - - strip-linguas en pt ru el nl fr es fi hu ca it cs sk da sv nb no pl de sl pt_BR th et ja ko zh_CN zh_TW tr hi_IN ar he - if [ -n "${LINGUAS}" ] ; then - # use the leftmost value - temp_lang=( ${LINGUAS} ) - primary_lang=${temp_lang[0]} - else - primary_lang="en" - fi - - case "${primary_lang}" in - en ) OOLANGNO=01; OOLANGNAME=ENUS; OOLFULLNAME="US English (default)" - ;; - pt ) OOLANGNO=03; OOLANGNAME=PORT; OOLFULLNAME=Portuguese - ;; - ru ) OOLANGNO=07; OOLANGNAME=RUSS; OOLFULLNAME=Russian - ;; - el ) OOLANGNO=30; OOLANGNAME=GREEK; OOLFULLNAME=Greek - ;; - nl ) OOLANGNO=31; OOLANGNAME=DTCH; OOLFULLNAME=Dutch - ;; - fr ) OOLANGNO=33; OOLANGNAME=FREN; OOLFULLNAME=French - ;; - es ) OOLANGNO=34; OOLANGNAME=SPAN; OOLFULLNAME=Spanish - ;; - fi ) OOLANGNO=35; OOLANGNAME=FINN; OOLFULLNAME=Finnish - ;; - hu ) OOLANGNO=36; OOLANGNAME=HUNG; OOLFULLNAME=Hungarian - ;; - ca ) OOLANGNO=37; OOLANGNAME=CAT; OOLFULLNAME=Catalan - ;; - it ) OOLANGNO=39; OOLANGNAME=ITAL; OOLFULLNAME=Italian - ;; - cs ) OOLANGNO=42; OOLANGNAME=CZECH; OOLFULLNAME=Czech - ;; - sk ) OOLANGNO=43; OOLANGNAME=SLOVAK; OOLFULLNAME=Slovak - ;; - da ) OOLANGNO=45; OOLANGNAME=DAN; OOLFULLNAME=Danish - ;; - sv ) OOLANGNO=46; OOLANGNAME=SWED; OOLFULLNAME=Swedish - ;; - no ) OOLANGNO=47; OOLANGNAME=NORBOK; OOLFULLNAME="Norwegian" - ;; - pl ) OOLANGNO=48; OOLANGNAME=POL; OOLFULLNAME=Polish - ;; - de ) OOLANGNO=49; OOLANGNAME=GER; OOLFULLNAME=German - ;; - sl ) OOLANGNO=50; OOLANGNAME=SLOVENIAN; OOLFULLNAME=Slovenian - ;; - pt_BR ) OOLANGNO=55; OOLANGNAME=PORTBR; OOLFULLNAME="Portuguese brazilian" - ;; - th ) OOLANGNO=66; OOLANGNAME=THAI; OOLFULLNAME=Thai - ;; - et ) OOLANGNO=77; OOLANGNAME=ESTONIAN; OOLFULLNAME=Estonian - ;; - ja ) OOLANGNO=81; OOLANGNAME=JAPN; OOLFULLNAME="Japanese" - ;; - ko ) OOLANGNO=82; OOLANGNAME=KOREAN; OOLFULLNAME=Korean - ;; - zh_CN ) OOLANGNO=86; OOLANGNAME=CHINSIM; OOLFULLNAME="Simplified Chinese (PRC)" - ;; - zh_TW ) OOLANGNO=88; OOLANGNAME=CHINTRAD; OOLFULLNAME="Traditional Chinese (taiwan)" - ;; - tr ) OOLANGNO=90; OOLANGNAME=TURK; OOLFULLNAME=Turkish - ;; - hi_IN ) OOLANGNO=91; OOLANGNAME=HINDI; OOLFULLNAME=Hindi - ;; - ar ) OOLANGNO=96; OOLANGNAME=ARAB; OOLFULLNAME=Arabic - ;; - he ) OOLANGNO=97; OOLANGNAME=HEBREW; OOLFULLNAME=Hebrew - ;; - esac - - einfo "Installing OpenOffice.org for ${OOLFULLNAME} environment." - -} - -oo_setup() { - - unset LANGUAGE - unset LANG - unset LC_ALL - - if [ -x /usr/sbin/gcc-config ] - then - # Do we have a gcc that use the new layout and gcc-config ? - if /usr/sbin/gcc-config --get-current-profile &> /dev/null - then - export GCC_PROFILE="$(/usr/sbin/gcc-config --get-current-profile)" - - # Just recheck gcc version ... - if [ "$(gcc-version)" != "3.2" ] && [ "$(gcc-version)" != "3.3" ] && [ "$(gcc-version)" != "3.4" ] - then - # See if we can get a gcc profile we know is proper ... - if /usr/sbin/gcc-config --get-bin-path ${CHOST}-3.2.1 &> /dev/null - then - export PATH="$(/usr/sbin/gcc-config --get-bin-path ${CHOST}-3.2.1):${PATH}" - export GCC_PROFILE="${CHOST}-3.2.1" - else - eerror "This build needs gcc-3.2, gcc-3.3 or gcc-3.4!" - eerror - eerror "Use gcc-config to change your gcc profile:" - eerror - eerror " # gcc-config $CHOST-3.2.1" - eerror - eerror "or whatever gcc version is relevant." - die - fi - fi - fi - fi -} - -src_unpack() { - - oo_setup - - cd ${WORKDIR} - unpack ${A} - - #Beginnings of our own patchset - cd ${PATCHDIR} - epatch ${FILESDIR}/${OO_VER}/gentoo-${PV}.patch - - #Fix java problems in 1.3.7 - epatch ${FILESDIR}/${OO_VER}/nojvmfwk-fix.patch - - cd ${S} - - #Still needed: The STLport patch - cp ${DISTDIR}/STLport-4.6.2.tar.gz ${S}/stlport/download || die - epatch ${FILESDIR}/${OO_VER}/newstlportfix.patch - - epatch ${FILESDIR}/${OO_VER}/gcc-instlib.patch - - #Another java problem - epatch ${FILESDIR}/${OO_VER}/javafix.patch - - # fix for bug #82385 - epatch ${FILESDIR}/${OO_VER}/getcompver.awk.patch - - # Security fix, bug #88863 - epatch ${FILESDIR}/${OO_VER}/crash-objstream.diff - - # Workaround for bug #73940, may break debug use flag on ppc - if use ppc; then - epatch ${FILESDIR}/${OO_VER}/STLport-vector.patch - fi - - #Fixes for nptl - if use nptl; then - epatch ${FILESDIR}/${OO_VER}/nptl.patch - fi - - #Add our own splash screen - epatch ${FILESDIR}/${OO_VER}/gentoo-splash.diff - - #Detect which look and patchset we are using - export DISTRO="Gentoo" - export MYCONF="" - export ICONDIR=${WORKDIR}/ooo-icons-${ICON_VER} - - if use gnome; then - export DISTRO="GentooGNOME" - export MYCONF="--enable-gtk" - fi - - if use kde; then - export MYCONF="${MYCONF} --enable-kde" - if use !gnome; then - export DISTRO="GentooKDE" - export MYCONF="--enable-kde" - export ICONDIR=${WORKDIR}/ooo-KDE_icons-${KDE_ICON_VER} - fi - fi - - #Finally apply the patches - einfo "Applying Ximian OO.org Patches" - ${PATCHDIR}/patches/apply.pl ${PATCHDIR}/patches/${PATCHLEVEL} ${S} -f --distro=${DISTRO} || die "Ximian patches failed" - - #GCC 3.4 fixes, also needed for hardened - epatch ${FILESDIR}/${OO_VER}/gcc34_2.patch.bz2 - epatch ${FILESDIR}/${OO_VER}/gcc34-sal-link-to-libsupc++.diff - use !java && epatch ${FILESDIR}/${OO_VER}/gcc34-nojava-fix.patch - use gnome && epatch ${FILESDIR}/${OO_VER}/gcc34-gnome.patch - - #Fix for hardened - if use hardened; then - epatch ${FILESDIR}/${OO_VER}/pthreadlink-fix.patch - epatch ${FILESDIR}/${OO_VER}/hardened-link.patch - epatch ${FILESDIR}/${OO_VER}/pyunolink-fix.patch - fi - - einfo "Installing / Scaling Icons" - ${PATCHDIR}/bin/scale-icons ${S} || die - cp -af ${ICONDIR}/* ${S} || die - - einfo "Copying splash screens in place" - cp -af ${WORKDIR}/gentoo-splash/open*.bmp ${S}/offmgr/res/ || die - - einfo "Copying libpwd tarball in build dir" - mkdir -p ${S}/libwpd/download/ || die - cp -af ${DISTDIR}/libwpd-snap-20040823.tar.gz ${S}/libwpd/download/ || die - - einfo "Munging font mappings ..." - ${PATCHDIR}/bin/font-munge ${S}/officecfg/registry/data/org/openoffice/VCL.xcu || die -} - -get_EnvSet() { - - # Determine what Env file we should be using (Az) - export LinuxEnvSet="LinuxIntelEnv.Set.sh" - use sparc && export LinuxEnvSet="LinuxSparcEnv.Set.sh" - use ppc && export LinuxEnvSet="LinuxPPCEnv.Set.sh" - use alpha && export LinuxEnvSet="LinuxAlphaEnv.Set.sh" - - # Get build specific stuff (Az) - export SOLVER="$(awk '/^UPD=/ {gsub(/\"/, ""); gsub(/UPD=/, ""); print $0}' ${LinuxEnvSet})" - export SOLPATH="$(awk '/^INPATH=/ {gsub(/\"/, ""); gsub(/INPATH=/, ""); print $0}' ${LinuxEnvSet})" -} - -src_compile() { - - addpredict /bin - addpredict /root/.gconfd - - # dmake security patch - cd ${S}/dmake - autoconf || die - - #Check if we use java - if use java - then - MYCONF="${MYCONF} --with-jdk-home=${JAVA_HOME}" - else - MYCONF="${MYCONF} --disable-java" - fi - - #See if we use system-curl - if use curl - then - MYCONF="${MYCONF} --with-system-curl" - fi - - #See if we use system-zlib - if use zlib - then - MYCONF="${MYCONF} --with-system-zlib" - fi - - # Do NOT compile with a external STLport, as gcc-2.95.3 users will - # get linker errors due to the ABI being different (STLport will be - # compiled with 2.95.3, while OO is compiled with 3.x). (Az) - cd ${S}/config_office - rm -f config.cache || die - autoconf || die - - if [ "OOLANGNAME" != "ENUS" ]; then - OOLANGNAME="${OOLANGNAME},ENUS" - fi - - MYCONF="${MYCONF} --enable-libart \ - --enable-libsn \ - --enable-crashdump=no \ - --with-lang=${OOLANGNAME} \ - --without-fonts \ - --disable-rpath \ - --enable-fontconfig \ - --with-system-freetype \ - --with-system-xrender \ - --disable-mozilla" - - ./configure ${MYCONF} || die - - cd ${S} - get_EnvSet - - # unpack help files if present - if [ -f ${DISTDIR}/helpcontent_${OOLANGNO}_unix.tgz ]; then - einfo "Using helpcontent for ${OOLFULLNAME}" - mkdir -p ${S}/solver/${SOLVER}/${SOLPATH}/pck - tar -xzf ${DISTDIR}/helpcontent_${OOLANGNO}_unix.tgz -C ${S}/solver/${SOLVER}/${SOLPATH}/pck - fi - - # Build as minimal as possible - export BUILD_MINIMAL="${OOLANGNO}" - - # Embedded python dies without Home set - if test "z${HOME}" = "z"; then - export HOME="" - fi - - #Get info for parallel build - export JOBS=`echo "${MAKEOPTS}" | sed -e "s/.*-j\([0-9]\+\).*/\1/"` - - if [ "${JOBS}" -gt 10 ] - then - export JOBS="10" - einfo "dmake fails with too much parallel jobs, so limiting to 10" - fi - - export buildcmd="${S}/solenv/bin/build.pl --all product=full strip=true --dlv_switch link" - - # Should the build use multiprocessing? Not enabled by default, as it tends to break - if [ "${WANT_DISTCC}" == "true" ] - then - if [ "${JOBS}" -gt 1 ] - then - export buildcmd="${buildcmd} -P${JOBS}" - einfo "Using distcc, Good Luck" - fi - fi - - # Compile problems with these ... - filter-flags "-funroll-loops" - filter-flags "-fomit-frame-pointer" - filter-flags "-fprefetch-loop-arrays" - filter-flags "-fno-default-inline" - filter-flags "-fstack-protector" - filter-flags "-ftracer" - append-flags "-fno-strict-aliasing" - replace-flags "-O3" "-O2" - replace-flags "-Os" "-O2" - - if [ "$(gcc-version)" == "3.2" ]; then - einfo "You use a buggy gcc, so replacing -march=pentium4 with -march=pentium3" - replace-flags "-march=pentium4" "-march=pentium3 -mcpu=pentium4" - fi - - # Now for our optimization flags ... - export ARCH_FLAGS="${CFLAGS}" - - if [ -z "$(grep 'CCCOMP' ${S}/${LinuxEnvSet})" ] - then - # Set CCCOMP and CXXCOMP. This is still needed for STLport - export CCCOMP="$(tc-getCC)" - export CXXCOMP="$(tc-getCXX)" - fi - - einfo "Bootstrapping OpenOffice.org..." - # Get things ready for bootstrap (Az) - chmod 0755 ${S}/solenv/bin/*.pl - # Bootstrap ... - ./bootstrap || die - - einfo "Building OpenOffice.org..." - echo "source ${S}/${LinuxEnvSet} && cd ${S}/instsetoo && LINK=g++ ${buildcmd}" > build.sh - sh build.sh || die "Build failed!" - - [ -d ${S}/instsetoo/${SOLPATH} ] || die "Cannot find build directory!" -} - -src_install() { - - # Sandbox issues; bug #11838 - addpredict "/user" - addpredict "/share" - addpredict "/dev/dri" - addpredict "/usr/bin/soffice" - addpredict "/pspfontcache" - addpredict "/opt/OpenOffice.org/foo.tmp" - addpredict "/opt/OpenOffice.org/delme" - addpredict "/root/.gnome" - - - # The install part should now be relatively OK compared to - # what it was. Basically we use autoresponse files to install - # unattended. Afterwards we - # just cleanout ${D} from the registry, etc. This way we - # do not need pre-generated registry, and also fixes some weird - # bugs related to the old way we did things. - # - # <azarah@gentoo.org> (9 Sep 2002) - - # Autoresponse file for main installation - cat > ${T}/rsfile-global <<-"END_RS" - [ENVIRONMENT] - INSTALLATIONMODE=INSTALL_NETWORK - INSTALLATIONTYPE=STANDARD - DESTINATIONPATH=<destdir> - OUTERPATH= - LOGFILE= - LANGUAGELIST=<LANGUAGE> - - [JAVA] - JavaSupport=preinstalled_or_none - END_RS - - # Autoresponse file for user installation - cat > ${T}/rsfile-local <<-"END_RS" - [ENVIRONMENT] - INSTALLATIONMODE=INSTALL_WORKSTATION - INSTALLATIONTYPE=WORKSTATION - DESTINATIONPATH=<home>/.xopenoffice/<pv> - - [JAVA] - JavaSupport=none - END_RS - - # Fixing install location in response file - sed -e "s|<destdir>|${D}${INSTDIR}|" \ - ${T}/rsfile-global > ${T}/autoresponse || die - - einfo "Installing Ximian-OpenOffice.org into build root..." - dodir ${INSTDIR} - cd ${S}/instsetoo/${SOLPATH}/${OOLANGNO}/normal - ./setup -v -noexit -nogui -r:${T}/autoresponse || die "Setup failed" - - #Fix for parallel install - sed -i -e s/sversionrc/xversionrc/g ${D}${INSTDIR}/program/bootstraprc ${D}${INSTDIR}/program/instdb.ins || die - - einfo "Removing build root from registry..." - # Remove totally useless stuff. - rm -f ${D}${INSTDIR}/program/{setup.log,sopatchlevel.sh} || die - # Remove build root from registry and co - egrep -rl "${D}" ${D}${INSTDIR}/* | \ - xargs -i perl -pi -e "s|${D}||g" {} || : - - einfo "Fixing permissions..." - # Fix permissions - find ${D}${INSTDIR}/ -type f -exec chmod a+r {} \; - chmod a+x ${D}${INSTDIR}/share/config/webcast/*.pl - - # Install user autoresponse file - insinto /etc/ximian-openoffice - sed -e "s|<pv>|${OO_VER}|g" ${T}/rsfile-local > ${T}/autoresponse-${OO_VER}.conf - doins ${T}/autoresponse-${OO_VER}.conf - - # Install wrapper script - exeinto /usr/bin - sed -e "s|<pv>|${OO_VER}|g" \ - ${FILESDIR}/${OO_VER}/xooffice-wrapper-1.3 > ${T}/xooffice - doexe ${T}/xooffice - - # Component symlinks - for app in calc draw impress math web writer setup; do - dosym xooffice /usr/bin/xoo${app} - done - - # Install icons and menu shortcuts - cd ${PATCHDIR}/desktop/ - insinto /usr/share/pixmaps - doins *.png - - einfo "Installing menu shortcuts" - for menu in drawing presentation spreadsheet textdoc; do - intltool-merge -d ../po ${menu}.desktop.in xoo-${menu}.desktop; - done - sed -i -e s/'=oo'/'=xoo'/g *.desktop - insinto /usr/share/applications - doins *.desktop - - if use kde - then - insinto /usr/share/mimelnk/application - doins ${S}/sysui/${SOLPATH}/misc/kde/share/mimelnk/application/* - fi - - # Install corrected Symbol Font - insinto /usr/share/fonts/TTF/ - doins ${PATCHDIR}/fonts/*.ttf - - # Remove unneeded stuff - rm -rf ${D}${INSTDIR}/share/cde || die - - # Fix instdb.ins, to *not* install local copies of these - for entry in Kdeapplnk Kdemimetext Kdeicons Gnome_Apps Gnome_Icons Gnome2_Apps; do - perl -pi -e "/^File gid_File_Extra_$entry/ .. /^End/ and (\ - s|^\tSize\s+\= .*|\tSize\t\t = 0;\r| or \ - s|^\tArchiveFiles\s+\= .*|\tArchiveFiles\t = 0;\r| or \ - s|^\tArchiveSize\s+\= .*|\tArchiveSize\t = 0;\r| or \ - s|^\tContains\s+\= .*|\tContains\t = ();\r| or \ - s|\t\t\t\t\t\".*|\r|g)" \ - ${D}${INSTDIR}/program/instdb.ins - done - - # Make sure these do not get nuked. - keepdir ${INSTDIR}/user/registry/res/en-us/org/openoffice/{Office,ucb} ${INSTDIR}/user/psprint/{driver,fontmetric} ${INSTDIR}/user/{autocorr,backup,plugin,store,temp,template} -} - -pkg_postinst() { - - if use gnome; then - fdo-mime_desktop_database_update - fdo-mime_mime_database_update - fi - - einfo " To start Ximian-OpenOffice.org, run:" - einfo - einfo " $ xooffice" - einfo - einfo " Also, for individual components, you can use any of:" - einfo - einfo " xoocalc, xoodraw, xooimpress, xoomath, xooweb or xoowriter" -} |