[arch-commits] Commit in openoffice-base-beta/trunk (8 files)
andyrtr at archlinux.org
andyrtr at archlinux.org
Sun Oct 11 07:13:24 UTC 2009
Date: Sunday, October 11, 2009 @ 03:13:24
Author: andyrtr
Revision: 54517
prepare new 3.2.0 beta builds
Added:
openoffice-base-beta/trunk/buildfix-gcc44.diff
openoffice-base-beta/trunk/buildfix_FormulaMissingHeader.diff
Modified:
openoffice-base-beta/trunk/ChangeLog
openoffice-base-beta/trunk/PKGBUILD
Deleted:
openoffice-base-beta/trunk/buildfix-gcc43.diff
openoffice-base-beta/trunk/buildfix-sw-printf.diff
openoffice-base-beta/trunk/openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch
openoffice-base-beta/trunk/soltools-mkdepend-getline.diff
------------------------------------------------------+
ChangeLog | 7
PKGBUILD | 238 ++++++++++-------
buildfix-gcc43.diff | 10
buildfix-gcc44.diff | 10
buildfix-sw-printf.diff | 21 -
buildfix_FormulaMissingHeader.diff | 10
openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch | 16 -
soltools-mkdepend-getline.diff | 43 ---
8 files changed, 179 insertions(+), 176 deletions(-)
Modified: ChangeLog
===================================================================
--- ChangeLog 2009-10-11 07:12:16 UTC (rev 54516)
+++ ChangeLog 2009-10-11 07:13:24 UTC (rev 54517)
@@ -1,3 +1,10 @@
+2009-10-11 Andreas Radke <andyrtr at archlinux.org>
+
+ * 3.2.0-OOO320_m1-1 :
+ - first beta pkg for 3.2.0 series branched from DEV300_m60
+ - adopt all changes that went into the devel pkg
+ - pkg split to provide also the OOo sdk
+
2009-08-01 Andreas Radke <andyrtr at archlinux.org>
* 3.1.1-ooo310_m17-1 :
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2009-10-11 07:12:16 UTC (rev 54516)
+++ PKGBUILD 2009-10-11 07:13:24 UTC (rev 54517)
@@ -1,37 +1,35 @@
+# $Id: PKGBUILD 54513 2009-10-10 22:13:43Z andyrtr $
# Maintainer: AndyRTR <andyrtr at archlinux.org>
# Contributor: Hussam Al-Tayeb <ht990332 at gmail.com>
-pkgname=openoffice-base-beta
-pkgver=3.1.1_ooo310_m17 # m9=RC1
+pkgbase="openoffice-base-beta"
+pkgname=('openoffice-base-beta' 'openoffice-sdk-beta')
+_OO_milestone=OOO320_m1
+pkgver=3.2.0_${_OO_milestone} # not yet beta state
pkgrel=1
-pkgdesc="OpenOffice.org - a free multiplatform and multilingual office suite"
-arch=(i686 x86_64)
-_OO_milestone=OOO310_m17
+arch=('i686' 'x86_64')
license=('LGPL3')
url="http://www.openoffice.org"
-install=openoffice.install
-depends=('curl>=7.19.2' 'hunspell>=1.2.8' 'python>=2.6.2' 'libwpd' 'redland' 'libxaw' 'neon>=0.28.4'
- 'dbus-glib' 'icu>=4.2.1' 'hsqldb-java' 'libxslt' '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' 'svn' 'automake' 'findutils' 'flex' 'gawk' 'gcc-libs' 'libart-lgpl' 'libxtst'
- 'pam' 'sane' 'zip' 'perl-archive-zip' 'pkgconfig' 'unzip' 'xulrunner>=1.9.1-2'
- 'apache-ant>=1.7.1-3' 'cairo' 'gperf' 'libcups' 'pstoedit' 'gconf' 'openjdk6>=1.5-4') #'boost'
-backup=(usr/lib/openoffice-beta/program/sofficerc )
-provides=('openoffice-base')
-source=(${pkgname}-${_OO_milestone}.tar.gz
+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.1.3"
+ 'apache-ant>=1.7.1-3' 'cairo' 'gperf' 'libcups' 'poppler' 'pstoedit' 'gconf' "openjdk6>=1.6.1"
+ # from main OOo the deps
+ "curl>=7.19.2" "hunspell>=1.2.8" "python>=2.6.2" 'libwpd' 'redland' 'libxaw' "neon>=0.28.4"
+ '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
+ # libmythes
+source=(#${pkgname}-${_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
+ buildfix-gcc44.diff
shell.patch
- soltools-mkdepend-getline.diff
- buildfix-sw-printf.diff
- openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch
+ buildfix_FormulaMissingHeader.diff
+ http://www.openoffice.org/nonav/issues/showattachment.cgi/64767/openldap.patch
openoffice-beta.profile)
options=('!distcc' '!ccache' '!makeflags')
@@ -40,10 +38,10 @@
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 -cvzf ../${pkgname}-${_OO_milestone}.tar.gz ${_OO_milestone}/*
-# return 1
+ svn checkout svn://svn.services.openoffice.org/ooo/tags/${_OO_milestone}
+ find ${srcdir} -type d -depth -name ".svn" -exec rm -rf {} \;
+ tar -cvzf ../${pkgname}-${_OO_milestone}.tar.gz ${_OO_milestone}/*
+ return 1
cd ${srcdir}/${_OO_milestone}
@@ -52,7 +50,8 @@
[ -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}"
@@ -61,11 +60,10 @@
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 -Np1 -i ${srcdir}/openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch || return 1
-
+ patch -Np0 -i ${srcdir}/buildfix-gcc44.diff || return 1
+ patch -Np0 -i ${srcdir}/buildfix_FormulaMissingHeader.diff || return 1
+ patch -Np0 -i ${srcdir}/openldap.patch || 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
@@ -84,11 +82,14 @@
# 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
@@ -101,70 +102,64 @@
./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-mozilla=libxul\
- --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\
--without-fonts\
--without-afms\
--without-gpc\
--without-nas\
+ --without-ppds\
+ --without-system-agg\
+ --without-system-boost\
+ --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
-# --with-system-boost\
+# --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
# Setup environment for build
if [ "$CARCH" = "x86_64" ]; then
@@ -177,8 +172,28 @@
cd instsetoo_native
build.pl -P${SMP} ${MAXMODULESFLAG} ${MAXPROCESSESFLAG} --dlv_switch -link --all || return 1
- cd ..
+}
+package_openoffice-base-beta() {
+
+ pkgdesc="OpenOffice.org - a free multiplatform and multilingual office suite - testing branch leeding to next stable release"
+ install=openoffice.install
+ depends=("curl>=7.19.2" "hunspell>=1.2.8" "python>=2.6.2" 'libwpd' 'redland' 'libxaw' "neon>=0.28.4"
+ '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-dev/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}/
@@ -192,14 +207,14 @@
## 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
@@ -270,8 +285,8 @@
for i in `find ${pkgdir}/usr/share/icons -name '*.png'` ; do mv $i `dirname $i`/beta-`basename $i` ; done ;
cd ${pkgdir}/usr/share/applications/
- sed -i -e 's|Icon=|Icon=beta-|g' ${pkgdir}/usr/share/applications/*.desktop
- sed -i -e 's|OpenOffice\.org\ 3\.1|OpenOffice\.org\ Beta|g' ${pkgdir}/usr/share/applications/*.desktop
+ sed -i -e 's|Icon=|Icon=beta-|g' ${pkgdir}/usr/share/applications/*.desktop || return 1
+ sed -i -e 's|OpenOffice\.org\ 3\.2|OpenOffice\.org\ Beta|g' ${pkgdir}/usr/share/applications/*.desktop || return 1
cd ${pkgdir}/usr/lib/openoffice-beta/program/
ln -sf /usr/lib/openoffice-beta/program/soffice.bin soffice-beta.bin
@@ -286,3 +301,54 @@
ln -v -s /usr/lib/openoffice-beta/program/libnpsoplugin.so .
mv ${pkgdir}/usr/lib/mozilla/plugins/libnpsoplugin.so ${pkgdir}/usr/lib/mozilla/plugins/libnpsoplugin-beta.so
}
+
+package_openoffice-sdk-beta() {
+
+ pkgdesc="OpenOffice.org SDK - development files for beta branch pkg"
+ depends=('openoffice-base-beta')
+
+ 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, at OO_SDK_NAME@,sdk," \
+ -e "s, at OO_SDK_HOME@,/usr/lib/openoffice-dev/basis-link/sdk," \
+ -e "s, at OFFICE_HOME@,/usr/lib/openoffice-dev," \
+ -e "s, at OFFICE_BASE_HOME@,/usr/lib/openoffice-dev/basis-link," \
+ -e "s, at OO_SDK_URE_HOME@,/usr/lib/openoffice-dev/basis-link/ure-link," \
+ -e "s, at OO_SDK_MAKE_HOME@,/usr/bin," \
+ -e "s, at OO_SDK_ZIP_HOME@,/usr/bin," \
+ -e "s, at OO_SDK_CPP_HOME@,/usr/bin," \
+ -e "s, at OO_SDK_CC_55_OR_HIGHER@,," \
+ -e "s, at OO_SDK_JAVA_HOME@,\$JAVA_HOME," \
+ -e "s, at OO_SDK_OUTPUT_DIR@,\$HOME," \
+ -e "s, at 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}/
+
+ ## Develize it!
+ cd ${pkgdir}/usr/lib/
+ mv openoffice openoffice-beta
+}
Deleted: buildfix-gcc43.diff
===================================================================
--- buildfix-gcc43.diff 2009-10-11 07:12:16 UTC (rev 54516)
+++ buildfix-gcc43.diff 2009-10-11 07:13:24 UTC (rev 54517)
@@ -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 2009-10-11 07:13:24 UTC (rev 54517)
@@ -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 2009-10-11 07:12:16 UTC (rev 54516)
+++ buildfix-sw-printf.diff 2009-10-11 07:13:24 UTC (rev 54517)
@@ -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 2009-10-11 07:13:24 UTC (rev 54517)
@@ -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: openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch
===================================================================
--- openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch 2009-10-11 07:12:16 UTC (rev 54516)
+++ openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch 2009-10-11 07:13:24 UTC (rev 54517)
@@ -1,16 +0,0 @@
-Index: source/plugin/inc/plugin/unx/plugcon.hxx
-===================================================================
-RCS file: /cvs/util/extensions/source/plugin/inc/plugin/unx/plugcon.hxx,v
-retrieving revision 1.13.64.2
-diff -u -r1.13.64.2 plugcon.hxx
---- openoffice.org.orig/extensions/source/plugin/inc/plugin/unx/plugcon.hxx 15 Dec 2008 10:29:47 -0000 1.13.64.2
-+++ openoffice.org/extensions/source/plugin/inc/plugin/unx/plugcon.hxx 23 Dec 2008 09:24:57 -0000
-@@ -102,7 +102,7 @@
- extern "C" {
- #include <npsdk/npupp.h>
- }
--#include <npapi.h>
-+#include <npsdk/npapi.h>
-
- #if NP_VERSION_MINOR < 17
- // compatibility hack: compile with older NPN api header, but define
Deleted: soltools-mkdepend-getline.diff
===================================================================
--- soltools-mkdepend-getline.diff 2009-10-11 07:12:16 UTC (rev 54516)
+++ soltools-mkdepend-getline.diff 2009-10-11 07:13:24 UTC (rev 54517)
@@ -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:
-
More information about the arch-commits
mailing list