--- ooo-build-3.0.0.9/Makefile.shared.alt 2008-11-20 18:52:39 +0300 +++ ooo-build-3.0.0.9/Makefile.shared 2008-11-21 21:32:58 +0300 @@ -94,7 +94,6 @@ $(STAMP_DIR)/build : $(OOBUILDDIR)/unpac $(STAMP_DIR)/artwork.install \ $(STAMP_DIR)/build.tools \ $(STAMP_DIR)/prebuild - cd $(top_srcdir)/bin ; ./build-ooo touch $@ all: build --- ooo-build-3.0.0.9/configure.in.alt 2008-11-20 23:42:43 +0300 +++ ooo-build-3.0.0.9/configure.in 2008-11-21 21:32:58 +0300 @@ -585,6 +585,7 @@ AC_SUBST(DISTRO) AC_MSG_CHECKING([for vendor name based on the distribution name]) VENDORNAME=OpenOffice case $DISTRO in + ALTLinux*) VENDORNAME="ALT Linux Team" ;; Ark*) VENDORNAME="Ark" ;; Debian*|Ubuntu*) VENDORNAME="Debian" ;; Dropline*) VENDORNAME="DroplineGNOME" ;; @@ -1368,6 +1369,7 @@ desktop/mimetypes/24x24/Makefile desktop/mimetypes/32x32/Makefile desktop/mimetypes/48x48/Makefile distro-configs/Makefile +distro-configs/ALTLinux.conf distro-configs/Ark.conf distro-configs/Common.conf distro-configs/CommonLinux.conf --- ooo-build-3.0.0.9/distro-configs/ALTLinux.conf.in.alt 2008-11-21 21:32:58 +0300 +++ ooo-build-3.0.0.9/distro-configs/ALTLinux.conf.in 2008-11-21 21:32:58 +0300 @@ -0,0 +1,53 @@ +--with-vendor=\"ALT Linux Team\" +--disable-epm +--disable-odk +--disable-qadevooo +--disable-fontooo +--disable-mono +--without-fonts +--without-afms +--without-agfa-monotype-fonts +--without-agg +--without-myspell-dicts +--enable-kde +--enable-vba +--enable-evolution2 +--enable-lockdown +--enable-opengl +--enable-ogltrans +--enable-dbus +--enable-pam-link +--enable-xrender-link +--enable-cairo +--enable-scsolver +--enable-gio +--enable-wiki-publisher +--enable-pdfimport +--enable-report-builder +--with-alloc=system +--with-vba-package-format="builtin" +--with-openldap +--with-system-mozilla=mozilla +--with-system-db +--with-system-stdlibs +--with-system-zlib +--with-system-jpeg +--with-system-expat +--with-system-libwpd +--with-system_libwpg +--with-system-libxml +--with-system-python +--with-system-libxslt +--with-system-curl +--with-system-boost +--with-system-neon +--with-system-icu +--with-system-cairo +--with-system-openssl +--with-system-hunspell +--with-system-poppler +--with-system-sane-headers +--with-system-xrender-headers +--with-system-odbc-headers +--with-system-mesa-headers +--with-system-dicts --- ooo-build-3.0.0.9/patches/dev300/apply.alt 2008-11-20 13:59:49 +0300 +++ ooo-build-3.0.0.9/patches/dev300/apply 2008-11-21 22:19:53 +0300 @@ -89,6 +89,8 @@ Ubuntu64 : UbuntuBased, UbuntuDapperOnly # DroplineGNOME DroplineGNOME : LinuxCommon, DroplineGNOMEOnly, NotDebian, Mono, msaccess DroplineGNOME64 : LinuxCommon, DroplineGNOMEOnly, NotDebian, Mono, msaccess +# ALTLinux +ALTLinux: LinuxCommon, NotDebian, BerkeleyDB43, Gcc43, CairoFonts, LockDown, CalcSolver, PostgreSQL, Shrink, EMFPlus # Ark Linux Ark: LinuxCommon, NotDebian, ArkOnly, BerkeleyDB43, Gcc43, KDE4 # www.pld-linux.org @@ -347,7 +349,7 @@ debug-bits.diff, i#35336, jholesov gui-sw-scroll.diff, i#20826, michael # make menu layout prettier -vcl-menu-fixes.diff, i#67123, michael +#vcl-menu-fixes.diff, i#67123, michael [ FixesNotForUpstream < dev300-m31 < ooo300-m5 ] # Tell the desktop we support the VFS @@ -894,7 +896,7 @@ svtools-unsort-template-dialogentries.di desktop-cmdhelp-stdout.diff, kohei # always enable file save even when the document is not modified. -sfx2-always-allow-save-document.diff, n#347423, i#5226, kohei +#sfx2-always-allow-save-document.diff, n#347423, i#5226, kohei # Adjust scroll speed while extending selection beyoud visible sheet area. scroll-accel-sc.diff, n#375909, i#71362, kohei @@ -1404,7 +1406,7 @@ vcl-bigger-icons-kde-gnome.diff, i#95220 [ TangoIcons ] # default to large icons in the toolbar -gui-toolbox-large-icons.diff, jholesov +#gui-toolbox-large-icons.diff, jholesov # use it by default under Win32 tango-icons-default-w32.diff, n#254855, pmladek @@ -1469,12 +1471,12 @@ fpicker-kde-less-threads.diff, n#427336, [ AddressBooks ] # Evolution should also be default database(n#66217). -default-evolution-database.diff, michael +#default-evolution-database.diff, michael # Mailmerge column mapping by default (n#73627) -default-evo-column-mapping.diff, michael +#default-evo-column-mapping.diff, michael # NB. when this cws goes up-stream we need to enable this -default-evo2-ab.diff, michael +#default-evo2-ab.diff, michael [ Lwp ] @@ -2205,30 +2207,30 @@ layout-tab-toolkit.diff layout-tab-sfx2.diff layout-tab-sc.diff layout-tab-scp2.diff -layout-tab-svx.diff +#layout-tab-svx.diff # convert some simple dialogs to layout engine -layout-simple-dialogs-offapi.diff -layout-simple-dialogs-sc.diff -layout-simple-dialogs-scp2.diff -layout-simple-dialogs-scripting.diff -layout-simple-dialogs-sd.diff -layout-simple-dialogs-sfx2.diff -layout-simple-dialogs-solenv.diff -layout-simple-dialogs-starmath.diff -layout-simple-dialogs-svx.diff -layout-simple-dialogs-sw.diff -layout-simple-dialogs-toolkit.diff -layout-simple-dialogs-vcl.diff -layout-tab-sfx2-fix.diff, thorsten +#layout-simple-dialogs-offapi.diff +#layout-simple-dialogs-sc.diff +#layout-simple-dialogs-scp2.diff +#layout-simple-dialogs-scripting.diff +#layout-simple-dialogs-sd.diff +#layout-simple-dialogs-sfx2.diff +#layout-simple-dialogs-solenv.diff +#layout-simple-dialogs-starmath.diff +#layout-simple-dialogs-svx.diff +#layout-simple-dialogs-sw.diff +#layout-simple-dialogs-toolkit.diff +#layout-simple-dialogs-vcl.diff +#layout-tab-sfx2-fix.diff, thorsten # FIXME: hack to avoid internal copiler error with gcc (SUSE Linux) 4.3.2 20080613 (prerelease) # on openSUSE-11.1-alpha0; pmladek is discussing it with the gcc team -toolkit-layout-gcc-4.3.2-hack.diff, pmladek +#toolkit-layout-gcc-4.3.2-hack.diff, pmladek # These merge with the layoutdialogs2 cws -layout-disable-experimental.diff -layoutdialogs2-development.diff +#layout-disable-experimental.diff +#layoutdialogs2-development.diff [ AutoCorrectCapsLock ] SectionOwner => kohei @@ -2887,7 +2889,7 @@ warning-spin-button.diff, i#95554, micha crash-gvfs.diff, i#95689, michael # openjdk contains rhino.jar. breaks the build... -buildfix-openjdk-6-no-rhino.diff +#buildfix-openjdk-6-no-rhino.diff # fix problem with calling private and protected members in layout code sfx2-privateprotectedpublic.diff