From b9123ec5f80a942b7cdfa0ac707c9aa1990d51e1 Mon Sep 17 00:00:00 2001 From: John Marino Date: Sat, 26 Sep 2020 17:49:22 +0000 Subject: [PATCH] Ravenports generated: 26 Sep 2020 17:49 --- Mk/Misc/conspiracy_variants | 3 +- Mk/Misc/fpc_equivalents | 1 + Mk/Misc/port_dates | 19 ++-- Mk/Misc/repology.json | 30 +++++- Mk/Misc/summary.txt | 6 +- bucket_39/libreoffice | 2 +- bucket_89/liborcus15 | 194 ++++++++++++++++++++++++++++++++++++ bucket_EE/ixion | 66 +++++++++++- 8 files changed, 298 insertions(+), 23 deletions(-) create mode 100644 bucket_89/liborcus15 diff --git a/Mk/Misc/conspiracy_variants b/Mk/Misc/conspiracy_variants index 53db6e91d..b8844d07b 100644 --- a/Mk/Misc/conspiracy_variants +++ b/Mk/Misc/conspiracy_variants @@ -1481,6 +1481,7 @@ 88 ruby-actioncable 3 v25 v26 v27 89 R-MatrixModels 1 standard 89 R-modeldata 1 standard +89 liborcus15 1 standard 89 libwpd 1 standard 89 perl-Hash-Merge-Simple 2 530 532 89 perl-Math-Big 2 530 532 @@ -2598,7 +2599,7 @@ ED veracrypt 1 standard EE OpenSP 1 standard EE R-plogr 1 standard EE elftoolchain 1 standard -EE ixion 1 standard +EE ixion 2 standard libre EE libtcod 1 standard EE libublio 1 standard EE libvisual 1 standard diff --git a/Mk/Misc/fpc_equivalents b/Mk/Misc/fpc_equivalents index cc422b9f4..238dec013 100644 --- a/Mk/Misc/fpc_equivalents +++ b/Mk/Misc/fpc_equivalents @@ -1481,6 +1481,7 @@ python-google-i18n-address 2.4.0 generated ruby-actioncable 6.0.3.3 generated R-MatrixModels 0.4-1 generated R-modeldata 0.0.2 generated +liborcus15 0.15.4 devel/liborcus libwpd 0.10.3 textproc/libwpd010 perl-Hash-Merge-Simple 0.051 generated perl-Math-Big 1.14 generated diff --git a/Mk/Misc/port_dates b/Mk/Misc/port_dates index 93ad2fd04..580e974f0 100644 --- a/Mk/Misc/port_dates +++ b/Mk/Misc/port_dates @@ -149,7 +149,7 @@ R-jsonlite 1586931280 1599525512 R-knitr 1586974302 1600825772 R-labeling 1586931280 1586974302 R-later 1586931280 1591357802 -R-lava 1586934799 1597147905 +R-lava 1586934799 1601134524 R-lazyeval 1586931280 1586974302 R-leaflet 1586931280 1586974302 R-leaflet.providers 1586934799 1586974302 @@ -167,7 +167,7 @@ R-manipulateWidget 1587237611 1587237611 R-maps 1587237611 1587237611 R-maptools 1586974302 1598303840 R-markdown 1586934799 1586974302 -R-matrixStats 1594385497 1595164687 +R-matrixStats 1594385497 1601134524 R-maxLik 1586974302 1599525512 R-memoise 1586974302 1586974302 R-mgsub 1586934799 1595455155 @@ -744,7 +744,7 @@ hunspell-he 1502309271 1574833210 hunspell-hu 1502309271 1574833210 hunspell-it 1502219371 1574833210 hunspell-nl 1502219371 1574833210 -hunspell-pl 1502324544 1600900395 +hunspell-pl 1502324544 1601134524 hunspell-pt_BR 1502324544 1574833210 hunspell-pt_PT 1502324544 1574833210 hunspell-ru 1502219371 1594431191 @@ -781,7 +781,7 @@ jpeg-turbo 1496875210 1593006250 jq 1586104285 1589211901 json-c 1506720704 1596974450 json-glib 1512834904 1600107910 -jsoncpp 1493406552 1591361742 +jsoncpp 1493406552 1601134524 judy 1523302487 1574833210 kakoune 1593015844 1598992013 keepassxc 1524488408 1598280312 @@ -1006,7 +1006,7 @@ lua-bitop 1498963086 1600900395 lua-filesystem 1547403033 1600900395 lua-lgi 1548444903 1579480907 lua-lpeg 1498963086 1600900395 -lua-luarocks 1597147905 1600900395 +lua-luarocks 1597147905 1601134524 lua-mpack 1498963086 1600900395 lua-penlight 1547403033 1601056262 lua-posix 1581168548 1600900395 @@ -2000,7 +2000,8 @@ postfix 1534181170 1598992013 postgis 1519763665 1597616374 postgresql10 1545695095 1597606318 postgresql11 1541783088 1597606318 -postgresql12 1572387527 1597606318 +postgresql12 1572387527 1601134524 +postgresql13 1601134524 1601134524 postgresql95 1493362949 1597606318 postgresql96 1493266522 1597606318 potrace 1559514332 1589805576 @@ -2057,7 +2058,7 @@ python-billiard 1517585344 1587414585 python-black 1586475549 1598563465 python-booleanOperations 1578099803 1596932651 python-borgbackup 1546709443 1591533289 -python-botocore 1506630685 1601056262 +python-botocore 1506630685 1601134524 python-breathe 1586968094 1600825772 python-cached-property 1583883988 1600825772 python-cachetools 1587507764 1593567608 @@ -2116,7 +2117,7 @@ python-fontMath 1578099803 1589494803 python-fonttools 1578099803 1600825772 python-fs 1578099803 1587426949 python-funcsigs 1498761655 1587394859 -python-funcy 1500308034 1590927009 +python-funcy 1500308034 1601134524 python-furl 1517585344 1587394859 python-fusepy 1517585344 1587394859 python-future 1523886665 1587414585 @@ -2579,7 +2580,7 @@ vbindiff 1514136533 1574833210 vde2 1546643890 1585754641 veracrypt 1507060574 1598797117 video4linux 1496875210 1590244784 -vim 1505337740 1601056262 +vim 1505337740 1601134524 vimb 1548778695 1586963776 vo-aacenc 1505489237 1574833210 vorbis-tools 1515099169 1590712150 diff --git a/Mk/Misc/repology.json b/Mk/Misc/repology.json index b168c275f..afa97d286 100644 --- a/Mk/Misc/repology.json +++ b/Mk/Misc/repology.json @@ -29390,6 +29390,23 @@ } ] } + ,{ + "bucket": "89" + ,"namebase": "liborcus15" + ,"version": "0.15.4" + ,"homepage": "https://gitlab.com/orcus/orcus" + ,"FPC": "devel/liborcus" + ,"keywords": [ "devel", "misc" ] + ,"distfile": [ "mirror://GITLAB/orcus:orcus:0.15.4/orcus-orcus-0.15.4.tar.gz" ] + ,"variants": + [ + { + "label": "standard" + ,"sdesc": "File import library for spreadsheet documents" + ,"spkgs": [ "single" ] + } + ] + } ,{ "bucket": "89" ,"namebase": "libwpd" @@ -51711,7 +51728,7 @@ ,"homepage": "https://gitlab.com/ixion/ixion" ,"FPC": "N/A" ,"keywords": [ "math" ] - ,"distfile": [ "https://gitlab.com/ixion/ixion/-/archive/0.16.0/ixion-0.16.0.tar.bz2" ] + ,"distfile": [ "https://gitlab.com/ixion/ixion/-/archive/0.16.0/ixion-0.16.0.tar.bz2", "https://gitlab.com/ixion/ixion/-/archive/0.16.0/ixion-0.15.0.tar.bz2" ] ,"variants": [ { @@ -51719,6 +51736,11 @@ ,"sdesc": "General purpose formula parser and interpreter" ,"spkgs": [ "single" ] } + ,{ + "label": "libre" + ,"sdesc": "Formual parser and interpreter for Libreoffice" + ,"spkgs": [ "single" ] + } ] } ,{ @@ -55792,8 +55814,8 @@ ] ,"summary": { - "ports": 2804 - ,"variants": 4099 - ,"packages": 5231 + "ports": 2805 + ,"variants": 4101 + ,"packages": 5233 } } diff --git a/Mk/Misc/summary.txt b/Mk/Misc/summary.txt index 974cfecab..2a1d28df4 100644 --- a/Mk/Misc/summary.txt +++ b/Mk/Misc/summary.txt @@ -1,6 +1,6 @@ Statistics derived from generation of conspiracy index ========================================================== - Total ports : 2804 - Total variants : 4099 - Total packages : 5231 + Total ports : 2805 + Total variants : 4101 + Total packages : 5233 Linear scan time : 00:00:01 diff --git a/bucket_39/libreoffice b/bucket_39/libreoffice index 3313bbdfb..4073b2eca 100644 --- a/bucket_39/libreoffice +++ b/bucket_39/libreoffice @@ -58,7 +58,7 @@ BUILDRUN_DEPENDS= serf:single:standard libcmis:single:standard libmspub:single:standard libvisio:single:standard - liborcus:single:standard + liborcus15:single:standard libodfgen:single:standard libetonyek:single:standard libepubgen:single:standard diff --git a/bucket_89/liborcus15 b/bucket_89/liborcus15 new file mode 100644 index 000000000..cfc0a801e --- /dev/null +++ b/bucket_89/liborcus15 @@ -0,0 +1,194 @@ +# Buildsheet autogenerated by ravenadm tool -- Do not edit. + +NAMEBASE= liborcus15 +VERSION= 0.15.4 +KEYWORDS= devel misc +VARIANTS= standard +SDESC[standard]= File import library for spreadsheet documents +HOMEPAGE= https://gitlab.com/orcus/orcus +CONTACT= nobody + +DOWNLOAD_GROUPS= main +SITES[main]= GITLAB/orcus:orcus:0.15.4 +DISTFILE[1]= generated:main +DF_INDEX= 1 +SPKGS[standard]= single + +OPTIONS_AVAILABLE= none +OPTIONS_STANDARD= none + +BUILD_DEPENDS= mdds:single:standard + bzip2:static:standard + bzip2:shared:standard +BUILDRUN_DEPENDS= boost-libraries:rest:python_default + ixion:single:libre + +USES= pkgconfig zlib cmake python:build + +LICENSE= MPL:single +LICENSE_FILE= MPL:{{WRKSRC}}/LICENSE +LICENSE_SCHEME= solo + +FPC_EQUIVALENT= devel/liborcus + +INSTALL_REQ_TOOLCHAIN= yes +SOVERSION= 0.0.0 +PLIST_SUB= VER=0.15 + +LDFLAGS= -lboost_program_options + -lboost_thread + -lboost_filesystem + -lboost_iostreams +CMAKE_ARGS= -DMDDS_INCLUDEDIR:STRING="{{LOCALBASE}}/include/mdds-1.2" + -DIXION_INCLUDEDIR:STRING="{{LOCALBASE}}/include/ixion-0.15" + +post-patch: + # fix module name + ${REINPLACE_CMD} -e 's|Zlib|ZLIB|' ${WRKSRC}/CMakeLists.txt + +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/orcus* + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so + # manually create pkgconfig file + ${SED} -e 's|@prefix@|${PREFIX}|; s|@exec_prefix@|${PREFIX}|' \ + -e 's|@libdir@|${PREFIX}/lib|; s|@includedir@|${PREFIX}/include|' \ + -e 's|liborcus-@ORCUS_API_VERSION@|orcus-0.15|' \ + -e 's|@ORCUS_API_VERSION@|0.15|g' \ + -e 's|lorcus-|lliborcus-|g' \ + -e ' s|@VERSION@|0.15.4|g' ${WRKSRC}/liborcus.pc.in \ + > ${STAGEDIR}${PREFIX}/lib/pkgconfig/liborcus-0.15.pc + +[FILE:274:descriptions/desc.single] +Orcus is a library that provides a collection of standalone file processing +filters. It is currently focused on providing filters for spreadsheet +documents, but filters for other productivity application types (such as +wordprocessor and presentation) are in consideration. + + +[FILE:104:distinfo] +5521c7edd3b9d151012e35ab314e0be980acdd83c020c64a23c39ef2f934cb49 8156137 orcus-orcus-0.15.4.tar.gz + + +[FILE:1734:manifests/plist.single] +bin/ + orcus-css-dump + orcus-csv + orcus-detect + orcus-json + orcus-ods + orcus-styles-ods + orcus-xls-xml + orcus-xlsx + orcus-xml + orcus-yaml + orcus-zip-dump +include/orcus-%%VER%%/orcus/ + base64.hpp + cell_buffer.hpp + config.hpp + css_document_tree.hpp + css_parser.hpp + css_parser_base.hpp + css_selector.hpp + css_types.hpp + csv_parser.hpp + csv_parser_base.hpp + dom_tree.hpp + env.hpp + exception.hpp + format_detection.hpp + global.hpp + info.hpp + interface.hpp + json_document_tree.hpp + json_global.hpp + json_parser.hpp + json_parser_base.hpp + json_parser_thread.hpp + json_structure_tree.hpp + measurement.hpp + orcus_csv.hpp + orcus_gnumeric.hpp + orcus_import_ods.hpp + orcus_import_xlsx.hpp + orcus_json.hpp + orcus_ods.hpp + orcus_xls_xml.hpp + orcus_xlsx.hpp + orcus_xml.hpp + parser_base.hpp + parser_global.hpp + pstring.hpp + sax_ns_parser.hpp + sax_parser.hpp + sax_parser_base.hpp + sax_token_parser.hpp + sax_token_parser_thread.hpp + stream.hpp + string_pool.hpp + threaded_json_parser.hpp + threaded_sax_token_parser.hpp + tokens.hpp + types.hpp + xml_namespace.hpp + xml_structure_tree.hpp + yaml_document_tree.hpp + yaml_parser.hpp + yaml_parser_base.hpp + zip_archive.hpp + zip_archive_stream.hpp +include/orcus-%%VER%%/orcus/detail/ + parser_token_buffer.hpp + thread.hpp +include/orcus-%%VER%%/orcus/mso/encryption_info.hpp +include/orcus-%%VER%%/orcus/spreadsheet/ + auto_filter.hpp + config.hpp + document.hpp + export_interface.hpp + factory.hpp + import_interface.hpp + import_interface_pivot.hpp + import_interface_view.hpp + pivot.hpp + shared_strings.hpp + sheet.hpp + sheet_range.hpp + styles.hpp + types.hpp + view.hpp + view_types.hpp +lib/ + libliborcus-%%VER%%.so + libliborcus-parser-%%VER%%.so + libliborcus-spreadsheet-model-%%VER%%.so +lib/pkgconfig/liborcus-%%VER%%.pc + + +[FILE:816:patches/patch-src_liborcus_CMakeLists.txt] +--- src/liborcus/CMakeLists.txt.orig 2020-09-03 23:49:30 UTC ++++ src/liborcus/CMakeLists.txt +@@ -91,14 +91,14 @@ add_library(orcus-${ORCUS_API_VERSION} S + # gnumeric filter + # TODO : document a way to build boost with bzip2 and zlib options, or find + # a way to make this a build-time option. +-# gnumeric_detection_handler.cpp +-# gnumeric_cell_context.cpp +-# gnumeric_context.cpp +-# gnumeric_handler.cpp +-# gnumeric_helper.cpp +-# gnumeric_sheet_context.cpp +-# gnumeric_tokens.cpp +-# orcus_gnumeric.cpp ++ gnumeric_detection_handler.cpp ++ gnumeric_cell_context.cpp ++ gnumeric_context.cpp ++ gnumeric_handler.cpp ++ gnumeric_helper.cpp ++ gnumeric_sheet_context.cpp ++ gnumeric_tokens.cpp ++ orcus_gnumeric.cpp + ) + + configure_file(constants.inl.in ${CMAKE_CURRENT_BINARY_DIR}/constants.inl) + diff --git a/bucket_EE/ixion b/bucket_EE/ixion index 4b4ca16ac..5457dcd39 100644 --- a/bucket_EE/ixion +++ b/bucket_EE/ixion @@ -3,7 +3,8 @@ NAMEBASE= ixion VERSION= 0.16.0 KEYWORDS= math -VARIANTS= standard +VARIANTS= standard libre +SDESC[libre]= Formual parser and interpreter for Libreoffice SDESC[standard]= General purpose formula parser and interpreter HOMEPAGE= https://gitlab.com/ixion/ixion CONTACT= nobody @@ -11,11 +12,14 @@ CONTACT= nobody DOWNLOAD_GROUPS= main SITES[main]= https://gitlab.com/ixion/ixion/-/archive/0.16.0/ DISTFILE[1]= ixion-0.16.0.tar.bz2:main -DF_INDEX= 1 +DISTFILE[2]= ixion-0.15.0.tar.bz2:main +DF_INDEX= 1 2 +SPKGS[libre]= single SPKGS[standard]= single -OPTIONS_AVAILABLE= none +OPTIONS_AVAILABLE= LIBRE OPTIONS_STANDARD= none +VOPTS[libre]= LIBRE=ON BUILD_DEPENDS= mdds:single:standard spdlog:single:standard @@ -23,6 +27,8 @@ BUILDRUN_DEPENDS= boost-libraries:rest:python_default USES= cmake python:build zlib +DISTNAME= ixion-{{VERSION}} + LICENSE= MPL:single LICENSE_TERMS= single:{{WRKDIR}}/TERMS LICENSE_FILE= MPL:{{WRKSRC}}/LICENSE @@ -30,7 +36,7 @@ LICENSE_AWK= TERMS:"^$$" LICENSE_SOURCE= TERMS:{{WRKSRC}}/src/libixion/address.cpp LICENSE_SCHEME= solo -PLIST_SUB= VER=0.16 +PLIST_SUB= VER={{VER}} LDFLAGS= -lboost_thread -lboost_program_options @@ -39,6 +45,16 @@ CMAKE_ARGS= -DMDDS_INCLUDEDIR="{{LOCALBASE}}/include/mdds-1.2" -DCMAKE_SKIP_BUILD_RPATH:BOOL=YES VAR_OPSYS[linux]= LDFLAGS=-ldl +[LIBRE].DESCRIPTION= Build older 0.15 version for Libreoffice +[LIBRE].MAKEFILE_OFF= VER=0.16 + VERSION=0.16.0 +[LIBRE].MAKEFILE_ON= VER=0.15 + VERSION=0.15.0 + +post-patch-LIBRE-ON: + ${REINPLACE_CMD} -e '/input_cell/ s|nullptr_t|std::nullptr_t|' \ + ${WRKSRC}/include/ixion/model_context.hpp + post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ixion* ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so @@ -58,8 +74,9 @@ cells have been modified since the last calculation, and a partial calculation of only the affected cells need to be calculated. -[FILE:99:distinfo] +[FILE:198:distinfo] 2298d2f48836cfd12de162f0fbb3d50c45a910c8fa1186e905416d92894975ea 173629 ixion-0.16.0.tar.bz2 +654dd3fb9c6932e35b0c333f69574fa7c2eb05788e8c7fa9580fba27cb054a82 163162 ixion-0.15.0.tar.bz2 [FILE:717:manifests/plist.single] @@ -103,3 +120,42 @@ include/ixion-%%VER%%/ixion/interface/ table_handler.hpp lib/libixion-%%VER%%.so + +[FILE:657:manifests/plist.single.libre] +bin/ + ixion-formula-tokenizer + ixion-parser + ixion-sorter +include/ixion-%%VER%%/ixion/ + address.hpp + address_iterator.hpp + cell.hpp + column_store_type.hpp + compute_engine.hpp + config.hpp + dirty_cell_tracker.hpp + env.hpp + exceptions.hpp + formula.hpp + formula_function_opcode.hpp + formula_name_resolver.hpp + formula_opcode.hpp + formula_result.hpp + formula_tokens.hpp + formula_tokens_fwd.hpp + global.hpp + info.hpp + macros.hpp + matrix.hpp + mem_str_buf.hpp + model_context.hpp + model_iterator.hpp + module.hpp + table.hpp + types.hpp +include/ixion-%%VER%%/ixion/interface/ + formula_model_access.hpp + session_handler.hpp + table_handler.hpp +lib/liblibixion-%%VER%%.so + -- 2.41.0