September 2019 - crux-commits

ports/contrib (3.5): mdds: update signature
by crux＠crux.nu 08 Sep '19

08 Sep '19

commit 46bef2c0d5b59d5e60a654f92b68064591f2687c Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Sep 8 10:05:52 2019 +0200 mdds: update signature diff --git a/mdds/.signature b/mdds/.signature index 51f26452..ac8cf3ae 100644 --- a/mdds/.signature +++ b/mdds/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3xE0khn81GaINsntNEOgm6C5ybXN9Xpw6wre+Paoj82mdi4QDnwMAL5qRGJKufOc8r/ljZ1QrLnSSTvgeKX0KwM= +RWSagIOpLGJF367k3hkEOtG8hvJdeDTFDZn1v7ZYn0bXpNgl58NkHiPj/0/C5bhuZwx20MR8sQtqCiFzRxb4ZFIIrOZmqhRIOwA= SHA256 (Pkgfile) = 4edeb8e8e3dca23ad0cf3188fda8f5d0d39c0786a3e6ed820a8273d68e696036 SHA256 (.footprint) = eb6650a2a2b4eea349a3740f53db19a08985a307b42c571d3f3e5dceaf4d3c96 -SHA256 (mdds-1.5.0.tar.bz2) = 74cda018d5aa39a2f91652608efb066fd225f3597ce54733e6ab1e99e52606f7 +SHA256 (mdds-1.5.0.tar.bz2) = 144d6debd7be32726f332eac14ef9f17e2d3cf89cb3250eb31a7127e0789680d

1 0

ports/contrib (3.5): libixion: [notify] new dependency: spdlog
by crux＠crux.nu 08 Sep '19

08 Sep '19

commit 7aee016ed87600208f7756a20d9bd3bc582f824b Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Sep 8 02:37:11 2019 +0200 libixion: [notify] new dependency: spdlog diff --git a/libixion/.signature b/libixion/.signature index 811f5359..4241d7c0 100644 --- a/libixion/.signature +++ b/libixion/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF33uN7cACbxp1EDYPwJnbMeDGZNUBjweFBFHLaKsMwxs5IiqaGitWLFsOeC5hxsg+gidO+oM6iQAz2KmoNI8RdAg= -SHA256 (Pkgfile) = 9785c97e86684e9a7c120fe6a1a807bd9b96770b4b5797fedefbad929047f07f +RWSagIOpLGJF33yjaudkud1bSG7knSqcMq+IkRJ5ZvMwlIYLmi72M5OatMA8l1xlm77v3uow9hylV5K0jSVSe5E8uYu3sQhw6AM= +SHA256 (Pkgfile) = 00d5857cfadb2f7693b74104a5b28dd648d6b37d6b91eba9199728c153810f1b SHA256 (.footprint) = 87824f740fb9fbf13dd29153a22dc8d7791026ad380bca15e3436c48395791ae SHA256 (libixion-0.15.0.tar.xz) = b1f60af61be875e3bfa7ad18203a6c8ccdeb9922a531e196029fc42fbfa0b9e6 diff --git a/libixion/Pkgfile b/libixion/Pkgfile index 93fc9973..08457151 100644 --- a/libixion/Pkgfile +++ b/libixion/Pkgfile @@ -1,7 +1,7 @@ # Description: a library for calculating the results of formula expressions stored in multiple named targets # URL: https://gitlab.com/ixion/ixion # Maintainer: Tim Biermann, tbier at posteo dot de -# Depends on: mdds py3boost +# Depends on: mdds py3boost spdlog name=libixion version=0.15.0

1 0

ports/contrib (3.5): mdds: 1.4.3 -> 1.5.0
by crux＠crux.nu 08 Sep '19

08 Sep '19

commit fc05e267a67132b01c74aa3097b3656f480b8078 Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Sep 8 02:18:47 2019 +0200 mdds: 1.4.3 -> 1.5.0 diff --git a/mdds/.footprint b/mdds/.footprint index 01b6141c..9df144b0 100644 --- a/mdds/.footprint +++ b/mdds/.footprint @@ -1,39 +1,39 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/include/ -drwxr-xr-x root/root usr/include/mdds-1.4/ -drwxr-xr-x root/root usr/include/mdds-1.4/mdds/ --rw-r--r-- root/root usr/include/mdds-1.4/mdds/flat_segment_tree.hpp --rw-r--r-- root/root usr/include/mdds-1.4/mdds/flat_segment_tree_def.inl --rw-r--r-- root/root usr/include/mdds-1.4/mdds/flat_segment_tree_itr.hpp --rw-r--r-- root/root usr/include/mdds-1.4/mdds/global.hpp --rw-r--r-- root/root usr/include/mdds-1.4/mdds/multi_type_matrix.hpp --rw-r--r-- root/root usr/include/mdds-1.4/mdds/multi_type_matrix_def.inl --rw-r--r-- root/root usr/include/mdds-1.4/mdds/multi_type_vector.hpp -drwxr-xr-x root/root usr/include/mdds-1.4/mdds/multi_type_vector/ --rw-r--r-- root/root usr/include/mdds-1.4/mdds/multi_type_vector/collection.hpp --rw-r--r-- root/root usr/include/mdds-1.4/mdds/multi_type_vector/collection_def.inl --rw-r--r-- root/root usr/include/mdds-1.4/mdds/multi_type_vector_custom_func1.hpp --rw-r--r-- root/root usr/include/mdds-1.4/mdds/multi_type_vector_custom_func2.hpp --rw-r--r-- root/root usr/include/mdds-1.4/mdds/multi_type_vector_custom_func3.hpp --rw-r--r-- root/root usr/include/mdds-1.4/mdds/multi_type_vector_def.inl --rw-r--r-- root/root usr/include/mdds-1.4/mdds/multi_type_vector_itr.hpp --rw-r--r-- root/root usr/include/mdds-1.4/mdds/multi_type_vector_macro.hpp --rw-r--r-- root/root usr/include/mdds-1.4/mdds/multi_type_vector_trait.hpp --rw-r--r-- root/root usr/include/mdds-1.4/mdds/multi_type_vector_types.hpp --rw-r--r-- root/root usr/include/mdds-1.4/mdds/node.hpp --rw-r--r-- root/root usr/include/mdds-1.4/mdds/point_quad_tree.hpp --rw-r--r-- root/root usr/include/mdds-1.4/mdds/quad_node.hpp --rw-r--r-- root/root usr/include/mdds-1.4/mdds/rectangle_set.hpp --rw-r--r-- root/root usr/include/mdds-1.4/mdds/rectangle_set_def.inl --rw-r--r-- root/root usr/include/mdds-1.4/mdds/rtree.hpp --rw-r--r-- root/root usr/include/mdds-1.4/mdds/rtree_def.inl --rw-r--r-- root/root usr/include/mdds-1.4/mdds/segment_tree.hpp --rw-r--r-- root/root usr/include/mdds-1.4/mdds/segment_tree_def.inl --rw-r--r-- root/root usr/include/mdds-1.4/mdds/sorted_string_map.hpp --rw-r--r-- root/root usr/include/mdds-1.4/mdds/sorted_string_map_def.inl --rw-r--r-- root/root usr/include/mdds-1.4/mdds/trie_map.hpp --rw-r--r-- root/root usr/include/mdds-1.4/mdds/trie_map_def.inl --rw-r--r-- root/root usr/include/mdds-1.4/mdds/trie_map_itr.hpp +drwxr-xr-x root/root usr/include/mdds-1.5/ +drwxr-xr-x root/root usr/include/mdds-1.5/mdds/ +-rw-r--r-- root/root usr/include/mdds-1.5/mdds/flat_segment_tree.hpp +-rw-r--r-- root/root usr/include/mdds-1.5/mdds/flat_segment_tree_def.inl +-rw-r--r-- root/root usr/include/mdds-1.5/mdds/flat_segment_tree_itr.hpp +-rw-r--r-- root/root usr/include/mdds-1.5/mdds/global.hpp +-rw-r--r-- root/root usr/include/mdds-1.5/mdds/multi_type_matrix.hpp +-rw-r--r-- root/root usr/include/mdds-1.5/mdds/multi_type_matrix_def.inl +-rw-r--r-- root/root usr/include/mdds-1.5/mdds/multi_type_vector.hpp +drwxr-xr-x root/root usr/include/mdds-1.5/mdds/multi_type_vector/ +-rw-r--r-- root/root usr/include/mdds-1.5/mdds/multi_type_vector/collection.hpp +-rw-r--r-- root/root usr/include/mdds-1.5/mdds/multi_type_vector/collection_def.inl +-rw-r--r-- root/root usr/include/mdds-1.5/mdds/multi_type_vector_custom_func1.hpp +-rw-r--r-- root/root usr/include/mdds-1.5/mdds/multi_type_vector_custom_func2.hpp +-rw-r--r-- root/root usr/include/mdds-1.5/mdds/multi_type_vector_custom_func3.hpp +-rw-r--r-- root/root usr/include/mdds-1.5/mdds/multi_type_vector_def.inl +-rw-r--r-- root/root usr/include/mdds-1.5/mdds/multi_type_vector_itr.hpp +-rw-r--r-- root/root usr/include/mdds-1.5/mdds/multi_type_vector_macro.hpp +-rw-r--r-- root/root usr/include/mdds-1.5/mdds/multi_type_vector_trait.hpp +-rw-r--r-- root/root usr/include/mdds-1.5/mdds/multi_type_vector_types.hpp +-rw-r--r-- root/root usr/include/mdds-1.5/mdds/node.hpp +-rw-r--r-- root/root usr/include/mdds-1.5/mdds/point_quad_tree.hpp +-rw-r--r-- root/root usr/include/mdds-1.5/mdds/quad_node.hpp +-rw-r--r-- root/root usr/include/mdds-1.5/mdds/rectangle_set.hpp +-rw-r--r-- root/root usr/include/mdds-1.5/mdds/rectangle_set_def.inl +-rw-r--r-- root/root usr/include/mdds-1.5/mdds/rtree.hpp +-rw-r--r-- root/root usr/include/mdds-1.5/mdds/rtree_def.inl +-rw-r--r-- root/root usr/include/mdds-1.5/mdds/segment_tree.hpp +-rw-r--r-- root/root usr/include/mdds-1.5/mdds/segment_tree_def.inl +-rw-r--r-- root/root usr/include/mdds-1.5/mdds/sorted_string_map.hpp +-rw-r--r-- root/root usr/include/mdds-1.5/mdds/sorted_string_map_def.inl +-rw-r--r-- root/root usr/include/mdds-1.5/mdds/trie_map.hpp +-rw-r--r-- root/root usr/include/mdds-1.5/mdds/trie_map_def.inl +-rw-r--r-- root/root usr/include/mdds-1.5/mdds/trie_map_itr.hpp drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/pkgconfig/ --rw-r--r-- root/root usr/share/pkgconfig/mdds-1.4.pc +-rw-r--r-- root/root usr/share/pkgconfig/mdds-1.5.pc diff --git a/mdds/.signature b/mdds/.signature index 87d74605..51f26452 100644 --- a/mdds/.signature +++ b/mdds/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF31+KFFhb4AyEFzawj2wXTPWnnf6Bug6O5R0N7njyx0wagt6HvCZ7l+glu1B5+768AMMNGDS81fjFeMD2XCYccwc= -SHA256 (Pkgfile) = bccec5010b29cfbff690450a22f7bdeeab1f6f4f3db16de447acc363376bc0af -SHA256 (.footprint) = 5ff874ed29108b48a46184ecbc63fa04fd0397193cca38fc407e0caaa1137b1f -SHA256 (mdds-1.4.3.tar.bz2) = 25ce3d5af9f6609e1de05bb22b2316e57b74a72a5b686fbb2da199da72349c81 +RWSagIOpLGJF3xE0khn81GaINsntNEOgm6C5ybXN9Xpw6wre+Paoj82mdi4QDnwMAL5qRGJKufOc8r/ljZ1QrLnSSTvgeKX0KwM= +SHA256 (Pkgfile) = 4edeb8e8e3dca23ad0cf3188fda8f5d0d39c0786a3e6ed820a8273d68e696036 +SHA256 (.footprint) = eb6650a2a2b4eea349a3740f53db19a08985a307b42c571d3f3e5dceaf4d3c96 +SHA256 (mdds-1.5.0.tar.bz2) = 74cda018d5aa39a2f91652608efb066fd225f3597ce54733e6ab1e99e52606f7 diff --git a/mdds/Pkgfile b/mdds/Pkgfile index fda2bd35..f69d539f 100644 --- a/mdds/Pkgfile +++ b/mdds/Pkgfile @@ -4,7 +4,7 @@ # Depends on: boost name=mdds -version=1.4.3 +version=1.5.0 release=1 source=(https://kohei.us/files/mdds/src/$name-$version.tar.bz2)

1 0

ports/contrib (3.5): liborcus: 0.14.1 -> 0.15.2
by crux＠crux.nu 08 Sep '19

08 Sep '19

commit a04a1e95902647f7895e7323970d97338ccd1ee0 Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Sep 8 02:18:38 2019 +0200 liborcus: 0.14.1 -> 0.15.2 diff --git a/liborcus/.footprint b/liborcus/.footprint index f3607160..feb72661 100644 --- a/liborcus/.footprint +++ b/liborcus/.footprint @@ -11,107 +11,108 @@ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/orcus-xls-xml -rwxr-xr-x root/root usr/bin/orcus-xlsx -rwxr-xr-x root/root usr/bin/orcus-xml --rwxr-xr-x root/root usr/bin/orcus-xml-dump -rwxr-xr-x root/root usr/bin/orcus-yaml -rwxr-xr-x root/root usr/bin/orcus-zip-dump drwxr-xr-x root/root usr/include/ -drwxr-xr-x root/root usr/include/liborcus-0.14/ -drwxr-xr-x root/root usr/include/liborcus-0.14/orcus/ --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/base64.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/cell_buffer.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/config.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/css_document_tree.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/css_parser.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/css_parser_base.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/css_selector.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/css_types.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/csv_parser.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/csv_parser_base.hpp -drwxr-xr-x root/root usr/include/liborcus-0.14/orcus/detail/ --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/detail/parser_token_buffer.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/detail/thread.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/dom_tree.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/env.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/exception.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/format_detection.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/global.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/info.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/interface.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/json_document_tree.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/json_global.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/json_parser.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/json_parser_base.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/json_parser_thread.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/measurement.hpp -drwxr-xr-x root/root usr/include/liborcus-0.14/orcus/mso/ --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/mso/encryption_info.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/orcus_csv.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/orcus_gnumeric.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/orcus_import_ods.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/orcus_import_xlsx.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/orcus_ods.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/orcus_xls_xml.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/orcus_xlsx.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/orcus_xml.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/parser_base.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/parser_global.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/pstring.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/sax_ns_parser.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/sax_parser.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/sax_parser_base.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/sax_token_parser.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/sax_token_parser_thread.hpp -drwxr-xr-x root/root usr/include/liborcus-0.14/orcus/spreadsheet/ --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/spreadsheet/auto_filter.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/spreadsheet/config.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/spreadsheet/document.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/spreadsheet/export_interface.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/spreadsheet/factory.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/spreadsheet/import_interface.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/spreadsheet/import_interface_pivot.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/spreadsheet/import_interface_view.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/spreadsheet/pivot.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/spreadsheet/shared_strings.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/spreadsheet/sheet.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/spreadsheet/sheet_range.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/spreadsheet/styles.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/spreadsheet/types.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/spreadsheet/view.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/spreadsheet/view_types.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/stream.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/string_pool.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/threaded_json_parser.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/threaded_sax_token_parser.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/tokens.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/types.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/xml_namespace.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/xml_structure_tree.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/yaml_document_tree.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/yaml_parser.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/yaml_parser_base.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/zip_archive.hpp --rw-r--r-- root/root usr/include/liborcus-0.14/orcus/zip_archive_stream.hpp +drwxr-xr-x root/root usr/include/liborcus-0.15/ +drwxr-xr-x root/root usr/include/liborcus-0.15/orcus/ +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/base64.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/cell_buffer.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/config.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/css_document_tree.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/css_parser.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/css_parser_base.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/css_selector.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/css_types.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/csv_parser.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/csv_parser_base.hpp +drwxr-xr-x root/root usr/include/liborcus-0.15/orcus/detail/ +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/detail/parser_token_buffer.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/detail/thread.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/dom_tree.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/env.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/exception.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/format_detection.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/global.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/info.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/interface.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/json_document_tree.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/json_global.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/json_parser.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/json_parser_base.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/json_parser_thread.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/json_structure_tree.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/measurement.hpp +drwxr-xr-x root/root usr/include/liborcus-0.15/orcus/mso/ +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/mso/encryption_info.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/orcus_csv.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/orcus_gnumeric.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/orcus_import_ods.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/orcus_import_xlsx.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/orcus_json.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/orcus_ods.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/orcus_xls_xml.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/orcus_xlsx.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/orcus_xml.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/parser_base.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/parser_global.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/pstring.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/sax_ns_parser.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/sax_parser.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/sax_parser_base.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/sax_token_parser.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/sax_token_parser_thread.hpp +drwxr-xr-x root/root usr/include/liborcus-0.15/orcus/spreadsheet/ +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/spreadsheet/auto_filter.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/spreadsheet/config.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/spreadsheet/document.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/spreadsheet/export_interface.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/spreadsheet/factory.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/spreadsheet/import_interface.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/spreadsheet/import_interface_pivot.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/spreadsheet/import_interface_view.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/spreadsheet/pivot.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/spreadsheet/shared_strings.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/spreadsheet/sheet.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/spreadsheet/sheet_range.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/spreadsheet/styles.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/spreadsheet/types.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/spreadsheet/view.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/spreadsheet/view_types.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/stream.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/string_pool.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/threaded_json_parser.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/threaded_sax_token_parser.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/tokens.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/types.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/xml_namespace.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/xml_structure_tree.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/yaml_document_tree.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/yaml_parser.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/yaml_parser_base.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/zip_archive.hpp +-rw-r--r-- root/root usr/include/liborcus-0.15/orcus/zip_archive_stream.hpp drwxr-xr-x root/root usr/lib/ --rw-r--r-- root/root usr/lib/liborcus-0.14.a --rwxr-xr-x root/root usr/lib/liborcus-0.14.la -lrwxrwxrwx root/root usr/lib/liborcus-0.14.so -> liborcus-0.14.so.0.0.0 -lrwxrwxrwx root/root usr/lib/liborcus-0.14.so.0 -> liborcus-0.14.so.0.0.0 --rwxr-xr-x root/root usr/lib/liborcus-0.14.so.0.0.0 --rw-r--r-- root/root usr/lib/liborcus-mso-0.14.a --rwxr-xr-x root/root usr/lib/liborcus-mso-0.14.la -lrwxrwxrwx root/root usr/lib/liborcus-mso-0.14.so -> liborcus-mso-0.14.so.0.0.0 -lrwxrwxrwx root/root usr/lib/liborcus-mso-0.14.so.0 -> liborcus-mso-0.14.so.0.0.0 --rwxr-xr-x root/root usr/lib/liborcus-mso-0.14.so.0.0.0 --rw-r--r-- root/root usr/lib/liborcus-parser-0.14.a --rwxr-xr-x root/root usr/lib/liborcus-parser-0.14.la -lrwxrwxrwx root/root usr/lib/liborcus-parser-0.14.so -> liborcus-parser-0.14.so.0.0.0 -lrwxrwxrwx root/root usr/lib/liborcus-parser-0.14.so.0 -> liborcus-parser-0.14.so.0.0.0 --rwxr-xr-x root/root usr/lib/liborcus-parser-0.14.so.0.0.0 --rw-r--r-- root/root usr/lib/liborcus-spreadsheet-model-0.14.a --rwxr-xr-x root/root usr/lib/liborcus-spreadsheet-model-0.14.la -lrwxrwxrwx root/root usr/lib/liborcus-spreadsheet-model-0.14.so -> liborcus-spreadsheet-model-0.14.so.0.0.0 -lrwxrwxrwx root/root usr/lib/liborcus-spreadsheet-model-0.14.so.0 -> liborcus-spreadsheet-model-0.14.so.0.0.0 --rwxr-xr-x root/root usr/lib/liborcus-spreadsheet-model-0.14.so.0.0.0 +-rw-r--r-- root/root usr/lib/liborcus-0.15.a +-rwxr-xr-x root/root usr/lib/liborcus-0.15.la +lrwxrwxrwx root/root usr/lib/liborcus-0.15.so -> liborcus-0.15.so.0.0.0 +lrwxrwxrwx root/root usr/lib/liborcus-0.15.so.0 -> liborcus-0.15.so.0.0.0 +-rwxr-xr-x root/root usr/lib/liborcus-0.15.so.0.0.0 +-rw-r--r-- root/root usr/lib/liborcus-mso-0.15.a +-rwxr-xr-x root/root usr/lib/liborcus-mso-0.15.la +lrwxrwxrwx root/root usr/lib/liborcus-mso-0.15.so -> liborcus-mso-0.15.so.0.0.0 +lrwxrwxrwx root/root usr/lib/liborcus-mso-0.15.so.0 -> liborcus-mso-0.15.so.0.0.0 +-rwxr-xr-x root/root usr/lib/liborcus-mso-0.15.so.0.0.0 +-rw-r--r-- root/root usr/lib/liborcus-parser-0.15.a +-rwxr-xr-x root/root usr/lib/liborcus-parser-0.15.la +lrwxrwxrwx root/root usr/lib/liborcus-parser-0.15.so -> liborcus-parser-0.15.so.0.0.0 +lrwxrwxrwx root/root usr/lib/liborcus-parser-0.15.so.0 -> liborcus-parser-0.15.so.0.0.0 +-rwxr-xr-x root/root usr/lib/liborcus-parser-0.15.so.0.0.0 +-rw-r--r-- root/root usr/lib/liborcus-spreadsheet-model-0.15.a +-rwxr-xr-x root/root usr/lib/liborcus-spreadsheet-model-0.15.la +lrwxrwxrwx root/root usr/lib/liborcus-spreadsheet-model-0.15.so -> liborcus-spreadsheet-model-0.15.so.0.0.0 +lrwxrwxrwx root/root usr/lib/liborcus-spreadsheet-model-0.15.so.0 -> liborcus-spreadsheet-model-0.15.so.0.0.0 +-rwxr-xr-x root/root usr/lib/liborcus-spreadsheet-model-0.15.so.0.0.0 drwxr-xr-x root/root usr/lib/pkgconfig/ --rw-r--r-- root/root usr/lib/pkgconfig/liborcus-0.14.pc --rw-r--r-- root/root usr/lib/pkgconfig/liborcus-spreadsheet-model-0.14.pc +-rw-r--r-- root/root usr/lib/pkgconfig/liborcus-0.15.pc +-rw-r--r-- root/root usr/lib/pkgconfig/liborcus-spreadsheet-model-0.15.pc diff --git a/liborcus/.signature b/liborcus/.signature index 05685170..9c0b60ea 100644 --- a/liborcus/.signature +++ b/liborcus/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF306ntjPI+gP/DZEjFt8JvhT7kU83HIV49TUVRXCkcUIHj3Rwn+qVMop+Nkee/ZI5h3EfCD6uTF7LLXxd9Xqs6Q0= -SHA256 (Pkgfile) = 6f627bba94951dcb3c250fb47b3b423f12bba8cdacc1bbe214ac7e26f3e01628 -SHA256 (.footprint) = 771cc26f60e73506324a01d2358e2fcf2a2714cf3c88de2fa08a9987367d9a49 -SHA256 (liborcus-0.14.1.tar.xz) = f2d1dc840fa6a5358d956a7cb746c36b857d92190de0ac5b40b2841ed408daab +RWSagIOpLGJF342qXLdLOb133+q4UItEU9FHBILXdK0O1konpoE4YWOAwoJMZRG+4x9ARHQmvBjaDzMWQkgrOVK8dtt2s/x3WwY= +SHA256 (Pkgfile) = 65cdf06a64c9a201585e8328c29ce08d226156800a79814acd307b6287be94f9 +SHA256 (.footprint) = f79b1c945d6b80d96283bd8ce1ebd8cd0322fe1f3dee35a78ddd6bc6ea19a113 +SHA256 (liborcus-0.15.2.tar.xz) = 0d90f5d3d4998a0a46db7cf3be8759fb8c668c45be202866b9c7497bb06a7af7 diff --git a/liborcus/Pkgfile b/liborcus/Pkgfile index 3debca7e..78891400 100644 --- a/liborcus/Pkgfile +++ b/liborcus/Pkgfile @@ -4,7 +4,7 @@ # Depends on: libixion zstd name=liborcus -version=0.14.1 +version=0.15.2 release=1 source=(https://kohei.us/files/orcus/src/$name-$version.tar.xz)

1 0

ports/contrib (3.5): libixion: 0.14.1 -> 0.15.0
by crux＠crux.nu 08 Sep '19

08 Sep '19

commit 7fe9c6727b0045f212ee88a199db7f776572e6cc Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Sep 8 02:18:01 2019 +0200 libixion: 0.14.1 -> 0.15.0 diff --git a/libixion/.footprint b/libixion/.footprint index 378a777d..d9c3b58e 100644 --- a/libixion/.footprint +++ b/libixion/.footprint @@ -4,45 +4,45 @@ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/ixion-parser -rwxr-xr-x root/root usr/bin/ixion-sorter drwxr-xr-x root/root usr/include/ -drwxr-xr-x root/root usr/include/libixion-0.14/ -drwxr-xr-x root/root usr/include/libixion-0.14/ixion/ --rw-r--r-- root/root usr/include/libixion-0.14/ixion/address.hpp --rw-r--r-- root/root usr/include/libixion-0.14/ixion/address_iterator.hpp --rw-r--r-- root/root usr/include/libixion-0.14/ixion/cell.hpp --rw-r--r-- root/root usr/include/libixion-0.14/ixion/cell_listener_tracker.hpp --rw-r--r-- root/root usr/include/libixion-0.14/ixion/column_store_type.hpp --rw-r--r-- root/root usr/include/libixion-0.14/ixion/compute_engine.hpp --rw-r--r-- root/root usr/include/libixion-0.14/ixion/config.hpp --rw-r--r-- root/root usr/include/libixion-0.14/ixion/depth_first_search.hpp --rw-r--r-- root/root usr/include/libixion-0.14/ixion/env.hpp --rw-r--r-- root/root usr/include/libixion-0.14/ixion/exceptions.hpp --rw-r--r-- root/root usr/include/libixion-0.14/ixion/formula.hpp --rw-r--r-- root/root usr/include/libixion-0.14/ixion/formula_function_opcode.hpp --rw-r--r-- root/root usr/include/libixion-0.14/ixion/formula_name_resolver.hpp --rw-r--r-- root/root usr/include/libixion-0.14/ixion/formula_opcode.hpp --rw-r--r-- root/root usr/include/libixion-0.14/ixion/formula_result.hpp --rw-r--r-- root/root usr/include/libixion-0.14/ixion/formula_tokens.hpp --rw-r--r-- root/root usr/include/libixion-0.14/ixion/formula_tokens_fwd.hpp --rw-r--r-- root/root usr/include/libixion-0.14/ixion/global.hpp --rw-r--r-- root/root usr/include/libixion-0.14/ixion/info.hpp -drwxr-xr-x root/root usr/include/libixion-0.14/ixion/interface/ --rw-r--r-- root/root usr/include/libixion-0.14/ixion/interface/formula_model_access.hpp --rw-r--r-- root/root usr/include/libixion-0.14/ixion/interface/session_handler.hpp --rw-r--r-- root/root usr/include/libixion-0.14/ixion/interface/table_handler.hpp --rw-r--r-- root/root usr/include/libixion-0.14/ixion/macros.hpp --rw-r--r-- root/root usr/include/libixion-0.14/ixion/matrix.hpp --rw-r--r-- root/root usr/include/libixion-0.14/ixion/mem_str_buf.hpp --rw-r--r-- root/root usr/include/libixion-0.14/ixion/model_context.hpp --rw-r--r-- root/root usr/include/libixion-0.14/ixion/module.hpp --rw-r--r-- root/root usr/include/libixion-0.14/ixion/table.hpp --rw-r--r-- root/root usr/include/libixion-0.14/ixion/types.hpp +drwxr-xr-x root/root usr/include/libixion-0.15/ +drwxr-xr-x root/root usr/include/libixion-0.15/ixion/ +-rw-r--r-- root/root usr/include/libixion-0.15/ixion/address.hpp +-rw-r--r-- root/root usr/include/libixion-0.15/ixion/address_iterator.hpp +-rw-r--r-- root/root usr/include/libixion-0.15/ixion/cell.hpp +-rw-r--r-- root/root usr/include/libixion-0.15/ixion/column_store_type.hpp +-rw-r--r-- root/root usr/include/libixion-0.15/ixion/compute_engine.hpp +-rw-r--r-- root/root usr/include/libixion-0.15/ixion/config.hpp +-rw-r--r-- root/root usr/include/libixion-0.15/ixion/dirty_cell_tracker.hpp +-rw-r--r-- root/root usr/include/libixion-0.15/ixion/env.hpp +-rw-r--r-- root/root usr/include/libixion-0.15/ixion/exceptions.hpp +-rw-r--r-- root/root usr/include/libixion-0.15/ixion/formula.hpp +-rw-r--r-- root/root usr/include/libixion-0.15/ixion/formula_function_opcode.hpp +-rw-r--r-- root/root usr/include/libixion-0.15/ixion/formula_name_resolver.hpp +-rw-r--r-- root/root usr/include/libixion-0.15/ixion/formula_opcode.hpp +-rw-r--r-- root/root usr/include/libixion-0.15/ixion/formula_result.hpp +-rw-r--r-- root/root usr/include/libixion-0.15/ixion/formula_tokens.hpp +-rw-r--r-- root/root usr/include/libixion-0.15/ixion/formula_tokens_fwd.hpp +-rw-r--r-- root/root usr/include/libixion-0.15/ixion/global.hpp +-rw-r--r-- root/root usr/include/libixion-0.15/ixion/info.hpp +drwxr-xr-x root/root usr/include/libixion-0.15/ixion/interface/ +-rw-r--r-- root/root usr/include/libixion-0.15/ixion/interface/formula_model_access.hpp +-rw-r--r-- root/root usr/include/libixion-0.15/ixion/interface/session_handler.hpp +-rw-r--r-- root/root usr/include/libixion-0.15/ixion/interface/table_handler.hpp +-rw-r--r-- root/root usr/include/libixion-0.15/ixion/macros.hpp +-rw-r--r-- root/root usr/include/libixion-0.15/ixion/matrix.hpp +-rw-r--r-- root/root usr/include/libixion-0.15/ixion/mem_str_buf.hpp +-rw-r--r-- root/root usr/include/libixion-0.15/ixion/model_context.hpp +-rw-r--r-- root/root usr/include/libixion-0.15/ixion/model_iterator.hpp +-rw-r--r-- root/root usr/include/libixion-0.15/ixion/module.hpp +-rw-r--r-- root/root usr/include/libixion-0.15/ixion/table.hpp +-rw-r--r-- root/root usr/include/libixion-0.15/ixion/types.hpp drwxr-xr-x root/root usr/lib/ --rwxr-xr-x root/root usr/lib/libixion-0.14.la -lrwxrwxrwx root/root usr/lib/libixion-0.14.so -> libixion-0.14.so.0.0.0 -lrwxrwxrwx root/root usr/lib/libixion-0.14.so.0 -> libixion-0.14.so.0.0.0 --rwxr-xr-x root/root usr/lib/libixion-0.14.so.0.0.0 +-rwxr-xr-x root/root usr/lib/libixion-0.15.la +lrwxrwxrwx root/root usr/lib/libixion-0.15.so -> libixion-0.15.so.0.0.0 +lrwxrwxrwx root/root usr/lib/libixion-0.15.so.0 -> libixion-0.15.so.0.0.0 +-rwxr-xr-x root/root usr/lib/libixion-0.15.so.0.0.0 drwxr-xr-x root/root usr/lib/pkgconfig/ --rw-r--r-- root/root usr/lib/pkgconfig/libixion-0.14.pc +-rw-r--r-- root/root usr/lib/pkgconfig/libixion-0.15.pc drwxr-xr-x root/root usr/lib/python3.7/ drwxr-xr-x root/root usr/lib/python3.7/site-packages/ -rwxr-xr-x root/root usr/lib/python3.7/site-packages/ixion.la diff --git a/libixion/.signature b/libixion/.signature index 9d24536a..811f5359 100644 --- a/libixion/.signature +++ b/libixion/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF38i9qyhIzOn61TuPS9DqwLMyNflK8DDK1A6rke30E4DXKTjR4IK8WGK9kgniXWI1CLVD5edSYXD8qXgtTNhX0QE= -SHA256 (Pkgfile) = 7135349c69c0c807bacecae9302a43228acf373d13868640dc133dc3815e4a5b -SHA256 (.footprint) = 94b4a1e93f3f319321ebfa9b6904a7fcbb0ceaebe679a88cd554a40a73efaf49 -SHA256 (libixion-0.14.1.tar.xz) = 6ad1384fcf813083c6d981a16b2643c953f9bac4c2caf1ed1682921d9b69ed91 +RWSagIOpLGJF33uN7cACbxp1EDYPwJnbMeDGZNUBjweFBFHLaKsMwxs5IiqaGitWLFsOeC5hxsg+gidO+oM6iQAz2KmoNI8RdAg= +SHA256 (Pkgfile) = 9785c97e86684e9a7c120fe6a1a807bd9b96770b4b5797fedefbad929047f07f +SHA256 (.footprint) = 87824f740fb9fbf13dd29153a22dc8d7791026ad380bca15e3436c48395791ae +SHA256 (libixion-0.15.0.tar.xz) = b1f60af61be875e3bfa7ad18203a6c8ccdeb9922a531e196029fc42fbfa0b9e6 diff --git a/libixion/Pkgfile b/libixion/Pkgfile index 4c823e8d..93fc9973 100644 --- a/libixion/Pkgfile +++ b/libixion/Pkgfile @@ -4,7 +4,7 @@ # Depends on: mdds py3boost name=libixion -version=0.14.1 +version=0.15.0 release=1 source=(https://kohei.us/files/ixion/src/$name-$version.tar.xz)

1 0

ports/contrib (3.5): libreoffice: 6.3.1.2 -> 6.3.2.1
by crux＠crux.nu 08 Sep '19

08 Sep '19

commit fc56b5a6175306385d813cf6116dc2dfcf34231f Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Sep 8 02:13:34 2019 +0200 libreoffice: 6.3.1.2 -> 6.3.2.1 diff --git a/libreoffice/.signature b/libreoffice/.signature index b4559a70..7e4127db 100644 --- a/libreoffice/.signature +++ b/libreoffice/.signature @@ -1,9 +1,10 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF35wfDFMTwv4M7D+lyQjMM0LUP10OjYpZpXoM4B6WGwJApP/UenSLTRMNxC3w3jHdheu+fofxEaxipYS0ilpMPwo= -SHA256 (Pkgfile) = f3aa599f680c2466938fd4a47f8b8ff8d6da58c31a8dce181f6f787d726b68e5 +RWSagIOpLGJF39QRTboug1F4B5pTb8Xd2ml0IRFGzQ0ZbTXHJgUL9BV9PuaflaKvYszYcmsHhz6fj8f45VS/AbhS0lDhhi1O5QU= +SHA256 (Pkgfile) = 4605ab3f42f26a3ad67bc48061c1e7b393b2c17490b3b0b707a1298fad2b8e7b SHA256 (.footprint) = 2e6bbd97b7bef2d1d5254ce95990280f95ad03849b3ea754fbab32ad9ff4a666 -SHA256 (libreoffice-6.3.1.2.tar.xz) = 78c7c9a4d2203daeb1d3a6e7e8a522492b5d89fd374903558876dc3300bcc251 -SHA256 (libreoffice-dictionaries-6.3.1.2.tar.xz) = 88e75f6718d46fe6f760dff91a830a1a993a90ffc6bc8d8560b0e7455ffbf0f7 +SHA256 (libreoffice-6.3.2.1.tar.xz) = d5887c16fdca32f38351474f1c8812e7c4e304599840b71b8b23953783b33549 +SHA256 (libreoffice-dictionaries-6.3.2.1.tar.xz) = f77e1602c5570dec527621465be7625c042ceaefb344309da5889b25197f5327 SHA256 (185d60944ea767075d27247c3162b3bc-unowinreg.dll) = eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6 SHA256 (0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776 SHA256 (makefile.in.patch) = 50d2f5bac605f6fdbcb3234113949971b998875e832e1ae09b2498afe27f0f10 +SHA256 (fix_mdds-orcus.patch) = 8c56a58aaee117cb3879ea1ab358e5b886334dac781f505bba8aac446100e31f diff --git a/libreoffice/Pkgfile b/libreoffice/Pkgfile index 2c2ff2b8..873623ab 100644 --- a/libreoffice/Pkgfile +++ b/libreoffice/Pkgfile @@ -5,7 +5,7 @@ # Optional: cups gst-plugins-base kio qt5 valgrind vlc name=libreoffice -version=6.3.1.2 +version=6.3.2.1 release=1 source=( https://downloadarchive.documentfoundation.org/libreoffice/old/$version/src… @@ -13,6 +13,7 @@ source=( https://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-uno… https://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1… makefile.in.patch + fix_mdds-orcus.patch ) unpack_source() { @@ -35,6 +36,7 @@ unpack_source() { build() { cd $name-$version patch -Np0 -i ../makefile.in.patch + patch -Np1 -i ../fix_mdds-orcus.patch find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ diff --git a/libreoffice/fix_mdds-orcus.patch b/libreoffice/fix_mdds-orcus.patch new file mode 100644 index 00000000..8eba3654 --- /dev/null +++ b/libreoffice/fix_mdds-orcus.patch @@ -0,0 +1,453 @@ +From 56ffe3c0a1261cd98a3d42b8b08d5f8eb013ead4 Mon Sep 17 00:00:00 2001 +From: Kohei Yoshida <kohei(a)libreoffice.org> +Date: Mon, 12 Aug 2019 13:57:34 -0400 +Subject: Switch mdds to 1.5.0 and liborcus to 0.15.0. + +Change-Id: Ibff9a5e0f0771e4cf12b4dc3985661a01195e265 +Reviewed-on: https://gerrit.libreoffice.org/77482 +Tested-by: Jenkins +Reviewed-by: Kohei Yoshida <kohei(a)libreoffice.org> +--- + RepositoryExternal.mk | 4 ++-- + configure.ac | 4 ++-- + download.lst | 8 +++---- + .../0001-Prevent-unsigned-integer-underflow.patch | 27 ---------------------- + external/liborcus/ExternalPackage_liborcus.mk | 8 +++---- + external/liborcus/ExternalProject_liborcus.mk | 4 ++-- + external/liborcus/Library_orcus-parser.mk | 2 ++ + external/liborcus/Library_orcus.mk | 7 ++++++ + external/liborcus/UnpackedTarball_liborcus.mk | 3 --- + external/liborcus/version.patch.0 | 11 --------- + sc/inc/mtvelements.hxx | 8 +++---- + sc/inc/orcusxml.hxx | 1 + + sc/qa/unit/dataproviders_test.cxx | 1 + + sc/source/core/tool/scmatrix.cxx | 8 +++---- + sc/source/filter/inc/orcusinterface.hxx | 2 ++ + sc/source/filter/orcus/interface.cxx | 8 +++++-- + sc/source/filter/orcus/orcusfiltersimpl.cxx | 4 ++-- + sc/source/filter/orcus/xmlcontext.cxx | 9 +++++++- + sc/source/ui/xmlsource/xmlsourcedlg.cxx | 6 +++++ + svl/source/misc/gridprinter.cxx | 2 +- + 20 files changed, 58 insertions(+), 69 deletions(-) + delete mode 100644 external/liborcus/0001-Prevent-unsigned-integer-underflow.patch + delete mode 100644 external/liborcus/version.patch.0 + +diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk +index 54ab1db..57f66b8 100644 +--- a/RepositoryExternal.mk ++++ b/RepositoryExternal.mk +@@ -3262,7 +3262,7 @@ $(call gb_LinkTarget_set_include,$(1),\ + ) + + $(call gb_LinkTarget_add_libs,$(1),\ +- -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs -lorcus-0.14 \ ++ -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs -lorcus-0.15 \ + ) + + $(if $(SYSTEM_BOOST), \ +@@ -3281,7 +3281,7 @@ $(call gb_LinkTarget_set_include,$(1),\ + ) + + $(call gb_LinkTarget_add_libs,$(1),\ +- -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs -lorcus-parser-0.14 \ ++ -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs -lorcus-parser-0.15 \ + ) + + endef +diff --git a/configure.ac b/configure.ac +index 1510daf..d0e6759 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -9291,7 +9291,7 @@ AC_SUBST(SYSTEM_BOOST) + dnl =================================================================== + dnl Check for system mdds + dnl =================================================================== +-libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds-1.4 >= 1.4.1], ["-I${WORKDIR}/UnpackedTarball/mdds/include"]) ++libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds-1.5 >= 1.5.0], ["-I${WORKDIR}/UnpackedTarball/mdds/include"]) + + dnl =================================================================== + dnl Check for system glm +@@ -9597,7 +9597,7 @@ AC_SUBST(ENABLE_FUZZERS) + dnl =================================================================== + dnl Orcus + dnl =================================================================== +-libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.14 >= 0.14.0]) ++libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.15 >= 0.15.0]) + if test "$with_system_orcus" != "yes"; then + if test "$SYSTEM_BOOST" = "TRUE"; then + # =========================================================== +diff --git a/download.lst b/download.lst +index b57ed79..59b58f9 100644 +--- a/download.lst ++++ b/download.lst +@@ -168,8 +168,8 @@ export LXML_SHA256SUM := 940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a + export LXML_TARBALL := lxml-4.1.1.tgz + export MARIADB_CONNECTOR_C_SHA256SUM := fd2f751dea049c1907735eb236aeace1d811d6a8218118b00bbaa9b84dc5cd60 + export MARIADB_CONNECTOR_C_TARBALL := a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz +-export MDDS_SHA256SUM := 25ce3d5af9f6609e1de05bb22b2316e57b74a72a5b686fbb2da199da72349c81 +-export MDDS_TARBALL := mdds-1.4.3.tar.bz2 ++export MDDS_SHA256SUM := 74cda018d5aa39a2f91652608efb066fd225f3597ce54733e6ab1e99e52606f7 ++export MDDS_TARBALL := mdds-1.5.0.tar.bz2 + export MDNSRESPONDER_SHA256SUM := e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e3990d68aabf6e8b3f5a0 + export MDNSRESPONDER_TARBALL := mDNSResponder-878.200.35.tar.gz + export MSPUB_SHA256SUM := ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba +@@ -194,8 +194,8 @@ export OPENLDAP_SHA256SUM := cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb89 + export OPENLDAP_TARBALL := openldap-2.4.45.tgz + export OPENSSL_SHA256SUM := ae51d08bba8a83958e894946f15303ff894d75c2b8bbd44a852b64e3fe11d0d6 + export OPENSSL_TARBALL := openssl-1.0.2r.tar.gz +-export ORCUS_SHA256SUM := 3f48cfbc21ad74787218284939c04d42cb836c73bc393f27f538b668e4d78a5f +-export ORCUS_TARBALL := liborcus-0.14.1.tar.gz ++export ORCUS_SHA256SUM := 06ec7567896d76ca579efada794cc281a5d6b427195def01cbcfd79795e8a944 ++export ORCUS_TARBALL := liborcus-0.15.0.tar.gz + export OWNCLOUD_ANDROID_LIB_SHA256SUM := b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb + export OWNCLOUD_ANDROID_LIB_TARBALL := owncloud-android-library-0.9.4-no-binary-deps.tar.gz + export PAGEMAKER_SHA256SUM := 66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d +diff --git a/external/liborcus/0001-Prevent-unsigned-integer-underflow.patch b/external/liborcus/0001-Prevent-unsigned-integer-underflow.patch +deleted file mode 100644 +index 3353857..0000000 +--- a/external/liborcus/0001-Prevent-unsigned-integer-underflow.patch ++++ /dev/null +@@ -1,27 +0,0 @@ +-From 1967be013804f4f578b53659d7ef459b4c35de9f Mon Sep 17 00:00:00 2001 +-From: Kohei Yoshida <kohei.yoshida(a)gmail.com> +-Date: Wed, 7 Nov 2018 21:08:40 -0500 +-Subject: [PATCH] Prevent unsigned integer underflow. +- +-(cherry picked from commit 40bbce85048b77c545103af124f3d9831dd4a458) +---- +- src/parser/parser_base.cpp | 3 ++- +- 1 file changed, 2 insertions(+), 1 deletion(-) +- +-diff --git a/src/parser/parser_base.cpp b/src/parser/parser_base.cpp +-index 586d495f..9d426efb 100644 +---- a/src/parser/parser_base.cpp +-+++ b/src/parser/parser_base.cpp +-@@ -120,7 +120,8 @@ double parser_base::parse_double() +- +- size_t parser_base::remaining_size() const +- { +-- return std::distance(mp_char, mp_end) - 1; +-+ size_t n = std::distance(mp_char, mp_end); +-+ return n ? (n - 1) : 0; +- } +- +- std::ptrdiff_t parser_base::offset() const +--- +-2.17.1 +- +diff --git a/external/liborcus/ExternalPackage_liborcus.mk b/external/liborcus/ExternalPackage_liborcus.mk +index ffa0b38..21dd1bf 100644 +--- a/external/liborcus/ExternalPackage_liborcus.mk ++++ b/external/liborcus/ExternalPackage_liborcus.mk +@@ -12,11 +12,11 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,liborcus,liborcus)) + $(eval $(call gb_ExternalPackage_use_external_project,liborcus,liborcus)) + + ifeq ($(OS),MACOSX) +-$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.14.0.dylib,src/liborcus/.libs/liborcus-0.14.0.dylib)) +-$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.14.0.dylib,src/parser/.libs/liborcus-parser-0.14.0.dylib)) ++$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.15.0.dylib,src/liborcus/.libs/liborcus-0.15.0.dylib)) ++$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.15.0.dylib,src/parser/.libs/liborcus-parser-0.15.0.dylib)) + else ifeq ($(DISABLE_DYNLOADING),) +-$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.14.so.0,src/liborcus/.libs/liborcus-0.14.so.0.0.0)) +-$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.14.so.0,src/parser/.libs/liborcus-parser-0.14.so.0.0.0)) ++$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.15.so.0,src/liborcus/.libs/liborcus-0.15.so.0.0.0)) ++$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.15.so.0,src/parser/.libs/liborcus-parser-0.15.so.0.0.0)) + endif + + # vim: set noet sw=4 ts=4: +diff --git a/external/liborcus/ExternalProject_liborcus.mk b/external/liborcus/ExternalProject_liborcus.mk +index 8cc1c03..0bd36c3 100644 +--- a/external/liborcus/ExternalProject_liborcus.mk ++++ b/external/liborcus/ExternalProject_liborcus.mk +@@ -122,8 +122,8 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) : + $(MAKE) \ + $(if $(filter MACOSX,$(OS)),\ + && $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \ +- $(EXTERNAL_WORKDIR)/src/liborcus/.libs/liborcus-0.14.0.dylib \ +- $(EXTERNAL_WORKDIR)/src/parser/.libs/liborcus-parser-0.14.0.dylib \ ++ $(EXTERNAL_WORKDIR)/src/liborcus/.libs/liborcus-0.15.0.dylib \ ++ $(EXTERNAL_WORKDIR)/src/parser/.libs/liborcus-parser-0.15.0.dylib \ + ) \ + ) + +diff --git a/external/liborcus/Library_orcus-parser.mk b/external/liborcus/Library_orcus-parser.mk +index 32367b8..d25d821 100644 +--- a/external/liborcus/Library_orcus-parser.mk ++++ b/external/liborcus/Library_orcus-parser.mk +@@ -13,6 +13,7 @@ $(eval $(call gb_Library_use_unpacked,orcus-parser,liborcus)) + + $(eval $(call gb_Library_use_externals,orcus-parser,\ + boost_headers \ ++ boost_filesystem \ + boost_system \ + mdds_headers \ + zlib \ +@@ -22,6 +23,7 @@ $(eval $(call gb_Library_set_warnings_disabled,orcus-parser)) + + $(eval $(call gb_Library_set_include,orcus-parser,\ + -I$(call gb_UnpackedTarball_get_dir,liborcus)/include \ ++ -I$(call gb_UnpackedTarball_get_dir,liborcus)/src/include \ + $$(INCLUDE) \ + )) + +diff --git a/external/liborcus/Library_orcus.mk b/external/liborcus/Library_orcus.mk +index 2b20cdf..3793805 100644 +--- a/external/liborcus/Library_orcus.mk ++++ b/external/liborcus/Library_orcus.mk +@@ -24,6 +24,7 @@ $(eval $(call gb_Library_set_warnings_disabled,orcus)) + + $(eval $(call gb_Library_set_include,orcus,\ + -I$(call gb_UnpackedTarball_get_dir,liborcus)/include \ ++ -I$(call gb_UnpackedTarball_get_dir,liborcus)/src/include \ + $$(INCLUDE) \ + )) + +@@ -68,6 +69,9 @@ $(eval $(call gb_Library_add_generated_exception_objects,orcus,\ + UnpackedTarball/liborcus/src/liborcus/info \ + UnpackedTarball/liborcus/src/liborcus/interface \ + UnpackedTarball/liborcus/src/liborcus/json_document_tree \ ++ UnpackedTarball/liborcus/src/liborcus/json_map_tree \ ++ UnpackedTarball/liborcus/src/liborcus/json_structure_mapper \ ++ UnpackedTarball/liborcus/src/liborcus/json_structure_tree \ + UnpackedTarball/liborcus/src/liborcus/json_util \ + UnpackedTarball/liborcus/src/liborcus/measurement \ + UnpackedTarball/liborcus/src/liborcus/odf_helper \ +@@ -92,12 +96,15 @@ $(eval $(call gb_Library_add_generated_exception_objects,orcus,\ + UnpackedTarball/liborcus/src/liborcus/orcus_gnumeric \ + UnpackedTarball/liborcus/src/liborcus/orcus_import_ods \ + UnpackedTarball/liborcus/src/liborcus/orcus_import_xlsx \ ++ UnpackedTarball/liborcus/src/liborcus/orcus_json \ + UnpackedTarball/liborcus/src/liborcus/orcus_ods \ + UnpackedTarball/liborcus/src/liborcus/orcus_xls_xml \ + UnpackedTarball/liborcus/src/liborcus/orcus_xlsx \ + UnpackedTarball/liborcus/src/liborcus/orcus_xml \ ++ UnpackedTarball/liborcus/src/liborcus/orcus_xml_map_def \ + UnpackedTarball/liborcus/src/liborcus/session_context \ + UnpackedTarball/liborcus/src/liborcus/spreadsheet_iface_util \ ++ UnpackedTarball/liborcus/src/liborcus/spreadsheet_impl_types \ + UnpackedTarball/liborcus/src/liborcus/spreadsheet_interface \ + UnpackedTarball/liborcus/src/liborcus/spreadsheet_types \ + UnpackedTarball/liborcus/src/liborcus/string_helper \ +diff --git a/external/liborcus/UnpackedTarball_liborcus.mk b/external/liborcus/UnpackedTarball_liborcus.mk +index e1d810a..74fbbb2 100644 +--- a/external/liborcus/UnpackedTarball_liborcus.mk ++++ b/external/liborcus/UnpackedTarball_liborcus.mk +@@ -19,12 +19,9 @@ $(eval $(call gb_UnpackedTarball_update_autoconf_configs,liborcus)) + # <https://gitlab.com/orcus/orcus/commit/0dfa88f2adca7887dbe44bdb7025985777c89…> "Remove unused + # VERSION file": + $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\ +- external/liborcus/0001-workaround-a-linking-problem-on-windows.patch \ + external/liborcus/rpath.patch.0 \ + external/liborcus/gcc9.patch.0 \ +- external/liborcus/version.patch.0 \ + external/liborcus/libtool.patch.0 \ +- external/liborcus/0001-Prevent-unsigned-integer-underflow.patch \ + )) + + ifeq ($(OS),WNT) +diff --git a/external/liborcus/version.patch.0 b/external/liborcus/version.patch.0 +deleted file mode 100644 +index 2c0b5ae..0000000 +--- a/external/liborcus/version.patch.0 ++++ /dev/null +@@ -1,11 +0,0 @@ +---- configure +-+++ configure +-@@ -21055,7 +21055,7 @@ +- +- fi +- +--ac_config_files="$ac_config_files Makefile liborcus-$ORCUS_API_VERSION.pc:liborcus.pc.in liborcus-spreadsheet-model-$ORCUS_API_VERSION.pc:liborcus-spreadsheet-model.pc.in VERSION include/Makefile include/orcus/Makefile include/orcus/detail/Makefile include/orcus/mso/Makefile include/orcus/spreadsheet/Makefile src/Makefile src/liborcus/Makefile src/liborcus/constants.inl src/mso/Makefile src/parser/Makefile src/python/Makefile src/spreadsheet/Makefile parser_handlers/Makefile benchmark/Makefile doc_example/Makefile" +-+ac_config_files="$ac_config_files Makefile liborcus-$ORCUS_API_VERSION.pc:liborcus.pc.in liborcus-spreadsheet-model-$ORCUS_API_VERSION.pc:liborcus-spreadsheet-model.pc.in include/Makefile include/orcus/Makefile include/orcus/detail/Makefile include/orcus/mso/Makefile include/orcus/spreadsheet/Makefile src/Makefile src/liborcus/Makefile src/liborcus/constants.inl src/mso/Makefile src/parser/Makefile src/python/Makefile src/spreadsheet/Makefile parser_handlers/Makefile benchmark/Makefile doc_example/Makefile" +- +- cat >confcache <<\_ACEOF +- # This file is a shell script that caches the results of configure +diff --git a/sc/inc/mtvelements.hxx b/sc/inc/mtvelements.hxx +index 407f039..382fb4d 100644 +--- a/sc/inc/mtvelements.hxx ++++ b/sc/inc/mtvelements.hxx +@@ -52,9 +52,9 @@ const mdds::mtv::element_t element_type_formula = mdds::mtv::element_type_user_s + const mdds::mtv::element_t element_type_cellnote = mdds::mtv::element_type_user_start + 5; + + /// Mapped standard element types (for convenience). +-const mdds::mtv::element_t element_type_numeric = mdds::mtv::element_type_numeric; ++const mdds::mtv::element_t element_type_numeric = mdds::mtv::element_type_double; + const mdds::mtv::element_t element_type_empty = mdds::mtv::element_type_empty; +-const mdds::mtv::element_t element_type_uint16 = mdds::mtv::element_type_ushort; ++const mdds::mtv::element_t element_type_uint16 = mdds::mtv::element_type_uint16; + + /// Custom element blocks. + +@@ -66,8 +66,8 @@ typedef mdds::mtv::noncopyable_managed_element_block<element_type_edittext, Edit + typedef mdds::mtv::noncopyable_managed_element_block<element_type_formula, ScFormulaCell> formula_block; + + /// Mapped standard element blocks (for convenience). +-typedef mdds::mtv::numeric_element_block numeric_block; +-typedef mdds::mtv::ushort_element_block uint16_block; ++typedef mdds::mtv::double_element_block numeric_block; ++typedef mdds::mtv::uint16_element_block uint16_block; + + /// This needs to be in the same namespace as CellTextAttr. + MDDS_MTV_DEFINE_ELEMENT_CALLBACKS(CellTextAttr, element_type_celltextattr, CellTextAttr(), celltextattr_block) +diff --git a/sc/inc/orcusxml.hxx b/sc/inc/orcusxml.hxx +index ced991e..5db292c 100644 +--- a/sc/inc/orcusxml.hxx ++++ b/sc/inc/orcusxml.hxx +@@ -69,6 +69,7 @@ struct ScOrcusImportXMLParam + { + ScAddress maPos; + std::vector<OString> maFieldPaths; ++ std::vector<OString> maRowGroups; + }; + + typedef std::vector<CellLink> CellLinksType; +diff --git a/sc/qa/unit/dataproviders_test.cxx b/sc/qa/unit/dataproviders_test.cxx +index 1e9cf97..a9b6b11 100644 +--- a/sc/qa/unit/dataproviders_test.cxx ++++ b/sc/qa/unit/dataproviders_test.cxx +@@ -156,6 +156,7 @@ void ScDataProvidersTest::testXMLImport() + aRangeLink.maPos = ScAddress(0,0,0); + aRangeLink.maFieldPaths.push_back("/bookstore/book/title"); + aRangeLink.maFieldPaths.push_back("/bookstore/book/author"); ++ aRangeLink.maRowGroups.push_back("/bookstore/book"); + aParam.maRangeLinks.push_back(aRangeLink); + + createFileURL("test1.", "xml", aFileURL); +diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx +index 04660ab..2c03fe0 100644 +--- a/sc/source/core/tool/scmatrix.cxx ++++ b/sc/source/core/tool/scmatrix.cxx +@@ -1935,8 +1935,8 @@ public: + { + case mdds::mtm::element_numeric: + { +- numeric_element_block::const_iterator it = numeric_element_block::begin(*node.data); +- numeric_element_block::const_iterator itEnd = numeric_element_block::end(*node.data); ++ double_element_block::const_iterator it = double_element_block::begin(*node.data); ++ double_element_block::const_iterator itEnd = double_element_block::end(*node.data); + for (; it != itEnd; ++it, ++miPos) + *miPos = *it; + } +@@ -2012,8 +2012,8 @@ public: + { + case mdds::mtm::element_numeric: + { +- numeric_element_block::const_iterator it = numeric_element_block::begin(*node.data); +- numeric_element_block::const_iterator itEnd = numeric_element_block::end(*node.data); ++ double_element_block::const_iterator it = double_element_block::begin(*node.data); ++ double_element_block::const_iterator itEnd = double_element_block::end(*node.data); + for (; it != itEnd; ++it, ++miPos) + { + if (GetDoubleErrorValue(*miPos) == FormulaError::ElementNaN) +diff --git a/sc/source/filter/inc/orcusinterface.hxx b/sc/source/filter/inc/orcusinterface.hxx +index 9d090b7..7c7c4f2 100644 +--- a/sc/source/filter/inc/orcusinterface.hxx ++++ b/sc/source/filter/inc/orcusinterface.hxx +@@ -332,6 +332,8 @@ public: + + virtual orcus::spreadsheet::range_size_t get_sheet_size() const override; + ++ virtual void fill_down_cells(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, orcus::spreadsheet::row_t range_size) override; ++ + SCTAB getIndex() const { return mnTab; } + + const sc::SharedFormulaGroups& getSharedFormulaGroups() const; +diff --git a/sc/source/filter/orcus/interface.cxx b/sc/source/filter/orcus/interface.cxx +index 833fb27..23f17a1 100644 +--- a/sc/source/filter/orcus/interface.cxx ++++ b/sc/source/filter/orcus/interface.cxx +@@ -61,8 +61,7 @@ formula::FormulaGrammar::Grammar getCalcGrammarFromOrcus( os::formula_grammar_t + case orcus::spreadsheet::formula_grammar_t::ods: + eGrammar = formula::FormulaGrammar::GRAM_ODFF; + break; +- case orcus::spreadsheet::formula_grammar_t::xlsx_2007: +- case orcus::spreadsheet::formula_grammar_t::xlsx_2010: ++ case orcus::spreadsheet::formula_grammar_t::xlsx: + eGrammar = formula::FormulaGrammar::GRAM_OOXML; + break; + case orcus::spreadsheet::formula_grammar_t::gnumeric: +@@ -1188,6 +1187,11 @@ orcus::spreadsheet::range_size_t ScOrcusSheet::get_sheet_size() const + return ret; + } + ++void ScOrcusSheet::fill_down_cells(os::row_t /*row*/, os::col_t /*col*/, os::row_t /*range_size*/) ++{ ++ // TODO : implement this. ++} ++ + const sc::SharedFormulaGroups& ScOrcusSheet::getSharedFormulaGroups() const + { + return maFormulaGroups; +diff --git a/sc/source/filter/orcus/orcusfiltersimpl.cxx b/sc/source/filter/orcus/orcusfiltersimpl.cxx +index cdfb70d..8e9b0b1 100644 +--- a/sc/source/filter/orcus/orcusfiltersimpl.cxx ++++ b/sc/source/filter/orcus/orcusfiltersimpl.cxx +@@ -139,10 +139,10 @@ bool ScOrcusFiltersImpl::importODS_Styles(ScDocument& rDoc, OUString& aPath) con + + try + { +- std::string content = orcus::load_file_content(path); ++ orcus::file_content content(path); + ScOrcusFactory aFactory(rDoc); + ScOrcusStyles aStyles(aFactory); +- orcus::import_ods::read_styles(content.c_str(), content.size(), &aStyles); ++ orcus::import_ods::read_styles(content.data(), content.size(), &aStyles); + } + catch (const std::exception& e) + { +diff --git a/sc/source/filter/orcus/xmlcontext.cxx b/sc/source/filter/orcus/xmlcontext.cxx +index 2548f5b..71c44bc 100644 +--- a/sc/source/filter/orcus/xmlcontext.cxx ++++ b/sc/source/filter/orcus/xmlcontext.cxx +@@ -269,10 +269,17 @@ void ScOrcusXMLContextImpl::importXML(const ScOrcusImportXMLParam& rParam) + + std::for_each(rLink.maFieldPaths.begin(), rLink.maFieldPaths.end(), InsertFieldPath(filter)); + ++ std::for_each(rLink.maRowGroups.begin(), rLink.maRowGroups.end(), ++ [&filter] (const OString& rRowGroup) ++ { ++ filter.set_range_row_group(rRowGroup.getStr()); ++ } ++ ); ++ + filter.commit_range(); + } + +- std::string content = orcus::load_file_content(path); ++ orcus::file_content content(path); + filter.read_stream(content.data(), content.size()); + + aFactory.finalize(); +diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx b/sc/source/ui/xmlsource/xmlsourcedlg.cxx +index 95e8006..26b0cbc 100644 +--- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx ++++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx +@@ -533,6 +533,12 @@ void ScXMLSourceDlg::OkPressed() + // Go through all its child elements. + getFieldLinks(aRangeLink, aParam.maNamespaces, *mxLbTree, *rEntry); + ++ // Add the anchor node as a grouping node, which will be used as a ++ // row position increment point. ++ OUString aThisEntry = getXPath(*mxLbTree, *rEntry, aParam.maNamespaces); ++ aRangeLink.maRowGroups.push_back( ++ OUStringToOString(aThisEntry, RTL_TEXTENCODING_UTF8)); ++ + aParam.maRangeLinks.push_back(aRangeLink); + } + } +diff --git a/svl/source/misc/gridprinter.cxx b/svl/source/misc/gridprinter.cxx +index e129457..4f013d4 100644 +--- a/svl/source/misc/gridprinter.cxx ++++ b/svl/source/misc/gridprinter.cxx +@@ -29,7 +29,7 @@ typedef mdds::mtv::default_element_block<element_type_string, OUString> string_b + struct matrix_trait + { + typedef string_block string_element_block; +- typedef mdds::mtv::ushort_element_block integer_element_block; ++ typedef mdds::mtv::uint16_element_block integer_element_block; + + typedef mdds::mtv::custom_block_func1<string_block> element_block_func; + }; +-- +cgit v1.1 +

1 0

ports/contrib (3.5): qownnotes: 19.9.2 -> 19.9.5
by crux＠crux.nu 08 Sep '19

08 Sep '19

commit 41ae7a87abbeeffaefd6af3a3fc828b38dd281ef Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Sep 8 00:15:13 2019 +0200 qownnotes: 19.9.2 -> 19.9.5 diff --git a/qownnotes/.signature b/qownnotes/.signature index 29eee82d..722297cc 100644 --- a/qownnotes/.signature +++ b/qownnotes/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3xLve+uqsjgPOcUa6AbGHykXeJ5qkGV/SwXVVVXY51YdkO9jzGZsXN9FGtlH2XjCU2OSkwhGmdV+RyEDSuFX7gw= -SHA256 (Pkgfile) = f3ffecd7dc8fc8d739f515d9383a5887d878fac085a7d9a23c39dcc586379e8d +RWSagIOpLGJF3/06i4JICMdEwl0VM4YzVjXJYmk4I/yNbyFZOAsqk0rZgf3zkjLKF3H0OdLrpliQlk13+tdp2rf5jEPhzMWcsws= +SHA256 (Pkgfile) = 33376716ba8efb58b1e9ea554fa67754f8af89f3c7cc636f525627af29451e55 SHA256 (.footprint) = d3916e94908249d530356c1e79cef586cdeacf7bd488278a3f0c61ab5be2aab3 -SHA256 (qownnotes-19.9.2.tar.xz) = 4774979378e3f119f64bdc710dd9cc39d691d9aa6ae1825c845580adbd7daae5 +SHA256 (qownnotes-19.9.5.tar.xz) = bad8fbb847d513fc3a8b7fcf841bf82b593162e11305cc2ac7ae45902eb06639 diff --git a/qownnotes/Pkgfile b/qownnotes/Pkgfile index c4c93e27..f1ae839d 100644 --- a/qownnotes/Pkgfile +++ b/qownnotes/Pkgfile @@ -4,7 +4,7 @@ # Depends on: qt5 name=qownnotes -version=19.9.2 +version=19.9.5 release=1 source=(https://download.tuxfamily.org/$name/src/$name-$version.tar.xz)

1 0

ports/contrib (3.5): python3-numpy: 1.17.1 -> 1.17.2
by crux＠crux.nu 08 Sep '19

08 Sep '19

commit 5bb2f7d155cdfc0c021ed940a3be5051ea6671c2 Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Sep 8 00:13:41 2019 +0200 python3-numpy: 1.17.1 -> 1.17.2 diff --git a/python3-numpy/.footprint b/python3-numpy/.footprint index 218390b0..d61ba20a 100644 --- a/python3-numpy/.footprint +++ b/python3-numpy/.footprint @@ -6,13 +6,13 @@ drwxr-xr-x root/root usr/bin/ drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/python3.7/ drwxr-xr-x root/root usr/lib/python3.7/site-packages/ -drwxr-xr-x root/root usr/lib/python3.7/site-packages/numpy-1.17.1-py3.7.egg-info/ --rw-r--r-- root/root usr/lib/python3.7/site-packages/numpy-1.17.1-py3.7.egg-info/PKG-INFO --rw-r--r-- root/root usr/lib/python3.7/site-packages/numpy-1.17.1-py3.7.egg-info/SOURCES.txt --rw-r--r-- root/root usr/lib/python3.7/site-packages/numpy-1.17.1-py3.7.egg-info/dependency_links.txt --rw-r--r-- root/root usr/lib/python3.7/site-packages/numpy-1.17.1-py3.7.egg-info/entry_points.txt --rw-r--r-- root/root usr/lib/python3.7/site-packages/numpy-1.17.1-py3.7.egg-info/not-zip-safe --rw-r--r-- root/root usr/lib/python3.7/site-packages/numpy-1.17.1-py3.7.egg-info/top_level.txt +drwxr-xr-x root/root usr/lib/python3.7/site-packages/numpy-1.17.2-py3.7.egg-info/ +-rw-r--r-- root/root usr/lib/python3.7/site-packages/numpy-1.17.2-py3.7.egg-info/PKG-INFO +-rw-r--r-- root/root usr/lib/python3.7/site-packages/numpy-1.17.2-py3.7.egg-info/SOURCES.txt +-rw-r--r-- root/root usr/lib/python3.7/site-packages/numpy-1.17.2-py3.7.egg-info/dependency_links.txt +-rw-r--r-- root/root usr/lib/python3.7/site-packages/numpy-1.17.2-py3.7.egg-info/entry_points.txt +-rw-r--r-- root/root usr/lib/python3.7/site-packages/numpy-1.17.2-py3.7.egg-info/not-zip-safe +-rw-r--r-- root/root usr/lib/python3.7/site-packages/numpy-1.17.2-py3.7.egg-info/top_level.txt drwxr-xr-x root/root usr/lib/python3.7/site-packages/numpy/ -rw-r--r-- root/root usr/lib/python3.7/site-packages/numpy/__config__.py -rw-r--r-- root/root usr/lib/python3.7/site-packages/numpy/__init__.py diff --git a/python3-numpy/.signature b/python3-numpy/.signature index f7a38a6c..7fc20bb7 100644 --- a/python3-numpy/.signature +++ b/python3-numpy/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF34/WPnH4qhDPnsi7fu1rT7F+XZ5tO/8RCQfDojAyGkfQKCEEOQeplyTkWEce6G145sw41AFLa42++xpbCNsfqAY= -SHA256 (Pkgfile) = c9d7003611f2745970a8f90115d6b3e972f9044d821e837398da36583ab7a138 -SHA256 (.footprint) = af243e35f5f6fd263b0d3056100f293f6a851f862e321626e82a5b80366f4ea6 -SHA256 (numpy-1.17.1.tar.gz) = 24d479ebc92f2d1c739622568f0e4d1382c6bf9778505146a370c8e2f5749839 +RWSagIOpLGJF386yVXnrbbkSwdCoNEGIYTWNAUzIO9OBz5qHDhC26dzvtu3Lq8L7AOW3Vown3iT+CrnAtZ1aZIc9Vid3+Nhwxwc= +SHA256 (Pkgfile) = e5287637d4b18739a0020c3f4ec99c067294f976c8ecbe21f79d76c6503de0ae +SHA256 (.footprint) = 4e2c5786b236f9b27093309e0895d5e522ccb6bbab4bda7208868d8dcc219b7a +SHA256 (numpy-1.17.2.tar.gz) = 81a4f748dcfa80a7071ad8f3d9f8edb9f8bc1f0a9bdd19bfd44fd42c02bd286c diff --git a/python3-numpy/Pkgfile b/python3-numpy/Pkgfile index 3e48754a..40b9de31 100644 --- a/python3-numpy/Pkgfile +++ b/python3-numpy/Pkgfile @@ -5,7 +5,7 @@ # Depends on: openblas python3-cython name=python3-numpy -version=1.17.1 +version=1.17.2 release=1 source=(https://github.com/${name#*-}/${name#*-}/releases/download/v$versio…

1 0

ports/contrib (3.5): i3status-rust: cherry pick some patches
by crux＠crux.nu 07 Sep '19

07 Sep '19

commit 253113cd91eb6c436d934b9b8a098144405f81fd Author: Tim Biermann <tbier(a)posteo.de> Date: Sat Sep 7 23:27:20 2019 +0200 i3status-rust: cherry pick some patches diff --git a/i3status-rust/.signature b/i3status-rust/.signature index e9dc448e..46ce9b0c 100644 --- a/i3status-rust/.signature +++ b/i3status-rust/.signature @@ -1,5 +1,7 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF37OmgGXvHwKDo9/qeMo015151ix6vXgWcrjOgMzo0zgSSOXVDhBXaQDpmxX22ZpW+2hKgswadsEzPAgzWdWQRAU= -SHA256 (Pkgfile) = 514df7a5438b43e28078d70461097937f2d3e8e41a94bcb40a7c6fa5c9f99513 +RWSagIOpLGJF3yqTejWHKPkax2fPOzrUSK4wC+yYZppgf4KyLwUj8S7h/edup+AyEn6+Ts51gNdBss2qvOJFqTvObxbrprGmuQU= +SHA256 (Pkgfile) = a9b7d86dbca6419b8c20d81930cbb05e74e1989e58a98dbf8e733c0b4aae2640 SHA256 (.footprint) = 46e38c743630719fc5db8383d793d119a83726afb7568114366b2b9c2d3ed80b SHA256 (i3status-rust-0.10.0.tar.gz) = 84a12a91419fda35109a0be3980671c1d58e13c5987e6dc999cbe786d05053d9 +SHA256 (407.patch) = 06bce41061201b3ec2c9467d9f84478d18ed222d9e40f04d015697c0ab1d398e +SHA256 (418.patch) = 95373194871b6179a8eddf0fb84583ef3e5f22f9cc4efd84a32a8d3b30e2f8a6 diff --git a/i3status-rust/407.patch b/i3status-rust/407.patch new file mode 100644 index 00000000..ac4ca6b7 --- /dev/null +++ b/i3status-rust/407.patch @@ -0,0 +1,128 @@ +From 41fd7bf7a7a548aa3e1da05a3ac8ce2f873249c0 Mon Sep 17 00:00:00 2001 +From: Bram Vandenbogaerde <contact(a)bramvdb.com> +Date: Sat, 20 Jul 2019 19:05:58 +0200 +Subject: [PATCH] Made wind speed and degree optional by providing a default + value + cleaned up the JSON AST traversal code + +--- + src/blocks/weather.rs | 97 +++++++++++++++++-------------------------- + 1 file changed, 39 insertions(+), 58 deletions(-) + +diff --git a/src/blocks/weather.rs b/src/blocks/weather.rs +index 2c75067..8236b17 100644 +--- a/src/blocks/weather.rs ++++ b/src/blocks/weather.rs +@@ -48,6 +48,13 @@ pub struct Weather { + update_interval: Duration, + } + ++fn malformed_json_error() -> Error { ++ BlockError( ++ "weather".to_string(), ++ "Malformed JSON.".to_string(), ++ ) ++} ++ + impl Weather { + fn update_weather(&mut self) -> Result<()> { + match self.service { +@@ -97,67 +104,41 @@ impl Weather { + format!("API Error: {}", val.as_str().unwrap()), + )); + }; +- let raw_weather = match json.pointer("/weather/0/main") ++ let raw_weather = json.pointer("/weather/0/main") + .and_then(|v| v.as_str()) +- .map(|s| s.to_string()) { +- Some(v) => v, +- None => { +- return Err(BlockError( +- "weather".to_string(), +- "Malformed JSON.".to_string(), +- )); +- } +- }; +- let raw_temp = match json.pointer("/main/temp").and_then(|v| v.as_f64()) { +- Some(v) => v, +- None => { +- return Err(BlockError( +- "weather".to_string(), +- "Malformed JSON.".to_string(), +- )); +- } +- }; +- let raw_wind_speed = match json.pointer("/wind/speed").and_then(|v| v.as_f64()) { +- Some(v) => v, +- None => { +- return Err(BlockError( +- "weather".to_string(), +- "Malformed JSON.".to_string(), +- )); +- } +- }; +- let raw_wind_direction = match json.pointer("/wind/deg").and_then(|v| v.as_f64()) { +- Some(v) => v, +- None => { +- return Err(BlockError( +- "weather".to_string(), +- "Malformed JSON.".to_string(), +- )); +- } +- }; +- let raw_location = match json.pointer("/name").and_then(|v| v.as_str()).map(|s| { +- s.to_string() +- }) { +- Some(v) => v, +- None => { +- return Err(BlockError( +- "weather".to_string(), +- "Malformed JSON.".to_string(), +- )); +- } +- }; ++ .map(|s| s.to_string()) ++ .ok_or_else(malformed_json_error)?; ++ ++ let raw_temp = json.pointer("/main/temp").and_then(|v| v.as_f64()).ok_or_else(malformed_json_error)?; ++ ++ let raw_wind_speed: f64= json.pointer("/wind/speed") ++ .map_or(Some(0.0), |v| v.as_f64()) // provide default value 0.0 ++ .ok_or_else(malformed_json_error)?; // error when conversion to f64 fails ++ ++ let raw_wind_direction: Option<f64>= json.pointer("/wind/deg") ++ .map_or(Some(None), |v| v.as_f64().and_then(|v| Some(Some(v)))) // provide default value None ++ .ok_or_else(malformed_json_error)?; // error when conversion to f64 fails ++ ++ ++ let raw_location = json.pointer("/name") ++ .and_then(|v| v.as_str()) ++ .map(|s| s.to_string()) ++ .ok_or_else(malformed_json_error)?; + + // Convert wind direction in azimuth degrees to abbreviation names +- fn convert_wind_direction(direction: f64) -> String { +- match direction.round() as i64 { +- 24 ... 68 => "NE".to_string(), +- 69 ... 113 => "E".to_string(), +- 114 ... 158 => "SE".to_string(), +- 159 ... 203 => "S".to_string(), +- 204 ... 248 => "SW".to_string(), +- 249 ... 293 => "W".to_string(), +- 294 ... 338 => "NW".to_string(), +- _ => "N".to_string() ++ fn convert_wind_direction(direction_opt: Option<f64>) -> String { ++ match direction_opt { ++ Some(direction) => match direction.round() as i64 { ++ 24 ... 68 => "NE".to_string(), ++ 69 ... 113 => "E".to_string(), ++ 114 ... 158 => "SE".to_string(), ++ 159 ... 203 => "S".to_string(), ++ 204 ... 248 => "SW".to_string(), ++ 249 ... 293 => "W".to_string(), ++ 294 ... 338 => "NW".to_string(), ++ _ => "N".to_string() ++ }, ++ None => "-".to_string() + } + } + diff --git a/i3status-rust/418.patch b/i3status-rust/418.patch new file mode 100644 index 00000000..50493352 --- /dev/null +++ b/i3status-rust/418.patch @@ -0,0 +1,167 @@ +From b545460c66b8de1e94ae3ebd8614fe1d3b18b22c Mon Sep 17 00:00:00 2001 +From: Benjamin Bouvier <public(a)benj.me> +Date: Thu, 8 Aug 2019 10:05:25 +0200 +Subject: [PATCH] Fixes #387: Display WiFi signal strength in the net block. + +--- + blocks.md | 2 ++ + src/blocks/net.rs | 80 ++++++++++++++++++++++++++++++++++++++++++++++- + 2 files changed, 81 insertions(+), 1 deletion(-) + +diff --git a/blocks.md b/blocks.md +index 94e6cde..5584e66 100644 +--- a/blocks.md ++++ b/blocks.md +@@ -485,6 +485,7 @@ Creates a block which displays the upload and download throughput for a network + block = "net" + device = "wlp2s0" + ssid = true ++signal_strength = true + ip = true + speed_up = false + graph_up = true +@@ -497,6 +498,7 @@ Key | Values | Required | Default + ----|--------|----------|-------- + `device` | Network interface to moniter (name from /sys/class/net) | Yes | `lo` (loopback interface) + `ssid` | Display network SSID (wireless only). | No | `false` ++`signal_strength` | Display WiFi signal strength (wireless only). | No | `false` + `bitrate` | Display connection bitrate. | No | `false` + `ip` | Display connection IP address. | No | `false` + `speed_up` | Display upload speed. | No | `true` +diff --git a/src/blocks/net.rs b/src/blocks/net.rs +index 87b1332..328e587 100644 +--- a/src/blocks/net.rs ++++ b/src/blocks/net.rs +@@ -130,6 +130,62 @@ impl NetworkDevice { + } + } + ++ fn absolute_signal_strength(&self) -> Result<Option<i32>> { ++ let up = self.is_up()?; ++ if !self.wireless || !up { ++ return Err(BlockError( ++ "net".to_string(), ++ "Signal strength is only available for connected wireless devices." ++ .to_string(), ++ )); ++ } ++ let mut iw_output = Command::new("sh") ++ .args(&[ ++ "-c", ++ &format!( ++ "iw dev {} link | sed -n 's/^\\s\\+signal: \$.*\$ dBm/\\1/p'", ++ self.device ++ ), ++ ]) ++ .output() ++ .block_error("net", "Failed to execute signal strength query.")? ++ .stdout; ++ if iw_output.is_empty() { ++ Ok(None) ++ } else { ++ iw_output.pop(); // Remove trailing newline. ++ String::from_utf8(iw_output) ++ .block_error("net", "Non-UTF8 signal strength.") ++ .and_then(|as_str| as_str.parse::<i32>() ++ .block_error("net", "Non numerical signal strength.")) ++ .map(Some) ++ } ++ } ++ ++ fn relative_signal_strength(&self) -> Result<Option<u32>> { ++ let xbm = if let Some(xbm) = self.absolute_signal_strength()? { ++ xbm as f64 ++ } else { ++ return Ok(None); ++ }; ++ ++ // Code inspired by https://github.com/NetworkManager/NetworkManager/blob/master/src/platform/w… ++ const NOISE_FLOOR_DBM: f64 = -90.; ++ const SIGNAL_MAX_DBM: f64 = -20.; ++ ++ let xbm = if xbm < NOISE_FLOOR_DBM { ++ NOISE_FLOOR_DBM ++ } else if xbm > SIGNAL_MAX_DBM { ++ SIGNAL_MAX_DBM ++ } else { ++ xbm ++ }; ++ ++ let result = 100. - 70. * ((SIGNAL_MAX_DBM - xbm) / (SIGNAL_MAX_DBM - NOISE_FLOOR_DBM)); ++ let result = result as u32; ++ Ok(Some(result)) ++ } ++ + /// Queries the inet IP of this device (using `ip`). + pub fn ip_addr(&self) -> Result<Option<String>> { + if !self.is_up()? { +@@ -196,6 +252,7 @@ pub struct Net { + network: ButtonWidget, + ssid: Option<ButtonWidget>, + max_ssid_width: usize, ++ signal_strength: Option<ButtonWidget>, + ip_addr: Option<ButtonWidget>, + bitrate: Option<ButtonWidget>, + output_tx: Option<ButtonWidget>, +@@ -235,6 +292,10 @@ pub struct NetConfig { + #[serde(default = "NetConfig::default_max_ssid_width")] + pub max_ssid_width: usize, + ++ /// Whether to show the signal strength of active wireless networks. ++ #[serde(default = "NetConfig::default_signal_strength")] ++ pub signal_strength: bool, ++ + /// Whether to show the bitrate of active wireless networks. + #[serde(default = "NetConfig::default_bitrate")] + pub bitrate: bool, +@@ -296,6 +357,10 @@ impl NetConfig { + false + } + ++ fn default_signal_strength() -> bool { ++ false ++ } ++ + fn default_bitrate() -> bool { + false + } +@@ -350,6 +415,10 @@ impl ConfigBlock for Net { + None + }, + max_ssid_width: block_config.max_ssid_width, ++ signal_strength: if block_config.signal_strength && wireless { ++ Some(ButtonWidget::new(config.clone(), &id)) } else { ++ None ++ }, + bitrate: if block_config.bitrate { + Some(ButtonWidget::new(config.clone(), &id)) } else { + None +@@ -460,6 +529,12 @@ impl Block for Net { + ssid_widget.set_text(truncated); + } + } ++ if let Some(ref mut signal_strength_widget) = self.signal_strength { ++ let value = self.device.relative_signal_strength()?; ++ if value.is_some() { ++ signal_strength_widget.set_text(format!("{}%", value.unwrap())); ++ } ++ } + if let Some(ref mut ip_addr_widget) = self.ip_addr { + let ip_addr = self.device.ip_addr()?; + if ip_addr.is_some() { +@@ -510,11 +585,14 @@ impl Block for Net { + + fn view(&self) -> Vec<&I3BarWidget> { + if self.active { +- let mut widgets: Vec<&I3BarWidget> = Vec::with_capacity(7); ++ let mut widgets: Vec<&I3BarWidget> = Vec::with_capacity(8); + widgets.push(&self.network); + if let Some(ref ssid_widget) = self.ssid { + widgets.push(ssid_widget); + }; ++ if let Some(ref signal_strength_widget) = self.signal_strength { ++ widgets.push(signal_strength_widget); ++ }; + if let Some(ref bitrate_widget) = self.bitrate { + widgets.push(bitrate_widget); + } diff --git a/i3status-rust/Pkgfile b/i3status-rust/Pkgfile index d5e55a7c..ffcc851b 100644 --- a/i3status-rust/Pkgfile +++ b/i3status-rust/Pkgfile @@ -5,14 +5,17 @@ name=i3status-rust version=0.10.0 -release=1 -source=(https://github.com/greshake/i3status-rust/archive/v$version/$name-$version.tar.gz) +release=2 +source=(https://github.com/greshake/i3status-rust/archive/v$version/$name-$version.tar.gz + 407.patch 418.patch) build() { cd $name-$version prt-get isinst sccache && export RUSTC_WRAPPER=/usr/bin/sccache mkdir "$PKGMK_SOURCE_DIR/rust" || true export CARGO_HOME="$PKGMK_SOURCE_DIR/rust" + patch -Np1 -i $SRC/407.patch # fix weather block + patch -Np1 -i $SRC/418.patch # show wifi signal strength cargo fetch cargo build --release install -Dt $PKG/usr/bin target/release/i3status-rs

1 0

ports/contrib (3.5): cvs: update webpage location
by crux＠crux.nu 07 Sep '19

07 Sep '19

commit 307434f782d3338a53a17fa58cf4c33f2f55ef88 Author: John Vogel <jvogel4(a)stny.rr.com> Date: Sat Sep 7 15:26:26 2019 -0400 cvs: update webpage location diff --git a/cvs/.signature b/cvs/.signature index a898c15e..0d2af81b 100644 --- a/cvs/.signature +++ b/cvs/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF36ozcDIOILRaWolpLwNUG3wueixExlSPTcqNySHGTpWabP1LjVz/k/Kk6DyK4Wx7g6n+OkzYznsSj4Krwbkc9AI= -SHA256 (Pkgfile) = a0a75d4123ebed93f3384a2bb95ea775b958f4dd9df81a3fe03ded81633d86ef +RWSagIOpLGJF31TVRx6sm6VNjnOhTkEKb0Ek2Y5dam2P+tAl91vRtiEuJUMoDFcvK/lbzcFvS+fWAFPbIhv8MCeEc9l9oP7apgM= +SHA256 (Pkgfile) = 67eb0fbe47dbd0907a97b903d80bffd7f54c330b06dd0cddb706829408fe4522 SHA256 (.footprint) = 4a250f4ca7e8b8d17fd0268ec2978e406b084fab5f13e66a5c2bc249e61255e8 SHA256 (cvs-1.11.23.tar.bz2) = 400f51b59d85116e79b844f2d5dbbad4759442a789b401a94aa5052c3d7a4aa9 SHA256 (CVE-2010-3846.diff) = cba2498991e1c24d565300271a6b38073cf8e2a31719a5e345fa7f9929b8f973 diff --git a/cvs/Pkgfile b/cvs/Pkgfile index 0fcd8b65..b11b7ba3 100644 --- a/cvs/Pkgfile +++ b/cvs/Pkgfile @@ -1,5 +1,5 @@ # Description: Concurrent Versions System -# URL: https://cvs.nongnu.org/ +# URL: https://www.nongnu.org/cvs/ # Maintainer: John Vogel, jvogel4 at stny dot rr dot com name=cvs

1 0