From e38b96d62f7e6d46b31ab4727341b96f5242604a Mon Sep 17 00:00:00 2001 From: John Date: Mon, 29 Jun 2020 21:30:37 +0200 Subject: [PATCH 001/410] hooks/pkglint-elf-in-usrshare: speed up by only starting file once --- .../hooks/post-install/11-pkglint-elf-in-usrshare.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/common/hooks/post-install/11-pkglint-elf-in-usrshare.sh b/common/hooks/post-install/11-pkglint-elf-in-usrshare.sh index 484ceccaecd..ff4f7789e86 100644 --- a/common/hooks/post-install/11-pkglint-elf-in-usrshare.sh +++ b/common/hooks/post-install/11-pkglint-elf-in-usrshare.sh @@ -4,7 +4,7 @@ # - Looks on all packages for binary files being installed to /usr/share hook() { - local matches + local matches mime file if [ ! -d ${PKGDESTDIR}/usr/share ]; then return 0 @@ -12,12 +12,15 @@ hook() { # Find all binaries in /usr/share and add them to the pool while read -r f; do - case "$(file -bi "$f")" in + mime="${f##*:}" + mime="${mime// /}" + file="${f%:*}" + case "${mime}" in # Note application/x-executable is missing which is present in most Electron apps application/x-sharedlib*|application/x-pie-executable*) - matches+=" ${f#$PKGDESTDIR}" ;; + matches+=" ${file#$PKGDESTDIR}" ;; esac - done < <(find $PKGDESTDIR/usr/share -type f) + done < <(find $PKGDESTDIR/usr/share -type f | file --mime-type --files-from -) if [ -z "$matches" ]; then return 0 From c6d4158d285175eabf22f18dcd8a7892560bd3d2 Mon Sep 17 00:00:00 2001 From: cinerea Date: Mon, 29 Jun 2020 11:46:09 -0400 Subject: [PATCH 002/410] New package: wren-cli-0.3.0 --- srcpkgs/wren-cli/template | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 srcpkgs/wren-cli/template diff --git a/srcpkgs/wren-cli/template b/srcpkgs/wren-cli/template new file mode 100644 index 00000000000..e96411c0d3d --- /dev/null +++ b/srcpkgs/wren-cli/template @@ -0,0 +1,28 @@ +# Template file for 'wren-cli' +pkgname=wren-cli +version=0.3.0 +revision=1 +build_wrksrc=projects/make +build_style=gnu-makefile +make_build_args="config=release_${XBPS_TARGET_WORDSIZE}bit" +checkdepends="python3" +short_desc="Small, class-based, concurrent scripting language - CLI" +maintainer="cinerea0 " +license="MIT" +homepage="http://wren.io/cli" +distfiles="https://github.com/wren-lang/wren-cli/archive/${version}.tar.gz" +checksum=a498d2ccb9a723e7163b4530efbaec389cc13e6baaf935e16cbd052a739b7265 + +post_patch() { + vsed -i -e 's/ -m64 / /;s/ -m32 / /;s/ -O3//' wren_cli.make +} + +do_check() { + cd ../.. + python3 util/test.py +} + +do_install() { + vbin ${wrksrc}/bin/wren_cli wren + vlicense ${wrksrc}/LICENSE +} From f08074137212ca982686bbc311de10524d415fda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 30 Jun 2020 07:16:23 +0700 Subject: [PATCH 003/410] android-udev-rules: create system_groups --- srcpkgs/android-udev-rules/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/android-udev-rules/template b/srcpkgs/android-udev-rules/template index 83d9636a6ff..b9113d3cb12 100644 --- a/srcpkgs/android-udev-rules/template +++ b/srcpkgs/android-udev-rules/template @@ -1,13 +1,14 @@ # Template file for 'android-udev-rules' pkgname=android-udev-rules version=20200613 -revision=1 +revision=2 short_desc="Android udev rules list aimed to be the most comprehensive on the net" maintainer="Rien Maertens " license="GPL-3.0-or-later" homepage="https://github.com/M0Rf30/android-udev-rules" distfiles="https://github.com/M0Rf30/android-udev-rules/archive/${version}.tar.gz" checksum=8c7fad8cf97fe106f826f07aa9f033e9aa9ee69422b35dada6d9d2df878b5473 +system_groups="adbusers" do_install() { vinstall 51-android.rules 644 usr/lib/udev/rules.d 51-android.rules From b8a8516761466c4414165d791b677238ba1d9503 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 30 Jun 2020 07:17:03 +0700 Subject: [PATCH 004/410] android-tools: stop depending on android-udev-rules People may have their specific rules. Let's them decide if they want, this is not a hard dependency anyway. Close: #23307 --- srcpkgs/android-tools/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template index 21537d06375..738681c45a8 100644 --- a/srcpkgs/android-tools/template +++ b/srcpkgs/android-tools/template @@ -1,12 +1,11 @@ # Template file for 'android-tools' pkgname=android-tools version=29.0.6 -revision=2 +revision=3 archs="armv* aarch64* x86_64* i686*" build_style=cmake hostmakedepends="perl go" makedepends="gtest-devel zlib-devel libressl-devel libusb-devel pcre2-devel" -depends="android-udev-rules" short_desc="Android platform tools (adb and fastboot)" maintainer="John " license="Apache-2.0, ISC, GPL-2.0-only, MIT" From 49d11c47e3685fdfeda5a96d6e483e22ba25699a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 30 Jun 2020 07:36:01 +0700 Subject: [PATCH 005/410] python-nbxmpp: mark empty nbxmpp doesn't support Python 2 anymore. But 1.0.0 has been published, mark it as empty to remove. --- srcpkgs/python-nbxmpp | 1 + srcpkgs/python3-nbxmpp | 1 - .../template | 24 +++++++++---------- 3 files changed, 12 insertions(+), 14 deletions(-) create mode 120000 srcpkgs/python-nbxmpp delete mode 120000 srcpkgs/python3-nbxmpp rename srcpkgs/{python-nbxmpp => python3-nbxmpp}/template (51%) diff --git a/srcpkgs/python-nbxmpp b/srcpkgs/python-nbxmpp new file mode 120000 index 00000000000..ae760ace99f --- /dev/null +++ b/srcpkgs/python-nbxmpp @@ -0,0 +1 @@ +python3-nbxmpp \ No newline at end of file diff --git a/srcpkgs/python3-nbxmpp b/srcpkgs/python3-nbxmpp deleted file mode 120000 index ceb4d295ad5..00000000000 --- a/srcpkgs/python3-nbxmpp +++ /dev/null @@ -1 +0,0 @@ -python-nbxmpp \ No newline at end of file diff --git a/srcpkgs/python-nbxmpp/template b/srcpkgs/python3-nbxmpp/template similarity index 51% rename from srcpkgs/python-nbxmpp/template rename to srcpkgs/python3-nbxmpp/template index 9053b90dfca..74727077391 100644 --- a/srcpkgs/python-nbxmpp/template +++ b/srcpkgs/python3-nbxmpp/template @@ -1,13 +1,13 @@ -# Template file for 'python-nbxmpp' -pkgname=python-nbxmpp +# Template file for 'python3-nbxmpp' +pkgname=python3-nbxmpp version=1.0.0 -revision=1 +revision=2 archs=noarch wrksrc="${pkgname#*-}-${version}" -build_style=python-module -hostmakedepends="python-setuptools python3-setuptools" -depends="python-openssl" -short_desc="Non blocking Jabber/XMPP module (Python2)" +build_style=python3-module +hostmakedepends="python3-setuptools" +depends="python3-openssl" +short_desc="Non blocking Jabber/XMPP module" maintainer="Duncaen " license="GPL-2.0-or-later" homepage="https://python-nbxmpp.gajim.org/" @@ -15,11 +15,9 @@ homepage="https://python-nbxmpp.gajim.org/" distfiles="${PYPI_SITE}/n/nbxmpp/nbxmpp-${version}.tar.gz" checksum=8b7e967bc1d0f1a1f7cf3395b6f5d70009ae5607ad9afb8de32ff92b661693ad -python3-nbxmpp_package() { +python-nbxmpp_package() { + build_style=meta archs=noarch - depends="python3-openssl" - short_desc="${short_desc/Python2/Python3}" - pkg_install() { - vmove "usr/lib/python${py3_ver}" - } + # Someone bumped this package to 1.0.0, which doesn't support Python 2 + short_desc+=" - Python 2 - removed package" } From 0c79d92fc956672ec3ad58deb5908e4f58c72177 Mon Sep 17 00:00:00 2001 From: bra1nwave Date: Sat, 27 Jun 2020 11:42:25 +0200 Subject: [PATCH 006/410] mgba: update to 0.8.2. --- .../Fix-regex-on-empty-libzip-version.patch | 15 +++++++++++++++ srcpkgs/mgba/template | 7 ++++--- 2 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/mgba/patches/Fix-regex-on-empty-libzip-version.patch diff --git a/srcpkgs/mgba/patches/Fix-regex-on-empty-libzip-version.patch b/srcpkgs/mgba/patches/Fix-regex-on-empty-libzip-version.patch new file mode 100644 index 00000000000..60cbd84d056 --- /dev/null +++ b/srcpkgs/mgba/patches/Fix-regex-on-empty-libzip-version.patch @@ -0,0 +1,15 @@ +--- CMakeLists.txt.orig ++++ CMakeLists.txt +@@ -611,10 +611,10 @@ + if(USE_LIBZIP) + include_directories(AFTER ${LIBZIP_INCLUDE_DIRS}) + link_directories(${LIBZIP_LIBRARY_DIRS}) +- list(APPEND DEPENDENCY_LIB ${LIBZIP_LIBRARIES}) ++ list(APPEND DEPENDENCY_LIB zip) + list(APPEND FEATURES LIBZIP) + list(APPEND VFS_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/util/vfs/vfs-zip.c) +- string(REGEX MATCH "^[0-9]+" LIBZIP_VERSION_MAJOR ${libzip_VERSION}) ++ string(REGEX MATCH "^[0-9]+" LIBZIP_VERSION_MAJOR "${libzip_VERSION}") + if (LIBZIP_VERSION_MAJOR LESS 1) + set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS},libzip2") + elseif(LIBZIP_VERSION_MAJOR EQUAL 1) diff --git a/srcpkgs/mgba/template b/srcpkgs/mgba/template index 9b0d7fe5669..1669fb66e92 100644 --- a/srcpkgs/mgba/template +++ b/srcpkgs/mgba/template @@ -1,17 +1,18 @@ # Template file for 'mgba' pkgname=mgba -version=0.8.1 +version=0.8.2 revision=1 build_style=cmake hostmakedepends="pkg-config qt5-host-tools qt5-qmake desktop-file-utils" makedepends="SDL2-devel ffmpeg-devel libedit-devel libepoxy-devel libmagick-devel - libzip-devel minizip-devel qt5-multimedia-devel qt5-tools-devel" + libzip-devel qt5-multimedia-devel qt5-tools-devel" short_desc="Game Boy Advance emulator written in C" maintainer="bra1nwave " license="MPL-2.0" homepage="https://www.mgba.io/" +changelog="https://raw.githubusercontent.com/mgba-emu/mgba/master/CHANGES" distfiles="https://github.com/mgba-emu/${pkgname}/archive/${version}.tar.gz" -checksum=df136ea50c9cca380ab93e00fd8d87811e41a49a804c5b0e018babef0c490f13 +checksum=696d26b567f852825548a7ab2cb69ba54402561146a4cfebefcdc7ea218f7aea libmgba_package() { short_desc+=" - shared library" From 2395f1bb1668d58b1fffad5674f07370e4814faa Mon Sep 17 00:00:00 2001 From: avoidr Date: Sat, 27 Jun 2020 16:48:52 +0200 Subject: [PATCH 007/410] srain: update to 1.1.1. --- srcpkgs/srain/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/srain/template b/srcpkgs/srain/template index b9c6c01a210..6c7af25b29a 100644 --- a/srcpkgs/srain/template +++ b/srcpkgs/srain/template @@ -1,6 +1,6 @@ # Template file for 'srain' pkgname=srain -version=1.1.0 +version=1.1.1 revision=1 build_style=configure build_helper=gir @@ -13,4 +13,4 @@ maintainer="avoidr " license="GPL-3.0-only" homepage="https://srain.im/" distfiles="https://github.com/SrainApp/srain/archive/${version}.tar.gz" -checksum=cba8bf195933669c36d712c358504a0da271f65e36ff768c3ca7eb4172a54023 +checksum=7bbb139517aef047243c2f04e23aff28dc1b83e1d123c331215cf1b6c0f6594f From f3012d6375bd6ec95f2929e52b7bd78f8a2892b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= Date: Mon, 29 Jun 2020 08:05:10 +0200 Subject: [PATCH 008/410] postfix: update to 3.5.4. --- srcpkgs/postfix/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template index 632f63f956b..2bbb4bf788d 100644 --- a/srcpkgs/postfix/template +++ b/srcpkgs/postfix/template @@ -1,6 +1,6 @@ # Template file for 'postfix' pkgname=postfix -version=3.5.3 +version=3.5.4 revision=1 hostmakedepends="perl m4" makedepends="icu-devel libldap-devel libmysqlclient-devel pcre-devel @@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana " license="IPL-1.0, EPL-2.0" homepage="http://www.postfix.org/" distfiles="http://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${version}.tar.gz" -checksum=e381089cf2a03105042835776f23489c0a58600a6a6ebc8cb59f5cb1eb4d8d75 +checksum=fc2fb1cc27556aa2506bc287af04881cde07c83d5cb213ba835083b4bb796881 system_accounts="postfix" postfix_homedir="/var/spool/postfix" From 166aa23ffabcf06626fcd5cf1ca92fbc821b26e9 Mon Sep 17 00:00:00 2001 From: Nafis Date: Mon, 29 Jun 2020 06:54:23 +0600 Subject: [PATCH 009/410] baobab: update to 3.34.1. --- srcpkgs/baobab/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/baobab/template b/srcpkgs/baobab/template index 217d1a35c99..a028be4cd5b 100644 --- a/srcpkgs/baobab/template +++ b/srcpkgs/baobab/template @@ -1,6 +1,6 @@ # Template file for 'baobab' pkgname=baobab -version=3.34.0 +version=3.34.1 revision=1 build_style=meson hostmakedepends="gettext pkg-config itstool glib-devel vala" @@ -11,4 +11,4 @@ maintainer="Enno Boland " license="GPL-2.0-or-later, GFDL-1.1-or-later" homepage="https://wiki.gnome.org/action/show/Apps/DiskUsageAnalyzer" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=46ebd9466da6a68c340653e9095f1e905b6fac79305879a9e644634f7da98607 +checksum=7f981d4f135e4f80fba3f66e86b0eeedc94a2434649262ff01a5f0cb027b20c5 From 0e1b1d7b54249fc62f1f9e89ccd0c40d365a9c13 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 30 Jun 2020 12:39:50 +0200 Subject: [PATCH 010/410] nodejs-lts-10: update to 10.21.0. [ci skip] --- srcpkgs/nodejs-lts-10/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template index eaf31185e0e..ba72e480dac 100644 --- a/srcpkgs/nodejs-lts-10/template +++ b/srcpkgs/nodejs-lts-10/template @@ -1,7 +1,7 @@ # Template file for 'nodejs-lts-10' pkgname=nodejs-lts-10 -version=10.19.0 -revision=2 +version=10.21.0 +revision=1 wrksrc="node-v${version}" hostmakedepends="pkg-config python zlib-devel which $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel) @@ -16,7 +16,7 @@ maintainer="k4leg " license="MIT" homepage="https://nodejs.org/" distfiles="${homepage}/download/release/v${version}/node-v${version}.tar.xz" -checksum=622721bc3e6b65faf7eb6a22bfb6e3e31817e42212aa6bf5a7991ea7d9b6f169 +checksum=26b01fa28338cacaa8a66d7963ab2514e81678c268ab52ec55dcf937aadcb73b python_version=2 #unverified build_options="ssl libuv http_parser icu nghttp2 cares" From ed2d292f215e3732e3472ae5bf67ddfb4cbce6a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= Date: Mon, 29 Jun 2020 16:41:56 +0200 Subject: [PATCH 011/410] xbanish: update to 1.7. --- srcpkgs/xbanish/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xbanish/template b/srcpkgs/xbanish/template index d630a53bfdf..d034f10b377 100644 --- a/srcpkgs/xbanish/template +++ b/srcpkgs/xbanish/template @@ -1,6 +1,6 @@ # Template file for 'xbanish' pkgname=xbanish -version=1.6 +version=1.7 revision=1 build_style=gnu-makefile makedepends="libXfixes-devel libXt-devel libXi-devel libX11-devel" @@ -9,7 +9,7 @@ maintainer="Diogo Leal " license="BSD-3-Clause" homepage="https://github.com/jcs/xbanish" distfiles="https://github.com/jcs/xbanish/archive/v${version}.tar.gz" -checksum=6e9bec35720b3d0f047028ad248a758249c7139c62ef140d9d39df6bd382712d +checksum=64477d1429bcc76d481863b4736af2bb1870472cc48539fe0322563d981d43d5 pre_build() { export LIBS="$LDFLAGS" From 6f919a331a75093ca82cdc139c9b3cc98ec07787 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Fri, 26 Jun 2020 16:52:51 -0300 Subject: [PATCH 012/410] mdBook: update to 0.4.0, claim maintainership. --- srcpkgs/mdBook/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/mdBook/template b/srcpkgs/mdBook/template index 0d69365a833..a1aa6f83a42 100644 --- a/srcpkgs/mdBook/template +++ b/srcpkgs/mdBook/template @@ -1,15 +1,15 @@ # Template file for 'mdBook' pkgname=mdBook -version=0.3.7 +version=0.4.0 revision=1 build_style=cargo short_desc="Create book from markdown files. Like Gitbook but implemented in Rust" -maintainer="Huidong Hwang " +maintainer="Érico Nogueira " license="MPL-2.0" homepage="https://github.com/rust-lang/mdBook" changelog="https://raw.githubusercontent.com/rust-lang/mdBook/master/CHANGELOG.md" distfiles="https://github.com/rust-lang/mdBook/archive/v${version}.tar.gz" -checksum=b450d6f1c07624b4c31fd9bc7cb4390ca53e2c318136c62a86aaeea222437919 +checksum=402439a3ce61415bb84f0bf7681e15c96a9ce627c9e2c08647ec8c557c1a9b1a post_install() { vlicense LICENSE From d311cd7992df17a4d3431f046babe56fc83a5d44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Fri, 26 Jun 2020 16:53:12 -0300 Subject: [PATCH 013/410] mdbook-linkcheck: update to 0.7.0. Add warning about compatibility with mdBook. For use with `mdbook build`, it requires version 0.4.0 of mdBook. --- srcpkgs/mdbook-linkcheck/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mdbook-linkcheck/template b/srcpkgs/mdbook-linkcheck/template index 3facb44a84a..147a5ec55dc 100644 --- a/srcpkgs/mdbook-linkcheck/template +++ b/srcpkgs/mdbook-linkcheck/template @@ -1,6 +1,7 @@ # Template file for 'mdbook-linkcheck' +# New versions need to be tested for compatibility with mdBook pkgname=mdbook-linkcheck -version=0.6.0 +version=0.7.0 revision=1 build_style=cargo hostmakedepends="pkg-config" @@ -10,7 +11,7 @@ maintainer="Érico Nogueira " license="MIT" homepage="https://crates.io/crates/mdbook-linkcheck" distfiles="https://github.com/Michael-F-Bryan/${pkgname}/archive/v${version}.tar.gz" -checksum=66133be90c0f325d96bed7f052c6d1516b11e817ba62df85e1d2c37774847a30 +checksum=e3e444690d4e2c744eb240d4f6bacc6ebfacfadd9f75c61e0c461d7f046b920e post_install() { vlicense LICENSE From 622d2b28c5c4e3ea74ed5442444048a568bac33a Mon Sep 17 00:00:00 2001 From: David Flatz Date: Tue, 30 Jun 2020 09:17:36 +0200 Subject: [PATCH 014/410] neomutt: update to 20200626. --- srcpkgs/neomutt/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template index c2c49633d64..8994d938856 100644 --- a/srcpkgs/neomutt/template +++ b/srcpkgs/neomutt/template @@ -1,6 +1,6 @@ # Template file for 'neomutt' pkgname=neomutt -version=20200619 +version=20200626 revision=1 wrksrc="neomutt-${version}" create_wrksrc=true @@ -22,7 +22,7 @@ license="GPL-2.0-or-later" homepage="https://neomutt.org/" distfiles="https://github.com/neomutt/neomutt/archive/${version}.tar.gz https://github.com/neomutt/neomutt-test-files/archive/1ee274e9ae1330fb901eb7b8275b3079d7869222.tar.gz" -checksum="4449d43b3586a730ead151c66afc6af37e3ea15b3e72065e579a9e9884146acc +checksum="94b2e59667a080cb9d531050c3ad320f9951ba7ba09eb7eda15427899627f89e f7aeb9a70b213b1bbcdba629745fd345bde825c467453912f5cfd7f1d75418f5" python_version=3 From c4342931ec64650e6fd7d35e30127525fd48230f Mon Sep 17 00:00:00 2001 From: Dominic Monroe Date: Tue, 30 Jun 2020 11:49:20 +0100 Subject: [PATCH 015/410] hikari: update to 2.0.4. --- srcpkgs/hikari/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/hikari/template b/srcpkgs/hikari/template index eb36ec2491c..c4e5afd90df 100644 --- a/srcpkgs/hikari/template +++ b/srcpkgs/hikari/template @@ -1,6 +1,6 @@ # Template file for 'hikari' pkgname=hikari -version=2.0.3 +version=2.0.4 revision=1 build_style=gnu-makefile make_cmd=bmake @@ -18,7 +18,7 @@ license="BSD-2-Clause" homepage="https://hikari.acmelabs.space" changelog="https://hub.darcs.net/raichoo/hikari/browse/CHANGELOG.md" distfiles="${homepage}/releases/${pkgname}-${version}.tar.gz" -checksum=02eb73a3b76c440a8f30dd4fb5b18b43015eec7c3af79a07c83006cecc892610 +checksum=3f8648c69867fdbe83c09a1a10d9c3be813803f66721bc4543c49a525fed5c39 conf_files="/etc/pam.d/hikari-unlocker /etc/hikari/hikari.conf" if [ "$CROSS_BUILD" ]; then From 2f9c2984fe898d6ba8bdafd60064e1f277414e94 Mon Sep 17 00:00:00 2001 From: Neel Chotai Date: Tue, 30 Jun 2020 00:37:17 +0100 Subject: [PATCH 016/410] vim: update to 8.2.1095 --- srcpkgs/vim/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/vim/template b/srcpkgs/vim/template index f3ade46cb52..ef3fb81e01d 100644 --- a/srcpkgs/vim/template +++ b/srcpkgs/vim/template @@ -1,6 +1,6 @@ # Template file for 'vim' pkgname=vim -version=8.2.0891 +version=8.2.1095 revision=1 hostmakedepends="gettext glib-devel pkg-config" makedepends="acl-devel gtk+3-devel libXt-devel lua-devel ncurses-devel @@ -11,7 +11,7 @@ maintainer="Neel Chotai " license="Vim" homepage="https://www.vim.org" distfiles="https://github.com/vim/vim/archive/v${version}.tar.gz" -checksum=1848dbc78d21e119b9314de06ce9852137d740f8c3fb97f558dea3f7f01bed44 +checksum=d33a7229e2ec7f96dd8ae496f64a58712e1d76637ad30730ce1a14655b4d2cef python_version=3 subpackages="xxd vim-common vim-x11 gvim" From 5fa198cdfdc85f08af371c1063e82aaea7b4a91d Mon Sep 17 00:00:00 2001 From: Fabio Krapohl Date: Tue, 30 Jun 2020 00:44:30 +0200 Subject: [PATCH 017/410] ardor: update to 2.2.6. --- srcpkgs/ardor/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ardor/template b/srcpkgs/ardor/template index c83dcb10888..2a054ed502f 100644 --- a/srcpkgs/ardor/template +++ b/srcpkgs/ardor/template @@ -1,6 +1,6 @@ # Template file for 'ardor' pkgname=ardor -version=2.2.5 +version=2.2.6 revision=1 wrksrc=ardor hostmakedepends="unzip" @@ -10,7 +10,7 @@ maintainer="Fabio Krapohl " license="custom:Jelurida Public License 1.1" homepage="https://ardorplatform.org" distfiles="https://bitbucket.org/Jelurida/ardor/downloads/ardor-client-${version}.zip" -checksum=1282b33b153e6727bf70103c707cf0d1f3f8171f92a4fb673c32b7208171e16a +checksum=c2edf8d9785f4c9e8b2768324aca925e6c9a0ea5eb74996c7490a56967951366 do_install() { echo "#!/bin/sh" > ardor From d1d02159bf8614c275bdd359876c24d81b153a9f Mon Sep 17 00:00:00 2001 From: Piraty Date: Wed, 18 Dec 2019 22:38:08 +0100 Subject: [PATCH 018/410] New package: teams-bin-1.3.00.16851 Closes: #22398 --- srcpkgs/teams-bin/files/teams-wrapper.sh | 2 ++ srcpkgs/teams-bin/template | 43 ++++++++++++++++++++++++ srcpkgs/teams-bin/update | 2 ++ 3 files changed, 47 insertions(+) create mode 100755 srcpkgs/teams-bin/files/teams-wrapper.sh create mode 100644 srcpkgs/teams-bin/template create mode 100644 srcpkgs/teams-bin/update diff --git a/srcpkgs/teams-bin/files/teams-wrapper.sh b/srcpkgs/teams-bin/files/teams-wrapper.sh new file mode 100755 index 00000000000..4c4a8d3bae8 --- /dev/null +++ b/srcpkgs/teams-bin/files/teams-wrapper.sh @@ -0,0 +1,2 @@ +#!/bin/sh +LD_LIBRARY_PATH=/usr/lib/teams exec /usr/lib/teams/teams "$@" diff --git a/srcpkgs/teams-bin/template b/srcpkgs/teams-bin/template new file mode 100644 index 00000000000..93641949612 --- /dev/null +++ b/srcpkgs/teams-bin/template @@ -0,0 +1,43 @@ +# Template file for 'teams-bin' +pkgname=teams-bin +version=1.3.00.16851 +revision=1 +archs="x86_64" +hostmakedepends="xz" +short_desc="Official Microsoft Teams client" +maintainer="Piraty " +license="custom:Proprietary" +homepage="https://teams.microsoft.com/downloads" +distfiles="https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${version}_amd64.deb" +checksum=23838c8f8dea4960dce8bba559cd7ee3cdedc78ea7fdb226139b5b2204eee4d6 + +repository=nonfree +restricted=yes + +do_extract() { + ar p "${XBPS_SRCDISTDIR}/${pkgname}-${version}/teams_${version}_amd64.deb" data.tar.xz | bsdtar --extract --xz -f - -C . +} + +do_install() { + # use our simple wrapper instead of the provided one + vbin ${FILESDIR}/teams-wrapper.sh teams + + vmkdir usr/lib/teams + vcopy usr/share/teams usr/lib/ + + vmkdir usr/share + vcopy usr/share/applications usr/share/ + vcopy usr/share/pixmaps usr/share/ + + vlicense usr/share/teams/resources/ReadmeFirstTermsofUse.txt + vlicense usr/share/teams/resources/ThirdPartyNotice.txt + vlicense usr/share/teams/LICENSE + vlicense usr/share/teams/LICENSES.chromium.html +} + +post_install() { + # purge bundled libraries, but keep libffmpeg.so (not provided by Void) + for item in libEGL.so libGLESv2.so swiftshader/libEGL.so swiftshader/libGLESv2.so ; do + rm ${DESTDIR}/usr/lib/teams/$item + done +} diff --git a/srcpkgs/teams-bin/update b/srcpkgs/teams-bin/update new file mode 100644 index 00000000000..64b932f4206 --- /dev/null +++ b/srcpkgs/teams-bin/update @@ -0,0 +1,2 @@ +site=https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/ +pattern='href="teams_\K[\d\.]+(?=_amd64\.deb")' From 00e9562fee6f8c69aca20f6e9daec342cb95ab92 Mon Sep 17 00:00:00 2001 From: Nafis Date: Tue, 30 Jun 2020 21:39:12 +0600 Subject: [PATCH 019/410] zoom: update to 5.1.418436.0628. --- srcpkgs/zoom/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template index 7e47ce87cef..90355f63fcc 100644 --- a/srcpkgs/zoom/template +++ b/srcpkgs/zoom/template @@ -1,6 +1,6 @@ # Template file for 'zoom' pkgname=zoom -version=5.1.412382.0614 +version=5.1.418436.0628 revision=1 archs="x86_64" wrksrc=zoom @@ -11,7 +11,7 @@ maintainer="Daniel Santana " license="custom:Proprietary" homepage="https://zoom.us/" distfiles="https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz" -checksum=458fc640c85bad0a985f2a5bccfa69bc8a64f282a9aeeb908ef46fe585738660 +checksum=77bdea9da6f7551e936cd06dc37d9f305706ac49ccb48e48746e3e8c9ebbaeed repository=nonfree noshlibprovides=yes noverifyrdeps=yes From bc55c0f20415b368d6b8c661cdb57b98e747ba02 Mon Sep 17 00:00:00 2001 From: Neel Chotai Date: Tue, 30 Jun 2020 01:03:06 +0100 Subject: [PATCH 020/410] topgrade: update to 5.0.0 --- srcpkgs/topgrade/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/topgrade/template b/srcpkgs/topgrade/template index ea19e6d77c9..1cf0529c3ea 100644 --- a/srcpkgs/topgrade/template +++ b/srcpkgs/topgrade/template @@ -1,11 +1,11 @@ # Template file for 'topgrade' pkgname=topgrade -version=4.7.1 +version=5.0.0 revision=1 build_style=cargo short_desc="Meta upgrade tool for pip, flatpak, your distro and everything else" maintainer="jcgruenhage " license="GPL-3.0-only" homepage="https://github.com/r-darwish/topgrade" -distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=57d05d806ff95780fc196a5d20d0830b0b9437e3cc84a3735905446e3c0a3860 +distfiles="https://github.com/r-darwish/topgrade/archive/v${version}.tar.gz" +checksum=fc3ae25c550b66270457c11778bddcbb3b664638f5181f388262bf40e8811124 From a3e5c37f8923460901682e0857f33df767995fb0 Mon Sep 17 00:00:00 2001 From: Daniel Lewan Date: Sat, 27 Jun 2020 23:28:12 +0200 Subject: [PATCH 021/410] sequeler: update to 0.8.0. --- srcpkgs/sequeler/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/sequeler/template b/srcpkgs/sequeler/template index 428f4d86284..fbb01b9bbbb 100644 --- a/srcpkgs/sequeler/template +++ b/srcpkgs/sequeler/template @@ -1,6 +1,6 @@ # Template file for 'sequeler' pkgname=sequeler -version=0.7.91 +version=0.8.0 revision=1 build_style=meson hostmakedepends="gettext pkg-config glib-devel vala" @@ -11,4 +11,4 @@ maintainer="Daniel Lewan " license="GPL-3.0-or-later" homepage="https://github.com/Alecaddd/sequeler" distfiles="https://github.com/Alecaddd/sequeler/archive/v${version}.tar.gz" -checksum=0214b1767488d0290c5c1d673cd604ba6ecdaa011e4871b02171c63e1c25bf48 +checksum=471fdf63fda568d4caddf6182897518e4b7abc1b4f5dfb466bd1dfc86d380f0c From e07a8aceb225cb910285a3a1947e656cd479c76b Mon Sep 17 00:00:00 2001 From: amak Date: Sun, 28 Jun 2020 16:10:06 +1000 Subject: [PATCH 022/410] libnpupnp: update to 4.0.7 --- srcpkgs/libnpupnp/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libnpupnp/template b/srcpkgs/libnpupnp/template index ab3e7380995..92b4e78aae0 100644 --- a/srcpkgs/libnpupnp/template +++ b/srcpkgs/libnpupnp/template @@ -1,6 +1,6 @@ # Template file for 'libnpupnp' pkgname=libnpupnp -version=4.0.6 +version=4.0.7 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" @@ -10,7 +10,7 @@ maintainer="amak " license="BSD-3-Clause" homepage="https://www.lesbonscomptes.com/upmpdcli/libnpupnp.html" distfiles="https://www.lesbonscomptes.com/upmpdcli/downloads/libnpupnp-${version}.tar.gz" -checksum=650a3868ef1ad0b8c994ad886a77cf3ccf196bc44b08454b518f58f97b3a0afc +checksum=30f15caa67dc83f76b0976438165aa4704a50c7e3e5444c50bb8cbad874877ca post_install() { vlicense COPYING From 808b6111ca7d574cce8ddc53731fc0a34fd93bf0 Mon Sep 17 00:00:00 2001 From: amak Date: Sun, 28 Jun 2020 16:26:04 +1000 Subject: [PATCH 023/410] libupnpp: update to 0.19.2 --- srcpkgs/libupnpp/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libupnpp/template b/srcpkgs/libupnpp/template index 34e8ffc5080..2bb4c760dd3 100644 --- a/srcpkgs/libupnpp/template +++ b/srcpkgs/libupnpp/template @@ -1,6 +1,6 @@ # Template file for 'libupnpp' pkgname=libupnpp -version=0.19.1 +version=0.19.2 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" @@ -10,7 +10,7 @@ maintainer="amak " license="LGPL-2.1-or-later" homepage="https://www.lesbonscomptes.com/upmpdcli" distfiles="https://www.lesbonscomptes.com/upmpdcli/downloads/libupnpp-${version}.tar.gz" -checksum=412b38bdd07441588c11bb1d64af7d112f439a46512d53c907f9b54a6666ff58 +checksum=c9623533271605c92dfa603f5fe0ab6d3d5b4384a0c9173800784f4aa643a190 libupnpp-devel_package() { depends="${sourcepkg}>=${version}_${revision}" From bcf316aaebf1476ca0bff4fc1ec7fb49af8be045 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Tue, 30 Jun 2020 12:55:04 -0500 Subject: [PATCH 024/410] smem: verified with python3 --- srcpkgs/smem/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/smem/template b/srcpkgs/smem/template index 4deaca61567..64bb714d9c5 100644 --- a/srcpkgs/smem/template +++ b/srcpkgs/smem/template @@ -1,15 +1,15 @@ # Template file for 'smem' pkgname=smem version=1.5 -revision=1 -depends="python" +revision=2 +depends="python3" short_desc="Memory reporting tool" maintainer="Alexander Egorenkov " license="GPL-2.0-or-later" homepage="https://www.selenic.com/smem" distfiles="https://selenic.com/repo/smem/archive/${version}.tar.bz2" checksum=950c39ee8b1e051866564b25c36a6113eae2617e597b8302324bb8ee57d82ba6 -python_version=2 #unverified +python_version=3 do_build() { $CC $CFLAGS $LDFLAGS -o smemcap smemcap.c From 9bd1de6cb01821b4455495e7dba8a2939503bc45 Mon Sep 17 00:00:00 2001 From: Neel Date: Wed, 3 Jun 2020 02:22:38 +0100 Subject: [PATCH 025/410] bottom: update to 0.4.3 --- srcpkgs/bottom/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/bottom/template b/srcpkgs/bottom/template index d2126e11a4e..5bca4c46827 100644 --- a/srcpkgs/bottom/template +++ b/srcpkgs/bottom/template @@ -1,17 +1,17 @@ # Template file for 'bottom' pkgname=bottom -version=0.2.2 -revision=2 +version=0.4.3 +revision=1 build_style=cargo short_desc="Yet another cross-platform graphical process/system monitor" maintainer="Neel Chotai " license="MIT" homepage="https://github.com/ClementTsang/bottom" distfiles="https://github.com/ClementTsang/bottom/archive/${version}.tar.gz" -checksum=6706f9173beac1fa624be93b6e0d0549f0adbb69e87970ca49fa3f0e5f53241d +checksum=8b8c4f03bf761932f89ef90296eebdfca4d94e70c36b25e1a9e43c33f2a36e17 case "$XBPS_TARGET_MACHINE" in - aarch64) broken="https://api.travis-ci.org/v3/job/655747606/log.txt";; + aarch64) broken="https://api.travis-ci.org/v3/job/694083880/log.txt";; esac post_install() { From 908e88bc920ac0a2f647361c9bb1ae65a4bd8ce6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Tue, 30 Jun 2020 20:31:39 +0200 Subject: [PATCH 026/410] cbang: update to 1.5.1 --- .../patches/0002-OpenSSL-version-check.patch | 40 ----- ...heck-OPENSSL_VERSION-in-compile-time.patch | 37 ---- ...bevent-use-compile-time-sizeof-check.patch | 114 ------------ ...06-Fixes-and-clean-up-of-sizeof-test.patch | 169 ------------------ srcpkgs/cbang/template | 6 +- 5 files changed, 3 insertions(+), 363 deletions(-) delete mode 100644 srcpkgs/cbang/patches/0002-OpenSSL-version-check.patch delete mode 100644 srcpkgs/cbang/patches/0004-config-openssl-check-OPENSSL_VERSION-in-compile-time.patch delete mode 100644 srcpkgs/cbang/patches/0005-libevent-use-compile-time-sizeof-check.patch delete mode 100644 srcpkgs/cbang/patches/0006-Fixes-and-clean-up-of-sizeof-test.patch diff --git a/srcpkgs/cbang/patches/0002-OpenSSL-version-check.patch b/srcpkgs/cbang/patches/0002-OpenSSL-version-check.patch deleted file mode 100644 index 9b3664fa0d6..00000000000 --- a/srcpkgs/cbang/patches/0002-OpenSSL-version-check.patch +++ /dev/null @@ -1,40 +0,0 @@ -From a25113c30d6ce2e04bb5bab517d109047947647b Mon Sep 17 00:00:00 2001 -From: Joseph Coffland -Date: Sun, 31 May 2020 15:04:16 -0700 -Subject: [PATCH 2/7] OpenSSL version check. - ---- - config/openssl/__init__.py | 17 ++++++++--------- - 1 file changed, 8 insertions(+), 9 deletions(-) - -diff --git config/openssl/__init__.py config/openssl/__init__.py -index 421271cd..3b66738d 100644 ---- config/openssl/__init__.py -+++ config/openssl/__init__.py -@@ -6,15 +6,14 @@ def check_version(context, version): - context.Message("Checking for openssl version >= %s..." % version) - - version = version.split('.') -- src = '#include \nint main() {\nreturn (' -- src += version[0] + '<= (OPENSSL_VERSION_NUMBER >> 28)' -- if 1 < len(version): -- src += ' && ' + version[1] + \ -- '<= ((OPENSSL_VERSION_NUMBER >> 20) & 0xf)' -- if 2 < len(version): -- src += ' && ' + version[2] + \ -- '<= ((OPENSSL_VERSION_NUMBER >> 12) & 0xf)' -- src += ') ? 0 : 1;}\n' -+ src = ''' -+ #include -+ int main() { -+ int v = (%s << 28) + (%s << 20) + (%s << 12); -+ return OPENSSL_VERSION_NUMBER < v; -+ } -+ ''' % (version[0], version[1] if 1 < len(version) else 0, -+ version[2] if 2 < len(version) else 0) - - ret = context.TryRun(src, '.cpp')[0] - --- -2.27.0.rc1.5.gae92ac8ae3 - diff --git a/srcpkgs/cbang/patches/0004-config-openssl-check-OPENSSL_VERSION-in-compile-time.patch b/srcpkgs/cbang/patches/0004-config-openssl-check-OPENSSL_VERSION-in-compile-time.patch deleted file mode 100644 index 226a8955a86..00000000000 --- a/srcpkgs/cbang/patches/0004-config-openssl-check-OPENSSL_VERSION-in-compile-time.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 0e24962ff868340636be7a67d7c7e03d2c4dcf15 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= - -Date: Sun, 17 May 2020 22:26:09 +0700 -Subject: [PATCH 4/7] config/openssl: check OPENSSL_VERSION in compile time - -All of required information are available at compile time, use compile -time check to support cross compiling. ---- - config/openssl/__init__.py | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git config/openssl/__init__.py config/openssl/__init__.py -index 3b66738d..8ab89d9f 100644 ---- config/openssl/__init__.py -+++ config/openssl/__init__.py -@@ -9,13 +9,14 @@ def check_version(context, version): - src = ''' - #include - int main() { -- int v = (%s << 28) + (%s << 20) + (%s << 12); -- return OPENSSL_VERSION_NUMBER < v; -+ int array[1 - 2 * (OPENSSL_VERSION_NUMBER < (%s << 28) + (%s << 20) + (%s << 12))]; -+ array[0] = 0; -+ return *array; - } - ''' % (version[0], version[1] if 1 < len(version) else 0, - version[2] if 2 < len(version) else 0) - -- ret = context.TryRun(src, '.cpp')[0] -+ ret = context.TryCompile(src, '.cpp') - - context.Result(ret) - return ret --- -2.27.0.rc1.5.gae92ac8ae3 - diff --git a/srcpkgs/cbang/patches/0005-libevent-use-compile-time-sizeof-check.patch b/srcpkgs/cbang/patches/0005-libevent-use-compile-time-sizeof-check.patch deleted file mode 100644 index 212ef9aa125..00000000000 --- a/srcpkgs/cbang/patches/0005-libevent-use-compile-time-sizeof-check.patch +++ /dev/null @@ -1,114 +0,0 @@ -From 062c1a54b295b4ff387ebdff84a6a957fccbefd4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= - -Date: Sun, 17 May 2020 22:44:25 +0700 -Subject: [PATCH 5/7] libevent: use compile time sizeof check - -Taken from https://github.com/scons/scons/wiki/AutoconfRecipes#ac_check_sizeof ---- - src/libevent/SConscript | 81 +++++++++++++++++++++++++++++++++++++---- - 1 file changed, 73 insertions(+), 8 deletions(-) - -diff --git src/libevent/SConscript src/libevent/SConscript -index 1197b8d3..ab1f72ad 100644 ---- src/libevent/SConscript -+++ src/libevent/SConscript -@@ -18,22 +18,87 @@ conf.AddTest('CheckSYS_TIMERFD_H', CheckSYS_TIMERFD_H) - - - # sizeof -+# https://github.com/scons/scons/wiki/AutoconfRecipes#ac_check_sizeof -+# Sensible default for common types on common platforms. -+_DEFAULTS_SIZEOF = { -+ 'short' : [2], -+ 'int' : [4, 2], -+ 'long' : [4, 8], -+ 'long long' : [8, 4], -+ 'unsigned short' : [2], -+ 'unsigned int' : [4, 2], -+ 'unsigned long' : [4, 8], -+ 'unsigned long long' : [8, 4], -+ 'float' : [4], -+ 'double' : [8], -+ 'long double' : [12], -+ 'size_t' : [4, 8], -+} -+ - def CheckSizeOf(ctx, type, includes = None): -+ """This check can be used to get the size of a given type, -+ or to check whether the type is of expected size. -+ -+ Arguments: -+ - type : str -+ the type to check -+ - includes : sequence -+ list of headers to include in the test code before testing the type -+ Returns: -+ status : int -+ 0 if the check failed, or the found size of the type -+ if the check succeeded.""" -+ minsz = 0 -+ maxsz = 16 -+ - src = ''' - #include - #include - #include -- int main() {printf("%d", (int)sizeof(''' + type + ''')); return 0;} -+ #include - ''' -+ if includes: -+ src += "\n".join("#include <%s>\n" % i for i in includes) - -- if includes is not None: -- for inc in includes: -- src = '#include <%s>\n%s' % (inc, src) -+ ext = '.c' -+ # test code taken from autoconf: this is a pretty clever hack to find that -+ # a type is of a given size using only compilation. This speeds things up -+ # quite a bit compared to straightforward code using TryRun -+ src += r""" -+typedef %s scons_check_type; - -- ctx.Message('Checking size of ' + type + '... ') -- ret = ctx.TryRun(src + '\n', '.c') -- ctx.Result(ret[0]) -- return ret[1] -+int main() -+{ -+ static int test_array[1 - 2 * ((long int) sizeof(scons_check_type) > %d)]; -+ test_array[0] = 0; -+ -+ return 0; -+} -+""" -+ -+ # Only check if the given size is the right one -+ ctx.Message('Checking size of %s ... ' % type) -+ -+ # Try sensible defaults first -+ try: -+ szrange = _DEFAULTS_SIZEOF[type] -+ except KeyError: -+ szrange = [] -+ szrange.extend(range(minsz, maxsz)) -+ st = 0 -+ -+ # Actual test -+ for sz in szrange: -+ st = ctx.TryCompile(src % (type, sz), ext) -+ if st: -+ break -+ -+ if st: -+ ctx.Result('%d' % sz) -+ return sz -+ else: -+ ctx.Result('Failed !') -+ return 0 - - conf.AddTest('CheckSizeOf', CheckSizeOf) - --- -2.27.0.rc1.5.gae92ac8ae3 - diff --git a/srcpkgs/cbang/patches/0006-Fixes-and-clean-up-of-sizeof-test.patch b/srcpkgs/cbang/patches/0006-Fixes-and-clean-up-of-sizeof-test.patch deleted file mode 100644 index 692db9976b4..00000000000 --- a/srcpkgs/cbang/patches/0006-Fixes-and-clean-up-of-sizeof-test.patch +++ /dev/null @@ -1,169 +0,0 @@ -From d9b5bf87e724bfbbad78fe254e902048f8d7e534 Mon Sep 17 00:00:00 2001 -From: Joseph Coffland -Date: Mon, 1 Jun 2020 14:55:52 -0700 -Subject: [PATCH 6/7] Fixes and clean up of sizeof test - ---- - src/libevent/SConscript | 115 ++++++++++------------------------------ - 1 file changed, 28 insertions(+), 87 deletions(-) - -diff --git src/libevent/SConscript src/libevent/SConscript -index ab1f72ad..db9884a6 100644 ---- src/libevent/SConscript -+++ src/libevent/SConscript -@@ -17,88 +17,25 @@ def CheckSYS_TIMERFD_H(ctx): - conf.AddTest('CheckSYS_TIMERFD_H', CheckSYS_TIMERFD_H) - - --# sizeof --# https://github.com/scons/scons/wiki/AutoconfRecipes#ac_check_sizeof --# Sensible default for common types on common platforms. --_DEFAULTS_SIZEOF = { -- 'short' : [2], -- 'int' : [4, 2], -- 'long' : [4, 8], -- 'long long' : [8, 4], -- 'unsigned short' : [2], -- 'unsigned int' : [4, 2], -- 'unsigned long' : [4, 8], -- 'unsigned long long' : [8, 4], -- 'float' : [4], -- 'double' : [8], -- 'long double' : [12], -- 'size_t' : [4, 8], --} -- --def CheckSizeOf(ctx, type, includes = None): -- """This check can be used to get the size of a given type, -- or to check whether the type is of expected size. -- -- Arguments: -- - type : str -- the type to check -- - includes : sequence -- list of headers to include in the test code before testing the type -- Returns: -- status : int -- 0 if the check failed, or the found size of the type -- if the check succeeded.""" -- minsz = 0 -- maxsz = 16 -- -+def CheckSizeOf(ctx, type, defaults, includes = None): - src = ''' -- #include -- #include -- #include -- #include -+ int main() { -+ int a[1 - 2 * (sizeof(%s) != %d)]; -+ return a[0] = 0; -+ } - ''' -- if includes: -- src += "\n".join("#include <%s>\n" % i for i in includes) -- -- ext = '.c' -- # test code taken from autoconf: this is a pretty clever hack to find that -- # a type is of a given size using only compilation. This speeds things up -- # quite a bit compared to straightforward code using TryRun -- src += r""" --typedef %s scons_check_type; -- --int main() --{ -- static int test_array[1 - 2 * ((long int) sizeof(scons_check_type) > %d)]; -- test_array[0] = 0; - -- return 0; --} --""" -+ if includes: -+ src = '\n'.join('#include <%s>' % i for i in includes) + '\n' + src - -- # Only check if the given size is the right one - ctx.Message('Checking size of %s ... ' % type) - -- # Try sensible defaults first -- try: -- szrange = _DEFAULTS_SIZEOF[type] -- except KeyError: -- szrange = [] -- szrange.extend(range(minsz, maxsz)) -- st = 0 -- -- # Actual test -- for sz in szrange: -- st = ctx.TryCompile(src % (type, sz), ext) -- if st: -- break -- -- if st: -- ctx.Result('%d' % sz) -- return sz -- else: -- ctx.Result('Failed !') -- return 0 -+ for sz in defaults + range(1, 16): -+ if ctx.TryCompile(src % (type, sz), '.c'): -+ ctx.Result(str(sz)) -+ return sz -+ -+ raise Exception('Failed to get the sizeof of ' + type) - - conf.AddTest('CheckSizeOf', CheckSizeOf) - -@@ -209,7 +146,17 @@ headers = '''arpa/inet.h fcntl.h ifaddrs.h inttypes.h mach/mach_time.h - ''' - decls = '''CTL_KERN KERN_ARND KERN_RANDOM RANDOM_UUID''' - structs = 'addrinfo in6_addr sockaddr_in6 sockaddr_storage' --sizeof = ['int', 'long', 'long long', 'off_t', 'short', 'size_t', 'void *'] -+ -+sizeof = [ -+ ('short', [2], None), -+ ('int', [4, 2], None), -+ ('long', [8, 4], None), -+ ('long long', [8, 4], None), -+ ('void *', [8, 4], None), -+ ('size_t', [8, 4], ['sys/types.h']), -+ ('off_t', [8, 4], ['sys/types.h']), -+ ('pthread_t', [8, 4], ['pthread.h']), -+] - - gethostbyname_r_3_arg_src = ''' - #ifndef __cplusplus -@@ -284,13 +231,9 @@ def get_event_config_defs(): - - - # Sizes -- for type in sizeof: -- size = conf.CheckSizeOf(type) -- if size: -- defs['SIZEOF_' + to_def(type)] = size -- -- size = conf.CheckSizeOf('pthread_t', ['pthread.h']) -- if size: defs['SIZEOF_PTHREAD_T'] = size -+ for type, defaults, includes in sizeof: -+ size = conf.CheckSizeOf(type, defaults, includes) -+ defs['SIZEOF_' + to_def(type)] = size - - - # Decls -@@ -380,13 +323,11 @@ def build_function(target, source, env): - - f = open(target, 'w') - -- f.write('#ifndef EVENT2_EVENT_CONFIG_H_INCLUDED_\n') -- f.write('#define EVENT2_EVENT_CONFIG_H_INCLUDED_\n') -+ f.write('#pragma once\n') - - for name, value in sorted(defs.items()): - f.write('#define EVENT__%s %s\n' % (name, value)) - -- f.write('#endif /* EVENT2_EVENT_CONFIG_H_INCLUDED_ */\n') - f.close() - - --- -2.27.0.rc1.5.gae92ac8ae3 - diff --git a/srcpkgs/cbang/template b/srcpkgs/cbang/template index 3f9305d18fe..a90fcf23fcf 100644 --- a/srcpkgs/cbang/template +++ b/srcpkgs/cbang/template @@ -1,7 +1,7 @@ # Template file for 'cbang' pkgname=cbang -version=1.5.0 -revision=3 +version=1.5.1 +revision=1 build_style=scons make_build_args="sharedlib=1 staticlib=1" make_install_args="${make_build_args}" @@ -13,7 +13,7 @@ maintainer="Jürgen Buchmüller " license="LGPL-2.1-only" homepage="https://github.com/CauldronDevelopmentLLC/cbang" distfiles="https://github.com/CauldronDevelopmentLLC/cbang/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=6469c9fba9c47b5731a15294550575a4b71851d2eb52df0f20cfb0f03ed943f5 +checksum=cff5e9e9280512c49439643465dec9e84f84debaa02fe2473e51b37f6fa50846 pre_build() { make_build_args+=" prefix=$DESTDIR/usr" From 64870e18cff59da76fb6c3aba8172eddfa1e81ce Mon Sep 17 00:00:00 2001 From: toluschr Date: Sat, 27 Jun 2020 20:47:37 +0200 Subject: [PATCH 027/410] New package: quiterss-0.19.4 --- srcpkgs/quiterss/template | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 srcpkgs/quiterss/template diff --git a/srcpkgs/quiterss/template b/srcpkgs/quiterss/template new file mode 100644 index 00000000000..1072961760f --- /dev/null +++ b/srcpkgs/quiterss/template @@ -0,0 +1,13 @@ +# Template file for 'quiterss' +pkgname=quiterss +version=0.19.4 +revision=1 +build_style=qmake +hostmakedepends="pkg-config qt5-qmake qt5-webkit-devel qt5-multimedia-devel" +makedepends="sqlite-devel qt5-webkit-devel qt5-multimedia-devel" +short_desc="Open-source cross-platform RSS/Atom news feeds reader" +maintainer="toluschr " +license="GPL-3.0-or-later" +homepage="https://quiterss.org/" +distfiles="https://github.com/QuiteRSS/${pkgname}/archive/${version}.tar.gz" +checksum=d9dffa205a8ec4e7bf00d87183fd94d4a12f045fae04a6efd41d6557827233bc From 8f6cbbfb1e7f5190358c3fb46c666d178962ac49 Mon Sep 17 00:00:00 2001 From: Alexander Egorenkov Date: Tue, 30 Jun 2020 20:43:33 +0200 Subject: [PATCH 028/410] plantuml: update to 1.2020.15 --- srcpkgs/plantuml/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plantuml/template b/srcpkgs/plantuml/template index 099e7a8becd..a28ec87cf43 100644 --- a/srcpkgs/plantuml/template +++ b/srcpkgs/plantuml/template @@ -1,7 +1,7 @@ # Template file for 'plantuml' pkgname=plantuml reverts="8047_1 8053_1 8059_1" -version=1.2020.14 +version=1.2020.15 revision=1 archs=noarch create_wrksrc=yes @@ -12,7 +12,7 @@ maintainer="Julien Dehos " license="GPL-2.0-or-later" homepage="http://plantuml.com/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-jar-gplv2-${version}.zip" -checksum=e4f66f229dea07c5830cc7b3b1363f32bcfef420706a35c253cc2cc6a57c442d +checksum=d6138fa270a21266e92d82fb3120923af5f3da0087649de34994ebddca01da79 do_build() { mv ${pkgname}.jar ${pkgname}-${version}.jar From 121595f497d0e6a60142829b33129728b80e8816 Mon Sep 17 00:00:00 2001 From: Joseph Benden Date: Tue, 30 Jun 2020 09:31:40 -0700 Subject: [PATCH 029/410] protonmail-bridge: update to 1.2.8. Signed-off-by: Joseph Benden --- srcpkgs/protonmail-bridge/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/protonmail-bridge/template b/srcpkgs/protonmail-bridge/template index 25a14459c83..38e7a539202 100644 --- a/srcpkgs/protonmail-bridge/template +++ b/srcpkgs/protonmail-bridge/template @@ -1,6 +1,6 @@ # Template file for 'protonmail-bridge' pkgname=protonmail-bridge -version=1.2.7 +version=1.2.8 revision=1 archs="x86_64" build_style=fetch @@ -10,7 +10,7 @@ maintainer="Rich G " license="custom:Commercial" homepage="https://protonmail.com/bridge" distfiles="https://protonmail.com/download/beta/protonmail-bridge_${version}-1_amd64.deb" -checksum=b61c7aa1f616e671c8c01697886f47ffb9ffead3d09203d2f09ec7a635af6cb1 +checksum=4ab1254088f4a56512f3e20adcf8d19bb8aaf659dddf8d50590f7fe02bc69adc restricted=yes noverifyrdeps=yes From 57af8fba2e503b25873934a143a388d12f6e2152 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Mon, 29 Jun 2020 23:06:43 +0200 Subject: [PATCH 030/410] apg: remove empty package --- srcpkgs/apg/INSTALL.msg | 1 - srcpkgs/apg/template | 9 --------- 2 files changed, 10 deletions(-) delete mode 100644 srcpkgs/apg/INSTALL.msg delete mode 100644 srcpkgs/apg/template diff --git a/srcpkgs/apg/INSTALL.msg b/srcpkgs/apg/INSTALL.msg deleted file mode 100644 index 396e1f2636e..00000000000 --- a/srcpkgs/apg/INSTALL.msg +++ /dev/null @@ -1 +0,0 @@ -apg is no longer provided by Void Linux, and will be fully removed from the repos on 2019/05/25 diff --git a/srcpkgs/apg/template b/srcpkgs/apg/template deleted file mode 100644 index 73d5fed6437..00000000000 --- a/srcpkgs/apg/template +++ /dev/null @@ -1,9 +0,0 @@ -# Template file for 'apg' -pkgname=apg -version=2.2.3 -revision=5 -archs=noarch -build_style=meta -short_desc="Automated Password Generator (removed package)" -license="metapackage" -homepage="http://web.archive.org/web/20140714024048/http://www.adel.nursat.kz/apg/" From b13b451044c913adf33351036c11d0b84571d9e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Mon, 29 Jun 2020 23:06:57 +0200 Subject: [PATCH 031/410] arptables: remove empty package --- srcpkgs/arptables/INSTALL.msg | 1 - srcpkgs/arptables/template | 10 ---------- srcpkgs/arptables/update | 1 - 3 files changed, 12 deletions(-) delete mode 100644 srcpkgs/arptables/INSTALL.msg delete mode 100644 srcpkgs/arptables/template delete mode 100644 srcpkgs/arptables/update diff --git a/srcpkgs/arptables/INSTALL.msg b/srcpkgs/arptables/INSTALL.msg deleted file mode 100644 index c209534e908..00000000000 --- a/srcpkgs/arptables/INSTALL.msg +++ /dev/null @@ -1 +0,0 @@ -arptables is no longer provided by Void Linux, and will be fully removed from the repos on 2019-06-26 diff --git a/srcpkgs/arptables/template b/srcpkgs/arptables/template deleted file mode 100644 index e01a175f92a..00000000000 --- a/srcpkgs/arptables/template +++ /dev/null @@ -1,10 +0,0 @@ -# Template file for 'arptables' -pkgname=arptables -version=0.0.4 -revision=3 -archs=noarch -build_style=meta -depends="iptables" -short_desc="ARP table administration (removed package)" -license="metapackage" -homepage="http://ebtables.sourceforge.net/" diff --git a/srcpkgs/arptables/update b/srcpkgs/arptables/update deleted file mode 100644 index 5dd4ff91b57..00000000000 --- a/srcpkgs/arptables/update +++ /dev/null @@ -1 +0,0 @@ -pattern="${pkgname}-v\\K[\\d.]+(?=\\.tar)" From 405b4c1f6b3cf3c767204e1dab894f727bd389ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Mon, 29 Jun 2020 23:08:35 +0200 Subject: [PATCH 032/410] python-audit: remove empty package --- srcpkgs/audit/INSTALL.msg | 1 - srcpkgs/audit/template | 6 ------ srcpkgs/python-audit | 1 - 3 files changed, 8 deletions(-) delete mode 100644 srcpkgs/audit/INSTALL.msg delete mode 120000 srcpkgs/python-audit diff --git a/srcpkgs/audit/INSTALL.msg b/srcpkgs/audit/INSTALL.msg deleted file mode 100644 index 5fdbc9ab9d4..00000000000 --- a/srcpkgs/audit/INSTALL.msg +++ /dev/null @@ -1 +0,0 @@ -python-audit is no longer provided by Void Linux, and will be fully removed from the repos on 2019-06-19. diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template index f7c2957a3d0..4d8d2fbe12a 100644 --- a/srcpkgs/audit/template +++ b/srcpkgs/audit/template @@ -83,12 +83,6 @@ libauparse-devel_package() { } } -python-audit_package() { - archs=noarch - build_style=meta - short_desc+=" - Python2 bindings (removed package)" -} - python3-audit_package() { lib32disabled=yes short_desc+=" - Python3 bindings" diff --git a/srcpkgs/python-audit b/srcpkgs/python-audit deleted file mode 120000 index ba33219b36f..00000000000 --- a/srcpkgs/python-audit +++ /dev/null @@ -1 +0,0 @@ -audit \ No newline at end of file From 05a4b998f0c0639ee8f6e76cbce16af920bcb06a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Mon, 29 Jun 2020 23:12:20 +0200 Subject: [PATCH 033/410] bokken: remove empty package --- srcpkgs/bokken/INSTALL.msg | 1 - srcpkgs/bokken/template | 9 --------- 2 files changed, 10 deletions(-) delete mode 100644 srcpkgs/bokken/INSTALL.msg delete mode 100644 srcpkgs/bokken/template diff --git a/srcpkgs/bokken/INSTALL.msg b/srcpkgs/bokken/INSTALL.msg deleted file mode 100644 index 0391df04b3b..00000000000 --- a/srcpkgs/bokken/INSTALL.msg +++ /dev/null @@ -1 +0,0 @@ -bokken is no longer provided by Void Linux, and will be fully removed from the repos on 2019-07-12 diff --git a/srcpkgs/bokken/template b/srcpkgs/bokken/template deleted file mode 100644 index b23194583ae..00000000000 --- a/srcpkgs/bokken/template +++ /dev/null @@ -1,9 +0,0 @@ -# Template file for 'bokken' -pkgname=bokken -version=1.8 -revision=3 -archs=noarch -build_style=meta -short_desc="GUI for the Pyew malware analysis tool and Radare (removed package)" -license="BSD-2-Clause" -homepage="https://bitbucket.org/inguma/bokken" From fd7001d19afce7f6c6dd7cf05cd797521ced7e35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Mon, 29 Jun 2020 23:12:48 +0200 Subject: [PATCH 034/410] ctpp2: remove empty package --- srcpkgs/ctpp2-devel | 1 - srcpkgs/ctpp2/INSTALL.msg | 1 - srcpkgs/ctpp2/template | 15 --------------- 3 files changed, 17 deletions(-) delete mode 120000 srcpkgs/ctpp2-devel delete mode 100644 srcpkgs/ctpp2/INSTALL.msg delete mode 100644 srcpkgs/ctpp2/template diff --git a/srcpkgs/ctpp2-devel b/srcpkgs/ctpp2-devel deleted file mode 120000 index 3887915c7e4..00000000000 --- a/srcpkgs/ctpp2-devel +++ /dev/null @@ -1 +0,0 @@ -ctpp2 \ No newline at end of file diff --git a/srcpkgs/ctpp2/INSTALL.msg b/srcpkgs/ctpp2/INSTALL.msg deleted file mode 100644 index d77e60b875c..00000000000 --- a/srcpkgs/ctpp2/INSTALL.msg +++ /dev/null @@ -1 +0,0 @@ -ctpp2 is no longer provided by Void Linux, and will be fully removed from the repos on 2019/05/15 diff --git a/srcpkgs/ctpp2/template b/srcpkgs/ctpp2/template deleted file mode 100644 index 82399af70b4..00000000000 --- a/srcpkgs/ctpp2/template +++ /dev/null @@ -1,15 +0,0 @@ -# Template file for 'ctpp2' -pkgname=ctpp2 -version=2.8.3 -revision=7 -build_style=meta -short_desc="HTML template engine for c++ - (removed package)" -maintainer="John " -license="metapackage" -homepage="http://ctpp.havoc.ru" - - -ctpp2-devel_package() { - short_desc+=" - development package - (removed package)" - build_style=meta -} From 7937f35dba8dfbdfb6e27456722a7d3ed30ab451 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Mon, 29 Jun 2020 23:13:48 +0200 Subject: [PATCH 035/410] dleyna-core: remove empty package --- srcpkgs/dleyna-core/INSTALL.msg | 1 - srcpkgs/dleyna-core/template | 9 --------- 2 files changed, 10 deletions(-) delete mode 100644 srcpkgs/dleyna-core/INSTALL.msg delete mode 100644 srcpkgs/dleyna-core/template diff --git a/srcpkgs/dleyna-core/INSTALL.msg b/srcpkgs/dleyna-core/INSTALL.msg deleted file mode 100644 index cf316bb24d3..00000000000 --- a/srcpkgs/dleyna-core/INSTALL.msg +++ /dev/null @@ -1 +0,0 @@ -dleyna-core is no longer provided by Void Linux, and will be fully removed from the repos on 2019/06/14 diff --git a/srcpkgs/dleyna-core/template b/srcpkgs/dleyna-core/template deleted file mode 100644 index c4be86e9bdc..00000000000 --- a/srcpkgs/dleyna-core/template +++ /dev/null @@ -1,9 +0,0 @@ -# Template file for 'dleyna-core' -pkgname=dleyna-core -version=0.6.0 -revision=2 -archs=noarch -build_style=meta -short_desc="Library of utility functions for higher-level dleyna libraries (removed package)" -license="metapackage" -homepage="https://01.org/dleyna/" From 791a333bb6141314a7c269d0fb3a8c033643be9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Mon, 29 Jun 2020 23:14:02 +0200 Subject: [PATCH 036/410] dleyna-renderer: remove empty package --- srcpkgs/dleyna-renderer/INSTALL.msg | 1 - srcpkgs/dleyna-renderer/template | 9 --------- 2 files changed, 10 deletions(-) delete mode 100644 srcpkgs/dleyna-renderer/INSTALL.msg delete mode 100644 srcpkgs/dleyna-renderer/template diff --git a/srcpkgs/dleyna-renderer/INSTALL.msg b/srcpkgs/dleyna-renderer/INSTALL.msg deleted file mode 100644 index a42bd47a4d3..00000000000 --- a/srcpkgs/dleyna-renderer/INSTALL.msg +++ /dev/null @@ -1 +0,0 @@ -dleyna-renderer is no longer provided by Void Linux, and will be fully removed from the repos on 2019/06/14 diff --git a/srcpkgs/dleyna-renderer/template b/srcpkgs/dleyna-renderer/template deleted file mode 100644 index 84d2571bb91..00000000000 --- a/srcpkgs/dleyna-renderer/template +++ /dev/null @@ -1,9 +0,0 @@ -# Template file for 'dleyna-renderer' -pkgname=dleyna-renderer -version=0.6.0 -revision=2 -archs=noarch -build_style=meta -short_desc="Library for implementing services to manipulate Digital Media Renderers (removed package)" -license="metapackage" -homepage="https://01.org/dleyna/" From 15c9654c21e1c2d9a16b1e4cd893432ac79da8d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Mon, 29 Jun 2020 23:14:12 +0200 Subject: [PATCH 037/410] dleyna-server: remove empty package --- srcpkgs/dleyna-server/INSTALL.msg | 1 - srcpkgs/dleyna-server/template | 9 --------- 2 files changed, 10 deletions(-) delete mode 100644 srcpkgs/dleyna-server/INSTALL.msg delete mode 100644 srcpkgs/dleyna-server/template diff --git a/srcpkgs/dleyna-server/INSTALL.msg b/srcpkgs/dleyna-server/INSTALL.msg deleted file mode 100644 index c7e4e12213b..00000000000 --- a/srcpkgs/dleyna-server/INSTALL.msg +++ /dev/null @@ -1 +0,0 @@ -dleyna-server is no longer provided by Void Linux, and will be fully removed from the repos on 2019/06/14 diff --git a/srcpkgs/dleyna-server/template b/srcpkgs/dleyna-server/template deleted file mode 100644 index 0dad60298e8..00000000000 --- a/srcpkgs/dleyna-server/template +++ /dev/null @@ -1,9 +0,0 @@ -# Template file for 'dleyna-server' -pkgname=dleyna-server -version=0.6.0 -revision=2 -archs=noarch -build_style=meta -short_desc="Library for implementing services to manipulate Digital Media Servers (removed package)" -license="metapackage" -homepage="https://01.org/dleyna/" From 20a637b9ac61deff84c22396cdbe4b9a2485ad4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Mon, 29 Jun 2020 23:14:26 +0200 Subject: [PATCH 038/410] ebtables: remove empty package --- srcpkgs/ebtables/INSTALL.msg | 1 - srcpkgs/ebtables/template | 10 ---------- srcpkgs/ebtables/update | 1 - 3 files changed, 12 deletions(-) delete mode 100644 srcpkgs/ebtables/INSTALL.msg delete mode 100644 srcpkgs/ebtables/template delete mode 100644 srcpkgs/ebtables/update diff --git a/srcpkgs/ebtables/INSTALL.msg b/srcpkgs/ebtables/INSTALL.msg deleted file mode 100644 index 869ddb81c9d..00000000000 --- a/srcpkgs/ebtables/INSTALL.msg +++ /dev/null @@ -1 +0,0 @@ -ebtables is no longer provided by Void Linux, and will be fully removed from the repos on 2019-06-26 diff --git a/srcpkgs/ebtables/template b/srcpkgs/ebtables/template deleted file mode 100644 index 69aa9ca5b4b..00000000000 --- a/srcpkgs/ebtables/template +++ /dev/null @@ -1,10 +0,0 @@ -# Template file for 'ebtables' -pkgname=ebtables -version=2.0.10.4 -revision=8 -archs=noarch -build_style=meta -depends="iptables" -short_desc="Filtering tool for a Linux-based bridging firewall (removed package)" -license="metapackage" -homepage="http://ebtables.netfilter.org/" diff --git a/srcpkgs/ebtables/update b/srcpkgs/ebtables/update deleted file mode 100644 index 42cf95555d8..00000000000 --- a/srcpkgs/ebtables/update +++ /dev/null @@ -1 +0,0 @@ -pattern="$pkgname-\K.+?(?=\.tar)" From f81cce0ff821aa14ab69e6027ee5d1d5d7f63f25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Mon, 29 Jun 2020 23:14:42 +0200 Subject: [PATCH 039/410] eclipse-ecj: remove empty package --- srcpkgs/eclipse-ecj/INSTALL.msg | 1 - srcpkgs/eclipse-ecj/template | 10 ---------- 2 files changed, 11 deletions(-) delete mode 100644 srcpkgs/eclipse-ecj/INSTALL.msg delete mode 100644 srcpkgs/eclipse-ecj/template diff --git a/srcpkgs/eclipse-ecj/INSTALL.msg b/srcpkgs/eclipse-ecj/INSTALL.msg deleted file mode 100644 index 116011607e7..00000000000 --- a/srcpkgs/eclipse-ecj/INSTALL.msg +++ /dev/null @@ -1 +0,0 @@ -eclipse-ecj is no longer provided by Void Linux, and will be fully removed from the repos on 2020-02-17 diff --git a/srcpkgs/eclipse-ecj/template b/srcpkgs/eclipse-ecj/template deleted file mode 100644 index 8e1e52d93ec..00000000000 --- a/srcpkgs/eclipse-ecj/template +++ /dev/null @@ -1,10 +0,0 @@ -# Template file for 'eclipse-ecj' -pkgname=eclipse-ecj -version=4.9 -revision=3 -archs=noarch -build_style=meta -short_desc="Fork of the Eclipse Java bytecode compiler for GCJ (removed package)" -maintainer="Orphaned " -license="EPL" -homepage="http://gcc.gnu.org/java/" From be965721fd74358c1bf86cc2544d0d891261601f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Mon, 29 Jun 2020 23:14:58 +0200 Subject: [PATCH 040/410] enventor: remove empty package --- srcpkgs/enventor/INSTALL.msg | 1 - srcpkgs/enventor/template | 9 --------- 2 files changed, 10 deletions(-) delete mode 100644 srcpkgs/enventor/INSTALL.msg delete mode 100644 srcpkgs/enventor/template diff --git a/srcpkgs/enventor/INSTALL.msg b/srcpkgs/enventor/INSTALL.msg deleted file mode 100644 index d9b35ade77f..00000000000 --- a/srcpkgs/enventor/INSTALL.msg +++ /dev/null @@ -1 +0,0 @@ -enventor is no longer provided by Void Linux, and will be fully removed from the repos on 2019-07-12 diff --git a/srcpkgs/enventor/template b/srcpkgs/enventor/template deleted file mode 100644 index 9a632c0c340..00000000000 --- a/srcpkgs/enventor/template +++ /dev/null @@ -1,9 +0,0 @@ -# Template file for 'enventor' -pkgname=enventor -version=1.0.0 -revision=2 -archs=noarch -build_style=meta -short_desc="Enlightenment's EDC editor with some convenient functions (removed package)" -license="BSD-2-Clause" -homepage="http://enlightenment.org" From 69d644c509e9c538ef43e88024fc4bb2945dba12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Mon, 29 Jun 2020 23:15:15 +0200 Subject: [PATCH 041/410] epstopdf: remove empty package --- srcpkgs/epstopdf/INSTALL.msg | 1 - srcpkgs/epstopdf/template | 9 --------- 2 files changed, 10 deletions(-) delete mode 100644 srcpkgs/epstopdf/INSTALL.msg delete mode 100644 srcpkgs/epstopdf/template diff --git a/srcpkgs/epstopdf/INSTALL.msg b/srcpkgs/epstopdf/INSTALL.msg deleted file mode 100644 index d275b104e83..00000000000 --- a/srcpkgs/epstopdf/INSTALL.msg +++ /dev/null @@ -1 +0,0 @@ -epstopdf is no longer provided by Void Linux, and will be fully removed from the repos on 2019-07-12 diff --git a/srcpkgs/epstopdf/template b/srcpkgs/epstopdf/template deleted file mode 100644 index 72a8d61b06c..00000000000 --- a/srcpkgs/epstopdf/template +++ /dev/null @@ -1,9 +0,0 @@ -# Template file for 'epstopdf' -pkgname=epstopdf -version=2.27 -revision=3 -archs=noarch -build_style=meta -short_desc="Convert EPS to PDF using Ghostscript (removed package)" -license="BSD-2-Clause" -homepage="https://tug.org/epstopdf/" From 0c60c21fc46a7895c4c257d937460cad0e533624 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Mon, 29 Jun 2020 23:15:49 +0200 Subject: [PATCH 042/410] go1.4-bootstrap: remove empty package --- srcpkgs/go1.4-bootstrap/INSTALL.msg | 1 - srcpkgs/go1.4-bootstrap/template | 10 ---------- 2 files changed, 11 deletions(-) delete mode 100644 srcpkgs/go1.4-bootstrap/INSTALL.msg delete mode 100644 srcpkgs/go1.4-bootstrap/template diff --git a/srcpkgs/go1.4-bootstrap/INSTALL.msg b/srcpkgs/go1.4-bootstrap/INSTALL.msg deleted file mode 100644 index 08a1818a6af..00000000000 --- a/srcpkgs/go1.4-bootstrap/INSTALL.msg +++ /dev/null @@ -1 +0,0 @@ -go1.4-bootstrap is no longer provided by Void Linux, and will be fully removed from the repos on 2020-02-17 diff --git a/srcpkgs/go1.4-bootstrap/template b/srcpkgs/go1.4-bootstrap/template deleted file mode 100644 index 2804d28e012..00000000000 --- a/srcpkgs/go1.4-bootstrap/template +++ /dev/null @@ -1,10 +0,0 @@ -# Template file for 'go1.4-bootstrap' -pkgname=go1.4-bootstrap -version=20171003 -revision=2 -archs=noarch -build_style=meta -short_desc="Go 1.4 (bootstrap compiler) (removed package)" -maintainer="Michael Aldridge " -license="BSD-3-Clause" -homepage="https://golang.org" From d09fbbe9d7599f77019326ae749297b899daf302 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Mon, 29 Jun 2020 23:16:16 +0200 Subject: [PATCH 043/410] grv: remove empty package --- srcpkgs/grv/INSTALL.msg | 1 - srcpkgs/grv/template | 9 --------- 2 files changed, 10 deletions(-) delete mode 100644 srcpkgs/grv/INSTALL.msg delete mode 100644 srcpkgs/grv/template diff --git a/srcpkgs/grv/INSTALL.msg b/srcpkgs/grv/INSTALL.msg deleted file mode 100644 index d884cea443e..00000000000 --- a/srcpkgs/grv/INSTALL.msg +++ /dev/null @@ -1 +0,0 @@ -grv is no longer provided by Void Linux, and will be fully removed from the repos on 2019/06/04 diff --git a/srcpkgs/grv/template b/srcpkgs/grv/template deleted file mode 100644 index 4d264aa890a..00000000000 --- a/srcpkgs/grv/template +++ /dev/null @@ -1,9 +0,0 @@ -# Template file for 'grv' -pkgname=grv -version=0.3.1 -revision=3 -archs=noarch -build_style=meta -short_desc="Terminal based interface for viewing git repositories (removed package)" -license="metapackage" -homepage="https://github.com/rgburke/grv" From a1d416fb02ac9c65095584ef4fd3771c5046b457 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Mon, 29 Jun 2020 23:16:25 +0200 Subject: [PATCH 044/410] httperf: remove empty package --- srcpkgs/httperf/INSTALL.msg | 1 - srcpkgs/httperf/template | 9 --------- 2 files changed, 10 deletions(-) delete mode 100644 srcpkgs/httperf/INSTALL.msg delete mode 100644 srcpkgs/httperf/template diff --git a/srcpkgs/httperf/INSTALL.msg b/srcpkgs/httperf/INSTALL.msg deleted file mode 100644 index 466fb1f080c..00000000000 --- a/srcpkgs/httperf/INSTALL.msg +++ /dev/null @@ -1 +0,0 @@ -httperf is no longer provided by Void Linux, and will be fully removed from the repos on 2019-07-12 diff --git a/srcpkgs/httperf/template b/srcpkgs/httperf/template deleted file mode 100644 index 71c3b85e233..00000000000 --- a/srcpkgs/httperf/template +++ /dev/null @@ -1,9 +0,0 @@ -# Template file for 'httperf' -pkgname=httperf -version=0.9.0 -revision=9 -archs=noarch -build_style=meta -short_desc="Tool for measuring web server performance (removed package)" -license="BSD-2-Clause" -homepage="http://www.hpl.hp.com/research/linux/httperf/" From 9a4cc8f131419ca7073d16a7ec20c62ebe85f701 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Mon, 29 Jun 2020 23:16:43 +0200 Subject: [PATCH 045/410] isl16: remove empty package --- srcpkgs/isl16/INSTALL.msg | 1 - srcpkgs/isl16/template | 9 --------- 2 files changed, 10 deletions(-) delete mode 100644 srcpkgs/isl16/INSTALL.msg delete mode 100644 srcpkgs/isl16/template diff --git a/srcpkgs/isl16/INSTALL.msg b/srcpkgs/isl16/INSTALL.msg deleted file mode 100644 index f75c0f7d510..00000000000 --- a/srcpkgs/isl16/INSTALL.msg +++ /dev/null @@ -1 +0,0 @@ -isl16 is no longer provided by Void Linux, and will be fully removed from the repos on 2019-08-18 diff --git a/srcpkgs/isl16/template b/srcpkgs/isl16/template deleted file mode 100644 index 7cc4c4f8f7b..00000000000 --- a/srcpkgs/isl16/template +++ /dev/null @@ -1,9 +0,0 @@ -# Template file for 'isl16' -pkgname=isl16 -version=0.16 -revision=2 -archs=noarch -build_style=meta -short_desc="Integer Set Library (removed package)" -license="BSD-2-Clause" # Suppress xlint warning: vlicense -homepage="http://freecode.com/projects/isl" From a284343231cb6ff0527986fea27c4c06cdcd0432 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Mon, 29 Jun 2020 23:17:24 +0200 Subject: [PATCH 046/410] libqzeitgeist: remove empty package --- srcpkgs/libqzeitgeist/INSTALL.msg | 1 - srcpkgs/libqzeitgeist/template | 9 --------- 2 files changed, 10 deletions(-) delete mode 100644 srcpkgs/libqzeitgeist/INSTALL.msg delete mode 100644 srcpkgs/libqzeitgeist/template diff --git a/srcpkgs/libqzeitgeist/INSTALL.msg b/srcpkgs/libqzeitgeist/INSTALL.msg deleted file mode 100644 index 1a96fdbef1d..00000000000 --- a/srcpkgs/libqzeitgeist/INSTALL.msg +++ /dev/null @@ -1 +0,0 @@ -libqzeitgeist is no longer provided by Void Linux, and will be fully removed from the repos on 2019-07-10 diff --git a/srcpkgs/libqzeitgeist/template b/srcpkgs/libqzeitgeist/template deleted file mode 100644 index 4659a0a2b49..00000000000 --- a/srcpkgs/libqzeitgeist/template +++ /dev/null @@ -1,9 +0,0 @@ -# Template file for 'libqzeitgeist' -pkgname=libqzeitgeist -version=0.8.0 -revision=6 -archs=noarch -build_style=meta -short_desc="Qt interface to the Zeitgeist event tracking system (removed package)" -license="BSD-2-Clause" -homepage="https://projects.kde.org/projects/kdesupport/libqzeitgeist" From 457eba20dca3ec93f8d74e4f4bf32031e425374f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Mon, 29 Jun 2020 23:17:47 +0200 Subject: [PATCH 047/410] livewallpaper: remove empty package --- srcpkgs/livewallpaper/INSTALL.msg | 1 - srcpkgs/livewallpaper/template | 9 --------- 2 files changed, 10 deletions(-) delete mode 100644 srcpkgs/livewallpaper/INSTALL.msg delete mode 100644 srcpkgs/livewallpaper/template diff --git a/srcpkgs/livewallpaper/INSTALL.msg b/srcpkgs/livewallpaper/INSTALL.msg deleted file mode 100644 index 324bf7e25a1..00000000000 --- a/srcpkgs/livewallpaper/INSTALL.msg +++ /dev/null @@ -1 +0,0 @@ -livewallpaper is no longer provided by Void Linux, and will be fully removed from the repos on 2019-07-12 diff --git a/srcpkgs/livewallpaper/template b/srcpkgs/livewallpaper/template deleted file mode 100644 index 6d88333a7be..00000000000 --- a/srcpkgs/livewallpaper/template +++ /dev/null @@ -1,9 +0,0 @@ -# Template file for 'livewallpaper' -pkgname=livewallpaper -version=0.5.0 -revision=2 -archs=noarch -build_style=meta -short_desc="Animated Wallpapers for your Desktop (removed package)" -license="BSD-2-Clause" -homepage="https://launchpad.net/livewallpaper" From a72743f478e8b4e4b259076bb97d3d2c753207b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Mon, 29 Jun 2020 23:21:09 +0200 Subject: [PATCH 048/410] mac: remove empty package --- srcpkgs/mac/INSTALL.msg | 1 - srcpkgs/mac/template | 9 --------- 2 files changed, 10 deletions(-) delete mode 100644 srcpkgs/mac/INSTALL.msg delete mode 100644 srcpkgs/mac/template diff --git a/srcpkgs/mac/INSTALL.msg b/srcpkgs/mac/INSTALL.msg deleted file mode 100644 index 3a2832963cf..00000000000 --- a/srcpkgs/mac/INSTALL.msg +++ /dev/null @@ -1 +0,0 @@ -mac is no longer provided by Void Linux, and will be fully removed from the repos on 2019/05/25 diff --git a/srcpkgs/mac/template b/srcpkgs/mac/template deleted file mode 100644 index 126456048b0..00000000000 --- a/srcpkgs/mac/template +++ /dev/null @@ -1,9 +0,0 @@ -# Template file for 'mac' -pkgname=mac -version=3.99u4b5s7 -revision=3 -archs=noarch -build_style=meta -short_desc="APE (Monkey's Audio) codec and decompressor (removed package)" -license="metapackage" -homepage="http://www.etree.org/shnutils/shntool/" From 419c3a4125b9529e36da92c69d12c8dfcc3957f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Mon, 29 Jun 2020 23:22:14 +0200 Subject: [PATCH 049/410] mdds0: remove empty package --- srcpkgs/mdds0/INSTALL.msg | 1 - srcpkgs/mdds0/template | 9 --------- 2 files changed, 10 deletions(-) delete mode 100644 srcpkgs/mdds0/INSTALL.msg delete mode 100644 srcpkgs/mdds0/template diff --git a/srcpkgs/mdds0/INSTALL.msg b/srcpkgs/mdds0/INSTALL.msg deleted file mode 100644 index 7a5551c6812..00000000000 --- a/srcpkgs/mdds0/INSTALL.msg +++ /dev/null @@ -1 +0,0 @@ -mdds0 is no longer provided by Void Linux, and will be fully removed from the repos on 2019/04/21 diff --git a/srcpkgs/mdds0/template b/srcpkgs/mdds0/template deleted file mode 100644 index 583c969f3ba..00000000000 --- a/srcpkgs/mdds0/template +++ /dev/null @@ -1,9 +0,0 @@ -# Template file for 'mdds0' -pkgname=mdds0 -version=0.12.1 -revision=3 -archs=noarch -build_style=meta -short_desc="Multi-dimensional data structures and indexing algorithms (0.x branch) (removed package)" -license="metapackage" -homepage="https://gitlab.com/mdds/mdds" From a82a8dd09c08441ad0e06a7741bbca200372a3d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Tue, 30 Jun 2020 00:33:54 +0200 Subject: [PATCH 050/410] opencl-headers: remove empty package --- srcpkgs/opencl-headers/INSTALL.msg | 1 - srcpkgs/opencl-headers/template | 12 ------------ 2 files changed, 13 deletions(-) delete mode 100644 srcpkgs/opencl-headers/INSTALL.msg delete mode 100644 srcpkgs/opencl-headers/template diff --git a/srcpkgs/opencl-headers/INSTALL.msg b/srcpkgs/opencl-headers/INSTALL.msg deleted file mode 100644 index 92bb4e71919..00000000000 --- a/srcpkgs/opencl-headers/INSTALL.msg +++ /dev/null @@ -1 +0,0 @@ -opencl-headers is superseded by opencl2-headers diff --git a/srcpkgs/opencl-headers/template b/srcpkgs/opencl-headers/template deleted file mode 100644 index ca95690a8b6..00000000000 --- a/srcpkgs/opencl-headers/template +++ /dev/null @@ -1,12 +0,0 @@ -# Template file for 'opencl-headers' -pkgname=opencl-headers -_openclver=1.2 -_distver=20160105 -version="${_openclver}.${_distver}" -revision=3 -archs=noarch -build_style=meta -short_desc="OpenCL (Open Computing Language) header files (removed package)" -maintainer="Orphaned " -license="Apache-2.0" -homepage="http://www.khronos.org/registry/cl/" From 977cb19c0e56316e834974b16a87e7e7aa2a7f77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Mon, 29 Jun 2020 23:23:31 +0200 Subject: [PATCH 051/410] phonon-backend-gstreamer: remove empty package --- srcpkgs/phonon-backend-gstreamer/INSTALL.msg | 1 - srcpkgs/phonon-backend-gstreamer/template | 9 --------- 2 files changed, 10 deletions(-) delete mode 100644 srcpkgs/phonon-backend-gstreamer/INSTALL.msg delete mode 100644 srcpkgs/phonon-backend-gstreamer/template diff --git a/srcpkgs/phonon-backend-gstreamer/INSTALL.msg b/srcpkgs/phonon-backend-gstreamer/INSTALL.msg deleted file mode 100644 index 8d69385a68f..00000000000 --- a/srcpkgs/phonon-backend-gstreamer/INSTALL.msg +++ /dev/null @@ -1 +0,0 @@ -phonon-backend-gstreamer is no longer provided by Void Linux, and will be fully removed from the repos on 2019-07-10 diff --git a/srcpkgs/phonon-backend-gstreamer/template b/srcpkgs/phonon-backend-gstreamer/template deleted file mode 100644 index 18e1cf52fc7..00000000000 --- a/srcpkgs/phonon-backend-gstreamer/template +++ /dev/null @@ -1,9 +0,0 @@ -# Template file for 'phonon-backend-gstreamer' -pkgname=phonon-backend-gstreamer -version=4.9.0 -revision=2 -archs=noarch -build_style=meta -short_desc="Phonon GStreamer backend (removed package)" -license="BSD-2-Clause" -homepage="http://phonon.kde.org/" From 60306d586d2102113c7bc09ed1db2b3e0270438b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Mon, 29 Jun 2020 23:23:40 +0200 Subject: [PATCH 052/410] phonon-backend-vlc: remove empty package --- srcpkgs/phonon-backend-vlc/INSTALL.msg | 1 - srcpkgs/phonon-backend-vlc/template | 9 --------- 2 files changed, 10 deletions(-) delete mode 100644 srcpkgs/phonon-backend-vlc/INSTALL.msg delete mode 100644 srcpkgs/phonon-backend-vlc/template diff --git a/srcpkgs/phonon-backend-vlc/INSTALL.msg b/srcpkgs/phonon-backend-vlc/INSTALL.msg deleted file mode 100644 index f345adc7e83..00000000000 --- a/srcpkgs/phonon-backend-vlc/INSTALL.msg +++ /dev/null @@ -1 +0,0 @@ -phonon-backend-vlc is no longer provided by Void Linux, and will be fully removed from the repos on 2019-07-10 diff --git a/srcpkgs/phonon-backend-vlc/template b/srcpkgs/phonon-backend-vlc/template deleted file mode 100644 index c5e7224e42b..00000000000 --- a/srcpkgs/phonon-backend-vlc/template +++ /dev/null @@ -1,9 +0,0 @@ -# Template file for 'phonon-backend-vlc' -pkgname=phonon-backend-vlc -version=0.9.1 -revision=3 -archs=noarch -build_style=meta -short_desc="Phonon VLC backend (removed package)" -license="BSD-2-Clause" -homepage="http://phonon.kde.org/" From bd64312c956769debbbb9efd4c35050978c7e560 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Mon, 29 Jun 2020 23:23:53 +0200 Subject: [PATCH 053/410] polkit-qt: remove empty package --- srcpkgs/polkit-qt/INSTALL.msg | 1 - srcpkgs/polkit-qt/template | 9 --------- 2 files changed, 10 deletions(-) delete mode 100644 srcpkgs/polkit-qt/INSTALL.msg delete mode 100644 srcpkgs/polkit-qt/template diff --git a/srcpkgs/polkit-qt/INSTALL.msg b/srcpkgs/polkit-qt/INSTALL.msg deleted file mode 100644 index c7e8b23a6fd..00000000000 --- a/srcpkgs/polkit-qt/INSTALL.msg +++ /dev/null @@ -1 +0,0 @@ -polkit-qt is no longer provided by Void Linux, and will be fully removed from the repos on 2019-07-10 diff --git a/srcpkgs/polkit-qt/template b/srcpkgs/polkit-qt/template deleted file mode 100644 index a3f1ad13801..00000000000 --- a/srcpkgs/polkit-qt/template +++ /dev/null @@ -1,9 +0,0 @@ -# Template file for 'polkit-qt' -pkgname=polkit-qt -version=0.112.0 -revision=5 -archs=noarch -build_style=meta -short_desc="Qt-style PolicyKit API (removed package)" -license="BSD-2-Clause" -homepage="https://projects.kde.org/projects/kdesupport/polkit-qt-1" From 4b9a678a61b4fa590a556226a41454c7c541f926 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Mon, 29 Jun 2020 23:24:03 +0200 Subject: [PATCH 054/410] profont: remove empty package --- srcpkgs/profont/INSTALL.msg | 1 - srcpkgs/profont/template | 9 --------- 2 files changed, 10 deletions(-) delete mode 100644 srcpkgs/profont/INSTALL.msg delete mode 100644 srcpkgs/profont/template diff --git a/srcpkgs/profont/INSTALL.msg b/srcpkgs/profont/INSTALL.msg deleted file mode 100644 index b841172738b..00000000000 --- a/srcpkgs/profont/INSTALL.msg +++ /dev/null @@ -1 +0,0 @@ -profont is no longer provided by Void Linux, and will be fully removed from the repos on 2019/06/11 diff --git a/srcpkgs/profont/template b/srcpkgs/profont/template deleted file mode 100644 index 38ad8194953..00000000000 --- a/srcpkgs/profont/template +++ /dev/null @@ -1,9 +0,0 @@ -# Template file for 'profont' -pkgname=profont -version=1.0 -revision=2 -archs=noarch -build_style=meta -short_desc="Monospaced font created for programming (removed package)" -license="metapackage" -homepage="http://tobiasjung.name/profont/" From bf58f583525735d12c7e14b77aa0c22fd36e0648 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Mon, 29 Jun 2020 23:24:14 +0200 Subject: [PATCH 055/410] puddletag: remove empty package --- srcpkgs/puddletag/INSTALL.msg | 1 - srcpkgs/puddletag/template | 9 --------- 2 files changed, 10 deletions(-) delete mode 100644 srcpkgs/puddletag/INSTALL.msg delete mode 100644 srcpkgs/puddletag/template diff --git a/srcpkgs/puddletag/INSTALL.msg b/srcpkgs/puddletag/INSTALL.msg deleted file mode 100644 index 7e60ea8ce59..00000000000 --- a/srcpkgs/puddletag/INSTALL.msg +++ /dev/null @@ -1 +0,0 @@ -puddletag is no longer provided by Void Linux, and will be fully removed from the repos on 2019-07-12 diff --git a/srcpkgs/puddletag/template b/srcpkgs/puddletag/template deleted file mode 100644 index ecfea7c565b..00000000000 --- a/srcpkgs/puddletag/template +++ /dev/null @@ -1,9 +0,0 @@ -# Template file for 'puddletag' -pkgname=puddletag -version=1.2.0 -revision=3 -archs=noarch -build_style=meta -short_desc="MP3 tagging GUI (removed package)" -license="BSD-2-Clause" -homepage="http://puddletag.sourceforge.net" From 112dd7e9e77fd21edb353db45f1e1ebfc2fa1f1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Mon, 29 Jun 2020 23:24:41 +0200 Subject: [PATCH 056/410] python-PyQt4: remove empty package --- srcpkgs/python-PyQt4/INSTALL.msg | 1 - srcpkgs/python-PyQt4/template | 9 --------- 2 files changed, 10 deletions(-) delete mode 100644 srcpkgs/python-PyQt4/INSTALL.msg delete mode 100644 srcpkgs/python-PyQt4/template diff --git a/srcpkgs/python-PyQt4/INSTALL.msg b/srcpkgs/python-PyQt4/INSTALL.msg deleted file mode 100644 index 764834d7157..00000000000 --- a/srcpkgs/python-PyQt4/INSTALL.msg +++ /dev/null @@ -1 +0,0 @@ -python-PyQt4 is no longer provided by Void Linux, and will be fully removed from the repos on 2019-07-12 diff --git a/srcpkgs/python-PyQt4/template b/srcpkgs/python-PyQt4/template deleted file mode 100644 index 9adfa51520d..00000000000 --- a/srcpkgs/python-PyQt4/template +++ /dev/null @@ -1,9 +0,0 @@ -# Template file for 'python-PyQt4' -pkgname=python-PyQt4 -version=4.12.1 -revision=4 -archs=noarch -build_style=meta -short_desc="Python2 bindings for the Qt4 toolkit (removed package)" -license="BSD-2-Clause" -homepage="https://riverbankcomputing.com/software/pyqt/intro" From 0fe575589927b2c8e08c420da3aedead86856d6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Mon, 29 Jun 2020 23:24:54 +0200 Subject: [PATCH 057/410] python-jellyfish: remove empty package --- srcpkgs/python-jellyfish/INSTALL.msg | 1 - srcpkgs/python-jellyfish/template | 9 --------- 2 files changed, 10 deletions(-) delete mode 100644 srcpkgs/python-jellyfish/INSTALL.msg delete mode 100644 srcpkgs/python-jellyfish/template diff --git a/srcpkgs/python-jellyfish/INSTALL.msg b/srcpkgs/python-jellyfish/INSTALL.msg deleted file mode 100644 index d9033ba5a05..00000000000 --- a/srcpkgs/python-jellyfish/INSTALL.msg +++ /dev/null @@ -1 +0,0 @@ -python-jellyfish is no longer provided by Void Linux, and will be fully removed from the repos on 2019/04/29 diff --git a/srcpkgs/python-jellyfish/template b/srcpkgs/python-jellyfish/template deleted file mode 100644 index 691f94e795c..00000000000 --- a/srcpkgs/python-jellyfish/template +++ /dev/null @@ -1,9 +0,0 @@ -# Template file for 'python-jellyfish' -pkgname=python-jellyfish -version=0.6.1 -revision=2 -archs=noarch -build_style=meta -short_desc="Python2 library for approximate and phonetic matching of strings (removed package)" -license="metapackage" -homepage="https://github.com/jamesturk/jellyfish" From 35be9421aac2d87d4b006c4f00287181f413bd59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Mon, 29 Jun 2020 23:26:50 +0200 Subject: [PATCH 058/410] python-pivy: remove empty package --- srcpkgs/python-pivy/INSTALL.msg | 1 - srcpkgs/python-pivy/template | 9 --------- 2 files changed, 10 deletions(-) delete mode 100644 srcpkgs/python-pivy/INSTALL.msg delete mode 100644 srcpkgs/python-pivy/template diff --git a/srcpkgs/python-pivy/INSTALL.msg b/srcpkgs/python-pivy/INSTALL.msg deleted file mode 100644 index 5884104044c..00000000000 --- a/srcpkgs/python-pivy/INSTALL.msg +++ /dev/null @@ -1 +0,0 @@ -python-pivy is no longer provided by Void Linux, and will be fully removed from the repos on 2019/05/31 diff --git a/srcpkgs/python-pivy/template b/srcpkgs/python-pivy/template deleted file mode 100644 index df10747d705..00000000000 --- a/srcpkgs/python-pivy/template +++ /dev/null @@ -1,9 +0,0 @@ -# Template file for 'python-pivy' -pkgname=python-pivy -version=0.6.4 -revision=2 -archs=noarch -build_style=meta -short_desc="Python binding for the high-level 3D graphics library Coin (removed package)" -license=metapackage -homepage="https://bitbucket.org/Coin3D/pivy" From ca16f2f62d83dddbdeca06086b1398cb1f14deab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Mon, 29 Jun 2020 23:27:03 +0200 Subject: [PATCH 059/410] python-pyside: remove empty package --- srcpkgs/python-pyside/INSTALL.msg | 1 - srcpkgs/python-pyside/template | 9 --------- 2 files changed, 10 deletions(-) delete mode 100644 srcpkgs/python-pyside/INSTALL.msg delete mode 100644 srcpkgs/python-pyside/template diff --git a/srcpkgs/python-pyside/INSTALL.msg b/srcpkgs/python-pyside/INSTALL.msg deleted file mode 100644 index 6de207b7aa2..00000000000 --- a/srcpkgs/python-pyside/INSTALL.msg +++ /dev/null @@ -1 +0,0 @@ -python-pyside is no longer provided by Void Linux, and will be fully removed from the repos on 2019-07-17 diff --git a/srcpkgs/python-pyside/template b/srcpkgs/python-pyside/template deleted file mode 100644 index 7053f0e7fc3..00000000000 --- a/srcpkgs/python-pyside/template +++ /dev/null @@ -1,9 +0,0 @@ -# Template file for 'python-pyside' -pkgname=python-pyside -version=1.2.2 -revision=7 -archs=noarch -build_style=meta -short_desc="LGPL-licensed Python2 bindings for the Qt4 toolkit (removed package)" -license="BSD-2-Clause" -homepage="http://www.pyside.org/" From 40261ec2ea63f25a59a2402451a10551933dd53c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Mon, 29 Jun 2020 23:27:59 +0200 Subject: [PATCH 060/410] python-pytest-relaxed: remove empty package --- srcpkgs/python-pytest-relaxed/INSTALL.msg | 1 - srcpkgs/python-pytest-relaxed/template | 9 --------- 2 files changed, 10 deletions(-) delete mode 100644 srcpkgs/python-pytest-relaxed/INSTALL.msg delete mode 100644 srcpkgs/python-pytest-relaxed/template diff --git a/srcpkgs/python-pytest-relaxed/INSTALL.msg b/srcpkgs/python-pytest-relaxed/INSTALL.msg deleted file mode 100644 index 8436fd177e1..00000000000 --- a/srcpkgs/python-pytest-relaxed/INSTALL.msg +++ /dev/null @@ -1 +0,0 @@ -python-pytest-relaxed is no longer provided by Void Linux, and will be fully removed from the repos on 2019-07-12 diff --git a/srcpkgs/python-pytest-relaxed/template b/srcpkgs/python-pytest-relaxed/template deleted file mode 100644 index b91b2983b9d..00000000000 --- a/srcpkgs/python-pytest-relaxed/template +++ /dev/null @@ -1,9 +0,0 @@ -# Template file for 'python-pytest-relaxed' -pkgname=python-pytest-relaxed -version=1.1.2 -revision=2 -archs=noarch -build_style=meta -short_desc="Relaxed test discovery/organization for pytest (Python2) (removed package)" -license="BSD-2-Clause" -homepage="https://github.com/bitprophet/pytest-relaxed" From 613d453ccdd62cb386bc985d1179d900139ccffe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Mon, 29 Jun 2020 23:35:40 +0200 Subject: [PATCH 061/410] python-smbc: remove empty package --- srcpkgs/python-smbc/template | 12 ------------ srcpkgs/python-smbc/update | 1 - 2 files changed, 13 deletions(-) delete mode 100644 srcpkgs/python-smbc/template delete mode 100644 srcpkgs/python-smbc/update diff --git a/srcpkgs/python-smbc/template b/srcpkgs/python-smbc/template deleted file mode 100644 index 63b0bddc768..00000000000 --- a/srcpkgs/python-smbc/template +++ /dev/null @@ -1,12 +0,0 @@ -# Template file for 'python-smbc' -pkgname=python-smbc -version=1.0.16 -revision=2 -wrksrc="pysmbc-${version}" -build_style=meta -short_desc="Python2 bindings for libsmbclient (Removed package)" -maintainer="Orphaned " -license="GPL-2.0-or-later" -homepage="https://github.com/hamano/pysmbc" -distfiles="${PYPI_SITE}/p/pysmbc/pysmbc-${version}.tar.bz2" -checksum=62199b5cca02c05d5f3b9edbc9a864fb8a2cbe47a465c0b9461642eb3b6f5aca diff --git a/srcpkgs/python-smbc/update b/srcpkgs/python-smbc/update deleted file mode 100644 index b1cf65c3614..00000000000 --- a/srcpkgs/python-smbc/update +++ /dev/null @@ -1 +0,0 @@ -pkgname="pysmbc" From 885cf436cbedf6106ba1c4bebf6adf94864b7ab9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Mon, 29 Jun 2020 23:28:26 +0200 Subject: [PATCH 062/410] r2-bindings: remove empty package --- srcpkgs/r2-bindings/INSTALL.msg | 1 - srcpkgs/r2-bindings/template | 9 --------- 2 files changed, 10 deletions(-) delete mode 100644 srcpkgs/r2-bindings/INSTALL.msg delete mode 100644 srcpkgs/r2-bindings/template diff --git a/srcpkgs/r2-bindings/INSTALL.msg b/srcpkgs/r2-bindings/INSTALL.msg deleted file mode 100644 index 2594eb23fa6..00000000000 --- a/srcpkgs/r2-bindings/INSTALL.msg +++ /dev/null @@ -1 +0,0 @@ -r2-bindings is no longer provided by Void Linux, and will be fully removed from the repos on 2019-07-15 diff --git a/srcpkgs/r2-bindings/template b/srcpkgs/r2-bindings/template deleted file mode 100644 index 980db2ab61b..00000000000 --- a/srcpkgs/r2-bindings/template +++ /dev/null @@ -1,9 +0,0 @@ -# Template file for 'r2-bindings' -pkgname=r2-bindings -version=1.0.1 -revision=2 -archs=noarch -build_style=meta -short_desc="Advanced command line debugger and hexadecimal editor (bindings) (removed package)" -license="BSD-2-Clause" -homepage="http://www.radare.org" From fe523009a8e8307bf9d69a5be6a7953d234c0410 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Mon, 29 Jun 2020 23:28:46 +0200 Subject: [PATCH 063/410] simple-obfs: remove empty package --- srcpkgs/simple-obfs/INSTALL.msg | 1 - srcpkgs/simple-obfs/template | 9 --------- 2 files changed, 10 deletions(-) delete mode 100644 srcpkgs/simple-obfs/INSTALL.msg delete mode 100644 srcpkgs/simple-obfs/template diff --git a/srcpkgs/simple-obfs/INSTALL.msg b/srcpkgs/simple-obfs/INSTALL.msg deleted file mode 100644 index 6af58a215fb..00000000000 --- a/srcpkgs/simple-obfs/INSTALL.msg +++ /dev/null @@ -1 +0,0 @@ -simple-obfs is no longer provided by Void Linux, and will be fully removed from the repos on 2019/06/08 diff --git a/srcpkgs/simple-obfs/template b/srcpkgs/simple-obfs/template deleted file mode 100644 index 4330b95f559..00000000000 --- a/srcpkgs/simple-obfs/template +++ /dev/null @@ -1,9 +0,0 @@ -# Template file for 'simple-obfs' -pkgname=simple-obfs -version=0.0.5 -revision=2 -archs=noarch -build_style=meta -short_desc="Simple obfusacting tool designed as plugin server of shadowsocks (removed package)" -license="metapackage" -homepage="https://github.com/shadowsocks/simple-obfs" From ab6a3c377bd2f8db8b7bf6f9b04210b28a3718f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Mon, 29 Jun 2020 23:30:54 +0200 Subject: [PATCH 064/410] soulseekqt: remove empty package --- srcpkgs/soulseekqt/INSTALL.msg | 1 - srcpkgs/soulseekqt/template | 9 --------- 2 files changed, 10 deletions(-) delete mode 100644 srcpkgs/soulseekqt/INSTALL.msg delete mode 100644 srcpkgs/soulseekqt/template diff --git a/srcpkgs/soulseekqt/INSTALL.msg b/srcpkgs/soulseekqt/INSTALL.msg deleted file mode 100644 index 53fd705ec5c..00000000000 --- a/srcpkgs/soulseekqt/INSTALL.msg +++ /dev/null @@ -1 +0,0 @@ -soulseekqt is no longer provided by Void Linux, and will be fully removed from the repos on 2019-06-23 diff --git a/srcpkgs/soulseekqt/template b/srcpkgs/soulseekqt/template deleted file mode 100644 index 3527b60a73a..00000000000 --- a/srcpkgs/soulseekqt/template +++ /dev/null @@ -1,9 +0,0 @@ -# Template file for 'soulseekqt' -pkgname=soulseekqt -version=20160117 -revision=2 -archs=noarch -build_style=meta -short_desc="Desktop client for the Soulseek peer-to-peer file sharing network (removed package)" -license="metapackage" -homepage="http://www.soulseekqt.net/news/" From 0aa457df5c5738406c7a545f2f4c13d41c6f0502 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Mon, 29 Jun 2020 23:32:10 +0200 Subject: [PATCH 065/410] v8: remove empty package --- srcpkgs/v8/INSTALL.msg | 1 - srcpkgs/v8/template | 9 --------- 2 files changed, 10 deletions(-) delete mode 100644 srcpkgs/v8/INSTALL.msg delete mode 100644 srcpkgs/v8/template diff --git a/srcpkgs/v8/INSTALL.msg b/srcpkgs/v8/INSTALL.msg deleted file mode 100644 index e1cab59b931..00000000000 --- a/srcpkgs/v8/INSTALL.msg +++ /dev/null @@ -1 +0,0 @@ -v8 is no longer provided by Void Linux, and will be fully removed from the repos on 2019/04/23 diff --git a/srcpkgs/v8/template b/srcpkgs/v8/template deleted file mode 100644 index ce7a87f673b..00000000000 --- a/srcpkgs/v8/template +++ /dev/null @@ -1,9 +0,0 @@ -# Template file for 'v8' -pkgname=v8 -version=3.24.35.33 -revision=4 -archs=noarch -build_style=meta -short_desc="V8 JavaScript Engine (removed package)" -license="metapackage" -homepage="http://code.google.com/p/v8/" From d5d983fac40a16ee801bc1be5b18d17ef86fb559 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Tue, 30 Jun 2020 00:01:32 +0200 Subject: [PATCH 066/410] WildMidi: make transitional package --- srcpkgs/WildMidi | 1 + srcpkgs/WildMidi-devel | 2 +- srcpkgs/WildMidi/INSTALL.msg | 3 --- srcpkgs/WildMidi/template | 16 ---------------- srcpkgs/wildmidi/template | 15 +++++++++++++-- 5 files changed, 15 insertions(+), 22 deletions(-) create mode 120000 srcpkgs/WildMidi delete mode 100644 srcpkgs/WildMidi/INSTALL.msg delete mode 100644 srcpkgs/WildMidi/template diff --git a/srcpkgs/WildMidi b/srcpkgs/WildMidi new file mode 120000 index 00000000000..e20d971e60a --- /dev/null +++ b/srcpkgs/WildMidi @@ -0,0 +1 @@ +wildmidi \ No newline at end of file diff --git a/srcpkgs/WildMidi-devel b/srcpkgs/WildMidi-devel index d1de92525c9..e20d971e60a 120000 --- a/srcpkgs/WildMidi-devel +++ b/srcpkgs/WildMidi-devel @@ -1 +1 @@ -WildMidi \ No newline at end of file +wildmidi \ No newline at end of file diff --git a/srcpkgs/WildMidi/INSTALL.msg b/srcpkgs/WildMidi/INSTALL.msg deleted file mode 100644 index d47a0539145..00000000000 --- a/srcpkgs/WildMidi/INSTALL.msg +++ /dev/null @@ -1,3 +0,0 @@ -This package (WildMidi) was replaced by the wildmidi and libwildmidi packages. -You can simply install those and uninstall this package. -This package will be fully removed from the repos on 2020-4-20. diff --git a/srcpkgs/WildMidi/template b/srcpkgs/WildMidi/template deleted file mode 100644 index 976dab12bf3..00000000000 --- a/srcpkgs/WildMidi/template +++ /dev/null @@ -1,16 +0,0 @@ -# Template file for 'WildMidi' -pkgname=WildMidi -version=0.4.3 -revision=2 -wrksrc="wildmidi-wildmidi-${version}" -build_style=meta -depends="wildmidi" -short_desc="Core softsynth library and player (removed package)" -maintainer="oreo639 " -license="GPL-3.0-or-later, LGPL-3.0-only" -homepage="https://www.mindwerks.net/projects/wildmidi/" - -WildMidi-devel_package() { - depends="libwildmidi-devel" - short_desc+=" - development files" -} diff --git a/srcpkgs/wildmidi/template b/srcpkgs/wildmidi/template index 073fda315ea..e6772c66ca0 100644 --- a/srcpkgs/wildmidi/template +++ b/srcpkgs/wildmidi/template @@ -1,7 +1,7 @@ # Template file for 'wildmidi' pkgname=wildmidi version=0.4.3 -revision=5 +revision=6 wrksrc="${pkgname}-${pkgname}-${version}" build_style=cmake configure_args="-DWANT_ALSA=1 -DWANT_OSS=1 -DWANT_OPENAL=1" @@ -14,7 +14,6 @@ license="GPL-3.0-or-later, LGPL-3.0-only" homepage="http://www.mindwerks.net/projects/wildmidi" distfiles="https://github.com/Mindwerks/${pkgname}/archive/${pkgname}-${version}.tar.gz" checksum=498e5a96455bb4b91b37188ad6dcb070824e92c44f5ed452b90adbaec8eef3c5 -replaces="WildMidi>=0 WildMidi-devel>=0" post_install() { vsconf ${FILESDIR}/wildmidi.cfg @@ -40,3 +39,15 @@ libwildmidi-devel_package() { vmove usr/share/man/man3 } } + +WildMidi_package() { + build_style=meta + short_desc+=" - dummy transitional package" + depends="wildmidi" +} + +WildMidi-devel_package() { + build_style=meta + short_desc+=" - dummy transitional package" + depends="libwildmidi-devel" +} From 52f51c3d8ae717ff0308890dd52e8cf06afe8dd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Tue, 30 Jun 2020 00:27:38 +0200 Subject: [PATCH 067/410] oxygen-icons: make transitional package --- srcpkgs/oxygen-icons | 1 + srcpkgs/oxygen-icons/INSTALL.msg | 1 - srcpkgs/oxygen-icons/template | 9 --------- srcpkgs/oxygen-icons5/template | 8 +++++++- 4 files changed, 8 insertions(+), 11 deletions(-) create mode 120000 srcpkgs/oxygen-icons delete mode 100644 srcpkgs/oxygen-icons/INSTALL.msg delete mode 100644 srcpkgs/oxygen-icons/template diff --git a/srcpkgs/oxygen-icons b/srcpkgs/oxygen-icons new file mode 120000 index 00000000000..d6b90088f8d --- /dev/null +++ b/srcpkgs/oxygen-icons @@ -0,0 +1 @@ +oxygen-icons5 \ No newline at end of file diff --git a/srcpkgs/oxygen-icons/INSTALL.msg b/srcpkgs/oxygen-icons/INSTALL.msg deleted file mode 100644 index a082cf6c9c7..00000000000 --- a/srcpkgs/oxygen-icons/INSTALL.msg +++ /dev/null @@ -1 +0,0 @@ -oxygen-icons is no longer provided by Void Linux, and will be fully removed from the repos on 2019-07-10 diff --git a/srcpkgs/oxygen-icons/template b/srcpkgs/oxygen-icons/template deleted file mode 100644 index 16ffcbcd442..00000000000 --- a/srcpkgs/oxygen-icons/template +++ /dev/null @@ -1,9 +0,0 @@ -# Template file for 'oxygen-icons' -pkgname=oxygen-icons -version=4.14.3 -revision=3 -archs=noarch -build_style=meta -short_desc="The Oxygen Icon Theme for KDE (removed package)" -license="BSD-2-Clause" -homepage="https://www.kde.org" diff --git a/srcpkgs/oxygen-icons5/template b/srcpkgs/oxygen-icons5/template index e3f357bc88f..acd55018822 100644 --- a/srcpkgs/oxygen-icons5/template +++ b/srcpkgs/oxygen-icons5/template @@ -1,7 +1,7 @@ # Template file for 'oxygen-icons5' pkgname=oxygen-icons5 version=5.71.0 -revision=1 +revision=2 archs=noarch build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -14,3 +14,9 @@ homepage="https://projects.kde.org/projects/frameworks/oxygen-icons5" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" checksum=a75a82164e2af5b6f269a386762ff2abba052dbfca18c9aed8d738c9cd958b04 conflicts="oxygen-icons>=0" + +oxygen-icons_package() { + build_style=meta + short_desc+=" - dummy transitional package" + depends="oxygen-icons5" +} From cc8d220040f1fb17b9903126e6f796b5953e02ec Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 30 Jun 2020 21:33:01 +0200 Subject: [PATCH 068/410] lua51: adopt, fix pkg-config --- srcpkgs/lua51/files/lua.pc | 21 +++++++++++++++++++++ srcpkgs/lua51/template | 13 ++++++++----- 2 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 srcpkgs/lua51/files/lua.pc diff --git a/srcpkgs/lua51/files/lua.pc b/srcpkgs/lua51/files/lua.pc new file mode 100644 index 00000000000..b05ba08151a --- /dev/null +++ b/srcpkgs/lua51/files/lua.pc @@ -0,0 +1,21 @@ +V=%VER% +R=%REL% + +prefix=/usr +INSTALL_BIN=${prefix}/bin +INSTALL_INC=${prefix}/include +INSTALL_LIB=${prefix}/lib +INSTALL_MAN=${prefix}/man/man1 +INSTALL_LMOD=${prefix}/share/lua/${V} +INSTALL_CMOD=${prefix}/lib/lua/${V} +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include/lua${V} + +Name: Lua +Description: An Extensible Extension Language +Version: ${R} +Requires: +Libs: -L${libdir} -llua${V} +Libs.private: -lm -ldl +Cflags: -I${includedir} diff --git a/srcpkgs/lua51/template b/srcpkgs/lua51/template index 515fbd0f5d4..b7d1fe1d918 100644 --- a/srcpkgs/lua51/template +++ b/srcpkgs/lua51/template @@ -1,11 +1,11 @@ # Template file for 'lua51' pkgname=lua51 version=5.1.5 -revision=9 +revision=10 wrksrc="lua-${version}" makedepends="ncurses-devel readline-devel" short_desc="Powerful, fast, lightweight, embeddable scripting language (5.1.x)" -maintainer="Orphaned " +maintainer="q66 " license="MIT" homepage="https://www.lua.org" distfiles="https://www.lua.org/ftp/lua-$version.tar.gz" @@ -21,7 +21,7 @@ alternatives=" do_build() { export CFLAGS="$CFLAGS -fPIC" - sed -e 's:llua:llua5.1:' -e 's:/include:/include/lua5.1:' -i etc/lua.pc + vsed -e 's:llua:llua5.1:' -e 's:/include:/include/lua5.1:' -i etc/lua.pc sed -r -e '/^LUA_(SO|A|T)=/ s/lua/lua5.1/' -e '/^LUAC_T=/ s/luac/luac5.1/' -i src/Makefile make MYCFLAGS="$CFLAGS -fPIC" MYLDFLAGS="$LDFLAGS" \ CC="$CC" RANLIB="$RANLIB" \ @@ -35,7 +35,10 @@ do_install() { INSTALL_INC="${DESTDIR}/usr/include/lua5.1" \ INSTALL_MAN="${DESTDIR}/usr/share/man/man1" install - vinstall etc/lua.pc 644 usr/lib/pkgconfig lua5.1.pc + sed ${FILESDIR}/lua.pc \ + -e "s;%VER%;${version%.*};g;s;%REL%;${version};g" \ + > lua5.1.pc + vinstall lua5.1.pc 644 usr/lib/pkgconfig # Install the documentation rm -f doc/*.1 @@ -50,7 +53,7 @@ do_install() { } lua51-devel_package() { - depends="ncurses-devel readline-devel>=6.3 lua51>=${version}_${revision}" + depends="${makedepends} lua51>=${version}_${revision}" short_desc+=" - development files" alternatives=" lua-devel:lua:/usr/include/lua5.1 From 5607662cc50cb7282e7cd279730408ad147b325b Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 30 Jun 2020 21:33:31 +0200 Subject: [PATCH 069/410] lua52: adopt, fix pkg-config --- srcpkgs/lua52/files/lua.pc | 5 +++-- srcpkgs/lua52/template | 6 ++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/srcpkgs/lua52/files/lua.pc b/srcpkgs/lua52/files/lua.pc index bf7977bcd7c..b05ba08151a 100644 --- a/srcpkgs/lua52/files/lua.pc +++ b/srcpkgs/lua52/files/lua.pc @@ -10,11 +10,12 @@ INSTALL_LMOD=${prefix}/share/lua/${V} INSTALL_CMOD=${prefix}/lib/lua/${V} exec_prefix=${prefix} libdir=${exec_prefix}/lib -includedir=${prefix}/include +includedir=${prefix}/include/lua${V} Name: Lua Description: An Extensible Extension Language Version: ${R} Requires: -Libs: -L${libdir} -llua -lm +Libs: -L${libdir} -llua${V} +Libs.private: -lm -ldl Cflags: -I${includedir} diff --git a/srcpkgs/lua52/template b/srcpkgs/lua52/template index 3cd12dbc63d..ce18f9a7d80 100644 --- a/srcpkgs/lua52/template +++ b/srcpkgs/lua52/template @@ -1,11 +1,11 @@ # Template file for 'lua52' pkgname=lua52 version=5.2.4 -revision=8 +revision=9 wrksrc=lua-${version} makedepends="ncurses-devel readline-devel" short_desc="Powerful, fast, lightweight, embeddable scripting language (5.2.x)" -maintainer="Orphaned " +maintainer="q66 " license="MIT" homepage="https://www.lua.org" distfiles="https://www.lua.org/ftp/lua-$version.tar.gz" @@ -37,8 +37,6 @@ do_install() { sed ${FILESDIR}/lua.pc \ -e "s;%VER%;${version%.*};g;s;%REL%;${version};g" \ - -e "s;llua;llua5.2;" \ - -e "s;/include;/include/lua5.2;" \ > lua5.2.pc vinstall lua5.2.pc 644 usr/lib/pkgconfig From 859caf62317d7662afba57dd3a223edec62dd272 Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 30 Jun 2020 21:42:41 +0200 Subject: [PATCH 070/410] lua: rename to lua53, add transitional pkgs, adopt, fix pkg-config --- common/shlibs | 2 +- srcpkgs/lua | 1 + srcpkgs/lua-devel | 2 +- srcpkgs/lua53-devel | 1 + srcpkgs/{lua => lua53}/files/lua.pc | 5 +-- .../{lua => lua53}/patches/liblua.so.patch | 0 srcpkgs/{lua => lua53}/template | 33 ++++++++++++------- 7 files changed, 29 insertions(+), 15 deletions(-) create mode 120000 srcpkgs/lua create mode 120000 srcpkgs/lua53-devel rename srcpkgs/{lua => lua53}/files/lua.pc (80%) rename srcpkgs/{lua => lua53}/patches/liblua.so.patch (100%) rename srcpkgs/{lua => lua53}/template (79%) diff --git a/common/shlibs b/common/shlibs index 0df77943010..c44966c8cec 100644 --- a/common/shlibs +++ b/common/shlibs @@ -867,7 +867,7 @@ libgslcblas.so.0 gsl-1.15_1 libgsl.so.25 gsl-2.6_1 liblua5.1.so.5.1 lua51-5.1.5_1 liblua5.2.so.5.2 lua52-5.2.4_2 -liblua5.3.so.5.3 lua-5.3.1_2 +liblua5.3.so.5.3 lua53-5.3.5_4 libburn.so.4 libburn-0.7.2_1 libKF5Auth.so.5 kauth-5.26.0_1 libKF5AuthCore.so.5 kauth-5.56.0_1 diff --git a/srcpkgs/lua b/srcpkgs/lua new file mode 120000 index 00000000000..31ab3cac403 --- /dev/null +++ b/srcpkgs/lua @@ -0,0 +1 @@ +lua53 \ No newline at end of file diff --git a/srcpkgs/lua-devel b/srcpkgs/lua-devel index 9ad5171cee2..31ab3cac403 120000 --- a/srcpkgs/lua-devel +++ b/srcpkgs/lua-devel @@ -1 +1 @@ -lua \ No newline at end of file +lua53 \ No newline at end of file diff --git a/srcpkgs/lua53-devel b/srcpkgs/lua53-devel new file mode 120000 index 00000000000..31ab3cac403 --- /dev/null +++ b/srcpkgs/lua53-devel @@ -0,0 +1 @@ +lua53 \ No newline at end of file diff --git a/srcpkgs/lua/files/lua.pc b/srcpkgs/lua53/files/lua.pc similarity index 80% rename from srcpkgs/lua/files/lua.pc rename to srcpkgs/lua53/files/lua.pc index bf7977bcd7c..b05ba08151a 100644 --- a/srcpkgs/lua/files/lua.pc +++ b/srcpkgs/lua53/files/lua.pc @@ -10,11 +10,12 @@ INSTALL_LMOD=${prefix}/share/lua/${V} INSTALL_CMOD=${prefix}/lib/lua/${V} exec_prefix=${prefix} libdir=${exec_prefix}/lib -includedir=${prefix}/include +includedir=${prefix}/include/lua${V} Name: Lua Description: An Extensible Extension Language Version: ${R} Requires: -Libs: -L${libdir} -llua -lm +Libs: -L${libdir} -llua${V} +Libs.private: -lm -ldl Cflags: -I${includedir} diff --git a/srcpkgs/lua/patches/liblua.so.patch b/srcpkgs/lua53/patches/liblua.so.patch similarity index 100% rename from srcpkgs/lua/patches/liblua.so.patch rename to srcpkgs/lua53/patches/liblua.so.patch diff --git a/srcpkgs/lua/template b/srcpkgs/lua53/template similarity index 79% rename from srcpkgs/lua/template rename to srcpkgs/lua53/template index 9172334c4e1..fd4c407ba5c 100644 --- a/srcpkgs/lua/template +++ b/srcpkgs/lua53/template @@ -1,10 +1,11 @@ -# Template file for 'lua' -pkgname=lua +# Template file for 'lua53' +pkgname=lua53 version=5.3.5 -revision=3 +revision=4 +wrksrc=lua-${version} makedepends="ncurses-devel readline-devel" -short_desc="Powerful, fast, lightweight, embeddable scripting language" -maintainer="Orphaned " +short_desc="Powerful, fast, lightweight, embeddable scripting language (5.3.x)" +maintainer="q66 " license="MIT" homepage="https://www.lua.org" distfiles="https://www.lua.org/ftp/lua-${version}.tar.gz" @@ -19,8 +20,8 @@ alternatives=" " pre_build() { - # Lua 5.3.4 has wrong release version in its Makefile. Fix it. - sed "s/^R= \$V.4/R= \$V.5/" -i Makefile + # 5.3.5 has 5.3.4 in the Makefile + vsed "s/^R= \$V.4/R= \$V.5/" -i Makefile } do_build() { @@ -41,8 +42,6 @@ do_install() { sed ${FILESDIR}/lua.pc \ -e "s;%VER%;${version%.*};g;s;%REL%;${version};g" \ - -e "s;llua;llua5.3;" \ - -e "s;/include;/include/lua5.3;" \ > lua5.3.pc vinstall lua5.3.pc 644 usr/lib/pkgconfig @@ -59,8 +58,8 @@ do_install() { mv ${DESTDIR}/usr/share/man/man1/luac{,5.3}.1 } -lua-devel_package() { - depends="${makedepends} lua>=${version}_${revision}" +lua53-devel_package() { + depends="${makedepends} lua53>=${version}_${revision}" short_desc+=" - development files" alternatives=" lua-devel:lua:/usr/include/lua5.3 @@ -81,3 +80,15 @@ lua-devel_package() { vmove usr/share/doc } } + +lua_package() { + depends="lua53>=${version}_${revision}" + short_desc+=" (transitional dummy package)" + build_style=meta +} + +lua-devel_package() { + depends="lua53-devel>=${version}_${revision}" + short_desc+=" - development files (transitional dummy package)" + build_style=meta +} From f0cb9000aabc85e2dbddc798158ab0961f9d9f44 Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 30 Jun 2020 22:02:47 +0200 Subject: [PATCH 071/410] New package: lua54-5.4.0 --- common/shlibs | 1 + srcpkgs/lua54-devel | 1 + srcpkgs/lua54/files/lua.pc | 21 ++++++++ srcpkgs/lua54/patches/liblua.so.patch | 53 ++++++++++++++++++ srcpkgs/lua54/template | 77 +++++++++++++++++++++++++++ 5 files changed, 153 insertions(+) create mode 120000 srcpkgs/lua54-devel create mode 100644 srcpkgs/lua54/files/lua.pc create mode 100644 srcpkgs/lua54/patches/liblua.so.patch create mode 100644 srcpkgs/lua54/template diff --git a/common/shlibs b/common/shlibs index c44966c8cec..052526657d3 100644 --- a/common/shlibs +++ b/common/shlibs @@ -868,6 +868,7 @@ libgsl.so.25 gsl-2.6_1 liblua5.1.so.5.1 lua51-5.1.5_1 liblua5.2.so.5.2 lua52-5.2.4_2 liblua5.3.so.5.3 lua53-5.3.5_4 +liblua5.4.so.5.4 lua54-5.4.0_1 libburn.so.4 libburn-0.7.2_1 libKF5Auth.so.5 kauth-5.26.0_1 libKF5AuthCore.so.5 kauth-5.56.0_1 diff --git a/srcpkgs/lua54-devel b/srcpkgs/lua54-devel new file mode 120000 index 00000000000..65c6b1e2125 --- /dev/null +++ b/srcpkgs/lua54-devel @@ -0,0 +1 @@ +lua54 \ No newline at end of file diff --git a/srcpkgs/lua54/files/lua.pc b/srcpkgs/lua54/files/lua.pc new file mode 100644 index 00000000000..b05ba08151a --- /dev/null +++ b/srcpkgs/lua54/files/lua.pc @@ -0,0 +1,21 @@ +V=%VER% +R=%REL% + +prefix=/usr +INSTALL_BIN=${prefix}/bin +INSTALL_INC=${prefix}/include +INSTALL_LIB=${prefix}/lib +INSTALL_MAN=${prefix}/man/man1 +INSTALL_LMOD=${prefix}/share/lua/${V} +INSTALL_CMOD=${prefix}/lib/lua/${V} +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include/lua${V} + +Name: Lua +Description: An Extensible Extension Language +Version: ${R} +Requires: +Libs: -L${libdir} -llua${V} +Libs.private: -lm -ldl +Cflags: -I${includedir} diff --git a/srcpkgs/lua54/patches/liblua.so.patch b/srcpkgs/lua54/patches/liblua.so.patch new file mode 100644 index 00000000000..fbe7b39a4e2 --- /dev/null +++ b/srcpkgs/lua54/patches/liblua.so.patch @@ -0,0 +1,53 @@ +--- Makefile ++++ Makefile +@@ -52,7 +52,7 @@ R= $V.0 + all: $(PLAT) + + $(PLATS) help test clean: +- @cd src && $(MAKE) $@ ++ @cd src && $(MAKE) $@ V=$(V) R=$(R) + + install: dummy + cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD) +--- src/Makefile ++++ src/Makefile +@@ -33,6 +33,7 @@ CMCFLAGS= -Os + PLATS= guess aix bsd c89 freebsd generic linux linux-readline macosx mingw posix solaris + + LUA_A= liblua.a ++LUA_SO= liblua.so + CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o lundump.o lvm.o lzio.o + LIB_O= lauxlib.o lbaselib.o lcorolib.o ldblib.o liolib.o lmathlib.o loadlib.o loslib.o lstrlib.o ltablib.o lutf8lib.o linit.o + BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS) +@@ -44,7 +45,7 @@ LUAC_T= luac + LUAC_O= luac.o + + ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O) +-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) ++ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO) + ALL_A= $(LUA_A) + + # Targets start here. +@@ -60,6 +61,11 @@ $(LUA_A): $(BASE_O) + $(AR) $@ $(BASE_O) + $(RANLIB) $@ + ++$(LUA_SO): $(BASE_O) ++ $(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS) ++ ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V) ++ ln -sf $(LUA_SO).$(R) $(LUA_SO) ++ + $(LUA_T): $(LUA_O) $(LUA_A) + $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) + +--- src/luaconf.h ++++ src/luaconf.h +@@ -227,7 +227,7 @@ + + #else /* }{ */ + +-#define LUA_ROOT "/usr/local/" ++#define LUA_ROOT "/usr/" + #define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR "/" + #define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR "/" + diff --git a/srcpkgs/lua54/template b/srcpkgs/lua54/template new file mode 100644 index 00000000000..a3792ec83bc --- /dev/null +++ b/srcpkgs/lua54/template @@ -0,0 +1,77 @@ +# Template file for 'lua54' +pkgname=lua54 +version=5.4.0 +revision=1 +wrksrc=lua-${version} +makedepends="ncurses-devel readline-devel" +short_desc="Powerful, fast, lightweight, embeddable scripting language (5.4.x)" +maintainer="q66 " +license="MIT" +homepage="https://www.lua.org" +distfiles="https://www.lua.org/ftp/lua-${version}.tar.gz" +checksum=eac0836eb7219e421a96b7ee3692b93f0629e4cdb0c788432e3d10ce9ed47e28 + +alternatives=" + lua:lua:/usr/bin/lua5.4 + lua:luac:/usr/bin/luac5.4 + lua:lua.1:/usr/share/man/man1/lua5.4.1 + lua:luac.1:/usr/share/man/man1/luac5.4.1 + lua:lua:/usr/share/doc/lua5.4 +" + +do_build() { + sed -i src/Makefile -r \ + -e '/^LUA_(SO|A|T)=/ s;lua;lua5.4;' \ + -e '/^LUAC_T=/ s;luac;luac5.4;' + make MYCFLAGS="$CFLAGS -fPIC" MYLDFLAGS="$LDFLAGS" \ + CC="$CC" RANLIB="$RANLIB" \ + INSTALL_DATA="cp -d" LUA_SO=liblua5.4.so ${makejobs} linux-readline +} + +do_install() { + make INSTALL_DATA="cp -d" INSTALL_TOP="${DESTDIR}/usr" \ + TO_BIN="lua5.4 luac5.4" \ + TO_LIB="liblua5.4.a liblua5.4.so liblua5.4.so.${version%.*} liblua5.4.so.${version}" \ + INSTALL_INC="${DESTDIR}/usr/include/lua5.4" \ + INSTALL_MAN="${DESTDIR}/usr/share/man/man1" install + + sed ${FILESDIR}/lua.pc \ + -e "s;%VER%;${version%.*};g;s;%REL%;${version};g" \ + > lua5.4.pc + + vinstall lua5.4.pc 644 usr/lib/pkgconfig + + # Install the documentation + rm -f doc/*.1 + vmkdir usr/share/doc/lua5.4 + cp -R doc/* ${DESTDIR}/usr/share/doc/lua5.4 + + vlicense doc/readme.html + + # Rename man pages + mv ${DESTDIR}/usr/share/man/man1/lua{,5.4}.1 + mv ${DESTDIR}/usr/share/man/man1/luac{,5.4}.1 +} + +lua54-devel_package() { + depends="${makedepends} lua54>=${version}_${revision}" + short_desc+=" - development files" + alternatives=" + lua-devel:lua:/usr/include/lua5.4 + lua-devel:/usr/include/lua.h:/usr/include/lua5.4/lua.h + lua-devel:/usr/include/luaconf.h:/usr/include/lua5.4/luaconf.h + lua-devel:/usr/include/lua.hpp:/usr/include/lua5.4/lua.hpp + lua-devel:/usr/include/lualib.h:/usr/include/lua5.4/lualib.h + lua-devel:/usr/include/lauxlib.h:/usr/include/lua5.4/lauxlib.h + lua-devel:lua.pc:/usr/lib/pkgconfig/lua5.4.pc + lua-devel:liblua.a:/usr/lib/liblua5.4.a + lua-devel:liblua.so:/usr/lib/liblua5.4.so + " + pkg_install() { + vmove usr/include + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" + vmove usr/lib/pkgconfig + vmove usr/share/doc + } +} From 7505e94bd9c5f159e39551575d48bdf1e52c6836 Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 30 Jun 2020 22:15:17 +0200 Subject: [PATCH 072/410] awesome: rebuild for lua53 --- srcpkgs/awesome/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/awesome/template b/srcpkgs/awesome/template index 3f559ea1f87..bec0f022cf9 100644 --- a/srcpkgs/awesome/template +++ b/srcpkgs/awesome/template @@ -1,16 +1,16 @@ # Template file for 'awesome' pkgname=awesome version=4.3 -revision=4 +revision=5 build_style=cmake build_helper="qemu" configure_args="-DSYSCONFDIR=/etc" conf_files="/etc/xdg/awesome/rc.lua" -hostmakedepends="ruby-asciidoctor ImageMagick lgi lua pkg-config xmlto" +hostmakedepends="ruby-asciidoctor ImageMagick lgi lua53 pkg-config xmlto" makedepends="libxcb-devel pango-devel xcb-util-devel xcb-util-image-devel xcb-util-keysyms-devel xcb-util-wm-devel xcb-util-cursor-devel startup-notification-devel imlib2-devel lgi libxdg-basedir-devel - gdk-pixbuf-devel lua-devel dbus-devel libxkbcommon-devel xcb-util-xrm-devel" + gdk-pixbuf-devel lua53-devel dbus-devel libxkbcommon-devel xcb-util-xrm-devel" depends="dbus-x11 lgi>=0.7.2 pango" short_desc="Highly configurable, next gen framework window manager for X" maintainer="Orphaned " From 3fdd9beef66cd1391867b8bde33b33b84b771412 Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 30 Jun 2020 22:17:05 +0200 Subject: [PATCH 073/410] bam: rebuild for lua53 --- srcpkgs/bam/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/bam/template b/srcpkgs/bam/template index 8f51eae5a93..5913d7fd5ec 100644 --- a/srcpkgs/bam/template +++ b/srcpkgs/bam/template @@ -1,8 +1,8 @@ # Template file for 'bam' pkgname=bam version=0.5.1 -revision=2 -makedepends="lua-devel" +revision=3 +makedepends="lua53-devel" short_desc="Fast and flexible build system using Lua" maintainer="Leah Neukirchen " license="custom" From 471cce599e2bce94bb9e27a57f9eada351ba02d2 Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 30 Jun 2020 22:20:32 +0200 Subject: [PATCH 074/410] cegui: rebuild for lua53 --- srcpkgs/cegui/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/cegui/template b/srcpkgs/cegui/template index 89d2c271a9a..78f0c103ba7 100644 --- a/srcpkgs/cegui/template +++ b/srcpkgs/cegui/template @@ -1,14 +1,14 @@ # Template file for 'cegui' pkgname=cegui version=0.8.7.20190225 -revision=1 +revision=2 _githash=bfc6a841de45b8e63040d33b9cccc67745337f4e wrksrc="${pkgname}-${_githash}" build_style=cmake make_build_args="all html" hostmakedepends="graphviz doxygen dejavu-fonts-ttf gd glm perl pkg-config" makedepends="MesaLib-devel SDL2-devel SDL2_image-devel libxml2-devel boost-devel - devil-devel glfw-devel ois-devel silly-devel fribidi-devel lua-devel minizip-devel + devil-devel glfw-devel ois-devel silly-devel fribidi-devel lua53-devel minizip-devel $(vopt_if irrlicht irrlicht-devel) $(vopt_if ogre libogre-devel) $(vopt_if python python-devel) From c31dda3e47cf424d8bff659749fdb4da1bfa0326 Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 30 Jun 2020 22:58:41 +0200 Subject: [PATCH 075/410] conky: rebuild for lua53 --- srcpkgs/conky/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/conky/template b/srcpkgs/conky/template index c5d251df6e2..e91175bedcd 100644 --- a/srcpkgs/conky/template +++ b/srcpkgs/conky/template @@ -1,7 +1,7 @@ # Template file for 'conky' pkgname=conky version=1.11.5 -revision=2 +revision=3 build_style=cmake conf_files="/etc/conky/conky.conf /etc/conky/conky_no_x11.conf" configure_args="-DCMAKE_BUILD_TYPE=Release -DMAINTAINER_MODE=ON -DRELEASE=ON @@ -11,7 +11,7 @@ configure_args="-DCMAKE_BUILD_TYPE=Release -DMAINTAINER_MODE=ON -DRELEASE=ON -DBUILD_XSHAPE=ON -DBUILD_DOCS=ON" hostmakedepends="libtool pkg-config docbook2x man-db toluapp" makedepends="alsa-lib-devel imlib2-devel libXdamage-devel libXft-devel - libXinerama-devel libcurl-devel librsvg-devel lua-devel toluapp-devel + libXinerama-devel libcurl-devel librsvg-devel lua53-devel toluapp-devel wireless_tools-devel" short_desc="Lightweight system monitor for X" maintainer="Orphaned " From 18799483cb50173baa21eee21bb8fc1459d6ccae Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 30 Jun 2020 22:58:47 +0200 Subject: [PATCH 076/410] conky-cli: rebuild for lua53 --- srcpkgs/conky-cli/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/conky-cli/template b/srcpkgs/conky-cli/template index 421d76008bc..64e9bc3ba7f 100644 --- a/srcpkgs/conky-cli/template +++ b/srcpkgs/conky-cli/template @@ -1,7 +1,7 @@ # Template file for 'conky-cli' pkgname=conky-cli version=1.11.5 -revision=2 +revision=3 wrksrc="${pkgname/-cli/}-${version}" build_style=cmake conf_files="/etc/conky/conky.conf /etc/conky/conky_no_x11.conf" @@ -10,7 +10,7 @@ configure_args="-DCMAKE_BUILD_TYPE=Release -DMAINTAINER_MODE=ON -DRELEASE=ON -DBUILD_RSS=ON -DBUILD_WEATHER_METAR=OFF -DBUILD_IMLIB2=OFF -DBUILD_WLAN=ON -DBUILD_DOCS=ON" hostmakedepends="libtool pkg-config docbook2x man-db" -makedepends="libcurl-devel libglib-devel libxml2-devel lua-devel +makedepends="libcurl-devel libglib-devel libxml2-devel lua53-devel wireless_tools-devel" short_desc="Conky command line without X11" maintainer="Orphaned " From 31547a05eb1ce7777acddbd27400487e8da58ebf Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 30 Jun 2020 23:05:37 +0200 Subject: [PATCH 077/410] darktable: fix lua-devel dep --- srcpkgs/darktable/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template index 5d1246342c6..97f28355265 100644 --- a/srcpkgs/darktable/template +++ b/srcpkgs/darktable/template @@ -11,7 +11,7 @@ configure_args="-DBINARY_PACKAGE_BUILD=ON -DBUILD_NOISE_TOOLS=ON hostmakedepends="pkg-config intltool libxslt-devel" makedepends="gtk+3-devel glib-devel exiv2-devel libglade-devel libxslt-devel dbus-glib-devel libcurl-devel libgphoto2-devel libwebp-devel libsoup-devel - lensfun-devel sqlite-devel librsvg-devel lua-devel json-glib-devel + lensfun-devel sqlite-devel librsvg-devel lua53-devel json-glib-devel libgomp-devel libopenjpeg2-devel libopenexr-devel libgraphicsmagick-devel libsecret-devel pugixml-devel libosmgpsmap-devel colord-gtk-devel desktop-file-utils" From 3acdd774c2c4f4d51b1fe0d5705bac9f590cfcd1 Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 30 Jun 2020 23:07:02 +0200 Subject: [PATCH 078/410] devilspie2: rebuild for lua53 + fix lint --- srcpkgs/devilspie2/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/devilspie2/template b/srcpkgs/devilspie2/template index 07dfb3a63bd..0d796f8fae8 100644 --- a/srcpkgs/devilspie2/template +++ b/srcpkgs/devilspie2/template @@ -1,13 +1,13 @@ # Template file for 'devilspie2' pkgname=devilspie2 version=0.43 -revision=1 +revision=2 build_style=gnu-makefile hostmakedepends="gettext pkg-config" -makedepends="glib-devel lua-devel libwnck-devel" +makedepends="glib-devel lua53-devel libwnck-devel" short_desc="Window matching utility for X" maintainer="Diogo Leal " -license="GPL-3" -homepage="http://www.gusnan.se/devilspie2" +license="GPL-3.0-or-later" +homepage="http://www.nongnu.org/devilspie2" distfiles="http://download.savannah.gnu.org/releases/devilspie2/devilspie2_${version}-src.tar.gz" checksum=ecffc17c62b41e196b72340192a90c4223329df041f135e74c0990860595f828 From 5a99d519a378f2f131761cc4556354273e66c045 Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 30 Jun 2020 23:09:05 +0200 Subject: [PATCH 079/410] freeciv: fix lua-devel dep --- srcpkgs/freeciv/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/freeciv/template b/srcpkgs/freeciv/template index faa45f1a4cf..cb643452944 100644 --- a/srcpkgs/freeciv/template +++ b/srcpkgs/freeciv/template @@ -7,7 +7,7 @@ configure_args="--disable-static --enable-fcdb=sqlite3 --enable-fcmp=all --enable-client=all" hostmakedepends="pkg-config" makedepends="SDL2_gfx-devel SDL2_image-devel SDL2_mixer-devel SDL2_ttf-devel gtk+-devel - gtk+3-devel libXaw-devel libcurl-devel lua-devel" + gtk+3-devel libXaw-devel libcurl-devel lua53-devel" short_desc="Free and Open Source empire-building strategy game - server/data" maintainer="bra1nwave " license="GPL-2.0-or-later" From 9b429e3759483c61254350df74b2dad7ade4a230 Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 30 Jun 2020 23:09:34 +0200 Subject: [PATCH 080/410] freedroidRPG: fix lua-devel dep --- srcpkgs/freedroidRPG/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/freedroidRPG/template b/srcpkgs/freedroidRPG/template index 0ddb2eb3a11..b1cb939802a 100644 --- a/srcpkgs/freedroidRPG/template +++ b/srcpkgs/freedroidRPG/template @@ -6,7 +6,7 @@ wrksrc=${pkgname,,}-${version} build_style=gnu-configure hostmakedepends="pkg-config python" makedepends="SDL_gfx-devel SDL_image-devel SDL_mixer-devel - libjpeg-turbo-devel libvorbis-devel lua-devel libpng-devel" + libjpeg-turbo-devel libvorbis-devel lua53-devel libpng-devel" depends="${pkgname}-data>=${version}_${revision}" short_desc="Role playing game featuring Tux and evil robots" maintainer="Jürgen Buchmüller " From 39a28a6044c94900cc8626698bc4ce52d32b9cca Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 30 Jun 2020 23:11:01 +0200 Subject: [PATCH 081/410] golly: fix lua-devel dep --- srcpkgs/golly/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/golly/template b/srcpkgs/golly/template index 3512fd71b72..44a3069e2eb 100644 --- a/srcpkgs/golly/template +++ b/srcpkgs/golly/template @@ -7,7 +7,7 @@ build_style=gnu-configure configure_script="gui-wx/configure/configure" configure_args="LIBS=-lGL" hostmakedepends="automake python" -makedepends="MesaLib-devel glu-devel lua-devel python-devel wxWidgets-devel +makedepends="MesaLib-devel glu-devel lua53-devel python-devel wxWidgets-devel zlib-devel" short_desc="Simulator for Conway's Game of Life and other cellular automata" maintainer="Leah Neukirchen " From 572740e91322ef6bc73a38d20ac51d93d61efd13 Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 30 Jun 2020 23:12:38 +0200 Subject: [PATCH 082/410] hexchat: fix lua-devel dep --- srcpkgs/hexchat/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template index b5048e97ad8..b14a436a5e1 100644 --- a/srcpkgs/hexchat/template +++ b/srcpkgs/hexchat/template @@ -9,7 +9,7 @@ configure_args="-Dwith-dbus=true -Dwith-ssl=true -Dwith-text=false hostmakedepends="gettext pkg-config glib-devel" makedepends="gtk+-devel libressl-devel dbus-glib-devel perl libnotify-devel libcanberra-devel libxml2-devel pciutils-devel libproxy-devel - iso-codes python3-devel $(vopt_if LuaJIT LuaJIT-devel lua-devel)" + iso-codes python3-devel $(vopt_if LuaJIT LuaJIT-devel lua53-devel)" depends="desktop-file-utils enchant" short_desc="GTK+ based IRC client successor of Xchat" maintainer="Orphaned " From 84c80b5415e8971b074448a45c70f58889e62981 Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 30 Jun 2020 23:13:34 +0200 Subject: [PATCH 083/410] mame: fix lua-devel dep --- srcpkgs/mame/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mame/template b/srcpkgs/mame/template index 39bfbf1161f..5e4598e006a 100644 --- a/srcpkgs/mame/template +++ b/srcpkgs/mame/template @@ -12,7 +12,7 @@ checksum=3380b86d1bc5bc09f5bb4099f3833b6fba924a8bd189aac4dab149afba799ce7 hostmakedepends="pkg-config python tar xz which" makedepends="SDL2_ttf-devel glm libgomp-devel libjpeg-turbo-devel - libutf8proc-devel libuv-devel lua-devel portaudio-devel portmidi-devel + libutf8proc-devel libuv-devel lua53-devel portaudio-devel portmidi-devel pugixml-devel rapidjson $(vopt_if qt 'qt5-devel')" depends="liberation-fonts-ttf" nocross=yes From da67984dea20d30ed4ff385fd77ecc60a7b8fc78 Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 30 Jun 2020 23:14:08 +0200 Subject: [PATCH 084/410] podofo: fix lua-devel dep --- srcpkgs/podofo/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/podofo/template b/srcpkgs/podofo/template index 78dd317ab60..80777f9959d 100644 --- a/srcpkgs/podofo/template +++ b/srcpkgs/podofo/template @@ -4,7 +4,7 @@ version=0.9.6 revision=4 build_style=cmake configure_args="-DPODOFO_BUILD_SHARED=TRUE" -makedepends="fontconfig-devel libidn-devel libressl-devel lua-devel tiff-devel" +makedepends="fontconfig-devel libidn-devel libressl-devel lua53-devel tiff-devel" short_desc="Library to work with the PDF file format" maintainer="Andrea Brancaleoni " license="GPL-2.0-or-later, LGPL-2.1-or-later" From 5a674e4dee7859820c563e5d6a23722ee1ea2362 Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 30 Jun 2020 23:15:15 +0200 Subject: [PATCH 085/410] haproxy: rebuild for lua53 --- srcpkgs/haproxy/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template index 2d4e77108b9..16d7f240fda 100644 --- a/srcpkgs/haproxy/template +++ b/srcpkgs/haproxy/template @@ -1,10 +1,10 @@ # Template file for 'haproxy' pkgname=haproxy version=2.1.7 -revision=1 +revision=2 build_style=gnu-makefile make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}" -makedepends="libatomic-devel libressl-devel lua-devel pcre-devel" +makedepends="libatomic-devel libressl-devel lua53-devel pcre-devel" checkdepends="varnish" short_desc="Reliable, high performance TCP/HTTP load balancer" maintainer="Orphaned " From c9b8cc63a306213e7fed331badac3825cfe262f0 Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 30 Jun 2020 23:16:06 +0200 Subject: [PATCH 086/410] highlight: rebuild for lua53 --- srcpkgs/highlight/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/highlight/template b/srcpkgs/highlight/template index fb55e73b068..ffaca39dcba 100644 --- a/srcpkgs/highlight/template +++ b/srcpkgs/highlight/template @@ -1,10 +1,10 @@ # Template file for 'highlight' pkgname=highlight version=3.57 -revision=1 +revision=2 build_style=gnu-makefile hostmakedepends="pkg-config swig perl" -makedepends="boost-devel lua-devel perl" +makedepends="boost-devel lua53-devel perl" short_desc="Fast and flexible source code highlighter (CLI version)" maintainer="Steve Prybylski " license="GPL-3.0-or-later" From 2906c1786581ee9a3fd87db2cd49d4c539b4b5fa Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 30 Jun 2020 23:18:34 +0200 Subject: [PATCH 087/410] weechat: rebuild for lua53 --- srcpkgs/weechat/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/weechat/template b/srcpkgs/weechat/template index b8bc31ba8fb..d5f224985c5 100644 --- a/srcpkgs/weechat/template +++ b/srcpkgs/weechat/template @@ -1,7 +1,7 @@ # Template file for 'weechat' pkgname=weechat version=2.8 -revision=2 +revision=3 build_style=cmake configure_args="-DENABLE_MAN=ON -DENABLE_ENCHANT=ON -DENABLE_PERL=ON -DENABLE_LUA=ON -DENABLE_RUBY=ON -DENABLE_SPELL=ON @@ -9,7 +9,7 @@ configure_args="-DENABLE_MAN=ON -DENABLE_ENCHANT=ON -DENABLE_PERL=ON -DPYTHON_EXECUTABLE=/usr/bin/python3 -DPYTHON_LIBRARY=${XBPS_CROSS_BASE}/usr/lib/libpython3.so" hostmakedepends="ruby-asciidoctor libgcrypt-devel pkg-config python3 tcl-devel" -makedepends="enchant-devel gnutls-devel libcurl-devel lua-devel ncurses-devel +makedepends="enchant-devel gnutls-devel libcurl-devel lua53-devel ncurses-devel perl python3-devel ruby-devel tcl-devel" depends="ca-certificates" short_desc="Fast, light and extensible IRC client" From c560cdb797a1ba95cf029b254a82476ba23373ac Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 30 Jun 2020 23:21:06 +0200 Subject: [PATCH 088/410] vim: fix lua-devel dep --- srcpkgs/vim/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/vim/template b/srcpkgs/vim/template index ef3fb81e01d..4585d99624f 100644 --- a/srcpkgs/vim/template +++ b/srcpkgs/vim/template @@ -3,7 +3,7 @@ pkgname=vim version=8.2.1095 revision=1 hostmakedepends="gettext glib-devel pkg-config" -makedepends="acl-devel gtk+3-devel libXt-devel lua-devel ncurses-devel +makedepends="acl-devel gtk+3-devel libXt-devel lua53-devel ncurses-devel perl python3-devel ruby-devel" depends="vim-common>=${version}" short_desc="Vim editor (vi clone)" From 5d6d114189e3d99ce15ca8d283d5b24940e28d7f Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 30 Jun 2020 23:22:36 +0200 Subject: [PATCH 089/410] pandoc: fix lua-devel dep --- srcpkgs/pandoc/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template index 153fb4f2a86..fc02ba90687 100644 --- a/srcpkgs/pandoc/template +++ b/srcpkgs/pandoc/template @@ -13,7 +13,7 @@ make_build_args=" --flag=hslua:system-lua --flag=hslua:pkg-config" stackage="lts-16.0" hostmakedepends="pkg-config unzip wget" -makedepends="zlib-devel lua-devel" +makedepends="zlib-devel lua53-devel" short_desc="Universal converter between markup formats (with citeproc support)" maintainer="Leah Neukirchen " license="GPL-2.0-or-later, BSD-3-Clause, MIT" From 85cf89e82e1223166e93ece4a89c0565d16d8838 Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 30 Jun 2020 23:24:14 +0200 Subject: [PATCH 090/410] libguestfs: fix lua deps --- srcpkgs/libguestfs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libguestfs/template b/srcpkgs/libguestfs/template index 842df2180de..22356f78e0c 100644 --- a/srcpkgs/libguestfs/template +++ b/srcpkgs/libguestfs/template @@ -13,10 +13,10 @@ configure_args="--disable-static --disable-probes --disable-appliance $(vopt_enable php) $(vopt_enable lua) $(vopt_enable fuse)" hostmakedepends="cpio gperf cdrtools flex pkg-config automake libtool qemu git ocaml ocaml-findlib perl-Module-Build perl hivex supermin - $(vopt_if ruby ruby) $(vopt_if python python3) $(vopt_if go go) $(vopt_if php php) $(vopt_if lua lua)" + $(vopt_if ruby ruby) $(vopt_if python python3) $(vopt_if go go) $(vopt_if php php) $(vopt_if lua lua53)" makedepends="ncurses-devel pcre-devel augeas-devel libxml2-devel gettext-devel file-devel jansson-devel yajl-devel perl $(vopt_if ruby ruby-devel) $(vopt_if python python3-devel) - $(vopt_if php php-devel) $(vopt_if lua lua-devel) $(vopt_if fuse fuse-devel)" + $(vopt_if php php-devel) $(vopt_if lua lua53-devel) $(vopt_if fuse fuse-devel)" short_desc="Access and modify virtual machine disk image" maintainer="Andrea Brancaleoni " license="GPL-2" From ab14a7d88004be7ae7c0946f4c9c4d31e0f787b8 Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 30 Jun 2020 23:24:47 +0200 Subject: [PATCH 091/410] notion: rebuild for lua53 --- srcpkgs/notion/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/notion/template b/srcpkgs/notion/template index 342639e43bf..b0746f9b1c0 100644 --- a/srcpkgs/notion/template +++ b/srcpkgs/notion/template @@ -1,11 +1,11 @@ # Template file for 'notion' pkgname="notion" version=4.0.0 -revision=1 +revision=2 archs="~*-musl" short_desc="Tabbed, tiling window manager" -hostmakedepends="pkg-config gettext groff lua" -makedepends="lua-devel libXext-devel libXft-devel libSM-devel libXinerama-devel libXrandr-devel" +hostmakedepends="pkg-config gettext groff lua53" +makedepends="lua53-devel libXext-devel libXft-devel libSM-devel libXinerama-devel libXrandr-devel" maintainer="Julian Wiesener " license="LGPL-2.1-or-later" repository="nonfree" From 538fa151c2743e629ae319398a429bd2118dc6e5 Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 30 Jun 2020 23:26:30 +0200 Subject: [PATCH 092/410] tracebox: fix lua-devel dep --- srcpkgs/tracebox/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/tracebox/template b/srcpkgs/tracebox/template index 99331cec27b..f0f42c46c4c 100644 --- a/srcpkgs/tracebox/template +++ b/srcpkgs/tracebox/template @@ -8,7 +8,7 @@ _crafter_ver=0.3.3git build_style=gnu-configure archs="i686 x86_64" hostmakedepends="automake pkg-config libtool unzip" -makedepends="libpcap-devel json-c-devel lua-devel" +makedepends="libpcap-devel json-c-devel lua53-devel" short_desc="A middlebox detection tool" maintainer="Jürgen Buchmüller " license="GPL-2" From b4974ff8869945e161ad3f5e7a6713df0997df16 Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 30 Jun 2020 23:27:08 +0200 Subject: [PATCH 093/410] wordgrinder: rebuild for lua53 --- srcpkgs/wordgrinder/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/wordgrinder/template b/srcpkgs/wordgrinder/template index 711557d7502..4f352f023e7 100644 --- a/srcpkgs/wordgrinder/template +++ b/srcpkgs/wordgrinder/template @@ -1,9 +1,9 @@ # Template file for 'wordgrinder' pkgname=wordgrinder version=0.7.2 -revision=1 -hostmakedepends="pkg-config ninja lua" -makedepends="libXft-devel lua-devel" +revision=2 +hostmakedepends="pkg-config ninja lua53" +makedepends="libXft-devel lua53-devel" short_desc="A terminal-based word processor" maintainer="Andrew Benson " license="MIT" From f6ebc47b5a46fa1565450b1b2776ab09104ff290 Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 30 Jun 2020 23:28:14 +0200 Subject: [PATCH 094/410] nmap: rebuild for lua53 --- srcpkgs/nmap/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/nmap/template b/srcpkgs/nmap/template index 2bec6f4e2c7..5608758e080 100644 --- a/srcpkgs/nmap/template +++ b/srcpkgs/nmap/template @@ -1,11 +1,11 @@ # Template file for 'nmap' pkgname=nmap version=7.80 -revision=2 +revision=3 build_style=gnu-configure configure_args="--without-ndiff --with-openssl --with-zenmap $(vopt_with lua liblua)" hostmakedepends="python" -makedepends="libpcap-devel libressl-devel pcre-devel $(vopt_if lua lua-devel)" +makedepends="libpcap-devel libressl-devel pcre-devel $(vopt_if lua lua53-devel)" short_desc="Utility for network discovery and security auditing" maintainer="Piraty " license="custom:nmap" From e979f5b4d3b74c2ff5b201a4ce20bd535720f482 Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 30 Jun 2020 23:33:26 +0200 Subject: [PATCH 095/410] grafx2: fix lua-devel dep --- srcpkgs/grafx2/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/grafx2/template b/srcpkgs/grafx2/template index d7bd131b1da..5f9f4304f66 100644 --- a/srcpkgs/grafx2/template +++ b/srcpkgs/grafx2/template @@ -8,7 +8,7 @@ build_wrksrc="src" build_style=gnu-makefile make_build_args="API=sdl2" hostmakedepends="pkg-config" -makedepends="SDL2_image-devel SDL2_ttf-devel fontconfig-devel lua-devel" +makedepends="SDL2_image-devel SDL2_ttf-devel fontconfig-devel lua53-devel" depends="desktop-file-utils" short_desc="Bitmap/pixel drawing program like Deluxe Paint" maintainer="allan " From 3e49944365f272bb7e0151b8c357ca0b55f43c4b Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 30 Jun 2020 23:33:45 +0200 Subject: [PATCH 096/410] grilo-plugins: fix lua-devel dep --- srcpkgs/grilo-plugins/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/grilo-plugins/template b/srcpkgs/grilo-plugins/template index 166044d8b57..8bf651366da 100644 --- a/srcpkgs/grilo-plugins/template +++ b/srcpkgs/grilo-plugins/template @@ -9,7 +9,7 @@ hostmakedepends="pkg-config intltool itstool glib-devel gperf makedepends="grilo-devel gom-devel gupnp-av-devel json-glib-devel libquvi-devel rest-devel sqlite-devel libgcrypt-devel gmime-devel tracker-devel totem-pl-parser-devel libgdata-devel libmediaart-devel - gstreamer1-devel libdmapsharing-devel lua-devel gnome-online-accounts-devel + gstreamer1-devel libdmapsharing-devel lua53-devel gnome-online-accounts-devel avahi-glib-libs-devel" short_desc="Plugins for Grilo" maintainer="Orphaned " From 8fdd594ef46983ae3cfaa997190970009364e825 Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 30 Jun 2020 23:34:20 +0200 Subject: [PATCH 097/410] imapfilter: rebuild for lua53 --- srcpkgs/imapfilter/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/imapfilter/template b/srcpkgs/imapfilter/template index 98227dbde7d..334b6f0115d 100644 --- a/srcpkgs/imapfilter/template +++ b/srcpkgs/imapfilter/template @@ -1,11 +1,11 @@ # Template file for 'imapfilter' pkgname=imapfilter version=2.6.12 -revision=3 +revision=4 build_style=gnu-makefile make_build_args="DESTIDIR=${DESTDIR} PREFIX=/usr" -hostmakedepends="lua-devel" -makedepends="pcre-devel lua-devel libressl-devel" +hostmakedepends="lua53-devel" +makedepends="pcre-devel lua53-devel libressl-devel" short_desc="Mail filtering utility" maintainer="lemmi " license="MIT" From bdc25f5fb50184a5d38c4456585677f80863b194 Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 30 Jun 2020 23:34:46 +0200 Subject: [PATCH 098/410] ipe: fix lua-devel dep --- srcpkgs/ipe/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ipe/template b/srcpkgs/ipe/template index 8fa76bc4abe..9419958828b 100644 --- a/srcpkgs/ipe/template +++ b/srcpkgs/ipe/template @@ -5,7 +5,7 @@ revision=1 _tools_commit=2480d96e205316115a1febd123403c7d65a292e6 hostmakedepends="pkg-config qt5-qmake qt5-tools qt5-host-tools" makedepends="cairo-devel gsl-devel libcurl-devel libjpeg-turbo-devel - lua-devel poppler-devel qt5-devel" + lua53-devel poppler-devel qt5-devel" short_desc="Drawing editor for creating figures in PDF or EPS formats" maintainer="Leah Neukirchen " license="GPL-3.0-or-later" From ae2a67425bb1dd4c283997aef9f9a9aac0b70af1 Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 30 Jun 2020 23:36:07 +0200 Subject: [PATCH 099/410] libquvi-scripts: rebuild for lua53 --- srcpkgs/libquvi-scripts/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/libquvi-scripts/template b/srcpkgs/libquvi-scripts/template index 5f47d63d592..c2d247e52dd 100644 --- a/srcpkgs/libquvi-scripts/template +++ b/srcpkgs/libquvi-scripts/template @@ -1,12 +1,12 @@ # Template file for 'libquvi-scripts' pkgname=libquvi-scripts version=0.4.21 -revision=2 +revision=3 archs=noarch build_style=gnu-configure -hostmakedepends="pkg-config lua" -makedepends="lua" -depends="lua" +hostmakedepends="pkg-config lua53" +makedepends="lua53" +depends="lua53" short_desc="Set of (lua) scripts for libquvi" maintainer="Orphaned " license="LGPL-2.1-or-later" From 725c7f378c5bf1fa324e8b80f742e8c58de56536 Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 30 Jun 2020 23:36:47 +0200 Subject: [PATCH 100/410] lighttpd: rebuild for lua53 --- srcpkgs/lighttpd/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template index a23b5206fc7..ddddbc7f7fb 100644 --- a/srcpkgs/lighttpd/template +++ b/srcpkgs/lighttpd/template @@ -1,7 +1,7 @@ # Template file for 'lighttpd' pkgname=lighttpd version=1.4.55 -revision=1 +revision=2 build_style=meson configure_args="-Dwith_bzip=true -Dwith_fam=false -Dwith_gdbm=true -Dwith_geoip=false -Dwith_krb5=true -Dwith_ldap=true -Dwith_libev=true @@ -11,7 +11,7 @@ configure_args="-Dwith_bzip=true -Dwith_fam=false -Dwith_gdbm=true -Dwith_webdav_locks=true -Dmoduledir=lib/lighttpd/modules" hostmakedepends="pkg-config" makedepends="attr-devel fcgi-devel gdbm-devel libev-devel libmemcached-devel - libxml2-devel lua-devel mit-krb5-devel pcre-devel sqlite-devel" + libxml2-devel lua53-devel mit-krb5-devel pcre-devel sqlite-devel" checkdepends="perl" short_desc="Secure, fast, compliant and very flexible web-server" maintainer="Enno Boland " From c84e6a0e56578913493220c6d41de5052d52e0f5 Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 30 Jun 2020 23:37:18 +0200 Subject: [PATCH 101/410] lsyncd: rebuild for lua53 --- srcpkgs/lsyncd/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/lsyncd/template b/srcpkgs/lsyncd/template index a6923503734..c089ab7d193 100644 --- a/srcpkgs/lsyncd/template +++ b/srcpkgs/lsyncd/template @@ -1,11 +1,11 @@ # Template file for 'lsyncd' pkgname=lsyncd version=2.2.3 -revision=2 +revision=3 wrksrc="${pkgname}-release-${version}" build_style=cmake -hostmakedepends="asciidoc lua" -makedepends="lua-devel" +hostmakedepends="asciidoc lua53" +makedepends="lua53-devel" depends="rsync" short_desc="Syncing Daemon that synchronizes local directories with remote targets" maintainer="Kyle Nusbaum " From 730df0af9a04db130b6db4aa7c944f61f0dbc5d2 Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 30 Jun 2020 23:37:50 +0200 Subject: [PATCH 102/410] mle: rebuild for lua53 --- srcpkgs/mle/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mle/template b/srcpkgs/mle/template index 064ea1d5289..2c09434a1a7 100644 --- a/srcpkgs/mle/template +++ b/srcpkgs/mle/template @@ -1,11 +1,11 @@ # Template file for 'mle' pkgname=mle version=1.4.2 -revision=1 +revision=2 build_style=gnu-makefile make_install_args="prefix=/usr" hostmakedepends="libtool" -makedepends="termbox-devel lua-devel pcre-devel uthash" +makedepends="termbox-devel lua53-devel pcre-devel uthash" short_desc="Flexible terminal-based text editor \(C\)" maintainer="Anjandev Momi " license="Apache-2.0" From ecfabda767c594a69e8d5230c457cb1b5260f00b Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 30 Jun 2020 23:38:13 +0200 Subject: [PATCH 103/410] modsecurity: fix lua-devel dep --- srcpkgs/modsecurity/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/modsecurity/template b/srcpkgs/modsecurity/template index 91a9466865e..4f550b43027 100644 --- a/srcpkgs/modsecurity/template +++ b/srcpkgs/modsecurity/template @@ -6,7 +6,7 @@ wrksrc="modsecurity-v${version}" build_style=gnu-configure configure_args="--enable-standalone-module --enable-htaccess-config" hostmakedepends="pkg-config" -makedepends="apache-devel gdbm-devel libcurl-devel libxml2-devel lua-devel +makedepends="apache-devel gdbm-devel libcurl-devel libxml2-devel lua53-devel pcre-devel yajl-devel lmdb-devel" depends="perl-LWP" short_desc="Rule based web application firwall (WAF)" From c2b2a77de65a6a153f46c6ec96cb2b39a0f6a15a Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 30 Jun 2020 23:38:51 +0200 Subject: [PATCH 104/410] neomutt: fix lua-devel dep --- srcpkgs/neomutt/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template index 8994d938856..cc492777177 100644 --- a/srcpkgs/neomutt/template +++ b/srcpkgs/neomutt/template @@ -14,7 +14,7 @@ conf_files="/etc/neomuttrc" hostmakedepends="docbook-xsl gettext libxslt perl tcl w3m" makedepends="aspell-devel gdbm-devel gettext-devel gpgme-devel libidn-devel rocksdb-devel tdb-devel - libnotmuch-devel libressl-devel libsasl-devel lua-devel zlib-devel" + libnotmuch-devel libressl-devel libsasl-devel lua53-devel zlib-devel" depends="mime-types" short_desc="Mutt with misc fixes and feature patches" maintainer="Toyam Cox " From 86dbd1614d26c64ca98efc698c54ea5ef4d118ad Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 30 Jun 2020 23:39:19 +0200 Subject: [PATCH 105/410] roccat-tools: rebuild for lua53 --- srcpkgs/roccat-tools/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/roccat-tools/template b/srcpkgs/roccat-tools/template index 69ad0521686..b4241e65836 100644 --- a/srcpkgs/roccat-tools/template +++ b/srcpkgs/roccat-tools/template @@ -1,15 +1,15 @@ # Template file for 'roccat-tools' pkgname=roccat-tools version=5.8.0 -revision=1 +revision=2 build_style=cmake configure_args=" -DDEVICES=arvo;isku;iskufx;kiro;kone;koneplus;konepure;konepuremilitary;konepureoptical;konextd;konextdoptical;kovaplus;kova2016;lua;nyth;pyra;ryosmk;ryosmkfx;ryostkl;savu;skeltr;sova;suora;tyon -DWITH_LUA=5.3 -DUDEVDIR=/usr/lib/udev/rules.d -DCMAKE_MODULE_PATH=${XBPS_CROSS_BASE}/usr/lib/cmake" make_dirs="/var/lib/roccat 2770 root roccat" -hostmakedepends="pkg-config glib-devel" -makedepends="lua-devel gtk+-devel libgaminggear-devel dbus-glib-devel +hostmakedepends="pkg-config glib-devel gettext" +makedepends="lua53-devel gtk+-devel libgaminggear-devel dbus-glib-devel libgudev-devel" short_desc="Roccat mouse and keyboard drivers" maintainer="Alexander Gehrke " From b8f73ca3116b358f7f3f96437bb794f6c17bce76 Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 30 Jun 2020 23:39:45 +0200 Subject: [PATCH 106/410] scite: rebuild for lua53 --- srcpkgs/scite/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/scite/template b/srcpkgs/scite/template index f0bd9dafa02..8e5294d7c1d 100644 --- a/srcpkgs/scite/template +++ b/srcpkgs/scite/template @@ -1,10 +1,10 @@ # Template file for 'scite' pkgname=scite version=4.4.3 -revision=1 +revision=2 create_wrksrc=yes hostmakedepends="pkg-config" -makedepends="gtk+-devel lua-devel" +makedepends="gtk+-devel lua53-devel" short_desc="SCIntilla based Text Editor" maintainer="Leah Neukirchen " license="MIT" From 5e746e389bacf3549268a9bcf89b36e2af34964b Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 30 Jun 2020 23:42:19 +0200 Subject: [PATCH 107/410] slurm-wlm: fix lua-devel dep --- srcpkgs/slurm-wlm/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template index 86b40a0a6cb..efa2aa3064c 100644 --- a/srcpkgs/slurm-wlm/template +++ b/srcpkgs/slurm-wlm/template @@ -8,7 +8,7 @@ build_style=gnu-configure configure_args="--disable-static" hostmakedepends="perl cgit python pkg-config" # XXX: ofed, DataWarp, netloc, blcr -makedepends="munge-devel lua-devel pam-devel libressl-devel gtk+-devel +makedepends="munge-devel lua53-devel pam-devel libressl-devel gtk+-devel ncurses-devel readline-devel libmysqlclient-devel json-c-devel libhwloc-devel freeipmi-devel" short_desc="Workload manager for Linux clusters of all sizes" From 1a62a38ec55119663c363e07132cdb9183ca9f7c Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 30 Jun 2020 23:42:40 +0200 Subject: [PATCH 108/410] suricata: fix lua-devel dep --- srcpkgs/suricata/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/suricata/template b/srcpkgs/suricata/template index f101c0a558e..1a93a7f4ee6 100644 --- a/srcpkgs/suricata/template +++ b/srcpkgs/suricata/template @@ -10,7 +10,7 @@ configure_args="--disable-gccmarch-native $(vopt_enable rust) hostmakedepends="pkg-config $(vopt_if rust cargo)" makedepends="libnet-devel libpcap-devel pcre-devel libyaml-devel libcap-ng-devel liblz4-devel liblzma-devel file-devel jansson-devel nss-devel libhtp-devel - $(vopt_if rust rust-std) $(vopt_if lua lua-devel) + $(vopt_if rust rust-std) $(vopt_if lua lua53-devel) $(vopt_if hiredis hiredis-devel)" short_desc="Suricata is a network IDS, IPS and NSM engine" maintainer="Orphaned " From 6ff6c47fe6aac129dd0749f92b3e636f67292d1c Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 30 Jun 2020 23:42:57 +0200 Subject: [PATCH 109/410] texworks: rebuild for lua53 --- srcpkgs/texworks/patches/qt515.patch | 21 +++++++++++++++++++++ srcpkgs/texworks/template | 4 ++-- 2 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/texworks/patches/qt515.patch diff --git a/srcpkgs/texworks/patches/qt515.patch b/srcpkgs/texworks/patches/qt515.patch new file mode 100644 index 00000000000..444e0e765e6 --- /dev/null +++ b/srcpkgs/texworks/patches/qt515.patch @@ -0,0 +1,21 @@ +From a5352a3a94e3685125650b65e6197de060326cc2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Stefan=20L=C3=B6ffler?= +Date: Fri, 1 May 2020 08:05:46 +0200 +Subject: [PATCH] Fix compilation with Qt 5.15 + +--- + modules/QtPDF/src/PDFBackend.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/modules/QtPDF/src/PDFBackend.cpp b/modules/QtPDF/src/PDFBackend.cpp +index 0305d87a..500d20aa 100644 +--- modules/QtPDF/src/PDFBackend.cpp ++++ modules/QtPDF/src/PDFBackend.cpp +@@ -14,6 +14,7 @@ + + #include + #include ++#include + #include + + namespace QtPDF { diff --git a/srcpkgs/texworks/template b/srcpkgs/texworks/template index c5e9a78e95b..0ad5cc23e89 100644 --- a/srcpkgs/texworks/template +++ b/srcpkgs/texworks/template @@ -1,13 +1,13 @@ # Template file for 'texworks' pkgname=texworks version=0.6.3 -revision=2 +revision=3 wrksrc="texworks-release-${version}" build_style=cmake configure_args="-DTW_BUILD_ID=Void -DWITH_LUA=ON -DWITH_PYTHON=ON -DDESIRED_QT_VERSION:STRING=5" hostmakedepends="pkg-config qt5-qmake qt5-host-tools" -makedepends="lua-devel python3-devel qt5-tools-devel qt5-script-devel +makedepends="lua53-devel python3-devel qt5-tools-devel qt5-script-devel poppler-qt5-devel hunspell-devel" depends="hunspell dejavu-fonts-ttf" short_desc="TeX editor" From 9bf6bf335e1a34228652dac82a4657adab15337f Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 30 Jun 2020 23:48:55 +0200 Subject: [PATCH 110/410] tuxc: rebuild for lua53 --- srcpkgs/tuxc/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/tuxc/template b/srcpkgs/tuxc/template index a339b7ab8eb..861291aef0b 100644 --- a/srcpkgs/tuxc/template +++ b/srcpkgs/tuxc/template @@ -1,10 +1,10 @@ # Template file for 'tuxc' pkgname=tuxc version=1.1 -revision=2 +revision=3 build_style="gnu-makefile" hostmakedepends="pkg-config" -makedepends="lua-devel" +makedepends="lua53-devel" short_desc="Modular universal package manager wrapper" maintainer="Logen Kain " license="ISC" From 2d13868b0ab0b4ee2c42dabae42e87bd9a3db725 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Wed, 1 Jul 2020 00:20:31 +0200 Subject: [PATCH 111/410] lmms: fix build w/ qt5-5.15.0 Also revbump to rebuild just in case. --- srcpkgs/lmms/patches/qt5-5.15.0.patch | 54 +++++++++++++++++++++++++++ srcpkgs/lmms/template | 9 ++++- 2 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/lmms/patches/qt5-5.15.0.patch diff --git a/srcpkgs/lmms/patches/qt5-5.15.0.patch b/srcpkgs/lmms/patches/qt5-5.15.0.patch new file mode 100644 index 00000000000..5f0798f778b --- /dev/null +++ b/srcpkgs/lmms/patches/qt5-5.15.0.patch @@ -0,0 +1,54 @@ +Source: @pullmoll +Upstream: no +Reason: qt5-5.15.0 requires explicit include for QPainterPath + +--- src/gui/AutomationPatternView.cpp 2018-11-03 02:43:42.000000000 +0100 ++++ src/gui/AutomationPatternView.cpp 2020-06-30 20:54:11.520449601 +0200 +@@ -25,6 +25,7 @@ + + #include + #include ++#include + #include + + #include "AutomationEditor.h" +--- src/gui/LmmsStyle.cpp 2018-11-03 02:43:42.000000000 +0100 ++++ src/gui/LmmsStyle.cpp 2020-06-30 22:59:34.411837701 +0200 +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + #include + #include + +--- src/gui/editors/AutomationEditor.cpp 2018-11-03 02:43:42.000000000 +0100 ++++ src/gui/editors/AutomationEditor.cpp 2020-06-30 23:03:53.262851055 +0200 +@@ -35,6 +35,7 @@ + #include + #include + #include ++#include + #include + #include + #include +--- plugins/Eq/EqSpectrumView.h 2018-11-03 02:43:42.000000000 +0100 ++++ plugins/Eq/EqSpectrumView.h 2020-06-30 23:07:48.389863185 +0200 +@@ -24,6 +24,7 @@ + #define EQSPECTRUMVIEW_H + + #include ++#include + #include + + #include "fft_helpers.h" +--- plugins/Eq/EqCurve.h 2018-11-03 02:43:42.000000000 +0100 ++++ plugins/Eq/EqCurve.h 2020-06-30 23:08:21.792864908 +0200 +@@ -27,6 +27,7 @@ + + #include + #include ++#include + #include + #include "lmms_math.h" + #include "AutomatableModelView.h" diff --git a/srcpkgs/lmms/template b/srcpkgs/lmms/template index 6948d94ce11..317fb476b71 100644 --- a/srcpkgs/lmms/template +++ b/srcpkgs/lmms/template @@ -1,7 +1,7 @@ # Template file for 'lmms' pkgname=lmms version=1.2.1 -revision=4 +revision=5 archs="~armv6*" build_style=cmake configure_args="-DWANT_QT5=ON -DWANT_WEAKJACK=OFF" @@ -21,6 +21,13 @@ checksum=5a6d1e82b00a7f54ffb8cf52eff2e0b3ff87cadbe5691917edebe51f64c26ae8 build_options="sndio" build_options_default="sndio" +# No error for several warnings +CXXFLAGS="-Wno-deprecated-declarations -Wno-class-memaccess -Wno-format-truncation" + +#pre_configure() { +# grep -rlw QString::null | xargs sed -i -e "s;QString::null;nullptr;g" +#} + post_install() { rm -f ${DESTDIR}/usr/lib/*.a } From a872cf648eb87a4a5890fb059bd24d74487e464f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Wed, 1 Jul 2020 00:23:27 +0200 Subject: [PATCH 112/410] lmms: remove trial and error trails --- srcpkgs/lmms/template | 4 ---- 1 file changed, 4 deletions(-) diff --git a/srcpkgs/lmms/template b/srcpkgs/lmms/template index 317fb476b71..31c8a9dd7ba 100644 --- a/srcpkgs/lmms/template +++ b/srcpkgs/lmms/template @@ -24,10 +24,6 @@ build_options_default="sndio" # No error for several warnings CXXFLAGS="-Wno-deprecated-declarations -Wno-class-memaccess -Wno-format-truncation" -#pre_configure() { -# grep -rlw QString::null | xargs sed -i -e "s;QString::null;nullptr;g" -#} - post_install() { rm -f ${DESTDIR}/usr/lib/*.a } From 32156cb1a23e3cb72a3944b776b45897a5b4048d Mon Sep 17 00:00:00 2001 From: q66 Date: Wed, 1 Jul 2020 00:20:12 +0200 Subject: [PATCH 113/410] lutok: rebuild for lua53 --- srcpkgs/lutok/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/lutok/template b/srcpkgs/lutok/template index ec22650fc20..ca4672503b2 100644 --- a/srcpkgs/lutok/template +++ b/srcpkgs/lutok/template @@ -1,11 +1,11 @@ # Template file for 'lutok' pkgname=lutok version=0.4 -revision=6 +revision=7 build_style=gnu-configure configure_args="--with-doxygen" hostmakedepends="pkg-config doxygen tar" -makedepends="lua-devel" +makedepends="lua53-devel" short_desc="Lightweight C++ API for Lua" maintainer="Orphaned " license="BSD-3-Clause" @@ -17,7 +17,7 @@ post_install() { vlicense COPYING } lutok-devel_package() { - depends="lua-devel lutok>=${version}_${revision}" + depends="lua53-devel lutok>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include From 76d39f0848e9a5094fc155a2082d2287aa905dce Mon Sep 17 00:00:00 2001 From: q66 Date: Wed, 1 Jul 2020 00:29:17 +0200 Subject: [PATCH 114/410] lua-lpeg: add 5.4 support, rename to lua54-lpeg --- srcpkgs/lua-lpeg | 1 + srcpkgs/lua51-lpeg | 2 +- srcpkgs/lua52-lpeg | 2 +- srcpkgs/lua53-lpeg | 1 + srcpkgs/{lua-lpeg => lua54-lpeg}/template | 45 ++++++++++++++++++----- srcpkgs/{lua-lpeg => lua54-lpeg}/update | 0 6 files changed, 39 insertions(+), 12 deletions(-) create mode 120000 srcpkgs/lua-lpeg create mode 120000 srcpkgs/lua53-lpeg rename srcpkgs/{lua-lpeg => lua54-lpeg}/template (62%) rename srcpkgs/{lua-lpeg => lua54-lpeg}/update (100%) diff --git a/srcpkgs/lua-lpeg b/srcpkgs/lua-lpeg new file mode 120000 index 00000000000..0fe4aab7f3d --- /dev/null +++ b/srcpkgs/lua-lpeg @@ -0,0 +1 @@ +lua54-lpeg \ No newline at end of file diff --git a/srcpkgs/lua51-lpeg b/srcpkgs/lua51-lpeg index 2e6f1b22b2f..0fe4aab7f3d 120000 --- a/srcpkgs/lua51-lpeg +++ b/srcpkgs/lua51-lpeg @@ -1 +1 @@ -lua-lpeg \ No newline at end of file +lua54-lpeg \ No newline at end of file diff --git a/srcpkgs/lua52-lpeg b/srcpkgs/lua52-lpeg index 2e6f1b22b2f..0fe4aab7f3d 120000 --- a/srcpkgs/lua52-lpeg +++ b/srcpkgs/lua52-lpeg @@ -1 +1 @@ -lua-lpeg \ No newline at end of file +lua54-lpeg \ No newline at end of file diff --git a/srcpkgs/lua53-lpeg b/srcpkgs/lua53-lpeg new file mode 120000 index 00000000000..0fe4aab7f3d --- /dev/null +++ b/srcpkgs/lua53-lpeg @@ -0,0 +1 @@ +lua54-lpeg \ No newline at end of file diff --git a/srcpkgs/lua-lpeg/template b/srcpkgs/lua54-lpeg/template similarity index 62% rename from srcpkgs/lua-lpeg/template rename to srcpkgs/lua54-lpeg/template index 177f27cc1dd..dd13eb59014 100644 --- a/srcpkgs/lua-lpeg/template +++ b/srcpkgs/lua54-lpeg/template @@ -1,17 +1,17 @@ -# Template file for 'lua-lpeg' -pkgname=lua-lpeg +# Template file for 'lua54-lpeg' +pkgname=lua54-lpeg version=1.0.2 -revision=1 -wrksrc="${pkgname#lua-}-${version}" -hostmakedepends="lua lua51 lua52" -makedepends="lua-devel lua51-devel lua52-devel" -depends="lua>=5.3" +revision=2 +wrksrc="lpeg-${version}" +hostmakedepends="lua51 lua52 lua53 lua54" +makedepends="lua51-devel lua52-devel lua53-devel lua54-devel" +depends="lua>=5.4" _desc="Pattern-matching library for Lua based on Parsing Expression Grammars" -short_desc="${_desc} (5.3.x)" +short_desc="${_desc} (5.4.x)" maintainer="Tj Vanderpoel (bougyman) " license="MIT" homepage="http://www.inf.puc-rio.br/~roberto/lpeg/" -distfiles="${homepage}/${pkgname#lua-}-${version}.tar.gz" +distfiles="${homepage}/lpeg-${version}.tar.gz" checksum=48d66576051b6c78388faad09b70493093264588fcd0f258ddaab1cdd4a15ffe post_extract() { @@ -19,6 +19,7 @@ post_extract() { mv * lua51 || true cp -a lua51 lua52 cp -a lua51 lua53 + cp -a lua51 lua54 } do_build() { @@ -33,6 +34,10 @@ do_build() { cd ${wrksrc}/lua53 make CC=$CC DLLFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.3 -fPIC" \ LUADIR="${XBPS_CROSS_BASE}/usr/include/lua5.3" ${makejobs} + + cd ${wrksrc}/lua54 + make CC=$CC DLLFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.4 -fPIC" \ + LUADIR="${XBPS_CROSS_BASE}/usr/include/lua5.4" ${makejobs} } do_install() { @@ -47,6 +52,10 @@ do_install() { cd ${wrksrc}/lua53 vinstall lpeg.so 755 usr/lib/lua/5.3/ vinstall re.lua 644 usr/share/lua/5.3/ + + cd ${wrksrc}/lua54 + vinstall lpeg.so 755 usr/lib/lua/5.4/ + vinstall re.lua 644 usr/share/lua/5.4/ vlicense lpeg.html } @@ -56,7 +65,7 @@ lua51-lpeg_package() { pkg_install() { vmove usr/lib/lua/5.1 vmove usr/share/lua/5.1 - vlicense ${wrksrc}/lua52/lpeg.html + vlicense ${wrksrc}/lua51/lpeg.html } } @@ -69,3 +78,19 @@ lua52-lpeg_package() { vlicense ${wrksrc}/lua52/lpeg.html } } + +lua53-lpeg_package() { + depends="lua53" + short_desc="${_desc} (5.3.x)" + pkg_install() { + vmove usr/lib/lua/5.3 + vmove usr/share/lua/5.3 + vlicense ${wrksrc}/lua53/lpeg.html + } +} + +lua-lpeg_package() { + depends="lua53-lpeg>=${version}_${revision}" + short_desc+="${_desc} (5.3.x) (transitional dummy package)" + build_style=meta +} diff --git a/srcpkgs/lua-lpeg/update b/srcpkgs/lua54-lpeg/update similarity index 100% rename from srcpkgs/lua-lpeg/update rename to srcpkgs/lua54-lpeg/update From 54a3cc182aa031e2c57ccf69d2bf77bb50d55a0f Mon Sep 17 00:00:00 2001 From: q66 Date: Wed, 1 Jul 2020 00:33:57 +0200 Subject: [PATCH 115/410] vis: rebuild against lua53 --- srcpkgs/vis/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/vis/template b/srcpkgs/vis/template index d5fc46daff3..b00b99a184c 100644 --- a/srcpkgs/vis/template +++ b/srcpkgs/vis/template @@ -1,10 +1,10 @@ # Template file for 'vis' pkgname=vis version=0.6 -revision=1 +revision=2 build_style=gnu-configure -makedepends="libtermkey-devel lua-devel" -depends="lua-lpeg" +makedepends="libtermkey-devel lua53-devel" +depends="lua53-lpeg" short_desc="Tiny vim like editor" maintainer="Diogo Leal " license="ISC" From b4476802172f66d95ad15f827429c780e849de4c Mon Sep 17 00:00:00 2001 From: fosslinux Date: Sat, 27 Jun 2020 08:57:00 +1000 Subject: [PATCH 116/410] python3-repoze.sphinx.autointerface: patch for sphinx 3.x. Close: #23257 --- .../patches/sphinx3.patch | 60 +++++++++++++++++++ .../template | 5 +- 2 files changed, 63 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/python3-repoze.sphinx.autointerface/patches/sphinx3.patch diff --git a/srcpkgs/python3-repoze.sphinx.autointerface/patches/sphinx3.patch b/srcpkgs/python3-repoze.sphinx.autointerface/patches/sphinx3.patch new file mode 100644 index 00000000000..7611b89a2b3 --- /dev/null +++ b/srcpkgs/python3-repoze.sphinx.autointerface/patches/sphinx3.patch @@ -0,0 +1,60 @@ +From f1ce0d2f790ebd8e1158ac8e4a1d04715053fc38 Mon Sep 17 00:00:00 2001 +From: Fred Drake +Date: Tue, 24 Mar 2020 15:01:46 -0400 +Subject: [PATCH] update to work with newer sphinx + +- avoid sphinx.util.force_decode on python 3.x +- support sphinx 3.x: + * Sphinx.domains -> Sphinx.registry.domains + * Sphinx.override_domain(D) -> Sphinx.add_domain(D, override=True) +--- + repoze/sphinx/autointerface.py | 26 ++++++++++++++++++++++---- + +Modified by fosslinux. + +diff --git repoze/sphinx/autointerface.py repoze/sphinx/autointerface.py +index 597567e..147c790 100644 +--- repoze/sphinx/autointerface.py ++++ repoze/sphinx/autointerface.py +@@ -1,2 +1,10 @@ + from zope.interface.interface import InterfaceClass + ++ ++if sys.version_info < (3,): ++ from sphinx.util import force_decode ++else: ++ def force_decode(s, encoding): ++ return s ++ ++ +@@ -117,17 +117,27 @@ + + from sphinx.domains import ObjType + ++ try: ++ domains = app.domains ++ except AttributeError: ++ domains = app.registry.domains ++ + # Allow the :class: directive to xref interface objects through the search + # mechanism, i.e., prefixed with a '.', like :class:`.ITheInterface` + # (without this, an exact match is required) +- class InterfacePythonDomain(app.domains['py']): ++ class InterfacePythonDomain(domains['py']): + pass +- InterfacePythonDomain.object_types = app.domains['py'].object_types.copy() ++ InterfacePythonDomain.object_types = domains['py'].object_types.copy() + InterfacePythonDomain.object_types['interface'] = ObjType( 'interface', 'interface', 'obj', 'class') + old_class = InterfacePythonDomain.object_types['class'] + new_class = ObjType( old_class.lname, *(old_class.roles + ('interface',)), **old_class.attrs ) + InterfacePythonDomain.object_types['class'] = new_class +- app.override_domain( InterfacePythonDomain ) ++ ++ if hasattr(app, 'override_domain'): ++ app.override_domain( InterfacePythonDomain ) ++ else: ++ app.add_domain( InterfacePythonDomain, override=True ) ++ + except AttributeError: + # Sphinx < 1.0 + app.add_directive('interface', InterfaceDesc) diff --git a/srcpkgs/python3-repoze.sphinx.autointerface/template b/srcpkgs/python3-repoze.sphinx.autointerface/template index f0352fc9b7e..684c7f90d05 100644 --- a/srcpkgs/python3-repoze.sphinx.autointerface/template +++ b/srcpkgs/python3-repoze.sphinx.autointerface/template @@ -1,12 +1,13 @@ # Template file for 'python3-repoze.sphinx.autointerface' pkgname=python3-repoze.sphinx.autointerface version=0.8 -revision=2 +revision=3 archs=noarch wrksrc="repoze.sphinx.autointerface-${version}" build_style=python3-module hostmakedepends="python3-setuptools" -depends="python3-zope.interface" +depends="python3-zope.interface python3-Sphinx python3-setuptools" +checkdepends="$depends" short_desc="Sphinx extension to auto-generate API docs from Zope interfaces" maintainer="Alex Childs " license="BSD-4-Clause" From 8760089e55fa609570029ebfcf47081d33ed4c58 Mon Sep 17 00:00:00 2001 From: Anthony Iliopoulos Date: Tue, 23 Jun 2020 23:39:48 +0200 Subject: [PATCH 117/410] sparse: update to 0.6.2. --- srcpkgs/sparse/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/sparse/template b/srcpkgs/sparse/template index 206ccedeab1..ae09d557e10 100644 --- a/srcpkgs/sparse/template +++ b/srcpkgs/sparse/template @@ -1,6 +1,6 @@ # Template file for 'sparse' pkgname=sparse -version=0.6.1 +version=0.6.2 revision=1 build_style=gnu-makefile make_use_env=yes @@ -9,7 +9,7 @@ maintainer="Anthony Iliopoulos " license="MIT" homepage="https://git.kernel.org/pub/scm/devel/sparse/sparse.git" distfiles="${homepage}/snapshot/${pkgname}-${version}.tar.gz" -checksum=b0502efa4c4d60d718b089af5659c40e1f972c1e246d59de1150a5e828d703ea +checksum=039d66953691e15e350534c7041721276552a147ed6ac83709dce141306614b3 pre_build() { make_build_args="CC=$CC LD=$CC AR=$AR" From b3f3cc55e899b19c8085affb3a81bee2d551f5dc Mon Sep 17 00:00:00 2001 From: q66 Date: Wed, 1 Jul 2020 04:34:33 +0200 Subject: [PATCH 118/410] lua54-lpeg: fix dependencies --- srcpkgs/lua54-lpeg/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/lua54-lpeg/template b/srcpkgs/lua54-lpeg/template index dd13eb59014..71e0e0175a5 100644 --- a/srcpkgs/lua54-lpeg/template +++ b/srcpkgs/lua54-lpeg/template @@ -1,11 +1,11 @@ # Template file for 'lua54-lpeg' pkgname=lua54-lpeg version=1.0.2 -revision=2 +revision=3 wrksrc="lpeg-${version}" hostmakedepends="lua51 lua52 lua53 lua54" makedepends="lua51-devel lua52-devel lua53-devel lua54-devel" -depends="lua>=5.4" +depends="lua54" _desc="Pattern-matching library for Lua based on Parsing Expression Grammars" short_desc="${_desc} (5.4.x)" maintainer="Tj Vanderpoel (bougyman) " From c9777a82758a1eae6f92fa236a58fe7a8fb2b7ed Mon Sep 17 00:00:00 2001 From: q66 Date: Wed, 1 Jul 2020 04:06:38 +0200 Subject: [PATCH 119/410] lua-cjson: add 5.4 support, properly version --- srcpkgs/lua-cjson | 1 + srcpkgs/lua51-cjson | 2 +- srcpkgs/lua52-cjson | 2 +- srcpkgs/lua53-cjson | 1 + srcpkgs/{lua-cjson => lua54-cjson}/template | 42 +++++++++++++++------ 5 files changed, 34 insertions(+), 14 deletions(-) create mode 120000 srcpkgs/lua-cjson create mode 120000 srcpkgs/lua53-cjson rename srcpkgs/{lua-cjson => lua54-cjson}/template (52%) diff --git a/srcpkgs/lua-cjson b/srcpkgs/lua-cjson new file mode 120000 index 00000000000..da5aa9861b9 --- /dev/null +++ b/srcpkgs/lua-cjson @@ -0,0 +1 @@ +lua54-cjson \ No newline at end of file diff --git a/srcpkgs/lua51-cjson b/srcpkgs/lua51-cjson index b379c087453..da5aa9861b9 120000 --- a/srcpkgs/lua51-cjson +++ b/srcpkgs/lua51-cjson @@ -1 +1 @@ -lua-cjson \ No newline at end of file +lua54-cjson \ No newline at end of file diff --git a/srcpkgs/lua52-cjson b/srcpkgs/lua52-cjson index b379c087453..da5aa9861b9 120000 --- a/srcpkgs/lua52-cjson +++ b/srcpkgs/lua52-cjson @@ -1 +1 @@ -lua-cjson \ No newline at end of file +lua54-cjson \ No newline at end of file diff --git a/srcpkgs/lua53-cjson b/srcpkgs/lua53-cjson new file mode 120000 index 00000000000..da5aa9861b9 --- /dev/null +++ b/srcpkgs/lua53-cjson @@ -0,0 +1 @@ +lua54-cjson \ No newline at end of file diff --git a/srcpkgs/lua-cjson/template b/srcpkgs/lua54-cjson/template similarity index 52% rename from srcpkgs/lua-cjson/template rename to srcpkgs/lua54-cjson/template index b2703270328..c74cfc667fe 100644 --- a/srcpkgs/lua-cjson/template +++ b/srcpkgs/lua54-cjson/template @@ -1,25 +1,27 @@ -# Template file for 'lua-cjson' -pkgname=lua-cjson +# Template file for 'lua54-cjson' +pkgname=lua54-cjson version=2.1.0 -revision=1 +revision=2 create_wrksrc=yes -hostmakedepends="lua lua51 lua52" -makedepends="lua-devel lua51-devel lua52-devel" -depends="lua>=5.3" -short_desc="JSON support for Lua" +hostmakedepends="lua51 lua52 lua53 lua54" +makedepends="lua51-devel lua52-devel lua53-devel lua54-devel" +depends="lua54" +_desc="JSON support for Lua" +short_desc="${_desc} (5.4.x)" maintainer="Denis Revin " license="MIT" homepage="http://www.kyne.com.au/~mark/software/lua-cjson.php" -distfiles="http://www.kyne.com.au/~mark/software/download/${pkgname}-${version}.tar.gz" +distfiles="http://www.kyne.com.au/~mark/software/download/lua-cjson-${version}.tar.gz" checksum=51bc69cd55931e0cba2ceae39e9efa2483f4292da3a88a1ed470eda829f6c778 post_extract() { mv "lua-cjson-${version}" lua51 cp -a lua51 lua52 cp -a lua51 lua53 + cp -a lua51 lua54 } do_build() { - for x in lua51 lua52 lua53; do + for x in lua51 lua52 lua53 lua54; do make -C "$x" \ CC=$CC CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ LUA_VERSION="5.${x#lua5}" USE_INTERNAL_FPCONV=1 \ @@ -27,7 +29,7 @@ do_build() { done } do_install() { - for x in lua51 lua52 lua53; do + for x in lua51 lua52 lua53 lua54; do vinstall "$x/cjson.so" 755 "usr/lib/lua/5.${x#lua5}" done vlicense lua53/LICENSE @@ -35,17 +37,33 @@ do_install() { lua51-cjson_package() { depends="lua51" - short_desc+=" (5.1)" + short_desc="${_desc} (5.1.x)" pkg_install() { vmove usr/lib/lua/5.1 vlicense ${wrksrc}/lua51/LICENSE } } + lua52-cjson_package() { depends="lua52" - short_desc+=" (5.2)" + short_desc="${_desc} (5.2.x)" pkg_install() { vmove usr/lib/lua/5.2 vlicense ${wrksrc}/lua52/LICENSE } } + +lua53-cjson_package() { + depends="lua53" + short_desc="${_desc} (5.3.x)" + pkg_install() { + vmove usr/lib/lua/5.3 + vlicense ${wrksrc}/lua53/LICENSE + } +} + +lua-cjson_package() { + depends="lua53-cjson>=${version}_${revision}" + short_desc+="${_desc} (5.3.x) (transitional dummy package)" + build_style=meta +} From ff447eca6deb164278e035e18944e822556cc196 Mon Sep 17 00:00:00 2001 From: q66 Date: Wed, 1 Jul 2020 04:14:05 +0200 Subject: [PATCH 120/410] lua-luadbi: add 5.4 support, properly version --- srcpkgs/lua-luadbi | 1 + srcpkgs/lua51-luadbi | 2 +- srcpkgs/lua52-luadbi | 2 +- srcpkgs/lua53-luadbi | 1 + srcpkgs/{lua-luadbi => lua54-luadbi}/template | 51 ++++++++++++++----- 5 files changed, 42 insertions(+), 15 deletions(-) create mode 120000 srcpkgs/lua-luadbi create mode 120000 srcpkgs/lua53-luadbi rename srcpkgs/{lua-luadbi => lua54-luadbi}/template (67%) diff --git a/srcpkgs/lua-luadbi b/srcpkgs/lua-luadbi new file mode 120000 index 00000000000..c255838a5d7 --- /dev/null +++ b/srcpkgs/lua-luadbi @@ -0,0 +1 @@ +lua54-luadbi \ No newline at end of file diff --git a/srcpkgs/lua51-luadbi b/srcpkgs/lua51-luadbi index 7804b6f228e..c255838a5d7 120000 --- a/srcpkgs/lua51-luadbi +++ b/srcpkgs/lua51-luadbi @@ -1 +1 @@ -lua-luadbi \ No newline at end of file +lua54-luadbi \ No newline at end of file diff --git a/srcpkgs/lua52-luadbi b/srcpkgs/lua52-luadbi index 7804b6f228e..c255838a5d7 120000 --- a/srcpkgs/lua52-luadbi +++ b/srcpkgs/lua52-luadbi @@ -1 +1 @@ -lua-luadbi \ No newline at end of file +lua54-luadbi \ No newline at end of file diff --git a/srcpkgs/lua53-luadbi b/srcpkgs/lua53-luadbi new file mode 120000 index 00000000000..c255838a5d7 --- /dev/null +++ b/srcpkgs/lua53-luadbi @@ -0,0 +1 @@ +lua54-luadbi \ No newline at end of file diff --git a/srcpkgs/lua-luadbi/template b/srcpkgs/lua54-luadbi/template similarity index 67% rename from srcpkgs/lua-luadbi/template rename to srcpkgs/lua54-luadbi/template index 8036549b322..9bc471cfde8 100644 --- a/srcpkgs/lua-luadbi/template +++ b/srcpkgs/lua54-luadbi/template @@ -1,17 +1,18 @@ -# Template file for 'lua-luadbi' -pkgname=lua-luadbi +# Template file for 'lua54-luadbi' +pkgname=lua54-luadbi version=0.5 -revision=2 -makedepends="lua-devel lua51-devel lua52-devel sqlite-devel postgresql-libs-devel libmysqlclient-devel" +revision=3 +wrksrc="luadbi-${version}" +create_wrksrc="yes" +makedepends="lua51-devel lua52-devel lua53-devel lua54-devel sqlite-devel + postgresql-libs-devel libmysqlclient-devel" _desc="Lua database interface library" -short_desc="${_desc} - Lua 5.3" +short_desc="${_desc} (5.4.x)" maintainer="John Regan " license="MIT" homepage="https://code.google.com/archive/p/luadbi/" distfiles="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/luadbi/luadbi.$version.tar.gz" -wrksrc="${pkgname#lua-}-${version}" checksum=49116458dd80052536bf5d7e2b2a1f5a0fa42a671ce77f1cb7355ef7faeb331e -create_wrksrc="yes" post_extract() { cd ${wrksrc} @@ -19,6 +20,7 @@ post_extract() { mv * lua51 || true cp -a lua51 lua52 cp -a lua51 lua53 + cp -a lua51 lua54 } _common_cflags="-pedantic -Wall -O2 -shared -fpic -I${XBPS_CROSS_BASE}/usr/include/mysql -I${XBPS_CROSS_BASE}/usr/include/postgresql/server -I." @@ -37,6 +39,8 @@ do_build() { cd ${wrksrc}/lua53 make CC="$CC" AR="$AR" RANLIB="$RANLIB" CFLAGS="${_common_cflags} -I${XBPS_CROSS_BASE}/usr/include/lua5.3" ${makejobs} free + cd ${wrksrc}/lua54 + make CC="$CC" AR="$AR" RANLIB="$RANLIB" CFLAGS="${_common_cflags} -I${XBPS_CROSS_BASE}/usr/include/lua5.4" ${makejobs} free } do_install() { @@ -57,11 +61,26 @@ do_install() { vinstall ${lib} 755 usr/lib/lua/5.3 done vinstall DBI.lua 644 usr/share/lua/5.3/ + + cd ${wrksrc}/lua54 + for lib in *.so; do + vinstall ${lib} 755 usr/lib/lua/5.4 + done + vinstall DBI.lua 644 usr/share/lua/5.4/ vlicense COPYING } +lua51-luadbi_package() { + short_desc="${_desc} (5.1.x)" + pkg_install() { + vmove usr/lib/lua/5.1 + vmove usr/share/lua/5.1 + vlicense ${wrksrc}/lua51/COPYING + } +} + lua52-luadbi_package() { - short_desc="${_desc} - Lua 5.2" + short_desc="${_desc} (5.2.x)" pkg_install() { vmove usr/lib/lua/5.2 vmove usr/share/lua/5.2 @@ -69,11 +88,17 @@ lua52-luadbi_package() { } } -lua51-luadbi_package() { - short_desc="${_desc} - Lua 5.1" +lua53-luadbi_package() { + short_desc="${_desc} (5.3.x)" pkg_install() { - vmove usr/lib/lua/5.1 - vmove usr/share/lua/5.1 - vlicense ${wrksrc}/lua51/COPYING + vmove usr/lib/lua/5.3 + vmove usr/share/lua/5.3 + vlicense ${wrksrc}/lua53/COPYING } } + +lua-luadbi_package() { + depends="lua53-luadbi>=${version}_${revision}" + short_desc+="${_desc} (5.3.x) (transitional dummy package)" + build_style=meta +} From 1f8bd5f2093af7ba63d296299556e49b5e3c5684 Mon Sep 17 00:00:00 2001 From: q66 Date: Wed, 1 Jul 2020 04:21:31 +0200 Subject: [PATCH 121/410] lua-lualdap: add 5.4 support, properly version --- srcpkgs/lua-lualdap | 1 + srcpkgs/lua51-lualdap | 2 +- srcpkgs/lua52-lualdap | 2 +- srcpkgs/lua53-lualdap | 1 + srcpkgs/lua54-lualdap/patches/lua54.patch | 17 ++++++++ .../{lua-lualdap => lua54-lualdap}/template | 40 +++++++++++++------ 6 files changed, 49 insertions(+), 14 deletions(-) create mode 120000 srcpkgs/lua-lualdap create mode 120000 srcpkgs/lua53-lualdap create mode 100644 srcpkgs/lua54-lualdap/patches/lua54.patch rename srcpkgs/{lua-lualdap => lua54-lualdap}/template (64%) diff --git a/srcpkgs/lua-lualdap b/srcpkgs/lua-lualdap new file mode 120000 index 00000000000..ad1d96d68f0 --- /dev/null +++ b/srcpkgs/lua-lualdap @@ -0,0 +1 @@ +lua54-lualdap \ No newline at end of file diff --git a/srcpkgs/lua51-lualdap b/srcpkgs/lua51-lualdap index 27333fc92f7..ad1d96d68f0 120000 --- a/srcpkgs/lua51-lualdap +++ b/srcpkgs/lua51-lualdap @@ -1 +1 @@ -lua-lualdap \ No newline at end of file +lua54-lualdap \ No newline at end of file diff --git a/srcpkgs/lua52-lualdap b/srcpkgs/lua52-lualdap index 27333fc92f7..ad1d96d68f0 120000 --- a/srcpkgs/lua52-lualdap +++ b/srcpkgs/lua52-lualdap @@ -1 +1 @@ -lua-lualdap \ No newline at end of file +lua54-lualdap \ No newline at end of file diff --git a/srcpkgs/lua53-lualdap b/srcpkgs/lua53-lualdap new file mode 120000 index 00000000000..ad1d96d68f0 --- /dev/null +++ b/srcpkgs/lua53-lualdap @@ -0,0 +1 @@ +lua54-lualdap \ No newline at end of file diff --git a/srcpkgs/lua54-lualdap/patches/lua54.patch b/srcpkgs/lua54-lualdap/patches/lua54.patch new file mode 100644 index 00000000000..733d72a78ab --- /dev/null +++ b/srcpkgs/lua54-lualdap/patches/lua54.patch @@ -0,0 +1,17 @@ +--- src/compat-5.3.h ++++ src/compat-5.3.h +@@ -399,11 +399,11 @@ COMPAT53_API void luaL_requiref (lua_State *L, const char *modname, + + + /* other Lua versions */ +-#if !defined(LUA_VERSION_NUM) || LUA_VERSION_NUM < 501 || LUA_VERSION_NUM > 503 ++#if !defined(LUA_VERSION_NUM) || LUA_VERSION_NUM < 501 || LUA_VERSION_NUM > 504 + +-# error "unsupported Lua version (i.e. not Lua 5.1, 5.2, or 5.3)" ++# error "unsupported Lua version (i.e. not Lua 5.1, 5.2, 5.3 or 5.4)" + +-#endif /* other Lua versions except 5.1, 5.2, and 5.3 */ ++#endif /* other Lua versions except 5.1, 5.2, 5.3 and 5.4 */ + + + diff --git a/srcpkgs/lua-lualdap/template b/srcpkgs/lua54-lualdap/template similarity index 64% rename from srcpkgs/lua-lualdap/template rename to srcpkgs/lua54-lualdap/template index 0fb91565b5b..419985a3c11 100644 --- a/srcpkgs/lua-lualdap/template +++ b/srcpkgs/lua54-lualdap/template @@ -1,28 +1,30 @@ -# Template file for 'lua-lualdap' -pkgname=lua-lualdap +# Template file for 'lua54-lualdap' +pkgname=lua54-lualdap version=1.2.5 -revision=1 +revision=2 wrksrc="lualdap-${version}" build_style=gnu-makefile hostmakedepends="pkg-config" -makedepends="lua51-devel lua52-devel lua-devel libldap-devel" -short_desc="LDAP bindings for Lua" +makedepends="lua51-devel lua52-devel lua53-devel lua54-devel libldap-devel" +_desc="LDAP bindings for Lua" +short_desc="${_desc} (5.4.x)" maintainer="John Regan " license="MIT" homepage="https://github.com/lualdap/lualdap" distfiles="https://github.com/lualdap/lualdap/archive/v${version}.tar.gz" checksum=3e028faa6a5798cf2f3d50b9853b9b3fb6eb562b62010747bd5b6f50b57bb1cc -post_extract() { +post_patch() { cd ${wrksrc} mkdir -p lua51 - mv * lua51 || : + mv * lua51 || true cp -a lua51 lua52 cp -a lua51 lua53 + cp -a lua51 lua54 } do_build() { - for luaver in 5.1 5.2 5.3; do + for luaver in 5.1 5.2 5.3 5.4; do cd ${wrksrc}/lua${luaver//.} vsed -i "s|^LUA_VERSION.*|LUA_VERSION = ${luaver}|g" config make \ @@ -36,7 +38,7 @@ do_build() { } do_install() { - for luaver in 5.1 5.2 5.3; do + for luaver in 5.1 5.2 5.3 5.4; do vmkdir usr/lib/lua/$luaver cd ${wrksrc}/lua${luaver//.} make \ @@ -48,11 +50,11 @@ do_install() { DESTDIR="${DESTDIR}" \ install done - vlicense ${wrksrc}/lua53/LICENSE.md + vlicense ${wrksrc}/lua54/LICENSE.md } lua51-lualdap_package() { - short_desc+=" - Lua 5.1" + short_desc="${_desc} (5.1.x)" pkg_install() { vmove usr/lib/lua/5.1 vlicense lua51/LICENSE.md @@ -60,9 +62,23 @@ lua51-lualdap_package() { } lua52-lualdap_package() { - short_desc+=" - Lua 5.2" + short_desc="${_desc} (5.2.x)" pkg_install() { vmove usr/lib/lua/5.2 vlicense lua52/LICENSE.md } } + +lua53-lualdap_package() { + short_desc="${_desc} (5.3.x)" + pkg_install() { + vmove usr/lib/lua/5.3 + vlicense lua53/LICENSE.md + } +} + +lua-lualdap_package() { + depends="lua53-lualdap>=${version}_${revision}" + short_desc+="${_desc} (5.3.x) (transitional dummy package)" + build_style=meta +} From 43f50a7d2acf73144fbb8e375f16f4580f4758eb Mon Sep 17 00:00:00 2001 From: q66 Date: Wed, 1 Jul 2020 04:26:51 +0200 Subject: [PATCH 122/410] lua-zlib: add 5.4 support, properly version --- srcpkgs/lua-zlib | 1 + srcpkgs/lua51-zlib | 2 +- srcpkgs/lua52-zlib | 2 +- srcpkgs/lua53-zlib | 1 + srcpkgs/{lua-zlib => lua54-zlib}/template | 35 +++++++++++++++++------ 5 files changed, 30 insertions(+), 11 deletions(-) create mode 120000 srcpkgs/lua-zlib create mode 120000 srcpkgs/lua53-zlib rename srcpkgs/{lua-zlib => lua54-zlib}/template (70%) diff --git a/srcpkgs/lua-zlib b/srcpkgs/lua-zlib new file mode 120000 index 00000000000..0c83671d18c --- /dev/null +++ b/srcpkgs/lua-zlib @@ -0,0 +1 @@ +lua54-zlib \ No newline at end of file diff --git a/srcpkgs/lua51-zlib b/srcpkgs/lua51-zlib index 7625f861936..0c83671d18c 120000 --- a/srcpkgs/lua51-zlib +++ b/srcpkgs/lua51-zlib @@ -1 +1 @@ -lua-zlib \ No newline at end of file +lua54-zlib \ No newline at end of file diff --git a/srcpkgs/lua52-zlib b/srcpkgs/lua52-zlib index 7625f861936..0c83671d18c 120000 --- a/srcpkgs/lua52-zlib +++ b/srcpkgs/lua52-zlib @@ -1 +1 @@ -lua-zlib \ No newline at end of file +lua54-zlib \ No newline at end of file diff --git a/srcpkgs/lua53-zlib b/srcpkgs/lua53-zlib new file mode 120000 index 00000000000..0c83671d18c --- /dev/null +++ b/srcpkgs/lua53-zlib @@ -0,0 +1 @@ +lua54-zlib \ No newline at end of file diff --git a/srcpkgs/lua-zlib/template b/srcpkgs/lua54-zlib/template similarity index 70% rename from srcpkgs/lua-zlib/template rename to srcpkgs/lua54-zlib/template index dfb6701cb62..7f78d9410f5 100644 --- a/srcpkgs/lua-zlib/template +++ b/srcpkgs/lua54-zlib/template @@ -1,11 +1,13 @@ -# Template file for 'lua-zlib' -pkgname=lua-zlib +# Template file for 'lua54-zlib' +pkgname=lua54-zlib version=1.2 -revision=1 +revision=2 +wrksrc="lua-zlib-${version}" build_style=gnu-makefile hostmakedepends="pkg-config" -makedepends="lua51-devel lua52-devel lua-devel zlib-devel" -short_desc="Zlib streamng interface for lua" +makedepends="lua51-devel lua52-devel lua53-devel lua54-devel zlib-devel" +_desc="Zlib streamng interface for lua" +short_desc="${_desc} (5.4.x)" maintainer="John Regan " license="MIT" homepage="https://github.com/brimworks/lua-zlib/" @@ -17,10 +19,11 @@ post_extract() { mv * lua51 || true cp -a lua51 lua52 cp -a lua51 lua53 + cp -a lua51 lua54 } do_build() { - for luaver in 5.1 5.2 5.3; do + for luaver in 5.1 5.2 5.3 5.4; do ( cd lua${luaver//.} make \ @@ -37,7 +40,7 @@ do_build() { } do_install() { - for luaver in 5.1 5.2 5.3; do + for luaver in 5.1 5.2 5.3 5.4; do ( mkdir -p "${DESTDIR}/$(pkg-config --variable=INSTALL_CMOD lua${luaver})" cd lua${luaver//.} @@ -57,7 +60,7 @@ do_install() { } lua51-zlib_package() { - short_desc+=" - Lua 5.1" + short_desc="${_desc} (5.1.x)" pkg_install() { vmove usr/lib/lua/5.1 vlicense "${wrksrc}/lua51/README" @@ -65,9 +68,23 @@ lua51-zlib_package() { } lua52-zlib_package() { - short_desc+=" - Lua 5.2" + short_desc="${_desc} (5.2.x)" pkg_install() { vmove usr/lib/lua/5.2 vlicense "${wrksrc}/lua52/README" } } + +lua53-zlib_package() { + short_desc="${_desc} (5.3.x)" + pkg_install() { + vmove usr/lib/lua/5.3 + vlicense "${wrksrc}/lua53/README" + } +} + +lua-zlib_package() { + depends="lua53-zlib>=${version}_${revision}" + short_desc+="${_desc} (5.3.x) (transitional dummy package)" + build_style=meta +} From 6ec6e958b617bbf921384d8adde6a2b738c459a9 Mon Sep 17 00:00:00 2001 From: q66 Date: Wed, 1 Jul 2020 04:47:34 +0200 Subject: [PATCH 123/410] lua-stdlib-debug: add 5.4, properly version --- srcpkgs/lua-stdlib-debug | 1 + srcpkgs/lua51-stdlib-debug | 2 +- srcpkgs/lua52-stdlib-debug | 2 +- srcpkgs/lua53-stdlib-debug | 1 + .../template | 35 ++++++++++++++----- 5 files changed, 31 insertions(+), 10 deletions(-) create mode 120000 srcpkgs/lua-stdlib-debug create mode 120000 srcpkgs/lua53-stdlib-debug rename srcpkgs/{lua-stdlib-debug => lua54-stdlib-debug}/template (56%) diff --git a/srcpkgs/lua-stdlib-debug b/srcpkgs/lua-stdlib-debug new file mode 120000 index 00000000000..7dd63b8c592 --- /dev/null +++ b/srcpkgs/lua-stdlib-debug @@ -0,0 +1 @@ +lua54-stdlib-debug \ No newline at end of file diff --git a/srcpkgs/lua51-stdlib-debug b/srcpkgs/lua51-stdlib-debug index 69cde51cc4a..7dd63b8c592 120000 --- a/srcpkgs/lua51-stdlib-debug +++ b/srcpkgs/lua51-stdlib-debug @@ -1 +1 @@ -lua-stdlib-debug \ No newline at end of file +lua54-stdlib-debug \ No newline at end of file diff --git a/srcpkgs/lua52-stdlib-debug b/srcpkgs/lua52-stdlib-debug index 69cde51cc4a..7dd63b8c592 120000 --- a/srcpkgs/lua52-stdlib-debug +++ b/srcpkgs/lua52-stdlib-debug @@ -1 +1 @@ -lua-stdlib-debug \ No newline at end of file +lua54-stdlib-debug \ No newline at end of file diff --git a/srcpkgs/lua53-stdlib-debug b/srcpkgs/lua53-stdlib-debug new file mode 120000 index 00000000000..7dd63b8c592 --- /dev/null +++ b/srcpkgs/lua53-stdlib-debug @@ -0,0 +1 @@ +lua54-stdlib-debug \ No newline at end of file diff --git a/srcpkgs/lua-stdlib-debug/template b/srcpkgs/lua54-stdlib-debug/template similarity index 56% rename from srcpkgs/lua-stdlib-debug/template rename to srcpkgs/lua54-stdlib-debug/template index 46df70335f4..50087fb7fc5 100644 --- a/srcpkgs/lua-stdlib-debug/template +++ b/srcpkgs/lua54-stdlib-debug/template @@ -1,11 +1,12 @@ -# Template file for 'lua-stdlib-debug' -pkgname=lua-stdlib-debug +# Template file for 'lua54-stdlib-debug' +pkgname=lua54-stdlib-debug version=1.0.1 -revision=1 +revision=2 wrksrc=_debug-${version} archs=noarch -depends="lua" -short_desc="A debug hints management library for Lua (Lua 5.3)" +depends="lua54" +_desc="A debug hints management library for Lua" +short_desc="${_desc} (5.4.x)" maintainer="Daniel Santana " license="MIT" homepage="https://lua-stdlib.github.io/_debug/" @@ -13,7 +14,7 @@ distfiles="https://github.com/lua-stdlib/_debug/archive/v${version}.tar.gz" checksum=efc560540f08dcf880ac48c6ab527bd741bbe3d6d66202a3c8be3ff5c9e1e907 do_install() { - for _lua_version in 5.1 5.2 5.3; do + for _lua_version in 5.1 5.2 5.3 5.4; do vmkdir usr/share/lua/$_lua_version/ vcopy lib/std usr/share/lua/$_lua_version/ done @@ -25,7 +26,7 @@ do_install() { lua51-stdlib-debug_package() { depends="lua51" - short_desc="${short_desc/5.3/5.1}" + short_desc="${_desc} (5.1.x)" pkg_install() { vmove usr/share/lua/5.1 vdoc NEWS.md @@ -37,7 +38,7 @@ lua51-stdlib-debug_package() { lua52-stdlib-debug_package() { depends="lua52" - short_desc="${short_desc/5.3/5.2}" + short_desc="${_desc} (5.2.x)" pkg_install() { vmove usr/share/lua/5.2 vdoc NEWS.md @@ -46,3 +47,21 @@ lua52-stdlib-debug_package() { vlicense LICENSE.md } } + +lua53-stdlib-debug_package() { + depends="lua53" + short_desc="${_desc} (5.3.x)" + pkg_install() { + vmove usr/share/lua/5.3 + vdoc NEWS.md + vdoc README.md + vdoc AUTHORS.md + vlicense LICENSE.md + } +} + +lua-stdlib-debug_package() { + depends="lua53-stdlib-debug>=${version}_${revision}" + short_desc+="${_desc} (5.3.x) (transitional dummy package)" + build_style=meta +} From edf68a8c99c5fdb8c5b97feb8e64e329132a67cf Mon Sep 17 00:00:00 2001 From: q66 Date: Wed, 1 Jul 2020 04:48:02 +0200 Subject: [PATCH 124/410] lua-stdlib-normalize: add 5.4, properly version --- srcpkgs/lua-stdlib-normalize | 1 + srcpkgs/lua51-stdlib-normalize | 2 +- srcpkgs/lua52-stdlib-normalize | 2 +- srcpkgs/lua53-stdlib-normalize | 1 + .../template | 35 ++++++++++++++----- 5 files changed, 31 insertions(+), 10 deletions(-) create mode 120000 srcpkgs/lua-stdlib-normalize create mode 120000 srcpkgs/lua53-stdlib-normalize rename srcpkgs/{lua-stdlib-normalize => lua54-stdlib-normalize}/template (55%) diff --git a/srcpkgs/lua-stdlib-normalize b/srcpkgs/lua-stdlib-normalize new file mode 120000 index 00000000000..8302b7ec171 --- /dev/null +++ b/srcpkgs/lua-stdlib-normalize @@ -0,0 +1 @@ +lua54-stdlib-normalize \ No newline at end of file diff --git a/srcpkgs/lua51-stdlib-normalize b/srcpkgs/lua51-stdlib-normalize index b377e6adb0b..8302b7ec171 120000 --- a/srcpkgs/lua51-stdlib-normalize +++ b/srcpkgs/lua51-stdlib-normalize @@ -1 +1 @@ -lua-stdlib-normalize \ No newline at end of file +lua54-stdlib-normalize \ No newline at end of file diff --git a/srcpkgs/lua52-stdlib-normalize b/srcpkgs/lua52-stdlib-normalize index b377e6adb0b..8302b7ec171 120000 --- a/srcpkgs/lua52-stdlib-normalize +++ b/srcpkgs/lua52-stdlib-normalize @@ -1 +1 @@ -lua-stdlib-normalize \ No newline at end of file +lua54-stdlib-normalize \ No newline at end of file diff --git a/srcpkgs/lua53-stdlib-normalize b/srcpkgs/lua53-stdlib-normalize new file mode 120000 index 00000000000..8302b7ec171 --- /dev/null +++ b/srcpkgs/lua53-stdlib-normalize @@ -0,0 +1 @@ +lua54-stdlib-normalize \ No newline at end of file diff --git a/srcpkgs/lua-stdlib-normalize/template b/srcpkgs/lua54-stdlib-normalize/template similarity index 55% rename from srcpkgs/lua-stdlib-normalize/template rename to srcpkgs/lua54-stdlib-normalize/template index 57de02cf208..be1312722f0 100644 --- a/srcpkgs/lua-stdlib-normalize/template +++ b/srcpkgs/lua54-stdlib-normalize/template @@ -1,11 +1,12 @@ -# Template file for 'lua-stdlib-normalize' -pkgname=lua-stdlib-normalize +# Template file for 'lua54-stdlib-normalize' +pkgname=lua54-stdlib-normalize version=2.0.3 -revision=1 +revision=2 archs=noarch wrksrc=normalize-${version} -depends="lua lua-stdlib-debug" -short_desc="Collection of normalized Lua functions (Lua 5.3)" +depends="lua54 lua54-stdlib-debug" +_desc="Collection of normalized Lua functions" +short_desc="${_desc} (5.4.x)" maintainer="Daniel Santana " license="MIT" homepage="https://lua-stdlib.github.io/normalize/" @@ -13,7 +14,7 @@ distfiles="https://github.com/lua-stdlib/normalize/archive/v${version}.tar.gz" checksum=2038c38da542cf274b0b7512928e5b649c90a34f36c8919fbbbc2524b4ef716d do_install() { - for _lua_version in 5.1 5.2 5.3; do + for _lua_version in 5.1 5.2 5.3 5.4; do vmkdir usr/share/lua/$_lua_version/ vcopy lib/std usr/share/lua/$_lua_version/ done @@ -25,7 +26,7 @@ do_install() { lua51-stdlib-normalize_package() { depends="lua51 lua51-stdlib-debug" - short_desc="${short_desc/5.3/5.1}" + short_desc="${_desc} (5.1.x)" pkg_install() { vmove usr/share/lua/5.1 vdoc NEWS.md @@ -37,7 +38,7 @@ lua51-stdlib-normalize_package() { lua52-stdlib-normalize_package() { depends="lua52 lua52-stdlib-debug" - short_desc="${short_desc/5.3/5.2}" + short_desc="${_desc} (5.2.x)" pkg_install() { vmove usr/share/lua/5.2 vdoc NEWS.md @@ -46,3 +47,21 @@ lua52-stdlib-normalize_package() { vlicense LICENSE.md } } + +lua53-stdlib-normalize_package() { + depends="lua53 lua53-stdlib-debug" + short_desc="${_desc} (5.3.x)" + pkg_install() { + vmove usr/share/lua/5.3 + vdoc NEWS.md + vdoc README.md + vdoc AUTHORS.md + vlicense LICENSE.md + } +} + +lua-stdlib-normalize_package() { + depends="lua53-stdlib-normalize>=${version}_${revision}" + short_desc+="${_desc} (5.3.x) (transitional dummy package)" + build_style=meta +} From 8e2d2c0ebba69b95ab6b31e7e42daf879e377bf6 Mon Sep 17 00:00:00 2001 From: q66 Date: Wed, 1 Jul 2020 04:48:35 +0200 Subject: [PATCH 125/410] luaposix: add 5.4, rename packages for consistency --- srcpkgs/lua51-luaposix | 1 + srcpkgs/lua52-luaposix | 1 + srcpkgs/lua53-luaposix | 1 + srcpkgs/{luaposix => lua54-luaposix}/template | 62 ++++++++++++++----- srcpkgs/luaposix | 1 + srcpkgs/luaposix51 | 2 +- srcpkgs/luaposix52 | 2 +- 7 files changed, 53 insertions(+), 17 deletions(-) create mode 120000 srcpkgs/lua51-luaposix create mode 120000 srcpkgs/lua52-luaposix create mode 120000 srcpkgs/lua53-luaposix rename srcpkgs/{luaposix => lua54-luaposix}/template (51%) create mode 120000 srcpkgs/luaposix diff --git a/srcpkgs/lua51-luaposix b/srcpkgs/lua51-luaposix new file mode 120000 index 00000000000..18904ae814f --- /dev/null +++ b/srcpkgs/lua51-luaposix @@ -0,0 +1 @@ +lua54-luaposix \ No newline at end of file diff --git a/srcpkgs/lua52-luaposix b/srcpkgs/lua52-luaposix new file mode 120000 index 00000000000..18904ae814f --- /dev/null +++ b/srcpkgs/lua52-luaposix @@ -0,0 +1 @@ +lua54-luaposix \ No newline at end of file diff --git a/srcpkgs/lua53-luaposix b/srcpkgs/lua53-luaposix new file mode 120000 index 00000000000..18904ae814f --- /dev/null +++ b/srcpkgs/lua53-luaposix @@ -0,0 +1 @@ +lua54-luaposix \ No newline at end of file diff --git a/srcpkgs/luaposix/template b/srcpkgs/lua54-luaposix/template similarity index 51% rename from srcpkgs/luaposix/template rename to srcpkgs/lua54-luaposix/template index 0fbd9385409..f5fb76ff686 100644 --- a/srcpkgs/luaposix/template +++ b/srcpkgs/lua54-luaposix/template @@ -1,12 +1,13 @@ -# Template file for 'luaposix' -pkgname=luaposix +# Template file for 'lua54-luaposix' +pkgname=lua54-luaposix version=34.1.1 -revision=1 +revision=2 wrksrc="luaposix-release-v${version}" -hostmakedepends="lua51-devel lua52-devel lua-devel" -makedepends="lua51-devel lua52-devel lua-devel" -depends="lua lua-stdlib-normalize" -short_desc="POSIX library for Lua programming language" +hostmakedepends="lua51-devel lua52-devel lua53-devel lua54-devel" +makedepends="lua51-devel lua52-devel lua53-devel lua54-devel" +depends="lua54 lua54-stdlib-normalize" +_desc="POSIX library for Lua programming language" +short_desc="${_desc} (5.4.x)" maintainer="Orphaned " license="MIT" homepage="http://luaforge.net/projects/luaposix/" @@ -20,10 +21,11 @@ post_extract() { mv * lua5.1 || true cp -a lua5.1 lua5.2 cp -a lua5.1 lua5.3 + cp -a lua5.1 lua5.4 } do_build() { - for _lua_version in 5.1 5.2 5.3; do + for _lua_version in 5.1 5.2 5.3 5.4; do pushd lua${_lua_version} lua${_lua_version} build-aux/luke version=${version} PREFIX=/usr \ LUA_INCDIR="${XBPS_CROSS_BASE}/usr/include/lua${_lua_version}" \ @@ -33,7 +35,7 @@ do_build() { } do_install() { - for _lua_version in 5.1 5.2 5.3; do + for _lua_version in 5.1 5.2 5.3 5.4; do pushd lua${_lua_version} lua${_lua_version} build-aux/luke PREFIX="${DESTDIR}/usr" install popd @@ -41,14 +43,14 @@ do_install() { } post_install() { - vlicense lua5.3/LICENSE + vlicense lua5.4/LICENSE vmkdir usr/share/doc/$pkgname - vcopy "lua5.3/doc/*" usr/share/doc/$pkgname + vcopy "lua5.4/doc/*" usr/share/doc/$pkgname } -luaposix51_package() { +lua51-luaposix_package() { depends="lua51 lua51-stdlib-normalize lua51-bitlib" - short_desc="${short_desc} - Lua 5.1" + short_desc="${_desc} (5.1.x)" pkg_install() { vlicense "${wrksrc}/lua5.1/LICENSE" vmove usr/lib/lua/5.1 @@ -58,9 +60,9 @@ luaposix51_package() { } } -luaposix52_package() { - short_desc="${short_desc} - Lua 5.2" +lua52-luaposix_package() { depends="lua52 lua52-stdlib-normalize" + short_desc="${_desc} (5.2.x)" pkg_install() { vlicense "${wrksrc}/lua5.2/LICENSE" vmove usr/lib/lua/5.2 @@ -69,3 +71,33 @@ luaposix52_package() { vcopy "${wrksrc}/lua5.2/doc/*" usr/share/doc/$pkgname } } + +lua53-luaposix_package() { + depends="lua53 lua53-stdlib-normalize" + short_desc="${_desc} (5.3.x)" + pkg_install() { + vlicense "${wrksrc}/lua5.3/LICENSE" + vmove usr/lib/lua/5.3 + vmove usr/share/lua/5.3 + vmkdir usr/share/doc/$pkgname + vcopy "${wrksrc}/lua5.3/doc/*" usr/share/doc/$pkgname + } +} + +luaposix51_package() { + depends="lua51-luaposix>=${version}_${revision}" + short_desc+="${_desc} (5.1.x) (transitional dummy package)" + build_style=meta +} + +luaposix52_package() { + depends="lua52-luaposix>=${version}_${revision}" + short_desc+="${_desc} (5.2.x) (transitional dummy package)" + build_style=meta +} + +luaposix_package() { + depends="lua53-luaposix>=${version}_${revision}" + short_desc+="${_desc} (5.3.x) (transitional dummy package)" + build_style=meta +} diff --git a/srcpkgs/luaposix b/srcpkgs/luaposix new file mode 120000 index 00000000000..18904ae814f --- /dev/null +++ b/srcpkgs/luaposix @@ -0,0 +1 @@ +lua54-luaposix \ No newline at end of file diff --git a/srcpkgs/luaposix51 b/srcpkgs/luaposix51 index 4789a96bd38..18904ae814f 120000 --- a/srcpkgs/luaposix51 +++ b/srcpkgs/luaposix51 @@ -1 +1 @@ -luaposix \ No newline at end of file +lua54-luaposix \ No newline at end of file diff --git a/srcpkgs/luaposix52 b/srcpkgs/luaposix52 index 4789a96bd38..18904ae814f 120000 --- a/srcpkgs/luaposix52 +++ b/srcpkgs/luaposix52 @@ -1 +1 @@ -luaposix \ No newline at end of file +lua54-luaposix \ No newline at end of file From c7d01aac1b553924b3f39e0536ee6225d9e56cf4 Mon Sep 17 00:00:00 2001 From: q66 Date: Wed, 1 Jul 2020 05:01:00 +0200 Subject: [PATCH 126/410] luarocks: add 5.4 support, rename default to luarocks-lua53 --- srcpkgs/luarocks | 1 + srcpkgs/luarocks-lua51 | 2 +- srcpkgs/luarocks-lua52 | 2 +- srcpkgs/{luarocks => luarocks-lua53}/template | 43 ++++++++++++++----- srcpkgs/luarocks-lua54 | 1 + 5 files changed, 37 insertions(+), 12 deletions(-) create mode 120000 srcpkgs/luarocks rename srcpkgs/{luarocks => luarocks-lua53}/template (71%) create mode 120000 srcpkgs/luarocks-lua54 diff --git a/srcpkgs/luarocks b/srcpkgs/luarocks new file mode 120000 index 00000000000..07fa8d2ec5a --- /dev/null +++ b/srcpkgs/luarocks @@ -0,0 +1 @@ +luarocks-lua53 \ No newline at end of file diff --git a/srcpkgs/luarocks-lua51 b/srcpkgs/luarocks-lua51 index 9c289adc714..07fa8d2ec5a 120000 --- a/srcpkgs/luarocks-lua51 +++ b/srcpkgs/luarocks-lua51 @@ -1 +1 @@ -luarocks \ No newline at end of file +luarocks-lua53 \ No newline at end of file diff --git a/srcpkgs/luarocks-lua52 b/srcpkgs/luarocks-lua52 index 9c289adc714..07fa8d2ec5a 120000 --- a/srcpkgs/luarocks-lua52 +++ b/srcpkgs/luarocks-lua52 @@ -1 +1 @@ -luarocks \ No newline at end of file +luarocks-lua53 \ No newline at end of file diff --git a/srcpkgs/luarocks/template b/srcpkgs/luarocks-lua53/template similarity index 71% rename from srcpkgs/luarocks/template rename to srcpkgs/luarocks-lua53/template index 4847a3b8b9a..8979667e410 100644 --- a/srcpkgs/luarocks/template +++ b/srcpkgs/luarocks-lua53/template @@ -1,8 +1,9 @@ -# Template file for 'luarocks' -pkgname=luarocks +# Template file for 'luarocks-lua53' +pkgname=luarocks-lua53 version=3.3.1 -revision=1 +revision=2 archs=noarch +wrksrc=luarocks-${version} build_style=configure configure_args=" --prefix=/usr @@ -10,9 +11,10 @@ configure_args=" --lua-version=5.3 --with-lua-include=/usr/include/lua5.3 --versioned-rocks-dir" -hostmakedepends="lua-devel" -depends="lua curl unzip" -short_desc="Package management for Lua modules" +hostmakedepends="lua53-devel" +depends="lua53 curl unzip" +_desc="Package management for Lua modules" +short_desc="${_desc} (5.3.x)" maintainer="Duncaen " license="MIT" homepage="https://luarocks.org/" @@ -29,7 +31,7 @@ post_extract() { } post_build() { - for lv in 5.1 5.2; do + for lv in 5.1 5.2 5.4; do make LUA_VERSION=$lv LUA_INTERPRETER=lua$lv \ LUA_INCDIR=/usr/include/lua$lv ./build/config-$lv.lua done @@ -43,7 +45,7 @@ post_install() { vlicense COPYING vmkdir usr/bin - for lv in 5.1 5.2; do + for lv in 5.1 5.2 5.4; do make DESTDIR="${DESTDIR}" LUA_VERSION=$lv install-config make DESTDIR="${DESTDIR}" LUA_VERSION=$lv install-config @@ -60,9 +62,24 @@ post_install() { mv ${DESTDIR}/usr/bin/luarocks-admin{,-5.3} } +luarocks-lua54_package() { + archs=noarch + short_desc="${_desc} (5.4.x)" + depends="${sourcepkg}>=${version}_${revision} lua54" + conf_files="/etc/luarocks/config-5.4.lua" + alternatives=" + luarocks:luarocks:/usr/bin/luarocks-5.4 + luarocks:luarocks-admin:/usr/bin/luarocks-admin-5.4" + pkg_install() { + vmove usr/bin/luarocks-5.4 + vmove usr/bin/luarocks-admin-5.4 + vmove etc/luarocks/config-5.4.lua + } +} + luarocks-lua52_package() { archs=noarch - short_desc+=" - Lua52" + short_desc="${_desc} (5.2.x)" depends="${sourcepkg}>=${version}_${revision} lua52" conf_files="/etc/luarocks/config-5.2.lua" alternatives=" @@ -77,7 +94,7 @@ luarocks-lua52_package() { luarocks-lua51_package() { archs=noarch - short_desc+=" - Lua51" + short_desc="${_desc} (5.1.x)" depends="${sourcepkg}>=${version}_${revision} lua51" conf_files="/etc/luarocks/config-5.1.lua" alternatives=" @@ -89,3 +106,9 @@ luarocks-lua51_package() { vmove etc/luarocks/config-5.1.lua } } + +luarocks_package() { + depends="luarocks-lua53>=${version}_${revision}" + short_desc+="${_desc} (5.3.x) (transitional dummy package)" + build_style=meta +} diff --git a/srcpkgs/luarocks-lua54 b/srcpkgs/luarocks-lua54 new file mode 120000 index 00000000000..07fa8d2ec5a --- /dev/null +++ b/srcpkgs/luarocks-lua54 @@ -0,0 +1 @@ +luarocks-lua53 \ No newline at end of file From 3aba34d9bf1c3e4335ed7a3cbc99159ab1c097be Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Thu, 18 Jun 2020 09:07:59 +0200 Subject: [PATCH 127/410] libcec: create new sub package for python dependencies --- srcpkgs/libcec/template | 10 +++++++++- srcpkgs/python3-libcec | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) create mode 120000 srcpkgs/python3-libcec diff --git a/srcpkgs/libcec/template b/srcpkgs/libcec/template index cba4bc56cd0..f956cfcd468 100644 --- a/srcpkgs/libcec/template +++ b/srcpkgs/libcec/template @@ -1,7 +1,7 @@ # Template file for 'libcec' pkgname=libcec version=4.0.4 -revision=5 +revision=6 wrksrc="${pkgname}-${pkgname}-${version}" build_style=cmake configure_args="Python_ADDITIONAL_VERSIONS=${py3_ver}" @@ -39,6 +39,14 @@ cec-client_package() { vmove usr/bin } } +python3-libcec_package() { + short_desc+=" - python bindings" + depends="python3 libcec>=${version}" + + pkg_install() { + vmove "${py3_lib#/}" + } +} libcec-devel_package() { short_desc+=" - development files" depends="eudev-libudev-devel p8-platform-devel libcec>=${version}_${revision}" diff --git a/srcpkgs/python3-libcec b/srcpkgs/python3-libcec new file mode 120000 index 00000000000..de19fbe0575 --- /dev/null +++ b/srcpkgs/python3-libcec @@ -0,0 +1 @@ +libcec \ No newline at end of file From 61a6690028371f09458eab497329ae7286456edf Mon Sep 17 00:00:00 2001 From: gt7-void Date: Sat, 20 Jun 2020 23:02:29 -0300 Subject: [PATCH 128/410] autoconf: fix empty manpages Need help2man as a hostmakedepends to build those --- srcpkgs/autoconf/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/autoconf/template b/srcpkgs/autoconf/template index 46d14a1d23a..a7aecf1359e 100644 --- a/srcpkgs/autoconf/template +++ b/srcpkgs/autoconf/template @@ -1,10 +1,10 @@ # Template file for 'autoconf' pkgname=autoconf version=2.69 -revision=7 +revision=8 archs=noarch build_style=gnu-configure -hostmakedepends="perl m4" +hostmakedepends="perl m4 help2man" depends="virtual?awk m4 perl" short_desc="Generates automatic source code configuration scripts" maintainer="Enno Boland " From eb1c299ebc0e92b88ce455b8fc9180e40f853193 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 1 Jul 2020 13:50:27 +0200 Subject: [PATCH 129/410] monit: update to 5.27.0. --- srcpkgs/monit/INSTALL | 18 ----------- srcpkgs/monit/patches/cross-fix.patch | 43 +++++++++++++++++++++++++++ srcpkgs/monit/template | 16 ++++++---- 3 files changed, 53 insertions(+), 24 deletions(-) delete mode 100644 srcpkgs/monit/INSTALL create mode 100644 srcpkgs/monit/patches/cross-fix.patch diff --git a/srcpkgs/monit/INSTALL b/srcpkgs/monit/INSTALL deleted file mode 100644 index b059c102d66..00000000000 --- a/srcpkgs/monit/INSTALL +++ /dev/null @@ -1,18 +0,0 @@ -# INSTALL -case "$ACTION" in -post) - if [ "$UPDATE" = "yes" ]; then - cat < +Date: Tue, 30 Jun 2020 21:30:28 +0200 +Subject: [PATCH] Patch for cross-compile + +--- + configure.ac | 4 +++- + libmonit/configure.ac | 4 +++- + 2 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index f7ea677..a8c32c8 100644 +--- configure.ac ++++ configure.ac +@@ -442,7 +442,9 @@ AC_RUN_IFELSE( + #endif + #endif + return 1; +- ])], [CFLAGS="$CFLAGS -std=c11"], [CFLAGS="$CFLAGS -std=c99"]) ++ ])], [CFLAGS="$CFLAGS -std=c11"], [CFLAGS="$CFLAGS -std=c99"], ++ [AC_MSG_NOTICE([WARNING: result CFLAGS -std=c11 guessed because of cross compilation]) ++ CFLAGS="$CFLAGS -std=c11"]) + AC_CHECK_HEADERS([stdint.h stdbool.h], [], [AC_MSG_ERROR([toolchain does not have C99 headers])]) + + +diff --git a/libmonit/configure.ac b/libmonit/configure.ac +index 21ebdd7..8813852 100644 +--- libmonit/configure.ac ++++ libmonit/configure.ac +@@ -336,7 +336,9 @@ AC_RUN_IFELSE( + #endif + #endif + return 1; +- ])], [CFLAGS="$CFLAGS -std=c11"], [CFLAGS="$CFLAGS -std=c99"]) ++ ])], [CFLAGS="$CFLAGS -std=c11"], [CFLAGS="$CFLAGS -std=c99"], ++ [AC_MSG_NOTICE([WARNING: result CFLAGS -std=c11 guessed because of cross compilation]) ++ CFLAGS="$CFLAGS -std=c11"]) + AC_CHECK_HEADERS([stdint.h stdbool.h], [], [AC_MSG_ERROR([toolchain does not have C99 headers])]) + + # ------------------------------------------------------------------------ +-- +2.10.5 + diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template index 537daa72b97..e80fd0e8a54 100644 --- a/srcpkgs/monit/template +++ b/srcpkgs/monit/template @@ -1,6 +1,6 @@ # Template file for 'monit' pkgname=monit -version=5.26.0 +version=5.27.0 revision=1 build_style=gnu-configure configure_args=" @@ -8,15 +8,19 @@ configure_args=" libmonit_cv_setjmp_available=yes libmonit_cv_vsnprintf_c99_conformant=yes" conf_files="/etc/monitrc" -hostmakedepends="perl" +hostmakedepends="automake libtool perl" makedepends="pam-devel libressl-devel zlib-devel" short_desc="Utility for monitoring, processes, files, directories and devices" maintainer="Duncaen " license="AGPL-3.0-only" -homepage="http://mmonit.com/monit/" -#changelog="https://mmonit.com/monit/changes/" -distfiles="http://mmonit.com/monit/dist/${pkgname}-${version}.tar.gz" -checksum=87fc4568a3af9a2be89040efb169e3a2e47b262f99e78d5ddde99dd89f02f3c2 +homepage="https://mmonit.com/monit/" +changelog="https://mmonit.com/monit/changes/" +distfiles="https://mmonit.com/monit/dist/${pkgname}-${version}.tar.gz" +checksum=d8c0deef624f193a952502fe9baabfa66e3d8d057df5738da43f9a37792afca4 + +pre_configure() { + ./bootstrap +} post_install() { vconf monitrc From 438698b5df4e6d328d6ed26115791d5ee8dab3c2 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Sun, 28 Jun 2020 00:24:07 +0000 Subject: [PATCH 130/410] reptyr: remove musl.patch. The patch is no longer necessary and also breaks the build on glibc. --- srcpkgs/reptyr/patches/musl.patch | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 srcpkgs/reptyr/patches/musl.patch diff --git a/srcpkgs/reptyr/patches/musl.patch b/srcpkgs/reptyr/patches/musl.patch deleted file mode 100644 index 02d1a0b71a6..00000000000 --- a/srcpkgs/reptyr/patches/musl.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- ptrace.h 2020-01-02 17:05:32.920795583 +0100 -+++ ptrace.h 2020-01-02 17:05:46.203324659 +0100 -@@ -22,6 +22,9 @@ - #ifndef PTRACE_H - #define PTRACE_H - -+#ifdef __linux__ -+#include -+#endif - #include - #include - #include From 4d1887373b2e74b852344bcd45a17d36fcfab4df Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 1 Jul 2020 16:40:37 +0200 Subject: [PATCH 131/410] linux5.7: update to 5.7.7. --- srcpkgs/linux5.7/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/linux5.7/template b/srcpkgs/linux5.7/template index 536157b9526..47fa51e7779 100644 --- a/srcpkgs/linux5.7/template +++ b/srcpkgs/linux5.7/template @@ -1,6 +1,6 @@ # Template file for 'linux5.7' pkgname=linux5.7 -version=5.7.6 +version=5.7.7 revision=1 wrksrc="linux-${version}" short_desc="Linux kernel and modules (${version%.*} series)" @@ -8,7 +8,7 @@ maintainer="Orphaned " license="GPL-2.0-only" homepage="https://www.kernel.org" distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz" -checksum=9fd4c93dc6df53efa904134aa2ede6100f7453c11383490dd32ebbed84f610e6 +checksum=f840b9679283343c165516585c3070ebb277528721c890e9410a58e9d071ee7f python_version=3 patch_args="-Np1" From 7d394fbbfea69eab478b76d7c0d07af08ce23b74 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Sat, 27 Jun 2020 08:53:56 +1000 Subject: [PATCH 132/410] python-zope.interface: update to 5.1.0. --- srcpkgs/python-zope.interface/template | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/srcpkgs/python-zope.interface/template b/srcpkgs/python-zope.interface/template index 37864186e5e..2b08dff3db0 100644 --- a/srcpkgs/python-zope.interface/template +++ b/srcpkgs/python-zope.interface/template @@ -1,10 +1,9 @@ # Template file for 'python-zope.interface' pkgname=python-zope.interface -version=4.7.1 +version=5.1.0 revision=1 wrksrc="${pkgname#*-}-${version}" build_style=python-module -pycompile_module="zope" hostmakedepends="python-setuptools python3-setuptools" makedepends="python-devel python3-devel" depends="python-setuptools" @@ -13,7 +12,7 @@ maintainer="Alessio Sergi " license="ZPL-2.1" homepage="https://github.com/zopefoundation/zope.interface" distfiles="${PYPI_SITE}/z/zope.interface/zope.interface-${version}.tar.gz" -checksum=4bb937e998be9d5e345f486693e477ba79e4344674484001a0b646be1d530487 +checksum=40e4c42bd27ed3c11b2c983fecfb03356fae1209de10686d03c02c8696a1d90e post_install() { # zope.interface provides the zope namespace @@ -24,7 +23,6 @@ post_install() { } python3-zope.interface_package() { - pycompile_module="zope" depends="python3-setuptools" short_desc="${short_desc/Python2/Python3}" pkg_install() { From a8e2b356d85b2d5d3d69796fd86b42f8f668b699 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Sat, 27 Jun 2020 08:43:48 +1000 Subject: [PATCH 133/410] python3-eliot: update to 1.12.0. --- srcpkgs/python3-eliot/template | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/srcpkgs/python3-eliot/template b/srcpkgs/python3-eliot/template index 52a08e19f1a..eca2c769d45 100644 --- a/srcpkgs/python3-eliot/template +++ b/srcpkgs/python3-eliot/template @@ -1,11 +1,10 @@ # Template file for 'python3-eliot' pkgname=python3-eliot -version=1.11.0 -revision=2 +version=1.12.0 +revision=1 archs=noarch wrksrc="eliot-${version}" build_style=python3-module -pycompile_module="eliot" hostmakedepends="python3-setuptools" depends="python3-setuptools python3-six python3-zope.interface python3-rsistent python3-boltons" @@ -14,4 +13,4 @@ maintainer="Orphaned " license="Apache-2.0" homepage="https://github.com/itamarst/eliot/" distfiles="${PYPI_SITE}/e/eliot/eliot-${version}.tar.gz" -checksum=166ac21f6bef7dbb1b2b1c3e36445ebe4aacca1d0addcbb5b1df0f77c9720f78 +checksum=b6e16d8a4392cac6bd07358aaef140c50059ab00fc13171012810e33e1d94b71 From b66be3ea185ff9f42410e01a93aba685be17a81d Mon Sep 17 00:00:00 2001 From: fosslinux Date: Sat, 27 Jun 2020 08:40:27 +1000 Subject: [PATCH 134/410] python3-txacme: update to 0.9.3. --- srcpkgs/python3-txacme/template | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/srcpkgs/python3-txacme/template b/srcpkgs/python3-txacme/template index c678addda4d..bd1c82d0611 100644 --- a/srcpkgs/python3-txacme/template +++ b/srcpkgs/python3-txacme/template @@ -1,11 +1,10 @@ # Template file for 'python3-txacme' pkgname=python3-txacme -version=0.9.2 -revision=2 +version=0.9.3 +revision=1 archs=noarch wrksrc="txacme-${version}" build_style=python3-module -pycompile_module="txacme" hostmakedepends="python3-setuptools" depends="python3-attrs python3-acme python3-josepy python3-treq python3-Twisted python3-openssl python3-eliot python3-TxSNI python3-pem" @@ -14,7 +13,7 @@ maintainer="Orphaned " license="MIT" homepage="https://github.com/twisted/txacme" distfiles="${PYPI_SITE}/t/txacme/txacme-${version}.tar.gz" -checksum=2db8e98132d8fcb85cfbd5e59866fa3a9fd8d26e923f673802251e4c29e9f4b2 +checksum=bce2d0dfa8fa2cf3f2eb10526c89a8b4f77a021d9e182704e7776fff7bd8bceb post_install() { vlicense LICENSE From 2da3334d0e7a53a40cdfe0122afad529af22c89e Mon Sep 17 00:00:00 2001 From: fosslinux Date: Sat, 27 Jun 2020 08:33:56 +1000 Subject: [PATCH 135/410] python3-zope.component: update to 4.6.1. --- srcpkgs/python3-zope.component/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-zope.component/template b/srcpkgs/python3-zope.component/template index 5a6156dabce..5dddba61bb3 100644 --- a/srcpkgs/python3-zope.component/template +++ b/srcpkgs/python3-zope.component/template @@ -1,6 +1,6 @@ # Template file for 'python3-zope.component' pkgname=python3-zope.component -version=4.6 +version=4.6.1 revision=1 archs=noarch wrksrc="${pkgname#*-}-${version}" @@ -13,7 +13,7 @@ maintainer="Toyam Cox " license="ZPL-2.1" homepage="https://www.zope.org" distfiles="${PYPI_SITE}/z/zope.component/zope.component-${version}.tar.gz" -checksum=ec2afc5bbe611dcace98bb39822c122d44743d635dafc7315b9aef25097db9e6 +checksum=d9c7c27673d787faff8a83797ce34d6ebcae26a370e25bddb465ac2182766aca post_install() { vlicense LICENSE.txt LICENSE From d69f0ba2e39824a5c5288d5383b2dd44411f095d Mon Sep 17 00:00:00 2001 From: fosslinux Date: Sat, 27 Jun 2020 08:27:51 +1000 Subject: [PATCH 136/410] python3-zope.location: fix homepage url --- srcpkgs/python3-zope.location/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-zope.location/template b/srcpkgs/python3-zope.location/template index 26507ebb77c..c2d6435dcf4 100644 --- a/srcpkgs/python3-zope.location/template +++ b/srcpkgs/python3-zope.location/template @@ -1,7 +1,7 @@ # Template file for 'python3-zope.location' pkgname=python3-zope.location version=4.2 -revision=2 +revision=3 archs=noarch wrksrc="zope.location-${version}" build_style=python3-module @@ -13,6 +13,6 @@ checkdepends="python3-zope.copy python3-zope.testrunner" short_desc="Zope location" maintainer="Alex Childs " license="ZPL-2.1" -homepage="https://github.com/zopefederation/zope.location" +homepage="https://github.com/zopefoundation/zope.location" distfiles="${PYPI_SITE}/z/zope.location/zope.location-${version}.tar.gz" checksum=a720f9e3c8a51d5007ed6fcd47e1834df02671d85dbfd1062a0d808de8bf80ac From bb832ed8bf2ece949a149a2d763d1acc24ccf41f Mon Sep 17 00:00:00 2001 From: fosslinux Date: Sat, 27 Jun 2020 09:38:17 +1000 Subject: [PATCH 137/410] freeplane: update to 1.8.6. Closes: #23258 [via git-merge-pr] --- srcpkgs/freeplane/patches/remove_mac.patch | 13 +++++++++++++ srcpkgs/freeplane/template | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/freeplane/patches/remove_mac.patch diff --git a/srcpkgs/freeplane/patches/remove_mac.patch b/srcpkgs/freeplane/patches/remove_mac.patch new file mode 100644 index 00000000000..72df0db4a30 --- /dev/null +++ b/srcpkgs/freeplane/patches/remove_mac.patch @@ -0,0 +1,13 @@ +--- freeplane_debughelper/build.gradle 2020-06-29 17:33:42.544000000 +1000 ++++ freeplane_debughelper/build.gradle 2020-06-29 17:33:48.627000000 +1000 +@@ -7,9 +7,7 @@ + + dependencies { + def exclusions = [project.name, 'freeplane_ant'] +- if (! Os.isFamily(Os.FAMILY_MAC)) { +- exclusions.add('freeplane_mac') +- } ++ exclusions.add('freeplane_mac') + parent.subprojects.findAll{! exclusions.contains(it.name)}.each { + runtimeOnly it + } diff --git a/srcpkgs/freeplane/template b/srcpkgs/freeplane/template index 63f5ad54973..bb5875f7e7e 100644 --- a/srcpkgs/freeplane/template +++ b/srcpkgs/freeplane/template @@ -1,6 +1,6 @@ # Template file for 'freeplane' pkgname=freeplane -version=1.8.5 +version=1.8.6 revision=1 archs=noarch hostmakedepends="apache-ant openjdk8 unzip gradle" @@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni " license="GPL-2.0-or-later" homepage="http://freeplane.sourceforge.net/" distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname%20stable/${pkgname}_src-$version.tar.gz" -checksum=f21f3d166f9ab1f67add0c5cd0b8b5723e52577f1ff59b6c4d0c41179a3b4a6e +checksum=f690dce9e8e833a4feb7007d3518480aa0329b42b857040a28fa258cc08b25fc make_dirs=" /usr/share/freeplane/fwdir/condperm/ 755 root root From c53972e6dfb5d080cf8da56e2d5ff4f5e301523a Mon Sep 17 00:00:00 2001 From: Lorem Date: Sun, 14 Jun 2020 18:01:40 +0530 Subject: [PATCH 138/410] python3-dateparser: update to 0.7.6. --- srcpkgs/python3-dateparser/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-dateparser/template b/srcpkgs/python3-dateparser/template index 2de3e35d7b1..e36395eea8a 100644 --- a/srcpkgs/python3-dateparser/template +++ b/srcpkgs/python3-dateparser/template @@ -1,6 +1,6 @@ # Template file for 'python3-dateparser' pkgname=python3-dateparser -version=0.7.4 +version=0.7.6 revision=1 archs=noarch wrksrc=dateparser-${version} @@ -12,7 +12,7 @@ maintainer="Lorem " license="BSD-3-Clause" homepage="https://github.com/scrapinghub/dateparser" distfiles="${PYPI_SITE}/d/dateparser/dateparser-${version}.tar.gz" -checksum=fb5bfde4795fa4b179fe05c2c25b3981f785de26bec37e247dee1079c63d5689 +checksum=e875efd8c57c85c2d02b238239878db59ff1971f5a823457fcc69e493bf6ebfa post_install() { vlicense LICENSE From 56e00ab73dbe210a1f0d66903a395219ffacfcb6 Mon Sep 17 00:00:00 2001 From: Felipe Nogueira Date: Tue, 23 Jun 2020 11:34:38 -0300 Subject: [PATCH 139/410] googler: update to 4.1. --- srcpkgs/googler/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/googler/template b/srcpkgs/googler/template index e7ab732874d..c9fc3e9c4f4 100644 --- a/srcpkgs/googler/template +++ b/srcpkgs/googler/template @@ -1,7 +1,7 @@ # Template file for 'googler' pkgname=googler -version=4.0 -revision=2 +version=4.1 +revision=1 build_style=gnu-makefile make_build_target=disable-self-upgrade depends="python3 xsel xclip" @@ -10,7 +10,7 @@ maintainer="Nathan Owens " license="GPL-3.0-or-later" homepage="https://github.com/jarun/googler" distfiles="https://github.com/jarun/googler/archive/v${version}.tar.gz" -checksum=f72593ca2a3dccd7301c0fed55effd223cc38f6c21910bffbbfba1360c985cd3 +checksum=1906be38020a941ee271034df63c589bb0ba6a7449fa1a68d4df2d10922fba07 post_install() { vinstall auto-completion/bash/googler-completion.bash 644 /usr/share/bash-completion/completions/googler From 15a69030692b15454969a9ede2dee7a4253bebc6 Mon Sep 17 00:00:00 2001 From: Piraty Date: Wed, 1 Jul 2020 17:20:05 +0200 Subject: [PATCH 140/410] wsjtx: update to 2.2.2. Closes: #23208 --- srcpkgs/wsjtx/template | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/srcpkgs/wsjtx/template b/srcpkgs/wsjtx/template index d21da033fe4..a03f0f7b200 100644 --- a/srcpkgs/wsjtx/template +++ b/srcpkgs/wsjtx/template @@ -1,6 +1,6 @@ # Template file for 'wsjtx' pkgname=wsjtx -version=2.2.1 +version=2.2.2 revision=1 build_wrksrc="wsjtx" build_style=cmake @@ -16,12 +16,7 @@ maintainer="bra1nwave " license="GPL-3.0-or-later" homepage="https://www.physics.princeton.edu/pulsar/K1JT/wsjtx.html" distfiles="https://www.physics.princeton.edu/pulsar/K1JT/wsjtx-${version}.tgz" -checksum=c92c9be90151a6b20f7aaba4d0ac9d6e8ed87ca4c9ce97109dce654e4231a48b - -case $XBPS_TARGET_MACHINE in - # aarch64 builders can't fetch the distfile from the orig url. - aarch64*) distfiles="https://sources.voidlinux.org/wsjtx-${version}/wsjtx-${version}.tgz";; -esac +checksum=1cbc163f238a8cfd64cd9e4a00aa1e00ef43758a1ba9c5db83ca63ca60f64f9d if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-qmake qt5-host-tools" From 4a123ebda48406e968b14439b11a659c816fa074 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sun, 28 Jun 2020 20:30:06 -0400 Subject: [PATCH 141/410] python3-scipy: update to 1.5.0; make cross compilation work --- srcpkgs/python3-scipy/template | 43 +++++++++++++++++++++++++++------- 1 file changed, 35 insertions(+), 8 deletions(-) diff --git a/srcpkgs/python3-scipy/template b/srcpkgs/python3-scipy/template index 139e9b1dfe0..e3ba0099209 100644 --- a/srcpkgs/python3-scipy/template +++ b/srcpkgs/python3-scipy/template @@ -1,13 +1,12 @@ # Template file for 'python3-scipy' pkgname=python3-scipy -version=1.3.2 -revision=2 +version=1.5.0 +revision=1 wrksrc="scipy-${version}" build_style=python3-module -pycompile_module="scipy" make_check_args="--force" -hostmakedepends="python3-setuptools python3-Cython gcc-fortran" -makedepends="python3-devel python3-numpy lapack-devel" +hostmakedepends="python3-setuptools python3-Cython python3-numpy gcc-fortran" +makedepends="python3-devel python3-numpy python3-pybind11 lapack-devel openblas-devel" depends="python3-numpy" checkdepends="python3-nose" short_desc="Scientific library for Python3" @@ -15,11 +14,39 @@ maintainer="Alessio Sergi " license="BSD-3-Clause" homepage="https://scipy.org/scipylib/" distfiles="https://github.com/scipy/scipy/releases/download/v${version}/scipy-${version}.tar.xz" -checksum=1d2f09bcb6c4b66a65d9f49d21fa065f5396c940edac8285b87947b8d21b55f8 +checksum=23baeaa18803d12d1abdff3f5c148b1085c2dc4028c6b8efce652dde2119b41c -nocross="https://build.voidlinux.org/builders/aarch64_builder/builds/24733/steps/shell_3/logs/stdio" +if [ "$CROSS_BUILD" ]; then + # Make sure numpy is found for the target arch first + CFLAGS+=" -I${XBPS_CROSS_BASE}/${py3_sitelib}/numpy/core/include" + LDFLAGS+=" -L${XBPS_CROSS_BASE}/${py3_sitelib}/numpy/core/lib" -LDFLAGS+="-shared" + # Tell numpy.distutils where to find FORTRAN compilers + export F77="${FC}" + export F90="${FC}" +fi + +LDFLAGS+=" -shared" + +pre_build() { + cat > site.cfg <<-EOF + [openblas] + libraries = openblas + EOF + + if [ "$CROSS_BUILD" ]; then + # Make sure scipy knows how to find openblas + cat >> site.cfg <<-EOF + library_dirs = ${XBPS_CROSS_BASE}/usr/lib + include_dirs = ${XBPS_CROSS_BASE}/usr/include + runtime_library_dirs = ${XBPS_CROSS_BASE}/usr/lib + EOF + + # numpy.distutils refuses to find the right linker for FORTRAN + # Link the cross compiler so the module will find it as gfortran + ln -sf "/usr/bin/${FC}" "${XBPS_WRAPPERDIR}/gfortran" + fi +} post_install() { rm ${DESTDIR}/${py3_sitelib}/scipy/*.txt From 2eb52614286204c11085dfc08bd6dace02a59ec5 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Tue, 30 Jun 2020 12:14:30 -0400 Subject: [PATCH 142/410] python3-trimesh: update to 3.7.4. Closes: #23295 [via git-merge-pr] --- srcpkgs/python3-trimesh/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-trimesh/template b/srcpkgs/python3-trimesh/template index 5d8afe7ec5f..15f6715ce1d 100644 --- a/srcpkgs/python3-trimesh/template +++ b/srcpkgs/python3-trimesh/template @@ -1,6 +1,6 @@ # Template file for 'python3-trimesh' pkgname=python3-trimesh -version=3.6.43 +version=3.7.4 revision=1 archs=noarch wrksrc="trimesh-${version}" @@ -13,7 +13,7 @@ maintainer="Karl Nilsson " license="MIT" homepage="https://trimsh.org/" distfiles="https://github.com/mikedh/trimesh/archive/${version}.tar.gz" -checksum=b7614cf37723f2d1f11420253da0bd2bb0ec9fab6dc6afd3486d70780df2841d +checksum=05818e5332337734fb1d0df706a80ea81398641f31274d51fef488cbd988f066 post_install() { vlicense LICENSE.md From 16b4539e291376eb035bddbfa181c813824adc7d Mon Sep 17 00:00:00 2001 From: Piraty Date: Wed, 1 Jul 2020 17:39:37 +0200 Subject: [PATCH 143/410] wsjtx: aarch64 builders still can't fetch from the official source --- srcpkgs/wsjtx/template | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/srcpkgs/wsjtx/template b/srcpkgs/wsjtx/template index a03f0f7b200..a842a2169a3 100644 --- a/srcpkgs/wsjtx/template +++ b/srcpkgs/wsjtx/template @@ -18,6 +18,11 @@ homepage="https://www.physics.princeton.edu/pulsar/K1JT/wsjtx.html" distfiles="https://www.physics.princeton.edu/pulsar/K1JT/wsjtx-${version}.tgz" checksum=1cbc163f238a8cfd64cd9e4a00aa1e00ef43758a1ba9c5db83ca63ca60f64f9d +case $XBPS_TARGET_MACHINE in + # aarch64 builders can't fetch the distfile from the orig url. + aarch64*) distfiles="https://sources.voidlinux.org/wsjtx-${version}/wsjtx-${version}.tgz";; +esac + if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-qmake qt5-host-tools" configure_args+=" -DBoost_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include" From c1ccec3170097fb13659beee504434d93e0344a3 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 1 Jul 2020 17:39:21 +0200 Subject: [PATCH 144/410] alpine: update to 2.23.2. --- srcpkgs/alpine/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template index 795aafd765e..88141ce2c21 100644 --- a/srcpkgs/alpine/template +++ b/srcpkgs/alpine/template @@ -1,8 +1,8 @@ # Template file for 'alpine' pkgname=alpine -version=2.23.1 +version=2.23.2 revision=1 -_githash=ddabc05251a15f67f95741fc5eaa8ce4354dfa78 +_githash=7b8875f8bb237a156a1250629e8c684706bd202f _gitshort="${_githash:0:7}" wrksrc="${pkgname}-${_gitshort}" build_style=gnu-configure @@ -17,7 +17,7 @@ maintainer="Leah Neukirchen " license="Apache-2.0" homepage="https://repo.or.cz/alpine.git" distfiles="https://repo.or.cz/alpine.git/snapshot/${_githash}.tar.gz" -checksum=e06fe13e74ecd95c868c30e2587705eb9b7edef01a46dd136141271b7a948740 +checksum=07593d4a47d48f0253ad341f0baf0d1a17eb2b9356a1c96abc0f15688d8fd3b4 post_extract() { sed -i -e '/run test program/s/^/: /' \ From 6c7b09117be22c74264c6d975f1780e04b0dbca3 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 1 Jul 2020 17:41:27 +0200 Subject: [PATCH 145/410] swi-prolog: update to 8.2.1. --- srcpkgs/swi-prolog/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/swi-prolog/template b/srcpkgs/swi-prolog/template index 981216a3647..278dbff5f03 100644 --- a/srcpkgs/swi-prolog/template +++ b/srcpkgs/swi-prolog/template @@ -1,6 +1,6 @@ # Template file for 'swi-prolog' pkgname=swi-prolog -version=8.2.0 +version=8.2.1 revision=1 wrksrc="swipl-${version}" build_style=cmake @@ -16,7 +16,7 @@ license="LGPL-2.1-or-later" homepage="http://www.swi-prolog.org/" changelog="http://www.swi-prolog.org/ChangeLog?branch=stable" distfiles="http://www.swi-prolog.org/download/stable/src/swipl-${version}.tar.gz" -checksum=d8c9f3adb9cd997a5fed7b5f5dbfe971d2defda969b9066ada158e4202c09c3c +checksum=331bc5093d72af0c9f18fc9ed83b88ef9ddec0c8d379e6c49fa43739c8bda2fb if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" From 2e8d0a02c7d6d5d10fc0dac73444673960761557 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 1 Jul 2020 17:43:44 +0200 Subject: [PATCH 146/410] netpbm: update to 10.91.0. --- .../netpbm/files/netpbm-security-code.patch | 23 ------------------- srcpkgs/netpbm/template | 10 ++++---- 2 files changed, 5 insertions(+), 28 deletions(-) diff --git a/srcpkgs/netpbm/files/netpbm-security-code.patch b/srcpkgs/netpbm/files/netpbm-security-code.patch index 8fa365bb1a3..88d91435865 100644 --- a/srcpkgs/netpbm/files/netpbm-security-code.patch +++ b/srcpkgs/netpbm/files/netpbm-security-code.patch @@ -981,29 +981,6 @@ diff -up netpbm-10.58.01/urt/Runput.c.security-code netpbm-10.58.01/urt/Runput.c if ( h_cmap == NULL ) { fprintf( stderr, -diff -up netpbm-10.58.01/urt/scanargs.c.security-code netpbm-10.58.01/urt/scanargs.c ---- netpbm-10.58.01/urt/scanargs.c.security-code 2012-04-09 15:31:45.000000000 +0200 -+++ netpbm-10.58.01/urt/scanargs.c 2012-04-09 15:40:03.235619390 +0200 -@@ -38,6 +38,8 @@ - * - * Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire - * to have all "void" functions so declared. -+ * -+ * 2002-12-19: Fix maths wrapping bugs. Alan Cox - */ - - #include -@@ -63,8 +65,8 @@ typedef int *ptr; - /* - * Storage allocation macros - */ --#define NEW( type, cnt ) (type *) malloc( (cnt) * sizeof( type ) ) --#define RENEW( type, ptr, cnt ) (type *) realloc( ptr, (cnt) * sizeof( type ) ) -+#define NEW( type, cnt ) (type *) malloc2( (cnt) , sizeof( type ) ) -+#define RENEW( type, ptr, cnt ) (type *) realloc2( ptr, (cnt), sizeof( type ) ) - - static CONST_DECL char * prformat( CONST_DECL char *, int ); - static int isnum( CONST_DECL char *, int, int ); --- netpbm-10.58.01/lib/libpbm1.c.orig 2014-06-16 21:12:28.499230631 -0400 +++ netpbm-10.58.01/lib/libpbm1.c 2014-06-16 21:12:55.932519324 -0400 @@ -78,6 +78,7 @@ diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template index 01814aca117..38dbd3616c0 100644 --- a/srcpkgs/netpbm/template +++ b/srcpkgs/netpbm/template @@ -1,10 +1,10 @@ # Template file for 'netpbm' pkgname=netpbm # from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY -version=10.90.4 +version=10.91.0 revision=1 -_githash=ac5acc75607aeb1cb79007b62afa8a7c49059f3c -_githash_guide=aed071d6acf292f6cd0dd2a00b1ab54101aa6009 +_githash=1cd3ef0dd6c2236d0b329879bacd9360d01c88a1 +_githash_guide=13c467a30bb451860177e5b2c707f772bd717909 create_wrksrc=yes build_wrksrc="netpbm-mirror-${_githash}" hostmakedepends="pkg-config perl python flex" @@ -16,8 +16,8 @@ license="BSD-3-Clause,GPL-2.0-only,custom:netpbm" homepage="http://netpbm.sourceforge.net/" distfiles="https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash}.tar.gz https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz" -checksum="9e0a331a8f88f4575ed327a7b1215dd5320010ffd738025468227e5e31b75616 - d00b6a83e1c806b3c53ee7003974569b61993ff5e60f1d5de1b712c1203dfea0" +checksum="4849043bbf91932f32d60c3cbb82a79e2df5455f25db70109851ee60b8f06da2 + d6519cfef1c2beab7bd3889435e77e27afe329ff3bfea5885a64b00a585dddcf" post_extract() { cd $build_wrksrc From daff58ea50e0bef6b6ce669dcaa654e98631e98f Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 1 Jul 2020 17:44:40 +0200 Subject: [PATCH 147/410] zutils: update to 1.9. --- srcpkgs/zutils/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/zutils/template b/srcpkgs/zutils/template index 73e6de2624a..8999be27760 100644 --- a/srcpkgs/zutils/template +++ b/srcpkgs/zutils/template @@ -1,6 +1,6 @@ # Template file for 'zutils' pkgname=zutils -version=1.8 +version=1.9 revision=1 build_style=gnu-configure hostmakedepends="lzip" @@ -11,7 +11,7 @@ maintainer="Leah Neukirchen " license="GPL-2.0-or-later" homepage="http://www.nongnu.org/zutils/zutils.html" distfiles="http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${version}.tar.lz" -checksum=07a47e1602be66a166bd3bf99c80efe2df889e2d407fadcd7ff83974762da337 +checksum=59d83cb129788528d311a0bb686e40986c6941b1ad90edc20a91878c39aa5c78 post_install() { cd ${DESTDIR}/usr/bin From f15806a726b502135b3750d5980df33752e544aa Mon Sep 17 00:00:00 2001 From: yopito Date: Tue, 16 Jun 2020 06:55:43 +0200 Subject: [PATCH 148/410] python-jmespath: update to 0.10.0 --- srcpkgs/python-jmespath/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python-jmespath/template b/srcpkgs/python-jmespath/template index ca7bd4d61d2..6f1dfcecf0f 100644 --- a/srcpkgs/python-jmespath/template +++ b/srcpkgs/python-jmespath/template @@ -1,6 +1,6 @@ # Template file for 'python-jmespath' pkgname=python-jmespath -version=0.9.5 +version=0.10.0 revision=1 archs=noarch wrksrc="jmespath.py-${version}" @@ -12,7 +12,7 @@ maintainer="yopito " license="MIT" homepage="http://jmespath.org" distfiles="https://github.com/jmespath/jmespath.py/archive/${version}.tar.gz" -checksum=74d5baa70e6e43fd51253a435954fbd2d994ecd9eeb372f6c5cd694fb2bdcd76 +checksum=999b0ef13b798cf04de5451a51201d63a6feaf07c3fdcfbab4e5bca2b4ac653e alternatives="jmespath:jp.py:/usr/bin/jp.py2" post_install() { From 9b27f68b1e41efe91631b70d3a3511d16f905bea Mon Sep 17 00:00:00 2001 From: Felipe Nogueira Date: Thu, 25 Jun 2020 00:50:30 -0300 Subject: [PATCH 149/410] composer: update to 1.10.8. --- srcpkgs/composer/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/composer/template b/srcpkgs/composer/template index 99b626e9732..31684a026f3 100644 --- a/srcpkgs/composer/template +++ b/srcpkgs/composer/template @@ -1,17 +1,17 @@ # Template file for 'composer' pkgname=composer -version=1.10.1 +version=1.10.8 revision=1 archs=noarch build_style=fetch depends="php" short_desc="Dependency manager for PHP" -maintainer="Alexander Mamay " +maintainer="Felipe Nogueira " license="MIT" homepage="https://getcomposer.org/" distfiles="https://github.com/composer/composer/releases/download/${version}/composer.phar https://raw.githubusercontent.com/composer/composer/master/LICENSE" -checksum="57c63365eccdd4a787ebc40b9c57a4e019ab79d2f8662cea9892992d91640bf0 +checksum="4c40737f5d5f36d04f8b2df37171c6a1ff520efcadcb8626cc7c30bd4c5178e5 7855ac293067aebe7e51afdd23b9dea54b8be24187dbecc9b9142581c37f596c" do_install() { From 4c6f68bbc7a129c33163e91933b7d47177531afe Mon Sep 17 00:00:00 2001 From: Reed Wade Date: Mon, 8 Jun 2020 17:39:30 +0200 Subject: [PATCH 150/410] New Package: python3-i3ipc-2.2.1 Closes: #22688 [via git-merge-pr] --- srcpkgs/python3-i3ipc/template | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 srcpkgs/python3-i3ipc/template diff --git a/srcpkgs/python3-i3ipc/template b/srcpkgs/python3-i3ipc/template new file mode 100644 index 00000000000..c559f276fc3 --- /dev/null +++ b/srcpkgs/python3-i3ipc/template @@ -0,0 +1,17 @@ +# Template file for 'python3-i3ipc' +pkgname=python3-i3ipc +version=2.2.1 +revision=1 +wrksrc="${pkgname#*-}-${version}" +build_style=python3-module +hostmakedepends="python3-setuptools" +short_desc="Improved Python library to control i3wm and sway" +maintainer="Reed Wade " +license="BSD-3-Clause" +homepage="https://pypi.org/project/i3ipc/" +distfiles="${PYPI_SITE}/i/i3ipc/i3ipc-${version}.tar.gz" +checksum=e880d7d7147959ead5cb34764f08b97b41385b36eb8256e8af1ce163dbcccce8 + +post_install() { + vlicense LICENSE +} From 22ea0fdca18a01bd1bcc7b3ef9930e0b11dbc7c8 Mon Sep 17 00:00:00 2001 From: Piraty Date: Wed, 1 Jul 2020 18:01:57 +0200 Subject: [PATCH 151/410] python3-i3ipc: noarch Relates to: #22688 --- srcpkgs/python3-i3ipc/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/python3-i3ipc/template b/srcpkgs/python3-i3ipc/template index c559f276fc3..14be6b27d4c 100644 --- a/srcpkgs/python3-i3ipc/template +++ b/srcpkgs/python3-i3ipc/template @@ -1,7 +1,8 @@ # Template file for 'python3-i3ipc' pkgname=python3-i3ipc version=2.2.1 -revision=1 +revision=2 +archs=noarch wrksrc="${pkgname#*-}-${version}" build_style=python3-module hostmakedepends="python3-setuptools" From 3e1592faea7e0d1065a228a755d83a2fae346f38 Mon Sep 17 00:00:00 2001 From: q66 Date: Wed, 1 Jul 2020 18:11:39 +0200 Subject: [PATCH 152/410] luasec: rename to lua53-luasec --- srcpkgs/{luasec => lua53-luasec}/template | 22 ++++++++++++++-------- srcpkgs/luasec | 1 + 2 files changed, 15 insertions(+), 8 deletions(-) rename srcpkgs/{luasec => lua53-luasec}/template (57%) create mode 120000 srcpkgs/luasec diff --git a/srcpkgs/luasec/template b/srcpkgs/lua53-luasec/template similarity index 57% rename from srcpkgs/luasec/template rename to srcpkgs/lua53-luasec/template index be68fc3d8ee..537b3de7e7d 100644 --- a/srcpkgs/luasec/template +++ b/srcpkgs/lua53-luasec/template @@ -1,17 +1,17 @@ -# Template file for 'luasec' -pkgname=luasec +# Template file for 'lua53-luasec' +pkgname=lua53-luasec version=0.8.1 -revision=1 -wrksrc="${pkgname}-${pkgname}-${version}" +revision=2 +wrksrc="luasec-luasec-${version}" build_style=gnu-makefile -hostmakedepends="lua" -makedepends="lua-devel libressl-devel" -depends="lua" +hostmakedepends="lua53" +makedepends="lua53-devel libressl-devel" +depends="lua53" short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication" maintainer="Duncaen " license="MIT" homepage="https://github.com/brunoos/luasec" -distfiles="https://github.com/brunoos/luasec/archive/${pkgname}-${version}.tar.gz" +distfiles="https://github.com/brunoos/luasec/archive/luasec-${version}.tar.gz" checksum=cc9fc92df3be56add5c9687319951f457c31f5d12ac19cfc09d53056dc24f04e do_build() { @@ -23,3 +23,9 @@ do_build() { pre_install() { vlicense LICENSE } + +luasec_package() { + depends="lua53-luasec>=${version}_${revision}" + short_desc+=" (transitional dummy package)" + build_style=meta +} diff --git a/srcpkgs/luasec b/srcpkgs/luasec new file mode 120000 index 00000000000..11e94d58f46 --- /dev/null +++ b/srcpkgs/luasec @@ -0,0 +1 @@ +lua53-luasec \ No newline at end of file From 3f737a205c5f22142cd3fcd67020be8333942a6a Mon Sep 17 00:00:00 2001 From: q66 Date: Wed, 1 Jul 2020 18:11:48 +0200 Subject: [PATCH 153/410] lua52-MessagePack: add support for other versions --- srcpkgs/lua51-MessagePack | 1 + srcpkgs/lua52-MessagePack | 1 + srcpkgs/lua52-MessagePack/template | 21 ----------- srcpkgs/lua53-MessagePack | 1 + srcpkgs/lua54-MessagePack/template | 56 ++++++++++++++++++++++++++++++ 5 files changed, 59 insertions(+), 21 deletions(-) create mode 120000 srcpkgs/lua51-MessagePack create mode 120000 srcpkgs/lua52-MessagePack delete mode 100644 srcpkgs/lua52-MessagePack/template create mode 120000 srcpkgs/lua53-MessagePack create mode 100644 srcpkgs/lua54-MessagePack/template diff --git a/srcpkgs/lua51-MessagePack b/srcpkgs/lua51-MessagePack new file mode 120000 index 00000000000..990ceab3ba1 --- /dev/null +++ b/srcpkgs/lua51-MessagePack @@ -0,0 +1 @@ +lua54-MessagePack \ No newline at end of file diff --git a/srcpkgs/lua52-MessagePack b/srcpkgs/lua52-MessagePack new file mode 120000 index 00000000000..990ceab3ba1 --- /dev/null +++ b/srcpkgs/lua52-MessagePack @@ -0,0 +1 @@ +lua54-MessagePack \ No newline at end of file diff --git a/srcpkgs/lua52-MessagePack/template b/srcpkgs/lua52-MessagePack/template deleted file mode 100644 index 9e8b775e1d0..00000000000 --- a/srcpkgs/lua52-MessagePack/template +++ /dev/null @@ -1,21 +0,0 @@ -# Template file for 'lua52-MessagePack' -pkgname=lua52-MessagePack -version=0.5.2 -revision=1 -archs=noarch -wrksrc="${pkgname/52/}-${version}" -hostmakedepends="lua52" -makedepends="lua52" -depends="lua52>=5.2" -short_desc="Pure Lua implementation of msgpack.org" -maintainer="Tj Vanderpoel (bougyman) " -license="MIT" -homepage="https://framagit.org/fperrad/lua-MessagePack" -distfiles="${homepage}/-/archive/${version}/${wrksrc}.tar.gz" -checksum=e8285b1c574fca279e7ec8c09b49073ef48a13c4a12d8db920ca50be34b07394 -replaces="lua-MessagePack>=0" - -do_install() { - make PREFIX=/usr DESTDIR="${DESTDIR}" LUAVER=5.2 install - vlicense COPYRIGHT LICENSE -} diff --git a/srcpkgs/lua53-MessagePack b/srcpkgs/lua53-MessagePack new file mode 120000 index 00000000000..990ceab3ba1 --- /dev/null +++ b/srcpkgs/lua53-MessagePack @@ -0,0 +1 @@ +lua54-MessagePack \ No newline at end of file diff --git a/srcpkgs/lua54-MessagePack/template b/srcpkgs/lua54-MessagePack/template new file mode 100644 index 00000000000..6383677d8ca --- /dev/null +++ b/srcpkgs/lua54-MessagePack/template @@ -0,0 +1,56 @@ +# Template file for 'lua54-MessagePack' +pkgname=lua54-MessagePack +version=0.5.2 +revision=2 +archs=noarch +wrksrc="lua-MessagePack-${version}" +depends="lua54" +_desc="Pure Lua implementation of msgpack.org" +short_desc="${_desc} (5.4.x)" +maintainer="Tj Vanderpoel (bougyman) " +license="MIT" +homepage="https://framagit.org/fperrad/lua-MessagePack" +distfiles="${homepage}/-/archive/${version}/${wrksrc}.tar.gz" +checksum=e8285b1c574fca279e7ec8c09b49073ef48a13c4a12d8db920ca50be34b07394 +replaces="lua-MessagePack>=0" + +do_install() { + # Once the 5.3 version is confirmed to work completely with 5.4, + # adjust so that we install the 5.3 version for 5.4 as well + for luaver in 5.1 5.2 5.3 5.4; do + vmkdir usr/share/lua/${luaver} + if [ "$luaver" = "5.3" ]; then + vinstall src5.3/MessagePack.lua 644 usr/share/lua/${luaver} + else + vinstall src/MessagePack.lua 644 usr/share/lua/${luaver} + fi + done + vlicense COPYRIGHT LICENSE +} + +lua51-MessagePack_package() { + depends="lua51" + short_desc="${_desc} (5.1.x)" + pkg_install() { + vlicense "${wrksrc}/COPYRIGHT" LICENSE + vmove usr/share/lua/5.1 + } +} + +lua52-MessagePack_package() { + depends="lua52" + short_desc="${_desc} (5.2.x)" + pkg_install() { + vlicense "${wrksrc}/COPYRIGHT" LICENSE + vmove usr/share/lua/5.2 + } +} + +lua53-MessagePack_package() { + depends="lua53" + short_desc="${_desc} (5.3.x)" + pkg_install() { + vlicense "${wrksrc}/COPYRIGHT" LICENSE + vmove usr/share/lua/5.3 + } +} From f4762574fed556ff7ef97c60bcbd7c168e3f61bf Mon Sep 17 00:00:00 2001 From: q66 Date: Wed, 1 Jul 2020 18:11:51 +0200 Subject: [PATCH 154/410] luaexpat: add support for all lua versions, rename --- srcpkgs/lua51-luaexpat | 1 + srcpkgs/lua52-luaexpat | 1 + srcpkgs/lua53-luaexpat | 1 + srcpkgs/lua54-luaexpat/template | 83 +++++++++++++++++++++++++++++++++ srcpkgs/luaexpat | 1 + srcpkgs/luaexpat/template | 19 -------- 6 files changed, 87 insertions(+), 19 deletions(-) create mode 120000 srcpkgs/lua51-luaexpat create mode 120000 srcpkgs/lua52-luaexpat create mode 120000 srcpkgs/lua53-luaexpat create mode 100644 srcpkgs/lua54-luaexpat/template create mode 120000 srcpkgs/luaexpat delete mode 100644 srcpkgs/luaexpat/template diff --git a/srcpkgs/lua51-luaexpat b/srcpkgs/lua51-luaexpat new file mode 120000 index 00000000000..fe62399e2e5 --- /dev/null +++ b/srcpkgs/lua51-luaexpat @@ -0,0 +1 @@ +lua54-luaexpat \ No newline at end of file diff --git a/srcpkgs/lua52-luaexpat b/srcpkgs/lua52-luaexpat new file mode 120000 index 00000000000..fe62399e2e5 --- /dev/null +++ b/srcpkgs/lua52-luaexpat @@ -0,0 +1 @@ +lua54-luaexpat \ No newline at end of file diff --git a/srcpkgs/lua53-luaexpat b/srcpkgs/lua53-luaexpat new file mode 120000 index 00000000000..fe62399e2e5 --- /dev/null +++ b/srcpkgs/lua53-luaexpat @@ -0,0 +1 @@ +lua54-luaexpat \ No newline at end of file diff --git a/srcpkgs/lua54-luaexpat/template b/srcpkgs/lua54-luaexpat/template new file mode 100644 index 00000000000..7e2e1004727 --- /dev/null +++ b/srcpkgs/lua54-luaexpat/template @@ -0,0 +1,83 @@ +# Template file for 'lua54-luaexpat' +pkgname=lua54-luaexpat +version=1.3.0 +revision=3 +wrksrc=luaexpat-${version} +make_build_args="EXPAT_INC=-I${XBPS_CROSS_BASE}/usr/include" +makedepends="lua51-devel lua52-devel lua53-devel lua54-devel expat-devel" +depends="lua54" +_desc="XML Expat parsing for the Lua programming language" +short_desc="${_desc} (5.4.x)" +maintainer="Duncaen " +license="MIT" +homepage="https://matthewwild.co.uk/projects/luaexpat/" +distfiles="https://matthewwild.co.uk/projects/luaexpat/luaexpat-${version}.tar.gz" +checksum=d060397960d87b2c89cf490f330508b7def1a0677bdc120531c571609fc57dc3 + +post_extract() { + cd "${wrksrc}" + mkdir -p lua5.1 + + sed -n '/Copyright/,/SOFTWARE\./p' doc/us/license.html > LICENSE + # lua 5.3+ does not work with -ansi (integer type detection error) + vsed -i 's, -ansi,,' Makefile + + mv * lua5.1 || true + cp -a lua5.1 lua5.2 + cp -a lua5.1 lua5.3 + cp -a lua5.1 lua5.4 +} + +do_build() { + for luaver in 5.1 5.2 5.3 5.4; do + pushd lua${luaver} + make CC=$CC LUA_V=${luaver} ${make_build_args} ${makejobs} \ + LUA_INC=-I${XBPS_CROSS_BASE}/usr/include/lua${luaver} + popd + done +} + +do_install() { + for luaver in 5.1 5.2 5.3 5.4; do + pushd lua${luaver} + make DESTDIR=${DESTDIR} LUA_V=${luaver} install + popd + done + vlicense lua5.4/LICENSE +} + +lua51-luaexpat_package() { + depends="lua51" + short_desc="${_desc} (5.1.x)" + pkg_install() { + vlicense "${wrksrc}/lua5.1/LICENSE" + vmove usr/lib/lua/5.1 + vmove usr/share/lua/5.1 + } +} + +lua52-luaexpat_package() { + depends="lua52" + short_desc="${_desc} (5.2.x)" + pkg_install() { + vlicense "${wrksrc}/lua5.2/LICENSE" + vmove usr/lib/lua/5.2 + vmove usr/share/lua/5.2 + } +} + +lua53-luaexpat_package() { + depends="lua53" + short_desc="${_desc} (5.3.x)" + pkg_install() { + vlicense "${wrksrc}/lua5.3/LICENSE" + vmove usr/lib/lua/5.3 + vmove usr/share/lua/5.3 + } +} + +luaexpat_package() { + depends="lua51-luaexpat>=${version}_${revision}" + short_desc="${_desc} (5.1.x) (transitional dummy package)" + build_style=meta +} diff --git a/srcpkgs/luaexpat b/srcpkgs/luaexpat new file mode 120000 index 00000000000..fe62399e2e5 --- /dev/null +++ b/srcpkgs/luaexpat @@ -0,0 +1 @@ +lua54-luaexpat \ No newline at end of file diff --git a/srcpkgs/luaexpat/template b/srcpkgs/luaexpat/template deleted file mode 100644 index 61dc698c2b4..00000000000 --- a/srcpkgs/luaexpat/template +++ /dev/null @@ -1,19 +0,0 @@ -# Template file for 'luaexpat' -pkgname=luaexpat -version=1.3.0 -revision=2 -build_style=gnu-makefile -make_build_args="LUA_INC=-I${XBPS_CROSS_BASE}/usr/include/lua5.1 EXPAT_INC=-I${XBPS_CROSS_BASE}/usr/include" -makedepends="lua51-devel expat-devel" -depends="lua51" -short_desc="XML Expat parsing for the Lua programming language" -maintainer="Duncaen " -license="MIT" -homepage="https://matthewwild.co.uk/projects/luaexpat/" -distfiles="https://matthewwild.co.uk/projects/luaexpat/luaexpat-${version}.tar.gz" -checksum=d060397960d87b2c89cf490f330508b7def1a0677bdc120531c571609fc57dc3 - -post_install() { - sed -n '/Copyright/,/SOFTWARE\./p' doc/us/license.html > LICENSE - vlicense LICENSE -} From 73c5370025bee76041dfc422566870aa6409a828 Mon Sep 17 00:00:00 2001 From: q66 Date: Wed, 1 Jul 2020 18:11:54 +0200 Subject: [PATCH 155/410] luasocket: rename to lua51-luasocket --- .../patches/luasocket-arch.patch | 0 .../patches/luasocket-unixsocket.patch | 0 srcpkgs/{luasocket => lua51-luasocket}/template | 15 +++++++++++---- srcpkgs/{luasocket => lua51-luasocket}/update | 0 srcpkgs/luasocket | 1 + 5 files changed, 12 insertions(+), 4 deletions(-) rename srcpkgs/{luasocket => lua51-luasocket}/patches/luasocket-arch.patch (100%) rename srcpkgs/{luasocket => lua51-luasocket}/patches/luasocket-unixsocket.patch (100%) rename srcpkgs/{luasocket => lua51-luasocket}/template (62%) rename srcpkgs/{luasocket => lua51-luasocket}/update (100%) create mode 120000 srcpkgs/luasocket diff --git a/srcpkgs/luasocket/patches/luasocket-arch.patch b/srcpkgs/lua51-luasocket/patches/luasocket-arch.patch similarity index 100% rename from srcpkgs/luasocket/patches/luasocket-arch.patch rename to srcpkgs/lua51-luasocket/patches/luasocket-arch.patch diff --git a/srcpkgs/luasocket/patches/luasocket-unixsocket.patch b/srcpkgs/lua51-luasocket/patches/luasocket-unixsocket.patch similarity index 100% rename from srcpkgs/luasocket/patches/luasocket-unixsocket.patch rename to srcpkgs/lua51-luasocket/patches/luasocket-unixsocket.patch diff --git a/srcpkgs/luasocket/template b/srcpkgs/lua51-luasocket/template similarity index 62% rename from srcpkgs/luasocket/template rename to srcpkgs/lua51-luasocket/template index 85a7739cf1d..63a505b4ecf 100644 --- a/srcpkgs/luasocket/template +++ b/srcpkgs/lua51-luasocket/template @@ -1,11 +1,12 @@ -# Template file for 'luasocket' -pkgname=luasocket +# Template file for 'lua51-luasocket' +pkgname=lua51-luasocket version=2.0.2 -revision=6 +revision=7 +wrksrc=luasocket-${version} build_style=gnu-makefile makedepends="lua51-devel" depends="lua51" -short_desc="Network support for the Lua language " +short_desc="Network support for the Lua language" maintainer="Orphaned " license="MIT" homepage="http://w3.impa.br/~diego/software/luasocket/" @@ -19,3 +20,9 @@ do_build() { post_install() { vlicense LICENSE } + +luasocket_package() { + depends="lua51-luasocket>=${version}_${revision}" + short_desc+=" (transitional dummy package)" + build_style=meta +} diff --git a/srcpkgs/luasocket/update b/srcpkgs/lua51-luasocket/update similarity index 100% rename from srcpkgs/luasocket/update rename to srcpkgs/lua51-luasocket/update diff --git a/srcpkgs/luasocket b/srcpkgs/luasocket new file mode 120000 index 00000000000..d061e632fab --- /dev/null +++ b/srcpkgs/luasocket @@ -0,0 +1 @@ +lua51-luasocket \ No newline at end of file From 0fc3deaf521925b904a89a5072624d100ac8c11f Mon Sep 17 00:00:00 2001 From: q66 Date: Wed, 1 Jul 2020 18:11:57 +0200 Subject: [PATCH 156/410] luafilesystem: adopt, update to 1.8.0, add all versions --- srcpkgs/lua51-luafilesystem | 1 + srcpkgs/lua52-luafilesystem | 1 + srcpkgs/lua53-luafilesystem | 1 + srcpkgs/lua54-luafilesystem/template | 75 +++++++++++++++++++ .../update | 0 srcpkgs/luafilesystem | 1 + srcpkgs/luafilesystem/template | 22 ------ 7 files changed, 79 insertions(+), 22 deletions(-) create mode 120000 srcpkgs/lua51-luafilesystem create mode 120000 srcpkgs/lua52-luafilesystem create mode 120000 srcpkgs/lua53-luafilesystem create mode 100644 srcpkgs/lua54-luafilesystem/template rename srcpkgs/{luafilesystem => lua54-luafilesystem}/update (100%) create mode 120000 srcpkgs/luafilesystem delete mode 100644 srcpkgs/luafilesystem/template diff --git a/srcpkgs/lua51-luafilesystem b/srcpkgs/lua51-luafilesystem new file mode 120000 index 00000000000..34380acd602 --- /dev/null +++ b/srcpkgs/lua51-luafilesystem @@ -0,0 +1 @@ +lua54-luafilesystem \ No newline at end of file diff --git a/srcpkgs/lua52-luafilesystem b/srcpkgs/lua52-luafilesystem new file mode 120000 index 00000000000..34380acd602 --- /dev/null +++ b/srcpkgs/lua52-luafilesystem @@ -0,0 +1 @@ +lua54-luafilesystem \ No newline at end of file diff --git a/srcpkgs/lua53-luafilesystem b/srcpkgs/lua53-luafilesystem new file mode 120000 index 00000000000..34380acd602 --- /dev/null +++ b/srcpkgs/lua53-luafilesystem @@ -0,0 +1 @@ +lua54-luafilesystem \ No newline at end of file diff --git a/srcpkgs/lua54-luafilesystem/template b/srcpkgs/lua54-luafilesystem/template new file mode 100644 index 00000000000..2f6d3104f05 --- /dev/null +++ b/srcpkgs/lua54-luafilesystem/template @@ -0,0 +1,75 @@ +# Template file for 'lua54-luafilesystem' +pkgname=lua54-luafilesystem +version=1.8.0 +revision=1 +wrksrc="luafilesystem-${version//./_}" +makedepends="lua51-devel lua52-devel lua53-devel lua54-devel" +depends="lua54" +_desc="File System Library for the Lua Programming Language" +short_desc="${_desc} (5.4.x)" +maintainer="q66 " +license="MIT" +homepage="http://keplerproject.github.com/luafilesystem" +distfiles="https://github.com/keplerproject/luafilesystem/archive/v${version//./_}.tar.gz" +checksum=16d17c788b8093f2047325343f5e9b74cccb1ea96001e45914a58bbae8932495 + +post_extract() { + cd "${wrksrc}" + mkdir -p lua5.1 + + mv * lua5.1 || true + cp -a lua5.1 lua5.2 + cp -a lua5.1 lua5.3 + cp -a lua5.1 lua5.4 +} + +do_build() { + for luaver in 5.1 5.2 5.3 5.4; do + pushd lua${luaver} + make CC=$CC LUA_VERSION=${luaver} ${make_build_args} ${makejobs} \ + LUA_INC=-I${XBPS_CROSS_BASE}/usr/include/lua${luaver} + popd + done +} + +do_install() { + for luaver in 5.1 5.2 5.3 5.4; do + pushd lua${luaver} + make PREFIX=${DESTDIR}/usr LUA_VERSION=${luaver} install + popd + done + vlicense lua5.4/LICENSE +} + +lua51-luafilesystem_package() { + depends="lua51" + short_desc="${_desc} (5.1.x)" + pkg_install() { + vlicense "${wrksrc}/lua5.1/LICENSE" + vmove usr/lib/lua/5.1 + } +} + +lua52-luafilesystem_package() { + depends="lua52" + short_desc="${_desc} (5.2.x)" + pkg_install() { + vlicense "${wrksrc}/lua5.2/LICENSE" + vmove usr/lib/lua/5.2 + } +} + +lua53-luafilesystem_package() { + depends="lua53" + short_desc="${_desc} (5.3.x)" + pkg_install() { + vlicense "${wrksrc}/lua5.3/LICENSE" + vmove usr/lib/lua/5.3 + } +} + +luafilesystem_package() { + depends="lua51-luafilesystem>=${version}_${revision}" + short_desc="${_desc} (5.1.x) (transitional dummy package)" + build_style=meta +} diff --git a/srcpkgs/luafilesystem/update b/srcpkgs/lua54-luafilesystem/update similarity index 100% rename from srcpkgs/luafilesystem/update rename to srcpkgs/lua54-luafilesystem/update diff --git a/srcpkgs/luafilesystem b/srcpkgs/luafilesystem new file mode 120000 index 00000000000..34380acd602 --- /dev/null +++ b/srcpkgs/luafilesystem @@ -0,0 +1 @@ +lua54-luafilesystem \ No newline at end of file diff --git a/srcpkgs/luafilesystem/template b/srcpkgs/luafilesystem/template deleted file mode 100644 index 3f959938961..00000000000 --- a/srcpkgs/luafilesystem/template +++ /dev/null @@ -1,22 +0,0 @@ -# Template file for 'luafilesystem' -pkgname=luafilesystem -version=1.7.0.2 -revision=1 -wrksrc="$pkgname-${version//./_}" -makedepends="lua51-devel" -depends="lua51" -short_desc="File System Library for the Lua Programming Language" -maintainer="Orphaned " -license="MIT" -homepage="http://keplerproject.github.com/luafilesystem" -distfiles="https://github.com/keplerproject/${pkgname}/archive/v${version//./_}.tar.gz" -checksum=23b4883aeb4fb90b2d0f338659f33a631f9df7a7e67c54115775a77d4ac3cc59 - -do_build() { - make ${makejobs} CC="$CC" LUA_INC=${XBPS_CROSS_BASE}/usr/include/lua5.1 -} - -do_install() { - make PREFIX=${DESTDIR}/usr install - vlicense LICENSE -} From c947979a1d76de944776a938aaec0bcd01a5474f Mon Sep 17 00:00:00 2001 From: q66 Date: Wed, 1 Jul 2020 18:12:00 +0200 Subject: [PATCH 157/410] libluv: remove lua dependency (it depends on luajit) The lua dependency didn't make any sense since libluv can be compiled for one or the other. We choose luajit because neovim is also compiled with luajit etc. and it's the default choice. --- srcpkgs/libluv/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/libluv/template b/srcpkgs/libluv/template index 7f340255f69..6f261668624 100644 --- a/srcpkgs/libluv/template +++ b/srcpkgs/libluv/template @@ -1,14 +1,14 @@ # Template file for 'libluv' pkgname=libluv version=1.32.0.0 -revision=1 +revision=2 _distver="${version%.*}-${version##*.}" wrksrc=luv-${_distver} build_style=cmake configure_args="-DLUA_BUILD_TYPE=System -DBUILD_MODULE=OFF -DBUILD_SHARED_LIBS=ON" makedepends="libuv-devel LuaJIT-devel" -depends="lua libuv LuaJIT" -short_desc="Bare libuv bindings for lua" +depends="libuv LuaJIT" +short_desc="Bare libuv bindings for LuaJIT" maintainer="andry-dev " license="Apache-2.0" homepage="https://github.com/luvit/luv" From 08686eb5a121d9240ddbde7fd9024cd757362f56 Mon Sep 17 00:00:00 2001 From: q66 Date: Wed, 1 Jul 2020 18:12:03 +0200 Subject: [PATCH 158/410] vicious: update to 2.4.1, add all lua versions, rename --- srcpkgs/lua51-vicious | 1 + srcpkgs/lua52-vicious | 1 + srcpkgs/lua53-vicious | 1 + srcpkgs/lua54-vicious/template | 69 ++++++++++++++++++++++++++++++++++ srcpkgs/vicious | 1 + srcpkgs/vicious/template | 26 ------------- 6 files changed, 73 insertions(+), 26 deletions(-) create mode 120000 srcpkgs/lua51-vicious create mode 120000 srcpkgs/lua52-vicious create mode 120000 srcpkgs/lua53-vicious create mode 100644 srcpkgs/lua54-vicious/template create mode 120000 srcpkgs/vicious delete mode 100644 srcpkgs/vicious/template diff --git a/srcpkgs/lua51-vicious b/srcpkgs/lua51-vicious new file mode 120000 index 00000000000..7d8a019c106 --- /dev/null +++ b/srcpkgs/lua51-vicious @@ -0,0 +1 @@ +lua54-vicious \ No newline at end of file diff --git a/srcpkgs/lua52-vicious b/srcpkgs/lua52-vicious new file mode 120000 index 00000000000..7d8a019c106 --- /dev/null +++ b/srcpkgs/lua52-vicious @@ -0,0 +1 @@ +lua54-vicious \ No newline at end of file diff --git a/srcpkgs/lua53-vicious b/srcpkgs/lua53-vicious new file mode 120000 index 00000000000..7d8a019c106 --- /dev/null +++ b/srcpkgs/lua53-vicious @@ -0,0 +1 @@ +lua54-vicious \ No newline at end of file diff --git a/srcpkgs/lua54-vicious/template b/srcpkgs/lua54-vicious/template new file mode 100644 index 00000000000..9da7e6330c5 --- /dev/null +++ b/srcpkgs/lua54-vicious/template @@ -0,0 +1,69 @@ +# Template file for 'lua54-vicious' +pkgname=lua54-vicious +version=2.4.1 +revision=1 +wrksrc=vicious-${version} +archs=noarch +depends="lua54" +_desc="Modular widget library for window managers" +short_desc="${_desc} (5.4.x)" +maintainer="Steven R " +license="GPL-2.0-only" +homepage="https://github.com/Mic92/vicious" +distfiles="https://github.com/Mic92/vicious/archive/v${version}.tar.gz" +checksum=02a123e77c42cb5bfff66e1bf95e5b8219ec83de91ecef5e4951be021438f3a3 + +do_install() { + vdoc Changes.md + vdoc TODO + vdoc README.md + + for luaver in 5.1 5.2 5.3 5.4; do + vmkdir usr/share/lua/${luaver}/vicious + vmkdir usr/share/lua/${luaver}/vicious/widgets + vmkdir usr/share/lua/${luaver}/vicious/contrib + + vcopy "*.lua" usr/share/lua/${luaver}/vicious + vcopy "widgets/*.lua" usr/share/lua/${luaver}/vicious/widgets + vcopy "contrib/*.lua" usr/share/lua/${luaver}/vicious/contrib + done +} + +lua51-vicious_package() { + depends="lua51" + short_desc="${_desc} (5.1.x)" + pkg_install() { + vmove usr/share/lua/5.1 + vdoc ${wrksrc}/Changes.md + vdoc ${wrksrc}/README.md + vdoc ${wrksrc}/TODO + } +} + +lua52-vicious_package() { + depends="lua52" + short_desc="${_desc} (5.2.x)" + pkg_install() { + vmove usr/share/lua/5.2 + vdoc ${wrksrc}/Changes.md + vdoc ${wrksrc}/README.md + vdoc ${wrksrc}/TODO + } +} + +lua53-vicious_package() { + depends="lua53" + short_desc="${_desc} (5.3.x)" + pkg_install() { + vmove usr/share/lua/5.3 + vdoc ${wrksrc}/Changes.md + vdoc ${wrksrc}/README.md + vdoc ${wrksrc}/TODO + } +} + +vicious_package() { + depends="lua53-vicious>=${version}_${revision}" + short_desc="${_desc} (5.3.x) (transitional dummy package)" + build_style=meta +} diff --git a/srcpkgs/vicious b/srcpkgs/vicious new file mode 120000 index 00000000000..7d8a019c106 --- /dev/null +++ b/srcpkgs/vicious @@ -0,0 +1 @@ +lua54-vicious \ No newline at end of file diff --git a/srcpkgs/vicious/template b/srcpkgs/vicious/template deleted file mode 100644 index 0c34e5869d4..00000000000 --- a/srcpkgs/vicious/template +++ /dev/null @@ -1,26 +0,0 @@ -# Template file for 'vicious' -pkgname=vicious -version=2.3.3 -revision=1 -archs=noarch -depends="lua" -short_desc="Modular widget library for window managers" -maintainer="Steven R " -license="GPL-2.0-only" -homepage="https://github.com/Mic92/vicious" -distfiles="https://github.com/Mic92/vicious/archive/v${version}.tar.gz" -checksum=062f0e8c802a07b58d094fcc66aba7a7de242726733d31ee607a483c20c4957c - -do_install() { - vdoc Changes.md - vdoc TODO - vdoc README.md - - vmkdir usr/share/lua/5.3/vicious - vmkdir usr/share/lua/5.3/vicious/widgets - vmkdir usr/share/lua/5.3/vicious/contrib - - vcopy "*.lua" usr/share/lua/5.3/vicious - vcopy "widgets/*.lua" usr/share/lua/5.3/vicious/widgets - vcopy "contrib/*.lua" usr/share/lua/5.3/vicious/contrib -} From 633ed994831c3e76b1090507ab5cac84112b292f Mon Sep 17 00:00:00 2001 From: q66 Date: Wed, 1 Jul 2020 18:12:05 +0200 Subject: [PATCH 159/410] editorconfig-core-lua: update to 0.3.0, rename to lua53-editorconfig-core --- srcpkgs/editorconfig-core-lua | 1 + .../patches/testing-not-included.patch | 16 ----------- srcpkgs/editorconfig-core-lua/template | 20 -------------- srcpkgs/lua53-editorconfig-core/template | 27 +++++++++++++++++++ 4 files changed, 28 insertions(+), 36 deletions(-) create mode 120000 srcpkgs/editorconfig-core-lua delete mode 100644 srcpkgs/editorconfig-core-lua/patches/testing-not-included.patch delete mode 100644 srcpkgs/editorconfig-core-lua/template create mode 100644 srcpkgs/lua53-editorconfig-core/template diff --git a/srcpkgs/editorconfig-core-lua b/srcpkgs/editorconfig-core-lua new file mode 120000 index 00000000000..471164cd781 --- /dev/null +++ b/srcpkgs/editorconfig-core-lua @@ -0,0 +1 @@ +lua53-editorconfig-core \ No newline at end of file diff --git a/srcpkgs/editorconfig-core-lua/patches/testing-not-included.patch b/srcpkgs/editorconfig-core-lua/patches/testing-not-included.patch deleted file mode 100644 index 39dad5031a7..00000000000 --- a/srcpkgs/editorconfig-core-lua/patches/testing-not-included.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- CMakeLists.txt.orig -+++ CMakeLists.txt -@@ -109,8 +109,8 @@ function(new_ec_test_full_ec_file_path name ec_file src_file regex) - set_tests_properties(${name}-open ${name}-parse PROPERTIES PASS_REGULAR_EXPRESSION "${regex}") - endfunction() - --add_subdirectory(tests/glob) --add_subdirectory(tests/properties) --add_subdirectory(tests/parser) --add_subdirectory(tests/filetree) -+#add_subdirectory(tests/glob) -+#add_subdirectory(tests/properties) -+#add_subdirectory(tests/parser) -+#add_subdirectory(tests/filetree) - #add_subdirectory(tests/cli) - diff --git a/srcpkgs/editorconfig-core-lua/template b/srcpkgs/editorconfig-core-lua/template deleted file mode 100644 index 864017d3066..00000000000 --- a/srcpkgs/editorconfig-core-lua/template +++ /dev/null @@ -1,20 +0,0 @@ -# Template file for 'editorconfig-lua' -pkgname=editorconfig-core-lua -version=0.2.0 -revision=1 -build_style=cmake -makedepends="editorconfig-devel lua-devel" -short_desc="EditorConfig core library written in Lua" -maintainer="Felix Van der Jeugt " -license="BSD-2-Clause" -homepage="https://github.com/editorconfig/${pkgname}" -distfiles="https://github.com/editorconfig/${pkgname}/archive/v${version}.tar.gz" -checksum=cce8fc6a02d41a665bee098b275026ab9b9043f97c553a3019ade650779b13a0 - -do_install() { - vinstall build/editorconfig_core.so 755 usr/lib/lua/5.3/ -} - -post_install() { - vlicense LICENSE -} diff --git a/srcpkgs/lua53-editorconfig-core/template b/srcpkgs/lua53-editorconfig-core/template new file mode 100644 index 00000000000..5db1475fdfb --- /dev/null +++ b/srcpkgs/lua53-editorconfig-core/template @@ -0,0 +1,27 @@ +# Template file for 'lua53-editorconfig-core' +pkgname=lua53-editorconfig-core +version=0.3.0 +revision=1 +wrksrc=editorconfig-core-lua-${version} +build_style=cmake +makedepends="editorconfig-devel lua53-devel" +short_desc="EditorConfig core library written in Lua (5.3.x)" +maintainer="Felix Van der Jeugt " +license="BSD-2-Clause" +homepage="https://github.com/editorconfig/editorconfig-core-lua" +distfiles="https://github.com/editorconfig/editorconfig-core-lua/archive/v${version}.tar.gz" +checksum=2dfb764a89e339d9c9140de241ea6b9162c295e78bc3e946c5ce6f40784a74c4 + +do_install() { + vinstall build/editorconfig.so 755 usr/lib/lua/5.3/ +} + +post_install() { + vlicense LICENSE +} + +editorconfig-core-lua_package() { + depends="lua53-editorconfig-core>=${version}_${revision}" + short_desc+=" (transitional dummy package)" + build_style=meta +} From 300c903aee8ce4d4dda9238473a9514e68f6e460 Mon Sep 17 00:00:00 2001 From: q66 Date: Wed, 1 Jul 2020 18:12:07 +0200 Subject: [PATCH 160/410] lgi: add all lua versions, version package, disable checks Also drop dump-typelib as it doesn't work out of box anyway and is mostly just for development of lgi itself. --- srcpkgs/lgi | 1 + srcpkgs/lgi/template | 21 ------- srcpkgs/lua51-lgi | 1 + srcpkgs/lua52-lgi | 1 + srcpkgs/lua53-lgi | 1 + srcpkgs/lua54-lgi/patches/lua54.patch | 14 +++++ srcpkgs/lua54-lgi/template | 85 +++++++++++++++++++++++++++ 7 files changed, 103 insertions(+), 21 deletions(-) create mode 120000 srcpkgs/lgi delete mode 100644 srcpkgs/lgi/template create mode 120000 srcpkgs/lua51-lgi create mode 120000 srcpkgs/lua52-lgi create mode 120000 srcpkgs/lua53-lgi create mode 100644 srcpkgs/lua54-lgi/patches/lua54.patch create mode 100644 srcpkgs/lua54-lgi/template diff --git a/srcpkgs/lgi b/srcpkgs/lgi new file mode 120000 index 00000000000..3f76e777e31 --- /dev/null +++ b/srcpkgs/lgi @@ -0,0 +1 @@ +lua54-lgi \ No newline at end of file diff --git a/srcpkgs/lgi/template b/srcpkgs/lgi/template deleted file mode 100644 index 5941e26ea66..00000000000 --- a/srcpkgs/lgi/template +++ /dev/null @@ -1,21 +0,0 @@ -# Template file for 'lgi' -pkgname=lgi -version=0.9.2 -revision=3 -build_style=gnu-makefile -make_install_args="LUA_VERSION=5.3" -hostmakedepends="pkg-config" -makedepends="libglib-devel libffi-devel lua-devel - gobject-introspection gir-freedesktop" -depends="lua gir-freedesktop" -short_desc="Lua binadings for gnome/gobject using gobject-introspection library" -maintainer="Orphaned " -license="MIT" -homepage="https://github.com/pavouk/lgi" -distfiles="https://github.com/pavouk/lgi/archive/$version.tar.gz" -checksum=cfc4105482b4730b3a40097c9d9e7e35c46df2fb255370bdeb2f45a886548c4f - -post_install() { - vbin tools/dump-typelib.lua dump-typelib - vlicense LICENSE -} diff --git a/srcpkgs/lua51-lgi b/srcpkgs/lua51-lgi new file mode 120000 index 00000000000..3f76e777e31 --- /dev/null +++ b/srcpkgs/lua51-lgi @@ -0,0 +1 @@ +lua54-lgi \ No newline at end of file diff --git a/srcpkgs/lua52-lgi b/srcpkgs/lua52-lgi new file mode 120000 index 00000000000..3f76e777e31 --- /dev/null +++ b/srcpkgs/lua52-lgi @@ -0,0 +1 @@ +lua54-lgi \ No newline at end of file diff --git a/srcpkgs/lua53-lgi b/srcpkgs/lua53-lgi new file mode 120000 index 00000000000..3f76e777e31 --- /dev/null +++ b/srcpkgs/lua53-lgi @@ -0,0 +1 @@ +lua54-lgi \ No newline at end of file diff --git a/srcpkgs/lua54-lgi/patches/lua54.patch b/srcpkgs/lua54-lgi/patches/lua54.patch new file mode 100644 index 00000000000..d4e2ba364f8 --- /dev/null +++ b/srcpkgs/lua54-lgi/patches/lua54.patch @@ -0,0 +1,14 @@ +--- lgi/callable.c ++++ lgi/callable.c +@@ -1233,7 +1233,10 @@ closure_callback (ffi_cif *cif, void *ret, void **args, void *closure_arg) + } + else + { +-#if LUA_VERSION_NUM >= 502 ++#if LUA_VERSION_NUM > 503 ++ int nres; ++ res = lua_resume (L, NULL, npos, &nres); ++#elif LUA_VERSION_NUM >= 502 + res = lua_resume (L, NULL, npos); + #else + res = lua_resume (L, npos); diff --git a/srcpkgs/lua54-lgi/template b/srcpkgs/lua54-lgi/template new file mode 100644 index 00000000000..abae56cc431 --- /dev/null +++ b/srcpkgs/lua54-lgi/template @@ -0,0 +1,85 @@ +# Template file for 'lua54-lgi' +pkgname=lua54-lgi +version=0.9.2 +revision=4 +wrksrc=lgi-${version} +hostmakedepends="pkg-config" +makedepends="libglib-devel libffi-devel lua51-devel lua52-devel lua53-devel + lua54-devel gobject-introspection gir-freedesktop" +depends="lua54 gir-freedesktop" +_desc="Lua binadings for gnome/gobject using gobject-introspection library" +short_desc="${_desc} (5.4.x)" +maintainer="Orphaned " +license="MIT" +homepage="https://github.com/pavouk/lgi" +distfiles="https://github.com/pavouk/lgi/archive/$version.tar.gz" +checksum=cfc4105482b4730b3a40097c9d9e7e35c46df2fb255370bdeb2f45a886548c4f + +# requires X11 +do_check() { + : +} + +post_patch() { + cd "${wrksrc}" + mkdir -p lua5.1 + + mv * lua5.1 || true + cp -a lua5.1 lua5.2 + cp -a lua5.1 lua5.3 + cp -a lua5.1 lua5.4 +} + +do_build() { + for luaver in 5.1 5.2 5.3 5.4; do + pushd lua${luaver} + make CC=$CC LUA_VERSION=${luaver} ${make_build_args} ${makejobs} \ + LUA_CFLAGS=-I${XBPS_CROSS_BASE}/usr/include/lua${luaver} + popd + done +} + +do_install() { + for luaver in 5.1 5.2 5.3 5.4; do + pushd lua${luaver} + make DESTDIR=${DESTDIR} PREFIX=/usr LUA_VERSION=${luaver} install + popd + done + vlicense lua5.4/LICENSE +} + +lua51-lgi_package() { + depends="lua51 gir-freedesktop" + short_desc="${_desc} (5.1.x)" + pkg_install() { + vlicense "${wrksrc}/lua5.1/LICENSE" + vmove usr/lib/lua/5.1 + vmove usr/share/lua/5.1 + } +} + +lua52-lgi_package() { + depends="lua52 gir-freedesktop" + short_desc="${_desc} (5.2.x)" + pkg_install() { + vlicense "${wrksrc}/lua5.2/LICENSE" + vmove usr/lib/lua/5.2 + vmove usr/share/lua/5.2 + } +} + +lua53-lgi_package() { + depends="lua53 gir-freedesktop" + short_desc="${_desc} (5.2.x)" + pkg_install() { + vlicense "${wrksrc}/lua5.3/LICENSE" + vmove usr/lib/lua/5.3 + vmove usr/share/lua/5.3 + } +} + +lgi_package() { + depends="lua53-lgi>=${version}_${revision}" + short_desc="${_desc} (5.3.x) (transitional dummy package)" + build_style=meta +} From f0e8c925a1c2297d36860f12b785aa6282d34349 Mon Sep 17 00:00:00 2001 From: q66 Date: Wed, 1 Jul 2020 18:12:12 +0200 Subject: [PATCH 161/410] sile: rebuild for updated dependency names --- srcpkgs/sile/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/sile/template b/srcpkgs/sile/template index a97bf159b43..a6de557216d 100644 --- a/srcpkgs/sile/template +++ b/srcpkgs/sile/template @@ -1,13 +1,13 @@ # Template file for 'sile' pkgname=sile version=0.9.5.1 -revision=3 +revision=4 build_style=gnu-configure hostmakedepends="pkg-config" -makedepends="harfbuzz-devel lua51-devel lua51-lpeg luaexpat - lua51-zlib luafilesystem luasocket lua51-luasec" -depends="lua51-lpeg luaexpat lua51-zlib luafilesystem luasocket - lua51-luasec" +makedepends="harfbuzz-devel lua51-devel lua51-lpeg lua51-luaexpat + lua51-zlib lua51-luafilesystem lua51-luasocket lua51-luasec" +depends="lua51-lpeg lua51-luaexpat lua51-zlib lua51-luafilesystem + lua51-luasocket lua51-luasec" short_desc="Modern typesetting system inspired by TeX" maintainer="John " license="MIT" From 79e0c624bd14f017178599192d43c1a82502dce9 Mon Sep 17 00:00:00 2001 From: q66 Date: Wed, 1 Jul 2020 18:12:14 +0200 Subject: [PATCH 162/410] prosody: rebuild for updated dependency names --- srcpkgs/prosody/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template index fde8f2b39a6..494b04e81e3 100644 --- a/srcpkgs/prosody/template +++ b/srcpkgs/prosody/template @@ -1,7 +1,7 @@ # Template file for 'prosody' pkgname=prosody version=0.11.5 -revision=1 +revision=2 build_style=configure configure_args=" --ostype=linux @@ -20,7 +20,8 @@ conf_files=" /etc/prosody/certs/GNUmakefile" make_dirs="/var/lib/prosody 0755 prosody prosody" makedepends="lua51-devel libressl-devel libidn-devel" -depends="luasocket luafilesystem luaexpat lua51-luasec lua51-BitOp" +depends="lua51-luasocket lua51-luafilesystem lua51-luaexpat lua51-luasec + lua51-BitOp" short_desc="Lightweight and extensible Jabber/XMPP server written in Lua" maintainer="Duncaen " license="MIT" From f2c785181d98957d411e5e3197928dcdc861efb2 Mon Sep 17 00:00:00 2001 From: q66 Date: Wed, 1 Jul 2020 18:12:19 +0200 Subject: [PATCH 163/410] awesome: rebuild for renamed lgi --- srcpkgs/awesome/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/awesome/template b/srcpkgs/awesome/template index bec0f022cf9..d372beedbd6 100644 --- a/srcpkgs/awesome/template +++ b/srcpkgs/awesome/template @@ -1,17 +1,17 @@ # Template file for 'awesome' pkgname=awesome version=4.3 -revision=5 +revision=6 build_style=cmake build_helper="qemu" configure_args="-DSYSCONFDIR=/etc" conf_files="/etc/xdg/awesome/rc.lua" -hostmakedepends="ruby-asciidoctor ImageMagick lgi lua53 pkg-config xmlto" +hostmakedepends="ruby-asciidoctor ImageMagick lua53-lgi lua53 pkg-config xmlto" makedepends="libxcb-devel pango-devel xcb-util-devel xcb-util-image-devel xcb-util-keysyms-devel xcb-util-wm-devel xcb-util-cursor-devel - startup-notification-devel imlib2-devel lgi libxdg-basedir-devel + startup-notification-devel imlib2-devel lua53-lgi libxdg-basedir-devel gdk-pixbuf-devel lua53-devel dbus-devel libxkbcommon-devel xcb-util-xrm-devel" -depends="dbus-x11 lgi>=0.7.2 pango" +depends="dbus-x11 lua53-lgi>=0.7.2 pango" short_desc="Highly configurable, next gen framework window manager for X" maintainer="Orphaned " license="GPL-2.0-or-later" From f5f636116986f11509289006305f6b3128306fca Mon Sep 17 00:00:00 2001 From: q66 Date: Wed, 1 Jul 2020 18:12:24 +0200 Subject: [PATCH 164/410] luakit: rebuild for renamed luafilesystem --- srcpkgs/luakit/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/luakit/template b/srcpkgs/luakit/template index d2020c109ff..491e261eb78 100644 --- a/srcpkgs/luakit/template +++ b/srcpkgs/luakit/template @@ -2,11 +2,11 @@ pkgname=luakit reverts="2017.08.10_1" version=2.1 -revision=2 +revision=3 conf_files="/etc/xdg/luakit/*.lua" hostmakedepends="pkg-config LuaJIT" -makedepends="webkit2gtk-devel luafilesystem LuaJIT-devel" -depends="luafilesystem" +makedepends="webkit2gtk-devel lua51-luafilesystem LuaJIT-devel" +depends="lua51-luafilesystem" short_desc="Fast, small, webkit based browser framework extensible by Lua" maintainer="Orphaned " license="GPL-3.0-or-later" From 4e45edcaf44f47341747fe7e2c5095319f962bb7 Mon Sep 17 00:00:00 2001 From: q66 Date: Wed, 1 Jul 2020 18:38:09 +0200 Subject: [PATCH 165/410] lua54-stdlib-normalize: fix dummy short_desc --- srcpkgs/lua54-stdlib-normalize/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/lua54-stdlib-normalize/template b/srcpkgs/lua54-stdlib-normalize/template index be1312722f0..9a0d6071327 100644 --- a/srcpkgs/lua54-stdlib-normalize/template +++ b/srcpkgs/lua54-stdlib-normalize/template @@ -1,7 +1,7 @@ # Template file for 'lua54-stdlib-normalize' pkgname=lua54-stdlib-normalize version=2.0.3 -revision=2 +revision=3 archs=noarch wrksrc=normalize-${version} depends="lua54 lua54-stdlib-debug" @@ -62,6 +62,6 @@ lua53-stdlib-normalize_package() { lua-stdlib-normalize_package() { depends="lua53-stdlib-normalize>=${version}_${revision}" - short_desc+="${_desc} (5.3.x) (transitional dummy package)" + short_desc="${_desc} (5.3.x) (transitional dummy package)" build_style=meta } From 48a05ad54ccdd9a7e95d3941001c06f33a095bda Mon Sep 17 00:00:00 2001 From: q66 Date: Wed, 1 Jul 2020 18:38:32 +0200 Subject: [PATCH 166/410] lua54-stdlib-debug: fix dummy short_desc --- srcpkgs/lua54-stdlib-debug/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/lua54-stdlib-debug/template b/srcpkgs/lua54-stdlib-debug/template index 50087fb7fc5..1d862bc6726 100644 --- a/srcpkgs/lua54-stdlib-debug/template +++ b/srcpkgs/lua54-stdlib-debug/template @@ -1,7 +1,7 @@ # Template file for 'lua54-stdlib-debug' pkgname=lua54-stdlib-debug version=1.0.1 -revision=2 +revision=3 wrksrc=_debug-${version} archs=noarch depends="lua54" @@ -62,6 +62,6 @@ lua53-stdlib-debug_package() { lua-stdlib-debug_package() { depends="lua53-stdlib-debug>=${version}_${revision}" - short_desc+="${_desc} (5.3.x) (transitional dummy package)" + short_desc="${_desc} (5.3.x) (transitional dummy package)" build_style=meta } From 3f8c6c00a226e6bdbf5987e408a64c42bdb6b891 Mon Sep 17 00:00:00 2001 From: q66 Date: Wed, 1 Jul 2020 18:39:14 +0200 Subject: [PATCH 167/410] lua54-lpeg: fix dummy short_desc --- srcpkgs/lua54-lpeg/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/lua54-lpeg/template b/srcpkgs/lua54-lpeg/template index 71e0e0175a5..a55a51eb47a 100644 --- a/srcpkgs/lua54-lpeg/template +++ b/srcpkgs/lua54-lpeg/template @@ -1,7 +1,7 @@ # Template file for 'lua54-lpeg' pkgname=lua54-lpeg version=1.0.2 -revision=3 +revision=4 wrksrc="lpeg-${version}" hostmakedepends="lua51 lua52 lua53 lua54" makedepends="lua51-devel lua52-devel lua53-devel lua54-devel" @@ -91,6 +91,6 @@ lua53-lpeg_package() { lua-lpeg_package() { depends="lua53-lpeg>=${version}_${revision}" - short_desc+="${_desc} (5.3.x) (transitional dummy package)" + short_desc="${_desc} (5.3.x) (transitional dummy package)" build_style=meta } From fba7845906967e8d4ac8da923d2de7b6fc812a6e Mon Sep 17 00:00:00 2001 From: q66 Date: Wed, 1 Jul 2020 18:39:36 +0200 Subject: [PATCH 168/410] lua54-luadbi: fix dummy short_desc --- srcpkgs/lua54-luadbi/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/lua54-luadbi/template b/srcpkgs/lua54-luadbi/template index 9bc471cfde8..36c0f892501 100644 --- a/srcpkgs/lua54-luadbi/template +++ b/srcpkgs/lua54-luadbi/template @@ -1,7 +1,7 @@ # Template file for 'lua54-luadbi' pkgname=lua54-luadbi version=0.5 -revision=3 +revision=4 wrksrc="luadbi-${version}" create_wrksrc="yes" makedepends="lua51-devel lua52-devel lua53-devel lua54-devel sqlite-devel @@ -99,6 +99,6 @@ lua53-luadbi_package() { lua-luadbi_package() { depends="lua53-luadbi>=${version}_${revision}" - short_desc+="${_desc} (5.3.x) (transitional dummy package)" + short_desc="${_desc} (5.3.x) (transitional dummy package)" build_style=meta } From 7d90628b0d2b35b0dda963bfaf735125e306e7b6 Mon Sep 17 00:00:00 2001 From: q66 Date: Wed, 1 Jul 2020 18:40:12 +0200 Subject: [PATCH 169/410] lua54-luaposix: fix dummy short_desc --- srcpkgs/lua54-luaposix/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/lua54-luaposix/template b/srcpkgs/lua54-luaposix/template index f5fb76ff686..d776c3a598a 100644 --- a/srcpkgs/lua54-luaposix/template +++ b/srcpkgs/lua54-luaposix/template @@ -1,7 +1,7 @@ # Template file for 'lua54-luaposix' pkgname=lua54-luaposix version=34.1.1 -revision=2 +revision=3 wrksrc="luaposix-release-v${version}" hostmakedepends="lua51-devel lua52-devel lua53-devel lua54-devel" makedepends="lua51-devel lua52-devel lua53-devel lua54-devel" @@ -86,18 +86,18 @@ lua53-luaposix_package() { luaposix51_package() { depends="lua51-luaposix>=${version}_${revision}" - short_desc+="${_desc} (5.1.x) (transitional dummy package)" + short_desc="${_desc} (5.1.x) (transitional dummy package)" build_style=meta } luaposix52_package() { depends="lua52-luaposix>=${version}_${revision}" - short_desc+="${_desc} (5.2.x) (transitional dummy package)" + short_desc="${_desc} (5.2.x) (transitional dummy package)" build_style=meta } luaposix_package() { depends="lua53-luaposix>=${version}_${revision}" - short_desc+="${_desc} (5.3.x) (transitional dummy package)" + short_desc="${_desc} (5.3.x) (transitional dummy package)" build_style=meta } From d11177f3db9126b83154183ea73d0ef642faaa4e Mon Sep 17 00:00:00 2001 From: q66 Date: Wed, 1 Jul 2020 18:40:38 +0200 Subject: [PATCH 170/410] luarocks-lua53: fix dummy short_desc --- srcpkgs/luarocks-lua53/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/luarocks-lua53/template b/srcpkgs/luarocks-lua53/template index 8979667e410..5c047f790c0 100644 --- a/srcpkgs/luarocks-lua53/template +++ b/srcpkgs/luarocks-lua53/template @@ -1,7 +1,7 @@ # Template file for 'luarocks-lua53' pkgname=luarocks-lua53 version=3.3.1 -revision=2 +revision=3 archs=noarch wrksrc=luarocks-${version} build_style=configure @@ -109,6 +109,6 @@ luarocks-lua51_package() { luarocks_package() { depends="luarocks-lua53>=${version}_${revision}" - short_desc+="${_desc} (5.3.x) (transitional dummy package)" + short_desc="${_desc} (5.3.x) (transitional dummy package)" build_style=meta } From fabeb9e6c4796b3c9d1580771972fa90bf46d51a Mon Sep 17 00:00:00 2001 From: q66 Date: Wed, 1 Jul 2020 18:41:09 +0200 Subject: [PATCH 171/410] lua54-cjson: fix dummy short_desc --- srcpkgs/lua54-cjson/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/lua54-cjson/template b/srcpkgs/lua54-cjson/template index c74cfc667fe..72ba9407c30 100644 --- a/srcpkgs/lua54-cjson/template +++ b/srcpkgs/lua54-cjson/template @@ -1,7 +1,7 @@ # Template file for 'lua54-cjson' pkgname=lua54-cjson version=2.1.0 -revision=2 +revision=3 create_wrksrc=yes hostmakedepends="lua51 lua52 lua53 lua54" makedepends="lua51-devel lua52-devel lua53-devel lua54-devel" @@ -64,6 +64,6 @@ lua53-cjson_package() { lua-cjson_package() { depends="lua53-cjson>=${version}_${revision}" - short_desc+="${_desc} (5.3.x) (transitional dummy package)" + short_desc="${_desc} (5.3.x) (transitional dummy package)" build_style=meta } From 16727c8bb1c6d6e7682a7e94fd2ec7a899417b02 Mon Sep 17 00:00:00 2001 From: q66 Date: Wed, 1 Jul 2020 18:41:26 +0200 Subject: [PATCH 172/410] lua54-zlib: fix dummy short_desc --- srcpkgs/lua54-zlib/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/lua54-zlib/template b/srcpkgs/lua54-zlib/template index 7f78d9410f5..6786ccb8d71 100644 --- a/srcpkgs/lua54-zlib/template +++ b/srcpkgs/lua54-zlib/template @@ -1,7 +1,7 @@ # Template file for 'lua54-zlib' pkgname=lua54-zlib version=1.2 -revision=2 +revision=3 wrksrc="lua-zlib-${version}" build_style=gnu-makefile hostmakedepends="pkg-config" @@ -85,6 +85,6 @@ lua53-zlib_package() { lua-zlib_package() { depends="lua53-zlib>=${version}_${revision}" - short_desc+="${_desc} (5.3.x) (transitional dummy package)" + short_desc="${_desc} (5.3.x) (transitional dummy package)" build_style=meta } From 5fdc3b1c882d4c5fd16d5f9c13760b2e56e9a940 Mon Sep 17 00:00:00 2001 From: q66 Date: Wed, 1 Jul 2020 18:41:48 +0200 Subject: [PATCH 173/410] lua54-lualdap: fix dummy short_desc --- srcpkgs/lua54-lualdap/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/lua54-lualdap/template b/srcpkgs/lua54-lualdap/template index 419985a3c11..386222ce0c6 100644 --- a/srcpkgs/lua54-lualdap/template +++ b/srcpkgs/lua54-lualdap/template @@ -1,7 +1,7 @@ # Template file for 'lua54-lualdap' pkgname=lua54-lualdap version=1.2.5 -revision=2 +revision=3 wrksrc="lualdap-${version}" build_style=gnu-makefile hostmakedepends="pkg-config" @@ -79,6 +79,6 @@ lua53-lualdap_package() { lua-lualdap_package() { depends="lua53-lualdap>=${version}_${revision}" - short_desc+="${_desc} (5.3.x) (transitional dummy package)" + short_desc="${_desc} (5.3.x) (transitional dummy package)" build_style=meta } From 1aa5fadf7731d8a7bdab4232cc51d3ab8c50d83d Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Wed, 1 Jul 2020 13:12:59 -0400 Subject: [PATCH 174/410] bcnc: mark nocross because libopencv-python3 is nocross --- srcpkgs/bcnc/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/bcnc/template b/srcpkgs/bcnc/template index e36fca328db..df8a16d12cf 100644 --- a/srcpkgs/bcnc/template +++ b/srcpkgs/bcnc/template @@ -13,6 +13,7 @@ license="GPL-2.0-only" homepage="https://github.com/vlachoudis/bCNC" distfiles="${PYPI_SITE}/b/bCNC/bCNC-${version}.tar.gz" checksum=2df238989184179726870559f0531aea1e85ae9369d194bf8dba3638107671d7 +nocross="libopencv-python3 is not cross-compilable" # opencv is not available on 32-bit ppc case "$XBPS_TARGET_MACHINE" in From 0774a69451f9252512c42e9952bd16bffe99dc1b Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Wed, 1 Jul 2020 13:31:54 -0400 Subject: [PATCH 175/410] python3-scikit-video: move deps to allow cross-compilation --- srcpkgs/python3-scikit-video/template | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/srcpkgs/python3-scikit-video/template b/srcpkgs/python3-scikit-video/template index fc236aa855f..12e32a4f116 100644 --- a/srcpkgs/python3-scikit-video/template +++ b/srcpkgs/python3-scikit-video/template @@ -1,12 +1,11 @@ # Template file for 'python3-scikit-video' pkgname=python3-scikit-video version=1.1.11 -revision=1 +revision=2 wrksrc="scikit-video-${version}" build_style=python3-module -hostmakedepends="python3-setuptools" -makedepends="python3-devel python3-numpy python3-scipy python3-Pillow" -depends="python3-numpy python3-scipy python3-Pillow" +hostmakedepends="python3-setuptools python3-scipy python3-Pillow" +depends="python3-scipy python3-Pillow" short_desc="Video processing in Python, which is modeled around scikit packages" maintainer="ash " license="BSD-3-Clause" From bcd248273ede6e6833805fcb9dd3d43f7982382f Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Wed, 1 Jul 2020 13:50:50 -0400 Subject: [PATCH 176/410] python3-scikit-learn: update to 0.23.1. --- srcpkgs/python3-scikit-learn/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/python3-scikit-learn/template b/srcpkgs/python3-scikit-learn/template index b7fac585dac..e923339d1fd 100644 --- a/srcpkgs/python3-scikit-learn/template +++ b/srcpkgs/python3-scikit-learn/template @@ -1,18 +1,19 @@ # Template file for 'python3-scikit-learn' pkgname=python3-scikit-learn -version=0.22.2 +version=0.23.1 revision=1 wrksrc="scikit-learn-${version}" build_style=python3-module -hostmakedepends="python3-setuptools python3-Cython" -makedepends="python3-devel python3-numpy python3-scipy python3-joblib" +hostmakedepends="python3-setuptools python3-Cython python3-scipy python3-joblib" +makedepends="python3-devel" depends="python3-numpy python3-scipy python3-joblib" short_desc="Python3 modules for machine learning and data mining" maintainer="Alessio Sergi " license="BSD-3-Clause" homepage="https://scikit-learn.org/" distfiles="https://github.com/scikit-learn/scikit-learn/archive/${version}.tar.gz" -checksum=54ae27be30ef26718c9e517c4c8f23b6af26c66e52cf16d38799ba4262d4fd3b +checksum=3596ede14e1edcfee2e10ecf2a52cd10b2df3f8b763fe14d6e99141e6ca5ecba +nocross="build tries to run target executable on host" post_install() { vlicense COPYING From 59fbacd98dad74713b00353c5c7e0b553105bd2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Wed, 1 Jul 2020 20:09:43 +0200 Subject: [PATCH 177/410] Manual.md: eliminate significant trailing whitespace --- Manual.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Manual.md b/Manual.md index 3e69af57e42..da8764c78e6 100644 --- a/Manual.md +++ b/Manual.md @@ -281,11 +281,11 @@ The following functions are defined by `xbps-src` and can be used on any templat converts gzipped (.gz) and bzipped (.bz2) manpages into plaintext. Example mappings: - `foo.1` -> `${DESTDIR}/usr/share/man/man1/foo.1` - `foo.fr.1` -> `${DESTDIR}/usr/share/man/fr/man1/foo.1` - `foo.1p` -> `${DESTDIR}/usr/share/man/man1/foo.1p` - `foo.1.gz` -> `${DESTDIR}/usr/share/man/man1/foo.1` - `foo.1.bz2` -> `${DESTDIR}/usr/share/man/man1/foo.1` + - `foo.1` -> `${DESTDIR}/usr/share/man/man1/foo.1` + - `foo.fr.1` -> `${DESTDIR}/usr/share/man/fr/man1/foo.1` + - `foo.1p` -> `${DESTDIR}/usr/share/man/man1/foo.1p` + - `foo.1.gz` -> `${DESTDIR}/usr/share/man/man1/foo.1` + - `foo.1.bz2` -> `${DESTDIR}/usr/share/man/man1/foo.1` - *vdoc()* `vdoc []` From 721fcfa729e68ba44aba972630f13fcaa7dcae82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Wed, 1 Jul 2020 20:09:43 +0200 Subject: [PATCH 178/410] python3-googleapis-common-protos: fix permissions --- srcpkgs/python3-googleapis-common-protos/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-googleapis-common-protos/template b/srcpkgs/python3-googleapis-common-protos/template index 0dc5210e83b..1b0747910e0 100644 --- a/srcpkgs/python3-googleapis-common-protos/template +++ b/srcpkgs/python3-googleapis-common-protos/template @@ -1,7 +1,7 @@ # Template file for 'python3-googleapis-common-protos' pkgname=python3-googleapis-common-protos version=1.51.0 -revision=1 +revision=2 archs=noarch wrksrc="${pkgname#*-}-${version}" build_style=python3-module @@ -16,5 +16,5 @@ distfiles="${PYPI_SITE}/g/googleapis-common-protos/googleapis-common-protos-${ve checksum=013c91704279119150e44ef770086fdbba158c1f978a6402167d47d5409e226e post_install() { - chmod -R +r ${py3_sitelib} + chmod -R +r "${DESTDIR}/${py3_sitelib}" } From df2a7a15b1f623a188728280fac939527ec86c5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Wed, 1 Jul 2020 20:09:43 +0200 Subject: [PATCH 179/410] tree-wide: make python path variables relative --- Manual.md | 12 ++++++------ common/environment/setup/python.sh | 8 ++++---- srcpkgs/bcnc/template | 4 ++-- srcpkgs/blender/template | 2 +- srcpkgs/boost/template | 2 +- srcpkgs/compizconfig-python/template | 2 +- srcpkgs/gnuradio/template | 2 +- srcpkgs/gramps/template | 2 +- srcpkgs/kicad/template | 2 +- srcpkgs/libcec/template | 2 +- srcpkgs/libffado/template | 2 +- srcpkgs/opencv/template | 4 ++-- srcpkgs/opencv4/template | 4 ++-- srcpkgs/rpm/template | 2 +- 14 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Manual.md b/Manual.md index da8764c78e6..c612479ec73 100644 --- a/Manual.md +++ b/Manual.md @@ -1475,13 +1475,13 @@ Also, a set of useful variables are defined to use in the templates: | Variable | Value | |-------------|----------------------------------| | py2_ver | 2.X | -| py2_lib | /usr/lib/python2.X | -| py2_sitelib | /usr/lib/python2.X/site-packages | -| py2_inc | /usr/include/python2.X | +| py2_lib | usr/lib/python2.X | +| py2_sitelib | usr/lib/python2.X/site-packages | +| py2_inc | usr/include/python2.X | | py3_ver | 3.X | -| py3_lib | /usr/lib/python3.X | -| py3_sitelib | /usr/lib/python3.X/site-packages | -| py3_inc | /usr/include/python3.Xm | +| py3_lib | usr/lib/python3.X | +| py3_sitelib | usr/lib/python3.X/site-packages | +| py3_inc | usr/include/python3.Xm | > NOTE: it's expected that additional subpkgs must be generated to allow packaging for multiple python versions. diff --git a/common/environment/setup/python.sh b/common/environment/setup/python.sh index eca368dbf0d..3469fe070a9 100644 --- a/common/environment/setup/python.sh +++ b/common/environment/setup/python.sh @@ -3,12 +3,12 @@ # py2_ver="2.7" -py2_lib="/usr/lib/python${py2_ver}" +py2_lib="usr/lib/python${py2_ver}" py2_sitelib="${py2_lib}/site-packages" -py2_inc="/usr/include/python${py2_ver}" +py2_inc="usr/include/python${py2_ver}" py3_ver="3.8" py3_abiver="" -py3_lib="/usr/lib/python${py3_ver}" +py3_lib="usr/lib/python${py3_ver}" py3_sitelib="${py3_lib}/site-packages" -py3_inc="/usr/include/python${py3_ver}${py3_abiver}" +py3_inc="usr/include/python${py3_ver}${py3_abiver}" diff --git a/srcpkgs/bcnc/template b/srcpkgs/bcnc/template index df8a16d12cf..c7e6eb32c80 100644 --- a/srcpkgs/bcnc/template +++ b/srcpkgs/bcnc/template @@ -29,7 +29,7 @@ fi post_install() { vmkdir usr/share/applications vmkdir usr/share/pixmaps - ln -s "${py3_sitelib}/bCNC/bCNC.desktop" "${DESTDIR}/usr/share/applications/" - ln -s "${py3_sitelib}/bCNC/bCNC.png" "${DESTDIR}/usr/share/pixmaps/" + ln -s "/${py3_sitelib}/bCNC/bCNC.desktop" "${DESTDIR}/usr/share/applications/" + ln -s "/${py3_sitelib}/bCNC/bCNC.png" "${DESTDIR}/usr/share/pixmaps/" ln -s "bCNC" "${DESTDIR}/usr/bin/bcnc" } diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template index 663a38381b6..754af3f0c47 100644 --- a/srcpkgs/blender/template +++ b/srcpkgs/blender/template @@ -44,7 +44,7 @@ configure_args=" -DPYTHON_VERSION=$py3_ver -DPYTHON_LIBPATH=/usr/lib -DPYTHON_LIBRARY='python${py3_ver}${py3_abiver}' --DPYTHON_INCLUDE_DIRS=$py3_inc" +-DPYTHON_INCLUDE_DIRS=/$py3_inc" case "$XBPS_TARGET_MACHINE" in *-musl) # crashes at startup in jemallocs free() diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template index 3dffb6087ca..f0827218312 100644 --- a/srcpkgs/boost/template +++ b/srcpkgs/boost/template @@ -71,7 +71,7 @@ do_build() { cat > user-config.jam <<-__EOF using gcc : : ${CXX} : "${CXXFLAGS}" "${LDFLAGS}" ; using python : 2.7 : ${XBPS_CROSS_BASE}/usr/bin/python2 : ${XBPS_CROSS_BASE}/usr/include/python2.7 : ${XBPS_CROSS_BASE}/usr/lib/python2.7 ; - using python : ${py3_ver} : ${XBPS_CROSS_BASE}/usr/bin/python3 : ${XBPS_CROSS_BASE}${py3_inc} : ${XBPS_CROSS_BASE}${py3_lib} ; + using python : ${py3_ver} : ${XBPS_CROSS_BASE}/usr/bin/python3 : ${XBPS_CROSS_BASE}/${py3_inc} : ${XBPS_CROSS_BASE}/${py3_lib} ; __EOF # --no-cmake-config should be removed with boost-1.71 or later diff --git a/srcpkgs/compizconfig-python/template b/srcpkgs/compizconfig-python/template index c3bd82bd18b..437f1876301 100644 --- a/srcpkgs/compizconfig-python/template +++ b/srcpkgs/compizconfig-python/template @@ -19,6 +19,6 @@ pre_configure() { NOCONFIGURE=1 ./autogen.sh if [ "$CROSS_BUILD" ]; then - sed -i "s,PYTHON_INCLUDES=.*,PYTHON_INCLUDES=-I${XBPS_CROSS_BASE}${py3_inc},g" configure + sed -i "s,PYTHON_INCLUDES=.*,PYTHON_INCLUDES=-I${XBPS_CROSS_BASE}/${py3_inc},g" configure fi } diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template index 925990ba141..8c7c6e80eee 100644 --- a/srcpkgs/gnuradio/template +++ b/srcpkgs/gnuradio/template @@ -4,7 +4,7 @@ version=3.8.0.0 revision=4 build_style=cmake conf_files="/etc/gnuradio/conf.d/*" -configure_args="-DENABLE_INTERNAL_VOLK=OFF -DGR_PYTHON_DIR=${py3_sitelib}" +configure_args="-DENABLE_INTERNAL_VOLK=OFF -DGR_PYTHON_DIR=/${py3_sitelib}" hostmakedepends="pkg-config doxygen swig python3-Mako python3-Sphinx python3-cairo python3-numpy python3-yaml" makedepends="SDL-devel boost-devel fftw-devel gsl-devel jack-devel diff --git a/srcpkgs/gramps/template b/srcpkgs/gramps/template index 3aa8997f51c..35e3245ef62 100644 --- a/srcpkgs/gramps/template +++ b/srcpkgs/gramps/template @@ -15,5 +15,5 @@ distfiles="https://github.com/gramps-project/${pkgname}/archive/v${version}.tar. checksum=4f11d7fa66e397a36c902057794c48c0740d56c802fcdc5f2c3e3652104dd45b post_install() { - echo -n '/usr/share' > ${DESTDIR}${py3_sitelib}/gramps/gen/utils/resource-path + echo -n '/usr/share' > ${DESTDIR}/${py3_sitelib}/gramps/gen/utils/resource-path } diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template index 5dfcfded2d8..d5d12ff8b23 100644 --- a/srcpkgs/kicad/template +++ b/srcpkgs/kicad/template @@ -26,7 +26,7 @@ CXXFLAGS="-std=c++17" if [ "$CROSS_BUILD" ]; then hostmakedepends+=" python wxPython" configure_args+=" -DPYTHON_SITE_PACKAGE_PATH=${XBPS_CROSS_BASE}/${py2_sitelib} - -DPYTHON_DEST=${py2_sitelib}" + -DPYTHON_DEST=/${py2_sitelib}" fi pre_configure() { diff --git a/srcpkgs/libcec/template b/srcpkgs/libcec/template index f956cfcd468..13f44a65b84 100644 --- a/srcpkgs/libcec/template +++ b/srcpkgs/libcec/template @@ -44,7 +44,7 @@ python3-libcec_package() { depends="python3 libcec>=${version}" pkg_install() { - vmove "${py3_lib#/}" + vmove "${py3_lib}" } } libcec-devel_package() { diff --git a/srcpkgs/libffado/template b/srcpkgs/libffado/template index 2aa44e3be1b..cb5abd08fb1 100644 --- a/srcpkgs/libffado/template +++ b/srcpkgs/libffado/template @@ -6,7 +6,7 @@ build_style=scons make_build_args="PREFIX=/usr MANDIR=/usr/share/man UDEVDIR=/usr/lib/udev/rules.d CUSTOM_ENV=1 BUILD_TESTS=0 ENABLE_OPTIMIZATIONS=0 DEBUG=0 PYTHON_INTERPRETER=/usr/bin/python3 - DETECT_USERSPACE_ENV=0 PYPKGDIR=${py3_sitelib}" + DETECT_USERSPACE_ENV=0 PYPKGDIR=/${py3_sitelib}" make_install_args="$make_build_args WILL_DEAL_WITH_XDG_MYSELF=1" hostmakedepends="pkg-config xdg-utils python3-PyQt5-devel-tools" makedepends="libxml++-devel libdbus-c++-devel libsigc++-devel libconfig++-devel diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template index d707ed34dda..2015ca6db52 100644 --- a/srcpkgs/opencv/template +++ b/srcpkgs/opencv/template @@ -5,8 +5,8 @@ revision=3 build_style=cmake configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -DWITH_OPENCL=ON -DENABLE_CXX11=ON -DOPENCV_SKIP_PYTHON_LOADER=ON - -DOPENCV_PYTHON3_INSTALL_PATH=${py3_sitelib} - -DOPENCV_PYTHON_INSTALL_PATH=${py2_sitelib}" + -DOPENCV_PYTHON3_INSTALL_PATH=/${py3_sitelib} + -DOPENCV_PYTHON_INSTALL_PATH=/${py2_sitelib}" hostmakedepends="pkg-config eigen" makedepends="ffmpeg-devel libpng-devel libjpeg-turbo-devel tiff-devel jasper-devel ocl-icd-devel libgomp-devel libopenexr-devel gtk+3-devel diff --git a/srcpkgs/opencv4/template b/srcpkgs/opencv4/template index 746ed456f3e..c6a21b58cac 100644 --- a/srcpkgs/opencv4/template +++ b/srcpkgs/opencv4/template @@ -7,8 +7,8 @@ build_style=cmake configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -DWITH_OPENCL=ON -DOPENCV_GENERATE_PKGCONFIG=YES -DWITH_EIGEN=ON -DENABLE_CXX11=ON -DOPENCV_SKIP_PYTHON_LOADER=ON - -DOPENCV_PYTHON3_INSTALL_PATH=${py3_sitelib} - -DOPENCV_PYTHON_INSTALL_PATH=${py2_sitelib} + -DOPENCV_PYTHON3_INSTALL_PATH=/${py3_sitelib} + -DOPENCV_PYTHON_INSTALL_PATH=/${py2_sitelib} -DOPENCV_EXTRA_MODULES_PATH=${XBPS_BUILDDIR}/opencv_contrib-${version}/modules -DBUILD_opencv_rgbd=OFF" hostmakedepends="pkg-config eigen" diff --git a/srcpkgs/rpm/template b/srcpkgs/rpm/template index bc3d44d9428..26d91814102 100644 --- a/srcpkgs/rpm/template +++ b/srcpkgs/rpm/template @@ -19,7 +19,7 @@ checksum=ddef45f9601cd12042edfc9b6e37efcca32814e1e0f4bb8682d08144a3e2d230 python_version=2 #unverified conflicts="rpmextract>=0" # Both provide rpm2cpio -CFLAGS="-I${XBPS_CROSS_BASE}${py3_inc}" +CFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}" CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/nss" CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/nspr" From 560ec5a882563ac68ecda68c937057b505603ffb Mon Sep 17 00:00:00 2001 From: q66 Date: Wed, 1 Jul 2020 20:31:02 +0200 Subject: [PATCH 180/410] wsjtx: switch to a better mirror The other one is frequently (if not always) unreachable from a lot of places. --- srcpkgs/wsjtx/template | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/srcpkgs/wsjtx/template b/srcpkgs/wsjtx/template index a842a2169a3..9b646cdd9ad 100644 --- a/srcpkgs/wsjtx/template +++ b/srcpkgs/wsjtx/template @@ -15,14 +15,9 @@ short_desc="Weak-signal Amateur Radio communication program" maintainer="bra1nwave " license="GPL-3.0-or-later" homepage="https://www.physics.princeton.edu/pulsar/K1JT/wsjtx.html" -distfiles="https://www.physics.princeton.edu/pulsar/K1JT/wsjtx-${version}.tgz" +distfiles="${SOURCEFORGE_SITE}/wsjt/${pkgname}-${version}/${pkgname}-${version}.tgz" checksum=1cbc163f238a8cfd64cd9e4a00aa1e00ef43758a1ba9c5db83ca63ca60f64f9d -case $XBPS_TARGET_MACHINE in - # aarch64 builders can't fetch the distfile from the orig url. - aarch64*) distfiles="https://sources.voidlinux.org/wsjtx-${version}/wsjtx-${version}.tgz";; -esac - if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-qmake qt5-host-tools" configure_args+=" -DBoost_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include" From 2746a2421d51de8f9495e2b8756cf6e5f1bb02a1 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Wed, 1 Jul 2020 20:39:23 +0200 Subject: [PATCH 181/410] monero-gui: update to 0.16.0.2. --- srcpkgs/monero-gui/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template index 98cd57aedb6..03bbd11ef57 100644 --- a/srcpkgs/monero-gui/template +++ b/srcpkgs/monero-gui/template @@ -1,6 +1,7 @@ # Template file for 'monero-gui' pkgname=monero-gui -version=0.16.0.1 +version=0.16.0.2 +_monero_version=0.16.0.1 revision=1 build_style=qmake hostmakedepends="pkg-config qt5-tools qt5-qmake qt5-quickcontrols qt5-declarative-devel @@ -14,13 +15,13 @@ 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${version}.tar.gz>monero-${version}.tar.gz" -checksum="548286b12d5a7bdd64525922a9925ad469327379c11fa18e247cb8ffec558e21 + https://github.com/monero-project/monero/archive/v${_monero_version}.tar.gz>monero-${_monero_version}.tar.gz" +checksum="7a22262db4b779386d6d9a565eb66ff900f5bf4448378b527c1a1df3b25581ae 0fde78e23313a693207bffccd8a6481d14043e48588dc52fc10094a56a80fa39" skip_extraction="monero-${version}.tar.gz" post_extract() { - bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/monero-${version}.tar.gz --strip-components 1 -C monero + bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/monero-${_monero_version}.tar.gz --strip-components 1 -C monero } pre_configure() { From c02506e4f8c7967b56cdddb7e3207ffba216e788 Mon Sep 17 00:00:00 2001 From: Pulux Date: Fri, 29 May 2020 19:40:34 +0200 Subject: [PATCH 182/410] python3-plotly: update to 4.8.1. --- srcpkgs/python3-plotly/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-plotly/template b/srcpkgs/python3-plotly/template index e6af08f7b84..9c4b556a768 100644 --- a/srcpkgs/python3-plotly/template +++ b/srcpkgs/python3-plotly/template @@ -1,6 +1,6 @@ # Template file for 'python3-plotly' pkgname=python3-plotly -version=4.6.0 +version=4.8.1 revision=1 archs=noarch wrksrc="plotly-${version}" @@ -13,7 +13,7 @@ maintainer="pulux " license="MIT" homepage="https://plot.ly/python/" distfiles="${PYPI_SITE}/p/plotly/plotly-${version}.tar.gz" -checksum=61f34955f04201a1ebcd59feaafa7eae7c16ef9b3f439870be01fb85a949292f +checksum=d3fea527fe3dfdd55d7334318f107b05a8407474a0fffe6cd4726c9b99e624f1 conf_files="etc/jupyter/nbconfig/notebook.d/plotlywidget.json" do_check() { From 7b6f1fa17ec338804b65b1e5db7af60c43e48145 Mon Sep 17 00:00:00 2001 From: Renato Aguiar Date: Fri, 8 May 2020 17:01:38 -0700 Subject: [PATCH 183/410] thrift: split devel, orphan --- srcpkgs/thrift-devel | 1 + srcpkgs/thrift/template | 19 ++++++++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) create mode 120000 srcpkgs/thrift-devel diff --git a/srcpkgs/thrift-devel b/srcpkgs/thrift-devel new file mode 120000 index 00000000000..7ede8bc0ef9 --- /dev/null +++ b/srcpkgs/thrift-devel @@ -0,0 +1 @@ +thrift \ No newline at end of file diff --git a/srcpkgs/thrift/template b/srcpkgs/thrift/template index 068125b377f..12750bcf8f7 100644 --- a/srcpkgs/thrift/template +++ b/srcpkgs/thrift/template @@ -1,11 +1,13 @@ # Template file for 'thrift' pkgname=thrift version=0.13.0 -revision=3 +revision=4 build_style=gnu-configure +configure_args="--without-python" makedepends="boost-devel libressl-devel" +checkdepends="zlib-devel libevent-devel" short_desc="Apache Thrift compiler" -maintainer="Renato Aguiar " +maintainer="Orphaned " license="Apache-2.0" homepage="https://thrift.apache.org/" distfiles="http://www-us.apache.org/dist/thrift/${version}/thrift-${version}.tar.gz" @@ -16,7 +18,7 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then fi if [ "$CROSS_BUILD" ]; then - configure_args="--disable-tests --disable-tutorial" + configure_args+=" --disable-tests --disable-tutorial" fi post_configure() { @@ -27,3 +29,14 @@ post_configure() { ;; esac } + +thrift-devel_package() { + short_desc+=" - development files" + depends="${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" + vmove usr/lib/pkgconfig + } +} From 61050b96f6e927b2306365a3a91497c2378fae57 Mon Sep 17 00:00:00 2001 From: q66 Date: Wed, 1 Jul 2020 23:48:08 +0200 Subject: [PATCH 184/410] bcnc: remove no_opencv logic It's no longer possible to build bcnc on ppc32 since scipy no longer builds because of openblas dependency. --- srcpkgs/bcnc/template | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/srcpkgs/bcnc/template b/srcpkgs/bcnc/template index c7e6eb32c80..c0c7bfb8402 100644 --- a/srcpkgs/bcnc/template +++ b/srcpkgs/bcnc/template @@ -6,7 +6,8 @@ archs=noarch wrksrc=bCNC-$version build_style=python3-module hostmakedepends="python3-setuptools" -depends="python3-pyserial python3-Pillow python3-tkinter python3-numpy python3-scipy" +depends="python3-pyserial python3-Pillow python3-tkinter python3-numpy python3-scipy + libopencv-python3" short_desc="GRBL CNC command sender, autoleveler and g-code editor" maintainer="Urs Schulz " license="GPL-2.0-only" @@ -15,17 +16,6 @@ distfiles="${PYPI_SITE}/b/bCNC/bCNC-${version}.tar.gz" checksum=2df238989184179726870559f0531aea1e85ae9369d194bf8dba3638107671d7 nocross="libopencv-python3 is not cross-compilable" -# opencv is not available on 32-bit ppc -case "$XBPS_TARGET_MACHINE" in - ppc64*) ;; - ppc*) _no_opencv=yes;; -esac - -# libopencv-python3 is optional -if [ -z "$_no_opencv" ]; then - depends+=" libopencv-python3" -fi - post_install() { vmkdir usr/share/applications vmkdir usr/share/pixmaps From eea4ff90e354804ff340f7166530acc961782863 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 2 Jul 2020 08:35:13 +0700 Subject: [PATCH 185/410] libical: cross GOject-Introspection --- srcpkgs/libical/template | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/srcpkgs/libical/template b/srcpkgs/libical/template index c90914003b0..da1b777528c 100644 --- a/srcpkgs/libical/template +++ b/srcpkgs/libical/template @@ -1,9 +1,9 @@ # Template file for 'libical' pkgname=libical version=3.0.8 -revision=2 +revision=3 build_style=cmake -build_helper="gir" +build_helper="gir qemu" configure_args="-DICAL_BUILD_DOCS=false $(vopt_if gir '-DGOBJECT_INTROSPECTION=true -DICAL_GLIB_VAPI=true')" hostmakedepends="gettext libglib-devel libxml2-devel perl pkg-config $(vopt_if gir vala)" @@ -19,9 +19,15 @@ patch_args="-Np1" disable_parallel_build=yes build_options="gir" -if [ -z "$CROSS_BUILD" ]; then - build_options_default="gir" -fi +build_options_default="gir" + +post_configure() { + if [ "$CROSS_BUILD" ]; then + # QEMU_SET_ENV=LD_LIBRARY_PATH=/builddir/libical-3.0.8/build/lib + # in pre_build doesn't work?? + ln -sf ../../lib/libical.so.3 build/src/libical-glib + fi +} libical-devel_package() { depends="icu-devel ${sourcepkg}>=${version}_${revision}" From 2aabfa4a3719cd3118b69f8a2a733aadc592bf24 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Wed, 1 Jul 2020 20:52:29 -0400 Subject: [PATCH 186/410] python3-scipy: make openblas a build option --- srcpkgs/python3-scipy/template | 43 ++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/srcpkgs/python3-scipy/template b/srcpkgs/python3-scipy/template index e3ba0099209..3d602c347c9 100644 --- a/srcpkgs/python3-scipy/template +++ b/srcpkgs/python3-scipy/template @@ -1,12 +1,14 @@ # Template file for 'python3-scipy' pkgname=python3-scipy version=1.5.0 -revision=1 +revision=2 wrksrc="scipy-${version}" build_style=python3-module make_check_args="--force" -hostmakedepends="python3-setuptools python3-Cython python3-numpy gcc-fortran" -makedepends="python3-devel python3-numpy python3-pybind11 lapack-devel openblas-devel" +hostmakedepends="gcc-fortran python3-setuptools + python3-Cython python3-numpy python3-pybind11" +makedepends="python3-devel python3-numpy python3-pybind11 + $(vopt_if openblas openblas-devel lapack-devel)" depends="python3-numpy" checkdepends="python3-nose" short_desc="Scientific library for Python3" @@ -16,6 +18,17 @@ homepage="https://scipy.org/scipylib/" distfiles="https://github.com/scipy/scipy/releases/download/v${version}/scipy-${version}.tar.xz" checksum=23baeaa18803d12d1abdff3f5c148b1085c2dc4028c6b8efce652dde2119b41c +build_options="openblas" +desc_option_openblas="Enable support for openblas accelerated linear algebra" + +case "$XBPS_TARGET_MACHINE" in + x86_64*|i686*|aarch64*|armv[67]*|ppc64*) + # Prefer accelerated routines where available + build_options_default="openblas" + ;; + *) ;; +esac + if [ "$CROSS_BUILD" ]; then # Make sure numpy is found for the target arch first CFLAGS+=" -I${XBPS_CROSS_BASE}/${py3_sitelib}/numpy/core/include" @@ -29,23 +42,23 @@ fi LDFLAGS+=" -shared" pre_build() { - cat > site.cfg <<-EOF - [openblas] - libraries = openblas - EOF - if [ "$CROSS_BUILD" ]; then - # Make sure scipy knows how to find openblas - cat >> site.cfg <<-EOF - library_dirs = ${XBPS_CROSS_BASE}/usr/lib - include_dirs = ${XBPS_CROSS_BASE}/usr/include - runtime_library_dirs = ${XBPS_CROSS_BASE}/usr/lib - EOF - # numpy.distutils refuses to find the right linker for FORTRAN # Link the cross compiler so the module will find it as gfortran ln -sf "/usr/bin/${FC}" "${XBPS_WRAPPERDIR}/gfortran" fi + + # Find the right linear algebra subroutines on the target arch + : > site.cfg + for _blaslib in $(vopt_if openblas openblas "lapack blas"); do + cat >> site.cfg <<-EOF + [$_blaslib] + libraries = ${_blaslib} + include_dirs = ${XBPS_CROSS_BASE}/usr/include + library_dirs = ${XBPS_CROSS_BASE}/usr/lib + runtime_library_dirs = ${XBPS_CROSS_BASE}/usr/lib + EOF + done } post_install() { From 3da220137eaf3c19745d4d7242716a015f3a6da4 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Wed, 1 Jul 2020 15:38:32 -0400 Subject: [PATCH 187/410] bcnc: update to 0.9.14.306; rename to bCNC --- srcpkgs/bCNC/INSTALL.msg | 2 ++ srcpkgs/{bcnc => bCNC}/template | 21 ++++++++++++--------- srcpkgs/bcnc | 1 + 3 files changed, 15 insertions(+), 9 deletions(-) create mode 100644 srcpkgs/bCNC/INSTALL.msg rename srcpkgs/{bcnc => bCNC}/template (63%) create mode 120000 srcpkgs/bcnc diff --git a/srcpkgs/bCNC/INSTALL.msg b/srcpkgs/bCNC/INSTALL.msg new file mode 100644 index 00000000000..1ed6f8cd321 --- /dev/null +++ b/srcpkgs/bCNC/INSTALL.msg @@ -0,0 +1,2 @@ +If you would like to enable webcam streaming in bCNC, please install the +libopencv-python3 package. diff --git a/srcpkgs/bcnc/template b/srcpkgs/bCNC/template similarity index 63% rename from srcpkgs/bcnc/template rename to srcpkgs/bCNC/template index c0c7bfb8402..054a118ecfb 100644 --- a/srcpkgs/bcnc/template +++ b/srcpkgs/bCNC/template @@ -1,20 +1,17 @@ -# Template file for 'bcnc' -pkgname=bcnc -version=0.9.14.303 +# Template file for 'bCNC' +pkgname=bCNC +version=0.9.14.306 revision=1 archs=noarch -wrksrc=bCNC-$version build_style=python3-module hostmakedepends="python3-setuptools" -depends="python3-pyserial python3-Pillow python3-tkinter python3-numpy python3-scipy - libopencv-python3" +depends="python3-pyserial python3-Pillow python3-tkinter python3-numpy python3-scipy" short_desc="GRBL CNC command sender, autoleveler and g-code editor" maintainer="Urs Schulz " license="GPL-2.0-only" homepage="https://github.com/vlachoudis/bCNC" -distfiles="${PYPI_SITE}/b/bCNC/bCNC-${version}.tar.gz" -checksum=2df238989184179726870559f0531aea1e85ae9369d194bf8dba3638107671d7 -nocross="libopencv-python3 is not cross-compilable" +distfiles="${PYPI_SITE}/b/${pkgname}/${pkgname}-${version}.tar.gz" +checksum=3af8590e3d2b6320fc1d0db019ba5584736c7a30dd205de531656f6d8f3b04cc post_install() { vmkdir usr/share/applications @@ -23,3 +20,9 @@ post_install() { ln -s "/${py3_sitelib}/bCNC/bCNC.png" "${DESTDIR}/usr/share/pixmaps/" ln -s "bCNC" "${DESTDIR}/usr/bin/bcnc" } + +bcnc_package() { + depends="bCNC>=${version}_${revision}" + short_desc+=" (transitional dummy package)" + build_style=meta +} diff --git a/srcpkgs/bcnc b/srcpkgs/bcnc new file mode 120000 index 00000000000..f70a8d863fc --- /dev/null +++ b/srcpkgs/bcnc @@ -0,0 +1 @@ +bCNC \ No newline at end of file From 124b6ed08e54b46043fe92432860fdd67cefb504 Mon Sep 17 00:00:00 2001 From: mobinmob Date: Fri, 19 Jun 2020 17:23:28 +0300 Subject: [PATCH 188/410] eclipse: update to 4.16. Closes: #23060 [via git-merge-pr] --- srcpkgs/eclipse/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/eclipse/template b/srcpkgs/eclipse/template index 6dc98a06c75..5a9082e966c 100644 --- a/srcpkgs/eclipse/template +++ b/srcpkgs/eclipse/template @@ -1,9 +1,9 @@ # Template file for 'eclipse' pkgname=eclipse -version=4.15 +version=4.16 revision=1 #code name of version -_release=2020-03 +_release=2020-06 archs="x86_64" wrksrc="eclipse" depends="virtual?java-environment unzip gtk+3 webkit2gtk libXtst @@ -18,8 +18,8 @@ _patch=R _edition=java _mirror="http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse" distfiles="${_mirror}/technology/epp/downloads/release/${_release}/${_patch}/eclipse-${_edition}-${_release}-${_patch}-linux-gtk-x86_64.tar.gz" -checksum=72fde94154999df569cbd30551bc784341391b9753209cd563829a6c8674383e -python_version=2 #unverified +checksum=dc52b7486715cf13aa2642b7e96fc7d2ea1d0544c070110dd52b2644ec869e76 +python_version=2 do_install() { vmkdir usr/lib/eclipse From e16c647e2211b9c111b6bb2284d115e94fa96c4d Mon Sep 17 00:00:00 2001 From: yopito Date: Wed, 10 Jun 2020 19:28:45 +0200 Subject: [PATCH 189/410] eigen: upstream switched to gitlab.com --- srcpkgs/eigen/template | 5 ++--- srcpkgs/eigen/update | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) delete mode 100644 srcpkgs/eigen/update diff --git a/srcpkgs/eigen/template b/srcpkgs/eigen/template index aecb421d47e..8344fbf98ec 100644 --- a/srcpkgs/eigen/template +++ b/srcpkgs/eigen/template @@ -3,14 +3,13 @@ pkgname=eigen version=3.3.7 revision=2 archs=noarch -wrksrc=eigen-eigen-323c052e1731 build_style=cmake short_desc="C++ template library for linear algebra (version 3.x)" maintainer="Orphaned " license="MPL-2.0, GPL-3.0-or-later, LGPL-2.1-or-later, BSD-3-Clause" homepage="https://eigen.tuxfamily.org/" -distfiles="https://bitbucket.org/eigen/eigen/get/${version}.tar.bz2" -checksum=9f13cf90dedbe3e52a19f43000d71fdf72e986beb9a5436dddcd61ff9d77a3ce +distfiles="https://gitlab.com/libeigen/eigen/-/archive/${version}/eigen-${version}.tar.bz2" +checksum=685adf14bd8e9c015b78097c1dc22f2f01343756f196acdc76a678e1ae352e11 post_install() { vlicense COPYING.BSD diff --git a/srcpkgs/eigen/update b/srcpkgs/eigen/update deleted file mode 100644 index 7a93539c9a2..00000000000 --- a/srcpkgs/eigen/update +++ /dev/null @@ -1 +0,0 @@ -pattern='eigen/get/\K[\d.]+(?=.tar.bz2)' From 205f170d0a3c3a5069b91db08f44cd46fb32e71c Mon Sep 17 00:00:00 2001 From: Duncaen Date: Thu, 2 Jul 2020 13:35:48 +0200 Subject: [PATCH 190/410] knot-resolver: update to 5.1.2. --- srcpkgs/knot-resolver/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/knot-resolver/template b/srcpkgs/knot-resolver/template index 8e12dd04528..c0e2a9201bc 100644 --- a/srcpkgs/knot-resolver/template +++ b/srcpkgs/knot-resolver/template @@ -1,6 +1,6 @@ # Template file for 'knot-resolver' pkgname=knot-resolver -version=5.1.1 +version=5.1.2 revision=1 build_style=meson configure_args=" @@ -17,7 +17,7 @@ maintainer="Duncaen " license="GPL-3.0-or-later" homepage="https://www.knot-resolver.cz/" distfiles="https://secure.nic.cz/files/knot-resolver/knot-resolver-${version}.tar.xz" -checksum=f72214046df8aae2b1a5c6d1ad0bc8b166aa060df5b008f6e88b4f6ba79cbf4e +checksum=caa4f941caf39080184554fb1310f383eba4b30d9c4c2215670d6b0a2de8f836 system_accounts="_knot_resolver" _knot_resolver_homedir="/var/cache/knot-resolver" From 583943c7abd34fd652410e4b3406859e53b2dddc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 2 Jul 2020 20:48:22 +0700 Subject: [PATCH 191/410] kexec-tools: patch for i686 Patch taken from https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/patch/?id=2c9f26ed20a791a7df0182ba82e93abb52f5a615 --- srcpkgs/kexec-tools/patches/i686.patch | 69 ++++++++++++++++++++++++++ srcpkgs/kexec-tools/template | 4 -- 2 files changed, 69 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/kexec-tools/patches/i686.patch diff --git a/srcpkgs/kexec-tools/patches/i686.patch b/srcpkgs/kexec-tools/patches/i686.patch new file mode 100644 index 00000000000..5f96349eb88 --- /dev/null +++ b/srcpkgs/kexec-tools/patches/i686.patch @@ -0,0 +1,69 @@ +From 2c9f26ed20a791a7df0182ba82e93abb52f5a615 Mon Sep 17 00:00:00 2001 +From: Chris Packham +Date: Mon, 18 Nov 2019 12:52:15 +1300 +Subject: kexec: build multiboot2 for i386 + +This addresses the following compilation issues when building for i386. + + kexec/arch/i386/kexec-x86.c:39:22: error: 'multiboot2_x86_probe' undeclared here (not in a function); did you mean 'multiboot_x86_probe'? + { "multiboot2-x86", multiboot2_x86_probe, multiboot2_x86_load, + ^~~~~~~~~~~~~~~~~~~~ + multiboot_x86_probe + kexec/arch/i386/kexec-x86.c:39:44: error: 'multiboot2_x86_load' undeclared here (not in a function); did you mean 'multiboot_x86_load'? + { "multiboot2-x86", multiboot2_x86_probe, multiboot2_x86_load, + ^~~~~~~~~~~~~~~~~~~ + multiboot_x86_load + kexec/arch/i386/kexec-x86.c:40:4: error: 'multiboot2_x86_usage' undeclared here (not in a function); did you mean 'multiboot_x86_usage'? + multiboot2_x86_usage }, + ^~~~~~~~~~~~~~~~~~~~ + multiboot_x86_usage + make: *** [Makefile:114: kexec/arch/i386/kexec-x86.o] Error 1 + make: *** Waiting for unfinished jobs.... + +Signed-off-by: Chris Packham +Signed-off-by: Simon Horman +--- + https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/patch/?id=2c9f26ed20a791a7df0182ba82e93abb52f5a615 + kexec/arch/i386/Makefile | 2 +- + kexec/arch/i386/kexec-x86.h | 5 +++++ + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git kexec/arch/i386/Makefile kexec/arch/i386/Makefile +index 105cefd..f486103 100644 +--- kexec/arch/i386/Makefile ++++ kexec/arch/i386/Makefile +@@ -7,6 +7,7 @@ i386_KEXEC_SRCS += kexec/arch/i386/kexec-elf-x86.c + i386_KEXEC_SRCS += kexec/arch/i386/kexec-elf-rel-x86.c + i386_KEXEC_SRCS += kexec/arch/i386/kexec-bzImage.c + i386_KEXEC_SRCS += kexec/arch/i386/kexec-multiboot-x86.c ++i386_KEXEC_SRCS += kexec/arch/i386/kexec-mb2-x86.c + i386_KEXEC_SRCS += kexec/arch/i386/kexec-beoboot-x86.c + i386_KEXEC_SRCS += kexec/arch/i386/kexec-nbi.c + i386_KEXEC_SRCS += kexec/arch/i386/x86-linux-setup.c +@@ -14,7 +15,6 @@ i386_KEXEC_SRCS += kexec/arch/i386/crashdump-x86.c + + dist += kexec/arch/i386/Makefile $(i386_KEXEC_SRCS) \ + kexec/arch/i386/crashdump-x86.h \ +- kexec/arch/i386/kexec-mb2-x86.c \ + kexec/arch/i386/kexec-x86.h \ + kexec/arch/i386/x86-linux-setup.h \ + kexec/arch/i386/include/arch/options.h +diff --git kexec/arch/i386/kexec-x86.h kexec/arch/i386/kexec-x86.h +index 1b58c3b..0f941df 100644 +--- kexec/arch/i386/kexec-x86.h ++++ kexec/arch/i386/kexec-x86.h +@@ -60,6 +60,11 @@ int multiboot_x86_load(int argc, char **argv, const char *buf, off_t len, + struct kexec_info *info); + void multiboot_x86_usage(void); + ++int multiboot2_x86_load(int argc, char **argv, const char *buf, off_t len, ++ struct kexec_info *info); ++void multiboot2_x86_usage(void); ++int multiboot2_x86_probe(const char *buf, off_t buf_len); ++ + int elf_x86_probe(const char *buf, off_t len); + int elf_x86_load(int argc, char **argv, const char *buf, off_t len, + struct kexec_info *info); +-- +cgit 1.2.3-1.el7 + diff --git a/srcpkgs/kexec-tools/template b/srcpkgs/kexec-tools/template index 81efebab90a..96e730e9127 100644 --- a/srcpkgs/kexec-tools/template +++ b/srcpkgs/kexec-tools/template @@ -14,10 +14,6 @@ distfiles="${KERNEL_SITE}/utils/kernel/kexec/${pkgname}-${version}.tar.xz" checksum=dad8077f0315445d1f6335579fc4ade222facf82a67124974c7be5303ba4f8c8 skip_extraction="${pkgname}-${version}.tar.xz" -case "$XBPS_TARGET_MACHINE" in - i686*) broken="https://build.voidlinux.org/builders/i686_builder/builds/19200/steps/shell_3/logs/stdio" ;; -esac - case "$XBPS_TARGET_MACHINE" in ppc-musl) nopie=yes;; # textrels not supported esac From 57902f0002a0faa9bd6e883ccc8519c4dc9fcaf5 Mon Sep 17 00:00:00 2001 From: Paper Mountain Studio Date: Sun, 1 Dec 2019 16:51:33 +0100 Subject: [PATCH 192/410] New package: drist-1.04 --- srcpkgs/drist/patches/fix_permissions.patch | 14 ++++++++++++++ srcpkgs/drist/template | 20 ++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 srcpkgs/drist/patches/fix_permissions.patch create mode 100644 srcpkgs/drist/template diff --git a/srcpkgs/drist/patches/fix_permissions.patch b/srcpkgs/drist/patches/fix_permissions.patch new file mode 100644 index 00000000000..5bc7421ce56 --- /dev/null +++ b/srcpkgs/drist/patches/fix_permissions.patch @@ -0,0 +1,14 @@ +--- Makefile ++++ Makefile +@@ -11,9 +11,9 @@ + + install: + @echo installing executable to "${DESTDIR}${PREFIX}/bin" +- @install -D "${BIN}" "${DESTDIR}${BINDIR}/${BIN}" ++ @install -D -m 755 "${BIN}" "${DESTDIR}${BINDIR}/${BIN}" + @echo installing manual page to ${DESTDIR}${MANDIR}/man1 +- @install -D "${BIN}.1" "${DESTDIR}${MANDIR}/man1/${BIN}.1" ++ @install -D -m 644 "${BIN}.1" "${DESTDIR}${MANDIR}/man1/${BIN}.1" + + uninstall: + @echo removing executable file from "${DESTDIR}${PREFIX}/bin" diff --git a/srcpkgs/drist/template b/srcpkgs/drist/template new file mode 100644 index 00000000000..89f39b7eec8 --- /dev/null +++ b/srcpkgs/drist/template @@ -0,0 +1,20 @@ +# Template file for 'drist' +pkgname=drist +version=1.04 +revision=1 +archs=noarch +wrksrc=$pkgname-v$version +build_style=gnu-makefile +depends="openssh rsync" +short_desc="Remote deployment tool" +maintainer="Paper " +license="BSD-2-Clause" +homepage="gopher://bitreich.org/1/scm/drist/" +distfiles="ftp://bitreich.org/releases/drist/drist-v$version.tgz" +checksum=174e243b4ae41a3c3c9919b351f6fbe0c94e07b9b728310c78bfa767e810910d + +post_install() { + vlicense LICENSE + vmkdir usr/share/drist + vcopy examples /usr/share/drist/ +} From 88149ce22a533033587c03acd7445c8df7729307 Mon Sep 17 00:00:00 2001 From: Paper Mountain Studio Date: Fri, 3 Jan 2020 11:59:53 +0100 Subject: [PATCH 193/410] gnome-doc-utils: use python3 Closes: #18005 --- srcpkgs/gnome-doc-utils/patches/python3.patch | 521 ++++++++++++++++++ srcpkgs/gnome-doc-utils/template | 12 +- 2 files changed, 527 insertions(+), 6 deletions(-) create mode 100644 srcpkgs/gnome-doc-utils/patches/python3.patch diff --git a/srcpkgs/gnome-doc-utils/patches/python3.patch b/srcpkgs/gnome-doc-utils/patches/python3.patch new file mode 100644 index 00000000000..284e38e775d --- /dev/null +++ b/srcpkgs/gnome-doc-utils/patches/python3.patch @@ -0,0 +1,521 @@ +taken from fedora, alpine, gentoo +diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/__init__.py gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py +--- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/__init__.py 2011-08-04 09:36:03.000000000 -0500 ++++ gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py 2019-09-10 09:30:28.018627919 -0500 +@@ -86,14 +86,14 @@ + self.messages.append(t) + if spacepreserve: + self.nowrap[t] = True +- if t in self.linenos.keys(): ++ if t in list(self.linenos.keys()): + self.linenos[t].append((self.filename, tag, lineno)) + else: + self.linenos[t] = [ (self.filename, tag, lineno) ] + if (not self.do_translations) and comment and not t in self.comments: + self.comments[t] = comment + else: +- if t in self.linenos.keys(): ++ if t in list(self.linenos.keys()): + self.linenos[t].append((self.filename, tag, lineno)) + else: + self.linenos[t] = [ (self.filename, tag, lineno) ] +@@ -166,7 +166,7 @@ + elif node.isText(): + if node.isBlankNode(): + if self.app.options.get('expand_entities') or \ +- (not (node.prev and not node.prev.isBlankNode() and node.next and not node.next.isBlankNode()) ): ++ (not (node.prev and not node.prev.isBlankNode() and node.__next__ and not node.next.isBlankNode()) ): + #print >>sys.stderr, "BLANK" + node.setContent('') + else: +@@ -176,7 +176,7 @@ + child = node.children + while child: + self.normalizeNode(child) +- child = child.next ++ child = child.__next__ + + def normalizeString(self, text, spacepreserve = False): + """Normalizes string to be used as key for gettext lookup. +@@ -200,7 +200,7 @@ + tree = ctxt.doc() + newnode = tree.getRootElement() + except: +- print >> sys.stderr, """Error while normalizing string as XML:\n"%s"\n""" % (text) ++ print("""Error while normalizing string as XML:\n"%s"\n""" % (text), file=sys.stderr) + return text + + self.normalizeNode(newnode) +@@ -209,7 +209,7 @@ + child = newnode.children + while child: + result += child.serialize('utf-8') +- child = child.next ++ child = child.__next__ + + result = re.sub('^ ','', result) + result = re.sub(' $','', result) +@@ -235,7 +235,7 @@ + ctxt.parseDocument() + tree = ctxt.doc() + if next: +- newnode = tree.children.next ++ newnode = tree.children.__next__ + else: + newnode = tree.children + +@@ -243,7 +243,7 @@ + child = newnode.children + while child: + result += child.serialize('utf-8') +- child = child.next ++ child = child.__next__ + tree.freeDoc() + return result + +@@ -262,7 +262,7 @@ + result += child.content.decode('utf-8') + else: + result += self.myAttributeSerialize(child) +- child = child.next ++ child = child.__next__ + else: + result = node.serialize('utf-8') + return result +@@ -338,7 +338,7 @@ + pass + + if not newnode: +- print >> sys.stderr, """Error while parsing translation as XML:\n"%s"\n""" % (text.encode('utf-8')) ++ print("""Error while parsing translation as XML:\n"%s"\n""" % (text.encode('utf-8')), file=sys.stderr) + return + + newelem = newnode.getRootElement() +@@ -346,13 +346,13 @@ + if newelem and newelem.children: + free = node.children + while free: +- next = free.next ++ next = free.__next__ + free.unlinkNode() + free = next + + if node: + copy = newelem.copyNodeList() +- next = node.next ++ next = node.__next__ + node.replaceNode(newelem.copyNodeList()) + node.next = next + +@@ -378,7 +378,7 @@ + if child.type in ['text'] and child.content.strip()!='': + final = True + break +- child = child.next ++ child = child.__next__ + + node.__autofinal__ = final + return final +@@ -457,7 +457,7 @@ + outtxt += '<%s>%s' % (starttag, content, endtag) + else: + outtxt += self.doSerialize(child) +- child = child.next ++ child = child.__next__ + + if self.app.operation == 'merge': + norm_outtxt = self.normalizeString(outtxt, self.app.isSpacePreserveNode(node)) +@@ -534,7 +534,7 @@ + outtxt = '' + while child: + outtxt += self.doSerialize(child) +- child = child.next ++ child = child.__next__ + return outtxt + + def xml_error_handler(arg, ctxt): +@@ -577,8 +577,8 @@ + raise IOError("Unable to read file '%s'" % xmlfile) + try: + doc = XMLDocument(xmlfile, self) +- except Exception, e: +- print >> sys.stderr, "Unable to parse XML file '%s': %s" % (xmlfile, str(e)) ++ except Exception as e: ++ print("Unable to parse XML file '%s': %s" % (xmlfile, str(e)), file=sys.stderr) + sys.exit(1) + self.current_mode.preProcessXml(doc.doc, self.msg) + doc.generate_messages() +@@ -590,14 +590,14 @@ + raise IOError("Unable to read file '%s'" % xmlfile) + try: + doc = XMLDocument(xmlfile, self) +- except Exception, e: +- print >> sys.stderr, str(e) ++ except Exception as e: ++ print(str(e), file=sys.stderr) + sys.exit(1) + + try: + mfile = open(mofile, "rb") + except: +- print >> sys.stderr, "Can't open MO file '%s'." % (mofile) ++ print("Can't open MO file '%s'." % (mofile), file=sys.stderr) + self.gt = gettext.GNUTranslations(mfile) + self.gt.add_fallback(NoneTranslations()) + # Has preProcessXml use cases for merge? +@@ -619,16 +619,16 @@ + raise IOError("Unable to read file '%s'" % xmlfile) + try: + doc = XMLDocument(xmlfile, self) +- except Exception, e: +- print >> sys.stderr, str(e) ++ except Exception as e: ++ print(str(e), file=sys.stderr) + sys.exit(1) + doc.generate_messages() + + self.msg.translationsFollow() + try: + doc = XMLDocument(origxml, self) +- except Exception, e: +- print >> sys.stderr, str(e) ++ except Exception as e: ++ print(str(e), file=sys.stderr) + sys.exit(1) + doc.generate_messages() + self.output_po() +diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/docbook.py gnome-doc-utils-0.20.10/xml2po/xml2po/modes/docbook.py +--- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/docbook.py 2011-01-10 10:08:10.000000000 -0600 ++++ gnome-doc-utils-0.20.10/xml2po/xml2po/modes/docbook.py 2019-09-10 09:31:15.199572286 -0500 +@@ -43,7 +43,7 @@ + except ImportError: + from md5 import new as md5_new + +-from basic import basicXmlMode ++from .basic import basicXmlMode + + class docbookXmlMode(basicXmlMode): + """Class for special handling of DocBook document types. +@@ -131,7 +131,7 @@ + hash = self._md5_for_file(fullpath) + else: + hash = "THIS FILE DOESN'T EXIST" +- print >>sys.stderr, "Warning: image file '%s' not found." % fullpath ++ print("Warning: image file '%s' not found." % fullpath, file=sys.stderr) + + msg.outputMessage("@@image: '%s'; md5=%s" % (attr, hash), node.lineNo(), + "When image changes, this message will be marked fuzzy or untranslated for you.\n"+ +@@ -198,10 +198,10 @@ + # Perform some tests when ran standalone + if __name__ == '__main__': + test = docbookXmlMode() +- print "Ignored tags : " + repr(test.getIgnoredTags()) +- print "Final tags : " + repr(test.getFinalTags()) +- print "Space-preserve tags: " + repr(test.getSpacePreserveTags()) ++ print("Ignored tags : " + repr(test.getIgnoredTags())) ++ print("Final tags : " + repr(test.getFinalTags())) ++ print("Space-preserve tags: " + repr(test.getSpacePreserveTags())) + +- print "Credits from string: '%s'" % test.getStringForTranslators() +- print "Explanation for credits:\n\t'%s'" % test.getCommentForTranslators() ++ print("Credits from string: '%s'" % test.getStringForTranslators()) ++ print("Explanation for credits:\n\t'%s'" % test.getCommentForTranslators()) + +diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/gs.py gnome-doc-utils-0.20.10/xml2po/xml2po/modes/gs.py +--- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/gs.py 2010-12-13 10:14:07.000000000 -0600 ++++ gnome-doc-utils-0.20.10/xml2po/xml2po/modes/gs.py 2019-09-10 09:31:15.201572284 -0500 +@@ -20,7 +20,7 @@ + # Special case Gnome Summary + # + +-from basic import basicXmlMode ++from .basic import basicXmlMode + + class gsXmlMode(basicXmlMode): + """Abstract class for special handling of document types.""" +diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/mallard.py gnome-doc-utils-0.20.10/xml2po/xml2po/modes/mallard.py +--- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/mallard.py 2011-01-10 10:08:50.000000000 -0600 ++++ gnome-doc-utils-0.20.10/xml2po/xml2po/modes/mallard.py 2019-09-10 09:31:15.212572271 -0500 +@@ -39,7 +39,7 @@ + except ImportError: + from md5 import new as md5_new + +-from basic import basicXmlMode ++from .basic import basicXmlMode + + class mallardXmlMode(basicXmlMode): + """Class for special handling of Mallard document types.""" +@@ -112,7 +112,7 @@ + hash = self._md5_for_file(fullpath) + else: + hash = "THIS FILE DOESN'T EXIST" +- print >>sys.stderr, "Warning: image file '%s' not found." % fullpath ++ print("Warning: image file '%s' not found." % fullpath, file=sys.stderr) + + msg.outputMessage("@@image: '%s'; md5=%s" % (attr, hash), node.lineNo(), + "When image changes, this message will be marked fuzzy or untranslated for you.\n"+ +diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/ubuntu.py gnome-doc-utils-0.20.10/xml2po/xml2po/modes/ubuntu.py +--- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/ubuntu.py 2010-12-13 10:14:07.000000000 -0600 ++++ gnome-doc-utils-0.20.10/xml2po/xml2po/modes/ubuntu.py 2019-09-10 09:31:15.213572270 -0500 +@@ -2,7 +2,7 @@ + + import libxml2 + +-from docbook import docbookXmlMode ++from .docbook import docbookXmlMode + + class ubuntuXmlMode (docbookXmlMode): + """Special-casing Ubuntu DocBook website documentation.""" +diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/xhtml.py gnome-doc-utils-0.20.10/xml2po/xml2po/modes/xhtml.py +--- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/xhtml.py 2010-12-13 10:14:07.000000000 -0600 ++++ gnome-doc-utils-0.20.10/xml2po/xml2po/modes/xhtml.py 2019-09-10 09:31:15.214572269 -0500 +@@ -21,7 +21,7 @@ + # This implements special instructions for handling XHTML documents + # in a better way, particularly to extract some attributes in HTML tags + +-from basic import basicXmlMode ++from .basic import basicXmlMode + + class xhtmlXmlMode(basicXmlMode): + """Class for special handling of XHTML document types.""" +diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/xml2po.py.in gnome-doc-utils-0.20.10/xml2po/xml2po/xml2po.py.in +--- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/xml2po.py.in 2010-12-13 10:14:07.000000000 -0600 ++++ gnome-doc-utils-0.20.10/xml2po/xml2po/xml2po.py.in 2019-09-10 09:30:28.217627684 -0500 +@@ -41,9 +41,9 @@ + if not os.path.exists('/dev/null'): NULL_STRING = 'NUL' + + def usage (with_help = False): +- print >> sys.stderr, "Usage: %s [OPTIONS] [XMLFILE]..." % (sys.argv[0]) ++ print("Usage: %s [OPTIONS] [XMLFILE]..." % (sys.argv[0]), file=sys.stderr) + if with_help: +- print >> sys.stderr, """ ++ print(""" + OPTIONS may be some of: + -a --automatic-tags Automatically decides if tags are to be considered + "final" or not +@@ -72,7 +72,7 @@ + using -p option for each XML file: + %(command)s -p de.po chapter1.xml > chapter1.de.xml + %(command)s -p de.po chapter2.xml > chapter2.de.xml +-""" % {'command': sys.argv[0]} ++""" % {'command': sys.argv[0]}, file=sys.stderr) + + + def main(argv): +@@ -82,7 +82,7 @@ + + name = os.path.join(os.path.dirname(__file__), '..') + if os.path.exists(os.path.join(name, 'tests')): +- print >> sys.stderr, 'Running from source folder, modifying PYTHONPATH' ++ print('Running from source folder, modifying PYTHONPATH', file=sys.stderr) + sys.path.insert(0, name) + + from xml2po import Main +@@ -142,14 +142,14 @@ + elif opt in ('-o', '--output'): + output = arg + elif opt in ('-v', '--version'): +- print VERSION ++ print(VERSION) + sys.exit(0) + elif opt in ('-h', '--help'): + usage(True) + sys.exit(0) + + if operation == 'update' and output != "-": +- print >> sys.stderr, "Option '-o' is not yet supported when updating translations directly. Ignoring this option." ++ print("Option '-o' is not yet supported when updating translations directly. Ignoring this option.", file=sys.stderr) + + # Treat remaining arguments as XML files + filenames = [] +@@ -159,16 +159,16 @@ + try: + xml2po_main = Main(default_mode, operation, output, options) + except IOError: +- print >> sys.stderr, "Error: cannot open file %s for writing." % (output) ++ print("Error: cannot open file %s for writing." % (output), file=sys.stderr) + sys.exit(5) + + if operation == 'merge': + if len(filenames) > 1: +- print >> sys.stderr, "Error: You can merge translations with only one XML file at a time." ++ print("Error: You can merge translations with only one XML file at a time.", file=sys.stderr) + sys.exit(2) + + if not mofile: +- print >> sys.stderr, "Error: You must specify MO file when merging translations." ++ print("Error: You must specify MO file when merging translations.", file=sys.stderr) + sys.exit(3) + + xml2po_main.merge(mofile, filenames[0]) +--- gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py.orig 2019-09-10 09:34:42.110328324 -0500 ++++ gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py 2019-09-10 09:34:44.170325899 -0500 +@@ -166,7 +166,7 @@ + elif node.isText(): + if node.isBlankNode(): + if self.app.options.get('expand_entities') or \ +- (not (node.prev and not node.prev.isBlankNode() and node.__next__ and not node.next.isBlankNode()) ): ++ (not (node.prev and not node.prev.isBlankNode() and node.next and not node.next.isBlankNode()) ): + #print >>sys.stderr, "BLANK" + node.setContent('') + else: +@@ -176,7 +176,7 @@ + child = node.children + while child: + self.normalizeNode(child) +- child = child.__next__ ++ child = child.next + + def normalizeString(self, text, spacepreserve = False): + """Normalizes string to be used as key for gettext lookup. +@@ -209,7 +209,7 @@ + child = newnode.children + while child: + result += child.serialize('utf-8') +- child = child.__next__ ++ child = child.next + + result = re.sub('^ ','', result) + result = re.sub(' $','', result) +@@ -235,7 +235,7 @@ + ctxt.parseDocument() + tree = ctxt.doc() + if next: +- newnode = tree.children.__next__ ++ newnode = tree.children.next + else: + newnode = tree.children + +@@ -243,7 +243,7 @@ + child = newnode.children + while child: + result += child.serialize('utf-8') +- child = child.__next__ ++ child = child.next + tree.freeDoc() + return result + +@@ -262,7 +262,7 @@ + result += child.content.decode('utf-8') + else: + result += self.myAttributeSerialize(child) +- child = child.__next__ ++ child = child.next + else: + result = node.serialize('utf-8') + return result +@@ -346,13 +346,13 @@ + if newelem and newelem.children: + free = node.children + while free: +- next = free.__next__ ++ next = free.next + free.unlinkNode() + free = next + + if node: + copy = newelem.copyNodeList() +- next = node.__next__ ++ next = node.next + node.replaceNode(newelem.copyNodeList()) + node.next = next + +@@ -378,7 +378,7 @@ + if child.type in ['text'] and child.content.strip()!='': + final = True + break +- child = child.__next__ ++ child = child.next + + node.__autofinal__ = final + return final +@@ -457,7 +457,7 @@ + outtxt += '<%s>%s' % (starttag, content, endtag) + else: + outtxt += self.doSerialize(child) +- child = child.__next__ ++ child = child.next + + if self.app.operation == 'merge': + norm_outtxt = self.normalizeString(outtxt, self.app.isSpacePreserveNode(node)) +@@ -534,7 +534,7 @@ + outtxt = '' + while child: + outtxt += self.doSerialize(child) +- child = child.__next__ ++ child = child.next + return outtxt + + def xml_error_handler(arg, ctxt): +--- gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py.orig 2019-09-10 09:39:57.733974912 -0500 ++++ gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py 2019-09-10 09:40:24.761946962 -0500 +@@ -326,7 +326,7 @@ + pass + + content = '<%s>%s' % (starttag, text, endtag) +- tmp = tmp + content.encode('utf-8') ++ tmp = tmp + content + + newnode = None + try: +@@ -663,7 +663,7 @@ + if not text or text.strip() == '': + return text + if self.gt: +- res = self.gt.ugettext(text.decode('utf-8')) ++ res = self.gt.gettext(text) + return res + + return text +--- gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py.orig 2019-09-10 09:41:23.853885851 -0500 ++++ gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py 2019-09-10 09:44:23.580699979 -0500 +@@ -352,9 +352,10 @@ + + if node: + copy = newelem.copyNodeList() +- next = node.next ++ #next = node.next + node.replaceNode(newelem.copyNodeList()) +- node.next = next ++ #print(type(next)) ++ #node.next = next + + else: + # In practice, this happens with tags such as " " (only whitespace in between) +@@ -470,7 +471,7 @@ + + worth = self.worthOutputting(node) + if not translation: +- translation = outtxt.decode('utf-8') ++ translation = outtxt + if worth and self.app.options.get('mark_untranslated'): + node.setLang('C') + +--- gnome-doc-utils-0.20.10/xml2po/xml2po/modes/docbook.py.orig 2019-09-10 09:46:15.409584334 -0500 ++++ gnome-doc-utils-0.20.10/xml2po/xml2po/modes/docbook.py 2019-09-10 09:46:30.164569075 -0500 +@@ -184,7 +184,7 @@ + else: + ai.addChild(copy) + if match.group(3): +- copy.newChild(None, "year", match.group(3).encode('utf-8')) ++ copy.newChild(None, "year", match.group(3)) + if match.group(1) and match.group(2): + holder = match.group(1)+"(%s)" % match.group(2) + elif match.group(1): +@@ -193,7 +193,7 @@ + holder = match.group(2) + else: + holder = "???" +- copy.newChild(None, "holder", holder.encode('utf-8')) ++ copy.newChild(None, "holder", holder) + + # Perform some tests when ran standalone + if __name__ == '__main__': +--- gnome-doc-utils-0.20.10/xml2po/xml2po/xml2po.py.in~ 2019-09-10 09:50:34.000000000 -0500 ++++ gnome-doc-utils-0.20.10/xml2po/xml2po/xml2po.py.in 2019-09-10 09:50:45.114305443 -0500 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python -u ++#!/usr/bin/python3 -u + # -*- encoding: utf-8 -*- + # Copyright (c) 2004, 2005, 2006 Danilo Šegan . + # Copyright (c) 2009 Claude Paroz . diff --git a/srcpkgs/gnome-doc-utils/template b/srcpkgs/gnome-doc-utils/template index c4b2632232f..d2fa2e9e4cd 100644 --- a/srcpkgs/gnome-doc-utils/template +++ b/srcpkgs/gnome-doc-utils/template @@ -1,19 +1,19 @@ # Template file for 'gnome-doc-utils' pkgname=gnome-doc-utils version=0.20.10 -revision=4 +revision=5 archs=noarch build_style=gnu-configure configure_args="--disable-scrollkeeper" -pycompile_module="xml2po" -hostmakedepends="pkg-config intltool python libxml2-python libxslt-python +hostmakedepends="pkg-config intltool python3 libxml2-python3 libxslt-python gsettings-desktop-schemas" -makedepends="libxslt-devel docbook-xml docbook-xsl rarian python - libxml2-python libxslt" -depends="libxslt docbook-xml docbook-xsl rarian python libxml2-python" +makedepends="libxslt-devel docbook-xml docbook-xsl rarian python3 + libxml2-python3 libxslt" +depends="libxslt docbook-xml docbook-xsl rarian python3 libxml2-python3" short_desc="Documentation utilities for GNOME" maintainer="Orphaned " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/GnomeDocUtils" distfiles="${GNOME_SITE}/${pkgname}/0.20/${pkgname}-${version}.tar.xz" checksum=cb0639ffa9550b6ddf3b62f3b1add92fb92ab4690d351f2353cffe668be8c4a6 +patch_args="-Np1" From d361608d1a0a5ef1dbe0a60ff8185a0bd4a857a2 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 12 May 2020 13:56:19 +0200 Subject: [PATCH 194/410] libressl: update to 3.1.3. --- common/shlibs | 3 +++ srcpkgs/{libcrypto45 => libcrypto46} | 0 srcpkgs/libressl/template | 16 ++++++++-------- srcpkgs/{libssl47 => libssl48} | 0 srcpkgs/{libtls19 => libtls20} | 0 5 files changed, 11 insertions(+), 8 deletions(-) rename srcpkgs/{libcrypto45 => libcrypto46} (100%) rename srcpkgs/{libssl47 => libssl48} (100%) rename srcpkgs/{libtls19 => libtls20} (100%) diff --git a/common/shlibs b/common/shlibs index 052526657d3..878ca5a5ac6 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3591,6 +3591,9 @@ libssl.so.46 libssl46-2.8.2_1 libcrypto.so.45 libcrypto45-2.9.2_1 libtls.so.19 libtls19-2.9.2_1 libssl.so.47 libssl47-2.9.2_1 +libcrypto.so.46 libcrypto46-3.1.1_1 +libtls.so.20 libtls20-3.1.1_1 +libssl.so.48 libssl48-3.1.1_1 libxmlb.so.1 libxmlb-0.1.3_1 libvoikko.so.1 libvoikko-4.2_1 libfstrcmp.so.0 libfstrcmp-0.7.D001_1 diff --git a/srcpkgs/libcrypto45 b/srcpkgs/libcrypto46 similarity index 100% rename from srcpkgs/libcrypto45 rename to srcpkgs/libcrypto46 diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template index 4790d556987..f8a201c19b5 100644 --- a/srcpkgs/libressl/template +++ b/srcpkgs/libressl/template @@ -1,7 +1,7 @@ # Template file for 'libressl' pkgname=libressl -version=3.0.2 -revision=2 +version=3.1.3 +revision=1 bootstrap=yes build_style=gnu-configure short_desc="Version of the TLS/crypto stack forked from OpenSSL" @@ -10,7 +10,7 @@ license="OpenSSL-License, SSLeay-License, ISC" #changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog" homepage="http://www.libressl.org/" distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${pkgname}-${version}.tar.gz" -checksum=df7b172bf79b957dd27ef36dcaa1fb162562c0e8999e194aa8c1a3df2f15398e +checksum=c76b0316acf612ecb62f5cb014a20d972a663bd9e40abf952a86f3b998b69fa0 provides="openssl-${version}_${revision}" replaces="openssl>=0" conf_files="/etc/ssl/openssl.cnf /etc/ssl/x509v3.cnf" @@ -38,21 +38,21 @@ post_install() { find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete } -libcrypto45_package() { +libcrypto46_package() { short_desc+=" - crypto library" pkg_install() { vmove usr/lib/libcrypto.so.* } } -libssl47_package() { +libssl48_package() { short_desc+=" - SSL/TLS library" pkg_install() { vmove usr/lib/libssl.so.* } } -libtls19_package() { +libtls20_package() { short_desc+=" - new TLS library" pkg_install() { vmove usr/lib/libtls.so.* @@ -61,8 +61,8 @@ libtls19_package() { libressl-devel_package() { short_desc+=" - development files" - depends="libcrypto45-${version}_${revision} libssl47-${version}_${revision} - libtls19-${version}_${revision}" + depends="libcrypto46-${version}_${revision} libssl48-${version}_${revision} + libtls20-${version}_${revision}" pkg_install() { vmove usr/include vmove "usr/lib/*.a" diff --git a/srcpkgs/libssl47 b/srcpkgs/libssl48 similarity index 100% rename from srcpkgs/libssl47 rename to srcpkgs/libssl48 diff --git a/srcpkgs/libtls19 b/srcpkgs/libtls20 similarity index 100% rename from srcpkgs/libtls19 rename to srcpkgs/libtls20 From f527062bc848d0dee53f4dda91731120a4c17586 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 2 Jul 2020 16:40:07 +0200 Subject: [PATCH 195/410] xbps: rebuild against libressl-3.1.3 --- srcpkgs/xbps/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template index 31ed71bbaf2..66deab88d1b 100644 --- a/srcpkgs/xbps/template +++ b/srcpkgs/xbps/template @@ -1,7 +1,7 @@ # Template file for 'xbps' pkgname=xbps version=0.59.1 -revision=1 +revision=2 bootstrap=yes build_style=configure short_desc="XBPS package system utilities" From af031a5a85b21bdfab2404249fbbd2e0f09cd587 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 2 Jul 2020 16:40:11 +0200 Subject: [PATCH 196/410] libarchive: rebuild against libressl-3.1.3 --- srcpkgs/libarchive/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template index e9166f9d6ad..48b1c29802b 100644 --- a/srcpkgs/libarchive/template +++ b/srcpkgs/libarchive/template @@ -1,7 +1,7 @@ # Template file for 'libarchive' pkgname=libarchive version=3.4.3 -revision=1 +revision=2 bootstrap=yes build_style=gnu-configure configure_args="$(vopt_enable acl) $(vopt_enable acl xattr) From a6e645b1ec63f80aeb982c225d065ea0ac387cbb Mon Sep 17 00:00:00 2001 From: zhengqunkoo Date: Mon, 27 Apr 2020 07:37:37 +0800 Subject: [PATCH 197/410] New package: ziptuner-0.6 Closes: #21361 --- srcpkgs/ziptuner/template | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 srcpkgs/ziptuner/template diff --git a/srcpkgs/ziptuner/template b/srcpkgs/ziptuner/template new file mode 100644 index 00000000000..b7041d9c31f --- /dev/null +++ b/srcpkgs/ziptuner/template @@ -0,0 +1,25 @@ +# Template file for 'ziptuner' +pkgname=ziptuner +version=0.6 +revision=1 +build_style=gnu-makefile +makedepends="libcurl-devel" +depends="dialog" +short_desc="Internet radio station tuner for the console using C and dialog" +maintainer="zhengqunkoo " +license="MIT" +homepage="https://github.com/deeice/ziptuner" +distfiles="${homepage}/archive/v${version}.tar.gz" +checksum=eaa8d9e3e212fed12c38b8a517dd685c03629d5e74e590baed79281f018f1877 + +post_patch() { + vsed -i -e 's/^CFLAGS :=/CFLAGS +=/' \ + -e 's/-Wl,--unresolved-symbols=ignore-in-shared-libs//' \ + -e 's/\$(LFLAGS)/$(LDFLAGS) &/' \ + Makefile +} + +do_install() { + vbin ${pkgname} + vlicense LICENSE +} From 243b461285941eafad43b0d739af71a911a4f8a5 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Thu, 2 Jul 2020 16:57:54 +0200 Subject: [PATCH 198/410] linux5.4: update to 5.4.50. --- srcpkgs/linux5.4/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template index 5027291b9a4..8a730acbcd3 100644 --- a/srcpkgs/linux5.4/template +++ b/srcpkgs/linux5.4/template @@ -1,6 +1,6 @@ # Template file for 'linux5.4' pkgname=linux5.4 -version=5.4.49 +version=5.4.50 revision=1 wrksrc="linux-${version}" short_desc="Linux kernel and modules (${version%.*} series)" @@ -8,7 +8,7 @@ maintainer="Helmut Pozimski " license="GPL-2.0-only" homepage="https://www.kernel.org" distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz" -checksum=55d89b636a07240ef57d04e840e9386f5aa18d957999bd077315042c9cd4573c +checksum=ad10f4c1e900f4e3eb4903b65dbcb4ca74250de63aa9fa7105b9b3c3f9a8a6e2 python_version=3 patch_args="-Np1" From b09aa5e8d0a83b0e97022f3bc224573e49ff52a7 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Thu, 2 Jul 2020 17:01:10 +0200 Subject: [PATCH 199/410] linux4.19: update to 4.19.131. --- srcpkgs/linux4.19/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template index 5e065d54932..f48b1f44c1a 100644 --- a/srcpkgs/linux4.19/template +++ b/srcpkgs/linux4.19/template @@ -1,6 +1,6 @@ # Template file for 'linux4.19' pkgname=linux4.19 -version=4.19.130 +version=4.19.131 revision=1 wrksrc="linux-${version}" short_desc="Linux kernel and modules (${version%.*} series)" @@ -8,7 +8,7 @@ maintainer="Helmut Pozimski " license="GPL-2.0-only" homepage="https://www.kernel.org" distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz" -checksum=a692c0e61dc885b4d6e66ae7bf202dadf7d5538fbf92766ce7cf8e227fd4f00f +checksum=19dfb9f6cc4ba30104b65dcce7d78240a4ae188cb366747d5f8eae35e98964ba python_version=2 #unverified patch_args="-Np1" From 721ee236b816ca93dbc71004fed0ed347c0fabba Mon Sep 17 00:00:00 2001 From: John Date: Thu, 2 Jul 2020 16:43:55 +0200 Subject: [PATCH 200/410] cargo: rebuild against libressl-3.1.3 --- srcpkgs/cargo/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template index de7ed57bce9..f57f8941589 100644 --- a/srcpkgs/cargo/template +++ b/srcpkgs/cargo/template @@ -1,7 +1,7 @@ # Template file for 'cargo' pkgname=cargo version=0.45.0 -revision=1 +revision=2 wrksrc="cargo-${version}" build_helper=rust hostmakedepends="rust python curl cmake pkg-config" From 2341701c752e1b2372a0ef71db89aee145a42822 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 2 Jul 2020 16:56:49 +0200 Subject: [PATCH 201/410] cargo-deny: rebuild against libressl-3.1.3 --- srcpkgs/cargo-deny/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cargo-deny/template b/srcpkgs/cargo-deny/template index 464052ed062..d6dbd56a65b 100644 --- a/srcpkgs/cargo-deny/template +++ b/srcpkgs/cargo-deny/template @@ -1,7 +1,7 @@ # Template file for 'cargo-deny' pkgname=cargo-deny version=0.6.8 -revision=1 +revision=2 build_style=cargo configure_args="--no-default-features" hostmakedepends="pkg-config" From 3dcc5adbbc6e1ffa0afa344f754fe8b584ae6404 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 2 Jul 2020 16:59:18 +0200 Subject: [PATCH 202/410] rust-cargo-audit: rebuild against libressl-3.1.3 --- srcpkgs/rust-cargo-audit/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/rust-cargo-audit/template b/srcpkgs/rust-cargo-audit/template index 908fb77a7c2..a90a7636365 100644 --- a/srcpkgs/rust-cargo-audit/template +++ b/srcpkgs/rust-cargo-audit/template @@ -1,7 +1,7 @@ # Template file for 'rust-cargo-audit' pkgname=rust-cargo-audit version=0.11.2 -revision=1 +revision=2 wrksrc="${pkgname/rust-/}-${version}" build_style=cargo hostmakedepends="pkg-config" @@ -13,6 +13,10 @@ homepage="https://rustsec.org" distfiles="https://static.crates.io/crates/cargo-audit/cargo-audit-${version}.crate" checksum=c5a18158b613c72145473977a158ae16e30784f49fff8f360c330b44721ff207 +pre_build() { + cargo update --package openssl-sys --precise 0.9.58 +} + post_install() { vlicense LICENSE-APACHE vlicense LICENSE-MIT From a657ca450e579114fcea94299fcf08da87cd9992 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 2 Jul 2020 16:59:18 +0200 Subject: [PATCH 203/410] rust-sccache: rebuild against libressl-3.1.3 --- srcpkgs/rust-sccache/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template index 79e3bac43ba..bbcadbeb6f4 100644 --- a/srcpkgs/rust-sccache/template +++ b/srcpkgs/rust-sccache/template @@ -1,7 +1,7 @@ # Template file for 'rust-sccache' pkgname=rust-sccache version=0.2.13 -revision=1 +revision=2 wrksrc="${pkgname/rust-/}-${version}" build_style=cargo hostmakedepends="pkg-config" @@ -16,3 +16,7 @@ checksum=34b8eaab25eb467e9796c2f3ad7524c8548bf3afed962a922dd0b40ed2472ef7 case "$XBPS_TARGET_MACHINE" in ppc*) broken="ftbfs in ring" ;; esac + +pre_build() { + cargo update --package openssl-sys --precise 0.9.58 +} From dd19d0a8a053a3d33a422a10a35347befbfefad5 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 2 Jul 2020 16:59:19 +0200 Subject: [PATCH 204/410] rustup: rebuild against libressl-3.1.3 --- srcpkgs/rustup/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template index 7d18697ed2d..90d19f98a99 100644 --- a/srcpkgs/rustup/template +++ b/srcpkgs/rustup/template @@ -1,7 +1,7 @@ # Template file for 'rustup' pkgname=rustup version=1.21.1 -revision=3 +revision=4 build_style=cargo configure_args="--features no-self-update --bin rustup-init" hostmakedepends="pkg-config" @@ -14,8 +14,8 @@ distfiles="https://github.com/rust-lang/${pkgname}/archive/${version}.tar.gz" checksum=3dd54cb15313ff01c930ad4e36326f7d60caadd2d6707790d83bea26fbb8bbe1 pre_build() { - cargo update --package openssl-sys --precise 0.9.57 - cargo update --package openssl --precise 0.10.29 + cargo update --package openssl-sys --precise 0.9.58 + cargo update --package openssl --precise 0.10.30 } do_install() { From 8ab61707739bb5d7e833382823fd2e2816eb6106 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 2 Jul 2020 16:59:19 +0200 Subject: [PATCH 205/410] cargo-edit: rebuild against libressl-3.1.3 --- srcpkgs/cargo-edit/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/cargo-edit/template b/srcpkgs/cargo-edit/template index d703849d6c4..67452f52678 100644 --- a/srcpkgs/cargo-edit/template +++ b/srcpkgs/cargo-edit/template @@ -1,7 +1,7 @@ # Template file for 'cargo-edit' pkgname=cargo-edit version=0.6.0 -revision=1 +revision=2 build_style=cargo hostmakedepends="pkg-config" makedepends="libressl-devel" @@ -12,6 +12,10 @@ homepage="https://github.com/killercup/cargo-edit" distfiles="https://github.com/killercup/cargo-edit/archive/v${version}.tar.gz" checksum=b91161dcb14d86bc605778cc7fb4d6f6333305fc6cbe84fc6717f1e682678200 +pre_build() { + cargo update --package openssl-sys --precise 0.9.58 +} + post_install() { vlicense LICENSE } From ef5b47e2761eda59133d025593da272e66c64b52 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 2 Jul 2020 16:59:19 +0200 Subject: [PATCH 206/410] cargo-geiger: rebuild against libressl-3.1.3 --- srcpkgs/cargo-geiger/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/cargo-geiger/template b/srcpkgs/cargo-geiger/template index 633e22087bd..c614dce5980 100644 --- a/srcpkgs/cargo-geiger/template +++ b/srcpkgs/cargo-geiger/template @@ -1,7 +1,7 @@ # Template file for 'cargo-geiger' pkgname=cargo-geiger version=0.10.0 -revision=1 +revision=2 wrksrc="${pkgname}-${pkgname}-${version}" build_wrksrc="${pkgname}" build_style=cargo @@ -14,6 +14,10 @@ homepage="https://github.com/rust-secure-code/cargo-geiger" distfiles="https://github.com/rust-secure-code/cargo-geiger/archive/cargo-geiger-${version}.tar.gz" checksum=01590e9e37ca8ca304b5d10c81740b80581724c856945d8f551468b25940d847 +pre_build() { + cargo update --package openssl-sys --precise 0.9.58 +} + post_install() { vlicense LICENSE-MIT vlicense LICENSE-APACHE From adb2fea5cb25fb02a66779bdefa0aa9f891b03a3 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 2 Jul 2020 16:59:19 +0200 Subject: [PATCH 207/410] cargo-outdated: rebuild against libressl-3.1.3 --- srcpkgs/cargo-outdated/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/cargo-outdated/template b/srcpkgs/cargo-outdated/template index 05e338f0c97..7e159bb6f5a 100644 --- a/srcpkgs/cargo-outdated/template +++ b/srcpkgs/cargo-outdated/template @@ -1,7 +1,7 @@ # Template file for 'cargo-outdated' pkgname=cargo-outdated version=0.9.9 -revision=1 +revision=2 build_style=cargo hostmakedepends="pkg-config" makedepends="libgit2-devel libressl-devel" @@ -16,8 +16,8 @@ checksum=f23bb266d0f31316817e6350b4a02a91cbb6b02baa280092bbd9719ebfee31b4 export LIBGIT2_SYS_USE_PKG_CONFIG=1 pre_build() { - cargo update --package openssl-sys --precise 0.9.55 - cargo update --package openssl --precise 0.10.29 + cargo update --package openssl-sys --precise 0.9.58 + cargo update --package openssl --precise 0.10.30 } post_install() { From e82c9970a1f473c311f2171bb298a3051eb4a281 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 2 Jul 2020 16:59:19 +0200 Subject: [PATCH 208/410] cargo-aoc: rebuild against libressl-3.1.3 --- srcpkgs/cargo-aoc/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/cargo-aoc/template b/srcpkgs/cargo-aoc/template index b7d9be9ebdc..d8ecf5e2ee8 100644 --- a/srcpkgs/cargo-aoc/template +++ b/srcpkgs/cargo-aoc/template @@ -1,7 +1,7 @@ # Template file for 'cargo-aoc' pkgname=cargo-aoc version=0.3.2 -revision=1 +revision=2 build_wrksrc=cargo-aoc build_style=cargo hostmakedepends="pkg-config" @@ -14,8 +14,8 @@ distfiles="https://github.com/gobanos/cargo-aoc/archive/${version}.tar.gz" checksum=2a33a861a03087690cc2ab690567c3ab906c5b31a53d96159e9d552e14ecc960 pre_build() { - cargo update --package openssl --precise 0.10.26 - cargo update --package openssl-sys --precise 0.9.53 + cargo update --package openssl --precise 0.10.30 + cargo update --package openssl-sys --precise 0.9.58 } post_install() { From e86b1739a1adb027e6d2460a5653cadf897c1ec9 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Thu, 2 Jul 2020 10:10:31 -0500 Subject: [PATCH 209/410] python3-yara: update to 4.0.2. --- srcpkgs/python3-yara/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-yara/template b/srcpkgs/python3-yara/template index 6fff7b3c921..4441fa7a0c4 100644 --- a/srcpkgs/python3-yara/template +++ b/srcpkgs/python3-yara/template @@ -1,6 +1,6 @@ # Template file for 'python3-yara' pkgname=python3-yara -version=4.0.1 +version=4.0.2 revision=1 wrksrc="yara-python-${version}" build_style=python3-module @@ -12,4 +12,4 @@ maintainer="Andrew Benson " license="Apache-2.0" homepage="http://virustotal.github.io/yara/" distfiles="https://github.com/VirusTotal/yara-python/archive/v${version}.tar.gz" -checksum=1b893f14c0db164ed0bd3e2bf3b2b019ca87d77a1dab268f89d19dbf23c4c6c6 +checksum=6e747caefa8d208bf40b078ef0a71f3866fa9075091239cc362bd23bf436d816 From bcb32e6abf0bc4b49d8cb222a86b3fc37403ec54 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 2 Jul 2020 17:19:43 +0200 Subject: [PATCH 210/410] FreeRADIUS: rebuild against libressl-3.1.3 --- srcpkgs/FreeRADIUS/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template index ea7c67d6ae5..ad05f62732d 100644 --- a/srcpkgs/FreeRADIUS/template +++ b/srcpkgs/FreeRADIUS/template @@ -1,7 +1,7 @@ # Template file for 'FreeRADIUS' pkgname=FreeRADIUS version=3.0.20 -revision=1 +revision=2 wrksrc=freeradius-server-release_${version//./_} build_style=gnu-configure makedepends="talloc-devel libressl-devel mit-krb5-devel pam-devel \ From a3e3ed7f14ec68547ab8b84c0c1c5f6c28a5e541 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 2 Jul 2020 17:19:43 +0200 Subject: [PATCH 211/410] Ice: rebuild against libressl-3.1.3 --- srcpkgs/Ice/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template index d9f68fde12b..d27bb350c74 100644 --- a/srcpkgs/Ice/template +++ b/srcpkgs/Ice/template @@ -1,7 +1,7 @@ # Template file for 'Ice' pkgname=Ice version=3.5.1 -revision=21 +revision=22 build_wrksrc=cpp makedepends="zlib-devel bzip2-devel mcpp-devel db-devel expat-devel libressl-devel" short_desc="Internet Communications Engine (Ice)" From 75d70a8603f60bd6bda5f1c7fb978cc02c37d3b8 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 2 Jul 2020 17:19:43 +0200 Subject: [PATCH 212/410] LGOGDownloader: rebuild against libressl-3.1.3 --- srcpkgs/LGOGDownloader/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template index 59aaf5505a7..1ad9e8165b7 100644 --- a/srcpkgs/LGOGDownloader/template +++ b/srcpkgs/LGOGDownloader/template @@ -1,7 +1,7 @@ # Template file for 'LGOGDownloader' pkgname=LGOGDownloader version=3.7 -revision=1 +revision=2 wrksrc="lgogdownloader-${version}" build_style=cmake hostmakedepends="pkg-config" From cd6da2a9fd869e247d4be9fe291d4b9e7bf393a7 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 2 Jul 2020 17:19:43 +0200 Subject: [PATCH 213/410] MEGAsdk: rebuild against libressl-3.1.3 --- srcpkgs/MEGAsdk/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/MEGAsdk/template b/srcpkgs/MEGAsdk/template index 52aa7573279..342e76fc676 100644 --- a/srcpkgs/MEGAsdk/template +++ b/srcpkgs/MEGAsdk/template @@ -1,7 +1,7 @@ # Template file for 'MEGAsdk' pkgname=MEGAsdk version=3.6.2a -revision=2 +revision=3 wrksrc="sdk-${version}" build_style=gnu-configure configure_args="--enable-chat --disable-examples $(vopt_with libuv)" From b0527aeac04f577288aa9884e1de37db3eea31c0 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 2 Jul 2020 17:19:43 +0200 Subject: [PATCH 214/410] OpenRCT2: rebuild against libressl-3.1.3 --- srcpkgs/OpenRCT2/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template index 26659712ac8..5b0c68a5f80 100644 --- a/srcpkgs/OpenRCT2/template +++ b/srcpkgs/OpenRCT2/template @@ -5,7 +5,7 @@ pkgname=OpenRCT2 _objects_version=1.0.15 _titles_version=0.1.2 version=0.2.6 -revision=1 +revision=2 build_style=cmake configure_args="$(vopt_if multiplayer "" "-DDISABLE_HTTP_TWITCH=1 -DDISABLE_NETWORK=1")" hostmakedepends="pkg-config unzip" From 2adf7fcf34e31feb2d605466240ba0c8665d8b0d Mon Sep 17 00:00:00 2001 From: John Date: Thu, 2 Jul 2020 17:19:43 +0200 Subject: [PATCH 215/410] VirtualGL: rebuild against libressl-3.1.3 --- srcpkgs/VirtualGL/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/VirtualGL/template b/srcpkgs/VirtualGL/template index 343e9c78f4c..1a4c708af37 100644 --- a/srcpkgs/VirtualGL/template +++ b/srcpkgs/VirtualGL/template @@ -1,7 +1,7 @@ # Template file for 'VirtualGL' pkgname=VirtualGL version=2.6.2 -revision=1 +revision=2 build_style=cmake configure_args="-DTJPEG_INCLUDE_DIR=/usr/include -DVGL_SYSTEMGLX=ON -DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DCMAKE_INSTALL_LIBDIR=/usr/lib From 28e1f62c283f8042cd60c4b8ea09843158908249 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 2 Jul 2020 17:19:43 +0200 Subject: [PATCH 216/410] acme-client: rebuild against libressl-3.1.3 --- srcpkgs/acme-client/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/acme-client/template b/srcpkgs/acme-client/template index 3bf86341ff0..e778658b3fd 100644 --- a/srcpkgs/acme-client/template +++ b/srcpkgs/acme-client/template @@ -1,7 +1,7 @@ # Template file for 'acme-client' pkgname=acme-client version=0.1.16 -revision=4 +revision=5 _distver=VERSION_${version//./_} wrksrc=acme-client-portable-${_distver} build_style=gnu-makefile From 151b362fa9fffad668260ac3cf4992738b6e2b8c Mon Sep 17 00:00:00 2001 From: John Date: Thu, 2 Jul 2020 17:19:43 +0200 Subject: [PATCH 217/410] aircrack-ng: rebuild against libressl-3.1.3 --- srcpkgs/aircrack-ng/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/aircrack-ng/template b/srcpkgs/aircrack-ng/template index a544f6f7c26..1225e4b10a9 100644 --- a/srcpkgs/aircrack-ng/template +++ b/srcpkgs/aircrack-ng/template @@ -1,7 +1,7 @@ # Template file for 'aircrack-ng' pkgname=aircrack-ng version=1.6 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="automake libtool pkg-config" makedepends="libnl3-devel libressl-devel sqlite-devel zlib-devel" From c728caec0820b719275018f33620c02aaa3634e5 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 2 Jul 2020 17:19:44 +0200 Subject: [PATCH 218/410] alpine: rebuild against libressl-3.1.3 --- srcpkgs/alpine/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template index 88141ce2c21..5933bdd7d24 100644 --- a/srcpkgs/alpine/template +++ b/srcpkgs/alpine/template @@ -1,7 +1,7 @@ # Template file for 'alpine' pkgname=alpine version=2.23.2 -revision=1 +revision=2 _githash=7b8875f8bb237a156a1250629e8c684706bd202f _gitshort="${_githash:0:7}" wrksrc="${pkgname}-${_gitshort}" From d375bc1619b5c10da36eaecca7ca6fcb22110bf2 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 2 Jul 2020 17:19:44 +0200 Subject: [PATCH 219/410] apache: rebuild against libressl-3.1.3 --- srcpkgs/apache/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template index 56b4539ea83..edfedc59964 100644 --- a/srcpkgs/apache/template +++ b/srcpkgs/apache/template @@ -1,7 +1,7 @@ # Template file for 'apache' pkgname=apache version=2.4.43 -revision=2 +revision=3 wrksrc="httpd-${version}" build_style=gnu-configure configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all From d6b636e54a3e34a064be26107b5247e29e48106f Mon Sep 17 00:00:00 2001 From: John Date: Thu, 2 Jul 2020 17:19:44 +0200 Subject: [PATCH 220/410] apk-tools: rebuild against libressl-3.1.3 --- srcpkgs/apk-tools/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template index 6b13fb0476b..87ecbd8a144 100644 --- a/srcpkgs/apk-tools/template +++ b/srcpkgs/apk-tools/template @@ -1,7 +1,7 @@ # Template file for 'apk-tools' pkgname=apk-tools version=2.10.5 -revision=1 +revision=2 build_style=gnu-makefile make_build_args="LUAAPK=" hostmakedepends="pkg-config" From 8dda000d15e68d396941dbfb7e45ef5922e82ad3 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 2 Jul 2020 17:19:44 +0200 Subject: [PATCH 221/410] apr-util: rebuild against libressl-3.1.3 --- srcpkgs/apr-util/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template index 13436a674d4..e78d1ee2714 100644 --- a/srcpkgs/apr-util/template +++ b/srcpkgs/apr-util/template @@ -1,7 +1,7 @@ # Template file for 'apr-util' pkgname=apr-util version=1.6.1 -revision=8 +revision=9 build_style=gnu-configure configure_args=" --with-pgsql --with-ldap From be2bd180fc235f3a714ea75c2525b7bd5bee088b Mon Sep 17 00:00:00 2001 From: John Date: Thu, 2 Jul 2020 17:19:44 +0200 Subject: [PATCH 222/410] argyllcms: rebuild against libressl-3.1.3 --- srcpkgs/argyllcms/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/argyllcms/template b/srcpkgs/argyllcms/template index 2229da45e32..230f2ce28e8 100644 --- a/srcpkgs/argyllcms/template +++ b/srcpkgs/argyllcms/template @@ -1,7 +1,7 @@ # Template file for 'argyllcms' pkgname=argyllcms version=2.1.2 -revision=1 +revision=2 wrksrc="Argyll_V${version}" hostmakedepends="ftjam zip unzip" makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel libressl-devel From dbcff4e4e62b4850217b1e7610f81f5b36f4e04f Mon Sep 17 00:00:00 2001 From: John Date: Thu, 2 Jul 2020 17:19:44 +0200 Subject: [PATCH 223/410] aria2: rebuild against libressl-3.1.3 --- srcpkgs/aria2/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/aria2/template b/srcpkgs/aria2/template index 4e0fdf6fa1c..f88cb53e958 100644 --- a/srcpkgs/aria2/template +++ b/srcpkgs/aria2/template @@ -1,7 +1,7 @@ # Template file for 'aria2' pkgname=aria2 version=1.35.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-openssl --with-libexpat --without-gnutls --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt From 7a154b97daa0f62087fe8a1b4d80866b6b77c4cc Mon Sep 17 00:00:00 2001 From: John Date: Thu, 2 Jul 2020 17:19:44 +0200 Subject: [PATCH 224/410] attic: rebuild against libressl-3.1.3 --- srcpkgs/attic/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/attic/template b/srcpkgs/attic/template index ff061533165..6256cc00951 100644 --- a/srcpkgs/attic/template +++ b/srcpkgs/attic/template @@ -1,7 +1,7 @@ # Template file for 'attic' pkgname=attic version=0.16 -revision=17 +revision=18 wrksrc="Attic-$version" build_style=python3-module pycompile_module="attic" From 0719779c5c9d3074b2945fb935158b8883517d85 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 2 Jul 2020 17:19:45 +0200 Subject: [PATCH 225/410] axel: rebuild against libressl-3.1.3 --- srcpkgs/axel/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/axel/template b/srcpkgs/axel/template index 78a5b27158a..3ddba3d3b4e 100644 --- a/srcpkgs/axel/template +++ b/srcpkgs/axel/template @@ -1,7 +1,7 @@ # Template file for 'axel' pkgname=axel version=2.17.9 -revision=1 +revision=2 build_style=gnu-configure conf_files="/etc/axelrc" hostmakedepends="gettext-devel pkg-config" From 97449b9a60c2e4a57a4c96b1bad82e705391c3af Mon Sep 17 00:00:00 2001 From: John Date: Thu, 2 Jul 2020 17:19:45 +0200 Subject: [PATCH 226/410] bacula-common: rebuild against libressl-3.1.3 --- srcpkgs/bacula-common/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template index ef76bc1935c..02c9bb07fcf 100644 --- a/srcpkgs/bacula-common/template +++ b/srcpkgs/bacula-common/template @@ -1,7 +1,7 @@ # Template file for 'bacula-common' pkgname=bacula-common version=9.4.2 -revision=2 +revision=3 wrksrc="${pkgname%-*}-${version}" build_style=gnu-configure configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql From 8e3d5df43ccf55e389337d2fe7dcedc46d45f473 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 2 Jul 2020 17:19:45 +0200 Subject: [PATCH 227/410] badvpn: rebuild against libressl-3.1.3 --- srcpkgs/badvpn/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/badvpn/template b/srcpkgs/badvpn/template index b62d13f208f..360dc5a9140 100644 --- a/srcpkgs/badvpn/template +++ b/srcpkgs/badvpn/template @@ -1,7 +1,7 @@ # Template file for 'badvpn' pkgname=badvpn version=1.999.130 -revision=11 +revision=12 build_style=cmake hostmakedepends="pkg-config" makedepends="libressl-devel nspr-devel nss-devel" From 6985103e06bedcd64b0e71b3d89122eac4115a86 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 2 Jul 2020 17:19:45 +0200 Subject: [PATCH 228/410] baresip: rebuild against libressl-3.1.3 --- srcpkgs/baresip/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template index b0706cfbe73..666fc279cc7 100644 --- a/srcpkgs/baresip/template +++ b/srcpkgs/baresip/template @@ -1,7 +1,7 @@ # Template file for 'baresip' pkgname=baresip version=0.6.5 -revision=1 +revision=2 build_style=gnu-makefile make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk SYSROOT=${XBPS_CROSS_BASE}/usr LIBRE_INC=${XBPS_CROSS_BASE}/usr/include/re From 149247b2cf5cf8d5ed39c45bfd4780c573afe9ab Mon Sep 17 00:00:00 2001 From: John Date: Thu, 2 Jul 2020 17:19:45 +0200 Subject: [PATCH 229/410] barrier: rebuild against libressl-3.1.3 --- srcpkgs/barrier/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/barrier/template b/srcpkgs/barrier/template index 6d2072c98a7..81a304f6088 100644 --- a/srcpkgs/barrier/template +++ b/srcpkgs/barrier/template @@ -1,7 +1,7 @@ # Template file for 'barrier' pkgname=barrier version=2.3.2 -revision=1 +revision=2 build_style=cmake configure_args="-DBARRIER_REVISION=00000000 -DBARRIER_VERSION_STAGE=RELEASE" hostmakedepends="pkg-config qt5-qmake qt5-host-tools" From 607d07ccd24f1dcd34c0a7f2bb6e54b635dc5280 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 2 Jul 2020 17:19:45 +0200 Subject: [PATCH 230/410] bind: rebuild against libressl-3.1.3 --- srcpkgs/bind/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template index 40310807795..138460d5ad5 100644 --- a/srcpkgs/bind/template +++ b/srcpkgs/bind/template @@ -1,7 +1,7 @@ # Template file for 'bind' pkgname=bind version=9.16.4 -revision=1 +revision=2 _fullver="${version}${_patchver:+-${_patchver}}" wrksrc="${pkgname}-${_fullver}" build_style=gnu-configure From 107280ff2c59445e8f8c78080acf4c43ceacb272 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 2 Jul 2020 17:19:45 +0200 Subject: [PATCH 231/410] bitchx: rebuild against libressl-3.1.3 --- srcpkgs/bitchx/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/bitchx/template b/srcpkgs/bitchx/template index 90c2b4c757f..53278edc409 100644 --- a/srcpkgs/bitchx/template +++ b/srcpkgs/bitchx/template @@ -1,7 +1,7 @@ # Template file for 'bitchx' pkgname=bitchx version=1.2.1 -revision=14 +revision=15 build_style=gnu-configure configure_args="--with-ssl --with-ipv6 --with-plugins" makedepends="libressl-devel ncurses-devel" From a01e73096c097d9033a9705d41b5fdefceada3f3 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 2 Jul 2020 17:19:46 +0200 Subject: [PATCH 232/410] bitcoin: rebuild against libressl-3.1.3 --- srcpkgs/bitcoin/patches/qt5.15.patch | 10 ++++++++++ srcpkgs/bitcoin/template | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/bitcoin/patches/qt5.15.patch diff --git a/srcpkgs/bitcoin/patches/qt5.15.patch b/srcpkgs/bitcoin/patches/qt5.15.patch new file mode 100644 index 00000000000..adfe3604717 --- /dev/null +++ b/srcpkgs/bitcoin/patches/qt5.15.patch @@ -0,0 +1,10 @@ +--- src/qt/trafficgraphwidget.cpp 2020-03-04 13:13:02.000000000 +0100 ++++ - 2020-07-02 17:58:16.576242713 +0200 +@@ -6,6 +6,7 @@ + #include + #include + ++#include + #include + #include + #include diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template index 4b74e47916c..df1ab218e16 100644 --- a/srcpkgs/bitcoin/template +++ b/srcpkgs/bitcoin/template @@ -1,7 +1,7 @@ # Template file for 'bitcoin' pkgname=bitcoin version=0.19.1 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-incompatible-bdb --disable-ccache --disable-static --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr" From d2a99b992d2d2aaf3461fad2fce1ebfc981d5868 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 2 Jul 2020 17:19:46 +0200 Subject: [PATCH 233/410] boinc: rebuild against libressl-3.1.3 --- srcpkgs/boinc/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/boinc/template b/srcpkgs/boinc/template index a359a2210c6..ffba563355e 100644 --- a/srcpkgs/boinc/template +++ b/srcpkgs/boinc/template @@ -1,7 +1,7 @@ # Template file for 'boinc' pkgname=boinc version=7.16.7 -revision=1 +revision=2 _majorver=${version%.*} wrksrc=boinc-client_release-${_majorver}-${version} build_style=gnu-configure From ec205aaa48e14ff045911fc51fc505f6d01f95b8 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 2 Jul 2020 17:19:46 +0200 Subject: [PATCH 234/410] borg: rebuild against libressl-3.1.3 --- srcpkgs/borg/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/borg/template b/srcpkgs/borg/template index 9ab9266a0fc..0ede63598e1 100644 --- a/srcpkgs/borg/template +++ b/srcpkgs/borg/template @@ -1,7 +1,7 @@ # Template file for 'borg' pkgname=borg version=1.1.13 -revision=1 +revision=2 wrksrc="borgbackup-${version}" build_style=python3-module hostmakedepends="python3-setuptools python3-devel libressl-devel" From ce5fa6f04fc13cf2499f2e57f4ecbeaceb098b00 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 2 Jul 2020 17:19:46 +0200 Subject: [PATCH 235/410] botan: rebuild against libressl-3.1.3 --- srcpkgs/botan/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template index 88bd64fc544..49d382d1bcc 100644 --- a/srcpkgs/botan/template +++ b/srcpkgs/botan/template @@ -1,7 +1,7 @@ # Template file for 'botan' pkgname=botan version=2.14.0 -revision=1 +revision=2 wrksrc="${pkgname^}-${version}" build_style=gnu-makefile pycompile_module="botan.py" From d2c4be78b2030df98c8630b006be1738d4e417f7 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 2 Jul 2020 17:19:46 +0200 Subject: [PATCH 236/410] bro: rebuild against libressl-3.1.3 --- srcpkgs/bro/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/bro/template b/srcpkgs/bro/template index 8ef7be068cc..12c14e82226 100644 --- a/srcpkgs/bro/template +++ b/srcpkgs/bro/template @@ -1,7 +1,7 @@ # Template file for 'bro' pkgname=bro version=2.6.4 -revision=1 +revision=2 archs="x86_64* i686* aarch64* armv7* ppc64*" build_style=cmake hostmakedepends="flex pkg-config python3" From 9de1e712744d6c936c6a12722ffce46a972ab8b8 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 2 Jul 2020 17:19:46 +0200 Subject: [PATCH 237/410] burp-server: rebuild against libressl-3.1.3 --- srcpkgs/burp-server/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/burp-server/template b/srcpkgs/burp-server/template index dbd40dbd540..85cff6602c6 100644 --- a/srcpkgs/burp-server/template +++ b/srcpkgs/burp-server/template @@ -3,7 +3,7 @@ _desc="A network-based backup and restore program" pkgname=burp-server version=1.4.40 -revision=11 +revision=12 short_desc="${_desc} - Server" maintainer="Pierre Bourgin " license="AGPL-3.0-only, BSD-3-Clause, GPL-2.0-or-later" From f26bfb821a8badd5dda82d419cf490b215de17b4 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 2 Jul 2020 17:19:46 +0200 Subject: [PATCH 238/410] burp2-server: rebuild against libressl-3.1.3 --- srcpkgs/burp2-server/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/burp2-server/template b/srcpkgs/burp2-server/template index 729f07dccdb..9845f6afe9e 100644 --- a/srcpkgs/burp2-server/template +++ b/srcpkgs/burp2-server/template @@ -3,7 +3,7 @@ _desc="Network-based backup and restore program" pkgname=burp2-server version=2.2.18 -revision=2 +revision=3 wrksrc="burp-${version}" build_style=gnu-configure make_install_target=install-all From e325bf341622427af0657fe8451209798db9777d Mon Sep 17 00:00:00 2001 From: John Date: Thu, 2 Jul 2020 17:19:46 +0200 Subject: [PATCH 239/410] calibre: rebuild against libressl-3.1.3 --- srcpkgs/calibre/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template index 49b6a7286ef..1283d9cd819 100644 --- a/srcpkgs/calibre/template +++ b/srcpkgs/calibre/template @@ -1,7 +1,7 @@ # Template file for 'calibre' pkgname=calibre version=4.19.0 -revision=1 +revision=2 build_style=python2-module pycompile_dirs="/usr/lib/calibre/" hostmakedepends="pkg-config python-BeautifulSoup4 python-Pillow python-PyQt5-svg From 2aaea4597ef042931e1bb8f8d162bc92c3ce155c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Wed, 1 Jul 2020 19:54:22 +0200 Subject: [PATCH 240/410] qt5: get rid of EVP_CipherFinal warning If EVP_CipherFinal is used, libressl always prints a linker warning: /bin/ld: /usr/lib/libQt5Network.so: warning: EVP_CipherFinal is often misused, please use EVP_CipherFinal_ex and EVP_CIPHER_CTX_cleanup Extend the qtnetwork-5.15.0-libressl.patch to replace EVP_CipherFinal() with EVP_CipherFinal_ex(). [ci skip] --- .../patches/qtnetwork-5.15.0-libressl.patch | 42 +++++++++++++++++++ srcpkgs/qt5/template | 2 +- 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch b/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch index 6e19657e207..d7414f68dc5 100644 --- a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch +++ b/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch @@ -338,3 +338,45 @@ index f35e0ba2..30097317 100644 -- 2.25.0 +--- qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp 2020-05-11 10:15:08.000000000 +0200 ++++ qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp 2020-07-01 17:06:34.471202351 +0200 +@@ -264,7 +264,7 @@ + DEFINEFUNC5(int, EVP_CipherInit, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *type, type, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return) + DEFINEFUNC6(int, EVP_CipherInit_ex, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *cipher, cipher, ENGINE *impl, impl, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return) + DEFINEFUNC5(int, EVP_CipherUpdate, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, const unsigned char *in, in, int inl, inl, return 0, return) +-DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return) ++DEFINEFUNC3(int, EVP_CipherFinal_ex, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return) + DEFINEFUNC(const EVP_MD *, EVP_get_digestbyname, const char *name, name, return nullptr, return) + #ifndef OPENSSL_NO_DES + DEFINEFUNC(const EVP_CIPHER *, EVP_des_cbc, DUMMYARG, DUMMYARG, return nullptr, return) +@@ -962,7 +962,7 @@ + RESOLVEFUNC(EVP_CipherInit) + RESOLVEFUNC(EVP_CipherInit_ex) + RESOLVEFUNC(EVP_CipherUpdate) +- RESOLVEFUNC(EVP_CipherFinal) ++ RESOLVEFUNC(EVP_CipherFinal_ex) + RESOLVEFUNC(EVP_get_digestbyname) + #ifndef OPENSSL_NO_DES + RESOLVEFUNC(EVP_des_cbc) +--- qtbase/src/network/ssl/qsslkey_openssl.cpp 2020-05-11 10:15:08.000000000 +0200 ++++ qtbase/src/network/ssl/qsslkey_openssl.cpp 2020-07-01 17:58:44.674363835 +0200 +@@ -360,7 +360,7 @@ + q_EVP_CipherUpdate(ctx, + reinterpret_cast(output.data()), &len, + reinterpret_cast(data.constData()), data.size()); +- q_EVP_CipherFinal(ctx, ++ q_EVP_CipherFinal_ex(ctx, + reinterpret_cast(output.data()) + len, &i); + len += i; + +--- qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h 2020-07-01 18:00:20.748368792 +0200 ++++ qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h 2020-07-01 18:04:38.177382072 +0200 +@@ -429,7 +429,7 @@ + int q_EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, const unsigned char *key, const unsigned char *iv, int enc); + int q_EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc); + int q_EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl); +-int q_EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl); ++int q_EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl); + const EVP_MD *q_EVP_get_digestbyname(const char *name); + + #ifndef OPENSSL_NO_DES diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template index 4af424a3dd2..bbcac4460a3 100644 --- a/srcpkgs/qt5/template +++ b/srcpkgs/qt5/template @@ -1,7 +1,7 @@ # Template file for 'qt5' pkgname=qt5 version=5.15.0 -revision=1 +revision=2 wrksrc="qt-everywhere-src-${version}" build_style=meta hostmakedepends="cmake clang flex perl glib-devel pkg-config From d890f0d77dcf7da7c8dec79ce721e6b7c2044eed Mon Sep 17 00:00:00 2001 From: John Date: Thu, 2 Jul 2020 20:33:19 +0200 Subject: [PATCH 241/410] bacula-common: mark noross --- srcpkgs/bacula-common/template | 2 ++ 1 file changed, 2 insertions(+) diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template index 02c9bb07fcf..504583f406c 100644 --- a/srcpkgs/bacula-common/template +++ b/srcpkgs/bacula-common/template @@ -22,6 +22,8 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" fi +nocross="https://build.voidlinux.org/builders/armv6l_builder/builds/26660/steps/shell_3/logs/stdio" + post_install() { rm "${DESTDIR}/usr/bin/bacula" rm -rf "${DESTDIR}/usr/share/doc" From b125c401261594b11acd911a9c9558f717cbf6d9 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 2 Jul 2020 23:33:33 +0200 Subject: [PATCH 242/410] libssh2: rebuild against libressl-3.1.3 --- srcpkgs/libssh2/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libssh2/template b/srcpkgs/libssh2/template index d17d10180ad..e82591556f9 100644 --- a/srcpkgs/libssh2/template +++ b/srcpkgs/libssh2/template @@ -1,7 +1,7 @@ # Template file for 'libssh2' pkgname=libssh2 version=1.9.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-libssl-prefix=${XBPS_CROSS_BASE}/usr" makedepends="zlib-devel libressl-devel" From f71210f90e674a5bf19cdb04448fd5ce92e54600 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 00:12:49 +0200 Subject: [PATCH 243/410] rtmpdump: rebuild against libressl-3.1.3 --- srcpkgs/rtmpdump/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/rtmpdump/template b/srcpkgs/rtmpdump/template index 39171da0b77..eeeff44012e 100644 --- a/srcpkgs/rtmpdump/template +++ b/srcpkgs/rtmpdump/template @@ -1,7 +1,7 @@ # Template file for 'rtmpdump' pkgname=rtmpdump version=2.4.20161210 -revision=7 +revision=8 _patchlevel=${version##*.} create_wrksrc=yes makedepends="zlib-devel libressl-devel" From d4db658a7554f257a04631e668ef276d7190a0c3 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 00:16:22 +0200 Subject: [PATCH 244/410] gst-plugins-bad1: rebuild against libressl-3.1.3 --- srcpkgs/gst-plugins-bad1/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template index ef777ee712e..df1d5053c5f 100644 --- a/srcpkgs/gst-plugins-bad1/template +++ b/srcpkgs/gst-plugins-bad1/template @@ -1,7 +1,7 @@ # Template file for 'gst-plugins-bad1' pkgname=gst-plugins-bad1 version=1.16.2 -revision=8 +revision=9 wrksrc="${pkgname/1/}-${version}" build_helper="gir" build_style=meson From 873908c635f7adc662f5d8ec6d6f754b9d597316 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 00:16:34 +0200 Subject: [PATCH 245/410] angle-grinder: rebuild against libressl-3.1.3 --- srcpkgs/angle-grinder/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/angle-grinder/template b/srcpkgs/angle-grinder/template index 741794e78f9..d7921dea2da 100644 --- a/srcpkgs/angle-grinder/template +++ b/srcpkgs/angle-grinder/template @@ -1,7 +1,7 @@ # Template file for 'angle-grinder' pkgname=angle-grinder version=0.13.0 -revision=1 +revision=2 build_style=cargo hostmakedepends="pkg-config" makedepends="libressl-devel" @@ -13,6 +13,10 @@ distfiles="https://github.com/rcoh/angle-grinder/archive/v${version}.tar.gz" checksum=b257b9869f5350bc75754ecdd883341a7ede74bde05dd1e934dfd3b40d962d7c nocross="https://build.voidlinux.org/builders/aarch64_builder/builds/26343/steps/shell_3/logs/stdio" +pre_build() { + cargo update --package openssl-sys --precise 0.9.58 +} + post_install() { vlicense LICENSE } From 06c192506c54ceddb298a6df91b1387a68a6ec96 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 00:16:39 +0200 Subject: [PATCH 246/410] cbang: rebuild against libressl-3.1.3 --- srcpkgs/cbang/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cbang/template b/srcpkgs/cbang/template index a90fcf23fcf..eaf26bf648a 100644 --- a/srcpkgs/cbang/template +++ b/srcpkgs/cbang/template @@ -1,7 +1,7 @@ # Template file for 'cbang' pkgname=cbang version=1.5.1 -revision=1 +revision=2 build_style=scons make_build_args="sharedlib=1 staticlib=1" make_install_args="${make_build_args}" From 9e166bf5ec764ad924fd57623c4b83c7d48df814 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 00:16:43 +0200 Subject: [PATCH 247/410] chatterino2: rebuild against libressl-3.1.3 --- srcpkgs/chatterino2/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template index ca263b79909..53e41580dbc 100644 --- a/srcpkgs/chatterino2/template +++ b/srcpkgs/chatterino2/template @@ -1,7 +1,7 @@ # Template file for 'chatterino2' pkgname=chatterino2 version=2.1.7 -revision=3 +revision=4 _signals_commit=1c38746b05d9311e73c8c8acdfdc4d36c9c551be _settings_commit=4fe0ff9b0cb7b04f8017a63b38c40104430a4b66 _humanize_commit=13867379249c64cd44b9cd4c03f18c1a52d56587 From 49d8624cba0cd2b73c3514f4794bf478107fd93b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Thu, 2 Jul 2020 17:14:52 -0300 Subject: [PATCH 248/410] volumeicon: add libnotify patch. Changes to the configure.ac file required new build time dependencies as well. Closes: #23367 --- srcpkgs/volumeicon/patches/notify.patch | 22 ++++++++++++++++++++++ srcpkgs/volumeicon/template | 21 ++++++++++++++++++--- 2 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/volumeicon/patches/notify.patch diff --git a/srcpkgs/volumeicon/patches/notify.patch b/srcpkgs/volumeicon/patches/notify.patch new file mode 100644 index 00000000000..dbcf7f4d700 --- /dev/null +++ b/srcpkgs/volumeicon/patches/notify.patch @@ -0,0 +1,22 @@ +From 78a9c23775ebe12d3f3be93c0798144a6e732d90 Mon Sep 17 00:00:00 2001 +From: John Lindgren +Date: Wed, 30 Dec 2015 20:50:46 -0500 +Subject: [PATCH] Add missing space in NOTIFY_CFLAGS. + +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git configure.ac configure.ac +index 6ad78d5..c8b72bd 100644 +--- configure.ac ++++ configure.ac +@@ -86,7 +86,7 @@ fi + if test "x${notify}" = xyes; then + # Check for libnotify + PKG_CHECK_MODULES([NOTIFY], [libnotify >= 0.5.0]) +-NOTIFY_CFLAGS+="-DCOMPILEWITH_NOTIFY" ++NOTIFY_CFLAGS+=" -DCOMPILEWITH_NOTIFY" + AC_SUBST(NOTIFY_CFLAGS) + AC_SUBST(NOTIFY_LIBS) + fi diff --git a/srcpkgs/volumeicon/template b/srcpkgs/volumeicon/template index 95a0e78794d..bd79cabe1f3 100644 --- a/srcpkgs/volumeicon/template +++ b/srcpkgs/volumeicon/template @@ -1,14 +1,29 @@ # Template file for 'volumeicon' pkgname=volumeicon version=0.5.1 -revision=2 +revision=3 build_style=gnu-configure configure_args="--enable-notify" -hostmakedepends="pkg-config intltool" +hostmakedepends="pkg-config intltool automake glib-devel gettext-devel" makedepends="alsa-lib-devel libnotify-devel gtk+3-devel" short_desc="Lightweight volume control that sits in your systray" maintainer="Orphaned " -license="GPL-3" +license="GPL-3.0-only, ISC, MIT" homepage="http://softwarebakery.com/maato/volumeicon.html" distfiles="http://softwarebakery.com/maato/files/volumeicon/volumeicon-${version}.tar.gz" checksum=24b8c1d0a81d708b201ce6e67301fc175d65588d892d01859f667b8db8a05da0 + +post_patch() { + sed -ne '/Copyright/,/IN THE SOFTWARE/s/ [*] *//p' src/bind.c >LICENSE.MIT + sed -ne '/Copyright/,/OF THIS SOFTWARE/s/ [*] *//p' \ + src/alsa_volume_mapping.c >LICENSE.ISC +} + +pre_configure() { + autoreconf -fi +} + +post_install() { + vlicense LICENSE.MIT + vlicense LICENSE.ISC +} From 515dde4f6af1d61496aa37f76d7a41c3d23fbd35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Fri, 3 Jul 2020 05:04:31 +0200 Subject: [PATCH 249/410] icecat: update to 68.10.0 --- .../icecat/patches/musl-rust.configure.patch | 26 +++++++++++++++++++ srcpkgs/icecat/template | 5 ++-- 2 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/icecat/patches/musl-rust.configure.patch diff --git a/srcpkgs/icecat/patches/musl-rust.configure.patch b/srcpkgs/icecat/patches/musl-rust.configure.patch new file mode 100644 index 00000000000..d8f387136e0 --- /dev/null +++ b/srcpkgs/icecat/patches/musl-rust.configure.patch @@ -0,0 +1,26 @@ +--- build/moz.configure/rust.configure 2019-10-28 12:05:04.930404603 +0700 ++++ build/moz.configure/rust.configure 2019-10-28 12:09:42.742338957 +0700 +@@ -297,11 +297,20 @@ + suffix = 'hf' + else: + suffix = '' ++ ++ narrowed = [] + for p in prefixes: + for c in candidates: +- if c.rust_target.startswith('{}-'.format(p)) and \ +- c.rust_target.endswith(suffix): +- return c.rust_target ++ if c.rust_target.startswith('{}-'.format(p)): ++ narrowed.append(c.rust_target) ++ ++ for target in narrowed: ++ if target.endswith(host_or_target.raw_os): ++ return target ++ ++ for target in narrowed: ++ if target.endswith(suffix): ++ return target + + # See if we can narrow down on the exact alias + narrowed = [c for c in candidates if c.target.alias == host_or_target.alias] diff --git a/srcpkgs/icecat/template b/srcpkgs/icecat/template index 9bb3e5cfa0d..bc4e855005d 100644 --- a/srcpkgs/icecat/template +++ b/srcpkgs/icecat/template @@ -1,6 +1,6 @@ # Template file for 'icecat' pkgname=icecat -version=68.9.0 +version=68.10.0 revision=1 build_helper="rust" hostmakedepends="autoconf213 unzip zip pkg-config perl python yasm @@ -18,7 +18,7 @@ maintainer="Jürgen Buchmüller " license="MPL-1.1, GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://www.gnu.org/software/${pkgname}/" distfiles="https://distfiles.voidlinux.de/${pkgname}-${version}/${pkgname}-${version}-gnu1.tar.xz" -checksum=87d69b6726c4b0e3a816e8c583fcbe468192ee29321fd4bfa58fd46e9ae186e5 +checksum=b4dfc9644d64c1effa8f7721956274d071b897d1893b57f8b7bd7b749955f834 lib32disabled=yes build_options="alsa dbus gtk3 pulseaudio startup_notification sndio xscreensaver" @@ -26,7 +26,6 @@ build_options_default="alsa dbus gtk3 pulseaudio startup_notification sndio xscr case $XBPS_TARGET_MACHINE in armv[56]*) broken="required NEON extensions are not supported on armv[56]" ;; - armv7*) broken="https://build.voidlinux.org/builders/armv7l-musl_builder/builds/26095/steps/shell_3/logs/stdio" ;; ppc64*) ;; ppc*) broken="xptcall bitrot" ;; esac From 6262304bef42543c25c29c9afacdf5eab59586d4 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 11:00:05 +0200 Subject: [PATCH 250/410] clamav: rebuild against libressl-3.1.3 --- srcpkgs/clamav/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template index 192a6142d0c..d6b6c3826cb 100644 --- a/srcpkgs/clamav/template +++ b/srcpkgs/clamav/template @@ -1,7 +1,7 @@ # Template file for 'clamav' pkgname=clamav version=0.102.3 -revision=4 +revision=5 build_style=gnu-configure # XXX: system llvm is too new (< 3.7 required) # Shipped llvm does not build with gcc6 From 9140a2260e2f37a7de896443d78b94c4c85b484d Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 11:00:06 +0200 Subject: [PATCH 251/410] cloudfuse: rebuild against libressl-3.1.3 --- srcpkgs/cloudfuse/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cloudfuse/template b/srcpkgs/cloudfuse/template index 5240fd0c6b7..bcba5bba859 100644 --- a/srcpkgs/cloudfuse/template +++ b/srcpkgs/cloudfuse/template @@ -1,7 +1,7 @@ # Template file for 'cloudfuse' pkgname=cloudfuse version=1.0 -revision=3 +revision=4 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="libxml2-devel libcurl-devel fuse-devel" From 0e59ead69f5b27f77313dd3d45784209d64c0232 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 11:00:06 +0200 Subject: [PATCH 252/410] cmusfm: rebuild against libressl-3.1.3 --- srcpkgs/cmusfm/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cmusfm/template b/srcpkgs/cmusfm/template index 950a7575c26..6b5ac2bbee1 100644 --- a/srcpkgs/cmusfm/template +++ b/srcpkgs/cmusfm/template @@ -1,7 +1,7 @@ # Template file for 'cmusfm' pkgname=cmusfm version=0.3.3 -revision=4 +revision=5 build_style=gnu-configure configure_args="--enable-libnotify" hostmakedepends="automake pkg-config" From 270587cfeb4024bde5d4d9fc1779e6ec22229f50 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 11:00:06 +0200 Subject: [PATCH 253/410] coWPAtty: rebuild against libressl-3.1.3 --- srcpkgs/coWPAtty/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/coWPAtty/template b/srcpkgs/coWPAtty/template index 317ad862a8d..97f085ee607 100644 --- a/srcpkgs/coWPAtty/template +++ b/srcpkgs/coWPAtty/template @@ -2,7 +2,7 @@ pkgname=coWPAtty _pkgname=cowpatty version=4.8 -revision=2 +revision=3 wrksrc="${_pkgname}-${version}" build_style=gnu-makefile make_use_env=1 From e37f23bd4b4bf7e65f7005059c51f05929ffd80f Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 11:00:06 +0200 Subject: [PATCH 254/410] collectd: rebuild against libressl-3.1.3 --- srcpkgs/collectd/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template index 73c29bc2667..a88454aa4e8 100644 --- a/srcpkgs/collectd/template +++ b/srcpkgs/collectd/template @@ -1,7 +1,7 @@ # Template file for 'collectd' pkgname=collectd version=5.11.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl) $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt From ac5e53c0c28161fdacd98bd5ca798d5cdd5d79f0 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 11:00:06 +0200 Subject: [PATCH 255/410] coturn: rebuild against libressl-3.1.3 --- srcpkgs/coturn/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template index 540193574ae..5a11c168339 100644 --- a/srcpkgs/coturn/template +++ b/srcpkgs/coturn/template @@ -1,7 +1,7 @@ # Template file for 'coturn' pkgname=coturn version=4.5.1.1 -revision=3 +revision=4 build_style=gnu-configure conf_files="/etc/turnserver.conf" makedepends="libressl-devel libevent-devel hiredis-devel sqlite-devel From 1f57f547465d09cb325fc159193aaa57befbba2b Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 11:00:06 +0200 Subject: [PATCH 256/410] cyrus-sasl: rebuild against libressl-3.1.3 --- srcpkgs/cyrus-sasl/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template index 59e3030025b..6a8ca2516e3 100644 --- a/srcpkgs/cyrus-sasl/template +++ b/srcpkgs/cyrus-sasl/template @@ -1,7 +1,7 @@ # Template file for 'cyrus-sasl' pkgname=cyrus-sasl version=2.1.27 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-static --enable-shared --enable-checkapop --enable-cram --enable-digest --disable-otp --disable-srp From c4a84bf95d2e3cf736af8cc859d79f48cf5eaa8d Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 11:07:26 +0200 Subject: [PATCH 257/410] dillo: rebuild against libressl-3.1.3 --- srcpkgs/dillo/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/dillo/template b/srcpkgs/dillo/template index 9cf4c0dd86a..def56464ac2 100644 --- a/srcpkgs/dillo/template +++ b/srcpkgs/dillo/template @@ -1,7 +1,7 @@ # Template file for 'dillo' pkgname=dillo version=3.0.5 -revision=11 +revision=12 build_style=gnu-configure configure_args="--enable-ssl --enable-ipv6 --enable-threaded-dns" conf_files="/etc/dillo/dillorc From 65a39f616c2afb302c6afd836e949d505ff20023 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 11:07:26 +0200 Subject: [PATCH 258/410] dma: rebuild against libressl-3.1.3 --- srcpkgs/dma/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/dma/template b/srcpkgs/dma/template index a740882d8ed..91fa000a9bc 100644 --- a/srcpkgs/dma/template +++ b/srcpkgs/dma/template @@ -1,7 +1,7 @@ # Template file for 'dma' pkgname=dma version=0.13 -revision=1 +revision=2 conf_files="/etc/dma/*.conf" make_dirs="/var/spool/dma 2775 root mail" hostmakedepends="flex" From 19d811abcd0d4b2d9ebfa878322e885b89f36c2b Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 11:07:26 +0200 Subject: [PATCH 259/410] dmg2img: rebuild against libressl-3.1.3 --- srcpkgs/dmg2img/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/dmg2img/template b/srcpkgs/dmg2img/template index 549b1370298..72918f9e428 100644 --- a/srcpkgs/dmg2img/template +++ b/srcpkgs/dmg2img/template @@ -1,7 +1,7 @@ # Template file for 'dmg2img' pkgname=dmg2img version=1.6.7 -revision=3 +revision=4 build_style=gnu-makefile makedepends="zlib-devel bzip2-devel libressl-devel" short_desc="Convert Apple's compressed dmg to standard image disks" From df9f31b5a31958a089e368093cc66c347f674c84 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 11:07:26 +0200 Subject: [PATCH 260/410] dovecot: rebuild against libressl-3.1.3 --- srcpkgs/dovecot/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template index 80b77e2392f..81d9cb35003 100644 --- a/srcpkgs/dovecot/template +++ b/srcpkgs/dovecot/template @@ -2,7 +2,7 @@ # revbump dovecot-plugin-pigeonhole when updating dovecot! pkgname=dovecot version=2.3.10.1 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin --disable-static --with-pam --with-mysql --with-pgsql --with-lucene From cd1349f58a5f82a24efadf30c904e340ee2361ff Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 11:07:26 +0200 Subject: [PATCH 261/410] dpdk: rebuild against libressl-3.1.3 --- srcpkgs/dpdk/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/dpdk/template b/srcpkgs/dpdk/template index ac9e822ec72..0f3b5630b7b 100644 --- a/srcpkgs/dpdk/template +++ b/srcpkgs/dpdk/template @@ -1,7 +1,7 @@ # Template file for 'dpdk' pkgname=dpdk version=19.08 -revision=2 +revision=3 # no musl - uses error.h, execinfo.h and argp.h archs="x86_64 aarch64 ppc64le i686 armv7l" build_style=meson From d1d67260d03e618efa2c26dc9709fb7ab6c6c654 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 11:07:39 +0200 Subject: [PATCH 262/410] ecryptfs-utils: rebuild against libressl-3.1.3 --- srcpkgs/ecryptfs-utils/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ecryptfs-utils/template b/srcpkgs/ecryptfs-utils/template index 4384ed10870..8f80772d00f 100644 --- a/srcpkgs/ecryptfs-utils/template +++ b/srcpkgs/ecryptfs-utils/template @@ -1,7 +1,7 @@ # Template file for 'ecryptfs-utils' pkgname=ecryptfs-utils version=111 -revision=7 +revision=8 lib32disabled=yes build_style=gnu-configure configure_args="--sbindir=/usr/bin From dfc5985a08d3fc024d284bcc188e0a2387c92f7a Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 11:08:15 +0200 Subject: [PATCH 263/410] efl: rebuild against libressl-3.1.3 --- srcpkgs/efl/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template index 7c97d0e4894..caba1145ab3 100644 --- a/srcpkgs/efl/template +++ b/srcpkgs/efl/template @@ -1,7 +1,7 @@ # Template file for 'efl' pkgname=efl version=1.24.3 -revision=1 +revision=2 build_style=meson configure_args=" -Dembedded-lz4=false From a51d9c965a672dd786d4aa26ca418ec1a19ee76e Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 11:08:27 +0200 Subject: [PATCH 264/410] eggdrop: rebuild against libressl-3.1.3 --- srcpkgs/eggdrop/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/eggdrop/template b/srcpkgs/eggdrop/template index dd274acdb61..107bf00e429 100644 --- a/srcpkgs/eggdrop/template +++ b/srcpkgs/eggdrop/template @@ -1,7 +1,7 @@ # Template file for 'eggdrop' pkgname=eggdrop version=1.8.4 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="tcl-devel" makedepends="tcl-devel libressl-devel zlib-devel" From 0b7ef00d037fcf385d5982512d6d87a5429d018b Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 11:08:51 +0200 Subject: [PATCH 265/410] eid-mw: rebuild against libressl-3.1.3 --- srcpkgs/eid-mw/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/eid-mw/template b/srcpkgs/eid-mw/template index dff48d18ef1..6e36044d10b 100644 --- a/srcpkgs/eid-mw/template +++ b/srcpkgs/eid-mw/template @@ -1,7 +1,7 @@ # Template file for 'eid-mw' pkgname=eid-mw version=4.4.16 -revision=2 +revision=3 build_style=gnu-configure hostmakedepends="pkg-config automake gettext gettext-devel libtool glib-devel gdk-pixbuf-devel" From f2b80dbcd7b50e537b52f30b07ab92e7886147db Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 11:13:31 +0200 Subject: [PATCH 266/410] eiskaltdcpp-qt: rebuild against libressl-3.1.3 --- srcpkgs/eiskaltdcpp-qt/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/eiskaltdcpp-qt/template b/srcpkgs/eiskaltdcpp-qt/template index 8b346061f27..39e5a8ad398 100644 --- a/srcpkgs/eiskaltdcpp-qt/template +++ b/srcpkgs/eiskaltdcpp-qt/template @@ -1,7 +1,7 @@ # Template file for 'eiskaltdcpp-qt' pkgname=eiskaltdcpp-qt version=2.2.10 -revision=10 +revision=11 wrksrc="eiskaltdcpp-${version}" build_style=cmake configure_args="-DUSE_MINIUPNP=ON -DUSE_QT5=ON -DUSE_QT=OFF" From 9fde33e45aeaeb71119850d61df7fcdbbafeb13c Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 11:13:46 +0200 Subject: [PATCH 267/410] ejabberd: mark broken --- srcpkgs/ejabberd/template | 2 ++ 1 file changed, 2 insertions(+) diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template index 9baf450896d..7a00e1c55b4 100644 --- a/srcpkgs/ejabberd/template +++ b/srcpkgs/ejabberd/template @@ -20,6 +20,8 @@ checksum=2e7f2fd0d137099de6d137794881200a70c2e4be7de8221fc6389b886fc16519 build_options="sqlite" build_options_default="sqlite" +broken="Tries to link againt erl_interface-4.0, we only ship 3.13.2" + if [ "$CROSS_BUILD" ]; then makedepends+=" erlang" configure_args="--with-erlang=${XBPS_CROSS_BASE}/usr/lib/erlang/usr/include" From ebca4ccf78ff106692d939b6762f001d821305a3 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 11:14:22 +0200 Subject: [PATCH 268/410] elinks: rebuild against libressl-3.1.3 --- srcpkgs/elinks/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/elinks/template b/srcpkgs/elinks/template index d3b68af6783..e796d65c831 100644 --- a/srcpkgs/elinks/template +++ b/srcpkgs/elinks/template @@ -1,7 +1,7 @@ # Template file for 'elinks' pkgname=elinks version=0.12pre6 -revision=21 +revision=22 build_style=gnu-configure configure_args="--enable-true-color --enable-fastmem" hostmakedepends="automake libtool pkg-config" From d80b78fc01942d6cfcb380d8561f8c584212a0f0 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 11:14:46 +0200 Subject: [PATCH 269/410] encfs: rebuild against libressl-3.1.3 --- srcpkgs/encfs/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/encfs/template b/srcpkgs/encfs/template index 6c2d65618a0..36a4613197c 100644 --- a/srcpkgs/encfs/template +++ b/srcpkgs/encfs/template @@ -1,7 +1,7 @@ # Template file for 'encfs' pkgname=encfs version=1.9.5 -revision=3 +revision=4 build_style=cmake hostmakedepends="gettext pkg-config perl" makedepends="fuse-devel libressl-devel gettext-devel" From c700c70552941004b99a463e2fbd0f231a00a90c Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 11:32:15 +0200 Subject: [PATCH 270/410] erlang: rebuild against libressl-3.1.3 --- srcpkgs/erlang/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template index 1f432e00151..e3a37446390 100644 --- a/srcpkgs/erlang/template +++ b/srcpkgs/erlang/template @@ -1,7 +1,7 @@ # Template file for 'erlang' pkgname=erlang version=23.0.2 -revision=1 +revision=2 create_wrksrc=yes build_wrksrc="otp-OTP-${version}" build_style=gnu-configure From 3ed5300958c5c4fdd00918bbf2d9f7b798772c50 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 11:42:41 +0200 Subject: [PATCH 271/410] coturn: fix 32bit cross build --- srcpkgs/coturn/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template index 5a11c168339..614fd9c65b6 100644 --- a/srcpkgs/coturn/template +++ b/srcpkgs/coturn/template @@ -25,7 +25,8 @@ system_accounts="_coturn" post_install() { if [ "$CROSS_BUILD" ]; then - mv ${DESTDIR}/tmp ${DESTDIR}/usr + vmkdir usr + mv -v ${DESTDIR}/tmp/* ${DESTDIR}/usr fi vlicense LICENSE vsv coturnserver From 233c30caed287895f159b667f2daf8894eeaa679 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 11:52:57 +0200 Subject: [PATCH 272/410] bacula-common: fix cross patch --- srcpkgs/bacula-common/patches/fix-cross.patch | 4 ++-- srcpkgs/bacula-common/template | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/srcpkgs/bacula-common/patches/fix-cross.patch b/srcpkgs/bacula-common/patches/fix-cross.patch index 52c03d014f4..f7e6f861708 100644 --- a/srcpkgs/bacula-common/patches/fix-cross.patch +++ b/srcpkgs/bacula-common/patches/fix-cross.patch @@ -19,8 +19,8 @@ MYSQL_LIBDIR=/usr/local/lib fi MYSQL_BINDIR=/usr/local/bin -+ elif test -f ${XBPS_CROSS_BASE}/usr/include/mysql.h; then -+ MYSQL_INCDIR=${XBPS_CROSS_BASE}/usr/include ++ elif test -f ${XBPS_CROSS_BASE}/usr/include/mysql/mysql.h; then ++ MYSQL_INCDIR=${XBPS_CROSS_BASE}/usr/include/mysql + if test -f ${XBPS_CROSS_BASE}/usr/lib64/libmysqlclient_r.a \ + -o -f ${XBPS_CROSS_BASE}/usr/lib64/libmysqlclient_r.so; then + MYSQL_LIBDIR=${XBPS_CROSS_BASE}/usr/lib64 diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template index 504583f406c..02c9bb07fcf 100644 --- a/srcpkgs/bacula-common/template +++ b/srcpkgs/bacula-common/template @@ -22,8 +22,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" fi -nocross="https://build.voidlinux.org/builders/armv6l_builder/builds/26660/steps/shell_3/logs/stdio" - post_install() { rm "${DESTDIR}/usr/bin/bacula" rm -rf "${DESTDIR}/usr/share/doc" From fa68e7a8d0df2fe196a58acea5d7e4a57dd52e5f Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 14:29:53 +0200 Subject: [PATCH 273/410] efitools: rebuild against libressl-3.1.3 --- srcpkgs/efitools/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/efitools/template b/srcpkgs/efitools/template index 57e9948790f..f125ae41053 100644 --- a/srcpkgs/efitools/template +++ b/srcpkgs/efitools/template @@ -1,7 +1,7 @@ # Template file for 'efitools' pkgname=efitools version=1.9.2 -revision=3 +revision=4 archs="x86_64* i686* arm* aarch64*" build_style=gnu-makefile hostmakedepends="perl-File-Slurp" From 86f245d73fc7b7c588967902f9fc3c42b6f48aa3 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 14:29:53 +0200 Subject: [PATCH 274/410] ettercap: rebuild against libressl-3.1.3 --- srcpkgs/ettercap/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ettercap/template b/srcpkgs/ettercap/template index cbb7b64fe21..bf024b6fda2 100644 --- a/srcpkgs/ettercap/template +++ b/srcpkgs/ettercap/template @@ -1,7 +1,7 @@ # Template file for 'ettercap' pkgname=ettercap version=0.8.2 -revision=13 +revision=14 build_style=cmake configure_args="-DENABLE_GTK=OFF" hostmakedepends="flex" From 1b5e5a948a4fba9410e449134ccdcb94e3b8aab0 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 14:29:53 +0200 Subject: [PATCH 275/410] facter: rebuild against libressl-3.1.3 --- srcpkgs/facter/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/facter/template b/srcpkgs/facter/template index 7cd562e8f2f..18b1e1f566f 100644 --- a/srcpkgs/facter/template +++ b/srcpkgs/facter/template @@ -1,7 +1,7 @@ # Template file for 'facter' pkgname=facter version=3.14.11 -revision=1 +revision=2 build_style=cmake configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include -DENABLE_CXX_WERROR=OFF" From 49eea9bafa4027796d13c80354937362651aa743 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 14:29:53 +0200 Subject: [PATCH 276/410] falkon: rebuild against libressl-3.1.3 --- srcpkgs/falkon/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/falkon/template b/srcpkgs/falkon/template index 4b4a4e39a0c..6c9f1f201ad 100644 --- a/srcpkgs/falkon/template +++ b/srcpkgs/falkon/template @@ -1,7 +1,7 @@ # Template file for 'falkon' pkgname=falkon version=3.1.0 -revision=3 +revision=4 build_style=cmake hostmakedepends="extra-cmake-modules gettext pkg-config qt5-qmake qt5-host-tools python3 kcoreaddons" From 3990682c5d377a9ee22320f53a1c0aa85966510a Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 14:29:53 +0200 Subject: [PATCH 277/410] fdm: rebuild against libressl-3.1.3 --- srcpkgs/fdm/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/fdm/template b/srcpkgs/fdm/template index f086c0d8331..b79809683f9 100644 --- a/srcpkgs/fdm/template +++ b/srcpkgs/fdm/template @@ -1,7 +1,7 @@ # Template file for 'fdm' pkgname=fdm version=2.0 -revision=3 +revision=4 build_style=gnu-configure configure_args="ac_cv_func_strlcpy=no ac_cv_func_strlcat=no --enable-pcre" hostmakedepends="automake bison" From ff76eba316063de69c2bb6e50496bc730e9d13a1 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 14:30:06 +0200 Subject: [PATCH 278/410] fetchmail: rebuild against libressl-3.1.3 --- srcpkgs/fetchmail/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template index ef4016788ba..9ae908c9b22 100644 --- a/srcpkgs/fetchmail/template +++ b/srcpkgs/fetchmail/template @@ -1,7 +1,7 @@ # Template file for 'fetchmail' pkgname=fetchmail version=6.4.8 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr" hostmakedepends="python3" From 11bf25c9ef59b3e986687ac8601b6393cd8474c9 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 14:30:11 +0200 Subject: [PATCH 279/410] ffsend: rebuild against libressl-3.1.3 --- srcpkgs/ffsend/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/ffsend/template b/srcpkgs/ffsend/template index b35e0144caf..c2f33abd32d 100644 --- a/srcpkgs/ffsend/template +++ b/srcpkgs/ffsend/template @@ -1,7 +1,7 @@ # Template file for 'ffsend' pkgname=ffsend version=0.2.64 -revision=2 +revision=3 build_style=cargo hostmakedepends="pkg-config" makedepends="libressl-devel" @@ -16,3 +16,7 @@ post_extract() { # avoid ring dependency vsed -i 's,"crypto-ring","crypto-openssl",' Cargo.toml } + +pre_build() { + cargo update --package openssl-sys --precise 0.9.58 +} From a403efa3bc885311fad25f3a3e249c0df4da6b89 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 3 Jul 2020 14:50:07 +0200 Subject: [PATCH 280/410] k9s: update to 0.21.1. --- srcpkgs/k9s/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/k9s/template b/srcpkgs/k9s/template index 4209f84c27e..0a98959fda9 100644 --- a/srcpkgs/k9s/template +++ b/srcpkgs/k9s/template @@ -1,6 +1,6 @@ # Template file for 'k9s' pkgname=k9s -version=0.20.5 +version=0.21.1 revision=1 build_style=go go_import_path="github.com/derailed/k9s" @@ -10,4 +10,4 @@ maintainer="Leah Neukirchen " license="Apache-2.0" homepage="https://k9scli.io/" distfiles="https://github.com/derailed/k9s/archive/v${version}.tar.gz" -checksum=baaaa57482e9345245261eb14acaeb591acc0fced7c61fff6526c98f3a933b17 +checksum=d0cf926eb164b3e796c9481ead6f49dd559af27090f6f630ead15ef35e17870b From 6216a07fb55b7c0a3f5d4f282f80c3669631e4bd Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 3 Jul 2020 14:51:28 +0200 Subject: [PATCH 281/410] xaos: update to 4.1. --- srcpkgs/xaos/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xaos/template b/srcpkgs/xaos/template index f647f58d7b7..58cc3d49620 100644 --- a/srcpkgs/xaos/template +++ b/srcpkgs/xaos/template @@ -1,6 +1,6 @@ # Template file for 'xaos' pkgname=xaos -version=4.0 +version=4.1 revision=1 wrksrc="XaoS-release-${version}" build_style=qmake @@ -11,7 +11,7 @@ maintainer="Leah Neukirchen " license="GPL-2.0-or-later" homepage="https://xaos-project.github.io/" distfiles="https://github.com/xaos-project/XaoS/archive/release-${version}.tar.gz" -checksum=2d72b38a53d975bfdb4ed828125f8e7017f70761d4f06249c5630367522f8e6f +checksum=7e41e9fbdb73a7c02c853eb028943791fa9ca11120f39814eeae4cf66438e5bf pre_configure() { vsed -i i18n/i18n.pri -e'/updateqm.commands/ s;lrelease;lrelease-qt5;' From beaa6ea326b91264f6ee6545043963f2c5c0c4a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Fri, 3 Jul 2020 15:27:09 +0200 Subject: [PATCH 282/410] fdm: fix musl build --- srcpkgs/fdm/template | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/srcpkgs/fdm/template b/srcpkgs/fdm/template index b79809683f9..9523085603b 100644 --- a/srcpkgs/fdm/template +++ b/srcpkgs/fdm/template @@ -13,6 +13,10 @@ homepage="https://github.com/nicm/fdm" distfiles="https://github.com/nicm/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.gz" checksum=06b28cb6b792570bc61d7e29b13d2af46b92fea77e058b2b17e11e8f7ed0cea4 +if [ "$XBPS_TARGET_LIBC" = "musl" ]; then + makedepends+=" musl-legacy-compat" +fi + post_extract() { sed -i '$d' Makefile.am sed -i '$d' Makefile.am From 0ca207ccb6483ef213120a5d98acef785d880f08 Mon Sep 17 00:00:00 2001 From: mmnmnnmnmm <45293514+mmnmnnmnmm@users.noreply.github.com> Date: Fri, 3 Jul 2020 13:23:42 +0100 Subject: [PATCH 283/410] firefox-esr-i18n: update to 68.10.0 --- srcpkgs/firefox-esr-i18n/template | 188 +++++++++++++++--------------- 1 file changed, 94 insertions(+), 94 deletions(-) diff --git a/srcpkgs/firefox-esr-i18n/template b/srcpkgs/firefox-esr-i18n/template index fc7126449df..6d0d3813775 100644 --- a/srcpkgs/firefox-esr-i18n/template +++ b/srcpkgs/firefox-esr-i18n/template @@ -1,6 +1,6 @@ # Template file for 'firefox-esr-i18n' pkgname=firefox-esr-i18n -version=68.9.0 +version=68.10.0 revision=1 build_style=meta short_desc="Firefox ESR language packs" @@ -135,96 +135,96 @@ _pkgtmpl() { } } -checksum="7dc3f9966c171b877ce118d5e4a2338dde7bb01bd1f7026c9b3dc163fb32338c - ee8cb8df56affe0cf028944b734bdc209e705247e4a5a27d49ff6ac04856af05 - 69c61faac2078c7477c1f2cf3cf39371f43695a8ea9b71bc6f13602bc49d22d1 - 3d9dd82abdc7e76a679ebca562d03843183ac57850825be8aa9fb15847ed2b8e - 31e8941b1593b32a05defd174b2e4ea78817c7e368cecbb7beb0cc3cea56a11d - db5dbf4c68ef98c0a5bd5ebd257a8a6517f6b390f0f43947d3bbb6e4acdbdd6b - bf129294c789ecd5fd949e3376d6cf52a0a67d6efc12d78aec6de83c5589aaad - dcd21a3b46d59da5850c134f7bc253050db7a3b1b19ea148045b86c8caba1676 - cb0cfd6680a348cfcee6adcdc672633a58d95752c6cb6427cf49176b59da4283 - e20d73f4e3325f5a4f23639ea1ca737e8adf116f7af86f8620fc5fa60381550a - 64bf9830b6c4775a84ccdc2d65b803f37c916ca175fce89e37d37c483080f4de - 9b942d018350f51686570815cbf730d237924753e339fcb52b9dfcdb0455ffc5 - 711d70df1f0ae8e7db6eee5a7dded10ed3e3515b28babfff3bc85d4d569b964a - 7af49a3dd6569ae353f76a85d301b05ff5dcbedbc7625f1f2918032dea36e39a - 38efa252397163152b2faa9c78e4cc9091306c3f8dbaa1f7ea44ad6c93752d50 - 71884db2ff89774306d5495db3f6fe187321e17a2a76c71a0450d37860efb1c6 - bc4ca5f5769b0640a6664f04b02067dabc6372c5081d03393c74ca4c9a3f6fa5 - 4ca07243fc814b04e96e92e248142d918009f8cf90ab99aa08df4ffe684167fb - 6e24faf2deaf99a4bdc2290286dec74cf60f17c0d3411f9b6314420959c4cd67 - 8dcc767f285dddc4d29c512860587458f7894c665862a511b3d4604c386085b3 - 3f2b2707d27025718f2711bc7ad9c4fc5dfb3dc5f82355bcce678899a2b8b764 - af5eb0060e5d3bd2d11d31dc4f1bccee0d961f791cb0e517778287535df9b731 - 3cf1356294191737da8077877cbb46f7879c8530baeaa93ca756d953fc6a7054 - 7469eed1717aeff0b398251ef0ef7ad55e66110b7c5d2c098cd55ad6f70c9d3f - c0a807c1afa07cddf02c661f6bb3fd2e2eb44129939639dda397d82aedfdd7b2 - 3d6c9e7216dc66ed1bf9bbe05a6d3f1cacb79d87f0c8915f24b653dcc047037f - 738cf048a48a6bc5ecd7c4f76c742c8642abcdf10e8ef7502a4bb1f48382667c - f129f1cb2491f5f3c5e5dc356165ab603609e163cabc2f9515cd16a5e0b7bad9 - 732a499cfd664762be5cbfe0633f665f19660045674f8f64dc638ad338b91b8a - 0e06e2866281f28130ac7876c9145c96812541aea4607302a709217fa6195d00 - 577463f3f9837d516945bcfa7cc4f97a3676a4259aee262b89641c41e0ff65a6 - 2593ed5bb3e4d6f9c048c4b06400bf4393c8e208200e1c477b1f0d0bf16604b7 - 7f649305e8f4c57e49a14f27e05178bc0fd07559729e9a9baa06a03e193af372 - d6aab8db0c23aa129bb5a21b299576215b0f8c909bb259e6e836dd1118533765 - b8a7927eb4653e7af6e5a56f64ff0f6961ea859a475a4f54d96ea24641a7cbb0 - 6535383b547291cd41eb9ed756368308b0661b7ee5854639f862bb8019d78ab2 - d0f614f4bfce9455bafa10eaa244674926c397e3a645da3787358093ffcd421d - 988c6b508402c482e6164c474c77da4d93175e63d84012320e33911290cf94b4 - 0e1dfb5fbe7f6eaf7739e9616a7d52c2df04ec69b148487ad0a0a6709d887ddb - 525c8431ddc3907d91d2f96230940a98280dd9dae226c5a5afd6512e9ea7d377 - ebcd21681b8beec14357935650452bfae6d5ef4c6c48b94755bba27e3d068689 - 317b32356ac01a1477bbf5183b1185cba476462ae5e699e4cd2ef93ecd95342d - 620d57199507c8fcbb10c50ed655a2258b14e887f74165d1d610ece374e3a7c9 - 7bc71cf1209b983faaa3bdbd7da16f134a34a5ffaba11d18d294c73637ca3d88 - b7095b25f4b5273d18827d5278c5eee7899e7e65eb7161a3b748c63c54e720fa - 826886b248bafc0cdf6b846172e04bb24d74b750e0aaa4b38e635c84af54068c - 03a1ad8b30209a9cfbdfaf2d4307ca3b23f9365dea7f4d563854e6fcd0253f0c - 11310cba00c2fd041f195dd97d8071e53fe3831698b8c886ac274948d854c6e8 - a7c87693a552e87f54731b9f728eaf281f424028c3b96b820bdc718fb78adfaa - d9fc59fb9704722143deb8921fa2f145b42a960cd0756440f635419a04b42b6c - 8f8b13e59244df5c86cf11325fbbba2ceb94011aee459fd6bf2737ae520c1017 - 8f9c247cbb8ee42c45e0354b759138f607a95c406beac3b4ea9899576ef8cb2c - 05b93a1fc1904e524967ae598e59f7cdfc8d9977aafcb6488adcba92837dfb4e - e233f7a6a30c3e279bea87a395f6ced2d13666bb89734dedbe6f03f34e57f4aa - 28cf4b292f4867760f541b62188202020a191889cc9046a64661063b58af8f38 - 23431783f6003535b90c979bce3e1db1cf20c193f945c64b9030bbd7bb3cff15 - aa07376ec63b58b39551c25bd6d481079d912fc309dd39f8b926871dfad9b4a6 - af3d3fb944da306397df5a084280443c0b9a442b44116c43925d2debd2ad750f - 3def249d91ecccbd815738c927d148ef014250f83cb4bbc86bbcc85f75c0c78a - e7328a5cbb4b5b03c4a06d47ac6698862b661384b36912c59056cb6f524b675c - fefe80d125619a133c0bc3ad9d97edb3168d653914f6a44174f298e5a096924d - 3ce82a25df9a00d8cddc0578790bb407a2c4d08be23ab7306ce4217bd0e143c2 - 13767baee4900b8b4099e80917a8428fce0a411ef7d1de804a19a83a5d3f9ca1 - 3127a9dbc4bb5adcd1b89921accf9792194f542ed2586fdf5bd0fd87e6cc594a - 718c924b8cff5c6f6b9d14c59f0c5eda0aeb1b356140e387f68add8254a63c3d - 927db45ae8d5d6c0099e99ed72843a81a68c13ad817fb1b5cd2cb03ecfe61f23 - 7cd3afed275ca80aae49c20ca68a0fcefb33c41b5594487b1de048bb50b42180 - b8d408d2fde4c11a76defc6466ab62b6c29f6160cec97d3851387b61d9ce68a5 - f8465bfb27437ffcb46736874942afbbf863406f7e6b0b44219b484a22625891 - 861adbe3f866a4396123f57803f44c4c31dfe1bff1b318ad4c71b608a9d1c4ad - ed1d9272413441d9d5c1e53a2692e9f4eec2e85b99e078239531221ebd26f8c4 - 139559e718eb660d69e8157c9deb5a79522635f6d499a1b63795e08818eddf3d - 3c216cc281b169780eb7bb0a9f5901a869768bb2a2d0298d7ad7494a1342de73 - 4ee7ad5af7ccbb06286144147694248f88a8730e6a508485f386aeb82ca6ab0c - 1a96a508d28e7efba46d14ea6aa7c6915d44b8c1cb1039d4b4da00bd540405e6 - d823194b5fc4d953d19a22ab686577bd6dbce6a5d696da21a7072263fd0e21b8 - 554eb6daf88bea7ccc91e0be2cd962255614e9f9a78eff70d011968dc2616f0d - b894f45dde6558ac4ef22c89b940de433c0aa6f4b8004b5c2db7ee8aa9efc4d3 - 1d1017cb7fcbdbd8f90ed01eeaa84a46b1a980315fac06a0ff216a9f5b9edaaf - c61a33177bb75872578d23aae608519a1a1b8a91a6cb591724faafd3ce5dd73b - bb51fa320c894e9a07a30ef566e698a330caa203e2f49e60800f9edaffce9f57 - b25d13eedf48a5945be5215c44396b65c6ded17362b8e5363a8e415a581b054a - ffbe0cecea752110bd0bdc51401c64cd7dff38c1ba3a052cd0ac1ca505c498b6 - 0e09765a15e474473cce22089bff932245b0894a3b477fbee93d062b0ae91104 - 4888be8cef47b64a2355bf6c8b6351311583d857c2f5885560a3ed2536b1d4a1 - 30d1c6c816bbc74807f437765c7f1c6e97c9901e31b32ed482615a7ccb25b24c - 109fe912570ba3fabdd931bbcbe0f4a781165b185c2b2f83994e256a8b16f11c - 92b66fa7c60c55ae44633ba9dd8d306217779c922d5ff56f9d79434f5030278c - 626f22ddc7f84e123ed2bcd4249104b062132be0df05bf23419b24e9b61c6090 - 9e9463bbcad073aa69001ebc2b60727c0b84b2f5cbcc1f13e5cc7e4ba2658391 - 37a6279a337122b40c84f4e9aff7a36494f72bcd2eafed235650ae1810d91f36 - 75bb58e2cc7ff17182792280e5a19bb47bde3598363a0f3e1c0f9bde5feae529 - 2b843898604945a69900834369a709f0abc34f2e50021fc5e829b8d6bccd92be" +checksum="3f2ba9320f4909c96e4dd622f5e514c64ff38f37396f6e1a564d30d5e594cfd7 + 356c4b03bdeb0755b0f4da33db5f69262f6a23f6b24bf73b8cfba2ad153f40bd + 1aaca2b396708f610c4abbd8aa946f6ed801e2bf49c23378a23ac3eae035c50f + f63759f8e33cc55d724cd8f168a27278cef0cc9f70eab06bef1b0c35a7f03931 + 97e425102826f5ce01742d777f9cd945ea0466dbad95ee672e155ced83b064b3 + 1cf70c87d35978c9bca9bcfee8554e2cfe29b187d30a096b0f1fce13bb1273ff + ddb9721ee66f44feba0e8afd476321d21db0eace189c9768ff589f4242e3cd01 + a509f8e0715d484f7bbdcfb3b98558f6dd5ba3c5feade3e393abdd0f224fe8b5 + 4fd26ced6c3fd12d32e4606594c045fe3c1e9f3eeaef6ad3a8d145183ddfef92 + 66df49026e36b7978e8fb1dc1e717101caa58ddb2664dba582001309c3b828a2 + 909e817334bf0d2fa22e7a1cc658b681bf05cf7ee15f46be04b0f6628b994379 + 253d1380b7eb7e82788ae6af7f09f50cb04e2d3cfa8449918b68a0b8f080af78 + 1f77cbadc72be0fe86b17a6ae0b3b8e1e415a4999db435a026665f06b71d4fe2 + a430e741a5c05f18706cf7fbb90691129410728f04a94a6b3d419d8a8d705ffb + fe20000b081d4c0497472ea2ba36a89492e1134e493ed25205f2c74d051205cc + d4950b690f710fe3e61f09e6fbed8a9b52bfe483f099f7259ccd5ff1500f3908 + c0cd944eeade950be7d184bc5f5b5fc2e4967868166217a8682e9dc3cb52b9d1 + a7a24ec314b246670acf099309bf738e11851b01a37086f18da475005d87a73d + 73510c25c860c0a6d2f90775183c8d0d84025f01f8e2fcfad1ff5f1cf09f89f4 + dcc0fee2d8769c1912efd601196e664229305c99178ca0305c19e09654bc4b41 + b615fa3a7a836dd2f0361c682f159e95b3b6053175645246a2ebe9833d179da7 + 3edb426d061ed1d9c7daababbb0426832a2c4e2a27bd56d9325b53b720c5fb99 + 7919ad02865a7640d624739ebe27c267b3844b107a72345d272bb55d935e822a + 4e0ad13ebc3c602fb5317f32d1f5f057d628f719be62a6b406e3a38f681dc0f1 + bb8ee36f388a3259f0adc6c9900568680e1d378858d149636ed91d9cebe2676e + cbcf2fafc7c9f3f99efa6602564c0167a6ed7e3db39287abf7a5179eb2978b22 + 7f6c184fb68ac38ba8612af4f2c78e7741c7dc906e67b217a342316e6763825c + f46e7865dd4f4152e75256f65b6d96297c51b28a1fef79d41cbbe99227b30442 + a18aef681c207177fa2a884927a82c5a6924ed2943f1b3a9e4d3203d0165bd2b + a3e75715ff8b60eb60b45bae45682658a65daa63d11af97d6b73e2e66bd17706 + ca6ada663a3664e17ccf8cba08ba9af19112d2381152684da23433a3fac74a69 + b82fe910d834349e6bc560be6d3ebf7e13de4e6e690fa444a440f28d3bb18a52 + b5762753bbc0f89ad3009eec6a08309d81cc860d068a8ed83c0ccdc4c56326ca + 4c99c72790aad89a3d6551131b64ace67d15b4c406b6f082aca4a76c7abc05db + 73cbb74363164636eca5255c6b326deb6016116b3e21e5cd3caa60cc9c260eb8 + 0f84e705fceb45b42637521bf1f8f5490eaac35b6fb699b59e3708e481f1a6df + a8f6100c7011f34191281b9de62b1103c508a69974b80f8d26e1bedb593b4907 + 29e6268619f3f2a57d7d61e5777506fd256d9f766902375c074261c484771b64 + 1e66e975e73c77a029a2e4e4d7fa67f5c0c5fc0e720d4798762c5250dd3bf843 + 68e037e4c6db7b43342999acd9c4396d895aa95259300faeaf3e616e1f626bb8 + b4045ce9d42d518c47ca216f3bf4bcd630728d298ac92792b8e4b64173d69d43 + 1e45b89986fa2f0de6058190bf32468c31ae7c2891983f7d589b1d4e55c1536c + 6fd771ed16594792d91e82d979bfd0975eff9dd6f5b18aca785f4d24c9e3b736 + e1bf8f800f8c5520cf5d982a6616d74737dd573c330ff3316d1f148ee7c7259b + 541ad78f4c185666cc8fe3e9a3014aa9e89e8d36cc54a4e63891081dfd0fd300 + 50269984e3087c7df3709aa00a322c70245c56757263b0ea379a716ae3564440 + 1eeed1e21cbf59acb8f3fc707e5a6f2d603266f0f482954d26e0ef339f438d4e + 13b5e2b3728a7b9ccef953918797457f74193661f45c1953bce4c297b57fe92e + b5a291ab1c6e594a5d42616e4ef617d2c35fa21bfb68cf7b41131ac46373fb48 + cdbbf3a770f892bee345d2d09936ca2e372ede9a93eab241329959a0c91bffaa + 56a00f95d0dc5b9773a2a4bdd3f1c4f313cc72a4f9beb339c11847076d7c93e5 + 67eb0beb2b86701e33e6ae36fc5ce2061a8aa5b25434651cbc948fcf31835eb4 + b7ed3771bde06bf04d2751f78eb44c1bd8b2d07a9a4c26474d447e5e20643bae + c30f2b9f90aed0e5e08253849a4e1f8eacb851960d110cc6e607313eaf4e8cd7 + 2ade2e006c294c23e24f3dabec292eef8be284c8d398ea5b66a4eb4c28393623 + 8b5a0955701a4ff95bc219fc1e99a96cabb2cbea7948a72fa980590caa94a1b7 + 670086791fd6050c0835f749bd0da5909ab9e46826273ba059524d80cc15e8f4 + 5f7d526c9766df9c7514ee616d3f34907d1cfaba7fed4eac8df60ae7939c3b5c + d857454bf9e3e7d2c1ac84605786d1bc88afd21c88950d6bd104547029cc0b79 + 5db2b576e2bab4134fb0dd85257452025783c4d868e055faa84919befdac3a71 + 4e014daed9cb91bef0d835e50af23e75dae6645f50aa0c1e5163231c60de84a0 + 97c26f0b795d9a357aae122864f6cac7d3977dcc81fcc951da74a31d601f1f41 + 2ad72e0a82c5a9ff204ae0501a26823f898f8fc403f904a27f23e2111e36ed7b + cdfd6a44387f77359e5e5a9d3d0365e210014a37b5979d0268ff687099571dd1 + e52301792dc9b04a3a82e1599e05ab2a1a8424896fb6ab8289e5c5fdb4be7fe5 + 7c6bc07db83004c241c6ea355d4613fd7a2636d9012d273efa83fa4bb40dbd02 + b735b936df7d0d274d650dd5cb907cf00e545433b008a9be2b52f3cd426c7b6f + 73fa0631d5b31187442666d1323fc4b615270e1249fec38b3e3e421c55601bd8 + dd2eef3d44d44ec05f2dc3d09f29ab7309d25714f9befd76b618c571a7501fa3 + 8cbce1cccb2f3b0523a5ccf3da917c244b278ba529dba1faca68c24de54de8b3 + c265077b6961023dd6ad0d1af8a2676d0cfe461253b725d90c58817b089031b6 + a63bddf7297f8ca0736d2667d6a855e5ef87cfec8be56e660a0d66468de8ebc2 + 40ebfc5349c18959f0c3d7ad8ca72b8f2dc855b4f6494614fcfdd6e3f8c95370 + 83d2f5231378ff3035c3ceb75ac2afca79ccbf522836816d96dda26d728ca294 + 1e0edbcec59180be6a71d2a413012a3dc9f7dcedafdaba1212db91268d3e558d + 7145f8d3bf9db35a9cf7303925ce114db8c892c4aaa8a1f6b8faa522a73ce6a8 + 97bddf5e5d13a8a2e051b037ef109315f45560763546a91536a616e9b144b7bb + db789005a81b655bb6110d2bfe4ae68e58d1da536ed23cd150021bbcd54e37a9 + acafb7f340a28d8c4e25978a7673a6d4c2d1e01c0cb607fcca100520fdf69e5a + 676670bddd7a9d2e93b92e4e5b95f6987cf3666890ce462535b1f096e3be6044 + 281d9b0b8d357d7ea6f50b833ac130d52ecf9bcae46a7118a05c7826550320ea + 0c703243bd81cdc11e1e65c19bfb2aa19a62f5040b101d04a922f8ce6c98852a + 8a971c55300ea615b083eeb85c254b00a3b3c6a707c288ffb1e3a19de9f44e15 + 99f922ae3adf4a3d4b68e42e58e62ec9a2e6480cfb1bf57589541f7a128bbdca + 06c1859289dfbc7da249f793fcac7587b91abe309f767627dbc6fbe7f004d4bc + 01b62183ce512b1272894bdd10432bb4261593bba74c024643b3a14027ad3131 + 4a0eca11feee73b2027d8a7c14cc5f2b1b499230ec58609b543960a7f964d8d3 + c55342dc5303a79592c40aa4b2dae5a2ad69dae5b01f80c707a7280d0b7f520f + 312f0ea8c1b21772cbd39128c8b51c40457eaf02cc055bb1f095071860d73d7c + dee400420b646d142787678196fd04782fc4e355e576e71410118247df3065c0 + 7b70091975ebc64e3a7ea5d5aad2cf3be5388452df48a12ce6d8d41463c9f6fa + f4905c7984db6fffce05da3c69938aaab5d1691fcea9755291a882725fb3ce8f + 7c236ce3361e47cf0a6337cff008ed87114840b9681d9fca8e5e245ca631ac1b" From 1b20805ec740106bad23fce40a2c588e29e184a4 Mon Sep 17 00:00:00 2001 From: mmnmnnmnmm <45293514+mmnmnnmnmm@users.noreply.github.com> Date: Fri, 3 Jul 2020 13:24:13 +0100 Subject: [PATCH 284/410] firefox-esr: update to 68.10.0 [ci skip] --- srcpkgs/firefox-esr/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template index 6c2295476b6..5bc255f7de5 100644 --- a/srcpkgs/firefox-esr/template +++ b/srcpkgs/firefox-esr/template @@ -3,7 +3,7 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-esr-i18n". # pkgname=firefox-esr -version=68.9.0 +version=68.10.0 revision=1 wrksrc="firefox-${version}" build_helper="rust" @@ -12,7 +12,7 @@ maintainer="Orphaned " license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://www.mozilla.org/firefox/organizations/" distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz" -checksum=935105e1a8a97d64daffb372690e2b566b5f07641f01470929dbbc82d20d4407 +checksum=2ec8c2627e46e80fc208584966a2ded7a0a9ff76b55ffccec0623b89b98ded2b lib32disabled=yes hostmakedepends="autoconf213 unzip zip pkg-config perl python yasm From 26225b1b02626e3d31949f603b42d43c67f9bc74 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Wed, 1 Jul 2020 12:14:56 -0700 Subject: [PATCH 285/410] granite: update to 5.5.0. --- srcpkgs/granite/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/granite/template b/srcpkgs/granite/template index ba41c61daaf..2ae77d6ee66 100644 --- a/srcpkgs/granite/template +++ b/srcpkgs/granite/template @@ -1,6 +1,6 @@ # Template file for 'granite' pkgname=granite -version=5.4.0 +version=5.5.0 revision=1 build_style=meson build_helper="gir" @@ -12,7 +12,7 @@ maintainer="Cameron Nemo " license="LGPL-3.0-or-later" homepage="https://github.com/elementary/granite" distfiles="https://github.com/elementary/granite/archive/${version}.tar.gz" -checksum=8194031cac3b87d84a3fab9c30270485ce73f8b8ec23f26c9152b6859c8a18fd +checksum=0c376520c7d462fca05213a14970ee1075fea4a78062a33b47529e2647cd5557 granite-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" From e55f5286d3c1ba5f3f2abf7acf5fb37d7c64d004 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Wed, 1 Jul 2020 12:10:51 -0700 Subject: [PATCH 286/410] fuse-overlayfs: update to 1.1.2. --- srcpkgs/fuse-overlayfs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fuse-overlayfs/template b/srcpkgs/fuse-overlayfs/template index f4f4ae749f4..7c010091e67 100644 --- a/srcpkgs/fuse-overlayfs/template +++ b/srcpkgs/fuse-overlayfs/template @@ -1,6 +1,6 @@ # Template file for 'fuse-overlayfs' pkgname=fuse-overlayfs -version=1.1.1 +version=1.1.2 revision=1 build_style=gnu-configure hostmakedepends="autoconf automake pkg-config" @@ -10,7 +10,7 @@ maintainer="Cameron Nemo " license="GPL-3.0-or-later" homepage="https://github.com/containers/fuse-overlayfs" distfiles="https://github.com/containers/fuse-overlayfs/archive/v${version}.tar.gz" -checksum=9a1c4221a82059fd9686dd8b519d432bae126c08f9d891fb722bcb51ba4933ec +checksum=1c0fa67f806c44d5c51f4bce02fdcb546137a2688a8de76d93d07b79defc9cac pre_configure() { ./autogen.sh From 60d303688e0d9f5444713be51bb6eafcf32d61d3 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Fri, 3 Jul 2020 16:11:57 +0200 Subject: [PATCH 287/410] lowdown: update to 0.7.1. --- srcpkgs/lowdown/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/lowdown/template b/srcpkgs/lowdown/template index a8510de9587..fbbef29bff6 100644 --- a/srcpkgs/lowdown/template +++ b/srcpkgs/lowdown/template @@ -1,6 +1,6 @@ # Template file for 'lowdown' pkgname=lowdown -version=0.7.0 +version=0.7.1 revision=1 build_style=configure configure_args="PREFIX=/usr MANDIR=/usr/share/man" @@ -11,7 +11,7 @@ license="ISC" homepage="https://kristaps.bsd.lv/lowdown/" changelog="https://kristaps.bsd.lv/lowdown/archive.html" distfiles="https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz" -checksum=7fead8283b6db44ad7dcef1c1f01713fa59ef5603bca9e6bde7eb2adc742cd11 +checksum=02b48f90885cc2a8a375ef095da15954f2a2f3ece26bd6e13552b75906cd19e9 post_install() { vlicense LICENSE.md From c347395fa7f9a893c143cf8723ee636df82e713f Mon Sep 17 00:00:00 2001 From: Duncaen Date: Fri, 3 Jul 2020 16:18:53 +0200 Subject: [PATCH 288/410] giada: update to 0.16.3.1. --- srcpkgs/giada/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/giada/template b/srcpkgs/giada/template index ab44814983c..1e8714a6871 100644 --- a/srcpkgs/giada/template +++ b/srcpkgs/giada/template @@ -1,6 +1,6 @@ # Template file for 'giada' pkgname=giada -version=0.16.2.2 +version=0.16.3.1 revision=1 build_style=gnu-configure configure_args="--target=linux" @@ -13,7 +13,7 @@ maintainer="Duncaen " license="GPL-3.0-only" homepage="https://www.giadamusic.com/" distfiles="https://github.com/monocasual/giada/archive/v${version}.tar.gz" -checksum=0e6eac3ee5ef81177b3c7d1befe21c2ed1cb5efb448ae1d7d20701365ea27b4c +checksum=a2ee69e66bfb4504ce4f91e758315d42e6b83d7b8b0db2eb1d89ab245342f73c if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" From 823bb2c082cbee34d8d52300ca4d631952f4283d Mon Sep 17 00:00:00 2001 From: DirectorX Date: Thu, 2 Jul 2020 13:47:21 +0300 Subject: [PATCH 289/410] hydroxide: update to 0.2.15. --- srcpkgs/hydroxide/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/hydroxide/template b/srcpkgs/hydroxide/template index 60f3abeae04..5881bed511a 100644 --- a/srcpkgs/hydroxide/template +++ b/srcpkgs/hydroxide/template @@ -1,6 +1,6 @@ # Template file for 'hydroxide' pkgname=hydroxide -version=0.2.14 +version=0.2.15 revision=1 build_style=go go_import_path=github.com/emersion/hydroxide/cmd/hydroxide @@ -10,7 +10,7 @@ maintainer="DirectorX " license="MIT" homepage="https://github.com/emersion/hydroxide" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=2aad1c44a2eaf2d0cc859babc3be2042bf93f4ac5568f901ef2dd61fd776a445 +checksum=189d302daf207d21d8bea94fbb59fbfc9e26ef945e68f7c02228c936998862fc post_install() { vlicense LICENSE From 878a94074199113cf9a626cb5706770ea1c5b852 Mon Sep 17 00:00:00 2001 From: Sora Morimoto Date: Thu, 2 Jul 2020 03:15:19 +0900 Subject: [PATCH 290/410] delta: update to 0.2.0 --- srcpkgs/delta/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/delta/template b/srcpkgs/delta/template index bf0a29494a1..8ea7575edeb 100644 --- a/srcpkgs/delta/template +++ b/srcpkgs/delta/template @@ -1,6 +1,6 @@ # Template file for 'delta' pkgname=delta -version=0.1.1 +version=0.2.0 revision=1 build_style=cargo hostmakedepends="llvm clang" @@ -10,7 +10,7 @@ maintainer="Andrew Benson " license="MIT" homepage="https://github.com/dandavison/delta" distfiles="${homepage}/archive/${version}.tar.gz" -checksum=50519e97310b54ddb485635ac8e0984670d4ae64fc7fd4a5ed2b67cc6b77347f +checksum=c093d40e7a069572fc31407a39dcb6a77094acb5b52518691de6f8f0c21530de pre_build() { export CFLAGS_${RUST_BUILD//-/_}="${CFLAGS_host}" From fbce2f0d561cdfcaf26bd9e5fc9da5863d321e40 Mon Sep 17 00:00:00 2001 From: travankor Date: Mon, 27 Apr 2020 02:38:57 -0700 Subject: [PATCH 291/410] wpgtk: update to 6.1.3. --- srcpkgs/wpgtk/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/wpgtk/template b/srcpkgs/wpgtk/template index e9789f03f13..4692074cd04 100644 --- a/srcpkgs/wpgtk/template +++ b/srcpkgs/wpgtk/template @@ -1,14 +1,14 @@ # Template file for 'wpgtk' pkgname=wpgtk -version=6.1.0 +version=6.1.3 revision=1 archs=noarch build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-gobject python3-Pillow pywal libxslt" short_desc="Colorscheme, wallpaper and template manager for *nix" -maintainer="travankor " +maintainer="Orphaned " license="GPL-2.0-only" homepage="https://github.com/deviantfero/wpgtk/" distfiles="https://github.com/deviantfero/wpgtk/archive/${version}.tar.gz" -checksum=118f71a0030ff9d95297186aff14d98f0589dfd3bc592609aca9f89de83c87d1 +checksum=158f93c6dbb6f14c17fb43847a750e049a7a92a0c76fa54b9c0c5fee1012fcfe From d38b41d535a8e55ca90a3c2e987c35d76eb3f582 Mon Sep 17 00:00:00 2001 From: Anthony Iliopoulos Date: Tue, 16 Jun 2020 13:17:59 +0200 Subject: [PATCH 292/410] execline: update to 2.6.1.0. --- srcpkgs/execline/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/execline/template b/srcpkgs/execline/template index 25ea1b41628..2892bfcbef1 100644 --- a/srcpkgs/execline/template +++ b/srcpkgs/execline/template @@ -1,6 +1,6 @@ # Template file for 'execline' pkgname=execline -version=2.6.0.2 +version=2.6.1.0 revision=1 build_style=configure configure_args="--libdir=/usr/lib --bindir=/usr/bin @@ -13,7 +13,7 @@ license="ISC" homepage="https://skarnet.org/software/execline/" changelog="https://skarnet.org/software/execline/upgrade.html" distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=caf367be970af800a3fa5ca99e872dc85d5187b341a26675c5adf7cbe148af71 +checksum=a24c76f097ff44fe50b63b89bcde5d6ba9a481aecddbe88ee01b0e5a7b314556 CFLAGS="-fPIC" From 7f7626465a89f15269a10a36ec9faa675ce3a756 Mon Sep 17 00:00:00 2001 From: Anthony Iliopoulos Date: Tue, 16 Jun 2020 13:18:38 +0200 Subject: [PATCH 293/410] redis: update to 6.0.5. --- srcpkgs/redis/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/redis/template b/srcpkgs/redis/template index 24d271f62f8..27d3778b201 100644 --- a/srcpkgs/redis/template +++ b/srcpkgs/redis/template @@ -1,6 +1,6 @@ # Template file for 'redis' pkgname=redis -version=6.0.4 +version=6.0.5 revision=1 makedepends="jemalloc-devel libatomic-devel" checkdepends="tcl-devel procps-ng" @@ -10,7 +10,7 @@ license="BSD-3-Clause" homepage="https://redis.io" changelog="https://raw.githubusercontent.com/antirez/redis/5.0/00-RELEASENOTES" distfiles="http://download.redis.io/releases/${pkgname}-${version}.tar.gz" -checksum=3337005a1e0c3aa293c87c313467ea8ac11984921fab08807998ba765c9943de +checksum=42cf86a114d2a451b898fcda96acd4d01062a7dbaaad2801d9164a36f898f596 system_accounts="redis" redis_homedir="/var/lib/redis" From 12da40a33095e1efc34a190d5265c088de581a7f Mon Sep 17 00:00:00 2001 From: Piraty Date: Fri, 3 Jul 2020 16:37:02 +0200 Subject: [PATCH 294/410] dropbear: update to 2020.80. Closes: #22947 --- srcpkgs/dropbear/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/dropbear/template b/srcpkgs/dropbear/template index b5c90315097..ee99230b9e1 100644 --- a/srcpkgs/dropbear/template +++ b/srcpkgs/dropbear/template @@ -1,6 +1,6 @@ # Template file for 'dropbear' pkgname=dropbear -version=2019.78 +version=2020.80 revision=1 build_style=gnu-configure configure_args="--enable-zlib --disable-bundled-libtom" @@ -10,7 +10,7 @@ maintainer="Orphaned " license="MIT" homepage="https://matt.ucc.asn.au/dropbear/dropbear.html" distfiles="https://matt.ucc.asn.au/${pkgname}/releases/${pkgname}-${version}.tar.bz2" -checksum=525965971272270995364a0eb01f35180d793182e63dd0b0c3eb0292291644a4 +checksum=d927941b91f2da150b2033f1a88b6a47999bf0afb1493a73e9216cffdb5d7949 make_dirs="/etc/dropbear 0755 root root" post_install() { From 0a85f35531dcaa81251df84a219980fa5280902c Mon Sep 17 00:00:00 2001 From: Anthony Iliopoulos Date: Tue, 16 Jun 2020 13:12:25 +0200 Subject: [PATCH 295/410] bison: update to 3.6.4. --- srcpkgs/bison/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/bison/template b/srcpkgs/bison/template index 632cc81590c..bc60a9c7ef4 100644 --- a/srcpkgs/bison/template +++ b/srcpkgs/bison/template @@ -1,6 +1,6 @@ # Template file for 'bison' pkgname=bison -version=3.6.3 +version=3.6.4 revision=1 build_style=gnu-configure hostmakedepends="help2man perl m4" @@ -11,7 +11,7 @@ maintainer="Enno Boland " license="GPL-3.0-or-later" homepage="http://www.gnu.org/software/bison/bison.html" distfiles="${GNU_SITE}/bison/bison-${version}.tar.xz" -checksum=06db793651de9dd5f0a85a6fe4bdbca413c0806bf2432377523da96ca0b4b73d +checksum=8b13473b31ca7fcf65e5e8a74224368ffd5df19275602a9c9567ba393f18577d alternatives=" yacc:yacc:/usr/bin/bison-yacc yacc:yacc.1:/usr/share/man/man1/bison-yacc.1" From 03e4f6430c0cbd1f08108b2ddb484ae13eaa6ae9 Mon Sep 17 00:00:00 2001 From: Anthony Iliopoulos Date: Tue, 16 Jun 2020 13:32:48 +0200 Subject: [PATCH 296/410] swig: update to 4.0.2. --- srcpkgs/swig/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/swig/template b/srcpkgs/swig/template index 72d39cc0e5b..b42afc12663 100644 --- a/srcpkgs/swig/template +++ b/srcpkgs/swig/template @@ -1,6 +1,6 @@ # Template file for 'swig' pkgname=swig -version=4.0.1 +version=4.0.2 revision=1 build_style=gnu-configure configure_args="--with-pcre-prefix=${XBPS_CROSS_BASE}/usr" @@ -11,4 +11,4 @@ maintainer="Orphaned " license="GPL-3.0-or-later" homepage="http://www.swig.org" distfiles="${SOURCEFORGE_SITE}/swig/swig-${version}.tar.gz" -checksum=7a00b4d0d53ad97a14316135e2d702091cd5f193bb58bcfcd8bc59d41e7887a9 +checksum=d53be9730d8d58a16bf0cbd1f8ac0c0c3e1090573168bfa151b01eb47fa906fc From e309c1ee3c851a95d4d4a89e13ef1d28210a5088 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 15:01:35 +0200 Subject: [PATCH 297/410] fossil: rebuild against libressl-3.1.3 --- srcpkgs/fossil/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/fossil/template b/srcpkgs/fossil/template index 8998863e05d..715b2d4f8ec 100644 --- a/srcpkgs/fossil/template +++ b/srcpkgs/fossil/template @@ -1,7 +1,7 @@ # Template file for 'fossil' pkgname=fossil version=2.11.1 -revision=1 +revision=2 build_style=configure configure_args="--disable-internal-sqlite --prefix=/usr" hostmakedepends="tcl" From 0eadb6d0a794fbe2f4d4e04ba90806e5519670de Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 15:01:38 +0200 Subject: [PATCH 298/410] fractal: rebuild against libressl-3.1.3 --- srcpkgs/fractal/patches/fix-build.patch | 2 +- srcpkgs/fractal/template | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/fractal/patches/fix-build.patch b/srcpkgs/fractal/patches/fix-build.patch index eb2b0c1de46..dabe7f9a328 100644 --- a/srcpkgs/fractal/patches/fix-build.patch +++ b/srcpkgs/fractal/patches/fix-build.patch @@ -20,7 +20,7 @@ Some builds also fail with unused import. export CARGO_HOME="$CARGO_TARGET_DIR"/cargo-home export FRACTAL_PROFILE="$4" -+cargo update --manifest-path $1/Cargo.toml -p fractal-gtk --package openssl-sys --precise 0.9.53 ++cargo update --manifest-path $1/Cargo.toml -p fractal-gtk --package openssl-sys --precise 0.9.58 +cargo update --manifest-path $1/Cargo.toml -p fractal-gtk --package num-bigint --precise 0.2.3 + if [ "$FRACTAL_PROFILE" = "Devel" ] diff --git a/srcpkgs/fractal/template b/srcpkgs/fractal/template index 505c9455da5..4957b83a6b2 100644 --- a/srcpkgs/fractal/template +++ b/srcpkgs/fractal/template @@ -1,10 +1,10 @@ # Template file for 'fractal' pkgname=fractal version=4.2.2 -revision=1 +revision=2 build_style=meson build_helper="rust" -hostmakedepends="cargo pkg-config glib-devel" +hostmakedepends="cargo pkg-config glib-devel gettext" makedepends="gtk+3-devel libglib-devel libressl-devel gstreamer1-devel cairo-devel gettext-devel gst-plugins-base1-devel gst-plugins-bad1-devel gst1-editing-services-devel gtksourceview4-devel pango-devel gspell-devel From 8bee9f57c5ddc607fd956dda554d21e52eb56e4f Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 15:01:43 +0200 Subject: [PATCH 299/410] freshplayerplugin: rebuild against libressl-3.1.3 --- srcpkgs/freshplayerplugin/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template index b4f06c7f614..516778fecca 100644 --- a/srcpkgs/freshplayerplugin/template +++ b/srcpkgs/freshplayerplugin/template @@ -1,7 +1,7 @@ # Template file for 'freshplayerplugin' pkgname=freshplayerplugin version=0.3.9 -revision=5 +revision=6 build_style=cmake hostmakedepends="pkg-config ragel" makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel From 9b9fdb171163560f20a88fb83e3500ac6e5e4e0e Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 15:01:48 +0200 Subject: [PATCH 300/410] gambit: rebuild against libressl-3.1.3 --- srcpkgs/gambit/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gambit/template b/srcpkgs/gambit/template index fb3a382f47d..375c19cc284 100644 --- a/srcpkgs/gambit/template +++ b/srcpkgs/gambit/template @@ -1,7 +1,7 @@ # Template file for 'gambit' pkgname=gambit version=4.9.3 -revision=3 +revision=4 build_style=gnu-configure configure_args=" --libdir=/usr/lib/gambit --docdir=/usr/share/doc/gambit From d8ec20721b7f2da51018cad6e77b5bfd0bdd9591 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 15:01:51 +0200 Subject: [PATCH 301/410] gambit: rebuild against libressl-3.1.3 --- srcpkgs/gambit/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gambit/template b/srcpkgs/gambit/template index 375c19cc284..39c040ea37a 100644 --- a/srcpkgs/gambit/template +++ b/srcpkgs/gambit/template @@ -1,7 +1,7 @@ # Template file for 'gambit' pkgname=gambit version=4.9.3 -revision=4 +revision=5 build_style=gnu-configure configure_args=" --libdir=/usr/lib/gambit --docdir=/usr/share/doc/gambit From 0e1cd7072be1af171b96a7ec9f24b1bf559df815 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 15:02:27 +0200 Subject: [PATCH 302/410] gatling: rebuild against libressl-3.1.3 --- srcpkgs/gatling/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gatling/template b/srcpkgs/gatling/template index ea214a6edba..c34e3f8d811 100644 --- a/srcpkgs/gatling/template +++ b/srcpkgs/gatling/template @@ -1,7 +1,7 @@ # Template file for 'gatling' pkgname=gatling version=0.15 -revision=8 +revision=9 build_style=gnu-makefile makedepends="libowfat libressl-devel zlib-devel" short_desc="High performance web server" From d762f454a4c45c540da4ef5ec47ec9a45a355f14 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 18:41:19 +0200 Subject: [PATCH 303/410] git: rebuild against libressl-3.1.3 --- srcpkgs/git/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/git/template b/srcpkgs/git/template index b433fa41c33..9538d2f355e 100644 --- a/srcpkgs/git/template +++ b/srcpkgs/git/template @@ -1,7 +1,7 @@ # Template file for 'git' pkgname=git version=2.27.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-curl --with-expat --with-tcltk --with-libpcre2" hostmakedepends="asciidoc gettext perl pkg-config tar tk xmlto" From 058dfcc11d08a7d59396109e1952071242e8a42a Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 18:41:32 +0200 Subject: [PATCH 304/410] git-brws: rebuild against libressl-3.1.3 --- srcpkgs/git-brws/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/git-brws/template b/srcpkgs/git-brws/template index 5fb086e8f4c..b0229d7f5b5 100644 --- a/srcpkgs/git-brws/template +++ b/srcpkgs/git-brws/template @@ -1,7 +1,7 @@ # Template file for 'git-brws' pkgname=git-brws version=0.11.9 -revision=1 +revision=2 build_style=cargo hostmakedepends="pkg-config" makedepends="libressl-devel" @@ -12,6 +12,10 @@ homepage="https://rhysd.github.io/git-brws/" distfiles="https://github.com/rhysd/git-brws/archive/v${version}.tar.gz" checksum=1f90d55ecbc8c9d69af20cb5209bf359b1262b290b3e082fc8cd0b8c68653cb2 +pre_build() { + cargo update --package openssl-sys --precise 0.9.58 +} + post_install() { vlicense LICENSE.txt } From a13020e0f69bb66b4cd5624826357df86bf00927 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 18:41:45 +0200 Subject: [PATCH 305/410] git-crypt: rebuild against libressl-3.1.3 --- srcpkgs/git-crypt/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/git-crypt/template b/srcpkgs/git-crypt/template index f563c56e1c1..1c642ee7d45 100644 --- a/srcpkgs/git-crypt/template +++ b/srcpkgs/git-crypt/template @@ -1,7 +1,7 @@ # Template file for 'git-crypt' pkgname=git-crypt version=0.6.0 -revision=5 +revision=6 build_style=gnu-makefile make_use_env=yes makedepends="libressl-devel" From 9fcf3732d78681d20b9af1799f1cf99972f46e87 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 18:47:50 +0200 Subject: [PATCH 306/410] gftp: rebuild against libressl-3.1.3 --- srcpkgs/gftp/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gftp/template b/srcpkgs/gftp/template index 91f1da3a925..1ba37c8e51d 100644 --- a/srcpkgs/gftp/template +++ b/srcpkgs/gftp/template @@ -1,7 +1,7 @@ # Template file for 'gftp' pkgname=gftp version=2.0.19 -revision=6 +revision=7 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="gtk+-devel libressl-devel" From 4b5eb290431641fe1df04cb01c2a69d4da21e82e Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 18:49:47 +0200 Subject: [PATCH 307/410] getdns: rebuild against libressl-3.1.3 --- srcpkgs/getdns/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/getdns/template b/srcpkgs/getdns/template index 38a6cd23327..b0bb313b3af 100644 --- a/srcpkgs/getdns/template +++ b/srcpkgs/getdns/template @@ -1,7 +1,7 @@ # Template file for 'getdns' pkgname=getdns version=1.5.1 -revision=5 +revision=6 build_style=gnu-configure configure_args="--with-libev --with-libevent --with-libuv --with-ssl=${XBPS_CROSS_BASE}/usr" From d2e6ec4eb9227552fee7702d7542638b075a46f8 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 18:50:00 +0200 Subject: [PATCH 308/410] gerbil: rebuild against libressl-3.1.3 --- srcpkgs/gerbil/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gerbil/template b/srcpkgs/gerbil/template index 5bf1efa88c9..d5377b6b030 100644 --- a/srcpkgs/gerbil/template +++ b/srcpkgs/gerbil/template @@ -1,7 +1,7 @@ # Template file for 'gerbil' pkgname=gerbil version=0.16 -revision=1 +revision=2 hostmakedepends="gambit rsync" makedepends="libressl-devel sqlite-devel zlib-devel" short_desc="Opinionated dialect of Scheme designed for Systems Programming" From 08aeff0d06cf911d905538232a79afd646dd7c4d Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 18:50:21 +0200 Subject: [PATCH 309/410] gcsf: rebuild against libressl-3.1.3 --- srcpkgs/gcsf/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gcsf/template b/srcpkgs/gcsf/template index d23c160740d..7863437b8ef 100644 --- a/srcpkgs/gcsf/template +++ b/srcpkgs/gcsf/template @@ -1,7 +1,7 @@ # Template file for 'gcsf' pkgname=gcsf version=0.1.25 -revision=2 +revision=3 build_style=cargo hostmakedepends="pkg-config" makedepends="fuse-devel libressl-devel" @@ -17,7 +17,7 @@ case "$XBPS_TARGET_MACHINE" in esac pre_build() { - cargo update --package openssl-sys --precise 0.9.53 + cargo update --package openssl-sys --precise 0.9.58 cargo update --package openssl --precise 0.10.22 } From de372ffd68869ca5cb76444dfd3bbce02128489c Mon Sep 17 00:00:00 2001 From: bra1nwave Date: Fri, 3 Jul 2020 14:58:17 +0200 Subject: [PATCH 310/410] inxi: update to 3.1.04. --- srcpkgs/inxi/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/inxi/template b/srcpkgs/inxi/template index 84c5e915b0c..4126ef12968 100644 --- a/srcpkgs/inxi/template +++ b/srcpkgs/inxi/template @@ -1,6 +1,6 @@ # Template file for 'inxi' pkgname=inxi -version=3.1.03 +version=3.1.04 revision=1 archs=noarch wrksrc="inxi-${version}-1" @@ -12,7 +12,7 @@ license="GPL-3.0-or-later" homepage="https://smxi.org/docs/inxi.htm" changelog="https://raw.githubusercontent.com/smxi/inxi/master/inxi.changelog" distfiles="https://github.com/smxi/inxi/archive/${version}-1.tar.gz" -checksum=af6843ee886a95e7e35cec8ffb2877b9c9b7b11ed4e9a129fab66b07a536d2a9 +checksum=9661ee7120a5bdc5b7cd0b36a56aa18924283490e5430216d2ed8dc685cfc68c do_install() { vbin inxi From e4d95ae5cc536505e498c07ae3c59e77f7e7f6f9 Mon Sep 17 00:00:00 2001 From: Peter Bui Date: Thu, 2 Jul 2020 08:56:32 -0400 Subject: [PATCH 311/410] bitlbee-discord: update to 0.4.3. --- srcpkgs/bitlbee-discord/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/bitlbee-discord/template b/srcpkgs/bitlbee-discord/template index c508d6643fe..4fda22d1571 100644 --- a/srcpkgs/bitlbee-discord/template +++ b/srcpkgs/bitlbee-discord/template @@ -1,6 +1,6 @@ # Template file for 'bitlbee-discord' pkgname=bitlbee-discord -version=0.4.2 +version=0.4.3 revision=1 build_style=gnu-configure hostmakedepends="libtool automake pkg-config glib-devel" @@ -10,7 +10,7 @@ maintainer="Mikolaj Halber " license="GPL-2.0-or-later" homepage="https://github.com/sm00th/bitlbee-discord" distfiles="${homepage}/archive/$version.tar.gz" -checksum=de45b8bb05b513eb012e5a5992a87255de7cf2713bbe66d86457beb97a9b6c52 +checksum=cf6278e8e27a3b72f4b29be1d9952ae357db0f5cd97223595f76f6065f6d4701 pre_configure() { autoreconf -fi From 35b3bad48ada5ff7de6a04344ae9de4224a4b14b Mon Sep 17 00:00:00 2001 From: Lorem Date: Thu, 2 Jul 2020 13:35:56 +0530 Subject: [PATCH 312/410] foliate: update to 2.4.0. --- srcpkgs/foliate/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/foliate/template b/srcpkgs/foliate/template index c190d8d8667..b9c9295011c 100644 --- a/srcpkgs/foliate/template +++ b/srcpkgs/foliate/template @@ -1,6 +1,6 @@ # Template file for 'foliate' pkgname=foliate -version=2.3.0 +version=2.4.0 revision=1 archs=noarch build_style=meson @@ -12,7 +12,7 @@ maintainer="lorem " license="GPL-3.0-or-later" homepage="https://johnfactotum.github.io/foliate/" distfiles="https://github.com/johnfactotum/foliate/archive/${version}.tar.gz" -checksum=96f0eb3426300293242331a8a67fedf92b7cec46774512d19c691f42e06ce187 +checksum=71ec508c30747afcc3c51c2147dbf2738ccc38cb2e38dd20de6c1189042f0e53 python_version=3 post_install() { From 25cde869bc1b4f3146e5c458858ed11a456d1ffb Mon Sep 17 00:00:00 2001 From: Daniel Lewan Date: Thu, 2 Jul 2020 17:49:29 +0200 Subject: [PATCH 313/410] bashmount: update to 4.3.0. --- srcpkgs/bashmount/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/bashmount/template b/srcpkgs/bashmount/template index cdae52e3404..1c797678452 100644 --- a/srcpkgs/bashmount/template +++ b/srcpkgs/bashmount/template @@ -1,6 +1,6 @@ # Template file for 'bashmount' pkgname=bashmount -version=4.2.5 +version=4.3.0 revision=1 archs=noarch conf_files="/etc/$pkgname.conf" @@ -10,7 +10,7 @@ maintainer="Daniel Lewan " license="GPL-2.0-or-later" homepage="https://github.com/jamielinux/bashmount" distfiles="https://github.com/jamielinux/bashmount/archive/$version.tar.gz" -checksum=23e758b124320bf0f303f8366dd58fa4d4e1c2a972f9dfe3a82bc70dae674ed1 +checksum=e9facfa8b40c515b0f57f68804e5da08d7344432b4b0db4b704ce4f667c34873 do_install() { vbin $pkgname From 83712e36b660a534a7550645d1f3ca1c640a1dee Mon Sep 17 00:00:00 2001 From: bra1nwave Date: Fri, 3 Jul 2020 10:52:15 +0200 Subject: [PATCH 314/410] python-tqdm: update to 4.47.0. --- srcpkgs/python-tqdm/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python-tqdm/template b/srcpkgs/python-tqdm/template index 83487e8d8eb..82f6a436809 100644 --- a/srcpkgs/python-tqdm/template +++ b/srcpkgs/python-tqdm/template @@ -1,6 +1,6 @@ # Template file for 'python-tqdm' pkgname=python-tqdm -version=4.46.1 +version=4.47.0 revision=1 archs=noarch wrksrc="tqdm-${version}" @@ -12,7 +12,7 @@ maintainer="bra1nwave " license="MPL-2.0, MIT" homepage="https://tqdm.github.io/" distfiles="https://github.com/tqdm/tqdm/archive/v${version}.tar.gz" -checksum=f409cc40ebcc619c571ed5a8f62f5f6c7d9f1851240cb410c58a27320435591e +checksum=f45d4b766a0fbae4f93156d57a0b4e7aef510b2fd483b6a265ac6ff9e6cc0c4a alternatives=" tqdm:tqdm:/usr/bin/tqdm2 tqdm:tqdm.1:/usr/share/man/man1/tqdm2.1" From a646fb4d5146299fae9937d53cc63eaf4deed6a3 Mon Sep 17 00:00:00 2001 From: bra1nwave Date: Fri, 3 Jul 2020 14:47:03 +0200 Subject: [PATCH 315/410] gallery-dl: update to 1.14.2. --- srcpkgs/gallery-dl/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gallery-dl/template b/srcpkgs/gallery-dl/template index 6a582272b92..2a361f53274 100644 --- a/srcpkgs/gallery-dl/template +++ b/srcpkgs/gallery-dl/template @@ -1,6 +1,6 @@ # Template file for 'gallery-dl' pkgname=gallery-dl -version=1.14.1 +version=1.14.2 revision=1 archs=noarch build_style=python3-module @@ -13,7 +13,7 @@ license="GPL-2.0-or-later" homepage="https://github.com/mikf/gallery-dl" changelog="https://raw.githubusercontent.com/mikf/gallery-dl/master/CHANGELOG.md" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=a1cb56dec274a1a529872312a945a181e168fc4d5b05ea3934a0954b1f28397f +checksum=a3ab8df1d6ec8cac540139886b29c11d43b8ecd79365644720c6e99d6ee2950a do_check() { make test From 762fc0096e1358a68643ef14ec99f8f6b5c7623e Mon Sep 17 00:00:00 2001 From: David Flatz Date: Fri, 3 Jul 2020 17:25:09 +0200 Subject: [PATCH 316/410] synapse: update to 1.15.2. --- srcpkgs/synapse/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template index 1a02e86cda9..ae7c29848d5 100644 --- a/srcpkgs/synapse/template +++ b/srcpkgs/synapse/template @@ -1,6 +1,6 @@ # Template file for 'synapse' pkgname=synapse -version=1.15.1 +version=1.15.2 revision=1 archs=noarch build_style=python3-module @@ -19,7 +19,7 @@ maintainer="Pete " license="Apache-2.0" homepage="https://github.com/matrix-org/synapse" distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz" -checksum=5ed1fd9f5ca5e5bb087accf685835bc3fe5e4b13e43b16c38233c420ae1b65fc +checksum=15c198c296159730f9e5bc2e777ce94892b1ad93da0d101613e957792a76ea17 system_accounts="synapse" synapse_homedir="/var/lib/synapse" From 618f43cd5de6d28d477760a584f652906dbfefc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alu=C3=ADsio=20Augusto=20Silva=20Gon=C3=A7alves?= Date: Fri, 12 Jun 2020 04:23:16 -0300 Subject: [PATCH 317/410] beancount: update to 2.3.0. --- srcpkgs/beancount/template | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/srcpkgs/beancount/template b/srcpkgs/beancount/template index 0ba68fc8f4e..37104579030 100644 --- a/srcpkgs/beancount/template +++ b/srcpkgs/beancount/template @@ -1,9 +1,8 @@ # Template file for 'beancount' pkgname=beancount -version=2.2.3 -revision=2 +version=2.3.0 +revision=1 build_style=python3-module -pycompile_module="beancount" hostmakedepends="python3-setuptools" makedepends="python3-devel" depends="python3-pytest python3-dateutil python3-ply python3-bottle python3-lxml @@ -14,4 +13,4 @@ maintainer="Aluísio Augusto Silva Gonçalves " license="GPL-2.0-only" homepage="http://furius.ca/beancount/" distfiles="${PYPI_SITE}/b/beancount/beancount-${version}.tar.gz" -checksum=1554adfd773d12cb88fd7f4da67fcb608665a9bdedc7e44834e059d1b3a08e5d +checksum=9a6d9692435007195aae29a20328fb11d0126ff03db66322a79a894b1f422712 From 344c0c8bc9b18ea19c31d6c5a394f736614a8e16 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Fri, 3 Jul 2020 20:52:54 +0200 Subject: [PATCH 318/410] libvirt: update to 6.5.0. --- srcpkgs/libvirt/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template index 5ab50827e27..53c90d9f1b0 100644 --- a/srcpkgs/libvirt/template +++ b/srcpkgs/libvirt/template @@ -1,6 +1,6 @@ # Template file for 'libvirt' pkgname=libvirt -version=6.4.0 +version=6.5.0 revision=1 build_wrksrc="build" build_style=gnu-configure @@ -15,7 +15,7 @@ license="LGPL-2.1-or-later" homepage="https://libvirt.org" changelog="https://libvirt.org/news.html" distfiles="https://libvirt.org/sources/${pkgname}-${version}.tar.xz" -checksum=586ebcf220369d08a07c6cc17035e8a91bb3741e4300199459904e9e02478be7 +checksum=4915d9eab299ed79288d7598b717c587156708c05f701fe55a72293f32eb3182 # FIX https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701649 system_accounts="libvirt" From 3aaedc982792b195c214144374a88c45a9859fc6 Mon Sep 17 00:00:00 2001 From: mmnmnnmnmm <45293514+mmnmnnmnmm@users.noreply.github.com> Date: Fri, 3 Jul 2020 17:39:00 +0100 Subject: [PATCH 319/410] thunderbird-i18n: update to 68.10.0 --- srcpkgs/thunderbird-i18n/template | 112 +++++++++++++++--------------- 1 file changed, 56 insertions(+), 56 deletions(-) diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template index 22e8a29a367..c50c08a36fb 100644 --- a/srcpkgs/thunderbird-i18n/template +++ b/srcpkgs/thunderbird-i18n/template @@ -1,6 +1,6 @@ # Template file for 'thunderbird-i18n' pkgname=thunderbird-i18n -version=68.9.0 +version=68.10.0 revision=1 build_style=meta short_desc="Thunderbird language packs" @@ -96,58 +96,58 @@ _pkgtmpl() { } } -checksum="27700ccbae6d7c5ca121f5e51f6eb90c5aeb22f598f94461687fd6bdbe1109ca - 29451262471180ce063634739abdd2665ebf0358d9d5ccbddd03cf9742f7f98b - 2bf9909e18717df0c09b7265b254babe45ba3cd4583f9b313085781d86ee1f19 - 700d87d8a2d5aed601b75a846a77194b5581f5cd61c734b1b3c3525aad05b789 - 176ef493916b240462940007fea56b0507b2434a53006e5acae2dcce13dde9f9 - 9c67ab56b8815fd089136d2349c2ffcd95dd8c74a606a7be0a8666afd51bdc23 - 936bf7713e02c3ad301f062256b3d646b9c4b055501273dbc7bcd66172f3479b - 29145303e64d4c101115ae1dc3ce3e6ead107b9e9a37b5df6d680a45dfe841dc - b7af892656650d84640720eb748153c757c66ecb974a97b15610587e66c6e0d3 - a83775d002850a99d47698b9457ea2faad111b4dc3500817adbbfe8ef5857ffa - b0643e890c89db1422e9ebaa331b26c7d87eb822e8060fcc9627123d4f02e86e - f0d5b08c5706974552cf55cc92262222513f409036739eb77fa8b2ed0d0b4e68 - b82c08415c9e394d5793af99d60b7792a30ba51769e3b939377f36b91d8d7d3d - 1a7ecb847dd418b880347aceead59b5f47654fc991f6abc20dfcb941ef6efa7f - 37281cff7baa7d497900e8ecc6329a2a8e58540155c98153a618dfab0f726e79 - 5fb111a704d6a2032d71ab095f749797f13658ad818f5c9e68bb836ccc5ed071 - 348fda0bca35459e9875b3100445ffaf91d32911ef5c23462696fb9981684267 - 6340e919a9a59addf334087193f92a4376f12ceaa2d9f0759ebc8dcfd2901815 - b5b2d043b41fa4350393a6237044f3e81edaf48f3634b19b7acde90587c52b98 - d3dab0bdc8a58c768828ebfc6785b94a43fdbb99ce0dc2f47e88448d6526c557 - 28efe84ef26d50378c66f5446e6886714402446cb14fb5cff95edec1e02c83da - 7f303acfc7302bd0349fc109da2b57dc367c263b52bd922ed16a61bbaeced466 - 42df9712fb85590fac4c6352749f4f9c0c63778792b04e12a482a920e6092efc - f64c08f8c32c2dc6c8ec828d02340b62d1a5b8562b61931ed0d6c196bcfa8168 - 9fdfe16fb112cb474d5015444333b9c6aa8453cae09c1c1b971b89e39d9c2d90 - 13a25a7732e2de93f1fd3b1615b9472e1f279c412efb75d4eb4bc488961d065d - 3acc691110e1311aeb7644d628231e3392381b8675d2e8135ef35f1bba31f2c0 - 46b06020d4de61c7525f2420958b053dd937e7ea534c1e9fe04e5772acf7493c - fc742e6d2548df141648e11f8c93f1a139253cf55488b36f8adfcade2328a9db - bbad3d2c6b76cdf3700d79593e45efd8a5de6577f4278cf0a4c9b189636e2108 - 0984b1100fc12637836f00e293911dae6db3cfc6d2109a5ac9b90d0f1421d9d3 - 2fb56d0f60b52ffebee5e27e1039512f749086d0324429d9b8147f7c885748c2 - df7af63f5833c624ceda447bce546655a6f8d95605833a35840e2b84e4346d68 - 131ec860a20971f97005e66f5bdbbdd2440fd29b1ed1b556e70ffd55efd17dd1 - 2cc004b2c18898d559c983269f84efd48bce5f5403b142121eeb3c11cd42e9ff - a92567e64a631a1263a0b3e07e2c76f2402b38113a3714b70ea665058e39d3ae - 521855bb42c3bcb464e9723d812cd44b28b70c7eeaa91b4ac27ca59bf7d19a60 - fe4729fbe49e9b629eacdb6680520dafe969d87a3eaccf08377117b5f8d54038 - de2c28dba418a5bdfa8bef22306c11aeca98ff560d6685eebbb759b7351dce6b - a0a75ef17432549b7ac86b86dffb7eeea7ccebf4292c191e1928353069333aac - 316bdb5e905292246c6389cbeb71c624ff17959ac00268b9167163f5063e3f4f - d22ef926005e969b2e11750538d6b10d8e569418790bdebf4e55e7250826af69 - b7b3e8dcafcf3f3e94545a7c4d4bfe4120e155dcee6a7d4ebd3dc1a3f6f3d6cf - 892d5fbc2c17e1acd2b5fded60cdaca45e3ca5f2d0e5779dd4efcfd8105e7238 - f85e36771d8a41bb9128f8a0b6a268d6f124782289760a17ffd1210263a741aa - 06448f9a1e1f2517eea3105c04634c7ff62719384191a86fc8aa1da6ef63372f - 7a735063fa15bc9c0f75c47ddb4b33cd49d5de72da60773f14451695397b51a1 - 55bfd7b8151e6bbab78d236fdc61cf31f2bf742b6fc207013fff45e6eea73fa1 - 83ee8e0802b2f129e82abb6a6d7fbdd4fbc9cedc0a75cd5fe9795a031ba20d81 - 2cfb33f4fe2c7e534f503c294f6f3477966f325011362a3e46b5515d61d7f12d - 569b4923a66c84e113ded36071d2ad81362d265b658b8af5ce00f81d0dd9cd85 - 940aca80b7f4eb04604207b3b0af301835776947551c32f838ed2946e9e88f5d - a7727455a84e84efc3fbcb33510ce9550148602f3f71cf8fccf5cebab19baa0b - 6bc3d399224ee52417fd2c54eda69f99e24e76bbfa5edbcded5297d10c04167f - adca8809af4859a795de4a4a76171b4224104e6c766669697ec9496948f7c261" +checksum="709f70baf3c40898eb756532d30fe1349644c9506246fb165e0671931441b9db + 6afab3506d837a333013d4f91fdddb34fa965e315c51f94963e13497beb0f986 + c4bce091be5319bcd1e9778be4e2d1ead606641ff13c32a38286c8060d2b8c19 + 5ed49402525f50f4ca65e2efcb86a579e1ae1f9cf46df7c6383007be355cfc1e + 85d72d143cdf253245b9c541976ea537f2fb2491bdf98dfca7f0e54f45cc2ebd + 7fb19aa6a3553dd10dd2aa9b9e63cc2cab5cf437f3ffc6de340bd0bcc62b40d7 + 7353abfe8d887c9409fa67da63ee37beb30b4878ca45b202d00cc8a71619c5b1 + 7de84cf98ad09ac18d88e38633f40aee82d9f8baabf22c889c92a2f1e4c6bedb + 908e2c54110553377d35747cf7aa6820233157fa13a9ec159e92e7924dd83282 + ee2f839709a94ff54d15943bff24a9e8a6f040534859e7db0af5be01ed4cee26 + 4f32e4925e0c63ba996be7cd506460225757d0dfc59623fc72d69f3a0012a516 + 06847dc045c3384b0501f0ebc4edb13da44097d3656a7c51ce8984b5f800b49e + b59f067fd285f3b1b327f29cfbda759e8ed99b9ce8cce028c32e5f27cd53425b + d0856747e23cc6bf0938430730ecc5490be15f0a1cbe573fdc757c86c1d23e17 + 0b0fab697f75fc2748befb8a8856f3c79529cf7f1f769a1b1b8b74d58f050594 + 714f4112b30383bb1e3389b42b1da8fc47ad2bba53eacd40ecafd71a27e81745 + d0fcf8d65df1feec06897747caf6e250634ae1a973e1c3ed281758b82367e8eb + cab7cf42d2e374bb16c46d6987d2a17465b0e06e2ec23201d023cbc4e00d1f8e + a77f7fa009e11666c31193a0a4ea8910aee89ef3b10226152b23c086130ffc5d + e378810b13548baceeebced1ee60af37cd7999491b12819403a768de376c8c98 + c00c9f5e8566f61c2f9f02fc5cb3ba338f9782a10a74515a13a34f9b75d8f0d8 + 9fe0dd389902362b343b34ac973d05c9716a330b495084bbad408586f37affa6 + bac3abd761b4ffcda0fcc9abb8cf8f975db4106f96c5fee440963c9e86dc6dae + 9608caf3deba64e07c1f0e8978ee39863d7d6de91e22ee90b4b3ee49c5f28892 + e26e504ddfeb29b9536b8d191db6d9839ad52cf1a72b2789236ddac5af654766 + f01bed8dd40d38fb316d7918125027662341d8b0e4f566037b41c16f67696905 + 58b7d8b7348b66892cbf8f8277deb48bdcdb287e42188fd0295e22316d20c27d + cc79d0bbccfbe73ac86bcf0565302def6bd80fb6e9ae3e051d99d50d8866e6a0 + b1d1789ef68af1df8eae432f65dc63c5121782832383b9242fb0ef9d307fbeed + b4eef48fa4074e39d8f6b9da3709d18965eb6448f2245f27a8463746bfd0bd13 + 3bafbe37de82de4f51bd55d89d7d4fd49923644fa77a113de1bb9f71b300c782 + ba4672d3f6470892fcd02e8b1e75d67028a66872ba69ba373ec6481aded01f5d + 795d1fc525a91f406ab304c25adce32f8749b1c994a215e910c5d777cc3f4e26 + e7fbc84f967d74fc67033582452ded49182759fbb9d414420fc8ed78930aad33 + 322db1e4f4d54fcf43e965ab664afb4f2a530811443a1a5d6bcfa6b25cc137b4 + ad272efe203ccab630f18c5611082f3f5b7b816ea7ff30e0113e520a3abc6cee + 421b4573d77378d5e6b84dd66e2bac8cc73caf5c5c208e9beea636d7885b7277 + c337892d41955e7f7e31cbc8e4566cbd1905d657073044a09eba41fb071733bb + 71e3262f0e8374c367ad1e8defabc6375d342a6bedbe162456a175e8dc4bec45 + 476629477ff1118177de3e91286fcc85476d6bb5056b39721a324a5c259f1928 + 34feff2bbd6c38d2d33268b2ac8cf5d16fdf99df03d61e476b31ffafda7c2519 + c15cef46ba00298fdfd71811a49df4841a3fd8441651839e00024c45c03633be + de6574c879312c80a466cd146f803118f781c81c366ebddef2c4782f47e876ff + d8b5b044934a2fcd4914b388b933ee0c7f9085b828a702f010f6aea360dedc89 + a8855c24ebd0b2dd5ff34ac5d50efce72f0cd5fd022ae507bcaac518e13acff4 + b5c22a80f34b2b9014f1b453767c69ff7d42a2fe072cc3a7cb69590e2be544f7 + 048ed53d45c7fe7327f74c1fcede709354570ba7649ee361232dc7b9762eff26 + 874e3fea9b45f350167f7b792d6c3c2c7ebdfec89e243a284556c3f46616ade0 + 772fa4e8c8863e77f7b371ce271d3a092566f82cda9cec84f87e58a6e1377479 + 4e1c67e09c148ee9044bd7ab0776f634cdbd6c8db753d702bd0dbe3defe947af + d3511f5f5c4a070c0550ec64d1b0e07a214406f48e2529b6068a7347e3547904 + d5d383e4b0213e77ff41249753a39d8c8b31023c37c25e4b594ed09ba9d003f8 + 295b114543d0d1b198a0ce1aa856f9aeb7b031b3bedf68de5c121b8f5cdeeb38 + db5ca4999c8f6b2a9f58520c40bb0950ee5a153cea9f3ff02b2b8b0fbcf0fc12 + 1476e612f96c9d40c26896b8785355cc6ea40744024e50f31c6a1bd1bea10b87" From 097e6b1caf5192842f42a3e4d60763e219e4152d Mon Sep 17 00:00:00 2001 From: mmnmnnmnmm <45293514+mmnmnnmnmm@users.noreply.github.com> Date: Fri, 3 Jul 2020 17:39:20 +0100 Subject: [PATCH 320/410] thunderbird: update to 68.10.0 [ci skip] --- srcpkgs/thunderbird/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template index 6db05bd70c5..7c1b361f7ca 100644 --- a/srcpkgs/thunderbird/template +++ b/srcpkgs/thunderbird/template @@ -3,7 +3,7 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n". # pkgname=thunderbird -version=68.9.0 +version=68.10.0 revision=1 build_helper="rust" short_desc="Standalone Mail/News reader" @@ -11,7 +11,7 @@ maintainer="Enno Boland " license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://www.thunderbird.net/" distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz" -checksum=8286599f14a852dfc503893d141d3e0582892faae8aef81bc36cfab3906408cc +checksum=700ca2e21fef8f76134fc18d901fe890180c21a988ab39ad651554a8ed08a01d lib32disabled=yes From c251dd96ba465f96b8b0f99d7670d5e7d70f141c Mon Sep 17 00:00:00 2001 From: Nafis Date: Fri, 3 Jul 2020 14:54:14 +0600 Subject: [PATCH 321/410] opera: update to 69.0.3686.49. --- srcpkgs/opera/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/opera/template b/srcpkgs/opera/template index 1e96118ae95..10d641858c6 100644 --- a/srcpkgs/opera/template +++ b/srcpkgs/opera/template @@ -1,6 +1,6 @@ # Template file for 'opera' pkgname=opera -version=69.0.3686.36 +version=69.0.3686.49 revision=1 archs="x86_64" depends="ffmpeg desktop-file-utils hicolor-icon-theme" @@ -9,7 +9,7 @@ maintainer="Diogo Leal " license="custom:Proprietary" homepage="https://www.opera.com/computer" distfiles="http://get.geo.opera.com/pub/opera/desktop/${version}/linux/${pkgname}-stable_${version}_amd64.deb" -checksum=aa7fcd532feae92fca4e347b0a19f6a9363d7bd0735d9fea0e0f95a7aa6e9029 +checksum=1361a44b77b7e164cb14e3c9695211454fffdc554b33291299c445ff8364ed15 repository="nonfree" nostrip=yes From a94de349e558a4568c2d9bde7b268b688da7f742 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 21:31:29 +0200 Subject: [PATCH 322/410] virtualbox-ose: rebuild against libressl-3.1.3 --- srcpkgs/virtualbox-ose/patches/qt5.15.patch | 50 +++++++++++++++++++++ srcpkgs/virtualbox-ose/template | 2 +- 2 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/virtualbox-ose/patches/qt5.15.patch diff --git a/srcpkgs/virtualbox-ose/patches/qt5.15.patch b/srcpkgs/virtualbox-ose/patches/qt5.15.patch new file mode 100644 index 00000000000..daa4bb48e1d --- /dev/null +++ b/srcpkgs/virtualbox-ose/patches/qt5.15.patch @@ -0,0 +1,50 @@ +--- src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.cpp 2020-06-04 18:29:31.000000000 +0200 ++++ - 2020-07-03 22:15:08.774947719 +0200 +@@ -16,6 +16,7 @@ + */ + + /* Qt includes: */ ++#include + #include + + /* GUI include */ +--- src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp 2020-06-04 18:29:39.000000000 +0200 ++++ - 2020-07-03 22:31:19.731541404 +0200 +@@ -18,6 +18,7 @@ + /* Qt includes: */ + #include + #include ++#include + #include + #include + #include +--- src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h 2020-06-04 18:29:39.000000000 +0200 ++++ - 2020-07-03 22:36:58.693069087 +0200 +@@ -22,6 +22,7 @@ + #endif + + /* Qt includes: */ ++#include + #include + #include + +--- src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp 2020-06-04 18:29:39.000000000 +0200 ++++ - 2020-07-03 22:40:03.474499683 +0200 +@@ -20,6 +20,7 @@ + #include + #include + #include ++#include + #include + #include + #include +--- src/VBox/Frontends/VirtualBox/src/widgets/UIMenuToolBar.cpp 2020-06-04 18:29:39.000000000 +0200 ++++ - 2020-07-03 22:42:57.625474621 +0200 +@@ -18,6 +18,7 @@ + /* Qt includes: */ + #include + #include ++#include + #include + #include + #include diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template index f37bb2c9452..f1184e6a6fc 100644 --- a/srcpkgs/virtualbox-ose/template +++ b/srcpkgs/virtualbox-ose/template @@ -1,7 +1,7 @@ # Template file for 'virtualbox-ose' pkgname=virtualbox-ose version=6.1.10 -revision=1 +revision=2 wrksrc="VirtualBox-${version%*a}" short_desc="General-purpose full virtualizer for x86 hardware" maintainer="Orphaned " From 8dd5bc245357572275802a391fdd30d99af69ae0 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 21:31:30 +0200 Subject: [PATCH 323/410] virtuoso: rebuild against libressl-3.1.3 --- srcpkgs/virtuoso/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template index dfe11897781..7650d871fcd 100644 --- a/srcpkgs/virtuoso/template +++ b/srcpkgs/virtuoso/template @@ -1,7 +1,7 @@ # Template file for 'virtuoso' pkgname=virtuoso version=7.2.5.1 -revision=1 +revision=2 archs="x86_64* aarch64* ppc64le*" wrksrc="${pkgname}-opensource-${version}" build_style=gnu-configure From bb7ae07a0a69a316c4f28874742dcf1d14d7f77f Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 21:31:30 +0200 Subject: [PATCH 324/410] volta: rebuild against libressl-3.1.3 --- srcpkgs/volta/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template index 77060262849..54cea3bd468 100644 --- a/srcpkgs/volta/template +++ b/srcpkgs/volta/template @@ -1,7 +1,7 @@ # Template file for 'volta' pkgname=volta version=0.8.2 -revision=1 +revision=2 archs="x86_64 i686" # Due to volta pulling pre-built binaries later. Evil. build_helper="rust" hostmakedepends="cargo pkg-config" @@ -14,7 +14,7 @@ distfiles="https://github.com/volta-cli/volta/archive/v${version}.tar.gz" checksum=df4668d4a5b187fd6a332f2099a5a90e14b5393da7de5636e638f6aee3d9fd29 pre_build() { - cargo update --package openssl-sys --precise 0.9.55 + cargo update --package openssl-sys --precise 0.9.58 } do_build() { From 7875e6cd8eedfb835c7798c675a415228c89dde7 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 21:31:30 +0200 Subject: [PATCH 325/410] vpn-ws: rebuild against libressl-3.1.3 --- srcpkgs/vpn-ws/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/vpn-ws/template b/srcpkgs/vpn-ws/template index 952f04bdb19..f5914c07390 100644 --- a/srcpkgs/vpn-ws/template +++ b/srcpkgs/vpn-ws/template @@ -1,7 +1,7 @@ # Template file for 'vpn-ws' pkgname=vpn-ws version=0.2 -revision=5 +revision=6 build_style=gnu-makefile make_use_env=yes makedepends="libressl-devel" From a2b34807b254fe73b97741fd42a50ae61fc4a6c9 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 21:31:30 +0200 Subject: [PATCH 326/410] w3m: rebuild against libressl-3.1.3 --- srcpkgs/w3m/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/w3m/template b/srcpkgs/w3m/template index ae432a48ce3..a739d9ad654 100644 --- a/srcpkgs/w3m/template +++ b/srcpkgs/w3m/template @@ -1,7 +1,7 @@ # Template file for 'w3m' pkgname=w3m version=0.5.3.git20190105 -revision=2 +revision=3 wrksrc="${pkgname}-${version/.git/-git}" build_style=gnu-configure configure_args="--libexecdir=/usr/lib --enable-image=x11,fb From 56a279974464b9f8340cf4945ba99413c434d44a Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 21:31:30 +0200 Subject: [PATCH 327/410] watchman: rebuild against libressl-3.1.3 --- srcpkgs/watchman/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/watchman/template b/srcpkgs/watchman/template index c53c562fed8..be338d5ce96 100644 --- a/srcpkgs/watchman/template +++ b/srcpkgs/watchman/template @@ -1,7 +1,7 @@ # Template file for 'watchman' pkgname=watchman version=4.9.0 -revision=5 +revision=6 build_style=gnu-configure configure_args="--disable-statedir --enable-lenient" hostmakedepends="pkg-config automake libtool" From 042f462255f973e2c7ba70f41e0fefdca44227db Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 21:31:30 +0200 Subject: [PATCH 328/410] wget: rebuild against libressl-3.1.3 --- srcpkgs/wget/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/wget/template b/srcpkgs/wget/template index 46bcb718d0d..71e0b746558 100644 --- a/srcpkgs/wget/template +++ b/srcpkgs/wget/template @@ -1,7 +1,7 @@ # Template file for 'wget' pkgname=wget version=1.20.3 -revision=2 +revision=3 build_style=gnu-configure configure_args="$(vopt_if ssl '--with-ssl=openssl') $(vopt_if gnutls '--with-ssl=gnutls')" conf_files="/etc/wgetrc" From 59d74bc3d36d0d965f8072f5b1752e655c39d4a2 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 21:31:30 +0200 Subject: [PATCH 329/410] uget: rebuild against libressl-3.1.3 --- srcpkgs/uget/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/uget/template b/srcpkgs/uget/template index a6ec77d74ef..c0d26f0606b 100644 --- a/srcpkgs/uget/template +++ b/srcpkgs/uget/template @@ -1,7 +1,7 @@ # Template file for 'uget' pkgname=uget version=2.2.2 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config intltool" makedepends="libnotify-devel gtk+3-devel libcurl-devel gstreamer1-devel" From 8454187f57de222813847422836103bd63224907 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 21:31:31 +0200 Subject: [PATCH 330/410] uftp: rebuild against libressl-3.1.3 --- srcpkgs/uftp/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/uftp/template b/srcpkgs/uftp/template index 0c6ace6da7c..8b80a32cf4d 100644 --- a/srcpkgs/uftp/template +++ b/srcpkgs/uftp/template @@ -1,7 +1,7 @@ # Template file for 'uftp' pkgname=uftp version=4.10.1 -revision=1 +revision=2 build_style=gnu-makefile makedepends="libressl-devel" short_desc="Encrypted multicast file transfer program" From b77ad6f3edf777a7e6b876f0362829183cf9e5b6 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 21:31:31 +0200 Subject: [PATCH 331/410] transmission: rebuild against libressl-3.1.3 --- srcpkgs/transmission/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template index 32fd669ac4a..83053ed4a68 100644 --- a/srcpkgs/transmission/template +++ b/srcpkgs/transmission/template @@ -1,7 +1,7 @@ # Template file for 'transmission' pkgname=transmission version=3.00 -revision=2 +revision=3 build_style=cmake configure_args="-DENABLE_CLI=ON" hostmakedepends="autoconf automake intltool glib-devel libtool pkg-config From 7b00d90121fd2f4f152cf4a1c44f9676798135da Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 21:31:53 +0200 Subject: [PATCH 332/410] u-boot-tools: rebuild against libressl-3.1.3 --- srcpkgs/u-boot-tools/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/u-boot-tools/template b/srcpkgs/u-boot-tools/template index 868e03b6089..a145cf461c3 100644 --- a/srcpkgs/u-boot-tools/template +++ b/srcpkgs/u-boot-tools/template @@ -1,7 +1,7 @@ # Template file for 'u-boot-tools' pkgname=u-boot-tools version=2020.04 -revision=1 +revision=2 wrksrc="u-boot-${version}" build_style=gnu-makefile make_build_args="HOSTSTRIP=: STRIP=:" From 2deee4ceb63c440c68b3befba2a5b20b3620184b Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 21:32:48 +0200 Subject: [PATCH 333/410] opkg: rebuild against libressl-3.1.3 --- srcpkgs/opkg/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/opkg/template b/srcpkgs/opkg/template index 450ba6fd871..98433eb8b5e 100644 --- a/srcpkgs/opkg/template +++ b/srcpkgs/opkg/template @@ -1,7 +1,7 @@ # Template file for 'opkg' pkgname=opkg version=0.4.2 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-sha256 --without-libsolv --with-static-libopkg $(vopt_enable lz4) $(vopt_if ssl '--enable-openssl --enable-ssl-curl') From 5ade91dc358f2c1ccff7d6cb7d30c372bb51a91a Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 21:32:49 +0200 Subject: [PATCH 334/410] nix: rebuild against libressl-3.1.3 --- srcpkgs/nix/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template index fc327774af7..b53ab551709 100644 --- a/srcpkgs/nix/template +++ b/srcpkgs/nix/template @@ -1,7 +1,7 @@ # Template file for 'nix' pkgname=nix version=2.3.3 -revision=2 +revision=3 build_style=gnu-configure # Use /nix/var as suggested by the official Manual. configure_args="--localstatedir=/nix/var --with-sandbox-shell=/bin/sh" From f57da17b149f514eda9808170cda3194befb7e94 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 21:32:49 +0200 Subject: [PATCH 335/410] mosh: rebuild against libressl-3.1.3 --- srcpkgs/mosh/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template index 780f0475149..a51ba621809 100644 --- a/srcpkgs/mosh/template +++ b/srcpkgs/mosh/template @@ -1,7 +1,7 @@ # Template file for 'mosh' pkgname=mosh version=1.3.2 -revision=16 +revision=17 build_style=gnu-configure hostmakedepends="pkg-config protobuf" makedepends="ncurses-devel protobuf-devel libutempter-devel libressl-devel" From d04cf68847fe6388831944359e12da3fc8af0d08 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 21:32:49 +0200 Subject: [PATCH 336/410] openssh: rebuild against libressl-3.1.3 --- srcpkgs/openssh/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template index d84b65b0473..79baf6dc213 100644 --- a/srcpkgs/openssh/template +++ b/srcpkgs/openssh/template @@ -1,7 +1,7 @@ # Template file for 'openssh' pkgname=openssh version=8.3p1 -revision=1 +revision=2 build_style=gnu-configure configure_args="--datadir=/usr/share/openssh --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody From e5663bf17716eebd013cf0ec01935a26bf2e4f5f Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 21:36:07 +0200 Subject: [PATCH 337/410] grub-customizer: rebuild against libressl-3.1.3 --- srcpkgs/grub-customizer/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/grub-customizer/template b/srcpkgs/grub-customizer/template index e3bd598f30d..1fa8ee27d6e 100644 --- a/srcpkgs/grub-customizer/template +++ b/srcpkgs/grub-customizer/template @@ -1,7 +1,7 @@ # Template file for 'grub-customizer' pkgname=grub-customizer version=5.1.0 -revision=3 +revision=4 build_style=cmake hostmakedepends="pkg-config" makedepends="gtkmm-devel libressl-devel libarchive-devel" From 456f703ad5dedc365eaf45d3a4ccbc5ef1e1d03a Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 21:36:27 +0200 Subject: [PATCH 338/410] irssi: rebuild against libressl-3.1.3 --- srcpkgs/irssi/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/irssi/template b/srcpkgs/irssi/template index 3d158e728d3..3bba172c631 100644 --- a/srcpkgs/irssi/template +++ b/srcpkgs/irssi/template @@ -1,7 +1,7 @@ # Template file for 'irssi' pkgname=irssi version=1.2.2 -revision=3 +revision=4 build_style=gnu-configure configure_args="--disable-static --with-proxy --enable-true-color --with-otr" hostmakedepends="pkg-config" From d0cd92d4d7e577d338733a6c9fa55c46fb4c0a0a Mon Sep 17 00:00:00 2001 From: John Date: Sat, 4 Jul 2020 00:17:42 +0200 Subject: [PATCH 339/410] qupzilla1: rebuild against libressl-3.1.3 --- srcpkgs/qupzilla1/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/qupzilla1/template b/srcpkgs/qupzilla1/template index 77adfee111c..e72f0f95897 100644 --- a/srcpkgs/qupzilla1/template +++ b/srcpkgs/qupzilla1/template @@ -1,7 +1,7 @@ # Template file for 'qupzilla1' pkgname=qupzilla1 version=1.8.9 -revision=15 +revision=16 wrksrc="QupZilla-${version}" build_style=qmake hostmakedepends="pkg-config" From 7bfaf86e99e56811766911ab392b32ae0021f773 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 4 Jul 2020 00:17:42 +0200 Subject: [PATCH 340/410] python3: rebuild against libressl-3.1.3 --- srcpkgs/python3/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template index 0649cd82cf1..33106458a3c 100644 --- a/srcpkgs/python3/template +++ b/srcpkgs/python3/template @@ -4,7 +4,7 @@ # pkgname=python3 version=3.8.3 -revision=1 +revision=2 wrksrc="Python-${version}" short_desc="Python programming language (${version%.*} series)" maintainer="Orphaned " From 1a4f9010415042e1eba97a2df1549505afbdd193 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 4 Jul 2020 00:18:08 +0200 Subject: [PATCH 341/410] python-M2Crypto: rebuild against libressl-3.1.3 --- srcpkgs/python-M2Crypto/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/python-M2Crypto/template b/srcpkgs/python-M2Crypto/template index 6febd5a9ea1..a2d19a07b3c 100644 --- a/srcpkgs/python-M2Crypto/template +++ b/srcpkgs/python-M2Crypto/template @@ -1,7 +1,7 @@ # Template file for 'python-M2Crypto' pkgname=python-M2Crypto version=0.35.2 -revision=2 +revision=3 wrksrc="M2Crypto-${version}" build_style=python-module pycompile_module="M2Crypto" From 629f5e72a90222d8402422c41b8b9e92d4e9dedd Mon Sep 17 00:00:00 2001 From: John Date: Sat, 4 Jul 2020 00:18:16 +0200 Subject: [PATCH 342/410] python-cryptography: rebuild against libressl-3.1.3 --- srcpkgs/python-cryptography/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/python-cryptography/template b/srcpkgs/python-cryptography/template index e7aca2d26e7..99f66f0727c 100644 --- a/srcpkgs/python-cryptography/template +++ b/srcpkgs/python-cryptography/template @@ -1,7 +1,7 @@ # Template file for 'python-cryptography' pkgname=python-cryptography version=2.8 -revision=1 +revision=2 wrksrc="cryptography-${version}" build_style=python-module hostmakedepends="python-setuptools python3-setuptools libressl-devel From a1a3d6100c2bd48dc9460d7902610de14c946ab8 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 4 Jul 2020 00:18:24 +0200 Subject: [PATCH 343/410] python-curl: rebuild against libressl-3.1.3 --- srcpkgs/python-curl/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/python-curl/template b/srcpkgs/python-curl/template index 685c63ce68a..cc716df8c9c 100644 --- a/srcpkgs/python-curl/template +++ b/srcpkgs/python-curl/template @@ -1,7 +1,7 @@ # Template file for 'python-curl' pkgname=python-curl version=7.43.0.3 -revision=5 +revision=6 wrksrc="pycurl-${version}" build_style=python-module pycompile_module="curl" From 03d88697afc29bd340665919d551b6ebe5abeaa0 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 4 Jul 2020 00:18:31 +0200 Subject: [PATCH 344/410] python3-scrypt: rebuild against libressl-3.1.3 --- srcpkgs/python3-scrypt/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/python3-scrypt/template b/srcpkgs/python3-scrypt/template index d4384598c91..c0e64aff178 100644 --- a/srcpkgs/python3-scrypt/template +++ b/srcpkgs/python3-scrypt/template @@ -1,7 +1,7 @@ # Template file for 'python3-scrypt' pkgname=python3-scrypt version=0.8.15 -revision=1 +revision=2 wrksrc="scrypt-${version}" build_style=python3-module hostmakedepends="python3-setuptools" From b30cf5ea335b45bdbe8c4d7f5c6515b579b076d9 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 4 Jul 2020 00:18:44 +0200 Subject: [PATCH 345/410] qbittorrent: rebuild against libressl-3.1.3 --- srcpkgs/qbittorrent/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template index 7d2d0a94ff3..caea7a7677f 100644 --- a/srcpkgs/qbittorrent/template +++ b/srcpkgs/qbittorrent/template @@ -1,7 +1,7 @@ # Template file for 'qbittorrent' pkgname=qbittorrent version=4.2.5 -revision=1 +revision=2 create_wrksrc=yes build_style=qmake hostmakedepends="automake libtool pkg-config qt5-host-tools qt5-qmake qt5-tools tar xz" From 9d7b47d4e4d6ffeb5407079b7d439ff8353ff0c4 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 4 Jul 2020 00:18:59 +0200 Subject: [PATCH 346/410] qca: rebuild against libressl-3.1.3 --- srcpkgs/qca/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/qca/template b/srcpkgs/qca/template index f652ac18e14..a93ef3c8352 100644 --- a/srcpkgs/qca/template +++ b/srcpkgs/qca/template @@ -1,7 +1,7 @@ # Template file for 'qca' pkgname=qca version=2.1.3 -revision=5 +revision=6 build_style=cmake configure_args="-DBUILD_TESTS=0 -DQC_CERTSTORE_PATH=/etc/ssl/certs/ca-certificates.crt -DQCA_FEATURE_INSTALL_DIR=/usr/share/qca/mkspecs -DWITH_ossl_PLUGIN=yes" From b12c1d470fa3120fe1d80fbcf6407bb1e76f809c Mon Sep 17 00:00:00 2001 From: John Date: Sat, 4 Jul 2020 00:19:21 +0200 Subject: [PATCH 347/410] qca-qt5: rebuild against libressl-3.1.3 --- srcpkgs/qca-qt5/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/qca-qt5/template b/srcpkgs/qca-qt5/template index 21ff730e44d..2523d3095a1 100644 --- a/srcpkgs/qca-qt5/template +++ b/srcpkgs/qca-qt5/template @@ -1,7 +1,7 @@ # Template file for 'qca-qt5' pkgname=qca-qt5 version=2.2.1 -revision=1 +revision=2 wrksrc="${pkgname%-*}-${version}" build_style=cmake configure_args="-DBUILD_TESTS=0 -DQCA_FEATURE_INSTALL_DIR=/usr/share/qca-qt5/mkspecs From b39d44eb125da7806931acb3520ed483aa42b5a0 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 4 Jul 2020 00:19:40 +0200 Subject: [PATCH 348/410] qingy: rebuild against libressl-3.1.3 --- srcpkgs/qingy/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/qingy/template b/srcpkgs/qingy/template index bd640e6a38c..f7cb416180d 100644 --- a/srcpkgs/qingy/template +++ b/srcpkgs/qingy/template @@ -1,7 +1,7 @@ # Template file for 'qingy' pkgname=qingy version=1.0.0 -revision=27 +revision=28 lib32disabled=yes build_style=gnu-configure makedepends="ncurses-devel libressl-devel From 46f4ea6bb378b75a38d8471c94c26d59979d2e24 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 4 Jul 2020 00:19:48 +0200 Subject: [PATCH 349/410] python-curl: rebuild against libressl-3.1.3 --- srcpkgs/python-curl/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/python-curl/template b/srcpkgs/python-curl/template index cc716df8c9c..c7b9034560e 100644 --- a/srcpkgs/python-curl/template +++ b/srcpkgs/python-curl/template @@ -1,7 +1,7 @@ # Template file for 'python-curl' pkgname=python-curl version=7.43.0.3 -revision=6 +revision=7 wrksrc="pycurl-${version}" build_style=python-module pycompile_module="curl" From fe730b21932009a2436c6adf13eb1e15cf7d9164 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 4 Jul 2020 00:19:53 +0200 Subject: [PATCH 350/410] python-cryptography: rebuild against libressl-3.1.3 --- srcpkgs/python-cryptography/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/python-cryptography/template b/srcpkgs/python-cryptography/template index 99f66f0727c..2e71290492b 100644 --- a/srcpkgs/python-cryptography/template +++ b/srcpkgs/python-cryptography/template @@ -1,7 +1,7 @@ # Template file for 'python-cryptography' pkgname=python-cryptography version=2.8 -revision=2 +revision=3 wrksrc="cryptography-${version}" build_style=python-module hostmakedepends="python-setuptools python3-setuptools libressl-devel From 939221f80ee2f7de35f393e14e8e4a26143f101c Mon Sep 17 00:00:00 2001 From: John Date: Sat, 4 Jul 2020 00:19:58 +0200 Subject: [PATCH 351/410] python-M2Crypto: rebuild against libressl-3.1.3 --- srcpkgs/python-M2Crypto/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/python-M2Crypto/template b/srcpkgs/python-M2Crypto/template index a2d19a07b3c..619c49f7df6 100644 --- a/srcpkgs/python-M2Crypto/template +++ b/srcpkgs/python-M2Crypto/template @@ -1,7 +1,7 @@ # Template file for 'python-M2Crypto' pkgname=python-M2Crypto version=0.35.2 -revision=3 +revision=4 wrksrc="M2Crypto-${version}" build_style=python-module pycompile_module="M2Crypto" From 9414252c60d097c5d86723a360465b2706622e9f Mon Sep 17 00:00:00 2001 From: John Date: Sat, 4 Jul 2020 00:20:03 +0200 Subject: [PATCH 352/410] python: rebuild against libressl-3.1.3 --- srcpkgs/python/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/python/template b/srcpkgs/python/template index 9e235222197..4498f6fc67c 100644 --- a/srcpkgs/python/template +++ b/srcpkgs/python/template @@ -4,7 +4,7 @@ # pkgname=python version=2.7.18 -revision=1 +revision=2 wrksrc="Python-${version}" pycompile_dirs="usr/lib/python2.7" hostmakedepends="pkg-config" From cd61277dd2d6053d9cb43692a94c99b4613ed6f2 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 4 Jul 2020 00:21:19 +0200 Subject: [PATCH 353/410] nasa-wallpaper: rebuild against libressl-3.1.3 --- srcpkgs/nasa-wallpaper/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/nasa-wallpaper/template b/srcpkgs/nasa-wallpaper/template index c03df8ffc4a..59857b342e8 100644 --- a/srcpkgs/nasa-wallpaper/template +++ b/srcpkgs/nasa-wallpaper/template @@ -1,7 +1,7 @@ # Template file for 'nasa-wallpaper' pkgname=nasa-wallpaper version=2.0 -revision=1 +revision=2 build_style="cargo" hostmakedepends="pkg-config" makedepends="libressl-devel" From 485896f8e42f48eeafe024b32f5907f92dbfbebd Mon Sep 17 00:00:00 2001 From: John Date: Sat, 4 Jul 2020 00:32:52 +0200 Subject: [PATCH 354/410] neomutt: rebuild against libressl-3.1.3 --- srcpkgs/neomutt/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template index cc492777177..79c9858b350 100644 --- a/srcpkgs/neomutt/template +++ b/srcpkgs/neomutt/template @@ -1,7 +1,7 @@ # Template file for 'neomutt' pkgname=neomutt version=20200626 -revision=1 +revision=2 wrksrc="neomutt-${version}" create_wrksrc=true build_wrksrc="$wrksrc" From 5b226e574072bc9d9c284978595ccf5bd4baad01 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 4 Jul 2020 00:33:04 +0200 Subject: [PATCH 355/410] netsurf: rebuild against libressl-3.1.3 --- srcpkgs/netsurf/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/netsurf/template b/srcpkgs/netsurf/template index 784779eb27f..2443180f8df 100644 --- a/srcpkgs/netsurf/template +++ b/srcpkgs/netsurf/template @@ -1,7 +1,7 @@ # Template file for 'netsurf' pkgname=netsurf version=3.10 -revision=1 +revision=2 build_style=gnu-makefile make_use_env=yes make_build_args=" From 0dfc5eee19d0333fd47158423b6b9ddfb8960d83 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 4 Jul 2020 00:33:40 +0200 Subject: [PATCH 356/410] php: rebuild against libressl-3.1.3 --- srcpkgs/php/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/php/template b/srcpkgs/php/template index 33d80f11725..2045e3ca659 100644 --- a/srcpkgs/php/template +++ b/srcpkgs/php/template @@ -1,7 +1,7 @@ # Template file for 'php' pkgname=php version=7.4.7 -revision=1 +revision=2 hostmakedepends="bison pkg-config apache-devel" makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel gmp-devel libcurl-devel libjpeg-turbo-devel libmysqlclient-devel From 82cfbb53fd4bb6b86a6458c479a63abcd068c8ea Mon Sep 17 00:00:00 2001 From: John Date: Sat, 4 Jul 2020 00:35:28 +0200 Subject: [PATCH 357/410] znc: rebuild against libressl-3.1.3 --- srcpkgs/znc/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template index bfd0e427324..ef82f6aff27 100644 --- a/srcpkgs/znc/template +++ b/srcpkgs/znc/template @@ -1,7 +1,7 @@ # Template file for 'znc' pkgname=znc version=1.8.1 -revision=1 +revision=2 build_style=gnu-configure configure_args=" --enable-python From 9671fdaeb8c5ecf8b8935305a6db14a1f18619f0 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 4 Jul 2020 00:35:53 +0200 Subject: [PATCH 358/410] zchunk: rebuild against libressl-3.1.3 --- srcpkgs/zchunk/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/zchunk/template b/srcpkgs/zchunk/template index b504f202fc4..73e35d8e56a 100644 --- a/srcpkgs/zchunk/template +++ b/srcpkgs/zchunk/template @@ -1,7 +1,7 @@ # Template file for 'zchunk' pkgname=zchunk version=1.1.6 -revision=1 +revision=2 build_style=meson hostmakedepends="pkg-config" makedepends="libcurl-devel libzstd-devel" From 07259996cd615ad9764bd433c302ed637cfa2ca6 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 4 Jul 2020 00:36:11 +0200 Subject: [PATCH 359/410] zbackup: rebuild against libressl-3.1.3 --- srcpkgs/zbackup/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/zbackup/template b/srcpkgs/zbackup/template index ceea4527ffb..2ea029e35e5 100644 --- a/srcpkgs/zbackup/template +++ b/srcpkgs/zbackup/template @@ -1,7 +1,7 @@ # Template file for 'zbackup' pkgname=zbackup version=1.4.4 -revision=17 +revision=18 build_style=cmake hostmakedepends="protobuf" makedepends="zlib-devel liblzma-devel protobuf-devel libressl-devel lzo-devel" From de7f471601c5a3ec9663846f436d5b265df9254b Mon Sep 17 00:00:00 2001 From: John Date: Sat, 4 Jul 2020 00:37:03 +0200 Subject: [PATCH 360/410] yara: rebuild against libressl-3.1.3 --- srcpkgs/yara/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/yara/template b/srcpkgs/yara/template index 17647c42a34..38b32a09bd3 100644 --- a/srcpkgs/yara/template +++ b/srcpkgs/yara/template @@ -1,7 +1,7 @@ # Template file for 'yara' pkgname=yara version=4.0.2 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-magic --enable-cuckoo" hostmakedepends="automake libtool pkg-config" From a031e620407d97dd735caa6a55cda08611309940 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 4 Jul 2020 00:42:08 +0200 Subject: [PATCH 361/410] spice: rebuild against libressl-3.1.3 --- srcpkgs/spice/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/spice/template b/srcpkgs/spice/template index 669ac66a5da..5a2b3b95560 100644 --- a/srcpkgs/spice/template +++ b/srcpkgs/spice/template @@ -1,7 +1,7 @@ # Template file for 'spice' pkgname=spice version=0.14.3 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-tunnel --disable-opengl --enable-smartcard --with-sasl --disable-static --enable-xinerama --disable-celt051" From 1145417ad0af3b60bfe2b95a1d4f12831b659110 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 4 Jul 2020 00:42:08 +0200 Subject: [PATCH 362/410] pulseaudio: rebuild against libressl-3.1.3 --- srcpkgs/pulseaudio/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template index ddc0add3d5a..391c187bd83 100644 --- a/srcpkgs/pulseaudio/template +++ b/srcpkgs/pulseaudio/template @@ -1,7 +1,7 @@ # Template file for 'pulseaudio' pkgname=pulseaudio version=13.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-oss-output --disable-oss-wrapper --disable-tcpwrap --enable-jack --disable-lirc --disable-hal-compat --disable-gconf --enable-orc From 316fc1520111aee40ca552daa95bd2188377a93d Mon Sep 17 00:00:00 2001 From: John Date: Sat, 4 Jul 2020 00:42:34 +0200 Subject: [PATCH 363/410] rstudio: rebuild against libressl-3.1.3 --- srcpkgs/rstudio/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template index 70c81ff693b..d4fc62c99fd 100644 --- a/srcpkgs/rstudio/template +++ b/srcpkgs/rstudio/template @@ -1,7 +1,7 @@ # Template file for 'rstudio' pkgname=rstudio version=1.3.959 -revision=1 +revision=2 build_style=cmake configure_args="-DRSTUDIO_TARGET=Desktop -DRSTUDIO_USE_SYSTEM_BOOST=ON From ff3a98a959c05089d30c582ff912f1aa0cc66293 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 4 Jul 2020 00:58:53 +0200 Subject: [PATCH 364/410] qt: rebuild against libressl-3.1.3 --- srcpkgs/qt/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/qt/template b/srcpkgs/qt/template index 392f77b4ccb..de8ebf0a483 100644 --- a/srcpkgs/qt/template +++ b/srcpkgs/qt/template @@ -1,7 +1,7 @@ # Template file for 'qt' pkgname=qt version=4.8.7 -revision=28 +revision=29 _distname=qt-everywhere-opensource-src patch_args="-Np1" wrksrc=${_distname}-${version} From 8c5e963642a0a3648e7df722ff274a6059ef6ce3 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 4 Jul 2020 01:00:10 +0200 Subject: [PATCH 365/410] gkrellm: rebuild against libressl-3.1.3 --- srcpkgs/gkrellm/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gkrellm/template b/srcpkgs/gkrellm/template index 6f44315c773..b7fef8fea9d 100644 --- a/srcpkgs/gkrellm/template +++ b/srcpkgs/gkrellm/template @@ -1,7 +1,7 @@ # Template file for 'gkrellm' pkgname=gkrellm version=2.3.11 -revision=1 +revision=2 build_style=gnu-makefile hostmakedepends="pkg-config gettext which" makedepends="libressl-devel libSM-devel gtk+-devel libsensors-devel" From f296f6a00a9bbbee0010dd4c0ce30268dad542e9 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 4 Jul 2020 01:00:27 +0200 Subject: [PATCH 366/410] glusterfs: rebuild against libressl-3.1.3 --- srcpkgs/glusterfs/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/glusterfs/template b/srcpkgs/glusterfs/template index 763951859a4..69f553566e6 100644 --- a/srcpkgs/glusterfs/template +++ b/srcpkgs/glusterfs/template @@ -1,7 +1,7 @@ # Template file for 'glusterfs' pkgname=glusterfs version=7.6 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-mountutildir=/usr/bin ac_cv_file__etc_debian_version=no ac_cv_file__etc_SuSE_release=no ac_cv_file__etc_redhat_release=no From 8758bcf4f6a8e6fbd29f87f404d4f176e08d133f Mon Sep 17 00:00:00 2001 From: John Date: Sat, 4 Jul 2020 01:00:41 +0200 Subject: [PATCH 367/410] gogglesmm: rebuild against libressl-3.1.3 --- srcpkgs/gogglesmm/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template index 024fc662717..3bb2961c891 100644 --- a/srcpkgs/gogglesmm/template +++ b/srcpkgs/gogglesmm/template @@ -1,7 +1,7 @@ # Template file for 'gogglesmm' pkgname=gogglesmm version=1.2.1 -revision=3 +revision=4 archs="x86_64* i686* aarch64* armv7* ppc64*" build_style=cmake hostmakedepends="pkg-config desktop-file-utils" From 70ee32003012becfd7a1ff82d21396e870c1f4f7 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 4 Jul 2020 01:00:55 +0200 Subject: [PATCH 368/410] grpc: rebuild against libressl-3.1.3 --- srcpkgs/grpc/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template index 3541d1370cf..9a58e311aaa 100644 --- a/srcpkgs/grpc/template +++ b/srcpkgs/grpc/template @@ -1,7 +1,7 @@ # Template file for 'grpc' pkgname=grpc version=1.27.3 -revision=2 +revision=3 _abseilver=37dd2562ec830d547a1524bb306be313ac3f2556 build_style=cmake configure_args="-DBUILD_SHARED_LIBS=ON From 62e65bacd52e6426f44008565f17f456f8751d63 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 4 Jul 2020 01:01:01 +0200 Subject: [PATCH 369/410] hexchat: rebuild against libressl-3.1.3 --- srcpkgs/hexchat/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template index b14a436a5e1..01086d5682b 100644 --- a/srcpkgs/hexchat/template +++ b/srcpkgs/hexchat/template @@ -1,7 +1,7 @@ # Template file for 'hexchat' pkgname=hexchat version=2.14.3 -revision=1 +revision=2 build_style=meson configure_args="-Dwith-dbus=true -Dwith-ssl=true -Dwith-text=false -Dwith-perl=/usr/bin/perl -Dwith-python=python3 From 1e5328f5ef2e426db1d746ae43822f05a44af697 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 4 Jul 2020 01:01:08 +0200 Subject: [PATCH 370/410] hfsprogs: rebuild against libressl-3.1.3 --- srcpkgs/hfsprogs/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/hfsprogs/template b/srcpkgs/hfsprogs/template index de6f1e8f074..c36fd2bd8bc 100644 --- a/srcpkgs/hfsprogs/template +++ b/srcpkgs/hfsprogs/template @@ -3,7 +3,7 @@ pkgname=hfsprogs _distver=540.1 _patchver=3 version="${_distver}.linux${_patchver}" -revision=5 +revision=6 wrksrc="diskdev_cmds-${version}" hostmakedepends="clang" makedepends="libressl-devel libuuid-devel" From 9bf4554f11a6d46335d937b31dbba2f3d9a895c0 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 4 Jul 2020 01:01:19 +0200 Subject: [PATCH 371/410] hitch: rebuild against libressl-3.1.3 --- srcpkgs/hitch/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/hitch/template b/srcpkgs/hitch/template index b8b2fc494a2..a0155cc64c6 100644 --- a/srcpkgs/hitch/template +++ b/srcpkgs/hitch/template @@ -1,7 +1,7 @@ # Template file for 'hitch' pkgname=hitch version=1.5.2 -revision=1 +revision=2 build_style=gnu-configure configure_args="ac_cv_so_reuseport_works=yes ac_cv_so_tfo=yes" hostmakedepends="pkg-config" From f717e68985a446b2e825d22cbd54bf4259666e09 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 4 Jul 2020 01:01:38 +0200 Subject: [PATCH 372/410] hostapd: rebuild against libressl-3.1.3 --- srcpkgs/hostapd/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/hostapd/template b/srcpkgs/hostapd/template index b6e69311204..3c7af9d0274 100644 --- a/srcpkgs/hostapd/template +++ b/srcpkgs/hostapd/template @@ -1,7 +1,7 @@ # Template file for 'hostapd' pkgname=hostapd version=2.9 -revision=1 +revision=2 build_wrksrc="$pkgname" conf_files="/etc/hostapd/hostapd.conf" hostmakedepends="pkg-config" From a271eb4b579cb07ebf9e9ed348eaf7be005d0df9 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 4 Jul 2020 01:05:32 +0200 Subject: [PATCH 373/410] hplip: rebuild against libressl-3.1.3 --- srcpkgs/hplip/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template index 1dcb1ebc686..498eefb86aa 100644 --- a/srcpkgs/hplip/template +++ b/srcpkgs/hplip/template @@ -1,7 +1,7 @@ # Template file for 'hplip' pkgname=hplip version=3.20.5 -revision=1 +revision=2 build_style=gnu-configure pycompile_dirs="usr/share/hplip" configure_args=" From 25757f4c0e5b2fd8eb7845f357cc6642a652492e Mon Sep 17 00:00:00 2001 From: John Date: Sat, 4 Jul 2020 01:05:46 +0200 Subject: [PATCH 374/410] httpdirfs: rebuild against libressl-3.1.3 --- srcpkgs/httpdirfs/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/httpdirfs/template b/srcpkgs/httpdirfs/template index 2c71c40c8b7..9ec780456ec 100644 --- a/srcpkgs/httpdirfs/template +++ b/srcpkgs/httpdirfs/template @@ -1,7 +1,7 @@ # Template file for 'httpdirfs' pkgname=httpdirfs version=1.2.0 -revision=1 +revision=2 build_style=gnu-makefile make_install_args="prefix=/usr" makedepends="libcurl-devel fuse-devel gumbo-parser-devel From e088a0ab98a8e0ff7b046a8de2a46f3f2aaa7b40 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 4 Jul 2020 01:05:53 +0200 Subject: [PATCH 375/410] httrack: rebuild against libressl-3.1.3 --- srcpkgs/httrack/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/httrack/template b/srcpkgs/httrack/template index 3d6fe2b8f63..4550f0df36c 100644 --- a/srcpkgs/httrack/template +++ b/srcpkgs/httrack/template @@ -1,7 +1,7 @@ # Template file for 'httrack' pkgname=httrack version=3.49.2 -revision=5 +revision=6 build_style=gnu-configure configure_args="--disable-static --with-zlib=${XBPS_CROSS_BASE}/usr" short_desc="A free and easy-to-use offline browser utility" From a4d4e1e3eff8945f3ca2ae9c4dc5ab26e93458ec Mon Sep 17 00:00:00 2001 From: John Date: Sat, 4 Jul 2020 01:06:03 +0200 Subject: [PATCH 376/410] i2pd: rebuild against libressl-3.1.3 --- srcpkgs/i2pd/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template index 9874633f89b..37ba2b355c4 100644 --- a/srcpkgs/i2pd/template +++ b/srcpkgs/i2pd/template @@ -1,7 +1,7 @@ # Template file for 'i2pd' pkgname=i2pd version=2.32.1 -revision=1 +revision=2 build_style=gnu-makefile make_build_args="USE_UPNP=yes" makedepends="zlib-devel boost-devel libressl-devel miniupnpc-devel From 42602ca43a1b290319eb3694005da815d4530005 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 4 Jul 2020 01:06:32 +0200 Subject: [PATCH 377/410] icinga2: rebuild against libressl-3.1.3 --- srcpkgs/icinga2/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template index dd87ceb55a2..5d657999287 100644 --- a/srcpkgs/icinga2/template +++ b/srcpkgs/icinga2/template @@ -1,7 +1,7 @@ # Template file for 'icinga2' pkgname=icinga2 version=2.9.3 -revision=2 +revision=3 build_style=cmake build_helper="qemu" configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc From 17cf9d46e0a8dce02e0640e82239c63425989c2b Mon Sep 17 00:00:00 2001 From: John Date: Sat, 4 Jul 2020 01:07:14 +0200 Subject: [PATCH 378/410] imapfilter: rebuild against libressl-3.1.3 --- srcpkgs/imapfilter/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/imapfilter/template b/srcpkgs/imapfilter/template index 334b6f0115d..850327bba1d 100644 --- a/srcpkgs/imapfilter/template +++ b/srcpkgs/imapfilter/template @@ -1,7 +1,7 @@ # Template file for 'imapfilter' pkgname=imapfilter version=2.6.12 -revision=4 +revision=5 build_style=gnu-makefile make_build_args="DESTIDIR=${DESTDIR} PREFIX=/usr" hostmakedepends="lua53-devel" From 100b540574ac87a2b531fa462f19450eb3eace33 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 4 Jul 2020 01:07:27 +0200 Subject: [PATCH 379/410] inadyn: rebuild against libressl-3.1.3 --- srcpkgs/inadyn/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/inadyn/template b/srcpkgs/inadyn/template index 9dffd5e2f15..fb16b0faba4 100644 --- a/srcpkgs/inadyn/template +++ b/srcpkgs/inadyn/template @@ -1,7 +1,7 @@ # Template file for 'inadyn' pkgname=inadyn version=2.7 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-openssl" hostmakedepends="automake libtool pkg-config" From fb09b0f0fcb5fc61beaf29f99fb866d14eeaf94d Mon Sep 17 00:00:00 2001 From: John Date: Sat, 4 Jul 2020 01:07:42 +0200 Subject: [PATCH 380/410] inspircd: rebuild against libressl-3.1.3 --- srcpkgs/inspircd/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/inspircd/template b/srcpkgs/inspircd/template index d11e3088ab3..abe41e0df03 100644 --- a/srcpkgs/inspircd/template +++ b/srcpkgs/inspircd/template @@ -1,7 +1,7 @@ # Template file for 'inspircd' pkgname=inspircd version=3.5.0 -revision=1 +revision=2 build_style=gnu-makefile hostmakedepends="perl pkg-config" makedepends="geoip-devel libressl-devel sqlite-devel gnutls-devel" From 04549e18c5ba89735e3fef1f85ac1c8d8e093587 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 4 Jul 2020 01:08:06 +0200 Subject: [PATCH 381/410] ipmitool: rebuild against libressl-3.1.3 --- srcpkgs/ipmitool/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ipmitool/template b/srcpkgs/ipmitool/template index d6303e9f167..02d31d34c6d 100644 --- a/srcpkgs/ipmitool/template +++ b/srcpkgs/ipmitool/template @@ -1,7 +1,7 @@ # Template file for 'ipmitool' pkgname=ipmitool version=1.8.18 -revision=6 +revision=7 build_style=gnu-configure makedepends="libressl-devel" short_desc="Command-line interface to IPMI-enabled devices" From 005f3ec1434ee991e94060f363d766eaec534ed9 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 4 Jul 2020 01:08:27 +0200 Subject: [PATCH 382/410] ipmiutil: rebuild against libressl-3.1.3 --- srcpkgs/ipmiutil/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ipmiutil/template b/srcpkgs/ipmiutil/template index bd7dc36968e..0508008d9ba 100644 --- a/srcpkgs/ipmiutil/template +++ b/srcpkgs/ipmiutil/template @@ -1,7 +1,7 @@ # Template file for 'ipmiutil' pkgname=ipmiutil version=3.1.3 -revision=2 +revision=3 archs="i686* x86_64* ppc*" build_style=gnu-configure configure_args="--disable-systemd --libdir=/usr/lib" From 933f85809bb8250e6dcef6e670b18b5a8c408b78 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 4 Jul 2020 01:08:27 +0200 Subject: [PATCH 383/410] iputils: rebuild against libressl-3.1.3 --- srcpkgs/iputils/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template index 7d68914e7a9..97215e5d421 100644 --- a/srcpkgs/iputils/template +++ b/srcpkgs/iputils/template @@ -1,7 +1,7 @@ # Template file for 'iputils' pkgname=iputils version=20190709 -revision=2 +revision=3 wrksrc="${pkgname}-s${version}" build_style=meson configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false From 1117a4c5f0bd55358b38d38f5f547236234cf5ef Mon Sep 17 00:00:00 2001 From: John Date: Sat, 4 Jul 2020 01:08:27 +0200 Subject: [PATCH 384/410] isync: rebuild against libressl-3.1.3 --- srcpkgs/isync/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template index eef3cf3c078..99e38a431b7 100644 --- a/srcpkgs/isync/template +++ b/srcpkgs/isync/template @@ -1,7 +1,7 @@ # Template file for 'isync' pkgname=isync version=1.3.1 -revision=2 +revision=3 build_style=gnu-configure hostmakedepends="perl pkg-config" makedepends="libressl-devel libsasl-devel db-devel zlib-devel" From df162dacd0d3379a03abcf8fb23a99dff7a6fa21 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 22 Jun 2020 14:51:42 +1000 Subject: [PATCH 385/410] New build-helper: texmf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Piotr Wójcik --- Manual.md | 2 + common/build-style/texmf.sh | 44 ++++ common/environment/build-style/texmf.sh | 5 + .../build-style/texmf/ownership.txt | 229 ++++++++++++++++++ 4 files changed, 280 insertions(+) create mode 100644 common/build-style/texmf.sh create mode 100644 common/environment/build-style/texmf.sh create mode 100644 common/environment/build-style/texmf/ownership.txt diff --git a/Manual.md b/Manual.md index c612479ec73..b0f92bfeab3 100644 --- a/Manual.md +++ b/Manual.md @@ -931,6 +931,8 @@ Environment variables for a specific `build_style` can be declared in a filename matching the `build_style` name, Example: `common/environment/build-style/gnu-configure.sh` + +- `texmf` For archlinux's texmf zip/tarballs that need to go into /usr/share/texmf-dist. ### build helper scripts diff --git a/common/build-style/texmf.sh b/common/build-style/texmf.sh new file mode 100644 index 00000000000..798d44e14d2 --- /dev/null +++ b/common/build-style/texmf.sh @@ -0,0 +1,44 @@ +do_build() { + local f p + mkdir -p "build/usr/share/texmf-dist" + find . -maxdepth 1 -print -name "*.tar.xz" \ + -exec bsdtar -C "build/usr/share/texmf-dist" -xf {} \; + cd "build/usr/share/texmf-dist/" + if [ -d "texmf-dist" ] ; then + rsync -ar texmf-dist/ ./ + rm -rf texmf-dist/ + fi + rm -f LICENSE* + while IFS=' ' read -r f p ; do + if [ "$p" = "$pkgname" ] && ! [ -e "$f" ]; then + msg_error "$pkgver: missing file $f\n" + elif [ "$p" != "$pkgname" ] && [ -e "$f" ]; then + echo "removed $f" + mkdir -p ../texlive/removed + echo "$f" >> ../texlive/removed/$pkgname.txt + rm -f "$f" + fi + done < "${XBPS_COMMONDIR}/environment/build-style/texmf/ownership.txt" +} + +do_check() { + local f p exitcode=0 + cd build + while read p; do + if [[ ${p%-*} =~ .*-bin$ ]] || [ "${p%-*}" = "$pkgname" ]; then + continue + fi + echo checking conflicts with ${p}... + while IFS= read -r f; do + if [ -e ".$f" ]; then + msg_red "both contain file $f\n" + exitcode=1 + fi + done < <(xbps-query -Rf $p | sed 's/ -> .*//') + done < <(xbps-query -Rs texlive -p pkgver | cut -d : -f 1) + return $exitcode +} + +do_install() { + vcopy build/usr . +} diff --git a/common/environment/build-style/texmf.sh b/common/environment/build-style/texmf.sh new file mode 100644 index 00000000000..098b1b61c19 --- /dev/null +++ b/common/environment/build-style/texmf.sh @@ -0,0 +1,5 @@ +# rsync isn't needed for everything but it's far easier to just put it here +hostmakedepends+=" rsync" +# python_version isn't needed for everything either +python_version=3 +create_wrksrc=yes diff --git a/common/environment/build-style/texmf/ownership.txt b/common/environment/build-style/texmf/ownership.txt new file mode 100644 index 00000000000..8feffa24b63 --- /dev/null +++ b/common/environment/build-style/texmf/ownership.txt @@ -0,0 +1,229 @@ +dvipdfmx/dvipdfmx.cfg texlive +dvips/base/color.pro texlive +dvips/base/crop.pro texlive +dvips/base/finclude.pro texlive +dvips/base/hps.pro texlive +dvips/base/special.pro texlive +dvips/base/tex.pro texlive +dvips/base/texc.pro texlive +dvips/base/texps.pro texlive +dvips/gsftopk/render.ps texlive +dvips/xdvi/config.xdvi texlive +fonts/cmap/dvipdfmx/EUC-UCS2 texlive +fonts/enc/dvips/base/dvips-all.enc texlive +fonts/map/dvipdfmx/cid-x.map texlive +fonts/map/glyphlist/glyphlist.txt texlive +fonts/map/glyphlist/pdfglyphlist.txt texlive +psutils/paper.cfg texlive +scripts/a2ping/a2ping.pl texlive +scripts/accfonts/mkt1font texlive +scripts/accfonts/vpl2ovp texlive +scripts/accfonts/vpl2vpl texlive +scripts/adhocfilelist/adhocfilelist.sh texlive +scripts/arara/arara.sh texlive +scripts/attachfile2/pdfatfi.pl texlive +scripts/authorindex/authorindex texlive +scripts/authorindex/authorindex texlive +scripts/bib2gls/bib2gls.sh texlive +scripts/bib2gls/convertgls2bib.sh texlive +scripts/bibexport/bibexport.sh texlive +scripts/bundledoc/arlatex texlive +scripts/bundledoc/bundledoc texlive +scripts/cachepic/cachepic.tlu texlive-pictures +scripts/checkcites/checkcites.lua texlive +scripts/checklistings/checklistings.sh texlive +scripts/chklref/chklref.pl texlive +scripts/cjk-gs-integrate/cjk-gs-integrate.pl texlive +scripts/clojure-pamphlet/pamphletangler texlive +scripts/cluttex/cluttex.lua texlive +scripts/context/perl/mptopdf.pl texlive +scripts/context/stubs/unix/context texlive +scripts/context/stubs/unix/contextjit texlive +scripts/context/stubs/unix/luatools texlive +scripts/context/stubs/unix/mtxrun texlive +scripts/context/stubs/unix/mtxrunjit texlive +scripts/context/stubs/unix/texexec texlive +scripts/context/stubs/unix/texmfstart texlive +scripts/convbkmk/convbkmk.rb texlive-langjapanese +scripts/crossrefware/bbl2bib.pl texlive +scripts/crossrefware/bibdoiadd.pl texlive +scripts/crossrefware/bibmradd.pl texlive +scripts/crossrefware/biburl2doi.pl texlive +scripts/crossrefware/bibzbladd.pl texlive +scripts/crossrefware/ltx2crossrefxml.pl texlive +scripts/ctan-o-mat/ctan-o-mat.pl texlive +scripts/ctanbib/ctanbib texlive +scripts/ctanify/ctanify texlive +scripts/ctanupload/ctanupload.pl texlive +scripts/de-macro/de-macro texlive +scripts/diadia/diadia.lua texlive-humanities +scripts/dosepsbin/dosepsbin.pl texlive +scripts/dtxgen/dtxgen texlive +scripts/dviasm/dviasm.py texlive +scripts/dviinfox/dviinfox.pl texlive +scripts/epspdf/epspdf.tlu texlive +scripts/epspdf/epspdftk.tcl texlive +scripts/epstopdf/epstopdf.pl texlive +scripts/exceltex/exceltex texlive +scripts/exceltex/exceltex texlive +scripts/fig4latex/fig4latex texlive-pictures +scripts/findhyph/findhyph texlive +scripts/fontools/afm2afm texlive +scripts/fontools/autoinst texlive +scripts/fontools/ot2kpx texlive +scripts/fragmaster/fragmaster.pl texlive +scripts/getmap/getmapdl.lua texlive +scripts/glossaries/makeglossaries texlive +scripts/glossaries/makeglossaries texlive +scripts/glossaries/makeglossaries-lite.lua texlive +scripts/glossaries/makeglossaries-lite.lua texlive +scripts/installfont/installfont-tl texlive +scripts/jfmutil/jfmutil.pl texlive +scripts/ketcindy/ketcindy.pl texlive +scripts/kotex-utils/jamo-normalize.pl texlive-langkorean +scripts/kotex-utils/komkindex.pl texlive-langkorean +scripts/kotex-utils/ttf2kotexfont.pl texlive-langkorean +scripts/l3build/l3build.lua texlive-latexextra +scripts/latex-git-log/latex-git-log texlive +scripts/latex-papersize/latex-papersize.py texlive +scripts/latex2man/latex2man texlive +scripts/latex2nemeth/latex2nemeth texlive +scripts/latexdiff/latexdiff-vc.pl texlive +scripts/latexdiff/latexdiff.pl texlive +scripts/latexdiff/latexrevise.pl texlive +scripts/latexfileversion/latexfileversion texlive +scripts/latexindent/latexindent.pl texlive +scripts/latexmk/latexmk.pl texlive +scripts/latexpand/latexpand texlive +scripts/lilyglyphs/lily-glyph-commands.py texlive-music +scripts/lilyglyphs/lily-image-commands.py texlive-music +scripts/lilyglyphs/lily-rebuild-pdfs.py texlive-music +scripts/listbib/listbib texlive +scripts/listings-ext/listings-ext.sh texlive +scripts/ltxfileinfo/ltxfileinfo texlive +scripts/ltximg/ltximg.pl texlive +scripts/luaotfload/luaotfload-tool.lua texlive +scripts/lwarp/lwarpmk.lua texlive +scripts/m-tx/m-tx.lua texlive-music +scripts/make4ht/make4ht texlive +scripts/makedtx/makedtx.pl texlive +scripts/makedtx/makedtx.pl texlive +scripts/match_parens/match_parens texlive +scripts/mathspic/mathspic.pl texlive-pictures +scripts/mf2pt1/mf2pt1.pl texlive +scripts/mkgrkindex/mkgrkindex texlive-langgreek +scripts/mkjobtexmf/mkjobtexmf.pl texlive +scripts/mkpic/mkpic texlive-pictures +scripts/multibibliography/multibibliography.pl texlive +scripts/musixtex/musixflx.lua texlive-music +scripts/musixtex/musixtex.lua texlive-music +scripts/mf2pt1/mf2pt1.pl texlive +scripts/mkjobtexmf/mkjobtexmf.pl texlive +scripts/multibibliography/multibibliography.pl texlive +scripts/pax/pdfannotextractor.pl texlive +scripts/pax/pdfannotextractor.pl texlive +scripts/pdfbook2/pdfbook2 texlive +scripts/pdfcrop/pdfcrop.pl texlive +scripts/pdfjam/pdfjam texlive +scripts/pdflatexpicscale/pdflatexpicscale.pl texlive +scripts/pdftex-quiet/pdftex-quiet texlive +scripts/pdfxup/pdfxup texlive +scripts/pedigree-perl/pedigree.pl texlive-pstricks +scripts/perltex/perltex.pl texlive +scripts/perltex/perltex.pl texlive +scripts/petri-nets/pn2pdf texlive +scripts/pfarrei/a5toa4.tlu texlive +scripts/pfarrei/pfarrei.tlu texlive +scripts/pkfix-helper/pkfix-helper texlive +scripts/pkfix/pkfix.pl texlive +scripts/pmxchords/pmxchords.lua texlive-music +scripts/ps2eps/ps2eps.pl texlive +scripts/pst-pdf/ps4pdf texlive-pstricks +scripts/pst2pdf/pst2pdf.pl texlive-pstricks +scripts/psutils/extractres.pl texlive +scripts/psutils/includeres.pl texlive +scripts/psutils/psjoin.pl texlive +scripts/ptex-fontmaps/kanji-config-updmap-sys.sh texlive-langjapanese +scripts/ptex-fontmaps/kanji-config-updmap-user.sh texlive-langjapanese +scripts/ptex-fontmaps/kanji-config-updmap.pl texlive-langjapanese +scripts/ptex-fontmaps/kanji-fontmap-creator.pl texlive-langjapanese +scripts/ptex2pdf/ptex2pdf.lua texlive +scripts/ps2eps/ps2eps.pl texlive +scripts/psutils/extractres.pl texlive +scripts/psutils/includeres.pl texlive +scripts/psutils/psjoin.pl texlive +scripts/purifyeps/purifyeps texlive +scripts/pygmentex/pygmentex.py texlive-latexextra +scripts/pythontex/depythontex.py texlive +scripts/pythontex/pythontex.py texlive +scripts/rubik/rubikrotation.pl texlive-games +scripts/simpdftex/simpdftex texlive +scripts/splitindex/splitindex.pl texlive +scripts/splitindex/splitindex.pl texlive +scripts/srcredact/srcredact.pl texlive +scripts/sty2dtx/sty2dtx.pl texlive +scripts/svn-multi/svn-multi.pl texlive +scripts/svn-multi/svn-multi.pl texlive +scripts/tex4ebook/tex4ebook texlive +scripts/texcount/texcount.pl texlive +scripts/texdef/texdef.pl texlive +scripts/texdiff/texdiff texlive +scripts/texdirflatten/texdirflatten texlive +scripts/texdoc/texdoc.tlu texlive +scripts/texdoctk/texdoctk.pl texlive +scripts/texfot/texfot.pl texlive +scripts/texlive/tlmgr.pl texlive +scripts/texlive-extra/allcm.sh texlive +scripts/texlive-extra/allneeded.sh texlive +scripts/texlive-extra/dvi2fax.sh texlive +scripts/texlive-extra/dvired.sh texlive +scripts/texlive-extra/e2pall.pl texlive +scripts/texlive-extra/fontinst.sh texlive +scripts/texlive-extra/kpsetool.sh texlive +scripts/texlive-extra/kpsewhere.sh texlive +scripts/texlive-extra/ps2frag.sh texlive +scripts/texlive-extra/pslatex.sh texlive +scripts/texlive-extra/rubibtex.sh texlive-langcyrillic +scripts/texlive-extra/rumakeindex.sh texlive-langcyrillic +scripts/texlive-extra/texconfig-dialog.sh texlive +scripts/texlive-extra/texconfig-sys.sh texlive +scripts/texlive-extra/texconfig.sh texlive +scripts/texlive-extra/texlinks.sh texlive +scripts/texlive/fmtutil-sys.sh texlive +scripts/texlive/fmtutil-user.sh texlive +scripts/texlive/fmtutil.pl texlive +scripts/texlive/mktexlsr texlive +scripts/texlive/mktexmf texlive +scripts/texlive/mktexpk texlive +scripts/texlive/mktextfm texlive +scripts/texlive/rungs.tlu texlive +scripts/texlive/updmap-sys.sh texlive +scripts/texlive/updmap-user.sh texlive +scripts/texlive/updmap.pl texlive +scripts/texliveonfly/texliveonfly.py texlive +scripts/texloganalyser/texloganalyser texlive +scripts/texosquery/texosquery-jre5.sh texlive +scripts/texosquery/texosquery-jre8.sh texlive +scripts/texosquery/texosquery.sh texlive +scripts/texplate/texplate.sh texlive +scripts/thumbpdf/thumbpdf.pl texlive +scripts/tlshell/tlshell.tcl texlive +scripts/typeoutfileinfo/typeoutfileinfo.sh texlive +scripts/ulqda/ulqda.pl texlive-science +scripts/urlbst/urlbst texlive +scripts/vpe/vpe.pl texlive +scripts/vpe/vpe.pl texlive +scripts/webquiz/webquiz.py texlive +scripts/webquiz/webquiz.py texlive +scripts/wordcount/wordcount.sh texlive +scripts/wordcount/wordcount.sh texlive +scripts/xindex/xindex.lua texlive +scripts/yplan/yplan texlive +scripts/yplan/yplan texlive +texconfig/tcfmgr texlive +texconfig/tcfmgr.map texlive +web2c/fmtutil.cnf texlive +web2c/texmf.cnf texlive +xdvi/XDvi texlive +xdvi/pixmap/toolbar.xpm texlive +xdvi/pixmap/toolbar2.xpm texlive From e940ed791b72f96f04c2cda576f45b444c58a2d0 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 22 Jun 2020 10:16:28 +1000 Subject: [PATCH 386/410] New package: texlive-20200406 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: q66 Co-authored-by: Piotr Wójcik --- common/shlibs | 4 + srcpkgs/texlive-BibTeX | 1 + srcpkgs/texlive-ConTeXt | 1 + srcpkgs/texlive-LuaTeX | 1 + srcpkgs/texlive-LuaTeX-devel | 1 + srcpkgs/texlive-PythonTeX | 1 + srcpkgs/texlive-Xdvi | 1 + srcpkgs/texlive-XeTeX | 1 + srcpkgs/texlive-devel | 1 + srcpkgs/texlive-dvi | 1 + srcpkgs/texlive/files/duplicates.txt | 27 ++ srcpkgs/texlive/patches/cross-luajit.patch | 124 ++++++ .../texlive/patches/freetype2-config.patch | 102 +++++ .../patches/kpsewhich-default-progname.patch | 14 + .../texlive/patches/luajit-arch-fixes.patch | 50 +++ srcpkgs/texlive/template | 386 ++++++++++++++++++ 16 files changed, 716 insertions(+) create mode 120000 srcpkgs/texlive-BibTeX create mode 120000 srcpkgs/texlive-ConTeXt create mode 120000 srcpkgs/texlive-LuaTeX create mode 120000 srcpkgs/texlive-LuaTeX-devel create mode 120000 srcpkgs/texlive-PythonTeX create mode 120000 srcpkgs/texlive-Xdvi create mode 120000 srcpkgs/texlive-XeTeX create mode 120000 srcpkgs/texlive-devel create mode 120000 srcpkgs/texlive-dvi create mode 100644 srcpkgs/texlive/files/duplicates.txt create mode 100644 srcpkgs/texlive/patches/cross-luajit.patch create mode 100644 srcpkgs/texlive/patches/freetype2-config.patch create mode 100644 srcpkgs/texlive/patches/kpsewhich-default-progname.patch create mode 100644 srcpkgs/texlive/patches/luajit-arch-fixes.patch create mode 100644 srcpkgs/texlive/template diff --git a/common/shlibs b/common/shlibs index 878ca5a5ac6..af53130c471 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3980,3 +3980,7 @@ libselinux.so.1 libselinux-3.0_1 libsepol.so.1 libsepol-3.0_1 libfrrcares.so.0 libfrr-7.3.1_1 libhugetlbfs.so.0 libhugetlbfs-2.22_1 +libkpathsea.so.6 texlive-20200406_1 +libtexluajit.so.2 texlive-LuaTeX-20200406_1 +libtexlua53.so.5 texlive-LuaTeX-20200406_1 +libptexenc.so.1 texlive-20200406_1 diff --git a/srcpkgs/texlive-BibTeX b/srcpkgs/texlive-BibTeX new file mode 120000 index 00000000000..c6cca627ba9 --- /dev/null +++ b/srcpkgs/texlive-BibTeX @@ -0,0 +1 @@ +texlive \ No newline at end of file diff --git a/srcpkgs/texlive-ConTeXt b/srcpkgs/texlive-ConTeXt new file mode 120000 index 00000000000..c6cca627ba9 --- /dev/null +++ b/srcpkgs/texlive-ConTeXt @@ -0,0 +1 @@ +texlive \ No newline at end of file diff --git a/srcpkgs/texlive-LuaTeX b/srcpkgs/texlive-LuaTeX new file mode 120000 index 00000000000..c6cca627ba9 --- /dev/null +++ b/srcpkgs/texlive-LuaTeX @@ -0,0 +1 @@ +texlive \ No newline at end of file diff --git a/srcpkgs/texlive-LuaTeX-devel b/srcpkgs/texlive-LuaTeX-devel new file mode 120000 index 00000000000..c6cca627ba9 --- /dev/null +++ b/srcpkgs/texlive-LuaTeX-devel @@ -0,0 +1 @@ +texlive \ No newline at end of file diff --git a/srcpkgs/texlive-PythonTeX b/srcpkgs/texlive-PythonTeX new file mode 120000 index 00000000000..c6cca627ba9 --- /dev/null +++ b/srcpkgs/texlive-PythonTeX @@ -0,0 +1 @@ +texlive \ No newline at end of file diff --git a/srcpkgs/texlive-Xdvi b/srcpkgs/texlive-Xdvi new file mode 120000 index 00000000000..c6cca627ba9 --- /dev/null +++ b/srcpkgs/texlive-Xdvi @@ -0,0 +1 @@ +texlive \ No newline at end of file diff --git a/srcpkgs/texlive-XeTeX b/srcpkgs/texlive-XeTeX new file mode 120000 index 00000000000..c6cca627ba9 --- /dev/null +++ b/srcpkgs/texlive-XeTeX @@ -0,0 +1 @@ +texlive \ No newline at end of file diff --git a/srcpkgs/texlive-devel b/srcpkgs/texlive-devel new file mode 120000 index 00000000000..c6cca627ba9 --- /dev/null +++ b/srcpkgs/texlive-devel @@ -0,0 +1 @@ +texlive \ No newline at end of file diff --git a/srcpkgs/texlive-dvi b/srcpkgs/texlive-dvi new file mode 120000 index 00000000000..c6cca627ba9 --- /dev/null +++ b/srcpkgs/texlive-dvi @@ -0,0 +1 @@ +texlive \ No newline at end of file diff --git a/srcpkgs/texlive/files/duplicates.txt b/srcpkgs/texlive/files/duplicates.txt new file mode 100644 index 00000000000..c8fa8ec09de --- /dev/null +++ b/srcpkgs/texlive/files/duplicates.txt @@ -0,0 +1,27 @@ +/usr/share/texmf-dist/scripts/rubik/rubikrotation.pl +/usr/share/texmf-dist/scripts/diadia/diadia.lua +/usr/share/texmf-dist/scripts/ulqda/ulqda.pl +/usr/share/texmf-dist/scripts/cachepic/cachepic.tlu +/usr/share/texmf-dist/scripts/fig4latex/fig4latex +/usr/share/texmf-dist/scripts/mathspic/mathspic.pl +/usr/share/texmf-dist/scripts/mkpic/mkpic +/usr/share/texmf-dist/scripts/pygmentex/pygmentex.py +/usr/share/texmf-dist/scripts/convbkmk/convbkmk.rb +/usr/share/texmf-dist/scripts/ptex-fontmaps/kanji-config-updmap-sys.sh +/usr/share/texmf-dist/scripts/ptex-fontmaps/kanji-config-updmap-user.sh +/usr/share/texmf-dist/scripts/ptex-fontmaps/kanji-config-updmap.pl +/usr/share/texmf-dist/scripts/ptex-fontmaps/kanji-fontmap-creator.pl +/usr/share/texmf-dist/scripts/mkgrkindex/mkgrkindex +/usr/share/texmf-dist/scripts/kotex-utils/jamo-normalize.pl +/usr/share/texmf-dist/scripts/kotex-utils/komkindex.pl +/usr/share/texmf-dist/scripts/kotex-utils/ttf2kotexfont.pl +/usr/share/texmf-dist/scripts/lilyglyphs/lily-glyph-commands.py +/usr/share/texmf-dist/scripts/lilyglyphs/lily-image-commands.py +/usr/share/texmf-dist/scripts/lilyglyphs/lily-rebuild-pdfs.py +/usr/share/texmf-dist/scripts/m-tx/m-tx.lua +/usr/share/texmf-dist/scripts/musixtex/musixflx.lua +/usr/share/texmf-dist/scripts/musixtex/musixtex.lua +/usr/share/texmf-dist/scripts/pmxchords/pmxchords.lua +/usr/share/texmf-dist/scripts/pst-pdf/ps4pdf +/usr/share/texmf-dist/scripts/pedigree-perl/pedigree.pl +/usr/share/texmf-dist/scripts/pst2pdf/pst2pdf.pl diff --git a/srcpkgs/texlive/patches/cross-luajit.patch b/srcpkgs/texlive/patches/cross-luajit.patch new file mode 100644 index 00000000000..9655d7683db --- /dev/null +++ b/srcpkgs/texlive/patches/cross-luajit.patch @@ -0,0 +1,124 @@ +--- libs/luajit/native/Makefile.in 2018-09-07 06:40:04.000000000 +1000 ++++ libs/luajit/native/Makefile.in.new 2020-06-07 16:10:40.445000000 +1000 +@@ -154,6 +154,8 @@ + am__v_CC_1 = + CCLD = $(CC) + LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++HOSTCCLD = $(HOSTCC) ++HOSTLINK = $(HOSTCCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ + AM_V_CCLD = $(am__v_CCLD_@AM_V@) + am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) + am__v_CCLD_0 = @echo " CCLD " $@; +@@ -413,7 +415,7 @@ + + buildvm$(EXEEXT): $(buildvm_OBJECTS) $(buildvm_DEPENDENCIES) $(EXTRA_buildvm_DEPENDENCIES) + @rm -f buildvm$(EXEEXT) +- $(AM_V_CCLD)$(LINK) $(buildvm_OBJECTS) $(buildvm_LDADD) $(LIBS) ++ $(AM_V_CCLD)$(HOSTLINK) $(buildvm_OBJECTS) $(buildvm_LDADD) $(LIBS) + @LUAJIT_TREE@/src/host/minilua-minilua.$(OBJEXT): \ + @LUAJIT_TREE@/src/host/$(am__dirstamp) \ + @LUAJIT_TREE@/src/host/$(DEPDIR)/$(am__dirstamp) +@@ -459,74 +461,74 @@ + @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + + @LUAJIT_TREE@/src/host/buildvm-buildvm.o: @LUAJIT_TREE@/src/host/buildvm.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT @LUAJIT_TREE@/src/host/buildvm-buildvm.o -MD -MP -MF @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm.Tpo -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm.o `test -f '@LUAJIT_TREE@/src/host/buildvm.c' || echo '$(srcdir)/'`@LUAJIT_TREE@/src/host/buildvm.c ++@am__fastdepCC_TRUE@ $(AM_V_CC)$(HOSTCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT @LUAJIT_TREE@/src/host/buildvm-buildvm.o -MD -MP -MF @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm.Tpo -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm.o `test -f '@LUAJIT_TREE@/src/host/buildvm.c' || echo '$(srcdir)/'`@LUAJIT_TREE@/src/host/buildvm.c + @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm.Tpo @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='@LUAJIT_TREE@/src/host/buildvm.c' object='@LUAJIT_TREE@/src/host/buildvm-buildvm.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm.o `test -f '@LUAJIT_TREE@/src/host/buildvm.c' || echo '$(srcdir)/'`@LUAJIT_TREE@/src/host/buildvm.c ++@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(HOSTCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm.o `test -f '@LUAJIT_TREE@/src/host/buildvm.c' || echo '$(srcdir)/'`@LUAJIT_TREE@/src/host/buildvm.c + + @LUAJIT_TREE@/src/host/buildvm-buildvm.obj: @LUAJIT_TREE@/src/host/buildvm.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT @LUAJIT_TREE@/src/host/buildvm-buildvm.obj -MD -MP -MF @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm.Tpo -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm.obj `if test -f '@LUAJIT_TREE@/src/host/buildvm.c'; then $(CYGPATH_W) '@LUAJIT_TREE@/src/host/buildvm.c'; else $(CYGPATH_W) '$(srcdir)/@LUAJIT_TREE@/src/host/buildvm.c'; fi` ++@am__fastdepCC_TRUE@ $(AM_V_CC)$(HOSTCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT @LUAJIT_TREE@/src/host/buildvm-buildvm.obj -MD -MP -MF @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm.Tpo -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm.obj `if test -f '@LUAJIT_TREE@/src/host/buildvm.c'; then $(CYGPATH_W) '@LUAJIT_TREE@/src/host/buildvm.c'; else $(CYGPATH_W) '$(srcdir)/@LUAJIT_TREE@/src/host/buildvm.c'; fi` + @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm.Tpo @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='@LUAJIT_TREE@/src/host/buildvm.c' object='@LUAJIT_TREE@/src/host/buildvm-buildvm.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm.obj `if test -f '@LUAJIT_TREE@/src/host/buildvm.c'; then $(CYGPATH_W) '@LUAJIT_TREE@/src/host/buildvm.c'; else $(CYGPATH_W) '$(srcdir)/@LUAJIT_TREE@/src/host/buildvm.c'; fi` ++@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(HOSTCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm.obj `if test -f '@LUAJIT_TREE@/src/host/buildvm.c'; then $(CYGPATH_W) '@LUAJIT_TREE@/src/host/buildvm.c'; else $(CYGPATH_W) '$(srcdir)/@LUAJIT_TREE@/src/host/buildvm.c'; fi` + + @LUAJIT_TREE@/src/host/buildvm-buildvm_asm.o: @LUAJIT_TREE@/src/host/buildvm_asm.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT @LUAJIT_TREE@/src/host/buildvm-buildvm_asm.o -MD -MP -MF @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_asm.Tpo -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_asm.o `test -f '@LUAJIT_TREE@/src/host/buildvm_asm.c' || echo '$(srcdir)/'`@LUAJIT_TREE@/src/host/buildvm_asm.c ++@am__fastdepCC_TRUE@ $(AM_V_CC)$(HOSTCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT @LUAJIT_TREE@/src/host/buildvm-buildvm_asm.o -MD -MP -MF @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_asm.Tpo -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_asm.o `test -f '@LUAJIT_TREE@/src/host/buildvm_asm.c' || echo '$(srcdir)/'`@LUAJIT_TREE@/src/host/buildvm_asm.c + @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_asm.Tpo @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_asm.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='@LUAJIT_TREE@/src/host/buildvm_asm.c' object='@LUAJIT_TREE@/src/host/buildvm-buildvm_asm.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_asm.o `test -f '@LUAJIT_TREE@/src/host/buildvm_asm.c' || echo '$(srcdir)/'`@LUAJIT_TREE@/src/host/buildvm_asm.c ++@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(HOSTCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_asm.o `test -f '@LUAJIT_TREE@/src/host/buildvm_asm.c' || echo '$(srcdir)/'`@LUAJIT_TREE@/src/host/buildvm_asm.c + + @LUAJIT_TREE@/src/host/buildvm-buildvm_asm.obj: @LUAJIT_TREE@/src/host/buildvm_asm.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT @LUAJIT_TREE@/src/host/buildvm-buildvm_asm.obj -MD -MP -MF @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_asm.Tpo -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_asm.obj `if test -f '@LUAJIT_TREE@/src/host/buildvm_asm.c'; then $(CYGPATH_W) '@LUAJIT_TREE@/src/host/buildvm_asm.c'; else $(CYGPATH_W) '$(srcdir)/@LUAJIT_TREE@/src/host/buildvm_asm.c'; fi` ++@am__fastdepCC_TRUE@ $(AM_V_CC)$(HOSTCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT @LUAJIT_TREE@/src/host/buildvm-buildvm_asm.obj -MD -MP -MF @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_asm.Tpo -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_asm.obj `if test -f '@LUAJIT_TREE@/src/host/buildvm_asm.c'; then $(CYGPATH_W) '@LUAJIT_TREE@/src/host/buildvm_asm.c'; else $(CYGPATH_W) '$(srcdir)/@LUAJIT_TREE@/src/host/buildvm_asm.c'; fi` + @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_asm.Tpo @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_asm.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='@LUAJIT_TREE@/src/host/buildvm_asm.c' object='@LUAJIT_TREE@/src/host/buildvm-buildvm_asm.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_asm.obj `if test -f '@LUAJIT_TREE@/src/host/buildvm_asm.c'; then $(CYGPATH_W) '@LUAJIT_TREE@/src/host/buildvm_asm.c'; else $(CYGPATH_W) '$(srcdir)/@LUAJIT_TREE@/src/host/buildvm_asm.c'; fi` ++@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(HOSTCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_asm.obj `if test -f '@LUAJIT_TREE@/src/host/buildvm_asm.c'; then $(CYGPATH_W) '@LUAJIT_TREE@/src/host/buildvm_asm.c'; else $(CYGPATH_W) '$(srcdir)/@LUAJIT_TREE@/src/host/buildvm_asm.c'; fi` + + @LUAJIT_TREE@/src/host/buildvm-buildvm_fold.o: @LUAJIT_TREE@/src/host/buildvm_fold.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT @LUAJIT_TREE@/src/host/buildvm-buildvm_fold.o -MD -MP -MF @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_fold.Tpo -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_fold.o `test -f '@LUAJIT_TREE@/src/host/buildvm_fold.c' || echo '$(srcdir)/'`@LUAJIT_TREE@/src/host/buildvm_fold.c ++@am__fastdepCC_TRUE@ $(AM_V_CC)$(HOSTCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT @LUAJIT_TREE@/src/host/buildvm-buildvm_fold.o -MD -MP -MF @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_fold.Tpo -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_fold.o `test -f '@LUAJIT_TREE@/src/host/buildvm_fold.c' || echo '$(srcdir)/'`@LUAJIT_TREE@/src/host/buildvm_fold.c + @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_fold.Tpo @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_fold.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='@LUAJIT_TREE@/src/host/buildvm_fold.c' object='@LUAJIT_TREE@/src/host/buildvm-buildvm_fold.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_fold.o `test -f '@LUAJIT_TREE@/src/host/buildvm_fold.c' || echo '$(srcdir)/'`@LUAJIT_TREE@/src/host/buildvm_fold.c ++@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(HOSTCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_fold.o `test -f '@LUAJIT_TREE@/src/host/buildvm_fold.c' || echo '$(srcdir)/'`@LUAJIT_TREE@/src/host/buildvm_fold.c + + @LUAJIT_TREE@/src/host/buildvm-buildvm_fold.obj: @LUAJIT_TREE@/src/host/buildvm_fold.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT @LUAJIT_TREE@/src/host/buildvm-buildvm_fold.obj -MD -MP -MF @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_fold.Tpo -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_fold.obj `if test -f '@LUAJIT_TREE@/src/host/buildvm_fold.c'; then $(CYGPATH_W) '@LUAJIT_TREE@/src/host/buildvm_fold.c'; else $(CYGPATH_W) '$(srcdir)/@LUAJIT_TREE@/src/host/buildvm_fold.c'; fi` ++@am__fastdepCC_TRUE@ $(AM_V_CC)$(HOSTCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT @LUAJIT_TREE@/src/host/buildvm-buildvm_fold.obj -MD -MP -MF @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_fold.Tpo -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_fold.obj `if test -f '@LUAJIT_TREE@/src/host/buildvm_fold.c'; then $(CYGPATH_W) '@LUAJIT_TREE@/src/host/buildvm_fold.c'; else $(CYGPATH_W) '$(srcdir)/@LUAJIT_TREE@/src/host/buildvm_fold.c'; fi` + @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_fold.Tpo @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_fold.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='@LUAJIT_TREE@/src/host/buildvm_fold.c' object='@LUAJIT_TREE@/src/host/buildvm-buildvm_fold.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_fold.obj `if test -f '@LUAJIT_TREE@/src/host/buildvm_fold.c'; then $(CYGPATH_W) '@LUAJIT_TREE@/src/host/buildvm_fold.c'; else $(CYGPATH_W) '$(srcdir)/@LUAJIT_TREE@/src/host/buildvm_fold.c'; fi` ++@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(HOSTCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_fold.obj `if test -f '@LUAJIT_TREE@/src/host/buildvm_fold.c'; then $(CYGPATH_W) '@LUAJIT_TREE@/src/host/buildvm_fold.c'; else $(CYGPATH_W) '$(srcdir)/@LUAJIT_TREE@/src/host/buildvm_fold.c'; fi` + + @LUAJIT_TREE@/src/host/buildvm-buildvm_lib.o: @LUAJIT_TREE@/src/host/buildvm_lib.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT @LUAJIT_TREE@/src/host/buildvm-buildvm_lib.o -MD -MP -MF @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_lib.Tpo -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_lib.o `test -f '@LUAJIT_TREE@/src/host/buildvm_lib.c' || echo '$(srcdir)/'`@LUAJIT_TREE@/src/host/buildvm_lib.c ++@am__fastdepCC_TRUE@ $(AM_V_CC)$(HOSTCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT @LUAJIT_TREE@/src/host/buildvm-buildvm_lib.o -MD -MP -MF @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_lib.Tpo -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_lib.o `test -f '@LUAJIT_TREE@/src/host/buildvm_lib.c' || echo '$(srcdir)/'`@LUAJIT_TREE@/src/host/buildvm_lib.c + @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_lib.Tpo @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_lib.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='@LUAJIT_TREE@/src/host/buildvm_lib.c' object='@LUAJIT_TREE@/src/host/buildvm-buildvm_lib.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_lib.o `test -f '@LUAJIT_TREE@/src/host/buildvm_lib.c' || echo '$(srcdir)/'`@LUAJIT_TREE@/src/host/buildvm_lib.c ++@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(HOSTCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_lib.o `test -f '@LUAJIT_TREE@/src/host/buildvm_lib.c' || echo '$(srcdir)/'`@LUAJIT_TREE@/src/host/buildvm_lib.c + + @LUAJIT_TREE@/src/host/buildvm-buildvm_lib.obj: @LUAJIT_TREE@/src/host/buildvm_lib.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT @LUAJIT_TREE@/src/host/buildvm-buildvm_lib.obj -MD -MP -MF @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_lib.Tpo -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_lib.obj `if test -f '@LUAJIT_TREE@/src/host/buildvm_lib.c'; then $(CYGPATH_W) '@LUAJIT_TREE@/src/host/buildvm_lib.c'; else $(CYGPATH_W) '$(srcdir)/@LUAJIT_TREE@/src/host/buildvm_lib.c'; fi` ++@am__fastdepCC_TRUE@ $(AM_V_CC)$(HOSTCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT @LUAJIT_TREE@/src/host/buildvm-buildvm_lib.obj -MD -MP -MF @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_lib.Tpo -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_lib.obj `if test -f '@LUAJIT_TREE@/src/host/buildvm_lib.c'; then $(CYGPATH_W) '@LUAJIT_TREE@/src/host/buildvm_lib.c'; else $(CYGPATH_W) '$(srcdir)/@LUAJIT_TREE@/src/host/buildvm_lib.c'; fi` + @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_lib.Tpo @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_lib.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='@LUAJIT_TREE@/src/host/buildvm_lib.c' object='@LUAJIT_TREE@/src/host/buildvm-buildvm_lib.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_lib.obj `if test -f '@LUAJIT_TREE@/src/host/buildvm_lib.c'; then $(CYGPATH_W) '@LUAJIT_TREE@/src/host/buildvm_lib.c'; else $(CYGPATH_W) '$(srcdir)/@LUAJIT_TREE@/src/host/buildvm_lib.c'; fi` ++@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(HOSTCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_lib.obj `if test -f '@LUAJIT_TREE@/src/host/buildvm_lib.c'; then $(CYGPATH_W) '@LUAJIT_TREE@/src/host/buildvm_lib.c'; else $(CYGPATH_W) '$(srcdir)/@LUAJIT_TREE@/src/host/buildvm_lib.c'; fi` + + @LUAJIT_TREE@/src/host/buildvm-buildvm_peobj.o: @LUAJIT_TREE@/src/host/buildvm_peobj.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT @LUAJIT_TREE@/src/host/buildvm-buildvm_peobj.o -MD -MP -MF @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_peobj.Tpo -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_peobj.o `test -f '@LUAJIT_TREE@/src/host/buildvm_peobj.c' || echo '$(srcdir)/'`@LUAJIT_TREE@/src/host/buildvm_peobj.c ++@am__fastdepCC_TRUE@ $(AM_V_CC)$(HOSTCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT @LUAJIT_TREE@/src/host/buildvm-buildvm_peobj.o -MD -MP -MF @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_peobj.Tpo -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_peobj.o `test -f '@LUAJIT_TREE@/src/host/buildvm_peobj.c' || echo '$(srcdir)/'`@LUAJIT_TREE@/src/host/buildvm_peobj.c + @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_peobj.Tpo @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_peobj.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='@LUAJIT_TREE@/src/host/buildvm_peobj.c' object='@LUAJIT_TREE@/src/host/buildvm-buildvm_peobj.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_peobj.o `test -f '@LUAJIT_TREE@/src/host/buildvm_peobj.c' || echo '$(srcdir)/'`@LUAJIT_TREE@/src/host/buildvm_peobj.c ++@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(HOSTCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_peobj.o `test -f '@LUAJIT_TREE@/src/host/buildvm_peobj.c' || echo '$(srcdir)/'`@LUAJIT_TREE@/src/host/buildvm_peobj.c + + @LUAJIT_TREE@/src/host/buildvm-buildvm_peobj.obj: @LUAJIT_TREE@/src/host/buildvm_peobj.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT @LUAJIT_TREE@/src/host/buildvm-buildvm_peobj.obj -MD -MP -MF @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_peobj.Tpo -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_peobj.obj `if test -f '@LUAJIT_TREE@/src/host/buildvm_peobj.c'; then $(CYGPATH_W) '@LUAJIT_TREE@/src/host/buildvm_peobj.c'; else $(CYGPATH_W) '$(srcdir)/@LUAJIT_TREE@/src/host/buildvm_peobj.c'; fi` ++@am__fastdepCC_TRUE@ $(AM_V_CC)$(HOSTCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT @LUAJIT_TREE@/src/host/buildvm-buildvm_peobj.obj -MD -MP -MF @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_peobj.Tpo -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_peobj.obj `if test -f '@LUAJIT_TREE@/src/host/buildvm_peobj.c'; then $(CYGPATH_W) '@LUAJIT_TREE@/src/host/buildvm_peobj.c'; else $(CYGPATH_W) '$(srcdir)/@LUAJIT_TREE@/src/host/buildvm_peobj.c'; fi` + @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_peobj.Tpo @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_peobj.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='@LUAJIT_TREE@/src/host/buildvm_peobj.c' object='@LUAJIT_TREE@/src/host/buildvm-buildvm_peobj.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_peobj.obj `if test -f '@LUAJIT_TREE@/src/host/buildvm_peobj.c'; then $(CYGPATH_W) '@LUAJIT_TREE@/src/host/buildvm_peobj.c'; else $(CYGPATH_W) '$(srcdir)/@LUAJIT_TREE@/src/host/buildvm_peobj.c'; fi` ++@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(HOSTCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_peobj.obj `if test -f '@LUAJIT_TREE@/src/host/buildvm_peobj.c'; then $(CYGPATH_W) '@LUAJIT_TREE@/src/host/buildvm_peobj.c'; else $(CYGPATH_W) '$(srcdir)/@LUAJIT_TREE@/src/host/buildvm_peobj.c'; fi` + + @LUAJIT_TREE@/src/host/minilua-minilua.o: @LUAJIT_TREE@/src/host/minilua.c + @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(minilua_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT @LUAJIT_TREE@/src/host/minilua-minilua.o -MD -MP -MF @LUAJIT_TREE@/src/host/$(DEPDIR)/minilua-minilua.Tpo -c -o @LUAJIT_TREE@/src/host/minilua-minilua.o `test -f '@LUAJIT_TREE@/src/host/minilua.c' || echo '$(srcdir)/'`@LUAJIT_TREE@/src/host/minilua.c +@@ -914,7 +922,7 @@ + $(buildvm_OBJECTS): buildvm_arch.h + + buildvm_arch.h: minilua$(EXEEXT) $(LUAJIT_TREE)/dynasm/dynasm.lua +- $(AM_V_GEN)./minilua $(srcdir)/$(LUAJIT_TREE)/dynasm/dynasm.lua \ ++ lua $(srcdir)/$(LUAJIT_TREE)/dynasm/dynasm.lua \ + `cat ../dynasm_flags` \ + -o $@ $(srcdir)/$(LUAJIT_TREE)/src/vm_$(DASM_ARCH).dasc + diff --git a/srcpkgs/texlive/patches/freetype2-config.patch b/srcpkgs/texlive/patches/freetype2-config.patch new file mode 100644 index 00000000000..cef6d7532ba --- /dev/null +++ b/srcpkgs/texlive/patches/freetype2-config.patch @@ -0,0 +1,102 @@ +Disables the use of freetype2-config. Does some weird stuff on +i686, armv5tel, ppc*, etc. No harm caused by disabling it +everywhere. + +--- texk/dvipng/configure 2020-06-08 10:00:42.953000000 +1000 ++++ texk/dvipng/configure 2020-06-08 10:00:57.069000000 +1000 +@@ -16432,10 +16432,7 @@ + else + PKG_CONFIG="$ac_cv_prog_PKG_CONFIG" + fi +-if $FT2_CONFIG --ftversion >/dev/null 2>&1; then +- FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags` +- FREETYPE2_LIBS=`$FT2_CONFIG --libs` +-elif $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then ++if $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then + FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2` + FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2` + elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then +--- configure 2020-06-08 10:03:04.785000000 +1000 ++++ configure 2020-06-08 10:01:47.902000000 +1000 +@@ -21471,10 +21471,7 @@ + else + PKG_CONFIG="$ac_cv_prog_PKG_CONFIG" + fi +-if $FT2_CONFIG --ftversion >/dev/null 2>&1; then +- FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags` +- FREETYPE2_LIBS=`$FT2_CONFIG --libs` +-elif $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then ++if $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then + FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2` + FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2` + elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then +--- libs/gd/configure 2019-03-26 04:27:50.000000000 +1100 ++++ libs/gd/configure 2020-06-08 10:06:28.481000000 +1000 +@@ -5933,10 +5933,7 @@ + else + PKG_CONFIG="$ac_cv_prog_PKG_CONFIG" + fi +-if $FT2_CONFIG --ftversion >/dev/null 2>&1; then +- FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags` +- FREETYPE2_LIBS=`$FT2_CONFIG --libs` +-elif $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then ++if $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then + FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2` + FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2` + elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then +--- texk/dvisvgm/configure 2020-03-22 09:04:56.000000000 +1100 ++++ texk/dvisvgm/configure 2020-06-08 10:08:15.384000000 +1000 +@@ -21794,10 +21794,7 @@ + else + PKG_CONFIG="$ac_cv_prog_PKG_CONFIG" + fi +-if $FT2_CONFIG --ftversion >/dev/null 2>&1; then +- FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags` +- FREETYPE2_LIBS=`$FT2_CONFIG --libs` +-elif $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then ++if $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then + FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2` + FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2` + elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then +--- texk/xdvik/configure 2020-03-02 06:07:53.000000000 +1100 ++++ texk/xdvik/configure 2020-06-08 10:08:15.731000000 +1000 +@@ -19055,10 +19055,7 @@ + else + PKG_CONFIG="$ac_cv_prog_PKG_CONFIG" + fi +-if $FT2_CONFIG --ftversion >/dev/null 2>&1; then +- FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags` +- FREETYPE2_LIBS=`$FT2_CONFIG --libs` +-elif $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then ++if $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then + FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2` + FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2` + elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then +--- texk/web2c/configure 2020-01-17 09:02:50.000000000 +1100 ++++ texk/web2c/configure 2020-06-08 10:08:15.533000000 +1000 +@@ -25346,10 +25346,7 @@ + else + PKG_CONFIG="$ac_cv_prog_PKG_CONFIG" + fi +-if $FT2_CONFIG --ftversion >/dev/null 2>&1; then +- FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags` +- FREETYPE2_LIBS=`$FT2_CONFIG --libs` +-elif $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then ++if $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then + FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2` + FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2` + elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then +--- texk/ttf2pk2/configure 2019-03-26 04:27:50.000000000 +1100 ++++ texk/ttf2pk2/configure 2020-06-08 10:08:15.656000000 +1000 +@@ -15265,10 +15265,7 @@ + else + PKG_CONFIG="$ac_cv_prog_PKG_CONFIG" + fi +-if $FT2_CONFIG --ftversion >/dev/null 2>&1; then +- FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags` +- FREETYPE2_LIBS=`$FT2_CONFIG --libs` +-elif $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then ++if $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then + FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2` + FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2` + elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then diff --git a/srcpkgs/texlive/patches/kpsewhich-default-progname.patch b/srcpkgs/texlive/patches/kpsewhich-default-progname.patch new file mode 100644 index 00000000000..eecdf544f48 --- /dev/null +++ b/srcpkgs/texlive/patches/kpsewhich-default-progname.patch @@ -0,0 +1,14 @@ +The default progname really should be kpsewhich, and makes a test +pass which otherwise fails. + +--- texk/kpathsea/kpsewhich.c 2020-07-01 19:07:23.592000000 +1000 ++++ texk/kpathsea/kpsewhich.c 2020-07-01 19:07:33.999000000 +1000 +@@ -60,7 +60,7 @@ + boolean must_exist = false; + + /* The program name, for `.PROG' construct in texmf.cnf. (-program) */ +-string progname = NULL; ++string progname = "kpsewhich"; + + /* Safe input and output names to check. (-safe-in-name and -safe-out-name) */ + string safe_in_name = NULL; diff --git a/srcpkgs/texlive/patches/luajit-arch-fixes.patch b/srcpkgs/texlive/patches/luajit-arch-fixes.patch new file mode 100644 index 00000000000..658c0a90aa2 --- /dev/null +++ b/srcpkgs/texlive/patches/luajit-arch-fixes.patch @@ -0,0 +1,50 @@ +Have texluajit recognize ppc64 ELFv2 ABI and therefore emit correct dynasm +stuff. + +Also, fix luajittex crashing on non-x86 64-bit systems (MAP_32BIT only exists +on x86 and defining it on other systems will activate a codepath in luajit +that segfaults). + +Author: q66 + +--- libs/luajit/configure ++++ libs/luajit/configure +@@ -14243,7 +14243,7 @@ else + fi + if grep 'LJ_ARCH_BITS 64' conftest.i >/dev/null 2>&1; then : + echo '-D P64' >>dynasm_flags +- if test "x$LJHOST" = xLinux; then : ++ if test "x$LJHOST" = xLinux -a "x$LJARCH" = xx64; then : + LUAJIT_DEFINES="$LUAJIT_DEFINES -DMAP_32BIT=0x40" + fi + fi +@@ -14294,6 +14294,9 @@ fi + fi + if grep 'LJ_ARCH_PPC32ON64 1' conftest.i >/dev/null 2>&1; then : + echo '-D GPR64' >>dynasm_flags ++fi ++ if grep 'LJ_ARCH_PPC_ELFV2 1' conftest.i >/dev/null 2>&1; then : ++ echo '-D ELFV2' >>dynasm_flags + fi + if grep 'LJ_ARCH_PPC64 ' conftest.i >/dev/null 2>&1; then : + DASM_ARCH=ppc64 +--- libs/luajit/m4/lj-system.m4 ++++ libs/luajit/m4/lj-system.m4 +@@ -52,7 +52,7 @@ AS_IF([grep 'LJ_LE' conftest.i >/dev/null 2>&1], + [echo '-D ENDIAN_BE' >>dynasm_flags]) + AS_IF([grep 'LJ_ARCH_BITS 64' conftest.i >/dev/null 2>&1], + [echo '-D P64' >>dynasm_flags +- AS_IF([test "x$LJHOST" = xLinux], ++ AS_IF([test "x$LJHOST" = xLinux -a "x$LJARCH" = xx64], + [LUAJIT_DEFINES="$LUAJIT_DEFINES -DMAP_32BIT=0x40"])]) + AS_IF([grep 'LJ_HASJIT 1' conftest.i >/dev/null 2>&1], + [echo '-D JIT' >>dynasm_flags]) +@@ -84,6 +84,8 @@ AS_CASE([$LJARCH], + [echo '-D ROUND' >>dynasm_flags]) + AS_IF([grep 'LJ_ARCH_PPC32ON64 1' conftest.i >/dev/null 2>&1], + [echo '-D GPR64' >>dynasm_flags]) ++ AS_IF([grep 'LJ_ARCH_PPC_ELFV2 1' conftest.i >/dev/null 2>&1], ++ [echo '-D ELFV2' >>dynasm_flags]) + AS_IF([grep 'LJ_ARCH_PPC64 ' conftest.i >/dev/null 2>&1], + [DASM_ARCH=ppc64]) + AS_IF([test "x$LJHOST" = xPS3], diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template new file mode 100644 index 00000000000..49bd3053240 --- /dev/null +++ b/srcpkgs/texlive/template @@ -0,0 +1,386 @@ +# Template file for 'texlive' +pkgname=texlive +version=20200406 +revision=1 +wrksrc="texlive-${version}-source" +build_wrksrc="build" +build_style=gnu-configure +configure_script="../configure" +configure_args=" + --enable-biber + --enable-epsfwin + --enable-ipc + --enable-luajittex + --enable-luajithbtex + --enable-mfluajit + --enable-mfluajit-nowin + --enable-luatex + --enable-luahbtex + --enable-mflua + --enable-mfluajit + --enable-mfluajit-nowin + --enable-mftalkwin + --enable-regiswin + --enable-shared + --enable-tektronixwin + --enable-unitermwin + --enable-xetex + --enable-dvipng + --enable-dvipsk + --enable-ps2eps + --enable-psutils + --disable-bibtex-x + --disable-chktex + --disable-cjkutils + --disable-detex + --disable-dialog + --disable-dvi2tty + --disable-dvisvgm + --disable-largefile + --disable-lcdf-typetools + --disable-multiplatform + --disable-native-texlive-build + --disable-pdfopen + --disable-ps2pkm + --disable-t1utils + --disable-tex4htk + --disable-ttf2pk2 + --disable-vlna + --disable-xindy + --with-ps=gs + --with-banner-add=/VoidLinux + --with-system-cairo + --with-system-freetype2 + --with-system-gd + --with-system-graphite2 + --with-system-gmp + --with-system-harfbuzz + --with-system-icu + --with-system-libpaper + --with-system-libpng + --with-system-mpfr + --with-system-poppler + --with-system-pixman + --with-system-teckit + --with-system-xpdf + --with-system-zlib + --with-system-zziplib + --with-xdvi-x-toolkit=Xaw" +hostmakedepends="pkg-config perl lua52-BitOp texinfo" +makedepends="cairo-devel freetype-devel gd-devel graphite-devel gmp-devel + harfbuzz-devel icu-devel libpaper-devel libpng-devel mpfr-devel + poppler-devel pixman-devel libteckit-devel zlib-devel zziplib-devel + libXaw-devel" +depends="dialog ghostscript perl-Tk texlive-core" +short_desc="TeX Live" +maintainer="fosslinux " +license="GPL-2.0-or-later" +homepage="https://www.tug.org/texlive/" +distfiles="ftp://tug.org/texlive/historic/2020/texlive-${version}-source.tar.xz" +checksum=e32f3d08cbbbcf21d8d3f96f2143b64a1f5e4cb01b06b761d6249c8785249078 +python_version=3 + +if [ "$CROSS_BUILD" ] ; then + # Tangle is required for cross compile + hostmakedepends+=" texlive" +fi + +case "$XBPS_TARGET_MACHINE" in + mips*) broken="cannot find libraries" ;; +esac + +build_options="luajit" + +_luajit_host_cc="cc" +if [ "$XBPS_WORDSIZE" != "$XBPS_TARGET_WORDSIZE" ] ; then + case "$XBPS_MACHINE" in + x86_64*) + hostmakedepends+=" cross-i686-linux-musl" + _luajit_host_cc="i686-linux-musl-gcc -static" + ;; + ppc64le*) _luajit_host_cc="broken" ;; # no 32-bit counterpart yet + ppc64*) + hostmakedepends+=" cross-powerpc-linux-musl" + _luajit_host_cc="powerpc-linux-musl-gcc -static" + ;; + *) _luajit_host_cc="broken" ;; + esac +fi + +if [ "${_luajit_host_cc}" != "broken" ] ; then + build_options_default+=" luajit" +fi + +if [ ! "$build_option_luajit" ] ; then + configure_args+=" --disable-luajittex --disable-mfluajit + --disable-mfluajit-nowin --disable-luajithbtex" +else + if [ "${_luajit_host_cc}" = "broken" ] ; then + nocross="Cannot cross compile LuaJIT for different wordsizes" + fi +fi + +case "$XBPS_TARGET_MACHINE" in + aarch64*) DASM_ARCH=arm64 ;; + arm*) DASM_ARCH=arm ;; + mips64*) DASM_ARCH=mips64 ;; + mips*) DASM_ARCH=mips ;; + ppc*) DASM_ARCH=ppc ;; + i686*) DASM_ARCH=x86 ;; + x86_64*) DASM_ARCH=x64 ;; +esac +export DASM_ARCH + +post_extract() { + # pdftex poppler compatibility + cp -pv texk/web2c/pdftexdir/pdftoepdf{-poppler0.76.0,}.cc + cp -pv texk/web2c/pdftexdir/pdftosrc{-poppler0.76.0,}.cc + + mkdir -p "${build_wrksrc}" + cp -rf texk/web2c "${build_wrksrc}/web2c-host" +} + +post_patch() { + pushd "${wrksrc}/libs/luajit/LuaJIT-src" + + # Apply all LuaJIT patches first + for i in ${XBPS_SRCPKGDIR}/LuaJIT/patches/*.patch ; do + # This patch breaks the build + if [ "$(basename ${i})" != "get-rid-of-luajit-version-sym.patch" ] ; then + msg_normal "patching: $(basename ${i})\n" + patch -sNp0 -i ${i} + fi + done + + # Per-architecture patches + # ppc/ppc64: LuaJIT patches + local patchdir + + case "$XBPS_TARGET_MACHINE" in + ppc64*) patchdir="ppc64" ;; + ppc*) patchdir="ppc" ;; + *) popd; return ;; + esac + + for i in ${XBPS_SRCPKGDIR}/LuaJIT/files/patches/${patchdir}/*.patch ; do + msg_normal "patching: $(basename ${i})\n" + patch -sNp0 -i ${i} + done + + popd +} + +pre_configure() { + if [ "$CROSS_BUILD" ] ; then + # For some reason, when cross-building, the configure script has this path + # for freetype2 include: + # /usr/x86_64-linux-musl/usr/x86_64-linux-musl/usr/include/freetype2. + # It shouldn't have two /usr/x86_64-linux-musl's, add it to CPPFLAGS. + CPPFLAGS="-I${XBPS_CROSS_BASE}/usr/include/freetype2" + fi +} + +pre_build() { + if [ -n "$build_option_luajit" ] ; then + export HOST_CC="${_luajit_host_cc}" + export HOSTCC="${_luajit_host_cc}" + if [ -n "$CROSS_BUILD" ] ; then + # LuaJIT configure script does not cross compile correctly + local _cflags=$CFLAGS + local _ldflags=$LDFLAGS + unset CFLAGS LDFLAGS + mkdir -p "${wrksrc}/build/libs/luajit/native" + cd "${wrksrc}/build/libs/luajit/native" + PREFIX=/usr HOST_LUA=lua5.2 HOST_CFLAGS="$XBPS_CFLAGS" \ + HOST_LDFLAGS="$XBPS_LDFLAGS" TARGET_CFLAGS="${_cflags}" \ + TARGET_LDFLAGS="${_ldflags}" CROSS="${XBPS_CROSS_TRIPLET}-" \ + ../../../../libs/luajit/native/configure \ + --build=${XBPS_TRIPLET} \ + --host=${XBPS_CROSS_TRIPLET} \ + --target=${XBPS_CROSS_TRIPLET} + CFLAGS="${_cflags}" + LDFLAGS="${_ldflags}" + # Replace configure script with dummy script + cd "${wrksrc}" + cat > libs/luajit/native/configure << EOF +#!/bin/sh +printf "already complete\\n" +EOF + fi + fi + + # web2c should not be cross + mkdir -p "${wrksrc}/build/texk/web2c/web2c" + cd "${wrksrc}/build/texk/web2c/web2c" + unset CC CXX + CFLAGS="$XBPS_CFLAGS" LDFLAGS="$XBPS_LDFLAGS" RANLIB=ranlib \ + ../../../../texk/web2c/web2c/configure + + # Replace configure script with dummy script + cd "${wrksrc}" + cat > texk/web2c/web2c/configure << EOF +#!/bin/sh +printf "already complete\\n" +EOF +} + +post_install() { + cp -rf ${wrksrc}/texk/tests/TeXLive \ + "${DESTDIR}/usr/share/texmf-dist/scripts/texlive" + sed -i -e 's:^\(TEXMFROOT *= *\)$SELFAUTOPARENT$:\1/usr/share:g' \ + "${DESTDIR}/usr/share/texmf-dist/web2c/texmf.cnf" + # Remove files provided by other texlive-* packages + while IFS=' ' read -r f p ; do + if [ "$p" = "$pkgname" ] && ! [ -e "${DESTDIR}/usr/share/texmf-dist/${f}" ]; then + msg_error "$pkgver: missing file $f\n" + elif [ "$p" != "$pkgname" ] && [ -e "${DESTDIR}/usr/share/texmf-dist/${f}" ]; then + echo "removed $f" + mkdir -p ${DESTDIR}/usr/share/texlive/removed + echo "$f" >> ${DESTDIR}/usr/share/texlive/removed/$pkgname.txt + rm -f "${DESTDIR}/usr/share/texmf-dist/$f" + fi + done < "${XBPS_COMMONDIR}/environment/build-style/texmf/ownership.txt" + for cmd in amstex cslatex csplain eplain etex jadetex latex lollipop mex \ + llatex mltex pdfetex pdfcslatex pdfcsplain pdfjadetex pdflatex \ + pdfmex pdfxmltex texsis utf8mex xmltex ; do + ln -s pdftex "${DESTDIR}/usr/bin/${cmd}" + done + ln -s eptex "${DESTDIR}/usr/bin/platex" + ln -s euptex "${DESTDIR}/usr/bin/uplatex" +} + +texlive-XeTeX_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - engine supporting modern typography" + pkg_install() { + vmove usr/bin/xetex + for cmd in xelatex xelollipop ; do + ln -s xetex "${PKGDESTDIR}/usr/bin/${cmd}" + done + } +} + +texlive-dvi_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - tools for dvi based workflow" + pkg_install() { + for i in afm2tfm bbox epsffit extractres includeres ps2eps psbook psjoin \ + psnup psresize psselect pstops ; do + vmove "usr/bin/${i}" + done + vmove usr/bin/dvi* + } +} + +texlive-LuaTeX_package() { + depends="${sourcepkg}>=${version}_${revision} bash" + short_desc+=" - extended pdfTeX using Lua" + pkg_install() { + if [ "$build_option_luajit" ] ; then + for i in luajittex mfluajit mfluajit-nowin luajithbtex texluajit \ + texluajitc ; do + vmove "usr/bin/${i}" + done + fi + for i in checkcites cllualatex cluttex diadia getmapdl l3build luahbtex \ + luaotfload-tool luatools luatex lwarpmk m-tx \ + makeglossaries-lite mflua mflua-nowin musixflx musixtex pmxchords \ + ptex2pdf texlua texluac xindex ; do + vmove "usr/bin/${i}" + done + for i in checkcites cluttex diadia getmap glossaries/makeglossaries-lite.lua \ + l3build luaotfload lwarp m-tx musixtex pmxchords ptex2pdf xindex ; do + vmove "usr/share/texmf-dist/scripts/${i}" + done + for i in luatex texlua texluac ; do + vmove "usr/share/man/man1/${i}.1" + done + vmove "usr/lib/libtexlua*.so.*" + for cmd in dvilualatex dviluatex lualollipop lualatex ; do + ln -s luatex "${PKGDESTDIR}/usr/bin/${cmd}" + done + } +} + +texlive-LuaTeX-devel_package() { + depends="${sourcepkg}-devel>=${version}_${revision} + ${sourcepkg}-LuaTeX>=${version}_${revision}" + short_desc+=" - extended pdfTeX using Lua - development files" + pkg_install() { + for i in texlua53 $(vopt_if luajit texluajit); do + vmove "usr/include/${i}" + vmove "usr/lib/lib${i}.a" + vmove "usr/lib/lib${i}.so" + vmove "usr/lib/pkgconfig/${i}.pc" + done + } +} + +texlive-Xdvi_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - displaying DVI files on the X window system" + pkg_install() { + for i in xdvi xdvi-xaw xdvipdfmx ; do + vmove "usr/bin/${i}" + done + vmove usr/share/texmf-dist/xdvi + for i in xdvi xdvipdfmx ; do + vmove "usr/share/man/man1/${i}.1" + done + vmove usr/share/applications/xdvi.desktop + } +} + +texlive-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + for i in kpathsea ptexenc synctex; do + vmove "usr/include/${i}" + vmove "usr/lib/lib${i}.a" + vmove "usr/lib/lib${i}.so" + vmove "usr/lib/pkgconfig/${i}.pc" + done + } +} + +texlive-BibTeX_package() { + depends="${sourcepkg}>=${version}_${revision} bash" + short_desc+=" - reference management software" + pkg_install() { + for i in bbl2bib ctanbib ; do + vmove "usr/bin/${i}" + done + for i in bib2gls bibexport ; do + vmove "usr/share/texmf-dist/scripts/${i}" + done + vmove usr/bin/bib* + vmove usr/share/man/man1/bibtex.1 + } +} + +texlive-ConTeXt_package() { + depends="${sourcepkg}>=${version}_${revision} perl ghostscript" + short_desc+=" - alternative general-purpose document processor" + pkg_install() { + for i in context contextjit mptopdf mtxrun mtxrunjit texexec \ + texmfstart dosepsbin epspdf epspdftk purifyeps repstopdf ; do + vmove "usr/bin/${i}" + done + for i in context dosepsbin epspdf epstopdf ps2eps purifyeps ; do + vmove "usr/share/texmf-dist/scripts/${i}" + done + for i in epsffit ps2eps ; do + vmove "usr/share/man/man1/${i}.1" + done + } +} + +texlive-PythonTeX_package() { + depends="${sourcepkg}>=${version}_${revision} python3" + short_desc+=" - executing Python in LaTeX" + pkg_install() { + vmove usr/bin/*pythontex + vmove usr/share/texmf-dist/scripts/pythontex + } +} From 84f245bda9b03cee06a83fd45dbee750ea37d94d Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 22 Jun 2020 11:19:28 +1000 Subject: [PATCH 387/410] New package: texlive-core-2020.55416 --- srcpkgs/texlive-core/files/duplicates.txt | 148 ++++++++++++++++++++++ srcpkgs/texlive-core/template | 12 ++ 2 files changed, 160 insertions(+) create mode 100644 srcpkgs/texlive-core/files/duplicates.txt create mode 100644 srcpkgs/texlive-core/template diff --git a/srcpkgs/texlive-core/files/duplicates.txt b/srcpkgs/texlive-core/files/duplicates.txt new file mode 100644 index 00000000000..743023321a3 --- /dev/null +++ b/srcpkgs/texlive-core/files/duplicates.txt @@ -0,0 +1,148 @@ +/usr/share/texmf-dist/psutils/paper.cfg +/usr/share/texmf-dist/scripts/a2ping/a2ping.pl +/usr/share/texmf-dist/scripts/accfonts/mkt1font +/usr/share/texmf-dist/scripts/accfonts/vpl2ovp +/usr/share/texmf-dist/scripts/accfonts/vpl2vpl +/usr/share/texmf-dist/scripts/adhocfilelist/adhocfilelist.sh +/usr/share/texmf-dist/scripts/arara/arara.sh +/usr/share/texmf-dist/scripts/attachfile2/pdfatfi.pl +/usr/share/texmf-dist/scripts/bundledoc/arlatex +/usr/share/texmf-dist/scripts/bundledoc/bundledoc +/usr/share/texmf-dist/scripts/checklistings/checklistings.sh +/usr/share/texmf-dist/scripts/chklref/chklref.pl +/usr/share/texmf-dist/scripts/cjk-gs-integrate/cjk-gs-integrate.pl +/usr/share/texmf-dist/scripts/clojure-pamphlet/pamphletangler +/usr/share/texmf-dist/scripts/context/perl/mptopdf.pl +/usr/share/texmf-dist/scripts/context/stubs/unix/context +/usr/share/texmf-dist/scripts/context/stubs/unix/contextjit +/usr/share/texmf-dist/scripts/context/stubs/unix/mtxrun +/usr/share/texmf-dist/scripts/context/stubs/unix/mtxrunjit +/usr/share/texmf-dist/scripts/context/stubs/unix/texexec +/usr/share/texmf-dist/scripts/context/stubs/unix/texmfstart +/usr/share/texmf-dist/scripts/ctan-o-mat/ctan-o-mat.pl +/usr/share/texmf-dist/scripts/ctanbib/ctanbib +/usr/share/texmf-dist/scripts/ctanify/ctanify +/usr/share/texmf-dist/scripts/ctanupload/ctanupload.pl +/usr/share/texmf-dist/scripts/de-macro/de-macro +/usr/share/texmf-dist/scripts/dosepsbin/dosepsbin.pl +/usr/share/texmf-dist/scripts/dtxgen/dtxgen +/usr/share/texmf-dist/scripts/dviasm/dviasm.py +/usr/share/texmf-dist/scripts/dviinfox/dviinfox.pl +/usr/share/texmf-dist/scripts/epstopdf/epstopdf.pl +/usr/share/texmf-dist/scripts/findhyph/findhyph +/usr/share/texmf-dist/scripts/fontools/afm2afm +/usr/share/texmf-dist/scripts/fontools/autoinst +/usr/share/texmf-dist/scripts/fontools/ot2kpx +/usr/share/texmf-dist/scripts/fragmaster/fragmaster.pl +/usr/share/texmf-dist/scripts/jfmutil/jfmutil.pl +/usr/share/texmf-dist/scripts/ketcindy/ketcindy.pl +/usr/share/texmf-dist/scripts/latex-git-log/latex-git-log +/usr/share/texmf-dist/scripts/latex-papersize/latex-papersize.py +/usr/share/texmf-dist/scripts/latex2man/latex2man +/usr/share/texmf-dist/scripts/latex2nemeth/latex2nemeth +/usr/share/texmf-dist/scripts/latexdiff/latexdiff-vc.pl +/usr/share/texmf-dist/scripts/latexdiff/latexdiff.pl +/usr/share/texmf-dist/scripts/latexdiff/latexrevise.pl +/usr/share/texmf-dist/scripts/latexfileversion/latexfileversion +/usr/share/texmf-dist/scripts/latexmk/latexmk.pl +/usr/share/texmf-dist/scripts/latexpand/latexpand +/usr/share/texmf-dist/scripts/listings-ext/listings-ext.sh +/usr/share/texmf-dist/scripts/ltxfileinfo/ltxfileinfo +/usr/share/texmf-dist/scripts/ltximg/ltximg.pl +/usr/share/texmf-dist/scripts/make4ht/make4ht +/usr/share/texmf-dist/scripts/match_parens/match_parens +/usr/share/texmf-dist/scripts/mf2pt1/mf2pt1.pl +/usr/share/texmf-dist/scripts/mkjobtexmf/mkjobtexmf.pl +/usr/share/texmf-dist/scripts/pdfbook2/pdfbook2 +/usr/share/texmf-dist/scripts/pdfcrop/pdfcrop.pl +/usr/share/texmf-dist/scripts/pdfjam/pdfjam +/usr/share/texmf-dist/scripts/pdflatexpicscale/pdflatexpicscale.pl +/usr/share/texmf-dist/scripts/pdftex-quiet/pdftex-quiet +/usr/share/texmf-dist/scripts/pdfxup/pdfxup +/usr/share/texmf-dist/scripts/pfarrei/a5toa4.tlu +/usr/share/texmf-dist/scripts/pfarrei/pfarrei.tlu +/usr/share/texmf-dist/scripts/pkfix/pkfix.pl +/usr/share/texmf-dist/scripts/pkfix-helper/pkfix-helper +/usr/share/texmf-dist/scripts/ps2eps/ps2eps.pl +/usr/share/texmf-dist/scripts/psutils/extractres.pl +/usr/share/texmf-dist/scripts/psutils/includeres.pl +/usr/share/texmf-dist/scripts/psutils/psjoin.pl +/usr/share/texmf-dist/scripts/purifyeps/purifyeps +/usr/share/texmf-dist/scripts/pythontex/depythontex.py +/usr/share/texmf-dist/scripts/pythontex/pythontex.py +/usr/share/texmf-dist/scripts/simpdftex/simpdftex +/usr/share/texmf-dist/scripts/srcredact/srcredact.pl +/usr/share/texmf-dist/scripts/sty2dtx/sty2dtx.pl +/usr/share/texmf-dist/scripts/tex4ebook/tex4ebook +/usr/share/texmf-dist/scripts/texcount/texcount.pl +/usr/share/texmf-dist/scripts/texdef/texdef.pl +/usr/share/texmf-dist/scripts/texdiff/texdiff +/usr/share/texmf-dist/scripts/texdirflatten/texdirflatten +/usr/share/texmf-dist/scripts/texdoc/texdoc.tlu +/usr/share/texmf-dist/scripts/texdoctk/texdoctk.pl +/usr/share/texmf-dist/scripts/texfot/texfot.pl +/usr/share/texmf-dist/scripts/texlive/fmtutil-sys.sh +/usr/share/texmf-dist/scripts/texlive/fmtutil-user.sh +/usr/share/texmf-dist/scripts/texlive/fmtutil.pl +/usr/share/texmf-dist/scripts/texlive/mktexlsr +/usr/share/texmf-dist/scripts/texlive/mktexmf +/usr/share/texmf-dist/scripts/texlive/mktexpk +/usr/share/texmf-dist/scripts/texlive/mktextfm +/usr/share/texmf-dist/scripts/texlive/rungs.tlu +/usr/share/texmf-dist/scripts/texlive/updmap-sys.sh +/usr/share/texmf-dist/scripts/texlive/updmap-user.sh +/usr/share/texmf-dist/scripts/texlive/updmap.pl +/usr/share/texmf-dist/scripts/texlive-extra/allcm.sh +/usr/share/texmf-dist/scripts/texlive-extra/allneeded.sh +/usr/share/texmf-dist/scripts/texlive-extra/dvi2fax.sh +/usr/share/texmf-dist/scripts/texlive-extra/dvired.sh +/usr/share/texmf-dist/scripts/texlive-extra/e2pall.pl +/usr/share/texmf-dist/scripts/texlive-extra/fontinst.sh +/usr/share/texmf-dist/scripts/texlive-extra/kpsetool.sh +/usr/share/texmf-dist/scripts/texlive-extra/kpsewhere.sh +/usr/share/texmf-dist/scripts/texlive-extra/ps2frag.sh +/usr/share/texmf-dist/scripts/texlive-extra/pslatex.sh +/usr/share/texmf-dist/scripts/texlive-extra/texconfig-dialog.sh +/usr/share/texmf-dist/scripts/texlive-extra/texconfig-sys.sh +/usr/share/texmf-dist/scripts/texlive-extra/texconfig.sh +/usr/share/texmf-dist/scripts/texlive-extra/texlinks.sh +/usr/share/texmf-dist/scripts/texliveonfly/texliveonfly.py +/usr/share/texmf-dist/scripts/texloganalyser/texloganalyser +/usr/share/texmf-dist/scripts/texosquery/texosquery-jre5.sh +/usr/share/texmf-dist/scripts/texosquery/texosquery-jre8.sh +/usr/share/texmf-dist/scripts/texosquery/texosquery.sh +/usr/share/texmf-dist/scripts/texplate/texplate.sh +/usr/share/texmf-dist/scripts/thumbpdf/thumbpdf.pl +/usr/share/texmf-dist/scripts/typeoutfileinfo/typeoutfileinfo.sh +/usr/share/texmf-dist/web2c/texmf.cnf +/usr/share/texmf-dist/dvipdfmx/dvipdfmx.cfg +/usr/share/texmf-dist/dvips/base/color.pro +/usr/share/texmf-dist/dvips/base/crop.pro +/usr/share/texmf-dist/dvips/base/finclude.pro +/usr/share/texmf-dist/dvips/base/hps.pro +/usr/share/texmf-dist/dvips/base/special.pro +/usr/share/texmf-dist/dvips/base/tex.pro +/usr/share/texmf-dist/dvips/base/texc.pro +/usr/share/texmf-dist/dvips/base/texps.pro +/usr/share/texmf-dist/dvips/gsftopk/render.ps +/usr/share/texmf-dist/dvips/xdvi/config.xdvi +/usr/share/texmf-dist/fonts/cmap/dvipdfmx/EUC-UCS2 +/usr/share/texmf-dist/fonts/enc/dvips/base/dvips-all.enc +/usr/share/texmf-dist/fonts/map/dvipdfmx/cid-x.map +/usr/share/texmf-dist/fonts/map/glyphlist/glyphlist.txt +/usr/share/texmf-dist/fonts/map/glyphlist/pdfglyphlist.txt +/usr/share/texmf-dist/scripts/context/stubs/unix/luatools +/usr/share/texmf-dist/scripts/checkcites/checkcites.lua +/usr/share/texmf-dist/scripts/cluttex/cluttex.lua +/usr/share/texmf-dist/scripts/lwarp/lwarpmk.lua +/usr/share/texmf-dist/scripts/xindex/xindex.lua +/usr/share/texmf-dist/xdvi/XDvi +/usr/share/texmf-dist/xdvi/pixmap/toolbar.xpm +/usr/share/texmf-dist/xdvi/pixmap/toolbar2.xpm +/usr/share/texmf-dist/scripts/installfont/installfont-tl +/usr/share/texmf-dist/scripts/tlshell/tlshell.tcl +/usr/share/texmf-dist/texconfig/tcfmgr +/usr/share/texmf-dist/texconfig/tcfmgr.map +/usr/share/texmf-dist/web2c/fmtutil.cnf +/usr/share/texmf-dist/scripts/latexindent/latexindent.pl +/usr/share/texmf-dist/scripts/luaotfload/luaotfload-tool.lua diff --git a/srcpkgs/texlive-core/template b/srcpkgs/texlive-core/template new file mode 100644 index 00000000000..694c8bcb3d0 --- /dev/null +++ b/srcpkgs/texlive-core/template @@ -0,0 +1,12 @@ +# Template file for 'texlive-core' +pkgname=texlive-core +version=2020.55416 +revision=1 +archs="noarch" +build_style="texmf" +short_desc="TeX Live - core texmf distribution" +maintainer="fosslinux " +license="GPL-2.0-or-later" +homepage="http://tug.org/texlive" +distfiles="https://sources.archlinux.org/other/texlive/${pkgname}-${version}-src.zip" +checksum=8e025c2dfa4e19dcb6aa5e661874d2c2a158aa2e1a078c11a4ddd6347bd9db45 From fd156f7889819a18bd53aa830f151b9bf97a4e66 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 22 Jun 2020 10:16:51 +1000 Subject: [PATCH 388/410] New package: texlive-bibtexextra-2020.55376 --- srcpkgs/texlive-bibtexextra/files/duplicates.txt | 12 ++++++++++++ srcpkgs/texlive-bibtexextra/template | 13 +++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 srcpkgs/texlive-bibtexextra/files/duplicates.txt create mode 100644 srcpkgs/texlive-bibtexextra/template diff --git a/srcpkgs/texlive-bibtexextra/files/duplicates.txt b/srcpkgs/texlive-bibtexextra/files/duplicates.txt new file mode 100644 index 00000000000..958f647ec1e --- /dev/null +++ b/srcpkgs/texlive-bibtexextra/files/duplicates.txt @@ -0,0 +1,12 @@ +/usr/share/texmf-dist/scripts/crossrefware/bbl2bib.pl +/usr/share/texmf-dist/scripts/crossrefware/bibdoiadd.pl +/usr/share/texmf-dist/scripts/crossrefware/bibmradd.pl +/usr/share/texmf-dist/scripts/crossrefware/biburl2doi.pl +/usr/share/texmf-dist/scripts/crossrefware/bibzbladd.pl +/usr/share/texmf-dist/scripts/crossrefware/ltx2crossrefxml.pl +/usr/share/texmf-dist/scripts/listbib/listbib +/usr/share/texmf-dist/scripts/multibibliography/multibibliography.pl +/usr/share/texmf-dist/scripts/urlbst/urlbst +/usr/share/texmf-dist/scripts/bib2gls/bib2gls.sh +/usr/share/texmf-dist/scripts/bib2gls/convertgls2bib.sh +/usr/share/texmf-dist/scripts/bibexport/bibexport.sh diff --git a/srcpkgs/texlive-bibtexextra/template b/srcpkgs/texlive-bibtexextra/template new file mode 100644 index 00000000000..e5954e1c364 --- /dev/null +++ b/srcpkgs/texlive-bibtexextra/template @@ -0,0 +1,13 @@ +# Template file for 'texlive-bibtexextra' +pkgname=texlive-bibtexextra +version=2020.55376 +revision=1 +archs="noarch" +build_style="texmf" +depends="texlive-core" +short_desc="TeX Live - Additional BibTeX styles and bibliography databases" +maintainer="fosslinux " +license="GPL-2.0-or-later" +homepage="http://tug.org/texlive/" +distfiles="https://sources.archlinux.org/other/texlive/${pkgname}-${version}-src.zip" +checksum=f886188aa015f8450519a22cca61b7dc929bb206c90f5de8947a1a949f762f4a From ff85c5f54c0b8c47617d297487af9011fe30af6f Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 22 Jun 2020 10:17:28 +1000 Subject: [PATCH 389/410] New package: texlive-fontsextra-2020.55407 --- srcpkgs/texlive-fontsextra/template | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 srcpkgs/texlive-fontsextra/template diff --git a/srcpkgs/texlive-fontsextra/template b/srcpkgs/texlive-fontsextra/template new file mode 100644 index 00000000000..a80ea7cd234 --- /dev/null +++ b/srcpkgs/texlive-fontsextra/template @@ -0,0 +1,13 @@ +# Template file for 'texlive-fontsextra' +pkgname=texlive-fontsextra +version=2020.55407 +revision=1 +archs="noarch" +build_style="texmf" +depends="texlive-core" +short_desc="TeX Live - All sorts of extra fonts" +maintainer="fosslinux " +license="GPL-2.0-or-later" +homepage="http://tug.org/texlive/" +distfiles="https://sources.archlinux.org/other/texlive/${pkgname}-${version}-src.zip" +checksum=25e1060c699f09e02924bf27902b162d7af5a6cc2d0c898f83c09ca0928d9060 From 8cf435bc344e6819729ea2b44999702aef38a9ea Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 22 Jun 2020 10:17:39 +1000 Subject: [PATCH 390/410] New package: texlive-formatsextra-2020.54498 --- srcpkgs/texlive-formatsextra/template | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 srcpkgs/texlive-formatsextra/template diff --git a/srcpkgs/texlive-formatsextra/template b/srcpkgs/texlive-formatsextra/template new file mode 100644 index 00000000000..85704c43687 --- /dev/null +++ b/srcpkgs/texlive-formatsextra/template @@ -0,0 +1,13 @@ +# Template file for 'texlive-formatsextra' +pkgname=texlive-formatsextra +version=2020.54498 +revision=1 +archs="noarch" +build_style="texmf" +depends="texlive-core" +short_desc="TeX Live - Collection of extra TeX 'formats'" +maintainer="fosslinux " +license="GPL-2.0-or-later" +homepage="http://tug.org/texlive/" +distfiles="https://sources.archlinux.org/other/texlive/${pkgname}-${version}-src.zip" +checksum=897881410cc6144478c40cee45d976950a60bd5f86f798857d57501b3c2a4bf0 From 138610f37c35c46a8c4db96ced1e3b6c03f0ac48 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 22 Jun 2020 10:17:47 +1000 Subject: [PATCH 391/410] New package: texlive-games-2020.55271 --- srcpkgs/texlive-games/template | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 srcpkgs/texlive-games/template diff --git a/srcpkgs/texlive-games/template b/srcpkgs/texlive-games/template new file mode 100644 index 00000000000..d5a8209c893 --- /dev/null +++ b/srcpkgs/texlive-games/template @@ -0,0 +1,13 @@ +# Template file for 'texlive-games' +pkgname=texlive-games +version=2020.55271 +revision=1 +archs="noarch" +build_style="texmf" +depends="texlive-core" +short_desc="TeX Live - Typesetting board games" +maintainer="fosslinux " +license="GPL-2.0-or-later" +homepage="http://tug.org/texlive/" +distfiles="https://sources.archlinux.org/other/texlive/${pkgname}-${version}-src.zip" +checksum=8fee7616c18bd8c53cdea108d2d17583b88ace4a97fe6d23f13d32c56397885b From 39ffb5e92da84dd5287875207d740b16c7826dab Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 22 Jun 2020 10:17:54 +1000 Subject: [PATCH 392/410] New package: texlive-humanities-2020.55389 --- srcpkgs/texlive-humanities/template | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 srcpkgs/texlive-humanities/template diff --git a/srcpkgs/texlive-humanities/template b/srcpkgs/texlive-humanities/template new file mode 100644 index 00000000000..e1b06eacfd4 --- /dev/null +++ b/srcpkgs/texlive-humanities/template @@ -0,0 +1,13 @@ +# Template file for 'texlive-humanities' +pkgname=texlive-humanities +version=2020.55389 +revision=1 +archs="noarch" +build_style="texmf" +depends="texlive-core texlive-latexextra texlive-pictures" +short_desc="TeX Live - Packages for humanities, law, linguistics, etc" +maintainer="fosslinux " +license="GPL-2.0-or-later" +homepage="http://tug.org/texlive/" +distfiles="https://sources.archlinux.org/other/texlive/${pkgname}-${version}-src.zip" +checksum=528bc27a2ba5410a76d4ab509b97d0ea87038fde1b65f4254fb0d94805c1f3e5 From ac2bfefab05c79c2eca923c10ad2ad065a2807a8 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 22 Jun 2020 10:18:03 +1000 Subject: [PATCH 393/410] New package: texlive-langchinese-2020.55162 --- srcpkgs/texlive-langchinese/template | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 srcpkgs/texlive-langchinese/template diff --git a/srcpkgs/texlive-langchinese/template b/srcpkgs/texlive-langchinese/template new file mode 100644 index 00000000000..4fa5ee940eb --- /dev/null +++ b/srcpkgs/texlive-langchinese/template @@ -0,0 +1,13 @@ +# Template file for 'texlive-langchinese' +pkgname=texlive-langchinese +version=2020.55162 +revision=1 +archs="noarch" +build_style="texmf" +depends="texlive-core" +short_desc="TeX Live - Fonts and macro packages for typesetting Chinese" +maintainer="fosslinux " +license="GPL-2.0-or-later" +homepage="http://tug.org/texlive/" +distfiles="https://sources.archlinux.org/other/texlive/${pkgname}-${version}-src.zip" +checksum=4ed294a09e69ca853fd9a141103ad4d4f6282afc3dcc058e18415acfd71f8883 From 6083399624289f5816f80e66ce7f07f95e2aa2b6 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 22 Jun 2020 10:18:13 +1000 Subject: [PATCH 394/410] New package: texlive-langcyrillic-2020.54594 --- srcpkgs/texlive-langcyrillic/template | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 srcpkgs/texlive-langcyrillic/template diff --git a/srcpkgs/texlive-langcyrillic/template b/srcpkgs/texlive-langcyrillic/template new file mode 100644 index 00000000000..80b953954c5 --- /dev/null +++ b/srcpkgs/texlive-langcyrillic/template @@ -0,0 +1,13 @@ +# Template file for 'texlive-langcyrillic' +pkgname=texlive-langcyrillic +version=2020.54594 +revision=1 +archs="noarch" +build_style="texmf" +depends="texlive-core" +short_desc="TeX Live - Fonts and macro packages for typesetting Cyrillic text" +maintainer="fosslinux " +license="GPL-2.0-or-later" +homepage="http://tug.org/texlive/" +distfiles="https://sources.archlinux.org/other/texlive/${pkgname}-${version}-src.zip" +checksum=42cb98a93a1cb9437691d24d4aae64360b260da036f874cb6644aa7bc8a47c67 From fe22a949cb049db257a805cdd21629f7f82a3e34 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 22 Jun 2020 10:18:24 +1000 Subject: [PATCH 395/410] New package: texlive-langextra-2020.55417 --- srcpkgs/texlive-langextra/template | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 srcpkgs/texlive-langextra/template diff --git a/srcpkgs/texlive-langextra/template b/srcpkgs/texlive-langextra/template new file mode 100644 index 00000000000..ac20ff46333 --- /dev/null +++ b/srcpkgs/texlive-langextra/template @@ -0,0 +1,13 @@ +# Template file for 'texlive-langextra' +pkgname=texlive-langextra +version=2020.55417 +revision=1 +archs="noarch" +build_style="texmf" +depends="texlive-core texlive-latexextra" +short_desc="TeX Live - Packages for a bunch of extra languages" +maintainer="fosslinux " +license="GPL-2.0-or-later" +homepage="http://tug.org/texlive/" +distfiles="https://sources.archlinux.org/other/texlive/${pkgname}-${version}-src.zip" +checksum=b92cff8917d8f44071de42307c9f5d72d0be8999d789d1d407225d010f026ac9 From 36f0f7e4c35d136f5b670f9634d575010e37720e Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 22 Jun 2020 10:18:31 +1000 Subject: [PATCH 396/410] New package: texlive-langgreek-2020.54512 --- srcpkgs/texlive-langgreek/template | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 srcpkgs/texlive-langgreek/template diff --git a/srcpkgs/texlive-langgreek/template b/srcpkgs/texlive-langgreek/template new file mode 100644 index 00000000000..fe279f6ea13 --- /dev/null +++ b/srcpkgs/texlive-langgreek/template @@ -0,0 +1,13 @@ +# Template file for 'texlive-langgreek' +pkgname=texlive-langgreek +version=2020.54512 +revision=1 +archs="noarch" +build_style="texmf" +depends="texlive-core" +short_desc="TeX Live - Fonts and macro packages for typesetting Greek" +maintainer="fosslinux " +license="GPL-2.0-or-later" +homepage="http://tug.org/texlive/" +distfiles="https://sources.archlinux.org/other/texlive/${pkgname}-${version}-src.zip" +checksum=72c7c9b7ab23df11edf2ec2430a97d8a45885316ccbcfa7bc62684b3f2e9188b From cb4b86f9446f58322461d14be564f48cd5788f8c Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 22 Jun 2020 10:18:42 +1000 Subject: [PATCH 397/410] New package: texlive-langjapanese-2020.55320 --- srcpkgs/texlive-langjapanese/files/duplicates.txt | 1 + srcpkgs/texlive-langjapanese/template | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 srcpkgs/texlive-langjapanese/files/duplicates.txt create mode 100644 srcpkgs/texlive-langjapanese/template diff --git a/srcpkgs/texlive-langjapanese/files/duplicates.txt b/srcpkgs/texlive-langjapanese/files/duplicates.txt new file mode 100644 index 00000000000..e12bf7aa036 --- /dev/null +++ b/srcpkgs/texlive-langjapanese/files/duplicates.txt @@ -0,0 +1 @@ +/usr/share/texmf-dist/scripts/ptex2pdf/ptex2pdf.lua diff --git a/srcpkgs/texlive-langjapanese/template b/srcpkgs/texlive-langjapanese/template new file mode 100644 index 00000000000..cd10461aea0 --- /dev/null +++ b/srcpkgs/texlive-langjapanese/template @@ -0,0 +1,13 @@ +# Template file for 'texlive-langjapanese' +pkgname=texlive-langjapanese +version=2020.55320 +revision=1 +archs="noarch" +build_style="texmf" +depends="texlive-core" +short_desc="TeX Live - Fonts and macro packages for typesetting Japanese" +maintainer="fosslinux " +license="GPL-2.0-or-later" +homepage="http://tug.org/texlive/" +distfiles="https://sources.archlinux.org/other/texlive/${pkgname}-${version}-src.zip" +checksum=2e2538c9c81ed69530ce78b1dd132eaa54832276e614d6907bafeec17a1c3a90 From f5f5ee86d98a4b34680111e3e5f2b7ac125e1865 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 22 Jun 2020 10:18:50 +1000 Subject: [PATCH 398/410] New package: texlive-langkorean-2020.54519 --- srcpkgs/texlive-langkorean/template | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 srcpkgs/texlive-langkorean/template diff --git a/srcpkgs/texlive-langkorean/template b/srcpkgs/texlive-langkorean/template new file mode 100644 index 00000000000..281ac6c1864 --- /dev/null +++ b/srcpkgs/texlive-langkorean/template @@ -0,0 +1,13 @@ +# Template file for 'texlive-langkorean' +pkgname=texlive-langkorean +version=2020.54519 +revision=1 +archs="noarch" +build_style="texmf" +depends="texlive-core" +short_desc="TeX Live - Fonts and macro packages for typesetting Korean" +maintainer="fosslinux " +license="GPL-2.0-or-later" +homepage="http://tug.org/texlive/" +distfiles="https://sources.archlinux.org/other/texlive/${pkgname}-${version}-src.zip" +checksum=dfc1e1434bbc10442009e9c3e28609ae45aeda96930df899d365eea38423f66e From ddde3c28f8e21d70c7fb4efce258cfef7e5a0d7e Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 22 Jun 2020 10:19:00 +1000 Subject: [PATCH 399/410] New package: texlive-latexextra-2020.55418 --- srcpkgs/texlive-latexextra/files/duplicates.txt | 14 ++++++++++++++ srcpkgs/texlive-latexextra/template | 14 ++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 srcpkgs/texlive-latexextra/files/duplicates.txt create mode 100644 srcpkgs/texlive-latexextra/template diff --git a/srcpkgs/texlive-latexextra/files/duplicates.txt b/srcpkgs/texlive-latexextra/files/duplicates.txt new file mode 100644 index 00000000000..b1431e7b9a1 --- /dev/null +++ b/srcpkgs/texlive-latexextra/files/duplicates.txt @@ -0,0 +1,14 @@ +/usr/share/texmf-dist/scripts/authorindex/authorindex +/usr/share/texmf-dist/scripts/exceltex/exceltex +/usr/share/texmf-dist/scripts/glossaries/makeglossaries +/usr/share/texmf-dist/scripts/makedtx/makedtx.pl +/usr/share/texmf-dist/scripts/pax/pdfannotextractor.pl +/usr/share/texmf-dist/scripts/perltex/perltex.pl +/usr/share/texmf-dist/scripts/pygmentex/pygmentex.py +/usr/share/texmf-dist/scripts/splitindex/splitindex.pl +/usr/share/texmf-dist/scripts/svn-multi/svn-multi.pl +/usr/share/texmf-dist/scripts/vpe/vpe.pl +/usr/share/texmf-dist/scripts/webquiz/webquiz.py +/usr/share/texmf-dist/scripts/wordcount/wordcount.sh +/usr/share/texmf-dist/scripts/yplan/yplan +/usr/share/texmf-dist/scripts/glossaries/makeglossaries-lite.lua diff --git a/srcpkgs/texlive-latexextra/template b/srcpkgs/texlive-latexextra/template new file mode 100644 index 00000000000..bb9ac9c418f --- /dev/null +++ b/srcpkgs/texlive-latexextra/template @@ -0,0 +1,14 @@ +# Template file for 'texlive-latexextra' +pkgname=texlive-latexextra +version=2020.55418 +revision=1 +archs="noarch" +build_style="texmf" +depends="perl-File-Which python3-Pygments texlive-core texlive-pictures" +short_desc="TeX Live - Collection of LaTeX addon packages" +maintainer="fosslinux " +license="GPL-2.0-or-later" +homepage="http://tug.org/texlive/" +distfiles="https://sources.archlinux.org/other/texlive/${pkgname}-${version}-src.zip" +checksum=a2ee21a2a6f00def6bec620a85bb8116de97a16dcd98adaa308eb455fe0e7fcb +python_version=3 From 021a7a35bd3b8e23294e7a1353ee6b1c60e89a4c Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 22 Jun 2020 10:19:07 +1000 Subject: [PATCH 400/410] New package: texlive-music-2020.54758 --- srcpkgs/texlive-music/template | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 srcpkgs/texlive-music/template diff --git a/srcpkgs/texlive-music/template b/srcpkgs/texlive-music/template new file mode 100644 index 00000000000..7a6f4ab94a7 --- /dev/null +++ b/srcpkgs/texlive-music/template @@ -0,0 +1,14 @@ +# Template file for 'texlive-music' +pkgname=texlive-music +version=2020.54758 +revision=1 +archs="noarch" +build_style="texmf" +depends="fontforge python3 texlive-core" +short_desc="TeX Live - Music typesetting packages" +maintainer="fosslinux " +license="GPL-2.0-or-later" +homepage="http://tug.org/texlive/" +distfiles="https://sources.archlinux.org/other/texlive/${pkgname}-${version}-src.zip" +checksum=47f418d851a0f838c08be406135ef338533e32cf0bc9c4ffefeaa0139973e8f1 +python_version=3 From cfeb877d869dc79f80ed8da334ae74b6693ca281 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 22 Jun 2020 10:19:13 +1000 Subject: [PATCH 401/410] New package: texlive-pictures-2020.55342 --- srcpkgs/texlive-pictures/files/duplicates.txt | 4 ++++ srcpkgs/texlive-pictures/template | 13 +++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 srcpkgs/texlive-pictures/files/duplicates.txt create mode 100644 srcpkgs/texlive-pictures/template diff --git a/srcpkgs/texlive-pictures/files/duplicates.txt b/srcpkgs/texlive-pictures/files/duplicates.txt new file mode 100644 index 00000000000..a113980742b --- /dev/null +++ b/srcpkgs/texlive-pictures/files/duplicates.txt @@ -0,0 +1,4 @@ +/usr/share/texmf-dist/scripts/petri-nets/pn2pdf +/usr/share/texmf-dist/scripts/epspdf/epspdf.tlu +/usr/share/texmf-dist/scripts/epspdf/epspdftk.tcl +/usr/share/texmf-dist/scripts/getmap/getmapdl.lua diff --git a/srcpkgs/texlive-pictures/template b/srcpkgs/texlive-pictures/template new file mode 100644 index 00000000000..dee8054f190 --- /dev/null +++ b/srcpkgs/texlive-pictures/template @@ -0,0 +1,13 @@ +# Template file for 'texlive-pictures' +pkgname=texlive-pictures +version=2020.55342 +revision=1 +archs="noarch" +build_style="texmf" +depends="texlive-core" +short_desc="TeX Live - Packages for drawing graphics" +maintainer="fosslinux " +license="GPL-2.0-or-later" +homepage="http://tug.org/texlive/" +distfiles="https://sources.archlinux.org/other/texlive/${pkgname}-${version}-src.zip" +checksum=4bfd4a1cf0339151806ff7591c11d4b1868bc9ebf7f9b0f396193abbc3c7aec5 From 487f696a1172fbc1b46bd64d30a802df80ddf510 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 22 Jun 2020 10:19:18 +1000 Subject: [PATCH 402/410] New package: texlive-pstricks-2020.55289 --- srcpkgs/texlive-pstricks/template | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 srcpkgs/texlive-pstricks/template diff --git a/srcpkgs/texlive-pstricks/template b/srcpkgs/texlive-pstricks/template new file mode 100644 index 00000000000..c76855241de --- /dev/null +++ b/srcpkgs/texlive-pstricks/template @@ -0,0 +1,13 @@ +# Template file for 'texlive-pstricks' +pkgname=texlive-pstricks +version=2020.55289 +revision=1 +archs="noarch" +build_style="texmf" +depends="texlive-core" +short_desc="TeX Live - Additional PSTricks packages" +maintainer="fosslinux " +license="GPL-2.0-or-later" +homepage="http://tug.org/texlive/" +distfiles="https://sources.archlinux.org/other/texlive/${pkgname}-${version}-src.zip" +checksum=be0eb4d24474a3af116af7d34af5b78f6cdc7aee6235ed4d63f1682dc2ef0cbc From c30725d5de4850734920c537511fd41b91e7f02f Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 22 Jun 2020 10:19:24 +1000 Subject: [PATCH 403/410] New package: texlive-publishers-2020.55415 --- srcpkgs/texlive-publishers/template | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 srcpkgs/texlive-publishers/template diff --git a/srcpkgs/texlive-publishers/template b/srcpkgs/texlive-publishers/template new file mode 100644 index 00000000000..1e5f646ccf7 --- /dev/null +++ b/srcpkgs/texlive-publishers/template @@ -0,0 +1,12 @@ +# Template file for 'texlive-publishers' +pkgname=texlive-publishers +version=2020.55415 +revision=1 +archs="noarch" +build_style="texmf" +short_desc="TeX Live - Classes and packages for certain publishers" +maintainer="fosslinux " +license="GPL-2.0-or-later" +homepage="http://tug.org/texlive/" +distfiles="https://sources.archlinux.org/other/texlive/${pkgname}-${version}-src.zip" +checksum=4d36cad1e18e5ad9b9866bba17c9288454f6d7b17a3ac144160ec4a5bce79176 From d394c20216dfe87950b62a8351bc5ad348a2d7fb Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 22 Jun 2020 10:19:31 +1000 Subject: [PATCH 404/410] New package: texlive-science-2020.55390 --- srcpkgs/texlive-science/template | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 srcpkgs/texlive-science/template diff --git a/srcpkgs/texlive-science/template b/srcpkgs/texlive-science/template new file mode 100644 index 00000000000..68f358537f7 --- /dev/null +++ b/srcpkgs/texlive-science/template @@ -0,0 +1,13 @@ +# Template file for 'texlive-science' +pkgname=texlive-science +version=2020.55390 +revision=1 +archs="noarch" +build_style="texmf" +depends="texlive-core" +short_desc="TeX Live - Typesetting for mathematatics and science disciplines" +maintainer="fosslinux " +license="GPL-2.0-or-later" +homepage="http://tug.org/texlive/" +distfiles="https://sources.archlinux.org/other/texlive/${pkgname}-${version}-src.zip" +checksum=c42294cd26e5a65585b27520e5a877539f88ba1583d5e1101c828a934225eea4 From 7ee7696b96c2da8b48dd4e562204ec52bf84ae64 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Sat, 4 Jul 2020 09:59:10 +1000 Subject: [PATCH 405/410] New package: texlive-basic-2020 --- srcpkgs/texlive-basic/template | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 srcpkgs/texlive-basic/template diff --git a/srcpkgs/texlive-basic/template b/srcpkgs/texlive-basic/template new file mode 100644 index 00000000000..0d2a5afd265 --- /dev/null +++ b/srcpkgs/texlive-basic/template @@ -0,0 +1,17 @@ +# Template file for 'texlive-basic' +pkgname=texlive-basic +version=2020 +revision=1 +build_style=meta +short_desc="TeX Live - Metapackage including some simple packages" +maintainer="fosslinux " +license="GPL-2.0-or-later" +homepage="https://www.tug.org/texlive/" + +depends="texlive>=20200406 + texlive-BibTeX>=20200406 + texlive-LuaTeX>=20200406 + texlive-dvi>=20200406 + texlive-core>=2020.55416 + texlive-latexextra>=2020.55418 + texlive-pictures>=2020.55342" From aa1bede2e2496fdae312b37402220e2918fc685b Mon Sep 17 00:00:00 2001 From: fosslinux Date: Sat, 4 Jul 2020 10:00:22 +1000 Subject: [PATCH 406/410] New package: texlive-minimal-2020 --- srcpkgs/texlive-minimal/template | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 srcpkgs/texlive-minimal/template diff --git a/srcpkgs/texlive-minimal/template b/srcpkgs/texlive-minimal/template new file mode 100644 index 00000000000..a7a044304fa --- /dev/null +++ b/srcpkgs/texlive-minimal/template @@ -0,0 +1,12 @@ +# Template file for 'texlive-minimal' +pkgname=texlive-minimal +version=2020 +revision=1 +build_style=meta +short_desc="TeX Live - Metapackage including minimal packages" +maintainer="fosslinux " +license="GPL-2.0-or-later" +homepage="https://www.tug.org/texlive/" + +depends="texlive>=20200406 + texlive-core>=2020.55416" From 5cee91626747d915d51acfff54a0d74b3a33e490 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Sat, 4 Jul 2020 10:00:11 +1000 Subject: [PATCH 407/410] New package: texlive-lang-2020 --- srcpkgs/texlive-lang/template | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 srcpkgs/texlive-lang/template diff --git a/srcpkgs/texlive-lang/template b/srcpkgs/texlive-lang/template new file mode 100644 index 00000000000..c63e04a7b8b --- /dev/null +++ b/srcpkgs/texlive-lang/template @@ -0,0 +1,17 @@ +# Template file for 'texlive-lang' +pkgname=texlive-lang +version=2020 +revision=1 +build_style=meta +short_desc="TeX Live - Metapackage including all languages" +maintainer="fosslinux " +license="GPL-2.0-or-later" +homepage="https://www.tug.org/texlive/" + +depends="texlive-core>=2020.55416 + texlive-langchinese>=2020.55162 + texlive-langcyrillic>=2020.54594 + texlive-langextra>=2020.55417 + texlive-langgreek>=2020.54512 + texlive-langjapanese>=2020.55320 + texlive-langkorean>=2020.54519" From 8dc60734eb534f020276c72b30d6041f3e43036d Mon Sep 17 00:00:00 2001 From: fosslinux Date: Sat, 4 Jul 2020 10:00:34 +1000 Subject: [PATCH 408/410] New package: texlive-most-2020 --- srcpkgs/texlive-most/template | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 srcpkgs/texlive-most/template diff --git a/srcpkgs/texlive-most/template b/srcpkgs/texlive-most/template new file mode 100644 index 00000000000..7bbb973a2aa --- /dev/null +++ b/srcpkgs/texlive-most/template @@ -0,0 +1,30 @@ +# Template file for 'texlive-most' +pkgname=texlive-most +version=2020 +revision=1 +build_style=meta +short_desc="TeX Live - Metapackage including most packages" +maintainer="fosslinux " +license="GPL-2.0-or-later" +homepage="https://www.tug.org/texlive/" + +depends="texlive>=20200406 + texlive-BibTeX>=20200406 + texlive-ConTeXt>=20200406 + texlive-LuaTeX>=20200406 + texlive-PythonTeX>=20200406 + texlive-Xdvi>=20200406 + texlive-XeTeX>=20200406 + texlive-dvi>=20200406 + texlive-core>=2020.55416 + texlive-bibtexextra>=2020.55376 + texlive-fontsextra>=2020.55407 + texlive-formatsextra>=2020.54498 + texlive-games>=2020.55271 + texlive-humanities>=2020.55389 + texlive-latexextra>=2020.55418 + texlive-music>=2020.54758 + texlive-pictures>=2020.55342 + texlive-pstricks>=2020.55289 + texlive-publishers>=2020.55415 + texlive-science>=2020.55390" From b5a57c36e474eac4fb589ac28267937edf8a62ec Mon Sep 17 00:00:00 2001 From: fosslinux Date: Sat, 4 Jul 2020 09:59:20 +1000 Subject: [PATCH 409/410] New package: texlive-full-2020 --- srcpkgs/texlive-full/template | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 srcpkgs/texlive-full/template diff --git a/srcpkgs/texlive-full/template b/srcpkgs/texlive-full/template new file mode 100644 index 00000000000..614589887a9 --- /dev/null +++ b/srcpkgs/texlive-full/template @@ -0,0 +1,12 @@ +# Template file for 'texlive-full' +pkgname=texlive-full +version=2020 +revision=1 +build_style=meta +short_desc="TeX Live - Metapackage including all packages" +maintainer="fosslinux " +license="GPL-2.0-or-later" +homepage="https://www.tug.org/texlive/" + +depends="texlive-most>=2020 + texlive-lang>=2020" From f8250170f8ecd47947bd907993871e34aa87df49 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Sun, 5 Jul 2020 11:39:30 +1000 Subject: [PATCH 410/410] xbps-triggers: add texmf-dist regeneration trigger --- Manual.md | 15 +++++++ .../04-create-xbps-metadata-scripts.sh | 6 +++ srcpkgs/xbps-triggers/files/texmf-dist | 39 +++++++++++++++++++ srcpkgs/xbps-triggers/template | 2 +- 4 files changed, 61 insertions(+), 1 deletion(-) create mode 100755 srcpkgs/xbps-triggers/files/texmf-dist diff --git a/Manual.md b/Manual.md index b0f92bfeab3..ffde29fcd47 100644 --- a/Manual.md +++ b/Manual.md @@ -64,6 +64,7 @@ packages for XBPS, the `Void Linux` native packaging system. * [pycompile](#triggers_pycompile) * [register-shell](#triggers_register_shell) * [system-accounts](#triggers_system_accounts) + * [texmf-dist](#triggers_texmf_dist) * [update-desktopdb](#triggers_update_desktopdb) * [x11-fonts](#triggers_x11_fonts) * [xml-catalog](#triggers_xml_catalog) @@ -1897,6 +1898,20 @@ Example: `transmission unprivileged user - for uninstalled package transmission` This trigger can only be used by using the `system_accounts` variable. + +#### texmf-dist + +The texmf-dist trigger is responsible for regenerating TeXLive's texmf databases. + +During both installation and removal, it regenerates both the texhash and format +databases using `texhash` and `fmtutil-sys`, to add or remove any new hashes or +formats. + +It runs on every package that changes /usr/share/texmf-dist. This is likely overkill, +but it is much cleaner rather than checking each format directory and each directory +that is hashed. In addition, it is very likely any package touching /usr/share/texmf-dist +requires one of these triggers anyway. + #### update-desktopdb diff --git a/common/hooks/post-install/04-create-xbps-metadata-scripts.sh b/common/hooks/post-install/04-create-xbps-metadata-scripts.sh index 182388febfe..1300c783b7d 100644 --- a/common/hooks/post-install/04-create-xbps-metadata-scripts.sh +++ b/common/hooks/post-install/04-create-xbps-metadata-scripts.sh @@ -150,6 +150,12 @@ _EOF _add_trigger hwdb.d-dir fi # + # Handle texmf database changes + # + if [ -d "${PKGDESTDIR}/usr/share/texmf-dist" ] ; then + _add_trigger texmf-dist + fi + # # (Un)Register a shell in /etc/shells. # if [ -n "${register_shell}" ]; then diff --git a/srcpkgs/xbps-triggers/files/texmf-dist b/srcpkgs/xbps-triggers/files/texmf-dist new file mode 100755 index 00000000000..e525bcc24b8 --- /dev/null +++ b/srcpkgs/xbps-triggers/files/texmf-dist @@ -0,0 +1,39 @@ +#!/bin/sh +# +# Updates the shared-mime-info db file with update-mime-database(1). +# +# Arguments: $ACTION = [run/targets] +# $TARGET = [post-install/post-remove] +# $PKGNAME +# $VERSION +# $UPDATE = [yes/no] +# +ACTION="$1" +TARGET="$2" +PKGNAME="$3" +VERSION="$4" +UPDATE="$5" + +texhash=usr/bin/texhash +fmtutil=usr/bin/fmtutil-sys + +case "$ACTION" in +targets) + echo "post-install post-remove" + ;; +run) + if [ ! -x ${texhash} ] && [ ! -x ${fmtutil} ]; then + exit 0 + fi + + echo "Updating texmf-dist hashes..." + ${texhash} 2>&1 >/dev/null || true # silence strange errors + echo "Updating texmf-dist formats..." + ${fmtutil} --all >/dev/null || true + ;; +*) + exit 1 + ;; +esac + +exit 0 diff --git a/srcpkgs/xbps-triggers/template b/srcpkgs/xbps-triggers/template index c80bb30d3f5..2c76f76e3b1 100644 --- a/srcpkgs/xbps-triggers/template +++ b/srcpkgs/xbps-triggers/template @@ -1,6 +1,6 @@ # Template file for 'xbps-triggers' pkgname=xbps-triggers -version=0.114 +version=0.115 revision=1 archs=noarch bootstrap=yes