Date: Friday, February 4, 2011 @ 01:41:02 Author: andyrtr Revision: 108829
prepare next release; update sources,fix startup wizard patch; build broken http://www.openoffice.org/issues/show_bug.cgi?id=116795 Modified: openoffice-base-devel/trunk/PKGBUILD openoffice-base-devel/trunk/default-no-startup-wizard.diff --------------------------------+ PKGBUILD | 24 ++++++++++++------------ default-no-startup-wizard.diff | 8 ++++---- 2 files changed, 16 insertions(+), 16 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-02-04 01:04:10 UTC (rev 108828) +++ PKGBUILD 2011-02-04 06:41:02 UTC (rev 108829) @@ -4,7 +4,7 @@ pkgbase="openoffice-base-devel" pkgname=('openoffice-base-devel' 'openoffice-sdk-devel') -_OO_milestone=DEV300_m98 +_OO_milestone=DEV300_m99 pkgver=3.4_${_OO_milestone/DEV/dev} pkgrel=1 arch=('i686' 'x86_64') @@ -31,7 +31,7 @@ buildfix_FormulaMissingHeader.diff http://cgit.freedesktop.org/ooo-build/ooo-build/plain/patches/dev300/sal-cpprt-gcc-4.5-workaround.diff cppunit_gcc45.diff - KDESalGraphics_buildfix.diff +# KDESalGraphics_buildfix.diff libx11.diff openoffice.profile ${_additional_source_url}/63ddc5116488985e820075e65fbe6aa4-openssl-0.9.8o.tar.gz @@ -80,13 +80,13 @@ ${_additional_source_url}/abc405d0bdd3ee22782d7aa20e440f08-zlib-1.1.4.tar.gz ${_additional_source_url}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip ${_additional_source_url}/af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz - ${_additional_source_url}/ba1015b59c112d44d7797b62fe7bee51-neon-0.29.3.tar.gz + ${_additional_source_url}/ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz ${_additional_source_url}/bc702168a2af16869201dbe91e46ae48-LICENSE_Python-2.6.1 ${_additional_source_url}/c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz ${_additional_source_url}/ca66e26082cab8bb817185a116db809b-redland-1.0.8.tar.gz ${_additional_source_url}/cd5997284f4ba1e8dde5d1e5869fc342-libwpd-0.8.8.tar.gz - ${_additional_source_url}/d0b5af6e408b8d2958f3d83b5244f5e8-hyphen-2.4.tar.gz - ${_additional_source_url}/d1a3205871c3c52e8a50c9f18510ae12-libformula.zip + ${_additional_source_url}/48a9f787f43a09c0a9b7b00cd1fddbbf-hyphen-2.7.1.tar.gz + ${_additional_source_url}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip ${_additional_source_url}/d35724900f6a4105550293686688bbb3-silgraphite-2.3.1.tar.gz ${_additional_source_url}/d4c4d91ab3a8e52a2e69d48d34ef4df4-core.zip ${_additional_source_url}/d70951c80dabecc2892c919ff5d07172-db-4.7.25.NC-custom.tar.gz @@ -110,16 +110,15 @@ ${_additional_source_url}/cf8a6967f7de535ae257fa411c98eb88-mdds_0.3.0.tar.bz2 ${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip) #options=('!distcc' '!ccache') -md5sums=('6f79df8abccdabab2a3a38f5e78037f2' +md5sums=('1c7dc59f199e738c2d6469148901fc74' 'e3a0b76dcd876f3d721ee7183729153d' 'e1cbc51a71749066200b282d89f698f9' - '71f136a31e296a04ab68932a31dd533e' + '634b9c798d028abc9a2075899a8a8a38' 'c1d61e74909812122ddb1003b7a6d801' '1dc7480a04f572ad136d35923a2af66d' '863a3ab2c17a3d11b8fa3ec321986366' 'cf01fa2669f828864146842e040e3cf8' 'bb5ada95f7b11a5cac5d669f7ae8baaa' - '45e0746ccff33614b35fe56906d7eae4' 'ad01b65e677334e0764ad31f24aee428' '749ea5f5d878baeb64cc6674e6225599' '63ddc5116488985e820075e65fbe6aa4' @@ -168,13 +167,13 @@ 'abc405d0bdd3ee22782d7aa20e440f08' 'ada24d37d8d638b3d8a9985e80bc2978' 'af3c3acf618de6108d65fcdc92b492e1' - 'ba1015b59c112d44d7797b62fe7bee51' + 'ff369e69ef0f0143beb5626164e87ae2' 'bc702168a2af16869201dbe91e46ae48' 'c441926f3a552ed3e5b274b62e86af16' 'ca66e26082cab8bb817185a116db809b' 'cd5997284f4ba1e8dde5d1e5869fc342' - 'd0b5af6e408b8d2958f3d83b5244f5e8' - 'd1a3205871c3c52e8a50c9f18510ae12' + '48a9f787f43a09c0a9b7b00cd1fddbbf' + '3404ab6b1792ae5f16bbd603bd1e1d03' 'd35724900f6a4105550293686688bbb3' 'd4c4d91ab3a8e52a2e69d48d34ef4df4' 'd70951c80dabecc2892c919ff5d07172' @@ -198,6 +197,7 @@ 'cf8a6967f7de535ae257fa411c98eb88' 'ba2930200c9f019c2d93a8c88c651a0f') + # see http://ftp.linux.cz/pub/localization/OpenOffice.org/devel/build/build # source PKGBUILD && time mksource @@ -241,7 +241,7 @@ # fix new libx11 headers - see http://www.openoffice.org/issues/show_bug.cgi?id=115871 | https://bugs.gentoo.org/show_bug.cgi?id=344993 patch -Np0 -i ${srcdir}/libx11.diff # http://www.openoffice.org/issues/show_bug.cgi?id=116562 - patch -Np1 -i ${srcdir}/KDESalGraphics_buildfix.diff +# patch -Np1 -i ${srcdir}/KDESalGraphics_buildfix.diff # gcc4.5 fix patch -Np0 -i ${srcdir}/sal-cpprt-gcc-4.5-workaround.diff Modified: default-no-startup-wizard.diff =================================================================== --- default-no-startup-wizard.diff 2011-02-04 01:04:10 UTC (rev 108828) +++ default-no-startup-wizard.diff 2011-02-04 06:41:02 UTC (rev 108829) @@ -1,12 +1,12 @@ --- desktop/source/migration/wizard.cxx +++ desktop/source/migration/wizard.cxx -@@ -121,6 +121,7 @@ - ,m_bAutomaticUpdChk(sal_True) +@@ -132,6 +132,7 @@ + ,m_aThrobber(this, WizardResId(CTRL_THROBBER)) ,m_aLicensePath( rLicensePath ) { -+ return; ++ return; + FreeResource(); // --- - // FreeResource(); // enableState(STATE_USER, sal_False); @@ -383,7 +384,7 @@