From 61c794f8fe0efc8a95c2fd4c0462a9c36657866e Mon Sep 17 00:00:00 2001 From: Juan Cuzmar Date: Sun, 4 Oct 2020 01:29:40 -0300 Subject: [PATCH 01/18] wofi: fix segfaults under musl --- srcpkgs/wofi/patches/fix-mode-thread.patch | 30 ++++++++++++++++++++++ srcpkgs/wofi/template | 2 +- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/wofi/patches/fix-mode-thread.patch diff --git a/srcpkgs/wofi/patches/fix-mode-thread.patch b/srcpkgs/wofi/patches/fix-mode-thread.patch new file mode 100644 index 00000000000..93888b1c45a --- /dev/null +++ b/srcpkgs/wofi/patches/fix-mode-thread.patch @@ -0,0 +1,30 @@ +# HG changeset patch +# User Scoopta +# Date 1601697276 25200 +# Fri Oct 02 20:54:36 2020 -0700 +# Node ID 8a4a5e29ca9c1fb0a11ed9b329d275f5c02154a6 +# Parent ac8dc17ab751b13b6d4ddcc1a1467e4beb8d7d26 +The mode thread will not be joined multiple times as this causes segfaults under musl + +--- src/wofi.c ++++ src/wofi.c +@@ -103,6 +103,7 @@ + static bool dynamic_lines; + static struct wl_list mode_list; + static pthread_t mode_thread; ++static bool has_joined_mode = false; + + static struct map* keys; + +@@ -596,7 +597,10 @@ + } + + static gboolean insert_all_widgets(gpointer data) { +- pthread_join(mode_thread, NULL); ++ if(!has_joined_mode) { ++ pthread_join(mode_thread, NULL); ++ has_joined_mode = true; ++ } + struct wl_list* modes = data; + if(modes->prev == modes) { + return FALSE; diff --git a/srcpkgs/wofi/template b/srcpkgs/wofi/template index 5f6b75dca57..4c21a047785 100644 --- a/srcpkgs/wofi/template +++ b/srcpkgs/wofi/template @@ -1,7 +1,7 @@ # Template file for 'wofi' pkgname=wofi version=1.2.2 -revision=1 +revision=2 wrksrc="${pkgname}-v${version}" build_style=meson hostmakedepends="pkg-config" From 96a128510cf3563849f7f3b1a2658e14e13eeea6 Mon Sep 17 00:00:00 2001 From: Peter Bui Date: Wed, 30 Sep 2020 23:49:34 -0400 Subject: [PATCH 02/18] python3-httplib2: update to 0.18.1. --- srcpkgs/python3-httplib2/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-httplib2/template b/srcpkgs/python3-httplib2/template index eefec628859..99ae7217f46 100644 --- a/srcpkgs/python3-httplib2/template +++ b/srcpkgs/python3-httplib2/template @@ -1,7 +1,7 @@ # Template file for 'python3-httplib2' pkgname=python3-httplib2 -version=0.14.0 -revision=4 +version=0.18.1 +revision=1 create_wrksrc=yes build_wrksrc="httplib2-${version}" build_style=python3-module @@ -14,7 +14,7 @@ homepage="https://github.com/httplib2/httplib2" changelog="https://raw.githubusercontent.com/httplib2/httplib2/master/CHANGELOG" distfiles="${PYPI_SITE}/h/httplib2/httplib2-${version}.tar.gz https://raw.githubusercontent.com/httplib2/httplib2/master/LICENSE>LICENSE.txt" -checksum="34537dcdd5e0f2386d29e0e2c6d4a1703a3b982d34c198a5102e6e5d6194b107 +checksum="8af66c1c52c7ffe1aa5dc4bcd7c769885254b0756e6e69f953c7f0ab49a70ba3 589eec38f72df2be203711d3b8cbece9b908c5e7ff00bc3cab7f63bae9e366b4" post_install() { From 1ac0f6824b20261bda278764da8e7be27fa209b6 Mon Sep 17 00:00:00 2001 From: Peter Bui Date: Wed, 30 Sep 2020 23:52:00 -0400 Subject: [PATCH 03/18] python3-google-api-python-client: update to 1.12.3. --- srcpkgs/python3-google-api-python-client/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-google-api-python-client/template b/srcpkgs/python3-google-api-python-client/template index 7351849b1d0..fefe2c2d67b 100644 --- a/srcpkgs/python3-google-api-python-client/template +++ b/srcpkgs/python3-google-api-python-client/template @@ -1,6 +1,6 @@ # Template file for 'python3-google-api-python-client' pkgname=python3-google-api-python-client -version=1.9.3 +version=1.12.3 revision=1 wrksrc="${pkgname#*-}-${version}" build_style=python3-module @@ -13,7 +13,7 @@ maintainer="Peter Bui " license="Apache-2.0" homepage="https://github.com/googleapis/google-api-python-client" distfiles="${PYPI_SITE}/g/google-api-python-client/google-api-python-client-${version}.tar.gz" -checksum=220349ce189a85229fc46875d467101318495a4a735c0ff2f165b9bdbc7511a0 +checksum=844ef76bda585ea0ea2d5e7f8f9a0eb10d6e2eba66c4fea0210ec7843941cb1a post_patch() { # unittest2 is python2 thing. From 502c39ce40a520b1a0c2ae162ca0aea68c7ef9b3 Mon Sep 17 00:00:00 2001 From: Peter Bui Date: Wed, 30 Sep 2020 23:55:56 -0400 Subject: [PATCH 04/18] python3-google-auth: update to 1.22.0. --- srcpkgs/python3-google-auth/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-google-auth/template b/srcpkgs/python3-google-auth/template index 0010f234166..5cdbedbc557 100644 --- a/srcpkgs/python3-google-auth/template +++ b/srcpkgs/python3-google-auth/template @@ -1,6 +1,6 @@ # Template file for 'python3-google-auth' pkgname=python3-google-auth -version=1.21.1 +version=1.22.0 revision=1 wrksrc="${pkgname#*-}-${version}" build_style=python3-module @@ -11,4 +11,4 @@ maintainer="Peter Bui " license="Apache-2.0" homepage="https://github.com/GoogleCloudPlatform/google-auth-library-python" distfiles="${PYPI_SITE}/g/google-auth/google-auth-${version}.tar.gz" -checksum=bcbd9f970e7144fe933908aa286d7a12c44b7deb6d78a76871f0377a29d09789 +checksum=a73e6fb6d232ed1293ef9a5301e6f8aada7880d19c65d7f63e130dc50ec05593 From aa8b0e69841142c8646df9950d9bce24ebd6bf25 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, 4 Oct 2020 11:29:17 +0700 Subject: [PATCH 05/18] flite: update to 2.2. --- srcpkgs/flite/template | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/srcpkgs/flite/template b/srcpkgs/flite/template index 037240600d6..85afadf8d84 100644 --- a/srcpkgs/flite/template +++ b/srcpkgs/flite/template @@ -1,17 +1,16 @@ # Template file for 'flite' pkgname=flite -version=2.1 -revision=2 -wrksrc="flite-${version}-release" +version=2.2 +revision=1 build_style=gnu-configure configure_args="--enable-shared --with-audio=alsa" makedepends="alsa-lib-devel" -short_desc="A lightweight speech synthesis engine" +short_desc="Lightweight speech synthesis engine" maintainer="Orphaned " -license="custom" +license="BSD-4-Clause" homepage="http://www.festvox.org/flite/" -distfiles="http://www.festvox.org/flite/packed/flite-${version}/flite-${version}-release.tar.bz2" -checksum=c73c3f6a2ea764977d6eaf0a287722d1e2066b4697088c552e342c790f3d2b85 +distfiles="https://github.com/festvox/flite/archive/v$version.tar.gz" +checksum=ab1555fe5adc3f99f1d4a1a0eb1596d329fd6d74f1464a0097c81f53c0cf9e5c post_install() { vlicense COPYING From 8743d4e02a78755b178baf9bac8fbdbaef39a39b Mon Sep 17 00:00:00 2001 From: rs Date: Sat, 3 Oct 2020 11:41:01 +0000 Subject: [PATCH 06/18] amdvlk: update to 2020.Q3.6 --- srcpkgs/amdvlk/template | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/srcpkgs/amdvlk/template b/srcpkgs/amdvlk/template index a233477813f..23b4869d16b 100644 --- a/srcpkgs/amdvlk/template +++ b/srcpkgs/amdvlk/template @@ -1,13 +1,13 @@ # Template file for 'amdvlk' pkgname=amdvlk -version=2020.Q3.5 +version=2020.Q3.6 revision=1 -_llpc_commit=a3ac9d29e78d11a6cdc1bc1dd0be082e35dbfc0d -_xgl_commit=6e4aaa87a128f91cc62d337642949ee8cfcaeec8 -_pal_commit=a52f7c12f9ce5aca5c0c7f799f72b1b3362121bc -_llvm_project_commit=baf9929eed02f75d0a429fc72ba76b9286ba1996 -_spvgen_commit=2557aaa0e96695c51de0d66903e24194a1af054e -_MetroHash_commit=712f76fee75d69b23a1ea8f6465752c3ccaaf9a2 +_llpc_commit=6ff17fa6136e4bba8b6ae496e90e40c6e7750820 +_xgl_commit=07bb2eb097cd90983902118388cabd49f3530e8b +_pal_commit=6fa4f8ac88b95688241d266ff9d8f02da6ec3c22 +_llvm_project_commit=1a8b53e02a92dbc7d40087c483d03c45c6c63f2e +_spvgen_commit=fb798cb760a436e9496dbaab8827e4d183b74744 +_MetroHash_commit=3c566dd9cda44ca7fd97659e0b53ac953f9037d2 _CWPack_commit=7387247eb9889ddcabbc1053b9c2052e253b088e archs="i686* x86_64*" create_wrksrc=yes @@ -31,13 +31,13 @@ distfiles="https://github.com/GPUOpen-Drivers/AMDVLK/archive/v-${version}.tar.gz https://github.com/GPUOpen-Drivers/spvgen/archive/${_spvgen_commit}.tar.gz https://github.com/GPUOpen-Drivers/MetroHash/archive/${_MetroHash_commit}.tar.gz https://github.com/GPUOpen-Drivers/CWPack/archive/${_CWPack_commit}.tar.gz" -checksum="2ff31b8fc62cd2036212e06e74c495c01933f5aee3fb85ec7a67d44f99b54e6b - 5ac1087dd5d27fa6e89dd668fdae0ffad0e4a2902ad9234b93d3bfbc22bacee8 - 07ca7f5e8ff638b434fdb4ac1be97d53018182473984a4d9152fe0b50def0fb9 - 96de8d9839a7f0a8e7fd100b44e7a33aca6106f4654962fc808707b95cb5e20c - 4565791a16e7b982e2dbefcdb375552443517516245450000a98bf720127510f - 33fdabca074c161fff1fea42f4ea27d023c571198c65b9063776817cb2462b5d - 07c7389894a4acd9aff7ddb6d70fc3ea6a4cc10589b69ce92c737487cbe2d37d +checksum="e318b94f6d0951855c23d0b1dd14f8984ae09e722ed654f2a1cf456d1dd3f8d5 + 19843d5cf2dcadbe61c4276dba08b58ef7ccea5455faab7109d3ee37ad452fbe + ab94dc387f86eb8f4a9dd3498b145bfd4ccf1dbc994fe8b96f83c4542bca4a5e + e16d8c15e158d6b435c617c72bd3f31b6c980dc1b0d1821792b9b65a8e308fa4 + 30ed1b4d168f83bc7d24ee5e27726f4358293ab39705aa93aafc3c548abc38a4 + 371b137edf4d5ec4f4483ec10ac1419fffa73b6abb1931dd637a59c1b6247e65 + cc8ff538fede25fe023984b3fde27f09b000bdc49793534794cd1d2bf881750a 186060fbcf87165224ba7df0e1858b66ebc42cf190c481aef1df8d89ebab7abd" nocross=yes lib32files="/usr/share/vulkan/icd.d/amd_icd32.json" From 4ae67c21bee96d99a6629130768e71b1028e6381 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, 4 Oct 2020 10:33:17 +0700 Subject: [PATCH 07/18] gnome-dictionary: use SPDX v3 license --- srcpkgs/gnome-dictionary/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gnome-dictionary/template b/srcpkgs/gnome-dictionary/template index 9e5cff39dad..111d3bb484a 100644 --- a/srcpkgs/gnome-dictionary/template +++ b/srcpkgs/gnome-dictionary/template @@ -1,18 +1,18 @@ # Template file for 'gnome-dictionary' pkgname=gnome-dictionary version=3.26.1 -revision=1 +revision=2 build_style=meson -hostmakedepends="pkg-config intltool itstool gnome-doc-utils glib-devel" +hostmakedepends="pkg-config intltool itstool glib-devel" makedepends="gtk+3-devel gsettings-desktop-schemas-devel" depends="hicolor-icon-theme desktop-file-utils gsettings-desktop-schemas>=3.14" -replaces="gnome-utils>=3.0" short_desc="Look up words in dictionary sources" maintainer="Enno Boland " +license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Dictionary" -license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=16b8bc248dcf68987826d5e39234b1bb7fd24a2607fcdbf4258fde88f012f300 +replaces="gnome-utils>=3.0" post_install() { # Remove -devel stuff. From c95c312306103249f8a7ae76e11aaea7246b479c 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, 4 Oct 2020 19:57:36 +0700 Subject: [PATCH 08/18] seahorse-sharing: use SPDX v3 license --- srcpkgs/seahorse-sharing/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/seahorse-sharing/template b/srcpkgs/seahorse-sharing/template index c2c64093086..a1883d54423 100644 --- a/srcpkgs/seahorse-sharing/template +++ b/srcpkgs/seahorse-sharing/template @@ -1,17 +1,17 @@ # Template file for 'seahorse-sharing' pkgname=seahorse-sharing version=3.8.0 -revision=2 +revision=3 build_style=gnu-configure hostmakedepends="automake libtool pkg-config intltool gettext-devel glib-devel - gnome-doc-utils gpgme-devel gnupg" + gpgme-devel gnupg" makedepends="libsoup-devel gettext-devel glib-devel gpgme-devel gtk+3-devel avahi-glib-libs-devel libSM-devel" depends="gnupg" short_desc="Sharing of PGP public keys via DNS-SD and HKP" maintainer="Orphaned " +license="GPL-2.0-or-later" homepage="http://www.gnome.org/projects/seahorse/" -license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=e216e7d5709e688e142b4e96710759f5be54c39ac6c2d58f2eec330e4dfef92b From fb96faabefb108e47a822a21b29e5affeb7d1fbf 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, 4 Oct 2020 20:19:36 +0700 Subject: [PATCH 09/18] shotwell: update to 0.30.10. --- srcpkgs/shotwell/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/shotwell/template b/srcpkgs/shotwell/template index 2b692bc9cfe..46071f8c950 100644 --- a/srcpkgs/shotwell/template +++ b/srcpkgs/shotwell/template @@ -1,11 +1,11 @@ # Template file for 'shotwell' pkgname=shotwell -version=0.30.7 +version=0.30.10 revision=1 build_style=meson -hostmakedepends="gcr-devel gettext glib-devel gnome-doc-utils itstool +hostmakedepends="gcr-devel gettext glib-devel itstool libgee08-devel libgexiv2-devel pkg-config vala-devel" -makedepends="gnome-doc-utils gst-plugins-base1-devel libgdata-devel +makedepends="gst-plugins-base1-devel libgdata-devel libgee08-devel libgexiv2-devel libgphoto2-devel libgudev-devel libraw-devel libunique-devel rest-devel vala-devel webkit2gtk-devel" depends="desktop-file-utils hicolor-icon-theme" @@ -14,7 +14,7 @@ maintainer="Enno Boland " license="LGPL-2.1-or-later, CC-BY-SA-3.0" homepage="https://wiki.gnome.org/Apps/Shotwell" distfiles="${GNOME_SITE}/shotwell/${version%.*}/shotwell-${version}.tar.xz" -checksum=345d4205760d26f54033d44cf1b778ed9d3fc964de71293bfd5034ff484631d5 +checksum=01fb8fa0c0404dc9362d589442442bf095c0d453db2718c4a9a6eb0ebfbe3c15 lib32disabled=yes nocross="https://build.voidlinux.org/builders/armv7l-musl_builder/builds/20405/steps/shell_3/logs/stdio" From b497e6e5d1d4f1c623e46f332c72bf0e74e68dbd 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, 4 Oct 2020 10:39:19 +0700 Subject: [PATCH 10/18] gnome-getting-started-docs: drop noarch, gnome-doc-utils --- srcpkgs/gnome-getting-started-docs/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-getting-started-docs/template b/srcpkgs/gnome-getting-started-docs/template index bed9b696162..18f55aa7909 100644 --- a/srcpkgs/gnome-getting-started-docs/template +++ b/srcpkgs/gnome-getting-started-docs/template @@ -1,10 +1,9 @@ # Template file for 'gnome-getting-started-docs' pkgname=gnome-getting-started-docs version=3.36.2 -revision=1 -archs=noarch +revision=2 build_style=gnu-configure -hostmakedepends="gnome-doc-utils intltool itstool pkg-config" +hostmakedepends="intltool itstool pkg-config" short_desc="Getting Started documentation for GNOME" maintainer="Enno Boland " license="CC-BY-SA-3.0" From df28e2d9964134e80e8a1361e83c0428bd26041c 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, 4 Oct 2020 09:32:26 +0700 Subject: [PATCH 11/18] telepathy-python: drop - Python 2 only - Last release was 2010 - Telepathy doesn't even list this package in their components page --- ...nt-install-generated-errors.py-twice.patch | 17 ----------------- srcpkgs/telepathy-python/template | 19 ------------------- 2 files changed, 36 deletions(-) delete mode 100644 srcpkgs/telepathy-python/patches/dont-install-generated-errors.py-twice.patch delete mode 100644 srcpkgs/telepathy-python/template diff --git a/srcpkgs/telepathy-python/patches/dont-install-generated-errors.py-twice.patch b/srcpkgs/telepathy-python/patches/dont-install-generated-errors.py-twice.patch deleted file mode 100644 index 5a39d39807d..00000000000 --- a/srcpkgs/telepathy-python/patches/dont-install-generated-errors.py-twice.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/Makefile.am b/src/Makefile.am -index 135f2f0..ede1fc3 100644 ---- src/Makefile.am -+++ src/Makefile.am -@@ -13,10 +13,12 @@ telepathy_PYTHON = \ - spec_dir = $(top_srcdir)/spec - spec_files := $(patsubst $(spec_dir)%.xml,_generated%.py,$(wildcard $(spec_dir)/*.xml)) - -+# We leave _generated/errors.py out of here because there exists a -+# spec/errors.xml file, so that means there'll be a -+# _generated/errors.py in $(spec_files). See fd.o#32526 - BUILT_SOURCES = \ - _generated/interfaces.py \ - _generated/constants.py \ -- _generated/errors.py \ - _generated/__init__.py \ - $(spec_files) diff --git a/srcpkgs/telepathy-python/template b/srcpkgs/telepathy-python/template deleted file mode 100644 index 41a0e0d03cb..00000000000 --- a/srcpkgs/telepathy-python/template +++ /dev/null @@ -1,19 +0,0 @@ -# Template file for 'telepathy-python' -pkgname=telepathy-python -version=0.15.19 -revision=7 -archs=noarch -build_style=gnu-configure -pycompile_module="telepathy" -hostmakedepends="automake python libxslt" -depends="python python-dbus" -short_desc="Python libraries for use in Telepathy clients and connection managers" -maintainer="Orphaned " -license="LGPL-2.1" -homepage="http://telepathy.freedesktop.org" -distfiles="http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=244c0e1bf4bbd78ae298ea659fe10bf3a73738db550156767cc2477aedf72376 - -pre_configure() { - autoreconf -if -} From 5a5cd3b49c908ce41a1c6d448925c97e20e240d5 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, 4 Oct 2020 10:56:49 +0700 Subject: [PATCH 12/18] gnome-system-log: use SPDX v3 license --- srcpkgs/gnome-system-log/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gnome-system-log/template b/srcpkgs/gnome-system-log/template index bf603b722e7..92fd318ffbd 100644 --- a/srcpkgs/gnome-system-log/template +++ b/srcpkgs/gnome-system-log/template @@ -1,15 +1,15 @@ # Template file for 'gnome-system-log' pkgname=gnome-system-log version=3.9.90 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-schemas-compile" -hostmakedepends="pkg-config intltool itstool gnome-doc-utils glib-devel" +hostmakedepends="pkg-config intltool itstool glib-devel" makedepends="gtk+3-devel" depends="hicolor-icon-theme desktop-file-utils" -short_desc="A system log viewer for GNOME" +short_desc="GNOME system log viewer" maintainer="Orphaned " +license="GPL-2.0-or-later" homepage="http://www.gnome.org" -license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=9eeb51982d347aa7b33703031e2c1d8084201374665425cd62199649b29a5411 From dd05afb5367b6d6bc1d0b6a1ea4cff896c143fb2 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, 4 Oct 2020 18:54:41 +0700 Subject: [PATCH 13/18] meld: drop noarch, remove gnome-doc-utils --- srcpkgs/meld/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/meld/template b/srcpkgs/meld/template index 486d3b7104b..04fc5f76b60 100644 --- a/srcpkgs/meld/template +++ b/srcpkgs/meld/template @@ -1,11 +1,10 @@ # Template file for 'meld' pkgname=meld version=3.20.2 -revision=1 -archs=noarch +revision=2 build_style=python3-module configure_args="--disable-schemas-compile" -hostmakedepends="pkg-config intltool gnome-doc-utils python3 itstool gtk-update-icon-cache libxml2-python3" +hostmakedepends="pkg-config intltool python3 itstool gtk-update-icon-cache libxml2-python3" depends="python3-gobject gsettings-desktop-schemas gtksourceview desktop-file-utils hicolor-icon-theme" short_desc="Visual diff and merge tool" maintainer="Helmut Pozimski " From 4e772556e41fed86a4fe718246f46aaca3ed7313 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 2 Oct 2020 19:02:35 +0700 Subject: [PATCH 14/18] gnome-doc-utils: not requires libxslt-python anymore while we're at it, drop noarch --- srcpkgs/gnome-doc-utils/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-doc-utils/template b/srcpkgs/gnome-doc-utils/template index d2fa2e9e4cd..c95e75921ef 100644 --- a/srcpkgs/gnome-doc-utils/template +++ b/srcpkgs/gnome-doc-utils/template @@ -1,11 +1,10 @@ # Template file for 'gnome-doc-utils' pkgname=gnome-doc-utils version=0.20.10 -revision=5 -archs=noarch +revision=6 build_style=gnu-configure configure_args="--disable-scrollkeeper" -hostmakedepends="pkg-config intltool python3 libxml2-python3 libxslt-python +hostmakedepends="pkg-config intltool python3 libxml2-python3 libxslt gsettings-desktop-schemas" makedepends="libxslt-devel docbook-xml docbook-xsl rarian python3 libxml2-python3 libxslt" From 2dc9f6619f71637929b558fe0a94824995244683 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 4 Oct 2020 16:22:36 +0200 Subject: [PATCH 15/18] expat: update to 2.2.10. --- srcpkgs/expat/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/expat/template b/srcpkgs/expat/template index b26e9ee9a93..3c94508f4d5 100644 --- a/srcpkgs/expat/template +++ b/srcpkgs/expat/template @@ -1,6 +1,6 @@ # Template file for 'expat' pkgname=expat -version=2.2.9 +version=2.2.10 revision=1 build_style=gnu-configure short_desc="XML parser library written in C" @@ -8,7 +8,7 @@ maintainer="Leah Neukirchen " license="MIT" homepage="http://expat.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/expat/${pkgname}-${version}.tar.bz2" -checksum=f1063084dc4302a427dabcca499c8312b3a32a29b7d2506653ecc8f950a9a237 +checksum=b2c160f1b60e92da69de8e12333096aeb0c3bf692d41c60794de278af72135a5 post_install() { vlicense COPYING From 7f3c72d02c3b25964ac4a1aba3892851d0b4f161 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, 4 Oct 2020 21:34:48 +0700 Subject: [PATCH 16/18] bumblebee-status: update to 2.0.5. --- srcpkgs/bumblebee-status/template | 35 ++++++++++++++++++------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/srcpkgs/bumblebee-status/template b/srcpkgs/bumblebee-status/template index 48cc3d02b04..c31b9d8370c 100644 --- a/srcpkgs/bumblebee-status/template +++ b/srcpkgs/bumblebee-status/template @@ -1,22 +1,29 @@ # Template file for 'bumblebee-status' pkgname=bumblebee-status -version=1.9.0 +version=2.0.5 revision=1 -archs=noarch -pycompile_dirs="usr/share/${pkgname}/bumblebee" -depends="python-netifaces python-psutil python-requests" +build_style=python3-module +hostmakedepends="python3-setuptools" +depends="python3-netifaces python3-psutil python3-requests" short_desc="Modular, theme-able status line generator for the i3 window manager" -maintainer="ibrokemypie " +maintainer="Orphaned " license="MIT" homepage="https://github.com/tobi-wan-kenobi/bumblebee-status" -distfiles="https://github.com/tobi-wan-kenobi/bumblebee-status/archive/v${version}.tar.gz" -checksum=ba483f07f5726454aeaf929069bc82dce85be198b969b96c9bd8d85eab5a619c -python_version=2 #unverified +distfiles="$PYPI_SITE/b/bumblebee-status/bumblebee-status-$version.tar.gz + https://raw.githubusercontent.com/tobi-wan-kenobi/bumblebee-status/v$version/LICENSE" +checksum="37685b0026997ef0055e14b235297f932fb637d1929db8e0e4af19730a8b73be + 7cf86a994584e9e1bfe64c63f4e4b9d9bf757148d7ee2af960a267e79b16eab3" +skip_extraction=LICENSE -do_install() { - vmkdir usr/share/${pkgname} - vmkdir usr/bin - vcopy "bumblebee themes bumblebee-status" usr/share/${pkgname} - ln -sfr /usr/share/bumblebee-status/bumblebee-status ${DESTDIR}/usr/bin - vlicense LICENSE +post_patch() { + vsed -i ' + s|os.path.*THEME_BASE_DIR.*|"/usr/share/bumblebee-status/themes",| + ' bumblebee_status/core/theme.py + vsed -i '/usr.share.bumblebee-status/s/bin/utility/' bumblebee_status/discover.py +} + +post_install() { + rm -rf $DESTDIR/$py3_sitelib/tests + rm -f $DESTDIR/usr/share/bumblebee-status/utility/pacman-updates + vlicense $XBPS_SRCDISTDIR/bumblebee-status-$version/LICENSE } From e541f45ee82f989da8c3f9406e26c4640c8bad6c 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, 4 Oct 2020 21:43:17 +0700 Subject: [PATCH 17/18] osm2pgsql: build with python3-psycopg2 --- srcpkgs/osm2pgsql/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/osm2pgsql/template b/srcpkgs/osm2pgsql/template index aba55690852..0d09887ce8c 100644 --- a/srcpkgs/osm2pgsql/template +++ b/srcpkgs/osm2pgsql/template @@ -1,10 +1,11 @@ # Template file for 'osm2pgsql' pkgname=osm2pgsql version=1.3.0 -revision=1 +revision=2 build_style=cmake -hostmakedepends="boost python3 python-psycopg2" -makedepends="expat-devel proj-devel bzip2-devel zlib-devel boost-devel postgresql-libs-devel lua52-devel" +hostmakedepends="boost python3 python3-psycopg2" +makedepends="expat-devel proj-devel bzip2-devel zlib-devel boost-devel + postgresql-libs-devel lua52-devel" short_desc="Tool for loading OpenStreetMap data into a PostgreSQL database" maintainer="Nýx " license="GPL-3.0-or-later" From adfcaa998b0fcb3f623455147b7ace2a6dd6b9e8 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, 4 Oct 2020 21:43:51 +0700 Subject: [PATCH 18/18] python-psycopg2: drop package --- srcpkgs/python-psycopg2/template | 25 ------------------------- srcpkgs/python3-psycopg2 | 1 - srcpkgs/python3-psycopg2/template | 16 ++++++++++++++++ 3 files changed, 16 insertions(+), 26 deletions(-) delete mode 100644 srcpkgs/python-psycopg2/template delete mode 120000 srcpkgs/python3-psycopg2 create mode 100644 srcpkgs/python3-psycopg2/template diff --git a/srcpkgs/python-psycopg2/template b/srcpkgs/python-psycopg2/template deleted file mode 100644 index 14b28b8aed1..00000000000 --- a/srcpkgs/python-psycopg2/template +++ /dev/null @@ -1,25 +0,0 @@ -# Template file for 'python-psycopg2' -pkgname=python-psycopg2 -version=2.8.3 -revision=2 -wrksrc="psycopg2-${version}" -build_style=python-module -pycompile_module="psycopg2" -# Require postgresql-libs-devel to find executable: pg_config -hostmakedepends="postgresql-libs-devel python3-setuptools python-setuptools" -# Require postgresql-libs-devel for libpq-fe.h -makedepends="python-devel python3-devel postgresql-libs-devel" -short_desc="PostgreSQL adapter for Python2" -maintainer="Toyam Cox " -license="LGPL-3.0-or-later" -homepage="http://initd.org/psycopg" -distfiles="${PYPI_SITE}/p/psycopg2/psycopg2-${version}.tar.gz" -checksum=897a6e838319b4bf648a574afb6cabcb17d0488f8c7195100d48d872419f4457 - -python3-psycopg2_package() { - pycompile_module="psycopg2" - short_desc="${short_desc/Python/Python3}" - pkg_install() { - vmove usr/lib/python3* - } -} diff --git a/srcpkgs/python3-psycopg2 b/srcpkgs/python3-psycopg2 deleted file mode 120000 index 229ccfbf905..00000000000 --- a/srcpkgs/python3-psycopg2 +++ /dev/null @@ -1 +0,0 @@ -python-psycopg2 \ No newline at end of file diff --git a/srcpkgs/python3-psycopg2/template b/srcpkgs/python3-psycopg2/template new file mode 100644 index 00000000000..0758b992bae --- /dev/null +++ b/srcpkgs/python3-psycopg2/template @@ -0,0 +1,16 @@ +# Template file for 'python3-psycopg2' +pkgname=python3-psycopg2 +version=2.8.3 +revision=3 +wrksrc="psycopg2-${version}" +build_style=python3-module +# Require postgresql-libs-devel to find executable: pg_config +hostmakedepends="postgresql-libs-devel python3-setuptools" +# Require postgresql-libs-devel for libpq-fe.h +makedepends="python3-devel postgresql-libs-devel" +short_desc="PostgreSQL adapter for Python32" +maintainer="Toyam Cox " +license="LGPL-3.0-or-later" +homepage="http://initd.org/psycopg" +distfiles="${PYPI_SITE}/p/psycopg2/psycopg2-${version}.tar.gz" +checksum=897a6e838319b4bf648a574afb6cabcb17d0488f8c7195100d48d872419f4457