Date: Fri, 19 May 2017 23:48:29 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r441279 - in head/editors/libreoffice: . files Message-ID: <201705192348.v4JNmTTo090760@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Fri May 19 23:48:29 2017 New Revision: 441279 URL: https://svnweb.freebsd.org/changeset/ports/441279 Log: Revert r441276 and properly fix build failures with JAVA option. Deleted: head/editors/libreoffice/files/patch-chart2_Module__chart2.mk Modified: head/editors/libreoffice/Makefile head/editors/libreoffice/distinfo head/editors/libreoffice/files/patch-sc_Module__sc.mk head/editors/libreoffice/files/patch-sw_Module__sw.mk Modified: head/editors/libreoffice/Makefile ============================================================================== --- head/editors/libreoffice/Makefile Fri May 19 23:17:56 2017 (r441278) +++ head/editors/libreoffice/Makefile Fri May 19 23:48:29 2017 (r441279) @@ -167,8 +167,10 @@ JAVA_DISTFILES= 17410483b5b5f267aa18b7e0 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip:src \ 3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip:src \ 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip:src \ + 8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar:ext \ 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip:src \ 97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip:src \ + a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar:ext \ ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip:src \ ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip:src \ d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip:src \ Modified: head/editors/libreoffice/distinfo ============================================================================== --- head/editors/libreoffice/distinfo Fri May 19 23:17:56 2017 (r441278) +++ head/editors/libreoffice/distinfo Fri May 19 23:48:29 2017 (r441279) @@ -1,4 +1,4 @@ -TIMESTAMP = 1495064362 +TIMESTAMP = 1495234833 SHA256 (libreoffice/libreoffice-5.3.3.2.tar.xz) = 9632956926d9d5c9049ce5b81c2673f298ae73b873d53cce8cfaea8ee243619a SIZE (libreoffice/libreoffice-5.3.3.2.tar.xz) = 190216268 SHA256 (libreoffice/libreoffice-help-5.3.3.2.tar.xz) = f9b4fef5f449cdbbcb5796908d0536576585c511173bfccf2ca049b5dcbb0dc7 @@ -19,10 +19,14 @@ SHA256 (libreoffice/3bdf40c0d199af31923e SIZE (libreoffice/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip) = 5750610 SHA256 (libreoffice/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip) = 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753 SIZE (libreoffice/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip) = 1521926 +SHA256 (libreoffice/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar) = f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770 +SIZE (libreoffice/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar) = 2448421 SHA256 (libreoffice/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip) = abe2c57ac12ba45d83563b02e240fa95d973376de2f720aab8fe11f2e621c095 SIZE (libreoffice/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip) = 762419 SHA256 (libreoffice/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip) = 3d853b19b1d94a6efa69e7af90f7f2b09ecf302913bee3da796c15ecfebcfac8 SIZE (libreoffice/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip) = 2938721 +SHA256 (libreoffice/a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar) = a0bd3e0186e043223bfb231a888e2bfb06c78ee2e07c2f0eca434236d173cf34 +SIZE (libreoffice/a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar) = 18033694 SHA256 (libreoffice/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip) = 7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66 SIZE (libreoffice/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip) = 2929311 SHA256 (libreoffice/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip) = 233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd Modified: head/editors/libreoffice/files/patch-sc_Module__sc.mk ============================================================================== --- head/editors/libreoffice/files/patch-sc_Module__sc.mk Fri May 19 23:17:56 2017 (r441278) +++ head/editors/libreoffice/files/patch-sc_Module__sc.mk Fri May 19 23:48:29 2017 (r441279) @@ -1,16 +1,6 @@ --- sc/Module_sc.mk.orig 2017-05-03 16:46:29 UTC +++ sc/Module_sc.mk -@@ -45,7 +45,8 @@ $(eval $(call gb_Module_add_check_targets,sc,\ - $(if $(and $(filter $(COM),MSC),$(MERGELIBS)),, \ - CppunitTest_sc_ucalc) \ - CppunitTest_sc_bugfix_test \ -- CppunitTest_sc_filters_test \ -+ $(if $(filter FREEBSD,$(OS)),, \ -+ CppunitTest_sc_filters_test) \ - CppunitTest_sc_rangelst_test \ - CppunitTest_sc_mark_test \ - CppunitTest_sc_core \ -@@ -60,8 +61,9 @@ endif +@@ -60,8 +60,9 @@ endif $(eval $(call gb_Module_add_slowcheck_targets,sc, \ CppunitTest_sc_condformats \ CppunitTest_sc_new_cond_format_api \ @@ -22,7 +12,7 @@ CppunitTest_sc_html_export_test \ CppunitTest_sc_opencl_test \ CppunitTest_sc_copypaste \ -@@ -71,7 +73,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,sc, \ +@@ -71,7 +72,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,sc, \ # point weirdness (x87, registers, compiler optimization, ... whatever), # disable them until someone finds a real cure. Modified: head/editors/libreoffice/files/patch-sw_Module__sw.mk ============================================================================== --- head/editors/libreoffice/files/patch-sw_Module__sw.mk Fri May 19 23:17:56 2017 (r441278) +++ head/editors/libreoffice/files/patch-sw_Module__sw.mk Fri May 19 23:48:29 2017 (r441279) @@ -1,14 +1,8 @@ --- sw/Module_sw.mk.orig 2017-05-03 16:46:29 UTC +++ sw/Module_sw.mk -@@ -52,26 +52,33 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\ - CppunitTest_sw_htmlexport \ - CppunitTest_sw_htmlimport \ - CppunitTest_sw_macros_test \ -- CppunitTest_sw_ooxmlexport \ -- CppunitTest_sw_ooxmlexport2 \ -+ $(if $(filter FREEBSD,$(OS)),, \ -+ CppunitTest_sw_ooxmlexport \ -+ CppunitTest_sw_ooxmlexport2) \ +@@ -55,23 +55,28 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\ + CppunitTest_sw_ooxmlexport \ + CppunitTest_sw_ooxmlexport2 \ CppunitTest_sw_ooxmlexport3 \ - CppunitTest_sw_ooxmlexport4 \ + $(if $(filter FREEBSD,$(OS)),, \ @@ -32,9 +26,7 @@ + CppunitTest_sw_ww8import) \ CppunitTest_sw_rtfexport \ CppunitTest_sw_rtfimport \ -- CppunitTest_sw_odfexport \ -+ $(if $(filter FREEBSD,$(OS)),, \ -+ CppunitTest_sw_odfexport) \ + CppunitTest_sw_odfexport \ CppunitTest_sw_odfimport \ - CppunitTest_sw_uiwriter \ + $(if $(filter FREEBSD,$(OS)),, \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201705192348.v4JNmTTo090760>