kpriv/pkgsrc-wip
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to a newer snapshot

Browse source
This commit is contained in:
Francois Tigeot 2011-08-30 21:01:50 +00:00 committed by Thomas Klausner
parent 182699a1d0
commit 0944fae183
7 changed files with 27 additions and 157 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
libreoffice/Makefile
View file

@ -1,12 +1,12 @@
# $NetBSD: Makefile,v 1.15 2011/07/21 05:16:36 ftigeot Exp $
# $NetBSD: Makefile,v 1.16 2011/08/30 21:01:50 ftigeot Exp $
VER= 2011-07-17
VER= 2011-08-30
DISTNAME= libreoffice-${VER}
PKGNAME= libreoffice-${VER:S/-//g}
CATEGORIES= misc
#MASTER_SITES= http://download.documentfoundation.org/libreoffice/src/
MASTER_SITES= http://dl.wolfpond.org/libreoffice/ \
http://download.go-oo.org/src/ \
http://dev-www.libreoffice.org/src/ \
http://www.numbertext.org/linux/
MAINTAINER= ftigeot@wolfpond.org
@ -19,11 +19,8 @@ PKG_DESTDIR_SUPPORT= user-destdir
DIST_SUBDIR= libreoffice
LO_BOOTSTRAP= libreoffice-bootstrap-${VER}
LO_COMPONENTS= artwork base calc components extensions extras \
filters help impress libs-core libs-extern \
libs-extern-sys libs-gui postprocess sdk testing \
ure writer
LO_BOOTSTRAP= libreoffice-core-${VER}
LO_COMPONENTS= dictionaries help
MORE_DISTFILES= \
1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz \
@ -34,7 +31,7 @@ MORE_DISTFILES= \
35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip \
48a9f787f43a09c0a9b7b00cd1fddbbf-hyphen-2.7.1.tar.gz \
ca4870d899fd7e943ffc310a5421ad4d-liberation-fonts-ttf-1.06.0.20100721.tar.gz \
979a3f3da4dc176e80fe8c6b759cb7f4-libvisio-0.0.2.tar.bz2 \
9b8eb71bf58b006ac0d2f0b464786cee-libvisio-0.0.5.tar.bz2 \
0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 \
067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz \
fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
@ -87,6 +84,7 @@ PTHREAD_OPTS+= require
HAS_CONFIGURE= yes
CONFIGURE_ARGS+= --prefix=${DESTDIR}${PREFIX}/${PKGNAME}
CONFIGURE_ARGS+= --disable-ccache
CONFIGURE_ARGS+= --disable-epm
CONFIGURE_ARGS+= --disable-mozilla
CONFIGURE_ARGS+= --disable-neon
@ -96,7 +94,7 @@ CONFIGURE_ARGS+= --disable-opengl
CONFIGURE_ARGS+= --disable-systray
CONFIGURE_ARGS+= --with-alloc=system
CONFIGURE_ARGS+= --with-fonts
CONFIGURE_ARGS+= --with-max-jobs=${MAKE_JOBS}
CONFIGURE_ARGS+= --with-num-cpus=${MAKE_JOBS}
CONFIGURE_ARGS+= --with-system-headers
CONFIGURE_ARGS+= --with-system-libs
CONFIGURE_ARGS+= --with-system-libtextcat
@ -114,7 +112,9 @@ CONFIGURE_ARGS+= --without-system-mythes
# and fail with the pkgsrc environment
# Preset LD_LIBRARY_PATH to sane defaults and avoid complicating them
# further
LIBPATH= ${BUILDLINK_DIR}/lib:${WRKSRC}/desktop/unxdfly.pro/lib:${WRKSRC}/desktop/unxnbsd.pro/lib:${X11BASE}/lib
LIBPATH= ${BUILDLINK_DIR}/lib:${X11BASE}/lib
LIBPATH+= ${WRKSRC}/desktop/unxdfly.pro/lib:${WRKSRC}/solver/unxdfly.pro/lib:
LIBPATH+= ${WRKSRC}/desktop/unxnbsd.pro/lib:${WRKSRC}/solver/unxnbsd.pro/lib:
SUBST_CLASSES+= libpath
SUBST_STAGE.libpath= pre-configure

85
libreoffice/distinfo
View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.14 2011/08/03 09:58:46 thomasklausner Exp $
$NetBSD: distinfo,v 1.15 2011/08/30 21:01:51 ftigeot Exp $
SHA1 (libreoffice/067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz) = 025d5d0d566a23ddb353495c116116c1088ba2e9
RMD160 (libreoffice/067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz) = aefa80476ef8340be84440b61f738f432da51c92
@ -21,9 +21,9 @@ Size (libreoffice/48a9f787f43a09c0a9b7b00cd1fddbbf-hyphen-2.7.1.tar.gz) = 612842
SHA1 (libreoffice/881af2b7dca9b8259abbca00bbbc004d-LinLibertineG-20110101.zip) = 704c90532c96c460c9fb0ca0a4b41561dd958dcb
RMD160 (libreoffice/881af2b7dca9b8259abbca00bbbc004d-LinLibertineG-20110101.zip) = 530969ea625e7c7c2b8f8336a6d69a960ba3b31f
Size (libreoffice/881af2b7dca9b8259abbca00bbbc004d-LinLibertineG-20110101.zip) = 4001063 bytes
SHA1 (libreoffice/979a3f3da4dc176e80fe8c6b759cb7f4-libvisio-0.0.2.tar.bz2) = 120c361d5ce1912d25c800d7d95d9bd587742951
RMD160 (libreoffice/979a3f3da4dc176e80fe8c6b759cb7f4-libvisio-0.0.2.tar.bz2) = a66c94e42db2eb116f4284c210b07bcf9454f6c3
Size (libreoffice/979a3f3da4dc176e80fe8c6b759cb7f4-libvisio-0.0.2.tar.bz2) = 52538 bytes
SHA1 (libreoffice/9b8eb71bf58b006ac0d2f0b464786cee-libvisio-0.0.5.tar.bz2) = d6045e7be1b11bd7b0733e6555ec4113dbf68fce
RMD160 (libreoffice/9b8eb71bf58b006ac0d2f0b464786cee-libvisio-0.0.5.tar.bz2) = 87f64f76191a8517fa5728147904fc268368e3b8
Size (libreoffice/9b8eb71bf58b006ac0d2f0b464786cee-libvisio-0.0.5.tar.bz2) = 337612 bytes
SHA1 (libreoffice/ca4870d899fd7e943ffc310a5421ad4d-liberation-fonts-ttf-1.06.0.20100721.tar.gz) = e36555ed4e13a8109bfdb5a8c621de6d581f5ab7
RMD160 (libreoffice/ca4870d899fd7e943ffc310a5421ad4d-liberation-fonts-ttf-1.06.0.20100721.tar.gz) = 4ff48c470d788e0fccdd9b8c3acdb66b73fcf546
Size (libreoffice/ca4870d899fd7e943ffc310a5421ad4d-liberation-fonts-ttf-1.06.0.20100721.tar.gz) = 1324547 bytes
@ -36,68 +36,15 @@ Size (libreoffice/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2) = 38806
SHA1 (libreoffice/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz) = 6e836945719e137596df1ca82f0afa809e8a2e88
RMD160 (libreoffice/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz) = 6443438ddf0bb5cd277c96108aa2671213edf8df
Size (libreoffice/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz) = 547217 bytes
SHA1 (libreoffice/libreoffice-artwork-2011-07-17.tar.bz2) = cc37642c706e3dc7e21befea6516702efaa99bc0
RMD160 (libreoffice/libreoffice-artwork-2011-07-17.tar.bz2) = d81479e217d10635aaf37b8ae3d01127af3b4f58
Size (libreoffice/libreoffice-artwork-2011-07-17.tar.bz2) = 12914394 bytes
SHA1 (libreoffice/libreoffice-base-2011-07-17.tar.bz2) = c789330d4199beb75c1fe9e7dc1302ed7d547976
RMD160 (libreoffice/libreoffice-base-2011-07-17.tar.bz2) = 5206268152183d6e459a519fb9c426f54684e5b2
Size (libreoffice/libreoffice-base-2011-07-17.tar.bz2) = 1491243 bytes
SHA1 (libreoffice/libreoffice-bootstrap-2011-07-17.tar.bz2) = 31d5f1e41985b47d591e94c63e94ab68716704f0
RMD160 (libreoffice/libreoffice-bootstrap-2011-07-17.tar.bz2) = 267a8d09f1934c0e6df125f81b97f53b2244e3d2
Size (libreoffice/libreoffice-bootstrap-2011-07-17.tar.bz2) = 1686928 bytes
SHA1 (libreoffice/libreoffice-calc-2011-07-17.tar.bz2) = 908f64ef94a0bbe548bd57e7a5f9491876f2e706
RMD160 (libreoffice/libreoffice-calc-2011-07-17.tar.bz2) = 8ee8bf51e57efcc44b4512d2faac08624c1f5878
Size (libreoffice/libreoffice-calc-2011-07-17.tar.bz2) = 8268995 bytes
SHA1 (libreoffice/libreoffice-components-2011-07-17.tar.bz2) = 883492349a95119d1375650e69f2ecbb8f21b382
RMD160 (libreoffice/libreoffice-components-2011-07-17.tar.bz2) = f452f2e57139b2c9bd314f4faf86521446a6e918
Size (libreoffice/libreoffice-components-2011-07-17.tar.bz2) = 4194994 bytes
SHA1 (libreoffice/libreoffice-extensions-2011-07-17.tar.bz2) = ce15961e2a6ef7318184e859aeccab47d92eb368
RMD160 (libreoffice/libreoffice-extensions-2011-07-17.tar.bz2) = 749ea8dc73bc98a3b9c2576012421d97d17ec328
Size (libreoffice/libreoffice-extensions-2011-07-17.tar.bz2) = 4109235 bytes
SHA1 (libreoffice/libreoffice-extras-2011-07-17.tar.bz2) = d6443b1ffaa93b1b01cda0fc65a5f6b1a16db725
RMD160 (libreoffice/libreoffice-extras-2011-07-17.tar.bz2) = a8515dfff0894549cce29356f7c7840499601921
Size (libreoffice/libreoffice-extras-2011-07-17.tar.bz2) = 38468259 bytes
SHA1 (libreoffice/libreoffice-filters-2011-07-17.tar.bz2) = 8c916a061f99cf8adb288495c89c599595254afa
RMD160 (libreoffice/libreoffice-filters-2011-07-17.tar.bz2) = a738236aa58f241d29fd5ad36e129ab0a85eca2c
Size (libreoffice/libreoffice-filters-2011-07-17.tar.bz2) = 11305083 bytes
SHA1 (libreoffice/libreoffice-help-2011-07-17.tar.bz2) = 3f038ad57fa5a3f373f835f1740dd8a4f339b7d9
RMD160 (libreoffice/libreoffice-help-2011-07-17.tar.bz2) = 336d31a743c48f3935a4e87730381b9bebd1f1dd
Size (libreoffice/libreoffice-help-2011-07-17.tar.bz2) = 1428380 bytes
SHA1 (libreoffice/libreoffice-impress-2011-07-17.tar.bz2) = 23af572785736fc1d7ce158e0a700b29f0a7251d
RMD160 (libreoffice/libreoffice-impress-2011-07-17.tar.bz2) = 92eb9268f3b87b7c42fda14099d38c05574b269a
Size (libreoffice/libreoffice-impress-2011-07-17.tar.bz2) = 1927444 bytes
SHA1 (libreoffice/libreoffice-libs-core-2011-07-17.tar.bz2) = af42f7fc9577115ba8cfa8dcf7b994745c50ef8c
RMD160 (libreoffice/libreoffice-libs-core-2011-07-17.tar.bz2) = 5db0714d83d1a7a3b89663c74d784062db4843a8
Size (libreoffice/libreoffice-libs-core-2011-07-17.tar.bz2) = 11583964 bytes
SHA1 (libreoffice/libreoffice-libs-extern-2011-07-17.tar.bz2) = b4c6dfa01eee69fea127e6891f768e814d74849c
RMD160 (libreoffice/libreoffice-libs-extern-2011-07-17.tar.bz2) = 634345f60ce719a01067455da489bc5c554d0ef8
Size (libreoffice/libreoffice-libs-extern-2011-07-17.tar.bz2) = 588198 bytes
SHA1 (libreoffice/libreoffice-libs-extern-sys-2011-07-17.tar.bz2) = b6e1ab889bf485da83517033986127c268d4e1cb
RMD160 (libreoffice/libreoffice-libs-extern-sys-2011-07-17.tar.bz2) = 7026610b1faf33f20c848b42e81d60ab9cf8668a
Size (libreoffice/libreoffice-libs-extern-sys-2011-07-17.tar.bz2) = 39907718 bytes
SHA1 (libreoffice/libreoffice-libs-gui-2011-07-17.tar.bz2) = 011b12a3b10e021a6ef442d7c92d0af5e145f0d7
RMD160 (libreoffice/libreoffice-libs-gui-2011-07-17.tar.bz2) = 9745dd16164b1e5884e6bc29a2dbf07e1f356319
Size (libreoffice/libreoffice-libs-gui-2011-07-17.tar.bz2) = 8806829 bytes
SHA1 (libreoffice/libreoffice-postprocess-2011-07-17.tar.bz2) = dac51d4f89a340df4c491a9ca44d2acba92c5fdb
RMD160 (libreoffice/libreoffice-postprocess-2011-07-17.tar.bz2) = 737b357e0434667de6ceb7489fb36393515b9a52
Size (libreoffice/libreoffice-postprocess-2011-07-17.tar.bz2) = 24389 bytes
SHA1 (libreoffice/libreoffice-sdk-2011-07-17.tar.bz2) = 8cc180cbca123aab3c98034f5fb7f697101fa7da
RMD160 (libreoffice/libreoffice-sdk-2011-07-17.tar.bz2) = 4873941789d278a0fc3eb48b8623ccf6f859158a
Size (libreoffice/libreoffice-sdk-2011-07-17.tar.bz2) = 1515016 bytes
SHA1 (libreoffice/libreoffice-testing-2011-07-17.tar.bz2) = cf8235e115aa6626366ee6f90cdf683ab761881e
RMD160 (libreoffice/libreoffice-testing-2011-07-17.tar.bz2) = 7e154a5b232338a487356dc23f63bdf7c0ce1c71
Size (libreoffice/libreoffice-testing-2011-07-17.tar.bz2) = 50244416 bytes
SHA1 (libreoffice/libreoffice-ure-2011-07-17.tar.bz2) = 14c7d990eb73c5f604285cf0e0596a165c72104f
RMD160 (libreoffice/libreoffice-ure-2011-07-17.tar.bz2) = 168e650d712c2a82c2400ed28880bee91a33c88c
Size (libreoffice/libreoffice-ure-2011-07-17.tar.bz2) = 4864710 bytes
SHA1 (libreoffice/libreoffice-writer-2011-07-17.tar.bz2) = 51794142be68846c6d035e7acdd4272c401ba145
RMD160 (libreoffice/libreoffice-writer-2011-07-17.tar.bz2) = 8579dfb7df526372f8c3b68be917f97bd29ad0c3
Size (libreoffice/libreoffice-writer-2011-07-17.tar.bz2) = 5757021 bytes
SHA1 (patch-clone_calc_sc_Module_sc.mk) = ef5bf0215bb6921c7cce3da6ebe9e327c08dcbdd
SHA1 (patch-clone_filters_lotuswordpro_Module_lotuswordpro.mk) = 2a6f457663efe8361e9a74002389d74a75e951dc
SHA1 (patch-clone_impress_sd_Module_sd.mk) = 975c8a47e5b11d8a28e14784515615e2118eccb7
SHA1 (patch-clone_libs-core_desktop_scripts_soffice.sh) = a58adc508b93cf9a797e8d415edf91618c082abc
SHA1 (patch-clone_libs-gui_svtools_source_contnr_imivctl1.cxx) = 8b2dc0bf4d282daa93e972e9f19886861dcfc14a
SHA1 (patch-clone_writer_starmath_Module_starmath.mk) = 2acd64f4b4871a840c86946232e2bb0981fe629f
SHA1 (patch-clone_writer_sw_Module_sw.mk) = 5472ad4d9fe56fd034b12a32596f32e51cce96be
SHA1 (patch-set_soenv.in) = 2397076ed3568a6fdfe9a4d2143d1a4112bf5ce9
SHA1 (libreoffice/libreoffice-core-2011-08-30.tar.bz2) = e9cf417fd72c63114437f6da83f09b61597f8064
RMD160 (libreoffice/libreoffice-core-2011-08-30.tar.bz2) = b05c9b97b76d7d7e2ea6dfc54950358fa7fd951b
Size (libreoffice/libreoffice-core-2011-08-30.tar.bz2) = 161896384 bytes
SHA1 (libreoffice/libreoffice-dictionaries-2011-08-30.tar.bz2) = 7ef20b1a1c8674850c93bc67ce8a6d2068f91495
RMD160 (libreoffice/libreoffice-dictionaries-2011-08-30.tar.bz2) = b21a2229a15fcf46542bf7276891cc4d20602017
Size (libreoffice/libreoffice-dictionaries-2011-08-30.tar.bz2) = 39634187 bytes
SHA1 (libreoffice/libreoffice-help-2011-08-30.tar.bz2) = 2f47f0e4b5debf78baa698d62fcf1055f665fa2a
RMD160 (libreoffice/libreoffice-help-2011-08-30.tar.bz2) = 7ac3012c8f1c84c62ec931564fe7503d702ed0e6
Size (libreoffice/libreoffice-help-2011-08-30.tar.bz2) = 1427881 bytes
SHA1 (patch-desktop_scripts_soffice.sh) = 37dfdd298a131d30580d597f3faa4c2ddbda4299
SHA1 (patch-sd_Module_sd.mk) = efc6753baeb518e6577c018fe88f0774b307ea60
SHA1 (patch-set_soenv.in) = 2c4299e1e5f191c8cb63003f8af9194b4d7bf2e9

15
libreoffice/patches/patch-clone_calc_sc_Module_sc.mk
View file

@ -1,15 +0,0 @@
$NetBSD: patch-clone_calc_sc_Module_sc.mk,v 1.2 2011/07/21 05:16:36 ftigeot Exp $
--- clone/calc/sc/Module_sc.mk.orig 2011-05-11 12:36:55 +0000
+++ clone/calc/sc/Module_sc.mk
@@ -33,10 +33,4 @@ $(eval $(call gb_Module_add_targets,sc,\
Package_xml \
))
-$(eval $(call gb_Module_add_check_targets,sc,\
- CppunitTest_sc_ucalc \
- CppunitTest_sc_test_filters \
-))
-
-
# vim: set noet ts=4 sw=4:

13
libreoffice/patches/patch-clone_filters_lotuswordpro_Module_lotuswordpro.mk
View file

@ -1,13 +0,0 @@
$NetBSD: patch-clone_filters_lotuswordpro_Module_lotuswordpro.mk,v 1.1 2011/05/19 10:20:51 ftigeot Exp $
--- clone/filters/lotuswordpro/Module_lotuswordpro.mk.orig 2011-05-17 11:28:39 +0000
+++ clone/filters/lotuswordpro/Module_lotuswordpro.mk
@@ -31,8 +31,4 @@ $(eval $(call gb_Module_add_targets,lotu
Library_lwpft \
))
-$(eval $(call gb_Module_add_check_targets,lotuswordpro,\
- CppunitTest_lotuswordpro_test_lotuswordpro \
-))
-
# vim: set noet ts=4 sw=4:

16
libreoffice/patches/patch-clone_libs-gui_svtools_source_contnr_imivctl1.cxx
View file

@ -1,16 +0,0 @@
$NetBSD: patch-clone_libs-gui_svtools_source_contnr_imivctl1.cxx,v 1.2 2011/08/03 09:58:46 thomasklausner Exp $
Note: upstream fixed this by changing the prototype in imivctl.hxx instead --
beware when updating libreoffice to a newer snapshot.
--- clone/libs-gui/svtools/source/contnr/imivctl1.cxx.orig 2011-07-15 14:53:56.000000000 +0000
+++ clone/libs-gui/svtools/source/contnr/imivctl1.cxx
@@ -292,7 +292,7 @@ void SvxIconChoiceCtrl_Impl::FontModifie
ShowCursor( sal_True );
}
-void SvxIconChoiceCtrl_Impl::InsertEntry( SvxIconChoiceCtrlEntry* pEntry, size_t nPos,
+void SvxIconChoiceCtrl_Impl::InsertEntry( SvxIconChoiceCtrlEntry* pEntry, sal_uLong nPos,
const Point* pPos )
{
StopEditTimer();

17
libreoffice/patches/patch-clone_writer_starmath_Module_starmath.mk
View file

@ -1,17 +0,0 @@
$NetBSD: patch-clone_writer_starmath_Module_starmath.mk,v 1.2 2011/06/15 17:20:21 ftigeot Exp $
--- clone/writer/starmath/Module_starmath.mk.orig 2011-06-14 15:12:29 +0000
+++ clone/writer/starmath/Module_starmath.mk
@@ -29,12 +29,6 @@ $(eval $(call gb_Module_add_targets,sm,\
Package_uiconfig \
))
-ifneq ($(OS),OPENBSD)
-$(eval $(call gb_Module_add_check_targets,sm,\
- CppunitTest_starmath_qa_cppunit \
-))
-endif
-
$(eval $(call gb_Module_add_subsequentcheck_targets,sm,\
JunitTest_starmath_unoapi \
))

16
libreoffice/patches/patch-clone_writer_sw_Module_sw.mk
View file

@ -1,16 +0,0 @@
$NetBSD: patch-clone_writer_sw_Module_sw.mk,v 1.1 2011/06/15 17:25:56 ftigeot Exp $
--- clone/writer/sw/Module_sw.mk.orig 2011-06-14 15:12:29 +0000
+++ clone/writer/sw/Module_sw.mk
@@ -39,11 +39,6 @@ $(eval $(call gb_Module_add_targets,sw,\
Package_xml \
))
-$(eval $(call gb_Module_add_check_targets,sw,\
- CppunitTest_sw_test_filters \
- CppunitTest_sw_swdoc_test \
-))
-
$(eval $(call gb_Module_add_subsequentcheck_targets,sw,\
JunitTest_sw_complex \
JunitTest_sw_unoapi \