From 82123e090a6bd4ca89012ba33642a152ce3f8368 Mon Sep 17 00:00:00 2001 From: Gadzhi Kharkharov Date: Sun, 11 Oct 2020 13:33:11 +0300 Subject: [PATCH 01/16] godot: update to 3.2.3. --- srcpkgs/godot/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template index dc0c3a90e36..5b17ece10d0 100644 --- a/srcpkgs/godot/template +++ b/srcpkgs/godot/template @@ -1,6 +1,6 @@ # Template file for 'godot' pkgname=godot -version=3.2.2 +version=3.2.3 revision=1 archs="x86_64* i686* aarch64* armv7* ppc64*" wrksrc="${pkgname}-${version}-stable" @@ -27,7 +27,7 @@ maintainer="Nick Hahn " license="MIT" homepage="https://www.godotengine.org/" distfiles="https://github.com/godotengine/${pkgname}/archive/${version}-stable.tar.gz" -checksum=9a071aba23fc912976203d35212a94207b7cb667c0b5353b3525f9b7e6899017 +checksum=4c2a8e7da1ad05c6223b0ff6cf2be124dad6708b56a8ec9910dc2aaf82a553ae nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio CFLAGS+=" -fPIE -fPIC" From 63f45dc7400894ceca8053e387e37196797448a2 Mon Sep 17 00:00:00 2001 From: q66 Date: Sun, 11 Oct 2020 21:17:47 +0200 Subject: [PATCH 02/16] xcb-proto: update to 1.14.1 --- srcpkgs/xcb-proto/template | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/srcpkgs/xcb-proto/template b/srcpkgs/xcb-proto/template index 7301e58b1b2..bd8bcc2b242 100644 --- a/srcpkgs/xcb-proto/template +++ b/srcpkgs/xcb-proto/template @@ -1,17 +1,22 @@ # Template file for 'xcb-proto' pkgname=xcb-proto -version=1.14 -revision=2 +version=1.14.1 +revision=1 +wrksrc="xcbproto-${pkgname}-${version}" build_style=gnu-configure -hostmakedepends="python3" +hostmakedepends="python3 automake" makedepends="libxml2" depends="python3" short_desc="XML-XCB (X C Bindings) protocol descriptions" maintainer="Orphaned " license="MIT" homepage="http://xcb.freedesktop.org" -distfiles="http://xcb.freedesktop.org/dist/$pkgname-$version.tar.xz" -checksum=186a3ceb26f9b4a015f5a44dcc814c93033a5fc39684f36f1ecc79834416a605 +distfiles="https://gitlab.freedesktop.org/xorg/proto/xcbproto/-/archive/${pkgname}-${version}/xcbproto-${pkgname}-${version}.tar.gz" +checksum=1101be204eecfb6af6b4325c143b3da06a6929753418f161882e86ae1457ca57 + +pre_configure() { + NOCONFIGURE=1 ./autogen.sh +} post_install() { vlicense COPYING From 4b6f61044a2f80f73d5406dd7a7f73b43f2a5bbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= Date: Sun, 11 Oct 2020 07:25:32 +0200 Subject: [PATCH 03/16] gifski: update to 1.2.2. --- srcpkgs/gifski/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gifski/template b/srcpkgs/gifski/template index 81b927c1373..312651db44f 100644 --- a/srcpkgs/gifski/template +++ b/srcpkgs/gifski/template @@ -1,6 +1,6 @@ # Template file for 'gifski' pkgname=gifski -version=1.2.0 +version=1.2.2 revision=1 build_style=cargo configure_args="--features=openmp" @@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana " license="AGPL-3.0-only" homepage="https://gif.ski" distfiles="https://github.com/ImageOptim/gifski/archive/${version}.tar.gz" -checksum=6571ad379a39604ecd7688f32841a8d76465af0f637cdcfe6d10b7ed8e6a3d6a +checksum=e5830f18b38fb333f1d89af99d651c173c816d71f764e703460a38d241ce8df4 post_install() { vlicense LICENSE From c3c2285171514afa5636c058d0e8a784730f0402 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sat, 10 Oct 2020 19:29:53 +0200 Subject: [PATCH 04/16] monero-gui: update to 0.17.0.1. --- srcpkgs/monero-gui/files | 1 + srcpkgs/monero-gui/template | 72 +++++++++++++++++++++++++++++++------ 2 files changed, 62 insertions(+), 11 deletions(-) create mode 120000 srcpkgs/monero-gui/files diff --git a/srcpkgs/monero-gui/files b/srcpkgs/monero-gui/files new file mode 120000 index 00000000000..0dc85055cb8 --- /dev/null +++ b/srcpkgs/monero-gui/files @@ -0,0 +1 @@ +../monero/patches \ No newline at end of file diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template index 39fe1e42bc2..b94d23ef1d7 100644 --- a/srcpkgs/monero-gui/template +++ b/srcpkgs/monero-gui/template @@ -1,34 +1,79 @@ # Template file for 'monero-gui' pkgname=monero-gui -version=0.16.0.3 -_monero_version=0.16.0.3 +version=0.17.0.1 revision=1 -build_style=qmake +_monero_version=0.17.0.1 +_randomx_version="1.1.8" +# the revision monero uses as a submodule for the specific version +_rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c" +_supercop_gitrev="633500ad8c8759995049ccd022107d1fa8a1bbc9" +build_style=cmake +configure_args="-DVERSION_IS_RELEASE=true -DQt5_LRELEASE_EXECUTABLE=/usr/bin/lrelease" hostmakedepends="pkg-config qt5-tools qt5-qmake qt5-quickcontrols qt5-declarative-devel qt5-svg-devel" -makedepends="boost-devel libatomic-devel libunwind-devel miniupnpc-devel monero-devel +makedepends="boost-devel libatomic-devel libunwind-devel miniupnpc-devel qt5-declarative-devel readline-devel unbound-devel libsodium-devel hidapi-devel - qt5-svg-devel RandomX libgcrypt-devel" + qt5-svg-devel libgcrypt-devel zeromq-devel" depends="qt5-graphicaleffects qt5-quickcontrols qt5-quickcontrols2 qt5-xmlpatterns" short_desc="GUI for the core Monero implementation" maintainer="Helmut Pozimski " license="BSD-3-Clause" homepage="https://getmonero.org" distfiles="https://github.com/monero-project/monero-gui/archive/v${version}.tar.gz - https://github.com/monero-project/monero/archive/v${_monero_version}.tar.gz>monero-${_monero_version}.tar.gz" -checksum="23061761d15728e2dc081c799515d010a28914bac2b27d6bbd01d65ac09e89ef - df15660f877b75d340214847be1648cac47b2fcdb4011cf8f5aa4517f3af48cb" -skip_extraction="monero-${version}.tar.gz" + https://github.com/monero-project/monero/archive/v${_monero_version}.tar.gz>monero-${_monero_version}.tar.gz + https://github.com/tevador/RandomX/archive/v${_randomx_version}.tar.gz + https://github.com/Tencent/rapidjson/archive/${_rapidjson_gitrev}.tar.gz + https://github.com/monero-project/supercop/archive/${_supercop_gitrev}.tar.gz" +checksum="98324e610d04426dbac80c83ae8f5c642101d0e175d71123f42513cc45361d31 + 490f59c669992fc9bc74103dc2c82c968d07fecb6e2831d2d356575dc78862fb + f982a12d18b1d260bef2a1d3c46ae4902975fbf63abb38ca6413c96d1778db3a + 44b007d419ac21b6affec58991e865ee572346ead19b73cf1c3e4e11c7a81273 + b973b9d8269ec4d97c3c3443f0dad96d09f72b1b30e616e0947557adbdbb03f7" +skip_extraction="monero-${version}.tar.gz ${_rapidjson_gitrev}.tar.gz ${_supercop_gitrev}.tar.gz v${_randomx_version}.tar.gz" + +if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then + makedepends+=" libatomic-devel" + CFLAGS+=" -latomic" +fi + +case "$XBPS_TARGET_MACHINE" in + *-musl) configure_args+=" -DSTACK_TRACE=OFF" +esac + +case "$XBPS_TARGET_MACHINE" in + armv7*) configure_args+=" -DARCH=armv7" ;; + armv6*) configure_args+=" -DARCH=armv6" ;; + armv5*) configure_args+=" -DARCH=armv5" ;; + aarch64*) configure_args+=" -DARCH=aarch64" ;; + mips*) configure_args+=" -DARCH=mipsr32 -DNO_AES=ON" ;; + ppc64le*) configure_args+=" -DARCH=ppc64le" ;; + ppc64*) configure_args+=" -DARCH=ppc64" ;; + ppc*) configure_arch+=" -DARCH=ppc" ;; + *) configure_args+=" -DARCH=default" ;; +esac + + post_extract() { bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/monero-${_monero_version}.tar.gz --strip-components 1 -C monero + bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_rapidjson_gitrev}.tar.gz --strip-components 1 -C monero/external/rapidjson + bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_supercop_gitrev}.tar.gz --strip-components 1 -C monero/external/supercop + bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/v${_randomx_version}.tar.gz --strip-components 1 -C monero/external/randomx +} + +post_patch() { + cd monero + for f in "${FILESDIR}"/*.patch; do + echo "Applying $f" + patch -Np0 -i "$f" + done } pre_configure() { echo "var GUI_VERSION = \"${version}\"" > version.js echo "var GUI_MONERO_VERSION = \"${version}\"" >> version.js if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - sed -i *.pro -e "s;-leasylogging;-leasylogging -latomic;" + vsed -i monero/CMakeLists.txt -e '/include(version.cmake)/i list(APPEND EXTRA_LIBRARIES libatomic.a)' fi } @@ -39,13 +84,18 @@ pre_build() { # built for the host CXX=${CXX_host} CXXFLAGS="${XBPS_CXXFLAGS}" LDFLAGS="${XBPS_LDFLAGS}" \ make ${makejobs} -C src/zxcvbn-c dictgen + # The generate_translations_header binary is executed during the build + # but is not included in the binary package. It thus needs to be + # built for the host + CC=${CC_host} CFLAGS="${XBPS_CFLAGS}" LDFLAGS="${XBPS_LDFLAGS}" \ + make -C build/monero ${makejobs} generate_translations_header fi make ${makejobs} -C src/zxcvbn-c } do_install() { - vbin release/bin/monero-wallet-gui + vbin build/bin/monero-wallet-gui vlicense LICENSE } From 58b1490c07d40dd7b97006346def5ba55a6adfd3 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sat, 10 Oct 2020 19:31:28 +0200 Subject: [PATCH 05/16] monero-core: Remove transitional package --- srcpkgs/monero-core | 1 - srcpkgs/monero-gui/template | 6 ------ 2 files changed, 7 deletions(-) delete mode 120000 srcpkgs/monero-core diff --git a/srcpkgs/monero-core b/srcpkgs/monero-core deleted file mode 120000 index 6e7f62767eb..00000000000 --- a/srcpkgs/monero-core +++ /dev/null @@ -1 +0,0 @@ -monero-gui \ No newline at end of file diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template index b94d23ef1d7..1439a122b3f 100644 --- a/srcpkgs/monero-gui/template +++ b/srcpkgs/monero-gui/template @@ -98,9 +98,3 @@ do_install() { vbin build/bin/monero-wallet-gui vlicense LICENSE } - -monero-core_package() { - build_style=meta - depends="monero-gui>=${version}_${revision}" - short_desc+=" (transitional dummy package)" -} From bbfaa93ece8ddfd500d7d000095f8fb634f8b993 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sat, 10 Oct 2020 19:32:12 +0200 Subject: [PATCH 06/16] RandomX: remove package --- srcpkgs/RandomX/template | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 srcpkgs/RandomX/template diff --git a/srcpkgs/RandomX/template b/srcpkgs/RandomX/template deleted file mode 100644 index 8d2bba4f93d..00000000000 --- a/srcpkgs/RandomX/template +++ /dev/null @@ -1,20 +0,0 @@ -# Template file for 'RandomX' -pkgname=RandomX -version=1.1.8 -revision=1 -build_style=cmake -short_desc="Proof of work algorithm based on random code execution" -maintainer="Helmut Pozimski " -license="BSD-3-Clause" -homepage="https://github.com/tevador/RandomX" -distfiles="https://github.com/tevador/RandomX/archive/v${version}.tar.gz" -checksum=f982a12d18b1d260bef2a1d3c46ae4902975fbf63abb38ca6413c96d1778db3a - -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - CFLAGS+=" -Wl,-latomic" - makedepends="libatomic-devel" -fi - -post_install() { - vlicense LICENSE -} From c34fb2f4f64e43450851201ff74a8586fb953d7a Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 12 Oct 2020 07:42:57 -0400 Subject: [PATCH 07/16] zim: add upstream patches for Python 3.9 --- srcpkgs/zim/patches/01-py39.patch | 234 ++++++++++++++++++++++++++++++ srcpkgs/zim/patches/02-py39.patch | 22 +++ srcpkgs/zim/template | 2 +- 3 files changed, 257 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/zim/patches/01-py39.patch create mode 100644 srcpkgs/zim/patches/02-py39.patch diff --git a/srcpkgs/zim/patches/01-py39.patch b/srcpkgs/zim/patches/01-py39.patch new file mode 100644 index 00000000000..79b64e429ef --- /dev/null +++ b/srcpkgs/zim/patches/01-py39.patch @@ -0,0 +1,234 @@ +From 0c7d355a76236b0c687fb7c59cd974c2c7f35657 Mon Sep 17 00:00:00 2001 +From: Robin Lee +Date: Thu, 10 Sep 2020 21:31:22 +0800 +Subject: [PATCH] Replace usage of `getchildren` and `getiterator` with `list` + or `iter` + +Methods getchildren() and getiterator() of classes ElementTree and Element in +the ElementTree module have been deprecated since Python 3.2 and removed since +Python 3.9. + +Fixes #1258 +Closes #1259 +--- + tests/__init__.py | 2 +- + zim/formats/__init__.py | 44 ++++++++++++++++++++--------------------- + zim/gui/pageview.py | 2 +- + 3 files changed, 24 insertions(+), 24 deletions(-) + +diff --git tests/__init__.py tests/__init__.py +index 20e5b8df..88f87f87 100644 +--- tests/__init__.py ++++ tests/__init__.py +@@ -559,7 +559,7 @@ def __init__(self): + tree = etree.ElementTree(file=root + '/tests/data/notebook-wiki.xml') + + test_data = [] +- for node in tree.getiterator(tag='page'): ++ for node in tree.iter(tag='page'): + name = node.attrib['name'] + text = str(node.text.lstrip('\n')) + test_data.append((name, text)) +diff --git zim/formats/__init__.py zim/formats/__init__.py +index 9e00c169..e1149f7f 100644 +--- zim/formats/__init__.py ++++ zim/formats/__init__.py +@@ -262,7 +262,7 @@ def hascontent(self): + '''Returns True if the tree contains any content at all.''' + root = self._etree.getroot() + return root is not None and ( +- bool(root.getchildren()) or (root.text and not root.text.isspace()) ++ bool(list(root)) or (root.text and not root.text.isspace()) + ) + + @property +@@ -284,14 +284,14 @@ def extend(self, tree): + myroot = self._etree.getroot() + otherroot = tree._etree.getroot() + if otherroot.text: +- children = myroot.getchildren() ++ children = list(myroot) + if children: + last = children[-1] + last.tail = (last.tail or '') + otherroot.text + else: + myroot.text = (myroot.text or '') + otherroot.text + +- for element in otherroot.getchildren(): ++ for element in iter(otherroot): + myroot.append(element) + + return self +@@ -312,7 +312,7 @@ def tostring(self): + + # HACK: Force sorting of attrib - else change in python3.8 breaks test cases + # Ensure all attrib are string, else ElementTree fails +- for element in self._etree.getiterator('*'): ++ for element in self._etree.iter('*'): + myattrib = element.attrib.copy() + element.attrib.clear() + for key in sorted(myattrib.keys()): +@@ -342,8 +342,8 @@ def iter_href(self): + from zim.notebook.page import HRef # XXX + seen = set() + for elt in itertools.chain( +- self._etree.getiterator(LINK), +- self._etree.getiterator(IMAGE) ++ self._etree.iter(LINK), ++ self._etree.iter(IMAGE) + ): + href = elt.attrib.get('href') + if href and href not in seen: +@@ -359,7 +359,7 @@ def iter_tag_names(self): + @returns: yields an unordered list of tag names + ''' + seen = set() +- for elt in self._etree.getiterator(TAG): ++ for elt in self._etree.iter(TAG): + name = elt.text + if not name in seen: + seen.add(name) +@@ -367,7 +367,7 @@ def iter_tag_names(self): + + def _get_heading_element(self, level=1): + root = self._etree.getroot() +- children = root.getchildren() ++ children = list(root) + if root.text and not root.text.isspace(): + return None + +@@ -424,7 +424,7 @@ def remove_heading(self, level=-1): + ''' + root = self._etree.getroot() + roottext = root.text and not root.text.isspace() +- children = root.getchildren() ++ children = list(root) + + if children and not roottext: + first = children[0] +@@ -442,7 +442,7 @@ def cleanup_headings(self, offset=0, max=6): + and a max depth. + ''' + path = [] +- for heading in self._etree.getiterator('h'): ++ for heading in self._etree.iter('h'): + level = int(heading.attrib['level']) + # find parent header in path using old level + while path and path[-1][0] >= level: +@@ -461,11 +461,11 @@ def resolve_images(self, notebook=None, path=None): + adds a '_src_file' attribute to the elements with the full file path. + ''' + if notebook is None: +- for element in self._etree.getiterator('img'): ++ for element in self._etree.iter('img'): + filepath = element.attrib['src'] + element.attrib['_src_file'] = File(filepath) + else: +- for element in self._etree.getiterator('img'): ++ for element in self._etree.iter('img'): + filepath = element.attrib['src'] + element.attrib['_src_file'] = notebook.resolve_file(element.attrib['src'], path) + +@@ -473,7 +473,7 @@ def unresolve_images(self): + '''Undo effect of L{resolve_images()}, mainly intended for + testing. + ''' +- for element in self._etree.getiterator('img'): ++ for element in self._etree.iter('img'): + if '_src_file' in element.attrib: + element.attrib.pop('_src_file') + +@@ -481,7 +481,7 @@ def encode_urls(self, mode=URL_ENCODE_READABLE): + '''Calls encode_url() on all links that contain urls. + See zim.parsing for details. Modifies the parse tree. + ''' +- for link in self._etree.getiterator('link'): ++ for link in self._etree.iter('link'): + href = link.attrib['href'] + if href and is_url_re.match(href): + link.attrib['href'] = url_encode(href, mode=mode) +@@ -492,7 +492,7 @@ def decode_urls(self, mode=URL_ENCODE_READABLE): + '''Calls decode_url() on all links that contain urls. + See zim.parsing for details. Modifies the parse tree. + ''' +- for link in self._etree.getiterator('link'): ++ for link in self._etree.iter('link'): + href = link.attrib['href'] + if href and is_url_re.match(href): + link.attrib['href'] = url_decode(href, mode=mode) +@@ -502,7 +502,7 @@ def decode_urls(self, mode=URL_ENCODE_READABLE): + def count(self, text): + '''Returns the number of occurences of 'text' in this tree.''' + count = 0 +- for element in self._etree.getiterator(): ++ for element in self._etree.iter(): + if element.text: + count += element.text.count(text) + if element.tail: +@@ -515,7 +515,7 @@ def countre(self, regex): + in this tree. + ''' + count = 0 +- for element in self._etree.getiterator(): ++ for element in self._etree.iter(): + if element.text: + newstring, n = regex.subn('', element.text) + count += n +@@ -535,7 +535,7 @@ def _get_element_ends_with_newline(self, element): + elif element.tag in ('li', 'h'): + return True # implicit newline + else: +- children = element.getchildren() ++ children = list(element) + if children: + return self._get_element_ends_with_newline(children[-1]) # recurs + elif element.text: +@@ -586,7 +586,7 @@ def findall(self, tag): + @param tag: tag name + @returns: yields L{Node} objects + ''' +- for elt in self._etree.getiterator(tag): ++ for elt in self._etree.iter(tag): + yield Element.new_from_etree(elt) + + def replace(self, tag, func): +@@ -932,7 +932,7 @@ def end(self, tag): + if len(self._stack) > 1 and not ( + tag in (IMAGE, OBJECT, HEADDATA, TABLEDATA) + or (self._last.text and not self._last.text.isspace()) +- or self._last.getchildren() ++ or bool(list(self._last)) + ): + # purge empty tags + if self._last.text and self._last.text.isspace(): +@@ -940,7 +940,7 @@ def end(self, tag): + + empty = self._stack.pop() + self._stack[-1].remove(empty) +- children = self._stack[-1].getchildren() ++ children = list(self._stack[-1]) + if children: + self._last = children[-1] + if not self._last.tail is None: +@@ -1053,7 +1053,7 @@ def close(self): + def _append_to_previous(self, text): + '''Add text before current element''' + parent = self._stack[-2] +- children = parent.getchildren()[:-1] ++ children = list(parent)[:-1] + if children: + if children[-1].tail: + children[-1].tail = children[-1].tail + text +diff --git zim/gui/pageview.py zim/gui/pageview.py +index 84fe99b4..c2c29cc5 100644 +--- zim/gui/pageview.py ++++ zim/gui/pageview.py +@@ -857,7 +857,7 @@ def force_line_start(): + if not iter.starts_line(): + self.insert_at_cursor('\n') + +- for element in node.getchildren(): ++ for element in iter(node): + if element.tag in ('p', 'div'): + # No force line start here on purpose + if 'indent' in element.attrib: diff --git a/srcpkgs/zim/patches/02-py39.patch b/srcpkgs/zim/patches/02-py39.patch new file mode 100644 index 00000000000..7bf92a28589 --- /dev/null +++ b/srcpkgs/zim/patches/02-py39.patch @@ -0,0 +1,22 @@ +From 177d4b58f5bc5b298bc88907d76372334057dd31 Mon Sep 17 00:00:00 2001 +From: Alexander Kapshuna +Date: Tue, 22 Sep 2020 21:26:39 +0300 +Subject: [PATCH] Fix reading preformatted text under Python 3.9 (#1261) + +--- + zim/formats/__init__.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git zim/formats/__init__.py zim/formats/__init__.py +index e1149f7f..f22b0b0b 100644 +--- zim/formats/__init__.py ++++ zim/formats/__init__.py +@@ -822,7 +822,7 @@ def end(self, tag): + self._last_char = None + + def append(self, tag, attrib=None, text=None): +- attrib = attrib.copy() if attrib is not None else None ++ attrib = attrib.copy() if attrib is not None else {} + if tag in BLOCK_LEVEL: + if text and not text.endswith('\n'): + text += '\n' diff --git a/srcpkgs/zim/template b/srcpkgs/zim/template index 62ed7762b72..8e49842cf7b 100644 --- a/srcpkgs/zim/template +++ b/srcpkgs/zim/template @@ -1,7 +1,7 @@ # Template file for 'zim' pkgname=zim version=0.73.2 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-gobject python3-xdg gtk+3" depends="python3-gobject python3-xdg gtk+3 desktop-file-utils" From 611b6aee9889c3fab48e9a17acb78939431633bc Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Sun, 11 Oct 2020 10:04:39 -0600 Subject: [PATCH 08/16] bpytop: update to 1.0.42. --- srcpkgs/bpytop/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/bpytop/template b/srcpkgs/bpytop/template index be15bdfdc3f..00db9350ba1 100644 --- a/srcpkgs/bpytop/template +++ b/srcpkgs/bpytop/template @@ -1,6 +1,6 @@ # Template file for 'bpytop' pkgname=bpytop -version=1.0.40 +version=1.0.42 revision=1 build_style=gnu-makefile depends="python3-psutil" @@ -9,7 +9,7 @@ maintainer="Andrew Benson " license="Apache-2.0" homepage="https://github.com/aristocratos/bpytop" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=0ba93bb74f7a545209d5646c6fac6625eeb66fcb9d25fd8f562aef4b28bf2437 +checksum=64790b248ec03bf8f4b2810207edcde2dae8121f174578cb88112eb65eadbc19 pre_configure() { vsed -e '/^update_check/s/\$update_check/false/' -i bpytop.py From bccf974be72b46c8061b2e48fdd4319529f02cbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 10 Oct 2020 16:36:46 +0200 Subject: [PATCH 09/16] botan: update to 2.16.0 --- common/shlibs | 2 +- srcpkgs/botan/template | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/common/shlibs b/common/shlibs index 9c7da029640..e0a61266068 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2926,7 +2926,7 @@ libKDb3.so.4 kdb-3.1.0_1 libKPropertyWidgets3.so.4 kproperty-3.1.0_1 libKPropertyCore3.so.4 kproperty-3.1.0_1 libKReport3.so.4 kreport-3.1.0_1 -libbotan-2.so.13 botan-2.14.0_1 +libbotan-2.so.16 botan-2.16.0_1 libswipl.so.8 swi-prolog-8.0.0_1 libpcre2-16.so.0 libpcre2-10.22_1 libpcre2-32.so.0 libpcre2-10.22_1 diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template index 49d382d1bcc..e1230d09a73 100644 --- a/srcpkgs/botan/template +++ b/srcpkgs/botan/template @@ -1,20 +1,19 @@ # Template file for 'botan' pkgname=botan -version=2.14.0 -revision=2 +version=2.16.0 +revision=1 wrksrc="${pkgname^}-${version}" build_style=gnu-makefile pycompile_module="botan.py" -hostmakedepends="doxygen python" +hostmakedepends="doxygen python3" makedepends="libressl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel" short_desc="Crypto library written in C++" maintainer="Jürgen Buchmüller " license="BSD-2-Clause" homepage="https://botan.randombit.net/" distfiles="https://botan.randombit.net/releases/Botan-${version}.tar.xz" -checksum=0c10f12b424a40ee19bde00292098e201d7498535c062d8d5b586d07861a54b5 - -python_version=2 +checksum=92ed6ebc918d86bd1b04221ca518af4cf29cc326c4760740bd2d22e61cea2628 +python_version=3 LDFLAGS="-pthread" CXXFLAGS="-O3" @@ -72,7 +71,7 @@ do_configure() { ;; esac - python2 configure.py \ + python3 configure.py \ --distribution-info="Void Linux botan-${version}_${revision}" \ --cpu=${_cpu} \ ${_args} From 3175cef842fc99843bae744af73d68beac3b2b4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 10 Oct 2020 16:37:01 +0200 Subject: [PATCH 10/16] corectrl: revbump for botan-2.16.0 --- srcpkgs/corectrl/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/corectrl/template b/srcpkgs/corectrl/template index 75b5fea7722..b44994fd940 100644 --- a/srcpkgs/corectrl/template +++ b/srcpkgs/corectrl/template @@ -1,7 +1,7 @@ # Template file for 'corectrl' pkgname=corectrl version=1.1.1 -revision=1 +revision=2 wrksrc=${pkgname}-v${version} build_style=cmake configure_args="-DBUILD_TESTING=OFF" From cf29e44ccf49c0db666fa765c8ced24825bd6dda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 10 Oct 2020 16:37:16 +0200 Subject: [PATCH 11/16] qownnotes: revbump for botan-2.16.0 --- srcpkgs/qownnotes/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/qownnotes/template b/srcpkgs/qownnotes/template index 462360884e5..bbc44ba4d95 100644 --- a/srcpkgs/qownnotes/template +++ b/srcpkgs/qownnotes/template @@ -1,7 +1,7 @@ # Template file for 'qownnotes' pkgname=qownnotes version=20.7.0 -revision=1 +revision=2 build_style=qmake hostmakedepends="pkg-config qt5-qmake" makedepends="botan-devel qt5-declarative-devel qt5-svg-devel From 84129d44ad77f87e8b77eccfaa830f400bc88f4a Mon Sep 17 00:00:00 2001 From: Sora Morimoto Date: Mon, 12 Oct 2020 13:31:56 +0900 Subject: [PATCH 12/16] delta: update to 0.4.4 Signed-off-by: Sora Morimoto --- srcpkgs/delta/template | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/srcpkgs/delta/template b/srcpkgs/delta/template index 4408c16abba..59271de2dc3 100644 --- a/srcpkgs/delta/template +++ b/srcpkgs/delta/template @@ -1,21 +1,14 @@ # Template file for 'delta' pkgname=delta -version=0.4.3 +version=0.4.4 revision=1 build_style=cargo -hostmakedepends="llvm clang" -makedepends="oniguruma-devel" short_desc="Syntax-highlighting pager for git" maintainer="Andrew Benson " license="MIT" homepage="https://github.com/dandavison/delta" distfiles="${homepage}/archive/${version}.tar.gz" -checksum=78ee36ec30194fe261ccb585111b67adae5166e79170f9636e54cbf5427da54a - -pre_build() { - export CFLAGS_${RUST_BUILD//-/_}="${CFLAGS_host}" - export CC_${RUST_BUILD//-/_}="${BUILD_CC}" -} +checksum=4068cb88a4110bbef24b8148e3ae283ff007f4f6aa4780789cda7a412928daa0 post_install() { vlicense LICENSE From cfa92e07fb4193de770b16e10526dcd51830df96 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 10 Oct 2020 19:55:34 +0200 Subject: [PATCH 13/16] bdf2sfd: update to 1.1.4. --- srcpkgs/bdf2sfd/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/bdf2sfd/template b/srcpkgs/bdf2sfd/template index 882c64e157c..5f14d49b941 100644 --- a/srcpkgs/bdf2sfd/template +++ b/srcpkgs/bdf2sfd/template @@ -1,6 +1,6 @@ # Template file for 'bdf2sfd' pkgname=bdf2sfd -version=1.1.3 +version=1.1.4 revision=1 build_style=cmake short_desc="BDF to SFD converter to vectorize bitmap fonts" @@ -9,7 +9,7 @@ license="BSD-2-clause" homepage="https://github.com/fcambus/bdf2sfd" changelog="https://github.com/fcambus/bdf2sfd/raw/master/ChangeLog" distfiles="https://github.com/fcambus/bdf2sfd/archive/${version}.tar.gz" -checksum=66c35ac6ba98e0f20298480c58e683aacb2f16d1cd12c55b2ec6c94a448901e6 +checksum=03f3c070d3e6b2b39822270ca0850a1ebb8ae675ff0fbfb474468310134271c9 post_install() { vlicense LICENSE From fde6b71a01071ca0769fd3aed604674be7e9faa9 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 10 Oct 2020 20:00:45 +0200 Subject: [PATCH 14/16] elixir: update to 1.11.0. --- srcpkgs/elixir/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/elixir/template b/srcpkgs/elixir/template index 2681cfa9012..f2772725637 100644 --- a/srcpkgs/elixir/template +++ b/srcpkgs/elixir/template @@ -1,16 +1,16 @@ # Template file for 'elixir' pkgname=elixir -version=1.10.4 +version=1.11.0 revision=1 build_style=gnu-makefile make_check_target="test" hostmakedepends="erlang" -depends="erlang>=21" +depends="erlang>=23" checkdepends="git" short_desc="Functional, concurrent, general-purpose programming language" maintainer="Duncaen " license="Apache-2.0" homepage="http://elixir-lang.org/" -changelog="https://github.com/elixir-lang/elixir/raw/v1.9/CHANGELOG.md" +changelog="https://raw.githubusercontent.com/elixir-lang/elixir/v${version%.*}/CHANGELOG.md" distfiles="https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz" -checksum=8518c78f43fe36315dbe0d623823c2c1b7a025c114f3f4adbb48e04ef63f1d9f +checksum=80b02a8973d2a0becacf577f15b202273002ad9c4d9ef55d8910c8d433c99a59 From 4d473cb84b8571cabefba72ca72dd337a252c3d9 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Mon, 12 Oct 2020 19:05:28 +0200 Subject: [PATCH 15/16] knot: update to 3.0.1. --- srcpkgs/knot/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/knot/template b/srcpkgs/knot/template index baf5423192d..fcb16c24310 100644 --- a/srcpkgs/knot/template +++ b/srcpkgs/knot/template @@ -1,6 +1,6 @@ # Template file for 'knot' pkgname=knot -version=3.0.0 +version=3.0.1 revision=1 build_style=gnu-configure configure_args=" @@ -18,7 +18,7 @@ maintainer="Duncaen " license="GPL-3.0-or-later" homepage="https://www.knot-dns.cz/" distfiles="https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz" -checksum=f1c96aff6e873a2f9b1b8c2441d5a7801dd48d3abdb738a4d24b26c2a8fbe6c4 +checksum=97af6724b04308f691392c80d75564ff8b246871f2f59c4f03cede3c4dd401bb system_accounts="_knot" _knot_homedir="/var/lib/knot" From 59a2dfa08850b3881f47a25691bc314e64b68fa0 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Fri, 9 Oct 2020 00:21:46 +0200 Subject: [PATCH 16/16] u-boot-tools: update to 2020.10. --- srcpkgs/u-boot-tools/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/u-boot-tools/template b/srcpkgs/u-boot-tools/template index 0859350f18a..c0752ff6456 100644 --- a/srcpkgs/u-boot-tools/template +++ b/srcpkgs/u-boot-tools/template @@ -1,6 +1,6 @@ # Template file for 'u-boot-tools' pkgname=u-boot-tools -version=2020.07 +version=2020.10 revision=1 wrksrc="u-boot-${version}" build_style=gnu-makefile @@ -13,7 +13,7 @@ maintainer="Duncaen " license="GPL-2.0-or-later" homepage="https://www.denx.de/wiki/U-Boot/" distfiles="ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2" -checksum=c1f5bf9ee6bb6e648edbf19ce2ca9452f614b08a9f886f1a566aa42e8cf05f6a +checksum=0d481bbdc05c0ee74908ec2f56a6daa53166cc6a78a0e4fac2ac5d025770a622 if [ "$CROSS_BUILD" ]; then make_build_args+=" CROSS_BUILD_TOOLS=y CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"