Date: Thursday, February 11, 2010 @ 00:43:59
Author: andyrtr
Revision: 68155
3.2.0 release
Added:
openoffice-base/trunk/buildfix-gcc44.diff
openoffice-base/trunk/buildfix_FormulaMissingHeader.diff
Modified:
openoffice-base/trunk/ChangeLog
openoffice-base/trunk/PKGBUILD
openoffice-base/trunk/openoffice.install
openoffice-base/trunk/openoffice.profile
Deleted:
openoffice-base/trunk/buildfix-gcc43.diff
openoffice-base/trunk/buildfix-sw-printf.diff
openoffice-base/trunk/no-mozilla-plug-in-option.diff
openoffice-base/trunk/nsplugin-path.diff
openoffice-base/trunk/shell.patch
openoffice-base/trunk/soltools-mkdepend-getline.diff
openoffice-base/trunk/xulrunner-1.9.1.diff
------------------------------------+
ChangeLog | 6
PKGBUILD | 306 ++++++++++++++++++++--------------
buildfix-gcc43.diff | 10 -
buildfix-gcc44.diff | 10 +
buildfix-sw-printf.diff | 21 --
buildfix_FormulaMissingHeader.diff | 10 +
no-mozilla-plug-in-option.diff | 313 -----------------------------------
nsplugin-path.diff | 132 --------------
openoffice.install | 2
openoffice.profile | 1
shell.patch | 42 ----
soltools-mkdepend-getline.diff | 43 ----
xulrunner-1.9.1.diff | 14 -
13 files changed, 211 insertions(+), 699 deletions(-)
Modified: ChangeLog
===================================================================
--- ChangeLog 2010-02-11 03:08:30 UTC (rev 68154)
+++ ChangeLog 2010-02-11 05:43:59 UTC (rev 68155)
@@ -1,3 +1,9 @@
+2010-02-10 Andreas Radke <andyrtr at archlinux.org>
+
+ * 3.2.0-1 :
+ - new 3.2.0 release pkg based on OOO320_m12
+ - apply changes made over the last months in the *beta pkg
+
2009-09-27 Andreas Radke <andyrtr at archlinux.org>
* 3.1.1-2 :
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-02-11 03:08:30 UTC (rev 68154)
+++ PKGBUILD 2010-02-11 05:43:59 UTC (rev 68155)
@@ -2,75 +2,67 @@
# Maintainer: AndyRTR <[email protected]>
# Contributor: Hussam Al-Tayeb <[email protected]>
-pkgname=openoffice-base
-pkgver=3.1.1
-pkgrel=3
-pkgdesc="OpenOffice.org - a free multiplatform and multilingual office suite"
-arch=(i686 x86_64)
-_OO_milestone=OOO310_m19 # =RC2 = final
+pkgbase="openoffice-base"
+pkgname=('openoffice-base' 'openoffice-sdk')
+_OO_milestone=OOO320_m12
+pkgver=3.2.0 # m12=3.2.0 RC5 = final
+pkgrel=1
+arch=('i686' 'x86_64')
license=('LGPL3')
url="http://www.openoffice.org";
-install=openoffice.install
-depends=('curl>=7.19.6' 'hunspell>=1.2.8' 'python>=2.6.2-6' 'libwpd>=0.8.14'
'redland>=1.0.9-4' 'libxaw>=1.0.6' 'neon>=0.28.6'
- 'dbus-glib>=0.80' 'icu>=4.2.1' 'hsqldb-java' 'libxslt>=1.1.24-2'
'hicolor-icon-theme' 'desktop-file-utils')
-optdepends=('java-runtime: adds java support'
- 'libcups: adds printing support'
- 'gconf: adds additional gnome support'
- 'nss: adds support for signed files/macros'
- 'pstoedit: translates PostScript and PDF graphics into
other vector formats')
-makedepends=('bison' 'subversion' 'automake' 'findutils' 'flex' 'gawk'
'gcc-libs' 'libart-lgpl' 'libxtst'
- 'pam' 'sane' 'zip' 'perl-archive-zip' 'pkgconfig' 'unzip'
'xulrunner>=1.9.1.3'
- 'apache-ant>=1.7.1-3' 'cairo' 'gperf' 'libcups' 'pstoedit'
'gconf' 'openjdk6>=1.6.1')
-backup=(usr/lib/openoffice/program/sofficerc)
-source=(ftp://ftp.archlinux.org/other/openoffice/${pkgname}-${_OO_milestone}.tar.bz2
+makedepends=(# the real makedeps
+ 'bison' 'svn' 'automake' 'findutils' 'flex' 'gawk' 'gcc-libs'
'libart-lgpl' 'libxtst'
+ 'pam' 'sane' 'zip' 'perl-archive-zip' 'pkgconfig' 'unzip'
"xulrunner>=1.9.2"
+ 'apache-ant>=1.7.1-3' 'cairo' 'gperf' 'libcups' 'poppler'
'kdelibs>=4.4.0-3' 'pstoedit' 'gconf' "openjdk6>=6.b17_1.7"
+ # from main OOo the deps
+ "curl>=7.19.7" "hunspell>=1.2.8" "python>=2.6.4" 'libwpd'
'redland>=1.0.10' 'libxaw' "neon>=0.28.6"
+ 'dbus-glib' "icu>=4.2.1" 'hsqldb-java' 'libxslt'
'hicolor-icon-theme' 'desktop-file-utils'
+ 'beanshell' 'saxon' 'vigra' 'libgraphite' 'hyphen' 'lpsolve'
'libmspack' 'libldap' 'lucene' 'boost>=1.41.0')
+ # libmythes
+source=(ftp://ftp.archlinux.org/other/openoffice/${_OO_milestone}.tar.gz
+ 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-gcc43.diff
- shell.patch
- openoffice.profile
- soltools-mkdepend-getline.diff
- buildfix-sw-printf.diff
- xulrunner-1.9.1.diff
- nsplugin-path.diff
- no-mozilla-plug-in-option.diff
- buildfix_system_db48.diff)
-md5sums=('23370db83cc40bfbf22cedc460fd6b85' '63209bbc64c901ef105455bda0282f45'\
- '71f136a31e296a04ab68932a31dd533e' '6c596129fb48316226ce3adfd3a4c86d'\
- '1dc7480a04f572ad136d35923a2af66d' 'bf7119084a2d1e0566b5e34b57dce8eb'\
- 'a51200f770c635355c430cc5052db8cf' '8d68d44c941a687813ddd968383cdf27'\
- '7f9012680d0e329227445925710bafe6' '2461119a2b7f1580f997f504a76a1c98'\
- '94b52cefc3656013f33ccedc0392848b' 'b48650dbdcf72c09a15dc9dff54915f1'\
- '00d28e85d97a467c58f317a2d93d26ac' '0cd6f3525939d3ef6e5a30ad30c25d27')
-sha1sums=('95d2be123637a788c1ed9a2443b11c81a1f7f9b0'
'55ae7d962e057410e84327025d3a42a40e265fdc'\
- '503dae7a4236a0b23c89b36393295e6647c411a5'
'e3bed93c2afd730a1e68162aff55df64a5400538'\
- 'a40ff3f326e544517e1034ac19f4b545d9a17a49'
'bcc57d75d41512cc28564cfe9675be2cd61ec583'\
- 'ca324bbef8d004e3ca5352e5b3a2d4489f3eaa92'
'b01228a9291f0f51fdaf940e0fe29840e0db7f51'\
- 'd2e91ae7c374214dcd59a6fbdd732386a2040855'
'768ab295dc5bac786abe00cbb5bf8b2eaa85efe0'\
- 'b64c7c934741b5ab8956708aaef7a2cf662f55ca'
'f326d37d117196d0772498bf0ad40ce663e3211c'\
- 'e4095f814744e804c1c86c5deb0f333cdf50cac0'
'0532bf5584f61fb96f281be9018f2359fa2551ea')
+ buildfix-gcc44.diff
+ buildfix_FormulaMissingHeader.diff
+ buildfix_system_db48.diff
+ openoffice.profile)
options=('!distcc' '!ccache' '!makeflags')
+md5sums=('0bce3a276b687ed228e162993ef0d8b2'
+ 'e3a0b76dcd876f3d721ee7183729153d'
+ '63209bbc64c901ef105455bda0282f45'
+ '71f136a31e296a04ab68932a31dd533e'
+ '6c596129fb48316226ce3adfd3a4c86d'
+ '1dc7480a04f572ad136d35923a2af66d'
+ 'c8e82b4d2324fe62ad8c6e29213e80b5'
+ '863a3ab2c17a3d11b8fa3ec321986366'
+ '0cd6f3525939d3ef6e5a30ad30c25d27'
+ '40ca15a651e78d9cf44722046552d769')
-# see ftp://ftp.linux.cz/pub/localization/OpenOffice.org/devel/build/build for
upstream build instructions
+# source PKGBUILD && mksource
+mksource() {
+ mkdir /tmp/$pkgname-source
+ pushd /tmp/$pkgname-source
+ # now svn: http://wiki.services.openoffice.org/wiki/OOo_and_Subversion
+ svn checkout svn://svn.services.openoffice.org/ooo/tags/${_OO_milestone}
+ find . -type d -depth -name ".svn" -exec rm -rf {} \;
+ tar -cvzf ${_OO_milestone}.tar.gz ${_OO_milestone}/*
+ popd
+}
build() {
- cd ${srcdir}
- # now svn: http://wiki.services.openoffice.org/wiki/OOo_and_Subversion
-# svn checkout svn://svn.services.openoffice.org/ooo/tags/${_OO_milestone}
-# find ${srcdir} -type d -depth -name ".svn" -exec rm -rf {} \;
-# tar -cvjf ../${pkgname}-${_OO_milestone}.tar.bz2 ${_OO_milestone}/*
-# return 1
cd ${srcdir}/${_OO_milestone}
-
+
# just to make sure that it will detect the desired JDK/JVM - we want
openjdk6
unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH
[ -z "${JAVA_HOME}" ] && . /etc/profile.d/openjdk6.sh
JAVAHOME=${JAVA_HOME}
[ -z "${MOZ_PLUGIN_PATH}" ] && . /etc/profile.d/mozilla-common.sh
[ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh
-
+
# some speedups
export SMP="6"
MAXMODULESFLAG="-P${SMP}"
@@ -79,22 +71,16 @@
export NO_HIDS=true
# build fixes
- patch -Np0 -i ${srcdir}/buildfix-gcc43.diff || return 1
- patch -Np0 -i ${srcdir}/buildfix-sw-printf.diff || return 1
- patch -Np0 -i ${srcdir}/soltools-mkdepend-getline.diff || return 1
- patch -Np0 -i ${srcdir}/xulrunner-1.9.1.diff || return 1
+ patch -Np0 -i ${srcdir}/buildfix-gcc44.diff || return 1
+ patch -Np0 -i ${srcdir}/buildfix_FormulaMissingHeader.diff || return 1
patch -Np0 -i ${srcdir}/buildfix_system_db48.diff || return 1
-
+
# allows soffice to find the user's firefox profile so that it can read
# its digital certificates. Nss stores digital certificates in your
mozilla firefox profile.
patch -Np0 -i ${srcdir}/soffice-detect-mozilla-certificates.diff ||
return 1
# important bugfixes
- # try to fix non-gtk integration
- patch -Np0 -i ${srcdir}/shell.patch || return 1
- # fix the mozilla plugin and remove it from option menu
- patch -Np0 -i ${srcdir}/nsplugin-path.diff || return 1
- patch -Np0 -i ${srcdir}/no-mozilla-plug-in-option.diff || return 1
+ # ...nothing :)
# remove the startup wizard
patch -Np0 -i ${srcdir}/default-no-startup-wizard.diff || return 1
@@ -106,16 +92,18 @@
# fix to build with SUN jdk/jre and OpenJDK
# http://qa.openoffice.org/issues/show_bug.cgi?id=74749
sed -i "s:lib64\/libjpeg.so:lib\/libjpeg.so:g"
${srcdir}/${_OO_milestone}/solenv/inc/libs.mk || return 1
- else EXTRAOPTS="--with-stlport"
+ else EXTRAOPTS="--with-stlport --without-system-graphite"
fi
cd ${srcdir}/${_OO_milestone}
+ # needed to build the OO-SDK
+ mv ${srcdir}/unowinreg.dll external/unowinreg || return 1
+
# export C(XX)FLAGS
# http://www.openoffice.org/issues/show_bug.cgi?id=103205
unset CFLAGS
unset CXXFLAGS
-# export ARCH_FLAGS="$CFLAGS"
# Need to recreate the configure script because of patches
autoreconf -v || return 1
@@ -123,69 +111,65 @@
./configure --with-build-version="${pkgver} ArchLinux build-${pkgrel}
(${_OO_milestone})" \
--with-vendor="ArchLinux"\
--prefix=/usr --exec-prefix=/usr\
- --disable-ldap\
--with-lang="en-US"\
--with-dict=ALL\
--disable-gnome-vfs\
- --disable-binfilter\
- --disable-evolution2\
- --disable-kde\
- --disable-lockdown\
- --disable-mediawiki\
- --disable-minimizer\
- --disable-odk\
- --disable-pdfimport\
--disable-qadevooo\
--disable-reportdesign\
--disable-systray\
--disable-mathmldtd\
+ --enable-binfilter\
+ --enable-cairo\
+ --enable-crashdump=yes\
+ --enable-cups\
+ --enable-dbus\
+ --enable-evolution2\
--enable-gio\
--enable-gtk\
- --enable-cups\
- --enable-dbus\
- --enable-cairo\
- --enable-crashdump=no\
+ --enable-graphite\
+ --enable-kde4\
+ --enable-ldap\
+ --enable-lockdown\
+ --enable-mediawiki\
+ --enable-minimizer\
+ --enable-odk\
+ --enable-opengl\
+ --enable-pdfimport\
+ --enable-presenter-console\
+ --enable-report-builder\
--enable-vba\
+ --enable-verbose\
+ --enable-wiki-publisher\
--with-package-format=native\
- --with-system-db\
- --with-system-cairo\
- --with-system-curl\
- --with-system-expat\
- --with-system-freetype\
- --with-system-hunspell\
- --with-system-icu\
- --with-system-jpeg\
- --with-system-libwpd\
- --with-system-libxml\
- --with-system-libxslt\
- --with-system-neon\
- --with-system-python\
- --with-system-redland\
- --with-system-sane-header\
- --with-system-sndfile\
- --with-system-stdlibs\
- --with-system-xrender-headers\
- --with-system-zlib\
- --with-system-openssl\
- --with-system-mozilla=libxul\
--without-fonts\
--without-afms\
--without-gpc\
--without-nas\
+ --without-ppds\
+ --without-system-agg\
+ --without-system-lucene\
+ --with-openldap\
+ --with-system-stdlibs\
+ --with-system-libs\
+ --with-system-sane-header\
+ --with-system-mozilla=libxul\
+ --with-system-xrender-headers\
+ --with-system-headers\
+ --with-system-redland\
+ --with-alloc=system\
--with-jdk-home=${JAVA_HOME}\
- --with-system-hsqldb\
- --with-hsqldb-jar=/usr/share/java/hsqldb.jar\
- --with-system-xerces\
- --with-xerces-jar=/usr/share/java/xercesImpl.jar\
- --with-system-xalan\
- --with-xalan-jar=/usr/share/java/xalan.jar\
- --with-system-xml-apis\
- --with-xml-apis-jar=/usr/share/java/xml-apis.jar\
- --with-serializer-jar=/usr/share/java/serializer.jar\
- --with-ant-home=/usr/share/java/apache-ant \
+ --with-lucene-core-jar=/usr/share/java/lucene-core.jar\
+ --with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar\
+ --with-saxon-jar=/usr/share/java/saxon/saxon9he.jar\
--with-use-shell=bash\
$EXTRAOPTS || return 1
+# --enable-layout\ /bin/bash: tralay: command not found ???
+# --with-system-jfreereport
+# --with-system-mythes\
+# we will need myspell dicts for --with-system-dicts
--without-myspell-dicts
+# --without-system-boost\
+
# Setup environment for build
if [ "$CARCH" = "x86_64" ]; then
source LinuxX86-64Env.Set.sh
@@ -197,8 +181,28 @@
cd instsetoo_native
build.pl -P${SMP} ${MAXMODULESFLAG} ${MAXPROCESSESFLAG} --dlv_switch
-link --all || return 1
- cd ..
+}
+package_openoffice-base() {
+
+ pkgdesc="OpenOffice.org - a free multiplatform and multilingual office suite
- testing branch leeding to next stable release"
+ install=openoffice.install
+ depends=("curl>=7.19.7" "hunspell>=1.2.8" "python>=2.6.4" 'libwpd' 'redland'
'libxaw' "neon>=0.28.6" 'gtk2'
+ 'dbus-glib' "icu>=4.2.1" 'hsqldb-java' 'libxslt'
'hicolor-icon-theme' 'desktop-file-utils'
+ 'beanshell' 'saxon' 'vigra' 'libgraphite' 'hyphen' 'lpsolve'
'libmspack' 'libldap' 'lucene') # 'libmythes'
+ optdepends=('java-runtime: adds java support'
+ 'libcups: adds printing support'
+ 'gconf: adds additional gnome support'
+ 'nss: adds support for signed files/macros'
+ 'pstoedit: translates PostScript and PDF graphics into
other vector formats'
+ 'poppler: for shipped pdfimport extension'
+ 'kdelibs: for kde integration')
+ backup=(usr/lib/openoffice/program/sofficerc )
+ provides=('openoffice-base' 'openoffice-en-US')
+
+
+ cd ${srcdir}/${_OO_milestone}
+
# install binaries
if [ "$CARCH" = "x86_64" ]; then
cp -R
instsetoo_native/unxlngx6.pro/OpenOffice/native/install/en-US/linux-2.6-x86_64/buildroot/*
${pkgdir}/
@@ -209,17 +213,17 @@
mkdir -p ${pkgdir}/usr/lib
mv ${pkgdir}/opt/* ${pkgdir}/usr/lib/
rmdir ${pkgdir}/opt
-
+
## Step 1
cd ${pkgdir}/usr/lib/openoffice.org || return 1
- mv ure/ basis3.1/ || return 1
- cd basis3.1 || return 1
+ mv ure/ basis3.2/ || return 1
+ cd basis3.2 || return 1
rm ure-link && mv ure ure-link || return 1
## Step 2
cd ${pkgdir}/usr/lib/ || return 1
- mv openoffice.org/basis3.1/ openoffice.org3/ || return 1
+ mv openoffice.org/basis3.2/ openoffice.org3/ || return 1
cd openoffice.org3/ || return 1
- rm basis-link && mv basis3.1 basis-link || return 1
+ rm basis-link && mv basis3.2 basis-link || return 1
## Step 3
cd ${pkgdir}/usr/lib/ || return 1
rmdir ${pkgdir}/usr/lib/openoffice.org || return 1
@@ -231,7 +235,16 @@
install -D -m644 $i
${pkgdir}/usr/lib/openoffice/share/extension/install/$i || return 1
done
popd
-
+
+ # install extensions
+ pushd ${srcdir}/${_OO_milestone}/solver/320/unxlng?6.pro/bin
+ install -D -m644 sun-report-builder.oxt
${pkgdir}/usr/lib/openoffice/share/extension/install/sun-report-builder.oxt ||
return 1
+ install -D -m644 swext/wiki-publisher.oxt
${pkgdir}/usr/lib/openoffice/share/extension/install/wiki-publisher.oxt ||
return 1
+ install -D -m644 minimizer/sun-presentation-minimizer.oxt
${pkgdir}/usr/lib/openoffice/share/extension/install/sun-presentation-minimizer.oxt
|| return 1
+ install -D -m644 presenter/presenter-screen.oxt
${pkgdir}/usr/lib/openoffice/share/extension/install/presenter-screen.oxt ||
return 1
+ install -D -m644 pdfimport/pdfimport.oxt
${pkgdir}/usr/lib/openoffice/share/extension/install/pdfimport.oxt || return 1
+ popd
+
# prepare filesystem entries
mkdir -p ${pkgdir}/usr/{bin,share/applications}
mkdir -p ${pkgdir}/usr/share/icons/{hicolor,locolor}
@@ -268,18 +281,65 @@
# fix ownership and permissions
chown root.root -R ${pkgdir}/
chmod +rX -R ${pkgdir}/usr
-
- # make symlinks
- cd ${pkgdir}/usr/bin
- ln -s /usr/lib/openoffice/program/soffice soffice
- ln -s /usr/lib/openoffice/program/spadmin spadmin
-
+
+ # set desktop variable to force gtk/gnome vcl usage
+ install -m755 -d ${pkgdir}/etc/profile.d
+ install -m755 ${srcdir}/openoffice.profile
${pkgdir}/etc/profile.d/openoffice.sh || return 1
+
+ # make symlinks
+ cd ${pkgdir}/usr/bin
+ ln -s /usr/lib/openoffice/program/soffice soffice
+ ln -s /usr/lib/openoffice/program/spadmin spadmin
+
# link the mozilla-plugin
mkdir -p ${pkgdir}/usr/lib/mozilla/plugins/
cd ${pkgdir}/usr/lib/mozilla/plugins/
ln -v -s /usr/lib/openoffice/program/libnpsoplugin.so .
+}
- # set desktop variable to force gtk/gnome vcl usage
- install -m755 -d ${pkgdir}/etc/profile.d
- install -m755 ${srcdir}/openoffice.profile
${pkgdir}/etc/profile.d/openoffice.sh || return 1
+package_openoffice-sdk() {
+
+ pkgdesc="OpenOffice.org SDK - development files"
+ depends=('openoffice-base')
+
+ cd ${srcdir}/${_OO_milestone}
+
+ # install SDK
+ if [ "$CARCH" = "x86_64" ]; then
+ cp -R
instsetoo_native/unxlngx6.pro/OpenOffice_SDK/native/install/en-US/linux-2.6-x86_64/buildroot/*
${pkgdir}/
+ else cp -R
instsetoo_native/unxlngi6.pro/OpenOffice_SDK/native/install/en-US/linux-2.6-intel/buildroot/*
${pkgdir}/
+ fi
+
+ # move all to /usr/lib
+ mkdir -p ${pkgdir}/usr/lib
+ mv ${pkgdir}/opt/* ${pkgdir}/usr/lib/
+ rmdir ${pkgdir}/opt
+
+ cd ${pkgdir}/usr/lib/openoffice.org/basis3.2/sdk
+
+ for file in setsdkenv_unix.csh setsdkenv_unix.sh ; do
+ sed -e "s,@OO_SDK_NAME@,sdk," \
+ -e "s,@OO_SDK_HOME@,/usr/lib/openoffice-dev/basis-link/sdk," \
+ -e "s,@OFFICE_HOME@,/usr/lib/openoffice-dev," \
+ -e "s,@OFFICE_BASE_HOME@,/usr/lib/openoffice-dev/basis-link," \
+ -e
"s,@OO_SDK_URE_HOME@,/usr/lib/openoffice-dev/basis-link/ure-link," \
+ -e "s,@OO_SDK_MAKE_HOME@,/usr/bin," \
+ -e "s,@OO_SDK_ZIP_HOME@,/usr/bin," \
+ -e "s,@OO_SDK_CPP_HOME@,/usr/bin," \
+ -e "s,@OO_SDK_CC_55_OR_HIGHER@,," \
+ -e "s,@OO_SDK_JAVA_HOME@,\$JAVA_HOME," \
+ -e "s,@OO_SDK_OUTPUT_DIR@,\$HOME," \
+ -e "s,@SDK_AUTO_DEPLOYMENT@,NO," \
+ $file.in > $file
+ chmod 755 $file
+ done
+
+ cd ${pkgdir}/usr/lib/ || return 1
+ mv openoffice.org openoffice || return 1
+
+ cd ${pkgdir}/usr/lib/openoffice/ || return 1
+ mv basis3.2 basis-link || return 1
+
+ # fix ownership and permissions
+ chown root.root -R ${pkgdir}/
}
Deleted: buildfix-gcc43.diff
===================================================================
--- buildfix-gcc43.diff 2010-02-11 03:08:30 UTC (rev 68154)
+++ buildfix-gcc43.diff 2010-02-11 05:43:59 UTC (rev 68155)
@@ -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"
-
-
Added: buildfix-gcc44.diff
===================================================================
--- buildfix-gcc44.diff (rev 0)
+++ buildfix-gcc44.diff 2010-02-11 05:43:59 UTC (rev 68155)
@@ -0,0 +1,10 @@
+--- 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;
Deleted: buildfix-sw-printf.diff
===================================================================
--- buildfix-sw-printf.diff 2010-02-11 03:08:30 UTC (rev 68154)
+++ buildfix-sw-printf.diff 2010-02-11 05:43:59 UTC (rev 68155)
@@ -1,21 +0,0 @@
---- sw/source/core/doc/docbm.cxx 2009-05-01 08:09:45.000000000 -0500
-+++ sw/source/core/doc/docbm.cxx 2009-05-01 13:31:49.000000000 -0500
-@@ -33,6 +33,7 @@
- #include "precompiled_sw.hxx"
-
-
-+#include <stdio.h>
- #include <tools/pstm.hxx>
- #include <svx/linkmgr.hxx>
- #include <fmtanchr.hxx>
---- sw/source/filter/ww8/WW8TableInfo.cxx 2009-04-21 04:51:46.000000000
-0500
-+++ sw/source/filter/ww8/WW8TableInfo.cxx 2009-05-01 15:20:53.000000000
-0500
-@@ -31,6 +31,7 @@
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_sw.hxx"
-
-+#include <stdio.h>
- #include <iostream>
- #include "WW8TableInfo.hxx"
- #include "swtable.hxx"
-
Added: buildfix_FormulaMissingHeader.diff
===================================================================
--- buildfix_FormulaMissingHeader.diff (rev 0)
+++ buildfix_FormulaMissingHeader.diff 2010-02-11 05:43:59 UTC (rev 68155)
@@ -0,0 +1,10 @@
+--- 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
+ {
Deleted: no-mozilla-plug-in-option.diff
===================================================================
--- no-mozilla-plug-in-option.diff 2010-02-11 03:08:30 UTC (rev 68154)
+++ no-mozilla-plug-in-option.diff 2010-02-11 05:43:59 UTC (rev 68155)
@@ -1,313 +0,0 @@
---- svx/source/dialog/optinet2.cxx-old 2007-05-04 22:59:31.000000000 +0200
-+++ svx/source/dialog/optinet2.cxx 2007-05-04 22:59:56.000000000 +0200
-@@ -1813,199 +1813,6 @@
- maProtectRecordsPB.SetText( sNewText );
- }
-
--//added by jmeng begin
--MozPluginTabPage::MozPluginTabPage(Window* pParent, const SfxItemSet& rSet)
-- : SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_INET_MOZPLUGIN ), rSet ),
-- aMSWordGB ( this, SVX_RES( GB_MOZPLUGIN ) ),
-- aWBasicCodeCB ( this, SVX_RES( CB_MOZPLUGIN_CODE ) )
--{
-- FreeResource();
--}
--
--MozPluginTabPage::~MozPluginTabPage()
--{
--}
--
--SfxTabPage* MozPluginTabPage::Create( Window* pParent,
--
const SfxItemSet& rAttrSet )
--{
-- return new MozPluginTabPage( pParent, rAttrSet );
--}
--BOOL MozPluginTabPage::FillItemSet( SfxItemSet& )
--{
-- BOOL hasInstall = isInstalled();
-- BOOL hasChecked = aWBasicCodeCB.IsChecked();
-- if(hasInstall && (!hasChecked)){
-- //try to uninstall
-- uninstallPlugin();
-- }
-- else if((!hasInstall) && hasChecked){
-- //try to install
-- installPlugin();
-- }
-- else{
-- // do nothing
-- }
-- return TRUE;
--}
--void MozPluginTabPage::Reset( const SfxItemSet& )
--{
-- aWBasicCodeCB.Check( isInstalled());
-- aWBasicCodeCB.SaveValue();
--}
--
--#ifdef WNT
--extern "C" {
-- int lc_isInstalled(const char* realFilePath);
-- int lc_installPlugin(const char* realFilePath);
-- int lc_uninstallPlugin(const char* realFilePath);
--}
--#endif
--
--#define NPP_PATH_MAX 2048
--inline bool getDllURL(rtl::OString * path)
--{
-- OSL_ASSERT(path != NULL);
-- ::rtl::OUString dirPath/*dllPath, */;
-- if (osl_getExecutableFile(&dirPath.pData) != osl_Process_E_None) {
-- return false;
-- }
-- dirPath = dirPath.copy(0, dirPath.lastIndexOf('/'));
--// osl::FileBase::getAbsoluteFileURL(dirPath, libPath, dllPath);
-- ::rtl::OUString sysDirPath;
-- osl::FileBase::getSystemPathFromFileURL(dirPath, sysDirPath);
-- *path = OUStringToOString(sysDirPath, RTL_TEXTENCODING_ASCII_US);
-- return true;
--}
--
--BOOL MozPluginTabPage::isInstalled()
--{
--#ifdef UNIX
-- // get the real file referred by .so lnk file
-- char lnkFilePath[NPP_PATH_MAX] = {0};
-- char lnkReferFilePath[NPP_PATH_MAX] = {0};
-- char* pHome = getpwuid(getuid())->pw_dir;
-- strcat(lnkFilePath, pHome);
-- strcat(lnkFilePath, "/.mozilla/plugins/libnpsoplugin" SAL_DLLEXTENSION);
--
-- struct stat sBuf;
-- if (0 > lstat(lnkFilePath, &sBuf))
-- return false;
-- if (!S_ISLNK(sBuf.st_mode))
-- return false;
-- if (0 >= readlink(lnkFilePath, lnkReferFilePath, NPP_PATH_MAX))
-- return false;
-- // If the link is relative, then we regard it as non-standard
-- if (lnkReferFilePath[0] != '/')
-- return false;
--
-- // get the real file path
-- char realFilePath[NPP_PATH_MAX] = {0};
-- ::rtl::OString tempString;
-- if (!getDllURL(&tempString)) {
-- return false;
-- }
-- strncpy(realFilePath, tempString.getStr(), NPP_PATH_MAX);
-- strcat(realFilePath, "/libnpsoplugin" SAL_DLLEXTENSION);
--
-- if (0 != strcmp(lnkReferFilePath, realFilePath))
-- return false;
-- return true;
--#endif
--#ifdef WNT
-- // get the value from registry
-- BOOL ret = true;
-- ::rtl::OString tempString;
-- char realFilePath[NPP_PATH_MAX] = {0};
-- if (!getDllURL(&tempString)){
-- return false;
-- }
-- strncpy(realFilePath, tempString.getStr(), NPP_PATH_MAX);
-- if(! lc_isInstalled(realFilePath))
-- ret =true;
-- else
-- ret = false;
-- return ret;
--#endif
--}
--
--BOOL MozPluginTabPage::installPlugin()
--{
--#ifdef UNIX
-- // get the real file referred by .so lnk file
-- char lnkFilePath[NPP_PATH_MAX] = {0};
-- char* pHome = getpwuid(getuid())->pw_dir;
-- strcat(lnkFilePath, pHome);
-- strcat(lnkFilePath, "/.mozilla/plugins/libnpsoplugin" SAL_DLLEXTENSION);
-- remove(lnkFilePath);
--
-- // create the dirs if necessary
-- struct stat buf;
-- char tmpDir[NPP_PATH_MAX] = {0};
-- sprintf(tmpDir, "%s/.mozilla", pHome);
-- if (0 > stat(lnkFilePath, &buf))
-- {
-- mkdir(tmpDir, 0755);
-- strcat(tmpDir, "/plugins");
-- mkdir(tmpDir, 0755);
-- }
--
-- // get the real file path
-- char realFilePath[NPP_PATH_MAX] = {0};
-- ::rtl::OString tempString;
-- if (!getDllURL(&tempString)) {
-- return false;
-- }
-- strncpy(realFilePath, tempString.getStr(), NPP_PATH_MAX);
-- strcat(realFilePath, "/libnpsoplugin" SAL_DLLEXTENSION);
--
-- // create the link
-- if (0 != symlink(realFilePath, lnkFilePath))
-- return false;
-- return true;
--#endif
--#ifdef WNT
-- ::rtl::OString tempString;
-- char realFilePath[NPP_PATH_MAX] = {0};
-- if (!getDllURL(&tempString)) {
-- return false;
-- }
-- strncpy(realFilePath, tempString.getStr(), NPP_PATH_MAX);
-- if( !lc_installPlugin(realFilePath))
-- return true;
-- else
-- return false;
--#endif
--}
--
--BOOL MozPluginTabPage::uninstallPlugin()
--{
--#ifdef UNIX
-- // get the real file referred by .so lnk file
-- char lnkFilePath[NPP_PATH_MAX] = {0};
-- char* pHome = getpwuid(getuid())->pw_dir;
-- strcat(lnkFilePath, pHome);
-- strcat(lnkFilePath, "/.mozilla/plugins/libnpsoplugin" SAL_DLLEXTENSION);
--
-- if(0 > remove(lnkFilePath))
-- return false;
-- return true;
--#endif
--#ifdef WNT
-- ::rtl::OString tempString;
-- char realFilePath[NPP_PATH_MAX] = {0};
-- if (!getDllURL(&tempString)) {
-- return false;
-- }
-- strncpy(realFilePath, tempString.getStr(), NPP_PATH_MAX);
-- if(!lc_uninstallPlugin(realFilePath))
-- return true;
-- else
-- return false;
--#endif
--}
--//added by jmeng end
--
- /* -------------------------------------------------------------------------*/
-
- class MailerProgramCfg_Impl : public utl::ConfigItem
---- svx/source/dialog/optinet2.hxx 10 Apr 2008 23:34:00 -0000 1.16
-+++ svx/source/dialog/optinet2.hxx 16 Jun 2008 16:09:22 -0000
-@@ -293,29 +293,6 @@
- virtual void Reset( const SfxItemSet& rSet );
- };
-
--//added by jmeng begin
--class MozPluginTabPage : public SfxTabPage
--{
-- FixedLine aMSWordGB;
-- CheckBox aWBasicCodeCB;
--
-- BOOL isInstalled(void);
-- BOOL installPlugin(void);
-- BOOL uninstallPlugin(void);
--
-- MozPluginTabPage( Window* pParent, const SfxItemSet& rSet );
-- virtual ~MozPluginTabPage();
--
--public:
--
-- static SfxTabPage* Create( Window* pParent,
-- const
SfxItemSet& rAttrSet );
--
-- virtual BOOL FillItemSet( SfxItemSet& rSet );
-- virtual void Reset( const SfxItemSet& rSet );
--
--};
--//added by jmeng end
- #endif
-
- /* -----------------------------20.06.01 16:32--------------------------------
---- svx/source/options/optinet2.src 11 Apr 2008 02:13:50 -0000 1.97
-+++ svx/source/options/optinet2.src 16 Jun 2008 16:11:20 -0000
-@@ -40,32 +40,6 @@
- /* */
- /************************************************************************/
-
--// added by jmeng begin
--
--TabPage RID_SVXPAGE_INET_MOZPLUGIN
--{
-- OutputSize = TRUE ;
-- Size = MAP_APPFONT ( 260 , 185 ) ;
-- SVLook = TRUE ;
-- Hide = TRUE ;
--
-- FixedLine GB_MOZPLUGIN
-- {
-- Pos = MAP_APPFONT ( 6 , 3 ) ;
-- Size = MAP_APPFONT ( 248 , 8 ) ;
-- Text[ en-US ] = "Browser Plug-in";
-- };
-- CheckBox CB_MOZPLUGIN_CODE
-- {
-- Pos = MAP_APPFONT ( 12 , 14 ) ;
-- Size = MAP_APPFONT ( 236 , 10 ) ;
-- TabStop = TRUE ;
-- Text [ en-US ] = "~Display documents in browser" ;
-- };
--};
--
--//added by jmeng end
--
- TabPage RID_SVXPAGE_INET_PROXY
- {
- HelpId = HID_OPTIONS_PROXY ;
---- svx/source/dialog/treeopt.src 11 Apr 2008 00:17:12 -0000 1.21
-+++ svx/source/dialog/treeopt.src 16 Jun 2008 16:12:27 -0000
-@@ -187,7 +187,6 @@
- < "Proxy" ; RID_SVXPAGE_INET_PROXY; > ;
- < "Search" ; RID_SVXPAGE_INET_SEARCH; > ;
- < "E-mail" ; RID_SVXPAGE_INET_MAIL; > ;
-- < "Browser Plug-in" ; RID_SVXPAGE_INET_MOZPLUGIN; > ;
- };
- //modified by jmeng end
- };
---- svx/inc/svx/dialogs.hrc 4 Jun 2008 11:21:07 -0000 1.14
-+++ svx/inc/svx/dialogs.hrc 16 Jun 2008 16:14:30 -0000
-@@ -258,11 +258,6 @@
- #define RID_SVXPAGE_INET_CACHE (RID_SVX_START + 158)
- #define RID_SVXPAGE_INET_TYPE (RID_SVX_START + 159)
- #define RID_SVXPAGE_INET_SEARCH (RID_SVX_START
+ 160)
--//added by jmeng begin
--#define RID_SVXPAGE_INET_MOZPLUGIN (RID_SVX_START + 2161)
--#define GB_MOZPLUGIN 1
--#define CB_MOZPLUGIN_CODE 2
--//added by jmeng end
- #define RID_SVXPAGE_INET_SECURITY (RID_SVX_START + 200)
-
- #define RID_SVXPAGE_BROWSER_OTHER (RID_SVX_START + 202)
---- svx/source/dialog/treeopt.cxx 11 Apr 2008 00:16:21 -0000 1.56
-+++ svx/source/dialog/treeopt.cxx 16 Jun 2008 16:04:13 -0000
-@@ -368,9 +368,6 @@
- case RID_SVXPAGE_ACCESSIBILITYCONFIG: fnCreate =
&SvxAccessibilityOptionsTabPage::Create; break;
- case RID_SVXPAGE_SSO:
fnCreate = GetSSOCreator(); break;
- case RID_SVXPAGE_OPTIONS_CTL:
fnCreate = &SvxCTLOptionsPage::Create ; break;
-- //added by jmeng begin
-- case RID_SVXPAGE_INET_MOZPLUGIN:
fnCreate = &MozPluginTabPage::Create; break;
-- //added by jmeng end
- case RID_SVXPAGE_OPTIONS_JAVA:
fnCreate = &SvxJavaOptionsPage::Create ; break;
- case RID_SVXPAGE_ONLINEUPDATE:
fnCreate = &SvxOnlineUpdateTabPage::Create; break;
- case RID_OPTPAGE_CHART_DEFCOLORS: fnCreate =
&SvxDefaultColorOptPage::Create; break;
-@@ -370,7 +367,6 @@
- { "Internet", "Proxy", RID_SVXPAGE_INET_PROXY },
- { "Internet", "Search", RID_SVXPAGE_INET_SEARCH },
- { "Internet", "Email", RID_SVXPAGE_INET_MAIL },
-- { "Internet", "MozillaPlugin",
RID_SVXPAGE_INET_MOZPLUGIN },
- { "LoadSave", NULL, SID_FILTER_DLG },
- { "LoadSave", "General", RID_SFXPAGE_SAVE },
- { "LoadSave", "VBAProperties", SID_OPTFILTER_MSOFFICE },
Deleted: nsplugin-path.diff
===================================================================
--- nsplugin-path.diff 2010-02-11 03:08:30 UTC (rev 68154)
+++ nsplugin-path.diff 2010-02-11 05:43:59 UTC (rev 68155)
@@ -1,132 +0,0 @@
---- extensions/source/nsplugin/source/so_env.cxx.old 2009-04-02
10:51:19.000000000 +0000
-+++ extensions/source/nsplugin/source/so_env.cxx 2009-04-06
16:41:44.000000000 +0000
-@@ -34,6 +34,7 @@
- #ifdef UNIX
- #include <sys/types.h>
- #include <strings.h>
-+#include <dlfcn.h>
- #include <stdarg.h>
- // For vsnprintf()
- #define NSP_vsnprintf vsnprintf
-@@ -122,6 +123,96 @@ restoreUTF8(char *pPath)
- return 0;
- }
-
-+#ifdef UNIX
-+extern int nspluginOOoModuleHook (void** aResult);
-+int nspluginOOoModuleHook (void** aResult)
-+{
-+ void *dl_handle;
-+ void *thisp;
-+
-+ dl_handle = dlopen(NULL, RTLD_NOW);
-+ if (!dl_handle)
-+ {
-+ fprintf (stderr, "Can't open myself '%s'\n", dlerror());
-+ return 1;
-+ }
-+
-+ Dl_info dl_info = { 0, };
-+ if(!dladdr((void *)nspluginOOoModuleHook, &dl_info))
-+ {
-+ fprintf (stderr, "Can't find my own address '%s'\n", dlerror());
-+ return 1;
-+ }
-+
-+ if (!dl_info.dli_fname)
-+ {
-+ fprintf (stderr, "Can't find my own file name\n");
-+ return 1;
-+ }
-+
-+ char cwdstr[NPP_PATH_MAX];
-+ if (!getcwd (cwdstr, sizeof(cwdstr)))
-+ {
-+ fprintf (stderr, "Can't get cwd\n");
-+ return 1;
-+ }
-+
-+ char libFileName[NPP_PATH_MAX];
-+
-+ if (dl_info.dli_fname[0] != '/')
-+ {
-+ if ((strlen(cwdstr) + 1 + strlen(dl_info.dli_fname)) >=
NPP_PATH_MAX)
-+ {
-+ fprintf (stderr, "Plugin path too long\n");
-+ return 1;
-+ }
-+ strcpy (libFileName, cwdstr);
-+ strcat (libFileName, "/");
-+ strcat (libFileName, dl_info.dli_fname);
-+ }
-+ else
-+ {
-+ if (strlen(dl_info.dli_fname) >= NPP_PATH_MAX)
-+ {
-+ fprintf (stderr, "Plugin path too long\n");
-+ return 1;
-+ }
-+ strcpy (libFileName, dl_info.dli_fname);
-+ }
-+
-+ char *clobber;
-+ static char realFileName[NPP_PATH_MAX] = {0};
-+# define SEARCH_SUFFIX "/program/libnpsoplug"
-+
-+ if (!(clobber = strstr (libFileName, SEARCH_SUFFIX)))
-+ {
-+ ssize_t len = readlink(libFileName, realFileName,
NPP_PATH_MAX-1);
-+ if (len == -1)
-+ {
-+ fprintf (stderr, "Couldn't read link '%s'\n",
libFileName);
-+ return 1;
-+ }
-+ realFileName[len] = '\0';
-+ if (!(clobber = strstr (realFileName, SEARCH_SUFFIX)))
-+ {
-+ fprintf (stderr, "Couldn't find suffix in '%s'\n",
realFileName);
-+ return 1;
-+ }
-+ *clobber = '\0';
-+ }
-+ else
-+ {
-+ *clobber = '\0';
-+ strcpy (realFileName, libFileName);
-+ }
-+ *aResult = realFileName;
-+
-+ fprintf (stderr, "OpenOffice path is '%s'\n", realFileName);
-+
-+ return 0;
-+}
-+#endif
-+
- // *aResult points the static string holding "/opt/staroffice8"
- int findReadSversion(void** aResult, int /*bWnt*/, const char* /*tag*/, const
char* /*entry*/)
- {
-@@ -134,9 +225,22 @@ int findReadSversion(void** aResult, int
- // Filename of lnk file, eg. "soffice"
- char lnkFileName[NPP_PATH_MAX] = {0};
- char* pTempZero = NULL;
-+
-+ /* try to fetch a 'self' pointer */
-+ if (!nspluginOOoModuleHook (aResult))
-+ return 0;
-+
-+ /* .. now in $HOME */
- sprintf(lnkFileName, "%s/.mozilla/plugins/libnpsoplugin%s",
getenv("HOME"), SAL_DLLEXTENSION);
-- if ((0 > readlink(lnkFileName, realFileName, NPP_PATH_MAX)) ||
-- (NULL == (pTempZero = strstr(realFileName, "/program/libnpsoplugin"
SAL_DLLEXTENSION))))
-+ ssize_t len = readlink(lnkFileName, realFileName, NPP_PATH_MAX-1);
-+ if (-1 == len)
-+ {
-+ *realFileName = 0;
-+ return -1;
-+ }
-+ realFileName[len] = '\0';
-+
-+ if (NULL == (pTempZero = strstr(realFileName, "/program/libnpsoplugin"
SAL_DLLEXTENSION)))
- {
- *realFileName = 0;
- return -1;
Modified: openoffice.install
===================================================================
--- openoffice.install 2010-02-11 03:08:30 UTC (rev 68154)
+++ openoffice.install 2010-02-11 05:43:59 UTC (rev 68155)
@@ -3,7 +3,7 @@
gtk-update-icon-cache -f -q /usr/share/icons/hicolor
update-desktop-database -q
-echo " * relogin or source /etc/profile.d/openoffice.sh"
+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"
Modified: openoffice.profile
===================================================================
--- openoffice.profile 2010-02-11 03:08:30 UTC (rev 68154)
+++ openoffice.profile 2010-02-11 05:43:59 UTC (rev 68155)
@@ -1 +1,2 @@
export OOO_FORCE_DESKTOP=gnome
+#export OOO_FORCE_DESKTOP=KDE4
\ No newline at end of file
Deleted: shell.patch
===================================================================
--- shell.patch 2010-02-11 03:08:30 UTC (rev 68154)
+++ shell.patch 2010-02-11 05:43:59 UTC (rev 68155)
@@ -1,42 +0,0 @@
-Index: source/unix/sysshell/systemshell.cxx
-===================================================================
-RCS file: /cvs/gsl/shell/source/unix/sysshell/systemshell.cxx,v
-retrieving revision 1.8
-diff -u -r1.8 systemshell.cxx
---- shell/source/unix/sysshell/systemshell.cxx 19 Jun 2007 16:12:44 -0000
1.8
-+++ shell/source/unix/sysshell/systemshell.cxx 13 Apr 2008 15:27:22 -0000
-@@ -62,6 +62,8 @@
- #include <com/sun/star/uno/XComponentContext.hpp>
- #endif
-
-+#include "uno/current_context.hxx"
-+
- #include "osl/module.hxx"
-
- using namespace ::com::sun::star;
-@@ -116,6 +118,25 @@
-
- bool init_recent_manager_api()
- {
-+ bool bInGnome = false;
-+ try
-+ {
-+ uno::Reference< uno::XCurrentContext >
xCurrentContext(uno::getCurrentContext());
-+
-+ if (xCurrentContext.is())
-+ {
-+ uno::Any aValue = xCurrentContext->getValueByName(
-+ rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
"system.desktop-environment" ) ) );
-+
-+ rtl::OUString aDesktopEnvironment;
-+ if ( (aValue >>= aDesktopEnvironment) &&
(aDesktopEnvironment.equalsIgnoreAsciiCaseAscii("gnome")) )
-+ bInGnome = true;
-+ }
-+ } catch ( ... ) {}
-+
-+ if (!bInGnome)
-+ return false;
-+
- oslModule hDefault;
- if( osl_getModuleHandle( NULL, &hDefault ) )
- {
Deleted: soltools-mkdepend-getline.diff
===================================================================
--- soltools-mkdepend-getline.diff 2010-02-11 03:08:30 UTC (rev 68154)
+++ soltools-mkdepend-getline.diff 2010-02-11 05:43:59 UTC (rev 68155)
@@ -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:
-
Deleted: xulrunner-1.9.1.diff
===================================================================
--- xulrunner-1.9.1.diff 2010-02-11 03:08:30 UTC (rev 68154)
+++ xulrunner-1.9.1.diff 2010-02-11 05:43:59 UTC (rev 68155)
@@ -1,14 +0,0 @@
---- np_sdk/mozsrc/npapi.h 2009-07-12 16:12:42.604105232 +0200
-+++ np_sdk/mozsrc/npapi.h 2009-07-12 16:28:59.901456708 +0200
-@@ -42,8 +42,9 @@
- * Netscape client plug-in API spec
- */
-
--#ifndef _NPAPI_H_
-+#if !defined(_NPAPI_H_) && !defined(npapi_h_)
- #define _NPAPI_H_
-+#define npapi_h_
-
- #ifdef __OS2__
- #pragma pack(1)
-
