[Frugalware-darcs] frugalware-current: openoffice.org-1.3.16-1-i686
VMiklos
vmiklos at frugalware.org
Sun Sep 25 13:51:29 CEST 2005
Sun Sep 25 13:05:45 CEST 2005 VMiklos <vmiklos at frugalware.org>
* openoffice.org-1.3.16-1-i686
version bump, based on 1.1.5
diff -rN -u old-frugalware-current-1/source/xapps/openoffice.org/00-ooo-build-1.3.15-frugalware.patch new-frugalware-current/source/xapps/openoffice.org/00-ooo-build-1.3.15-frugalware.patch
--- old-frugalware-current-1/source/xapps/openoffice.org/00-ooo-build-1.3.15-frugalware.patch 2005-09-25 13:50:45.000000000 +0200
+++ new-frugalware-current/source/xapps/openoffice.org/00-ooo-build-1.3.15-frugalware.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,140 +0,0 @@
-diff -Naur ooo-build-1.3.8.orig/bin/package-ooo ooo-build-1.3.8/bin/package-ooo
---- ooo-build-1.3.8.orig/bin/package-ooo 2004-12-22 15:51:02.000000000 +0100
-+++ ooo-build-1.3.8/bin/package-ooo 2005-02-07 17:19:09.325663648 +0100
-@@ -147,7 +147,7 @@
- cp $TOOLSDIR/desktop/ximian-openoffice-*.png $OODESTDIR/opt/gnome/share/pixmaps
- else
- mkdir -p $PREFIX/share/gnome/ximian/applications
-- cp $TOOLSDIR/desktop/*$BINSUFFIX.desktop $PREFIX/share/gnome/ximian/applications
-+ cp $TOOLSDIR/desktop/*.desktop $PREFIX/share/gnome/ximian/applications
-
- mkdir -p $PREFIX/share/pixmaps
- cp $TOOLSDIR/desktop/ximian-openoffice-*.png $PREFIX/share/pixmaps
-diff -Naur ooo-build-1.3.8.orig/configure ooo-build-1.3.8/configure
---- ooo-build-1.3.8.orig/configure 2005-01-27 12:17:07.000000000 +0100
-+++ ooo-build-1.3.8/configure 2005-02-07 17:16:39.849387496 +0100
-@@ -5367,7 +5367,7 @@
-
- ac_config_files="$ac_config_files intltool-extract intltool-merge intltool-update"
-
-- ac_config_files="$ac_config_files Makefile ooo1.1.spec bin/setup bin/Makefile desktop/Makefile distro-configs/Makefile distro-configs/NLD.conf distro-configs/Win32.conf distro-configs/RH9.conf distro-configs/FedoraCore1.conf distro-configs/FedoraCore2.conf distro-configs/FedoraCore3.conf distro-configs/FedoraCore4.conf distro-configs/RHEL3.conf distro-configs/RHEL4.conf distro-configs/Ark.conf etc/Makefile fonts/Makefile patches/Makefile patches/wpd/Makefile patches/evo2/Makefile patches/gcc34/Makefile patches/vclplug/Makefile patches/mscodec/Makefile patches/OOO_1_1/Makefile patches/OOO_1_1_3/Makefile patches/OOO_1_1_4/Makefile po/Makefile doc/Makefile src/Makefile stamp/Makefile man/Makefile www/Makefile www/images/Makefile www/tinder-scripts/Makefile"
-+ ac_config_files="$ac_config_files Makefile ooo1.1.spec bin/setup bin/Makefile desktop/Makefile distro-configs/Makefile distro-configs/NLD.conf distro-configs/Win32.conf distro-configs/RH9.conf distro-configs/FedoraCore1.conf distro-configs/FedoraCore2.conf distro-configs/FedoraCore3.conf distro-configs/FedoraCore4.conf distro-configs/RHEL3.conf distro-configs/RHEL4.conf distro-configs/Ark.conf distro-configs/Frugalware.conf etc/Makefile fonts/Makefile patches/Makefile patches/wpd/Makefile patches/evo2/Makefile patches/gcc34/Makefile patches/vclplug/Makefile patches/mscodec/Makefile patches/OOO_1_1/Makefile patches/OOO_1_1_3/Makefile patches/OOO_1_1_4/Makefile po/Makefile doc/Makefile src/Makefile stamp/Makefile man/Makefile www/Makefile www/images/Makefile www/tinder-scripts/Makefile"
- cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
- # tests run on this system so they can be shared between configure
-@@ -6060,6 +6060,7 @@
- "distro-configs/RHEL3.conf" ) CONFIG_FILES="$CONFIG_FILES distro-configs/RHEL3.conf" ;;
- "distro-configs/RHEL4.conf" ) CONFIG_FILES="$CONFIG_FILES distro-configs/RHEL4.conf" ;;
- "distro-configs/Ark.conf" ) CONFIG_FILES="$CONFIG_FILES distro-configs/Ark.conf" ;;
-+ "distro-configs/Frugalware.conf" ) CONFIG_FILES="$CONFIG_FILES distro-configs/Frugalware.conf" ;;
- "etc/Makefile" ) CONFIG_FILES="$CONFIG_FILES etc/Makefile" ;;
- "fonts/Makefile" ) CONFIG_FILES="$CONFIG_FILES fonts/Makefile" ;;
- "patches/Makefile" ) CONFIG_FILES="$CONFIG_FILES patches/Makefile" ;;
-diff -Naur ooo-build-1.3.8.orig/configure.in ooo-build-1.3.8/configure.in
---- ooo-build-1.3.8.orig/configure.in 2005-01-26 12:38:08.000000000 +0100
-+++ ooo-build-1.3.8/configure.in 2005-02-07 17:16:39.858386128 +0100
-@@ -624,6 +624,7 @@
- distro-configs/RHEL3.conf
- distro-configs/RHEL4.conf
- distro-configs/Ark.conf
-+distro-configs/Frugalware.conf
- etc/Makefile
- fonts/Makefile
- patches/Makefile
-diff -Naur ooo-build-1.3.8.orig/distro-configs/Frugalware.conf.in ooo-build-1.3.8/distro-configs/Frugalware.conf.in
---- ooo-build-1.3.8.orig/distro-configs/Frugalware.conf.in 1970-01-01 01:00:00.000000000 +0100
-+++ ooo-build-1.3.8/distro-configs/Frugalware.conf.in 2005-02-07 17:20:01.784688664 +0100
-@@ -0,0 +1,17 @@
-+--with-lang=ALL
-+--enable-libart
-+--enable-libsn
-+--enable-crashdump=no
-+--without-fonts
-+--disable-rpath
-+--with-system-zlib
-+--enable-fontconfig
-+--with-system-freetype
-+--disable-mozilla
-+--enable-kde
-+--enable-gtk
-+--disable-java
-+--with-system-gcc=yes
-+--with-ccache-allowed
-+--with-system-db-version=4.3
-+--without-binsuffix
-diff -Naur ooo-build-1.3.8.orig/distro-configs/Makefile.in ooo-build-1.3.8/distro-configs/Makefile.in
---- ooo-build-1.3.8.orig/distro-configs/Makefile.in 2005-01-27 12:17:03.000000000 +0100
-+++ ooo-build-1.3.8/distro-configs/Makefile.in 2005-02-07 17:16:39.859385976 +0100
-@@ -39,7 +39,7 @@
- $(srcdir)/FedoraCore4.conf.in $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in $(srcdir)/NLD.conf.in \
- $(srcdir)/RH9.conf.in $(srcdir)/RHEL3.conf.in \
-- $(srcdir)/RHEL4.conf.in $(srcdir)/Win32.conf.in
-+ $(srcdir)/RHEL4.conf.in $(srcdir)/Frugalware.conf.in $(srcdir)/Win32.conf.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-@@ -47,7 +47,7 @@
- mkinstalldirs = $(mkdir_p)
- CONFIG_CLEAN_FILES = NLD.conf RH9.conf FedoraCore1.conf \
- FedoraCore2.conf FedoraCore3.conf FedoraCore4.conf RHEL3.conf \
-- RHEL4.conf Ark.conf
-+ RHEL4.conf Ark.conf Frugalware.conf
- SOURCES =
- DIST_SOURCES =
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-@@ -226,6 +226,8 @@
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
- Ark.conf: $(top_builddir)/config.status $(srcdir)/Ark.conf.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-+Frugalware.conf: $(top_builddir)/config.status $(srcdir)/Frugalware.conf.in
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
- uninstall-info-am:
- tags: TAGS
- TAGS:
-diff -Naur ooo-build-1.3.8.orig/patches/OOO_1_1/frugalware.diff ooo-build-1.3.8/patches/OOO_1_1/frugalware.diff
---- ooo-build-1.3.8.orig/patches/OOO_1_1/frugalware.diff 1970-01-01 01:00:00.000000000 +0100
-+++ ooo-build-1.3.8/patches/OOO_1_1/frugalware.diff 2005-02-07 17:16:39.860385824 +0100
-@@ -0,0 +1,22 @@
-+--- offmgr/source/offapp/intro/ooo.src.orig 2004-09-09 17:57:08.000000000 +0200
-++++ offmgr/source/offapp/intro/ooo.src 2005-02-04 15:52:52.166921568 +0100
-+@@ -76,8 +76,8 @@
-+ #include "app.hrc"
-+ #include "intro.hrc"
-+
-+-#ifdef BUILD_SPECIAL
-+-#define OOO_VENDOR "Sun Microsystems Inc."
-++#if 1
-++#define OOO_VENDOR "Frugalware Linux"
-+ #define OOO_LICENSE "LGPL"
-+ #define OOO_INTRO "openintro_sun.bmp"
-+ #else
-+@@ -172,7 +172,7 @@
-+ Text[ hindi ] ="Copyright 2004 Sun Microsystems Inc.\nThis product has been created by " OOO_VENDOR " based on OpenOffice.org using the " OOO_LICENSE ".\nOpenOffice.org acknowledges all community members, especially those mentioned at http://www.openoffice.org/welcome/credits.html.";
-+ Text[ slovak ] ="Copyright 2004 Sun Microsystems Inc.\nTento produkt bol vytvorený " OOO_VENDOR " založený na OpenOffice.org s použitÃm " OOO_LICENSE ".\nOpenOffice.org Äakuje vÅ¡etkým Älenom komunity, zvlášť tým, ktorà sú uvedenà na http://www.openoffice.org/welcome/credits.html.";
-+ WordBreak = TRUE ;
-+- Text[ hungarian ] = "Copyright 2004. Sun Microsystems Inc.\nEzen terméket az " OOO_VENDOR " készÃtette az OpenOffice.org alapján, az " OOO_LICENSE " felhasználásával.\nAz OpenOffice.org minden közösségi tag hozzájárulását nagyra értékeli, fÅ‘ként a http://www.openoffice.org/welcome/credits.html lapon szereplÅ‘két.";
-++ Text[ hungarian ] = "Copyright 2004. Sun Microsystems Inc.\nEzen terméket a " OOO_VENDOR " készÃtette az OpenOffice.org alapján, az " OOO_LICENSE " felhasználásával.\nAz OpenOffice.org minden közösségi tag hozzájárulását nagyra értékeli, fÅ‘ként a http://www.openoffice.org/welcome/credits.html lapon szereplÅ‘két.";
-+ Text[ slovenian ] = "Copyright 2004 Sun Microsystems Inc.\nTa izdelek je nastal s pomoÄjo prispevkov skupnosti OpenOffice.org, katere ustanovitelj je podjetje Sun Microsystems Inc.\nOpenOffice.org se zahvaljuje vsem Älanom skupnosti, posebej pa tistim, ki so omenjeni na strani http://www.openoffice.org/welcome/credits.html.";
-+ Text[ catalan ] = "Copyright 2004 Sun Microsystems Inc. Traducció de Softcatalà.\nAquest producte s'ha creat amb les contribucions de la comunitat d'OpenOffice.org, de la qual Sun Microsystem Inc. n'és el membre fundador.\nOpenOffice.org reconeix especialment la feina de: http://www.openoffice.org/welcome/credits.html.";
-+ Text[ estonian ] = "Autoriõigus 2003 Sun Microsystems Inc.\nEestindatud OpenOffice.org põhineb OpenOffice.org-i lähtetekstil vastavalt litsentsis LGPL toodud tingimustele.\nEestinduse loojaks on OpenOffice.org-i eestindamise meeskond:\n\nhttp://openoffice-et.sourceforge.net/\n\nOpenOffice.org tunnustab kõiki kogukonna liikmeid, eriti aga neid, kes on mainitud aadressil http://www.openoffice.org/welcome/credits.html.";
-diff -Naur ooo-build-1.3.8.orig/patches/OOO_1_1_4/apply ooo-build-1.3.8/patches/OOO_1_1_4/apply
---- ooo-build-1.3.8.orig/patches/OOO_1_1_4/apply 2005-01-27 12:10:22.000000000 +0100
-+++ ooo-build-1.3.8/patches/OOO_1_1_4/apply 2005-02-07 17:16:39.861385672 +0100
-@@ -33,6 +33,7 @@
- PLD : PLDOnly, LinuxCommon, FilePickers, KDECommon, GlobalDesktopFiles, NonArkCommon, NoRpath
- KDE : LinuxCommon, FilePickers, KDEOnly, NoRpath
- Ark : ArkOnly, LinuxCommon, FilePickers, GlobalDesktopFiles, Gcc34, NoRpath, IndicFixes, MSCodec
-+Frugalware : LinuxCommon, FilePickers, GnomeVFS, GlobalDesktopFiles, NonArkCommon, Evo2, NoRpath, NovellOnly, GentooOnly, Gcc34, FrugalwareOnly
- Gentoo : LinuxCommon, FilePickers, GlobalDesktopFiles, NonArkCommon, Gcc34, GentooOnly, NoRpath
- GentooGNOME : Gentoo, GnomeVFS, NovellOnly
- GentooKDE : Gentoo, KDECommon
-@@ -1330,5 +1330,8 @@
- layout-vcl-window.diff
- layout-test.diff
-
-+[ FrugalwareOnly ]
-+frugalware.diff
-+
- [ Security ]
- cws-heapbug_CAN-2005-0941.diff
diff -rN -u old-frugalware-current-1/source/xapps/openoffice.org/FrugalBuild new-frugalware-current/source/xapps/openoffice.org/FrugalBuild
--- old-frugalware-current-1/source/xapps/openoffice.org/FrugalBuild 2005-09-25 13:50:45.000000000 +0200
+++ new-frugalware-current/source/xapps/openoffice.org/FrugalBuild 2005-09-25 13:08:45.000000000 +0200
@@ -1,60 +1,60 @@
-# Last modified: Tue, 02 Aug 2005 06:45:20 +0200
+# Last modified: Sun, 25 Sep 2005 12:58:32 +0200
# Compiling time: ~36 hours on factory.frugalware.org
# Maintainer: Laszlo Dvornik <dvornik at gnome.hu>
pkgname=openoffice.org
-pkgver=1.3.15
+pkgver=1.3.16
pkgrel=1
pkgdesc="OpenOffice.org, a full office productivity suite"
url="http://ooo.ximian.com/"
depends=('db>=4.3' 'perl' 'gtk+2' 'gnome-vfs' 'libxml2' 'libart_lgpl' \
'startup-notification' 'fontconfig' 'libpng' 'imagemagick' 'flex' \
'bison' 'zip' 'unzip' 'expat' 'cups' 'desktop-file-utils')
-makedepends=('findutils' 'curl' 'intltool' 'tcsh' 'gcc' 'pam-headers' 'qt' \
- 'kdelibs' 'evolution-data-server')
+makedepends=('findutils' 'curl' 'intltool' 'tcsh' 'pam-headers' 'qt' \
+ 'kdelibs' 'evolution-data-server' 'util-linux')
+backup=('usr/lib/ooo-1.1/share/dict/ooo/dictionary.lst')
groups=('xapps')
archs=('i686')
-install=$pkgname.install
-up2date="lynx -dump http://ooo.ximian.com/packages/OOO_1_1_4/|grep tar.gz$|sed -n 's/.*-\(.*\)\.t.*/\1/;$ p'"
-source=(http://ooo.ximian.com/packages/OOO_1_1_4/ooo-build-$pkgver.tar.gz \
- http://ooo.ximian.com/packages/OOO_1_1_4/OOO_1_1_4.tar.bz2 \
- http://go-oo.org/packages/libwpd/libwpd-0.8.0.tar.gz \
+up2date="lynx -dump http://ooo.ximian.com/packages/OOO_1_1_5/|grep tar.gz$|sed -n 's/.*-\(.*\)\.t.*/\1/;$ p'"
+source=(http://ooo.ximian.com/packages/OOO_1_1_5/ooo-build-$pkgver.tar.gz \
+ http://ooo.ximian.com/packages/OOO_1_1_5/OOO_1_1_5.tar.bz2 \
+ http://go-oo.org/packages/libwpd/libwpd-0.8.2.tar.gz \
http://ooo.ximian.com/packages/ooo-icons-OOO_1_1-10.tar.gz \
- 00-ooo-build-$pkgver-frugalware.patch \
+ ooo-build-$pkgver-frugalware.patch \
dictionary.lst \
ooo.applications \
ooo.keys \
$pkgname-i18n.desc
$pkgname.install \
$pkgname-kde-menu.tar.bz2)
-md5sums=('3583d4ff4e3b232008af270656aaa0f3' \
- '7b0e155a91bbbd5c1ce301fb9f06cb26' \
- '98e59beecc112339bb78654863304c1c' \
- 'be79d3cb5f64d2c0ac8a75e65a59cb09' \
- '14070bc7e36fcdda2e13d86ab91eb22e' \
- '71a6d682ae2532a2a9af8894455a5512' \
- '4b1d023eb71526008e3b4a0e8796e4ef' \
- 'eb5c14d37a385786f19038782fa0af5c' \
- '2f95c311b83357d45c2c7c938604502e' \
- '45a9c321ce19a9fd38f0071602d2d160' \
- '7407987ebc37fb03a1fdd8ef524df572')
+sha1sums=('1ea1558d2fffa12b8980afe8373e7eadf06398e6' \
+ 'a6e36610fe4cd5242bf49bb6733a98b2ba9d6bc3' \
+ '8eb400f4e26db6333fb418051ae0cc98fe648797' \
+ '1e7b35e9adf8e51c90b43728f23af49685bf47c2' \
+ '29f916f1ea401389accb4f197e5703de6e9290ae' \
+ 'e83814a2a3e1425892309167de6172189ff26268' \
+ 'fdb8d5b9869e6363fe92d24cd4427f9e8e1cbcc2' \
+ 'e31a1b937707007b90731e809ab8947429d645be' \
+ 'f228032668b1466091eddaef20f23662fdf024a9' \
+ '458a718d106e852cb48c7f7a37f4b855f2bf8ed6' \
+ 'b35713e1a7038b8c7d4de0a29712d1c343bc79bc')
build() {
# Note: Requires a running X server for building.
# Move downloaded tarballs to the correct location. With this
# ooo-build won't download the tarballs again.
- mv $startdir/src/OOO_1_1_4.tar.bz2 $startdir/src/ooo-build-$pkgver/src
- mv $startdir/src/libwpd-0.8.0.tar.gz $startdir/src/ooo-build-$pkgver/src
+ mv $startdir/src/OOO_1_1_5.tar.bz2 $startdir/src/ooo-build-$pkgver/src
+ mv $startdir/src/libwpd-0.8.2.tar.gz $startdir/src/ooo-build-$pkgver/src
mv $startdir/src/ooo-icons-OOO_1_1-10.tar.gz $startdir/src/ooo-build-$pkgver/src
# Remove the extracted directories, because ooo-build will extract
# the tarballs.
- rm -rf libwpd-0.8.0
- rm -rf OOO_1_1_4
+ rm -rf libwpd-0.8.2
+ rm -rf OOO_1_1_5
rm -rf ooo-icons-OOO_1_1-10
- cd $startdir/src/ooo-build-$pkgver
- patch -p1 < $startdir/src/00-ooo-build-$pkgver-frugalware.patch || return 1
+ Fcd ooo-build-$pkgver
+ Fpatch ooo-build-$pkgver-frugalware.patch
./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/man \
--with-docdir=/usr/share/doc/$pkgname-$pkgver \
--with-lang=ALL --enable-libart --enable-libsn \
diff -rN -u old-frugalware-current-1/source/xapps/openoffice.org/ooo-build-1.3.16-frugalware.patch new-frugalware-current/source/xapps/openoffice.org/ooo-build-1.3.16-frugalware.patch
--- old-frugalware-current-1/source/xapps/openoffice.org/ooo-build-1.3.16-frugalware.patch 1970-01-01 01:00:00.000000000 +0100
+++ new-frugalware-current/source/xapps/openoffice.org/ooo-build-1.3.16-frugalware.patch 2005-09-25 13:08:45.000000000 +0200
@@ -0,0 +1,161 @@
+diff -Naur ooo-build-1.3.8.orig/bin/package-ooo ooo-build-1.3.8/bin/package-ooo
+--- ooo-build-1.3.8.orig/bin/package-ooo 2004-12-22 15:51:02.000000000 +0100
++++ ooo-build-1.3.8/bin/package-ooo 2005-02-07 17:19:09.325663648 +0100
+@@ -147,7 +147,7 @@
+ cp $TOOLSDIR/desktop/ximian-openoffice-*.png $OODESTDIR/opt/gnome/share/pixmaps
+ else
+ mkdir -p $PREFIX/share/gnome/ximian/applications
+- cp $TOOLSDIR/desktop/*$BINSUFFIX.desktop $PREFIX/share/gnome/ximian/applications
++ cp $TOOLSDIR/desktop/*.desktop $PREFIX/share/gnome/ximian/applications
+
+ mkdir -p $PREFIX/share/pixmaps
+ cp $TOOLSDIR/desktop/ximian-openoffice-*.png $PREFIX/share/pixmaps
+diff -Naur ooo-build-1.3.8.orig/configure ooo-build-1.3.8/configure
+--- ooo-build-1.3.8.orig/configure 2005-01-27 12:17:07.000000000 +0100
++++ ooo-build-1.3.8/configure 2005-02-07 17:16:39.849387496 +0100
+@@ -5367,7 +5367,7 @@
+
+ ac_config_files="$ac_config_files intltool-extract intltool-merge intltool-update"
+
+- ac_config_files="$ac_config_files Makefile ooo1.1.spec bin/setup bin/Makefile desktop/Makefile distro-configs/Makefile distro-configs/NLD.conf distro-configs/Win32.conf distro-configs/RH9.conf distro-configs/FedoraCore1.conf distro-configs/FedoraCore2.conf distro-configs/FedoraCore3.conf distro-configs/FedoraCore4.conf distro-configs/RHEL3.conf distro-configs/RHEL4.conf distro-configs/Ark.conf etc/Makefile fonts/Makefile patches/Makefile patches/wpd/Makefile patches/evo2/Makefile patches/gcc34/Makefile patches/vclplug/Makefile patches/mscodec/Makefile patches/OOO_1_1/Makefile patches/OOO_1_1_4/Makefile patches/OOO_1_1_5/Makefile po/Makefile doc/Makefile src/Makefile stamp/Makefile man/Makefile www/Makefile www/images/Makefile www/tinder-scripts/Makefile"
++ ac_config_files="$ac_config_files Makefile ooo1.1.spec bin/setup bin/Makefile desktop/Makefile distro-configs/Makefile distro-configs/NLD.conf distro-configs/Win32.conf distro-configs/RH9.conf distro-configs/FedoraCore1.conf distro-configs/FedoraCore2.conf distro-configs/FedoraCore3.conf distro-configs/FedoraCore4.conf distro-configs/RHEL3.conf distro-configs/RHEL4.conf distro-configs/Ark.conf distro-configs/Frugalware.conf etc/Makefile fonts/Makefile patches/Makefile patches/wpd/Makefile patches/evo2/Makefile patches/gcc34/Makefile patches/vclplug/Makefile patches/mscodec/Makefile patches/OOO_1_1/Makefile patches/OOO_1_1_4/Makefile patches/OOO_1_1_5/Makefile po/Makefile doc/Makefile src/Makefile stamp/Makefile man/Makefile www/Makefile www/images/Makefile www/tinder-scripts/Makefile"
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+ # tests run on this system so they can be shared between configure
+@@ -6060,6 +6060,7 @@
+ "distro-configs/RHEL3.conf" ) CONFIG_FILES="$CONFIG_FILES distro-configs/RHEL3.conf" ;;
+ "distro-configs/RHEL4.conf" ) CONFIG_FILES="$CONFIG_FILES distro-configs/RHEL4.conf" ;;
+ "distro-configs/Ark.conf" ) CONFIG_FILES="$CONFIG_FILES distro-configs/Ark.conf" ;;
++ "distro-configs/Frugalware.conf" ) CONFIG_FILES="$CONFIG_FILES distro-configs/Frugalware.conf" ;;
+ "etc/Makefile" ) CONFIG_FILES="$CONFIG_FILES etc/Makefile" ;;
+ "fonts/Makefile" ) CONFIG_FILES="$CONFIG_FILES fonts/Makefile" ;;
+ "patches/Makefile" ) CONFIG_FILES="$CONFIG_FILES patches/Makefile" ;;
+diff -Naur ooo-build-1.3.8.orig/configure.in ooo-build-1.3.8/configure.in
+--- ooo-build-1.3.8.orig/configure.in 2005-01-26 12:38:08.000000000 +0100
++++ ooo-build-1.3.8/configure.in 2005-02-07 17:16:39.858386128 +0100
+@@ -624,6 +624,7 @@
+ distro-configs/RHEL3.conf
+ distro-configs/RHEL4.conf
+ distro-configs/Ark.conf
++distro-configs/Frugalware.conf
+ etc/Makefile
+ fonts/Makefile
+ patches/Makefile
+diff -Naur ooo-build-1.3.8.orig/distro-configs/Frugalware.conf.in ooo-build-1.3.8/distro-configs/Frugalware.conf.in
+--- ooo-build-1.3.8.orig/distro-configs/Frugalware.conf.in 1970-01-01 01:00:00.000000000 +0100
++++ ooo-build-1.3.8/distro-configs/Frugalware.conf.in 2005-02-07 17:20:01.784688664 +0100
+@@ -0,0 +1,17 @@
++--with-lang=ALL
++--enable-libart
++--enable-libsn
++--enable-crashdump=no
++--without-fonts
++--disable-rpath
++--with-system-zlib
++--enable-fontconfig
++--with-system-freetype
++--disable-mozilla
++--enable-kde
++--enable-gtk
++--disable-java
++--with-system-gcc=yes
++--with-ccache-allowed
++--with-system-db-version=4.3
++--without-binsuffix
+diff -Naur ooo-build-1.3.8.orig/distro-configs/Makefile.in ooo-build-1.3.8/distro-configs/Makefile.in
+--- ooo-build-1.3.8.orig/distro-configs/Makefile.in 2005-01-27 12:17:03.000000000 +0100
++++ ooo-build-1.3.8/distro-configs/Makefile.in 2005-02-07 17:16:39.859385976 +0100
+@@ -39,7 +39,7 @@
+ $(srcdir)/FedoraCore4.conf.in $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in $(srcdir)/NLD.conf.in \
+ $(srcdir)/RH9.conf.in $(srcdir)/RHEL3.conf.in \
+- $(srcdir)/RHEL4.conf.in $(srcdir)/Win32.conf.in
++ $(srcdir)/RHEL4.conf.in $(srcdir)/Frugalware.conf.in $(srcdir)/Win32.conf.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+@@ -47,7 +47,7 @@
+ mkinstalldirs = $(mkdir_p)
+ CONFIG_CLEAN_FILES = NLD.conf RH9.conf FedoraCore1.conf \
+ FedoraCore2.conf FedoraCore3.conf FedoraCore4.conf RHEL3.conf \
+- RHEL4.conf Ark.conf
++ RHEL4.conf Ark.conf Frugalware.conf
+ SOURCES =
+ DIST_SOURCES =
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+@@ -226,6 +226,8 @@
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ Ark.conf: $(top_builddir)/config.status $(srcdir)/Ark.conf.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
++Frugalware.conf: $(top_builddir)/config.status $(srcdir)/Frugalware.conf.in
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ uninstall-info-am:
+ tags: TAGS
+ TAGS:
+diff -Naur ooo-build-1.3.8.orig/patches/OOO_1_1/frugalware.diff ooo-build-1.3.8/patches/OOO_1_1/frugalware.diff
+--- ooo-build-1.3.8.orig/patches/OOO_1_1/frugalware.diff 1970-01-01 01:00:00.000000000 +0100
++++ ooo-build-1.3.8/patches/OOO_1_1/frugalware.diff 2005-02-07 17:16:39.860385824 +0100
+@@ -0,0 +1,22 @@
++--- offmgr/source/offapp/intro/ooo.src.orig 2004-09-09 17:57:08.000000000 +0200
+++++ offmgr/source/offapp/intro/ooo.src 2005-02-04 15:52:52.166921568 +0100
++@@ -76,8 +76,8 @@
++ #include "app.hrc"
++ #include "intro.hrc"
++
++-#ifdef BUILD_SPECIAL
++-#define OOO_VENDOR "Sun Microsystems Inc."
+++#if 1
+++#define OOO_VENDOR "Frugalware Linux"
++ #define OOO_LICENSE "LGPL"
++ #define OOO_INTRO "openintro_sun.bmp"
++ #else
++@@ -172,7 +172,7 @@
++ Text[ hindi ] ="Copyright 2004 Sun Microsystems Inc.\nThis product has been created by " OOO_VENDOR " based on OpenOffice.org using the " OOO_LICENSE ".\nOpenOffice.org acknowledges all community members, especially those mentioned at http://www.openoffice.org/welcome/credits.html.";
++ Text[ slovak ] ="Copyright 2004 Sun Microsystems Inc.\nTento produkt bol vytvorený " OOO_VENDOR " založený na OpenOffice.org s použitÃm " OOO_LICENSE ".\nOpenOffice.org Äakuje vÅ¡etkým Älenom komunity, zvlášť tým, ktorà sú uvedenà na http://www.openoffice.org/welcome/credits.html.";
++ WordBreak = TRUE ;
++- Text[ hungarian ] = "Copyright 2004. Sun Microsystems Inc.\nEzen terméket az " OOO_VENDOR " készÃtette az OpenOffice.org alapján, az " OOO_LICENSE " felhasználásával.\nAz OpenOffice.org minden közösségi tag hozzájárulását nagyra értékeli, fÅ‘ként a http://www.openoffice.org/welcome/credits.html lapon szereplÅ‘két.";
+++ Text[ hungarian ] = "Copyright 2004. Sun Microsystems Inc.\nEzen terméket a " OOO_VENDOR " készÃtette az OpenOffice.org alapján, az " OOO_LICENSE " felhasználásával.\nAz OpenOffice.org minden közösségi tag hozzájárulását nagyra értékeli, fÅ‘ként a http://www.openoffice.org/welcome/credits.html lapon szereplÅ‘két.";
++ Text[ slovenian ] = "Copyright 2004 Sun Microsystems Inc.\nTa izdelek je nastal s pomoÄjo prispevkov skupnosti OpenOffice.org, katere ustanovitelj je podjetje Sun Microsystems Inc.\nOpenOffice.org se zahvaljuje vsem Älanom skupnosti, posebej pa tistim, ki so omenjeni na strani http://www.openoffice.org/welcome/credits.html.";
++ Text[ catalan ] = "Copyright 2004 Sun Microsystems Inc. Traducció de Softcatalà.\nAquest producte s'ha creat amb les contribucions de la comunitat d'OpenOffice.org, de la qual Sun Microsystem Inc. n'és el membre fundador.\nOpenOffice.org reconeix especialment la feina de: http://www.openoffice.org/welcome/credits.html.";
++ Text[ estonian ] = "Autoriõigus 2003 Sun Microsystems Inc.\nEestindatud OpenOffice.org põhineb OpenOffice.org-i lähtetekstil vastavalt litsentsis LGPL toodud tingimustele.\nEestinduse loojaks on OpenOffice.org-i eestindamise meeskond:\n\nhttp://openoffice-et.sourceforge.net/\n\nOpenOffice.org tunnustab kõiki kogukonna liikmeid, eriti aga neid, kes on mainitud aadressil http://www.openoffice.org/welcome/credits.html.";
+diff -Naur ooo-build-1.3.8.orig/patches/OOO_1_1_4/apply ooo-build-1.3.8/patches/OOO_1_1_4/apply
+--- ooo-build-1.3.8.orig/patches/OOO_1_1_4/apply 2005-01-27 12:10:22.000000000 +0100
++++ ooo-build-1.3.8/patches/OOO_1_1_4/apply 2005-02-07 17:16:39.861385672 +0100
+@@ -33,6 +33,7 @@
+ PLD : PLDOnly, LinuxCommon, FilePickers, KDECommon, GlobalDesktopFiles, NonArkCommon, NoRpath
+ KDE : LinuxCommon, FilePickers, KDEOnly, NoRpath
+ Ark : ArkOnly, LinuxCommon, FilePickers, GlobalDesktopFiles, Gcc34, NoRpath, IndicFixes, MSCodec
++Frugalware : LinuxCommon, FilePickers, GnomeVFS, GlobalDesktopFiles, NonArkCommon, Evo2, NoRpath, NovellOnly, Gcc34, FrugalwareOnly
+ Gentoo : LinuxCommon, FilePickers, GlobalDesktopFiles, NonArkCommon, Gcc34, GentooOnly, NoRpath
+ GentooGNOME : Gentoo, GnomeVFS, NovellOnly
+ GentooKDE : Gentoo, KDECommon
+@@ -1330,5 +1330,8 @@
+ layout-vcl-window.diff
+ layout-test.diff
+
++[ FrugalwareOnly ]
++frugalware.diff
++
+ [ Security ]
+ cws-heapbug_CAN-2005-0941.diff
+diff -Naur ooo-build-1.3.16.orig/patches/OOO_1_1_4/apply ooo-build-1.3.16/patches/OOO_1_1_4/apply
+--- ooo-build-1.3.16.orig/patches/OOO_1_1_5/apply 2005-01-27 12:10:22.000000000 +0100
++++ ooo-build-1.3.16/patches/OOO_1_1_5/apply 2005-02-07 17:16:39.861385672 +0100
+@@ -33,6 +33,7 @@
+ PLD : PLDOnly, LinuxCommon, FilePickers, KDECommon, GlobalDesktopFiles, NonArkCommon, NoRpath
+ KDE : LinuxCommon, FilePickers, KDEOnly, NoRpath
+ Ark : ArkOnly, LinuxCommon, FilePickers, GlobalDesktopFiles, Gcc34, NoRpath, IndicFixes, MSCodec
++Frugalware : LinuxCommon, FilePickers, GnomeVFS, GlobalDesktopFiles, NonArkCommon, Evo2, NoRpath, NovellOnly, Gcc34, FrugalwareOnly
+ Gentoo : LinuxCommon, FilePickers, GlobalDesktopFiles, NonArkCommon, Gcc34, GentooOnly, NoRpath
+ GentooGNOME : Gentoo, GnomeVFS, NovellOnly
+ GentooKDE : Gentoo, KDECommon
+@@ -707,6 +708,9 @@
+ # recognize dmake 4.3
+ dmake43.diff
+
++[ FrugalwareOnly ]
++frugalware.diff
++
+ [ Misc ]
+ # <ctrl> +/- to insert/delete a complete line in calc (X#62530) #38108
+ calc-new-acceleration.diff
More information about the Frugalware-darcs
mailing list