openoffice, port nettoyé

17 files changed, 13 insertions, 822 deletions

diff --git a/extra/openoffice/Pkgfile b/extra/openoffice/Pkgfile
index 00310852d..6019f41f6 100644
--- a/extra/openoffice/Pkgfile
+++ b/extra/openoffice/Pkgfile
@@ -11,19 +11,19 @@ OOdir=OOO320_m19
 CARCH=`uname -m`
 
 source=(http://download.services.openoffice.org/files/stable/$version/OOo_${version}_src_{core,system,l10n,extensions,binfilter}.tar.bz2 \
-	http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll
-        startcenter.desktop
-        default-no-startup-wizard.diff
-        default-system-fpicker.diff
-        soffice-detect-mozilla-certificates.diff
-        buildfix-gcc44.diff
-        buildfix_FormulaMissingHeader.diff
-        buildfix_system_db48.diff
-        http://cgit.freedesktop.org/ooo-build/ooo-build/plain/patches/dev300/cppu-lbnames-enable-gcc-4.5.diff
-        http://cgit.freedesktop.org/ooo-build/ooo-build/plain/patches/dev300/vcl-system-graphite-with-stlport.diff
-        http://cgit.freedesktop.org/ooo-build/ooo-build/plain/patches/dev300/fix-system-mythes-for-mythes-1.2.diff
-        http://cgit.freedesktop.org/ooo-build/ooo-build/plain/patches/dev300/redland-remove-patches.diff?h=ooo-build-3-2-1
-        openoffice.profile
+	http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll \
+        http://nutyx.meticul.eu/files/patchs/$name/startcenter.desktop \
+        http://nutyx.meticul.eu/files/patchs/$name/default-no-startup-wizard.diff \
+        http://nutyx.meticul.eu/files/patchs/$name/default-system-fpicker.diff \
+        http://nutyx.meticul.eu/files/patchs/$name/soffice-detect-mozilla-certificates.diff \
+        http://nutyx.meticul.eu/files/patchs/$name/buildfix-gcc44.diff \
+        http://nutyx.meticul.eu/files/patchs/$name/buildfix_FormulaMissingHeader.diff \
+        http://nutyx.meticul.eu/files/patchs/$name/buildfix_system_db48.diff \
+        http://cgit.freedesktop.org/ooo-build/ooo-build/plain/patches/dev300/cppu-lbnames-enable-gcc-4.5.diff \
+        http://cgit.freedesktop.org/ooo-build/ooo-build/plain/patches/dev300/vcl-system-graphite-with-stlport.diff \
+        http://cgit.freedesktop.org/ooo-build/ooo-build/plain/patches/dev300/fix-system-mythes-for-mythes-1.2.diff \
+        http://cgit.freedesktop.org/ooo-build/ooo-build/plain/patches/dev300/redland-remove-patches.diff?h=ooo-build-3-2-1 \
+        http://nutyx.meticul.eu/files/patchs/$name/openoffice.profile \
 	http://download.services.openoffice.org/files/localized/fr/$version/OOo_3.2.1_Linux_x86_langpack-rpm_fr.tar.gz)
 
 build() {
diff --git a/extra/openoffice/buildfix-gcc43.diff b/extra/openoffice/buildfix-gcc43.diff
deleted file mode 100755
index a5d187eb7..000000000
--- a/extra/openoffice/buildfix-gcc43.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
-+++ bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
-@@ -46,6 +46,7 @@
- #include <typelib/typedescription.hxx>
- #include <uno/any2.h>
- 
-+#include <string.h>
- #include "share.hxx"
- 
- 
diff --git a/extra/openoffice/buildfix-gcc44.diff b/extra/openoffice/buildfix-gcc44.diff
deleted file mode 100644
index 01520a70e..000000000
--- a/extra/openoffice/buildfix-gcc44.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- oox/source/token/tokenmap.cxx	2009-09-28 06:35:40.000000000 +0000
-+++ oox/source/token/tokenmap.cxx.new	2009-09-28 10:12:00.996437647 +0000
-@@ -33,6 +33,7 @@
- #include <rtl/string.hxx>
- #include "tokens.hxx"
- #include "oox/helper/containerhelper.hxx"
-+#include <string.h>
- 
- using ::rtl::OString;
- using ::rtl::OUString;
diff --git a/extra/openoffice/buildfix-openjdk-6-no-rhino.diff b/extra/openoffice/buildfix-openjdk-6-no-rhino.diff
deleted file mode 100755
index 8aaa9aaeb..000000000
--- a/extra/openoffice/buildfix-openjdk-6-no-rhino.diff
+++ /dev/null
@@ -1,42 +0,0 @@
-? unxlngx6.pro
-Index: rhino1_5R5.patch
-===================================================================
-RCS file: /cvs/external/rhino/rhino1_5R5.patch,v
-retrieving revision 1.3
-diff -u -r1.3 rhino1_5R5.patch
---- rhino/rhino1_5R5.patch	11 Apr 2008 07:03:06 -0000	1.3
-+++ rhino/rhino1_5R5.patch	12 Aug 2008 20:08:16 -0000
-@@ -1174,3 +1174,14 @@
-          PermissionCollection pc = Policy.getPolicy().getPermissions(cs);
-          return new ProtectionDomain(cs, pc);
-      }
-+--- misc/rhino1_5R5/toolsrc/build.xml	2004-03-25 17:54:34.000000000 -0300
-++++ misc/build/rhino1_5R5/toolsrc/build.xml	2008-08-12 16:58:52.000000000 -0
-+va	Fri Mar 28 17:24:23 2008
-+@@ -68,6 +32,7 @@
-+            includes="org/**/*.java"
-+            deprecation="on"
-+            debug="${debug}">
-++      <compilerarg value="-Xbootclasspath:${java.home}/jre/lib/rt.jar"/>
-+     </javac>
-+     <copy todir="${nest}/${classes}">
-+       <fileset dir="." includes="org/**/*.properties" />
-? unxlngx6.pro
-Index: java/build.xml
-===================================================================
-RCS file: /cvs/framework/scripting/java/build.xml,v
-retrieving revision 1.36
-diff -u -r1.36 build.xml
---- scripting/java/build.xml	11 Apr 2008 09:46:13 -0000	1.36
-+++ scripting/java/build.xml	12 Aug 2008 23:20:31 -0000
-@@ -85,7 +85,9 @@
-   <target name="compile" depends="prepare">
-     <javac srcdir="com" destdir="${jardir}"
-          includes="**/*.java" classpathref="idlclasspath"
--         debug="${debug}" optimize="${optimize}" deprecation="off"/>
-+         debug="${debug}" optimize="${optimize}" deprecation="off">
-+	 <compilerarg value="-Xbootclasspath:${java.home}/jre/lib/rt.jar"/>
-+    </javac>
-     <javac srcdir="Framework/" destdir="${jardir}"
-          includes="**/*.java" classpathref="idlclasspath" debug="${debug}" 
-          optimize="${optimize}" deprecation="off">
diff --git a/extra/openoffice/buildfix_FormulaMissingHeader.diff b/extra/openoffice/buildfix_FormulaMissingHeader.diff
deleted file mode 100644
index 85c046b34..000000000
--- a/extra/openoffice/buildfix_FormulaMissingHeader.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- formula/inc/formula/tokenarray.hxx	2009-01-17 00:12:44.000000000 +0000
-+++ formula/inc/formula/tokenarray.hxx.new	2009-01-17 17:10:20.850652556 +0000
-@@ -35,6 +35,7 @@
- #include "formula/ExternalReferenceHelper.hxx"
- #include <tools/solar.h>
- #include <com/sun/star/sheet/FormulaToken.hpp>
-+#include <limits.h>
- 
- namespace formula
- {
diff --git a/extra/openoffice/buildfix_system_db48.diff b/extra/openoffice/buildfix_system_db48.diff
deleted file mode 100644
index c7378fb7a..000000000
--- a/extra/openoffice/buildfix_system_db48.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in	2009-08-25 15:10:12.000000000 +0000
-+++ configure.in.new	2009-09-27 17:43:11.207515081 +0000
-@@ -3626,7 +3626,7 @@
-         ], []
-     )
-     AC_MSG_CHECKING([whether db is at least 4.1])
--    for v in `seq 1 7`; do
-+    for v in `seq 1 8`; do
-        AC_TRY_RUN([
- #include <db.h>
- 
diff --git a/extra/openoffice/default-no-startup-wizard.diff b/extra/openoffice/default-no-startup-wizard.diff
deleted file mode 100644
index 432c2de1a..000000000
--- a/extra/openoffice/default-no-startup-wizard.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- desktop/source/migration/wizard.cxx
-+++ desktop/source/migration/wizard.cxx
-@@ -121,6 +121,7 @@
-     ,m_bAutomaticUpdChk(sal_True)
-     ,m_aLicensePath( rLicensePath )
- {
-+	return;
-     // ---
-     // FreeResource();
- //	enableState(STATE_USER, sal_False);
-@@ -383,7 +384,7 @@
- 
- short FirstStartWizard::Execute()
- {
--    return svt::RoadmapWizard::Execute();
-+    return sal_True || svt::RoadmapWizard::Execute();
- }
- 
- static OUString _makeDateTimeString (const DateTime& aDateTime, sal_Bool bUTC = sal_False)
diff --git a/extra/openoffice/default-system-fpicker.diff b/extra/openoffice/default-system-fpicker.diff
deleted file mode 100644
index 331130f98..000000000
--- a/extra/openoffice/default-system-fpicker.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- officecfg/registry/data/org/openoffice/Office/Common.xcu
-+++ officecfg/registry/data/org/openoffice/Office/Common.xcu
-@@ -576,8 +576,8 @@
-     </node>
-   </node>
-   <node oor:name="Misc">
--    <prop oor:name="UseSystemFileDialog"  install:module="UseOOoFileDialogs">
--      <value>false</value>
-+    <prop oor:name="UseSystemFileDialog"  install:module="UseOOoFileDialogs">
-+      <value>true</value>
-     </prop>
-     <prop oor:name="UseSystemPrintDialog"  install:module="macosx">
-       <value>true</value>
diff --git a/extra/openoffice/libxmlsec-findcerts.diff b/extra/openoffice/libxmlsec-findcerts.diff
deleted file mode 100755
index 65e0adb81..000000000
--- a/extra/openoffice/libxmlsec-findcerts.diff
+++ /dev/null
@@ -1,28 +0,0 @@
---- libxmlsec/xmlsec1-1.2.6.patch
-+++ libxmlsec/xmlsec1-1.2.6.patch
-@@ -17395,3 +17395,25 @@
-   XMLSEC_NSS_ALIBS    	= smime3.lib ssl3.lib nss3.lib libnspr4_s.lib libplds4_s.lib libplc4_s.lib kernel32.lib user32.lib gdi32.lib
-   
-   XMLSEC_MSCRYPTO_SOLIBS  = kernel32.lib user32.lib gdi32.lib Crypt32.lib Advapi32.lib
-+*** misc/xmlsec1-1.2.6/src/nss/x509.c	2007-03-16 12:51:38.000000000 -0400
-+--- misc/build/xmlsec1-1.2.6/src/nss/x509.c	2007-03-19 11:23:22.000000000 -0400
-+*************** xmlSecNssKeyDataX509VerifyAndExtractKey(
-+*** 1365,1373 ****
-+  		/*-
-+  		 * I'll search key according to KeyReq.
-+  		 */
-+-         slot = cert->slot ;
-+          if( ( keyInfoCtx->keyReq.keyType & xmlSecKeyDataTypePrivate ) == xmlSecKeyDataTypePrivate ) {
-+!             if( ( priKey = PK11_FindPrivateKeyFromCert( slot , cert , NULL ) ) == NULL ) {
-+                  xmlSecError( XMLSEC_ERRORS_HERE ,
-+                      xmlSecErrorsSafeString( xmlSecKeyDataGetName( data ) ) ,
-+                      "PK11_FindPrivateKeyFromCert" ,
-+--- 1365,1372 ----
-+  		/*-
-+  		 * I'll search key according to KeyReq.
-+  		 */
-+          if( ( keyInfoCtx->keyReq.keyType & xmlSecKeyDataTypePrivate ) == xmlSecKeyDataTypePrivate ) {
-+!             if( ( priKey = PK11_FindKeyByAnyCert( cert , NULL ) ) == NULL ) {
-+                  xmlSecError( XMLSEC_ERRORS_HERE ,
-+                      xmlSecErrorsSafeString( xmlSecKeyDataGetName( data ) ) ,
-+                      "PK11_FindPrivateKeyFromCert" ,
diff --git a/extra/openoffice/ooffice.desktop b/extra/openoffice/ooffice.desktop
deleted file mode 100755
index 170b23a38..000000000
--- a/extra/openoffice/ooffice.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-# EFLTK Configuration - Version 2,003000
-
-[Desktop Entry]
-  Name=Open Office
-  Exec=soffice
-  Icon=soffice.png
-  Name[sk]=Open Office
-
diff --git a/extra/openoffice/ooo_getline.diff b/extra/openoffice/ooo_getline.diff
deleted file mode 100644
index c9fac857c..000000000
--- a/extra/openoffice/ooo_getline.diff
+++ /dev/null
@@ -1,43 +0,0 @@
-
---- soltools/mkdepend/def.h.orig	2009-05-18 15:28:59.000000000 +0200
-+++ soltools/mkdepend/def.h	2009-05-18 15:29:36.000000000 +0200
-@@ -154,7 +154,7 @@
- 
- char			*copy();
- char			*base_name();
--char			*getline();
-+char			*ooo_getline();
- char			*isdefined();
- struct filepointer	*getfile();
- struct inclist		*newinclude();
---- soltools/mkdepend/main.c.orig	2009-05-18 15:29:08.000000000 +0200
-+++ soltools/mkdepend/main.c	2009-05-18 15:30:23.000000000 +0200
-@@ -548,7 +548,7 @@
-  * Get the next line.  We only return lines beginning with '#' since that
-  * is all this program is ever interested in.
-  */
--char *getline(filep)
-+char *ooo_getline(filep)
- 	register struct filepointer	*filep;
- {
- 	register char	*p,	/* walking pointer */
---- soltools/mkdepend/parse.c.orig	2009-05-18 15:29:17.000000000 +0200
-+++ soltools/mkdepend/parse.c	2009-05-18 15:30:43.000000000 +0200
-@@ -45,7 +45,7 @@
- 	register int	type;
- 	boolean recfailOK;
- 
--	while ((line = getline(filep))) {
-+	while ((line = ooo_getline(filep))) {
- 		switch(type = deftype(line, filep, file_red, file, TRUE, symbols)) {
- 		case IF:
- 		doif:
-@@ -168,7 +168,7 @@
- 	register char	*line;
- 	register int	type;
- 
--	while ((line = getline(filep))) {
-+	while ((line = ooo_getline(filep))) {
- 		switch(type = deftype(line, filep, file_red, file, FALSE, symbols)) {
- 		case IF:
- 		case IFFALSE:
diff --git a/extra/openoffice/openoffice.install b/extra/openoffice/openoffice.install
deleted file mode 100644
index 94a8d6432..000000000
--- a/extra/openoffice/openoffice.install
+++ /dev/null
@@ -1,26 +0,0 @@
-post_install() {
-
-gtk-update-icon-cache -f -q /usr/share/icons/hicolor
-update-desktop-database -q
-
-echo " * check /etc/profile.d/openoffice.sh, then relogin or \"source\" the file"
-echo " * see http://wiki.archlinux.org/index.php/Openoffice"
-echo "   how to use extensions, e.g. for spell checking"
-echo "   see /usr/lib/openoffice/share/extension/install what"
-echo "   is shipped with this package"
-echo " * make sure you have installed a ttf font (ttf-dejavu recommended)"
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-update-desktop-database -q
-gtk-update-icon-cache -f -q /usr/share/icons/hicolor
-
-# make sure everything is gone, maybe someone has installed
-# extensions for all users using unopkg --shared
-rm -rf /usr/lib/openoffice
-}
-
diff --git a/extra/openoffice/openoffice.profile b/extra/openoffice/openoffice.profile
deleted file mode 100644
index 17fd89fd9..000000000
--- a/extra/openoffice/openoffice.profile
+++ /dev/null
@@ -1,4 +0,0 @@
-export OOO_FORCE_DESKTOP=gnome
-#export OOO_FORCE_DESKTOP=KDE4
-
-#export PYTHONPATH=$PYTHONPATH:/usr/lib/openoffice/basis-link/program/
\ No newline at end of file
diff --git a/extra/openoffice/shell.patch b/extra/openoffice/shell.patch
deleted file mode 100755
index f519e5b1f..000000000
--- a/extra/openoffice/shell.patch
+++ /dev/null
@@ -1,500 +0,0 @@
-
-
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1-strict.dtd ">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<title>Arch Linux Repositories [packages] Log of /openoffice-base/repos/extra-i686/shell.patch</title>
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<link rel="stylesheet" href="http://archlinux.org/media/arch.css" />
-<link rel="stylesheet" href="/static/styles.css" type="text/css" />
-
-<link rel="icon" href="http://archlinux.org/media/favicon.ico" type="image/x-icon" />
-<link rel="shortcut icon" href="http://archlinux.org/media/favicon.ico" type="image/x-icon" />
-<style type="text/css">
-div.searchbar {
-font-size: 13px;
-font-weight: bold;
-position: absolute;
-right: 0.2em;
-top: 152px;
-}
-</style>
-</head>
-<body>
-<div id="head_container">
-<div id="title">
-<div id="logo"><h1 id="archtitle"><a href="/" title="Arch Linux (Home)">Arch Linux</a></h1></div>
-</div>
-<div id="main_nav">
-<ul>
-<li><a href="http://archlinux.org/download/">Get Arch</a></li>
-<li><a href="http://aur.archlinux.org">AUR</a></li>
-<li><a href="http://bugs.archlinux.org">Bugs</a></li>
-<li><a href="http://wiki.archlinux.org">Wiki</a></li>
-<li><a href="http://bbs.archlinux.org">Forums</a></li>
-<li><a href="http://archlinux.org">Home</a></li>
-</ul>
-</div>
-<div id="ads">
-<script type="text/javascript"><!--
-google_ad_client = "pub-3170555743375154";
-google_ad_width = 468;
-google_ad_height = 60;
-google_ad_format = "468x60_as";
-google_color_border = "ffffff";
-google_color_bg = "ffffff";
-google_color_link = "0771A6";
-google_color_url = "99AACC";
-google_color_text = "000000";
-//--></script>
-<script type="text/javascript" src="http://pagead2.googlesyndication.com/pagead/show_ads.js"></script>
-</div>
-</div>
-<div id="content">
-<div class="vc_navheader">
-
-<form method="get" action="/viewvc.cgi/">
-
-<div>
-<strong>
-
-<a href="/viewvc.cgi/">
-
-[packages]</a>
-/
-
-<a href="/viewvc.cgi/openoffice-base/">
-
-openoffice-base</a>
-/
-
-<a href="/viewvc.cgi/openoffice-base/repos/">
-
-repos</a>
-/
-
-<a href="/viewvc.cgi/openoffice-base/repos/extra-i686/">
-
-extra-i686</a>
-/
-
-
-
-shell.patch
-
-
-</strong>
-
-</div>
-<div class="searchbar">
-
-
-<strong>Repository:</strong>
-<select name="root" onchange="submit()">
-
-
-<option value="*viewroots*">Repository Listing</option>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<optgroup label="CVS Repositories"><option>community</option><option>core</option><option>extra</option><option>unstable</option></optgroup>
-
-
-<optgroup label="Subversion Repositories"><option selected="selected">packages</option></optgroup>
-
-</select>
-<input type="submit" value="Go" />
-
-</div>
-
-</form>
-
-</div>
-<h1>Log of /openoffice-base/repos/extra-i686/shell.patch</h1>
-
-<p style="margin:0;">
-
-<a href="/viewvc.cgi/openoffice-base/repos/extra-i686/"><img src="/static/images/back_small.png" width="16" height="16" alt="Parent Directory" /> Parent Directory</a>
-
-
-
-
-</p>
-
-<hr />
-<table class="auto">
-
-
-
-<tr>
-<td>Links to HEAD:</td>
-<td>
-(<a href="/viewvc.cgi/openoffice-base/repos/extra-i686/shell.patch?view=markup">view</a>)
-(<a href="/viewvc.cgi/openoffice-base/repos/extra-i686/shell.patch?view=co">download</a>)
-
-(<a href="/viewvc.cgi/openoffice-base/repos/extra-i686/shell.patch?view=annotate">annotate</a>)
-</td>
-</tr>
-
-
-
-<tr>
-<td>Sticky Revision:</td>
-<td><form method="get" action="/viewvc.cgi" style="display: inline">
-<div style="display: inline">
-<input type="hidden" name="orig_pathtype" value="FILE" /><input type="hidden" name="orig_view" value="log" /><input type="hidden" name="orig_path" value="openoffice-base/repos/extra-i686/shell.patch" /><input type="hidden" name="view" value="redirect_pathrev" />
-
-<input type="text" name="pathrev" value="" size="6"/>
-
-<input type="submit" value="Set" />
-</div>
-</form>
-
-</td>
-</tr>
-</table>
- 
-
-
-
-
-
-<hr />
-<table cellspacing="1" cellpadding="2">
-<thead>
-<tr>
-<th class="vc_header">Revision</th>
-<th class="vc_header">Tasks</th>
-
-<th class="vc_header">Diffs</th>
-
-
-<th class="vc_header_sort">Age</th>
-<th class="vc_header">Author</th>
-</tr>
-</thead>
-
-
-
-
-
-<tbody>
-<tr style="vertical-align: top;" class="vc_row_even">
-
-<td rowspan="2">
-<a href="/viewvc.cgi?view=rev&amp;revision=5004"><strong>5004</strong></a>
-<a name="rev5004"></a>
-</td>
-
-<td>
-
-<a href="/viewvc.cgi/openoffice-base/repos/extra-i686/shell.patch?revision=5004&amp;view=markup"><strong>View</strong></a><br />
-
-<a href="/viewvc.cgi/openoffice-base/repos/extra-i686/shell.patch?revision=5004"><strong>Download</strong></a><br />
-
-<a href="/viewvc.cgi/openoffice-base/repos/extra-i686/shell.patch?annotate=5004"><strong>Annotate</strong></a><br />
-</td>
-
-<td>
-
-
-
-
-<a href="/viewvc.cgi/openoffice-base/repos/extra-i686/shell.patch?r1=5004&amp;view=log"><strong>[select&nbsp;for&nbsp;diffs]</strong></a><br />
-
-
-
-<a href="/viewvc.cgi/openoffice-base/repos/extra-i686/shell.patch?r1=4712&amp;r2=5004"><strong>Diff&nbsp;to&nbsp;previous&nbsp;4712</strong></a>
-
-<br />
-
-
-</td>
-
-
-
-<td>
-
-Modified
-
-2 months, 4 weeks ago<br /><em>Sun Jul 13 20:30:49 2008 UTC</em>
-
-</td>
-
-<td>
-pierre
-</td>
-</tr>
-<tr class="vc_row_even">
-<td colspan=5>
-
-
-
-<strong>File length: </strong>1411 byte(s)<br />
-
-
-
-<strong>Log: </strong><pre class="vc_log">db-move: moved openoffice-base from [testing] to [extra] (i686)</pre>
-</td>
-</tr>
-</tbody>
-
-
-
-<tbody>
-<tr style="vertical-align: top;" class="vc_row_odd">
-
-<td rowspan="2">
-<a href="/viewvc.cgi?view=rev&amp;revision=4712"><strong>4712</strong></a>
-<a name="rev4712"></a>
-</td>
-
-<td>
-
-<a href="/viewvc.cgi/openoffice-base/repos/extra-i686/shell.patch?revision=4712&amp;view=markup"><strong>View</strong></a><br />
-
-<a href="/viewvc.cgi/openoffice-base/repos/extra-i686/shell.patch?revision=4712"><strong>Download</strong></a><br />
-
-<a href="/viewvc.cgi/openoffice-base/repos/extra-i686/shell.patch?annotate=4712"><strong>Annotate</strong></a><br />
-</td>
-
-<td>
-
-
-
-
-<a href="/viewvc.cgi/openoffice-base/repos/extra-i686/shell.patch?r1=4712&amp;view=log"><strong>[select&nbsp;for&nbsp;diffs]</strong></a><br />
-
-
-
-<a href="/viewvc.cgi/openoffice-base/repos/extra-i686/shell.patch?r1=2691&amp;r2=4712"><strong>Diff&nbsp;to&nbsp;previous&nbsp;2691</strong></a>
-
-<br />
-
-
-</td>
-
-
-
-<td>
-
-Modified
-
-3 months ago<br /><em>Wed Jul  9 03:34:58 2008 UTC</em>
-
-</td>
-
-<td>
-andyrtr
-</td>
-</tr>
-<tr class="vc_row_odd">
-<td colspan=5>
-
-
-Original Path: <a href="/viewvc.cgi/openoffice-base/repos/testing-i686/shell.patch?view=log&amp;pathrev=4712"><em>openoffice-base/repos/testing-i686/shell.patch</em></a><br />
-
-
-<strong>File length: </strong>1411 byte(s)<br />
-
-
-
-<strong>Log: </strong><pre class="vc_log">archrelease: new repo testing-i686</pre>
-</td>
-</tr>
-</tbody>
-
-
-
-<tbody>
-<tr style="vertical-align: top;" class="vc_row_even">
-
-<td rowspan="2">
-<a href="/viewvc.cgi?view=rev&amp;revision=2691"><strong>2691</strong></a>
-<a name="rev2691"></a>
-</td>
-
-<td>
-
-<a href="/viewvc.cgi/openoffice-base/repos/extra-i686/shell.patch?revision=2691&amp;view=markup"><strong>View</strong></a><br />
-
-<a href="/viewvc.cgi/openoffice-base/repos/extra-i686/shell.patch?revision=2691"><strong>Download</strong></a><br />
-
-<a href="/viewvc.cgi/openoffice-base/repos/extra-i686/shell.patch?annotate=2691"><strong>Annotate</strong></a><br />
-</td>
-
-<td>
-
-
-
-
-<a href="/viewvc.cgi/openoffice-base/repos/extra-i686/shell.patch?r1=2691&amp;view=log"><strong>[select&nbsp;for&nbsp;diffs]</strong></a><br />
-
-
-
-
-</td>
-
-
-
-<td>
-
-Added
-
-4 months ago<br /><em>Thu Jun 12 09:41:04 2008 UTC</em>
-
-</td>
-
-<td>
-andyrtr
-</td>
-</tr>
-<tr class="vc_row_even">
-<td colspan=5>
-
-
-Original Path: <a href="/viewvc.cgi/openoffice-base/trunk/shell.patch?view=log&amp;pathrev=2691"><em>openoffice-base/trunk/shell.patch</em></a><br />
-
-
-<strong>File length: </strong>1411 byte(s)<br />
-
-
-
-<strong>Log: </strong><pre class="vc_log">upgpkg: openoffice-base 2.4.1-1</pre>
-</td>
-</tr>
-</tbody>
-
-</table>
- 
-
-
-
-
-
- <div class="box">
-<p><a name="diff"></a>
-This form allows you to request diffs between any two revisions of this file.
-For each of the two "sides" of the diff,
-
-enter a numeric revision.
-
-</p>
-<form method="get" action="/viewvc.cgi/openoffice-base/repos/extra-i686/shell.patch" id="diff_select">
-<table cellpadding="2" cellspacing="0" class="auto">
-<tr>
-<td>&nbsp;</td>
-<td>
-<input type="hidden" name="view" value="diff" />
-Diffs between
-
-<input type="text" size="12" name="r1"
-value="5004" />
-
-and
-
-<input type="text" size="12" name="r2" value="2691" />
-
-</td>
-</tr>
-<tr>
-<td>&nbsp;</td>
-<td>
-Type of Diff should be a
-<select name="diff_format" onchange="submit()">
-<option value="h" selected="selected">Colored Diff</option>
-<option value="l" >Long Colored Diff</option>
-<option value="u" >Unidiff</option>
-<option value="c" >Context Diff</option>
-<option value="s" >Side by Side</option>
-</select>
-<input type="submit" value=" Get Diffs " />
-</td>
-</tr>
-</table>
-</form>
-</div>
-
-
-<form method="get" action="/viewvc.cgi/openoffice-base/repos/extra-i686/shell.patch">
-<div>
-<a name="logsort"></a>
-<input type="hidden" name="view" value="log" />
-Sort log by:
-<select name="logsort" onchange="submit()">
-<option value="cvs" >Not sorted</option>
-<option value="date" selected="selected">Commit date</option>
-<option value="rev" >Revision</option>
-</select>
-<input type="submit" value=" Sort " />
-</div>
-</form>
-
-
-<hr />
-<div class="foot">
-Copyright &copy; 2002-2008
-<a href="mailto:jvinet@zeroflux.org" title="contact Judd Vinet">Judd Vinet</a> and
-<a href="mailto:aaron@archlinux.org" title="contact Aaron Griffin">Aaron Griffin</a>.
-<br />
-The Arch Linux name and logo are recognized trademarks. Some rights reserved.
-</div>
-<script type="text/javascript">
-var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-</script>
-<script type="text/javascript">
-var pageTracker = _gat._getTracker("UA-3589020-1");
-pageTracker._setDomainName("archlinux.org");
-pageTracker._initData();
-pageTracker._trackPageview();
-</script>
-</body>
-</html>
-
-
diff --git a/extra/openoffice/soffice-detect-mozilla-certificates.diff b/extra/openoffice/soffice-detect-mozilla-certificates.diff
deleted file mode 100644
index b3be61bc4..000000000
--- a/extra/openoffice/soffice-detect-mozilla-certificates.diff
+++ /dev/null
@@ -1,27 +0,0 @@
---- desktop/scripts/soffice.sh
-+++ desktop/scripts/soffice.sh
-@@ -207,6 +207,24 @@
- OPENOFFICE_MOZILLA_FIVE_HOME="$sd_inst/program"
- export OPENOFFICE_MOZILLA_FIVE_HOME
- 
-+if [ -z "$MOZILLA_CERTIFICATE_FOLDER" ]; then
-+	db=""
-+	dir=""
-+	for d in $HOME/.mozilla/firefox $HOME/.firefox $HOME/.thunderbird $HOME/.gnome2/epiphany/mozilla $HOME/.mozilla/default $HOME/.mozilla; do
-+		if [ -z "$dir" -a -d "$d" ]; then
-+			dir=$d;
-+		fi;
-+	done
-+	if [ -n "$dir" ]; then
-+		cert8=`find $dir -name "cert8.db" | head -n 1`
-+		if [ -n "$cert8" ]; then
-+			profiledir=`dirname "$cert8"`
-+			MOZILLA_CERTIFICATE_FOLDER=$profiledir
-+			export MOZILLA_CERTIFICATE_FOLDER
-+		fi
-+	fi
-+fi
-+
- unset XENVIRONMENT
- 
- # uncomment line below to disable anti aliasing of fonts
diff --git a/extra/openoffice/startcenter.desktop b/extra/openoffice/startcenter.desktop
deleted file mode 100644
index 552f06dd5..000000000
--- a/extra/openoffice/startcenter.desktop
+++ /dev/null
@@ -1,48 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Terminal=false
-TryExec=ooffice
-Exec=openoffice.org3 %U
-Icon=startcenter
-Type=Application
-Categories=Office;X-SuSE-Core-Office;
-StartupNotify=false
-InitialPreference=5
-Name=OpenOffice.org 3.2
-Name[af]=OpenOffice.org 3.2
-Name[ar]=أوبن أفيس.أورج
-Name[be@latin]=OpenOffice.org 3.2
-Name[ca]=OpenOffice.org 3.2
-Name[cs]=OpenOffice.org 3.2
-Name[da]=OpenOffice.org 3.2
-Name[de]=OpenOffice.org 3.2
-Name[dz]=ཨོ་པཱན་ཨོ་ཕིསི.ཨོ་ཨར་ཇི།
-Name[el]=OpenOffice.org 3.2
-Name[en_CA]=OpenOffice.org 3.2
-Name[en_GB]=OpenOffice.org 3.2
-Name[es]=OpenOffice.org 3.2
-Name[et]=OpenOffice.org 3.2
-Name[eu]=OpenOffice.org 3.2
-Name[fi]=OpenOffice.org 3.2
-Name[fr]=OpenOffice.org 3.2
-Name[gl]=OpenOffice.org 3.2
-Name[he]=OpenOffice.org 3.2
-Name[hu]=OpenOffice.org 3.2
-Name[it]=OpenOffice.org 3.2
-Name[ko]=OpenOffice.org 3.2
-Name[lt]=OpenOffice.org 3.2
-Name[nb]=OpenOffice.org 3.2
-Name[ne]=ओपनअफिस डट अर्ग
-Name[nl]=OpenOffice.org 3.2
-Name[oc]=OpenOffice.org 3.2
-Name[pl]=OpenOffice.org 3.2
-Name[ps]=اوپنافس.ورګ
-Name[pt]=OpenOffice.org 3.2
-Name[pt_BR]=OpenOffice.org 3.2
-Name[sl]=OpenOffice.org 3.2
-Name[sr]=OpenOffice.org 3.2
-Name[sr@latin]=OpenOffice.org 3.2
-Name[sv]=OpenOffice.org 3.2
-Name[vi]=OpenOffice.org 3.2
-Name[zh_CN]=OpenOffice.org 3.2
-GenericName=Office
diff --git a/extra/openoffice/system_hsqldb.diff b/extra/openoffice/system_hsqldb.diff
deleted file mode 100755
index d645ae1a9..000000000
--- a/extra/openoffice/system_hsqldb.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk     2008-08-19
-05:08:34.000000000 -0400
-+++ connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk     2008-08-31
-01:29:31.000000000 -0400
-@@ -44,4 +44,5 @@
- .IF "$(SYSTEM_HSQLDB)" == "YES"
- XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(HSQLDB_JAR)
-+JARFILES+= $(HSQLDB_JAR)
- .ELSE
- JARFILES+= hsqldb.jar