From 66cbe34a1cd4c226829d228283436b70b6f0a3ac Mon Sep 17 00:00:00 2001 From: biopsin Date: Fri, 16 Aug 2019 09:12:49 +0200 Subject: [PATCH 1/5] libnotify: update to 0.7.8 switch to meson, added build options for docs.. noticed this warning while build: /usr/include/features.h:382:4: warning: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Wcpp] --- srcpkgs/libnotify/template | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/srcpkgs/libnotify/template b/srcpkgs/libnotify/template index ca699bda40a..bda47d17c18 100644 --- a/srcpkgs/libnotify/template +++ b/srcpkgs/libnotify/template @@ -1,21 +1,24 @@ # Template file for 'libnotify' pkgname=libnotify -version=0.7.7 -revision=3 -build_style=gnu-configure +version=0.7.8 +revision=1 +build_style=meson build_helper="gir" -configure_args="--disable-static $(vopt_enable gir introspection)" +configure_args="-Dintrospection=$(vopt_if gir enabled disabled) + -Dgtk_doc=$(vopt_if gtk_doc true false) + -Ddocbook_docs=$(vopt_if docbook enabled disabled)" hostmakedepends="pkg-config glib-devel" -makedepends="libglib-devel libpng-devel gdk-pixbuf-devel gtk+3-devel" +makedepends="libglib-devel libpng-devel gdk-pixbuf-devel gtk+3-devel + $(vopt_if gtk_doc gtk-doc) $(vopt_if docbook 'xmlto docbook-xsl')" short_desc="Desktop notification library" maintainer="Juan RP " license="LGPL-2.1-or-later" homepage="http://library.gnome.org/devel/notification-spec/" distfiles="${GNOME_SITE}/${pkgname}/0.7/${pkgname}-${version}.tar.xz" -checksum=9cb4ce315b2655860c524d46b56010874214ec27e854086c1a1d0260137efc04 +checksum=69209e0b663776a00c7b6c0e560302a8dbf66b2551d55616304f240bba66e18c # Package build options -build_options="gir" +build_options="gir gtk_doc docbook" build_options_default="gir" libnotify-devel_package() { From bf76a08bd3c448da1e67e1a54640d31bcdc65fd8 Mon Sep 17 00:00:00 2001 From: biopsin Date: Mon, 19 Aug 2019 08:55:11 +0200 Subject: [PATCH 2/5] Update template --- srcpkgs/libnotify/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libnotify/template b/srcpkgs/libnotify/template index bda47d17c18..2243a2eef72 100644 --- a/srcpkgs/libnotify/template +++ b/srcpkgs/libnotify/template @@ -11,7 +11,7 @@ hostmakedepends="pkg-config glib-devel" makedepends="libglib-devel libpng-devel gdk-pixbuf-devel gtk+3-devel $(vopt_if gtk_doc gtk-doc) $(vopt_if docbook 'xmlto docbook-xsl')" short_desc="Desktop notification library" -maintainer="Juan RP " +maintainer="biopsin " license="LGPL-2.1-or-later" homepage="http://library.gnome.org/devel/notification-spec/" distfiles="${GNOME_SITE}/${pkgname}/0.7/${pkgname}-${version}.tar.xz" From 05ca14c65ca07f012b37597aa4ff7e5592b11e94 Mon Sep 17 00:00:00 2001 From: biopsin Date: Wed, 21 Aug 2019 09:28:17 +0200 Subject: [PATCH 3/5] Update template --- srcpkgs/libnotify/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libnotify/template b/srcpkgs/libnotify/template index 2243a2eef72..5390f45af82 100644 --- a/srcpkgs/libnotify/template +++ b/srcpkgs/libnotify/template @@ -4,7 +4,7 @@ version=0.7.8 revision=1 build_style=meson build_helper="gir" -configure_args="-Dintrospection=$(vopt_if gir enabled disabled) +configure_args="-Dc_args=-O2 -Dintrospection=$(vopt_if gir enabled disabled) -Dgtk_doc=$(vopt_if gtk_doc true false) -Ddocbook_docs=$(vopt_if docbook enabled disabled)" hostmakedepends="pkg-config glib-devel" From 9d660c090b19caedf4c5bbf39dbbed940bd66619 Mon Sep 17 00:00:00 2001 From: biopsin Date: Tue, 3 Sep 2019 11:36:05 +0200 Subject: [PATCH 4/5] libnotify: update to 0.7.8 trying to resolve my stupidity --- srcpkgs/libnotify/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/libnotify/template b/srcpkgs/libnotify/template index 5390f45af82..99ba36df8a0 100644 --- a/srcpkgs/libnotify/template +++ b/srcpkgs/libnotify/template @@ -5,8 +5,7 @@ revision=1 build_style=meson build_helper="gir" configure_args="-Dc_args=-O2 -Dintrospection=$(vopt_if gir enabled disabled) - -Dgtk_doc=$(vopt_if gtk_doc true false) - -Ddocbook_docs=$(vopt_if docbook enabled disabled)" + -Dgtk_doc=false -Ddocbook_docs=$(vopt_if docbook enabled disabled)" hostmakedepends="pkg-config glib-devel" makedepends="libglib-devel libpng-devel gdk-pixbuf-devel gtk+3-devel $(vopt_if gtk_doc gtk-doc) $(vopt_if docbook 'xmlto docbook-xsl')" @@ -18,7 +17,7 @@ distfiles="${GNOME_SITE}/${pkgname}/0.7/${pkgname}-${version}.tar.xz" checksum=69209e0b663776a00c7b6c0e560302a8dbf66b2551d55616304f240bba66e18c # Package build options -build_options="gir gtk_doc docbook" +build_options="gir docbook" build_options_default="gir" libnotify-devel_package() { From dff300c93a3c5469382cd1e3e70ad34d5f940ab5 Mon Sep 17 00:00:00 2001 From: biopsin Date: Sat, 19 Oct 2019 12:22:14 +0200 Subject: [PATCH 5/5] test (#11) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * python3-pulsectl: update to 19.9.5. * python3-precis-i18n: update to 1.0.1. * python3-rsistent: update to 0.15.4. * python3-saml2: update to 4.8.0. * python3-tabulate: update to 0.8.4. * perl-Proc-Govern: update to 0.208. * python3-PyFxA: update to 0.7.3. * python3-SoCo: update to 0.18. * python3-pem: update to 19.2.0. * python3-mypy: update to 0.730. * python3-mypy_extensions: update to 0.4.2. * python3-josepy: update to 1.2.0. * python3-dbusmock: update to 0.18.3. * python3-chromecast: update to 4.0.1. * python3-acme: update to 0.39.0. * python3-fido2: update to 0.7.1. * yubikey-manager: update to 3.1.0. * libGL: update to 19.2.1 * jack: update to 1.9.13, adopt package * wxPython4: actually build core library * bluedevil: update to 5.17.0 [ci skip] * breeze-gtk: update to 5.17.0 [ci skip] * breeze: update to 5.17.0 [ci skip] * kactivitymanagerd: update to 5.17.0 [ci skip] * kde-cli-tools: update to 5.17.0 [ci skip] * kde-gtk-config5: update to 5.17.0 [ci skip] * kdecoration: update to 5.17.0 [ci skip] * kdeplasma-addons5: update to 5.17.0 [ci skip] * kgamma5: update to 5.17.0 [ci skip] * khotkeys: update to 5.17.0 [ci skip] * kinfocenter: update to 5.17.0 [ci skip] * kmenuedit: update to 5.17.0 [ci skip] * kscreen: update to 5.17.0 [ci skip] * kscreenlocker: update to 5.17.0 [ci skip] * ksshaskpass: update to 5.17.0 [ci skip] * ksysguard: update to 5.17.0 [ci skip] * kwallet-pam: update to 5.17.0 [ci skip] * kwayland-integration: update to 5.17.0 [ci skip] * kwin: update to 5.17.0 [ci skip] * kwrited: update to 5.17.0 [ci skip] * libkscreen: update to 5.17.0 [ci skip] * libksysguard: update to 5.17.0 [ci skip] * milou: update to 5.17.0 [ci skip] * oxygen: update to 5.17.0 [ci skip] * plasma-browser-integration: update to 5.17.0 [ci skip] * plasma-desktop: update to 5.17.0 [ci skip] * plasma-integration: update to 5.17.0 [ci skip] * plasma-nm: update to 5.17.0 [ci skip] * plasma-pa: update to 5.17.0 [ci skip] * plasma-sdk: update to 5.17.0 [ci skip] * plasma-vault: update to 5.17.0 [ci skip] * plasma-workspace-wallpapers: update to 5.17.0 [ci skip] * plasma-workspace: update to 5.17.0 [ci skip] * polkit-kde-agent: update to 5.17.0 [ci skip] * powerdevil: update to 5.17.0 [ci skip] * sddm-kcm: update to 5.17.0 [ci skip] * systemsettings: update to 5.17.0 [ci skip] * user-manager: update to 5.17.0 [ci skip] * xdg-desktop-portal-kde: update to 5.17.0 [ci skip] * kde5: update to 5.17 * New package: plasma-thunderbolt-5.17.0 * Revert "libsass: update to 3.6.2." This reverts commit e3b836224babe33f5c0748cabfc82cf82adba400. this update broke sassc, at least for breeze-gtk [ci skip] * libdazzle: update to 3.34.1 Signed-off-by: Jürgen Buchmüller * libgweather: update to 3.34.0 Signed-off-by: Jürgen Buchmüller * evolution-data-server: revbump for libgweather-3.34.0 Signed-off-by: Jürgen Buchmüller * evolution: revbump for libgweather-3.34.0 Signed-off-by: Jürgen Buchmüller * gnome-calendar: update to 3.34.1 Signed-off-by: Jürgen Buchmüller * gnome-clocks: update to 3.34.0 Signed-off-by: Jürgen Buchmüller * gnome-initial-setup: update to 3.34.1 Signed-off-by: Jürgen Buchmüller * gnome-panel: update to 3.34.1 Signed-off-by: Jürgen Buchmüller * gnome-settings-daemon: update to 3.34.1 Signed-off-by: Jürgen Buchmüller * bijiben: update to 3.34.1 Signed-off-by: Jürgen Buchmüller * kubecfg: update to 0.13.1. * gjs: update to 1.58.1 Signed-off-by: Jürgen Buchmüller * meson: backport a regression fix to unbreak various builds Without this wlroots fails to build and possibly others too. [ci skip] * youtube-dl: update to 2019.10.16. * mutter: update to 3.34.1. [skip ci] requires void-linux/void-packages/pull/15506 closes #15530 * gnome-shell: update to 3.34.1. [skip ci] gnome-shell requires void-linux/void-packages/pull/15446 before merge. closes #15531 * sysprof: update to 3.34.1. closes #15506 * gnome-builder: update to 3.34.1. * gnome-todo: rebuild * Revert "meson: update to 0.52.0." This reverts commit 6b8bf86f64e2154765424f394283193093fe5a64. 0.52.0 did break gnome-builder https://gitlab.gnome.org/GNOME/gnome-builder/issues/1057 * gnome-todo: actually add patch * flatbuffers: update to 1.11.0 * linux4.14: update to 4.14.149. * s: install fish completion * nvme-cli: fix build and handling of generated files * pithos: update to 1.5.0. * mpd: update to 0.21.16. * totem: update to 3.34.1. * gnome-session: update to 3.34.1. * gnome-screensaver: rebuild against libgnome-desktop-3.so.18 * gnome-settings-daemon: rebuild against libgnome-desktop-3.so.18 * gnome-panel: rebuild against libgnome-desktop-3.so.18 * gnome-initial-setup: rebuild against libgnome-desktop-3.so.18 * gnome-font-viewer: update to 3.34.0. * gnome-flashback: update to 3.34.1. * gnome-control-center: update to 3.34.1. * gnome-documents: rebuild against libgnome-desktop-3.so.18 * gnome-contacts: rebuild against libgnome-desktop-3.so.18 * gnome-clocks: rebuild against libgnome-desktop-3.so.18 * gnome-books: update to 3.34.0. * evince: update to 3.34.1. * eog: update to 3.34.1. * cheese: update to 3.34.0. * gnome-desktop: update to 3.34.1. * adwaita-icon-theme: update to 3.34.0. * file-roller: update to 3.32.2. * gnome-backgrounds: update to 3.34.0. * gnome-bluetooth: update to 3.34.0. * gnome-user-docs: update to 3.34.0. * gnome-shell-extensions: update to 3.34.1. * gnome-online-miners: update to 3.34.0. * yelp: update to 3.34.0. * gnome-online-accounts: update to 3.34.1. * mutter: rebuild against libgnome-desktop-3.so.18 * evolution: rebuild against libgnome-desktop-3.so.18 * nautilus: update to 3.34.1. * sassc: increase rev to make sure that libcsass is build first * gnome-tweaks: update to 3.34.0. * yelp-xsl: update to 3.34.0. * libreoffice: require libatomic on ppc32 It fails to link otherwise. [ci skip] * sparse: update to 0.6.1. * exiftool: update to 11.70. * aspell: update to 0.60.8. * bogofilter: update to 1.2.5. * mariadb: simplify handling of atomics/libatomic, fix ppc32 build Platforms such as ppc32 and mips do not have the __sync builtins in gcc, which breaks compilation. However, that code is not even necessary, as proper implementations of the higher level atomic primitives are available as builtins in any modern toolchain (and definitely ours) and mariadb in fact already uses those when available. So basically ditch all this effectively dead code to fix build on those platforms. While at it, remove the wrong checks in cmake and fix properly linking against libatomic only when needed (this also affects ARMv5/6) and simplify the template. These changes have already been done upstream, but we're sticking with an older version for now because of libmysqlclient ABI compat, so fix this downstream until we can upgrade. Also add another patch for ppc/ppc64+musl to use a gcc builtin instead of a glibc extension. [ci skip] * firebird3: fix build on ppc*-musl [ci skip] * mariadb: mark as broken for armv6l-musl * wf-shell: fix cross * build_style/meson.sh: add support for using qemu as exe_wrapper * gnome-todo: fix cross * cheese: fix cross * io.elementary.calendar: temporarily use git tag for compat with libecal-1.2 * mariadb: unbreak * gnome-tweaks: add missing dependency * kcontacts: update to 5.63.0. * akonadi-calendar: rebuild for new kcontacts version number from KDE frameworks * akonadi-contacts: rebuild for new kcontacts version number from KDE frameworks * akonadi-import-wizard: rebuild for new kcontacts version number from KDE frameworks * akonadi-search: rebuild for new kcontacts version number from KDE frameworks * calligra-plan: rebuild for new kcontacts version number from KDE frameworks * digikam: rebuild for new kcontacts version number from KDE frameworks * eventviews: rebuild for new kcontacts version number from KDE frameworks * incidenceeditor: rebuild for new kcontacts version number from KDE frameworks * kaddressbook: rebuild for new kcontacts version number from KDE frameworks * kalarm: rebuild for new kcontacts version number from KDE frameworks * kdepim-apps-libs: rebuild for new kcontacts version number from KDE frameworks * kdepim-runtime: rebuild for new kcontacts version number from KDE frameworks * kgpg: rebuild for new kcontacts version number from KDE frameworks * kmail: rebuild for new kcontacts version number from KDE frameworks * kmymoney: rebuild for new kcontacts version number from KDE frameworks * knotes: rebuild for new kcontacts version number from KDE frameworks * korganizer: rebuild for new kcontacts version number from KDE frameworks * ktnef: rebuild for new kcontacts version number from KDE frameworks * libkdepim: rebuild for new kcontacts version number from KDE frameworks * libkgapi: rebuild for new kcontacts version number from KDE frameworks * mailcommon: rebuild for new kcontacts version number from KDE frameworks * messagelib: rebuild for new kcontacts version number from KDE frameworks * pim-data-exporter: rebuild for new kcontacts version number from KDE frameworks * pimcommon: rebuild for new kcontacts version number from KDE frameworks [skip ci] * qpdf: update to 9.0.2. * cups-filters: revbump for new qpdf release * perl-Term-Table: update to 0.014. * ruby-multi_json: update to 1.14.1. * rpm: update to 4.15.0. * occt: update to 7.4.0. ship an env file in /etc/profile.d to make sure the Draw command works (stolen from arch linux) * freecad: rebuild for occt-7.4.0 along, fix build with gcc9 Closes #15102 * portage: update to 2.3.77 * jmol: update to 14.29.54. * papirus-icon-theme: update to 20191009. * kvantum: update to 0.12.1. * google-cloud-sdk: update to 267.0.0. * cmus: add elogind option to interface with MPRIS Note: I couldn't adopt this package * azote: update to 1.5.1 * libGL: add wayland build_option * kgpg: update to 19.08.2. * kdegraphics-mobipocket: update to 19.08.2. * kdialog: update to 19.08.2. * python3-pafy: drop broken py2 version * go-jira: update to 1.0.21. * onionshare: update to 2.2. * New package: python3-Flask-HTTPAuth-3.3.0 * kio-extras: update to 19.08.2. * print-manager: update to 19.08.2. * dragon-player: update to 19.08.2. * kcharselect: update to 19.08.2. * ffmpegthumbs: update to 19.08.2. * kcalc: update to 19.08.2. * libksane: update to 19.08.2. * kcolorchooser: update to 19.08.2. * konquest: update to 19.08.2. * kdenlive: update to 19.08.2. * libkdegames: update to 19.08.2. * juk: update to 19.08.2. * ktouch: update to 19.08.2. * k3b: update to 19.08.2. * binwalk: update to 2.2.0. * xl2tpd: update to 1.3.15. * linux5.3: update to 5.3.7. [skip ci] * linux4.19: update to 4.19.80. * open-vm-tools: update to 11.0.0. adopt package Closes #14922 * xfce4-panel: split lib * xfce4-taskmanager: remove obsolete build dependency (xfce4-panel) * Thunar: rebuild for libxfce4panel * orage: rebuild for libxfce4panel * xfce4-battery-plugin: rebuild for libxfce4panel * xfce4-clipman-plugin: rebuild for libxfce4panel * xfce4-cpufreq-plugin: rebuild for libxfce4panel * xfce4-cpugraph-plugin: rebuild for libxfce4panel * xfce4-dict: rebuild for libxfce4panel * xfce4-diskperf-plugin: rebuild for libxfce4panel * xfce4-fsguard-plugin: rebuild for libxfce4panel * xfce4-genmon-plugin: rebuild for libxfce4panel * xfce4-hardware-monitor-plugin: rebuild for libxfce4panel * xfce4-kbdleds-plugin: rebuild for libxfce4panel * xfce4-mailwatch-plugin: rebuild for libxfce4panel * xfce4-mpc-plugin: rebuild for libxfce4panel * xfce4-netload-plugin: rebuild for libxfce4panel * xfce4-notes-plugin: rebuild for libxfce4panel * xfce4-notifyd: rebuild for libxfce4panel * xfce4-places-plugin: rebuild for libxfce4panel * xfce4-power-manager: rebuild for libxfce4panel * xfce4-pulseaudio-plugin: rebuild for libxfce4panel * xfce4-screenshooter: rebuild for libxfce4panel * xfce4-sensors-plugin: rebuild for libxfce4panel * xfce4-systemload-plugin: rebuild for libxfce4panel * xfce4-time-out-plugin: rebuild for libxfce4panel * xfce4-timer-plugin: rebuild for libxfce4panel * xfce4-verve-plugin: rebuild for libxfce4panel * xfce4-wavelan-plugin: rebuild for libxfce4panel * xfce4-weather-plugin: rebuild for libxfce4panel * xfce4-whiskermenu-plugin: rebuild for libxfce4panel * xfce4-windowck-plugin: rebuild for libxfce4panel * xfce4-xkb-plugin: rebuild for libxfce4panel Closes #13979 Fixes #15288 [ci skip] * sudo: update to 1.8.28p1. * gitlab-runner: update to 12.3.0 * tor: update sandbox patch for ppc32 [ci skip] * delta: update to 0.0.13. * exiftool: update to 11.71. * python3-yara: update to 3.11.0. * spotify-tui: update to 0.6.2. * tau: update to 0.9.3 * New package: sqlmap-1.3.9 * python3-perf: update to 1.6.1. * botan: update to 2.12.1 Signed-off-by: Jürgen Buchmüller * sqlite: update to 3.30.1. * yaru: update to 19.10.4. * Revert "libnotify" --- .travis.yml | 1 + common/build-style/cargo.sh | 2 +- common/build-style/meson.sh | 7 + common/shlibs | 225 +- common/xbps-src/shutils/build_dependencies.sh | 2 +- common/xbps-src/shutils/common.sh | 2 +- common/xbps-src/shutils/cross.sh | 2 +- srcpkgs/2bwm/template | 4 +- srcpkgs/3proxy/template | 8 +- srcpkgs/66-tools/template | 33 + srcpkgs/66/template | 6 +- srcpkgs/Amass/template | 12 + srcpkgs/AppStream/template | 2 +- srcpkgs/Bear/template | 8 +- srcpkgs/CImg/template | 5 +- srcpkgs/CLion/template | 12 +- srcpkgs/Clight/template | 2 +- srcpkgs/Clightd/template | 2 +- srcpkgs/ClusterSSH/template | 9 +- srcpkgs/ClusterSSH/update | 1 - srcpkgs/CopyQ/template | 4 +- srcpkgs/Electron-Cash/template | 25 + srcpkgs/EternalTerminal/template | 6 +- srcpkgs/FeatherPad/template | 6 +- srcpkgs/FeedReader/template | 4 +- srcpkgs/GoLand/template | 12 +- srcpkgs/GraphicsMagick/template | 4 +- srcpkgs/ImageMagick/template | 6 +- srcpkgs/ImageMagick6/template | 4 +- .../patches/ppc/musl-ppc-secureplt.patch | 93 + .../patches/ppc64}/add-ppc64-support.patch | 0 .../patches/ppc64}/fix-vm-jit-ppc64.patch | 0 srcpkgs/LuaJIT/template | 17 + srcpkgs/MEGAcmd/patches/include.am.patch | 16 +- srcpkgs/MEGAcmd/patches/megacmd-sdk36.diff | 381 + srcpkgs/MEGAcmd/patches/musl.patch | 13 - srcpkgs/MEGAcmd/template | 9 +- srcpkgs/MEGAsdk/template | 6 +- srcpkgs/MEGAsync/patches/breakpad.patch | 16 + srcpkgs/MEGAsync/template | 12 +- srcpkgs/Minder/template | 4 +- srcpkgs/ModemManager/template | 4 +- srcpkgs/MultiMC/template | 16 +- srcpkgs/NetAuth/template | 4 +- srcpkgs/NetKeys/template | 4 +- srcpkgs/NetworkManager/template | 7 +- srcpkgs/OTPClient/template | 6 +- srcpkgs/PackageKit/template | 2 +- srcpkgs/PopCorn/template | 14 +- srcpkgs/QMPlay2/template | 8 +- srcpkgs/R/template | 6 +- srcpkgs/RubyMine/template | 12 +- srcpkgs/SDL2_mixer/template | 6 +- srcpkgs/SLADE/template | 5 +- srcpkgs/SPIRV-Headers/template | 2 +- srcpkgs/SPIRV-Tools/template | 2 +- .../patches/build-from-tarball.patch | 7 +- srcpkgs/Signal-Desktop/template | 12 +- srcpkgs/Solaar/template | 15 + srcpkgs/SweetHome3D/template | 4 +- srcpkgs/The-Powder-Toy/template | 28 + srcpkgs/Thunar/template | 2 +- srcpkgs/UEFITool/template | 27 + .../Uranium/patches/fix-crash-in-cura.patch | 132 - srcpkgs/Uranium/template | 6 +- srcpkgs/VirtualGL/template | 8 +- srcpkgs/Vulkan-Headers/template | 4 +- srcpkgs/Vulkan-Tools/template | 4 +- srcpkgs/Waybar/template | 4 +- srcpkgs/WebStorm/template | 16 +- srcpkgs/YACReader/template | 6 +- srcpkgs/abi-compliance-checker/template | 2 +- srcpkgs/abireport/template | 8 +- srcpkgs/ack/template | 4 +- srcpkgs/acpica-utils/template | 6 +- srcpkgs/acpid/template | 6 +- srcpkgs/adobe-flash-plugin/template | 12 +- srcpkgs/adriconf/template | 9 +- srcpkgs/adwaita-icon-theme/template | 4 +- srcpkgs/afl/template | 15 +- srcpkgs/aisleriot/template | 4 +- srcpkgs/akonadi-calendar/template | 6 +- srcpkgs/akonadi-contacts/template | 6 +- srcpkgs/akonadi-import-wizard/template | 8 +- srcpkgs/akonadi-mime/template | 4 +- srcpkgs/akonadi-notes/template | 4 +- srcpkgs/akonadi-search/template | 6 +- srcpkgs/akonadi5/template | 4 +- srcpkgs/akregator/template | 4 +- srcpkgs/alert-after/template | 6 +- srcpkgs/alertmanager/template | 4 +- srcpkgs/alkimia/template | 4 +- srcpkgs/alpine/patches/418e8bc5.patch | 22 + srcpkgs/alpine/template | 2 +- srcpkgs/amdvlk/patches/musl.patch | 33 - srcpkgs/amdvlk/template | 36 +- srcpkgs/amiri-font/template | 6 +- srcpkgs/amp/template | 10 +- srcpkgs/amtk/template | 8 +- srcpkgs/android-studio/template | 43 +- srcpkgs/android-tools/files/generate_build.rb | 405 - srcpkgs/android-tools/patches/gcc-fixes.patch | 30 - .../patches/include-sys-sysmacros.patch | 10 - .../android-tools/patches/musl-fixes.patch | 199 - .../patches/undef__USE_GNU.patch | 24 - srcpkgs/android-tools/template | 89 +- srcpkgs/android-tools/update | 2 +- srcpkgs/angband/template | 8 +- srcpkgs/anki/template | 4 +- srcpkgs/ansi/template | 2 +- srcpkgs/anydesk/template | 9 +- srcpkgs/apache-directory-studio | 1 + .../files/ApacheDirectoryStudio.desktop | 0 .../template | 21 +- .../update | 0 srcpkgs/apache-jmeter/update | 1 + srcpkgs/apache-maven/template | 6 +- srcpkgs/apache-tomcat/template | 4 +- srcpkgs/apache/template | 7 +- srcpkgs/api-sanity-checker/template | 2 +- srcpkgs/apparmor/template | 7 +- srcpkgs/apt/template | 4 +- srcpkgs/aptly/template | 4 +- srcpkgs/aqbanking/template | 7 +- srcpkgs/aquatone/template | 4 +- srcpkgs/arc-theme/template | 10 +- srcpkgs/archiver/template | 6 +- srcpkgs/arduino/patches/astyle_fix.patch | 34 + .../patches/disable-dependency-build.patch | 4 +- srcpkgs/arduino/template | 6 +- .../patches/patch-src_libssl_compat_h.patch | 16 - srcpkgs/aria2/template | 6 +- srcpkgs/aribas/update | 1 + srcpkgs/ark/template | 4 +- srcpkgs/armadillo/template | 8 +- srcpkgs/asio/template | 10 +- srcpkgs/aspell-en/template | 6 +- srcpkgs/aspell/template | 6 +- .../patches/0001-glext_h_conflict.patch | 14 - srcpkgs/assimp/patches/musl.patch | 11 + srcpkgs/assimp/template | 15 +- srcpkgs/assimp_qt_viewer/template | 24 + srcpkgs/asunder/template | 6 +- srcpkgs/at-spi2-atk/template | 4 +- srcpkgs/at-spi2-core/template | 6 +- srcpkgs/atk/patches/fix-cross-gir.patch | 14 - srcpkgs/atk/template | 6 +- srcpkgs/atlantis/template | 4 +- srcpkgs/atomix/template | 4 +- srcpkgs/atril/template | 6 +- srcpkgs/attica/template | 4 +- srcpkgs/audacious-plugins/template | 13 +- srcpkgs/audacious/template | 16 +- srcpkgs/autofs/template | 8 +- srcpkgs/avidemux/template | 6 +- srcpkgs/avr-gcc/template | 12 +- srcpkgs/aws-cli/template | 5 +- srcpkgs/axel/template | 4 +- srcpkgs/azote/template | 6 +- srcpkgs/azpainter/template | 6 +- srcpkgs/babeld/patches/45.patch | 71 + srcpkgs/babeld/template | 11 +- srcpkgs/backblaze-b2/template | 6 +- srcpkgs/backintime-qt/template | 19 + srcpkgs/backintime/template | 15 +- srcpkgs/baloo-widgets5/template | 4 +- srcpkgs/baloo5/template | 5 +- srcpkgs/baresip/template | 4 +- srcpkgs/barrier/template | 4 +- srcpkgs/base-files/files/66-kvm.rules | 2 +- srcpkgs/base-files/files/vkpurge.8 | 6 +- srcpkgs/base-files/template | 4 +- srcpkgs/bash/files/bash50-008 | 68 + srcpkgs/bash/files/bash50-009 | 42 + srcpkgs/bash/files/bash50-010 | 172 + srcpkgs/bash/files/bash50-011 | 59 + srcpkgs/bash/template | 4 +- srcpkgs/bat/template | 11 +- srcpkgs/bc-gh/template | 4 +- srcpkgs/bcal/patches/non-null.patch | 11 + srcpkgs/bcal/template | 11 +- srcpkgs/bcc/patches/musl.patch | 12 - srcpkgs/bcc/template | 19 +- srcpkgs/bctoolbox/template | 2 +- srcpkgs/beancount/template | 6 +- srcpkgs/bearssl/template | 17 +- srcpkgs/beignet/patches/llvm8.patch | 56 + srcpkgs/beignet/patches/llvm9.patch | 111 + srcpkgs/beignet/template | 3 +- srcpkgs/berry/patches/fix-cross.patch | 22 +- srcpkgs/berry/template | 6 +- srcpkgs/bettercap/template | 4 +- srcpkgs/bfs/template | 6 +- srcpkgs/bijiben/template | 4 +- srcpkgs/bind/template | 4 +- srcpkgs/binutils/template | 6 +- srcpkgs/binwalk/template | 19 +- srcpkgs/bird/template | 4 +- srcpkgs/bison/template | 4 +- srcpkgs/bitcoin/template | 6 +- srcpkgs/bitlbee-facebook/template | 3 +- srcpkgs/blackbox_exporter/template | 4 +- srcpkgs/blender/patches/altivec-all.patch | 32 + srcpkgs/blender/patches/gcc9-elbeem.patch | 31 + srcpkgs/bluedevil/template | 4 +- srcpkgs/blueman/template | 6 +- srcpkgs/bluez-qt5/template | 4 +- srcpkgs/bluez/files/bluetooth-meshd/run | 3 + ...-without-systemd-in-the-user-session.patch | 59 - .../0001-enable-dbus-without-systemd.patch | 34 + ...02-allow-obexd-on-non-systemd-system.patch | 54 + .../0002-bluetoothd-dbus-service.patch | 20 - ...003-allow-mesh-on-non-systemd-system.patch | 29 + .../0003-bluetooth-group-can-use-bluez.patch | 13 - ...04-include-sys-time.h-for-musl-build.patch | 129 + ...0005-include-limits.h-for-musl-build.patch | 66 + .../{musl.patch => 0006-musl-fix.patch} | 21 +- .../bluez/patches/0007-include-string.h.patch | 25 + ...-grant-permission-to-bluetooth-group.patch | 27 + ...fresh-adv_manager-for-non-LE-devices.patch | 51 + srcpkgs/bluez/template | 28 +- srcpkgs/bogofilter/template | 14 +- srcpkgs/boinc/template | 6 +- srcpkgs/borgmatic/template | 4 +- srcpkgs/botan/template | 26 +- srcpkgs/bpftrace/template | 2 +- srcpkgs/breeze-gtk/template | 4 +- srcpkgs/breeze-icons/template | 4 +- srcpkgs/breeze/template | 4 +- srcpkgs/brig/template | 2 +- ...052df45c1fa439f6af0a2c8e9795087b9444.patch | 185 - srcpkgs/brisk-menu/template | 8 +- srcpkgs/bro/template | 4 +- srcpkgs/broot/template | 4 +- srcpkgs/brother-brlaser/template | 4 +- srcpkgs/bs1770gain/template | 6 +- srcpkgs/bsdunzip/template | 2 +- srcpkgs/bspwm/template | 4 +- srcpkgs/btfs/template | 12 +- srcpkgs/btrfs-progs/template | 4 +- srcpkgs/buildah/template | 4 +- srcpkgs/buildbot/template | 3 +- srcpkgs/bum/template | 2 +- srcpkgs/bvi/template | 8 +- srcpkgs/cJSON/template | 2 +- srcpkgs/caddy/template | 4 +- srcpkgs/cage/template | 18 + srcpkgs/caja-extensions/template | 4 +- srcpkgs/caja/template | 4 +- .../patches/DST-fix-date-change.patch | 34 + srcpkgs/calcurse/template | 2 +- srcpkgs/calendarsupport/template | 4 +- srcpkgs/calibre/template | 23 +- .../patches/missing-includes.patch | 22 + srcpkgs/calligra-plan/template | 2 +- srcpkgs/calligra/patches/qt5.13.patch | 21 + srcpkgs/calligra/template | 2 +- srcpkgs/camlp4/patches/version-hack.patch | 11 + srcpkgs/camlp4/template | 2 +- srcpkgs/camlp5/template | 6 +- .../patches/revert-libgit2-sys-api.patch | 32 + srcpkgs/cargo/template | 45 +- srcpkgs/catch2/template | 4 +- srcpkgs/catfish/template | 4 +- srcpkgs/cbindgen/template | 4 +- srcpkgs/ccache/template | 4 +- srcpkgs/ccls/template | 8 +- srcpkgs/cdemu-client/template | 4 +- srcpkgs/cdemu-daemon/template | 4 +- srcpkgs/cdetect/template | 6 +- srcpkgs/celluloid/template | 19 + srcpkgs/cgrps/template | 8 +- srcpkgs/chafa/template | 4 +- srcpkgs/chatty/template | 10 +- srcpkgs/cheat/template | 26 + srcpkgs/cheese/template | 26 +- srcpkgs/cherry-font/template | 4 +- srcpkgs/cherrytree/template | 4 +- srcpkgs/chocolate-doom/template | 2 +- srcpkgs/chroma/template | 6 +- srcpkgs/chromium-widevine/template | 4 +- .../files/musl-patches/no-mallinfo.patch | 12 + .../patches/chromium-enable-vaapi.patch | 760 +- .../chromium/patches/harfbuzz-subset.patch | 49 + .../chromium/patches/linked-hash-set.patch | 130 + .../chromium/patches/one_euro_filter.patch | 11 + .../patches/sandbox-sched_getparam.patch | 20 + srcpkgs/chromium/template | 6 +- srcpkgs/chronograf/template | 4 +- srcpkgs/cinnamon-control-center/template | 6 +- srcpkgs/cinnamon-desktop/template | 6 +- srcpkgs/cinnamon-menus/template | 10 +- srcpkgs/cinnamon-screensaver/template | 6 +- srcpkgs/cinnamon-session/template | 8 +- srcpkgs/cinnamon-settings-daemon/template | 6 +- srcpkgs/cinnamon-translations/template | 4 +- ...78cf57b80b977401460a147602832157b303.patch | 64 - srcpkgs/cinnamon/patches/default-theme.patch | 25 - srcpkgs/cinnamon/patches/set_wheel.patch | 17 - srcpkgs/cinnamon/template | 9 +- srcpkgs/cjs/template | 10 +- srcpkgs/ckb-next/template | 8 +- srcpkgs/ckbcomp/template | 6 +- srcpkgs/clamav/template | 9 +- srcpkgs/clang | 2 +- srcpkgs/clang-analyzer | 2 +- srcpkgs/clang-tools-extra | 2 +- srcpkgs/claws-mail/template | 2 +- srcpkgs/clazy/template | 6 +- srcpkgs/clearine/template | 32 +- ...add-missing-functional-includes-5630.patch | 51 - .../patches/clementine-chromaprint-1.4.patch | 41 - .../patches/clementine-moodbar_flags.patch | 14 - .../patches/clementine-sqlite-3.12.patch | 19 - srcpkgs/clementine/patches/protobuf-370.patch | 82 - srcpkgs/clementine/patches/sentinel.patch | 42 - srcpkgs/clementine/template | 22 +- srcpkgs/clipgrab/template | 8 +- srcpkgs/clipman/template | 14 + srcpkgs/cloc/template | 4 +- srcpkgs/cloudfuse/template | 2 +- srcpkgs/clyrics/template | 4 +- srcpkgs/cmake-gui/template | 4 +- srcpkgs/cmake/template | 6 +- srcpkgs/cmixer/patches/linux.patch | 34 + srcpkgs/cmixer/template | 20 + srcpkgs/cmocka/template | 2 +- srcpkgs/cmus/template | 19 +- srcpkgs/cni-plugins/template | 4 +- srcpkgs/cnping/INSTALL | 5 + srcpkgs/cnping/template | 19 + srcpkgs/codecrypt/template | 6 +- srcpkgs/codelite/template | 2 +- srcpkgs/collectd/template | 2 +- srcpkgs/composer/template | 9 +- srcpkgs/compton/template | 8 +- srcpkgs/conky-cli/template | 4 +- srcpkgs/conky/template | 5 +- srcpkgs/conmon/template | 4 +- srcpkgs/connman/files/connmand/run | 3 +- srcpkgs/connman/files/musl/freeaddrinfo.patch | 17 + srcpkgs/connman/template | 2 +- srcpkgs/consul-template/template | 13 + srcpkgs/consul/template | 6 +- srcpkgs/coq/template | 9 +- srcpkgs/coreboot-utils/template | 6 +- srcpkgs/coyim/template | 19 + srcpkgs/cozy/template | 4 +- srcpkgs/cppcheck/template | 29 +- srcpkgs/cpufrequtils/template | 2 +- srcpkgs/crash/template | 4 +- srcpkgs/cri-tools/template | 10 +- srcpkgs/croc/template | 4 +- srcpkgs/cropgui/template | 2 +- .../files/non-nullness.patch | 1 - srcpkgs/cross-aarch64-linux-gnu/template | 21 +- .../files/gccgo-musl.patch | 1 + .../files/non-nullness.patch | 1 - srcpkgs/cross-aarch64-linux-musl/template | 43 +- .../files/non-nullness.patch | 1 - srcpkgs/cross-arm-linux-gnueabi/template | 21 +- .../files/non-nullness.patch | 1 - srcpkgs/cross-arm-linux-gnueabihf/template | 21 +- .../files/gccgo-musl.patch | 1 + .../files/non-nullness.patch | 1 - srcpkgs/cross-arm-linux-musleabi/template | 43 +- .../files/gccgo-musl.patch | 1 + .../files/non-nullness.patch | 1 - srcpkgs/cross-arm-linux-musleabihf/template | 43 +- .../files/non-nullness.patch | 1 - srcpkgs/cross-armv7l-linux-gnueabihf/template | 21 +- .../files/gccgo-musl.patch | 1 + .../files/non-nullness.patch | 1 - .../cross-armv7l-linux-musleabihf/template | 43 +- .../files/bug90756.patch | 1 - .../files/gccgo-musl.patch | 1 + .../files/non-nullness.patch | 1 - srcpkgs/cross-i686-linux-musl/template | 47 +- .../files/bug90756.patch | 1 - .../files/non-nullness.patch | 1 - srcpkgs/cross-i686-pc-linux-gnu/template | 24 +- .../files/non-nullness.patch | 1 - srcpkgs/cross-mips-linux-musl/template | 14 +- .../files/non-nullness.patch | 1 - srcpkgs/cross-mips-linux-muslhf/template | 14 +- .../files/non-nullness.patch | 1 - srcpkgs/cross-mipsel-linux-musl/template | 14 +- .../files/non-nullness.patch | 1 - srcpkgs/cross-mipsel-linux-muslhf/template | 14 +- .../files/non-nullness.patch | 1 - srcpkgs/cross-powerpc-linux-gnu/template | 40 +- .../files/gccgo-musl.patch | 1 + .../files/non-nullness.patch | 1 - srcpkgs/cross-powerpc-linux-musl/template | 63 +- .../files/darn.patch | 1 + .../files/non-nullness.patch | 1 - srcpkgs/cross-powerpc64-linux-gnu/template | 21 +- .../files/darn.patch | 1 + .../files/gccgo-musl.patch | 1 + .../files/non-nullness.patch | 1 - srcpkgs/cross-powerpc64-linux-musl/template | 44 +- .../files/darn.patch | 1 + .../files/non-nullness.patch | 1 - srcpkgs/cross-powerpc64le-linux-gnu/template | 21 +- .../files/darn.patch | 1 + .../files/gccgo-musl.patch | 1 + .../files/non-nullness.patch | 1 - srcpkgs/cross-powerpc64le-linux-musl/template | 44 +- srcpkgs/cross-vpkg-dummy/template | 24 +- .../files/gccgo-musl.patch | 1 + .../files/non-nullness.patch | 1 - srcpkgs/cross-x86_64-linux-musl/template | 43 +- srcpkgs/cross-x86_64-w64-mingw32/template | 6 +- srcpkgs/crypto++/patches/arm-native.patch | 26 - .../crypto++/patches/musl-soname-links.patch | 10 - srcpkgs/crypto++/template | 16 +- srcpkgs/cryptsetup/template | 14 +- srcpkgs/crystal/template | 10 +- srcpkgs/cups-filters/template | 6 +- srcpkgs/cups/patches/cups-no-gzip-man.patch | 17 - srcpkgs/cups/template | 4 +- ...ult-none-so-that-it-compiles-in-gcc9.patch | 57 - srcpkgs/cura-engine/template | 4 +- srcpkgs/cura-fdm-materials/template | 5 +- srcpkgs/cura/template | 4 +- srcpkgs/curl/template | 10 +- srcpkgs/cutter/template | 6 +- srcpkgs/datamash/template | 4 +- srcpkgs/dav1d/template | 2 +- srcpkgs/dbeaver/template | 4 +- srcpkgs/dconf-editor/template | 4 +- srcpkgs/ddcutil/template | 4 +- srcpkgs/ddgr/template | 6 +- srcpkgs/debootstrap/template | 10 +- srcpkgs/dejagnu/template | 2 +- srcpkgs/delta/template | 15 + srcpkgs/deluge/files/deluge-web/run | 2 +- srcpkgs/deluge/template | 2 +- srcpkgs/delve/template | 18 +- srcpkgs/deutex/template | 8 +- srcpkgs/devedeng/template | 6 +- srcpkgs/dhcpcd/template | 5 +- srcpkgs/dialog/template | 2 +- srcpkgs/diffr/template | 18 + srcpkgs/digikam/template | 6 +- srcpkgs/diskus/template | 6 +- srcpkgs/dispcalGUI/template | 4 +- srcpkgs/dive/template | 4 +- srcpkgs/dkms/files/kernel.d/dkms.postinst | 2 + srcpkgs/dkms/template | 2 +- srcpkgs/dma/patches/musl_sys_param_h.patch | 12 - srcpkgs/dma/template | 9 +- srcpkgs/dmd/template | 16 +- srcpkgs/dmenu-wayland/template | 5 +- srcpkgs/dmenu/template | 2 +- srcpkgs/dnscrypt-proxy/template | 6 +- srcpkgs/dnsmasq/patches/nettle35.patch | 42 + .../patches/pyyaml_version.patch | 13 + srcpkgs/docker-compose/template | 8 +- srcpkgs/docker/template | 4 +- srcpkgs/dolphin/template | 4 +- srcpkgs/doomretro/template | 4 +- srcpkgs/dos2unix/template | 8 +- srcpkgs/dosbox/template | 4 - srcpkgs/dovecot-plugin-pigeonhole/template | 6 +- srcpkgs/dovecot/template | 6 +- srcpkgs/dracut/patches/ppc-mac-thermal.patch | 144 + srcpkgs/dracut/template | 4 +- srcpkgs/dragon-player/template | 4 +- srcpkgs/drone-cli/template | 6 +- srcpkgs/drumstick-devel | 1 + srcpkgs/drumstick/template | 33 + srcpkgs/dssi/template | 8 +- srcpkgs/dtc/template | 4 +- srcpkgs/dte/template | 4 +- srcpkgs/duktape/template | 4 +- srcpkgs/duplicity/template | 2 +- srcpkgs/dutree/template | 4 +- srcpkgs/e2fsprogs/template | 4 +- srcpkgs/eclipse/template | 6 +- srcpkgs/edbrowse/patches/curl-7.62.patch | 27 - srcpkgs/edbrowse/template | 6 +- srcpkgs/editline/template | 2 +- srcpkgs/eggdrop/template | 44 + srcpkgs/elfinfo/template | 6 +- srcpkgs/elfutils/template | 2 +- srcpkgs/elixir/template | 4 +- srcpkgs/ell/template | 6 +- srcpkgs/elogind/template | 6 +- srcpkgs/emacs/template | 4 +- srcpkgs/enchant2/template | 6 +- srcpkgs/encodings/template | 13 +- srcpkgs/endless-sky/template | 4 +- srcpkgs/engrampa/template | 4 +- srcpkgs/entr/template | 7 +- srcpkgs/eog/template | 4 +- srcpkgs/eom/template | 5 - srcpkgs/epiphany/template | 2 +- srcpkgs/eqonomize/template | 4 +- srcpkgs/erlang/template | 4 +- srcpkgs/eselect/template | 6 +- srcpkgs/etcd/template | 4 +- srcpkgs/etcetera/template | 10 +- srcpkgs/ethtool/template | 4 +- srcpkgs/eventviews/template | 6 +- srcpkgs/evince/template | 6 +- srcpkgs/evolution-data-server/template | 8 +- srcpkgs/evolution-ews/template | 4 +- srcpkgs/evolution/template | 8 +- .../0001-Add-missing-limits.h-include.patch | 37 + srcpkgs/evtest/template | 6 +- srcpkgs/exa/template | 2 +- srcpkgs/exec-on-git-staged/template | 16 + srcpkgs/execline/template | 4 +- srcpkgs/exiftool/template | 4 +- srcpkgs/exiv2/patches/musl.patch | 23 - srcpkgs/exiv2/template | 13 +- srcpkgs/expat/template | 6 +- srcpkgs/expect/template | 10 +- srcpkgs/extra-cmake-modules/template | 4 +- srcpkgs/extrace/template | 3 +- srcpkgs/extractpdfmark/template | 2 +- srcpkgs/f2fs-tools/template | 6 +- srcpkgs/faketime/template | 10 +- srcpkgs/fastmod/template | 4 +- srcpkgs/fatrace/template | 9 +- srcpkgs/fava/template | 10 +- srcpkgs/fd/template | 4 +- srcpkgs/fdk-aac/template | 4 +- srcpkgs/fetchmail/patches/patch-socket_c.diff | 21 - srcpkgs/fetchmail/template | 10 +- srcpkgs/ffcall/template | 4 +- srcpkgs/ffmpeg/template | 14 +- srcpkgs/ffmpegthumbnailer/template | 15 +- srcpkgs/ffmpegthumbs/template | 4 +- srcpkgs/ffsend/template | 4 +- srcpkgs/ffuf/template | 16 + srcpkgs/fierce/template | 15 + srcpkgs/figurine/template | 6 +- srcpkgs/file-roller/template | 4 +- srcpkgs/filelight/template | 11 +- srcpkgs/filezilla/template | 4 +- .../findutils/patches/gnulib-freadahead.patch | 11 - srcpkgs/findutils/patches/gnulib-fseeko.patch | 21 - .../findutils/patches/gnulib-mountlist.patch | 15 - .../findutils/patches/gnulib-stdio-impl.patch | 14 - srcpkgs/findutils/template | 12 +- srcpkgs/fio/template | 4 +- srcpkgs/firebird3/template | 7 + ...irefox-esr-i18n-as => firefox-esr-i18n-bn} | 0 ...-esr-i18n-bn-BD => firefox-esr-i18n-en-CA} | 0 ...fox-esr-i18n-bn-IN => firefox-esr-i18n-ia} | 0 ...-esr-i18n-en-ZA => firefox-esr-i18n-ne-NP} | 0 ...refox-esr-i18n-mai => firefox-esr-i18n-oc} | 0 srcpkgs/firefox-esr-i18n-or | 1 - ...irefox-esr-i18n-ml => firefox-esr-i18n-ur} | 0 .../firefox-esr-i18n/files/update-lang-list | 1 + srcpkgs/firefox-esr-i18n/template | 202 +- srcpkgs/firefox-esr/files/mozconfig | 6 - .../disable-image-format-warning.patch | 15 + .../patches/fix-arm-opus-include.patch | 11 + .../firefox-esr/patches/fix-i686-musl.patch | 9 - srcpkgs/firefox-esr/patches/fix-toolkit.patch | 35 +- srcpkgs/firefox-esr/patches/fix-tools.patch | 31 +- .../firefox-esr/patches/fix-wasm-arm.patch | 15 + .../firefox-esr/patches/fix-webrtc-arm.patch | 11 - .../patches/fix-webrtc-glibcisms.patch | 17 +- srcpkgs/firefox-esr/patches/fix-xpcom.patch | 11 - .../patches/gettid-musl.patch} | 0 srcpkgs/firefox-esr/patches/mallinfo.patch | 40 +- .../patches/ppc-no-static-sizes.patch | 19 - .../patches/remove-rustc-check.patch | 18 +- .../firefox-esr/patches/rust-cssparser.patch | 90 + .../patches/rust-unitialized-field.patch | 19 - srcpkgs/firefox-esr/patches/rust133.patch | 24 - ...nd-restore-non-volatile-x28-on-arm64.patch | 64 - ...-clobbering-it-in-the-regex-compiler.patch | 97 - srcpkgs/firefox-esr/patches/sndio.patch | 12 +- srcpkgs/firefox-esr/patches/yuv-be.patch | 48 + srcpkgs/firefox-esr/template | 33 +- srcpkgs/firefox-i18n-bn | 1 + srcpkgs/firefox-i18n-en-CA | 1 + srcpkgs/firefox-i18n-ia | 1 + srcpkgs/firefox-i18n-ne-NP | 1 + srcpkgs/firefox-i18n-oc | 1 + srcpkgs/firefox-i18n-ur | 1 + srcpkgs/firefox-i18n/files/update-lang-list | 81 + srcpkgs/firefox-i18n/template | 188 +- srcpkgs/firefox/files/firefox-wayland | 5 +- .../patches/initialize_sched_param.patch | 22 + .../firefox/patches/ppc64le-bug-1512162.patch | 50 - srcpkgs/firefox/template | 36 +- srcpkgs/fish-shell/template | 2 +- srcpkgs/flac/template | 5 +- srcpkgs/flacon/template | 4 +- srcpkgs/flake8/template | 6 +- srcpkgs/flatbuffers/patches/install.patch | 20 - srcpkgs/flatbuffers/template | 12 +- srcpkgs/flatpak-builder/template | 4 +- srcpkgs/flatpak/template | 6 +- srcpkgs/fldigi/template | 4 +- .../patches/00-add-bin-directories.patch | 10 +- srcpkgs/flowblade/template | 8 +- srcpkgs/fmt/template | 2 +- srcpkgs/fmtools/template | 11 + srcpkgs/focuswriter/template | 4 +- srcpkgs/foliate/template | 6 +- srcpkgs/folks/template | 8 +- srcpkgs/font-FixedMisc/template | 4 +- srcpkgs/font-Hasklig/template | 2 +- srcpkgs/font-awesome5/template | 6 +- srcpkgs/font-firacode/template | 4 +- srcpkgs/font-ibm-plex-ttf/template | 4 +- srcpkgs/font-ionicons-ttf/template | 4 +- srcpkgs/font-iosevka/template | 4 +- .../font-material-design-icons-ttf/template | 2 +- srcpkgs/font-mplus-ttf/template | 6 +- srcpkgs/font-sarasa-gothic/template | 4 +- srcpkgs/font-spleen/template | 8 +- srcpkgs/font-unifont-bdf/template | 4 +- srcpkgs/font-util/template | 8 +- srcpkgs/font-vazir/template | 4 +- srcpkgs/forkstat/template | 4 +- srcpkgs/fossil/template | 7 +- srcpkgs/fotoxx/template | 5 +- srcpkgs/four-in-a-row/template | 8 +- srcpkgs/fpc-src/template | 2 +- srcpkgs/frameworkintegration/template | 4 +- .../patches/020-namespace-missing-std.patch | 127 + srcpkgs/freecad/template | 2 +- srcpkgs/freecell-solver/template | 8 +- srcpkgs/freeipmi/template | 4 +- srcpkgs/fribidi/template | 6 +- srcpkgs/frp/template | 4 +- srcpkgs/fselect/template | 4 +- srcpkgs/fuse-mp3fs/template | 14 + srcpkgs/fuse-overlayfs/template | 6 +- srcpkgs/fuse-zip/template | 4 +- srcpkgs/fuse3/template | 4 +- srcpkgs/fvwm/template | 6 +- srcpkgs/fwup/template | 8 +- srcpkgs/fwupd/template | 6 +- srcpkgs/fwupdate/template | 2 +- srcpkgs/g810-led/template | 4 +- srcpkgs/gallery-dl/template | 14 +- srcpkgs/gc/template | 2 +- srcpkgs/gcc/files/gccgo-musl.patch | 200 + srcpkgs/gcc/patches/bug90756.patch | 23 - srcpkgs/gcc/patches/darn.patch | 504 + srcpkgs/gcc/patches/libffi_gnulinux.patch | 11 + srcpkgs/gcc/patches/non-nullness.patch | 88 - srcpkgs/gcc/template | 56 +- srcpkgs/gcdemu/template | 4 +- srcpkgs/gcompris-qt/template | 4 +- srcpkgs/gdb/template | 8 +- srcpkgs/gdm/template | 6 +- srcpkgs/geany-plugins/template | 7 +- srcpkgs/geany/template | 6 +- srcpkgs/geary/template | 10 +- srcpkgs/geckodriver/template | 4 +- srcpkgs/geda/patches/snarf_cpp_opts.patch | 17 + srcpkgs/geda/template | 23 +- srcpkgs/gerbera/template | 4 +- srcpkgs/getmail/template | 6 +- srcpkgs/gfuzz/template | 14 + srcpkgs/giflib/template | 2 +- srcpkgs/gifski/template | 8 +- srcpkgs/gip/template | 9 +- srcpkgs/girara/template | 8 +- srcpkgs/git-cola/template | 4 +- srcpkgs/git-mediate/template | 14 + srcpkgs/git-revise/template | 7 +- srcpkgs/github-opml/template | 2 +- srcpkgs/gitlab-runner/template | 4 +- srcpkgs/gjs/template | 4 +- srcpkgs/glances/template | 6 +- srcpkgs/glib-networking/template | 4 +- srcpkgs/glib/template | 4 +- srcpkgs/glibmm/template | 4 +- srcpkgs/glslViewer/template | 2 +- srcpkgs/glslang/template | 2 +- srcpkgs/glusterfs/template | 4 +- srcpkgs/gmic/template | 4 +- srcpkgs/gmime3/template | 6 +- srcpkgs/gnome-backgrounds/template | 4 +- srcpkgs/gnome-bluetooth/template | 6 +- srcpkgs/gnome-books/template | 4 +- .../patches/dont-require-FNM_EXTMATCH.patch | 25 - srcpkgs/gnome-builder/template | 8 +- srcpkgs/gnome-calendar/template | 4 +- srcpkgs/gnome-chess/template | 4 +- srcpkgs/gnome-clocks/template | 6 +- .../gnome-contacts/patches/ambiguous.patch | 14 - srcpkgs/gnome-contacts/template | 6 +- srcpkgs/gnome-control-center/template | 4 +- srcpkgs/gnome-desktop/template | 4 +- srcpkgs/gnome-documents/template | 2 +- srcpkgs/gnome-flashback/template | 6 +- srcpkgs/gnome-font-viewer/template | 4 +- srcpkgs/gnome-games/template | 7 +- srcpkgs/gnome-getting-started-docs/template | 4 +- srcpkgs/gnome-initial-setup/template | 8 +- srcpkgs/gnome-klotski/template | 6 +- srcpkgs/gnome-mahjongg/template | 6 +- srcpkgs/gnome-mines/template | 4 +- srcpkgs/gnome-mpv | 1 + srcpkgs/gnome-mpv/template | 13 - srcpkgs/gnome-nibbles/template | 12 +- srcpkgs/gnome-online-accounts/template | 6 +- srcpkgs/gnome-online-miners/template | 4 +- srcpkgs/gnome-panel/template | 6 +- srcpkgs/gnome-passwordsafe/template | 5 +- srcpkgs/gnome-robots/template | 6 +- srcpkgs/gnome-screensaver/template | 2 +- srcpkgs/gnome-session/template | 6 +- srcpkgs/gnome-settings-daemon/template | 11 +- srcpkgs/gnome-shell-extensions/template | 4 +- srcpkgs/gnome-shell/template | 8 +- srcpkgs/gnome-ssh-askpass/template | 4 +- srcpkgs/gnome-sudoku/template | 4 +- srcpkgs/gnome-tetravex/template | 4 +- ...bc4dd0c6c804a093b94c269461ce376fed4f.patch | 30 - .../patches/gnome-todo-eds-libecal-2.0.patch | 567 + srcpkgs/gnome-todo/template | 8 +- srcpkgs/gnome-tweaks/template | 8 +- srcpkgs/gnome-user-docs/template | 4 +- srcpkgs/gnu-efi-libs/template | 8 +- srcpkgs/gnucash/template | 6 +- srcpkgs/gnumeric/template | 2 +- .../patches/use-versioned-pcsclite.patch | 11 + srcpkgs/gnupg2/template | 9 +- srcpkgs/gnutls/template | 7 +- srcpkgs/go-for-it/template | 4 +- srcpkgs/go-jira/template | 24 +- srcpkgs/go-md2man/template | 2 +- srcpkgs/go-review/template | 18 + .../go/patches/gohostarch-bootstrap-fix.patch | 28 + srcpkgs/go/template | 4 +- srcpkgs/gocryptfs/template | 6 +- srcpkgs/godot/template | 6 +- srcpkgs/golangci-lint/template | 4 +- srcpkgs/golly/template | 6 +- srcpkgs/gomatrix/template | 17 + srcpkgs/goodvibes/template | 4 +- srcpkgs/google-chrome/template | 6 +- srcpkgs/google-cloud-sdk/template | 5 +- srcpkgs/googler/template | 2 +- srcpkgs/gopls/template | 20 + srcpkgs/goversion/template | 2 +- .../patches/elf-mem-image-musl.patch | 13 + srcpkgs/gperftools/patches/ppc-musl.patch | 76 + srcpkgs/gperftools/template | 22 +- srcpkgs/gpgme/template | 14 +- srcpkgs/gpodder/template | 5 +- srcpkgs/gpsim/template | 8 +- srcpkgs/gradle/template | 8 +- srcpkgs/grafana/template | 4 +- srcpkgs/gramps/template | 6 +- srcpkgs/granite/template | 10 +- srcpkgs/grantleetheme/template | 4 +- srcpkgs/graphene/template | 9 +- srcpkgs/grpc/template | 15 +- srcpkgs/grub/files/kernel.d/grub.post | 2 + srcpkgs/grub/template | 2 +- srcpkgs/gscan2pdf/template | 4 +- srcpkgs/gsettings-desktop-schemas/template | 6 +- srcpkgs/gsl/patches/ppc-musl.patch | 36 + srcpkgs/gst-libav/template | 4 +- srcpkgs/gst-omx/template | 4 +- srcpkgs/gst-plugins-bad1/template | 6 +- srcpkgs/gst-plugins-base1/template | 4 +- srcpkgs/gst-plugins-good1/template | 6 +- srcpkgs/gst-plugins-ugly1/template | 4 +- srcpkgs/gst1-editing-services/template | 4 +- srcpkgs/gst1-python/template | 4 +- srcpkgs/gst1-python3/template | 4 +- srcpkgs/gstreamer-vaapi/template | 4 +- srcpkgs/gstreamer1/template | 4 +- srcpkgs/gtk+3/template | 4 +- srcpkgs/gtk3-nocsd/template | 12 +- srcpkgs/gtk4/template | 10 +- srcpkgs/gtkwave/template | 4 +- srcpkgs/gucci/template | 17 + srcpkgs/guitarix2/patches/musl.patch | 15 - srcpkgs/guitarix2/template | 13 +- srcpkgs/gummiboot/template | 2 +- srcpkgs/gutenprint/patches/musl.patch | 19 - srcpkgs/gutenprint/template | 4 +- srcpkgs/gvfs/template | 8 +- srcpkgs/gwenview/template | 4 +- srcpkgs/gxi | 1 + srcpkgs/gxi/template | 23 - srcpkgs/h2o/template | 9 +- srcpkgs/harfbuzz/template | 6 +- srcpkgs/haveged/template | 8 +- srcpkgs/help2man/template | 6 +- srcpkgs/hexchat/template | 2 +- srcpkgs/hexyl/template | 6 +- srcpkgs/hiawatha/template | 4 +- srcpkgs/hitori/template | 6 +- srcpkgs/homebank/template | 6 +- srcpkgs/hopper/template | 4 +- srcpkgs/hplip/template | 4 +- srcpkgs/httpie/template | 6 +- srcpkgs/hub/template | 4 +- srcpkgs/hugo/template | 4 +- srcpkgs/hunspell-en_AU/template | 4 +- srcpkgs/hunspell-en_GB-ize/template | 12 +- srcpkgs/hunspell-en_US/template | 10 +- srcpkgs/hunspell-es_ES/template | 4 +- srcpkgs/hunspell-pl_PL/template | 4 +- srcpkgs/hwids/template | 6 +- srcpkgs/hydroxide/template | 5 +- srcpkgs/hyperfine/template | 6 +- srcpkgs/i2pd/template | 4 +- srcpkgs/i3-gaps/template | 4 +- srcpkgs/i3/template | 4 +- srcpkgs/i3lock-color/template | 6 +- srcpkgs/i3lock-fancy/template | 2 +- srcpkgs/i3status-rust/patches/fix-32bit.patch | 16 +- srcpkgs/i3status-rust/template | 10 +- .../patches/pulseaudio-optional.patch | 95 + srcpkgs/i3status/template | 41 +- srcpkgs/iagno/template | 8 +- srcpkgs/ibus-bamboo/template | 4 +- srcpkgs/ibus-m17n/INSTALL.msg | 2 + srcpkgs/ibus-m17n/template | 19 + srcpkgs/icdiff/template | 6 +- srcpkgs/ice-ssb/template | 4 +- .../patches/fix-gettid.patch} | 5 +- srcpkgs/icecat/patches/fix-musl.patch | 11 - srcpkgs/icecat/patches/rust-cssparser.patch | 90 + srcpkgs/icecat/template | 12 + srcpkgs/icewm/patches/use-NULL.patch | 45 - srcpkgs/icewm/template | 22 +- srcpkgs/iio-sensor-proxy/template | 4 +- srcpkgs/imgp/template | 2 +- srcpkgs/immortal/template | 2 +- srcpkgs/imv/template | 11 +- srcpkgs/incidenceeditor/template | 6 +- srcpkgs/include-what-you-use/template | 2 +- srcpkgs/influxdb/template | 4 +- srcpkgs/inkscape/template | 2 +- srcpkgs/innoextract/template | 10 +- srcpkgs/intel-ucode/template | 4 +- .../intellij-idea-community-edition/template | 15 +- srcpkgs/inxi/template | 6 +- srcpkgs/io.elementary.calendar/template | 9 +- srcpkgs/io.elementary.code/template | 2 +- srcpkgs/io.elementary.files/template | 8 +- srcpkgs/ipe/template | 11 +- srcpkgs/iperf/template | 2 +- srcpkgs/iperf3/template | 2 +- srcpkgs/iproute2/template | 4 +- srcpkgs/ipv6calc/template | 4 +- srcpkgs/ipvsadm/template | 8 +- srcpkgs/irssi/template | 6 +- srcpkgs/iso-codes/template | 4 +- srcpkgs/ispc/template | 8 +- srcpkgs/iverilog/template | 6 +- srcpkgs/iwd/template | 10 +- srcpkgs/jack/template | 38 +- srcpkgs/jansson/template | 2 +- .../jbig2dec/patches/2002_abi_compat.patch | 24 + srcpkgs/jbig2dec/template | 6 +- srcpkgs/jdupes/template | 4 +- srcpkgs/jemalloc/template | 4 +- srcpkgs/jenkins/files/jenkins/run | 2 +- srcpkgs/jenkins/template | 6 +- srcpkgs/jgmenu/template | 4 +- srcpkgs/jmol/template | 4 +- srcpkgs/jreen-qt5 | 1 + srcpkgs/jreen-qt5-devel | 2 +- srcpkgs/jreen-qt5/template | 28 - srcpkgs/jreen/template | 37 +- srcpkgs/json-glib/template | 2 +- srcpkgs/jsonnet/template | 5 +- srcpkgs/juCi++/patches/libgit2-0.28.patch | 23 - srcpkgs/juCi++/template | 14 +- srcpkgs/juk/template | 4 +- srcpkgs/julia/template | 10 +- srcpkgs/jwm-settings-manager/template | 2 +- srcpkgs/k3b/template | 4 +- srcpkgs/k3s/files/k3s-agent/log/run | 2 + srcpkgs/k3s/files/k3s-agent/run | 10 + srcpkgs/k3s/files/k3s-server/log/run | 2 + srcpkgs/k3s/files/k3s-server/run | 5 + srcpkgs/k3s/template | 65 + srcpkgs/kColorPicker-devel | 1 + srcpkgs/kColorPicker/template | 28 + srcpkgs/kImageAnnotator-devel | 1 + srcpkgs/kImageAnnotator/template | 28 + srcpkgs/kaccounts-integration/template | 4 +- srcpkgs/kaccounts-providers/template | 4 +- srcpkgs/kactivities5-stats/template | 5 +- srcpkgs/kactivities5/template | 5 +- srcpkgs/kactivitymanagerd/template | 4 +- srcpkgs/kaddressbook/template | 6 +- srcpkgs/kak-lsp/template | 4 +- srcpkgs/kalarm/template | 6 +- srcpkgs/kalarmcal/template | 4 +- srcpkgs/kapidox/template | 4 +- srcpkgs/karchive/template | 4 +- srcpkgs/kate5/template | 4 +- srcpkgs/kauth/template | 4 +- srcpkgs/kbfs | 1 + srcpkgs/kbfs/template | 23 - srcpkgs/kbookmarks/template | 4 +- srcpkgs/kcachegrind/template | 8 +- srcpkgs/kcalc/template | 6 +- srcpkgs/kcalcore/template | 4 +- srcpkgs/kcalutils/template | 4 +- srcpkgs/kcharselect/template | 4 +- srcpkgs/kcmutils/template | 4 +- srcpkgs/kcodecs/template | 4 +- srcpkgs/kcolorchooser/template | 4 +- srcpkgs/kcompletion/template | 5 +- srcpkgs/kconfig/template | 4 +- srcpkgs/kconfigwidgets/template | 5 +- srcpkgs/kcontacts/template | 9 +- srcpkgs/kcoreaddons/template | 4 +- srcpkgs/kcrash/template | 4 +- srcpkgs/kcron/template | 8 +- srcpkgs/kdav/template | 4 +- srcpkgs/kdbusaddons/template | 4 +- srcpkgs/kde-cli-tools/template | 4 +- srcpkgs/kde-gtk-config5/template | 6 +- srcpkgs/kde5-baseapps/template | 2 +- srcpkgs/kde5/template | 53 +- srcpkgs/kdeclarative/template | 4 +- srcpkgs/kdecoration/template | 4 +- srcpkgs/kded/template | 4 +- srcpkgs/kdegraphics-mobipocket/template | 4 +- srcpkgs/kdegraphics-thumbnailers/template | 4 +- srcpkgs/kdelibs4support/template | 5 +- srcpkgs/kdenlive/template | 4 +- srcpkgs/kdepim-apps-libs/template | 6 +- srcpkgs/kdepim-runtime/template | 6 +- srcpkgs/kdeplasma-addons5/template | 4 +- srcpkgs/kdesignerplugin/template | 6 +- srcpkgs/kdesu/template | 4 +- srcpkgs/kdevelop-php/template | 4 +- srcpkgs/kdevelop-python/template | 8 +- srcpkgs/kdevelop/patches/use-std-c99.patch | 9 +- srcpkgs/kdevelop/template | 6 +- srcpkgs/kdewebkit/template | 4 +- srcpkgs/kdialog/template | 4 +- srcpkgs/kdnssd/template | 4 +- srcpkgs/kdoctools/template | 4 +- srcpkgs/kea/patches/fix-musl-getopt.patch | 10 - srcpkgs/kea/template | 9 +- srcpkgs/keditbookmarks/template | 9 +- srcpkgs/keepalived/template | 6 +- srcpkgs/kemoticons/template | 4 +- srcpkgs/keybase-desktop/template | 6 +- .../{kbfs/INSTALL => keybase/kbfs.INSTALL} | 0 srcpkgs/keybase/template | 25 +- srcpkgs/keyutils/template | 9 +- srcpkgs/kfilemetadata5/template | 5 +- srcpkgs/kfind/template | 6 +- srcpkgs/kgamma5/template | 4 +- srcpkgs/kget/template | 4 +- srcpkgs/kglobalaccel/template | 4 +- srcpkgs/kgpg/template | 22 + srcpkgs/kguiaddons/template | 4 +- srcpkgs/khelpcenter/template | 4 +- srcpkgs/kholidays/template | 4 +- srcpkgs/khotkeys/template | 4 +- srcpkgs/khtml/template | 4 +- srcpkgs/ki18n/template | 4 +- srcpkgs/kiconthemes/template | 5 +- srcpkgs/kidentitymanagement/template | 4 +- srcpkgs/kidletime/template | 4 +- srcpkgs/kig/template | 11 +- srcpkgs/kimageformats/template | 4 +- srcpkgs/kimap/template | 4 +- srcpkgs/kinfocenter/template | 4 +- srcpkgs/kinit/template | 4 +- srcpkgs/kio-extras/template | 4 +- srcpkgs/kio-gdrive/template | 4 +- srcpkgs/kio/template | 5 +- srcpkgs/kirigami2/template | 5 +- srcpkgs/kismet/template | 4 +- srcpkgs/kitemmodels/template | 4 +- srcpkgs/kitemviews/template | 5 +- srcpkgs/kitty/patches/musl.patch | 37 - srcpkgs/kitty/template | 4 +- srcpkgs/kiwix-lib/template | 4 +- srcpkgs/kiwix-tools/template | 6 +- srcpkgs/kjobwidgets/template | 4 +- srcpkgs/kjs/template | 4 +- srcpkgs/kjsembed/template | 8 +- srcpkgs/kldap/template | 4 +- srcpkgs/kmag/template | 6 +- srcpkgs/kmail-account-wizard/template | 4 +- srcpkgs/kmail/template | 6 +- srcpkgs/kmailtransport/template | 4 +- srcpkgs/kmbox/template | 4 +- srcpkgs/kmediaplayer/template | 4 +- srcpkgs/kmenuedit/template | 4 +- srcpkgs/kmime/template | 4 +- srcpkgs/kmix/template | 6 +- srcpkgs/kmymoney/template | 2 +- srcpkgs/knewstuff/template | 4 +- srcpkgs/knights/template | 4 +- srcpkgs/knot-resolver/files/kresd/run | 2 +- srcpkgs/knot-resolver/template | 6 +- srcpkgs/knot/template | 4 +- srcpkgs/knotes/template | 6 +- srcpkgs/knotifications/template | 4 +- srcpkgs/knotifyconfig/template | 4 +- .../kodi-addon-inputstream-adaptive/template | 4 +- srcpkgs/kodi-addon-pvr-iptvsimple/template | 4 +- srcpkgs/kodi-rpi/files/swig.nojava-18.3 | 1 - srcpkgs/kodi-rpi/files/swig.nojava-18.4 | 1 + srcpkgs/kodi-rpi/files/xbmc-standalone/run | 1 + srcpkgs/kodi-rpi/template | 6 +- .../AddonModuleXbmc.i.cpp | 2 +- .../AddonModuleXbmc.i.xml | 12232 ++--- .../AddonModuleXbmcaddon.i.cpp | 2 +- .../AddonModuleXbmcaddon.i.xml | 1518 +- .../AddonModuleXbmcdrm.i.cpp | 2 +- .../AddonModuleXbmcdrm.i.xml | 1492 +- .../AddonModuleXbmcgui.i.cpp | 2 +- .../AddonModuleXbmcgui.i.xml | 40730 ++++++++-------- .../AddonModuleXbmcplugin.i.cpp | 2 +- .../AddonModuleXbmcplugin.i.xml | 2724 +- .../AddonModuleXbmcvfs.i.cpp | 2 +- .../AddonModuleXbmcvfs.i.xml | 2314 +- .../AddonModuleXbmcwsgi.i.cpp | 2 +- .../AddonModuleXbmcwsgi.i.xml | 2884 +- srcpkgs/kodi/template | 4 +- srcpkgs/kolourpaint/template | 10 +- srcpkgs/kompare/template | 6 +- srcpkgs/konqueror/template | 7 +- srcpkgs/konquest/template | 4 +- srcpkgs/konsole/template | 4 +- srcpkgs/kontact/template | 4 +- srcpkgs/kontactinterface/template | 4 +- srcpkgs/korganizer/template | 6 +- srcpkgs/kpackage/template | 4 +- srcpkgs/kparts/template | 4 +- srcpkgs/kpartx/template | 6 +- srcpkgs/kpat/template | 8 +- srcpkgs/kpeople/template | 4 +- srcpkgs/kpimtextedit/template | 4 +- srcpkgs/kplotting/template | 7 +- srcpkgs/kpty/template | 4 +- srcpkgs/kqtquickcharts/template | 4 +- srcpkgs/krdc/template | 7 +- srcpkgs/krfb/template | 6 +- srcpkgs/krita/patches/musl.patch | 11 + srcpkgs/krita/template | 5 +- srcpkgs/kross/template | 8 +- srcpkgs/kruler/template | 11 +- srcpkgs/krunner/template | 4 +- srcpkgs/krusader/template | 6 +- srcpkgs/kscreen/template | 10 +- srcpkgs/kscreenlocker/template | 4 +- srcpkgs/kservice/template | 4 +- srcpkgs/ksh/files/LICENSE | 229 - srcpkgs/ksh/template | 27 +- srcpkgs/ksmtp/template | 4 +- srcpkgs/ksnip/patches/useGNUInstallDirs.patch | 10 + srcpkgs/ksnip/template | 14 + srcpkgs/ksolid/template | 4 +- srcpkgs/ksshaskpass/template | 4 +- srcpkgs/ksysguard/template | 4 +- srcpkgs/ksystemlog/template | 15 +- srcpkgs/kteatime/template | 11 +- srcpkgs/ktexteditor/template | 4 +- srcpkgs/ktextwidgets/template | 4 +- srcpkgs/ktnef/template | 6 +- srcpkgs/ktouch/template | 4 +- srcpkgs/ktuberling/template | 4 +- srcpkgs/kturtle/template | 6 +- srcpkgs/kubecfg/template | 4 +- srcpkgs/kubernetes/template | 4 +- srcpkgs/kunitconversion/template | 4 +- srcpkgs/kvantum/template | 4 +- srcpkgs/kvirc/template | 2 +- srcpkgs/kwallet-pam/template | 4 +- srcpkgs/kwallet/template | 4 +- srcpkgs/kwalletmanager/template | 11 +- srcpkgs/kwayland-integration/template | 6 +- srcpkgs/kwayland/template | 4 +- srcpkgs/kwidgetsaddons/template | 4 +- srcpkgs/kwin/template | 8 +- srcpkgs/kwindowsystem/template | 4 +- srcpkgs/kwrited/template | 4 +- srcpkgs/kxmlgui/template | 4 +- srcpkgs/kxmlrpcclient/template | 4 +- srcpkgs/latte-dock/template | 4 +- srcpkgs/lazarus/template | 2 +- srcpkgs/lazydocker/template | 4 +- srcpkgs/lazygit/template | 6 +- srcpkgs/lbreakouthd/template | 4 +- srcpkgs/lego/template | 7 +- srcpkgs/lesspipe/template | 8 +- srcpkgs/libArcus/template | 4 +- srcpkgs/libGL/patches/add-glx-use-tls.patch | 47 - srcpkgs/libGL/patches/add-use-elf-tls.patch | 28 + srcpkgs/libGL/patches/musl.patch | 40 +- srcpkgs/libGL/patches/ppc-auxval.patch | 55 + srcpkgs/libGL/template | 38 +- srcpkgs/libICE/template | 7 +- srcpkgs/libSM/template | 2 +- srcpkgs/libSavitar/template | 6 +- srcpkgs/libX11/template | 4 +- srcpkgs/libXau/template | 2 +- srcpkgs/libXcomposite/template | 2 +- srcpkgs/libXcursor/template | 2 +- srcpkgs/libXdamage/template | 2 +- srcpkgs/libXext/template | 2 +- srcpkgs/libXfont2/template | 6 +- srcpkgs/libXft/template | 2 +- srcpkgs/libXmu/template | 2 +- srcpkgs/libXpresent/template | 2 +- srcpkgs/libXrandr/template | 2 +- srcpkgs/libXvMC/template | 2 +- srcpkgs/libXxf86dga/template | 2 +- srcpkgs/libaacs/template | 2 +- srcpkgs/libabw/template | 6 +- srcpkgs/libaom/template | 2 +- srcpkgs/libappindicator/template | 4 +- srcpkgs/libassuan/template | 2 +- srcpkgs/libbaseencode/template | 2 +- srcpkgs/libblockdev/template | 2 +- srcpkgs/libbsd/template | 11 +- srcpkgs/libbytesize/template | 2 +- srcpkgs/libcacard/template | 2 +- srcpkgs/libcap-ng/template | 8 +- srcpkgs/libclc-git/template | 2 +- srcpkgs/libcloudproviders/template | 2 +- ...no-include-cxx-headers-from-extern-c.patch | 19 + srcpkgs/libcmis/template | 2 +- srcpkgs/libcotp/template | 2 +- srcpkgs/libcxx/patches/ppc.patch | 22 + srcpkgs/libcxx/template | 25 +- srcpkgs/libcxxabi/template | 22 +- srcpkgs/libdazzle/template | 4 +- srcpkgs/libdrm/template | 2 +- srcpkgs/libdwarf/template | 4 +- srcpkgs/libebml/template | 2 +- srcpkgs/libfakekey/template | 2 +- srcpkgs/libfilezilla/template | 4 +- srcpkgs/libfontenc/template | 2 +- srcpkgs/libgcrypt/template | 7 +- srcpkgs/libgdiplus/template | 9 +- srcpkgs/libgit2-0.27/template | 28 - srcpkgs/libgit2-0.27/update | 3 - srcpkgs/libgnome-games-support/template | 4 +- srcpkgs/libgravatar/template | 4 +- srcpkgs/libgta/template | 5 +- srcpkgs/libgusb/template | 2 +- .../patches/conditionalize-gir.patch | 130 - srcpkgs/libgweather/template | 4 +- srcpkgs/libheif/template | 4 +- srcpkgs/libhtp/template | 2 +- srcpkgs/libical/template | 22 +- srcpkgs/libinput/template | 6 +- srcpkgs/libite/template | 6 +- srcpkgs/libjpeg-turbo/template | 4 +- srcpkgs/libkcddb/template | 11 +- srcpkgs/libkdcraw5/template | 4 +- srcpkgs/libkdegames/template | 4 +- srcpkgs/libkdepim/template | 6 +- srcpkgs/libkexiv25/template | 4 +- srcpkgs/libkgapi/template | 6 +- srcpkgs/libkipi5/template | 4 +- srcpkgs/libkleo/template | 4 +- srcpkgs/libknet1-devel | 1 + srcpkgs/libknet1/patches/01_musl_fix.diff | 210 + srcpkgs/libknet1/template | 58 + srcpkgs/libkomparediff2/template | 10 +- srcpkgs/libksane/template | 4 +- srcpkgs/libkscreen/template | 4 +- srcpkgs/libksieve/template | 4 +- srcpkgs/libksysguard/template | 4 +- srcpkgs/liblastfm-qt5/template | 6 +- srcpkgs/libllvm9 | 1 + srcpkgs/libluv-devel | 1 + srcpkgs/libluv/template | 37 + srcpkgs/libmatroska/template | 2 +- srcpkgs/libmediainfo/template | 4 +- srcpkgs/libmicrodns/template | 4 +- srcpkgs/libmirage/template | 6 +- srcpkgs/libmpack/template | 2 +- srcpkgs/libnftnl/template | 4 +- srcpkgs/libnl3/patches/musl.patch | 12 - srcpkgs/libnl3/template | 9 +- srcpkgs/libnotify/template | 18 +- srcpkgs/libnozzle1 | 1 + srcpkgs/libnozzle1-devel | 1 + srcpkgs/libogg/template | 16 +- srcpkgs/liboping/template | 4 +- srcpkgs/libopusenc/template | 2 +- srcpkgs/libosinfo/template | 8 +- srcpkgs/libpcap/patches/fix-musl.patch | 10 - srcpkgs/libpcap/template | 6 +- srcpkgs/libpipeline/template | 4 +- srcpkgs/libplacebo/template | 2 +- srcpkgs/libpsl/template | 5 +- srcpkgs/libpwquality-python3 | 1 + srcpkgs/libpwquality/template | 29 +- srcpkgs/libqmatrixclient/template | 11 +- srcpkgs/libqtxdg/template | 2 +- srcpkgs/libratbag/template | 8 +- srcpkgs/libraw/template | 4 +- srcpkgs/librdkafka/template | 4 +- srcpkgs/libreoffice/template | 5 + srcpkgs/librime/template | 4 +- srcpkgs/libsass/template | 3 +- srcpkgs/libsidplayfp/template | 4 +- srcpkgs/libsigsegv/patches/ppc-musl.patch | 16 + srcpkgs/libsmbios/template | 2 +- srcpkgs/libtickit/template | 2 +- srcpkgs/libu2f-host/template | 10 +- srcpkgs/liburcu/template | 4 +- srcpkgs/liburing-devel | 1 + srcpkgs/liburing/template | 25 + srcpkgs/libuv/template | 4 +- srcpkgs/libva/template | 13 +- srcpkgs/libvarnishapi | 1 + srcpkgs/libvarnishapi-devel | 1 + srcpkgs/libversion/template | 6 +- srcpkgs/libvirt-python/template | 6 +- srcpkgs/libvirt/template | 19 +- srcpkgs/libvoikko/template | 2 +- srcpkgs/libvpx5/template | 6 + srcpkgs/libvterm/template | 10 +- srcpkgs/libwaylandpp/template | 2 +- srcpkgs/libwebp/template | 2 +- srcpkgs/libxcb/template | 2 +- srcpkgs/libxfce4panel | 1 + srcpkgs/libxkbcommon/template | 2 +- srcpkgs/libxmlb/template | 2 +- srcpkgs/libxo/template | 2 +- srcpkgs/libyaml/template | 2 +- srcpkgs/libzim/template | 4 +- srcpkgs/libzip/template | 2 +- srcpkgs/licensechecker/template | 2 +- srcpkgs/licensor/template | 15 + srcpkgs/lightsoff/template | 6 +- srcpkgs/lightzone/template | 2 +- srcpkgs/links-x11/template | 6 +- srcpkgs/links/template | 6 +- srcpkgs/linux-driver-management/template | 2 +- srcpkgs/linux-firmware/template | 7 +- srcpkgs/linux-tools/patches/musl.patch | 3 +- srcpkgs/linux-tools/patches/turbostat.patch | 20 - srcpkgs/linux-tools/template | 6 +- srcpkgs/linux/template | 6 +- srcpkgs/linux3.16/template | 4 +- srcpkgs/linux4.14/template | 4 +- srcpkgs/linux4.19/template | 4 +- srcpkgs/linux4.4/files/i386-dotconfig | 3 +- srcpkgs/linux4.4/files/x86_64-dotconfig | 3 +- srcpkgs/linux4.4/patches/gcc9.patch | 18 - srcpkgs/linux4.4/template | 4 +- srcpkgs/linux4.9/files/arm64-dotconfig | 3 +- srcpkgs/linux4.9/template | 4 +- srcpkgs/linux5.1-dbg | 1 - srcpkgs/linux5.1-headers | 1 - srcpkgs/linux5.2/files/x86_64-dotconfig | 2 +- srcpkgs/linux5.2/template | 4 +- srcpkgs/linux5.3-dbg | 1 + srcpkgs/linux5.3-headers | 1 + .../files/DocBook/Makefile | 0 .../files/arm-dotconfig | 749 +- .../files/arm64-dotconfig | 899 +- .../files/i386-dotconfig | 811 +- srcpkgs/{linux5.1 => linux5.3}/files/mv-debug | 0 .../files/ppc-dotconfig | 620 +- .../files/ppc64-dotconfig | 765 +- .../files/ppc64le-dotconfig | 753 +- .../files/x86_64-dotconfig | 845 +- .../patches/ppc64-be-elfv2.patch | 0 .../patches/smsc95xx-mac.patch | 0 srcpkgs/{linux5.1 => linux5.3}/template | 19 +- srcpkgs/lld | 2 +- srcpkgs/lld-devel | 2 +- srcpkgs/lldb | 2 +- srcpkgs/lldb-devel | 2 +- srcpkgs/llvm-libunwind/patches/ppc32.patch | 63 + srcpkgs/llvm-libunwind/template | 8 +- srcpkgs/llvm/template | 7 +- .../patches/llvm/llvm-003-secureplt.patch | 164 +- srcpkgs/llvm8/template | 174 +- srcpkgs/llvm9/files/llvm-Config-config.h | 9 + srcpkgs/llvm9/files/llvm-Config-llvm-config.h | 9 + .../cfe-001-fix-unwind-chain-inclusion.patch | 44 + .../cfe/cfe-002-add-musl-triples.patch | 91 + .../cfe-003-ppc64-dynamic-linker-path.patch | 18 + .../cfe/cfe-004-ppc64-musl-elfv2.patch | 27 + .../files/patches/cfe/cfe-005-gcc9.patch | 40 + srcpkgs/llvm9/files/patches/lldb/musl.patch | 31 + .../files/patches/llvm/llvm-001-musl.patch | 58 + .../llvm/llvm-002-musl-ppc64-elfv2.patch | 31 + .../patches/llvm/llvm-003-secureplt.patch | 130 + .../patches/llvm/llvm-004-override-opt.patch | 18 + srcpkgs/llvm9/template | 283 + srcpkgs/llvm9/update | 2 + srcpkgs/logrotate/template | 5 +- srcpkgs/lok/template | 2 +- srcpkgs/lollypop/template | 6 +- srcpkgs/lowdown/patches/stdint_h.patch | 30 - srcpkgs/lowdown/template | 4 +- srcpkgs/lprng/files/lprng/run | 4 + srcpkgs/lprng/template | 24 + srcpkgs/lsd/template | 12 + srcpkgs/lsyncd/files/lsyncd/log/run | 2 + srcpkgs/lsyncd/files/lsyncd/run | 3 +- srcpkgs/lsyncd/template | 4 +- srcpkgs/lttng-modules-dkms/template | 6 +- srcpkgs/lttng-tools/template | 4 +- srcpkgs/lttng-ust/template | 4 +- srcpkgs/luaposix/template | 10 +- srcpkgs/luasec/template | 4 +- srcpkgs/lutris/template | 4 +- srcpkgs/lxqt-themes/template | 2 +- srcpkgs/lyx/template | 8 +- srcpkgs/lz4/template | 4 +- srcpkgs/magic-wormhole/template | 21 + srcpkgs/mailcommon/template | 8 +- srcpkgs/mailimporter/template | 4 +- srcpkgs/maim/template | 2 +- srcpkgs/makedepend/template | 2 +- srcpkgs/mame/template | 4 +- srcpkgs/man-db/template | 20 +- srcpkgs/man-pages/template | 4 +- srcpkgs/manuskript/template | 4 +- srcpkgs/marble5/template | 9 +- srcpkgs/marco/template | 8 +- .../mariadb/patches/force-c11-atomics.patch | 294 + srcpkgs/mariadb/patches/libatomic.patch | 103 + srcpkgs/mariadb/patches/musl-ppc.patch | 27 + srcpkgs/mariadb/template | 19 +- srcpkgs/mate-control-center/template | 2 +- srcpkgs/mate-menus/template | 20 +- srcpkgs/mate-panel/template | 6 +- srcpkgs/mate-screensaver/template | 10 +- srcpkgs/mate-tweak/template | 7 +- srcpkgs/mathcomp/template | 2 +- srcpkgs/mathjax/template | 8 +- srcpkgs/maxima/template | 13 +- srcpkgs/mc/template | 2 +- srcpkgs/mdevd/template | 6 +- srcpkgs/mediainfo/template | 4 +- srcpkgs/megazeux/template | 4 +- srcpkgs/menumaker/template | 10 +- srcpkgs/menutray/template | 6 +- srcpkgs/mercurial/template | 4 +- srcpkgs/meson/template | 9 +- srcpkgs/messagelib/template | 6 +- srcpkgs/mftrace/patches/gf2pbm.1.patch | 11 + srcpkgs/mftrace/template | 8 +- srcpkgs/mgba/template | 4 +- srcpkgs/miller/template | 8 +- srcpkgs/milou/template | 6 +- srcpkgs/miniflux/template | 4 +- srcpkgs/minify/template | 4 +- srcpkgs/minijail/template | 23 + srcpkgs/minikube/template | 2 +- srcpkgs/minio/template | 7 +- srcpkgs/minitalk/template | 14 +- srcpkgs/mkchromecast/template | 2 +- srcpkgs/mkfontscale/template | 2 +- srcpkgs/mkinitcpio/template | 6 +- srcpkgs/mkpasswd | 1 + srcpkgs/mkvtoolnix/template | 4 +- srcpkgs/mmark/template | 4 +- srcpkgs/modemmanager-qt5/template | 4 +- srcpkgs/modsecurity/template | 2 +- srcpkgs/mongoose/template | 6 +- srcpkgs/mono/patches/fix-heapviz-import.patch | 11 + srcpkgs/mono/patches/musl.patch | 11 + srcpkgs/mono/template | 9 +- srcpkgs/monolith/template | 22 + srcpkgs/moserial/template | 14 + srcpkgs/mozo/template | 8 +- srcpkgs/mpDris2/files/mpDris2/run | 2 + srcpkgs/mpDris2/template | 25 + srcpkgs/mpc/template | 2 +- srcpkgs/mpd/template | 11 +- srcpkgs/mpdcron/template | 2 +- srcpkgs/mpg123/template | 4 +- srcpkgs/mplayer/template | 2 + srcpkgs/mpop/template | 4 +- srcpkgs/msbuild-bin/template | 6 +- srcpkgs/msgpack/template | 6 +- srcpkgs/msmtp/template | 6 +- srcpkgs/mtm/template | 23 + srcpkgs/muffin/template | 4 +- .../patches/link-overlay-against-libGL.patch | 22 +- srcpkgs/mumble/patches/musl-dlsym.patch | 30 - srcpkgs/mumble/patches/protobuf-370.patch | 758 - .../mumble/patches/speech-dispatcher.patch | 11 - srcpkgs/mumble/patches/std-float.patch | 11 - srcpkgs/mumble/template | 50 +- srcpkgs/musikcube/template | 4 +- srcpkgs/mutt/template | 8 +- .../mutter/patches/meta-renderer-x11.patch | 17 - srcpkgs/mutter/template | 14 +- srcpkgs/mymcplus/template | 15 + srcpkgs/mysql++/template | 10 +- srcpkgs/namecoin/template | 6 +- srcpkgs/nano/template | 7 +- srcpkgs/nasa-wallpaper/template | 4 +- srcpkgs/nautilus/template | 4 +- srcpkgs/nbd/template | 4 +- srcpkgs/ncdc/template | 6 +- srcpkgs/ncmpc/template | 4 +- srcpkgs/ndctl/template | 6 +- srcpkgs/neatvi/template | 6 +- srcpkgs/nemo-fileroller/template | 6 +- srcpkgs/nemo/template | 8 +- srcpkgs/neofetch/template | 4 +- srcpkgs/neovim-remote/template | 4 +- srcpkgs/neovim/template | 9 +- srcpkgs/nerd-fonts/template | 2 +- srcpkgs/netcdf/template | 4 +- .../netpbm/files/netpbm-security-code.patch | 69 - srcpkgs/netpbm/template | 10 +- srcpkgs/nettle/template | 6 +- srcpkgs/networkmanager-qt5/template | 4 +- srcpkgs/newsboat/template | 8 +- srcpkgs/next/template | 21 + srcpkgs/nftables/template | 9 +- srcpkgs/ngspice/template | 6 +- srcpkgs/nilfs-utils/patches/max-input.patch | 12 - srcpkgs/nilfs-utils/patches/rpc-types.patch | 11 - srcpkgs/nilfs-utils/template | 8 +- srcpkgs/nim/template | 28 +- srcpkgs/ninja/template | 2 +- srcpkgs/nix/template | 2 +- srcpkgs/nnn/template | 4 +- srcpkgs/nodejs-lts/patches/ppc32.patch | 25 + srcpkgs/nodejs-lts/template | 6 + srcpkgs/nodejs/patches/ppc32.patch | 8 +- srcpkgs/nodejs/template | 9 +- srcpkgs/nomad/template | 6 +- srcpkgs/nootka/template | 6 +- srcpkgs/notify-send.sh/template | 2 +- srcpkgs/nsd/template | 4 +- srcpkgs/nsjail/template | 10 +- srcpkgs/nspr/template | 4 +- srcpkgs/nss/template | 6 +- srcpkgs/nsss/template | 6 +- srcpkgs/numactl/template | 6 +- srcpkgs/nvidia/template | 8 +- srcpkgs/nvidia340/files/kernel-5.0.patch | 44 + srcpkgs/nvidia340/template | 4 +- .../nvidia390/files/kernel-5.1-x86_64.patch | 29 - srcpkgs/nvidia390/files/kernel-5.1.patch | 102 - .../nvidia390/files/kernel-5.2-x86_64.patch | 18 - srcpkgs/nvidia390/template | 26 +- srcpkgs/nvme-cli/INSTALL | 12 + srcpkgs/nvme-cli/REMOVE | 8 + srcpkgs/nvme-cli/template | 18 +- srcpkgs/oblibs/template | 6 +- srcpkgs/obs/template | 4 +- srcpkgs/ocaml-findlib/template | 10 +- srcpkgs/ocaml-lablgtk2/template | 2 +- srcpkgs/ocaml-num/template | 2 +- srcpkgs/ocaml/template | 4 +- srcpkgs/ocamlbuild/template | 2 +- srcpkgs/occt/files/opencascade.sh | 24 + srcpkgs/occt/patches/musl-fenv.patch | 55 +- srcpkgs/occt/template | 9 +- srcpkgs/offlineimap/template | 10 +- srcpkgs/ofono/template | 8 +- srcpkgs/ok.sh/template | 2 +- srcpkgs/okular/template | 4 +- srcpkgs/olive/template | 4 +- srcpkgs/olm-python/template | 4 +- srcpkgs/olm/template | 4 +- srcpkgs/onionshare/template | 9 +- srcpkgs/opam/template | 2 +- srcpkgs/open-iscsi/patches/ether.patch | 10 - srcpkgs/open-iscsi/patches/fix-musl-2.patch | 10 - srcpkgs/open-iscsi/template | 20 +- srcpkgs/open-vm-tools/patches/gcc9.patch | 103 - srcpkgs/open-vm-tools/template | 20 +- srcpkgs/openbsd-netcat/template | 8 +- srcpkgs/openconnect/template | 4 +- srcpkgs/opendkim/files/opendkim/run | 3 + srcpkgs/opendkim/template | 7 +- srcpkgs/openldap/template | 3 +- srcpkgs/openmw/template | 5 +- srcpkgs/openresolv/template | 4 +- srcpkgs/openssh/patches/setproctitle.patch | 10 - srcpkgs/openssh/template | 7 +- srcpkgs/opentmpfiles/template | 2 +- srcpkgs/openttd/template | 6 +- srcpkgs/opera/template | 4 +- srcpkgs/opus/template | 2 +- srcpkgs/orage/template | 2 +- srcpkgs/orca/template | 6 +- srcpkgs/ortp/template | 2 +- srcpkgs/osg/template | 2 +- srcpkgs/osinfo-db-tools/template | 8 +- srcpkgs/osinfo-db/template | 6 +- srcpkgs/oxipng/template | 4 +- srcpkgs/oxygen-icons5/template | 4 +- srcpkgs/oxygen/template | 4 +- srcpkgs/p11-kit/template | 4 +- srcpkgs/packer/template | 6 +- srcpkgs/palapeli/template | 4 +- srcpkgs/pam_rundir/patches/fix.patch | 40 + srcpkgs/pam_rundir/template | 4 +- srcpkgs/pam_ssh/template | 6 +- srcpkgs/papi/patches/gnu_source.patch | 12 + srcpkgs/papi/template | 7 +- srcpkgs/papirus-icon-theme/template | 4 +- srcpkgs/parallel/template | 4 +- srcpkgs/paraview/template | 63 + srcpkgs/parted/patches/fix-glibc-2.27.patch | 42 - srcpkgs/parted/patches/fix-includes.patch | 10 - srcpkgs/parted/template | 6 +- srcpkgs/passphrase2pgp/template | 13 + srcpkgs/pastel/template | 15 + srcpkgs/patchelf/template | 2 +- srcpkgs/pax/template | 4 +- srcpkgs/pcmanfm-qt/template | 3 +- srcpkgs/pd/patches/fix-musl.patch | 15 + srcpkgs/pd/template | 10 +- srcpkgs/pdd/template | 2 +- srcpkgs/pdfcrack/template | 4 +- srcpkgs/pdsh/patches/fix_configure_ac.patch | 18 + srcpkgs/pdsh/template | 40 + srcpkgs/peaclock/template | 8 +- srcpkgs/peek/template | 11 +- srcpkgs/pelican/template | 6 +- srcpkgs/perl-ACL-Lite/template | 2 +- srcpkgs/perl-Alien-Build/template | 6 +- srcpkgs/perl-Archive-Zip/template | 8 +- srcpkgs/perl-Barcode-ZBar/template | 4 +- srcpkgs/perl-Bit-Vector/template | 2 +- srcpkgs/perl-CPAN-Meta-Check/template | 2 +- srcpkgs/perl-Cairo-GObject/template | 6 +- srcpkgs/perl-Cairo/template | 10 +- srcpkgs/perl-Carp-Clan/template | 4 +- srcpkgs/perl-Class-Method-Modifiers/template | 8 +- srcpkgs/perl-Class-XSAccessor/template | 4 +- srcpkgs/perl-Clone-Choose/template | 2 +- srcpkgs/perl-Clone-PP/template | 2 +- srcpkgs/perl-Clone/template | 2 +- srcpkgs/perl-Config-Simple/template | 2 +- srcpkgs/perl-Crypt-Blowfish/template | 2 +- srcpkgs/perl-Crypt-CAST5/template | 2 +- srcpkgs/perl-Crypt-DES/template | 2 +- srcpkgs/perl-Crypt-IDEA/template | 2 +- srcpkgs/perl-Crypt-OpenSSL-Bignum/template | 2 +- srcpkgs/perl-Crypt-OpenSSL-Guess/template | 2 +- srcpkgs/perl-Crypt-OpenSSL-RSA/template | 2 +- srcpkgs/perl-Crypt-OpenSSL-Random/template | 2 +- srcpkgs/perl-Crypt-Rijndael/template | 8 +- srcpkgs/perl-CryptX/template | 2 +- srcpkgs/perl-Curses-UI/template | 15 + srcpkgs/perl-Curses/template | 4 +- srcpkgs/perl-DBD-Pg/template | 12 +- srcpkgs/perl-DBD-SQLite/template | 2 +- srcpkgs/perl-DBD-mysql/template | 2 +- srcpkgs/perl-DBI/template | 2 +- srcpkgs/perl-Danga-Socket/template | 2 +- srcpkgs/perl-Data-MessagePack/template | 4 +- srcpkgs/perl-Data-Section-Simple/template | 2 +- srcpkgs/perl-Data-UUID/template | 2 +- srcpkgs/perl-Date-Manip/template | 4 +- srcpkgs/perl-DateTime-TimeZone/template | 4 +- srcpkgs/perl-DateTime/template | 8 +- srcpkgs/perl-Devel-Caller/template | 2 +- srcpkgs/perl-Devel-LexAlias/template | 4 +- srcpkgs/perl-Digest-SHA1/template | 2 +- srcpkgs/perl-Email-Address-XS/template | 4 +- srcpkgs/perl-Email-Date-Format/template | 2 +- srcpkgs/perl-Email-MIME-ContentType/template | 2 +- srcpkgs/perl-Email-MIME-Encodings/template | 2 +- srcpkgs/perl-Email-MIME/template | 2 +- srcpkgs/perl-Email-MessageID/template | 2 +- srcpkgs/perl-Email-Simple/template | 2 +- srcpkgs/perl-FFI-CheckLib/template | 6 +- srcpkgs/perl-File-BaseDir/template | 2 +- srcpkgs/perl-File-Copy-Recursive/template | 6 +- srcpkgs/perl-File-Find-Rule/template | 2 +- srcpkgs/perl-File-Flock-Retry/template | 2 +- srcpkgs/perl-File-Slurp/template | 6 +- srcpkgs/perl-File-Slurper/template | 2 +- srcpkgs/perl-File-Write-Rotate/template | 8 +- srcpkgs/perl-File-chdir/template | 2 +- srcpkgs/perl-File-pushd/template | 2 +- srcpkgs/perl-Filesys-Df/template | 2 +- srcpkgs/perl-Filesys-Notify-Simple/template | 2 +- srcpkgs/perl-Fuse/template | 2 +- srcpkgs/perl-Getopt-Compact/template | 2 +- .../perl-Glib-Object-Introspection/template | 2 +- srcpkgs/perl-Glib/template | 4 +- srcpkgs/perl-Goo-Canvas/template | 2 +- srcpkgs/perl-Gtk2-ImageView/template | 2 +- srcpkgs/perl-Gtk2-Notify/template | 2 +- srcpkgs/perl-Gtk2/template | 8 +- srcpkgs/perl-Gtk3/template | 4 +- srcpkgs/perl-HTML-Form/template | 4 +- srcpkgs/perl-HTML-Parser/template | 2 +- srcpkgs/perl-HTML-Tree/template | 2 +- srcpkgs/perl-HTTP-Daemon/template | 4 +- srcpkgs/perl-IO-HTML/template | 2 +- srcpkgs/perl-IO-SessionData/template | 2 +- srcpkgs/perl-IO-Tty/template | 2 +- srcpkgs/perl-IPC-System-Simple/template | 2 +- srcpkgs/perl-Image-Sane/template | 6 +- srcpkgs/perl-Importer/template | 2 +- srcpkgs/perl-Inline-C/template | 6 +- srcpkgs/perl-Inline/template | 6 +- srcpkgs/perl-JSON-XS/template | 2 +- srcpkgs/perl-LWP-MediaTypes/template | 2 +- srcpkgs/perl-Lchown/template | 4 +- srcpkgs/perl-Linux-Inotify2/template | 2 +- srcpkgs/perl-List-MoreUtils-XS/template | 2 +- srcpkgs/perl-Locale-gettext/template | 2 +- srcpkgs/perl-MP3-Tag/template | 10 +- srcpkgs/perl-Mail-Box/template | 4 +- srcpkgs/perl-Mail-DKIM/template | 4 +- srcpkgs/perl-Mail-Message/template | 2 +- srcpkgs/perl-Mail-POP3Client/template | 2 +- srcpkgs/perl-Mail-Sendmail/template | 2 +- srcpkgs/perl-Mail-Transport/template | 6 +- srcpkgs/perl-Math-BigInt-GMP/template | 6 +- srcpkgs/perl-Math-FFT/template | 15 + srcpkgs/perl-Math-Prime-Util-GMP/template | 2 +- srcpkgs/perl-Math-Prime-Util/template | 2 +- srcpkgs/perl-Module-Pluggable/template | 2 +- srcpkgs/perl-Mojolicious/template | 5 +- srcpkgs/perl-Monkey-Patch-Action/template | 2 +- srcpkgs/perl-Moo/template | 2 +- srcpkgs/perl-MusicBrainz-DiscID/template | 2 +- srcpkgs/perl-Net-DBus/template | 2 +- srcpkgs/perl-Net-DNS-Resolver-Mock/template | 2 +- srcpkgs/perl-Net-IMAP-Client/template | 2 +- srcpkgs/perl-Net-IMAP-Simple/template | 2 +- srcpkgs/perl-Net-MPD/template | 2 +- srcpkgs/perl-Net-SSH2/template | 2 +- srcpkgs/perl-Net-SSLeay/template | 2 +- srcpkgs/perl-NetAddr-IP/template | 2 +- srcpkgs/perl-Number-Compare/template | 2 +- srcpkgs/perl-Object-MultiType/template | 2 +- srcpkgs/perl-OpenGL/template | 2 +- srcpkgs/perl-PDF-API2/template | 4 +- srcpkgs/perl-Package-Stash-XS/template | 2 +- srcpkgs/perl-PadWalker/template | 2 +- srcpkgs/perl-Pango/template | 2 +- srcpkgs/perl-Params-Util/template | 2 +- srcpkgs/perl-Parse-RecDescent/template | 2 +- srcpkgs/perl-PatchReader/template | 2 +- srcpkgs/perl-Pegex/template | 2 +- srcpkgs/perl-Pod-Simple-Text-Termcap/template | 2 +- srcpkgs/perl-Proc-Daemontools/template | 2 +- srcpkgs/perl-Proc-Govern/template | 8 +- srcpkgs/perl-Proc-PID-File/template | 2 +- srcpkgs/perl-Proc-ProcessTable/template | 2 +- srcpkgs/perl-Ref-Util-XS/template | 2 +- srcpkgs/perl-Regexp-Grammars/template | 6 +- srcpkgs/perl-Role-Tiny/template | 4 +- srcpkgs/perl-SUPER/template | 8 +- srcpkgs/perl-Scope-Guard/template | 2 +- srcpkgs/perl-Search-Xapian/template | 2 +- srcpkgs/perl-Socket-MsgHdr/template | 4 +- srcpkgs/perl-Socket6/template | 2 +- srcpkgs/perl-Spiffy/template | 2 +- srcpkgs/perl-Sub-Delete/template | 2 +- srcpkgs/perl-Sub-Identify/template | 2 +- srcpkgs/perl-Sub-Info/template | 2 +- srcpkgs/perl-Sub-Name/template | 10 +- srcpkgs/perl-Sub-Quote/template | 6 +- srcpkgs/perl-Svsh/template | 2 +- srcpkgs/perl-Sys-Syscall/template | 2 +- srcpkgs/perl-Taint-Runtime/template | 4 +- srcpkgs/perl-Template-Toolkit/template | 2 +- srcpkgs/perl-Term-ExtendedColor/template | 6 +- srcpkgs/perl-Term-ReadKey/template | 2 +- srcpkgs/perl-Term-ReadLine-Gnu/template | 2 +- srcpkgs/perl-Term-Table/template | 6 +- srcpkgs/perl-Test-Base/template | 2 +- srcpkgs/perl-Test-CPAN-Meta/template | 2 +- srcpkgs/perl-Test-Class/template | 2 +- srcpkgs/perl-Test-Cmd/template | 2 +- srcpkgs/perl-Test-Command/template | 2 +- srcpkgs/perl-Test-Deep/template | 2 +- srcpkgs/perl-Test-FailWarnings/template | 2 +- srcpkgs/perl-Test-File-ShareDir/template | 2 +- srcpkgs/perl-Test-File/template | 2 +- srcpkgs/perl-Test-HTTP-Server-Simple/template | 2 +- srcpkgs/perl-Test-Inter/template | 2 +- srcpkgs/perl-Test-LeakTrace/template | 4 +- srcpkgs/perl-Test-MockModule/template | 2 +- srcpkgs/perl-Test-Most/template | 2 +- srcpkgs/perl-Test-Needs/template | 2 +- srcpkgs/perl-Test-Output/template | 2 +- srcpkgs/perl-Test-Requires/template | 2 +- srcpkgs/perl-Test-RequiresInternet/template | 2 +- srcpkgs/perl-Test-SharedFork/template | 2 +- srcpkgs/perl-Test-Simple/template | 6 +- srcpkgs/perl-Test-Subroutines/template | 2 +- srcpkgs/perl-Test-TCP/template | 4 +- srcpkgs/perl-Test-Warn/template | 2 +- srcpkgs/perl-Test-Warnings/template | 10 +- srcpkgs/perl-Test-Weaken/template | 2 +- srcpkgs/perl-Test-Without-Module/template | 2 +- srcpkgs/perl-Test-YAML/template | 2 +- srcpkgs/perl-Test-utf8/template | 2 +- srcpkgs/perl-Test2-Plugin-NoWarnings/template | 8 +- srcpkgs/perl-Test2-Suite/template | 6 +- srcpkgs/perl-Text-Aligner/template | 2 +- srcpkgs/perl-Text-Bidi/template | 2 +- srcpkgs/perl-Text-CharWidth/template | 2 +- srcpkgs/perl-Text-Markdown/template | 2 +- srcpkgs/perl-Text-Table/template | 2 +- srcpkgs/perl-Text-XLogfile/template | 2 +- srcpkgs/perl-Time-modules/template | 2 +- srcpkgs/perl-Tk/template | 2 +- srcpkgs/perl-Unicode-LineBreak/template | 2 +- srcpkgs/perl-Unicode-String/template | 2 +- srcpkgs/perl-Unix-Mknod/template | 4 +- srcpkgs/perl-Unix-Uptime/template | 2 +- srcpkgs/perl-Variable-Magic/template | 2 +- srcpkgs/perl-WL/template | 2 +- .../perl-WWW-Curl/patches/CURL_STRICTER.patch | 32 - .../perl-WWW-Curl/patches/curl-7.50.2.patch | 24 + srcpkgs/perl-WWW-Curl/template | 2 +- srcpkgs/perl-WWW-Mechanize/template | 6 +- srcpkgs/perl-XML-LibXML/template | 2 +- srcpkgs/perl-XML-Parser-Lite/template | 2 +- srcpkgs/perl-XML-Parser/template | 10 +- srcpkgs/perl-XML-Smart/template | 2 +- srcpkgs/perl-YAML-LibYAML/template | 8 +- srcpkgs/perl-namespace-autoclean/template | 10 +- srcpkgs/perl-pcsc/template | 2 +- srcpkgs/perl-strictures/template | 9 +- srcpkgs/perl-tainting/template | 2 +- srcpkgs/perl/patches/cleanup-paths.diff | 20 +- srcpkgs/perl/template | 100 +- srcpkgs/peru/template | 20 + srcpkgs/pfetch/template | 16 + srcpkgs/pgbackrest/template | 2 +- srcpkgs/pgbouncer/template | 4 +- srcpkgs/pgweb/template | 4 +- srcpkgs/phonon-qt5/template | 9 +- srcpkgs/php/template | 6 +- srcpkgs/picard/template | 4 +- srcpkgs/pidgin-sipe/template | 6 +- srcpkgs/pijul/patches/bindgen.patch | 19 +- srcpkgs/pijul/template | 13 +- srcpkgs/pim-data-exporter/template | 6 +- srcpkgs/pimcommon/template | 6 +- srcpkgs/pinentry-dmenu/template | 2 +- srcpkgs/pioneer/template | 4 +- srcpkgs/pioneer/update | 1 + srcpkgs/piper/template | 2 +- srcpkgs/pipewire/template | 5 +- srcpkgs/pithos/template | 8 +- srcpkgs/pixman/template | 2 +- srcpkgs/pkgtop/template | 18 + srcpkgs/plantuml/template | 5 +- srcpkgs/plasma-browser-integration/template | 7 +- srcpkgs/plasma-desktop/template | 4 +- srcpkgs/plasma-framework/template | 4 +- srcpkgs/plasma-integration/template | 4 +- srcpkgs/plasma-nm/template | 4 +- srcpkgs/plasma-pa/template | 4 +- srcpkgs/plasma-sdk/template | 4 +- srcpkgs/plasma-thunderbolt/template | 19 + srcpkgs/plasma-vault/template | 4 +- srcpkgs/plasma-workspace-wallpapers/template | 4 +- srcpkgs/plasma-workspace/template | 7 +- srcpkgs/plata-theme/INSTALL.msg | 3 + srcpkgs/plata-theme/template | 9 +- srcpkgs/pluma/template | 4 +- srcpkgs/pmbootstrap/template | 8 +- srcpkgs/png++/patches/musl-error.patch | 11 - srcpkgs/png++/template | 4 +- srcpkgs/poco/template | 6 +- srcpkgs/podman/template | 4 +- srcpkgs/poedit/patches/LearnMoreLink.patch | 21 - srcpkgs/poedit/template | 6 +- srcpkgs/poezio/template | 6 +- srcpkgs/poezio/update | 1 + srcpkgs/polkit-kde-agent/template | 4 +- srcpkgs/polygen/template | 2 +- srcpkgs/ponyc/template | 4 +- srcpkgs/poppler-qt5/template | 4 +- srcpkgs/poppler/template | 4 +- srcpkgs/portage/template | 4 +- srcpkgs/postfix/template | 6 +- .../postgis-2.5.3-PROTOCC_VERSION.patch | 13 + srcpkgs/postgis/template | 6 +- srcpkgs/postgis/update | 1 + srcpkgs/postgresql/template | 2 +- srcpkgs/potrace/template | 4 +- srcpkgs/powerdevil/template | 4 +- srcpkgs/powertop/template | 11 +- srcpkgs/ppsspp/template | 18 +- srcpkgs/praat/template | 4 +- srcpkgs/prelink-cross/template | 2 +- srcpkgs/print-manager/template | 4 +- srcpkgs/prison/template | 8 +- srcpkgs/profanity/template | 6 +- srcpkgs/prometheus/template | 4 +- .../disable-seccomp-based-tracing.patch | 28 + srcpkgs/proot/patches/makefile-fix-vars.patch | 35 + srcpkgs/proot/template | 28 +- srcpkgs/protontricks/template | 14 + srcpkgs/pscircle/template | 6 +- srcpkgs/pulseaudio-module-sndio/template | 4 +- .../pulseaudio/patches/fix-alsa-module.patch | 42 - srcpkgs/pulseaudio/template | 23 +- srcpkgs/puppet/template | 6 +- srcpkgs/purpose/template | 4 +- srcpkgs/putty/template | 4 +- srcpkgs/py3status/template | 4 +- srcpkgs/pycharm-community/template | 4 +- srcpkgs/pylint/template | 34 +- srcpkgs/pyradio/INSTALL.msg | 5 + srcpkgs/pyradio/template | 21 + srcpkgs/python-Arrow/template | 4 +- srcpkgs/python-Babel/template | 6 +- srcpkgs/python-BeautifulSoup4/template | 6 +- srcpkgs/python-Cheroot/template | 14 +- srcpkgs/python-ConfigArgParse/template | 4 +- srcpkgs/python-Cython/template | 4 +- srcpkgs/python-Django/template | 4 +- srcpkgs/python-Mako/template | 4 +- srcpkgs/python-Markdown/template | 6 +- srcpkgs/python-MiniMock/template | 2 +- srcpkgs/python-Pillow/template | 6 +- srcpkgs/python-PyQt5-webengine/template | 2 + srcpkgs/python-SQLAlchemy/template | 4 +- srcpkgs/python-Unidecode/template | 4 +- srcpkgs/python-aalib/template | 2 +- srcpkgs/python-alembic/template | 11 +- srcpkgs/python-appdirs/template | 2 +- srcpkgs/python-apsw/template | 5 +- srcpkgs/python-astroid/template | 16 +- srcpkgs/python-attrs/template | 11 +- srcpkgs/python-audioread/template | 6 +- srcpkgs/python-b2sdk/template | 4 +- srcpkgs/python-bitarray/template | 6 +- srcpkgs/python-botocore/template | 9 +- srcpkgs/python-coverage/template | 6 +- srcpkgs/python-cram/template | 2 +- .../patches/libressl.patch | 18 - srcpkgs/python-cryptography/template | 17 +- srcpkgs/python-cryptography_vectors/template | 30 + srcpkgs/python-cssselect/template | 8 +- srcpkgs/python-curl/template | 13 +- srcpkgs/python-dbus/template | 8 +- srcpkgs/python-docutils/template | 8 +- srcpkgs/python-dogpile.cache/template | 8 +- srcpkgs/python-dulwich/template | 4 +- srcpkgs/python-ecdsa/template | 10 +- srcpkgs/python-envdir/template | 2 +- srcpkgs/python-ewmh/template | 2 +- srcpkgs/python-flaky/template | 6 +- srcpkgs/python-fonttools/template | 32 +- srcpkgs/python-fonttools/update | 3 + srcpkgs/python-gitlab/template | 4 +- .../python-google-api-python-client/template | 4 +- srcpkgs/python-grako/template | 2 +- srcpkgs/python-graphviz/template | 2 +- srcpkgs/python-guessit/template | 9 +- srcpkgs/python-html2text/template | 29 - srcpkgs/python-httmock/template | 2 +- srcpkgs/python-httplib2/template | 4 +- srcpkgs/python-hypothesis/template | 4 +- srcpkgs/python-iso-8601/template | 30 + srcpkgs/python-iwlib/template | 4 +- srcpkgs/python-jedi/template | 8 +- srcpkgs/python-jsonschema/template | 5 +- srcpkgs/python-kaptan/template | 4 +- srcpkgs/python-lxml/template | 6 +- srcpkgs/python-magic/template | 2 +- srcpkgs/python-mechanize/template | 23 +- srcpkgs/python-mock/template | 8 +- srcpkgs/python-nose/template | 2 +- srcpkgs/python-npyscreen/template | 2 +- srcpkgs/python-numexpr/template | 8 +- srcpkgs/python-numpy/template | 6 +- srcpkgs/python-oauthlib/template | 10 +- srcpkgs/python-packaging/template | 10 +- srcpkgs/python-pafy | 1 + srcpkgs/python-pafy/template | 29 - srcpkgs/python-pandas/template | 19 +- srcpkgs/python-parsing/template | 9 +- srcpkgs/python-parso/template | 4 +- srcpkgs/python-pbr/template | 4 +- srcpkgs/python-pdfrw/template | 2 +- srcpkgs/python-peewee/template | 4 +- srcpkgs/python-pex/template | 4 +- srcpkgs/python-pexpect/template | 10 +- srcpkgs/python-pip/template | 8 +- srcpkgs/python-prctl/template | 2 +- srcpkgs/python-pretend/template | 32 + srcpkgs/python-prometheus_client/template | 4 +- srcpkgs/python-psycopg2/template | 4 +- srcpkgs/python-pycryptodome/template | 4 +- srcpkgs/python-pyglet/template | 8 +- srcpkgs/python-pyotp/template | 4 +- srcpkgs/python-pytz/template | 4 +- srcpkgs/python-rarfile/template | 4 +- srcpkgs/python-rebulk/template | 4 +- srcpkgs/python-regex/template | 28 +- srcpkgs/python-requests-oauthlib/template | 8 +- srcpkgs/python-requests/template | 8 +- srcpkgs/python-rfc6555/template | 25 + srcpkgs/python-s3transfer/template | 9 +- srcpkgs/python-scikit-learn/template | 30 - srcpkgs/python-scipy/template | 33 - srcpkgs/python-setuptools/template | 12 +- srcpkgs/python-snappy/template | 2 +- srcpkgs/python-soupsieve/template | 4 +- srcpkgs/python-tmuxp/template | 4 +- srcpkgs/python-tornado/template | 8 +- srcpkgs/python-tqdm/template | 4 +- srcpkgs/python-traitlets/template | 10 +- srcpkgs/python-tweepy/template | 2 +- srcpkgs/python-urllib3/template | 4 +- srcpkgs/python-virtualenv/template | 6 +- srcpkgs/python-vispy/template | 10 +- srcpkgs/python-xmltodict/template | 2 +- srcpkgs/python-yaml/template | 8 +- srcpkgs/python-zeroconf/template | 21 - srcpkgs/python-zeroconf/update | 1 - srcpkgs/python3-CherryPy/template | 7 +- srcpkgs/python3-Flask-HTTPAuth/template | 19 + srcpkgs/python3-MechanicalSoup/template | 4 +- srcpkgs/python3-PyBrowserID/template | 2 +- srcpkgs/python3-PyFxA/template | 6 +- srcpkgs/python3-PyJWT/template | 14 + srcpkgs/python3-SoCo/template | 6 +- srcpkgs/python3-Telethon/template | 6 +- srcpkgs/python3-TxSNI/template | 2 +- srcpkgs/python3-WebOb/template | 2 +- srcpkgs/python3-acme/template | 6 +- srcpkgs/python3-altgraph/template | 2 +- srcpkgs/python3-aniso8601/template | 6 +- srcpkgs/python3-astroid | 1 - srcpkgs/python3-astroid/template | 22 + srcpkgs/python3-async_generator/template | 2 +- srcpkgs/python3-autobahn/template | 20 + srcpkgs/{python-bcc => python3-bcc} | 0 srcpkgs/python3-blessed/template | 6 +- srcpkgs/python3-boltons/template | 2 +- srcpkgs/python3-canonicaljson/template | 2 +- srcpkgs/python3-casttube/template | 2 +- srcpkgs/python3-changelogs/template | 2 +- srcpkgs/python3-cheetah3/template | 4 +- srcpkgs/python3-chromecast/template | 6 +- srcpkgs/python3-cryptography_vectors | 1 + srcpkgs/python3-dbusmock/template | 6 +- srcpkgs/python3-distro/template | 16 + srcpkgs/python3-eliot/template | 2 +- srcpkgs/python3-fido2/template | 21 + srcpkgs/python3-fishnet/template | 8 +- srcpkgs/python3-flexmock/template | 2 +- srcpkgs/python3-fonttools | 1 - srcpkgs/python3-fonttools/template | 31 + srcpkgs/python3-frozendict/template | 2 +- srcpkgs/python3-geojson/template | 6 +- srcpkgs/python3-gitchangelog/template | 2 +- srcpkgs/python3-hawkauthlib/template | 2 +- srcpkgs/python3-hkdf/template | 19 + srcpkgs/python3-html2text | 1 - srcpkgs/python3-html2text/template | 16 + srcpkgs/python3-importlib_metadata/template | 4 +- srcpkgs/python3-ipython/template | 4 +- srcpkgs/python3-iso-8601 | 1 + srcpkgs/python3-jellyfish/template | 4 +- srcpkgs/python3-josepy/template | 6 +- srcpkgs/python3-libevdev/template | 19 + srcpkgs/python3-macaroons/template | 2 +- srcpkgs/python3-macholib/template | 2 +- srcpkgs/python3-matplotlib/template | 6 +- srcpkgs/python3-mechanize | 1 + srcpkgs/python3-more-itertools/template | 8 +- srcpkgs/python3-mpi4py/template | 20 + srcpkgs/python3-mpv/template | 2 +- srcpkgs/python3-mypy/template | 6 +- srcpkgs/python3-mypy_extensions/template | 6 +- srcpkgs/python3-nacl/template | 2 +- srcpkgs/python3-numpy/template | 9 +- srcpkgs/python3-pafy | 1 - srcpkgs/python3-pafy/template | 22 + srcpkgs/python3-pandas | 1 - .../INSTALL.msg} | 0 srcpkgs/python3-pandas/template | 20 + srcpkgs/python3-pandas/update | 1 + srcpkgs/python3-pefile/template | 2 +- srcpkgs/python3-pem/template | 6 +- srcpkgs/python3-perf/template | 16 +- srcpkgs/python3-pgspecial/template | 5 +- srcpkgs/python3-phonenumbers/template | 6 +- srcpkgs/python3-pivy/template | 5 + srcpkgs/python3-pluggy/template | 4 +- srcpkgs/python3-precis-i18n/template | 6 +- srcpkgs/python3-pretend | 1 + srcpkgs/python3-pulsectl/template | 6 +- srcpkgs/python3-pyfiglet/template | 21 + srcpkgs/python3-pylint | 1 - srcpkgs/python3-pylint/template | 47 + srcpkgs/python3-pysol_cards/template | 13 +- srcpkgs/python3-pytest-asyncio/template | 2 +- srcpkgs/python3-regex | 1 + srcpkgs/python3-rfc6555 | 1 + srcpkgs/python3-rsistent/template | 8 +- srcpkgs/python3-rss2email/template | 16 + srcpkgs/python3-saml2/template | 6 +- srcpkgs/python3-scard/template | 19 + srcpkgs/python3-scikit-learn | 1 - srcpkgs/python3-scikit-learn/template | 20 + srcpkgs/python3-scipy | 1 - srcpkgs/python3-scipy/template | 23 + .../{python-scipy => python3-scipy}/update | 0 srcpkgs/python3-scruffy/template | 4 +- srcpkgs/python3-shodan/template | 4 +- srcpkgs/python3-signedjson/template | 2 +- srcpkgs/python3-sortedcontainers/template | 2 +- srcpkgs/python3-spake2/template | 20 + srcpkgs/python3-tabulate/template | 6 +- srcpkgs/python3-tinycss/template | 21 + srcpkgs/python3-treq/template | 2 +- srcpkgs/python3-txacme/template | 2 +- srcpkgs/python3-txaio/template | 19 + srcpkgs/python3-txtorcon/template | 20 + srcpkgs/python3-unpaddedbase64/template | 2 +- srcpkgs/python3-usb/template | 21 + srcpkgs/python3-validators/template | 6 +- srcpkgs/python3-vdf/template | 18 + srcpkgs/python3-virustotal-api/template | 4 +- srcpkgs/python3-yara/template | 4 +- srcpkgs/python3-zipp/template | 4 +- srcpkgs/qalculate-gtk/template | 4 +- srcpkgs/qalculate/template | 6 +- srcpkgs/qbittorrent/template | 4 +- srcpkgs/qemu-user-static/template | 8 +- ...l.c-define-__SIGRTMIN-MAX-for-non-GN.patch | 12 +- srcpkgs/qemu/patches/musl-ppc.patch | 13 + srcpkgs/qemu/template | 20 +- srcpkgs/qgit/template | 8 +- srcpkgs/qimgv/template | 7 +- srcpkgs/qmmp/template | 6 +- srcpkgs/qpdf/template | 4 +- srcpkgs/qqc2-desktop-style/template | 4 +- srcpkgs/qt/patches/gcc9-qforeach.patch | 67 + srcpkgs/qt5-styleplugins/template | 8 +- srcpkgs/qt5-webkit/patches/musl-ppc.patch | 14 + srcpkgs/qt5-webkit/patches/ppc-llint.patch | 32 + .../qt5-webkit/patches/reduce-exports.patch | 27 + srcpkgs/qt5-webkit/template | 61 +- .../qt5/patches/0027-remove-glibc-check.patch | 13 + srcpkgs/qt5/patches/0048-qtbug-76742.patch | 25 - .../qt5/patches/0049-big-endian-scroll.patch | 54 + srcpkgs/qt5/patches/0050-pulse-stubs.patch | 49 + srcpkgs/qt5/patches/0100-qtbug-77364.patch | 26 + srcpkgs/qt5/template | 9 +- srcpkgs/qt5dxcb-plugin/template | 9 +- srcpkgs/qt5integration/template | 4 +- srcpkgs/qt5pas/template | 2 +- srcpkgs/qtcreator/patches/clang9.patch | 11 + srcpkgs/qtcreator/template | 19 +- .../qtcurve/patches/gtkprops_constexpr.patch | 29 + srcpkgs/qtcurve/template | 18 +- srcpkgs/qtfm/template | 6 +- srcpkgs/qtpass/patches/qmake-qt5.13.patch | 3 +- srcpkgs/qtpass/template | 5 +- srcpkgs/quadrapassel/template | 6 +- srcpkgs/qutebrowser/template | 4 +- srcpkgs/racket/template | 4 +- srcpkgs/radare2/template | 6 +- srcpkgs/radeon-profile/template | 4 +- .../rakudo/patches/fix-perl6-home-dir.patch | 26 + srcpkgs/rakudo/template | 4 +- srcpkgs/range-v3/patches/fix-is_trivial.patch | 96 - srcpkgs/range-v3/template | 6 +- srcpkgs/ranger/template | 2 +- srcpkgs/rawtherapee/template | 4 +- srcpkgs/rclone/template | 10 +- srcpkgs/rcm/template | 2 +- srcpkgs/rdfind/template | 2 +- srcpkgs/rdup/template | 3 +- srcpkgs/re/template | 6 +- srcpkgs/re2/template | 4 +- srcpkgs/reap/template | 11 + srcpkgs/rebar3/template | 4 +- srcpkgs/recutils/template | 2 +- srcpkgs/redis/template | 6 +- srcpkgs/remmina/template | 4 +- srcpkgs/resvg/template | 2 +- srcpkgs/retro-gtk/template | 6 +- srcpkgs/retroarch/template | 4 +- srcpkgs/rinse/template | 2 +- srcpkgs/riot-desktop/patches/electron5.patch | 32 - srcpkgs/riot-desktop/template | 8 +- srcpkgs/rlottie/template | 6 +- srcpkgs/rmlint/template | 6 +- srcpkgs/roswell/template | 4 +- srcpkgs/roxterm/template | 13 +- srcpkgs/rpi-firmware/template | 23 +- srcpkgs/rpi-kernel/template | 150 +- srcpkgs/rpm/template | 14 +- srcpkgs/rrdtool/template | 4 +- srcpkgs/rsClock/template | 16 + srcpkgs/rsyslog/template | 6 +- srcpkgs/rtags/template | 2 +- srcpkgs/rtaudio/template | 2 +- srcpkgs/rtl8822bu-dkms/template | 6 +- srcpkgs/rtl_433/template | 7 +- srcpkgs/ruby-addressable/template | 6 +- srcpkgs/ruby-asciidoctor/template | 6 +- srcpkgs/ruby-backports/template | 6 +- srcpkgs/ruby-connection_pool/template | 2 +- srcpkgs/ruby-erubis/template | 2 +- srcpkgs/ruby-ethon/template | 2 +- srcpkgs/ruby-faraday/template | 8 +- srcpkgs/ruby-faraday_middleware/template | 2 +- srcpkgs/ruby-ffi/template | 6 +- srcpkgs/ruby-gh/template | 2 +- srcpkgs/ruby-highline/template | 6 +- srcpkgs/ruby-hpricot/template | 2 +- srcpkgs/ruby-httparty/template | 6 +- srcpkgs/ruby-launchy/template | 2 +- srcpkgs/ruby-mime-types-data/template | 6 +- srcpkgs/ruby-mime-types/template | 8 +- srcpkgs/ruby-mini_portile2/template | 2 +- srcpkgs/ruby-multi_json/template | 8 +- srcpkgs/ruby-multi_xml/template | 2 +- srcpkgs/ruby-multipart-post/template | 8 +- srcpkgs/ruby-mustache/template | 2 +- srcpkgs/ruby-net-http-persistent/template | 8 +- srcpkgs/ruby-net-http-pipeline/template | 2 +- srcpkgs/ruby-pkg-config/template | 6 +- srcpkgs/ruby-public_suffix/template | 8 +- srcpkgs/ruby-pusher-client/template | 2 +- srcpkgs/ruby-rb-readline/template | 2 +- srcpkgs/ruby-rdiscount/template | 2 +- srcpkgs/ruby-ronn/template | 2 +- srcpkgs/ruby-thor/template | 2 +- srcpkgs/ruby-travis/template | 2 +- srcpkgs/ruby-typhoeus/template | 2 +- srcpkgs/ruby-websocket/template | 2 +- srcpkgs/ruby-xdg/template | 10 +- srcpkgs/ruby/template | 6 +- srcpkgs/run-parts/template | 6 +- srcpkgs/runc/template | 6 +- srcpkgs/runit-void/template | 6 +- srcpkgs/rust-cargo-audit/template | 4 +- srcpkgs/rust-cargo-bloat/template | 4 +- srcpkgs/rust-sccache/template | 11 +- .../rust/patches/0002-Fix-LLVM-build.patch | 10 +- ...to-work-when-cross-compiling-on-musl.patch | 8 +- ...ative-libraries-when-linking-static-.patch | 12 +- ...dlib-and-musl_root-from-musl-targets.patch | 127 +- ...er-libgcc_eh-over-libunwind-for-musl.patch | 10 +- ...x-C-aggregate-passing-ABI-on-powerpc.patch | 93 + ...t-Fix-proc-macro-tests-on-musl-hosts.patch | 39 - ...-zero-sized-aggregate-ABI-on-powerpc.patch | 62 + ...piletest-Match-suffixed-environments.patch | 48 + ...c-variadic-Fix-patterns-on-powerpc64.patch | 73 + ...n-for-plugins-Don-t-assume-multilib.patch} | 10 +- ...es-are-unstable-Fix-test-when-rpath.patch} | 8 +- ...ore-broken-and-non-applicable-tests.patch} | 55 +- ...stage-2-tools-dynamically-to-libstd.patch} | 10 +- ...-debugger-scripts-to-usr-share-rust.patch} | 14 +- srcpkgs/rust/patches/0030-libc-linkage.patch | 14 +- srcpkgs/rust/patches/0091-bootstrap.patch | 71 + .../patches/0091-lzma-sys-cross-ldflags.patch | 11 - srcpkgs/rust/template | 101 +- srcpkgs/rxvt-unicode/template | 2 +- srcpkgs/s/template | 5 +- srcpkgs/s6-dns/template | 6 +- srcpkgs/s6-linux-utils/template | 4 +- srcpkgs/s6-networking/template | 6 +- srcpkgs/s6-portable-utils/template | 6 +- srcpkgs/s6-rc/template | 11 +- srcpkgs/s6/template | 6 +- srcpkgs/sabnzbd/template | 5 +- ...ixed-crash-with-vte-0.54-Bug-1790317.patch | 69 - srcpkgs/sakura/template | 12 +- srcpkgs/saml2aws/template | 25 + srcpkgs/sampler/template | 4 +- srcpkgs/sane/patches/sane-desc-cross.patch | 2 +- srcpkgs/sane/template | 41 +- srcpkgs/sanoid/template | 7 +- srcpkgs/sassc/template | 2 +- srcpkgs/sbcl/template | 6 +- srcpkgs/sblg/template | 4 +- srcpkgs/scapy/template | 4 +- srcpkgs/scc/template | 17 + srcpkgs/scdoc/template | 4 +- srcpkgs/scons/template | 6 +- srcpkgs/screen/template | 6 +- srcpkgs/scrot/template | 6 +- srcpkgs/scrypt/template | 8 +- srcpkgs/scummvm/template | 43 +- srcpkgs/sddm-kcm/template | 4 +- srcpkgs/seafile-client-qt/template | 15 +- srcpkgs/seafile-libclient/template | 6 +- srcpkgs/seahorse/template | 2 +- srcpkgs/sequeler/template | 4 +- srcpkgs/sfeed/template | 4 +- srcpkgs/shaderc/template | 2 +- srcpkgs/shared-mime-info/template | 14 +- srcpkgs/shfmt/template | 2 +- srcpkgs/shiboken2/patches/qstringlist.patch | 12 + srcpkgs/shiboken2/template | 2 +- srcpkgs/shotcut/template | 4 +- srcpkgs/shotwell/template | 4 +- srcpkgs/shunit2/template | 2 +- srcpkgs/signon-kwallet-extension/template | 4 +- srcpkgs/sk1/template | 10 +- srcpkgs/sk1/update | 1 + srcpkgs/skaffold/template | 5 +- srcpkgs/skalibs/template | 27 +- srcpkgs/skim/template | 2 +- srcpkgs/skype/template | 8 +- srcpkgs/slack-desktop/template | 6 +- srcpkgs/sleuthkit/template | 4 +- srcpkgs/slirp4netns/template | 8 +- srcpkgs/smenu/template | 2 +- srcpkgs/socat/template | 25 +- srcpkgs/solarus-quest-editor/template | 4 +- srcpkgs/solarus/template | 6 +- srcpkgs/sonnet/template | 4 +- srcpkgs/sops/template | 13 + srcpkgs/source-sans-pro/template | 6 +- srcpkgs/sparse/template | 4 +- srcpkgs/spdx-licenses-list/template | 2 +- srcpkgs/spectacle/template | 6 +- srcpkgs/speedtest-cli/template | 4 +- srcpkgs/spice-gtk/template | 5 +- srcpkgs/spice/template | 4 + srcpkgs/spigot/template | 4 +- .../files/spotify-adblock.desktop | 11 + srcpkgs/spotify-adblock-linux/template | 20 + srcpkgs/spotify-tui/template | 17 + srcpkgs/sqlite-replication/template | 11 +- srcpkgs/sqlite/template | 6 +- srcpkgs/sqlmap/template | 27 + .../patches/CVE-2015-4645.patch | 27 - .../squashfs-tools/patches/fix-compat.patch | 46 - .../squashfs-tools/patches/vla-overlow.patch | 21 - srcpkgs/squashfs-tools/template | 19 +- srcpkgs/stagit/patches/libgit2-0.28.patch | 27 - srcpkgs/stagit/template | 10 +- srcpkgs/starship/template | 18 + srcpkgs/stow/template | 8 +- srcpkgs/strace/template | 9 +- srcpkgs/streamlink/template | 4 +- srcpkgs/stremio-shell/template | 8 +- srcpkgs/stress-ng/template | 4 +- srcpkgs/strongswan/template | 4 +- srcpkgs/sublime-merge/template | 4 +- srcpkgs/sublime-text3/template | 6 +- srcpkgs/sudo/template | 4 +- ...068659ced596402dedc78f49fabfab6470bd.patch | 23 - srcpkgs/supercollider/template | 5 +- srcpkgs/supermin/template | 2 +- srcpkgs/svctl/template | 2 +- srcpkgs/svgpart/template | 4 +- srcpkgs/swaks/template | 4 +- srcpkgs/sway/template | 8 +- srcpkgs/swell-foop/patches/pivot_point.patch | 32 + srcpkgs/swell-foop/template | 6 +- srcpkgs/sx/template | 2 +- .../patches/bump-python-dependencies.patch | 30 - srcpkgs/synapse/template | 6 +- srcpkgs/syncthing-gtk/template | 6 +- srcpkgs/syncthing-inotify/template | 2 +- srcpkgs/syncthing/template | 5 +- srcpkgs/syndication/template | 4 +- srcpkgs/syntax-highlighting/template | 4 +- srcpkgs/sysdig/template | 12 +- srcpkgs/sysexxer-ng/template | 17 + srcpkgs/sysprof/template | 8 +- srcpkgs/sysstat/template | 5 +- srcpkgs/systemsettings/template | 4 +- srcpkgs/systemtap/template | 4 +- srcpkgs/tab/template | 6 +- srcpkgs/taisei/template | 12 +- srcpkgs/tarpaulin/template | 19 + srcpkgs/tau/template | 29 + srcpkgs/tbb/template | 6 +- srcpkgs/tcpdump/template | 6 +- srcpkgs/teamspeak3/template | 6 +- srcpkgs/telegram-desktop/files/Telegram.cmake | 16 +- .../files/TelegramCodegenTools.cmake | 2 + .../telegram-desktop/patches/stdafx.h.patch | 19 + srcpkgs/telegram-desktop/template | 11 +- srcpkgs/telepresence/template | 5 +- srcpkgs/termdown/template | 15 + srcpkgs/terraform/template | 4 +- srcpkgs/terragrunt/template | 4 +- srcpkgs/texlive-bin/template | 19 +- srcpkgs/thermald/template | 4 +- srcpkgs/thingylaunch/template | 2 +- srcpkgs/threadweaver/template | 4 +- srcpkgs/thunderbird-i18n/template | 116 +- srcpkgs/thunderbird/files/mozconfig | 3 +- .../patches/disable-hunspell_hooks.patch | 11 - .../disable-image-format-warning.patch | 15 + .../patches/fix-arm-opus-include.patch | 11 + .../patches/fix-i686-ppc-musl.patch | 11 + srcpkgs/thunderbird/patches/fix-musl.patch | 18 +- .../thunderbird/patches/fix-rust-1.29.patch | 14 - .../patches/fix-sandbox-membarrier.patch | 52 + srcpkgs/thunderbird/patches/fix-toolkit.patch | 36 +- srcpkgs/thunderbird/patches/fix-tools.patch | 35 +- .../thunderbird/patches/fix-wasm-arm.patch | 15 + .../patches/fix-webrtc-glibcisms.patch | 25 +- srcpkgs/thunderbird/patches/fix-xpcom.patch | 11 - srcpkgs/thunderbird/patches/mallinfo.patch | 40 +- .../patches/ppc32-skia-portable.patch | 14 + .../thunderbird/patches/rust-configure.patch | 42 + .../thunderbird/patches/rust-cssparser.patch | 90 + .../patches/rust-unitialized-field.patch | 19 - srcpkgs/thunderbird/patches/rust133.patch | 24 - srcpkgs/thunderbird/patches/sndio.patch | 12 +- srcpkgs/thunderbird/patches/yuv-be.patch | 48 + srcpkgs/thunderbird/template | 90 +- srcpkgs/tig/template | 4 +- srcpkgs/tigervnc/template | 2 +- srcpkgs/timeshift/template | 4 +- srcpkgs/tinc/template | 6 +- srcpkgs/tintin/template | 4 +- srcpkgs/tinyxml2/template | 6 +- srcpkgs/tlp/template | 2 +- srcpkgs/tmux/template | 4 +- srcpkgs/tomahawk/template | 8 +- srcpkgs/tomb/template | 7 +- srcpkgs/toot/template | 7 +- srcpkgs/topgrade/template | 4 +- srcpkgs/tor/patches/ppc.patch | 35 + srcpkgs/tor/patches/ppc64.patch | 14 - srcpkgs/tor/template | 14 +- srcpkgs/torbrowser-launcher/template | 21 + srcpkgs/totem/template | 4 +- srcpkgs/tox/template | 4 +- srcpkgs/translate-shell/template | 4 +- srcpkgs/tty-clock/template | 19 +- srcpkgs/ttyd/template | 4 +- srcpkgs/tudu/template | 8 +- srcpkgs/tuir/template | 4 +- srcpkgs/turses/template | 2 +- srcpkgs/txr/template | 4 +- srcpkgs/txtw/template | 2 +- srcpkgs/tzdata/template | 4 +- srcpkgs/tzutils/template | 12 +- srcpkgs/ucspi-ssl/template | 2 +- srcpkgs/ufetch/template | 2 +- srcpkgs/uget/template | 6 +- srcpkgs/umbrello/template | 6 +- srcpkgs/unbound/template | 5 +- srcpkgs/unison/template | 2 +- srcpkgs/unrar/template | 6 +- srcpkgs/urh/template | 4 +- srcpkgs/urlscan/template | 4 +- srcpkgs/usbguard/files/usbguard/run | 2 + srcpkgs/usbguard/patches/musl.patch | 84 + srcpkgs/usbguard/template | 20 + srcpkgs/user-manager/template | 4 +- srcpkgs/usql/template | 6 +- srcpkgs/util-linux/patches/chsh.patch | 89 + srcpkgs/util-linux/template | 2 +- srcpkgs/utox/template | 8 +- srcpkgs/vagrant/template | 6 +- srcpkgs/vala-panel-appmenu/template | 4 +- srcpkgs/vala/template | 8 +- srcpkgs/valabind/template | 2 +- srcpkgs/valadoc/template | 8 +- srcpkgs/vamp-plugin-sdk/template | 16 +- srcpkgs/vapoursynth/template | 4 +- srcpkgs/varnish/INSTALL.msg | 1 - srcpkgs/varnish/files/varnishd/log/run | 2 + srcpkgs/varnish/files/varnishd/run | 20 + srcpkgs/varnish/patches/musl.patch | 22 + srcpkgs/varnish/template | 69 +- srcpkgs/varnish/update | 1 + srcpkgs/vault/template | 14 +- srcpkgs/vba-m/template | 7 +- srcpkgs/vhba-module-dkms/template | 4 +- srcpkgs/viewres/template | 4 +- srcpkgs/vifm/template | 5 +- srcpkgs/viking/template | 2 +- srcpkgs/vim/template | 6 +- srcpkgs/vinagre/template | 6 +- srcpkgs/virt-viewer/template | 5 +- srcpkgs/virt-what/template | 4 +- srcpkgs/virtualbox-ose/template | 4 +- srcpkgs/vivaldi/template | 8 +- srcpkgs/vlc/template | 19 +- srcpkgs/vmpk/template | 23 + srcpkgs/vnstat/template | 4 +- srcpkgs/vpnc-scripts/patches/fix-ipv6.patch | 16 - srcpkgs/vpnc-scripts/template | 4 +- srcpkgs/vscode/patches/fix_dir.patch | 10 +- srcpkgs/vscode/patches/gulp.patch | 2 +- srcpkgs/vscode/template | 9 +- srcpkgs/vte3/template | 13 +- srcpkgs/vulkan-loader/template | 4 +- srcpkgs/w3m/template | 2 +- srcpkgs/warzone2100/template | 25 +- srcpkgs/way-cooler/template | 2 +- srcpkgs/wayfire/template | 8 +- srcpkgs/wayland-protocols/template | 6 +- srcpkgs/wayland/template | 2 +- .../patches/fix-fast-memory-disabled.patch | 14 - .../patches/fix-musl-javascriptcore.patch | 492 +- srcpkgs/webkit2gtk/patches/ppc-llint.patch | 41 + srcpkgs/webkit2gtk/template | 100 +- srcpkgs/weechat/template | 16 +- srcpkgs/wesnoth/template | 6 +- srcpkgs/wf-config-devel | 1 + srcpkgs/wf-config/patches/fix-musl.patch | 13 - srcpkgs/wf-config/template | 20 +- srcpkgs/wf-shell/template | 28 +- srcpkgs/whois/template | 17 +- srcpkgs/wine-mono/template | 4 +- srcpkgs/wine/template | 4 +- srcpkgs/winetricks/template | 4 +- srcpkgs/wireguard/template | 5 +- srcpkgs/wireshark/template | 4 +- srcpkgs/wl-clipboard/template | 6 +- srcpkgs/wlroots/template | 12 +- srcpkgs/woff2/template | 2 +- srcpkgs/workrave/template | 9 +- srcpkgs/wpa-cute/template | 23 + srcpkgs/wxMaxima/template | 4 +- ...fig-gtk3.0-to-avoid-conflict-with-wx.patch | 12 +- srcpkgs/wxPython4/template | 17 +- srcpkgs/x264/template | 10 +- srcpkgs/x42-plugins/template | 4 +- srcpkgs/xapian-core/template | 6 +- srcpkgs/xapps/template | 6 +- srcpkgs/xbps-triggers/files/dkms | 2 +- srcpkgs/xbps-triggers/template | 2 +- srcpkgs/xcb-util-xrm/template | 2 +- srcpkgs/xdg-dbus-proxy/patches/musl.patch | 19 + srcpkgs/xdg-dbus-proxy/template | 6 +- srcpkgs/xdg-desktop-portal-kde/template | 4 +- srcpkgs/xdgmenumaker/files/1.5/xdgmenumaker.1 | 464 + srcpkgs/xdgmenumaker/template | 19 +- srcpkgs/xen/template | 2 +- srcpkgs/xev/template | 2 +- srcpkgs/xf86-input-libinput/template | 2 +- srcpkgs/xf86-video-amdgpu/template | 4 +- srcpkgs/xfce4-battery-plugin/template | 2 +- srcpkgs/xfce4-clipman-plugin/template | 2 +- srcpkgs/xfce4-cpufreq-plugin/template | 2 +- srcpkgs/xfce4-cpugraph-plugin/template | 2 +- srcpkgs/xfce4-dict/template | 8 +- srcpkgs/xfce4-diskperf-plugin/template | 2 +- srcpkgs/xfce4-fsguard-plugin/template | 2 +- srcpkgs/xfce4-genmon-plugin/template | 2 +- .../xfce4-hardware-monitor-plugin/template | 2 +- srcpkgs/xfce4-kbdleds-plugin/template | 2 +- srcpkgs/xfce4-mailwatch-plugin/template | 2 +- srcpkgs/xfce4-mpc-plugin/template | 2 +- srcpkgs/xfce4-netload-plugin/template | 2 +- srcpkgs/xfce4-notes-plugin/template | 2 +- srcpkgs/xfce4-notifyd/template | 2 +- srcpkgs/xfce4-panel/template | 19 +- srcpkgs/xfce4-places-plugin/template | 2 +- srcpkgs/xfce4-power-manager/template | 2 +- srcpkgs/xfce4-pulseaudio-plugin/template | 2 +- srcpkgs/xfce4-screensaver/template | 2 +- srcpkgs/xfce4-screenshooter/template | 6 +- srcpkgs/xfce4-sensors-plugin/template | 2 +- srcpkgs/xfce4-settings/template | 6 +- srcpkgs/xfce4-systemload-plugin/template | 2 +- srcpkgs/xfce4-taskmanager/template | 3 +- srcpkgs/xfce4-time-out-plugin/template | 2 +- srcpkgs/xfce4-timer-plugin/template | 2 +- srcpkgs/xfce4-verve-plugin/template | 2 +- srcpkgs/xfce4-wavelan-plugin/template | 2 +- srcpkgs/xfce4-weather-plugin/template | 2 +- srcpkgs/xfce4-whiskermenu-plugin/template | 2 +- srcpkgs/xfce4-windowck-plugin/template | 2 +- srcpkgs/xfce4-xkb-plugin/template | 2 +- srcpkgs/xfsdump/template | 9 +- srcpkgs/xfsprogs/template | 4 +- srcpkgs/xhost/template | 2 +- srcpkgs/xi-editor/template | 2 +- srcpkgs/xkb-switch/template | 6 +- srcpkgs/xkcdpass/template | 2 +- srcpkgs/xl2tpd/template | 6 +- srcpkgs/xlockmore/template | 8 +- srcpkgs/xlsatoms/template | 2 +- srcpkgs/xmltoman/template | 2 +- srcpkgs/xmodmap/template | 2 +- srcpkgs/xob/template | 2 +- srcpkgs/xonsh/template | 4 +- srcpkgs/xorg-server/template | 2 +- srcpkgs/xorgproto/template | 7 +- srcpkgs/xpdf/template | 6 +- srcpkgs/xpdf/update | 1 + srcpkgs/xpra/template | 2 +- srcpkgs/xprintidle/template | 2 +- srcpkgs/xrdb/template | 2 +- srcpkgs/xsecurelock/template | 4 +- srcpkgs/xst/template | 3 +- srcpkgs/xterm/template | 8 +- srcpkgs/xtitle/template | 2 +- srcpkgs/xurls/template | 4 +- srcpkgs/xvinfo/template | 2 +- srcpkgs/xvkbd/template | 9 +- srcpkgs/xxHash/template | 4 +- srcpkgs/yabasic/template | 10 +- srcpkgs/yad/template | 6 +- srcpkgs/yakuake/template | 16 +- srcpkgs/yandex-disk/template | 7 +- srcpkgs/yank/template | 6 +- srcpkgs/yarn-bin/template | 6 +- srcpkgs/yaru/template | 4 +- srcpkgs/yash/template | 11 +- srcpkgs/yelp-xsl/template | 4 +- srcpkgs/yelp/template | 4 +- srcpkgs/yggdrasil/template | 6 +- srcpkgs/ykpivmgr/patches/libressl.patch | 158 - srcpkgs/ykpivmgr/patches/ssl_obsolete.patch | 22 + srcpkgs/ykpivmgr/template | 9 +- srcpkgs/yoshimi/template | 4 +- srcpkgs/yosys/template | 6 +- srcpkgs/youtube-dl/template | 18 +- srcpkgs/youtube-viewer/template | 4 +- srcpkgs/yq-go/template | 2 +- srcpkgs/yq/template | 2 +- srcpkgs/yubikey-manager/template | 19 + srcpkgs/z3/template | 10 +- srcpkgs/zabbix/template | 2 +- srcpkgs/zaproxy/template | 34 - srcpkgs/zaproxy/update | 2 - srcpkgs/zathura/template | 13 +- srcpkgs/zchunk/template | 8 +- srcpkgs/zfs/template | 4 +- srcpkgs/zim-tools/template | 6 +- srcpkgs/zimwriterfs/template | 4 +- srcpkgs/znc/template | 8 +- srcpkgs/zola/template | 13 +- srcpkgs/zoom/template | 7 +- srcpkgs/zou/template | 2 +- srcpkgs/zsh-completions/template | 4 +- srcpkgs/zstd/template | 7 +- srcpkgs/zulucrypt/template | 7 +- 2552 files changed, 55414 insertions(+), 45921 deletions(-) create mode 100644 srcpkgs/66-tools/template create mode 100644 srcpkgs/Amass/template delete mode 100644 srcpkgs/ClusterSSH/update create mode 100644 srcpkgs/Electron-Cash/template create mode 100644 srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch rename srcpkgs/LuaJIT/{patches => files/patches/ppc64}/add-ppc64-support.patch (100%) rename srcpkgs/LuaJIT/{patches => files/patches/ppc64}/fix-vm-jit-ppc64.patch (100%) create mode 100644 srcpkgs/MEGAcmd/patches/megacmd-sdk36.diff delete mode 100644 srcpkgs/MEGAcmd/patches/musl.patch create mode 100644 srcpkgs/MEGAsync/patches/breakpad.patch create mode 100644 srcpkgs/Solaar/template create mode 100644 srcpkgs/The-Powder-Toy/template create mode 100644 srcpkgs/UEFITool/template delete mode 100644 srcpkgs/Uranium/patches/fix-crash-in-cura.patch create mode 100644 srcpkgs/alpine/patches/418e8bc5.patch delete mode 100755 srcpkgs/android-tools/files/generate_build.rb delete mode 100644 srcpkgs/android-tools/patches/gcc-fixes.patch delete mode 100644 srcpkgs/android-tools/patches/include-sys-sysmacros.patch delete mode 100644 srcpkgs/android-tools/patches/musl-fixes.patch delete mode 100644 srcpkgs/android-tools/patches/undef__USE_GNU.patch create mode 120000 srcpkgs/apache-directory-studio rename srcpkgs/{apache-directory-studio => apache-directory-studio-bin}/files/ApacheDirectoryStudio.desktop (100%) rename srcpkgs/{apache-directory-studio => apache-directory-studio-bin}/template (56%) rename srcpkgs/{apache-directory-studio => apache-directory-studio-bin}/update (100%) create mode 100644 srcpkgs/apache-jmeter/update create mode 100644 srcpkgs/arduino/patches/astyle_fix.patch delete mode 100644 srcpkgs/aria2/patches/patch-src_libssl_compat_h.patch create mode 100644 srcpkgs/aribas/update delete mode 100644 srcpkgs/assimp/patches/0001-glext_h_conflict.patch create mode 100644 srcpkgs/assimp/patches/musl.patch create mode 100644 srcpkgs/assimp_qt_viewer/template delete mode 100644 srcpkgs/atk/patches/fix-cross-gir.patch create mode 100644 srcpkgs/babeld/patches/45.patch create mode 100644 srcpkgs/backintime-qt/template create mode 100644 srcpkgs/bash/files/bash50-008 create mode 100644 srcpkgs/bash/files/bash50-009 create mode 100644 srcpkgs/bash/files/bash50-010 create mode 100644 srcpkgs/bash/files/bash50-011 create mode 100644 srcpkgs/bcal/patches/non-null.patch create mode 100644 srcpkgs/beignet/patches/llvm8.patch create mode 100644 srcpkgs/beignet/patches/llvm9.patch create mode 100644 srcpkgs/blender/patches/altivec-all.patch create mode 100644 srcpkgs/blender/patches/gcc9-elbeem.patch create mode 100755 srcpkgs/bluez/files/bluetooth-meshd/run delete mode 100644 srcpkgs/bluez/patches/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch create mode 100644 srcpkgs/bluez/patches/0001-enable-dbus-without-systemd.patch create mode 100644 srcpkgs/bluez/patches/0002-allow-obexd-on-non-systemd-system.patch delete mode 100644 srcpkgs/bluez/patches/0002-bluetoothd-dbus-service.patch create mode 100644 srcpkgs/bluez/patches/0003-allow-mesh-on-non-systemd-system.patch delete mode 100644 srcpkgs/bluez/patches/0003-bluetooth-group-can-use-bluez.patch create mode 100644 srcpkgs/bluez/patches/0004-include-sys-time.h-for-musl-build.patch create mode 100644 srcpkgs/bluez/patches/0005-include-limits.h-for-musl-build.patch rename srcpkgs/bluez/patches/{musl.patch => 0006-musl-fix.patch} (52%) create mode 100644 srcpkgs/bluez/patches/0007-include-string.h.patch create mode 100644 srcpkgs/bluez/patches/0008-grant-permission-to-bluetooth-group.patch create mode 100644 srcpkgs/bluez/patches/0009-adapter-Don-t-refresh-adv_manager-for-non-LE-devices.patch delete mode 100644 srcpkgs/brisk-menu/patches/69fa052df45c1fa439f6af0a2c8e9795087b9444.patch create mode 100644 srcpkgs/cage/template create mode 100644 srcpkgs/calcurse/patches/DST-fix-date-change.patch create mode 100644 srcpkgs/calligra/patches/qt5.13.patch create mode 100644 srcpkgs/camlp4/patches/version-hack.patch create mode 100644 srcpkgs/cargo/patches/revert-libgit2-sys-api.patch create mode 100644 srcpkgs/celluloid/template create mode 100644 srcpkgs/cheat/template create mode 100644 srcpkgs/chromium/patches/harfbuzz-subset.patch create mode 100644 srcpkgs/chromium/patches/linked-hash-set.patch create mode 100644 srcpkgs/chromium/patches/one_euro_filter.patch create mode 100644 srcpkgs/chromium/patches/sandbox-sched_getparam.patch delete mode 100644 srcpkgs/cinnamon/patches/595178cf57b80b977401460a147602832157b303.patch delete mode 100644 srcpkgs/cinnamon/patches/default-theme.patch delete mode 100644 srcpkgs/cinnamon/patches/set_wheel.patch delete mode 100644 srcpkgs/clementine/patches/add-missing-functional-includes-5630.patch delete mode 100644 srcpkgs/clementine/patches/clementine-chromaprint-1.4.patch delete mode 100644 srcpkgs/clementine/patches/clementine-moodbar_flags.patch delete mode 100644 srcpkgs/clementine/patches/clementine-sqlite-3.12.patch delete mode 100644 srcpkgs/clementine/patches/protobuf-370.patch delete mode 100644 srcpkgs/clementine/patches/sentinel.patch create mode 100644 srcpkgs/clipman/template create mode 100644 srcpkgs/cmixer/patches/linux.patch create mode 100644 srcpkgs/cmixer/template create mode 100644 srcpkgs/cnping/INSTALL create mode 100644 srcpkgs/cnping/template create mode 100644 srcpkgs/connman/files/musl/freeaddrinfo.patch create mode 100644 srcpkgs/consul-template/template create mode 100644 srcpkgs/coyim/template delete mode 120000 srcpkgs/cross-aarch64-linux-gnu/files/non-nullness.patch create mode 120000 srcpkgs/cross-aarch64-linux-musl/files/gccgo-musl.patch delete mode 120000 srcpkgs/cross-aarch64-linux-musl/files/non-nullness.patch delete mode 120000 srcpkgs/cross-arm-linux-gnueabi/files/non-nullness.patch delete mode 120000 srcpkgs/cross-arm-linux-gnueabihf/files/non-nullness.patch create mode 120000 srcpkgs/cross-arm-linux-musleabi/files/gccgo-musl.patch delete mode 120000 srcpkgs/cross-arm-linux-musleabi/files/non-nullness.patch create mode 120000 srcpkgs/cross-arm-linux-musleabihf/files/gccgo-musl.patch delete mode 120000 srcpkgs/cross-arm-linux-musleabihf/files/non-nullness.patch delete mode 120000 srcpkgs/cross-armv7l-linux-gnueabihf/files/non-nullness.patch create mode 120000 srcpkgs/cross-armv7l-linux-musleabihf/files/gccgo-musl.patch delete mode 120000 srcpkgs/cross-armv7l-linux-musleabihf/files/non-nullness.patch delete mode 120000 srcpkgs/cross-i686-linux-musl/files/bug90756.patch create mode 120000 srcpkgs/cross-i686-linux-musl/files/gccgo-musl.patch delete mode 120000 srcpkgs/cross-i686-linux-musl/files/non-nullness.patch delete mode 120000 srcpkgs/cross-i686-pc-linux-gnu/files/bug90756.patch delete mode 120000 srcpkgs/cross-i686-pc-linux-gnu/files/non-nullness.patch delete mode 120000 srcpkgs/cross-mips-linux-musl/files/non-nullness.patch delete mode 120000 srcpkgs/cross-mips-linux-muslhf/files/non-nullness.patch delete mode 120000 srcpkgs/cross-mipsel-linux-musl/files/non-nullness.patch delete mode 120000 srcpkgs/cross-mipsel-linux-muslhf/files/non-nullness.patch delete mode 120000 srcpkgs/cross-powerpc-linux-gnu/files/non-nullness.patch create mode 120000 srcpkgs/cross-powerpc-linux-musl/files/gccgo-musl.patch delete mode 120000 srcpkgs/cross-powerpc-linux-musl/files/non-nullness.patch create mode 120000 srcpkgs/cross-powerpc64-linux-gnu/files/darn.patch delete mode 120000 srcpkgs/cross-powerpc64-linux-gnu/files/non-nullness.patch create mode 120000 srcpkgs/cross-powerpc64-linux-musl/files/darn.patch create mode 120000 srcpkgs/cross-powerpc64-linux-musl/files/gccgo-musl.patch delete mode 120000 srcpkgs/cross-powerpc64-linux-musl/files/non-nullness.patch create mode 120000 srcpkgs/cross-powerpc64le-linux-gnu/files/darn.patch delete mode 120000 srcpkgs/cross-powerpc64le-linux-gnu/files/non-nullness.patch create mode 120000 srcpkgs/cross-powerpc64le-linux-musl/files/darn.patch create mode 120000 srcpkgs/cross-powerpc64le-linux-musl/files/gccgo-musl.patch delete mode 120000 srcpkgs/cross-powerpc64le-linux-musl/files/non-nullness.patch create mode 120000 srcpkgs/cross-x86_64-linux-musl/files/gccgo-musl.patch delete mode 120000 srcpkgs/cross-x86_64-linux-musl/files/non-nullness.patch delete mode 100644 srcpkgs/crypto++/patches/arm-native.patch delete mode 100644 srcpkgs/crypto++/patches/musl-soname-links.patch delete mode 100644 srcpkgs/cups/patches/cups-no-gzip-man.patch delete mode 100644 srcpkgs/cura-engine/patches/0001-Remove-default-none-so-that-it-compiles-in-gcc9.patch create mode 100644 srcpkgs/delta/template create mode 100644 srcpkgs/diffr/template delete mode 100644 srcpkgs/dma/patches/musl_sys_param_h.patch create mode 100644 srcpkgs/dnsmasq/patches/nettle35.patch create mode 100644 srcpkgs/docker-compose/patches/pyyaml_version.patch create mode 100644 srcpkgs/dracut/patches/ppc-mac-thermal.patch create mode 120000 srcpkgs/drumstick-devel create mode 100644 srcpkgs/drumstick/template delete mode 100644 srcpkgs/edbrowse/patches/curl-7.62.patch create mode 100644 srcpkgs/eggdrop/template create mode 100644 srcpkgs/evtest/patches/0001-Add-missing-limits.h-include.patch create mode 100644 srcpkgs/exec-on-git-staged/template delete mode 100644 srcpkgs/exiv2/patches/musl.patch delete mode 100644 srcpkgs/fetchmail/patches/patch-socket_c.diff create mode 100644 srcpkgs/ffuf/template create mode 100644 srcpkgs/fierce/template delete mode 100644 srcpkgs/findutils/patches/gnulib-freadahead.patch delete mode 100644 srcpkgs/findutils/patches/gnulib-fseeko.patch delete mode 100644 srcpkgs/findutils/patches/gnulib-mountlist.patch delete mode 100644 srcpkgs/findutils/patches/gnulib-stdio-impl.patch rename srcpkgs/{firefox-esr-i18n-as => firefox-esr-i18n-bn} (100%) rename srcpkgs/{firefox-esr-i18n-bn-BD => firefox-esr-i18n-en-CA} (100%) rename srcpkgs/{firefox-esr-i18n-bn-IN => firefox-esr-i18n-ia} (100%) rename srcpkgs/{firefox-esr-i18n-en-ZA => firefox-esr-i18n-ne-NP} (100%) rename srcpkgs/{firefox-esr-i18n-mai => firefox-esr-i18n-oc} (100%) delete mode 120000 srcpkgs/firefox-esr-i18n-or rename srcpkgs/{firefox-esr-i18n-ml => firefox-esr-i18n-ur} (100%) create mode 120000 srcpkgs/firefox-esr-i18n/files/update-lang-list create mode 100644 srcpkgs/firefox-esr/patches/disable-image-format-warning.patch create mode 100644 srcpkgs/firefox-esr/patches/fix-arm-opus-include.patch create mode 100644 srcpkgs/firefox-esr/patches/fix-wasm-arm.patch delete mode 100644 srcpkgs/firefox-esr/patches/fix-webrtc-arm.patch delete mode 100644 srcpkgs/firefox-esr/patches/fix-xpcom.patch rename srcpkgs/{firefox/patches/fix-musl.patch => firefox-esr/patches/gettid-musl.patch} (100%) delete mode 100644 srcpkgs/firefox-esr/patches/ppc-no-static-sizes.patch create mode 100644 srcpkgs/firefox-esr/patches/rust-cssparser.patch delete mode 100644 srcpkgs/firefox-esr/patches/rust-unitialized-field.patch delete mode 100644 srcpkgs/firefox-esr/patches/rust133.patch delete mode 100644 srcpkgs/firefox-esr/patches/save-and-restore-non-volatile-x28-on-arm64.patch delete mode 100644 srcpkgs/firefox-esr/patches/save-x28-before-clobbering-it-in-the-regex-compiler.patch create mode 100644 srcpkgs/firefox-esr/patches/yuv-be.patch create mode 120000 srcpkgs/firefox-i18n-bn create mode 120000 srcpkgs/firefox-i18n-en-CA create mode 120000 srcpkgs/firefox-i18n-ia create mode 120000 srcpkgs/firefox-i18n-ne-NP create mode 120000 srcpkgs/firefox-i18n-oc create mode 120000 srcpkgs/firefox-i18n-ur create mode 100755 srcpkgs/firefox-i18n/files/update-lang-list create mode 100644 srcpkgs/firefox/patches/initialize_sched_param.patch delete mode 100644 srcpkgs/firefox/patches/ppc64le-bug-1512162.patch delete mode 100644 srcpkgs/flatbuffers/patches/install.patch create mode 100644 srcpkgs/fmtools/template create mode 100644 srcpkgs/freecad/patches/020-namespace-missing-std.patch create mode 100644 srcpkgs/fuse-mp3fs/template create mode 100644 srcpkgs/gcc/files/gccgo-musl.patch delete mode 100644 srcpkgs/gcc/patches/bug90756.patch create mode 100644 srcpkgs/gcc/patches/darn.patch create mode 100644 srcpkgs/gcc/patches/libffi_gnulinux.patch delete mode 100644 srcpkgs/gcc/patches/non-nullness.patch create mode 100644 srcpkgs/geda/patches/snarf_cpp_opts.patch create mode 100644 srcpkgs/gfuzz/template create mode 100644 srcpkgs/git-mediate/template delete mode 100644 srcpkgs/gnome-builder/patches/dont-require-FNM_EXTMATCH.patch delete mode 100644 srcpkgs/gnome-contacts/patches/ambiguous.patch create mode 120000 srcpkgs/gnome-mpv delete mode 100644 srcpkgs/gnome-mpv/template delete mode 100644 srcpkgs/gnome-todo/patches/6cdabc4dd0c6c804a093b94c269461ce376fed4f.patch create mode 100644 srcpkgs/gnome-todo/patches/gnome-todo-eds-libecal-2.0.patch create mode 100644 srcpkgs/gnupg2/patches/use-versioned-pcsclite.patch create mode 100644 srcpkgs/go-review/template create mode 100644 srcpkgs/go/patches/gohostarch-bootstrap-fix.patch create mode 100644 srcpkgs/gomatrix/template create mode 100644 srcpkgs/gopls/template create mode 100644 srcpkgs/gperftools/patches/elf-mem-image-musl.patch create mode 100644 srcpkgs/gperftools/patches/ppc-musl.patch create mode 100644 srcpkgs/gsl/patches/ppc-musl.patch create mode 100644 srcpkgs/gucci/template delete mode 100644 srcpkgs/guitarix2/patches/musl.patch delete mode 100644 srcpkgs/gutenprint/patches/musl.patch create mode 120000 srcpkgs/gxi delete mode 100644 srcpkgs/gxi/template create mode 100644 srcpkgs/i3status/patches/pulseaudio-optional.patch create mode 100644 srcpkgs/ibus-m17n/INSTALL.msg create mode 100644 srcpkgs/ibus-m17n/template rename srcpkgs/{firefox-esr/patches/fix-musl.patch => icecat/patches/fix-gettid.patch} (61%) delete mode 100644 srcpkgs/icecat/patches/fix-musl.patch create mode 100644 srcpkgs/icecat/patches/rust-cssparser.patch delete mode 100644 srcpkgs/icewm/patches/use-NULL.patch create mode 100644 srcpkgs/jbig2dec/patches/2002_abi_compat.patch create mode 120000 srcpkgs/jreen-qt5 delete mode 100644 srcpkgs/jreen-qt5/template delete mode 100644 srcpkgs/juCi++/patches/libgit2-0.28.patch create mode 100755 srcpkgs/k3s/files/k3s-agent/log/run create mode 100755 srcpkgs/k3s/files/k3s-agent/run create mode 100755 srcpkgs/k3s/files/k3s-server/log/run create mode 100755 srcpkgs/k3s/files/k3s-server/run create mode 100644 srcpkgs/k3s/template create mode 120000 srcpkgs/kColorPicker-devel create mode 100644 srcpkgs/kColorPicker/template create mode 120000 srcpkgs/kImageAnnotator-devel create mode 100644 srcpkgs/kImageAnnotator/template create mode 120000 srcpkgs/kbfs delete mode 100644 srcpkgs/kbfs/template delete mode 100644 srcpkgs/kea/patches/fix-musl-getopt.patch rename srcpkgs/{kbfs/INSTALL => keybase/kbfs.INSTALL} (100%) create mode 100644 srcpkgs/kgpg/template delete mode 100644 srcpkgs/kitty/patches/musl.patch delete mode 120000 srcpkgs/kodi-rpi/files/swig.nojava-18.3 create mode 120000 srcpkgs/kodi-rpi/files/swig.nojava-18.4 rename srcpkgs/kodi/files/{swig.nojava-18.3 => swig.nojava-18.4}/AddonModuleXbmc.i.cpp (99%) rename srcpkgs/kodi/files/{swig.nojava-18.3 => swig.nojava-18.4}/AddonModuleXbmc.i.xml (61%) rename srcpkgs/kodi/files/{swig.nojava-18.3 => swig.nojava-18.4}/AddonModuleXbmcaddon.i.cpp (99%) rename srcpkgs/kodi/files/{swig.nojava-18.3 => swig.nojava-18.4}/AddonModuleXbmcaddon.i.xml (58%) rename srcpkgs/kodi/files/{swig.nojava-18.3 => swig.nojava-18.4}/AddonModuleXbmcdrm.i.cpp (99%) rename srcpkgs/kodi/files/{swig.nojava-18.3 => swig.nojava-18.4}/AddonModuleXbmcdrm.i.xml (59%) rename srcpkgs/kodi/files/{swig.nojava-18.3 => swig.nojava-18.4}/AddonModuleXbmcgui.i.cpp (99%) rename srcpkgs/kodi/files/{swig.nojava-18.3 => swig.nojava-18.4}/AddonModuleXbmcgui.i.xml (67%) rename srcpkgs/kodi/files/{swig.nojava-18.3 => swig.nojava-18.4}/AddonModuleXbmcplugin.i.cpp (99%) rename srcpkgs/kodi/files/{swig.nojava-18.3 => swig.nojava-18.4}/AddonModuleXbmcplugin.i.xml (59%) rename srcpkgs/kodi/files/{swig.nojava-18.3 => swig.nojava-18.4}/AddonModuleXbmcvfs.i.cpp (99%) rename srcpkgs/kodi/files/{swig.nojava-18.3 => swig.nojava-18.4}/AddonModuleXbmcvfs.i.xml (59%) rename srcpkgs/kodi/files/{swig.nojava-18.3 => swig.nojava-18.4}/AddonModuleXbmcwsgi.i.cpp (99%) rename srcpkgs/kodi/files/{swig.nojava-18.3 => swig.nojava-18.4}/AddonModuleXbmcwsgi.i.xml (61%) create mode 100644 srcpkgs/krita/patches/musl.patch delete mode 100644 srcpkgs/ksh/files/LICENSE create mode 100644 srcpkgs/ksnip/patches/useGNUInstallDirs.patch create mode 100644 srcpkgs/ksnip/template delete mode 100644 srcpkgs/libGL/patches/add-glx-use-tls.patch create mode 100644 srcpkgs/libGL/patches/add-use-elf-tls.patch create mode 100644 srcpkgs/libGL/patches/ppc-auxval.patch create mode 100644 srcpkgs/libcmis/patches/no-include-cxx-headers-from-extern-c.patch create mode 100644 srcpkgs/libcxx/patches/ppc.patch delete mode 100644 srcpkgs/libgit2-0.27/template delete mode 100644 srcpkgs/libgit2-0.27/update delete mode 100644 srcpkgs/libgweather/patches/conditionalize-gir.patch create mode 120000 srcpkgs/libknet1-devel create mode 100644 srcpkgs/libknet1/patches/01_musl_fix.diff create mode 100644 srcpkgs/libknet1/template create mode 120000 srcpkgs/libllvm9 create mode 120000 srcpkgs/libluv-devel create mode 100644 srcpkgs/libluv/template delete mode 100644 srcpkgs/libnl3/patches/musl.patch create mode 120000 srcpkgs/libnozzle1 create mode 120000 srcpkgs/libnozzle1-devel delete mode 100644 srcpkgs/libpcap/patches/fix-musl.patch create mode 120000 srcpkgs/libpwquality-python3 create mode 100644 srcpkgs/libsigsegv/patches/ppc-musl.patch create mode 120000 srcpkgs/liburing-devel create mode 100644 srcpkgs/liburing/template create mode 120000 srcpkgs/libvarnishapi create mode 120000 srcpkgs/libvarnishapi-devel create mode 120000 srcpkgs/libxfce4panel create mode 100644 srcpkgs/licensor/template delete mode 100644 srcpkgs/linux-tools/patches/turbostat.patch delete mode 100644 srcpkgs/linux4.4/patches/gcc9.patch delete mode 120000 srcpkgs/linux5.1-dbg delete mode 120000 srcpkgs/linux5.1-headers create mode 120000 srcpkgs/linux5.3-dbg create mode 120000 srcpkgs/linux5.3-headers rename srcpkgs/{linux5.1 => linux5.3}/files/DocBook/Makefile (100%) rename srcpkgs/{linux5.1 => linux5.3}/files/arm-dotconfig (91%) rename srcpkgs/{linux5.1 => linux5.3}/files/arm64-dotconfig (91%) rename srcpkgs/{linux5.1 => linux5.3}/files/i386-dotconfig (92%) rename srcpkgs/{linux5.1 => linux5.3}/files/mv-debug (100%) rename srcpkgs/{linux5.1 => linux5.3}/files/ppc-dotconfig (93%) rename srcpkgs/{linux5.1 => linux5.3}/files/ppc64-dotconfig (92%) rename srcpkgs/{linux5.1 => linux5.3}/files/ppc64le-dotconfig (92%) rename srcpkgs/{linux5.1 => linux5.3}/files/x86_64-dotconfig (92%) rename srcpkgs/{linux5.1 => linux5.3}/patches/ppc64-be-elfv2.patch (100%) rename srcpkgs/{linux5.1 => linux5.3}/patches/smsc95xx-mac.patch (100%) rename srcpkgs/{linux5.1 => linux5.3}/template (96%) create mode 100644 srcpkgs/llvm-libunwind/patches/ppc32.patch create mode 100644 srcpkgs/llvm9/files/llvm-Config-config.h create mode 100644 srcpkgs/llvm9/files/llvm-Config-llvm-config.h create mode 100644 srcpkgs/llvm9/files/patches/cfe/cfe-001-fix-unwind-chain-inclusion.patch create mode 100644 srcpkgs/llvm9/files/patches/cfe/cfe-002-add-musl-triples.patch create mode 100644 srcpkgs/llvm9/files/patches/cfe/cfe-003-ppc64-dynamic-linker-path.patch create mode 100644 srcpkgs/llvm9/files/patches/cfe/cfe-004-ppc64-musl-elfv2.patch create mode 100644 srcpkgs/llvm9/files/patches/cfe/cfe-005-gcc9.patch create mode 100644 srcpkgs/llvm9/files/patches/lldb/musl.patch create mode 100644 srcpkgs/llvm9/files/patches/llvm/llvm-001-musl.patch create mode 100644 srcpkgs/llvm9/files/patches/llvm/llvm-002-musl-ppc64-elfv2.patch create mode 100644 srcpkgs/llvm9/files/patches/llvm/llvm-003-secureplt.patch create mode 100644 srcpkgs/llvm9/files/patches/llvm/llvm-004-override-opt.patch create mode 100644 srcpkgs/llvm9/template create mode 100644 srcpkgs/llvm9/update create mode 100755 srcpkgs/lprng/files/lprng/run create mode 100644 srcpkgs/lprng/template create mode 100644 srcpkgs/lsd/template create mode 100755 srcpkgs/lsyncd/files/lsyncd/log/run create mode 100644 srcpkgs/magic-wormhole/template create mode 100644 srcpkgs/mariadb/patches/force-c11-atomics.patch create mode 100644 srcpkgs/mariadb/patches/libatomic.patch create mode 100644 srcpkgs/mariadb/patches/musl-ppc.patch create mode 100644 srcpkgs/mftrace/patches/gf2pbm.1.patch create mode 100644 srcpkgs/minijail/template create mode 120000 srcpkgs/mkpasswd create mode 100644 srcpkgs/mono/patches/fix-heapviz-import.patch create mode 100644 srcpkgs/mono/patches/musl.patch create mode 100644 srcpkgs/monolith/template create mode 100644 srcpkgs/moserial/template create mode 100644 srcpkgs/mpDris2/files/mpDris2/run create mode 100644 srcpkgs/mpDris2/template create mode 100644 srcpkgs/mtm/template delete mode 100644 srcpkgs/mumble/patches/musl-dlsym.patch delete mode 100644 srcpkgs/mumble/patches/protobuf-370.patch delete mode 100644 srcpkgs/mumble/patches/speech-dispatcher.patch delete mode 100644 srcpkgs/mumble/patches/std-float.patch delete mode 100644 srcpkgs/mutter/patches/meta-renderer-x11.patch create mode 100644 srcpkgs/mymcplus/template create mode 100644 srcpkgs/next/template delete mode 100644 srcpkgs/nilfs-utils/patches/max-input.patch delete mode 100644 srcpkgs/nilfs-utils/patches/rpc-types.patch delete mode 100644 srcpkgs/nvidia390/files/kernel-5.1-x86_64.patch delete mode 100644 srcpkgs/nvidia390/files/kernel-5.1.patch delete mode 100644 srcpkgs/nvidia390/files/kernel-5.2-x86_64.patch create mode 100644 srcpkgs/nvme-cli/INSTALL create mode 100644 srcpkgs/nvme-cli/REMOVE create mode 100644 srcpkgs/occt/files/opencascade.sh delete mode 100644 srcpkgs/open-iscsi/patches/ether.patch delete mode 100644 srcpkgs/open-iscsi/patches/fix-musl-2.patch delete mode 100644 srcpkgs/open-vm-tools/patches/gcc9.patch create mode 100644 srcpkgs/opendkim/files/opendkim/run delete mode 100644 srcpkgs/openssh/patches/setproctitle.patch create mode 100644 srcpkgs/pam_rundir/patches/fix.patch create mode 100644 srcpkgs/papi/patches/gnu_source.patch create mode 100644 srcpkgs/paraview/template delete mode 100644 srcpkgs/parted/patches/fix-glibc-2.27.patch delete mode 100644 srcpkgs/parted/patches/fix-includes.patch create mode 100644 srcpkgs/passphrase2pgp/template create mode 100644 srcpkgs/pastel/template create mode 100644 srcpkgs/pd/patches/fix-musl.patch create mode 100644 srcpkgs/pdsh/patches/fix_configure_ac.patch create mode 100644 srcpkgs/pdsh/template create mode 100644 srcpkgs/perl-Curses-UI/template create mode 100644 srcpkgs/perl-Math-FFT/template delete mode 100644 srcpkgs/perl-WWW-Curl/patches/CURL_STRICTER.patch create mode 100644 srcpkgs/perl-WWW-Curl/patches/curl-7.50.2.patch create mode 100644 srcpkgs/peru/template create mode 100644 srcpkgs/pfetch/template create mode 100644 srcpkgs/pioneer/update create mode 100644 srcpkgs/pkgtop/template create mode 100644 srcpkgs/plasma-thunderbolt/template create mode 100644 srcpkgs/plata-theme/INSTALL.msg delete mode 100644 srcpkgs/png++/patches/musl-error.patch delete mode 100644 srcpkgs/poedit/patches/LearnMoreLink.patch create mode 100644 srcpkgs/poezio/update create mode 100644 srcpkgs/postgis/patches/postgis-2.5.3-PROTOCC_VERSION.patch create mode 100644 srcpkgs/postgis/update create mode 100644 srcpkgs/proot/patches/disable-seccomp-based-tracing.patch create mode 100644 srcpkgs/proot/patches/makefile-fix-vars.patch create mode 100644 srcpkgs/protontricks/template delete mode 100644 srcpkgs/pulseaudio/patches/fix-alsa-module.patch create mode 100644 srcpkgs/pyradio/INSTALL.msg create mode 100644 srcpkgs/pyradio/template delete mode 100644 srcpkgs/python-cryptography/patches/libressl.patch create mode 100644 srcpkgs/python-cryptography_vectors/template create mode 100644 srcpkgs/python-fonttools/update delete mode 100644 srcpkgs/python-html2text/template create mode 100644 srcpkgs/python-iso-8601/template create mode 120000 srcpkgs/python-pafy delete mode 100644 srcpkgs/python-pafy/template create mode 100644 srcpkgs/python-pretend/template create mode 100644 srcpkgs/python-rfc6555/template delete mode 100644 srcpkgs/python-scikit-learn/template delete mode 100644 srcpkgs/python-scipy/template delete mode 100644 srcpkgs/python-zeroconf/template delete mode 100644 srcpkgs/python-zeroconf/update create mode 100644 srcpkgs/python3-Flask-HTTPAuth/template create mode 100644 srcpkgs/python3-PyJWT/template delete mode 120000 srcpkgs/python3-astroid create mode 100644 srcpkgs/python3-astroid/template create mode 100644 srcpkgs/python3-autobahn/template rename srcpkgs/{python-bcc => python3-bcc} (100%) create mode 120000 srcpkgs/python3-cryptography_vectors create mode 100644 srcpkgs/python3-distro/template create mode 100644 srcpkgs/python3-fido2/template delete mode 120000 srcpkgs/python3-fonttools create mode 100644 srcpkgs/python3-fonttools/template create mode 100644 srcpkgs/python3-hkdf/template delete mode 120000 srcpkgs/python3-html2text create mode 100644 srcpkgs/python3-html2text/template create mode 120000 srcpkgs/python3-iso-8601 create mode 100644 srcpkgs/python3-libevdev/template create mode 120000 srcpkgs/python3-mechanize create mode 100644 srcpkgs/python3-mpi4py/template delete mode 120000 srcpkgs/python3-pafy create mode 100644 srcpkgs/python3-pafy/template delete mode 120000 srcpkgs/python3-pandas rename srcpkgs/{python-pandas/python3-pandas.INSTALL.msg => python3-pandas/INSTALL.msg} (100%) create mode 100644 srcpkgs/python3-pandas/template create mode 100644 srcpkgs/python3-pandas/update create mode 120000 srcpkgs/python3-pretend create mode 100644 srcpkgs/python3-pyfiglet/template delete mode 120000 srcpkgs/python3-pylint create mode 100644 srcpkgs/python3-pylint/template create mode 120000 srcpkgs/python3-regex create mode 120000 srcpkgs/python3-rfc6555 create mode 100644 srcpkgs/python3-rss2email/template create mode 100644 srcpkgs/python3-scard/template delete mode 120000 srcpkgs/python3-scikit-learn create mode 100644 srcpkgs/python3-scikit-learn/template delete mode 120000 srcpkgs/python3-scipy create mode 100644 srcpkgs/python3-scipy/template rename srcpkgs/{python-scipy => python3-scipy}/update (100%) create mode 100644 srcpkgs/python3-spake2/template create mode 100644 srcpkgs/python3-tinycss/template create mode 100644 srcpkgs/python3-txaio/template create mode 100644 srcpkgs/python3-txtorcon/template create mode 100644 srcpkgs/python3-usb/template create mode 100644 srcpkgs/python3-vdf/template create mode 100644 srcpkgs/qt/patches/gcc9-qforeach.patch create mode 100644 srcpkgs/qt5-webkit/patches/musl-ppc.patch create mode 100644 srcpkgs/qt5-webkit/patches/ppc-llint.patch create mode 100644 srcpkgs/qt5-webkit/patches/reduce-exports.patch create mode 100644 srcpkgs/qt5/patches/0027-remove-glibc-check.patch delete mode 100644 srcpkgs/qt5/patches/0048-qtbug-76742.patch create mode 100644 srcpkgs/qt5/patches/0049-big-endian-scroll.patch create mode 100644 srcpkgs/qt5/patches/0050-pulse-stubs.patch create mode 100644 srcpkgs/qt5/patches/0100-qtbug-77364.patch create mode 100644 srcpkgs/qtcreator/patches/clang9.patch create mode 100644 srcpkgs/qtcurve/patches/gtkprops_constexpr.patch create mode 100644 srcpkgs/rakudo/patches/fix-perl6-home-dir.patch delete mode 100644 srcpkgs/range-v3/patches/fix-is_trivial.patch create mode 100644 srcpkgs/reap/template delete mode 100644 srcpkgs/riot-desktop/patches/electron5.patch create mode 100644 srcpkgs/rsClock/template create mode 100644 srcpkgs/rust/patches/0007-Fix-C-aggregate-passing-ABI-on-powerpc.patch delete mode 100644 srcpkgs/rust/patches/0007-runtest-Fix-proc-macro-tests-on-musl-hosts.patch create mode 100644 srcpkgs/rust/patches/0008-Fix-zero-sized-aggregate-ABI-on-powerpc.patch create mode 100644 srcpkgs/rust/patches/0009-compiletest-Match-suffixed-environments.patch create mode 100644 srcpkgs/rust/patches/0010-test-c-variadic-Fix-patterns-on-powerpc64.patch rename srcpkgs/rust/patches/{0008-test-use-extern-for-plugins-Don-t-assume-multilib.patch => 0011-test-use-extern-for-plugins-Don-t-assume-multilib.patch} (79%) rename srcpkgs/rust/patches/{0009-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch => 0012-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch} (80%) rename srcpkgs/rust/patches/{0010-Ignore-broken-and-non-applicable-tests.patch => 0013-Ignore-broken-and-non-applicable-tests.patch} (71%) rename srcpkgs/rust/patches/{0011-Link-stage-2-tools-dynamically-to-libstd.patch => 0014-Link-stage-2-tools-dynamically-to-libstd.patch} (75%) rename srcpkgs/rust/patches/{0012-Move-debugger-scripts-to-usr-share-rust.patch => 0015-Move-debugger-scripts-to-usr-share-rust.patch} (85%) create mode 100644 srcpkgs/rust/patches/0091-bootstrap.patch delete mode 100644 srcpkgs/rust/patches/0091-lzma-sys-cross-ldflags.patch delete mode 100644 srcpkgs/sakura/patches/0002-Fixed-crash-with-vte-0.54-Bug-1790317.patch create mode 100644 srcpkgs/saml2aws/template create mode 100644 srcpkgs/scc/template create mode 100644 srcpkgs/shiboken2/patches/qstringlist.patch create mode 100644 srcpkgs/sops/template create mode 100644 srcpkgs/spotify-adblock-linux/files/spotify-adblock.desktop create mode 100644 srcpkgs/spotify-adblock-linux/template create mode 100644 srcpkgs/spotify-tui/template create mode 100644 srcpkgs/sqlmap/template delete mode 100644 srcpkgs/squashfs-tools/patches/CVE-2015-4645.patch delete mode 100644 srcpkgs/squashfs-tools/patches/fix-compat.patch delete mode 100644 srcpkgs/squashfs-tools/patches/vla-overlow.patch delete mode 100644 srcpkgs/stagit/patches/libgit2-0.28.patch create mode 100644 srcpkgs/starship/template delete mode 100644 srcpkgs/supercollider/patches/bbcd068659ced596402dedc78f49fabfab6470bd.patch create mode 100644 srcpkgs/swell-foop/patches/pivot_point.patch delete mode 100644 srcpkgs/synapse/patches/bump-python-dependencies.patch create mode 100644 srcpkgs/sysexxer-ng/template create mode 100644 srcpkgs/tarpaulin/template create mode 100644 srcpkgs/tau/template create mode 100644 srcpkgs/telegram-desktop/patches/stdafx.h.patch create mode 100644 srcpkgs/termdown/template delete mode 100644 srcpkgs/thunderbird/patches/disable-hunspell_hooks.patch create mode 100644 srcpkgs/thunderbird/patches/disable-image-format-warning.patch create mode 100644 srcpkgs/thunderbird/patches/fix-arm-opus-include.patch create mode 100644 srcpkgs/thunderbird/patches/fix-i686-ppc-musl.patch delete mode 100644 srcpkgs/thunderbird/patches/fix-rust-1.29.patch create mode 100644 srcpkgs/thunderbird/patches/fix-sandbox-membarrier.patch create mode 100644 srcpkgs/thunderbird/patches/fix-wasm-arm.patch delete mode 100644 srcpkgs/thunderbird/patches/fix-xpcom.patch create mode 100644 srcpkgs/thunderbird/patches/ppc32-skia-portable.patch create mode 100644 srcpkgs/thunderbird/patches/rust-configure.patch create mode 100644 srcpkgs/thunderbird/patches/rust-cssparser.patch delete mode 100644 srcpkgs/thunderbird/patches/rust-unitialized-field.patch delete mode 100644 srcpkgs/thunderbird/patches/rust133.patch create mode 100644 srcpkgs/thunderbird/patches/yuv-be.patch create mode 100644 srcpkgs/tor/patches/ppc.patch delete mode 100644 srcpkgs/tor/patches/ppc64.patch create mode 100644 srcpkgs/torbrowser-launcher/template create mode 100644 srcpkgs/usbguard/files/usbguard/run create mode 100644 srcpkgs/usbguard/patches/musl.patch create mode 100644 srcpkgs/usbguard/template create mode 100644 srcpkgs/util-linux/patches/chsh.patch delete mode 100644 srcpkgs/varnish/INSTALL.msg create mode 100755 srcpkgs/varnish/files/varnishd/log/run create mode 100755 srcpkgs/varnish/files/varnishd/run create mode 100644 srcpkgs/varnish/patches/musl.patch create mode 100644 srcpkgs/varnish/update create mode 100644 srcpkgs/vmpk/template delete mode 100644 srcpkgs/vpnc-scripts/patches/fix-ipv6.patch delete mode 100644 srcpkgs/webkit2gtk/patches/fix-fast-memory-disabled.patch create mode 100644 srcpkgs/webkit2gtk/patches/ppc-llint.patch create mode 120000 srcpkgs/wf-config-devel delete mode 100644 srcpkgs/wf-config/patches/fix-musl.patch create mode 100644 srcpkgs/wpa-cute/template create mode 100644 srcpkgs/xdg-dbus-proxy/patches/musl.patch create mode 100644 srcpkgs/xdgmenumaker/files/1.5/xdgmenumaker.1 create mode 100644 srcpkgs/xpdf/update delete mode 100644 srcpkgs/ykpivmgr/patches/libressl.patch create mode 100644 srcpkgs/ykpivmgr/patches/ssl_obsolete.patch create mode 100644 srcpkgs/yubikey-manager/template delete mode 100644 srcpkgs/zaproxy/template delete mode 100644 srcpkgs/zaproxy/update diff --git a/.travis.yml b/.travis.yml index c6e23258590..d0ffe216573 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ language: bash +dist: bionic git: depth: 200 diff --git a/common/build-style/cargo.sh b/common/build-style/cargo.sh index a2a0dfe3744..cff16bee082 100644 --- a/common/build-style/cargo.sh +++ b/common/build-style/cargo.sh @@ -18,6 +18,6 @@ do_install() { : ${make_cmd:=cargo} ${make_cmd} install --path . --target ${RUST_TARGET} --root="${DESTDIR}/usr" \ - ${make_install_args} + --locked ${make_install_args} rm "${DESTDIR}"/usr/.crates.toml } diff --git a/common/build-style/meson.sh b/common/build-style/meson.sh index 160dc16b417..d318978ea59 100644 --- a/common/build-style/meson.sh +++ b/common/build-style/meson.sh @@ -69,6 +69,10 @@ cpu_family = '${_MESON_CPU_FAMILY}' cpu = '${_MESON_TARGET_CPU}' endian = '${_MESON_TARGET_ENDIAN}' EOF + if [ "${hostmakedepends}" != "${hostmakedepends/qemu-user-static/}" ]; then + sed -e "/\[binaries\]/ a exe_wrapper = '/usr/bin/qemu-${XBPS_TARGET_QEMU_MACHINE}-static'" \ + -i ${meson_crossfile} + fi unset _MESON_CPU_FAMILY _MESON_TARGET_CPU _MESON_TARGET_ENDIAN fi @@ -78,6 +82,7 @@ do_configure() { : ${meson_cmd:=meson} : ${meson_builddir:=build} : ${meson_crossfile:=xbps_meson.cross} + export QEMU_LD_PREFIX=${XBPS_CROSS_BASE} if [ "$CROSS_BUILD" ]; then configure_args+=" --cross-file=${meson_crossfile}" @@ -130,6 +135,7 @@ do_build() { : ${make_cmd:=ninja} : ${make_build_target:=all} : ${meson_builddir:=build} + export QEMU_LD_PREFIX=${XBPS_CROSS_BASE} ${make_cmd} -C ${meson_builddir} ${makejobs} ${make_build_args} ${make_build_target} } @@ -146,6 +152,7 @@ do_install() { : ${make_cmd:=ninja} : ${make_install_target:=install} : ${meson_builddir:=build} + export QEMU_LD_PREFIX=${XBPS_CROSS_BASE} DESTDIR=${DESTDIR} ${make_cmd} -C ${meson_builddir} ${make_install_args} ${make_install_target} } diff --git a/common/shlibs b/common/shlibs index c95b078e0bf..cc3fd8383d8 100644 --- a/common/shlibs +++ b/common/shlibs @@ -60,7 +60,7 @@ libgcc_s.so.1 libgcc-4.4.0_1 libgo.so.14 libgo-9.1.0_1 libmpx.so.2 libmpx-6.2.1_1 libmpxwrappers.so.2 libmpx-6.2.1_1 -libperl.so.5.28 perl-5.28.0_1 +libperl.so.5.30 perl-5.30.0_1 libgmp.so.10 gmp-5.0.1_1 libgmpxx.so.4 gmpxx-6.0.0_2 libmpfr.so.6 mpfr-4.0.0_1 @@ -146,8 +146,8 @@ libnvidia-gtk3.so.346.47 nvidia-gtklibs-346.47_1 ignore libnvidia-glcore.so.346.47 nvidia340-libs-340.46_1 ignore libnvidia-glcore.so.390.87 nvidia390-libs-390.87_1 ignore libnvidia-glsi.so.346.72 nvidia-libs-346.72_1 ignore -libnvidia-fatbinaryloader.so.390.116 nvidia390-libs-390.116_1 ignore -libnvidia-fatbinaryloader.so.430.14 nvidia-libs-430.14_1 ignore +libnvidia-fatbinaryloader.so.390.129 nvidia390-libs-390.129_1 ignore +libnvidia-fatbinaryloader.so.430.40 nvidia-libs-430.40_1 ignore libglapi.so.0 libglapi-7.11_1 libgbm.so.1 libgbm-9.0_1 librsvg-2.so.2 librsvg-2.26.0_1 @@ -182,8 +182,8 @@ libreadline.so.8 libreadline8-8.0_1 libhistory.so.8 libhistory8-8.0_1 libxfconf-0.so.3 xfconf-4.13.7_1 libxfce4util.so.7 libxfce4util-4.12.1_1 -libxfce4panel-1.0.so.4 xfce4-panel-4.9.2_1 -libxfce4panel-2.0.so.4 xfce4-panel-4.12.0_1 +libxfce4panel-1.0.so.4 libxfce4panel-4.9.2_1 +libxfce4panel-2.0.so.4 libxfce4panel-4.12.0_1 libgdbm.so.6 gdbm-1.16_1 libgdbm_compat.so.4 gdbm-1.10_1_1 libintl.so.8 gettext-libs-0.19.2_1 @@ -354,7 +354,7 @@ libMagickCore-6.Q16.so.6 libmagick6-6.9.10.11_1 libMagickWand-6.Q16.so.6 libmagick6-6.9.10.11_1 libMagick++-6.Q16.so.8 libmagick6-6.9.10.11_1 libltdl.so.7 libltdl-2.2.6_1 -libpoppler.so.89 libpoppler89-0.78.0_1 +libpoppler.so.90 libpoppler89-0.80.0_1 libpoppler-glib.so.8 poppler-glib-0.18.2_1 libpoppler-cpp.so.0 poppler-cpp-0.18.2_1 libpoppler-qt5.so.1 poppler-qt5-0.31.0_1 @@ -541,6 +541,8 @@ libkdexoauth2.so.3 kdepim-runtime-17.12.3_1 libakonadi-filestore.so.5 kdepim-runtime-17.12.3_1 libmaildir.so.5 kdepim-runtime-17.12.3_1 libfolderarchivesettings.so.5 kdepim-runtime-17.12.3_1 +libkColorPicker.so.0.1.0 kColorPicker-0.1.0_1 +libkImageAnnotator.so.0.1.0 kImageAnnotator-0.1.0_1 libbabl-0.1.so.0 babl-0.1.16_1 libbamf3.so.2 bamf-0.5.1_1 libicuio.so.64 icu-libs-64.1_1 @@ -624,16 +626,16 @@ libcamel-1.2.so.62 evolution-data-server-3.30.0_1 libedataserver-1.2.so.24 evolution-data-server-3.32.0_1 libebackend-1.2.so.10 evolution-data-server-3.17.90_1 libedataserverui-1.2.so.2 evolution-data-server-3.28.0_1 -libebook-contacts-1.2.so.2 evolution-data-server-3.17.90_1 -libedata-book-1.2.so.25 evolution-data-server-3.8.0_1 -libebook-1.2.so.19 evolution-data-server-3.24.0_1 -libecal-1.2.so.19 evolution-data-server-3.18.0_1 +libebook-contacts-1.2.so.3 evolution-data-server-3.34.0_1 +libedata-book-1.2.so.26 evolution-data-server-3.34.0_1 +libebook-1.2.so.20 evolution-data-server-3.34.0_1 +libecal-2.0.so.1 evolution-data-server-3.34.0_1 libevolution-calendar.so evolution-3.28.0_1 libevolution-util.so evolution-3.28.0_1 libemail-engine.so evolution-3.28.0_1 libevolution-mail.so evolution-3.28.0_1 libevolution-shell.so evolution-3.28.0_1 -libedata-cal-1.2.so.29 evolution-data-server-3.30.0_1 +libedata-cal-2.0.so.1 evolution-data-server-3.34.0_1 libgdata.so.22 libgdata-0.17.9_1 libpcap.so.1 libpcap-1.1.1_1 libiptc.so.0 iptables-1.4.7_1 @@ -758,8 +760,8 @@ libasyncns.so.0 libasyncns-0.8_1 libpulse.so.0 libpulseaudio-1.0_1 libpulse-mainloop-glib.so.0 libpulseaudio-1.0_1 libpulse-simple.so.0 libpulseaudio-1.0_1 -libpulsecommon-12.2.so libpulseaudio-12.2_1 -libpulsecore-12.2.so libpulseaudio-12.2_1 +libpulsecommon-13.0.so libpulseaudio-13.0_1 +libpulsecore-13.0.so libpulseaudio-13.0_1 liborc-0.4.so.0 orc-0.4.11_1 liborc-test-0.4.so.0 orc-0.4.11_1 libgmime-2.6.so.0 gmime-2.6.4_1 @@ -1019,13 +1021,13 @@ libuchardet.so.0 uchardet-0.0.6_1 libgtksourceviewmm-3.0.so.0 gtksourceviewmm-3.2.0_1 libyajl.so.2 yajl-2.0.1_1 libconfuse.so.2 confuse-3.2.1_1 -liblldb.so.8 lldb-8.0.0_1 -libclang.so.8 clang-8.0.0_1 +liblldb.so.9 lldb-9.0.0_1 +libclang.so.9 clang-9.0.0_1 +libclang-cpp.so.9 clang-9.0.0_1 libLLVM-6.0.so libllvm6.0-6.0.0_1 libLLVM-7.so libllvm7-7.0.0_1 libLLVM-8.so libllvm8-8.0.0_1 -libOptRemarks.so.8 libllvm8-8.0.0_1 -libLTO.so.8 libllvm8-8.0.0_1 +libLLVM-9.so libllvm9-9.0.0_1 libisofs.so.6 libisofs-0.6.24_1 libmpack.so.0 libmpack-1.0.5_1 libGeoIP.so.1 libgeoip-1.4.8_1 @@ -1046,7 +1048,7 @@ libtirpc.so.3 libtirpc-1.0.2_1 librpcsecgss.so.3 librpcsecgss-0.19_1 libnfsidmap.so.0 libnfsidmap-0.24_1 libbind9.so.161 bind-libs-9.11.5_1 -libdns.so.1106 bind-libs-9.11.7_1 +libdns.so.1107 bind-libs-9.11.10_1 libirs.so.161 bind-libs-9.11.5_1 libisc.so.1100 bind-libs-9.11.5_1 libisccc.so.161 bind-libs-9.11.5_1 @@ -1129,7 +1131,7 @@ libsbc.so.1 sbc-1.0_1 libecryptfs.so.1 libecryptfs-104_1 libnuma.so.1 libnuma-2.0.7_1 libxar.so.1 xar-1.5.2_1 -libqpdf.so.21 libqpdf-8.0.0_1 +libqpdf.so.26 libqpdf-9.0.2_1 libmikmod.so.3 libmikmod-3.1.12_1 libSDL_sound-1.0.so.1 SDL_sound-1.0.3_1 libgtksourceview-2.0.so.0 gtksourceview2-2.10.5_1 @@ -1149,6 +1151,7 @@ libguess.so.1 libguess-1.1_1 libaudcore.so.5 audacious-3.9_1 libaudgui.so.5 audacious-3.9_1 libaudtag.so.3 audacious-3.8_1 +libaudqt.so.2 audacious-3.10.1_2 libgstreamer-1.0.so.0 gstreamer1-1.0.0_1 libgstbase-1.0.so.0 gstreamer1-1.0.0_1 libgstcontroller-1.0.so.0 gstreamer1-1.0.0_1 @@ -1172,9 +1175,9 @@ libgstbasecamerabinsrc-1.0.so.0 gst-plugins-bad1-1.0.0_1 libgstcodecparsers-1.0.so.0 gst-plugins-bad1-1.0.0_1 libgstplayer-1.0.so.0 gst-plugins-bad1-1.0.0_1 libgstgl-1.0.so.0 gst-plugins-base1-1.14.0_1 -libgnome-desktop-3.so.17 gnome-desktop-3.28.0_1 +libgnome-desktop-3.so.18 gnome-desktop-3.34.0_1 libsecret-1.so.0 libsecret-0.10_1 -libgweather-3.so.15 libgweather-3.28.0_1 +libgweather-3.so.16 libgweather-3.34.0_1 libgnomekbd.so.8 libgnomekbd-3.6.0_1 libgnomekbdui.so.8 libgnomekbd-3.6.0_1 libibus-1.0.so.5 ibus-1.4.99.20120917_1 @@ -1217,8 +1220,8 @@ libHX.so.28 libHX-3.14_1 libxkbcommon.so.0 libxkbcommon-0.2.0_1 libxkbcommon-x11.so.0 libxkbcommon-x11-0.4.2_1 libgee-0.8.so.2 libgee08-0.8.2_1 -libnettle.so.6 nettle-3.2_1 -libhogweed.so.4 nettle-3.2_1 +libnettle.so.7 nettle-3.5.1_1 +libhogweed.so.5 nettle-3.5.1_1 libgtkspell.so.0 gtkspell-2.0.16_1 libgtkspell3-3.so.0 gtkspell3-3.0.9_1 libpurple.so.0 libpurple-2.10.6_1 @@ -1298,6 +1301,7 @@ libunwind-aarch64.so.8 libunwind-1.2rc1_1 libunwind-ppc32.so.8 libunwind-1.2.1_1 libunwind-ppc64.so.8 libunwind-1.2.1_1 libmicrohttpd.so.12 libmicrohttpd-0.9.48_1 +libmicrodns.so.0 libmicrodns-0.1.0_1 libgit2.so.28 libgit2-0.28.0_1 libgit2-glib-1.0.so.0 libgit2-glib-0.23.4_1 libagg.so.2 agg-2.5_1 @@ -1309,7 +1313,7 @@ libkworkspace5.so.5 kworkspace-5.14.5_2 libdb-5.3.so libdb-5.3.21_1 libdb_cxx-5.3.so libdb-cxx-5.3.21_1 libcares.so.2 c-ares-1.10.0_1 -libcryptopp.so.5.6 crypto++-565_1 +libcryptopp.so.8 crypto++-820_1 libphonon.so.4 phonon-4.6.0_1 libphononexperimental.so.4 phonon-4.6.0_1 libdbusmenu-glib.so.4 libdbusmenu-glib-12.10.2_1 @@ -1326,8 +1330,8 @@ libodbcinst.so.2 libodbc-2.3.1_1 libodbc.so.2 libodbc-2.3.1_1 libiodbc.so.2 libiodbc-3.52.8_1 libiodbcinst.so.2 libiodbc-3.52.8_1 -libsolarus.so.1 solarus-1.5.3_1 -libsolarus-gui.so solarus-1.5.3_1 +libsolarus.so.1 solarus-1.6.2_1 +libsolarus-gui.so.1 solarus-1.6.2_1 libplank.so.1 plank-0.11.0_1 libssh.so.4 libssh-0.5.4_1 libqjson.so.0 qjson-0.8.1_1 @@ -1756,7 +1760,7 @@ libcblas.so.3 cblas-3.6.0_1 liblapack.so.3 lapack-3.5.0_1 libcinnamon-menu-3.so.0 cinnamon-menus-2.2.0_1 libmate-desktop-2.so.17 mate-desktop-1.8.0_1 -libmarco-private.so.1 libmarco-1.14.0_1 +libmarco-private.so.2 libmarco-1.22.2_1 libmate-menu.so.2 mate-menus-1.8.0_1 libcaja-extension.so.1 libcaja-1.8.1_1 libmatekbd.so.4 libmatekbd-1.8.0_1 @@ -1994,7 +1998,6 @@ libasignify.so.1 asignify-1.0_1 libvte2_90.so.9 vte290-0.36.3_1 libd0_blind_id.so.0 xonotic-0.8.0_1 libechonest.so.2.3 libechonest-2.3.1_1 -libjreen.so.1 jreen-1.2.1_1 libuecc.so.0 libuecc-5_1 libKF5WindowSystem.so.5 kwindowsystem-5.6.0_1 libKF5GuiAddons.so.5 kguiaddons-5.6.0_1 @@ -2063,6 +2066,7 @@ libsfml-graphics.so.2.5 SFML-2.5.0_1 libclamav.so.9 clamav-0.101.0_1 libclamunrar.so.9 clamav-0.101.0_1 libclamunrar_iface.so.9 clamav-0.101.0_1 +libfreshclam.so.2 clamav-0.102.0_1 libqca-qt5.so.2 qca-qt5-2.1.3_1 libqt5keychain.so.1 qtkeychain-qt5-0.7.0_1 libphonon4qt5.so.4 phonon-qt5-4.8.3_1 @@ -2075,7 +2079,7 @@ libechonest5.so.2.3 libechonest-qt5-2.3.0_1 liblastfm_fingerprint5.so.1 liblastfm-qt5-1.0.9_1 liblastfm5.so.1 liblastfm-qt5-1.0.9_1 libquazip5.so.1 quazip-0.7.3_2 -libjreen-qt5.so.1 jreen-qt5-1.2.0_1 +libjreen-qt5.so.1 jreen-1.3.0_1 libzen.so.0 libzen-0.4.31_1 libmediainfo.so.0 libmediainfo-0.7.75_1 libnghttp2.so.14 nghttp2-1.0.2_1 @@ -2104,7 +2108,7 @@ libtesseract.so.4 tesseract-ocr-4.0.0_1 libffmpegthumbnailer.so.4 ffmpegthumbnailer-2.0.10_1 libopenraw.so.7 libopenraw-0.1.0_1 libopenrawgnome.so.7 libopenraw-0.1.0_1 -libgeda.so.42 geda-1.8.2_1 +libgeda.so.46 geda-1.10.0_1 libclutter-gst-3.0.so.0 clutter-gst3-3.0.4_1 libgsound.so.0 gsound-1.0.1_1 libgegl-0.3.so.0 gegl3-0.3.0_1 @@ -2114,7 +2118,7 @@ libprocps.so.7 procps-ng-3.3.15_1 libgegl-0.4.so.0 gegl-0.4.16_1 libgegl-npd-0.4.so gegl-0.4.16_1 libgegl-sc-0.4.so gegl-0.4.16_1 -libskarnet.so.2.8 skalibs-2.8.0.0_1 +libskarnet.so.2.9 skalibs-2.9.0.0_1 libKF5BalooWidgets.so.5 baloo-widgets5-17.04.3_1 libtidy.so.5 libtidy5-5.1.25_1 libSDL2_gfx-1.0.so.0 SDL2_gfx-1.0.1_1 @@ -2254,7 +2258,7 @@ libhidapi-libusb.so.0 hidapi-0.8.0rc1_1 libu2f-host.so.0 libu2f-host-1.0.0_1 libu2f-server.so.0 libu2f-server-1.0.1_2 libsqlcipher.so.0 sqlcipher-3.3.1_1 -libgta.so.0 libgta-1.0.7_1 +libgta.so.1 libgta-1.2.0_1 libgdal.so.26 libgdal-3.0.0_1 libosgViewer.so.131 osg-3.4.1_1 libosgShadow.so.131 osg-3.4.1_1 @@ -2412,20 +2416,20 @@ libxdo.so.3 xdotool-3.20150503.1_1 libabigail.so.0 libabigail-1.0.rc3_1 libgnome-games-support-1.so.3 libgnome-games-support-1.4.0_1 libwlc.so.0 wlc-0.0.2_1 -libKDevClangPrivate.so.31 kdevelop-5.3.0_1 -libKDevPlatformDebugger.so.53 kdevelop-5.3.0_1 -libKDevPlatformDocumentation.so.53 kdevelop-5.3.0_1 -libKDevPlatformInterfaces.so.53 kdevelop-5.3.0_1 -libKDevPlatformLanguage.so.53 kdevelop-5.3.0_1 -libKDevPlatformOutputView.so.53 kdevelop-5.3.0_1 -libKDevPlatformProject.so.53 kdevelop-5.3.0_1 -libKDevPlatformSerialization.so.53 kdevelop-5.3.0_1 -libKDevPlatformShell.so.53 kdevelop-5.3.0_1 -libKDevPlatformSublime.so.53 kdevelop-5.3.0_1 -libKDevPlatformTests.so.53 kdevelop-5.3.0_1 -libKDevPlatformUtil.so.53 kdevelop-5.3.0_1 -libKDevPlatformVcs.so.53 kdevelop-5.3.0_1 -libkdevcmakecommon.so kdevelop-5.3.0_1 +libKDevClangPrivate.so.32 kdevelop-5.4.1_1 +libKDevPlatformDebugger.so.54 kdevelop-5.4.1_1 +libKDevPlatformDocumentation.so.54 kdevelop-5.4.1_1 +libKDevPlatformInterfaces.so.54 kdevelop-5.4.1_1 +libKDevPlatformLanguage.so.54 kdevelop-5.4.1_1 +libKDevPlatformOutputView.so.54 kdevelop-5.4.1_1 +libKDevPlatformProject.so.54 kdevelop-5.4.1_1 +libKDevPlatformSerialization.so.54 kdevelop-5.4.1_1 +libKDevPlatformShell.so.54 kdevelop-5.4.1_1 +libKDevPlatformSublime.so.54 kdevelop-5.4.1_1 +libKDevPlatformTests.so.54 kdevelop-5.4.1_1 +libKDevPlatformUtil.so.54 kdevelop-5.4.1_1 +libKDevPlatformVcs.so.54 kdevelop-5.4.1_1 +libkdevcmakecommon.so kdevelop-5.4.1_1 libts.so.0 tslib-1.6_1 libobs.so.0 obs-0.14.1_2 libobsglad.so.0 obs-0.14.1_2 @@ -2699,7 +2703,7 @@ libKDb3.so.4 kdb-3.1.0_1 libKPropertyWidgets3.so.4 kproperty-3.1.0_1 libKPropertyCore3.so.4 kproperty-3.1.0_1 libKReport3.so.4 kreport-3.1.0_1 -libbotan-2.so.10 botan-2.10.0_1 +libbotan-2.so.12 botan-2.12.0_1 libswipl.so.8 swi-prolog-8.0.0_1 libpcre2-16.so.0 libpcre2-10.22_1 libpcre2-32.so.0 libpcre2-10.22_1 @@ -2723,27 +2727,27 @@ libkj-http-0.7.0.so capnproto-0.7.0_1 libkj-async-0.7.0.so capnproto-0.7.0_1 libkj-test-0.7.0.so capnproto-0.7.0_1 libkj-0.7.0.so capnproto-0.7.0_1 -libkea-asiodns.so.0 libkea-1.1.0_1 +libkea-asiodns.so.1 libkea-1.7.0_1 libkea-asiolink.so.7 libkea-1.5.0_1 -libkea-cc.so.7 libkea-1.5.0_1 -libkea-cfgclient.so.6 libkea-1.5.0_1 -libkea-cryptolink.so.4 libkea-1.5.0_1 -libkea-database.so.1 libkea-1.5.0_1 -libkea-dhcp++.so.11 libkea-1.5.0_1 -libkea-dhcp_ddns.so.1 libkea-1.1.0_1 -libkea-dhcpsrv.so.14 libkea-1.5.0_1 +libkea-cc.so.8 libkea-1.6.0_1 +libkea-cfgclient.so.8 libkea-1.7.0_1 +libkea-cryptolink.so.5 libkea-1.7.0_1 +libkea-database.so.5 libkea-1.7.0_1 +libkea-dhcp++.so.14 libkea-1.7.0_1 +libkea-dhcp_ddns.so.2 libkea-1.7.0_1 +libkea-dhcpsrv.so.17 libkea-1.7.0_1 libkea-dns++.so.3 libkea-1.5.0_1 -libkea-eval.so.10 libkea-1.5.0_1 +libkea-eval.so.12 libkea-1.7.0_1 libkea-exceptions.so.0 libkea-1.1.0_1 -libkea-hooks.so.7 libkea-1.4.0_1 -libkea-http.so.4 libkea-1.5.0_1 -libkea-log.so.3 libkea-1.2.0_1 -libkea-pgsql.so.0 libkea-1.5.0_1 -libkea-process.so.3 libkea-1.5.0_1 -libkea-stats.so.2 libkea-1.3.0_1 -libkea-threads.so.2 libkea-1.5.0_1 +libkea-hooks.so.8 libkea-1.7.0_1 +libkea-http.so.7 libkea-1.7.0_1 +libkea-log.so.5 libkea-1.7.0_1 +libkea-pgsql.so.1 libkea-1.7.0_1 +libkea-process.so.4 libkea-1.6.0_1 +libkea-stats.so.3 libkea-1.6.0_1 +libkea-threads.so.3 libkea-1.7.0_1 libkea-util-io.so.0 libkea-1.1.0_1 -libkea-util.so.5 libkea-1.5.0_1 +libkea-util.so.8 libkea-1.7.0_1 libytnef.so.0 ytnef-1.8_1 libpisock.so.9 pilot-link-0.12.5_1 libpisync.so.1 pilot-link-0.12.5_1 @@ -2777,11 +2781,11 @@ libdecoration.so.0 compiz-core-0.8.14_1 libcompizconfig.so.0 libcompizconfig-0.8.14_1 libemeraldengine.so.0 emerald-0.8.14_1 libhangul.so.1 libhangul-0.1.0_1 -libmutter-4.so.0 mutter-3.32.0_1 -libmutter-clutter-4.so.0 mutter-3.32.0_1 -libmutter-cogl-path-4.so mutter-3.32.0_1 -libmutter-cogl-4.so.0 mutter-3.32.0_1 -libmutter-cogl-pango-4.so.0 mutter-3.32.0_1 +libmutter-5.so.0 mutter-3.34.1_1 +libmutter-clutter-5.so.0 mutter-3.34.1_1 +libmutter-cogl-path-5.so mutter-3.34.1_1 +libmutter-cogl-5.so.0 mutter-3.34.1_1 +libmutter-cogl-pango-5.so.0 mutter-3.34.1_1 libgeoclue-2.so.0 geoclue2-2.4.4_1 libgepub.so.0 libgepub-0.4_1 libslopy.so.7.4 slop-7.4_1 @@ -2798,7 +2802,7 @@ libomxvideosched.so.0 libomxil-bellagio-0.9.3_1 libnss_libvirt_guest.so.2 libvirt-3.1.0_1 libvirt-admin.so.0 libvirt-3.1.0_1 libnss_libvirt.so.2 libvirt-3.1.0_1 -libassimp.so.4 libassimp-4.0.0_1 +libassimp.so.5 libassimp-5.0.0_1 libdouble-conversion.so.1 double-conversion-2.0.1_1 libspectrum.so.8 libspectrum-1.2.2_1 libbearssl.so.0 bearssl-0.3_1 @@ -2812,16 +2816,19 @@ libsigrok.so.4 libsigrok-0.5.0_1 libsigrokcxx.so.4 libsigrok-0.5.0_1 libsigrokdecode.so.4 libsigrokdecode-0.5.0_2 libglyr.so.1 glyr-1.0.8_1 -libPocoJSON.so.60 poco-1.9.0_1 -libPocoMongoDB.so.60 poco-1.9.0_1 -libPocoZip.so.60 poco-1.9.0_1 -libPocoData.so.60 poco-1.9.0_1 -libPocoNet.so.60 poco-1.9.0_1 -libPocoDataSQLite.so.60 poco-1.9.0_1 -libPocoFoundation.so.60 poco-1.9.0_1 -libPocoXML.so.60 poco-1.9.0_1 -libPocoUtil.so.60 poco-1.9.0_1 -libPocoRedis.so.60 poco-1.9.0_1 +libPocoJSON.so.64 poco-1.9.4_1 +libPocoMongoDB.so.64 poco-1.9.4_1 +libPocoZip.so.64 poco-1.9.4_1 +libPocoData.so.64 poco-1.9.4_1 +libPocoNet.so.64 poco-1.9.4_1 +libPocoDataSQLite.so.64 poco-1.9.4_1 +libPocoFoundation.so.64 poco-1.9.4_1 +libPocoXML.so.64 poco-1.9.4_1 +libPocoUtil.so.64 poco-1.9.4_1 +libPocoRedis.so.64 poco-1.9.4_1 +libPocoEncodings.so.64 poco-1.9.4_1 +libPocoNetSSL.so.64 poco-1.9.4_1 +libPocoCrypto.so.64 poco-1.9.4_1 libopenblas.so.0 openblas-0.2.19_1 librtmidi.so.4 rtmidi-3.0.0_1 libbiblesync.so.2.0.1 biblesync-2.0.1_1 @@ -2880,7 +2887,7 @@ libbrotlienc.so.1 brotli-1.0.2_1 libfilteraudio.so filter_audio-0.0.1_1 libgstreamermm-1.0.so.1 gstreamermm-1.8.0_1 libmovit.so.8 movit-1.6.0_1 -libduktape.so.203 duktape-2.3.0_1 +libduktape.so.204 duktape-2.4.0_1 libccgnu2-1.8.so.0 commoncpp2-1.8.1_1 libccext2-1.8.so.0 commoncpp2-1.8.1_1 libucommon.so.8 ucommon-7.0.0_1 @@ -2916,7 +2923,7 @@ libtracker-sparql-2.0.so.0 libtracker-2.0.0_1 libdockapp.so.3 libdockapp-0.7.2_1 libkrdccore.so.5 krdc-17.04.3_1 libArcus.so.3 libArcus-3.1.0_1 -libgutenprint.so.8 gutenprint-5.3.1_1 +libgutenprint.so.9 gutenprint-5.3.3_1 libunbound.so.8 unbound-1.8.0_1 libmirage.so.11 libmirage-3.1.0_1 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1 @@ -2924,19 +2931,19 @@ libixml.so.10 libupnp1.8-1.8.2_1 libupnp.so.13 libupnp1.8-1.8.4_1 libevent_extra-2.1.so.6 libevent-2.1.8_3 libevent_openssl-2.1.so.6 libevent-2.1.8_3 -libsysprof-2.so sysprof-3.24.1_1 -libsysprof-ui-2.so sysprof-3.24.1_1 +libsysprof-3.so sysprof-3.34.0_1 +libsysprof-ui-3.so sysprof-3.34.0_1 libmozjs-52.so mozjs52-52.3.0_1 libmozjs-52.so.0 mozjs52-52.3.0_1 -libvala-0.44.so.0 libvala-0.44.0_1 -libvaladoc-0.44.so.0 libvaladoc-0.44.2_1 +libvala-0.46.so.0 libvala-0.46.0_1 +libvaladoc-0.46.so.0 libvaladoc-0.46.0_1 libvalaccodegen.so libvala-0.44.0_1 libphodav-2.0.so.0 phodav-2.2_1 libgfshare.so.2 libgfshare-2.0.0_1 libtracker-miner-2.0.so.0 libtracker-2.0.1_1 libtacacs.so.1 tacacs-4.0.4.28_1 libffms2.so.4 libffms2-2.23.1_1 -libddcutil.so.0 ddcutil-0.8.5_1 +libddcutil.so.1 ddcutil-0.9.7_1 liblsmash.so.2 liblsmash-2.9.1_1 libgiac.so.0 libgiac-1.4.9r17_1 libgnustep-base.so.1.26 gnustep-base-1.26.0_1 @@ -2950,7 +2957,7 @@ libvted-3.so.0 libvted-3.7.0_2 libpeasd-3.so.0 libpeasd-3.7.0_2 libgstreamerd-3.so.0 libgstreamerd-3.7.0_2 libgtkdgl-3.so.0 libgtkdgl-3.7.0_2 -libmega.so.30504 MEGAsdk-3.5.4_1 +libmega.so.30602 MEGAsdk-3.6.2a_1 libopenglrecorder.so.0 libopenglrecorder-0.1.0_1 libgpod.so.4 libgpod-0.8.3_1 libi2c.so.0 i2c-tools-4.0_1 @@ -2963,13 +2970,13 @@ libKF5Kipi.so.32.0.0 libkipi5-17.04.3_1 libhackrf.so.0 libhackrf-2017.02.1_1 libtecla.so.1 libtecla-1.6.3_1 libtecla_r.so.1 libtecla-1.6.3_1 -libzim.so.5 libzim-5.0.0_1 -libkiwix.so.6 kiwix-lib-6.0.0_1 +libzim.so.6 libzim-6.0.1_1 +libkiwix.so.8 kiwix-lib-8.0.1_1 libaria2.so.0 libaria2-1.33.1_3 -librpm.so.8 librpm-4.14.1_1 -librpmsign.so.8 librpmsign-4.14.1_1 -librpmbuild.so.8 librpmbuild-4.14.1_1 -librpmio.so.8 librpmio-4.14.1_1 +librpm.so.9 librpm-4.15.0_1 +librpmsign.so.9 librpmsign-4.15.0_1 +librpmbuild.so.9 librpmbuild-4.15.0_1 +librpmio.so.9 librpmio-4.15.0_1 libsquirrel.so.0 squirrel-libs-3.1_1 libsqstdlib.so.0 squirrel-libs-3.1_1 libexecinfo.so.1 libexecinfo-1.1_1 @@ -3017,7 +3024,7 @@ libembb_mtapi_network_c.so embb-devel-1.0.0_1 libembb_base_cpp.so embb-devel-1.0.0_1 libembb_base_c.so embb-devel-1.0.0_1 libhpdf.so Haru-devel-2.3.0_1 -libKF5Contacts.so.5 kcontacts-17.12.0_1 +libKF5Contacts.so.5 kcontacts-5.63.0_1 libKF5AkonadiPrivate.so.5 akonadi5-17.12.0_1 libKF5AkonadiCore.so.5 akonadi5-17.12.0_1 libKF5AkonadiAgentBase.so.5 akonadi5-17.12.0_1 @@ -3232,6 +3239,7 @@ libTKOffset.so.7 occt-7.2.0p1_1 libTKXDESTEP.so.7 occt-7.2.0p1_1 libTKQADraw.so.7 occt-7.2.0p1_1 libTKXmlL.so.7 occt-7.2.0p1_1 +libTKRWMesh.so.7 occt-7.4.0_1 libargon2.so.1 libargon2-20171227_1 libdazzle-1.0.so.0 libdazzle-3.28.0_1 libjsonrpc-glib-1.0.so.1 jsonrpc-glib-3.28.0_1 @@ -3291,7 +3299,7 @@ libshaderc_shared.so.1 shaderc-2018.0_1 libglslang.so glslang-6.2.2596_1 libSPIRV.so glslang-6.2.2596_1 libmaxminddb.so.0 libmaxminddb-1.3.2_1 -libmysqlpp.so mysql++-3.2.4_1 +libmysqlpp.so.3 mysql++-3.2.5_1 libKF5Syndication.so.5 syndication-5.50.0_1 liblqr-1.so.0 liblqr-0.4.2_1 libmozjs-60.so.0 mozjs60-60.0.2_1 @@ -3404,7 +3412,7 @@ libsnore-qt5.so.0.7 snorenotify-0.7.0_1 libsnoresettings-qt5.so.0.7 snorenotify-0.7.0_1 libTECkit.so.0 libteckit-2.5.8_1 libTECkit_Compiler.so.0 libteckit-2.5.8_1 -libwf-config.so wf-config-0.1_1 +libwf-config.so.0 wf-config-0.3_1 libQt5Pas.so.1 qt5pas-2.6~beta_1 libClp.so.1 libClp-1.16.11_1 libCoinUtils.so.3 libClp-1.16.11_1 @@ -3457,16 +3465,16 @@ liboblibs.so.0.0 oblibs-0.0.1.1_1 libaal-1.0.so.7 libaal-1.0.7_1 libaal-minimal.so.0 libaal-1.0.7_1 libcli.so.1.9 libcli-1.9.8.4_1 -libaddress_sorting.so.7 grpc-1.19.1_1 -libgpr.so.7 grpc-1.19.1_1 +libaddress_sorting.so.8 grpc-1.24.1_1 +libgpr.so.8 grpc-1.24.1_1 libgrpc++.so.1 grpc-1.19.1_1 libgrpc++_cronet.so.1 grpc-1.19.1_1 libgrpc++_error_details.so.1 grpc-1.19.1_1 libgrpc++_reflection.so.1 grpc-1.19.1_1 libgrpc++_unsecure.so.1 grpc-1.19.1_1 -libgrpc.so.7 grpc-1.19.1_1 -libgrpc_cronet.so.7 grpc-1.19.1_1 -libgrpc_unsecure.so.7 grpc-1.19.1_1 +libgrpc.so.8 grpc-1.24.1_1 +libgrpc_cronet.so.8 grpc-1.24.1_1 +libgrpc_unsecure.so.8 grpc-1.24.1_1 libgrpcpp_channelz.so.1 grpc-1.19.1_1 libircclient.so.1 libircclient-1.10_1 libFAudio.so.0 FAudio-19.05_1 @@ -3485,7 +3493,7 @@ libmhash.so.2 mhash-0.9.9.9_1 librlottie.so.0 rlottie-0.0.20160709_1 libfstrm.so.0 fstrm-0.5.0_1 libfreecell-solver.so.0 libfreecell-solver-5.10.0_1 -libknot.so.9 libknot-2.8.2_1 +libknot.so.10 libknot-2.9.0_1 libdnssec.so.7 libknot-2.8.2_1 libzscanner.so.3 libknot-2.8.2_1 libkres.so.9 knot-resolver-4.0.0_1 @@ -3499,3 +3507,14 @@ libgambit.so.4 gambit-4.9.3_1 liblog4cpp.so.5 log4cpp-1.1.3_1 libnuspell.so.2 libnuspell-2.3.0_1 liblog4c.so.3 log4c-1.2.4_1 +libqb.so.0 libqb-1.0.5_1 +libusbguard.so.0 usbguard-0.7.5_1 +libknet.so.1 libknet1-1.11_1 +libdrumstick-file.so.1 drumstick-1.1.2_1 +libdrumstick-alsa.so.1 drumstick-1.1.2_1 +libdrumstick-rt.so.1 drumstick-1.1.2_1 +libnozzle.so.1 libnozzle1-1.11_2 +libmygpo-qt5.so.1 libmygpo-qt-1.1.0_1 +libluv.so.1 libluv-1.30.1.0_1 +libarmadillo.so.9 armadillo-9.700.2_1 +libvarnishapi.so.2 libvarnishapi-6.3.0_1 diff --git a/common/xbps-src/shutils/build_dependencies.sh b/common/xbps-src/shutils/build_dependencies.sh index 6d9d727e0d3..26e24232ad8 100644 --- a/common/xbps-src/shutils/build_dependencies.sh +++ b/common/xbps-src/shutils/build_dependencies.sh @@ -169,7 +169,7 @@ install_pkg_deps() { break fi done - if [[ $found -eq 1 ]]; then + if [[ $found -eq 1 ]] && [[ -z "$cross" ]]; then echo " [host] ${_vpkg}: not found (subpkg, ignored)" else echo " [host] ${_vpkg}: not found" diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh index d258509d878..d0e455471ea 100644 --- a/common/xbps-src/shutils/common.sh +++ b/common/xbps-src/shutils/common.sh @@ -237,7 +237,7 @@ run_pkg_hooks() { unset_package_funcs() { local f - for f in "$(typeset -F)"; do + for f in $(typeset -F); do case "$f" in *_package) unset -f "$f" diff --git a/common/xbps-src/shutils/cross.sh b/common/xbps-src/shutils/cross.sh index a699885e801..0a4fa3028db 100644 --- a/common/xbps-src/shutils/cross.sh +++ b/common/xbps-src/shutils/cross.sh @@ -29,7 +29,7 @@ prepare_cross_sysroot() { [ -z "$cross" -o "$cross" = "" -o -f $statefile ] && return 0 # Check for cross-vpkg-dummy available for the target arch, otherwise build it. - pkg_available 'cross-vpkg-dummy>=0.31_1' $cross + pkg_available 'cross-vpkg-dummy>=0.33_1' $cross if [ $? -eq 0 ]; then $XBPS_LIBEXECDIR/build.sh cross-vpkg-dummy cross-vpkg-dummy pkg $cross init || return $? fi diff --git a/srcpkgs/2bwm/template b/srcpkgs/2bwm/template index a0ca799c977..be62e8594f7 100644 --- a/srcpkgs/2bwm/template +++ b/srcpkgs/2bwm/template @@ -1,6 +1,6 @@ # Template file for '2bwm' pkgname=2bwm -version=0.2 +version=0.3 revision=1 build_style=gnu-makefile makedepends="libxcb-devel xcb-util-keysyms-devel xcb-util-wm-devel xcb-util-xrm-devel" @@ -9,7 +9,7 @@ maintainer="Orphaned " license="ISC" homepage="https://github.com/venam/2bwm" distfiles="https://github.com/venam/${pkgname}/archive/v${version}.tar.gz" -checksum=5d071bdbe6d3b4b79b5462cc1b36afe357030fb70c7e64f88d9c7d541d648439 +checksum=a4889ea4b01b1a3d4a508daa034b9d86676913cbbca1f977858df692a6e2af95 pre_build() { sed -i 's|-Os ||g' Makefile diff --git a/srcpkgs/3proxy/template b/srcpkgs/3proxy/template index 6e0aad41627..6063c616007 100644 --- a/srcpkgs/3proxy/template +++ b/srcpkgs/3proxy/template @@ -1,13 +1,13 @@ # Template file for '3proxy' pkgname=3proxy -version=0.8.12 -revision=2 +version=0.8.13 +revision=1 short_desc="3proxy tiny proxy server" maintainer="iaroki " license="BSD-3-Clause" homepage="https://3proxy.ru" -distfiles="https://github.com/z3APA3A/3proxy/archive/$version.tar.gz" -checksum=c2ad3798b4f0df06cfcc7b49f658304e451d60e4834e2705ef83ddb85a03f849 +distfiles="https://github.com/z3APA3A/3proxy/archive/${version}.tar.gz" +checksum=a6d3cf9dd264315fa6ec848f6fe6c9057db005ce4ca8ed1deb00f6e1c3900f88 do_build() { make -f Makefile.Linux CC=$CC LN=$CC diff --git a/srcpkgs/66-tools/template b/srcpkgs/66-tools/template new file mode 100644 index 00000000000..9c954860c2b --- /dev/null +++ b/srcpkgs/66-tools/template @@ -0,0 +1,33 @@ +# Template file for '66-tools' +pkgname=66-tools +version=0.0.1.0 +revision=1 +wrksrc=${pkgname}-v${version} +build_style=configure +configure_args="--prefix=/usr + --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps + --with-lib=${XBPS_CROSS_BASE}/usr/lib" +hostmakedepends="pkg-config scdoc" +makedepends="oblibs-devel execline-devel skalibs-devel" +short_desc="Small tools and helpers for service scripts execution" +maintainer="mobinmob " +license="ISC" +homepage="http://web.obarun.org/software/index.html" +distfiles="https://framagit.org/Obarun/66-tools/-/archive/v${version}/66-tools-v${version}.tar.gz" +checksum=e3ce0a1de81196ca7e6ab0bee720022b98dabaa7dd01d9c4c1cc98a90cb3a2a7 + +pre_build() { + make man +} + +post_install() { + local i + vlicense COPYING + for i in doc/html/*.html ; do + vdoc $i + done + vdoc README + for i in doc/man/*.{1,5} ; do + vman $i + done +} diff --git a/srcpkgs/66/template b/srcpkgs/66/template index ee21cc063cf..adb86308a14 100644 --- a/srcpkgs/66/template +++ b/srcpkgs/66/template @@ -1,6 +1,6 @@ # Template file for '66' pkgname=66 -version=0.2.0.4 +version=0.2.1.2 revision=1 wrksrc="66-v${version}" build_style=configure @@ -11,13 +11,13 @@ hostmakedepends="pkg-config scdoc" makedepends="oblibs-devel skalibs-devel execline-devel s6-devel s6-rc-devel procps-ng-devel" depends="s6-portable-utils" -short_desc="Helpers tools around s6-rc" +short_desc="Small tools built around s6 and s6-rc programs" maintainer="mobinmob " license="ISC" homepage="http://web.obarun.org/software/" changelog="https://framagit.org/Obarun/66/raw/master/NEWS" distfiles="https://framagit.org/Obarun/66/-/archive/v${version}/66-v${version}.tar.bz2" -checksum=fc6ca90cc12f16d35c8a7a1a181df8d690c72e04a9ecf586f588160528df7ce6 +checksum=9c3430ab291ec83e74faa05634614e1d851e2bc18fe173963d8fe5313c2dd337 conf_files="/etc/66/init /etc/66/init.conf" make_dirs=" diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template new file mode 100644 index 00000000000..c959b006334 --- /dev/null +++ b/srcpkgs/Amass/template @@ -0,0 +1,12 @@ +# Template file for 'Amass' +pkgname=Amass +version=3.1.10 +revision=1 +build_style=go +go_import_path="github.com/OWASP/Amass/..." +short_desc="In-depth Attack Surface Mapping and Asset Discovery" +maintainer="Andrew Benson " +license="Apache-2.0" +homepage="https://www.owasp.org/index.php/OWASP_Amass_Project" +distfiles="https://github.com/OWASP/Amass/archive/v${version}.tar.gz" +checksum=018a910c18df4510a6b73137177c05e98e9e01a0828ccd07285b83884fc24456 diff --git a/srcpkgs/AppStream/template b/srcpkgs/AppStream/template index f93ff78e3a0..3df0d5fa923 100644 --- a/srcpkgs/AppStream/template +++ b/srcpkgs/AppStream/template @@ -9,7 +9,7 @@ hostmakedepends="docbook-xsl glib-devel gperf libxslt pkg-config qt5-host-tools" makedepends="libglib-devel libxml2-devel libyaml-devel qt5-devel" short_desc="Tools and libraries to work with AppStream metadata" -maintainer="maxice8 " +maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://github.com/ximion/appstream" changelog="https://raw.githubusercontent.com/ximion/appstream/master/NEWS" diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template index 9a36eb6b1fe..69a36bfeeb1 100644 --- a/srcpkgs/Bear/template +++ b/srcpkgs/Bear/template @@ -1,14 +1,14 @@ # Template file for 'Bear' pkgname=Bear -version=2.4.1 +version=2.4.2 revision=1 build_style=cmake -makedepends="bash-completion" -depends="python" +hostmakedepends="python3" +depends="python3" short_desc="Tool that generates a compilation database for clang tooling" maintainer="Alain Kalker " license="GPL-3.0-or-later" homepage="https://github.com/rizsotto/Bear" changelog="https://raw.githubusercontent.com/rizsotto/Bear/master/ChangeLog.md" distfiles="https://github.com/rizsotto/Bear/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=41e118471f11d91147490561b3bc52228a9ffc2a293e8e03717d674a0e312a9c +checksum=e80c0d622a8192a1ec0c0efa139e5767c6c4b1defe1c75fc99cf680c6d1816c0 diff --git a/srcpkgs/CImg/template b/srcpkgs/CImg/template index b8c994a9b52..12b0b65c0b7 100644 --- a/srcpkgs/CImg/template +++ b/srcpkgs/CImg/template @@ -1,6 +1,6 @@ # Template file for 'CImg' pkgname=CImg -version=2.6.6 +version=2.7.4 revision=1 archs=noarch wrksrc="CImg-v.${version}" @@ -10,7 +10,7 @@ maintainer="Robert Lowry " license="CECILL-2.0, CECILL-C" homepage="http://cimg.eu" distfiles="https://framagit.org/dtschump/CImg/-/archive/v.${version}/CImg-v.${version}.tar.bz2" -checksum=45c22113418bf53a6c3b3b990a4283aff9eb96bd36895622ad27b367b632430d +checksum=f2897f26b20095a1f826c7f4baa9224a9a13727d4de93acd8f3fbe559214307a do_install() { vlicense Licence_CeCILL_V2-en.txt @@ -19,4 +19,3 @@ do_install() { vmkdir usr/include/CImg vcopy "plugins/*.h" usr/include/CImg } - diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template index 686b7a88a70..aa34774c3bc 100644 --- a/srcpkgs/CLion/template +++ b/srcpkgs/CLion/template @@ -1,6 +1,6 @@ # Template file for 'CLion' pkgname=CLion -version=2019.2 +version=2019.2.4 revision=1 archs="i686 x86_64" wrksrc="clion-${version}" @@ -10,7 +10,7 @@ maintainer="Anton Afanasyev " license="custom:Commercial" homepage="https://www.jetbrains.com/clion" distfiles="https://download.jetbrains.com/cpp/CLion-${version}.tar.gz" -checksum=e2d453264c2fb6dcc58e976fd5660157afd62ba5c0ee64f829407c772f7e1dcf +checksum=2d3b1820eef6d60aab4b9a12c7357280de6606f72cdc1c72d6449e3676f23030 repository=nonfree restricted=yes nopie=yes @@ -44,14 +44,14 @@ post_extract() { do_install() { TARGET_PATH="usr/lib/${pkgname}" - LICENSE_PATH="usr/share/licenses/${pkgname}" vmkdir usr/bin vmkdir ${TARGET_PATH} - vmkdir ${LICENSE_PATH} - # Ideally vlicense should be called here, but vcopy is more terse. - vcopy license/* ${LICENSE_PATH} + local i + for i in license/* ; do + vlicense $i + done vcopy bin ${TARGET_PATH} vcopy help ${TARGET_PATH} diff --git a/srcpkgs/Clight/template b/srcpkgs/Clight/template index 84d98307755..9919d510abb 100644 --- a/srcpkgs/Clight/template +++ b/srcpkgs/Clight/template @@ -1,7 +1,7 @@ # Template file for 'Clight' pkgname=Clight version=3.1 -revision=1 +revision=2 build_style=cmake hostmakedepends="pkg-config" makedepends="popt-devel gsl-devel libconfig-devel elogind-devel bash-completion dbus-devel" diff --git a/srcpkgs/Clightd/template b/srcpkgs/Clightd/template index 241cf60cd05..6779220bfcb 100644 --- a/srcpkgs/Clightd/template +++ b/srcpkgs/Clightd/template @@ -1,7 +1,7 @@ # Template file for 'Clightd' pkgname=Clightd version=3.4 -revision=1 +revision=2 build_style=cmake cmake_builddir=build configure_args="-DENABLE_DDC=1 -DENABLE_GAMMA=1 -DENABLE_DPMS=1" diff --git a/srcpkgs/ClusterSSH/template b/srcpkgs/ClusterSSH/template index a56c72440a5..ade9b7fefa0 100644 --- a/srcpkgs/ClusterSSH/template +++ b/srcpkgs/ClusterSSH/template @@ -1,10 +1,9 @@ # Template file for 'ClusterSSH' pkgname=ClusterSSH -version=4.13.2.02 +version=4.14 revision=1 -_distver="${version%.*}_${version##*.}" archs=noarch -wrksrc="clusterssh-${_distver}" +wrksrc="clusterssh-${version}" build_style=perl-ModuleBuild hostmakedepends="xterm openssh perl-CPAN-Changes perl-Module-Build perl-Try-Tiny perl-Tk @@ -18,8 +17,8 @@ maintainer="Enguerrand de Rochefort " license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="https://github.com/duncs/clusterssh" changelog="https://raw.githubusercontent.com/duncs/clusterssh/master/Changes" -distfiles="https://github.com/duncs/clusterssh/archive/v${_distver}.tar.gz" -checksum=5c03b706267ddf0b84cf1f1cd6756344859a90a20e3dcc3018820fe142146780 +distfiles="https://github.com/duncs/clusterssh/archive/v${version}.tar.gz" +checksum=179ac8a7c27ec9674d2aa3f65ebb097b4945646c71f83f52fe2b8b24c21cd629 pre_check() { touch README diff --git a/srcpkgs/ClusterSSH/update b/srcpkgs/ClusterSSH/update deleted file mode 100644 index 45c768a1027..00000000000 --- a/srcpkgs/ClusterSSH/update +++ /dev/null @@ -1 +0,0 @@ -pattern="clusterssh/archive/[-_a-z]+\K[-_.\d]+(?=\.tar\.gz)" diff --git a/srcpkgs/CopyQ/template b/srcpkgs/CopyQ/template index 58743ca47b1..7eef67931e3 100644 --- a/srcpkgs/CopyQ/template +++ b/srcpkgs/CopyQ/template @@ -1,6 +1,6 @@ # Template file for 'CopyQ' pkgname=CopyQ -version=3.9.0 +version=3.9.2 revision=1 build_style=cmake hostmakedepends="qt5-tools-devel" @@ -12,4 +12,4 @@ license="GPL-3.0-or-later" homepage="https://hluk.github.io/CopyQ/" changelog="https://raw.githubusercontent.com/hluk/CopyQ/master/CHANGES" distfiles="https://github.com/hluk/CopyQ/archive/v${version}.tar.gz" -checksum=de2e64451464dd5af661fd56bb8d5c6a9cdbbd2f66249ae0404e61c1c7d9916e +checksum=8d526c7b0ab7a2e5ae91ef68df104277217c6679b15a0f100ae2de50247c993b diff --git a/srcpkgs/Electron-Cash/template b/srcpkgs/Electron-Cash/template new file mode 100644 index 00000000000..2db05c94832 --- /dev/null +++ b/srcpkgs/Electron-Cash/template @@ -0,0 +1,25 @@ +# Template file for 'Electron-Cash' +pkgname=Electron-Cash +version=4.0.10 +revision=1 +archs=noarch +build_style=python3-module +pycompile_module="electroncash electroncash_gui electroncash_plugins" +hostmakedepends="python3-setuptools python3-PyQt5-devel-tools" +depends="python3-PyQt5 python3-PyQt5-svg + python3-jsonrpclib python3-protobuf + python3-pyaes python3-pycryptodome libbitcoin-secp256k1 libzbar + python3-dnspython python3-requests python3-qrcode python3-pysocks" +short_desc="Lightweight Bitcoin Cash client" +maintainer="Cameron Nemo " +license="MIT" +homepage="https://electroncash.org" +distfiles="https://electroncash.org/downloads/${version}/win-linux/Electron-Cash-${version}.tar.gz" +checksum=48270e12956a2f4ef4d2b0cb60611e47f136b734a3741dab176542a32ae59ee5 + +post_install() { + for lib in zbar secp256k1; do + rm -f -- "${DESTDIR}/usr/lib/python${py3_ver}/site-packages/electroncash/lib${lib}.so.0" + done + vlicense LICENCE +} diff --git a/srcpkgs/EternalTerminal/template b/srcpkgs/EternalTerminal/template index 8957865792d..875537de451 100644 --- a/srcpkgs/EternalTerminal/template +++ b/srcpkgs/EternalTerminal/template @@ -1,7 +1,7 @@ # Template file for 'EternalTerminal' pkgname=EternalTerminal -version=5.1.9 -revision=2 +version=5.1.10 +revision=1 wrksrc="${pkgname}-et-v${version}" build_style=cmake hostmakedepends="protobuf" @@ -12,7 +12,7 @@ maintainer="Nathan Owens " license="Apache-2.0" homepage="https://mistertea.github.io/EternalTerminal" distfiles="https://github.com/MisterTea/EternalTerminal/archive/et-v${version}.tar.gz" -checksum=37b9bd33ed3edc88cedf2c4168246e23818ccd4e08731d0698d8d133dd3b1147 +checksum=cfe368b3b79d5d07d59ee0437d6a7b838e6162ae85ffc71ca7988b37b46a477b system_accounts="_eternal" diff --git a/srcpkgs/FeatherPad/template b/srcpkgs/FeatherPad/template index 9ac45729814..ddfc89c6300 100644 --- a/srcpkgs/FeatherPad/template +++ b/srcpkgs/FeatherPad/template @@ -1,16 +1,16 @@ # Template file for 'FeatherPad' pkgname=FeatherPad -version=0.9.4 +version=0.11.1 revision=1 build_style=qmake hostmakedepends="qt5-qmake qt5-tools-devel" -makedepends="libX11-devel libXext-devel qt5-x11extras-devel qt5-svg-devel" +makedepends="libX11-devel libXext-devel qt5-x11extras-devel qt5-svg-devel hunspell-devel" short_desc="Lightweight Qt5 plain-text editor for Linux" maintainer="Young Jin Park " license="GPL-3.0-or-later" homepage="https://github.com/tsujan/FeatherPad" distfiles="https://github.com/tsujan/FeatherPad/archive/V${version}.tar.gz" -checksum=6833ebc541550c0cac4c5e47f0870eb0209f0d779dfeef7273b6287896d46ef6 +checksum=a9cb943587bb0065c7cd7e42b5b396d633d4bab6c531621b4f85b050e0ccd9db if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-x11extras-devel qt5-svg-devel" diff --git a/srcpkgs/FeedReader/template b/srcpkgs/FeedReader/template index 134f2a39144..55d74e6a51d 100644 --- a/srcpkgs/FeedReader/template +++ b/srcpkgs/FeedReader/template @@ -1,6 +1,6 @@ # Template file for 'FeedReader' pkgname=FeedReader -version=2.8.2 +version=2.10.0 revision=1 build_style=meson hostmakedepends="glib-devel intltool itstool pkg-config vala" @@ -12,7 +12,7 @@ maintainer="Enno Boland " license="GPL-3.0-only" homepage="https://jangernert.github.io/FeedReader/" distfiles="https://github.com/jangernert/${pkgname}/archive/v${version}.tar.gz" -checksum=40ec53a5bdb745909b486092fb0c91686b2f1a76fce5416514f62c3f3617f612 +checksum=fd10d2d2dc9c20c259d672634e5e100d10f0fb730e0687e1b3c2423224901a2c nocross="SQLite.vala:131.12-131.36: error: The name copy does not exist in the context of Sqlite.Value" case "$XBPS_TARGET_MACHINE" in diff --git a/srcpkgs/GoLand/template b/srcpkgs/GoLand/template index cebfb255168..70a9d20c60e 100644 --- a/srcpkgs/GoLand/template +++ b/srcpkgs/GoLand/template @@ -1,6 +1,6 @@ # Template file for 'GoLand' pkgname=GoLand -version=2019.1.3 +version=2019.2.3 revision=1 archs="i686 x86_64" depends="virtual?java-environment" @@ -9,7 +9,7 @@ maintainer="Anton Afanasyev " license="custom:Commercial" homepage="https://www.jetbrains.com/go" distfiles="https://download.jetbrains.com/go/goland-${version}.tar.gz" -checksum=b0e22be860ead904c88595f005d5fe2b0fea310c15a1d8551372b5c336d1895b +checksum=d65d5fc57798652be47d6a540c41da3cf344c0ebabc357c0807c6999acff2b7d repository=nonfree restricted=yes nopie=yes @@ -37,14 +37,14 @@ post_extract() { do_install() { TARGET_PATH="usr/lib/${pkgname}" - LICENSE_PATH="usr/share/licenses/${pkgname}" vmkdir usr/bin vmkdir ${TARGET_PATH} - vmkdir ${LICENSE_PATH} - # Ideally vlicense should be called here, but vcopy is more terse. - vcopy license/* ${LICENSE_PATH} + local i + for i in license/* ; do + vlicense $i + done vcopy bin ${TARGET_PATH} vcopy help ${TARGET_PATH} diff --git a/srcpkgs/GraphicsMagick/template b/srcpkgs/GraphicsMagick/template index 5bdcedd320d..20df5e5c42a 100644 --- a/srcpkgs/GraphicsMagick/template +++ b/srcpkgs/GraphicsMagick/template @@ -1,6 +1,6 @@ # Template file for 'GraphicsMagick' pkgname=GraphicsMagick -version=1.3.32 +version=1.3.33 revision=1 build_style=gnu-configure configure_args="--with-quantum-depth=16 --with-gs-font-dir=/usr/share/fonts/Type1 @@ -17,7 +17,7 @@ license="MIT" homepage="http://www.graphicsmagick.org/" changelog="http://www.graphicsmagick.org/NEWS.html" distfiles="${SOURCEFORGE_SITE}/graphicsmagick/graphicsmagick/${version}/${pkgname}-${version}.tar.gz" -checksum=03919288e14927d8cace1e2e95578bef171a3c2cdd88ac563f25c3d57f14ff2e +checksum=00ea0df7c78c903cce325f402429bcd3924168cf39277f743a0641d47c411ee8 keep_libtool_archives=yes post_install() { diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template index bd15d7fd519..5951e1e5a69 100644 --- a/srcpkgs/ImageMagick/template +++ b/srcpkgs/ImageMagick/template @@ -1,7 +1,7 @@ # Template file for 'ImageMagick' pkgname=ImageMagick _majorver=7.0.8 -_patchver=59 +_patchver=68 version="${_majorver}.${_patchver}" revision=1 wrksrc="${pkgname}-${_majorver}-${_patchver}" @@ -16,12 +16,12 @@ makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel libwmf-devel ocl-icd-devel pango-devel" short_desc="Package for display and interactive manipulation of images" -maintainer="Orphaned " +maintainer="Johannes " license="ImageMagick" homepage="https://www.imagemagick.org/" changelog="https://imagemagick.org/script/changelog.php" distfiles="https://github.com/ImageMagick/ImageMagick/archive/${_majorver}-${_patchver}.tar.gz" -checksum=238ee17196fcb80bb58485910aaefc12d48f99e4043c2a28f06ff9588161c4e3 +checksum=c3aa886789b36d3fe1f6f99fc1a32bbbf26d4ce51f485b32c3a4b85e176a53c9 subpackages="libmagick libmagick-devel" diff --git a/srcpkgs/ImageMagick6/template b/srcpkgs/ImageMagick6/template index 67747ba52db..75d65b49fb1 100644 --- a/srcpkgs/ImageMagick6/template +++ b/srcpkgs/ImageMagick6/template @@ -1,7 +1,7 @@ # Template file for 'ImageMagick6' pkgname=ImageMagick6 _majorver=6.9.10 -_patchver=59 +_patchver=68 version="${_majorver}.${_patchver}" revision=1 wrksrc="${pkgname}-${_majorver}-${_patchver}" @@ -20,7 +20,7 @@ maintainer="Johannes " license="ImageMagick" homepage="https://www.imagemagick.org/" distfiles="https://github.com/ImageMagick/ImageMagick6/archive/${_majorver}-${_patchver}.tar.gz" -checksum=eb4e312e2d576c61f0bf4b43eea9cc77820e0ecacb8a0264e5eb708dfa101493 +checksum=2caa3d8d1f65e733de30d1f537e57991ff3adb3edb5b60afa9cd0f6e0a20945f keep_libtool_archives=yes conf_files="/etc/ImageMagick-${_majorver%%.*}/*.xml" diff --git a/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch new file mode 100644 index 00000000000..b7304474f77 --- /dev/null +++ b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch @@ -0,0 +1,93 @@ +Imported from https://github.com/LuaJIT/LuaJIT/pull/486. + +This fixes crashes on ppc-musl, as musl only supports secureplt. + +--- src/lj_dispatch.c ++++ src/lj_dispatch.c +@@ -56,6 +56,18 @@ static const ASMFunction dispatch_got[] = { + #undef GOTFUNC + #endif + ++#if LJ_TARGET_PPC && (LJ_ARCH_BITS == 32) ++#include ++LJ_FUNCA_NORET void LJ_FASTCALL lj_ffh_coroutine_wrap_err(lua_State *L, ++ lua_State *co); ++ ++#define GOTFUNC(name) (ASMFunction)name, ++static const ASMFunction dispatch_got[] = { ++ GOTDEF(GOTFUNC) ++}; ++#undef GOTFUNC ++#endif ++ + /* Initialize instruction dispatch table and hot counters. */ + void lj_dispatch_init(GG_State *GG) + { +@@ -77,6 +89,9 @@ void lj_dispatch_init(GG_State *GG) + #if LJ_TARGET_MIPS + memcpy(GG->got, dispatch_got, LJ_GOT__MAX*sizeof(ASMFunction *)); + #endif ++#if LJ_TARGET_PPC && (LJ_ARCH_BITS == 32) ++ memcpy(GG->got, dispatch_got, LJ_GOT__MAX*4); ++#endif + } + + #if LJ_HASJIT +--- src/lj_dispatch.h ++++ src/lj_dispatch.h +@@ -66,6 +66,21 @@ GOTDEF(GOTENUM) + }; + #endif + ++#if LJ_TARGET_PPC && (LJ_ARCH_BITS == 32) ++/* Need our own global offset table for the dreaded MIPS calling conventions. */ ++#define GOTDEF(_) \ ++ _(floor) _(ceil) _(trunc) _(log) _(log10) _(exp) _(sin) _(cos) _(tan) \ ++ _(asin) _(acos) _(atan) _(sinh) _(cosh) _(tanh) _(frexp) _(modf) _(atan2) \ ++ _(pow) _(fmod) _(ldexp) _(sqrt) ++ ++enum { ++#define GOTENUM(name) LJ_GOT_##name, ++GOTDEF(GOTENUM) ++#undef GOTENUM ++ LJ_GOT__MAX ++}; ++#endif ++ + /* Type of hot counter. Must match the code in the assembler VM. */ + /* 16 bits are sufficient. Only 0.0015% overhead with maximum slot penalty. */ + typedef uint16_t HotCount; +@@ -89,7 +104,7 @@ typedef uint16_t HotCount; + typedef struct GG_State { + lua_State L; /* Main thread. */ + global_State g; /* Global state. */ +-#if LJ_TARGET_MIPS ++#if LJ_TARGET_MIPS || (LJ_TARGET_PPC && (LJ_ARCH_BITS == 32)) + ASMFunction got[LJ_GOT__MAX]; /* Global offset table. */ + #endif + #if LJ_HASJIT +--- src/vm_ppc.dasc ++++ src/vm_ppc.dasc +@@ -59,7 +59,12 @@ + |.define ENV_OFS, 8 + |.endif + |.else // No TOC. +-|.macro blex, target; bl extern target@plt; .endmacro ++|.macro blex, target ++| lwz TMP0, DISPATCH_GOT(target)(DISPATCH) ++| mtctr TMP0 ++| bctrl ++| //bl extern target@plt ++|.endmacro + |.macro .toc, a, b; .endmacro + |.endif + |.macro .tocenv, a, b; .if TOCENV; a, b; .endif; .endmacro +@@ -448,6 +453,8 @@ + |// Assumes DISPATCH is relative to GL. + #define DISPATCH_GL(field) (GG_DISP2G + (int)offsetof(global_State, field)) + #define DISPATCH_J(field) (GG_DISP2J + (int)offsetof(jit_State, field)) ++#define GG_DISP2GOT (GG_OFS(got) - GG_OFS(dispatch)) ++#define DISPATCH_GOT(name) (GG_DISP2GOT + 4*LJ_GOT_##name) + | + #define PC2PROTO(field) ((int)offsetof(GCproto, field)-(int)sizeof(GCproto)) + | diff --git a/srcpkgs/LuaJIT/patches/add-ppc64-support.patch b/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch similarity index 100% rename from srcpkgs/LuaJIT/patches/add-ppc64-support.patch rename to srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch diff --git a/srcpkgs/LuaJIT/patches/fix-vm-jit-ppc64.patch b/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch similarity index 100% rename from srcpkgs/LuaJIT/patches/fix-vm-jit-ppc64.patch rename to srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch diff --git a/srcpkgs/LuaJIT/template b/srcpkgs/LuaJIT/template index b204c21811f..313404defe1 100644 --- a/srcpkgs/LuaJIT/template +++ b/srcpkgs/LuaJIT/template @@ -47,6 +47,23 @@ if [ "$CROSS_BUILD" ]; then esac fi +# the ppc64 patchset subtly breaks ppc, needs investigation; for +# now apply patches conditionally, separately for ppc64 and ppc +post_patch() { + local patchdir + + case "$XBPS_TARGET_MACHINE" in + ppc64*) patchdir="ppc64";; + ppc*) patchdir="ppc";; + *) return;; + esac + + for i in ${FILESDIR}/patches/${patchdir}/*.patch; do + msg_normal "patching: $i\n" + patch -sNp0 -i ${i} + done +} + do_build() { local _cflags=$CFLAGS local _ldflags=$LDFLAGS diff --git a/srcpkgs/MEGAcmd/patches/include.am.patch b/srcpkgs/MEGAcmd/patches/include.am.patch index 45e1a9fcdd5..66a0d7287d4 100644 --- a/srcpkgs/MEGAcmd/patches/include.am.patch +++ b/srcpkgs/MEGAcmd/patches/include.am.patch @@ -1,20 +1,12 @@ ---- src/include.am.orig 2017-12-01 23:56:36.199044786 +0100 -+++ src/include.am 2017-12-01 23:56:54.073045467 +0100 -@@ -7,7 +7,7 @@ +--- src/include.am 2019-09-15 11:19:21.139430520 +0300 ++++ - 2019-09-15 11:20:24.234994345 +0300 +@@ -7,9 +7,9 @@ MEGACMD = mega-cmd mega-exec mega-cmd-server bin_PROGRAMS += $(MEGACMD) -$(MEGACMD): $(MEGA_LIBS) +$(MEGACMD): - noinst_HEADERS += src/comunicationsmanager.h src/configurationmanager.h src/megacmd.h src/megacmdlogger.h src/megacmdsandbox.h src/megacmdutils.h src/listeners.h src/megacmdexecuter.h src/megacmdversion.h src/megacmdplatform.h src/comunicationsmanagerportsockets.h - megacmdcompletiondir = $(sysconfdir)/bash_completion.d/ - megacmdcompletion_DATA = src/client/megacmd_completion.sh ---- src/include.am 2018-12-06 14:42:18.308589868 +0100 -+++ - 2018-12-06 14:45:15.075785487 +0100 -@@ -9,7 +9,7 @@ - bin_PROGRAMS += $(MEGACMD) - $(MEGACMD): - noinst_HEADERS += src/comunicationsmanager.h src/configurationmanager.h src/megacmd.h src/megacmdlogger.h src/megacmdsandbox.h src/megacmdutils.h src/listeners.h src/megacmdexecuter.h src/megacmdversion.h src/megacmdplatform.h src/comunicationsmanagerportsockets.h + noinst_HEADERS += src/comunicationsmanager.h src/configurationmanager.h src/megacmd.h src/megacmdlogger.h src/megacmdsandbox.h src/megacmdutils.h src/megacmdcommonutils.h src/listeners.h src/megacmdexecuter.h src/megacmdversion.h src/megacmdplatform.h src/comunicationsmanagerportsockets.h -megacmdcompletiondir = $(sysconfdir)/bash_completion.d/ +megacmdcompletiondir = $(datarootdir)/bash-completion/completions megacmdcompletion_DATA = src/client/megacmd_completion.sh diff --git a/srcpkgs/MEGAcmd/patches/megacmd-sdk36.diff b/srcpkgs/MEGAcmd/patches/megacmd-sdk36.diff new file mode 100644 index 00000000000..a30a142156e --- /dev/null +++ b/srcpkgs/MEGAcmd/patches/megacmd-sdk36.diff @@ -0,0 +1,381 @@ +--- src/comunicationsmanagerfilesockets.cpp ++++ src/comunicationsmanagerfilesockets.cpp +@@ -134,14 +134,13 @@ int ComunicationsManagerFileSockets::create_new_socket(int *sockId) + ComunicationsManagerFileSockets::ComunicationsManagerFileSockets() + { + count = 0; +- mtx = new MegaMutex(); +- informerMutex = new MegaMutex(false); ++ mtx = new std::recursive_mutex(); ++ informerMutex = new std::recursive_mutex(); + initialize(); + } + + int ComunicationsManagerFileSockets::initialize() + { +- mtx->init(false); + + MegaFileSystemAccess *fsAccess = new MegaFileSystemAccess(); + char csocketsFolder[34]; // enough to hold all numbers up to 64-bits +@@ -394,7 +393,7 @@ void ComunicationsManagerFileSockets::sendPartialOutput(CmdPetition *inf, OUTSTR + + int ComunicationsManagerFileSockets::informStateListener(CmdPetition *inf, string &s) + { +- MutexGuard g(*informerMutex); ++ std::lock_guard g(*informerMutex); + LOG_verbose << "Inform State Listener: Output to write in socket " << ((CmdPetitionPosixSockets *)inf)->outSocket << ": <<" << s << ">>"; + + sockaddr_in cliAddr; +--- src/comunicationsmanagerfilesockets.h ++++ src/comunicationsmanagerfilesockets.h +@@ -58,8 +58,8 @@ private: + + // to get next socket id + int count; +- mega::MegaMutex *mtx; +- mega::MegaMutex *informerMutex; ++ std::recursive_mutex *mtx; ++ std::recursive_mutex *informerMutex; + + /** + * @brief create_new_socket +--- src/comunicationsmanagerportsockets.cpp ++++ src/comunicationsmanagerportsockets.cpp +@@ -161,13 +161,12 @@ SOCKET ComunicationsManagerPortSockets::create_new_socket(int *sockId) + ComunicationsManagerPortSockets::ComunicationsManagerPortSockets() + { + count = 0; +- mtx = new MegaMutex(); ++ mtx = new std::recursive_mutex(); + initialize(); + } + + int ComunicationsManagerPortSockets::initialize() + { +- mtx->init(false); + #if _WIN32 + WORD wVersionRequested; + WSADATA wsaData; +--- src/comunicationsmanagerportsockets.h ++++ src/comunicationsmanagerportsockets.h +@@ -69,7 +69,7 @@ private: + + // to get next socket id + int count; +- mega::MegaMutex *mtx; ++ std::recursive_mutex *mtx; + + /** + * @brief create_new_socket +--- src/listeners.cpp ++++ src/listeners.cpp +@@ -902,7 +902,6 @@ MegaCmdGlobalTransferListener::MegaCmdGlobalTransferListener(MegaApi *megaApi, M + this->megaApi = megaApi; + this->sandboxCMD = sandboxCMD; + this->listener = parent; +- completedTransfersMutex.init(false); + }; + + void MegaCmdGlobalTransferListener::onTransferFinish(MegaApi* api, MegaTransfer *transfer, MegaError* error) +--- src/listeners.h ++++ src/listeners.h +@@ -178,7 +178,7 @@ private: + static const int MAXCOMPLETEDTRANSFERSBUFFER; + + public: +- mega::MegaMutex completedTransfersMutex; ++ std::recursive_mutex completedTransfersMutex; + std::deque completedTransfers; + std::map completedPathsByHandle; + public: +--- src/megacmd.cpp ++++ src/megacmd.cpp +@@ -103,11 +103,11 @@ MegaApi *api; + std::queue apiFolders; + std::vector occupiedapiFolders; + MegaSemaphore semaphoreapiFolders; +-MegaMutex mutexapiFolders; ++std::recursive_mutex mutexapiFolders; + + MegaCMDLogger *loggerCMD; + +-MegaMutex mutexEndedPetitionThreads; ++std::recursive_mutex mutexEndedPetitionThreads; + std::vector petitionThreads; + std::vector endedPetitionThreads; + MegaThread *threadRetryConnections; +@@ -194,7 +194,7 @@ static prompttype prompt = COMMAND; + // local console + Console* console; + +-MegaMutex mutexHistory; ++std::recursive_mutex mutexHistory; + + map threadline; + +@@ -4411,9 +4411,7 @@ int main(int argc, char* argv[]) + loggerCMD->setCmdLoggerLevel(MegaApi::LOG_LEVEL_MAX); + } + +- mutexHistory.init(false); + +- mutexEndedPetitionThreads.init(false); + + ConfigurationManager::loadConfiguration(( argc > 1 ) && debug); + if (!ConfigurationManager::lockExecution() && !skiplockcheck) +@@ -4476,7 +4474,6 @@ int main(int argc, char* argv[]) + semaphoreClients.release(); + } + +- mutexapiFolders.init(false); + + LOG_debug << "Language set to: " << localecode; + +--- src/megacmdexecuter.cpp ++++ src/megacmdexecuter.cpp +@@ -124,12 +124,6 @@ MegaCmdExecuter::MegaCmdExecuter(MegaApi *api, MegaCMDLogger *loggerCMD, MegaCmd + api->addTransferListener(globalTransferListener); + cwd = UNDEF; + fsAccessCMD = new MegaFileSystemAccess(); +- mtxSyncMap.init(false); +- mtxWebDavLocations.init(false); +- mtxFtpLocations.init(false); +-#ifdef ENABLE_BACKUPS +- mtxBackupsMap.init(true); +-#endif + session = NULL; + } + +--- src/megacmdexecuter.h ++++ src/megacmdexecuter.h +@@ -33,12 +33,12 @@ private: + MegaCMDLogger *loggerCMD; + MegaCmdSandbox *sandboxCMD; + MegaCmdGlobalTransferListener *globalTransferListener; +- mega::MegaMutex mtxSyncMap; +- mega::MegaMutex mtxWebDavLocations; //TODO: destroy these two +- mega::MegaMutex mtxFtpLocations; ++ std::recursive_mutex mtxSyncMap; ++ std::recursive_mutex mtxWebDavLocations; //TODO: destroy these two ++ std::recursive_mutex mtxFtpLocations; + + #ifdef ENABLE_BACKUPS +- mega::MegaMutex mtxBackupsMap; ++ std::recursive_mutex mtxBackupsMap; + #endif + + // login/signup e-mail address +--- src/megacmdlogger.cpp ++++ src/megacmdlogger.cpp +@@ -38,7 +38,7 @@ using namespace std; + using namespace mega; + + // different outstreams for every thread. to gather all the output data +-MUTEX_CLASS threadLookups(false); ++std::mutex threadLookups; + map outstreams; + map threadLogLevel; + map threadoutCode; +@@ -50,7 +50,7 @@ LoggedStream LCOUT(&COUT); + + LoggedStream &getCurrentOut() + { +- MutexGuard g(threadLookups); ++ std::lock_guard g(threadLookups); + uint64_t currentThread = MegaThread::currentThreadId(); + if (outstreams.find(currentThread) == outstreams.end()) + { +@@ -71,7 +71,7 @@ bool interactiveThread() + + unsigned long long currentThread = MegaThread::currentThreadId(); + +- MutexGuard g(threadLookups); ++ std::lock_guard g(threadLookups); + if (outstreams.find(currentThread) == outstreams.end()) + { + return true; +@@ -86,7 +86,7 @@ int getCurrentOutCode() + { + unsigned long long currentThread = MegaThread::currentThreadId(); + +- MutexGuard g(threadLookups); ++ std::lock_guard g(threadLookups); + if (threadoutCode.find(currentThread) == threadoutCode.end()) + { + return 0; //default OK +@@ -102,7 +102,7 @@ CmdPetition * getCurrentPetition() + { + unsigned long long currentThread = MegaThread::currentThreadId(); + +- MutexGuard g(threadLookups); ++ std::lock_guard g(threadLookups); + if (threadpetition.find(currentThread) == threadpetition.end()) + { + return NULL; +@@ -117,7 +117,7 @@ int getCurrentThreadLogLevel() + { + unsigned long long currentThread = MegaThread::currentThreadId(); + +- MutexGuard g(threadLookups); ++ std::lock_guard g(threadLookups); + if (threadLogLevel.find(currentThread) == threadLogLevel.end()) + { + return -1; +@@ -132,7 +132,7 @@ bool getCurrentThreadIsCmdShell() + { + unsigned long long currentThread = MegaThread::currentThreadId(); + +- MutexGuard g(threadLookups); ++ std::lock_guard g(threadLookups); + if (threadIsCmdShell.find(currentThread) == threadIsCmdShell.end()) + { + return false; //default not +@@ -146,31 +146,31 @@ bool getCurrentThreadIsCmdShell() + + void setCurrentThreadLogLevel(int level) + { +- MutexGuard g(threadLookups); ++ std::lock_guard g(threadLookups); + threadLogLevel[MegaThread::currentThreadId()] = level; + } + + void setCurrentThreadOutStream(LoggedStream *s) + { +- MutexGuard g(threadLookups); ++ std::lock_guard g(threadLookups); + outstreams[MegaThread::currentThreadId()] = s; + } + + void setCurrentThreadIsCmdShell(bool isit) + { +- MutexGuard g(threadLookups); ++ std::lock_guard g(threadLookups); + threadIsCmdShell[MegaThread::currentThreadId()] = isit; + } + + void setCurrentOutCode(int outCode) + { +- MutexGuard g(threadLookups); ++ std::lock_guard g(threadLookups); + threadoutCode[MegaThread::currentThreadId()] = outCode; + } + + void setCurrentPetition(CmdPetition *petition) + { +- MutexGuard g(threadLookups); ++ std::lock_guard g(threadLookups); + threadpetition[MegaThread::currentThreadId()] = petition; + } + +@@ -179,7 +179,7 @@ MegaCMDLogger::MegaCMDLogger() + { + this->output = &LCOUT; + this->apiLoggerLevel = MegaApi::LOG_LEVEL_ERROR; +- this->outputmutex = new MegaMutex(false); ++ this->outputmutex = new std::recursive_mutex; + } + + MegaCMDLogger::~MegaCMDLogger() +@@ -199,7 +199,7 @@ void MegaCMDLogger::log(const char *time, int loglevel, const char *source, cons + if (loglevel <= cmdLoggerLevel) + { + #ifdef _WIN32 +- MutexGuard g(*outputmutex); ++ std::lock_guard g(*outputmutex); + int oldmode; + oldmode = _setmode(_fileno(stdout), _O_U8TEXT); + *output << "[" << SimpleLogger::toStr(LogLevel(loglevel)) << ": " << time << "] " << message << endl; +@@ -233,7 +233,7 @@ void MegaCMDLogger::log(const char *time, int loglevel, const char *source, cons + return; + } + #ifdef _WIN32 +- MutexGuard g(*outputmutex); ++ std::lock_guard g(*outputmutex); + int oldmode; + oldmode = _setmode(_fileno(stdout), _O_U8TEXT); + *output << "[API:" << SimpleLogger::toStr(LogLevel(loglevel)) << ": " << time << "] " << message << endl; +--- src/megacmdlogger.h ++++ src/megacmdlogger.h +@@ -112,7 +112,7 @@ private: + int apiLoggerLevel; + int cmdLoggerLevel; + LoggedStream * output; +- mega::MegaMutex *outputmutex; ++ std::recursive_mutex *outputmutex; + + public: + MegaCMDLogger(); +--- src/megacmdshell/megacmdshell.cpp ++++ src/megacmdshell/megacmdshell.cpp +@@ -199,7 +199,7 @@ bool confirmingcancellink = false; + // communications with megacmdserver: + MegaCmdShellCommunications *comms; + +-MUTEX_CLASS mutexPrompt(false); ++std::mutex mutexPrompt; + + void printWelcomeMsg(unsigned int width = 0); + +@@ -627,7 +627,7 @@ void install_rl_handler(const char *theprompt) + + void changeprompt(const char *newprompt, bool redisplay) + { +- MutexGuard g(mutexPrompt); ++ std::lock_guard g(mutexPrompt); + + if (*dynamicprompt) + { +--- src/megacmdshell/megacmdshellcommunications.cpp ++++ src/megacmdshell/megacmdshellcommunications.cpp +@@ -80,7 +80,7 @@ bool MegaCmdShellCommunications::stopListener; + bool MegaCmdShellCommunications::updating; + ::mega::Thread *MegaCmdShellCommunications::listenerThread; + SOCKET MegaCmdShellCommunications::newsockfd = INVALID_SOCKET; +-MegaMutex MegaCmdShellCommunications::megaCmdStdoutputing; ++std::recursive_mutex MegaCmdShellCommunications::megaCmdStdoutputing; + + bool MegaCmdShellCommunications::socketValid(SOCKET socket) + { +@@ -483,7 +483,6 @@ MegaCmdShellCommunications::MegaCmdShellCommunications() + stopListener = false; + updating = false; + listenerThread = NULL; +- MegaCmdShellCommunications::megaCmdStdoutputing.init(false); + } + + +--- src/megacmdshell/megacmdshellcommunications.h ++++ src/megacmdshell/megacmdshellcommunications.h +@@ -26,6 +26,7 @@ + + #include + #include ++#include + + #ifdef _WIN32 + #include +@@ -40,15 +41,12 @@ + + #if defined(_WIN32) && !defined(WINDOWS_PHONE) && !defined(USE_CPPTHREAD) + #include "mega/thread/win32thread.h" +-class MegaMutex : public ::mega::Win32Mutex {}; + class MegaThread : public ::mega::Win32Thread {}; + #elif defined(USE_CPPTHREAD) + #include "mega/thread/cppthread.h" +-class MegaMutex : public ::mega::CppMutex {}; + class MegaThread : public ::mega::CppThread {}; + #else + #include "mega/thread/posixthread.h" +-class MegaMutex : public ::mega::PosixMutex {}; + class MegaThread : public ::mega::PosixThread {}; + #endif + +@@ -118,7 +116,7 @@ public: + MegaCmdShellCommunications(); + virtual ~MegaCmdShellCommunications(); + +- static MegaMutex megaCmdStdoutputing; ++ static std::recursive_mutex megaCmdStdoutputing; + virtual int executeCommand(std::string command, std::string (*readresponse)(const char *) = NULL, OUTSTREAMTYPE &output = COUT, bool interactiveshell = true, std::wstring = L""); + virtual int executeCommandW(std::wstring command, std::string (*readresponse)(const char *) = NULL, OUTSTREAMTYPE &output = COUT, bool interactiveshell = true); + diff --git a/srcpkgs/MEGAcmd/patches/musl.patch b/srcpkgs/MEGAcmd/patches/musl.patch deleted file mode 100644 index 3e0a395fb19..00000000000 --- a/srcpkgs/MEGAcmd/patches/musl.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- src/configurationmanager.h 2018-10-03 16:27:51.311763612 +0200 -+++ - 2018-10-03 16:29:44.035272722 +0200 -@@ -23,6 +23,10 @@ - #include - #include - -+#ifndef _WIN32 -+#include // LOCK_EX and LOCK_NB -+#endif -+ - #define CONFIGURATIONSTOREDBYVERSION -2 - class ConfigurationManager - { diff --git a/srcpkgs/MEGAcmd/template b/srcpkgs/MEGAcmd/template index 2345b3972b8..63e7c4f6986 100644 --- a/srcpkgs/MEGAcmd/template +++ b/srcpkgs/MEGAcmd/template @@ -1,7 +1,8 @@ # Template file for 'MEGAcmd' pkgname=MEGAcmd -version=1.0.0 -revision=11 +version=1.1.0 +revision=1 +wrksrc="${pkgname}-${version}_Linux" build_style=gnu-configure make_build_args='LIBTOOLFLAGS="--tag=CXX"' hostmakedepends="autoconf-archive autogen gettext automake libtool pkg-config" @@ -10,8 +11,8 @@ short_desc="Command Line Interactive and Scriptable Application to access MEGA" maintainer="John " license="BSD-2-Clause, GPL-3.0-or-later" homepage="https://github.com/meganz/MEGAcmd" -distfiles="https://github.com/meganz/MEGAcmd/archive/${version}.tar.gz" -checksum=1200363bee2f387a2287e286b38d15b1a01079967e20b8c489815cc7c8d9ff63 +distfiles="https://github.com/meganz/MEGAcmd/archive/${version}_Linux.tar.gz" +checksum=8064a21b1d1436537ab9ccc98f1f411f9496aace000584bea87d95f8e7b3a550 replaces="megacmd>=0" if [ "$CROSS_BUILD" ]; then diff --git a/srcpkgs/MEGAsdk/template b/srcpkgs/MEGAsdk/template index a7a9977393e..52aa7573279 100644 --- a/srcpkgs/MEGAsdk/template +++ b/srcpkgs/MEGAsdk/template @@ -1,7 +1,7 @@ # Template file for 'MEGAsdk' pkgname=MEGAsdk -version=3.5.4 -revision=1 +version=3.6.2a +revision=2 wrksrc="sdk-${version}" build_style=gnu-configure configure_args="--enable-chat --disable-examples $(vopt_with libuv)" @@ -16,7 +16,7 @@ maintainer="John " license="BSD-2-Clause" homepage="https://mega.nz" distfiles="https://github.com/meganz/sdk/archive/v${version}.tar.gz" -checksum=7fc81a64a77829bbc8dd316aac2159890a556dfdeade527a1386482e6dee26ee +checksum=22d910bcd799f30a499fe748cc2b3917e9e213558b1d5fba07b3f3908a833897 replaces="libmega>=0" build_options="libuv mediainfo" diff --git a/srcpkgs/MEGAsync/patches/breakpad.patch b/srcpkgs/MEGAsync/patches/breakpad.patch new file mode 100644 index 00000000000..79f258f71a5 --- /dev/null +++ b/srcpkgs/MEGAsync/patches/breakpad.patch @@ -0,0 +1,16 @@ +--- src/MEGASync/google_breakpad/client/linux/handler/exception_handler.cc 2019-09-13 22:27:23.351723073 +0300 ++++ - 2019-09-13 22:33:08.244312688 +0300 +@@ -104,11 +104,13 @@ + #define PR_SET_PTRACER 0x59616d61 + #endif + ++#if defined(__GLIBC__) && !__GLIBC_PREREQ(2, 30) + // A wrapper for the tgkill syscall: send a signal to a specific thread. + static int tgkill(pid_t tgid, pid_t tid, int sig) { + return syscall(__NR_tgkill, tgid, tid, sig); + return 0; + } ++#endif + + namespace google_breakpad { + diff --git a/srcpkgs/MEGAsync/template b/srcpkgs/MEGAsync/template index 913e8fe7dee..4b66868b06e 100644 --- a/srcpkgs/MEGAsync/template +++ b/srcpkgs/MEGAsync/template @@ -1,20 +1,20 @@ # Template file for 'MEGAsync' pkgname=MEGAsync -version=4.1.1.0 +version=4.2.4.0 revision=1 -wrksrc="${pkgname}-${version}_Linux" +wrksrc="${pkgname}-${version}_Win" build_wrksrc=src build_style=qmake -configure_args='"CONFIG-=with_tools"' +configure_args='"CONFIG+=FULLREQUIREMENTS"' hostmakedepends="libtool qt5-qmake qt5-host-tools" makedepends="qt5-tools-devel qt5-devel qt5-svg-devel MEGAsdk-devel MEGAsdk-qt libraw-devel libgomp-devel" short_desc="Automated syncing with MEGA Cloud Drive" maintainer="John " -license="custom" +license="custom: Proprietary" homepage="https://mega.co.nz" -distfiles="https://github.com/meganz/MEGAsync/archive/v${version}_Linux.tar.gz" -checksum=5f43a3f402c10519e2f59c8c2a70c55affd3eb1a323767127929fb5f4baa429c +distfiles="https://github.com/meganz/MEGAsync/archive/v${version}_Win.tar.gz" +checksum=5fd90c93677085a2f73faa6a5a3548fcd29fc9f3203f6ddbcac7f170b580f239 restricted=yes nocross=yes diff --git a/srcpkgs/Minder/template b/srcpkgs/Minder/template index ffe8b188f28..47d62e32ed2 100644 --- a/srcpkgs/Minder/template +++ b/srcpkgs/Minder/template @@ -1,6 +1,6 @@ # Template file for 'Minder' pkgname=Minder -version=1.4.1 +version=1.5.0 revision=1 build_style=meson hostmakedepends="pkg-config glib-devel vala" @@ -11,4 +11,4 @@ maintainer="Cameron Nemo " license="GPL-3.0-or-later" homepage="https://github.com/phase1geo/Minder" distfiles="${homepage}/archive/${version}.tar.gz" -checksum=e1e5343fb83612bfc4f1943cbc53411649da4ce9bd078061b0623e7c9db95621 +checksum=e313b5305242959434d551d3ec78bbed6faceb5494c1832b98b0b63a95b2e3f0 diff --git a/srcpkgs/ModemManager/template b/srcpkgs/ModemManager/template index 085a1c6de39..276f13dba4b 100644 --- a/srcpkgs/ModemManager/template +++ b/srcpkgs/ModemManager/template @@ -1,6 +1,6 @@ # Template file for 'ModemManager' pkgname=ModemManager -version=1.10.4 +version=1.10.6 revision=1 build_style=gnu-configure build_helper="gir" @@ -18,7 +18,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://www.freedesktop.org/wiki/Software/ModemManager/" distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=fa556bb4ba1f1478e709b71151b4de8f7d136d80e51c64e887fc1fd8926cdc70 +checksum=3c2ca73782215664141042422759899ca9846440fc26d6223c7cf7ea4dd3c996 build_options="gir" build_options_default="gir" diff --git a/srcpkgs/MultiMC/template b/srcpkgs/MultiMC/template index 297ffe08850..b38ba6ca597 100644 --- a/srcpkgs/MultiMC/template +++ b/srcpkgs/MultiMC/template @@ -1,14 +1,14 @@ # Template file for 'MultiMC' pkgname=MultiMC -version=0.6.5 -revision=4 +version=0.6.7 +revision=2 wrksrc="${pkgname}5-${version}" _commithashnbt="4b305bbd2ac0e7a26987baf7949a484a87b474d4" -_nbtversion="multimc-0.5.0" -_quazipversion="multimc-2" +_nbtversion="multimc-0.6.1" +_quazipversion="multimc-3" build_style=cmake configure_args='-DMultiMC_BUILD_PLATFORM=Void -DMultiMC_LAYOUT=lin-system' -hostmakedepends="openjdk xxd git-all" +hostmakedepends="openjdk xxd git" makedepends="qt5-devel qt5-x11extras-devel qt5-svg-devel gtk+-devel" depends="virtual?java-environment" short_desc="Instanced Minecraft client" @@ -18,9 +18,9 @@ homepage="http://multimc.org" distfiles="https://github.com/${pkgname}/${pkgname}5/archive/${version}.tar.gz https://github.com/${pkgname}/libnbtplusplus/archive/${_nbtversion}.tar.gz https://github.com/${pkgname}/quazip/archive/${_quazipversion}.tar.gz" -checksum="98e8db7c0fda5e5a1917dc3f7cdbfd4b337c45aa47d1e7dbd45c380576bd7716 - bcefbdd905f10a04605cf9e8f768d0f60c972e9e219c800512a5fd9c5f7a8498 - 25e1b74f0edef5e09647f7b5344c08fad4eaebbc386b1f288b59286ecdfe07fa" +checksum="3ec38a5f622048ba3926f0e20fb296d646c7848f8313143062b3e2bd273149ae + 36c816e6b1ef8ece52c57dfa9bfda3a23808d0c6c3288b25d8bcf49c7cdb5b07 + ffa60368b1c196859691b637c740f4c60597b2ac47217995082ae8b2a3a9ac18" skip_extraction="${_nbtversion}.tar.gz ${_quazipversion}.tar.gz" pre_configure() { diff --git a/srcpkgs/NetAuth/template b/srcpkgs/NetAuth/template index caa6078d3d0..ef64bcac909 100644 --- a/srcpkgs/NetAuth/template +++ b/srcpkgs/NetAuth/template @@ -1,6 +1,6 @@ # Template file for 'NetAuth' pkgname=NetAuth -version=0.1.0 +version=0.2.1 revision=1 build_style="go" go_import_path="github.com/NetAuth/NetAuth" @@ -12,7 +12,7 @@ maintainer="Michael Aldridge " license="MIT" homepage="https://netauth.org" distfiles="https://github.com/NetAuth/NetAuth/archive/v$version.tar.gz" -checksum=3521516de7e342199ebc564614f0b5f93119b2fcbf603c186cd2c7f20cb18874 +checksum=f2065b58c6e6c1015ea5cfcf7a61a91e90b597e76ecabd0c6ec60016ebdb0766 do_check() { go test -v ./... diff --git a/srcpkgs/NetKeys/template b/srcpkgs/NetKeys/template index 1afaa01f939..ef5fedfe8e5 100644 --- a/srcpkgs/NetKeys/template +++ b/srcpkgs/NetKeys/template @@ -1,6 +1,6 @@ # Template file for 'NetKeys' pkgname=NetKeys -version=0.3 +version=0.4 revision=1 build_style=go go_import_path="github.com/NetAuth/NetKeys" @@ -11,7 +11,7 @@ maintainer="Michael Aldridge " license="MIT" homepage="https://netauth.org" distfiles="https://github.com/NetAuth/NetKeys/archive/v$version.tar.gz" -checksum=f6daf0390020c31ba33c4231df9190ce9d3b6a8373492debc98a797a31380679 +checksum=f70a457f7e840425618c32ef3f5a540b6b9a027e3199e5355ffb7995b5de0d3f post_install() { vlicense LICENSE diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template index bc2c5a4db7d..e9a615193c9 100644 --- a/srcpkgs/NetworkManager/template +++ b/srcpkgs/NetworkManager/template @@ -1,7 +1,7 @@ # Template file for 'NetworkManager' pkgname=NetworkManager version=1.18.2 -revision=2 +revision=4 build_style=meson build_helper="gir" configure_args="-Dpolkit_agent=true -Dsystemd_journal=false @@ -12,10 +12,11 @@ configure_args="-Dpolkit_agent=true -Dsystemd_journal=false -Dpppd_plugin_dir=/usr/lib/pppd/2.4.7 -Dresolvconf=/usr/bin/resolvconf -Ddhclient=/usr/bin/dhclient -Dkernel_firmware_dir=/usr/lib/firmware -Ddnsmasq=/usr/bin/dnsmasq -Ddbus_conf_dir=/etc/dbus-1/system.d + -Diwd=true -Dudev_dir=/usr/lib/udev -Dintrospection=$(vopt_if gir true false) -Dvapi=$(vopt_if vala true false) -Dsession_tracking=$(vopt_if elogind elogind no) - -Dsuspend_resume=$(vopt_if elogind elogind no) + -Dsuspend_resume=$(vopt_if elogind elogind upower) -Dconfig_dhcp_default=internal" hostmakedepends="gettext-devel glib-devel libxslt-devel pkg-config intltool dbus-glib-devel jansson-devel $(vopt_if vala vala) @@ -52,7 +53,7 @@ esac # Package build options build_options="gir vala elogind" -build_options_default="gir vala" +build_options_default="gir vala elogind" pre_configure() { if [ "$CROSS_BUILD" ]; then diff --git a/srcpkgs/OTPClient/template b/srcpkgs/OTPClient/template index 3effc7e017c..668300b7192 100644 --- a/srcpkgs/OTPClient/template +++ b/srcpkgs/OTPClient/template @@ -1,14 +1,14 @@ # Template file for 'OTPClient' pkgname=OTPClient -version=1.4.1 +version=1.5.1 revision=1 build_style=cmake hostmakedepends="pkg-config" makedepends="gtk+3-devel libglib-devel libgcrypt-devel libpng-devel libzip-devel libcotp-devel libzbar-devel jansson-devel" short_desc="Highly secure and easy to use GTK+ OTP client" -maintainer="maxice8 " +maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://github.com/paolostivanin/OTPClient" distfiles="https://github.com/paolostivanin/OTPClient/archive/v${version}.tar.gz" -checksum=67ffd03e866a2184896b99d385a95c181e2e84d371276723297d136683a0fa93 +checksum=c8794a45b691613326f15a95b9fe7f16511b0c16b6b6e1cedc11dc5344c2cc27 diff --git a/srcpkgs/PackageKit/template b/srcpkgs/PackageKit/template index b9590d1e5ba..046602547cd 100644 --- a/srcpkgs/PackageKit/template +++ b/srcpkgs/PackageKit/template @@ -15,7 +15,7 @@ hostmakedepends="automake glib-devel pkg-config libtool gtk-doc makedepends="libglib-devel sqlite-devel polkit-devel bash-completion $(vopt_if gir gobject-introspection) $(vopt_if vala 'vala-devel')" short_desc="D-BUS abstraction layer to package management API" -maintainer="maxice8 " +maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://github.com/hughsie/PackageKit" distfiles="https://github.com/hughsie/PackageKit/archive/PACKAGEKIT_${version//./_}.tar.gz" diff --git a/srcpkgs/PopCorn/template b/srcpkgs/PopCorn/template index 06da3633994..86b03287d71 100644 --- a/srcpkgs/PopCorn/template +++ b/srcpkgs/PopCorn/template @@ -1,21 +1,21 @@ # Template file for 'PopCorn' pkgname=PopCorn -version=0.3 -revision=4 +version=0.4 +revision=1 build_style=go go_import_path=github.com/the-maldridge/popcorn go_package="${go_import_path}/cmd/popcorn ${go_import_path}/cmd/popcornctl ${go_import_path}/cmd/statrepo ${go_import_path}/cmd/pqueryd" -hostmakedepends="dep" +hostmakedepends="git" depends="snooze" short_desc="Package statistics system" maintainer="Michael Aldridge " license="MIT" homepage="https://github.com/the-maldridge/PopCorn" distfiles="https://github.com/the-maldridge/PopCorn/archive/v${version}.tar.gz" -checksum=5e61970c3ba5fd83f6b5b86c30264213461f4a5af8aacd2ba1757333ece05260 +checksum=b25589802c5e1c277d2e9536add44704a012359b02d7fb4be1b4b0f11eb10d93 system_accounts="_popcorn" _popcorn_homedir="/var/lib/popcorn" @@ -23,12 +23,6 @@ make_dirs=" /var/lib/popcorn 0755 _popcorn _popcorn /etc/popcorn 0755 _popcorn _popcorn" -pre_build() { - cd $GOSRCPATH - dep ensure - cd $wrksrc -} - post_install() { vlicense LICENSE vsv popcorn diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template index 23d299bce49..9070ba6cd11 100644 --- a/srcpkgs/QMPlay2/template +++ b/srcpkgs/QMPlay2/template @@ -1,21 +1,21 @@ # Template file for 'QMPlay2' pkgname=QMPlay2 -version=18.12.26 -revision=3 +version=19.09.03 +revision=1 wrksrc="${pkgname}-src-${version}" build_style=cmake hostmakedepends="pkg-config qt5-qmake qt5-host-tools" makedepends="alsa-lib-devel ffmpeg-devel libass-devel libcdio-devel libgme-devel libsidplayfp-devel libva-glx-devel libXv-devel pulseaudio-devel qt5-svg-devel qt5-tools-devel qt5-x11extras-devel taglib-devel - libcdio-paranoia-devel" + libcdio-paranoia-devel qt5-declarative-devel" short_desc="Video and audio player which can play most formats and codecs" maintainer="Andrew Benson " license="LGPL-3.0-only" homepage="http://zaps166.sourceforge.net/?app=QMPlay2" changelog="https://raw.githubusercontent.com/zaps166/QMPlay2/master/ChangeLog" distfiles="https://github.com/zaps166/QMPlay2/releases/download/${version}/QMPlay2-src-${version}.tar.xz" -checksum=11922ea44512736de223f502f32ed075f2010c37a752065945fcadaf6af5e53d +checksum=8481124d0cdec6c2256a748dc529b4c6080b6f6700a26e11e3738d9d2a577882 QMPlay2-devel_package() { short_desc+=" - development files" diff --git a/srcpkgs/R/template b/srcpkgs/R/template index 427735181d9..1e62b4cd784 100644 --- a/srcpkgs/R/template +++ b/srcpkgs/R/template @@ -1,7 +1,7 @@ # Template file for 'R' pkgname=R -version=3.5.3 -revision=2 +version=3.6.1 +revision=1 build_style=gnu-configure configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R --with-lapack --with-blas --enable-R-shlib --with-tcltk @@ -18,7 +18,7 @@ license="GPL-2.0-or-later" homepage="https://www.r-project.org/" changelog="https://cran.r-project.org/doc/manuals/r-release/NEWS.html" distfiles="https://cran.r-project.org/src/base/R-3/${pkgname}-${version}.tar.gz" -checksum=2bfa37b7bd709f003d6b8a172ddfb6d03ddd2d672d6096439523039f7a8e678c +checksum=5baa9ebd3e71acecdcc3da31d9042fb174d55a42829f8315f2457080978b1389 nocross=yes shlib_provides="libR.so" diff --git a/srcpkgs/RubyMine/template b/srcpkgs/RubyMine/template index 7b674991b74..db8144b63a0 100644 --- a/srcpkgs/RubyMine/template +++ b/srcpkgs/RubyMine/template @@ -1,6 +1,6 @@ # Template file for 'RubyMine' pkgname=RubyMine -version=2019.1.2 +version=2019.2.3 revision=1 archs="i686 x86_64" depends="virtual?java-environment" @@ -9,7 +9,7 @@ maintainer="Anton Afanasyev " license="custom:Commercial" homepage="https://www.jetbrains.com/ruby" distfiles="https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz" -checksum=db60a07098d3fec4e72bcbd5e5c48638983e20817e41c3f83266733f2d8a0cfe +checksum=6ac522b2a68d2e32855999d73a900e08144a812f1e54562d4714d99eb0ee1e3d repository=nonfree restricted=yes nopie=yes @@ -37,14 +37,14 @@ post_extract() { do_install() { TARGET_PATH="usr/lib/${pkgname}" - LICENSE_PATH="usr/share/licenses/${pkgname}" vmkdir usr/bin vmkdir ${TARGET_PATH} - vmkdir ${LICENSE_PATH} - # Ideally vlicense should be called here, but vcopy is more terse. - vcopy license/* ${LICENSE_PATH} + local i + for i in license/* ; do + vlicense $i + done vcopy bin ${TARGET_PATH} vcopy help ${TARGET_PATH} diff --git a/srcpkgs/SDL2_mixer/template b/srcpkgs/SDL2_mixer/template index 69197b64791..80d654951b9 100644 --- a/srcpkgs/SDL2_mixer/template +++ b/srcpkgs/SDL2_mixer/template @@ -1,13 +1,13 @@ # Template file for 'SDL2_mixer' pkgname=SDL2_mixer version=2.0.4 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="SDL2-devel libvorbis-devel libmikmod-devel libflac-devel - libmodplug-devel mpg123-devel smpeg2-devel fluidsynth-devel" + libmodplug-devel mpg123-devel smpeg2-devel fluidsynth-devel opusfile-devel" # The following deps are dlopen(3)ed at runtime. -depends="libvorbis libmikmod libmpg123 libmodplug libflac smpeg2" +depends="libvorbis libmikmod libmpg123 libmodplug libflac smpeg2 opusfile" short_desc="Multi-channel audio mixer library (SDL 2.x)" maintainer="Orphaned " license="BSD-3-Clause" diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template index 0015cd93633..9123399f560 100644 --- a/srcpkgs/SLADE/template +++ b/srcpkgs/SLADE/template @@ -1,8 +1,9 @@ # Template file for 'SLADE' pkgname=SLADE -version=3.1.5 +version=3.1.7 revision=1 build_style=cmake +configure_args="-DCL_WX_CONFIG=wx-config-gtk3" hostmakedepends="pkg-config p7zip" makedepends="SFML-devel fluidsynth-devel freeimage-devel ftgl-devel glew-devel gtk+3-devel libcurl-devel wxWidgets-gtk3-devel" @@ -12,7 +13,7 @@ license="GPL-2.0-or-later" homepage="https://github.com/sirjuddington/SLADE" changelog="https://github.com/sirjuddington/SLADE/releases/tag/${version}" distfiles="https://github.com/sirjuddington/SLADE/archive/${version}.tar.gz" -checksum=ddab2c5bde9939dd74505fa4f021995e35f00ead0124ce19cbf72f908445aec4 +checksum=abea38ff173b5494ddb50fa7996b6f1818f08c6992b119cb137bdacc63af3789 if [ -z "$CROSS_BUILD" ]; then configure_args+=" -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3" diff --git a/srcpkgs/SPIRV-Headers/template b/srcpkgs/SPIRV-Headers/template index 3c0374f53bd..55f54b64dfa 100644 --- a/srcpkgs/SPIRV-Headers/template +++ b/srcpkgs/SPIRV-Headers/template @@ -5,7 +5,7 @@ revision=1 archs=noarch build_style=cmake short_desc="Machine-readable files for the SPIR-V Registry" -maintainer="maxice8 " +maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://github.com/KhronosGroup/SPIRV-Headers" distfiles="https://github.com/KhronosGroup/SPIRV-Headers/archive/${version}.tar.gz" diff --git a/srcpkgs/SPIRV-Tools/template b/srcpkgs/SPIRV-Tools/template index 5d6b76342c2..2c077be3c55 100644 --- a/srcpkgs/SPIRV-Tools/template +++ b/srcpkgs/SPIRV-Tools/template @@ -9,7 +9,7 @@ configure_args="-DSPIRV_SKIP_TESTS=ON -DSPIRV_WERROR=OFF hostmakedepends="python3" makedepends="SPIRV-Headers" short_desc="API and commands for processing SPIR-V modules" -maintainer="maxice8 " +maintainer="Orphaned " license="Apache-2.0" homepage="https://github.com/KhronosGroup/SPIRV-Tools" distfiles="https://github.com/KhronosGroup/SPIRV-Tools/archive/v${version}.tar.gz" diff --git a/srcpkgs/Signal-Desktop/patches/build-from-tarball.patch b/srcpkgs/Signal-Desktop/patches/build-from-tarball.patch index 11f75722a5a..9bb227005f0 100644 --- a/srcpkgs/Signal-Desktop/patches/build-from-tarball.patch +++ b/srcpkgs/Signal-Desktop/patches/build-from-tarball.patch @@ -1,7 +1,6 @@ -Kludge to work around https://github.com/signalapp/Signal-Desktop/issues/2376. ---- Gruntfile.js.orig 2018-05-15 01:57:11.000000000 +0200 -+++ Gruntfile.js 2018-05-20 19:15:45.054357251 +0200 -@@ -511,6 +511,5 @@ +--- Gruntfile.js.orig 2019-09-05 13:47:47.906325029 +0200 ++++ Gruntfile.js 2019-09-05 13:48:40.869808351 +0200 +@@ -436,6 +436,5 @@ 'concat', 'copy:deps', 'sass', diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template index 73fe0184272..7013d4d8a2a 100644 --- a/srcpkgs/Signal-Desktop/template +++ b/srcpkgs/Signal-Desktop/template @@ -1,20 +1,24 @@ # Template file for 'Signal-Desktop' pkgname=Signal-Desktop -version=1.23.2 -revision=2 +version=1.27.1 +revision=1 # Due to electron # 32-bit is not supported https://github.com/signalapp/Signal-Desktop/issues/1661 archs="x86_64" -hostmakedepends="git python nodejs-lts yarn" +hostmakedepends="git python nodejs yarn" depends="libnotify libappindicator" short_desc="Signal Private Messenger for Linux" maintainer="Julio Galvan " license="GPL-3.0-only" homepage="https://github.com/signalapp/Signal-Desktop" distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz" -checksum=344842c7a7eac1772a507c8170eef6cf000051eab688609e158669cda51f56a6 +checksum=18c5c9f1a3684b4d0d49a9bb490c7e56417e464b29a06bf4cef36e2e5c523652 nostrip_files="signal-desktop" +pre_build() { + vsed -e 's/"node": "/&>=/' -i package.json +} + do_build() { yarn install --ignore-engines yarn grunt diff --git a/srcpkgs/Solaar/template b/srcpkgs/Solaar/template new file mode 100644 index 00000000000..2e8f4112e0e --- /dev/null +++ b/srcpkgs/Solaar/template @@ -0,0 +1,15 @@ +# Template file for 'Solaar' +pkgname=Solaar +version=1.0.1 +revision=1 +archs=noarch +build_style=python3-module +pycompile_module="hidapi logitech_receiver solaar" +hostmakedepends="python3-setuptools" +depends="python3-pyudev" +short_desc="Linux device manager for a wide range of Logitech devices" +maintainer="Young Jin Park " +license="GPL-3.0-or-later" +homepage="https://pwr-solaar.github.io/Solaar/" +distfiles="https://github.com/pwr-Solaar/Solaar/archive/${version}.tar.gz" +checksum=20f7c29610cc1d0a964052b6698c3e01f1703d08d621cbe7f9e45a9892632f13 diff --git a/srcpkgs/SweetHome3D/template b/srcpkgs/SweetHome3D/template index 0cac3ce8c48..40617e123f3 100644 --- a/srcpkgs/SweetHome3D/template +++ b/srcpkgs/SweetHome3D/template @@ -1,6 +1,6 @@ # Template file for 'SweetHome3D' pkgname=SweetHome3D -version=6.1.2 +version=6.2 revision=1 archs="i686 x86_64" wrksrc="SweetHome3D-${version}-src" @@ -12,7 +12,7 @@ maintainer="1is7ac3 " license="GPL-2.0-or-later" homepage="www.sweethome3d.com" distfiles="${SOURCEFORGE_SITE}/sweethome3d/SweetHome3D-${version}-src.zip" -checksum=43645e34c94bf5b514974428c4a0eefae403fcaf52258cbb9c6fe07d4da8f7db +checksum=285cb97aee9254de66a195469e494fb28bb77dc1f14b0a92802e7896bd7870ad do_build() { ant application textures furniture examples help java3dLibraries diff --git a/srcpkgs/The-Powder-Toy/template b/srcpkgs/The-Powder-Toy/template new file mode 100644 index 00000000000..778c0f8f211 --- /dev/null +++ b/srcpkgs/The-Powder-Toy/template @@ -0,0 +1,28 @@ +# Template file for 'The-Powder-Toy' +pkgname=The-Powder-Toy +version=94.1 +revision=1 +build_style=scons +make_build_args="--output=powder" +makedepends="SDL2-devel lua51-devel fftw-devel bzip2-devel zlib-devel" +short_desc="Falling sand physics sandbox, simulates air pressure, velocity & heat" +maintainer="Illia Shestakov " +license="GPL-3.0-or-later" +homepage="https://powdertoy.co.uk/" +distfiles="https://github.com/The-Powder-Toy/${pkgname}/archive/v${version}.tar.gz" +checksum=9770c0732c97e4e89a1e53330c969e9675595f78e6673c519c3724d6df591e72 +CPPDEFINES=IGNORE_UPDATES + +case "$XBPS_TARGET_MACHINE" + in x86_64*|i686*) + ;; + *) + make_build_args+=" --no-sse";; +esac + +do_install() { + vbin build/powder + vdoc README.md + vinstall resources/powder.desktop 664 /usr/share/applications/ + vinstall resources/icon/powder-256.png 644 /usr/share/pixmaps/ powder.png +} diff --git a/srcpkgs/Thunar/template b/srcpkgs/Thunar/template index 26160c44da0..6cf46ccd0ff 100644 --- a/srcpkgs/Thunar/template +++ b/srcpkgs/Thunar/template @@ -1,7 +1,7 @@ # Template file for 'Thunar' pkgname=Thunar version=1.8.9 -revision=1 +revision=2 build_style=gnu-configure build_helper="gir" configure_args="--enable-gio-unix --enable-gudev diff --git a/srcpkgs/UEFITool/template b/srcpkgs/UEFITool/template new file mode 100644 index 00000000000..6d9602fd636 --- /dev/null +++ b/srcpkgs/UEFITool/template @@ -0,0 +1,27 @@ +# Template file for 'UEFITool' +pkgname=UEFITool +version=A55 +revision=1 +build_wrksrc="UEFITool" +build_style=qmake +hostmakedepends="qt5-qmake qt5-devel" +makedepends="qt5-declarative-devel" +short_desc="UEFI firmware image viewer and editor" +maintainer="Kacper Słomiński " +license="BSD-2-Clause" +homepage="https://github.com/LongSoft/UEFITool/" +distfiles="${homepage}/archive/${version}.tar.gz" +checksum=2b8f7643585aee80497789430b18196e8480c0d0af8632dec8bc06492fbc16d9 + +do_install() { + vbin UEFITool uefitool + vmkdir usr/share/applications + vinstall uefitool.desktop 644 usr/share/applications + local size + for size in 16 32 48 64 128 256 512; do + vinstall icons/uefitool_${size}x${size}.png \ + 644 usr/share/icons/hicolor${size}x${size}/apps uefitool.png + done + vinstall icons/uefitool_128x128.png 644 usr/share/pixmaps uefitool.png + vlicense ../LICENSE.md +} diff --git a/srcpkgs/Uranium/patches/fix-crash-in-cura.patch b/srcpkgs/Uranium/patches/fix-crash-in-cura.patch deleted file mode 100644 index 3d51f4e66d8..00000000000 --- a/srcpkgs/Uranium/patches/fix-crash-in-cura.patch +++ /dev/null @@ -1,132 +0,0 @@ -From 9de2827a6ea5eb6ce7d8f845c4b4fc388b01da40 Mon Sep 17 00:00:00 2001 -From: Mark Burton -Date: Mon, 22 Jul 2019 16:00:15 +0100 -Subject: [PATCH] Set border_node's geometry and material before appending it - to paint_node. - ---- - UM/Qt/Bindings/PointingRectangle.py | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/UM/Qt/Bindings/PointingRectangle.py b/UM/Qt/Bindings/PointingRectangle.py -index ddb8520db..a0a79c6a1 100644 ---- UM/Qt/Bindings/PointingRectangle.py -+++ UM/Qt/Bindings/PointingRectangle.py -@@ -162,8 +162,9 @@ def updatePaintNode(self, paint_node, update_data): - - if self._border_width > 0: - if paint_node.childCount() == 0: -- paint_node.appendChildNode(QSGGeometryNode()) -- border_node = paint_node.firstChild() -+ border_node = QSGGeometryNode() -+ else: -+ border_node = paint_node.firstChild() - - border_vertices = [] - border_vertices.append((0, 0)) -@@ -204,6 +205,9 @@ def updatePaintNode(self, paint_node, update_data): - border_material.setColor(self._border_color) - - border_node.setMaterial(border_material) -+ -+ if paint_node.childCount() == 0: -+ paint_node.appendChildNode(border_node) - else: - border_node = None - border_geometry = None - -From c0fcf8e290b88fa276af7df8694e95d55aa912b9 Mon Sep 17 00:00:00 2001 -From: Mark Burton -Date: Mon, 22 Jul 2019 19:47:15 +0100 -Subject: [PATCH] ShaderEffect crashes on Linux with Qt 5.13 so replace with - ColorOverlay. - ---- - UM/Qt/qml/UM/RecolorImage.qml | 60 ++++------------------------------- - 1 file changed, 6 insertions(+), 54 deletions(-) - -diff --git a/UM/Qt/qml/UM/RecolorImage.qml b/UM/Qt/qml/UM/RecolorImage.qml -index c4f209154..5bd73a6b5 100644 ---- UM/Qt/qml/UM/RecolorImage.qml -+++ UM/Qt/qml/UM/RecolorImage.qml -@@ -2,6 +2,7 @@ - // Uranium is released under the terms of the LGPLv3 or higher. - - import QtQuick 2.1 -+import QtGraphicalEffects 1.0 - import UM 1.3 as UM - - Item -@@ -9,7 +10,7 @@ Item - id: base; - - property alias source: img.source -- property alias color: shader.color -+ property alias color: overlay.color - property alias sourceSize: img.sourceSize - - Image -@@ -21,59 +22,10 @@ Item - sourceSize.height: parent.height - } - -- ShaderEffect -- { -- id: shader -+ ColorOverlay { -+ id: overlay - anchors.fill: parent -- -- property variant src: img -- property color color: "#fff" -- -- vertexShader: UM.OpenGLContextProxy.isLegacyOpenGL ? -- " -- uniform highp mat4 qt_Matrix; -- attribute highp vec4 qt_Vertex; -- attribute highp vec2 qt_MultiTexCoord0; -- varying highp vec2 coord; -- void main() { -- coord = qt_MultiTexCoord0; -- gl_Position = qt_Matrix * qt_Vertex; -- } -- " : " -- #version 410 -- uniform highp mat4 qt_Matrix; -- in highp vec4 qt_Vertex; -- in highp vec2 qt_MultiTexCoord0; -- out highp vec2 coord; -- void main() { -- coord = qt_MultiTexCoord0; -- gl_Position = qt_Matrix * qt_Vertex; -- } -- " -- -- fragmentShader: UM.OpenGLContextProxy.isLegacyOpenGL ? -- " -- varying highp vec2 coord; -- uniform sampler2D src; -- uniform lowp vec4 color; -- uniform lowp float qt_Opacity; -- void main() { -- lowp vec4 tex = texture2D(src, coord); -- lowp float alpha = tex.a * qt_Opacity; -- gl_FragColor = vec4(color.r * alpha, color.g * alpha, color.b * alpha, alpha); -- } -- " : " -- #version 410 -- in highp vec2 coord; -- uniform sampler2D src; -- uniform lowp vec4 color; -- uniform lowp float qt_Opacity; -- out vec4 frag_color; -- void main() { -- lowp vec4 tex = texture(src, coord); -- lowp float alpha = tex.a * qt_Opacity; -- frag_color = vec4(color.r * alpha, color.g * alpha, color.b * alpha, alpha); -- } -- " -+ source: img -+ color: "#fff" - } - } diff --git a/srcpkgs/Uranium/template b/srcpkgs/Uranium/template index cf3fb0bb38c..193d5e211df 100644 --- a/srcpkgs/Uranium/template +++ b/srcpkgs/Uranium/template @@ -1,7 +1,7 @@ # Template file for 'Uranium' pkgname=Uranium -version=4.2.0 -revision=2 +version=4.3.0 +revision=1 archs=noarch build_style=cmake pycompile_module="UM" @@ -15,4 +15,4 @@ maintainer="Karl Nilsson " license="LGPL-3.0-or-later" homepage="https://github.com/Ultimaker/Uranium" distfiles="https://github.com/Ultimaker/Uranium/archive/${version}.tar.gz" -checksum=af394fb133e6a3ce92c245428bcf458956b2ca26c33122a35c464b9f5aaddd2e +checksum=9f871877cf46e8b9e58346f33fdb6eed07c08f242fe292d0c993f224005dfc38 diff --git a/srcpkgs/VirtualGL/template b/srcpkgs/VirtualGL/template index 98bc90b7a1c..c142305613b 100644 --- a/srcpkgs/VirtualGL/template +++ b/srcpkgs/VirtualGL/template @@ -1,7 +1,7 @@ # Template file for 'VirtualGL' pkgname=VirtualGL -version=2.6.1 -revision=2 +version=2.6.2 +revision=1 build_style=cmake configure_args="-DTJPEG_INCLUDE_DIR=/usr/include -DVGL_SYSTEMGLX=ON -DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DCMAKE_INSTALL_LIBDIR=/usr/lib @@ -10,10 +10,10 @@ makedepends="libXv-devel glu-devel libjpeg-turbo-devel MesaLib-devel libXtst-devel fltk-devel libressl-devel" short_desc="Run remote OpenGL applications with full acceleration" maintainer="Orphaned " -license="LGPL-2.1" +license="LGPL-2.1-or-later" homepage="http://www.virtualgl.org/" distfiles="${SOURCEFORGE_SITE}/virtualgl/${version}/${pkgname}-${version}.tar.gz" -checksum=8802989a565b077036007848a845943971f670d72dc89f502601dfd36d401f83 +checksum=79dff857862890215794509ac65826005625925d03bf0874a486d695aae6f859 archs="i686* x86_64*" diff --git a/srcpkgs/Vulkan-Headers/template b/srcpkgs/Vulkan-Headers/template index 7993668de4b..addd0c9847a 100644 --- a/srcpkgs/Vulkan-Headers/template +++ b/srcpkgs/Vulkan-Headers/template @@ -1,6 +1,6 @@ # Template file for 'Vulkan-Headers' pkgname=Vulkan-Headers -version=1.1.115 +version=1.1.123 revision=1 archs=noarch wrksrc="${pkgname}-${version}" @@ -10,4 +10,4 @@ maintainer="Arvin Ignaci " license="Apache-2.0" homepage="https://www.khronos.org/vulkan/" distfiles="https://github.com/KhronosGroup/Vulkan-Headers/archive/v${version}.tar.gz" -checksum=9298c9a591ecbfbe399b659eac2ae0ee8845601235859a741f38ced1a8144fe3 +checksum=aa58ddcf972f05d26bdfa50ac689022b77baf101317258ac146393ef47741581 diff --git a/srcpkgs/Vulkan-Tools/template b/srcpkgs/Vulkan-Tools/template index 6a78090e775..cb1dfc9b446 100644 --- a/srcpkgs/Vulkan-Tools/template +++ b/srcpkgs/Vulkan-Tools/template @@ -1,6 +1,6 @@ # Template file for 'Vulkan-Tools' pkgname=Vulkan-Tools -version=1.1.108 +version=1.1.123 revision=1 wrksrc="${pkgname}-${version}" build_style=cmake @@ -14,7 +14,7 @@ maintainer="Arvin Ignaci " license="Apache-2.0" homepage="https://www.khronos.org/vulkan/" distfiles="https://github.com/KhronosGroup/${pkgname}/archive/v${version}.tar.gz" -checksum=6db41f252e32a5255342cfeb0e3eceff2ea729025a655727ac681f3c5ab46512 +checksum=a458ee9b3c6dcbdef0dbb69b6a6afbd7ac72f9355977636d34a89c2fadecc7c8 build_options="cube" desc_option_cube="Build cube vulkan demo" diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template index 88141db5e04..bc62ee11bb9 100644 --- a/srcpkgs/Waybar/template +++ b/srcpkgs/Waybar/template @@ -1,6 +1,6 @@ # Template file for 'Waybar' pkgname=Waybar -version=0.7.0 +version=0.8.0 revision=1 build_style=meson configure_args="-Dlibnl=$(vopt_if libnl enabled disabled) @@ -18,7 +18,7 @@ license="MIT" homepage="https://github.com/Alexays/Waybar" changelog="https://github.com/Alexays/Waybar/releases" distfiles="https://github.com/Alexays/Waybar/archive/${version}.tar.gz" -checksum=413bff4691c8c8b9d9cb98219063cf0c7c9cb05c946313984c8969009f172659 +checksum=2de2f0cec243da0d9ff2255ceb9dac9d95e8be06d6ea13926fae460d72e4b8aa build_options="libnl pulseaudio dbusmenugtk mpd" build_options_default="pulseaudio mpd" diff --git a/srcpkgs/WebStorm/template b/srcpkgs/WebStorm/template index 6602c930613..5bf8427f95e 100644 --- a/srcpkgs/WebStorm/template +++ b/srcpkgs/WebStorm/template @@ -1,16 +1,16 @@ # Template file for 'WebStorm' pkgname=WebStorm -version=2019.1.3 +version=2019.2.3 revision=1 archs="i686 x86_64" -wrksrc="WebStorm-191.7479.14" +wrksrc="WebStorm-192.6817.13" depends="virtual?java-environment" short_desc="Smartest JavaScript IDE" maintainer="Anton Afanasyev " license="custom:Commercial" homepage="https://www.jetbrains.com/webstorm" distfiles="https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz" -checksum=c3ef27051f6de608ee679035957a8a4329897c910b046cb2dbbf840cc8151dae +checksum=af94c66c80508fe221d9ba2b294d3852d68db8bc293dd240e2638dd2c21a6c50 repository=nonfree restricted=yes nopie=yes @@ -23,12 +23,14 @@ post_extract() { case "$XBPS_TARGET_MACHINE" in x86_64) rm -rf bin/fsnotifier + rm -rf bin/fsnotifier-arm rm -rf bin/webstorm.vmoptions rm -rf bin/libyjpagent-linux.so rm -rf lib/pty4j-native/linux/x86 ;; i686) rm -rf bin/fsnotifier64 + rm -rf bin/fsnotifier-arm rm -rf bin/webstorm64.vmoptions rm -rf bin/libyjpagent-linux64.so rm -rf lib/pty4j-native/linux/x86_64 @@ -40,14 +42,14 @@ post_extract() { do_install() { TARGET_PATH="usr/lib/${pkgname}" - LICENSE_PATH="usr/share/licenses/${pkgname}" vmkdir usr/bin vmkdir ${TARGET_PATH} - vmkdir ${LICENSE_PATH} - # Ideally vlicense should be called here, but vcopy is more terse. - vcopy license/* ${LICENSE_PATH} + local i + for i in license/* ; do + vlicense $i + done vcopy bin ${TARGET_PATH} vcopy help ${TARGET_PATH} diff --git a/srcpkgs/YACReader/template b/srcpkgs/YACReader/template index 3d60b425267..8223256ef3a 100644 --- a/srcpkgs/YACReader/template +++ b/srcpkgs/YACReader/template @@ -1,6 +1,6 @@ # Template file for 'YACReader' pkgname=YACReader -version=9.5.0 +version=9.6.2 revision=1 wrksrc=yacreader-${version} build_style=qmake @@ -13,7 +13,7 @@ makedepends="qt5-script-devel qt5-declarative-devel qt5-quickcontrols short_desc="Cross-platform reader and manager for your digital comic library" maintainer="Crestwave " license="GPL-3.0-or-later" -changelog="https://raw.githubusercontent.com/YACReader/yacreader/master/CHANGELOG.md" homepage="http://yacreader.com/" +changelog="https://raw.githubusercontent.com/YACReader/yacreader/master/CHANGELOG.md" distfiles="https://github.com/YACReader/yacreader/archive/${version}.tar.gz" -checksum=1104ffa78835b21a3cf611d42e52944ca413bf7feb38f7620fc07950e5f5ad40 +checksum=e58cd10071180c759f53d74ac7049105b8608e63661bd1b68bcbd8fc8a534a80 diff --git a/srcpkgs/abi-compliance-checker/template b/srcpkgs/abi-compliance-checker/template index cc8c7d58cc9..644acae70e6 100644 --- a/srcpkgs/abi-compliance-checker/template +++ b/srcpkgs/abi-compliance-checker/template @@ -7,7 +7,7 @@ hostmakedepends="perl" depends="binutils ctags perl" checkdepends="binutils ctags" short_desc="A tool for checking backward API/ABI compat of a C/C++ library" -maintainer="maxice8 " +maintainer="Orphaned " license="LGPL-2.1-or-later" homepage="https://github.com/lvc/abi-compliance-checker" distfiles="https://github.com/lvc/abi-compliance-checker/archive/${version}.tar.gz" diff --git a/srcpkgs/abireport/template b/srcpkgs/abireport/template index 4054e55d5c4..b23ea4d8565 100644 --- a/srcpkgs/abireport/template +++ b/srcpkgs/abireport/template @@ -1,16 +1,16 @@ # Template file for 'abireport' pkgname=abireport -version=1.0.6 -revision=2 +version=1.0.7 +revision=1 build_style=go go_import_path=github.com/clearlinux/abireport go_package="${go_import_path}/src/abireport" short_desc="Tool to create ABI reports from ELF binaries" -maintainer="maxice8 " +maintainer="Orphaned " license="Apache-2.0" homepage="https://github.com/clearlinux/abireport" distfiles="https://github.com/clearlinux/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz" -checksum=60beb805335302f999c32bda62f56afd6971f27499580fece84fe4d6bb9cb653 +checksum=c46c46bff3dc873cb84a66c639c38b2df14f095d95a4bb77e3b96904b8219399 post_install() { vman man/abireport.1 diff --git a/srcpkgs/ack/template b/srcpkgs/ack/template index 9c406b8f107..7a32670d18f 100644 --- a/srcpkgs/ack/template +++ b/srcpkgs/ack/template @@ -1,6 +1,6 @@ # Template file for 'ack' pkgname=ack -version=3.0.2 +version=3.1.1 revision=1 archs=noarch wrksrc="$pkgname-v$version" @@ -13,4 +13,4 @@ maintainer="Jan S. " license="Artistic-2.0" homepage="https://beyondgrep.com/" distfiles="${CPAN_SITE}/App/ack-v${version}.tar.gz" -checksum=63b4b3bdbdb919f231780b2ce09e73c64b0c407633b36433aa9b574b59cc9528 +checksum=f4778d6d7ef829a7cfd1c7a25f5ae191c4233d002535f3718cc357301008fb92 diff --git a/srcpkgs/acpica-utils/template b/srcpkgs/acpica-utils/template index 01de433f6c1..ea21904a2bb 100644 --- a/srcpkgs/acpica-utils/template +++ b/srcpkgs/acpica-utils/template @@ -1,16 +1,16 @@ # Template file for 'acpica-utils' pkgname=acpica-utils -version=20190509 +version=20190816 revision=1 archs="i686* x86_64*" wrksrc="acpica-unix-${version}" hostmakedepends="flex" short_desc="Intel ACPI CA Unix utilities" -maintainer="Orphaned " +maintainer="Anthony Iliopoulos " license="GPL-2.0-only, BSD-3-Clause" homepage="https://www.acpica.org/" distfiles="https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz" -checksum=f124ab6e99110a192864b23dc6911d180968dd15b49f95f7adc37d69dd14621a +checksum=7aec4dc88a3ba148eecd898e59fb5378573eb6a94585e5538e0b396840d0fc5c do_build() { vsed -e 's/-Werror//g' \ diff --git a/srcpkgs/acpid/template b/srcpkgs/acpid/template index 0bb77771db5..8312d0e4e15 100644 --- a/srcpkgs/acpid/template +++ b/srcpkgs/acpid/template @@ -1,14 +1,14 @@ # Template file for 'acpid' pkgname=acpid -version=2.0.31 -revision=2 +version=2.0.32 +revision=1 build_style=gnu-configure short_desc="The ACPI Daemon (acpid) With Netlink Support" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://sourceforge.net/projects/acpid2/" distfiles="${SOURCEFORGE_SITE}/acpid2/acpid-${version}.tar.xz" -checksum=fc9dc669ed85d9a1739aa76915e0667c6697c5431160f8dfb253046c6a072cc3 +checksum=f2d2d30b3edc3234bd82f6f7186699a6aa3c85c8d20bc4e30e9b3c68a1ed157e conf_files="/etc/acpi/events/anything /etc/acpi/handler.sh" post_install() { diff --git a/srcpkgs/adobe-flash-plugin/template b/srcpkgs/adobe-flash-plugin/template index cd6526df1b7..cab18ca659c 100644 --- a/srcpkgs/adobe-flash-plugin/template +++ b/srcpkgs/adobe-flash-plugin/template @@ -1,7 +1,7 @@ # Template file for 'adobe-flash-plugin' pkgname=adobe-flash-plugin -version=32.0.0.238 -revision=2 +version=32.0.0.270 +revision=1 depends="curl hicolor-icon-theme desktop-file-utils" short_desc="Adobe Flash Player plugin for Netscape compatible browsers" maintainer="Orphaned " @@ -23,15 +23,15 @@ if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then ${_url}/flash_player_npapi_linux.x86_64.tar.gz ${_url}/flash_player_ppapi_linux.x86_64.tar.gz" checksum=" - 3a711c50396819ead949598b0c0bb960ac923172f9d9b6e3db7790dfa4d6fb15 - 0268ebab5dbce2be8941c64f3402edd8c34a245206cf2e5e15ba13bf9e246277" + bccd1207ad080caf942305a5739cf690ae19e0fc2490c3e04ee44191d77c9d9a + 7176857cf2b3198ea5c725a007f12db1e570091675ecbe8648576cd8dd9d56c5" else distfiles=" ${_url}/flash_player_npapi_linux.i386.tar.gz ${_url}/flash_player_ppapi_linux.i386.tar.gz" checksum=" - e08807dcf17b68721658e5d91de781626acc5efb00946508efdde5021ffc871a - cc33e22aab65ee73b1d375cc6456cbba023e6fcfbd5c1ce7c52a585d97f2e16d" + 72cf38a1e6b9c3d4063ef2765f606b1ed77a249c3b937ab818581d7e51fd2d4b + 81eeee21e1e0337747a7668e01a5a89f9379b3ec3ba7d017ba1e38c13720f997" fi distfiles+=" ${_eula}" checksum+=" ${_eulacksum}" diff --git a/srcpkgs/adriconf/template b/srcpkgs/adriconf/template index 5f03859b73d..4055418c83c 100644 --- a/srcpkgs/adriconf/template +++ b/srcpkgs/adriconf/template @@ -1,8 +1,9 @@ # Template file for 'adriconf' pkgname=adriconf -version=1.4 +version=1.5.1 revision=1 build_style=cmake +configure_args="-DENABLE_UNIT_TESTS=false" hostmakedepends="pkg-config glib-devel" makedepends="MesaLib-devel gtkmm-devel boost-devel libxml++3.0-devel pciutils-devel gtest-devel" short_desc="Advanced DRI Configurator" @@ -10,8 +11,4 @@ maintainer="lemmi " license="GPL-3.0-or-later" homepage="https://github.com/jlHertel/adriconf" distfiles="https://github.com/jlHertel/adriconf/archive/v${version}.tar.gz" -checksum=058e7ed2ab2450167de1399898db4a53829b433157f43a1e14e50e7fae01f18c - -post_install() { - vbin build/adriconf -} +checksum=70c676e79302e00838ef0d297230fe03548f50fb2892cbe9318423d7aa1ef3ab diff --git a/srcpkgs/adwaita-icon-theme/template b/srcpkgs/adwaita-icon-theme/template index b1260b3ec2e..85a5d237ba5 100644 --- a/srcpkgs/adwaita-icon-theme/template +++ b/srcpkgs/adwaita-icon-theme/template @@ -1,6 +1,6 @@ # Template file for 'adwaita-icon-theme' pkgname=adwaita-icon-theme -version=3.32.0 +version=3.34.0 revision=1 archs=noarch build_style=gnu-configure @@ -12,4 +12,4 @@ maintainer="Enno Boland " license="LGPL-3.0-or-later, CC-BY-SA-3.0" homepage="https://gitlab.gnome.org/GNOME/adwaita-icon-theme" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=698db6e407bb987baec736c6a30216dfc0317e3ca2403c7adf3a5aa46c193286 +checksum=40b7e91f8263552b64d0f9beff33150291b086618ce498c71bf10035e48c7c7f diff --git a/srcpkgs/afl/template b/srcpkgs/afl/template index 9842510d59f..3cd3b8fcc17 100644 --- a/srcpkgs/afl/template +++ b/srcpkgs/afl/template @@ -1,25 +1,26 @@ # Template file for 'afl' pkgname=afl -version=2.52b +version=2.56b revision=1 -build_style=gnu-makefile # x86 only currently archs="i686* x86_64*" +wrksrc="AFL-${version}" +build_style=gnu-makefile hostmakedepends="llvm clang" short_desc="American fuzzy lop - a brute-force fuzzer" maintainer="Orphaned " license="Apache-2.0" -homepage="http://lcamtuf.coredump.cx/afl/" -distfiles="http://lcamtuf.coredump.cx/afl/releases/afl-${version}.tgz" -checksum=43614b4b91c014d39ef086c5cc84ff5f068010c264c2c05bf199df60898ce045 +homepage="https://github.com/google/AFL/" +distfiles="https://github.com/google/AFL/archive/v${version}.tar.gz" +checksum=1d4a372e49af02fbcef0dc3ac436d03adff577afc2b6245c783744609d9cdd22 nostrip_files="small_archive.a small_exec.elf" do_build() { make PREFIX=/usr - CFLAGS="${CFLAGS} -fPIC" \ - CXXFLAGS="${CXXFLAGS} -fPIC" \ + CFLAGS="${CFLAGS//-fstack-clash-protection} -fPIC" \ + CXXFLAGS="${CXXFLAGS//-fstack-clash-protection} -fPIC" \ LDFLAGS="${LDFLAGS} -pie" \ make PREFIX=/usr CC=clang CXX=clang++ -C llvm_mode } diff --git a/srcpkgs/aisleriot/template b/srcpkgs/aisleriot/template index cf364d25f06..40d46895aa4 100644 --- a/srcpkgs/aisleriot/template +++ b/srcpkgs/aisleriot/template @@ -1,6 +1,6 @@ # Template file for 'aisleriot' pkgname=aisleriot -version=3.22.8 +version=3.22.9 revision=1 _pysol_cardsets=PySolFC-Cardsets _pysol_ver=2.0 @@ -17,7 +17,7 @@ license="GPL-3.0-or-later" homepage="https://wiki.gnome.org/Apps/Aisleriot" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz http://distfiles.voidlinux.de/${_pysol_cardsets}-${_pysol_ver}/${_pysol_cardsets}-${_pysol_ver}.tar.bz2" -checksum="252094ec220691cacbf54cabbdf81fe593cf3cdcb62c7d409cbdfa744c1af596 +checksum="51f2ffe4dd4f23349b033fd87aab7bf433641285719503dd7e52b2c25982ed7b c388d6360191b3b7e463d84e5a64260c4e3ed36e791a85227d7e8923f3f47ca7" aisleriot-data_package() { diff --git a/srcpkgs/akonadi-calendar/template b/srcpkgs/akonadi-calendar/template index 582ba28e1ac..cbda74ac5cf 100644 --- a/srcpkgs/akonadi-calendar/template +++ b/srcpkgs/akonadi-calendar/template @@ -1,7 +1,7 @@ # Template file for 'akonadi-calendar' pkgname=akonadi-calendar -version=19.08.0 -revision=1 +version=19.08.2 +revision=2 build_style=cmake hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools kcoreaddons kconfig" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://community.kde.org/KDE_PIM" distfiles="${KDE_SITE}/applications/${version}/src/akonadi-calendar-${version}.tar.xz" -checksum=74743ff7822ce75f0e0170f154e4596644855a5fe9322a09b76e01bd1d078e3b +checksum=5beba24af485c8dae96944e4b5bd570460eb2868ba069580c2e5d784be38a3c8 akonadi-calendar-devel_package() { depends="${sourcepkg}>=${version}_${revision} ${makedepends}" diff --git a/srcpkgs/akonadi-contacts/template b/srcpkgs/akonadi-contacts/template index c5ef95cc0d0..90191703a9d 100644 --- a/srcpkgs/akonadi-contacts/template +++ b/srcpkgs/akonadi-contacts/template @@ -1,7 +1,7 @@ # Template file for 'akonadi-contacts' pkgname=akonadi-contacts -version=19.08.0 -revision=1 +version=19.08.2 +revision=2 build_style=cmake hostmakedepends="extra-cmake-modules kcoreaddons" makedepends="kio-devel kcontacts-devel kmime-devel akonadi-mime-devel prison-devel" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.0-or-later, GPL-2.0-or-later" homepage="https://community.kde.org/KDE_PIM/Akonadi" distfiles="${KDE_SITE}/applications/${version}/src/akonadi-contacts-${version}.tar.xz" -checksum=912a657a11d1bd1e680a71b43d69a5a871136ed83f171b11c52f1974d7381ce4 +checksum=eafeb550faea91a56109821864eedfbd619dc7850887746d31c1724ea7561920 if [ "$CROSS_BUILD" ];then hostmakedepends+=" qt5-qmake qt5-host-tools python3 kconfig" diff --git a/srcpkgs/akonadi-import-wizard/template b/srcpkgs/akonadi-import-wizard/template index ee192f5226a..f7280d0b44a 100644 --- a/srcpkgs/akonadi-import-wizard/template +++ b/srcpkgs/akonadi-import-wizard/template @@ -1,16 +1,16 @@ # Template file for 'akonadi-import-wizard' pkgname=akonadi-import-wizard -version=19.08.0 -revision=1 +version=19.08.2 +revision=2 build_style=cmake hostmakedepends="extra-cmake-modules kcoreaddons kdoctools qt5-host-tools qt5-qmake" -makedepends="mailcommon-devel mailimporter-devel messagelib-devel" +makedepends="kcontacts-devel mailcommon-devel mailimporter-devel messagelib-devel" short_desc="Import data from other mail clients to KMail" maintainer="John " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://community.kde.org/KDE_PIM" distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz" -checksum=e21454b8ac346c4b8d35e5979dc11346b96e3520df22f44270dc668d5abcd915 +checksum=038713e7d30686eb1b8e49c595ec853ffa52d335e435a5b0bdf2f2a2448cae45 akonadi-import-wizard-devel_package() { depends="${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/akonadi-mime/template b/srcpkgs/akonadi-mime/template index e4af94adf44..9d2af13bc19 100644 --- a/srcpkgs/akonadi-mime/template +++ b/srcpkgs/akonadi-mime/template @@ -1,6 +1,6 @@ # Template file for 'akonadi-mime' pkgname=akonadi-mime -version=19.08.0 +version=19.08.2 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.1-or-later, GPL-2.0-or-later" homepage="https://community.kde.org/KDE_PIM/Akonadi" distfiles="${KDE_SITE}/applications/${version}/src/akonadi-mime-${version}.tar.xz" -checksum=32dcee53d8bd79a4ad85dfa453aa762d69194493ad6622aea4fd7cd05bde3ec4 +checksum=16f8034d7990828c50a85474fe16641dfa46e22d00f49d8045d3483c61815264 if [ "$CROSS_BUILD" ];then hostmakedepends+=" qt5-qmake qt5-host-tools kconfig" diff --git a/srcpkgs/akonadi-notes/template b/srcpkgs/akonadi-notes/template index e97662c08ee..f54c93cf64b 100644 --- a/srcpkgs/akonadi-notes/template +++ b/srcpkgs/akonadi-notes/template @@ -1,6 +1,6 @@ # Template file for 'akonadi-notes' pkgname=akonadi-notes -version=19.08.0 +version=19.08.2 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules python qt5-qmake qt5-host-tools @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later, GPL-2.0-or-later, BSD-2-Clause" homepage="https://kontact.kde.org" distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz" -checksum=26000875958b3a0ff68c5ad871fd697623c8408b88fc46679c8a13ad308c33d3 +checksum=64684c50d06664d8ccda098f8bfa536e861e4938c8f27688ef97653f7788fdde post_install() { vlicense COPYING.BSD COPYING.BSD diff --git a/srcpkgs/akonadi-search/template b/srcpkgs/akonadi-search/template index 2fafd789f0e..be659b8d39f 100644 --- a/srcpkgs/akonadi-search/template +++ b/srcpkgs/akonadi-search/template @@ -1,7 +1,7 @@ # Template file for 'akonadi-search' pkgname=akonadi-search -version=19.08.0 -revision=1 +version=19.08.2 +revision=2 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python AppStream kcoreaddons" @@ -12,7 +12,7 @@ maintainer="John " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://community.kde.org/KDE_PIM" distfiles="${KDE_SITE}/applications/${version}/src/akonadi-search-${version}.tar.xz" -checksum=fadc158343eb7c124454ca3e22ade14230772f1d1a89e04a0059c924ed3959d0 +checksum=75c9713b84a03c60a68ff36652decbf57f4f56a0fb39579f53e7ed80a5ee8525 akonadi-search-devel_package() { depends="${sourcepkg}>=${version}_${revision} ${makedepends}" diff --git a/srcpkgs/akonadi5/template b/srcpkgs/akonadi5/template index a560368b260..68a23cde127 100644 --- a/srcpkgs/akonadi5/template +++ b/srcpkgs/akonadi5/template @@ -1,6 +1,6 @@ # Template file for 'akonadi5' pkgname=akonadi5 -version=19.08.0 +version=19.08.2 revision=1 wrksrc="akonadi-${version}" build_style=cmake @@ -16,7 +16,7 @@ maintainer="Helmut Pozimski " license="LGPL-2.1-or-later" homepage="https://community.kde.org/KDE_PIM/Akonadi" distfiles="${KDE_SITE}/applications/${version}/src/akonadi-${version}.tar.xz" -checksum=ff53f078b024f2674a8b2990515f5cbafe2bc965390d74a464b2a044aee32831 +checksum=f67f0fac07d480739b2d6715862ee47a93fd38f057ac7ef888ed8ddfdc99934f if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-tools-devel qt5-devel kconfig kcoreaddons" diff --git a/srcpkgs/akregator/template b/srcpkgs/akregator/template index 0f0b31406bb..ceaa405b82b 100644 --- a/srcpkgs/akregator/template +++ b/srcpkgs/akregator/template @@ -1,6 +1,6 @@ # Template file for 'akregator' pkgname=akregator -version=19.08.0 +version=19.08.2 revision=1 build_style=cmake configure_args=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson" @@ -13,4 +13,4 @@ maintainer="Helmut Pozimski " license="GPL-2.0-or-later, GFDL-1.2-only" homepage="https://www.kde.org/applications/internet/akregator" distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz" -checksum=d3cb8b97a3d2c9eeb805e1b7fc26cb637ad21589675d837b545580e6be764820 +checksum=cefc0785f40508a80fbf4534eef4d1164e349cfd50455483cef044945d1888c4 diff --git a/srcpkgs/alert-after/template b/srcpkgs/alert-after/template index 191286c6aa5..27dcd62231e 100644 --- a/srcpkgs/alert-after/template +++ b/srcpkgs/alert-after/template @@ -1,7 +1,7 @@ # Template file for 'alert-after' pkgname=alert-after -version=1.4.3 -revision=2 +version=1.5.1 +revision=1 build_style=cargo hostmakedepends="pkg-config" makedepends="dbus-devel" @@ -10,4 +10,4 @@ maintainer="Orphaned " license="Apache-2.0" homepage="https://crates.io/crates/alert-after" distfiles="https://github.com/frewsxcv/alert-after/archive/${version}.tar.gz" -checksum=e0d80e1b4c9cb78f4759a78495f197fa3865eacf9658653ec14ddb010e117b3d +checksum=f40dd43f667735741be95f753e52d3ec36731fcb3c3217084ad07e70dbac7a2a diff --git a/srcpkgs/alertmanager/template b/srcpkgs/alertmanager/template index 530e93fe081..f7f5533a569 100644 --- a/srcpkgs/alertmanager/template +++ b/srcpkgs/alertmanager/template @@ -1,6 +1,6 @@ # Template file for 'alertmanager' pkgname=alertmanager -version=0.17.0 +version=0.19.0 revision=1 build_style=go go_import_path="github.com/prometheus/alertmanager" @@ -15,7 +15,7 @@ maintainer="Toyam Cox " license="Apache-2.0" homepage="https://github.com/prometheus/alertmanager" distfiles="https://github.com/prometheus/alertmanager/archive/v${version}.tar.gz" -checksum=8254591e058338b31a023f0eb3ab69de9d1547e0a446d28cab4664609793e4a2 +checksum=4730664f746173f89804df43b3f608cac030e79baae165d6d99df472eb52d36a system_accounts="_alertmanager" make_dirs="/var/lib/alertmanager 700 _alertmanager _alertmanager" diff --git a/srcpkgs/alkimia/template b/srcpkgs/alkimia/template index 679c0c1c499..342011f742a 100644 --- a/srcpkgs/alkimia/template +++ b/srcpkgs/alkimia/template @@ -1,6 +1,6 @@ # Template file for 'alkimia' pkgname=alkimia -version=8.0.1 +version=8.0.2 revision=1 build_style=cmake configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson -DBUILD_TESTING=OFF" @@ -14,7 +14,7 @@ maintainer="Helmut Pozimski " license="LGPL-2.1-or-later" homepage="https://www.linux-apps.com/content/show.php/libalkimia?content=137323" distfiles="${KDE_SITE}/alkimia/${version}/alkimia-${version}.tar.xz" -checksum=f5601780f6ed95b5e14dd3a243ecd1afbdbdb522f0e32dec2fb86933ec363115 +checksum=616f7736fde8ce8acec4575f14e856fabfefb0961d932198d42fbd9a639a852a libalkimia-devel_package() { short_desc+=" - development files" diff --git a/srcpkgs/alpine/patches/418e8bc5.patch b/srcpkgs/alpine/patches/418e8bc5.patch new file mode 100644 index 00000000000..7cc8dc7a8c8 --- /dev/null +++ b/srcpkgs/alpine/patches/418e8bc5.patch @@ -0,0 +1,22 @@ +From 418e8bc5789d9ef223f043848619b6a648748dcc Mon Sep 17 00:00:00 2001 +From: Eduardo Chappa +Date: Thu, 22 Aug 2019 19:11:53 -0600 +Subject: [PATCH 1/1] * Ignore extra text in challenge from smtp server + during authentication. + +--- + imap/src/c-client/smtp.c | 1 + + pith/pine.hlp | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +--- imap/src/c-client/smtp.c ++++ imap/src/c-client/smtp.c +@@ -363,6 +363,7 @@ void *smtp_challenge (void *s,unsigned long *len) + sprintf (tmp,"SMTP SERVER BUG (invalid challenge, continuing): %.80s",stream->reply+4); + mm_log (tmp,ERROR); + ret = cpystr(""); /* This is silly: fake a reply, it will be ignored */ ++ *len = 0L; + } + return ret; + } + diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template index 9c8a0f8bb4e..6557a6debc6 100644 --- a/srcpkgs/alpine/template +++ b/srcpkgs/alpine/template @@ -1,7 +1,7 @@ # Template file for 'alpine' pkgname=alpine version=2.21.99999 -revision=1 +revision=2 _githash=abeb2c25935ef8c75f1e5deef0f81276754dc975 _gitshort="${_githash:0:7}" wrksrc="${pkgname}-${_gitshort}" diff --git a/srcpkgs/amdvlk/patches/musl.patch b/srcpkgs/amdvlk/patches/musl.patch index 9cf3d74915f..5e4e1e9f18d 100644 --- a/srcpkgs/amdvlk/patches/musl.patch +++ b/srcpkgs/amdvlk/patches/musl.patch @@ -1,23 +1,3 @@ -From a9dc984a35f0f522e3a1ec0d310facb3246a5d0f Mon Sep 17 00:00:00 2001 -From: John Zimmermann -Date: Fri, 25 Jan 2019 13:47:21 +0000 -Subject: [PATCH] Fix Compilation against Musl libc - -diff --git pal/shared/gpuopen/inc/posix/ddPosixPlatform.h pal/shared/gpuopen/inc/posix/ddPosixPlatform.h -index df54bfe..55d707c 100644 ---- pal/shared/gpuopen/inc/posix/ddPosixPlatform.h -+++ pal/shared/gpuopen/inc/posix/ddPosixPlatform.h -@@ -72,6 +72,9 @@ static_assert(false, "Unknown platform detected") - #else - #define DD_AXIOMATICALLY_CANNOT_HAPPEN(expr) ((expr) ? DD_UNUSED(0) : __builtin_unreachable()) - #endif -+#if defined(__linux__) && !defined(__GLIBC__) -+#include "rand48_r.h" -+#endif - - namespace DevDriver - { - --- pal/shared/gpuopen/src/posix/ddPosixSocket.cpp 2019-03-01 15:31:04.000000000 +0100 +++ - 2019-03-04 15:42:00.789284605 +0100 @@ -34,12 +34,12 @@ @@ -35,16 +15,3 @@ index df54bfe..55d707c 100644 #include #include ---- pal/shared/gpuopen/CMakeLists.txt 2019-06-06 14:52:37.000000000 +0200 -+++ - 2019-06-10 19:23:05.932195923 +0200 -@@ -72,6 +72,10 @@ - set(THREADS_PREFER_PTHREAD_FLAG ON) - find_package(Threads REQUIRED) - target_link_libraries(${GPUOPEN_LIB_NAME} Threads::Threads) -+ check_symbol_exists(seed48_r stdlib.h HAVE_RAND48) -+ if(NOT HAVE_RAND48) -+ target_link_libraries(${GPUOPEN_LIB_NAME} rand48_r) -+ endif() - endif() - - ### Build Defines ###################################################################################################### diff --git a/srcpkgs/amdvlk/template b/srcpkgs/amdvlk/template index 58b7b030dc0..ef74969d1a3 100644 --- a/srcpkgs/amdvlk/template +++ b/srcpkgs/amdvlk/template @@ -1,17 +1,21 @@ # Template file for 'amdvlk' pkgname=amdvlk -version=2019.Q3.4 +version=2019.Q3.6 revision=1 -_llpc_commit=0da6ca8e09f41639636a106f9b9ca74df50321ce -_xgl_commit=9b632ef4f132bddc94769702ed8b49efbc39d89c -_pal_commit=66e78b997748d03d77e1d706c10f1f17e18e5654 +_llpc_commit=4fa48ef1cf0f81eafdb56df91c2f2180d4865101 +_xgl_commit=331558e93794068a786bf699d3fe23bb11bac021 +_pal_commit=68b57dba33a4d922e8f1ef1b3781c2f659ffbd1c _llvm_commit=9bc5dd4450a6361faf5c5661056a7ee494fad830 _spvgen_commit=2f31d1170e8a12a66168b23235638c4bbc43ecdc +_MetroHash_commit=2b6fee002db6cc92345b02aeee963ebaaf4c0e2f +_CWPack_commit=b601c88aeca7a7b08becb3d32709de383c8ee428 archs="i686* x86_64*" create_wrksrc=yes build_wrksrc="xgl" build_style=cmake -configure_args="-DBUILD_WAYLAND_SUPPORT=ON" +configure_args="-DBUILD_WAYLAND_SUPPORT=ON + -DXGL_METROHASH_PATH=../../metrohash + -DXGL_CWPACK_PATH=../../cwpack" hostmakedepends="pkg-config python3 perl" makedepends="libxml2-devel xorg-server-devel libXrandr-devel" depends="vulkan-loader" @@ -24,20 +28,20 @@ distfiles="https://github.com/GPUOpen-Drivers/AMDVLK/archive/v-${version}.tar.gz https://github.com/GPUOpen-Drivers/xgl/archive/${_xgl_commit}.tar.gz https://github.com/GPUOpen-Drivers/pal/archive/${_pal_commit}.tar.gz https://github.com/GPUOpen-Drivers/llvm/archive/${_llvm_commit}.tar.gz - https://github.com/GPUOpen-Drivers/spvgen/archive/${_spvgen_commit}.tar.gz" -checksum="01777c1cfe4df7dce4feb91e75658fbc865dd5c755ff79451191a0cf8de1c7a4 - 00bf10ff483ba5f6420fb3bfe34f7ce77c6d33515840df64ed1e2858e0eeb831 - 6baede0581d63bdf88cc72c8c496b0cef534ee244dd4f74bcb39a9e0e0beeacd - e8a29b20a166cb7139157a40e88b8087ed33097871dcaee1bfda61b6a417886f + 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="9afb90b56c3c1213c97ef3364b1d31d0e85a81469c861b43dc389af5672c6331 + abe541ef6cd4fa3ca1eaab52412caa29e2adedec0fab40894aef88d33deee584 + 939a2cf69d840e01da8b3e69f5ffe1f852f9d2919cdbc8aa4ade7cff7ac56906 + 7648ca7761b588b6025f8fe16fcf4216bf7e1fe53c6568377f5cca98feca9627 efbde2752044ec74d522c160899491105dbc77bb8a08ff64c274d2b94a6916d1 - cc946ad2835e502aca904c5f87802a2004eaed4729cb5c1dc29a5258d1c1e401" + cc946ad2835e502aca904c5f87802a2004eaed4729cb5c1dc29a5258d1c1e401 + e8ecf026584dd953e39c3abba2eb04d28b28ed4577482ee70265f0d421fef398 + 58ca397f33d62bcfecaecd89eb4ad466a6c33e1c619e5cf742822074f1f7d664" nocross=yes lib32files="/usr/share/vulkan/icd.d/amd_icd32.json" -case $XBPS_TARGET_MACHINE in - *-musl) makedepends+=" rand48_r-devel" -esac - post_extract() { mv ${wrksrc}/AMDVLK-v-${version} ${wrksrc}/AMDVLK mv ${wrksrc}/xgl-${_xgl_commit} ${wrksrc}/xgl @@ -45,6 +49,8 @@ post_extract() { mv ${wrksrc}/llpc-${_llpc_commit} ${wrksrc}/llpc mv ${wrksrc}/llvm-${_llvm_commit} ${wrksrc}/llvm mv ${wrksrc}/spvgen-${_spvgen_commit} ${wrksrc}/spvgen + mv ${wrksrc}/MetroHash-${_MetroHash_commit} ${wrksrc}/metrohash + mv ${wrksrc}/CWPack-${_CWPack_commit} ${wrksrc}/cwpack } pre_configure() { diff --git a/srcpkgs/amiri-font/template b/srcpkgs/amiri-font/template index c20ce968b52..a9b07e456c4 100644 --- a/srcpkgs/amiri-font/template +++ b/srcpkgs/amiri-font/template @@ -1,7 +1,7 @@ # Template file for 'amiri-font' pkgname=amiri-font -version=0.111 -revision=2 +version=0.112 +revision=1 archs=noarch wrksrc="Amiri-${version}" hostmakedepends="unzip" @@ -12,7 +12,7 @@ license="OFL-1.1" homepage="https://github.com/alif-type/amiri/" changelog="https://github.com/alif-type/amiri/blob/master/NEWS.md" distfiles="https://github.com/alif-type/amiri/releases/download/${version}/Amiri-${version}.zip" -checksum=1fbfccced6348b5db2c1c21d5b319cd488e14d055702fa817a0f6cb83d882166 +checksum=b9da1916f5e1028ea5d8404f7ac7b3722576d794b1053b6be11f1a02651ddf3c font_dirs="/usr/share/fonts/TTF" do_install() { diff --git a/srcpkgs/amp/template b/srcpkgs/amp/template index ad20f0cb8eb..dcb603b52f6 100644 --- a/srcpkgs/amp/template +++ b/srcpkgs/amp/template @@ -1,20 +1,20 @@ # Template file for 'amp' pkgname=amp -version=0.5.2 -revision=3 +version=0.6.0 +revision=1 build_style=cargo hostmakedepends="cmake git perl pkg-config python3" makedepends="libcurl-devel libgit2-devel libxcb-devel" -short_desc="A complete text editor for your terminal" +short_desc="Complete text editor for your terminal" maintainer="Wilson Birney " license="GPL-3.0-or-later" homepage="https://amp.rs" changelog="https://raw.githubusercontent.com/jmacdonald/amp/master/CHANGELOG.md" distfiles="https://github.com/jmacdonald/amp/archive/${version}.tar.gz" -checksum=e1f22a829205cf44f8c3fcf5660dbdb9a3c5a1f64b92c67dcdb75a30ad7e5a60 +checksum=3529e9aa51df80ff3bd9db340423bf0975b58473fc0a307ea6eee799089ee2e2 export LIBGIT2_SYS_USE_PKG_CONFIG=1 pre_build() { - cargo update --package openssl-sys --precise 0.9.46 + cargo update --package openssl-sys --precise 0.9.49 } diff --git a/srcpkgs/amtk/template b/srcpkgs/amtk/template index 9381324e983..e642fe7b5d3 100644 --- a/srcpkgs/amtk/template +++ b/srcpkgs/amtk/template @@ -1,18 +1,18 @@ # Template file for 'amtk' pkgname=amtk -version=5.0.0 -revision=3 +version=5.0.1 +revision=1 build_style=gnu-configure build_helper="gir" configure_args="$(vopt_enable gir introspection)" hostmakedepends="pkg-config glib-devel" makedepends="gtk+3-devel libglib-devel" short_desc="Actions, Menus and Toolbars Kit for GTK+ applications" -maintainer="maxice8 " +maintainer="Orphaned " license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/Amtk" distfiles="${GNOME_SITE}/amtk/${version%.*}/amtk-${version}.tar.xz" -checksum=12a996978a30b7b69a810ac0c5656d5cf2f58d9787b98a0c028ff1b64e8f31ff +checksum=2d1cf4a4468655f93c90a2dde2e08b1ea0b3960c0aee04eb206c201d7849de27 build_options="gir" build_options_default="gir" diff --git a/srcpkgs/android-studio/template b/srcpkgs/android-studio/template index 4ccbb3e2221..5838e3f29ed 100644 --- a/srcpkgs/android-studio/template +++ b/srcpkgs/android-studio/template @@ -1,23 +1,21 @@ # Template file for 'android-studio' pkgname=android-studio -version=3.3.2 +version=3.4.2 revision=1 # _studio_build and _studio_rev are for downloading the zip from dl.google.com # https://developer.android.com/studio/#resources as of 2018-07-12 -_studio_build=182.5314842 +_studio_build=183.5692245 _studio_rev=0 archs="x86_64 i686" create_wrksrc=yes -build_style=fetch -hostmakedepends="unzip" depends="gtk+ libGL" short_desc="Official Android IDE" maintainer="Jordyn Carattini " license="Apache-2.0" homepage="http://tools.android.com/" # changelog="https://developer.android.com/studio/releases/index.html" -distfiles="https://dl.google.com/dl/android/studio/ide-zips/${version}.${_studio_rev}/android-studio-ide-${_studio_build}-linux.zip" -checksum=8257d3eab61c3da088e26689888a13e53e210c109a4e775ed71158b4471bb06a +distfiles="https://dl.google.com/dl/android/studio/ide-zips/${version}.${_studio_rev}/android-studio-ide-${_studio_build}-linux.tar.gz" +checksum=35eb8c74837d1aab59229101fc91568a607ac04854a40209f7a0ba7ac0601924 repository=nonfree nopie=yes nostrip=yes @@ -32,18 +30,37 @@ skiprdeps="/opt/android-studio/plugins/android/resources/installer/arm64-v8a/ins /opt/android-studio/plugins/android/resources/perfa/x86_64/libperfa.so /opt/android-studio/plugins/android/resources/perfd/arm64-v8a/perfd /opt/android-studio/plugins/android/resources/perfd/armeabi-v7a/perfd - /opt/android-studio/plugins/android/resources/perfd/x86/perfd" + /opt/android-studio/plugins/android/resources/perfd/x86/perfd + /opt/android-studio/plugins/android/resources/simpleperf/arm64-v8a/simpleperf + /opt/android-studio/plugins/android/resources/simpleperf/armeabi-v7a/simpleperf + /opt/android-studio/plugins/android/resources/simpleperf/x86/simpleperf + /opt/android-studio/plugins/android/resources/simpleperf/x86_64/simpleperf" + +do_extract() { + tar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}-ide-${_studio_build}-linux.tar.gz --strip-components=1 -C ${wrksrc} +} do_install() { - unzip android-studio-ide-${_studio_build}-linux.zip vmkdir opt/${pkgname} - vcopy android-studio/bin opt/${pkgname}/ - vcopy android-studio/gradle opt/${pkgname}/ - vcopy android-studio/lib opt/${pkgname}/ - vcopy android-studio/jre opt/${pkgname}/ - vcopy android-studio/plugins opt/${pkgname}/ + vcopy bin opt/${pkgname}/ + vcopy gradle opt/${pkgname}/ + vcopy lib opt/${pkgname}/ + vcopy jre opt/${pkgname}/ + vcopy plugins opt/${pkgname}/ + vcopy build.txt opt/${pkgname}/ # read as IDE version information + vcopy product-info.json opt/${pkgname}/ vmkdir usr/bin ln -s /opt/android-studio/bin/studio.sh ${DESTDIR}/usr/bin/android-studio + + # The version of host-side simpleperf bundled with Android Studio (as of 3.4.2) requires + # libncurses.so.5, which is not provided by Void Linux. However, as host-side simpleperf + # parsing is a fairly recent addition, we can just disable it... + + rm -r ${DESTDIR}/opt/android-studio/plugins/android/resources/simpleperf/linux-x86 + rm -r ${DESTDIR}/opt/android-studio/plugins/android/resources/simpleperf/linux-x86_64 + echo "-Dprofiler.cpu.simpleperf.host=false" >> ${DESTDIR}/opt/android-studio/bin/studio.vmoptions + echo "-Dprofiler.cpu.simpleperf.host=false" >> ${DESTDIR}/opt/android-studio/bin/studio64.vmoptions + vinstall "${FILESDIR}/android-studio.desktop" 644 usr/share/applications/ chmod -R ugo+rX ${DESTDIR}/opt } diff --git a/srcpkgs/android-tools/files/generate_build.rb b/srcpkgs/android-tools/files/generate_build.rb deleted file mode 100755 index c7674446998..00000000000 --- a/srcpkgs/android-tools/files/generate_build.rb +++ /dev/null @@ -1,405 +0,0 @@ -#!/usr/bin/ruby -# This ruby script has been copied from Arch Linux. - -# Android build system is complicated and does not allow to build -# separate parts easily. -# This script tries to mimic Android build rules. - -def expand(dir, files) - files.map{|f| File.join(dir,f)} -end - -# Compiles sources to *.o files. -# Returns array of output *.o filenames -def compile(sources, cflags) - outputs = [] - for s in sources - ext = File.extname(s) - - case ext - when '.c' - cc = 'cc' - lang_flags = '-std=gnu11 $CFLAGS $CPPFLAGS' - when '.cpp', '.cc' - cc = 'cxx' - lang_flags = '-std=gnu++17 $CXXFLAGS $CPPFLAGS' - else - raise "Unknown extension #{ext}" - end - - output = s + '.o' - outputs << output - puts "build #{output}: #{cc} #{s}\n cflags = #{lang_flags} #{cflags}" - end - - return outputs -end - -# dir - directory where ninja file is located -# lib - static library path relative to dir -def subninja(dir, lib) - puts "subninja #{dir}build.ninja" - return lib.each{|l| dir + l} -end - -# Links object files -def link(output, objects, ldflags) - puts "build #{output}: link #{objects.join(' ')}\n ldflags = #{ldflags} $LDFLAGS" -end - -puts "# This set of commands generated by generate_build.rb script\n\n" -puts "CC = #{ENV['CC'] || 'clang'}" -puts "CXX = #{ENV['CXX'] || 'clang++'}\n\n" -puts "CFLAGS = #{ENV['CFLAGS']}" -puts "CXXFLAGS = #{ENV['CXXFLAGS']}" -puts "LDFLAGS = #{ENV['LDFLAGS']}" -puts "PKGVER = #{ENV['PKGVER']}\n\n" - - -puts """ -rule cc - command = $CC $cflags -c $in -o $out - -rule cxx - command = $CXX $cflags -c $in -o $out - -rule link - command = $CXX $ldflags $LDFLAGS $in -o $out - - -""" - -adbdfiles = %w( - adb.cpp - adb_io.cpp - adb_listeners.cpp - adb_trace.cpp - adb_utils.cpp - bugreport.cpp - line_printer.cpp - sockets.cpp - transport.cpp - transport_local.cpp - transport_usb.cpp - transport_mdns_unsupported.cpp - fdevent.cpp - adb_auth_host.cpp - shell_service_protocol.cpp -) -libadbd = compile(expand('core/adb', adbdfiles), '-DADB_VERSION="\"$PKGVER\"" -DADB_HOST=1 -Icore/include -Icore/base/include -Icore/adb -Icore/libcrypto_utils/include -Iboringssl/include') - -adbfiles = %w( - console.cpp - socket_spec.cpp - commandline.cpp - adb_client.cpp - services.cpp - file_sync_client.cpp - sysdeps_unix.cpp - sysdeps/errno.cpp - client/main.cpp - client/usb_dispatch.cpp - client/usb_linux.cpp - client/usb_libusb.cpp - sysdeps/posix/network.cpp -) -libadb = compile(expand('core/adb', adbfiles), '-D_GNU_SOURCE -DADB_HOST=1 -Icore/include -Icore/base/include -Icore/adb') - -basefiles = %w( - file.cpp - logging.cpp - parsenetaddress.cpp - stringprintf.cpp - strings.cpp - errors_unix.cpp - test_utils.cpp -) -libbase = compile(expand('core/base', basefiles), '-DADB_HOST=1 -Icore/base/include -Icore/include') - -logfiles = %w( - log_event_write.c - fake_log_device.c - log_event_list.c - logger_write.c - config_write.c - config_read.c - logger_lock.c - local_logger.c - fake_writer.c - logger_name.c - stderr_write.c - logprint.c -) -liblog = compile(expand('core/liblog', logfiles), '-DLIBLOG_LOG_TAG=1006 -D_XOPEN_SOURCE=700 -DFAKE_LOG_DEVICE=1 -Icore/log/include -Icore/include') - -cutilsfiles = %w( - load_file.cpp - socket_local_client_unix.cpp - socket_network_client_unix.cpp - socket_local_server_unix.cpp - sockets_unix.cpp - socket_inaddr_any_server_unix.cpp - sockets.cpp - android_get_control_file.cpp - threads.cpp - fs_config.cpp - canned_fs_config.cpp -) -libcutils = compile(expand('core/libcutils', cutilsfiles), '-D_GNU_SOURCE -Icore/libcutils/include -Icore/include') - -diagnoseusbfiles = %w( - diagnose_usb.cpp -) -libdiagnoseusb = compile(expand('core/adb', diagnoseusbfiles), '-Icore/include -Icore/base/include') - -libcryptofiles = %w( - android_pubkey.c -) -libcrypto = compile(expand('core/libcrypto_utils', libcryptofiles), '-Icore/libcrypto_utils/include -Iboringssl/include') - -# TODO: make subninja working -#boringssl = subninja('boringssl/build/', ['crypto/libcrypto.a']) -boringssl = ['boringssl/build/crypto/libcrypto.a'] - -link('adb', libbase + liblog + libcutils + libadbd + libadb + libdiagnoseusb + libcrypto + boringssl, '-lpthread -lusb-1.0') - - -fastbootfiles = %w( - protocol.cpp - engine.cpp - bootimg_utils.cpp - fastboot.cpp - util.cpp - fs.cpp - usb_linux.cpp - socket.cpp - tcp.cpp - udp.cpp -) -libfastboot = compile(expand("core/fastboot", fastbootfiles), '-DFASTBOOT_VERSION="\"$PKGVER\"" -D_GNU_SOURCE -D_XOPEN_SOURCE=700 -DUSE_F2FS -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils/include -Iextras/f2fs_utils -Icore/libziparchive/include -Icore/mkbootimg/include/bootimg') - -sparsefiles = %w( - backed_block.c - output_file.c - sparse.c - sparse_crc32.c - sparse_err.c - sparse_read.cpp -) -libsparse = compile(expand('core/libsparse', sparsefiles), '-Icore/libsparse/include -Icore/base/include') - -f2fsfiles = %w( -) -f2fs = compile(expand("extras/f2fs_utils", f2fsfiles), "-DHAVE_LINUX_TYPES_H -If2fs-tools/include -Icore/liblog/include") - -zipfiles = %w( - zip_archive.cc -) -libzip = compile(expand('core/libziparchive', zipfiles), '-Icore/base/include -Icore/include -Icore/libziparchive/include') - -utilfiles = %w( - FileMap.cpp -) -libutil = compile(expand('core/libutils', utilfiles), '-Icore/include') - -ext4files = %w( - ext4_utils.c - wipe.c - ext4_sb.c -) -libext4 = compile(expand('extras/ext4_utils', ext4files), '-D_GNU_SOURCE -Icore/libsparse/include -Icore/include -Iselinux/libselinux/include -Iextras/ext4_utils/include') - -selinuxfiles = %w( - callbacks.c - check_context.c - freecon.c - init.c - label.c - label_file.c - label_support.c - setrans_client.c - regex.c - matchpathcon.c - selinux_config.c - label_backends_android.c - canonicalize_context.c - lsetfilecon.c - policyvers.c - lgetfilecon.c - load_policy.c - seusers.c - sha1.c - booleans.c - disable.c - enabled.c - getenforce.c - setenforce.c -) -libselinux = compile(expand('selinux/libselinux/src', selinuxfiles), '-DAUDITD_LOG_TAG=1003 -D_GNU_SOURCE -DHOST -DUSE_PCRE2 -DNO_PERSISTENTLY_STORED_PATTERNS -DDISABLE_SETRANS -DDISABLE_BOOL -DNO_MEDIA_BACKEND -DNO_X_BACKEND -DNO_DB_BACKEND -DPCRE2_CODE_UNIT_WIDTH=8 -Iselinux/libselinux/include -Iselinux/libsepol/include') - -libsepolfiles = %w( - policydb_public.c - genbools.c - debug.c - policydb.c - conditional.c - services.c - ebitmap.c - util.c - assertion.c - avtab.c - hashtab.c - sidtab.c - context.c - genusers.c - context_record.c - mls.c - avrule_block.c - symtab.c - policydb_convert.c - write.c - constraint.c - expand.c - hierarchy.c -) -libsepol = compile(expand('selinux/libsepol/src', libsepolfiles), '-Iselinux/libsepol/include') - -link('fastboot', libsparse + libzip + libcutils + liblog + libutil + libbase + libext4 + f2fs + libselinux + libsepol + libfastboot + libdiagnoseusb, '-lz -lpcre2-8 -lpthread -ldl') - - -# mke2fs.android - a ustom version of mke2fs that supports --android_sparse (FS#56955) -libext2fsfiles = %w( - lib/blkid/cache.c - lib/blkid/dev.c - lib/blkid/devname.c - lib/blkid/devno.c - lib/blkid/getsize.c - lib/blkid/llseek.c - lib/blkid/probe.c - lib/blkid/read.c - lib/blkid/resolve.c - lib/blkid/save.c - lib/blkid/tag.c - lib/e2p/feature.c - lib/e2p/hashstr.c - lib/e2p/mntopts.c - lib/e2p/ostype.c - lib/e2p/parse_num.c - lib/e2p/uuid.c - lib/et/com_err.c - lib/et/error_message.c - lib/et/et_name.c - lib/ext2fs/alloc.c - lib/ext2fs/alloc_sb.c - lib/ext2fs/alloc_stats.c - lib/ext2fs/alloc_tables.c - lib/ext2fs/atexit.c - lib/ext2fs/badblocks.c - lib/ext2fs/bb_inode.c - lib/ext2fs/bitmaps.c - lib/ext2fs/bitops.c - lib/ext2fs/blkmap64_ba.c - lib/ext2fs/blkmap64_rb.c - lib/ext2fs/blknum.c - lib/ext2fs/block.c - lib/ext2fs/bmap.c - lib/ext2fs/closefs.c - lib/ext2fs/crc16.c - lib/ext2fs/crc32c.c - lib/ext2fs/csum.c - lib/ext2fs/dirblock.c - lib/ext2fs/dir_iterate.c - lib/ext2fs/expanddir.c - lib/ext2fs/ext2_err.c - lib/ext2fs/ext_attr.c - lib/ext2fs/extent.c - lib/ext2fs/fallocate.c - lib/ext2fs/fileio.c - lib/ext2fs/freefs.c - lib/ext2fs/gen_bitmap64.c - lib/ext2fs/gen_bitmap.c - lib/ext2fs/get_num_dirs.c - lib/ext2fs/getsectsize.c - lib/ext2fs/getsize.c - lib/ext2fs/hashmap.c - lib/ext2fs/i_block.c - lib/ext2fs/ind_block.c - lib/ext2fs/initialize.c - lib/ext2fs/inline.c - lib/ext2fs/inline_data.c - lib/ext2fs/inode.c - lib/ext2fs/io_manager.c - lib/ext2fs/ismounted.c - lib/ext2fs/link.c - lib/ext2fs/llseek.c - lib/ext2fs/lookup.c - lib/ext2fs/mkdir.c - lib/ext2fs/mkjournal.c - lib/ext2fs/mmp.c - lib/ext2fs/namei.c - lib/ext2fs/newdir.c - lib/ext2fs/openfs.c - lib/ext2fs/progress.c - lib/ext2fs/punch.c - lib/ext2fs/rbtree.c - lib/ext2fs/read_bb.c - lib/ext2fs/read_bb_file.c - lib/ext2fs/res_gdt.c - lib/ext2fs/rw_bitmaps.c - lib/ext2fs/sha512.c - lib/ext2fs/sparse_io.c - lib/ext2fs/symlink.c - lib/ext2fs/undo_io.c - lib/ext2fs/unix_io.c - lib/ext2fs/valid_blk.c - lib/support/dict.c - lib/support/mkquota.c - lib/support/parse_qtype.c - lib/support/plausible.c - lib/support/prof_err.c - lib/support/profile.c - lib/support/quotaio.c - lib/support/quotaio_tree.c - lib/support/quotaio_v2.c - lib/uuid/gen_uuid.c - lib/uuid/isnull.c - lib/uuid/pack.c - lib/uuid/parse.c - lib/uuid/unpack.c - lib/uuid/unparse.c - misc/create_inode.c -) -libext2fs = compile(expand("e2fsprogs", libext2fsfiles), "-Ie2fsprogs/lib -Ie2fsprogs/lib/ext2fs -Icore/libsparse/include") - - -mke2fsfiles = %w( - misc/default_profile.c - misc/mke2fs.c - misc/mk_hugefiles.c - misc/util.c -) -mke2fs = compile(expand('e2fsprogs', mke2fsfiles), '-Ie2fsprogs/lib') - -link('mke2fs.android', mke2fs + libext2fs + libsparse + libbase + libzip + liblog + libutil, '-lpthread -lz') - - -e2fsdroidfiles = %w( - contrib/android/e2fsdroid.c - contrib/android/basefs_allocator.c - contrib/android/block_range.c - contrib/android/base_fs.c - contrib/android/fsmap.c - contrib/android/block_list.c - contrib/android/perms.c -) -e2fsdroid = compile(expand("e2fsprogs", e2fsdroidfiles), "-Ie2fsprogs/lib -Ie2fsprogs/lib/ext2fs -Iselinux/libselinux/include -Icore/libcutils/include -Ie2fsprogs/misc") - -link('e2fsdroid', e2fsdroid + libext2fs + libsparse + libbase + libzip + liblog + libutil + libselinux + libsepol + libcutils, '-lz -lpthread -lpcre2-8') - - -ext2simgfiles = %w( - contrib/android/ext2simg.c -) -ext2simg = compile(expand('e2fsprogs', ext2simgfiles), '-Ie2fsprogs/lib -Icore/libsparse/include') - -link('ext2simg', ext2simg + libext2fs + libsparse + libbase + libzip + liblog + libutil, '-lz -lpthread') diff --git a/srcpkgs/android-tools/patches/gcc-fixes.patch b/srcpkgs/android-tools/patches/gcc-fixes.patch deleted file mode 100644 index fc0e60fa06e..00000000000 --- a/srcpkgs/android-tools/patches/gcc-fixes.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- core/adb/sysdeps.h -+++ core/adb/sysdeps.h -@@ -66,6 +66,11 @@ - #endif - #endif - -+#ifndef __clang__ -+#define _Nonnull -+#define _Nullable -+#endif -+ - #ifdef _WIN32 - - // Clang-only nullability specifiers ---- core/libcutils/include/cutils/trace.h -+++ core/libcutils/include/cutils/trace.h -@@ -18,7 +18,13 @@ - #define _LIBS_CUTILS_TRACE_H - - #include -+// https://gcc.gnu.org/PR60932 -+#ifdef __cplusplus -+#include -+using namespace std; -+#else - #include -+#endif - #include - #include - #include diff --git a/srcpkgs/android-tools/patches/include-sys-sysmacros.patch b/srcpkgs/android-tools/patches/include-sys-sysmacros.patch deleted file mode 100644 index 592473ac93f..00000000000 --- a/srcpkgs/android-tools/patches/include-sys-sysmacros.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- core/adb/client/usb_linux.cpp 2019-01-02 20:03:26.218600891 +0100 -+++ - 2019-01-02 20:03:57.806149467 +0100 -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/srcpkgs/android-tools/patches/musl-fixes.patch b/srcpkgs/android-tools/patches/musl-fixes.patch deleted file mode 100644 index 235ef68854e..00000000000 --- a/srcpkgs/android-tools/patches/musl-fixes.patch +++ /dev/null @@ -1,199 +0,0 @@ -Patch has been taken from Arch Linux with some minor modifications for -needed to build android-tools with musl libc. - -diff -upr core.orig/adb/client/usb_libusb.cpp core/adb/client/usb_libusb.cpp ---- core.orig/adb/client/usb_libusb.cpp 2017-11-29 19:11:44.000000000 +0100 -+++ core/adb/client/usb_libusb.cpp 2018-02-25 10:35:06.661418453 +0100 -@@ -21,6 +21,7 @@ - #include - - #include -+#include - #include - #include - #include -@@ -28,7 +29,7 @@ - #include - #include - --#include -+#include - - #include - #include -diff -upr core.orig/adb/diagnose_usb.cpp core/adb/diagnose_usb.cpp ---- core.orig/adb/diagnose_usb.cpp 2017-11-29 19:11:44.000000000 +0100 -+++ core/adb/diagnose_usb.cpp 2018-02-25 10:35:06.658085109 +0100 -@@ -45,9 +45,7 @@ static std::string GetUdevProblem() { - return ""; - } - -- // getgroups(2) indicates that the GNU group_member(3) may not check the egid so we check it -- // additionally just to be sure. -- if (group_member(plugdev_group->gr_gid) || getegid() == plugdev_group->gr_gid) { -+ if (getegid() == plugdev_group->gr_gid) { - // The user is in plugdev so the problem is likely with the udev rules. - return "user in plugdev group; are your udev rules wrong?"; - } -diff -upr core.orig/adb/sysdeps/posix/network.cpp core/adb/sysdeps/posix/network.cpp ---- core.orig/adb/sysdeps/posix/network.cpp 2017-11-29 19:11:44.000000000 +0100 -+++ core/adb/sysdeps/posix/network.cpp 2018-02-25 10:35:06.661418453 +0100 -@@ -21,6 +21,7 @@ - #include - - #include -+#include - - #include "adb_unique_fd.h" - -diff -upr core.orig/base/errors_unix.cpp core/base/errors_unix.cpp ---- core.orig/base/errors_unix.cpp 2017-11-29 19:11:44.000000000 +0100 -+++ core/base/errors_unix.cpp 2018-02-25 10:35:06.654751766 +0100 -@@ -17,6 +17,7 @@ - #include "android-base/errors.h" - - #include -+#include - - namespace android { - namespace base { -diff -upr core.orig/base/file.cpp core/base/file.cpp ---- core.orig/base/file.cpp 2017-11-29 19:11:44.000000000 +0100 -+++ core/base/file.cpp 2018-02-25 10:35:06.654751766 +0100 -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - - #include - #include -diff -upr core.orig/base/logging.cpp core/base/logging.cpp ---- core.orig/base/logging.cpp 2017-11-29 19:11:44.000000000 +0100 -+++ core/base/logging.cpp 2018-02-25 10:35:06.654751766 +0100 -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - - // For getprogname(3) or program_invocation_short_name. - #if defined(__ANDROID__) || defined(__APPLE__) -@@ -89,7 +90,7 @@ static thread_id GetThreadId() { - } - - namespace { --#if defined(__GLIBC__) -+#if defined(__linux__) - const char* getprogname() { - return program_invocation_short_name; - } -diff -upr core.orig/fastboot/fs.cpp core/fastboot/fs.cpp ---- core.orig/fastboot/fs.cpp 2017-11-29 19:11:44.000000000 +0100 -+++ core/fastboot/fs.cpp 2018-02-25 10:35:06.651418422 +0100 -@@ -108,7 +108,7 @@ static int generate_ext4_image(const cha - static constexpr int block_size = 4096; - const std::string exec_dir = android::base::GetExecutableDirectory(); - -- const std::string mke2fs_path = exec_dir + "/mke2fs"; -+ const std::string mke2fs_path = exec_dir + "/mke2fs.android"; - std::vector mke2fs_args = {mke2fs_path.c_str(), "-t", "ext4", "-b"}; - - std::string block_size_str = std::to_string(block_size); -diff -upr core.orig/fastboot/socket.cpp core/fastboot/socket.cpp ---- core.orig/fastboot/socket.cpp 2017-11-29 19:11:44.000000000 +0100 -+++ core/fastboot/socket.cpp 2018-02-25 10:35:06.651418422 +0100 -@@ -28,6 +28,8 @@ - - #include "socket.h" - -+#include -+ - #include - #include - -diff -upr core.orig/libsparse/sparse_read.cpp core/libsparse/sparse_read.cpp ---- core.orig/libsparse/sparse_read.cpp 2017-11-29 19:11:44.000000000 +0100 -+++ core/libsparse/sparse_read.cpp 2018-02-25 10:35:06.621418331 +0100 -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - #include - - #include -diff -upr selinux.orig/libsepol/src/private.h selinux/libsepol/src/private.h ---- selinux.orig/libsepol/src/private.h 2017-08-13 09:34:17.000000000 +0200 -+++ selinux/libsepol/src/private.h 2018-02-25 10:36:31.765008355 +0100 -@@ -14,7 +14,7 @@ - #endif - - #include --#include -+#include "dso.h" - - #ifdef __APPLE__ - #define __BYTE_ORDER BYTE_ORDER -diff -upr selinux.orig/libsepol/src/util.c selinux/libsepol/src/util.c ---- selinux.orig/libsepol/src/util.c 2017-08-13 09:34:17.000000000 +0200 -+++ selinux/libsepol/src/util.c 2018-02-25 10:36:31.765008355 +0100 -@@ -27,7 +27,7 @@ - #include - #include - #include --#include -+#include "dso.h" - - struct val_to_name { - unsigned int val; -diff -upr e2fsprogs.orig/contrib/android/perms.c e2fsprogs/contrib/android/perms.c ---- e2fsprogs.orig/contrib/android/perms.c 2017-11-29 00:28:33.000000000 +0100 -+++ e2fsprogs/contrib/android/perms.c 2018-02-25 10:37:13.048466147 +0100 -@@ -5,6 +5,7 @@ - #include "support/nls-enable.h" - #include - #include -+#include "private/android_filesystem_capability.h" - - #ifndef XATTR_SELINUX_SUFFIX - # define XATTR_SELINUX_SUFFIX "selinux" -diff -upr e2fsprogs.orig/lib/ext2fs/bitops.h e2fsprogs/lib/ext2fs/bitops.h ---- e2fsprogs.orig/lib/ext2fs/bitops.h 2017-11-29 00:28:33.000000000 +0100 -+++ e2fsprogs/lib/ext2fs/bitops.h 2018-02-25 10:37:13.028466087 +0100 -@@ -233,11 +233,11 @@ extern errcode_t ext2fs_find_first_set_g - #if (__STDC_VERSION__ >= 199901L) - #define _INLINE_ extern inline - #else --#define _INLINE_ inline -+#define _INLINE_ static inline - #endif - #else /* !INCLUDE_INLINE FUNCS */ - #if (__STDC_VERSION__ >= 199901L) --#define _INLINE_ inline -+#define _INLINE_ static inline - #else /* not C99 */ - #ifdef __GNUC__ - #define _INLINE_ extern __inline__ -diff -upr e2fsprogs.orig/lib/ext2fs/ext2fs.h e2fsprogs/lib/ext2fs/ext2fs.h ---- e2fsprogs.orig/lib/ext2fs/ext2fs.h 2017-11-29 00:28:33.000000000 +0100 -+++ e2fsprogs/lib/ext2fs/ext2fs.h 2018-02-25 10:37:13.028466087 +0100 -@@ -53,9 +53,7 @@ extern "C" { - */ - #define EXT2_LIB_CURRENT_REV EXT2_DYNAMIC_REV - --#ifdef HAVE_SYS_TYPES_H - #include --#endif - - #include - #include -@@ -1736,7 +1734,7 @@ extern const struct ext2_inode *ext2fs_c - #define _INLINE_ extern - #else - #if (__STDC_VERSION__ >= 199901L) --#define _INLINE_ inline -+#define _INLINE_ static inline - #else - #ifdef __GNUC__ - #define _INLINE_ extern __inline__ diff --git a/srcpkgs/android-tools/patches/undef__USE_GNU.patch b/srcpkgs/android-tools/patches/undef__USE_GNU.patch deleted file mode 100644 index 03fb129c1c1..00000000000 --- a/srcpkgs/android-tools/patches/undef__USE_GNU.patch +++ /dev/null @@ -1,24 +0,0 @@ -Source: John -Upstream: No -Reason: Conflicting declaration of copy_file_range on GLIBC - -FAILED: e2fsprogs/misc/create_inode.c.o -cc -std=gnu11 -D_FORTIFY_SOURCE=2 -mtune=generic -O2 -pipe -Ie2fsprogs/lib -Ie2fsprogs/lib/ext2fs -Icore/libsparse/include -c e2fsprogs/misc/create_inode.c -o e2fsprogs/misc/create_inode.c.o -e2fsprogs/misc/create_inode.c:406:18: error: conflicting types for 'copy_file_range' - static errcode_t copy_file_range(ext2_filsys fs, int fd, ext2_file_t e2_file, - ^~~~~~~~~~~~~~~ -In file included from e2fsprogs/misc/create_inode.c:20: -/usr/include/unistd.h:1107:9: note: previous declaration of 'copy_file_range' was here - ssize_t copy_file_range (int __infd, __off64_t *__pinoff, - ^~~~~~~~~~~~~~~ - ---- e2fsprogs/misc/create_inode.c 2019-01-02 20:07:51.685424116 +0100 -+++ - 2019-01-02 20:08:17.379127932 +0100 -@@ -17,6 +17,7 @@ - #include - #include - #include -+#undef __USE_GNU - #include - #include /* for PATH_MAX */ - #ifdef HAVE_ATTR_XATTR_H diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template index 12806884ec0..cbf06abc647 100644 --- a/srcpkgs/android-tools/template +++ b/srcpkgs/android-tools/template @@ -1,56 +1,24 @@ # Template file for 'android-tools' pkgname=android-tools -# NOTE: not all upstream updates has code changes for the parts -# of android used by android-tools. Check for diff with: -# curl -L http://git.io/vvC0Z | sh -s 5.0.2_r1 5.1.0_r1 -version=9.0.0r45 -revision=2 -archs="x86_64* i686*" -_distver=${version/r/_r} -#See https://android.googlesource.com/platform/development/+/refs/tags/android-${_distver}/sdk/plat_tools_source.prop_template -_apiver="28.0.0 rc1" -create_wrksrc=yes -hostmakedepends="ruby cmake ninja perl go" +version=29.0.4 +revision=1 +archs="armv* aarch64* x86_64* i686*" +build_style=cmake +hostmakedepends="perl go" makedepends="gtest-devel zlib-devel libressl-devel libusb-devel pcre2-devel" short_desc="Android platform tools (adb and fastboot)" maintainer="John " license="Apache-2.0, ISC, GPL-2.0-only, MIT" homepage="http://developer.android.com/tools/help/adb.html" -_baseurl=https://android.googlesource.com/platform -distfiles=" - ${_baseurl}/system/core/+archive/android-${_distver}.tar.gz>core.tar.gz - ${_baseurl}/system/extras/+archive/android-${_distver}.tar.gz>extras.tar.gz - ${_baseurl}/external/selinux/+archive/android-${_distver}.tar.gz>selinux.tar.gz - ${_baseurl}/external/f2fs-tools/+archive/android-${_distver}.tar.gz>f2fs-tools.tar.gz - ${_baseurl}/external/e2fsprogs/+archive/android-${_distver}.tar.gz>e2fsprogs.tar.gz - ${_baseurl}/external/avb/+archive/android-${_distver}.tar.gz>avb.tar.gz - https://boringssl.googlesource.com/boringssl/+archive/3538.tar.gz>boringssl.tar.gz" -# Contents checksums because the tarballs change with every download -checksum="@dfaea8c40be4a8bbd1df513ab3516ff88e92430ee0fde399dd7e7e09ec21cd29 - @0a43d228088faabe8b7150fa752c8b0c002503c0d830d8470ecea351f195bbb3 - @9f2b5e379eca4c56e2d422598831bfd7bdf2b7b3c3d011ce513c7603aa46b574 - @f1efc86a1e78521f4754d184d682c1f6660c04f74496913f37cae9e2670db0e8 - @e98509632e865e792dc4b344b0a1ada0662dda7571534fa7c5d1a8902dcfb0f4 - @5c2fcb88154f9b6ffed8d24a069e4bad0a7aea1936be2ce18af972ad8762e09a - @452e29d95f8da494896e3335931e928d9b7c94500a5793101bb19629cd7dea8c" +distfiles="https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz" +checksum=5428e16a2baba79665cac0b11be81aa0cfa6920dc20da039711cc3d3b96a333b -do_extract() { - local tarball p - for p in ${distfiles}; do - tarball=${p##*>} - mkdir -p ${wrksrc}/${tarball/.*} - tar -x --no-same-permissions --no-same-owner -f \ - ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${tarball} \ - -C ${wrksrc}/${tarball/.*} - done -} +case "$XBPS_TARGET_MACHINE" in + armv[56]*) makedepends+=" libatomic-devel" + ;; +esac pre_configure() { - PKGVER="${_apiver}-void-${version}_${revision}" ${FILESDIR}/generate_build.rb > build.ninja - - mkdir -p boringssl/build - cd boringssl/build - # Don't check for CROSS_COMPILING, since i686 container/chroot inside # x86_64 host will failed to build this. if [ "${XBPS_TARGET_MACHINE}" = i686 ] && [ "$(uname -m)" = "x86_64" ]; then @@ -62,34 +30,19 @@ pre_configure() { SET(CMAKE_CXX_COMPILER ${CXX}) SET(CMAKE_SYSTEM_PROCESSOR x86) _EOF + configure_args+=" ${boring_ssl_cmake_args}" fi - cmake -GNinja \ - -DBUILD_SHARED_LIBS=FALSE \ - -DCMAKE_BUILD_TYPE=RELEASE \ - -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ - -DCMAKE_C_FLAGS="$CFLAGS" \ - $boring_ssl_cmake_args \ - .. - ninja + case "${XBPS_TARGET_MACHINE}" in + armv[56]*) sed -i vendor/CMakeLists.adb.txt \ + -e "/target_link_libraries/s;$; atomic;" + ;; + esac } -do_build() { - ninja -} - -do_install() { - for i in adb fastboot mke2fs.android e2fsdroid ext2simg \ - core/mkbootimg/mkbootimg avb/avbtool ;do - vbin $i - done - vlicense boringssl/LICENSE boringssl.LICENSE - vlicense boringssl/third_party/fiat/LICENSE fiat.LICENSE - vlicense boringssl/third_party/googletest/LICENSE gtest.LICENSE - vlicense boringssl/third_party/android-cmake/LICENSE android-cmake.LICENSE +post_install() { + vlicense vendor/boringssl/LICENSE boringssl.LICENSE + vlicense vendor/boringssl/third_party/fiat/LICENSE fiat.LICENSE + vlicense vendor/boringssl/third_party/googletest/LICENSE gtest.LICENSE vsv adb } - -# REMARKS: -# If there is any reason at all that fastboot may not be a position independent -# executable, please document it here. diff --git a/srcpkgs/android-tools/update b/srcpkgs/android-tools/update index e5c3658d328..49895605477 100644 --- a/srcpkgs/android-tools/update +++ b/srcpkgs/android-tools/update @@ -1,2 +1,2 @@ site="https://android.googlesource.com/platform/system/core" -pattern='android-\K[\d._r]+' +pattern='platform-tools-\K[\d._r]+' diff --git a/srcpkgs/angband/template b/srcpkgs/angband/template index 9b118cc9489..c9a1c5e0db2 100644 --- a/srcpkgs/angband/template +++ b/srcpkgs/angband/template @@ -1,18 +1,18 @@ # Template file for 'angband' pkgname=angband -version=4.1.3 +version=4.2.0 revision=1 build_style=gnu-configure configure_args="--enable-sdl --enable-sdl-mixer" hostmakedepends="automake" makedepends="SDL_image-devel SDL_mixer-devel SDL_ttf-devel" -short_desc="A free, single-player dungeon exploration game" +short_desc="Free, single-player dungeon exploration game" maintainer="Diogo Leal " license="GPL-2.0-or-later" homepage="http://rephial.org/" changelog="http://rephial.org/release/" -distfiles="http://rephial.org/downloads/4.1/angband-${version}.tar.gz" -checksum=9402c4f8da691edbd4567a948c5663e1066bee3fcb4a62fbcf86b5454918406f +distfiles="http://rephial.org/downloads/4.2/angband-${version}.tar.gz" +checksum=d3e1495c7cc2a4ee66de7b4e612d3b133048072e37504bd2e58a2351ab0fb56d pre_configure() { NOCONFIGURE=1 ./autogen.sh diff --git a/srcpkgs/anki/template b/srcpkgs/anki/template index 78d8089b5a7..c7248395618 100644 --- a/srcpkgs/anki/template +++ b/srcpkgs/anki/template @@ -1,6 +1,6 @@ # Template file for 'anki' pkgname=anki -version=2.1.13 +version=2.1.15 revision=2 archs=noarch build_style=gnu-makefile @@ -14,7 +14,7 @@ license="AGPL-3.0-or-later" homepage="https://apps.ankiweb.net" changelog="https://apps.ankiweb.net/docs/changes.html" distfiles="https://apps.ankiweb.net/downloads/current/anki-${version}-source.tgz" -checksum=8166eebc54575aa55eeff0886ffec3228b3c377885abf9cc18561b7a01cb8edb +checksum=5a53760164c77d619f55107a13099cffe620566a7f610b61b6c4b52487f3bb89 pycompile_version="$py3_ver" diff --git a/srcpkgs/ansi/template b/srcpkgs/ansi/template index c40ac829b2f..7c877d9c823 100644 --- a/srcpkgs/ansi/template +++ b/srcpkgs/ansi/template @@ -5,7 +5,7 @@ revision=1 archs=noarch depends="bash" short_desc="ANSI escape codes in pure Bash" -maintainer="maxice8 " +maintainer="Orphaned " license="MIT" homepage="https://github.com/fidian/ansi" changelog="https://raw.githubusercontent.com/fidian/ansi/master/CHANGELOG.md" diff --git a/srcpkgs/anydesk/template b/srcpkgs/anydesk/template index 4f760bc124d..6de2c0969bc 100644 --- a/srcpkgs/anydesk/template +++ b/srcpkgs/anydesk/template @@ -1,6 +1,6 @@ # Template file for 'anydesk' pkgname=anydesk -version=5.1.1 +version=5.1.2 revision=1 archs="i686 x86_64" wrksrc=${pkgname}-${version} @@ -14,10 +14,10 @@ restricted=yes if [ "${XBPS_TARGET_MACHINE}" = "x86_64" ] ; then distfiles="https://download.anydesk.com/linux/anydesk-${version}-amd64.tar.gz" - checksum=cb72b79ac1476bfb295f3e27d2127d4868107e324f6473b089b448c7f3df55a4 + checksum=02d98ca58dfa053d5dc59fb198992a3066ebd66b9faff8948421d233b5e03d56 elif [ "${XBPS_TARGET_MACHINE}" = "i686" ]; then - distfiles="https://download.anydesk.com/linux/anydesk-${version}-i686.tar.gz" - checksum=87d9a4ccfa6e46c7174e943453fc97418c73b6b8255631f36e9def3bc3fe6b82 + distfiles="https://download.anydesk.com/linux/anydesk-${version}-i386.tar.gz" + checksum=6ca826ead232e9bd54fb445524ab5efee5df7edd84fc90cd30567b54376950bf fi do_install() { @@ -29,4 +29,3 @@ do_install() { vbin anydesk vlicense copyright } - diff --git a/srcpkgs/apache-directory-studio b/srcpkgs/apache-directory-studio new file mode 120000 index 00000000000..da11f0190a6 --- /dev/null +++ b/srcpkgs/apache-directory-studio @@ -0,0 +1 @@ +apache-directory-studio-bin \ No newline at end of file diff --git a/srcpkgs/apache-directory-studio/files/ApacheDirectoryStudio.desktop b/srcpkgs/apache-directory-studio-bin/files/ApacheDirectoryStudio.desktop similarity index 100% rename from srcpkgs/apache-directory-studio/files/ApacheDirectoryStudio.desktop rename to srcpkgs/apache-directory-studio-bin/files/ApacheDirectoryStudio.desktop diff --git a/srcpkgs/apache-directory-studio/template b/srcpkgs/apache-directory-studio-bin/template similarity index 56% rename from srcpkgs/apache-directory-studio/template rename to srcpkgs/apache-directory-studio-bin/template index 61392aa39d0..0353d15dcdd 100644 --- a/srcpkgs/apache-directory-studio/template +++ b/srcpkgs/apache-directory-studio-bin/template @@ -1,25 +1,26 @@ # Template file for 'apache-directory-studio' -pkgname=apache-directory-studio +pkgname=apache-directory-studio-bin _pkgname=ApacheDirectoryStudio -version=2.0.0.v20170904 +version=2.0.0.v20180908 revision=1 +_versionprefix=M14 depends="virtual?java-runtime gtk+ desktop-file-utils" short_desc="LDAP browser and directory client" -maintainer="Orphaned " +maintainer="Frank Steinborn " license="Apache-2.0" -homepage="http://directory.apache.org/studio/" archs="i686 x86_64" +homepage="http://directory.apache.org/studio/" nopie=yes if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then _arch="x86_64" - checksum=581d55f3496827710301dec613466d829cf9a3ed3d4308460e63ca08aaa9d6c9 + checksum=faae04c6d37bfd1e1ac6cd997399d5d314de7ba9b7279fd7b9c9e052cea0044f elif [ "$XBPS_TARGET_MACHINE" = "i686" ]; then _arch="x86" - checksum=96281c2af3b1ea04e423b41b465a93b21607ce41b3dc3771861e0b52557eb5af + checksum=38c0ca414961852e6b1d3960124fb12f45ccfcd03779537291afe02725f20d0d fi -distfiles="http://apache.mindstudios.com/directory/studio/${version}-M13/${_pkgname}-${version}-M13-linux.gtk.${_arch}.tar.gz" +distfiles="https://www-eu.apache.org/dist/directory/studio/${version}-${_versionprefix}/${_pkgname}-${version}-${_versionprefix}-linux.gtk.${_arch}.tar.gz" wrksrc="${_pkgname}" do_install() { @@ -31,3 +32,9 @@ do_install() { ln -sf /opt/${_pkgname}/${_pkgname} ${DESTDIR}/usr/bin/${_pkgname} ln -sf /opt/${_pkgname}/${_pkgname} ${DESTDIR}/usr/bin/${pkgname//-/} } + +apache-directory-studio_package() { + depends="${sourcepkg}>=${version}_${revision}" + build_style=meta + short_desc+=" (transitional dummy package)" +} diff --git a/srcpkgs/apache-directory-studio/update b/srcpkgs/apache-directory-studio-bin/update similarity index 100% rename from srcpkgs/apache-directory-studio/update rename to srcpkgs/apache-directory-studio-bin/update diff --git a/srcpkgs/apache-jmeter/update b/srcpkgs/apache-jmeter/update new file mode 100644 index 00000000000..cb43837f485 --- /dev/null +++ b/srcpkgs/apache-jmeter/update @@ -0,0 +1 @@ +site=https://jmeter.apache.org/download_jmeter.cgi diff --git a/srcpkgs/apache-maven/template b/srcpkgs/apache-maven/template index e5cb31b40c5..573423ccb43 100644 --- a/srcpkgs/apache-maven/template +++ b/srcpkgs/apache-maven/template @@ -1,6 +1,6 @@ # Template file for 'apache-maven' pkgname=apache-maven -version=3.6.1 +version=3.6.2 revision=1 archs=noarch hostmakedepends="openjdk" @@ -11,8 +11,8 @@ license="Apache-2.0" homepage="https://maven.apache.org/" distfiles="https://www-us.apache.org/dist/maven/maven-3/${version}/source/${pkgname}-${version}-src.tar.gz https://www-us.apache.org/dist/maven/maven-3/${version}/binaries/apache-maven-${version}-bin.tar.gz" -checksum="025921fff6ba827a25413ffc08fb1933565eb1f07ee2d3f228911913ee4f3c3f - 2528c35a99c30f8940cc599ba15d34359d58bec57af58c1075519b8cd33b69e7" +checksum="7ed94655b4098729de292a13c96765bb90a407bb6feb64f201a9444aebde69d1 + 3fbc92d1961482d6fbd57fbf3dd6d27a4de70778528ee3fb44aa7d27eb32dfdc" do_build() { ./bin/mvn package -DskipTests -Drat.skip=true -Dmaven.repo.local=repo -DdistributionTargetDir=${DESTDIR}/usr/share/${pkgname}/ diff --git a/srcpkgs/apache-tomcat/template b/srcpkgs/apache-tomcat/template index 49a82f9b526..64a981fd38b 100644 --- a/srcpkgs/apache-tomcat/template +++ b/srcpkgs/apache-tomcat/template @@ -1,6 +1,6 @@ # Template file for 'apache-tomcat' pkgname=apache-tomcat -version=9.0.22 +version=9.0.26 revision=1 wrksrc="${pkgname}-${version}-src" hostmakedepends="openjdk apache-ant" @@ -10,7 +10,7 @@ maintainer="Michael Aldridge " license="Apache-2.0" homepage="https://tomcat.apache.org" distfiles="http://mirrors.gigenet.com/apache/tomcat/tomcat-9/v${version}/src/${pkgname}-${version}-src.tar.gz" -checksum=3058585ddea3f5133b2883b750536b4693950152c399b99a99e0ecc0b4e0caa4 +checksum=d061aa50bcc51e28c40f5a2d5a06999d9a49ddcae5410f3bac99c8d5ded61935 system_accounts="tomcat" make_dirs="/usr/share/${pkgname}/webapps 0755 tomcat tomcat diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template index c83d4ba5f51..b62093f0358 100644 --- a/srcpkgs/apache/template +++ b/srcpkgs/apache/template @@ -1,7 +1,7 @@ # Template file for 'apache' pkgname=apache -version=2.4.39 -revision=2 +version=2.4.41 +revision=1 wrksrc="httpd-${version}" build_style=gnu-configure configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all @@ -37,7 +37,8 @@ license="Apache-2.0" homepage="http://httpd.apache.org/" changelog="http://www.apache.org/dist/httpd/CHANGES_2.4" distfiles="https://archive.apache.org/dist/httpd/httpd-${version}.tar.bz2" -checksum=b4ca9d05773aa59b54d66cd8f4744b945289f084d3be17d7981d1783a5decfa2 +checksum=133d48298fe5315ae9366a0ec66282fa4040efa5d566174481077ade7d18ea40 +nocross="https://build.voidlinux.org/builders/armv7l_builder/builds/20326/steps/shell_3/logs/stdio" system_accounts="_${pkgname}" _apache_homedir="/srv/www/$pkgname" diff --git a/srcpkgs/api-sanity-checker/template b/srcpkgs/api-sanity-checker/template index 96ad3b7879a..765c5c3fc63 100644 --- a/srcpkgs/api-sanity-checker/template +++ b/srcpkgs/api-sanity-checker/template @@ -6,7 +6,7 @@ build_style=gnu-makefile hostmakedepends="perl abi-compliance-checker" depends="abi-compliance-checker perl binutils ctags" short_desc="An automatic generator of basic C/C++ library unit tests" -maintainer="maxice8 " +maintainer="Orphaned " license="LGPL-2.1-or-later" homepage="https://lvc.github.io/api-sanity-checker/" distfiles="https://github.com/lvc/api-sanity-checker/archive/${version}.tar.gz" diff --git a/srcpkgs/apparmor/template b/srcpkgs/apparmor/template index a51f79c409d..c0ef28bae03 100644 --- a/srcpkgs/apparmor/template +++ b/srcpkgs/apparmor/template @@ -1,7 +1,7 @@ # Template file for 'apparmor' pkgname=apparmor -version=2.13.2 -revision=7 +version=2.13.3 +revision=1 wrksrc="${pkgname}-v${version}" build_wrksrc=libraries/libapparmor build_style=gnu-configure @@ -16,7 +16,7 @@ maintainer="Olivier Mauras " license="GPL-2.0-only, LGPL-2.1-only" homepage="https://gitlab.com/apparmor/apparmor" distfiles="https://gitlab.com/apparmor/apparmor/-/archive/v${version}/apparmor-v${version}.tar.gz" -checksum=83edb98c729dc5388407aea23ea7aedb62c00db70131853f1eae15a27d71ca1d +checksum=2e32413a83108c3213d60f439ec2865432eb839a577425ee92489c45ac8ce7e4 patch_args="-Np1" if [ -z "$CROSS_BUILD" ]; then @@ -95,4 +95,3 @@ libapparmor-devel_package() { vmove usr/lib/pkgconfig } } - diff --git a/srcpkgs/apt/template b/srcpkgs/apt/template index cbb652c1e91..49a8e087855 100644 --- a/srcpkgs/apt/template +++ b/srcpkgs/apt/template @@ -1,6 +1,6 @@ # Template file for 'apt' pkgname=apt -version=1.8.2 +version=1.8.4 revision=1 build_style=cmake configure_args="-DDPKG_DATADIR=/usr/share/dpkg -DCURRENT_VENDOR=debian @@ -13,7 +13,7 @@ maintainer="Elie ROUDNINSKI " license="GPL-2.0-or-later" homepage="https://salsa.debian.org/apt-team/apt" distfiles="https://github.com/Debian/apt/archive/${version}.tar.gz" -checksum=6ff2ede3ffc707ae51c80e5026199816ce7baab038e55aa96aa7eabe0e910bb6 +checksum=41fcd2f1825405c6f0333b5e47eadf13bd9b3ca20d3b7abc26680683198d8ec8 case "$XBPS_TARGET_MACHINE" in *-musl) broken="error: void value not ignored as it ought to be" ;; diff --git a/srcpkgs/aptly/template b/srcpkgs/aptly/template index 7113619a063..4098ebc02d8 100644 --- a/srcpkgs/aptly/template +++ b/srcpkgs/aptly/template @@ -1,6 +1,6 @@ # Template file for 'aptly' pkgname=aptly -version=1.3.0 +version=1.4.0 revision=1 build_style=go go_import_path=github.com/aptly-dev/aptly @@ -9,7 +9,7 @@ maintainer="Tassilo Schweyer " license="MIT" homepage="https://www.aptly.info/" distfiles="https://github.com/aptly-dev/aptly/archive/v$version.tar.gz" -checksum=4d993dd790345e54dd963467a475ae160a7133bae7ee42844f15d5e82c1fb36e +checksum=4172d54613139f6c34d5a17396adc9675d7ed002e517db8381731d105351fbe5 post_install() { vlicense LICENSE diff --git a/srcpkgs/aqbanking/template b/srcpkgs/aqbanking/template index 7f547ad9444..ed906ea0645 100644 --- a/srcpkgs/aqbanking/template +++ b/srcpkgs/aqbanking/template @@ -1,7 +1,6 @@ # Template file for 'aqbanking' pkgname=aqbanking -_dnrel=217 -version=5.7.8 +version=5.8.2 revision=1 build_style=gnu-configure hostmakedepends="pkg-config gwenhywfar" @@ -10,8 +9,8 @@ short_desc="Library for online banking and financial applications" maintainer="Enno Boland " license="GPL-2.0-only, GPL-3.0-only" homepage="http://www.aquamaniac.de/aqbanking" -distfiles="http://www.aquamaniac.de/sites/download/download.php?package=03&release=${_dnrel}&file=02&dummy=aqbanking-$version.tar.gz" -checksum=16f86e4cc49a9eaaa8dfe3206607e627873208bce45a70030c3caea9b5afc768 +distfiles="https://www.aquamaniac.de/rdm/attachments/download/107/aqbanking-${version}.tar.gz" +checksum=93ca523fe175e72042db75f8c3fc6255ab058cf82caf52796e15f030809fb15e disable_parallel_build=yes if [ "$CROSS_BUILD" ]; then diff --git a/srcpkgs/aquatone/template b/srcpkgs/aquatone/template index 02e2b239665..f6215fe4ee6 100644 --- a/srcpkgs/aquatone/template +++ b/srcpkgs/aquatone/template @@ -1,6 +1,6 @@ # Template file for 'aquatone' pkgname=aquatone -version=1.4.3 +version=1.7.0 revision=1 build_style=go go_import_path=github.com/michenriksen/aquatone @@ -10,7 +10,7 @@ maintainer="Alex Childs " license="MIT" homepage="https://github.com/michenriksen/aquatone" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=8a54c597814a246b5b61cb1b5c1bc267fdbf47a83dbc55d5e7800c90b25a2cbb +checksum=7849dce3241df663ea6edd9a9433d5ecc20fb768d0192ccbfb28d61d67ebcc97 post_install() { vlicense LICENSE.txt diff --git a/srcpkgs/arc-theme/template b/srcpkgs/arc-theme/template index a40cf0e0ede..627fa1bad00 100644 --- a/srcpkgs/arc-theme/template +++ b/srcpkgs/arc-theme/template @@ -1,16 +1,16 @@ # Template file for 'arc-theme' pkgname=arc-theme -version=20190330 +version=20190917 revision=1 archs=noarch build_style=gnu-configure configure_script="./autogen.sh" hostmakedepends="automake glib-devel gnome-shell pkg-config sassc optipng inkscape" makedepends="gtk+3-devel" -depends="gnome-themes-standard gtk-engine-murrine" +depends="gnome-themes-extra gtk-engine-murrine" short_desc="Flat theme with transparent elements for GTK 3, GTK 2 and GNOME Shell" maintainer="jtalowell " license="GPL-3.0-or-later" -homepage="https://github.com/NicoHood/arc-theme" -distfiles="https://github.com/NicoHood/arc-theme/archive/${version}.tar.gz" -checksum=9e420be8ae3d71ca67882db7f44c5d8c199170751f7470865bf77e8762aa1d5f +homepage="https://github.com/arc-design/arc-theme" +distfiles="https://github.com/arc-design/arc-theme/archive/${version}.tar.gz" +checksum=7ec7ee60fe7c4de0dfbb407b02fde92f1acc87a07e5ed59d6af3d3c822b0ca59 diff --git a/srcpkgs/archiver/template b/srcpkgs/archiver/template index 942228d1767..e1c510df2b0 100644 --- a/srcpkgs/archiver/template +++ b/srcpkgs/archiver/template @@ -1,7 +1,7 @@ # Template file for 'archiver' pkgname=archiver -version=3.1.1 -revision=2 +version=3.2.0 +revision=1 build_style=go go_import_path=github.com/mholt/archiver go_package="${go_import_path}/cmd/arc" @@ -11,7 +11,7 @@ maintainer="Orphaned " license="MIT" homepage="https://github.com/mholt/archiver" distfiles="https://github.com/mholt/archiver/archive/v${version}.tar.gz" -checksum=41ec54a7e0165c9bf1a567589a453c243394efff41dc446532f2028d98b476ac +checksum=919182c8a2ae8095b12f059a1b2826107629bd13bdba6a429cb3d97eac6ae065 post_install() { vlicense LICENSE diff --git a/srcpkgs/arduino/patches/astyle_fix.patch b/srcpkgs/arduino/patches/astyle_fix.patch new file mode 100644 index 00000000000..7b07f574420 --- /dev/null +++ b/srcpkgs/arduino/patches/astyle_fix.patch @@ -0,0 +1,34 @@ +--- astyle/src/astyle_main.cpp 2017-05-30 20:26:37.000000000 -0400 ++++ astyle/src/astyle_main.cpp 2019-09-11 20:38:02.155936887 -0400 +@@ -3749,7 +3749,7 @@ + // called by a java program to get the version number + // the function name is constructed from method names in the calling java program + extern "C" EXPORT +-jstring STDCALL Java_AStyleInterface_AStyleGetVersion(JNIEnv* env, jclass) ++jstring STDCALL Java_cc_arduino_packages_formatter_AStyleInterface_AStyleGetVersion(JNIEnv* env, jclass) + { + return env->NewStringUTF(g_version); + } +@@ -3757,7 +3757,7 @@ + // called by a java program to format the source code + // the function name is constructed from method names in the calling java program + extern "C" EXPORT +-jstring STDCALL Java_AStyleInterface_AStyleMain(JNIEnv* env, ++jstring STDCALL Java_cc_arduino_packages_formatter_AStyleInterface_AStyleMain(JNIEnv* env, + jobject obj, + jstring textInJava, + jstring optionsJava) +--- astyle/src/astyle_main.h 2017-05-30 20:26:37.000000000 -0400 ++++ astyle/src/astyle_main.h 2019-09-11 20:39:15.953536523 -0400 +@@ -406,9 +406,9 @@ + char* STDCALL javaMemoryAlloc(unsigned long memoryNeeded); + // the following function names are constructed from method names in the calling java program + extern "C" EXPORT +-jstring STDCALL Java_AStyleInterface_AStyleGetVersion(JNIEnv* env, jclass); ++jstring STDCALL Java_cc_arduino_packages_formatter_AStyleInterface_AStyleGetVersion(JNIEnv* env, jclass); + extern "C" EXPORT +-jstring STDCALL Java_AStyleInterface_AStyleMain(JNIEnv* env, ++jstring STDCALL Java_cc_arduino_packages_formatter_AStyleInterface_AStyleMain(JNIEnv* env, + jobject obj, + jstring textInJava, + jstring optionsJava); diff --git a/srcpkgs/arduino/patches/disable-dependency-build.patch b/srcpkgs/arduino/patches/disable-dependency-build.patch index ac27de7601e..970decc78e1 100644 --- a/srcpkgs/arduino/patches/disable-dependency-build.patch +++ b/srcpkgs/arduino/patches/disable-dependency-build.patch @@ -1,5 +1,5 @@ ---- build/build.xml.orig 2019-02-26 02:16:33.845398910 +0100 -+++ build/build.xml 2019-02-26 02:22:56.667235290 +0100 +--- Arduino-1.8.9/build/build.xml.orig 2019-02-26 02:16:33.845398910 +0100 ++++ Arduino-1.8.9/build/build.xml 2019-02-26 02:22:56.667235290 +0100 @@ -649,15 +649,6 @@ diff --git a/srcpkgs/arduino/template b/srcpkgs/arduino/template index ed5954c9195..d877176f70c 100644 --- a/srcpkgs/arduino/template +++ b/srcpkgs/arduino/template @@ -1,9 +1,11 @@ # Template file for 'arduino' pkgname=arduino version=1.8.9 -revision=1 +revision=2 archs="x86_64* i686* aarch64* arm*" -wrksrc=Arduino-$version +wrksrc=$pkgname-$version +create_wrksrc=yes +build_wrksrc=Arduino-$version hostmakedepends="apache-ant unzip ImageMagick openjdk" depends="virtual?java-runtime avr-binutils avr-gcc avr-libc avrdude" short_desc="IDE for the arduino open-source electronics prototyping platform" diff --git a/srcpkgs/aria2/patches/patch-src_libssl_compat_h.patch b/srcpkgs/aria2/patches/patch-src_libssl_compat_h.patch deleted file mode 100644 index aedaa65199a..00000000000 --- a/srcpkgs/aria2/patches/patch-src_libssl_compat_h.patch +++ /dev/null @@ -1,16 +0,0 @@ -$OpenBSD: patch-src_libssl_compat_h,v 1.1 2018/02/18 11:12:22 sthen Exp $ - -Index: src/libssl_compat.h ---- src/libssl_compat.h.orig -+++ src/libssl_compat.h -@@ -43,7 +43,9 @@ - #define LIBRESSL_IN_USE 0 - #endif // !defined(LIBRESSL_VERSION_NUMBER) - -+/* XXX really OPENSSL_110_API... */ - #define OPENSSL_101_API \ -- (!LIBRESSL_IN_USE && OPENSSL_VERSION_NUMBER >= 0x1010000fL) -+ OPENSSL_VERSION_NUMBER >= 0x1010000fL || \ -+ (LIBRESSL_IN_USE && LIBRESSL_VERSION_NUMBER < 0x2070000fL) - - #endif // LIBSSL_COMPAT_H diff --git a/srcpkgs/aria2/template b/srcpkgs/aria2/template index 22dc750b8d5..4e0fdf6fa1c 100644 --- a/srcpkgs/aria2/template +++ b/srcpkgs/aria2/template @@ -1,7 +1,7 @@ # Template file for 'aria2' pkgname=aria2 -version=1.34.0 -revision=5 +version=1.35.0 +revision=1 build_style=gnu-configure configure_args="--with-openssl --with-libexpat --without-gnutls --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt @@ -18,7 +18,7 @@ license="GPL-2.0-or-later" homepage="https://aria2.github.io/" changelog="https://raw.githubusercontent.com/aria2/aria2/master/NEWS" distfiles="https://github.com/aria2/aria2/releases/download/release-${version}/aria2-${version}.tar.xz" -checksum=3a44a802631606e138a9e172a3e9f5bcbaac43ce2895c1d8e2b46f30487e77a3 +checksum=1e2b7fd08d6af228856e51c07173cfcf987528f1ac97e04c5af4a47642617dfd libaria2_package() { short_desc="Multi-Protocol/multi-source download library" diff --git a/srcpkgs/aribas/update b/srcpkgs/aribas/update new file mode 100644 index 00000000000..fdee11819e4 --- /dev/null +++ b/srcpkgs/aribas/update @@ -0,0 +1 @@ +ignore="164" diff --git a/srcpkgs/ark/template b/srcpkgs/ark/template index c676d14d6c8..12103a51375 100644 --- a/srcpkgs/ark/template +++ b/srcpkgs/ark/template @@ -1,6 +1,6 @@ # Template file for 'ark' pkgname=ark -version=19.04.3 +version=19.08.2 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-devel qt5-qmake kdoctools kconfig" @@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni " license="GPL-2.0-or-later" homepage="https://kde.org/applications/utilities/ark" distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz" -checksum=a06cc2937aa4ed41bab0a38344164f367b993a80bcd74011e4ab72643bfee8ee +checksum=63fcec0a32d806cfc82fb1c136b5e037bfe75459b148ac08c00be7e45ac70c50 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" python kcoreaddons kparts" diff --git a/srcpkgs/armadillo/template b/srcpkgs/armadillo/template index e72d11d50ec..66cb6816785 100644 --- a/srcpkgs/armadillo/template +++ b/srcpkgs/armadillo/template @@ -1,6 +1,6 @@ # Template file for 'armadillo' pkgname=armadillo -version=9.500.2 +version=9.700.2 revision=1 build_style=cmake configure_args="-DDETECT_HDF5=$(vopt_if hdf5 ON OFF)" @@ -11,7 +11,7 @@ maintainer="Julien Dehos " license="Apache-2.0" homepage="http://arma.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/arma/${pkgname}-${version}.tar.xz" -checksum=0b1a3e07a6ae4d98c69dd3a6a84262574c88e491c9215147236ee5bf957fd79e +checksum=923f2b48974f707c9da3176aab8d370e8003de23277c17ca0e49fdf97fac08bd build_options="hdf5" desc_option_hdf5="HDF5 support" @@ -19,10 +19,6 @@ if [ -z "$CROSS_BUILD" ]; then build_options_default="hdf5" fi -post_install() { - vlicense LICENSE.txt -} - armadillo-devel_package() { depends="${makedepends}" short_desc+=" - development files" diff --git a/srcpkgs/asio/template b/srcpkgs/asio/template index e5d25452725..98c37cd7cb1 100644 --- a/srcpkgs/asio/template +++ b/srcpkgs/asio/template @@ -1,7 +1,7 @@ # Template file for 'asio' pkgname=asio -version=1.13.0 -revision=2 +version=1.14.0 +revision=1 build_style=gnu-configure makedepends="boost-devel" depends="boost-devel" @@ -10,7 +10,7 @@ maintainer="Orphaned " license="BSL-1.0" homepage="http://think-async.com/Asio/" distfiles="${SOURCEFORGE_SITE}/asio/asio-${version}.tar.bz2" -checksum=1efa97afbf4191eb3d0bb96026ac35ff2eb4a842866dfe8648fbd4829a9f7e39 +checksum=2e1be1a518a568525f79b5734d13731b6b4e4399ec576a0961db6e2d86112973 pre_configure() { case "$XBPS_TARGET_MACHINE" in @@ -19,3 +19,7 @@ pre_configure() { -i ${wrksrc}/include/asio/impl/error_code.ipp esac } + +post_install() { + vlicense LICENSE_1_0.txt +} diff --git a/srcpkgs/aspell-en/template b/srcpkgs/aspell-en/template index 100c26721a6..09a1c2279d3 100644 --- a/srcpkgs/aspell-en/template +++ b/srcpkgs/aspell-en/template @@ -1,7 +1,8 @@ # Template file for 'aspell-en' pkgname=aspell-en -version=2018.04.16 +version=2019.10.06 revision=1 +archs=noarch wrksrc="aspell6-en-${version}-0" build_style=configure hostmakedepends="aspell-devel" @@ -10,8 +11,7 @@ maintainer="Leah Neukirchen " license="LGPL-2.1-or-later" homepage="http://aspell.net/" distfiles="${GNU_SITE}/aspell/dict/en/aspell6-en-${version}-0.tar.bz2" -checksum=f11071e74b0c0753f4afabf024941a5c3a96bafe3879211ebd47bc34e76fbd2f -archs=noarch +checksum=24334b4daac6890a679084f4089e1ce7edbe33c442ace776fa693d8e334f51fd words-en_package() { short_desc="English dictionary word list" diff --git a/srcpkgs/aspell/template b/srcpkgs/aspell/template index d1b6ca497bc..b3ccbeeaef8 100644 --- a/srcpkgs/aspell/template +++ b/srcpkgs/aspell/template @@ -1,6 +1,6 @@ # Template file for 'aspell' pkgname=aspell -version=0.60.7 +version=0.60.8 revision=1 build_style=gnu-configure configure_args="--enable-compile-in-filters" @@ -9,11 +9,11 @@ makedepends="ncurses-devel" depends="perl" short_desc="Spell checker with good multi-language support" maintainer="Orphaned " -license="LGPL-2.1" +license="LGPL-2.1-only" homepage="http://aspell.net/" changelog="http://aspell.net/man-html/ChangeLog.html" distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=5ca8fc8cb0370cc6c9eb5b64c6d1bc5d57b3750dbf17887726c3407d833b70e4 +checksum=f9b77e515334a751b2e60daab5db23499e26c9209f5e7b7443b05235ad0226f2 pre_configure() { # XXX workaround ctor/dtor ordering with musl diff --git a/srcpkgs/assimp/patches/0001-glext_h_conflict.patch b/srcpkgs/assimp/patches/0001-glext_h_conflict.patch deleted file mode 100644 index 06c69d59d20..00000000000 --- a/srcpkgs/assimp/patches/0001-glext_h_conflict.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- tools/assimp_qt_viewer/glview.cpp 2017-07-28 22:33:41.000000000 +0200 -+++ tools/assimp_qt_viewer/glview.cpp 2017-08-05 09:47:00.697027943 +0200 -@@ -3,6 +3,11 @@ - /// \author smal.root@gmail.com - /// \date 2016 - -+#if defined(__arm__) -+// Avoid conflict for types GLsizeiptr and GLintptr -+#define GL_VERSION_1_5 -+ -+#endif - #include "glview.hpp" - - // Header files, OpenGL. diff --git a/srcpkgs/assimp/patches/musl.patch b/srcpkgs/assimp/patches/musl.patch new file mode 100644 index 00000000000..f2cf5b1a5e9 --- /dev/null +++ b/srcpkgs/assimp/patches/musl.patch @@ -0,0 +1,11 @@ +--- contrib/zip/src/zip.h 2019-09-24 19:28:59.000000000 +0200 ++++ - 2019-09-29 00:15:02.408202128 +0200 +@@ -20,7 +20,7 @@ + #endif + + #if !defined(_SSIZE_T_DEFINED) && !defined(_SSIZE_T_DEFINED_) && \ +- !defined(_SSIZE_T) && !defined(_SSIZE_T_) && !defined(__ssize_t_defined) ++ !defined(_SSIZE_T) && !defined(_SSIZE_T_) && !defined(__ssize_t_defined) && !defined(__DEFINED_ssize_t) + #define _SSIZE_T + // 64-bit Windows is the only mainstream platform + // where sizeof(long) != sizeof(void*) diff --git a/srcpkgs/assimp/template b/srcpkgs/assimp/template index 1b41014d735..ec6a61c9bcd 100644 --- a/srcpkgs/assimp/template +++ b/srcpkgs/assimp/template @@ -1,23 +1,24 @@ # Template file for 'assimp' pkgname=assimp -version=4.1.0 -revision=1 +version=5.0.0 +revision=2 build_style=cmake configure_args="-DASSIMP_BUILD_SAMPLES=OFF" -hostmakedepends="cmake pkg-config qt5-qmake qt5-host-tools qt5-devel" -makedepends="boost-devel libgomp-devel devil-devel qt5-devel minizip-devel zziplib-devel" +hostmakedepends="pkg-config" +makedepends="boost-devel libgomp-devel devil-devel minizip-devel zziplib-devel" short_desc="Import library for various well-known 3D model formats" maintainer="Jürgen Buchmüller " license="3-clause-BSD" homepage="http://assimp.sourceforge.net/" distfiles="https://github.com/assimp/assimp/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=3520b1e9793b93a2ca3b797199e16f40d61762617e072f2d525fad70f9678a71 +checksum=b0110a91650d6bb4000e3d5c2185bf77b0ff0a2e7a284bc2c4af81b33988b63c depends="libassimp>=${version}_${revision}" post_install() { - # Install assimp_qt_viewer - vbin build/tools/assimp_qt_viewer/assimp_qt_viewer vlicense LICENSE + # Copy contrib/stb_image header file (required for assimp_qt_viewer) + vmkdir usr/include/assimp/contrib/stb_image + vcopy contrib/stb_image/stb_image.h usr/include/assimp/contrib/stb_image # Create command documentation cd doc diff --git a/srcpkgs/assimp_qt_viewer/template b/srcpkgs/assimp_qt_viewer/template new file mode 100644 index 00000000000..11838e028ae --- /dev/null +++ b/srcpkgs/assimp_qt_viewer/template @@ -0,0 +1,24 @@ +# Template file for 'assimp_qt_viewer' +pkgname=assimp_qt_viewer +version=5.0.0 +revision=1 +_gitrev=b2b86036a860297b86b096dba009aebeaf5a2503 +wrksrc="${pkgname}-${_gitrev}" +build_style=cmake +build_wrksrc="${pkgname}" +hostmakedepends="qt5-host-tools qt5-devel" +makedepends="qt5-devel libassimp-devel" +short_desc="Qt-Widget-based viewer for assimp" +maintainer="Jürgen Buchmüller " +license="MIT" +homepage="https://github.com/assimp/assimp_qt_viewer" +distfiles="https://github.com/assimp/${pkgname}/archive/${_gitrev}.tar.gz>${pkgname}-${version}.tar.gz" +checksum=6c65e214f0a49c446a479b98b1a4795c1b79103410403ad38e28c4846eb76996 + +pre_build() { + ln -fsv ${XBPS_CROSS_BASE}/usr/include/assimp/contrib contrib +} + +post_install() { + vlicense ${wrksrc}/LICENSE +} diff --git a/srcpkgs/asunder/template b/srcpkgs/asunder/template index 79b9ae35b57..cfed1debf04 100644 --- a/srcpkgs/asunder/template +++ b/srcpkgs/asunder/template @@ -1,6 +1,6 @@ # Template file for 'asunder' pkgname=asunder -version=2.9.3 +version=2.9.4 revision=1 build_style=gnu-configure hostmakedepends="intltool pkg-config" @@ -9,11 +9,11 @@ makedepends="gtk+-devel libcddb-devel" # bin/mpcenc (Musepack) depends="cdparanoia flac lame opus vorbis-tools wavpack" short_desc="Graphical Audio CD ripper and encoder" -maintainer="Orphaned " +maintainer="Helmut Pozimski " license="GPL-2.0-or-later" homepage="http://littlesvr.ca/asunder/" distfiles="http://littlesvr.ca/asunder/releases/asunder-${version}.tar.bz2" -checksum=8533c634802a6e830c887015eb169f4807de6539ae3d373620c81be05a886098 +checksum=6070646e53d0cd59d1d20fc0e551306c45b3b57846477e9ac473b840d34e8caf pre_build() { sed -i 's:cd syslogng && $(MAKE) install:true:' Makefile.in diff --git a/srcpkgs/at-spi2-atk/template b/srcpkgs/at-spi2-atk/template index 37bc305f58f..9d675e3752b 100644 --- a/srcpkgs/at-spi2-atk/template +++ b/srcpkgs/at-spi2-atk/template @@ -1,6 +1,6 @@ # Template file for 'at-spi2-atk' pkgname=at-spi2-atk -version=2.32.0 +version=2.34.0 revision=1 build_style=meson hostmakedepends="libtool pkg-config intltool glib-devel" @@ -10,7 +10,7 @@ maintainer="Enno Boland " license="LGPL-2.0-or-later" homepage="http://www.gnome.org" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=0b51e6d339fa2bcca3a3e3159ccea574c67b107f1ac8b00047fa60e34ce7a45c +checksum=3a9a7e96a1eb549529e60a42201dd78ccce413d9c1706e16351cc5288e064500 at-spi2-atk-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/at-spi2-core/template b/srcpkgs/at-spi2-core/template index 9de5050734d..b383fe99bed 100644 --- a/srcpkgs/at-spi2-core/template +++ b/srcpkgs/at-spi2-core/template @@ -1,7 +1,7 @@ # Template file for 'at-spi2-core' pkgname=at-spi2-core -version=2.32.1 -revision=2 +version=2.34.0 +revision=1 build_style=meson build_helper="gir" hostmakedepends="pkg-config dbus glib-devel" @@ -12,7 +12,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://gitlab.gnome.org/GNOME/at-spi2-core" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=3c2aa937ebfaca2c86569bce9b16a34fbe20d69ef0c58846313b1c42f53b0d53 +checksum=d629cdbd674e539f8912028512af583990938c7b49e25184c126b00121ef11c6 # Package build options build_options="gir" diff --git a/srcpkgs/atk/patches/fix-cross-gir.patch b/srcpkgs/atk/patches/fix-cross-gir.patch deleted file mode 100644 index c249c72c542..00000000000 --- a/srcpkgs/atk/patches/fix-cross-gir.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/atk/meson.build b/atk/meson.build -index 616a3e6..941ded8 100644 ---- atk/meson.build -+++ atk/meson.build -@@ -137,7 +137,7 @@ libatk_dep = declare_dependency(link_with: libatk, - dependencies: gobject_dep, - sources: atk_enum_h) - --if not meson.is_cross_build() and get_option('introspection') -+if get_option('introspection') - gnome.generate_gir(libatk, - sources: atk_sources + atk_headers + [ atk_enum_h ] + [ atk_version_h ], - namespace: 'Atk', - diff --git a/srcpkgs/atk/template b/srcpkgs/atk/template index 6d5d2399df7..7c14b116598 100644 --- a/srcpkgs/atk/template +++ b/srcpkgs/atk/template @@ -1,7 +1,7 @@ # Template file for 'atk' pkgname=atk -version=2.32.0 -revision=2 +version=2.34.1 +revision=1 build_style=meson build_helper="gir" configure_args="-Dintrospection=$(vopt_if gir true false)" @@ -12,7 +12,7 @@ maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://developer.gnome.org/atk/" distfiles="${GNOME_SITE}/atk/${version%.*}/atk-${version}.tar.xz" -checksum=cb41feda7fe4ef0daa024471438ea0219592baf7c291347e5a858bb64e4091cc +checksum=d4f0e3b3d21265fcf2bc371e117da51c42ede1a71f6db1c834e6976bb20997cb # Package build options build_options="gir" diff --git a/srcpkgs/atlantis/template b/srcpkgs/atlantis/template index 5801c6a8711..3c56b32df97 100644 --- a/srcpkgs/atlantis/template +++ b/srcpkgs/atlantis/template @@ -1,6 +1,6 @@ # Template file for 'atlantis' pkgname=atlantis -version=0.8.3 +version=0.9.0 revision=1 build_style=go go_import_path=github.com/runatlantis/atlantis @@ -11,7 +11,7 @@ maintainer="Michael Aldridge " license="Apache-2.0" homepage="https://runatlantis.io" distfiles="https://github.com/runatlantis/atlantis/archive/v${version}.tar.gz" -checksum=26304b0510544ec883f0bb08f7c60794062b4930e6cbaa3396f6d0e66aa813e0 +checksum=ff3b8b38c59c54ff9ff2dfd0c53c69af5308a6c6f64f92d1c4ece87a7d35f1c6 pre_build() { cd $GOSRCPATH diff --git a/srcpkgs/atomix/template b/srcpkgs/atomix/template index 18b09fa3650..78c47f01303 100644 --- a/srcpkgs/atomix/template +++ b/srcpkgs/atomix/template @@ -1,6 +1,6 @@ # Template file for 'atomix' pkgname=atomix -version=3.32.1 +version=3.34.0 revision=1 build_style=meson hostmakedepends="glib-devel itstool pkg-config" @@ -10,4 +10,4 @@ maintainer="Jürgen Buchmüller " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Atomix" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=74caa733e86c3410398ae79df536f33119d5c7c373821cbe34fd6463eba997a7 +checksum=0054c3b3830f1fe4383e17d716e6034b608859f4352a102130c13156894a2041 diff --git a/srcpkgs/atril/template b/srcpkgs/atril/template index a99680cd2c9..84be1535d7d 100644 --- a/srcpkgs/atril/template +++ b/srcpkgs/atril/template @@ -1,7 +1,7 @@ # Template file for 'atril' pkgname=atril -version=1.22.1 -revision=2 +version=1.22.2 +revision=1 build_style=gnu-configure build_helper="gir" configure_args="--disable-schemas-compile --enable-djvu @@ -18,7 +18,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://mate-desktop.org" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=208544f6cce4bb5c0bf423a0d618929e35527d1c5ed120a5aa19f2a7a77e5c44 +checksum=dc692b9c2a2b8bdd7c36631a9f50fb19335f9ce36156464e967a7fdde7478786 build_options="gir" build_options_default="gir" diff --git a/srcpkgs/attica/template b/srcpkgs/attica/template index 522b54b72fc..4b045707063 100644 --- a/srcpkgs/attica/template +++ b/srcpkgs/attica/template @@ -1,6 +1,6 @@ # Template file for 'attica' pkgname=attica -version=5.61.0 +version=5.63.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://projects.kde.org/projects/kdesupport/attica" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=9d3ad34c17223333b5a77144cc5a9d941cbb7baa01ab4a2ffe34ae9398c90dde +checksum=c064af18478386da6a8eee16a9af626e300a4f0d1755b1598c910e2628977a37 attica-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/audacious-plugins/template b/srcpkgs/audacious-plugins/template index d97bf72f30e..a50d65e7819 100644 --- a/srcpkgs/audacious-plugins/template +++ b/srcpkgs/audacious-plugins/template @@ -1,14 +1,16 @@ # Template file for 'audacious-plugins' pkgname=audacious-plugins version=3.10.1 -revision=3 +revision=4 build_style=gnu-configure +configure_args="$(vopt_enable gtk) $(vopt_enable qt)" hostmakedepends="pkg-config" makedepends="audacious-devel alsa-lib-devel pulseaudio-devel jack-devel lame-devel libvorbis-devel libflac-devel mpg123-devel faad2-devel ffmpeg-devel libmodplug-devel fluidsynth-devel libcdio-paranoia-devel wavpack-devel libnotify-devel - libcurl-devel libmtp-devel neon-devel libmms-devel gtk+-devel libxml2-devel - libbs2b-devel libsoxr-devel libsidplayfp-devel" + libcurl-devel libmtp-devel neon-devel libmms-devel libxml2-devel + libbs2b-devel libsoxr-devel libsidplayfp-devel libcue-devel + $(vopt_if gtk gtk+-devel) $(vopt_if qt 'qt5-devel qt5-multimedia-devel')" short_desc="Plugins for the Audacious media player" maintainer="Orphaned " license="BSD-2-Clause" @@ -16,6 +18,11 @@ homepage="https://audacious-media-player.org/" distfiles="https://distfiles.audacious-media-player.org/${pkgname}-${version}.tar.bz2" checksum=eec3177631f99729bf0e94223b627406cc648c70e6646e35613c7b55040a2642 +build_options="gtk qt" +build_options_default="gtk" +desc_option_gtk="Enable support for the GTK+2 GUI toolkit" +vopt_conflict gtk qt + post_install() { vlicense COPYING } diff --git a/srcpkgs/audacious/template b/srcpkgs/audacious/template index 69528553607..e925bb3683f 100644 --- a/srcpkgs/audacious/template +++ b/srcpkgs/audacious/template @@ -1,11 +1,12 @@ # Template file for 'audacious' pkgname=audacious version=3.10.1 -revision=1 +revision=2 build_style=gnu-configure -configure_args="--enable-thunar" -hostmakedepends="pkg-config glib-devel" -makedepends="libSM-devel gtk+-devel dbus-glib-devel libguess-devel" +configure_args="$(vopt_enable gtk) $(vopt_enable qt)" +hostmakedepends="pkg-config glib-devel $(vopt_if qt qt5-host-tools)" +makedepends="libSM-devel dbus-glib-devel libguess-devel $(vopt_if gtk gtk+-devel) + $(vopt_if qt qt5-devel)" depends="desktop-file-utils hicolor-icon-theme" short_desc="Lightweight, advanced audio player focused on audio quality" maintainer="Orphaned " @@ -14,6 +15,11 @@ homepage="https://audacious-media-player.org/" distfiles="https://distfiles.${pkgname}-media-player.org/${pkgname}-${version}.tar.bz2" checksum=8366e840bb3c9448c2cf0cf9a0800155b0bd7cc212a28ba44990c3d2289c6b93 +build_options="gtk qt" +build_options_default="gtk" +desc_option_gtk="Enable support for the GTK+2 GUI toolkit" +vopt_conflict gtk qt + post_install() { vlicense COPYING } @@ -24,6 +30,6 @@ audacious-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - vmove usr/lib/*.so + vmove "usr/lib/*.so" } } diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template index 6b9a6477107..67f298b2dc4 100644 --- a/srcpkgs/autofs/template +++ b/srcpkgs/autofs/template @@ -1,7 +1,7 @@ # Template file for 'autofs' pkgname=autofs -version=5.1.5 -revision=4 +version=5.1.6 +revision=1 build_style=gnu-configure make_build_args="DONTSTRIP=1" configure_args="--with-libtirpc --with-mapdir=/etc/autofs --sbindir=/usr/bin" @@ -11,9 +11,9 @@ makedepends="libtirpc-devel libxml2-devel" short_desc="Kernel-based automounter for Linux" maintainer="Helmut Pozimski " license="GPL-2.0-or-later" -homepage="${KERNEL_SITE}/daemons/autofs" +homepage="https://www.kernel.org/pub/linux/daemons/autofs" distfiles="${KERNEL_SITE}/daemons/autofs/v5/autofs-${version}.tar.xz" -checksum=23afdad9e2fd6d41b1900be8cfecfd5aae0ad174c7708ff685ec27e280f9c0da +checksum=dddee3d9b7388ce6cb7432832dfade25b07ef68ad48dcce01cf247b26a10caef CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/gssglue -I${XBPS_CROSS_BASE}/usr/include/tirpc" diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template index 7cf9d1d49d2..84fc747185c 100644 --- a/srcpkgs/avidemux/template +++ b/srcpkgs/avidemux/template @@ -1,7 +1,7 @@ # Template file for 'avidemux' pkgname=avidemux -version=2.7.3 -revision=3 +version=2.7.4 +revision=1 wrksrc="${pkgname}_${version}" # Can't be compiled for aarch64, arm* or mips* archs="x86_64* i686*" @@ -18,7 +18,7 @@ license="GPL-2.0-or-later" homepage="http://avidemux.sourceforge.net/" changelog="http://avidemux.sourceforge.net/news.html" distfiles="${SOURCEFORGE_SITE}/avidemux/avidemux/${version}/${pkgname}_${version}.tar.gz" -checksum=8d768e09cb646e4aa954d3332417fc565261590fb4944bccb917c192adada29f +checksum=7db0ac01c8255279a2c360ecb2725c27ea8a2c5bd1f38aeafabfed33ea588da9 do_build() { MAKEFLAGS=${makejobs} \ diff --git a/srcpkgs/avr-gcc/template b/srcpkgs/avr-gcc/template index 1f415c4a4af..c23673f9689 100644 --- a/srcpkgs/avr-gcc/template +++ b/srcpkgs/avr-gcc/template @@ -1,14 +1,14 @@ -# Template build file for 'avr-gcc' +# Template file for 'avr-gcc' pkgname=avr-gcc -version=8.2.0 +version=9.2.0 revision=1 -short_desc="The GNU C Compiler for AVR" +wrksrc="gcc-$version" +short_desc="GNU C Compiler for AVR" maintainer="allan " -homepage="http://gcc.gnu.org" license="GFDL-1.2, GPL-3, LGPL-2.1" +homepage="http://gcc.gnu.org" distfiles="${GNU_SITE}/gcc/gcc-${version}/gcc-${version}.tar.xz" -checksum=196c3c04ba2613f893283977e6011b2345d1cd1af9abeac58e916b1aab3e0080 -wrksrc="gcc-$version" +checksum=ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206 hostmakedepends="flex avr-binutils" if [ "$CROSS_BUILD" ]; then diff --git a/srcpkgs/aws-cli/template b/srcpkgs/aws-cli/template index 125e1c9c79a..4e5e200e3f9 100644 --- a/srcpkgs/aws-cli/template +++ b/srcpkgs/aws-cli/template @@ -1,6 +1,6 @@ # Template file for 'aws-cli' pkgname=aws-cli -version=1.16.169 +version=1.16.253 revision=1 archs=noarch wrksrc="aws-cli-${version}" @@ -14,10 +14,9 @@ maintainer="Robert Lowry " license="Apache-2.0" homepage="https://github.com/aws/aws-cli" distfiles="https://github.com/aws/aws-cli/archive/${version}.tar.gz" -checksum=eaec519dbb638d9aeaf9a9d451d011e64e0657cd71bf961a2c2544f175d00d2e +checksum=aacd3c0faa3b8ce6fda3c58fac6e5d29c7136fe67d56408ee39a64b63ed9485b post_install() { - vlicense LICENSE.txt vinstall bin/aws_bash_completer 644 usr/share/bash-completion/completions aws vinstall bin/aws_zsh_completer.sh 644 usr/share/zsh/site-functions _aws rm "${DESTDIR}/usr/bin/aws_bash_completer" diff --git a/srcpkgs/axel/template b/srcpkgs/axel/template index 44f1c979acd..4e5f8ccd348 100644 --- a/srcpkgs/axel/template +++ b/srcpkgs/axel/template @@ -1,6 +1,6 @@ # Template file for 'axel' pkgname=axel -version=2.17.5 +version=2.17.6 revision=1 build_style=gnu-configure conf_files="/etc/axelrc" @@ -12,7 +12,7 @@ license="GPL-2.0-or-later" homepage="https://github.com/axel-download-accelerator/axel" changelog="https://raw.githubusercontent.com/axel-download-accelerator/axel/master/ChangeLog" distfiles="https://github.com/axel-download-accelerator/axel/releases/download/v${version}/axel-${version}.tar.xz" -checksum=5c5c682617d498071ff9083029fcecc2c2fdeeedc366c35d2bdf8663355616cc +checksum=24ab549021bdfca01ad5e8e95b706869dd30fe9ab1043da4cbb9dff89edc267d post_install() { vconf doc/axelrc.example axelrc diff --git a/srcpkgs/azote/template b/srcpkgs/azote/template index 0d5daa6bdd4..0a23c209551 100644 --- a/srcpkgs/azote/template +++ b/srcpkgs/azote/template @@ -1,18 +1,18 @@ # Template file for 'azote' pkgname=azote -version=1.3.0 +version=1.5.1 revision=1 archs=noarch build_style=python3-module pycompile_module="azote" hostmakedepends="python3-setuptools" -depends="python3>=3.5 python3-setuptools python3-gobject python3-Pillow gtk+3 feh xrandr wmctrl" +depends="python3>=3.5 python3-setuptools python3-gobject python3-Pillow python3-send2trash gtk+3 feh xrandr wmctrl" short_desc="Wallpaper manager for Sway, i3 and some other WMs" maintainer="Piotr Miller " license="GPL-3.0-or-later" homepage="https://github.com/nwg-piotr/azote" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=fb66f06b8a53fbb9bb64b0a0260a187dc4f5b2a313f90e3f349bd5440e021334 +checksum=1da35263cef47e7dd656de4b3f422a277db8c6b0d4d9b1256767a2446722cdb2 post_install() { vmkdir usr/bin diff --git a/srcpkgs/azpainter/template b/srcpkgs/azpainter/template index 4e3bd5dc449..27651577200 100644 --- a/srcpkgs/azpainter/template +++ b/srcpkgs/azpainter/template @@ -1,6 +1,6 @@ # Template file for 'azpainter' pkgname=azpainter -version=2.1.3 +version=2.1.4 revision=1 build_style=gnu-configure hostmakedepends="automake" @@ -10,8 +10,8 @@ short_desc="Full-color painting software for illustration drawing" maintainer="Alexander Mamay " license="GPL-3.0-or-later" homepage="https://osdn.net/projects/azpainter/" -distfiles="https://acc.dl.osdn.jp/azpainter/70132/${pkgname}-${version}.tar.xz" -checksum=8716a47f3695ba3c6e230415c0d19f082bc2d900213ff1271bfd81496e02e300 +distfiles="https://osdn.net/frs/redir.php?m=rwthaachen&f=azpainter%2F71051%2Fazpainter-${version}.tar.xz" +checksum=200dba9b443888054172fd13c8d9045d1556210834a46edaa0267bc80a2bad30 CPPFLAGS="-I${XBPS_CROSS_BASE}/usr/include/freetype2" diff --git a/srcpkgs/babeld/patches/45.patch b/srcpkgs/babeld/patches/45.patch new file mode 100644 index 00000000000..089e35f8d54 --- /dev/null +++ b/srcpkgs/babeld/patches/45.patch @@ -0,0 +1,71 @@ +From 36121c1e67fb5a60a35fed0faa37297cd97c9ffc Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= +Date: Thu, 19 Sep 2019 01:16:46 +0200 +Subject: [PATCH] Remove src_plen assignments which break v4mapped encoding +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +These assignments were introduced in f8bce04, probably +to ensure that src_plen doesn't contain any leftovers from +earlier revisions when source specific wasn't done via sub-TLVs. + +This however breaks v4mapped encoding as a prefix length of 0 +for IPv4 routes is represented as src_plen = 96. This offset is +already added outside of the affected functions and therefore +gets overwritten by this assignment. + +Both functions contain an additional check if the message contains +ipv4 addresses, but as this check is only executed if the message has +a source-specific sub-TLV, the offset isn't added for non source-specific +routes. + +Because the offset is already added outside of the subtlv parsing +functions, this additional check is also removed, as it would otherwise +break IPv4 source specifics by adding the IPv4 offset two times. + +Signed-off-by: Fabian Bläse +--- + message.c | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/message.c b/message.c +index 0f6ca19d..78f9aa93 100644 +--- a/message.c ++++ b/message.c +@@ -137,8 +137,6 @@ parse_update_subtlv(struct interface *ifp, int metric, int ae, + } + } + +- *src_plen = 0; +- + while(i < alen) { + type = a[i]; + if(type == SUBTLV_PAD1) { +@@ -170,8 +168,6 @@ parse_update_subtlv(struct interface *ifp, int metric, int ae, + len - 1, src_prefix); + if(rc < 0) + goto fail; +- if(ae == 1) +- (*src_plen) += 96; + } else { + debugf("Received unknown%s Update sub-TLV %d.\n", + (type & 0x80) != 0 ? " mandatory" : "", type); +@@ -305,8 +301,6 @@ parse_request_subtlv(int ae, const unsigned char *a, int alen, + { + int type, len, i = 0; + +- *src_plen = 0; +- + while(i < alen) { + type = a[0]; + if(type == SUBTLV_PAD1) { +@@ -336,8 +330,6 @@ parse_request_subtlv(int ae, const unsigned char *a, int alen, + len - 1, src_prefix); + if(rc < 0) + goto fail; +- if(ae == 1) +- (*src_plen) += 96; + } else { + debugf("Received unknown%s Route Request sub-TLV %d.\n", + ((type & 0x80) != 0) ? " mandatory" : "", type); diff --git a/srcpkgs/babeld/template b/srcpkgs/babeld/template index a810d6a6522..7707dda1712 100644 --- a/srcpkgs/babeld/template +++ b/srcpkgs/babeld/template @@ -1,7 +1,7 @@ # Template file for 'babeld' pkgname=babeld -version=1.8.5 -revision=1 +version=1.9.1 +revision=3 wrksrc=babeld-babeld-${version} build_style=gnu-makefile short_desc="Babel loop-avoiding distance-vector routing daemon" @@ -9,7 +9,12 @@ maintainer="lemmi " license="MIT" homepage="https://www.irif.fr/~jch/software/babel/" distfiles="https://github.com/jech/babeld/archive/babeld-${version}.tar.gz" -checksum=91192a7d6f7e99ad6a68d696c2e7b174f8e1413c693d4dc31c77d04e24b64f3c +checksum=16e18dbd9f8442feaa68487f5919a8ff8f7d95c62a9c7a3c42b7adf31bd4a9b3 +patch_args="-Np1" + +pre_build() { + echo ${version}-${revision} > version +} do_install() { vbin babeld diff --git a/srcpkgs/backblaze-b2/template b/srcpkgs/backblaze-b2/template index d1136a5f750..48d5a95a5f7 100644 --- a/srcpkgs/backblaze-b2/template +++ b/srcpkgs/backblaze-b2/template @@ -1,7 +1,7 @@ # Template file for 'backblaze-b2' pkgname=backblaze-b2 -version=1.4.0 -revision=3 +version=1.4.2 +revision=1 archs=noarch wrksrc="B2_Command_Line_Tool-${version}" build_style=python2-module @@ -14,7 +14,7 @@ maintainer="Andrea Brancaleoni " license="MIT" homepage="https://github.com/Backblaze/B2_Command_Line_Tool" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=813bf3334b8986fc5592cff8e4e79faca46c957204d31ef4ba520080c5d315eb +checksum=2d6382b94af59dcaa44dd546252807e0364d1b61f169584829ebbf82458e7078 post_install() { # Remove test directory polluting site-packages diff --git a/srcpkgs/backintime-qt/template b/srcpkgs/backintime-qt/template new file mode 100644 index 00000000000..82f39c652f8 --- /dev/null +++ b/srcpkgs/backintime-qt/template @@ -0,0 +1,19 @@ +# Template file for 'backintime-qt' +pkgname=backintime-qt +version=1.2.1 +revision=1 +archs=noarch +wrksrc=backintime-${version} +build_wrksrc="qt" +build_style=configure +configure_args="--python3" +pycompile_dirs="/usr/share/backintime" +hostmakedepends="python3" +depends="backintime python3-PyQt5 python3-PyQt5-dbus libnotify xdpyinfo" +short_desc="Qt Gui for backintime" +maintainer="Alpicoid " +license="GPL-2.0-only" +homepage="https://github.com/bit-team/backintime" +distfiles="https://github.com/bit-team/backintime/releases/download/v${version}/backintime-${version}.tar.gz" +checksum=eef2aa4f43ac23fb0d45239a4bb2f7e5025afdca2ae4e6d6d9d6e722e8b17644 +pycompile_version="$py3_ver" diff --git a/srcpkgs/backintime/template b/srcpkgs/backintime/template index c66dd8521a5..1be1c42e32a 100644 --- a/srcpkgs/backintime/template +++ b/srcpkgs/backintime/template @@ -1,17 +1,18 @@ # Template file for 'backintime' pkgname=backintime -version=1.1.24 +version=1.2.1 revision=1 archs=noarch build_wrksrc="common" build_style=configure configure_args="--python3" -hostmakedepends="python3" -depends="python3 rsync python3-dbus" pycompile_dirs="/usr/share/backintime" -short_desc="A simple backup tool for Linux" -maintainer="Orphaned " -license="GPL-2" +hostmakedepends="python3" +depends="python3 rsync python3-dbus python3-keyring" +short_desc="Simple backup tool for Linux" +maintainer="Alpicoid " +license="GPL-2.0-only" homepage="https://github.com/bit-team/backintime" distfiles="https://github.com/bit-team/backintime/releases/download/v${version}/backintime-${version}.tar.gz" -checksum=72b9324314c70cc55bac04e5db8ca300ae98bf24f63334d3d9cd297a6b988308 +checksum=eef2aa4f43ac23fb0d45239a4bb2f7e5025afdca2ae4e6d6d9d6e722e8b17644 +pycompile_version="$py3_ver" diff --git a/srcpkgs/baloo-widgets5/template b/srcpkgs/baloo-widgets5/template index 03aa917a695..41196ccc6d1 100644 --- a/srcpkgs/baloo-widgets5/template +++ b/srcpkgs/baloo-widgets5/template @@ -1,6 +1,6 @@ # Template file for 'baloo-widgets5' pkgname=baloo-widgets5 -version=19.08.0 +version=19.08.2 revision=1 wrksrc="baloo-widgets-${version}" build_style=cmake @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.1-or-later, GPL-2.0-or-later" homepage="https://cgit.kde.org/baloo-widgets.git/" distfiles="${KDE_SITE}/applications/${version}/src/baloo-widgets-${version}.tar.xz" -checksum=3ef81f74ce6fccd6eaf60e0dfd18fe660ac357e75c4715801da9bb3a203a6008 +checksum=529f3b587098eb9b7d1aaa8b311f98c58d16ed88384fa0900f9fb9f8e242c070 baloo-widgets5-devel_package() { short_desc+=" - development" diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template index 38a78d381d2..da35cc5ece3 100644 --- a/srcpkgs/baloo5/template +++ b/srcpkgs/baloo5/template @@ -1,6 +1,6 @@ # Template file for 'baloo5' pkgname=baloo5 -version=5.61.0 +version=5.63.0 revision=1 wrksrc="${pkgname%5}-${version}" build_style=cmake @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://community.kde.org/Baloo" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz" -checksum=dd559e06237843f51d68eb5001b835037d4b2f6d62b7dc4d040961f9863632f1 +checksum=90ad2f2e13a33b74030fb4b26e46aa699525009efe30cf0c09283dfa52d818e2 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake python kcoreaddons" @@ -26,6 +26,7 @@ baloo5-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/cmake + vmove usr/lib/qt5/mkspecs vmove usr/lib/pkgconfig vmove "usr/lib/*.so" } diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template index a2e45356dad..606eb5a9119 100644 --- a/srcpkgs/baresip/template +++ b/srcpkgs/baresip/template @@ -1,6 +1,6 @@ # Template file for 'baresip' pkgname=baresip -version=0.6.3 +version=0.6.4 revision=1 build_style=gnu-makefile make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk @@ -25,7 +25,7 @@ maintainer="JohnZ " license="BSD-3-Clause" homepage="http://www.creytiv.com/baresip.html" distfiles="http://www.creytiv.com/pub/baresip-${version}.tar.gz" -checksum=c8005466b4947e28bc48ceb3d99608c782109970c2653b9d0eb0900d4695300c +checksum=61710bd1bec406ae1faf167c5743bad8eef9ced5152a3943b94d7e1cf9597581 # Package build options build_options="gtk video" diff --git a/srcpkgs/barrier/template b/srcpkgs/barrier/template index f636aa30b07..6d2072c98a7 100644 --- a/srcpkgs/barrier/template +++ b/srcpkgs/barrier/template @@ -1,6 +1,6 @@ # Template file for 'barrier' pkgname=barrier -version=2.3.1 +version=2.3.2 revision=1 build_style=cmake configure_args="-DBARRIER_REVISION=00000000 -DBARRIER_VERSION_STAGE=RELEASE" @@ -12,7 +12,7 @@ maintainer="John " license="GPL-2.0-only" homepage="https://github.com/debauchee/barrier" distfiles="https://github.com/debauchee/barrier/archive/v${version}.tar.gz" -checksum=adf6df33a4a07e05784e825a2549ff22fe288aa184f1caee2c2ffddb2cbcf249 +checksum=6b92a70c5f4d625065842d133386982ec2ad1db2a809af47e46ab8ce2acd39b5 do_install() { vbin build/bin/barrier diff --git a/srcpkgs/base-files/files/66-kvm.rules b/srcpkgs/base-files/files/66-kvm.rules index c2f7317aacc..582fc57ede4 100644 --- a/srcpkgs/base-files/files/66-kvm.rules +++ b/srcpkgs/base-files/files/66-kvm.rules @@ -1 +1 @@ -KERNEL=="kvm", GROUP="kvm", MODE="0660" +KERNEL=="kvm", GROUP="kvm", MODE="0660", OPTIONS+="static_node=kvm" diff --git a/srcpkgs/base-files/files/vkpurge.8 b/srcpkgs/base-files/files/vkpurge.8 index a4a1814a427..7974f4d0eb2 100644 --- a/srcpkgs/base-files/files/vkpurge.8 +++ b/srcpkgs/base-files/files/vkpurge.8 @@ -16,7 +16,7 @@ .Sh DESCRIPTION The .Nm -utility lists and removes removable kernel versions leaved +utility lists and removes removable kernel versions left behind by .Xr xbps-install 1 and @@ -68,5 +68,5 @@ The following command will delete the kernel versions matching the pattern and a .Xr xbps-install 1 , .Xr xbps-remove 1 .Sh BUGS -There is no support as of yet for all kernels, specific series like rpi-kernel -are not supported +There is no support for all kernels. Specific series, like rpi-kernel, are not +supported yet. diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template index 672855e8671..a049c59681d 100644 --- a/srcpkgs/base-files/template +++ b/srcpkgs/base-files/template @@ -1,12 +1,12 @@ # Template file for 'base-files' pkgname=base-files version=0.140 -revision=6 +revision=8 bootstrap=yes depends="xbps-triggers" short_desc="Void Linux base system files" maintainer="Enno Boland " -license="Public domain" +license="custom:Public domain" homepage="https://www.voidlinux.org" conf_files=" /etc/inputrc diff --git a/srcpkgs/bash/files/bash50-008 b/srcpkgs/bash/files/bash50-008 new file mode 100644 index 00000000000..b09d6b33ac7 --- /dev/null +++ b/srcpkgs/bash/files/bash50-008 @@ -0,0 +1,68 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 5.0 +Patch-ID: bash50-008 + +Bug-Reported-by: Michael Albinus +Bug-Reference-ID: <87bm36k3kz.fsf@gmx.de> +Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2019-02/msg00111.html + +Bug-Description: + +When HISTSIZE is set to 0, history expansion can leave the history length +set to an incorrect value, leading to subsequent attempts to access invalid +memory. + +Patch (apply with `patch -p0'): + +*** ../bash-5.0-patched/bashhist.c 2018-07-05 22:41:14.000000000 -0400 +--- bashhist.c 2019-02-20 16:20:04.000000000 -0500 +*************** +*** 561,573 **** + if (!history_expansion_inhibited && history_expansion && history_expansion_p (line)) + { + /* If we are expanding the second or later line of a multi-line + command, decrease history_length so references to history expansions + in these lines refer to the previous history entry and not the + current command. */ + if (history_length > 0 && command_oriented_history && current_command_first_line_saved && current_command_line_count > 1) + history_length--; + expanded = history_expand (line, &history_value); + if (history_length >= 0 && command_oriented_history && current_command_first_line_saved && current_command_line_count > 1) +! history_length++; + + if (expanded) +--- 561,576 ---- + if (!history_expansion_inhibited && history_expansion && history_expansion_p (line)) + { ++ int old_len; ++ + /* If we are expanding the second or later line of a multi-line + command, decrease history_length so references to history expansions + in these lines refer to the previous history entry and not the + current command. */ ++ old_len = history_length; + if (history_length > 0 && command_oriented_history && current_command_first_line_saved && current_command_line_count > 1) + history_length--; + expanded = history_expand (line, &history_value); + if (history_length >= 0 && command_oriented_history && current_command_first_line_saved && current_command_line_count > 1) +! history_length = old_len; + + if (expanded) + +*** ../bash-5.0/patchlevel.h 2016-06-22 14:51:03.000000000 -0400 +--- patchlevel.h 2016-10-01 11:01:28.000000000 -0400 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 7 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 8 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/srcpkgs/bash/files/bash50-009 b/srcpkgs/bash/files/bash50-009 new file mode 100644 index 00000000000..aef4ce7b5ad --- /dev/null +++ b/srcpkgs/bash/files/bash50-009 @@ -0,0 +1,42 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 5.0 +Patch-ID: bash50-009 + +Bug-Reported-by: chet.ramey@case.edu +Bug-Reference-ID: +Bug-Reference-URL: + +Bug-Description: + +The history file reading code doesn't close the file descriptor open to +the history file when it encounters a zero-length file. + +Patch (apply with `patch -p0'): + +*** ../bash-5.0-patched/lib/readline/histfile.c 2018-06-11 09:14:52.000000000 -0400 +--- lib/readline/histfile.c 2019-05-16 15:55:57.000000000 -0400 +*************** +*** 306,309 **** +--- 312,316 ---- + { + free (input); ++ close (file); + return 0; /* don't waste time if we don't have to */ + } +*** ../bash-5.0/patchlevel.h 2016-06-22 14:51:03.000000000 -0400 +--- patchlevel.h 2016-10-01 11:01:28.000000000 -0400 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 8 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 9 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/srcpkgs/bash/files/bash50-010 b/srcpkgs/bash/files/bash50-010 new file mode 100644 index 00000000000..bac7aa92515 --- /dev/null +++ b/srcpkgs/bash/files/bash50-010 @@ -0,0 +1,172 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 5.0 +Patch-ID: bash50-010 + +Bug-Reported-by: Thorsten Glaser +Bug-Reference-ID: <156622962831.19438.16374961114836556294.reportbug@tglase.lan.tarent.de> +Bug-Reference-URL: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=935115 + +Bug-Description: + +Bash-5.0 changed the way assignment statements preceding special builtins +and shell functions were handled in posix mode. They automatically created +or modified global variables instead of modifying existing local variables +as in bash-4.4. + +The bash-4.4 posix-mode semantics were buggy, and resulted in creating +local variables where they were not intended and modifying global variables +and local variables simultaneously. + +The bash-5.0 changes were intended to fix this issue, but did not preserve +enough backwards compatibility. The posix standard also changed what it +required in these cases, so bash-5.0 is not bound by the strict conformance +requirements that existed in previous issues of the standard. + +This patch modifies the bash-5.0 posix mode behavior in an effort to restore +some backwards compatibility and rationalize the behavior in the presence of +local variables. It + +1. Changes the assignment semantics to be more similar to standalone assignment + statements: assignments preceding a function call or special builtin while + executing in a shell function will modify the value of a local variable + with the same name for the duration of the function's execution; + +2. Changes assignments preceding shell function calls or special builtins + from within a shell function to no longer create or modify global variables + in the presence of a local variable with the same name; + +3. Assignment statements preceding a shell function call or special builtin + at the global scope continue to modify the (global) calling environment, + but are unaffected by assignments preceding function calls or special + builtins within a function, as described in item 2. This is also similar + to the behavior of a standalone assignment statement. + +Patch (apply with `patch -p0'): + +*** ../bash-5.0-patched/variables.c 2018-12-18 11:07:21.000000000 -0500 +--- variables.c 2019-08-22 10:53:44.000000000 -0400 +*************** +*** 4461,4467 **** + + /* Take a variable from an assignment statement preceding a posix special +! builtin (including `return') and create a global variable from it. This +! is called from merge_temporary_env, which is only called when in posix +! mode. */ + static void + push_posix_temp_var (data) +--- 4461,4467 ---- + + /* Take a variable from an assignment statement preceding a posix special +! builtin (including `return') and create a variable from it as if a +! standalone assignment statement had been performed. This is called from +! merge_temporary_env, which is only called when in posix mode. */ + static void + push_posix_temp_var (data) +*************** +*** 4473,4486 **** + var = (SHELL_VAR *)data; + +! binding_table = global_variables->table; +! if (binding_table == 0) +! binding_table = global_variables->table = hash_create (VARIABLES_HASH_BUCKETS); +! +! v = bind_variable_internal (var->name, value_cell (var), binding_table, 0, ASS_FORCE|ASS_NOLONGJMP); + + /* global variables are no longer temporary and don't need propagating. */ +! var->attributes &= ~(att_tempvar|att_propagate); + if (v) +! v->attributes |= var->attributes; + + if (find_special_var (var->name) >= 0) +--- 4473,4497 ---- + var = (SHELL_VAR *)data; + +! /* Just like do_assignment_internal(). This makes assignments preceding +! special builtins act like standalone assignment statements when in +! posix mode, satisfying the posix requirement that this affect the +! "current execution environment." */ +! v = bind_variable (var->name, value_cell (var), ASS_FORCE|ASS_NOLONGJMP); +! +! /* If this modifies an existing local variable, v->context will be non-zero. +! If it comes back with v->context == 0, we bound at the global context. +! Set binding_table appropriately. It doesn't matter whether it's correct +! if the variable is local, only that it's not global_variables->table */ +! binding_table = v->context ? shell_variables->table : global_variables->table; + + /* global variables are no longer temporary and don't need propagating. */ +! if (binding_table == global_variables->table) +! var->attributes &= ~(att_tempvar|att_propagate); +! + if (v) +! { +! v->attributes |= var->attributes; +! v->attributes &= ~att_tempvar; /* not a temp var now */ +! } + + if (find_special_var (var->name) >= 0) +*************** +*** 4576,4587 **** + { + int i; + + tempvar_list = strvec_create (HASH_ENTRIES (temporary_env) + 1); + tempvar_list[tvlist_ind = 0] = 0; +! +! hash_flush (temporary_env, pushf); +! hash_dispose (temporary_env); + temporary_env = (HASH_TABLE *)NULL; + + tempvar_list[tvlist_ind] = 0; + +--- 4587,4601 ---- + { + int i; ++ HASH_TABLE *disposer; + + tempvar_list = strvec_create (HASH_ENTRIES (temporary_env) + 1); + tempvar_list[tvlist_ind = 0] = 0; +! +! disposer = temporary_env; + temporary_env = (HASH_TABLE *)NULL; + ++ hash_flush (disposer, pushf); ++ hash_dispose (disposer); ++ + tempvar_list[tvlist_ind] = 0; + +*** ../bash-5.0-patched/tests/varenv.right 2018-12-17 15:39:48.000000000 -0500 +--- tests/varenv.right 2019-08-22 16:05:25.000000000 -0400 +*************** +*** 147,153 **** + outside: declare -- var="one" + inside: declare -x var="value" +! outside: declare -x var="value" +! inside: declare -- var="local" +! outside: declare -x var="global" + foo= environment foo= + foo=foo environment foo=foo +--- 147,153 ---- + outside: declare -- var="one" + inside: declare -x var="value" +! outside: declare -- var="outside" +! inside: declare -x var="global" +! outside: declare -- var="outside" + foo= environment foo= + foo=foo environment foo=foo +*** ../bash-5.0/patchlevel.h 2016-06-22 14:51:03.000000000 -0400 +--- patchlevel.h 2016-10-01 11:01:28.000000000 -0400 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 9 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 10 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/srcpkgs/bash/files/bash50-011 b/srcpkgs/bash/files/bash50-011 new file mode 100644 index 00000000000..a9ae690e004 --- /dev/null +++ b/srcpkgs/bash/files/bash50-011 @@ -0,0 +1,59 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 5.0 +Patch-ID: bash50-011 + +Bug-Reported-by: Matt Whitlock +Bug-Reference-ID: +Bug-Reference-URL: https://savannah.gnu.org/support/?109671 + +Bug-Description: + +The conditional command did not perform appropriate quoted null character +removal on its arguments, causing syntax errors and attempts to stat +invalid pathnames. + +Patch (apply with `patch -p0'): + +*** ../bash-5.0-patched/subst.c 2018-12-22 17:43:37.000000000 -0500 +--- subst.c 2019-04-14 13:25:41.000000000 -0400 +*************** +*** 3626,3630 **** + SPECIAL is 2, this is an rhs argument for the =~ operator, and should + be quoted appropriately for regcomp/regexec. The caller is responsible +! for removing the backslashes if the unquoted word is needed later. */ + char * + cond_expand_word (w, special) +--- 3642,3648 ---- + SPECIAL is 2, this is an rhs argument for the =~ operator, and should + be quoted appropriately for regcomp/regexec. The caller is responsible +! for removing the backslashes if the unquoted word is needed later. In +! any case, since we don't perform word splitting, we need to do quoted +! null character removal. */ + char * + cond_expand_word (w, special) +*************** +*** 3647,3650 **** +--- 3665,3670 ---- + if (special == 0) /* LHS */ + { ++ if (l->word) ++ word_list_remove_quoted_nulls (l); + dequote_list (l); + r = string_list (l); +*** ../bash-5.0/patchlevel.h 2016-06-22 14:51:03.000000000 -0400 +--- patchlevel.h 2016-10-01 11:01:28.000000000 -0400 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 10 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 11 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/srcpkgs/bash/template b/srcpkgs/bash/template index 84176143b72..1fd2f591cdb 100644 --- a/srcpkgs/bash/template +++ b/srcpkgs/bash/template @@ -1,9 +1,9 @@ # Template file for 'bash' pkgname=bash _bash_distver=5.0 -_bash_patchlevel=007 +_bash_patchlevel=011 version="${_bash_distver}.${_bash_patchlevel}" -revision=2 +revision=1 wrksrc="${pkgname}-${_bash_distver}" build_style=gnu-configure configure_args="--without-bash-malloc --with-curses --without-installed-readline" diff --git a/srcpkgs/bat/template b/srcpkgs/bat/template index db577d886ae..1a06119cd32 100644 --- a/srcpkgs/bat/template +++ b/srcpkgs/bat/template @@ -1,16 +1,21 @@ # Template file for 'bat' pkgname=bat -version=0.11.0 +version=0.12.1 revision=1 build_style=cargo -hostmakedepends="cmake" +hostmakedepends="cmake llvm" makedepends="libcurl-devel libssh2-devel oniguruma-devel" short_desc="Cat(1) clone with syntax highlighting and Git integration" maintainer="John " license="Apache-2.0, MIT" homepage="https://github.com/sharkdp/bat" distfiles="https://github.com/sharkdp/bat/archive/v${version}.tar.gz" -checksum=bb4e39efadfab71c0c929a92b82dac58deacfe2a4eb527d4256ac0634e042ed2 +checksum=1dd184ddc9e5228ba94d19afc0b8b440bfc1819fef8133fe331e2c0ec9e3f8e2 + +pre_build() { + export CFLAGS_${RUST_BUILD//-/_}="${CFLAGS_host}" + export CC_${RUST_BUILD//-/_}="${BUILD_CC}" +} post_install() { vlicense LICENSE-MIT diff --git a/srcpkgs/bc-gh/template b/srcpkgs/bc-gh/template index 0a8a7ee8293..ac863f30d77 100644 --- a/srcpkgs/bc-gh/template +++ b/srcpkgs/bc-gh/template @@ -1,6 +1,6 @@ # Template file for 'bc-gh' pkgname=bc-gh -version=2.1.0 +version=2.1.3 revision=1 wrksrc="bc-${version}" short_desc="Implementation of POSIX bc with GNU extensions" @@ -8,7 +8,7 @@ maintainer="Gavin D. Howard " license="BSD-2-Clause" homepage="https://github.com/gavinhoward/bc" distfiles="${homepage}/releases/download/${version}/bc-${version}.tar.xz" -checksum=b6b25a44323e42959b2ba4885f54fcc6d889070dbb53c7d0f8db9f56a4faafc8 +checksum=cf24e19a5573e7cc8e4cbefea382de57e982212c33e8e15d7064ccc989cae17b alternatives=" bc:bc:/usr/bin/bc-gh dc:dc:/usr/bin/dc-gh" diff --git a/srcpkgs/bcal/patches/non-null.patch b/srcpkgs/bcal/patches/non-null.patch new file mode 100644 index 00000000000..132fc086784 --- /dev/null +++ b/srcpkgs/bcal/patches/non-null.patch @@ -0,0 +1,11 @@ +--- src/bcal.c 2018-12-11 16:12:41.000000000 +0100 ++++ src/bcal.c 2019-09-24 22:34:39.475836973 +0200 +@@ -1923,7 +1923,7 @@ + char *expr = fixexpr(exp, &ret); /* Make parsing compatible */ + char *ptr; + +- log(DEBUG, "expr: %s\n", expr); ++ log(DEBUG, "expr: %s\n", expr ? expr : ""); + + if (expr == NULL) { + if (ret) diff --git a/srcpkgs/bcal/template b/srcpkgs/bcal/template index 8aedd08e322..905e22fccd5 100644 --- a/srcpkgs/bcal/template +++ b/srcpkgs/bcal/template @@ -1,18 +1,17 @@ # Template file for 'bcal' pkgname=bcal version=2.1 -revision=2 +revision=3 build_style=gnu-makefile makedepends="readline-devel" depends="bc" short_desc="Byte CALculator for storage conversions and calculations" -maintainer="maxice8 " +maintainer="Jürgen Buchmüller " license="GPL-3.0-or-later" homepage="https://github.com/jarun/bcal" distfiles="https://github.com/jarun/bcal/archive/v${version}.tar.gz" checksum=c0b6cb911a773abdd555e6a9e0eb8a25934ceca038156e6250e117fa451beaa6 -nocross=yes -case "$XBPS_TARGET_MACHINE" in - i686*) broken="https://build.voidlinux.org/builders/i686_builder/builds/6760/steps/shell_3/logs/stdio";; -esac +if [ "$XBPS_TARGET_WORDSIZE" -ne 64 ]; then + broken="Can only be built for 64 bit targets which define __uint128_t." +fi diff --git a/srcpkgs/bcc/patches/musl.patch b/srcpkgs/bcc/patches/musl.patch index 20def02c588..bc7ac1e7726 100644 --- a/srcpkgs/bcc/patches/musl.patch +++ b/srcpkgs/bcc/patches/musl.patch @@ -48,15 +48,3 @@ #include #include #include ---- src/cc/libbpf/src/hashmap.h.orig 2019-05-29 19:27:27.000000000 +0200 -+++ src/cc/libbpf/src/hashmap.h 2019-06-01 23:57:31.458324372 +0200 -@@ -10,6 +10,9 @@ - - #include - #include -+#if !defined(__GLIBC__) -+#include /* for __WORDSIZE */ -+#endif - #include "libbpf_internal.h" - - static inline size_t hash_bits(size_t h, int bits) diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template index 807f1425c1d..a4d32bce7a4 100644 --- a/srcpkgs/bcc/template +++ b/srcpkgs/bcc/template @@ -1,20 +1,21 @@ # Template file for 'bcc' pkgname=bcc -version=0.10.0 +version=0.11.0 revision=1 build_style=cmake configure_args="-DREVISION=${version}" hostmakedepends="flex" makedepends="clang elfutils-devel lld-devel llvm ncurses-devel - python-devel zlib-devel" + python3-devel zlib-devel" +python_version="3" short_desc="BPF-based Linux IO analysis, networking, monitoring, and more" maintainer="Leah Neukirchen " license="Apache-2.0" homepage="https://github.com/iovisor/bcc" distfiles="https://github.com/iovisor/${pkgname}/archive/v${version}.tar.gz - https://github.com/libbpf/libbpf/archive/75db50f4a09d9dbac49b1ace9e4b6a722bdf0519.tar.gz" -checksum="b02a75bc469a33e6781c915361a49a97d4ec7b45d74cfeffb22693247438d4b0 - 22a7ba2343df699a0332015aa54d4a8aeba1756f58308fed120b60a8900e9d55" + https://github.com/libbpf/libbpf/archive/1a26b51b1ca0c33ded075e7563ab40fba686ea0f.tar.gz" +checksum="18ba73ab285d96b806e59764abba5e6a5fa0c39f5571150b31cf651df3a71b48 + 3c2e5dc538b338353b05f1ed5d5f2aceee394bbd9b69fec2a7b586a4f9c0274d" nocross=yes # https://github.com/voidlinux/void-packages/issues/4738 post_extract() { @@ -25,7 +26,7 @@ post_extract() { } bcc-tools_package() { short_desc+=" - tools" - depends="python-bcc>=${version}_${revision} linux-headers" + depends="python3-bcc>=${version}_${revision} linux-headers" pkg_install() { vmove usr/share/bcc/man/man8 mv ${PKGDESTDIR}/usr/share/bcc/man ${PKGDESTDIR}/usr/share/man @@ -55,10 +56,10 @@ bcc-devel_package() { vmove usr/share/bcc/examples } } -python-bcc_package() { +python3-bcc_package() { lib32disabled=yes - depends="python" - short_desc+=" - Python 2.7 module" + depends="python3" + short_desc+=" - Python 3 module" depends="${sourcepkg}>=${version}_${revision}" pycompile_module="bcc" pkg_install() { diff --git a/srcpkgs/bctoolbox/template b/srcpkgs/bctoolbox/template index 1fdcea06dc7..b339759beac 100644 --- a/srcpkgs/bctoolbox/template +++ b/srcpkgs/bctoolbox/template @@ -6,7 +6,7 @@ build_style=cmake configure_args="-DENABLE_TESTS_COMPONENT=OFF" makedepends="mbedtls-devel" short_desc="Library to create and run audio and video streams" -maintainer="maxice8 " +maintainer="Orphaned " license="GPL-2.0-only" homepage="https://github.com/BelledonneCommunications/bctoolbox" distfiles="https://github.com/BelledonneCommunications/bctoolbox/archive/${version}.tar.gz" diff --git a/srcpkgs/beancount/template b/srcpkgs/beancount/template index c29e4b8836c..b1e2a121668 100644 --- a/srcpkgs/beancount/template +++ b/srcpkgs/beancount/template @@ -1,6 +1,6 @@ # Template file for 'beancount' pkgname=beancount -version=2.2.1 +version=2.2.3 revision=1 build_style=python3-module pycompile_module="beancount" @@ -8,10 +8,10 @@ hostmakedepends="python3-setuptools" makedepends="python3-devel" depends="python3-pytest python3-dateutil python3-ply python3-bottle python3-lxml python3-magic python3-BeautifulSoup4 python3-requests python3-chardet - python3-google-api-python-client" + python3-google-api-python-client python3-oauth2client" short_desc="Double-entry accounting system based on plain text files" 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=ebcb59bd7c0e18a858c55d6c30eacee3fa949ee5d2c452a7aa80690e36ae2f77 +checksum=1554adfd773d12cb88fd7f4da67fcb608665a9bdedc7e44834e059d1b3a08e5d diff --git a/srcpkgs/bearssl/template b/srcpkgs/bearssl/template index 777cec324d3..ec393735acf 100644 --- a/srcpkgs/bearssl/template +++ b/srcpkgs/bearssl/template @@ -1,23 +1,24 @@ # Template file for 'bearssl' pkgname=bearssl version=0.6 -revision=1 +revision=2 build_style=gnu-makefile +make_build_args="D=.so.${version} LD=\$(CC) LDDLL=\$(CC) LDDLLFLAGS=-shared LDDLLFLAGS+=-Wl,-soname,lib${pkgname}.so.${version%%.*}" short_desc="Implementation of the SSL/TLS protocol in C" maintainer="Leah Neukirchen " license="MIT" -homepage="https://www.bearssl.org/" -_changelog="https://www.bearssl.org/changelog.html" -distfiles="https://www.bearssl.org/${pkgname}-${version}.tar.gz" +homepage="https://bearssl.org" +changelog="${homepage}/changelog.html" +distfiles="${homepage}/${pkgname}-${version}.tar.gz" checksum=6705bba1714961b41a728dfc5debbe348d2966c117649392f8c8139efc83ff14 CFLAGS="-fPIC" -make_build_args="D=.so.${version} LDDLL=\$(CC) LD=\$(CC) LDDLLFLAGS=-shared LDDLLFLAGS+=-Wl,-soname,libbearssl.so.0" do_install() { vbin build/brssl - vinstall build/libbearssl.a 0644 usr/lib - vinstall build/libbearssl.so.${version} 0644 usr/lib - ln -s libbearssl.so.${version} ${DESTDIR}/usr/lib/libbearssl.so + vinstall "build/lib${pkgname}.a" 0644 usr/lib + vinstall "build/lib${pkgname}.so.${version}" 0644 usr/lib + ln -s "lib${pkgname}.so.${version}" "${DESTDIR}/usr/lib/lib${pkgname}.so.${version%%.*}" + ln -s "lib${pkgname}.so.${version%%.*}" "${DESTDIR}/usr/lib/lib${pkgname}.so" vcopy inc usr/include vlicense LICENSE.txt LICENSE } diff --git a/srcpkgs/beignet/patches/llvm8.patch b/srcpkgs/beignet/patches/llvm8.patch new file mode 100644 index 00000000000..15128d1a115 --- /dev/null +++ b/srcpkgs/beignet/patches/llvm8.patch @@ -0,0 +1,56 @@ +From 75c152599a7c1739e6dadcdb9b377acf7e44d9cf Mon Sep 17 00:00:00 2001 +From: Jan Beich +Date: Wed, 30 Jan 2019 12:42:34 +0000 +Subject: [PATCH] lang/beignet: unbreak with llvm80 + +Regressed by https://github.com/llvm/llvm-project/commit/721d95713a9e + +unable to load /usr/local/lib/beignet//libgbeinterp.so which is part of the driver, please check! +ld-elf.so.1: /usr/local/lib/beignet//libgbeinterp.so: Undefined symbol "_ZN4llvm24DisableABIBreakingChecksE" + +Regressed by https://github.com/llvm/llvm-project/commit/4a2d58e16acc + +backend/src/llvm/llvm_gen_backend.cpp:3076:5: error: + unknown type name 'TerminatorInst' + TerminatorInst *term = bb->getTerminator(); + ^ +backend/src/llvm/llvm_gen_backend.cpp:3083:5: error: + unknown type name 'TerminatorInst' + TerminatorInst *term = bb->getTerminator(); + ^ + +--- backend/src/CMakeLists.txt.orig 2017-09-22 08:05:22 UTC ++++ backend/src/CMakeLists.txt +@@ -168,6 +168,7 @@ add_dependencies(gbe beignet_bitcode) + endif (NOT (USE_STANDALONE_GBE_COMPILER STREQUAL "true")) + + add_library(gbeinterp SHARED gbe_bin_interpreter.cpp) ++target_link_libraries(gbeinterp ${LLVM_MODULE_LIBS}) + + if (LLVM_VERSION_NODOT VERSION_EQUAL 34) + find_library(TERMINFO NAMES tinfo ncurses) +--- backend/src/llvm/llvm_gen_backend.cpp.orig 2017-10-24 06:04:48 UTC ++++ backend/src/llvm/llvm_gen_backend.cpp +@@ -3073,14 +3073,22 @@ namespace gbe + + + static unsigned getChildNo(BasicBlock *bb) { ++#if LLVM_VERSION_MAJOR < 8 + TerminatorInst *term = bb->getTerminator(); ++#else ++ Instruction *term = bb->getTerminator(); ++#endif + return term->getNumSuccessors(); + } + + // return NULL if index out-range of children number + static BasicBlock *getChildPossible(BasicBlock *bb, unsigned index) { + ++#if LLVM_VERSION_MAJOR < 8 + TerminatorInst *term = bb->getTerminator(); ++#else ++ Instruction *term = bb->getTerminator(); ++#endif + unsigned childNo = term->getNumSuccessors(); + BasicBlock *child = NULL; + if(index < childNo) { diff --git a/srcpkgs/beignet/patches/llvm9.patch b/srcpkgs/beignet/patches/llvm9.patch new file mode 100644 index 00000000000..bff503800b0 --- /dev/null +++ b/srcpkgs/beignet/patches/llvm9.patch @@ -0,0 +1,111 @@ +Source: FreeBSD + q66 + +Mostly FreeBSD other than FindLLVM.cmake changes. +Linking against clang-cpp does not work for us. + +--- CMake/FindLLVM.cmake ++++ CMake/FindLLVM.cmake +@@ -140,6 +140,7 @@ add_one_lib("clangStaticAnalyzerCore") + add_one_lib("clangAnalysis") + add_one_lib("clangEdit") + add_one_lib("clangAST") ++add_one_lib("clangASTMatchers") + add_one_lib("clangParse") + add_one_lib("clangSema") + add_one_lib("clangLex") +--- backend/src/llvm/llvm_intrinsic_lowering.cpp.orig 2017-10-24 06:04:48 UTC ++++ backend/src/llvm/llvm_intrinsic_lowering.cpp +@@ -77,7 +77,11 @@ namespace gbe { + std::vector ParamTys; + for (Value** I = ArgBegin; I != ArgEnd; ++I) + ParamTys.push_back((*I)->getType()); ++#if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 90 ++ FunctionCallee FCache = M->getOrInsertFunction(NewFn, ++#else + Constant* FCache = M->getOrInsertFunction(NewFn, ++#endif + FunctionType::get(RetTy, ParamTys, false)); + + IRBuilder<> Builder(CI->getParent(), BasicBlock::iterator(CI)); +--- backend/src/llvm/llvm_sampler_fix.cpp.orig 2017-10-24 06:04:48 UTC ++++ backend/src/llvm/llvm_sampler_fix.cpp +@@ -82,7 +82,11 @@ namespace gbe { + #if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 40 + Module *M = I->getParent()->getParent()->getParent(); + #if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 50 ++#if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 90 ++ FunctionCallee samplerCvt = M->getOrInsertFunction("__gen_ocl_sampler_to_int", i32Ty, I->getOperand(0)->getType()); ++#else + Value* samplerCvt = M->getOrInsertFunction("__gen_ocl_sampler_to_int", i32Ty, I->getOperand(0)->getType()); ++#endif + #else + Value* samplerCvt = M->getOrInsertFunction("__gen_ocl_sampler_to_int", i32Ty, I->getOperand(0)->getType(), nullptr); + #endif +@@ -124,7 +128,11 @@ namespace gbe { + #if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 40 + Module *M = I->getParent()->getParent()->getParent(); + #if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 50 ++#if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 90 ++ FunctionCallee samplerCvt = M->getOrInsertFunction("__gen_ocl_sampler_to_int", i32Ty, I->getOperand(0)->getType()); ++#else + Value* samplerCvt = M->getOrInsertFunction("__gen_ocl_sampler_to_int", i32Ty, I->getOperand(0)->getType()); ++#endif + #else + Value* samplerCvt = M->getOrInsertFunction("__gen_ocl_sampler_to_int", i32Ty, I->getOperand(0)->getType(), nullptr); + #endif +--- backend/src/llvm/llvm_profiling.cpp.orig 2017-10-24 06:04:48 UTC ++++ backend/src/llvm/llvm_profiling.cpp +@@ -163,10 +163,18 @@ namespace gbe + // __gen_ocl_store_timestamp(int nth, int type); + Value *Args[2] = {ConstantInt::get(intTy, pointNum++), ConstantInt::get(intTy, profilingType)}; + #if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 50 ++#if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 90 ++ builder->CreateCall(module->getOrInsertFunction( ++#else + builder->CreateCall(cast(module->getOrInsertFunction( ++#endif + "__gen_ocl_calc_timestamp", Type::getVoidTy(module->getContext()), + IntegerType::getInt32Ty(module->getContext()), ++#if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 90 ++ IntegerType::getInt32Ty(module->getContext())), ++#else + IntegerType::getInt32Ty(module->getContext()))), ++#endif + ArrayRef(Args)); + #else + builder->CreateCall(cast(module->getOrInsertFunction( +@@ -185,10 +193,18 @@ namespace gbe + Value *Args2[2] = {profilingBuf, ConstantInt::get(intTy, profilingType)}; + + #if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 50 ++#if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 90 ++ builder->CreateCall(module->getOrInsertFunction( ++#else + builder->CreateCall(cast(module->getOrInsertFunction( ++#endif + "__gen_ocl_store_profiling", Type::getVoidTy(module->getContext()), + ptrTy, ++#if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 90 ++ IntegerType::getInt32Ty(module->getContext())), ++#else + IntegerType::getInt32Ty(module->getContext()))), ++#endif + ArrayRef(Args2)); + #else + builder->CreateCall(cast(module->getOrInsertFunction( +--- backend/src/llvm/llvm_device_enqueue.cpp.orig 2017-10-24 06:04:48 UTC ++++ backend/src/llvm/llvm_device_enqueue.cpp +@@ -398,8 +398,13 @@ namespace gbe { + std::vector ParamTys; + for (Value** iter = args.begin(); iter != args.end(); ++iter) + ParamTys.push_back((*iter)->getType()); ++#if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 90 ++ CallInst* newCI = builder.CreateCall(mod->getOrInsertFunction( ++ "__gen_enqueue_kernel_slm", FunctionType::get(intTy, ParamTys, false)), args); ++#else + CallInst* newCI = builder.CreateCall(cast(mod->getOrInsertFunction( + "__gen_enqueue_kernel_slm", FunctionType::get(intTy, ParamTys, false))), args); ++#endif + CI->replaceAllUsesWith(newCI); + deadInsnSet.insert(CI); + } diff --git a/srcpkgs/beignet/template b/srcpkgs/beignet/template index f56b3d1a0ae..eedb7aef1a7 100644 --- a/srcpkgs/beignet/template +++ b/srcpkgs/beignet/template @@ -1,7 +1,7 @@ # Template file for 'beignet' pkgname=beignet version=1.3.2 -revision=4 +revision=5 archs="i686* x86_64*" wrksrc="Beignet-${version}-Source" build_style=cmake @@ -14,7 +14,6 @@ license="LGPL-2.1-or-later" homepage="http://www.freedesktop.org/wiki/Software/Beignet/" distfiles="https://01.org/sites/default/files/${pkgname}-${version}-source.tar.gz" checksum=c555edba149de23243965a703f39f79fa06f15bcff5a3762b5544b0925010b43 -broken="Doesn't build against libLLVM8; can't be built against libclang 8 and libLLVM7" post_install() { # remove CL headers, we do use opencl-headers instead. diff --git a/srcpkgs/berry/patches/fix-cross.patch b/srcpkgs/berry/patches/fix-cross.patch index a19b36dbc0a..0841ad893af 100644 --- a/srcpkgs/berry/patches/fix-cross.patch +++ b/srcpkgs/berry/patches/fix-cross.patch @@ -1,12 +1,3 @@ ---- config.mk.orig -+++ config.mk -@@ -39,5 +39,5 @@ - - CPPFLAGS += $(NAME_DEFINES) -DSRVR_$$HOSTNAME $(DEBUG_CPPFLAGS) - CFLAGS += -Wall -O3 $(DEBUG_CFLAGS) --CFLAGS += -Icore -Iinclude -I/usr/include/freetype2 -+CFLAGS += -Icore -Iinclude -I$(XBPS_CROSS_BASE)/usr/include/freetype2 - LDFLAGS += -lX11 -lXrandr -lXft --- Makefile.orig +++ Makefile @@ -5,12 +5,12 @@ @@ -18,10 +9,19 @@ CFLAGS?=-Os -pedantic -Wall $(NAME_DEFINES) all: -- $(CC) $(CFLAGS) -I$(PREFIX)/include src/utils.c src/wm.c -L$(PREFIX)/lib -lX11 -lm -lXinerama -lXft -o berry +- $(CC) $(CFLAGS) -I$(PREFIX)/include src/utils.c src/wm.c -L$(PREFIX)/lib -lX11 -lm -lXinerama -lXft -lXext -o berry - $(CC) $(CFLAGS) -I$(PREFIX)/include src/client.c -L$(PREFIX)/lib -lX11 -o berryc -+ $(CC) $(CFLAGS) -I$(XBPS_CROSS_BASE)/$(PREFIX)/include src/utils.c src/wm.c -L$(XBPS_CROSS_BASE)/$(PREFIX)/lib -lX11 -lm -lXinerama -lXft -o berry ++ $(CC) $(CFLAGS) -I$(XBPS_CROSS_BASE)/$(PREFIX)/include src/utils.c src/wm.c -L$(XBPS_CROSS_BASE)/$(PREFIX)/lib -lX11 -lm -lXinerama -lXft -lXext -o berry + $(CC) $(CFLAGS) -I$(XBPS_CROSS_BASE)/$(PREFIX)/include src/client.c -L$(XBPS_CROSS_BASE)/$(PREFIX)/lib -lX11 -o berryc install: mkdir -p "$(DESTDIR)$(PREFIX)/bin" +--- config.mk.orig ++++ config.mk +@@ -39,5 +39,5 @@ + + CPPFLAGS += $(NAME_DEFINES) -DSRVR_$$HOSTNAME $(DEBUG_CPPFLAGS) + CFLAGS += -Wall -O3 $(DEBUG_CFLAGS) +-CFLAGS += -Icore -Iinclude -I/usr/include/freetype2 ++CFLAGS += -Icore -Iinclude -I$(XBPS_CROSS_BASE)/usr/include/freetype2 + LDFLAGS += -lX11 -lXrandr -lXft diff --git a/srcpkgs/berry/template b/srcpkgs/berry/template index 49cdc814ef8..72de22c1c5d 100644 --- a/srcpkgs/berry/template +++ b/srcpkgs/berry/template @@ -1,16 +1,16 @@ # Template file for 'berry' pkgname=berry -version=0.1.0 +version=0.1.3 revision=1 build_style=gnu-makefile make_use_env=yes makedepends="libX11-devel libXinerama-devel libXft-devel freetype-devel" short_desc="Healthy, bite-sized window manager" -maintainer="Andrew Benson " +maintainer="Andrew Benson " license="MIT" homepage="https://github.com/JLErvin/berry" distfiles="https://github.com/JLErvin/berry/archive/${version}.tar.gz" -checksum=62a9e279c2029f52fb80acee3169c02de3cda8e53cf1243e6deeeca7437d1efb +checksum=05a3b9b001ca515ded4310e358cfcd1d4b544954509f61fe40062951b57c0b87 do_install() { vbin berry diff --git a/srcpkgs/bettercap/template b/srcpkgs/bettercap/template index 55f649a982f..ce85b29756f 100644 --- a/srcpkgs/bettercap/template +++ b/srcpkgs/bettercap/template @@ -1,6 +1,6 @@ # Template file for 'bettercap' pkgname=bettercap -version=2.24.1 +version=2.25 revision=1 build_style=go go_import_path=github.com/bettercap/bettercap @@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni " license="GPL-3.0-only" homepage="https://github.com/bettercap/bettercap" distfiles="https://github.com/bettercap/bettercap/archive/v${version}.tar.gz" -checksum=590cef2b2b24fd9f67c57c8cb19ab8ff08b11d43bfc23b468013ddad907bb8b8 +checksum=955b29946774bb12a757006d5518bc20e7174092c5a37f771ab1cb8d21223b6a case "$XBPS_TARGET_MACHINE" in x86_64-musl) broken="fails to build" ;; diff --git a/srcpkgs/bfs/template b/srcpkgs/bfs/template index b900832fe8a..b1d0c7ce076 100644 --- a/srcpkgs/bfs/template +++ b/srcpkgs/bfs/template @@ -1,16 +1,16 @@ # Template file for 'bfs' pkgname=bfs -version=1.5 +version=1.5.1 revision=1 build_style=gnu-makefile makedepends="acl-devel libcap-devel" checkdepends="acl-progs" short_desc="Breadth-first version of the UNIX find command" -maintainer="maxice8 " +maintainer="Orphaned " license="0BSD" homepage="https://github.com/tavianator/bfs" distfiles="https://github.com/tavianator/bfs/archive/${version}.tar.gz" -checksum=c3e595e05e014acda10487efaf74d37ef0d6459d74b3c5b976cd425b277c79c9 +checksum=28defd5f66043c5bfda8b715e9e3eac92a0a1f59b3ec39c78d527a2fb5e0735b post_install() { vlicense COPYING diff --git a/srcpkgs/bijiben/template b/srcpkgs/bijiben/template index b60a004ec63..43e698466ef 100644 --- a/srcpkgs/bijiben/template +++ b/srcpkgs/bijiben/template @@ -1,6 +1,6 @@ # Template file for 'bijiben' pkgname=bijiben -version=3.32.2 +version=3.34.1 revision=1 build_helper="gir" build_style=meson @@ -14,5 +14,5 @@ license="GPL-3.0-or-later" homepage="https://wiki.gnome.org/Apps/Notes" changelog="https://raw.githubusercontent.com/GNOME/bijiben/gnome-${version%.*}/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=c23bc5af5e83a85cb4fdc6873ad800c2afb48dbcadfdce7c1dfdb2a3a7131532 +checksum=fbc3c8f050aed8174358e56dcbf06857db45180ee1e1481e20110b6b25d3c279 nocross="evolution-data-server cross" diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template index 2a59fe39135..d9dbd327368 100644 --- a/srcpkgs/bind/template +++ b/srcpkgs/bind/template @@ -1,7 +1,7 @@ # Template file for 'bind' pkgname=bind reverts="9.13.6_1" -version=9.11.9 +version=9.11.11 revision=1 _fullver="${version}${_patchver:+-${_patchver}}" wrksrc="${pkgname}-${_fullver}" @@ -21,7 +21,7 @@ maintainer="Orphaned " license="ISC" homepage="https://www.isc.org/downloads/bind/" distfiles="https://ftp.isc.org/isc/bind9/${_fullver}/bind-${_fullver}.tar.gz" -checksum=963bf048354795b85b8f3dbe3ff5ba524d3f5b14b86a4cc733fcf971b43ac50e +checksum=615230336645e494d0125a3e92cf1c0f956b7408378aca66667b44eaa9de8a6b conf_files="/etc/named/named.conf" system_accounts="named" diff --git a/srcpkgs/binutils/template b/srcpkgs/binutils/template index b6780fcd5d7..03ea951f7d1 100644 --- a/srcpkgs/binutils/template +++ b/srcpkgs/binutils/template @@ -1,14 +1,14 @@ # Template file for 'binutils' pkgname=binutils -version=2.32 -revision=3 +version=2.33.1 +revision=1 bootstrap=yes short_desc="GNU binary utilities" maintainer="Enno Boland " license="GPL-3.0-or-later" homepage="http://www.gnu.org/software/binutils/" distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.xz" -checksum=0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04 +checksum=ab66fc2d1c3ec0359b8e08843c9f33b63e8707efdff5e4cc5c200eae24722cbf if [ "$CHROOT_READY" ]; then hostmakedepends="flex perl" diff --git a/srcpkgs/binwalk/template b/srcpkgs/binwalk/template index d7a2fbc72f7..461ea4b547a 100644 --- a/srcpkgs/binwalk/template +++ b/srcpkgs/binwalk/template @@ -1,18 +1,27 @@ -# Template build file for 'binwalk'. +# Template file for 'binwalk' pkgname=binwalk -version=2.1.1 -revision=4 +version=2.2.0 +revision=1 archs=noarch build_style=python3-module pycompile_module="binwalk" hostmakedepends="python3" depends="python3" +checkdepends="python3-nose" short_desc="Easy tool for analyzing/reversing/extracting firmware images" maintainer="Duncaen " -homepage="http://www.binwalk.org" license="MIT" +homepage="https://github.com/ReFirmLabs/binwalk" distfiles="https://github.com/ReFirmLabs/binwalk/archive/v${version}.tar.gz" -checksum=1b70a5b03489d29f60fef18008a2164974234874faab48a4f47ec53d461d284a +checksum=f5495f0e4c5575023d593f7c087c367675df6aeb7f4d9a2966e49763924daa27 + +post_extract() { + vsed -i -e 's;/etc/bash_completion.d/%s;%s.bash;' setup.py +} + +do_check() { + PYTHONPATH="${wrksrc}/src" python3 setup.py test +} post_install() { vlicense LICENSE diff --git a/srcpkgs/bird/template b/srcpkgs/bird/template index 718a927acf6..ac4a7c0bf27 100644 --- a/srcpkgs/bird/template +++ b/srcpkgs/bird/template @@ -1,6 +1,6 @@ # Template file for 'bird' pkgname=bird -version=2.0.5 +version=2.0.6 revision=1 build_style=gnu-configure hostmakedepends="flex autoconf" @@ -10,7 +10,7 @@ maintainer="Philipp Hirsch " license="GPL-2.0-or-later" homepage="https://bird.network.cz" distfiles="ftp://bird.network.cz/pub/bird/bird-${version}.tar.gz" -checksum=4e4b736fd26579823a728be6a7746b3f525206e3c9a4a21fccb302cffd3029d3 +checksum=90934cce6ae90039ab1e58ade223935f9221a7e5eac05df6fb53045b77bfd3aa conf_files="/etc/bird.conf" system_accounts="_bird" diff --git a/srcpkgs/bison/template b/srcpkgs/bison/template index 005c9f270c8..2f8067783c4 100644 --- a/srcpkgs/bison/template +++ b/srcpkgs/bison/template @@ -1,6 +1,6 @@ # Template file for 'bison' pkgname=bison -version=3.4.1 +version=3.4.2 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=27159ac5ebf736dffd5636fd2cd625767c9e437de65baa63cb0de83570bd820d +checksum=27d05534699735dc69e86add5b808d6cb35900ad3fd63fa82e3eb644336abfa0 alternatives=" yacc:yacc:/usr/bin/bison-yacc yacc:yacc.1:/usr/share/man/man1/bison-yacc.1" diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template index 9312239a209..b91af62be02 100644 --- a/srcpkgs/bitcoin/template +++ b/srcpkgs/bitcoin/template @@ -1,7 +1,7 @@ # Template file for 'bitcoin' pkgname=bitcoin -version=0.18.0 -revision=2 +version=0.18.1 +revision=1 build_style=gnu-configure configure_args="--with-incompatible-bdb --disable-ccache --disable-static --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr" @@ -15,7 +15,7 @@ homepage="https://bitcoin.org/" distfiles="https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz https://raw.github.com/bitcoin-core/packaging/master/debian/bitcoin-qt.desktop https://raw.github.com/bitcoin/bitcoin/v${version}/share/pixmaps/bitcoin128.png" -checksum="5e4e6890e07b620a93fdb24605dae2bb53e8435b2a93d37558e1db1913df405f +checksum="5c7d93f15579e37aa2d1dc79e8f5ac675f59045fceddf604ae0f1550eb03bf96 0a46bbadda140599e807be38999e6848c89f9c3523d26fede02d34d62d50f632 ad880c8459ecfdb96abe6a4689af06bdd27906e0edcd39d0915482f2da91e722" conflicts="litecoin>=0" # Both provide libbitcoinconsensus.so.0 diff --git a/srcpkgs/bitlbee-facebook/template b/srcpkgs/bitlbee-facebook/template index 4eae30b1c51..052a896f72c 100644 --- a/srcpkgs/bitlbee-facebook/template +++ b/srcpkgs/bitlbee-facebook/template @@ -1,10 +1,11 @@ # Template file for 'bitlbee-facebook' pkgname=bitlbee-facebook version=1.2.0 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="libtool automake pkg-config glib-devel" makedepends="bitlbee-devel json-glib-devel" +depends="bitlbee" short_desc="Facebook protocol plugin for BitlBee" maintainer="Andrea Brancaleoni " license="GPL-2.0-or-later" diff --git a/srcpkgs/blackbox_exporter/template b/srcpkgs/blackbox_exporter/template index a827ce5c2f2..2915315437b 100644 --- a/srcpkgs/blackbox_exporter/template +++ b/srcpkgs/blackbox_exporter/template @@ -1,6 +1,6 @@ # Template file for 'blackbox_exporter' pkgname=blackbox_exporter -version=0.14.0 +version=0.15.1 revision=1 build_style=go go_import_path="github.com/prometheus/blackbox_exporter" @@ -14,7 +14,7 @@ license="Apache-2.0" homepage="https://prometheus.io" changelog="https://github.com/prometheus/blackbox_exporter/releases" distfiles="https://github.com/prometheus/blackbox_exporter/archive/v${version}.tar.gz" -checksum=25528cfd51ed95ff70e41f44670193f045b6107e803c1c2d30fc71aae5a8c711 +checksum=5873b6fef45f3fca67036f837a8b6191eace3cb722ad301919bfa8a4d120e24f system_accounts="_bbox_exporter" diff --git a/srcpkgs/blender/patches/altivec-all.patch b/srcpkgs/blender/patches/altivec-all.patch new file mode 100644 index 00000000000..115e1ea6fd0 --- /dev/null +++ b/srcpkgs/blender/patches/altivec-all.patch @@ -0,0 +1,32 @@ +This applies a better workaround for C++ type conflicts +in AltiVec/C++, allowing it to build on BE ppc(64). + +--- a/extern/clew/include/clew.h ++++ b/extern/clew/include/clew.h +@@ -370,15 +370,18 @@ typedef unsigned int cl_GLenum; + + /* Define basic vector types */ + /* Workaround for ppc64el platform: conflicts with bool from C++. */ +-#if defined( __VEC__ ) && !(defined(__PPC64__) && defined(__LITTLE_ENDIAN__)) ++#if defined(__VEC__) + #include /* may be omitted depending on compiler. AltiVec spec provides no way to detect whether the header is required. */ +- typedef vector unsigned char __cl_uchar16; +- typedef vector signed char __cl_char16; +- typedef vector unsigned short __cl_ushort8; +- typedef vector signed short __cl_short8; +- typedef vector unsigned int __cl_uint4; +- typedef vector signed int __cl_int4; +- typedef vector float __cl_float4; ++ #undef vector ++ #undef bool ++ #undef pixel ++ typedef __vector unsigned char __cl_uchar16; ++ typedef __vector signed char __cl_char16; ++ typedef __vector unsigned short __cl_ushort8; ++ typedef __vector signed short __cl_short8; ++ typedef __vector unsigned int __cl_uint4; ++ typedef __vector signed int __cl_int4; ++ typedef __vector float __cl_float4; + #define __CL_UCHAR16__ 1 + #define __CL_CHAR16__ 1 + #define __CL_USHORT8__ 1 diff --git a/srcpkgs/blender/patches/gcc9-elbeem.patch b/srcpkgs/blender/patches/gcc9-elbeem.patch new file mode 100644 index 00000000000..26c58e7d988 --- /dev/null +++ b/srcpkgs/blender/patches/gcc9-elbeem.patch @@ -0,0 +1,31 @@ +https://bugs.gentoo.org/685922 + +--- a/intern/elbeem/intern/solver_main.cpp ++++ b/intern/elbeem/intern/solver_main.cpp +@@ -381,7 +381,7 @@ LbmFsgrSolver::mainLoop(const int lev) + GRID_REGION_INIT(); + #if PARALLEL==1 + const int gDebugLevel = ::gDebugLevel; +-#pragma omp parallel default(none) num_threads(mNumOMPThreads) \ ++#pragma omp parallel default(none) firstprivate(gDebugLevel,iend,lev,cutConst) num_threads(mNumOMPThreads) \ + reduction(+: \ + calcCurrentMass,calcCurrentVolume, \ + calcCellsFilled,calcCellsEmptied, \ +@@ -1126,7 +1126,7 @@ LbmFsgrSolver::preinitGrids() + GRID_REGION_INIT(); + #if PARALLEL==1 + const int gDebugLevel = ::gDebugLevel; +-#pragma omp parallel default(none) num_threads(mNumOMPThreads) \ ++#pragma omp parallel default(none) firstprivate(gDebugLevel,iend,lev) num_threads(mNumOMPThreads) \ + reduction(+: \ + calcCurrentMass,calcCurrentVolume, \ + calcCellsFilled,calcCellsEmptied, \ +@@ -1164,7 +1164,7 @@ LbmFsgrSolver::standingFluidPreinit() + GRID_REGION_INIT(); + #if PARALLEL==1 + const int gDebugLevel = ::gDebugLevel; +-#pragma omp parallel default(none) num_threads(mNumOMPThreads) \ ++#pragma omp parallel default(none) firstprivate(gDebugLevel,iend,lev) num_threads(mNumOMPThreads) \ + reduction(+: \ + calcCurrentMass,calcCurrentVolume, \ + calcCellsFilled,calcCellsEmptied, \ diff --git a/srcpkgs/bluedevil/template b/srcpkgs/bluedevil/template index abb64eb503f..612d4da35bf 100644 --- a/srcpkgs/bluedevil/template +++ b/srcpkgs/bluedevil/template @@ -1,6 +1,6 @@ # Template file for 'bluedevil' pkgname=bluedevil -version=5.16.4 +version=5.17.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -11,7 +11,7 @@ maintainer="John " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://projects.kde.org/projects/plasma/bluedevil" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=36eaff3da49104fb4ca8de32c2cd42657af7cde94f54c95bacf5abd6c1d39521 +checksum=c4576b72dead133483e8faab787ea5daf96217216b324df529ca5381a5aac929 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel" diff --git a/srcpkgs/blueman/template b/srcpkgs/blueman/template index f59d3ccb980..83f9b899583 100644 --- a/srcpkgs/blueman/template +++ b/srcpkgs/blueman/template @@ -1,7 +1,7 @@ # Template file for 'blueman' pkgname=blueman version=2.1.1 -revision=1 +revision=2 build_style=gnu-configure pycompile_module="blueman" configure_args="--disable-static" @@ -20,3 +20,7 @@ conf_files="/etc/dbus-1/system.d/org.blueman.Mechanism.conf" if [ "$CROSS_BUILD" ]; then hostmakedepends+=" glib-devel python3-devel" fi + +post_install() { + rm -rf ${DESTDIR}/usr/lib/systemd +} diff --git a/srcpkgs/bluez-qt5/template b/srcpkgs/bluez-qt5/template index d739ac2f454..53d3b214cb6 100644 --- a/srcpkgs/bluez-qt5/template +++ b/srcpkgs/bluez-qt5/template @@ -1,6 +1,6 @@ # Template file for 'bluez-qt5' pkgname=bluez-qt5 -version=5.61.0 +version=5.63.0 revision=1 wrksrc="${pkgname%5}-${version}" build_style=cmake @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://cgit.kde.org/bluez-qt.git" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz" -checksum=0ea647de61fcc18a85c660fa8e05fe93072a713a8d00a018ba8e99ea790e5d27 +checksum=b0114b2f0605973b67cdc89ab2037a78d088abecab28597364352df859aa2a9d if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake" diff --git a/srcpkgs/bluez/files/bluetooth-meshd/run b/srcpkgs/bluez/files/bluetooth-meshd/run new file mode 100755 index 00000000000..752dbcc37bf --- /dev/null +++ b/srcpkgs/bluez/files/bluetooth-meshd/run @@ -0,0 +1,3 @@ +#!/bin/sh +sv check dbus >/dev/null || exit 1 +exec /usr/libexec/bluetooth/bluetooth-meshd --nodetach >/dev/null diff --git a/srcpkgs/bluez/patches/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch b/srcpkgs/bluez/patches/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch deleted file mode 100644 index 15da2636673..00000000000 --- a/srcpkgs/bluez/patches/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 3027cb7141fb65cf3eeda69c688db8c4045e2d3f Mon Sep 17 00:00:00 2001 -From: Giovanni Campagna -Date: Sat, 12 Oct 2013 17:45:25 +0200 -Subject: [PATCH] Allow using obexd without systemd in the user session - -Not all sessions run systemd --user (actually, the majority -doesn't), so the dbus daemon must be able to spawn obexd -directly, and to do so it needs the full path of the daemon. ---- - Makefile.obexd | 4 ++-- - obexd/src/org.bluez.obex.service | 4 ---- - obexd/src/org.bluez.obex.service.in | 4 ++++ - 3 files changed, 6 insertions(+), 6 deletions(-) - delete mode 100644 obexd/src/org.bluez.obex.service - create mode 100644 obexd/src/org.bluez.obex.service.in - -diff --git a/Makefile.obexd b/Makefile.obexd -index 3760867..142e7c3 100644 ---- Makefile.obexd -+++ Makefile.obexd -@@ -2,12 +2,12 @@ - if SYSTEMD - systemduserunitdir = @SYSTEMD_USERUNITDIR@ - systemduserunit_DATA = obexd/src/obex.service -+endif - - dbussessionbusdir = @DBUS_SESSIONBUSDIR@ - dbussessionbus_DATA = obexd/src/org.bluez.obex.service --endif - --EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service -+EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in - - obex_plugindir = $(libdir)/obex/plugins - -diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service -deleted file mode 100644 -index a538088..0000000 ---- obexd/src/org.bluez.obex.service -+++ /dev/null -@@ -1,4 +0,0 @@ --[D-BUS Service] --Name=org.bluez.obex --Exec=/bin/false --SystemdService=dbus-org.bluez.obex.service -diff --git a/obexd/src/org.bluez.obex.service.in b/obexd/src/org.bluez.obex.service.in -new file mode 100644 -index 0000000..9c815f2 ---- /dev/null -+++ obexd/src/org.bluez.obex.service.in -@@ -0,0 +1,4 @@ -+[D-BUS Service] -+Name=org.bluez.obex -+Exec=@libexecdir@/obexd -+SystemdService=dbus-org.bluez.obex.service --- -1.8.3.1 - - diff --git a/srcpkgs/bluez/patches/0001-enable-dbus-without-systemd.patch b/srcpkgs/bluez/patches/0001-enable-dbus-without-systemd.patch new file mode 100644 index 00000000000..5b9c7dc708c --- /dev/null +++ b/srcpkgs/bluez/patches/0001-enable-dbus-without-systemd.patch @@ -0,0 +1,34 @@ +From 2625ab38ae27754205d060f09e3a18f7648d5167 Mon Sep 17 00:00:00 2001 +From: Doan Tran Cong Danh +Date: Thu, 3 Oct 2019 12:57:09 +0700 +Subject: [PATCH 1/9] enable dbus without systemd + +--- + Makefile.am | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 404e6a460..0884156fa 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -40,14 +40,14 @@ conf_DATA = + + statedir = $(localstatedir)/lib/bluetooth + state_DATA = ++ ++dbussystembusdir = $(DBUS_SYSTEMBUSDIR) ++dbussystembus_DATA = src/org.bluez.service + endif + + if SYSTEMD + systemdsystemunitdir = $(SYSTEMD_SYSTEMUNITDIR) + systemdsystemunit_DATA = src/bluetooth.service +- +-dbussystembusdir = $(DBUS_SYSTEMBUSDIR) +-dbussystembus_DATA = src/org.bluez.service + endif + + EXTRA_DIST += src/bluetooth.service.in src/org.bluez.service +-- +2.23.0 + diff --git a/srcpkgs/bluez/patches/0002-allow-obexd-on-non-systemd-system.patch b/srcpkgs/bluez/patches/0002-allow-obexd-on-non-systemd-system.patch new file mode 100644 index 00000000000..4ea752cd685 --- /dev/null +++ b/srcpkgs/bluez/patches/0002-allow-obexd-on-non-systemd-system.patch @@ -0,0 +1,54 @@ +From 82099f711ecd8281cebad23b53aadb8c875bc235 Mon Sep 17 00:00:00 2001 +From: Doan Tran Cong Danh +Date: Thu, 3 Oct 2019 12:57:55 +0700 +Subject: [PATCH 2/9] allow obexd on non-systemd system + +--- + Makefile.obexd | 6 +++--- + .../{org.bluez.obex.service => org.bluez.obex.service.in} | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + rename obexd/src/{org.bluez.obex.service => org.bluez.obex.service.in} (74%) + +diff --git a/Makefile.obexd b/Makefile.obexd +index d36874770..c9996288c 100644 +--- a/Makefile.obexd ++++ b/Makefile.obexd +@@ -1,12 +1,12 @@ + if SYSTEMD + systemduserunitdir = $(SYSTEMD_USERUNITDIR) + systemduserunit_DATA = obexd/src/obex.service ++endif + + dbussessionbusdir = $(DBUS_SESSIONBUSDIR) + dbussessionbus_DATA = obexd/src/org.bluez.obex.service +-endif + +-EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service ++EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in + + if OBEX + +@@ -106,6 +106,6 @@ obexd/src/plugin.$(OBJEXT): obexd/src/builtin.h + obexd/src/builtin.h: obexd/src/genbuiltin $(obexd_builtin_sources) + $(AM_V_GEN)$(srcdir)/obexd/src/genbuiltin $(obexd_builtin_modules) > $@ + +-CLEANFILES += obexd/src/builtin.h $(builtin_files) obexd/src/obex.service ++CLEANFILES += obexd/src/builtin.h $(builtin_files) obexd/src/obex.service obexd/src/org.bluez.obex.service + + EXTRA_DIST += obexd/src/genbuiltin +diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service.in +similarity index 74% +rename from obexd/src/org.bluez.obex.service +rename to obexd/src/org.bluez.obex.service.in +index a53808884..543d7bc07 100644 +--- a/obexd/src/org.bluez.obex.service ++++ b/obexd/src/org.bluez.obex.service.in +@@ -1,4 +1,4 @@ + [D-BUS Service] + Name=org.bluez.obex +-Exec=/bin/false ++Exec=@pkglibexecdir@/obexd + SystemdService=dbus-org.bluez.obex.service +-- +2.23.0 + diff --git a/srcpkgs/bluez/patches/0002-bluetoothd-dbus-service.patch b/srcpkgs/bluez/patches/0002-bluetoothd-dbus-service.patch deleted file mode 100644 index b7856185dff..00000000000 --- a/srcpkgs/bluez/patches/0002-bluetoothd-dbus-service.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- Makefile.am.orig 2014-07-30 12:30:56.483179384 +0200 -+++ Makefile.am 2014-07-30 12:31:30.858387791 +0200 -@@ -39,14 +39,14 @@ conf_DATA = - - statedir = $(localstatedir)/lib/bluetooth - state_DATA = -+ -+dbussystembusdir = @DBUS_SYSTEMBUSDIR@ -+dbussystembus_DATA = src/org.bluez.service - endif - - if SYSTEMD - systemdsystemunitdir = @SYSTEMD_SYSTEMUNITDIR@ - systemdsystemunit_DATA = src/bluetooth.service -- --dbussystembusdir = @DBUS_SYSTEMBUSDIR@ --dbussystembus_DATA = src/org.bluez.service - endif - - EXTRA_DIST += src/bluetooth.service.in src/org.bluez.service diff --git a/srcpkgs/bluez/patches/0003-allow-mesh-on-non-systemd-system.patch b/srcpkgs/bluez/patches/0003-allow-mesh-on-non-systemd-system.patch new file mode 100644 index 00000000000..2cf6f73442d --- /dev/null +++ b/srcpkgs/bluez/patches/0003-allow-mesh-on-non-systemd-system.patch @@ -0,0 +1,29 @@ +From 32a425c3f9b42a55824c044a6b486c9c12e65a65 Mon Sep 17 00:00:00 2001 +From: Doan Tran Cong Danh +Date: Thu, 3 Oct 2019 12:58:18 +0700 +Subject: [PATCH 3/9] allow mesh on non-systemd system + +--- + Makefile.mesh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.mesh b/Makefile.mesh +index 90979cbc0..9e6e2c2ca 100644 +--- a/Makefile.mesh ++++ b/Makefile.mesh +@@ -2,11 +2,11 @@ if MESH + + if DATAFILES + dbus_DATA += mesh/bluetooth-mesh.conf ++dbussystembus_DATA += mesh/org.bluez.mesh.service + endif + + if SYSTEMD + systemdsystemunit_DATA += mesh/bluetooth-mesh.service +-dbussystembus_DATA += mesh/org.bluez.mesh.service + endif + + mesh_sources = mesh/mesh.h mesh/mesh.c \ +-- +2.23.0 + diff --git a/srcpkgs/bluez/patches/0003-bluetooth-group-can-use-bluez.patch b/srcpkgs/bluez/patches/0003-bluetooth-group-can-use-bluez.patch deleted file mode 100644 index 7a72e60944e..00000000000 --- a/srcpkgs/bluez/patches/0003-bluetooth-group-can-use-bluez.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- src/bluetooth.conf -+++ src/bluetooth.conf -@@ -28,6 +28,10 @@ - - - -+ -+ -+ -+ - - diff --git a/srcpkgs/bluez/patches/0004-include-sys-time.h-for-musl-build.patch b/srcpkgs/bluez/patches/0004-include-sys-time.h-for-musl-build.patch new file mode 100644 index 00000000000..1cd573cc039 --- /dev/null +++ b/srcpkgs/bluez/patches/0004-include-sys-time.h-for-musl-build.patch @@ -0,0 +1,129 @@ +From 2a2eb634d481ab4eed0a444321dc12338de96d6a Mon Sep 17 00:00:00 2001 +From: Doan Tran Cong Danh +Date: Thu, 3 Oct 2019 12:59:56 +0700 +Subject: [PATCH 4/9] include sys/time.h for musl build + +--- + mesh/appkey.c | 1 + + mesh/crypto.c | 1 + + mesh/friend.c | 1 + + mesh/manager.c | 1 + + mesh/mesh.c | 1 + + mesh/net.c | 2 +- + mesh/pb-adv.c | 1 + + mesh/prov-acceptor.c | 1 + + mesh/prov-initiator.c | 1 + + 9 files changed, 9 insertions(+), 1 deletion(-) + +diff --git a/mesh/appkey.c b/mesh/appkey.c +index 6c65454c1..a455c83b6 100644 +--- a/mesh/appkey.c ++++ b/mesh/appkey.c +@@ -22,6 +22,7 @@ + #endif + + #define _GNU_SOURCE ++#include + #include + + #include "mesh/mesh-defs.h" +diff --git a/mesh/crypto.c b/mesh/crypto.c +index cebdffe45..e1689c6d7 100644 +--- a/mesh/crypto.c ++++ b/mesh/crypto.c +@@ -24,6 +24,7 @@ + #define _GNU_SOURCE + #include + #include ++#include + #include + + #include +diff --git a/mesh/friend.c b/mesh/friend.c +index da2772870..ee48a3cc7 100644 +--- a/mesh/friend.c ++++ b/mesh/friend.c +@@ -21,6 +21,7 @@ + #include + #endif + ++#include + #include + + #include "mesh/mesh-defs.h" +diff --git a/mesh/manager.c b/mesh/manager.c +index 501ec10fe..6b6219c56 100644 +--- a/mesh/manager.c ++++ b/mesh/manager.c +@@ -22,6 +22,7 @@ + #endif + + #define _GNU_SOURCE ++#include + #include + + #include "mesh/mesh-defs.h" +diff --git a/mesh/mesh.c b/mesh/mesh.c +index b660a7ef2..3ea8b2cb4 100644 +--- a/mesh/mesh.c ++++ b/mesh/mesh.c +@@ -22,6 +22,7 @@ + #endif + + #define _GNU_SOURCE ++#include + #include + + #include "mesh/mesh-io.h" +diff --git a/mesh/net.c b/mesh/net.c +index 2785039db..740e3c3af 100644 +--- a/mesh/net.c ++++ b/mesh/net.c +@@ -22,7 +22,7 @@ + #endif + + #define _GNU_SOURCE +- ++#include + #include + + #include "mesh/mesh-defs.h" +diff --git a/mesh/pb-adv.c b/mesh/pb-adv.c +index 6b4a70052..481f4ac8d 100644 +--- a/mesh/pb-adv.c ++++ b/mesh/pb-adv.c +@@ -21,6 +21,7 @@ + #include + #endif + ++#include + #include + + #include "mesh/mesh-defs.h" +diff --git a/mesh/prov-acceptor.c b/mesh/prov-acceptor.c +index 57eb1e750..50989b217 100644 +--- a/mesh/prov-acceptor.c ++++ b/mesh/prov-acceptor.c +@@ -21,6 +21,7 @@ + #include + #endif + ++#include + #include + + #include "src/shared/ecc.h" +diff --git a/mesh/prov-initiator.c b/mesh/prov-initiator.c +index eb59f53f1..65cf194e6 100644 +--- a/mesh/prov-initiator.c ++++ b/mesh/prov-initiator.c +@@ -21,6 +21,7 @@ + #include + #endif + ++#include + #include + + #include "src/shared/ecc.h" +-- +2.23.0 + diff --git a/srcpkgs/bluez/patches/0005-include-limits.h-for-musl-build.patch b/srcpkgs/bluez/patches/0005-include-limits.h-for-musl-build.patch new file mode 100644 index 00000000000..0de1d253c1f --- /dev/null +++ b/srcpkgs/bluez/patches/0005-include-limits.h-for-musl-build.patch @@ -0,0 +1,66 @@ +From 9ac712db3c9913d6e00635e120d77541dcc51b6b Mon Sep 17 00:00:00 2001 +From: Doan Tran Cong Danh +Date: Thu, 3 Oct 2019 13:00:13 +0700 +Subject: [PATCH 5/9] include limits.h for musl build + +--- + mesh/keyring.c | 2 +- + mesh/mesh-config-json.c | 1 + + mesh/node.c | 1 + + mesh/util.c | 1 + + 4 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/mesh/keyring.c b/mesh/keyring.c +index 3a7f92f9f..d5765983c 100644 +--- a/mesh/keyring.c ++++ b/mesh/keyring.c +@@ -24,9 +24,9 @@ + #define _GNU_SOURCE + #include + #include ++#include + #include + #include +-#include + + #include + +diff --git a/mesh/mesh-config-json.c b/mesh/mesh-config-json.c +index cafa2fdd7..74ca49590 100644 +--- a/mesh/mesh-config-json.c ++++ b/mesh/mesh-config-json.c +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/mesh/node.c b/mesh/node.c +index b6824f505..15dcb977f 100644 +--- a/mesh/node.c ++++ b/mesh/node.c +@@ -23,6 +23,7 @@ + + #define _GNU_SOURCE + #include ++#include + #include + #include + +diff --git a/mesh/util.c b/mesh/util.c +index 1455bdec3..e441a2ed8 100644 +--- a/mesh/util.c ++++ b/mesh/util.c +@@ -24,6 +24,7 @@ + #define _GNU_SOURCE + #include + #include ++#include + #include + #include + #include +-- +2.23.0 + diff --git a/srcpkgs/bluez/patches/musl.patch b/srcpkgs/bluez/patches/0006-musl-fix.patch similarity index 52% rename from srcpkgs/bluez/patches/musl.patch rename to srcpkgs/bluez/patches/0006-musl-fix.patch index 033a1165fd5..ab0a588137e 100644 --- a/srcpkgs/bluez/patches/musl.patch +++ b/srcpkgs/bluez/patches/0006-musl-fix.patch @@ -1,10 +1,20 @@ +From d1d8408c9a7c7b5ffa30371f246cc18085e11313 Mon Sep 17 00:00:00 2001 +From: Doan Tran Cong Danh +Date: Thu, 3 Oct 2019 13:00:27 +0700 +Subject: [PATCH 6/9] musl fix + Including causes the inclusion of , which defines 'struct in6_addr', already defined in . Remove to fix musl build. +--- + tools/bneptest.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) ---- tools/bneptest.c.orig 2015-07-30 21:17:18.000000000 +0200 -+++ tools/bneptest.c 2017-03-01 19:27:43.579458817 +0100 -@@ -36,7 +36,6 @@ +diff --git a/tools/bneptest.c b/tools/bneptest.c +index 8bc7596b6..6b3956cfa 100644 +--- a/tools/bneptest.c ++++ b/tools/bneptest.c +@@ -37,7 +37,6 @@ #include #include #include @@ -12,7 +22,7 @@ Remove to fix musl build. #include -@@ -50,6 +49,9 @@ +@@ -51,6 +50,9 @@ #include "lib/bnep.h" #include "profiles/network/bnep.h" @@ -22,3 +32,6 @@ Remove to fix musl build. enum { MODE_LISTEN, MODE_CONNECT, +-- +2.23.0 + diff --git a/srcpkgs/bluez/patches/0007-include-string.h.patch b/srcpkgs/bluez/patches/0007-include-string.h.patch new file mode 100644 index 00000000000..e1cff41df49 --- /dev/null +++ b/srcpkgs/bluez/patches/0007-include-string.h.patch @@ -0,0 +1,25 @@ +From fe1a76a03b9cbc28621d53680eb9ff4a2bd31778 Mon Sep 17 00:00:00 2001 +From: Doan Tran Cong Danh +Date: Thu, 3 Oct 2019 16:31:01 +0700 +Subject: [PATCH 7/9] include string.h + +--- + android/client/if-hf-client.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/android/client/if-hf-client.c b/android/client/if-hf-client.c +index f701a814c..b44eb4291 100644 +--- a/android/client/if-hf-client.c ++++ b/android/client/if-hf-client.c +@@ -16,6 +16,8 @@ + */ + + #define _GNU_SOURCE ++#include ++ + #include "if-main.h" + #include "../hal-utils.h" + +-- +2.23.0 + diff --git a/srcpkgs/bluez/patches/0008-grant-permission-to-bluetooth-group.patch b/srcpkgs/bluez/patches/0008-grant-permission-to-bluetooth-group.patch new file mode 100644 index 00000000000..ec8a1f554af --- /dev/null +++ b/srcpkgs/bluez/patches/0008-grant-permission-to-bluetooth-group.patch @@ -0,0 +1,27 @@ +From 05853e46e66868228468fc73d86f221b12edaef1 Mon Sep 17 00:00:00 2001 +From: Doan Tran Cong Danh +Date: Fri, 4 Oct 2019 11:36:47 +0700 +Subject: [PATCH 8/9] grant permission to bluetooth group + +--- + src/bluetooth.conf | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/bluetooth.conf b/src/bluetooth.conf +index 8a1e25801..75dd7d670 100644 +--- a/src/bluetooth.conf ++++ b/src/bluetooth.conf +@@ -22,6 +22,10 @@ + + + ++ ++ ++ ++ + + + +-- +2.23.0 + diff --git a/srcpkgs/bluez/patches/0009-adapter-Don-t-refresh-adv_manager-for-non-LE-devices.patch b/srcpkgs/bluez/patches/0009-adapter-Don-t-refresh-adv_manager-for-non-LE-devices.patch new file mode 100644 index 00000000000..b78dd879800 --- /dev/null +++ b/srcpkgs/bluez/patches/0009-adapter-Don-t-refresh-adv_manager-for-non-LE-devices.patch @@ -0,0 +1,51 @@ +From 3b357802d24ae4f918a1b001b6930280909ef87e Mon Sep 17 00:00:00 2001 +From: "antoine.belvire@laposte.net" +Date: Tue, 27 Mar 2018 20:30:26 +0200 +Subject: [PATCH 9/9] adapter: Don't refresh adv_manager for non-LE devices + +btd_adv_manager_refresh is called upon MGMT_SETTING_DISCOVERABLE setting change +but as only LE adapters have an adv_manager, this leads to segmentation fault +for non-LE devices: + +0 btd_adv_manager_refresh (manager=0x0) at src/advertising.c:1176 +1 0x0000556fe45fcb02 in settings_changed (settings=, + adapter=0x556fe53f7c70) at src/adapter.c:543 +2 new_settings_callback (index=, length=, + param=, user_data=0x556fe53f7c70) at src/adapter.c:573 +3 0x0000556fe462c278 in request_complete (mgmt=mgmt@entry=0x556fe53f20c0, + status=, opcode=opcode@entry=7, index=index@entry=0, + length=length@entry=4, param=0x556fe53eb5f9) at src/shared/mgmt.c:261 +4 0x0000556fe462cd9d in can_read_data (io=, + user_data=0x556fe53f20c0) at src/shared/mgmt.c:353 +5 0x0000556fe46396e3 in watch_callback (channel=, + cond=, user_data=) + at src/shared/io-glib.c:170 +6 0x00007fe351c980e5 in g_main_context_dispatch () + from /usr/lib64/libglib-2.0.so.0 +7 0x00007fe351c984b0 in ?? () from /usr/lib64/libglib-2.0.so.0 +8 0x00007fe351c987c2 in g_main_loop_run () from /usr/lib64/libglib-2.0.so.0 +9 0x0000556fe45abc75 in main (argc=, argv=) + at src/main.c:770 + +This commit prevents the call to btd_adv_manager_refresh for non-LE devices. +--- + src/adapter.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/adapter.c b/src/adapter.c +index cef25616f..17018ecac 100644 +--- a/src/adapter.c ++++ b/src/adapter.c +@@ -546,7 +546,8 @@ static void settings_changed(struct btd_adapter *adapter, uint32_t settings) + g_dbus_emit_property_changed(dbus_conn, adapter->path, + ADAPTER_INTERFACE, "Discoverable"); + store_adapter_info(adapter); +- btd_adv_manager_refresh(adapter->adv_manager); ++ if (adapter->supported_settings & MGMT_SETTING_LE) ++ btd_adv_manager_refresh(adapter->adv_manager); + } + + if (changed_mask & MGMT_SETTING_BONDABLE) { +-- +2.23.0 + diff --git a/srcpkgs/bluez/template b/srcpkgs/bluez/template index c096e8386f7..9286b93a542 100644 --- a/srcpkgs/bluez/template +++ b/srcpkgs/bluez/template @@ -1,21 +1,33 @@ # Template file for 'bluez' pkgname=bluez -version=5.50 -revision=5 +version=5.51 +revision=1 build_style=gnu-configure configure_args="--with-udevdir=/usr/lib/udev --disable-systemd - --enable-sixaxis --enable-threads --enable-library --enable-deprecated" + --enable-sixaxis --enable-threads --enable-library --enable-deprecated + $(vopt_enable mesh) $(vopt_enable nfc)" hostmakedepends="automake flex libtool pkg-config" makedepends="cups-devel eudev-libudev-devel libglib-devel libical-devel - readline-devel" + readline-devel $(vopt_if mesh json-c-devel)" short_desc="Bluetooth tools and daemons" -maintainer="Orphaned " +maintainer="Doan Tran Cong Danh " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="http://www.bluez.org/" distfiles="${KERNEL_SITE}/bluetooth/$pkgname-$version.tar.xz" -checksum=5ffcaae18bbb6155f1591be8c24898dc12f062075a40b538b745bfd477481911 +checksum=ebedfb359f62957940822f1d0b39fcee30422380e435608dad06bb3913d5ebba conf_files="/etc/bluetooth/main.conf" system_groups="bluetooth" +build_options="mesh nfc" +patch_args="-Np1" + +post_patch() { + find android -name '*.h' -exec \ + sed -i\ + -e 's/__BEGIN_DECLS/#ifdef __cplusplus\nextern "C" {\n#endif/' \ + -e 's/__END_DECLS/#ifdef __cplusplus\n}\n#endif/' \ + -e '/#include .sys\/cdefs.h/d' \ + {} + +} pre_configure() { autoreconf -fi @@ -24,6 +36,9 @@ pre_configure() { post_install() { vinstall ${wrksrc}/src/main.conf 644 etc/bluetooth vsv bluetoothd + if [ $build_option_mesh ]; then + vsv bluetooth-meshd + fi } libbluetooth_package() { @@ -68,4 +83,3 @@ bluez-deprecated_package() { vmove usr/share/man/man1/sdptool.1 } } - diff --git a/srcpkgs/bogofilter/template b/srcpkgs/bogofilter/template index ffa878f9cc8..6a804e5c649 100644 --- a/srcpkgs/bogofilter/template +++ b/srcpkgs/bogofilter/template @@ -1,18 +1,18 @@ # Template file for 'bogofilter' pkgname=bogofilter -version=1.2.4 -revision=4 +version=1.2.5 +revision=1 build_style=gnu-configure configure_args="--sysconfdir=/etc/${pkgname} --with-database=sqlite" hostmakedepends="perl" -depends="perl" makedepends="gsl-devel sqlite-devel" -short_desc="A fast Bayesian spam filtering tool" +depends="perl" +short_desc="Fast Bayesian spam filtering tool" maintainer="Gour " -license="GPL-3" +license="GPL-3.0-only" homepage="http://bogofilter.sourceforge.net" -distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=d2f2598d1300307209b7b1905cc0637d2d053c0a4701a8d44383867299578471 +distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz" +checksum=3248a1373bff552c500834adbea4b6caee04224516ae581fb25a4c6a6dee89ea conf_files="/etc/bogofilter/bogofilter.cf" diff --git a/srcpkgs/boinc/template b/srcpkgs/boinc/template index 85315678f0e..ad3ac3a55f5 100644 --- a/srcpkgs/boinc/template +++ b/srcpkgs/boinc/template @@ -1,7 +1,7 @@ # Template file for 'boinc' pkgname=boinc -version=7.14.2 -revision=3 +version=7.16.3 +revision=1 _majorver=${version%.*} wrksrc=boinc-client_release-${_majorver}-${version} build_style=gnu-configure @@ -19,7 +19,7 @@ maintainer="Jürgen Buchmüller " license="LGPL-3.0-or-later" homepage="https://boinc.berkeley.edu/" distfiles="https://github.com/BOINC/boinc/archive/client_release/${_majorver}/${version}.tar.gz>boinc-${version}.tar.gz" -checksum=970aedb9e25afa20be67f125ab05435df8eb2e66a3ac30ad316c54085e397c88 +checksum=622ce3335a01ef30add4813c0cc7b65cffcaa5500a7f58f77748d0dbc80e6b06 conflicts="boinc-nox>=0" CXXFLAGS="-Wno-redundant-decls" diff --git a/srcpkgs/borgmatic/template b/srcpkgs/borgmatic/template index 6ddb713e591..8ef7c0568a6 100644 --- a/srcpkgs/borgmatic/template +++ b/srcpkgs/borgmatic/template @@ -1,6 +1,6 @@ # Template file for 'borgmatic' pkgname=borgmatic -version=1.3.14 +version=1.3.24 revision=1 archs=noarch build_style=python3-module @@ -15,7 +15,7 @@ maintainer="Renato Aguiar " license="GPL-3.0-only" homepage="https://torsion.org/borgmatic/" distfiles="${PYPI_SITE}/b/borgmatic/borgmatic-${version}.tar.gz" -checksum=4fbb7a0f3a32ee0ebdd6f6a982f7ced00ec92205176cbe1cfeaa780466716bdc +checksum=ca49f15e0eab8650550ce031a9c71a547acaaff15abd3448a6a2e55ca09e83ca do_check() { # The tests use the NEWS file to get version and checks against diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template index 0d2f0021391..2e8da6f872a 100644 --- a/srcpkgs/botan/template +++ b/srcpkgs/botan/template @@ -1,7 +1,7 @@ # Template file for 'botan' pkgname=botan -version=2.10.0 -revision=2 +version=2.12.1 +revision=1 wrksrc="${pkgname^}-${version}" build_style=gnu-makefile pycompile_module="botan.py" @@ -11,8 +11,8 @@ short_desc="Crypto library written in C++" maintainer="Jürgen Buchmüller " license="BSD-2-Clause" homepage="https://botan.randombit.net/" -distfiles="https://botan.randombit.net/releases/Botan-${version}.tgz" -checksum=88481997578c27924724fea76610d43d9f59c99edfe561d41803bbc98871ad31 +distfiles="https://botan.randombit.net/releases/Botan-${version}.tar.xz" +checksum=7e035f142a51fca1359705792627a282456d49749bf62a37a8e48375d41baaa9 python_version=2 @@ -20,7 +20,7 @@ LDFLAGS="-pthread" CXXFLAGS="-O3" do_configure() { - local _args _arch _cpu + local _args _cpu _args="--prefix=/usr" _args+=" --os=linux" @@ -36,48 +36,44 @@ do_configure() { case "$XBPS_TARGET_MACHINE" in i686*) _cpu="i686" - _arch="x86" ;; x86_64*) _cpu="x86_64" - _arch="x86" ;; armv5*) _cpu="arm" - _arch="armv5te" _args+=" --disable-modules=simd" ;; armv6*) _cpu="arm" - _arch="armv6" _args+=" --disable-modules=simd" ;; armv7*) _cpu="armv7-a" - _arch="armv7" _args+=" --disable-modules=simd" ;; aarch64*) _cpu="armv8-a" - _arch="arm64" ;; mips*) _cpu="mips32" - _arch="mips" ;; ppc64le*) _cpu="ppc64le" - _arch="ppc64le" ;; ppc64*) _cpu="ppc64" - _arch="ppc64" + ;; + ppc*) + _cpu="ppc" + ;; + *) + _cpu="${XBPS_TARGET_MACHINE%-musl}" ;; esac python2 configure.py \ --distribution-info="Void Linux botan-${version}_${revision}" \ - --cc-abi-flags="-std=c++14" \ --cpu=${_cpu} \ ${_args} } diff --git a/srcpkgs/bpftrace/template b/srcpkgs/bpftrace/template index cac5b779664..56d673d38e5 100644 --- a/srcpkgs/bpftrace/template +++ b/srcpkgs/bpftrace/template @@ -1,7 +1,7 @@ # Template file for 'bpftrace' pkgname=bpftrace version=0.9.2 -revision=1 +revision=2 build_style=cmake configure_args="-DBUILD_TESTING=OFF" # needs root to run hostmakedepends="pkg-config flex" diff --git a/srcpkgs/breeze-gtk/template b/srcpkgs/breeze-gtk/template index 9911b616943..e114ade1943 100644 --- a/srcpkgs/breeze-gtk/template +++ b/srcpkgs/breeze-gtk/template @@ -1,6 +1,6 @@ # Template file for 'breeze-gtk' pkgname=breeze-gtk -version=5.16.4 +version=5.17.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules sassc python3 python3-cairo" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://projects.kde.org/projects/plasma/breeze-gtk" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=8c954a8754bc75b2d8edff70a7b322c559da6e23dc75e1ed616ac926fbe186eb +checksum=bba00e94bad2b6f9baae19b1edba076785f45a94b591dd4b34f7b9104348cc3a if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-devel" diff --git a/srcpkgs/breeze-icons/template b/srcpkgs/breeze-icons/template index 512daf7ad2c..884d465a884 100644 --- a/srcpkgs/breeze-icons/template +++ b/srcpkgs/breeze-icons/template @@ -1,6 +1,6 @@ # Template file for 'breeze-icons' pkgname=breeze-icons -version=5.61.0 +version=5.63.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel libxml2" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-3.0-or-later" homepage="https://community.kde.org/Frameworks" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=1d260a01a2617f5f755d2eb38423af19bf4a1a2ccfa9339b441b4f6be6381c30 +checksum=25a5b55e5be0fc3df837e0dd8f6721bfcbb30ed94be6ac92c88523485ba2719e if [ -z "$CROSS_BUILD" ]; then configure_args="-DBINARY_ICONS_RESOURCE=ON" diff --git a/srcpkgs/breeze/template b/srcpkgs/breeze/template index 41d10059cd7..7bdb56fa3ef 100644 --- a/srcpkgs/breeze/template +++ b/srcpkgs/breeze/template @@ -1,6 +1,6 @@ # Template file for 'breeze' pkgname=breeze -version=5.16.4 +version=5.17.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -14,7 +14,7 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://projects.kde.org/projects/plasma/breeze" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=84fea0c31a41521983698ad2aed603b5e2c6e4f6e8723e2c64c66c37eb2a5395 +checksum=9d32ceffe33b776fcb7ec92d99088503a97c49e4b6216153438d5f7b93af8345 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework" diff --git a/srcpkgs/brig/template b/srcpkgs/brig/template index 72f627b5127..59dcd0ceba6 100644 --- a/srcpkgs/brig/template +++ b/srcpkgs/brig/template @@ -5,7 +5,7 @@ revision=1 build_style=go go_import_path=github.com/sahib/brig short_desc="File synchronization on top of IPFS with git-like interface and WebUI" -maintainer="maxice8 " +maintainer="Orphaned " license="AGPL-3.0-or-later" homepage="https://brig.readthedocs.io/en/master/" distfiles="https://github.com/sahib/brig/archive/v${version}.tar.gz" diff --git a/srcpkgs/brisk-menu/patches/69fa052df45c1fa439f6af0a2c8e9795087b9444.patch b/srcpkgs/brisk-menu/patches/69fa052df45c1fa439f6af0a2c8e9795087b9444.patch deleted file mode 100644 index 4b2bd478c8a..00000000000 --- a/srcpkgs/brisk-menu/patches/69fa052df45c1fa439f6af0a2c8e9795087b9444.patch +++ /dev/null @@ -1,185 +0,0 @@ -From 3cab9d1fc7b2ca500c7d3276e17b256f395e0126 Mon Sep 17 00:00:00 2001 -From: Mike Gabriel -Date: Fri, 19 Jan 2018 22:57:26 +0100 -Subject: [PATCH 1/2] Reliably fix parallel builds of brisk-menu. - - - Move brisk-glue .xml files to data/ and ... - - process them in an earlier stage of the build - - Fixes solus-project/brisk-menu#73. ---- - data/meson.build | 16 ++++++++ - .../org.gnome.SessionManager.xml | 0 - .../session => data}/org.mate.ScreenSaver.xml | 0 - src/frontend/meson.build | 1 + - src/meson.build | 28 +++++++++++-- - src/session/meson.build | 40 ------------------- - 6 files changed, 42 insertions(+), 43 deletions(-) - rename {src/session => data}/org.gnome.SessionManager.xml (100%) - rename {src/session => data}/org.mate.ScreenSaver.xml (100%) - delete mode 100644 src/session/meson.build - -diff --git data/meson.build data/meson.build -index 609ff27..aa450e8 100644 ---- data/meson.build -+++ data/meson.build -@@ -12,6 +12,22 @@ brisk_resources = gnome.compile_resources( - ], - ) - -+# libsaver_glue provides dbus code for the MATE screensaver -+libsaver_glue = gnome.gdbus_codegen( -+ 'libsaver-glue', -+ 'org.mate.ScreenSaver.xml', -+ interface_prefix : 'org.mate.', -+ namespace : 'Mate', -+) -+ -+# libsession_glue provides dbus code for the MATE/GNOME session -+libsession_glue = gnome.gdbus_codegen( -+ 'libsession-glue', -+ 'org.gnome.SessionManager.xml', -+ interface_prefix : 'org.gnome.', -+ namespace : 'Gnome', -+) -+ - icons = [ - 'brisk_system-log-out-symbolic.svg', - ] -diff --git src/session/org.gnome.SessionManager.xml data/org.gnome.SessionManager.xml -similarity index 100% -rename from src/session/org.gnome.SessionManager.xml -rename to data/org.gnome.SessionManager.xml -diff --git src/session/org.mate.ScreenSaver.xml data/org.mate.ScreenSaver.xml -similarity index 100% -rename from src/session/org.mate.ScreenSaver.xml -rename to data/org.mate.ScreenSaver.xml -diff --git src/frontend/meson.build src/frontend/meson.build -index 624b590..31e2f17 100644 ---- src/frontend/meson.build -+++ src/frontend/meson.build -@@ -30,6 +30,7 @@ libfrontend_dependencies = [ - - libfrontend_includes = [ - include_directories('.'), -+ include_directories('../../data'), - ] - - # Contains the main Brisk UI (Windowed) -diff --git src/meson.build src/meson.build -index 7c26b57..0f29a58 100644 ---- src/meson.build -+++ src/meson.build -@@ -18,15 +18,37 @@ link_libresources = declare_dependency( - ], - ) - -+# Build the Cs into a simple static library and control compiler noise -+libsession_stub = static_library( -+ 'brisk-glue', -+ sources: [ -+ libsaver_glue, -+ libsession_glue, -+ ], -+ c_args: [ -+ '-Wno-unused-parameter', -+ ], -+ dependencies: dep_gio_unix, -+ install: false, -+) -+ -+# Allow linking to the stub -+link_libsession_stub = declare_dependency( -+ link_with: libsession_stub, -+ dependencies: [ -+ dep_gio_unix, -+ ], -+ include_directories: [ -+ include_directories('.'), -+ ], -+) -+ - # Build common library (currently just keybinder really.) - subdir('lib') - - # Build the backend component - subdir('backend') - --# Build session glue to help the frontend out --subdir('session') -- - # Now build our main UI - subdir('frontend') - -diff --git src/session/meson.build src/session/meson.build -deleted file mode 100644 -index 5b38bdc..0000000 ---- src/session/meson.build -+++ /dev/null -@@ -1,40 +0,0 @@ --# libsaver_glue provides dbus code for the MATE screensaver --libsaver_glue = gnome.gdbus_codegen( -- 'libsaver-glue', -- 'org.mate.ScreenSaver.xml', -- interface_prefix : 'org.mate.', -- namespace : 'Mate', --) -- --# libsession_glue provides dbus code for the MATE/GNOME session --libsession_glue = gnome.gdbus_codegen( -- 'libsession-glue', -- 'org.gnome.SessionManager.xml', -- interface_prefix : 'org.gnome.', -- namespace : 'Gnome', --) -- --# Build the Cs into a simple static library and control compiler noise --libsession_stub = static_library( -- 'brisk-glue', -- sources: [ -- libsaver_glue, -- libsession_glue, -- ], -- c_args: [ -- '-Wno-unused-parameter', -- ], -- dependencies: dep_gio_unix, -- install: false, --) -- --# Allow linking to the stub --link_libsession_stub = declare_dependency( -- link_with: libsession_stub, -- dependencies: [ -- dep_gio_unix, -- ], -- include_directories: [ -- include_directories('.'), -- ], --) - -From 2309dab7ee5cce419c02038092a075096a89ff88 Mon Sep 17 00:00:00 2001 -From: Mike Gabriel -Date: Fri, 19 Jan 2018 23:01:46 +0100 -Subject: [PATCH 2/2] src/mesa.build: Fix build against GLib << 2.51.3. - - - This patch is not hurting builds against newer GLib versions. - - For details, see https://github.com/mesonbuild/meson/issues/1387 ---- - src/meson.build | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git src/meson.build src/meson.build -index 0f29a58..7d8ca3f 100644 ---- src/meson.build -+++ src/meson.build -@@ -30,6 +30,9 @@ libsession_stub = static_library( - ], - dependencies: dep_gio_unix, - install: false, -+ include_directories: [ -+ include_directories('..'), -+ ], - ) - - # Allow linking to the stub diff --git a/srcpkgs/brisk-menu/template b/srcpkgs/brisk-menu/template index 67c0d1fa881..f440391e26e 100644 --- a/srcpkgs/brisk-menu/template +++ b/srcpkgs/brisk-menu/template @@ -1,6 +1,6 @@ # Template file for 'brisk-menu' pkgname=brisk-menu -version=0.5.0 +version=0.6.1 revision=1 wrksrc="${pkgname}-v${version}" build_style=meson @@ -9,10 +9,10 @@ makedepends="gtk+3-devel mate-menus-devel libmate-panel-devel libnotify-devel" depends="mate-panel" short_desc="Modern, efficient menu for the MATE DE" maintainer="Jasu Koponen " -license="GPL-2, CC-BY-SA-4.0" -homepage="https://github.com/solus-project/brisk-menu" +license="GPL-2.0-only, CC-BY-SA-4.0" +homepage="https://github.com/getsolus/brisk-menu" distfiles="${homepage}/releases/download/v${version}/${pkgname}-v${version}.tar.xz" -checksum=1377ffbb784e576c290bb4d11a2dd376bc0ad017bb9f56a080bccdbc4fbe88ce +checksum=9cf9ae307a780afe5b808b8233ac85ecf948f846efbcfb60a6adcc8fd77017aa post_install() { vlicense LICENSE.CC-BY-SA-4.0 diff --git a/srcpkgs/bro/template b/srcpkgs/bro/template index 95552592e28..0d65960711e 100644 --- a/srcpkgs/bro/template +++ b/srcpkgs/bro/template @@ -1,6 +1,6 @@ # Template file for 'bro' pkgname=bro -version=2.6.3 +version=2.6.4 revision=1 build_style=cmake hostmakedepends="flex pkg-config python3" @@ -10,7 +10,7 @@ maintainer="Andrew Benson " license="BSD-3-Clause" homepage="https://www.bro.org" distfiles="https://www.bro.org/downloads/bro-${version}.tar.gz" -checksum=469dd7456af388ba65d8722fbfdd5b9182f14def16149aa5ebceb1cfd881697f +checksum=a47a9cdcef0ea14d5f70c390ab266f0333063ff96f3869a5f1609581a1d1ceb7 nocross="Needs to build part of itself to run, can't be built separately yet." case "$XBPS_TARGET_MACHINE" in diff --git a/srcpkgs/broot/template b/srcpkgs/broot/template index b4da3bf687a..b18675c1743 100644 --- a/srcpkgs/broot/template +++ b/srcpkgs/broot/template @@ -1,6 +1,6 @@ # Template file for 'broot' pkgname=broot -version=0.9.3 +version=0.9.6 revision=1 build_style=cargo short_desc="Interactive directory tree view, fuzzy search, balanced BFS descent" @@ -8,7 +8,7 @@ maintainer="SolitudeSF " license="MIT" homepage="https://dystroy.org/broot/" distfiles="https://github.com/Canop/broot/archive/v${version}.tar.gz" -checksum=@6d681c9336277dd8d13ba2238809b5ed2c0004a45c9574b50cbc4c7f2ce59c21 +checksum=af8b36d5d4242ec1bd86925f0f664a610e7e94309686ef0874df6bc0867a0c3e post_install() { vlicense LICENSE diff --git a/srcpkgs/brother-brlaser/template b/srcpkgs/brother-brlaser/template index e2b22b19b23..9e67aa9d44c 100644 --- a/srcpkgs/brother-brlaser/template +++ b/srcpkgs/brother-brlaser/template @@ -1,6 +1,6 @@ # Template file for 'brother-brlaser' pkgname=brother-brlaser -version=5 +version=6 revision=1 wrksrc="brlaser-${version}" build_style=cmake @@ -11,4 +11,4 @@ maintainer="Jaredy " license="GPL-2.0-or-later" homepage="https://github.com/pdewacht/brlaser" distfiles="https://github.com/pdewacht/brlaser/archive/v${version}.tar.gz" -checksum=0848513c03a789a450b9115419a24a43c92bcc2eb41203a7c5ea3c0a76ac52d2 +checksum=fe7c117eb7e837b6a1751f61a813c218f68a5d8fc40f3403f6a4b1cf5a4758dd diff --git a/srcpkgs/bs1770gain/template b/srcpkgs/bs1770gain/template index 772f2c33212..60efd328e4a 100644 --- a/srcpkgs/bs1770gain/template +++ b/srcpkgs/bs1770gain/template @@ -1,7 +1,9 @@ # Template file for 'bs1770gain' pkgname=bs1770gain -version=0.5.2 +version=0.6.4 revision=1 +# bgx.c:29:10: fatal error: gnu/libc-version.h: No such file or directory +archs="~*-musl" build_style=gnu-configure makedepends="ffmpeg-devel sox-devel" short_desc="Loudness scanner compliant with ITU-R BS.1770" @@ -9,4 +11,4 @@ maintainer="Michal Koutenský " license="GPL-2.0-or-later" homepage="http://bs1770gain.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=73e5738786b57afb89582333ed18206fd2c6d5245717d3b24ace7f7670f9dedc +checksum=24cf866748c78bc103a5f53c1af958531357b55bd945ee9e26f8c86445163515 diff --git a/srcpkgs/bsdunzip/template b/srcpkgs/bsdunzip/template index 450efc1e69e..dd02386b3e0 100644 --- a/srcpkgs/bsdunzip/template +++ b/srcpkgs/bsdunzip/template @@ -5,7 +5,7 @@ revision=1 build_style=gnu-makefile makedepends="libarchive-devel" short_desc="Libarchive(3)-utilizing unzip implementation from FreeBSD" -maintainer="maxice8 " +maintainer="Orphaned " license="BSD, ISC" homepage="https://github.com/somasis/bsdunzip" distfiles="https://github.com/somasis/bsdunzip/archive/${version}.tar.gz" diff --git a/srcpkgs/bspwm/template b/srcpkgs/bspwm/template index c8b7e959ab3..df8fdee1f5f 100644 --- a/srcpkgs/bspwm/template +++ b/srcpkgs/bspwm/template @@ -1,6 +1,6 @@ # Template file for 'bspwm' pkgname=bspwm -version=0.9.8 +version=0.9.9 revision=1 makedepends="xcb-util-wm-devel xcb-util-keysyms-devel" short_desc="Tiling window manager based on binary space partitioning" @@ -8,7 +8,7 @@ maintainer="Nathan Owens " license="BSD-2-Clause" homepage="https://github.com/baskerville/bspwm" distfiles="https://github.com/baskerville/bspwm/archive/${version}.tar.gz" -checksum=8bf670227b3e3c91b94df0834daf2b3da36bbac196c5bcc65353b3eb5983afa6 +checksum=b1438c3cad13b6101edb31ce8d00ba4ed2f972754e85b90f763e04fa5143c6fc do_build() { make CC=$CC diff --git a/srcpkgs/btfs/template b/srcpkgs/btfs/template index 7419009970f..cac840fda33 100644 --- a/srcpkgs/btfs/template +++ b/srcpkgs/btfs/template @@ -1,19 +1,17 @@ # Template file for 'btfs' pkgname=btfs -version=2.19 +version=2.20 revision=1 build_style=gnu-configure hostmakedepends="automake pkg-config" -makedepends="boost-devel libcurl-devel libtorrent-rasterbar-devel fuse-devel" -depends="python" +makedepends="boost-devel fuse-devel libcurl-devel libtorrent-rasterbar-devel" +depends="python3" short_desc="Bittorrent filesystem based on FUSE" -maintainer="Orphaned " +maintainer="Daniel Eyßer " license="GPL-3.0-or-later" homepage="https://github.com/johang/btfs" distfiles="https://github.com/johang/btfs/archive/v${version}.tar.gz" -checksum=678831788e3b5e24f674adf87618353bea935fb418d512f17aabe3244f06b7e1 - -CXXFLAGS="-std=c++11" +checksum=ab85d10407d210c367dc5a0db6aa9e8620ebbb819c58da783ca343dfa8577441 pre_configure() { autoreconf -fi diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template index 729425bafcd..8a525ea0af0 100644 --- a/srcpkgs/btrfs-progs/template +++ b/srcpkgs/btrfs-progs/template @@ -1,6 +1,6 @@ # Template file for 'btrfs-progs' pkgname=btrfs-progs -version=5.2.1 +version=5.2.2 revision=1 wrksrc="${pkgname}-v${version}" build_style=gnu-configure @@ -15,7 +15,7 @@ license="GPL-2.0-only, LGPL-3.0-or-later" homepage="https://btrfs.wiki.kernel.org/index.php/Main_Page" changelog="https://raw.githubusercontent.com/kdave/btrfs-progs/master/CHANGES" distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz" -checksum=36ac4a0198ffff79d5800c537ea4b19769a8fd3ad870f75413d25b20e2d83233 +checksum=821321dbf17087e1172023fa35656ce52d342fbfe210fb8ea01fc57b65dfb1c6 pre_configure() { NOCONFIGURE=1 ./autogen.sh diff --git a/srcpkgs/buildah/template b/srcpkgs/buildah/template index d852dccf93f..2145d41023d 100644 --- a/srcpkgs/buildah/template +++ b/srcpkgs/buildah/template @@ -1,6 +1,6 @@ # Template file for 'buildah' pkgname=buildah -version=1.10.1 +version=1.11.3 revision=1 build_style=go go_import_path=github.com/containers/buildah @@ -15,7 +15,7 @@ maintainer="Cameron Nemo " license="Apache-2.0" homepage="https://github.com/containers/buildah" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=02dc74649a2341d355281911ee5a8e4801165192e4419627513698ab129c9e78 +checksum=a3df3f87aa06e322f8fb5f61337cffa2c57ad4fca6b49ed9431b3275b52131a5 post_build() { make -C docs GOMD2MAN=go-md2man diff --git a/srcpkgs/buildbot/template b/srcpkgs/buildbot/template index c753cd7c502..9bee50ec737 100644 --- a/srcpkgs/buildbot/template +++ b/srcpkgs/buildbot/template @@ -1,7 +1,8 @@ # Template file for 'buildbot' pkgname=buildbot +reverts="2.4.1_1" version=0.8.14 -revision=3 +revision=4 archs=noarch build_style=python2-module pycompile_module="buildbot" diff --git a/srcpkgs/bum/template b/srcpkgs/bum/template index 7bf9c33f47e..58d0bb2b7f7 100644 --- a/srcpkgs/bum/template +++ b/srcpkgs/bum/template @@ -8,7 +8,7 @@ pycompile_module="bum" hostmakedepends="python3-setuptools" depends="python3-setuptools python3-mpd2 python3-musicbrainzngs python3-mpv" short_desc="Daemon that downloads and displays album arts via MPD events" -maintainer="maxice8 " +maintainer="Orphaned " license="MIT" homepage="https://github.com/dylanaraps/bum" distfiles="https://github.com/dylanaraps/bum/archive/${version}.tar.gz" diff --git a/srcpkgs/bvi/template b/srcpkgs/bvi/template index 476935bd33e..b31f4fc737e 100644 --- a/srcpkgs/bvi/template +++ b/srcpkgs/bvi/template @@ -1,12 +1,12 @@ # Template file for 'bvi' pkgname=bvi -version=1.4.0 +version=1.4.1 revision=1 build_style=gnu-configure makedepends="ncurses-devel" -short_desc="A display-oriented editor for binary files" +short_desc="Display-oriented editor for binary files" maintainer="oliver " -license="GPL-2" +license="GPL-3.0-or-later" homepage="http://bvi.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.src.tar.gz" -checksum=015a3c2832c7c097d98a5527deef882119546287ba8f2a70c736227d764ef802 +checksum=3035255ca79e0464567d255baa5544f7794e2b7eb791dcc60cc339cf1aa01e28 diff --git a/srcpkgs/cJSON/template b/srcpkgs/cJSON/template index e15f0252e7f..98595580c23 100644 --- a/srcpkgs/cJSON/template +++ b/srcpkgs/cJSON/template @@ -4,7 +4,7 @@ version=1.7.12 revision=1 build_style=cmake short_desc="Ultralightweight JSON parser in ANSI C" -maintainer="maxice8 " +maintainer="Orphaned " license="MIT" homepage="https://github.com/DaveGamble/cJSON" distfiles="https://github.com/DaveGamble/cJSON/archive/v${version}.tar.gz" diff --git a/srcpkgs/caddy/template b/srcpkgs/caddy/template index 5a647aca447..e863de20f2f 100644 --- a/srcpkgs/caddy/template +++ b/srcpkgs/caddy/template @@ -1,6 +1,6 @@ # Template file for 'caddy' pkgname=caddy -version=1.0.1 +version=1.0.3 revision=1 build_style=go go_import_path=github.com/caddyserver/caddy @@ -11,7 +11,7 @@ maintainer="Dominic Monroe " license="Apache-2.0" homepage="https://caddyserver.com" distfiles="https://github.com/caddyserver/caddy/archive/v${version}.tar.gz" -checksum=7cbd80c798a0db4195381f730f5409680c6e1239fbc06295b90b34f666a05692 +checksum=c1c7b337a5008d28c1956fd4f057104a78d0e24b74c30867cea988369b61fed3 system_accounts="caddy" make_dirs=" diff --git a/srcpkgs/cage/template b/srcpkgs/cage/template new file mode 100644 index 00000000000..eca84c1dacc --- /dev/null +++ b/srcpkgs/cage/template @@ -0,0 +1,18 @@ +# Template file for 'cage' +pkgname=cage +version=0.1.1 +revision=1 +build_style=meson +hostmakedepends="pkg-config wayland-devel" +makedepends="libxkbcommon-devel pixman-devel wayland-devel wlroots-devel" +short_desc="Kiosk compositor for Wayland" +maintainer="Illia Shestakov " +license="MIT" +homepage="https://www.hjdskes.nl/projects/cage/" +distfiles="https://github.com/Hjdskes/cage/archive/v${version}.tar.gz" +checksum=63efbe96cf307381f2bedf9b80153343e255970a70d612515da7dc325dd49478 + +post_install() { + vlicense LICENSE + vdoc README.md +} diff --git a/srcpkgs/caja-extensions/template b/srcpkgs/caja-extensions/template index dd5d680d6f3..cb7f942eb7b 100644 --- a/srcpkgs/caja-extensions/template +++ b/srcpkgs/caja-extensions/template @@ -1,6 +1,6 @@ # Template file for 'caja-extensions' pkgname=caja-extensions -version=1.22.0 +version=1.22.1 revision=1 build_style=gnu-configure configure_args="--disable-gksu" @@ -12,7 +12,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://mate-desktop.org" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=779c237f7e922c877f7884a0201cb54da9c8f30c414a7ee297178fd6aa3406c1 +checksum=d0845b6f2921ee7b7c951d4490a4fd7166f90b85f60a22aef77c75b53fbcf077 caja-image-converter_package() { short_desc="Caja extension for simple image conversions" diff --git a/srcpkgs/caja/template b/srcpkgs/caja/template index b190ff7fad1..71f867920a0 100644 --- a/srcpkgs/caja/template +++ b/srcpkgs/caja/template @@ -1,6 +1,6 @@ # Template file for 'caja' pkgname=caja -version=1.22.1 +version=1.22.2 revision=1 build_style=gnu-configure build_helper="gir" @@ -17,7 +17,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://mate-desktop.org" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=3b26efd276c68a579db443ea1f85a270cd33c59284667d5db8d5d355a3f46781 +checksum=b09cfd068da3789fddd564afb7117ed874472e97c9d2f3ceb7a7fd8b16c9beb0 build_options="gir" build_options_default="gir" diff --git a/srcpkgs/calcurse/patches/DST-fix-date-change.patch b/srcpkgs/calcurse/patches/DST-fix-date-change.patch new file mode 100644 index 00000000000..6ecadfd49bc --- /dev/null +++ b/srcpkgs/calcurse/patches/DST-fix-date-change.patch @@ -0,0 +1,34 @@ +From d6fd07785fe8072e6bbadc173e9d6a2e73efdcdd Mon Sep 17 00:00:00 2001 +From: Lars Henriksen +Date: Thu, 1 Aug 2019 07:19:14 +0200 +Subject: DST: fix date_change() thoroughly + +Explicit setting of Daylight Saving Time should be avoided before as well as +after the mktime() call. + +Signed-off-by: Lars Henriksen +Signed-off-by: Lukas Fleischer +--- + src/utils.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/utils.c b/src/utils.c +index 8a8de75..a9a9e68 100644 +--- src/utils.c ++++ src/utils.c +@@ -525,10 +525,11 @@ int date_change(struct tm *date, int delta_month, int delta_day) + t = *date; + t.tm_mon += delta_month; + t.tm_mday += delta_day; +- ++ t.tm_isdst = -1; + if (mktime(&t) == -1) { + return 1; + } else { ++ t.tm_isdst = -1; + *date = t; + return 0; + } +-- +cgit v1.2.1 + diff --git a/srcpkgs/calcurse/template b/srcpkgs/calcurse/template index b1c5e29ba2c..4508aba0a1f 100644 --- a/srcpkgs/calcurse/template +++ b/srcpkgs/calcurse/template @@ -1,7 +1,7 @@ # Template file for 'calcurse' pkgname=calcurse version=4.5.0 -revision=1 +revision=2 build_style=gnu-configure makedepends="ncurses-devel" depends="python3-httplib2" diff --git a/srcpkgs/calendarsupport/template b/srcpkgs/calendarsupport/template index 50c165c8161..ab5e828cacb 100644 --- a/srcpkgs/calendarsupport/template +++ b/srcpkgs/calendarsupport/template @@ -1,6 +1,6 @@ # Template file for 'calendarsupport' pkgname=calendarsupport -version=19.08.0 +version=19.08.2 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules kconfig python3 qt5-host-tools qt5-qmake @@ -11,7 +11,7 @@ maintainer="John " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://community.kde.org/KDE_PIM" distfiles="${KDE_SITE}/applications/${version}/src/calendarsupport-${version}.tar.xz" -checksum=af590cf5443c1205a8bd59d00c430bbdf65a185a36ed36e92e6ef78bba8551e4 +checksum=9ae448463ca60e075f1ea9a22489f0acf6ea672c00f9bd7b49027e548e82c2af calendarsupport-devel_package() { depends="${sourcepkg}>=${version}_${revision} ${makedepends}" diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template index 43ff96d668b..dce942cf36f 100644 --- a/srcpkgs/calibre/template +++ b/srcpkgs/calibre/template @@ -1,29 +1,30 @@ # Template file for 'calibre' pkgname=calibre -version=3.46.0 +version=4.1.0 revision=1 build_style=python2-module pycompile_dirs="/usr/lib/calibre/" make_build_args="gui" hostmakedepends="pkg-config python-BeautifulSoup4 python-Pillow python-PyQt5-svg - python-PyQt5-webkit python-apsw python-css-parser python-dateutil + python-PyQt5-webengine python-apsw python-css-parser python-dateutil python-devel python-html5-parser python-msgpack python-regex qt5-qmake xdg-utils" makedepends="glib-devel libchmlib-devel libinput-devel libmagick-devel libmtp-devel libpodofo-devel libwmf-devel libxkbcommon-devel python-PyQt5-devel - qt5-devel sqlite-devel tslib-devel qt5-webkit-devel" + qt5-devel sqlite-devel tslib-devel hunspell-devel" depends="desktop-file-utils optipng poppler-utils python-BeautifulSoup4 python-CherryPy python-Markdown python-Pillow python-PyQt5-svg - python-PyQt5-webkit python-Pygments python-apsw python-css-parser - python-cssselect python-dateutil python-dbus python-dnspython - python-feedparser python-html5-parser python-mechanize python-msgpack - python-netifaces python-psutil python-regex" + python-PyQt5-webengine python-PyQt5-webchannel python-Pygments python-apsw + python-css-parser python-cssselect python-dateutil python-dbus + python-dnspython python-feedparser python-html5-parser python-mechanize + python-msgpack python-netifaces python-psutil python-regex qt5-webengine" short_desc="Ebook management application" maintainer="bra1nwave " license="GPL-3.0-only" homepage="https://calibre-ebook.com" +changelog="https://raw.githubusercontent.com/kovidgoyal/calibre/master/Changelog.yaml" distfiles="https://download.calibre-ebook.com/${version}/calibre-${version}.tar.xz" -checksum=e947b9854f9db344ee07e5495feaad759c96936d89a128d3a3587c3503d09ab6 +checksum=363f89b4c26ba8f8bba1eb40da09df85b8b3fedf9a0256285a0abae1ff65987c nocross=yes do_configure() { @@ -38,6 +39,12 @@ do_configure() { } do_install() { + vmkdir usr/share/zsh/site-functions + python2 setup.py \ install --prefix=/usr --staging-root=${DESTDIR}/usr + + for m in man-pages/man1/*.1; do + vman "${m}" + done } diff --git a/srcpkgs/calligra-plan/patches/missing-includes.patch b/srcpkgs/calligra-plan/patches/missing-includes.patch index c02c5a82326..efb4183edfe 100644 --- a/srcpkgs/calligra-plan/patches/missing-includes.patch +++ b/srcpkgs/calligra-plan/patches/missing-includes.patch @@ -79,3 +79,25 @@ class KoUnit; +From fe36bf6f0dc1f0c1e927850dd78093cfe3b7aae2 Mon Sep 17 00:00:00 2001 +From: Albert Astals Cid +Date: Sun, 28 Jul 2019 00:07:33 +0200 +Subject: [PATCH] Fix compile on CI + +src/workpackage/view.h:148:31: error: field m_scheduleActions has incomplete type QMap +--- + src/workpackage/view.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/workpackage/view.h b/src/workpackage/view.h +index 6cae32b7..cd2fc4ea 100644 +--- src/workpackage/view.h ++++ src/workpackage/view.h +@@ -24,6 +24,7 @@ + + #include + ++#include + #include + + class QPrinter; diff --git a/srcpkgs/calligra-plan/template b/srcpkgs/calligra-plan/template index 321312114b5..a39e482f1b6 100644 --- a/srcpkgs/calligra-plan/template +++ b/srcpkgs/calligra-plan/template @@ -1,7 +1,7 @@ # Template file for 'calligra-plan' pkgname=calligra-plan version=3.1.0 -revision=3 +revision=4 wrksrc="${pkgname/-/}-${version}" build_style=cmake hostmakedepends="extra-cmake-modules kdoctools" diff --git a/srcpkgs/calligra/patches/qt5.13.patch b/srcpkgs/calligra/patches/qt5.13.patch new file mode 100644 index 00000000000..ec19e0a0929 --- /dev/null +++ b/srcpkgs/calligra/patches/qt5.13.patch @@ -0,0 +1,21 @@ +From 0c5430697bdcf41a45046107b28014e40c49a11a Mon Sep 17 00:00:00 2001 +From: David Faure +Date: Tue, 23 Jul 2019 13:02:34 +0200 +Subject: [PATCH] Fix compilation with Qt 5.13 (missing include) + +--- + sheets/plugins/calendar/CalendarToolWidget.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/sheets/plugins/calendar/CalendarToolWidget.cpp b/sheets/plugins/calendar/CalendarToolWidget.cpp +index b10b23022a2..0c5eeb68cf3 100644 +--- sheets/plugins/calendar/CalendarToolWidget.cpp ++++ sheets/plugins/calendar/CalendarToolWidget.cpp +@@ -30,6 +30,7 @@ + #include + + #include ++#include + + namespace Calligra + { diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template index 8e8142184c7..a9ca78804fa 100644 --- a/srcpkgs/calligra/template +++ b/srcpkgs/calligra/template @@ -1,7 +1,7 @@ # Template file for 'calligra' pkgname=calligra version=3.1.0 -revision=21 +revision=22 build_style=cmake configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON -DBUILD_TESTING=OFF" diff --git a/srcpkgs/camlp4/patches/version-hack.patch b/srcpkgs/camlp4/patches/version-hack.patch new file mode 100644 index 00000000000..34f7f48ff8c --- /dev/null +++ b/srcpkgs/camlp4/patches/version-hack.patch @@ -0,0 +1,11 @@ +--- configure.orig ++++ configure +@@ -39,7 +39,7 @@ + echo "The standalone Camlp4 requires OCaml >= 4.02." + echo "For previous versions of OCaml use the Camlp4 distributed with OCaml." + exit 2 +-elif [ $major -ne 4 -o $minor -ne 8 ]; then ++elif [ $major -ne 4 -o $minor -ne 9 ]; then + echo "This version of Camlp4 is for OCaml 4.07 but you are using OCaml $ocaml_version." + if [ -d .git ] ; then + if [ $PINNED -eq 1 ] ; then diff --git a/srcpkgs/camlp4/template b/srcpkgs/camlp4/template index 6d84e7e5093..64c324cb1a5 100644 --- a/srcpkgs/camlp4/template +++ b/srcpkgs/camlp4/template @@ -1,7 +1,7 @@ # Template file for 'camlp4' pkgname=camlp4 version=4.08+1 -revision=1 +revision=2 wrksrc="camlp4-${version/+/-}" build_style=configure hostmakedepends="ocaml ocamlbuild" diff --git a/srcpkgs/camlp5/template b/srcpkgs/camlp5/template index 28fff2aea9a..09e214a685c 100644 --- a/srcpkgs/camlp5/template +++ b/srcpkgs/camlp5/template @@ -1,7 +1,7 @@ # Template file for 'camlp5' pkgname=camlp5 -version=7.08 -revision=1 +version=7.10 +revision=2 build_style=configure configure_args="-mandir /usr/share/man" hostmakedepends="ocaml" @@ -13,7 +13,7 @@ distfiles="https://github.com/${pkgname}/${pkgname}/archive/rel${version//./}.ta wrksrc="camlp5-rel${version//./}" nocross=yes nopie=yes -checksum=46e67d8e36e5e4558c414f0b569532a33d3a12d7120ffdc474a6b3da1bfff163 +checksum=83dff83d33ee9b70cd1b9d8d365db63a118201e5feb6aab49d9d3b1d62621784 post_install() { vinstall etc/META 0644 usr/lib/ocaml/camlp5 diff --git a/srcpkgs/cargo/patches/revert-libgit2-sys-api.patch b/srcpkgs/cargo/patches/revert-libgit2-sys-api.patch new file mode 100644 index 00000000000..b2f819286ba --- /dev/null +++ b/srcpkgs/cargo/patches/revert-libgit2-sys-api.patch @@ -0,0 +1,32 @@ +Source: FreeBSD + +Revert to libgit2 0.28 API per https://github.com/rust-lang/git2-rs/issues/458 + +--- libgit2-sys/lib.rs ++++ libgit2-sys/lib.rs +@@ -331,7 +331,6 @@ pub struct git_remote_callbacks { + pub push_negotiation: Option, + pub transport: Option, + pub payload: *mut c_void, +- pub resolve_url: Option, + } + + #[repr(C)] +@@ -385,8 +384,6 @@ pub type git_push_negotiation = + + pub type git_push_update_reference_cb = + extern "C" fn(*const c_char, *const c_char, *mut c_void) -> c_int; +-pub type git_url_resolve_cb = +- extern "C" fn(*mut git_buf, *const c_char, c_int, *mut c_void) -> c_int; + + #[repr(C)] + pub struct git_push_update { +@@ -2233,7 +2230,7 @@ extern "C" { + source: *const git_tree, + ) -> c_int; + pub fn git_treebuilder_clear(bld: *mut git_treebuilder); +- pub fn git_treebuilder_entrycount(bld: *mut git_treebuilder) -> size_t; ++ pub fn git_treebuilder_entrycount(bld: *mut git_treebuilder) -> c_uint; + pub fn git_treebuilder_free(bld: *mut git_treebuilder); + pub fn git_treebuilder_get( + bld: *mut git_treebuilder, diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template index a0bca421f61..584ca07efe2 100644 --- a/srcpkgs/cargo/template +++ b/srcpkgs/cargo/template @@ -1,7 +1,8 @@ # Template file for 'cargo' pkgname=cargo -version=0.37.0 +version=0.39.0 revision=1 +wrksrc="cargo-${version}" build_helper=rust hostmakedepends="rust python curl cmake pkg-config" makedepends="libcurl-devel libgit2-devel" @@ -10,9 +11,11 @@ short_desc="Rust package manager" maintainer="Enno Boland " license="MIT, Apache-2.0" homepage="https://crates.io/" -distfiles="https://github.com/rust-lang/cargo/archive/${version}.tar.gz" -checksum=377e1090e9ce21206270576193746499a26e8ffbd8b89ccd5f8eb1085ca00e3b -_cargo_dist_version=0.37.0 +distfiles="https://github.com/rust-lang/cargo/archive/${version}.tar.gz + https://github.com/rust-lang/git2-rs/archive/libgit2-sys-0.8.2.tar.gz" +checksum="1fade63d5c09eab6fa234a1fdf64693ccf1b63398a316ad27edeb1f76ee4a57e + c6597bcdc2be7a2fd70c1bb8fdc75883ca5df6aea33f0354c5a8124eacc0938b" +_cargo_dist_version=0.39.0 build_options="static" if [ "$CROSS_BUILD" ]; then @@ -33,39 +36,39 @@ else case "$XBPS_MACHINE" in i686) checksum+=" - 6835a73e2ce17e11eda5393133dd7c78bc41bae5a09784e5327648f14340fd48" + 2996b0fb41506e87d9b07851f40b41fed94725cf53c3d251e4e1c78eea08df4c" ;; x86_64) checksum+=" - d20fa121951339d5492cf8862f8a7af59efc99d18f3c27b95ab6d4658b6a7d67" + 80bcb1368ce98d13cb371df89cbbed9007fb98843f34d07f2abd2c03b8f2747a" ;; x86_64-musl) checksum+=" - 53975d91e11569f2255d8e30176f05f6976cd810725197a527b0e7ad547ca70c" + 1d7d881a5af73fb7c3f632278d47a7d174f8347673e2263c4cd6a2f7d0278733" ;; ppc64le) checksum+=" - 4cda7686160f6981e936229703e8e2e756c74f390245f2ad9e356bbbed28a2c9" + 456d019511cfe015152a7a4c1c2f518fdeb10e0c610c9bc3ef44d73861ca967e" ;; ppc64le-musl) checksum+=" - d2690135522db9fdc6efa2f432e5719b8b70abc94e91db278b84be834a75bf72" + 5725c42c8356443db15f378d88f2ccb67e363ebf4beacc96ae1eac9ba36f8fe7" ;; ppc64) checksum+=" - 8b2f7d5da611a21dd7e0b4238b9aca6ee32f1e49d8fe831435301f11a29b12de" + 73a4f13b8edda6b4c9c1818341c5d936f7b11a04f892358039d072b80ccd41dc" ;; ppc64-musl) checksum+=" - 131db0127366665b2ae55327155c171e99c2eddfb4bcdd7e5cd2663ada109bd5" + ac18707b8df5d1f64b7e15dabd73eb7a3b0f9ef5976ef7c6ceb462b5d3feb9cd" ;; ppc) checksum+=" - 856fcb63f6ebeab67038fe3fc96ee0911353b1ee19cabcb0496c7d419de0d531" + 02c07b741062e75556f5993a05eefe6dace70fee4a45542f1c6997fa69624d7e" ;; ppc-musl) checksum+=" - 119dba3538f6c1d1164b720b238acac598e1924d943ebbdf3c7113ec3cbd8a2a" + b06306fc164bffa73afd2d21d96381a28d38446e58cf01a0d1585e92b4656a23" ;; esac fi @@ -75,6 +78,20 @@ post_extract() { mkdir -p target/snapshot cp ../cargo-${_cargo_dist_version}-${RUST_TARGET}/cargo/bin/cargo cargo fi + + # need this for the patch to work + cp -R ${XBPS_BUILDDIR}/git2-rs-libgit2-sys-0.8.2/libgit2-sys . +} + +post_patch() { + # but only use the patched libgit2 when not static; when static, bundled + # libgit2 is used and this would not work (libgit2 sources are not there) + if [ ! "$build_option_static" ]; then + cat >> Cargo.toml <<- EOF + [patch.crates-io] + libgit2-sys = { path = './libgit2-sys' } + EOF + fi } do_build() { @@ -93,8 +110,6 @@ do_build() { cargo="./cargo" fi - $cargo update - $cargo update --package libc --precise 0.2.55 $cargo build --release $(vopt_if static --features="all-static") } diff --git a/srcpkgs/catch2/template b/srcpkgs/catch2/template index 8d46f584f6f..2f9db0dd4c1 100644 --- a/srcpkgs/catch2/template +++ b/srcpkgs/catch2/template @@ -1,6 +1,6 @@ # Template file for 'catch2' pkgname=catch2 -version=2.7.1 +version=2.9.2 revision=1 archs=noarch wrksrc="Catch2-${version}" @@ -15,7 +15,7 @@ maintainer="Louis Dupré Bertoni " license="BSL-1.0" homepage="https://github.com/catchorg/Catch2" distfiles="https://github.com/catchorg/Catch2/archive/v${version}/${pkgname}-v${version}.tar.gz" -checksum=04b303517284572c277597004a33c3f8c02a4d12ba73d5a4cb73b4a369dfef0b +checksum=54bea6d80a388a80f895cd0e2343fca72b0d9093a776af40904aefce49c13bda post_install() { vlicense LICENSE.txt diff --git a/srcpkgs/catfish/template b/srcpkgs/catfish/template index 39c73a8a7ba..1b28ffcafff 100644 --- a/srcpkgs/catfish/template +++ b/srcpkgs/catfish/template @@ -1,6 +1,6 @@ # Template file for 'catfish' pkgname=catfish -version=1.4.9 +version=1.4.10 revision=1 archs=noarch build_style=python3-module @@ -12,5 +12,5 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="http://www.twotoasts.de/index.php/catfish/" distfiles="http://archive.xfce.org/src/apps/catfish/${version%.*}/catfish-${version}.tar.bz2" -checksum=29a39b85804336e4819dceff203693a5904b7e11d7e024b49b5aab2649ed944e +checksum=2573a004105031f871c92fed22a0c4b15bb96f2dff6e36c4f2959f56b62e343d nocross="gobject-introspection" diff --git a/srcpkgs/cbindgen/template b/srcpkgs/cbindgen/template index 778bc45666c..0fb0c8a7c0d 100644 --- a/srcpkgs/cbindgen/template +++ b/srcpkgs/cbindgen/template @@ -1,6 +1,6 @@ # Template file for 'cbindgen' pkgname=cbindgen -version=0.9.0 +version=0.9.1 revision=1 build_style=cargo short_desc="Tool to generate C bindings for Rust code" @@ -8,4 +8,4 @@ maintainer="Johannes " license="MPL-2.0" homepage="https://github.com/eqrion/cbindgen" distfiles="https://github.com/eqrion/cbindgen/archive/v${version}.tar.gz" -checksum=28ea5a0f99d0c4a8a6bd8a75a017031b0271bec2716ac0e9029d2a65451aacd0 +checksum=bb1b9b55bfed3ccd774d3c0e83bc549f2ac5418c7d80b63052b0dd1034478ec7 diff --git a/srcpkgs/ccache/template b/srcpkgs/ccache/template index 774f62915cb..efd4464d4df 100644 --- a/srcpkgs/ccache/template +++ b/srcpkgs/ccache/template @@ -1,6 +1,6 @@ # Template file for 'ccache' pkgname=ccache -version=3.7.3 +version=3.7.4 revision=1 bootstrap=yes build_style=gnu-configure @@ -13,7 +13,7 @@ license="GPL-3.0-or-later" homepage="https://ccache.samba.org/" changelog="https://ccache.samba.org/news.html" distfiles="https://github.com/ccache/ccache/releases/download/v${version}/${pkgname}-${version}.tar.xz" -checksum=73d2ec69fcf4fd3b956304036974a779b443d88882b69c5d81b62b5dc8630e04 +checksum=04c0af414b8cf89e541daed59735547fbfd323b1aaa983da0216f6b6731e6836 post_install() { vmkdir usr/lib/ccache/bin diff --git a/srcpkgs/ccls/template b/srcpkgs/ccls/template index 6c6ab601a78..e04cf8107ed 100644 --- a/srcpkgs/ccls/template +++ b/srcpkgs/ccls/template @@ -1,7 +1,7 @@ # Template file for 'ccls' pkgname=ccls -version=0.20190314 -revision=1 +version=0.20190823 +revision=2 build_style=cmake hostmakedepends="clang-tools-extra" makedepends="clang llvm ncurses-devel rapidjson zlib-devel" @@ -9,6 +9,6 @@ short_desc="C/C++/ObjC language server" maintainer="Nathan Owens " license="Apache-2.0" homepage="https://github.com/MaskRay/ccls" -distfiles="${homepage}/archive/${version}.tar.gz" -checksum=aaefa603a76325bb94e5222d144e19c432771346990c8b84165832bf37d15bb3 +distfiles="https://github.com/MaskRay/ccls/archive/${version}.tar.gz" +checksum=0176a10b2fa567862e5a93ac16a5bb92940f7bab7c3759b35be1a256cd2f1a66 nocross="Clang cannot be installed as makedep" diff --git a/srcpkgs/cdemu-client/template b/srcpkgs/cdemu-client/template index 5522981eaeb..d0b4b4bf7ba 100644 --- a/srcpkgs/cdemu-client/template +++ b/srcpkgs/cdemu-client/template @@ -1,6 +1,6 @@ # Template file for 'cdemu-client' pkgname=cdemu-client -version=3.2.1 +version=3.2.3 revision=1 archs=noarch build_style=cmake @@ -12,4 +12,4 @@ maintainer="Helmut Pozimski " license="GPL-2.0-or-later" homepage="http://cdemu.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/cdemu/cdemu-client-${version}.tar.bz2" -checksum=e54d2f5686d27bd49e65b84542fb2446ef349c27fa17ee14675d98bd311115b5 +checksum=f883800db99d39a91f41b94ede7c799c12318f15f4c138eeca0374374c156caf diff --git a/srcpkgs/cdemu-daemon/template b/srcpkgs/cdemu-daemon/template index 25f88bd4ec0..61631d510e8 100644 --- a/srcpkgs/cdemu-daemon/template +++ b/srcpkgs/cdemu-daemon/template @@ -1,6 +1,6 @@ # Template file for 'cdemu-daemon' pkgname=cdemu-daemon -version=3.2.2 +version=3.2.3 revision=1 build_style=cmake hostmakedepends="pkg-config intltool" @@ -11,4 +11,4 @@ maintainer="Helmut Pozimski " license="GPL-2.0-or-later" homepage="http://cdemu.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/cdemu/cdemu-daemon-${version}.tar.bz2" -checksum=2b8934ad09d5a1c844202d5e2020193dd5bb00112732559c23594b0761f63542 +checksum=b94bd9f343b82a292ea542c6454762ae4d5987a78387d36a5a5c335bf9fb5d08 diff --git a/srcpkgs/cdetect/template b/srcpkgs/cdetect/template index 0081cf0513e..b02df3a496e 100644 --- a/srcpkgs/cdetect/template +++ b/srcpkgs/cdetect/template @@ -1,7 +1,7 @@ # Template file for 'cdetect' pkgname=cdetect -version=0.5.3 -revision=2 +version=0.5.4 +revision=1 build_style=go go_import_path=github.com/xyproto/cdetect hostmakedepends="git" @@ -10,7 +10,7 @@ maintainer="Orphaned " license="MIT" homepage="https://github.com/xyproto/cdetect" distfiles="https://github.com/xyproto/cdetect/archive/${version}.tar.gz" -checksum=8f9e68366c619706ae48dc3c2188ee15dca97e01a922d1b7eda87ad746e14c32 +checksum=5df583e1b016d61cbc723fc0d222308c4327e108f91316707235148c06095b49 post_install() { vlicense LICENSE diff --git a/srcpkgs/celluloid/template b/srcpkgs/celluloid/template new file mode 100644 index 00000000000..e022f1175f4 --- /dev/null +++ b/srcpkgs/celluloid/template @@ -0,0 +1,19 @@ +# Template file for 'celluloid' +pkgname=celluloid +version=0.17 +revision=1 +build_style=meson +hostmakedepends="glib-devel pkg-config" +makedepends="gtk+3-devel libepoxy-devel libglib-devel mpv-devel" +short_desc="Simple GTK+ frontend for mpv" +maintainer="Enno Boland " +license="GPL-3.0-or-later" +homepage="https://celluloid-player.github.io/" +distfiles="https://github.com/${pkgname}-player/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.xz" +checksum=0016078c02c1c8629a0658bd6eeb02be50d94a670983f53cbdb23f34f4866b28 + +gnome-mpv_package() { + depends="${sourcepkg}>=${version}_${revision}" + build_style=meta + short_desc+=" (transitional dummy package)" +} diff --git a/srcpkgs/cgrps/template b/srcpkgs/cgrps/template index 9239c458de3..94d1c447138 100644 --- a/srcpkgs/cgrps/template +++ b/srcpkgs/cgrps/template @@ -1,15 +1,15 @@ # Template file for 'cgrps' pkgname=cgrps -version=0.7.0 -revision=3 +version=0.8.0 +revision=1 build_style=go go_import_path=github.com/k1LoW/cgrps short_desc="Set of commands for checking cgroups" -maintainer="maxice8 " +maintainer="Orphaned " license="MIT" homepage="https://github.com/k1LoW/cgrps" distfiles="https://github.com/k1LoW/cgrps/archive/v${version}.tar.gz" -checksum=728d95bdcf6a4d2805b7b4262af26440d66408dceea92873d443fc059bb22613 +checksum=1be01ebc65c7b86ccc88597934781a61321566e1be32a4ea4d3df34a4a2a1e43 post_install() { vlicense LICENSE diff --git a/srcpkgs/chafa/template b/srcpkgs/chafa/template index f7ef49009b6..c748a65494e 100644 --- a/srcpkgs/chafa/template +++ b/srcpkgs/chafa/template @@ -1,6 +1,6 @@ # Template file for 'chafa' pkgname=chafa -version=1.0.1 +version=1.2.1 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" @@ -10,7 +10,7 @@ maintainer="Christian Buschau " license="LGPL-3.0-or-later" homepage="https://hpjansson.org/chafa/" distfiles="https://hpjansson.org/chafa/releases/chafa-${version}.tar.xz" -checksum=49d491a566a22daf56c51c043259f1373a1b1125d5c1c1fe321f7c25ca178e01 +checksum=3f37a28bfb9ab716efb32d2652bc2c17856711ed7808e74481c8afcf7cdb44c2 case "$XBPS_TARGET_MACHINE" in x86_64*|i686*) ;; diff --git a/srcpkgs/chatty/template b/srcpkgs/chatty/template index 57249d473b2..7612f7bd929 100644 --- a/srcpkgs/chatty/template +++ b/srcpkgs/chatty/template @@ -1,16 +1,16 @@ # Template file for 'chatty' pkgname=chatty -version=0.9.7 -revision=2 +version=0.10 +revision=1 archs=noarch hostmakedepends="openjdk gradle" depends="virtual?java-runtime" short_desc="Twitch Chat Client for Desktop" maintainer="Frank Steinborn " -license="GPL-3" +license="GPL-3.0-only" homepage="http://chatty.github.io/" distfiles="https://github.com/chatty/chatty/archive/v${version}.tar.gz" -checksum="e5c2eb006db593ce0fc6fb71e602ad641dc3ff970b770dce73155c67d87afbea" +checksum=9b50246620f179be675e883c9a5766218fc50a8f0b4ee139dc40a9dfed5d54d2 do_build() { gradle shadowJar @@ -33,6 +33,4 @@ do_install() { vinstall src/${pkgname}/gui/app_main_64.png 644 usr/share/pixmaps chatty.png vinstall ${FILESDIR}/chatty.desktop 644 usr/share/applications - - vlicense assets/LICENSE } diff --git a/srcpkgs/cheat/template b/srcpkgs/cheat/template new file mode 100644 index 00000000000..b60b4ba53b2 --- /dev/null +++ b/srcpkgs/cheat/template @@ -0,0 +1,26 @@ +# Template file for 'cheat' +pkgname=cheat +version=2.5.1 +revision=1 +build_style=python3-module +pycompile_module="cheat" +conf_files="/etc/cheat" +hostmakedepends="python3" +depends="python3-docopt python3-termcolor python3-Pygments" +short_desc="Create and view interactive cheatsheets on the command-line" +maintainer="bra1nwave " +license="GPL-3.0-or-later, MIT" +homepage="https://github.com/cheat/cheat" +distfiles="${homepage}/archive/${version}.tar.gz" +checksum=9ae44cfc79478a7ba604871f3253e176f2bf3e1a4e698c9466e58a39d279effd + +post_install() { + vinstall cheat/autocompletion/cheat.bash 644 \ + usr/share/bash-completion/completions cheat + vinstall cheat/autocompletion/cheat.zsh 644 \ + usr/share/zsh/site-functions _cheat + vinstall cheat/autocompletion/cheat.fish 644 \ + usr/share/fish/completions + vman man1/cheat.1.gz + vlicense licenses/mit.txt LICENSE +} diff --git a/srcpkgs/cheese/template b/srcpkgs/cheese/template index 1e870bd7613..e6d1e05dbc1 100644 --- a/srcpkgs/cheese/template +++ b/srcpkgs/cheese/template @@ -1,12 +1,13 @@ # Template file for 'cheese' pkgname=cheese -version=3.32.1 -revision=2 -build_style=gnu-configure +version=3.34.0 +revision=1 +build_style=meson +configure_args="-Dgtk_doc=$(vopt_if gtk_doc 'true' 'false') + -Dman=$(vopt_if gtk_doc 'true' 'false')" build_helper="gir" -configure_args="--disable-static --disable-schemas-compile" -hostmakedepends="gdk-pixbuf glib-devel gtk-doc intltool itstool pkg-config - $(vopt_if gir 'gobject-introspection') vala" +hostmakedepends="gdk-pixbuf glib-devel itstool pkg-config vala librsvg + $(vopt_if gtk_doc 'gtk-doc') $(vopt_if gir 'gobject-introspection')" makedepends="clutter-gst3-devel clutter-gtk-devel gnome-desktop-devel gst-plugins-good1 libXtst-devel libcanberra-devel libgee08-devel librsvg-devel" depends="clutter-gst clutter-gtk desktop-file-utils gnome-video-effects @@ -16,12 +17,15 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Cheese" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=7b9ad1da8bb475a9e71ae69a5832786a75e860f0af927637540574fd49d595f6 -nocross="https://build.voidlinux.org/builders/armv7l_builder/builds/18665/steps/shell_3/logs/stdio" +checksum=d1865600ac88012e136b1ec3db72a4634f57bc2035895277be792bb078627e73 -build_options="gir" +build_options="gir gtk_doc" build_options_default="gir" +if [ -z "$CROSS_BUILD" ]; then + build_options_default+=" gtk_doc" +fi + libcheese_package() { short_desc+=" - shared libraries" pkg_install() { @@ -46,6 +50,8 @@ cheese-devel_package() { if [ "$build_option_gir" ]; then vmove usr/share/gir-1.0 fi - vmove usr/share/gtk-doc + if [ "$build_option_gtk_doc" ]; then + vmove usr/share/gtk-doc + fi } } diff --git a/srcpkgs/cherry-font/template b/srcpkgs/cherry-font/template index 544778ab2b6..496d45988d1 100644 --- a/srcpkgs/cherry-font/template +++ b/srcpkgs/cherry-font/template @@ -1,6 +1,6 @@ # Template file for 'cherry-font' pkgname=cherry-font -version=1.3 +version=1.4 revision=1 archs=noarch wrksrc="cherry-${version}" @@ -11,7 +11,7 @@ maintainer="Chinmay Pai " license="MIT" homepage="https://github.com/turquoise-hexagon/cherry" distfiles="https://github.com/turquoise-hexagon/cherry/archive/${version}.tar.gz" -checksum=3fd95e66f9baa8c71f3a513fb807ff72a44605e30938b2be6157a68a1d5ed57e +checksum=984191a0b305832b95bd3036cd8b7ab07cac8a0dd05ba440d6be9ffbdd8434df font_dirs="/usr/share/fonts/X11/misc" diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template index a6b59335c2a..2f8878707ec 100644 --- a/srcpkgs/cherrytree/template +++ b/srcpkgs/cherrytree/template @@ -1,6 +1,6 @@ # Template file for 'cherrytree' pkgname=cherrytree -version=0.38.8 +version=0.38.9 revision=1 archs=noarch build_style=python2-module @@ -12,7 +12,7 @@ maintainer="Logen K " license="GPL-3.0-or-later" homepage="https://www.giuspen.com/cherrytree/" distfiles="https://www.giuspen.com/software/${pkgname}-${version}.tar.xz" -checksum=af21e540fddb3c5a92cdad9b4bbfc6ccd3ce3ab87076a2a01d2e3f2d683f48db +checksum=fc16669e81e7f981f1b51671171a55035febf2ea80e801c0dd7ff52763025475 post_install() { # don’t install useless egg diff --git a/srcpkgs/chocolate-doom/template b/srcpkgs/chocolate-doom/template index c20db393a43..963ba91c585 100644 --- a/srcpkgs/chocolate-doom/template +++ b/srcpkgs/chocolate-doom/template @@ -1,4 +1,4 @@ -# Template file for 'chocolate-doom' +# Template file for 'chocolate-doom'. pkgname=chocolate-doom version=3.0.0 revision=1 diff --git a/srcpkgs/chroma/template b/srcpkgs/chroma/template index 7a7867cc8c9..e8b786f9671 100644 --- a/srcpkgs/chroma/template +++ b/srcpkgs/chroma/template @@ -1,6 +1,6 @@ # Template file for 'chroma' pkgname=chroma -version=0.6.6 +version=0.6.7 revision=1 build_style=go go_import_path="github.com/alecthomas/${pkgname}" @@ -10,8 +10,8 @@ short_desc="General purpose syntax highlighter" maintainer="Daniel Lewan " license="MIT" homepage="https://github.com/alecthomas/chroma" -distfiles="https://${go_import_path}/archive/v${version}.tar.gz" -checksum=87c64941500c9433ef481f2c54155f892ac8bd3c18b3247fc9d9785a8d4f5c10 +distfiles="https://github.com/alecthomas/chroma/archive/v${version}.tar.gz" +checksum=ac23e6b649929d093f2ad163629bc5f30b293ddf4d48d20824f97a512186dcb1 do_check() { go test -v diff --git a/srcpkgs/chromium-widevine/template b/srcpkgs/chromium-widevine/template index a8e074fd168..d777e5ffa2e 100644 --- a/srcpkgs/chromium-widevine/template +++ b/srcpkgs/chromium-widevine/template @@ -6,7 +6,7 @@ _chromeVersion="current" _channel="stable" pkgname=chromium-widevine -version=75.0.3770.142 +version=77.0.3865.120 revision=1 archs="x86_64" create_wrksrc=yes @@ -17,7 +17,7 @@ depends="chromium binutils xz" homepage="https://www.google.com/chrome" repository=nonfree distfiles="https://dl.google.com/linux/direct/google-chrome-${_channel}_${_chromeVersion}_amd64.deb" -checksum=8a39e922d9d0f12b79949efc46c22021f89a8207670fa9493a366ad8231b343f +checksum=07abdccd7c15f5abe68765c1162f2ab666b6478a4d578aa6351d5667cd983a48 do_extract() { : diff --git a/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch b/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch index 461c90cb0af..288f8670c06 100644 --- a/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch +++ b/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch @@ -42,3 +42,15 @@ index 0eb5c1f..8af7799 100644 mi = ::mallinfo(); return mi.uordblks; +--- third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/config.h.orig 2019-09-30 13:03:42.556880537 -0400 ++++ third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/config.h 2019-09-30 13:07:27.989821227 -0400 +@@ -122,7 +122,9 @@ + /* #undef HAVE_MALLCTL */ + + /* Define to 1 if you have the `mallinfo' function. */ ++#if defined(__GLIBC__) + #define HAVE_MALLINFO 1 ++#endif + + /* Define to 1 if you have the header file. */ + #define HAVE_MALLOC_H 1 diff --git a/srcpkgs/chromium/patches/chromium-enable-vaapi.patch b/srcpkgs/chromium/patches/chromium-enable-vaapi.patch index d1cb7b4be59..01c253de5ff 100644 --- a/srcpkgs/chromium/patches/chromium-enable-vaapi.patch +++ b/srcpkgs/chromium/patches/chromium-enable-vaapi.patch @@ -1,165 +1,107 @@ ---- chrome/browser/about_flags.cc.orig 2019-07-29 16:35:46.000000000 -0400 -+++ chrome/browser/about_flags.cc 2019-07-31 13:54:18.350186083 -0400 -@@ -1119,12 +1119,14 @@ - {"ui-disable-partial-swap", flag_descriptions::kUiPartialSwapName, - flag_descriptions::kUiPartialSwapDescription, kOsAll, - SINGLE_DISABLE_VALUE_TYPE(switches::kUIDisablePartialSwap)}, -+#if defined(OS_CHROMEOS) || defined(OS_ANDROID) - {"disable-webrtc-hw-decoding", flag_descriptions::kWebrtcHwDecodingName, - flag_descriptions::kWebrtcHwDecodingDescription, kOsAndroid | kOsCrOS, - SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWDecoding)}, - {"disable-webrtc-hw-encoding", flag_descriptions::kWebrtcHwEncodingName, - flag_descriptions::kWebrtcHwEncodingDescription, kOsAndroid | kOsCrOS, - SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWEncoding)}, -+#endif - #if !defined(OS_ANDROID) - {"enable-reader-mode", flag_descriptions::kEnableReaderModeName, - flag_descriptions::kEnableReaderModeDescription, kOsDesktop, -@@ -1446,6 +1448,13 @@ - flag_descriptions::kEnableVirtualDesksDescription, kOsCrOS, - FEATURE_VALUE_TYPE(ash::features::kVirtualDesks)}, - #endif // OS_CHROMEOS -+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID) -+ { -+ "enable-accelerated-video", flag_descriptions::kAcceleratedVideoName, -+ flag_descriptions::kAcceleratedVideoDescription, kOsLinux, -+ SINGLE_VALUE_TYPE(switches::kEnableAcceleratedVideo), -+ }, -+#else - { +From 53b93dfe87fd10cced5d2a2a63072dfc7a2af6e4 Mon Sep 17 00:00:00 2001 +From: Daniel Charles +Date: Fri, 28 Jul 2017 16:31:47 -0700 +Subject: [PATCH] Enable VAVDA, VAVEA and VAJDA on linux with VAAPI only + +This patch contains all the changes necessary to use VA-API along with +vaapi-driver to run all media use cases supported with hardware acceleration. + +It is intended to remain as experimental accessible from chrome://flags on linux. +It requires libva/intel-vaapi-driver to be installed on the system path where +chrome is executed. Other drivers could be tested if available. Flags are +kept independent for linux, where this feature has to be enabled before +actually using it. This should not change how other OSes use the flags +already, the new flags will show at the buttom on the section of unavailable +experiments + +The changes cover a range of compiler pre-processor flags to enable the stack. +It moves the presandbox operations to the vaapi_wrapper class as the hook function +is available there. vaInit will open driver on the correct installed folder. + +chrome flags consolidtation into only two flags for linux. Mjpeg and accelerated +video are used. The other flags are kept for ChromeOS and other OSes. + +Developer testing was made on skylake hardware, ChromeOS and Ubuntu. + +BUG=NONE +TEST="subjective testing with VAVDA,VAVEA and VAJDA, autotest for encoder" +TEST="and decoder hardware accelerated" +TEST="have libva/intel-vaapi-driver installed and not installed in the system" +TEST="repeat on different hardware families" +R=posciak@chromium.org +R=kcwu@chromium.org + +Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel +Change-Id: Ifbbf5c9e5221a8b5733fc6d4d0cf984a1f103171 +Signed-off-by: Daniel Charles +--- + +Index: dev/chrome/browser/about_flags.cc +=================================================================== +--- chrome/browser/about_flags.cc ++++ chrome/browser/about_flags.cc +@@ -1527,7 +1527,7 @@ const FeatureEntry kFeatureEntries[] = { "disable-accelerated-video-decode", flag_descriptions::kAcceleratedVideoDecodeName, -@@ -1453,6 +1462,7 @@ - kOsMac | kOsWin | kOsCrOS | kOsAndroid, + flag_descriptions::kAcceleratedVideoDecodeDescription, +- kOsMac | kOsWin | kOsCrOS | kOsAndroid, ++ kOsAll, SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode), }, -+#endif - {"enable-history-favicons-google-server-query", - flag_descriptions::kEnableHistoryFaviconsGoogleServerQueryName, - flag_descriptions::kEnableHistoryFaviconsGoogleServerQueryDescription, -@@ -1883,7 +1892,12 @@ + { +@@ -1993,10 +1993,10 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(service_manager::features::kXRSandbox)}, - #endif // ENABLE_ISOLATED_XR_SERVICE + #endif // !defined(OS_ANDROID) #endif // ENABLE_VR -#if defined(OS_CHROMEOS) -+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID) -+ {"enable-accelerated-mjpeg-decode", -+ flag_descriptions::kAcceleratedMjpegDecodeName, -+ flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsLinux, -+ SINGLE_VALUE_TYPE(switches::kEnableAcceleratedMjpegDecode)}, -+#elif defined(OS_CHROMEOS) ++#if defined(OS_LINUX) && !defined(OS_ANDROID) {"disable-accelerated-mjpeg-decode", flag_descriptions::kAcceleratedMjpegDecodeName, - flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS, ---- chrome/browser/chromeos/login/chrome_restart_request.cc.orig 2019-07-29 16:35:47.000000000 -0400 -+++ chrome/browser/chromeos/login/chrome_restart_request.cc 2019-07-31 13:58:47.201085960 -0400 -@@ -20,6 +20,7 @@ - #include "base/system/sys_info.h" - #include "base/timer/timer.h" - #include "base/values.h" -+#include "build/build_config.h" - #include "cc/base/switches.h" - #include "chrome/browser/browser_process.h" - #include "chrome/browser/chromeos/boot_times_recorder.h" -@@ -84,9 +85,14 @@ - ::switches::kBlinkSettings, - ::switches::kDisable2dCanvasImageChromium, - ::switches::kDisableAccelerated2dCanvas, -+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID) -+ ::switches::kEnableAcceleratedMjpegDecode, -+ ::switches::kEnableAcceleratedVideo, -+#else - ::switches::kDisableAcceleratedMjpegDecode, - ::switches::kDisableAcceleratedVideoDecode, - ::switches::kDisableAcceleratedVideoEncode, -+#endif - ::switches::kDisableBlinkFeatures, - ::switches::kDisableGpu, - ::switches::kDisableGpuMemoryBufferVideoFrames, -@@ -158,8 +164,10 @@ - ::switches::kEnableWebGLImageChromium, - ::switches::kEnableWebVR, - ::switches::kEnableUnsafeWebGPU, -+#if (defined(OS_CHROMEOS) || defined(OS_ANDROID)) - ::switches::kDisableWebRtcHWDecoding, - ::switches::kDisableWebRtcHWEncoding, -+#endif - ::switches::kOzonePlatform, - ash::switches::kAshEnableTabletMode, - ash::switches::kAshEnableWaylandServer, -diff -ur chrome/browser/flag_descriptions.cc chromium-69.0.3497.92/chrome/browser/flag_descriptions.cc ---- chrome/browser/flag_descriptions.cc.orig 2019-06-18 11:47:50.000000000 -0400 -+++ chrome/browser/flag_descriptions.cc 2019-07-02 12:27:47.137866754 -0400 -@@ -14,6 +14,13 @@ - "Enables the use of the GPU to perform 2d canvas rendering instead of " - "using software rendering."; - -+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID) -+const char kAcceleratedVideoName[] = "Hardware-accelerated video"; -+const char kAcceleratedVideoDescription[] = -+ "Hardware-accelerated video where VA-API driver is installed on the" -+ "system."; -+#endif -+ - const char kAcceleratedVideoDecodeName[] = "Hardware-accelerated video decode"; - const char kAcceleratedVideoDecodeDescription[] = - "Hardware-accelerated video decode where available."; -@@ -2081,6 +2088,7 @@ - const char kWebrtcHybridAgcDescription[] = - "WebRTC Agc2 digital adaptation with Agc1 analog adaptation."; - -+#if defined(OS_CHROMEOS) || defined(OS_ANDROID) - const char kWebrtcHwDecodingName[] = "WebRTC hardware video decoding"; - const char kWebrtcHwDecodingDescription[] = - "Support in WebRTC for decoding video streams using platform hardware."; -@@ -2088,6 +2096,7 @@ - const char kWebrtcHwEncodingName[] = "WebRTC hardware video encoding"; - const char kWebrtcHwEncodingDescription[] = - "Support in WebRTC for encoding video streams using platform hardware."; -+#endif - - const char kWebrtcHwH264EncodingName[] = "WebRTC hardware h264 video encoding"; - const char kWebrtcHwH264EncodingDescription[] = -@@ -2943,14 +2952,16 @@ +- flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS, ++ flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS | kOsLinux, + SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedMjpegDecode)}, + #endif // OS_CHROMEOS + {"system-keyboard-lock", flag_descriptions::kSystemKeyboardLockName, +Index: dev/chrome/browser/flag_descriptions.cc +=================================================================== +--- chrome/browser/flag_descriptions.cc ++++ chrome/browser/flag_descriptions.cc +@@ -2880,9 +2880,7 @@ const char kMacSystemMediaPermissionsInf - // Chrome OS ------------------------------------------------------------------- + #endif +-// Chrome OS ------------------------------------------------------------------- +- -#if defined(OS_CHROMEOS) -+#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID)) ++#if defined(OS_LINUX) && !defined(OS_ANDROID) const char kAcceleratedMjpegDecodeName[] = "Hardware-accelerated mjpeg decode for captured frame"; - const char kAcceleratedMjpegDecodeDescription[] = +@@ -2890,6 +2888,12 @@ const char kAcceleratedMjpegDecodeDescri "Enable hardware-accelerated mjpeg decode for captured frame where " "available."; -+#endif ++#endif ++ ++// Chrome OS ------------------------------------------------------------------- ++ +#if defined(OS_CHROMEOS) ++ const char kAppServiceAshName[] = "App Service Ash"; const char kAppServiceAshDescription[] = "Use the App Service to provide data to the Ash UI, such as the shelf and " -diff -ur chrome/browser/flag_descriptions.h chromium-69.0.3497.92/chrome/browser/flag_descriptions.h ---- chrome/browser/flag_descriptions.h.orig 2019-06-18 11:47:50.000000000 -0400 -+++ chrome/browser/flag_descriptions.h 2019-07-02 12:29:46.200214795 -0400 -@@ -43,6 +43,10 @@ - extern const char kAccelerated2dCanvasName[]; - extern const char kAccelerated2dCanvasDescription[]; - -+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID) -+extern const char kAcceleratedVideoName[]; -+extern const char kAcceleratedVideoDescription[]; -+#endif - extern const char kAcceleratedVideoDecodeName[]; - extern const char kAcceleratedVideoDecodeDescription[]; - -@@ -1765,13 +1769,17 @@ +Index: dev/chrome/browser/flag_descriptions.h +=================================================================== +--- chrome/browser/flag_descriptions.h ++++ chrome/browser/flag_descriptions.h +@@ -1715,13 +1715,17 @@ extern const char kPermissionPromptPersi #endif // defined(OS_MACOSX) -// Chrome OS ------------------------------------------------------------------ - -#if defined(OS_CHROMEOS) -+#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID)) ++#if defined(OS_LINUX) && !defined(OS_ANDROID) extern const char kAcceleratedMjpegDecodeName[]; extern const char kAcceleratedMjpegDecodeDescription[]; @@ -173,234 +115,32 @@ diff -ur chrome/browser/flag_descriptions.h chromium-69.0.3497.92/chrome/browser extern const char kAppServiceAshName[]; extern const char kAppServiceAshDescription[]; -diff -ur content/browser/gpu/compositor_util.cc chromium-69.0.3497.92/content/browser/gpu/compositor_util.cc ---- content/browser/gpu/compositor_util.cc 2018-09-12 00:39:41.000000000 +0530 -+++ content/browser/gpu/compositor_util.cc 2018-09-13 22:10:34.072012092 +0530 -@@ -149,7 +149,11 @@ - {"video_decode", - SafeGetFeatureStatus(gpu_feature_info, - gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE), -+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID) -+ !command_line.HasSwitch(switches::kEnableAcceleratedVideo), -+#else - command_line.HasSwitch(switches::kDisableAcceleratedVideoDecode), -+#endif - "Accelerated video decode has been disabled, either via blacklist, " - "about:flags or the command line.", - true, true}, ---- content/browser/gpu/gpu_process_host.cc.orig 2019-07-31 14:16:52.304849119 -0400 -+++ content/browser/gpu/gpu_process_host.cc 2019-07-31 14:19:22.567480008 -0400 -@@ -208,7 +208,9 @@ - switches::kDisableLogging, - switches::kDisableShaderNameHashing, - switches::kDisableSkiaRuntimeOpts, -+#if !defined(OS_LINUX) - switches::kDisableWebRtcHWEncoding, -+#endif - switches::kEnableGpuRasterization, - switches::kEnableLogging, - switches::kEnableVizDevTools, -diff -ur content/browser/renderer_host/media/video_capture_browsertest.cc chromium-69.0.3497.92/content/browser/renderer_host/media/video_capture_browsertest.cc ---- content/browser/renderer_host/media/video_capture_browsertest.cc 2018-09-12 00:39:41.000000000 +0530 -+++ content/browser/renderer_host/media/video_capture_browsertest.cc 2018-09-13 22:10:34.124010499 +0530 -@@ -165,8 +165,13 @@ - base::CommandLine::ForCurrentProcess()->AppendSwitch( - switches::kUseFakeJpegDecodeAccelerator); - } else { -+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID) -+ base::CommandLine::ForCurrentProcess()->AppendSwitch( -+ switches::kEnableAcceleratedMjpegDecode); -+#else - base::CommandLine::ForCurrentProcess()->AppendSwitch( - switches::kDisableAcceleratedMjpegDecode); -+#endif - } - } - ---- content/browser/renderer_host/render_process_host_impl.cc.orig 2019-07-29 16:36:09.000000000 -0400 -+++ content/browser/renderer_host/render_process_host_impl.cc 2019-07-31 14:04:18.859680348 -0400 -@@ -2937,7 +2937,11 @@ - switches::kDefaultTileHeight, - switches::kDisable2dCanvasImageChromium, - switches::kDisableYUVImageDecoding, -+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+ switches::kEnableAcceleratedVideo, -+#else - switches::kDisableAcceleratedVideoDecode, -+#endif - switches::kDisableBackgroundTimerThrottling, - switches::kDisableBestEffortTasks, - switches::kDisableBreakpad, -@@ -3077,8 +3081,10 @@ - #if BUILDFLAG(ENABLE_PLUGINS) - switches::kEnablePepperTesting, - #endif -+#if !defined(OS_LINUX) || defined(OS_CHROMEOS) - switches::kDisableWebRtcHWDecoding, - switches::kDisableWebRtcHWEncoding, -+#endif - switches::kEnableWebRtcSrtpAesGcm, - switches::kEnableWebRtcSrtpEncryptedHeaders, - switches::kEnableWebRtcStunOrigin, -diff -ur content/browser/utility_process_host.cc chromium-69.0.3497.92/content/browser/utility_process_host.cc ---- content/browser/utility_process_host.cc 2018-09-12 00:39:41.000000000 +0530 -+++ content/browser/utility_process_host.cc 2018-09-13 22:10:34.296005227 +0530 -@@ -296,7 +296,11 @@ - switches::kOverrideUseSoftwareGLForTests, - switches::kOverrideEnabledCdmInterfaceVersion, - switches::kProxyServer, -+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID) -+ switches::kEnableAcceleratedMjpegDecode, -+#else - switches::kDisableAcceleratedMjpegDecode, -+#endif - switches::kUseFakeDeviceForMediaStream, - switches::kUseFakeJpegDecodeAccelerator, - switches::kUseFileForFakeVideoCapture, -diff -ur content/browser/webrtc/webrtc_media_recorder_browsertest.cc chromium-69.0.3497.92/content/browser/webrtc/webrtc_media_recorder_browsertest.cc ---- content/browser/webrtc/webrtc_media_recorder_browsertest.cc 2018-09-12 00:39:41.000000000 +0530 -+++ content/browser/webrtc/webrtc_media_recorder_browsertest.cc 2018-09-13 22:10:34.143009916 +0530 -@@ -66,7 +66,12 @@ - return; - // This flag is also used for encoding, https://crbug.com/616640. - base::CommandLine::ForCurrentProcess()->AppendSwitch( -- switches::kDisableAcceleratedVideoDecode); -+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+ switches::kEnableAcceleratedVideo -+#else -+ switches::kDisableAcceleratedVideoDecode -+#endif -+ ); - } - - private: -diff -ur content/gpu/BUILD.gn chromium-69.0.3497.92/content/gpu/BUILD.gn ---- content/gpu/BUILD.gn 2018-09-12 00:39:41.000000000 +0530 -+++ content/gpu/BUILD.gn 2018-09-13 22:10:34.148009763 +0530 -@@ -133,4 +133,8 @@ +Index: dev/content/gpu/BUILD.gn +=================================================================== +--- content/gpu/BUILD.gn ++++ content/gpu/BUILD.gn +@@ -6,6 +6,7 @@ import("//build/config/jumbo.gni") + import("//build/config/ui.gni") + import("//gpu/vulkan/features.gni") + import("//media/media_options.gni") ++import("//media/gpu/args.gni") + import("//ui/ozone/ozone.gni") + + # See //content/BUILD.gn for how this works. +@@ -128,4 +129,8 @@ target(link_target_type, "gpu_sources") (!is_chromecast || is_cast_desktop_build)) { configs += [ "//build/config/linux/dri" ] } + -+ if (is_desktop_linux) { -+ public_configs = [ "//media/gpu:libva_config" ] ++ if (is_desktop_linux && use_vaapi) { ++ public_configs = [ "//build/config/linux/libva" ] + } } -diff -ur content/gpu/gpu_main.cc chromium-69.0.3497.92/content/gpu/gpu_main.cc ---- content/gpu/gpu_main.cc 2019-07-02 09:50:13.403486804 -0400 -+++ content/gpu/gpu_main.cc 2019-07-02 09:55:07.256818723 -0400 -@@ -288,7 +288,7 @@ - - base::PlatformThread::SetName("CrGpuMain"); - --#if defined(OS_ANDROID) || defined(OS_CHROMEOS) || defined(USE_OZONE) -+#if defined(OS_LINUX) - // Set thread priority before sandbox initialization. - base::PlatformThread::SetCurrentThreadPriority(base::ThreadPriority::DISPLAY); - #endif -@@ -321,7 +321,7 @@ - GetContentClient()->SetGpuInfo(gpu_init->gpu_info()); - - base::ThreadPriority io_thread_priority = base::ThreadPriority::NORMAL; --#if defined(OS_ANDROID) || defined(OS_CHROMEOS) || defined(USE_OZONE) -+#if defined(OS_LINUX) - io_thread_priority = base::ThreadPriority::DISPLAY; - #endif - -diff -ur content/public/browser/gpu_utils.cc chromium-69.0.3497.92/content/public/browser/gpu_utils.cc ---- content/public/browser/gpu_utils.cc 2018-09-12 00:39:42.000000000 +0530 -+++ content/public/browser/gpu_utils.cc 2018-09-13 22:10:34.164009273 +0530 -@@ -57,9 +57,17 @@ - gpu_preferences.in_process_gpu = - command_line->HasSwitch(switches::kInProcessGPU); - gpu_preferences.disable_accelerated_video_decode = -+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+ !command_line->HasSwitch(switches::kEnableAcceleratedVideo); -+#else - command_line->HasSwitch(switches::kDisableAcceleratedVideoDecode); -+#endif - gpu_preferences.disable_accelerated_video_encode = -+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+ !command_line->HasSwitch(switches::kEnableAcceleratedVideo); -+#else - command_line->HasSwitch(switches::kDisableAcceleratedVideoEncode); -+#endif - #if defined(OS_WIN) - uint32_t enable_accelerated_vpx_decode_val = - gpu::GpuPreferences::VPX_VENDOR_MICROSOFT; -diff -ur content/public/common/content_switches.cc chromium-69.0.3497.92/content/public/common/content_switches.cc ---- content/public/common/content_switches.cc 2018-09-12 00:39:42.000000000 +0530 -+++ content/public/common/content_switches.cc 2018-09-13 22:10:34.172009028 +0530 -@@ -79,6 +79,11 @@ - // Disable gpu-accelerated 2d canvas. - const char kDisableAccelerated2dCanvas[] = "disable-accelerated-2d-canvas"; - -+#if defined(OS_LINUX) -+// Enables hardware acceleration of video for Linux only. VA-API driver -+// is required to be present on the system installation. -+const char kEnableAcceleratedVideo[] = "enable-accelerated-video"; -+#endif - // Disables hardware acceleration of video decode, where available. - const char kDisableAcceleratedVideoDecode[] = - "disable-accelerated-video-decode"; -@@ -868,11 +873,13 @@ - // ignores this switch on its stable and beta channels. - const char kDisableWebRtcEncryption[] = "disable-webrtc-encryption"; - -+#if defined(OS_CHROMEOS) - // Disables HW decode acceleration for WebRTC. - const char kDisableWebRtcHWDecoding[] = "disable-webrtc-hw-decoding"; - - // Disables HW encode acceleration for WebRTC. - const char kDisableWebRtcHWEncoding[] = "disable-webrtc-hw-encoding"; -+#endif - - // Enables negotiation of GCM cipher suites from RFC 7714 for SRTP in WebRTC. - // See https://tools.ietf.org/html/rfc7714 for further information. -diff -ur content/public/common/content_switches.h chromium-69.0.3497.92/content/public/common/content_switches.h ---- content/public/common/content_switches.h 2018-09-12 00:39:42.000000000 +0530 -+++ content/public/common/content_switches.h 2018-09-13 22:10:34.172009028 +0530 -@@ -104,6 +104,9 @@ - CONTENT_EXPORT extern const char kDomAutomationController[]; - extern const char kDisable2dCanvasClipAntialiasing[]; - CONTENT_EXPORT extern const char kDumpBlinkRuntimeCallStats[]; -+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID) -+CONTENT_EXPORT extern const char kEnableAcceleratedVideo[]; -+#endif - CONTENT_EXPORT extern const char kEnableAccessibilityObjectModel[]; - CONTENT_EXPORT extern const char kEnableAggressiveDOMStorageFlushing[]; - CONTENT_EXPORT extern const char kEnableAutomation[]; -@@ -241,8 +244,10 @@ - CONTENT_EXPORT extern const char kWaitForDebuggerChildren[]; - - CONTENT_EXPORT extern const char kDisableWebRtcEncryption[]; -+#if defined(OS_CHROMEOS) - CONTENT_EXPORT extern const char kDisableWebRtcHWDecoding[]; - CONTENT_EXPORT extern const char kDisableWebRtcHWEncoding[]; -+#endif - CONTENT_EXPORT extern const char kEnableWebRtcSrtpAesGcm[]; - CONTENT_EXPORT extern const char kEnableWebRtcSrtpEncryptedHeaders[]; - CONTENT_EXPORT extern const char kEnableWebRtcStunOrigin[]; -diff -ur content/renderer/render_thread_impl.cc chromium-69.0.3497.92/content/renderer/render_thread_impl.cc ---- content/renderer/render_thread_impl.cc 2018-09-12 00:39:42.000000000 +0530 -+++ content/renderer/render_thread_impl.cc 2018-09-13 22:10:34.192008415 +0530 -@@ -1441,7 +1441,11 @@ - kGpuStreamPriorityMedia); - - const bool enable_video_accelerator = -+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+ cmd_line->HasSwitch(switches::kEnableAcceleratedVideo) && -+#else - !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode) && -+#endif - (gpu_channel_host->gpu_feature_info() - .status_values[gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE] == - gpu::kGpuFeatureStatusEnabled); -Only in content/renderer: render_thread_impl.cc.orig -diff -ur gpu/config/software_rendering_list.json chromium-69.0.3497.92/gpu/config/software_rendering_list.json ---- gpu/config/software_rendering_list.json 2018-09-12 00:39:44.000000000 +0530 -+++ gpu/config/software_rendering_list.json 2018-09-13 22:10:34.193008384 +0530 -@@ -377,17 +377,6 @@ +Index: dev/gpu/config/software_rendering_list.json +=================================================================== +--- gpu/config/software_rendering_list.json ++++ gpu/config/software_rendering_list.json +@@ -369,17 +369,6 @@ ] }, { @@ -418,119 +158,241 @@ diff -ur gpu/config/software_rendering_list.json chromium-69.0.3497.92/gpu/confi "id": 50, "description": "Disable VMware software renderer on older Mesa", "cr_bugs": [145531, 332596, 571899, 629434], -diff -ur media/base/media_switches.cc chromium-69.0.3497.92/media/base/media_switches.cc ---- media/base/media_switches.cc.orig 2019-06-18 11:48:14.000000000 -0400 -+++ media/base/media_switches.cc 2019-07-02 12:32:22.370983036 -0400 -@@ -103,10 +103,15 @@ - const char kUseFakeMjpegDecodeAccelerator[] = - "use-fake-mjpeg-decode-accelerator"; - -+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+// Enable hardware accelerated mjpeg decode on linux -+const char kEnableAcceleratedMjpegDecode[] = "enable-accelerated-mjpeg-decode"; -+#else - // Disable hardware acceleration of mjpeg decode for captured frame, where - // available. - const char kDisableAcceleratedMjpegDecode[] = - "disable-accelerated-mjpeg-decode"; -+#endif - - // When running tests on a system without the required hardware or libraries, - // this flag will cause the tests to fail. Otherwise, they silently succeed. -@@ -503,15 +508,21 @@ - }; - - bool IsVideoCaptureAcceleratedJpegDecodingEnabled() { -+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID) -+ if (!base::CommandLine::ForCurrentProcess()->HasSwitch( -+ switches::kEnableAcceleratedMjpegDecode) -+#else - if (base::CommandLine::ForCurrentProcess()->HasSwitch( -- switches::kDisableAcceleratedMjpegDecode)) { -+ switches::kDisableAcceleratedMjpegDecode) -+#endif -+ ) { - return false; - } - if (base::CommandLine::ForCurrentProcess()->HasSwitch( +Index: dev/media/base/media_switches.cc +=================================================================== +--- media/base/media_switches.cc ++++ media/base/media_switches.cc +@@ -544,7 +544,7 @@ bool IsVideoCaptureAcceleratedJpegDecodi switches::kUseFakeMjpegDecodeAccelerator)) { return true; } -#if defined(OS_CHROMEOS) -+#if !defined(OS_ANDROID) && defined(OS_LINUX) ++#if defined(OS_LINUX) && !defined(OS_ANDROID) return true; #endif return false; -diff -ur media/base/media_switches.h chromium-69.0.3497.92/media/base/media_switches.h ---- media/base/media_switches.h.orig 2019-07-02 12:20:39.902984488 -0400 -+++ media/base/media_switches.h 2019-07-02 12:33:45.441923602 -0400 -@@ -60,7 +60,11 @@ - MEDIA_EXPORT extern const char kUseFileForFakeVideoCapture[]; - MEDIA_EXPORT extern const char kUseFileForFakeAudioCapture[]; - MEDIA_EXPORT extern const char kUseFakeMjpegDecodeAccelerator[]; -+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+MEDIA_EXPORT extern const char kEnableAcceleratedMjpegDecode[]; -+#else - MEDIA_EXPORT extern const char kDisableAcceleratedMjpegDecode[]; -+#endif - - MEDIA_EXPORT extern const char kRequireAudioHardwareForTesting[]; - MEDIA_EXPORT extern const char kMuteAudio[]; ---- media/gpu/BUILD.gn.orig 2019-07-29 16:36:19.000000000 -0400 -+++ media/gpu/BUILD.gn 2019-07-31 14:09:28.093032826 -0400 -@@ -495,6 +495,14 @@ +Index: dev/media/filters/BUILD.gn +=================================================================== +--- media/filters/BUILD.gn ++++ media/filters/BUILD.gn +@@ -5,6 +5,7 @@ + import("//build/config/jumbo.gni") + import("//media/media_options.gni") + import("//third_party/libaom/options.gni") ++import("//media/gpu/args.gni") + + jumbo_source_set("filters") { + # Do not expand the visibility here without double-checking with OWNERS, this +@@ -196,7 +197,7 @@ jumbo_source_set("filters") { + deps += [ "//media/base/android" ] } - } -+if (is_desktop_linux && use_vaapi) { -+ import("//build/config/linux/pkg_config.gni") -+ -+ pkg_config("libva_config") { -+ packages = [ "libva" ] -+ } -+} -+ - if (use_v4l2_codec || use_vaapi || is_mac || is_win) { - test("video_encode_accelerator_unittest") { - deps = [ -@@ -525,6 +533,10 @@ +- if (current_cpu != "arm" && is_linux) { ++ if (use_vaapi) { + sources += [ + "h264_bitstream_buffer.cc", + "h264_bitstream_buffer.h", +Index: dev/media/gpu/BUILD.gn +=================================================================== +--- media/gpu/BUILD.gn ++++ media/gpu/BUILD.gn +@@ -531,6 +531,7 @@ if (use_v4l2_codec || use_vaapi || is_ma if (use_ozone) { deps += [ "//ui/ozone" ] } -+ -+ if (is_desktop_linux) { -+ public_configs = [ ":libva_config" ] -+ } ++ public_configs = [ "//build/config/linux/libva" ] } } ---- content/renderer/media/webrtc/video_codec_factory.cc.orig 2019-07-02 16:39:57.973241977 -0400 -+++ content/renderer/media/webrtc/video_codec_factory.cc 2019-07-02 17:00:00.656342711 -0400 -@@ -187,8 +187,11 @@ - std::unique_ptr encoder_factory; +Index: dev/media/gpu/gpu_video_decode_accelerator_factory.cc +=================================================================== +--- media/gpu/gpu_video_decode_accelerator_factory.cc ++++ media/gpu/gpu_video_decode_accelerator_factory.cc +@@ -171,6 +171,8 @@ GpuVideoDecodeAcceleratorFactory::Create + vda = (this->*create_vda_function)(workarounds, gpu_preferences, media_log); + if (vda && vda->Initialize(config, client)) + return vda; ++ else ++ LOG(ERROR) << "Initialization of one or more VDAs failed."; + } - const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); -- if (gpu_factories && gpu_factories->IsGpuVideoAcceleratorEnabled() && -- !cmd_line->HasSwitch(switches::kDisableWebRtcHWEncoding)) { -+ if (gpu_factories && gpu_factories->IsGpuVideoAcceleratorEnabled() -+#if defined(OS_CHROMEOS) -+ && !cmd_line->HasSwitch(switches::kDisableWebRtcHWEncoding) + return nullptr; +@@ -229,6 +231,7 @@ GpuVideoDecodeAcceleratorFactory::Create + const gpu::GpuDriverBugWorkarounds& workarounds, + const gpu::GpuPreferences& gpu_preferences, + MediaLog* media_log) const { ++ LOG(WARNING) << "Initializing VAAPI VDA."; + std::unique_ptr decoder; + decoder.reset(new VaapiVideoDecodeAccelerator(make_context_current_cb_, + bind_image_cb_)); +Index: dev/media/gpu/ipc/service/gpu_video_decode_accelerator.cc +=================================================================== +--- media/gpu/ipc/service/gpu_video_decode_accelerator.cc ++++ media/gpu/ipc/service/gpu_video_decode_accelerator.cc +@@ -380,6 +380,7 @@ bool GpuVideoDecodeAccelerator::Initiali + LOG(ERROR) << "Failed creating the VDA factory"; + return false; + } ++ LOG(WARNING) << "Created the VDA factory"; + + const gpu::GpuDriverBugWorkarounds& gpu_workarounds = + stub_->channel()->gpu_channel_manager()->gpu_driver_bug_workarounds(); +@@ -393,6 +394,7 @@ bool GpuVideoDecodeAccelerator::Initiali + << (config.is_encrypted() ? " with encryption" : ""); + return false; + } ++ LOG(WARNING) << "Created VDA"; + + // Attempt to set up performing decoding tasks on IO thread, if supported by + // the VDA. +Index: dev/media/gpu/vaapi/vaapi_video_decode_accelerator.cc +=================================================================== +--- media/gpu/vaapi/vaapi_video_decode_accelerator.cc ++++ media/gpu/vaapi/vaapi_video_decode_accelerator.cc +@@ -64,6 +64,7 @@ void ReportToUMA(VAVDADecoderFailure fai + VAVDA_DECODER_FAILURES_MAX + 1); + } + ++#if defined(OS_ANDROID) || defined(OS_CHROMEOS) + // Returns true if the CPU is an Intel Gemini Lake or later (including Kaby + // Lake) Cpu platform id's are referenced from the following file in kernel + // source arch/x86/include/asm/intel-family.h +@@ -76,6 +77,7 @@ bool IsGeminiLakeOrLater() { + cpuid.model() >= kGeminiLakeModelId; + return is_geminilake_or_later; + } +#endif -+ ) { - encoder_factory.reset(new RTCVideoEncoderFactory(gpu_factories)); + + } // namespace + +@@ -632,6 +634,10 @@ void VaapiVideoDecodeAccelerator::Assign + va_surface_format_ = GetVaFormatForVideoCodecProfile(profile_); + std::vector va_surface_ids; + ++ // Nvidia doesn't support VAProfileNone, so don't try to create a temporary ++ // copy buffer there. It's not needed anyways for hardware video decoding ++ // to work. ++#if defined(OS_ANDROID) || defined(OS_CHROMEOS) + // If we aren't in BufferAllocationMode::kNone, we have to allocate a + // |vpp_vaapi_wrapper_| for VaapiPicture to DownloadFromSurface() the VA's + // internal decoded frame. +@@ -645,15 +651,20 @@ void VaapiVideoDecodeAccelerator::Assign + NotifyError(PLATFORM_FAILURE); + } } ++#endif -@@ -205,8 +208,11 @@ - std::unique_ptr decoder_factory; + for (size_t i = 0; i < buffers.size(); ++i) { + // If we aren't in BufferAllocationMode::kNone, this |picture| is + // only used as a copy destination. Therefore, the VaapiWrapper used and + // owned by |picture| is |vpp_vaapi_wrapper_|. + std::unique_ptr picture = vaapi_picture_factory_->Create( ++#if defined(OS_LINUX) && !defined(OS_ANDROID) && !defined(OS_CHROMEOS) ++ vaapi_wrapper_, ++#else + (buffer_allocation_mode_ == BufferAllocationMode::kNone) + ? vaapi_wrapper_ + : vpp_vaapi_wrapper_, ++#endif + make_context_current_cb_, bind_image_cb_, buffers[i]); + RETURN_AND_NOTIFY_ON_FAILURE(picture, "Failed creating a VaapiPicture", + PLATFORM_FAILURE, ); +@@ -1078,6 +1089,9 @@ VaapiVideoDecodeAccelerator::GetSupporte + + VaapiVideoDecodeAccelerator::BufferAllocationMode + VaapiVideoDecodeAccelerator::DecideBufferAllocationMode() { ++#if defined(OS_LINUX) && !defined(OS_ANDROID) && !defined(OS_CHROMEOS) ++ return BufferAllocationMode::kNormal; ++#else + // TODO(crbug.com/912295): Enable a better BufferAllocationMode for IMPORT + // |output_mode_| as well. + if (output_mode_ == VideoDecodeAccelerator::Config::OutputMode::IMPORT) +@@ -1113,6 +1127,7 @@ VaapiVideoDecodeAccelerator::DecideBuffe + return BufferAllocationMode::kReduced; - const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); -- if (gpu_factories && gpu_factories->IsGpuVideoAcceleratorEnabled() && -- !cmd_line->HasSwitch(switches::kDisableWebRtcHWDecoding)) { -+ if (gpu_factories && gpu_factories->IsGpuVideoAcceleratorEnabled() -+#if defined(OS_CHROMEOS) -+ && !cmd_line->HasSwitch(switches::kDisableWebRtcHWDecoding) + return BufferAllocationMode::kSuperReduced; +#endif -+ ) { - decoder_factory.reset(new RTCVideoDecoderFactory(gpu_factories)); + } + + bool VaapiVideoDecodeAccelerator::IsBufferAllocationModeReducedOrSuperReduced() +Index: dev/media/gpu/vaapi/vaapi_wrapper.cc +=================================================================== +--- media/gpu/vaapi/vaapi_wrapper.cc ++++ media/gpu/vaapi/vaapi_wrapper.cc +@@ -324,6 +324,11 @@ void VADisplayState::PreSandboxInitializ + base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_WRITE); + if (drm_file.IsValid()) + VADisplayState::Get()->SetDrmFd(drm_file.GetPlatformFile()); ++ ++ const char kNvidiaPath[] = "/dev/dri/nvidiactl"; ++ base::File nvidia_file = base::File( ++ base::FilePath::FromUTF8Unsafe(kNvidiaPath), ++ base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_WRITE); + } + + VADisplayState::VADisplayState() +@@ -351,10 +356,6 @@ bool VADisplayState::Initialize() { + } + + bool VADisplayState::InitializeOnce() { +- static_assert( +- VA_MAJOR_VERSION >= 2 || (VA_MAJOR_VERSION == 1 && VA_MINOR_VERSION >= 1), +- "Requires VA-API >= 1.1.0"); +- + switch (gl::GetGLImplementation()) { + case gl::kGLImplementationEGLGLES2: + va_display_ = vaGetDisplayDRM(drm_fd_.get()); +@@ -362,10 +363,10 @@ bool VADisplayState::InitializeOnce() { + case gl::kGLImplementationDesktopGL: + #if defined(USE_X11) + va_display_ = vaGetDisplay(gfx::GetXDisplay()); +-#else +- LOG(WARNING) << "VAAPI video acceleration not available without " +- "DesktopGL (GLX)."; ++ if (vaDisplayIsValid(va_display_)) ++ break; + #endif // USE_X11 ++ va_display_ = vaGetDisplayDRM(drm_fd_.get()); + break; + // Cannot infer platform from GL, try all available displays + case gl::kGLImplementationNone: +@@ -398,8 +399,19 @@ bool VADisplayState::InitializeOnce() { + int major_version, minor_version; + VAStatus va_res = vaInitialize(va_display_, &major_version, &minor_version); + if (va_res != VA_STATUS_SUCCESS) { +- LOG(ERROR) << "vaInitialize failed: " << vaErrorStr(va_res); +- return false; ++ LOG(ERROR) << "vaInitialize failed (ignore if using Wayland desktop environment): " << vaErrorStr(va_res); ++ va_display_ = vaGetDisplayDRM(drm_fd_.get()); ++ if (!vaDisplayIsValid(va_display_)) { ++ LOG(ERROR) << "Could not get a valid DRM VA display"; ++ return false; ++ } ++ va_res = vaInitialize(va_display_, &major_version, &minor_version); ++ if (va_res != VA_STATUS_SUCCESS) { ++ LOG(ERROR) << "vaInitialize failed using DRM: " << vaErrorStr(va_res); ++ return false; ++ } else { ++ LOG(WARNING) << "vaInitialize succeeded for DRM"; ++ } } + va_initialized_ = true; +@@ -407,7 +419,7 @@ bool VADisplayState::InitializeOnce() { + va_vendor_string_ = vaQueryVendorString(va_display_); + DLOG_IF(WARNING, va_vendor_string_.empty()) + << "Vendor string empty or error reading."; +- DVLOG(1) << "VAAPI version: " << major_version << "." << minor_version << " " ++ VLOG(1) << "VAAPI version: " << major_version << "." << minor_version << " " + << va_vendor_string_; + + // The VAAPI version is determined from what is loaded on the system by +@@ -742,7 +754,7 @@ bool VASupportedProfiles::AreAttribsSupp + if (attribs[i].type != required_attribs[i].type || + (attribs[i].value & required_attribs[i].value) != + required_attribs[i].value) { +- DVLOG(1) << "Unsupported value " << required_attribs[i].value ++ VLOG(1) << "Unsupported value " << required_attribs[i].value + << " for attribute type " << required_attribs[i].type; + return false; + } diff --git a/srcpkgs/chromium/patches/harfbuzz-subset.patch b/srcpkgs/chromium/patches/harfbuzz-subset.patch new file mode 100644 index 00000000000..6f228b774d4 --- /dev/null +++ b/srcpkgs/chromium/patches/harfbuzz-subset.patch @@ -0,0 +1,49 @@ +From 27e25336b8316ff3ec4e464058682ed85801fd06 Mon Sep 17 00:00:00 2001 +From: Raphael Kubo da Costa +Date: Mon, 29 Jul 2019 10:54:28 +0000 +Subject: [PATCH] Also link against libharfbuzz-subset when use_system_harfbuzz is true + +When building HarfBuzz as part of Chromium, there is a single source set +with all the files we need in the build. + +Upstream HarfBuzz, on the other hand, produces a few different libraries: +harfbuzz, harfbuzz-icu and harfbuzz-subset. When |use_system_harfbuzz| is +true, we were only looking for (and using) harfbuzz.pc with pkg-config even +though we also use symbols from libharfbuzz-subset.so. This resulted in +errors when linking: + + ld: obj/skia/skia/SkPDFSubsetFont.o: in function `SkPDFSubsetFont(sk_sp, SkPDFGlyphUse const&, SkPDF::Metadata::Subsetter, char const*, int)': + SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x48a): undefined reference to `hb_subset_input_create_or_fail' + ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x4af): undefined reference to `hb_subset_input_glyph_set' + ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x5d7): undefined reference to `hb_subset_input_set_retain_gids' + ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x5e4): undefined reference to `hb_subset_input_set_drop_hints' + ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x5f3): undefined reference to `hb_subset' + ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x66f): undefined reference to `hb_subset_input_destroy' + +as reported in +https://groups.google.com/a/chromium.org/d/msg/chromium-packagers/UyJsVJ5QqWo/jSv5z7-rEQAJ + +Change-Id: I997af075c7b7263cd7cc71a63db5b0f93bd1ab59 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1715288 +Auto-Submit: Raphael Kubo da Costa +Commit-Queue: Dominik Röttsches +Reviewed-by: Dominik Röttsches +Cr-Commit-Position: refs/heads/master@{#681760} +--- + +diff --git a/third_party/harfbuzz-ng/BUILD.gn b/third_party/harfbuzz-ng/BUILD.gn +index 37d8e33..72013eb1d 100644 +--- third_party/harfbuzz-ng/BUILD.gn ++++ third_party/harfbuzz-ng/BUILD.gn +@@ -16,7 +16,10 @@ + "//third_party:freetype_harfbuzz", + "//third_party/freetype:freetype_source", + ] +- packages = [ "harfbuzz" ] ++ packages = [ ++ "harfbuzz", ++ "harfbuzz-subset", ++ ] + } + } else { + config("harfbuzz_config") { diff --git a/srcpkgs/chromium/patches/linked-hash-set.patch b/srcpkgs/chromium/patches/linked-hash-set.patch new file mode 100644 index 00000000000..24b13d8a5c0 --- /dev/null +++ b/srcpkgs/chromium/patches/linked-hash-set.patch @@ -0,0 +1,130 @@ +From 74138b9febd37eac0fc26b8efb110014a83a52c6 Mon Sep 17 00:00:00 2001 +From: Jeremy Roman +Date: Wed, 07 Aug 2019 13:26:48 +0000 +Subject: [PATCH] WTF: Make LinkedHashSet understand values for which memset initialization would be bad. + +Includes a unit test which fails before, and uses this to fix FontCacheKeyTraits. + +Bug: 980025 +Change-Id: If41f97444c7fd37b9b95d6dadaf3da5689079e9e +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1739948 +Reviewed-by: Kentaro Hara +Reviewed-by: Yutaka Hirano +Commit-Queue: Jeremy Roman +Cr-Commit-Position: refs/heads/master@{#684731} +--- + +diff --git a/third_party/blink/renderer/platform/fonts/font_cache_key.h b/third_party/blink/renderer/platform/fonts/font_cache_key.h +index 0efc8fb..90063cb 100644 +--- third_party/blink/renderer/platform/fonts/font_cache_key.h ++++ third_party/blink/renderer/platform/fonts/font_cache_key.h +@@ -133,6 +133,10 @@ + + struct FontCacheKeyTraits : WTF::SimpleClassHashTraits { + STATIC_ONLY(FontCacheKeyTraits); ++ ++ // std::string's empty state need not be zero in all implementations, ++ // and it is held within FontFaceCreationParams. ++ static const bool kEmptyValueIsZero = false; + }; + + } // namespace blink +diff --git a/third_party/blink/renderer/platform/wtf/linked_hash_set.h b/third_party/blink/renderer/platform/wtf/linked_hash_set.h +index b35b6e9..77e524c 100644 +--- third_party/blink/renderer/platform/wtf/linked_hash_set.h ++++ third_party/blink/renderer/platform/wtf/linked_hash_set.h +@@ -146,6 +146,11 @@ + LinkedHashSetNodeBase* next) + : LinkedHashSetNodeBase(prev, next), value_(value) {} + ++ LinkedHashSetNode(ValueArg&& value, ++ LinkedHashSetNodeBase* prev, ++ LinkedHashSetNodeBase* next) ++ : LinkedHashSetNodeBase(prev, next), value_(std::move(value)) {} ++ + LinkedHashSetNode(LinkedHashSetNode&& other) + : LinkedHashSetNodeBase(std::move(other)), + value_(std::move(other.value_)) {} +@@ -445,10 +450,13 @@ + + // The slot is empty when the next_ field is zero so it's safe to zero + // the backing. +- static const bool kEmptyValueIsZero = true; ++ static const bool kEmptyValueIsZero = ValueTraits::kEmptyValueIsZero; + + static const bool kHasIsEmptyValueFunction = true; + static bool IsEmptyValue(const Node& node) { return !node.next_; } ++ static Node EmptyValue() { ++ return Node(ValueTraits::EmptyValue(), nullptr, nullptr); ++ } + + static const int kDeletedValue = -1; + +diff --git a/third_party/blink/renderer/platform/wtf/list_hash_set_test.cc b/third_party/blink/renderer/platform/wtf/list_hash_set_test.cc +index 4c3f899..cd1be00 100644 +--- third_party/blink/renderer/platform/wtf/list_hash_set_test.cc ++++ third_party/blink/renderer/platform/wtf/list_hash_set_test.cc +@@ -487,6 +487,7 @@ + }; + + struct Complicated { ++ Complicated() : Complicated(0) {} + Complicated(int value) : simple_(value) { objects_constructed_++; } + + Complicated(const Complicated& other) : simple_(other.simple_) { +@@ -495,9 +496,6 @@ + + Simple simple_; + static int objects_constructed_; +- +- private: +- Complicated() = delete; + }; + + int Complicated::objects_constructed_ = 0; +@@ -731,4 +729,45 @@ + + } // anonymous namespace + ++// A unit type which objects to its state being initialized wrong. ++struct InvalidZeroValue { ++ InvalidZeroValue() = default; ++ InvalidZeroValue(WTF::HashTableDeletedValueType) : deleted_(true) {} ++ ~InvalidZeroValue() { CHECK(ok_); } ++ bool IsHashTableDeletedValue() const { return deleted_; } ++ ++ bool ok_ = true; ++ bool deleted_ = false; ++}; ++ ++template <> ++struct HashTraits : SimpleClassHashTraits { ++ static const bool kEmptyValueIsZero = false; ++}; ++ ++template <> ++struct DefaultHash { ++ struct Hash { ++ static unsigned GetHash(const InvalidZeroValue&) { return 0; } ++ static bool Equal(const InvalidZeroValue&, const InvalidZeroValue&) { ++ return true; ++ } ++ }; ++}; ++ ++template ++class ListOrLinkedHashSetInvalidZeroTest : public testing::Test {}; ++ ++using InvalidZeroValueSetTypes = ++ testing::Types, ++ ListHashSet, ++ LinkedHashSet>; ++TYPED_TEST_SUITE(ListOrLinkedHashSetInvalidZeroTest, InvalidZeroValueSetTypes); ++ ++TYPED_TEST(ListOrLinkedHashSetInvalidZeroTest, InvalidZeroValue) { ++ using Set = TypeParam; ++ Set set; ++ set.insert(InvalidZeroValue()); ++} ++ + } // namespace WTF diff --git a/srcpkgs/chromium/patches/one_euro_filter.patch b/srcpkgs/chromium/patches/one_euro_filter.patch new file mode 100644 index 00000000000..357babf1668 --- /dev/null +++ b/srcpkgs/chromium/patches/one_euro_filter.patch @@ -0,0 +1,11 @@ +--- third_party/one_euro_filter/src/one_euro_filter.h.orig 2019-09-29 21:21:03.958633609 -0400 ++++ third_party/one_euro_filter/src/one_euro_filter.h 2019-09-29 21:21:54.128270940 -0400 +@@ -3,6 +3,8 @@ + + #include "low_pass_filter.h" + ++#include ++ + namespace one_euro_filter { + namespace test { + class OneEuroFilterTest; diff --git a/srcpkgs/chromium/patches/sandbox-sched_getparam.patch b/srcpkgs/chromium/patches/sandbox-sched_getparam.patch new file mode 100644 index 00000000000..aa2d9aa1846 --- /dev/null +++ b/srcpkgs/chromium/patches/sandbox-sched_getparam.patch @@ -0,0 +1,20 @@ +Allow SYS_sched_getparam and SYS_sched_getscheduler +musl uses them for pthread_getschedparam() + +source: https://git.alpinelinux.org/aports/commit/community/chromium?id=54af9f8ac24f52d382c5758e2445bf0206eff40e + +--- services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc.orig 2019-10-08 21:03:18.253080425 +0200 ++++ services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc 2019-10-08 21:04:19.648549718 +0200 +@@ -88,10 +88,10 @@ + case __NR_sysinfo: + case __NR_times: + case __NR_uname: +- return Allow(); +- case __NR_sched_getaffinity: + case __NR_sched_getparam: + case __NR_sched_getscheduler: ++ return Allow(); ++ case __NR_sched_getaffinity: + case __NR_sched_setscheduler: + return sandbox::RestrictSchedTarget(GetPolicyPid(), sysno); + case __NR_prlimit64: diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template index c407841598b..45893b5f8e1 100644 --- a/srcpkgs/chromium/template +++ b/srcpkgs/chromium/template @@ -1,7 +1,7 @@ # Template file for 'chromium' pkgname=chromium # See http://www.chromium.org/developers/calendar for the latest version -version=76.0.3809.87 +version=77.0.3865.120 revision=1 archs="i686 x86_64*" short_desc="Google's attempt at creating a safer, faster, and more stable browser" @@ -9,7 +9,7 @@ maintainer="Enno Boland " license="BSD-3-Clause" homepage="https://www.chromium.org/" distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz" -checksum=215ca6acee7b4fd3c95fe796260af4dc5454dbba3b701aa43afeb98a06dc4194 +checksum=d792f9b09b1dcfd64e68f47a611c540dd1383dd9abd78ca1e06b2a7e2ff06af8 lib32disabled=yes nodebug=yes @@ -246,7 +246,7 @@ do_install() { vinstall out/Release/icudtl.dat 0644 usr/lib/chromium - for size in 22 24 48 64 128 256; do + for size in 24 48 64 128 256; do install -Dm644 "chrome/app/theme/chromium/product_logo_${size}.png" \ ${DESTDIR}/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png done diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template index c21c7a90a00..b23d2ef09a3 100644 --- a/srcpkgs/chronograf/template +++ b/srcpkgs/chronograf/template @@ -1,6 +1,6 @@ # Template file for 'chronograf' pkgname=chronograf -version=1.7.12 +version=1.7.14 revision=1 build_style=go go_import_path="github.com/influxdata/${pkgname}" @@ -12,7 +12,7 @@ maintainer="Michael Aldridge " license="AGPL-3.0" homepage="https://www.influxdata.com/time-series-platform/chronograf/" distfiles="https://github.com/influxdata/${pkgname}/archive/${version}.tar.gz" -checksum=b98b63577a039d3d505bcf953b3067fe180d09a91688ec162f9c8f00ee816dd3 +checksum=245479b691e2ad484717778562ce9e0c21b1d769e7d748335d1c5f41cd677d4c system_accounts="_chronograf" _chronograf_homedir="/var/lib/${pkgname}" diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template index 63027ef5197..5e6a1ab71d5 100644 --- a/srcpkgs/cinnamon-control-center/template +++ b/srcpkgs/cinnamon-control-center/template @@ -1,6 +1,6 @@ # Template file for 'cinnamon-control-center' pkgname=cinnamon-control-center -version=4.0.1 +version=4.2.2 revision=1 build_style=gnu-configure configure_args="--disable-static --disable-update-mimedb --disable-systemd" @@ -13,12 +13,12 @@ makedepends="ModemManager-devel cinnamon-desktop-devel cinnamon-menus-devel pulseaudio-devel tzdata upower-devel" depends="libcinnamon-control-center>=${version}_${revision} cinnamon-settings-daemon>=2.4 cinnamon-translations>=2.4 desktop-file-utils hicolor-icon-theme" -short_desc="The Cinnamon Control Center" +short_desc="Cinnamon Control Center" maintainer="Orphaned " license="GPL-2.0-or-later, LGPL-2.0-or-later" homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html" distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz" -checksum=130663817d55a6f37f6f5a51b2aa71b7b2ec7c684ef358f16b5a47e1b133ff76 +checksum=0cd334e9fc36165664362d2bef7953879ec1f1d1becdbce21ef0557ea34618d7 nocross="gobject-introspection" do_check() { diff --git a/srcpkgs/cinnamon-desktop/template b/srcpkgs/cinnamon-desktop/template index 10cf9698c70..926e292256d 100644 --- a/srcpkgs/cinnamon-desktop/template +++ b/srcpkgs/cinnamon-desktop/template @@ -1,7 +1,7 @@ # Template file for 'cinnamon-desktop' pkgname=cinnamon-desktop -version=4.0.1 -revision=4 +version=4.2.0 +revision=1 build_style=meson build_helper="gir" configure_args="-Dalsa=true" @@ -14,7 +14,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later, LGPL-2.0-or-later" homepage="https://developer.linuxmint.com/projects/cinnamon-projects.html" distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz" -checksum=72d4a8c78e42cf9d000f553551f3f3645df77c3c23973c989d7d269acd659100 +checksum=e7e6e9aa6e5c5c04a8320cb97ef545700826d04fc34e0f50d140d2efa41941a1 case "$XBPS_TARGET_MACHINE" in aarch64-musl) broken="Expat.c: loadable library and perl binaries are mismatched (got handshake key 0xce00080, needed 0xc800080)" ;; diff --git a/srcpkgs/cinnamon-menus/template b/srcpkgs/cinnamon-menus/template index affa413fa12..eedb8cbf29f 100644 --- a/srcpkgs/cinnamon-menus/template +++ b/srcpkgs/cinnamon-menus/template @@ -1,9 +1,8 @@ # Template file for 'cinnamon-menus' pkgname=cinnamon-menus -version=4.0.0 +version=4.2.0 revision=1 -build_style=gnu-configure -configure_args=" --disable-static" +build_style=meson hostmakedepends="glib-devel gnome-common gobject-introspection intltool libtool pkg-config" makedepends="libglib-devel gobject-introspection" @@ -12,12 +11,9 @@ maintainer="Orphaned " license="GPL-2.0-or-later, LGPL-2.0-or-later" homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/" distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz" -checksum=e42c642a6fcb3b8e53d6b8f389cca617c8988baaa6e85ac236b61edc38efc3a5 +checksum=331bd599d7a863fa92329483637de159c25c57467305691f9768e675cd63f7c2 nocross="gobject-introspection" -pre_configure() { - NOCONFIGURE=1 ./autogen.sh -} cinnamon-menus-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/cinnamon-screensaver/template b/srcpkgs/cinnamon-screensaver/template index 71f8a8ee026..9d39f32709a 100644 --- a/srcpkgs/cinnamon-screensaver/template +++ b/srcpkgs/cinnamon-screensaver/template @@ -1,6 +1,6 @@ # Template file for 'cinnamon-screensaver' pkgname=cinnamon-screensaver -version=4.0.3 +version=4.2.0 revision=1 build_style=gnu-configure configure_args="--disable-static" @@ -11,12 +11,12 @@ makedepends="cinnamon-desktop-devel dbus-glib-devel libXxf86misc-devel depends="cinnamon-translations hicolor-icon-theme python3-gobject python3-setproctitle python3-xapp xapps" conf_files="/etc/pam.d/${pkgname}" -short_desc="The Cinnamon screensaver" +short_desc="Cinnamon screensaver" maintainer="Orphaned " license="GPL-2.0-or-later, LGPL-2.0-or-later" homepage="https://developer.linuxmint.com/projects/cinnamon-projects.html/" distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz" -checksum=0835111cf01b25447076177944a977cebfe995b5ce3dcfe0fba841141ebbdaca +checksum=8dee253e12cbd2f30f2c5112a8e5fba62b651733cb56aa327ede939506adf6a0 nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/28904/steps/shell_3/logs/stdio pycompile_version="$py3_ver" diff --git a/srcpkgs/cinnamon-session/template b/srcpkgs/cinnamon-session/template index 04b89cbbab2..58b88acc618 100644 --- a/srcpkgs/cinnamon-session/template +++ b/srcpkgs/cinnamon-session/template @@ -1,6 +1,6 @@ # Template file for 'cinnamon-session' pkgname=cinnamon-session -version=4.0.0 +version=4.2.1 revision=1 build_style=meson configure_args="-Dwith-gconf=false" @@ -8,12 +8,12 @@ hostmakedepends="pkg-config gobject-introspection gettext-devel dbus-glib-devel glib-devel intltool xmlto" makedepends="gtk+3-devel dbus-devel json-glib-devel libSM-devel pangox-compat-devel cinnamon-desktop-devel libcanberra-devel upower-devel - elogind-devel libXtst-devel xapps-devel" + elogind-devel libXtst-devel xapps-devel GConf-devel" depends="cinnamon-desktop desktop-file-utils hicolor-icon-theme elogind" -short_desc="The Cinnamon session handler" +short_desc="Cinnamon session handler" maintainer="Orphaned " license="GPL-2.0-or-later, LGPL-2.0-or-later" homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html" distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz" -checksum=cfd6d71ff4000f463b36ffa97ab415557d627776eefbe2720d8d954319a5bdc5 +checksum=bff38239942dc990ccb57c35bde43c19ebc8708284410de53c100e12c7005663 nocross="gobject-introspection from cinnamon-desktop-devel" diff --git a/srcpkgs/cinnamon-settings-daemon/template b/srcpkgs/cinnamon-settings-daemon/template index 854aa640076..3641a1df2f0 100644 --- a/srcpkgs/cinnamon-settings-daemon/template +++ b/srcpkgs/cinnamon-settings-daemon/template @@ -1,6 +1,6 @@ # Template file for 'cinnamon-settings-daemon' pkgname=cinnamon-settings-daemon -version=4.0.3 +version=4.2.2 revision=1 build_style=gnu-configure configure_args=" --disable-static --disable-schemas-compile" @@ -10,13 +10,13 @@ makedepends="cinnamon-desktop-devel elogind-devel ibus-devel json-glib-devel libSM-devel libcanberra-devel libgnomekbd-devel libgudev-devel libnotify-devel nss-devel polkit-devel pulseaudio-devel upower-devel" depends="desktop-file-utils hicolor-icon-theme" -short_desc="The Cinnamon Settings Daemon" +short_desc="Cinnamon Settings Daemon" maintainer="Orphaned " license="GPL-2.0-or-later, LGPL-2.0-or-later" homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/" changelog="https://raw.githubusercontent.com/linuxmint/cinnamon-settings-daemon/${version}/debian/changelog" distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz" -checksum=2b2530c089cf4d1f52510d00b38abc8f037776f61cb02942f3a3bbf242239c4f +checksum=d5b1ff8b5777174a45ebf2906eb1690e79a241c1adeb56cd70f9f273674901f9 nocross="gobject-introspection" pre_configure() { diff --git a/srcpkgs/cinnamon-translations/template b/srcpkgs/cinnamon-translations/template index 2eb1ad70d50..69e35cdf682 100644 --- a/srcpkgs/cinnamon-translations/template +++ b/srcpkgs/cinnamon-translations/template @@ -1,6 +1,6 @@ # Template file for 'cinnamon-translations' pkgname=cinnamon-translations -version=4.0.2 +version=4.2.2 revision=1 archs=noarch build_style=gnu-makefile @@ -10,7 +10,7 @@ license="GPL-2.0-or-later" homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/" changelog="https://raw.githubusercontent.com/linuxmint/cinnamon-translations/${version}/debian/changelog" distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz" -checksum=07efa3d387aa91813dcc480e81237ae1daf1c8f817178ef7cbb2377ce8fba37d +checksum=0bfcca02894dcff4644a77560515ea33d4beed1365210cf17ea66b04bf52ee1d do_install() { vmkdir /usr/share/locale diff --git a/srcpkgs/cinnamon/patches/595178cf57b80b977401460a147602832157b303.patch b/srcpkgs/cinnamon/patches/595178cf57b80b977401460a147602832157b303.patch deleted file mode 100644 index 0e2bf8c54ba..00000000000 --- a/srcpkgs/cinnamon/patches/595178cf57b80b977401460a147602832157b303.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 595178cf57b80b977401460a147602832157b303 Mon Sep 17 00:00:00 2001 -From: Eli Schwartz -Date: Fri, 5 Apr 2019 11:28:45 -0400 -Subject: [PATCH] PIL: remove unnnecessary version check and code fork (#8496) - -The Image.VERSION variable was deprecated some time ago and is now gone -entirely. But its only use was to determine whether we were using at -least the latest version of PIL, or any version of its fork, Pillow. And -PIL was last developed in 2009 and does not support python3 at all, so -we are guaranteed to be using Pillow. - -Moreover, the check does not really matter, as Pillow is guaranteed to -load any image it opens, without the user doing so manually. - -Fixes #8495 ---- - .../cinnamon/cinnamon-settings/bin/imtools.py | 27 +------------------ - 1 file changed, 1 insertion(+), 26 deletions(-) - -diff --git a/files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py b/files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py -index 05605001f7..c386fe3847 100644 ---- files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py -+++ files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py -@@ -620,31 +620,6 @@ def has_transparency(image): - has_alpha(image) - - --if Image.VERSION == '1.1.7': -- -- def split(image): -- """Work around for bug in Pil 1.1.7 -- -- :param image: input image -- :type image: PIL image object -- :returns: the different color bands of the image (eg R, G, B) -- :rtype: tuple -- """ -- image.load() -- return image.split() --else: -- -- def split(image): -- """Work around for bug in Pil 1.1.7 -- -- :param image: input image -- :type image: PIL image object -- :returns: the different color bands of the image (eg R, G, B) -- :rtype: tuple -- """ -- return image.split() -- -- - def get_alpha(image): - """Gets the image alpha band. Can handles P mode images with transpareny. - Returns a band with all values set to 255 if no alpha band exists. -@@ -655,7 +630,7 @@ def get_alpha(image): - :rtype: single band image object - """ - if has_alpha(image): -- return split(image)[-1] -+ return image.split()[-1] - if image.mode == 'P' and 'transparency' in image.info: - return image.convert('RGBA').split()[-1] - # No alpha layer, create one. diff --git a/srcpkgs/cinnamon/patches/default-theme.patch b/srcpkgs/cinnamon/patches/default-theme.patch deleted file mode 100644 index f18623acb57..00000000000 --- a/srcpkgs/cinnamon/patches/default-theme.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 36af45f699daa886a3c3fc3187e0b24b193294ad Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= -Date: Sat, 22 Nov 2014 22:39:39 +0100 -Subject: [PATCH] Set default theme to 'cinnamon' - ---- - data/org.cinnamon.gschema.xml.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/data/org.cinnamon.gschema.xml.in b/data/org.cinnamon.gschema.xml.in -index 91fa171..9f56e4c 100644 ---- data/org.cinnamon.gschema.xml.in -+++ data/org.cinnamon.gschema.xml.in -@@ -581,7 +581,7 @@ - - -- "" -+ "cinnamon" - <_summary>Theme name - <_description> - The name of the theme --- -2.1.3 - diff --git a/srcpkgs/cinnamon/patches/set_wheel.patch b/srcpkgs/cinnamon/patches/set_wheel.patch deleted file mode 100644 index 86228d1895d..00000000000 --- a/srcpkgs/cinnamon/patches/set_wheel.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py.orig 2017-12-18 13:53:18.000000000 +0100 -+++ files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py 2017-12-21 22:15:03.058109278 +0100 -@@ -839,11 +833,11 @@ - pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size("/usr/share/cinnamon/faces/user-generic.png", 48, 48) - description = "%s\n%s" % (fullname, username) - piter = self.users.append(None, [new_user, pixbuf, description]) -- # Add the user to his/her own group and sudo if Administrator was selected -+ # Add the user to his/her own group and wheel if Administrator was selected - if dialog.account_type_combo.get_active() == 1: -- subprocess.call(["usermod", username, "-G", "%s,sudo,nopasswdlogin" % username]) -+ subprocess.call(["usermod", username, "-G", "%s,wheel,nopasswdlogin" % username]) - else: -- subprocess.call(["usermod", username, "-G", "%s,nopasswdlogin" % username]) -+ subprocess.call(["usermod", username, "-G", "%s" % username]) - self.load_groups() - dialog.destroy() - diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template index bdf374cea82..60b9e8be68b 100644 --- a/srcpkgs/cinnamon/template +++ b/srcpkgs/cinnamon/template @@ -1,7 +1,7 @@ # Template file for 'cinnamon' pkgname=cinnamon -version=4.0.10 -revision=2 +version=4.2.4 +revision=1 build_style=gnu-configure configure_args="--disable-static --disable-schemas-compile --enable-compile-warnings=no --disable-gtk-doc" @@ -18,14 +18,15 @@ depends=" accountsservice caribou cinnamon-settings-daemon>=${version%.*} cinnamon-translations>=${version%.*} nemo>=${version%.*} gnome-themes-standard gnome-themes-standard-metacity gnome-backgrounds network-manager-applet polkit-gnome upower>=0.99.7 libkeybinder3 python3-dbus - python3-gobject python3-pam python3-pexpect python3-Pillow python3-inotify" + python3-gobject python3-pam python3-pexpect python3-Pillow python3-inotify + python3-tinycss" short_desc="GNOME3 fork of Linux Mint with GNOME2 aspect" maintainer="Orphaned " license="GPL-2.0-or-later, LGPL-2.0-or-later" homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/" changelog="https://raw.githubusercontent.com/linuxmint/Cinnamon/${version}/debian/changelog" distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz" -checksum=50e07fa014eeecb380e840a3be0f09c8af0ad368c64c6b8ce6c30b1f78a2bf66 +checksum=4329b03e08a82316b6890b761174132c18a349508387f005748c32436f6364fd nocross="gobject-introspection" pycompile_version="$py3_ver" diff --git a/srcpkgs/cjs/template b/srcpkgs/cjs/template index a6584d1923b..5db9aa80efc 100644 --- a/srcpkgs/cjs/template +++ b/srcpkgs/cjs/template @@ -1,11 +1,11 @@ # Template file for 'cjs' pkgname=cjs -version=4.0.0 -revision=2 +version=4.2.0 +revision=1 build_style=gnu-configure configure_args="--disable-static --disable-profiler" hostmakedepends="automake autoconf-archive libtool gnome-common pkg-config - gobject-introspection glib-devel" + gobject-introspection glib-devel dbus" makedepends="mozjs52-devel dbus-glib-devel readline-devel gobject-introspection gtk+3-devel" short_desc="Javascript for Cinnamon" @@ -13,7 +13,9 @@ maintainer="Orphaned " license="LGPL-2.0-or-later" homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/" distfiles="https://github.com/linuxmint/cjs/archive/${version}.tar.gz" -checksum=acd520a503399753ecb0bfa71aa3d932d22ac6a72162043085ea48519a59d3f5 +checksum=77d1b9f0290135939ad03b60ac64ac637f05e886ba5b777b97f6742ee75af260 +nocross="yes" # https://api.travis-ci.org/v3/job/590340360/log.txt + pre_configure() { cp ${FILESDIR}/ax_code_coverage.m4 m4/ diff --git a/srcpkgs/ckb-next/template b/srcpkgs/ckb-next/template index f3beb2d0a08..c6925c6691d 100644 --- a/srcpkgs/ckb-next/template +++ b/srcpkgs/ckb-next/template @@ -1,9 +1,9 @@ # Template file for 'ckb-next' pkgname=ckb-next -version=0.4.0 -revision=2 +version=0.4.2 +revision=1 build_style=cmake -configure_args="-DDISABLE_UPDATER=1" +configure_args="-DDISABLE_UPDATER=1 -DUDEV_RULE_DIRECTORY=/usr/lib/udev/rules.d" hostmakedepends="qt5-devel" makedepends="qt5-devel quazip-qt5-devel eudev-libudev-devel $(vopt_if pulseaudio pulseaudio-devel)" short_desc="Corsair RGB Driver for Linux" @@ -11,7 +11,7 @@ maintainer="Frank Steinborn " license="GPL-2.0-or-later" homepage="https://github.com/ckb-next/ckb-next" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=5521c5a94e87ba035c6d9340e37785fa6f29710215f3e3201bb6949c88de8bd1 +checksum=75b6908d5590c293dee8258a83d4ebe206306d3df9f867596e953ef7c6a86440 build_options="pulseaudio" desc_option_pulseaudio="Enable support for music visualizer animation" diff --git a/srcpkgs/ckbcomp/template b/srcpkgs/ckbcomp/template index 00885ff6c2f..b6a0e1bc5d0 100644 --- a/srcpkgs/ckbcomp/template +++ b/srcpkgs/ckbcomp/template @@ -1,16 +1,16 @@ # Template file for 'ckbcomp' pkgname=ckbcomp -version=1.192 +version=1.193 revision=1 archs=noarch -wrksrc="console-setup" +wrksrc="console-setup-${version}" depends="perl" short_desc="Compile a XKB keyboard description to a keymap suitable for loadkeys" maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://anonscm.debian.org/cgit/d-i/console-setup.git" distfiles="${DEBIAN_SITE}/main/c/console-setup/console-setup_${version}.tar.xz" -checksum=4dbe2c9559ff68a61315efe4de2cb932396ede8c4a1df4b46b6fb0846cc59d5b +checksum=d29c5d49cf4e0d8c1149bacbac38d9400d16f25a9fe3b8ad121737b0cc828977 do_install() { vbin Keyboard/ckbcomp diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template index b74d1f6836b..e25a56e0a18 100644 --- a/srcpkgs/clamav/template +++ b/srcpkgs/clamav/template @@ -1,14 +1,15 @@ # Template file for 'clamav' pkgname=clamav -version=0.101.3 -revision=1 +version=0.102.0 +revision=2 build_style=gnu-configure # XXX: system llvm is too new (< 3.7 required) # Shipped llvm does not build with gcc6 configure_args="--sbindir=/usr/bin --libdir=/usr/lib --with-openssl=${XBPS_CROSS_BASE}/usr --with-pcre=${XBPS_CROSS_BASE}/usr --with-zlib=${XBPS_CROSS_BASE}/usr --with-libbz2-prefix=${XBPS_CROSS_BASE}/usr - --with-system-libmspack=${XBPS_CROSS_BASE}/usr --with-user=_clamav --with-group=_clamav" + --with-system-libmspack=${XBPS_CROSS_BASE}/usr --with-libcurl=${XBPS_CROSS_BASE}/usr + --enable-ipv6 --with-user=_clamav --with-group=_clamav" conf_files="/etc/clamd.conf /etc/freshclam.conf" hostmakedepends="flex pkg-config zip" makedepends="json-c-devel libcurl-devel libmspack-devel libxml2-devel @@ -18,7 +19,7 @@ maintainer="Jürgen Buchmüller " license="GPL-2.0-only" homepage="http://www.clamav.net/" distfiles="http://www.clamav.net/downloads/production/${pkgname}-${version}.tar.gz" -checksum=68d42aac4a9cbde293288533a9a3c3d55863de38f2b8707c1ef2d987b1260338 +checksum=48fe188c46c793c2d0cb5c81c106e4690251aff6dc8aa6575dc688343291bee1 _clamav_homedir="/var/lib/_${pkgname}" _clamav_descr="ClamAV user" system_accounts="_clamav" diff --git a/srcpkgs/clang b/srcpkgs/clang index 8ec3476f9c1..14540d7bad2 120000 --- a/srcpkgs/clang +++ b/srcpkgs/clang @@ -1 +1 @@ -llvm8 \ No newline at end of file +llvm9 \ No newline at end of file diff --git a/srcpkgs/clang-analyzer b/srcpkgs/clang-analyzer index 8ec3476f9c1..14540d7bad2 120000 --- a/srcpkgs/clang-analyzer +++ b/srcpkgs/clang-analyzer @@ -1 +1 @@ -llvm8 \ No newline at end of file +llvm9 \ No newline at end of file diff --git a/srcpkgs/clang-tools-extra b/srcpkgs/clang-tools-extra index 8ec3476f9c1..14540d7bad2 120000 --- a/srcpkgs/clang-tools-extra +++ b/srcpkgs/clang-tools-extra @@ -1 +1 @@ -llvm8 \ No newline at end of file +llvm9 \ No newline at end of file diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template index b7445b94b68..37ed2552729 100644 --- a/srcpkgs/claws-mail/template +++ b/srcpkgs/claws-mail/template @@ -1,7 +1,7 @@ # Template file for 'claws-mail' pkgname=claws-mail version=3.17.4 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-static --disable-python-plugin --disable-perl-plugin --enable-enchant --enable-gnutls" diff --git a/srcpkgs/clazy/template b/srcpkgs/clazy/template index 81f3176a363..f7f790395e6 100644 --- a/srcpkgs/clazy/template +++ b/srcpkgs/clazy/template @@ -1,7 +1,7 @@ # Template file for 'clazy' pkgname=clazy -version=1.5 -revision=2 +version=1.6 +revision=1 build_style=cmake hostmakedepends="python" makedepends="clang llvm" @@ -10,5 +10,5 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://cgit.kde.org/clazy.git/about/" distfiles="${KDE_SITE}/clazy/${version}/src/${pkgname}-${version}.tar.xz" -checksum=87e37aace395e31359d4258452bbf7d1bdb5eae39e21e0dc0d80a75db8b8b779 +checksum=806d1befaddba82316f4ea34f1cba38bcc7545d0981007e3527c1ff1576dd0de nocross="Clang cannot be installed as makedep" diff --git a/srcpkgs/clearine/template b/srcpkgs/clearine/template index 64919e918aa..419bb3c4550 100644 --- a/srcpkgs/clearine/template +++ b/srcpkgs/clearine/template @@ -1,32 +1,26 @@ # Template file for 'clearine' pkgname=clearine -version=0.5 +version=0.7 revision=1 -archs=noarch -build_style=gnu-makefile -depends="gtk+3 python3-gobject" +build_style=python3-module +pycompile_module="Clearine" +hostmakedepends="python3-setuptools" +depends="python3-gobject python3-cairo" short_desc="GTK3-based logout-window overlay for independent windowmanager" -maintainer="Orphaned " +maintainer="Frank Steinborn " license="MIT" homepage="https://github.com/yuune/clearine" distfiles="https://github.com/yuune/clearine/archive/${version}.tar.gz" -checksum=029d5ece64a0471d1978daa620f5f06c5757245f3fec240aade38c514b3a5145 +checksum=18a1a6b8b726c430e848a6688c97cd095fc01d7b15907fac28a267155b69588d conf_files="/etc/clearine.conf" -do_build() { - sed -i data/clearine.conf \ - -e "s;^\(restart =\) .*;\1 reboot;" \ - -e "s;^\(shutdown =\) .*;\1 poweroff;" +pre_build() { + sed -i src/data/clearine.conf \ + -e "s;\(restart =\) .*;\1 reboot;" \ + -e "s;\(shutdown =\) .*;\1 poweroff;" } -do_install() { - local f - - vmkdir usr/share/themes/Clearine-Fallback/clearine - vconf data/clearine.conf - for f in data/*.svg; do - vinstall $f 644 usr/share/themes/Clearine-Fallback/clearine - done - vbin clearine +post_install() { + vconf src/data/clearine.conf vlicense LICENSE } diff --git a/srcpkgs/clementine/patches/add-missing-functional-includes-5630.patch b/srcpkgs/clementine/patches/add-missing-functional-includes-5630.patch deleted file mode 100644 index 0355eefca7c..00000000000 --- a/srcpkgs/clementine/patches/add-missing-functional-includes-5630.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 8a6cc8b5069265e1e92e22def985e22c5955e503 Mon Sep 17 00:00:00 2001 -From: Morris Hafner -Date: Mon, 13 Feb 2017 17:46:46 +0100 -Subject: [PATCH] Add missing includes (#5630) - ---- - src/core/mergedproxymodel.cpp | 1 + - src/devices/giolister.cpp | 1 + - src/library/groupbydialog.cpp | 2 ++ - 3 files changed, 4 insertions(+) - -diff --git a/src/core/mergedproxymodel.cpp b/src/core/mergedproxymodel.cpp -index 56217f6fd..8c210d391 100644 ---- a/src/core/mergedproxymodel.cpp -+++ b/src/core/mergedproxymodel.cpp -@@ -23,6 +23,7 @@ - - #include - -+#include - #include - - // boost::multi_index still relies on these being in the global namespace. -diff --git a/src/devices/giolister.cpp b/src/devices/giolister.cpp -index aa3bddb34..5f63ef248 100644 ---- a/src/devices/giolister.cpp -+++ b/src/devices/giolister.cpp -@@ -17,6 +17,7 @@ - - #include "config.h" - -+#include - #include - - #include -diff --git a/src/library/groupbydialog.cpp b/src/library/groupbydialog.cpp -index 5efdc9f36..e5f711b34 100644 ---- a/src/library/groupbydialog.cpp -+++ b/src/library/groupbydialog.cpp -@@ -20,6 +20,8 @@ - - #include - -+#include -+ - // boost::multi_index still relies on these being in the global namespace. - using std::placeholders::_1; - using std::placeholders::_2; --- -2.13.4 - diff --git a/srcpkgs/clementine/patches/clementine-chromaprint-1.4.patch b/srcpkgs/clementine/patches/clementine-chromaprint-1.4.patch deleted file mode 100644 index bfdc49265aa..00000000000 --- a/srcpkgs/clementine/patches/clementine-chromaprint-1.4.patch +++ /dev/null @@ -1,41 +0,0 @@ -From ded312685735fc266d4154d355286eeb86db3bcd Mon Sep 17 00:00:00 2001 -From: Chocobozzz -Date: Thu, 8 Dec 2016 23:12:17 +0100 -Subject: [PATCH] Add compatibility with chromaprint >= 1.4 - ---- - src/musicbrainz/chromaprinter.cpp | 14 +++++++++++--- - 1 file changed, 11 insertions(+), 3 deletions(-) - -diff --git a/src/musicbrainz/chromaprinter.cpp b/src/musicbrainz/chromaprinter.cpp -index 9579b62..c7ad99e 100644 ---- a/src/musicbrainz/chromaprinter.cpp -+++ b/src/musicbrainz/chromaprinter.cpp -@@ -143,16 +143,24 @@ QString Chromaprinter::CreateFingerprint() { - ChromaprintContext* chromaprint = - chromaprint_new(CHROMAPRINT_ALGORITHM_DEFAULT); - chromaprint_start(chromaprint, kDecodeRate, kDecodeChannels); -- chromaprint_feed(chromaprint, reinterpret_cast(data.data()), -+ chromaprint_feed(chromaprint, reinterpret_cast(data.data()), - data.size() / 2); - chromaprint_finish(chromaprint); - -- void* fprint = nullptr; - int size = 0; -+ -+#if CHROMAPRINT_VERSION_MAJOR >= 1 && CHROMAPRINT_VERSION_MINOR >= 4 -+ u_int32_t *fprint = nullptr; -+ char *encoded = nullptr; -+#else -+ void *fprint = nullptr; -+ void *encoded = nullptr; -+#endif -+ - int ret = chromaprint_get_raw_fingerprint(chromaprint, &fprint, &size); -+ - QByteArray fingerprint; - if (ret == 1) { -- void* encoded = nullptr; - int encoded_size = 0; - chromaprint_encode_fingerprint(fprint, size, CHROMAPRINT_ALGORITHM_DEFAULT, - &encoded, &encoded_size, 1); diff --git a/srcpkgs/clementine/patches/clementine-moodbar_flags.patch b/srcpkgs/clementine/patches/clementine-moodbar_flags.patch deleted file mode 100644 index 5eadfec4c46..00000000000 --- a/srcpkgs/clementine/patches/clementine-moodbar_flags.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/gst/moodbar/CMakeLists.txt b/gst/moodbar/CMakeLists.txt -index 44c1362..7ed5047 100644 ---- a/gst/moodbar/CMakeLists.txt -+++ b/gst/moodbar/CMakeLists.txt -@@ -1,7 +1,7 @@ - cmake_minimum_required(VERSION 2.6) - --set(CMAKE_C_FLAGS "-Wall") --set(CMAKE_CXX_FLAGS "-Woverloaded-virtual -Wall --std=c++0x") -+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") -+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wall --std=c++0x") - - include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) - diff --git a/srcpkgs/clementine/patches/clementine-sqlite-3.12.patch b/srcpkgs/clementine/patches/clementine-sqlite-3.12.patch deleted file mode 100644 index 5c6a15227c7..00000000000 --- a/srcpkgs/clementine/patches/clementine-sqlite-3.12.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/src/core/database.cpp -+++ b/src/core/database.cpp -@@ -265,6 +265,16 @@ - StaticInit(); - - { -+#ifdef SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER -+ QVariant v = db.driver()->handle(); -+ if (v.isValid() && qstrcmp(v.typeName(), "sqlite3*") == 0) { -+ sqlite3* handle = *static_cast(v.data()); -+ if (handle) { -+ sqlite3_db_config(handle, SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER, 1, NULL); -+ } -+ } -+#endif -+ - QSqlQuery set_fts_tokenizer("SELECT fts3_tokenizer(:name, :pointer)", db); - set_fts_tokenizer.bindValue(":name", "unicode"); - set_fts_tokenizer.bindValue( diff --git a/srcpkgs/clementine/patches/protobuf-370.patch b/srcpkgs/clementine/patches/protobuf-370.patch deleted file mode 100644 index 00617da94cd..00000000000 --- a/srcpkgs/clementine/patches/protobuf-370.patch +++ /dev/null @@ -1,82 +0,0 @@ ---- a/src/internet/lastfm/lastfmcompat.cpp -+++ b/src/internet/lastfm/lastfmcompat.cpp -@@ -68,13 +68,13 @@ bool ParseQuery(const QByteArray& data, XmlQuery* query, - return false; - } - #endif // Q_OS_WIN32 -- } catch (lastfm::ws::ParseError e) { -+ } catch (lastfm::ws::ParseError &e) { - qLog(Error) << "Last.fm parse error: " << e.enumValue(); - if (connection_problems) { - *connection_problems = e.enumValue() == lastfm::ws::MalformedResponse; - } - return false; -- } catch (std::runtime_error& e) { -+ } (std::runtime_error& e) { - qLog(Error) << e.what(); - return false; - } ---- a/src/internet/spotify/spotifyblobdownloader.cpp -+++ b/src/internet/spotify/spotifyblobdownloader.cpp -@@ -216,7 +216,7 @@ bool SpotifyBlobDownloader::CheckSignature( - return false; - } - } -- } catch (std::exception e) { -+ } catch (std::exception &e) { - // This should only happen if we fail to parse our own key. - qLog(Debug) << "Verifying spotify blob signature failed:" << e.what(); - return false; ---- a/src/songinfo/echonestbiographies.cpp -+++ b/src/songinfo/echonestbiographies.cpp -@@ -66,7 +66,7 @@ void EchoNestBiographies::RequestFinished() { - try { - request->artist_->parseProfile(reply); - } -- catch (Echonest::ParseError e) { -+ catch (Echonest::ParseError &e) { - qLog(Warning) << "Error parsing echonest reply:" << e.errorType() - << e.what(); - } ---- a/src/songinfo/echonestimages.cpp -+++ b/src/songinfo/echonestimages.cpp -@@ -68,7 +68,7 @@ void EchoNestImages::RequestFinished(QNetworkReply* reply, int id, - reply->deleteLater(); - try { - artist.parseProfile(reply); -- } catch (Echonest::ParseError e) { -+ } catch (Echonest::ParseError &e) { - qLog(Warning) << "Error parsing echonest reply:" << e.errorType() - << e.what(); - } -@@ -94,7 +94,7 @@ void EchoNestImages::IdsFound(QNetworkReply* reply, int request_id) { - DoSpotifyImageRequest(id.foreign_id, request_id); - } - } -- } catch (Echonest::ParseError e) { -+ } catch (Echonest::ParseError &e) { - qLog(Warning) << "Error parsing echonest reply:" << e.errorType() - << e.what(); - } ---- a/src/songinfo/echonestsimilarartists.cpp -+++ b/src/songinfo/echonestsimilarartists.cpp -@@ -47,7 +47,7 @@ void EchoNestSimilarArtists::RequestFinished() { - try { - artists = Echonest::Artist::parseSimilar(reply); - } -- catch (Echonest::ParseError e) { -+ catch (Echonest::ParseError &e) { - qLog(Warning) << "Error parsing echonest reply:" << e.errorType() - << e.what(); - } ---- a/src/songinfo/echonesttags.cpp -+++ b/src/songinfo/echonesttags.cpp -@@ -51,7 +51,7 @@ void EchoNestTags::RequestFinished() { - try { - request->artist_->parseProfile(reply); - } -- catch (Echonest::ParseError e) { -+ catch (Echonest::ParseError &e) { - qLog(Warning) << "Error parsing echonest reply:" << e.errorType() - << e.what(); - } diff --git a/srcpkgs/clementine/patches/sentinel.patch b/srcpkgs/clementine/patches/sentinel.patch deleted file mode 100644 index d2aeb7d27ac..00000000000 --- a/srcpkgs/clementine/patches/sentinel.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- a/gstenginepipeline.cpp 2017-09-22 23:13:31.520359890 +0200 -+++ b/src/engines/gstenginepipeline.cpp 2017-09-22 23:14:31.837362189 +0200 -@@ -375,7 +375,7 @@ - // Link the elements with special caps - // The scope path through the tee gets 16-bit ints. - GstCaps* caps16 = gst_caps_new_simple("audio/x-raw", "format", G_TYPE_STRING, -- "S16LE", NULL); -+ "S16LE", (char*)0); - gst_element_link_filtered(probe_converter, probe_sink, caps16); - gst_caps_unref(caps16); - ---- a/chromaprinter.cpp 2017-09-22 23:18:59.324372383 +0200 -+++ b/src/musicbrainz/chromaprinter.cpp 2017-09-22 23:19:35.520373762 +0200 -@@ -78,7 +78,7 @@ - // Chromaprint expects mono 16-bit ints at a sample rate of 11025Hz. - GstCaps* caps = gst_caps_new_simple( - "audio/x-raw", "format", G_TYPE_STRING, "S16LE", "channels", G_TYPE_INT, -- kDecodeChannels, "rate", G_TYPE_INT, kDecodeRate, NULL); -+ kDecodeChannels, "rate", G_TYPE_INT, kDecodeRate, (char*)0); - gst_element_link_filtered(resample, sink, caps); - gst_caps_unref(caps); - ---- a/cddasongloader.cpp 2017-09-22 23:25:22.975387004 +0200 -+++ b/src/devices/cddasongloader.cpp 2017-09-22 23:25:59.774388406 +0200 -@@ -62,7 +62,7 @@ - nullptr); - } - if (g_object_class_find_property (G_OBJECT_GET_CLASS (cdda_), "paranoia-mode")) { -- g_object_set (cdda_, "paranoia-mode", 0, NULL); -+ g_object_set (cdda_, "paranoia-mode", 0, (char*)0); - } - - // Change the element's state to ready and paused, to be able to query it -@@ -106,7 +106,7 @@ - - GstElement* pipeline = gst_pipeline_new("pipeline"); - GstElement* sink = gst_element_factory_make ("fakesink", NULL); -- gst_bin_add_many (GST_BIN (pipeline), cdda_, sink, NULL); -+ gst_bin_add_many (GST_BIN (pipeline), cdda_, sink, (char*)0); - gst_element_link (cdda_, sink); - gst_element_set_state(pipeline, GST_STATE_READY); - gst_element_set_state(pipeline, GST_STATE_PAUSED); diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template index 6e99f249328..cda941a6369 100644 --- a/srcpkgs/clementine/template +++ b/srcpkgs/clementine/template @@ -1,22 +1,26 @@ # Template file for 'clementine' pkgname=clementine version=1.3.1 -revision=18 -wrksrc="Clementine-${version}" +revision=21 +_commit=75f18dab23f0842713a4200a7e362efd51b12e31 +wrksrc="Clementine-${_commit}" build_style=cmake -hostmakedepends="sparsehash pkg-config qt-host-tools qt-devel protobuf" +configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF" +hostmakedepends="sparsehash pkg-config qt5-qmake qt5-host-tools protobuf" makedepends="chromaprint-devel boost-devel gst-plugins-base1-devel liblastfm-devel - qt-webkit-devel glew-devel qjson-devel sqlite-devel protobuf-devel libplist-devel - libusbmuxd-devel libmtp-devel libcdio-devel qca-devel pulseaudio-devel glu-devel + qt5-devel glew-devel sqlite-devel protobuf-devel libplist-devel + libusbmuxd-devel libmtp-devel libcdio-devel pulseaudio-devel glu-devel taglib-devel crypto++-devel $(vopt_if spotify libspotify-devel) libechonest-devel - libgpod-devel" + libgpod-devel libmygpo-qt-devel qt5-x11extras-devel qt5-plugin-mysql + qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds qt5-plugin-odbc + qt5-tools-devel" depends="desktop-file-utils" short_desc="Modern music player and library organizer" maintainer="Andrea Brancaleoni " -license="GPL-3" +license="GPL-3.0-or-later" homepage="https://www.clementine-player.org/" -distfiles="https://github.com/clementine-player/Clementine/archive/${version}.tar.gz" -checksum=f885931a9ab7c88607d07b50c64fcce46fc05f13dd2c0a04188c94eff938f37c +distfiles="https://github.com/clementine-player/Clementine/archive/${_commit}.tar.gz" +checksum=0c29e596cb5acc6970754e3c20616c5474859b7d2e6f05f5cda5c539581e2c8a patch_args="-Np1" build_options="spotify" diff --git a/srcpkgs/clipgrab/template b/srcpkgs/clipgrab/template index 943cfaabde3..d437d592958 100644 --- a/srcpkgs/clipgrab/template +++ b/srcpkgs/clipgrab/template @@ -1,6 +1,6 @@ # Template file for 'clipgrab' pkgname=clipgrab -version=3.8.3 +version=3.8.5 revision=1 build_style=qmake configure_args=clipgrab.pro @@ -14,7 +14,7 @@ maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://clipgrab.org" distfiles="https://download.clipgrab.org/clipgrab-${version}.tar.gz" -checksum=ee03fe7fbac15c8ed7f8e6fd577c8d9372472ac0317dc5bf7fc363f930dd1bed +checksum=69c3264bedc72a6c98006b43f05413bce8724a3beec0081aa5d693bff9b7d249 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-location-devel qt5-quickcontrols2-devel @@ -22,6 +22,10 @@ if [ "$CROSS_BUILD" ]; then qt5-host-tools" fi +case "$XBPS_TARGET_MACHINE" in + arm*) broken="qt-webkit not available on arm" +esac + do_install() { vbin clipgrab vinstall icon.png 644 usr/share/pixmaps clipgrab.png diff --git a/srcpkgs/clipman/template b/srcpkgs/clipman/template new file mode 100644 index 00000000000..87303fff362 --- /dev/null +++ b/srcpkgs/clipman/template @@ -0,0 +1,14 @@ +# Template file for 'clipman' +pkgname=clipman +version=1.0.2 +revision=1 +build_style=go +go_import_path=github.com/yory8/clipman +hostmakedepends="git" +depends="wl-clipboard" +short_desc="Simple clipboard manager for Wayland" +maintainer="travankor " +license="GPL-3.0-or-later" +homepage="https://github.com/yory8/clipman" +distfiles="https://github.com/yory8/clipman/archive/v${version}.tar.gz" +checksum=9ee2a03891d06594323777fad2e34b3787f41c5168f2354c52776bc8ad2868d3 diff --git a/srcpkgs/cloc/template b/srcpkgs/cloc/template index b9fb0a9ae45..9fa379def29 100644 --- a/srcpkgs/cloc/template +++ b/srcpkgs/cloc/template @@ -1,6 +1,6 @@ # Template file for 'cloc' pkgname=cloc -version=1.82 +version=1.84 revision=1 archs=noarch hostmakedepends="perl" @@ -10,7 +10,7 @@ maintainer="Leah Neukirchen " license="GPL-2.0-or-later" homepage="https://github.com/AlDanial/cloc" distfiles="${homepage}/archive/${version}.tar.gz" -checksum=7ab390f3a4888d9b78df420bff586326b53e3f7fc0e0c9ff9b160d076ca85a17 +checksum=b88a3adc669c15a9a32975095090708ba4eee5a73b8498369fae14be5b8a37d4 do_build() { make -C Unix man diff --git a/srcpkgs/cloudfuse/template b/srcpkgs/cloudfuse/template index c5d930f1c02..5240fd0c6b7 100644 --- a/srcpkgs/cloudfuse/template +++ b/srcpkgs/cloudfuse/template @@ -6,7 +6,7 @@ build_style=gnu-configure hostmakedepends="pkg-config" makedepends="libxml2-devel libcurl-devel fuse-devel" short_desc="FUSE for Mosso's Cloud Files" -maintainer="maxice8 " +maintainer="Orphaned " license="MIT" homepage="https://redbo.github.io/cloudfuse" distfiles="https://github.com/redbo/cloudfuse/archive/${version}.tar.gz" diff --git a/srcpkgs/clyrics/template b/srcpkgs/clyrics/template index 3e4c42d3988..5a0144c5b30 100644 --- a/srcpkgs/clyrics/template +++ b/srcpkgs/clyrics/template @@ -1,6 +1,6 @@ # Template file for 'clyrics' pkgname=clyrics -version=0.11 +version=0.12 revision=1 archs=noarch depends="perl-LWP-Protocol-https perl-WWW-Mechanize" @@ -9,7 +9,7 @@ maintainer="Orphaned " license="GPL-3.0-only" homepage="https://trizenx.blogspot.fr/2013/02/mocp-lyrics.html" distfiles="https://github.com/trizen/clyrics/archive/${version}.tar.gz" -checksum=221d746c9c60249c56d2637f10890609bb14a97316016d98ebdf0db57acf22e8 +checksum=3110a177618fee02b5b17539b1a7c2fe877238ee922ac2967e828c3db5efc799 do_install() { local f diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template index f7fbf78964c..4614373f36c 100644 --- a/srcpkgs/cmake-gui/template +++ b/srcpkgs/cmake-gui/template @@ -1,6 +1,6 @@ # Template file for 'cmake-gui' pkgname=cmake-gui -version=3.15.2 +version=3.15.4 revision=1 wrksrc="cmake-${version}" build_style=configure @@ -15,7 +15,7 @@ maintainer="Orphaned " license="LGPL-2.1-or-later, BSD-3-Clause" homepage="https://www.cmake.org" distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz" -checksum=539088cb29a68e6d6a8fba5c00951e5e5b1a92c68fa38a83e1ed2f355933f768 +checksum=8a211589ea21374e49b25fc1fc170e2d5c7462b795f1b29c84dd0e984301ed7a nocross=yes do_install() { diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template index 0790260af45..c0b11d76885 100644 --- a/srcpkgs/cmake/template +++ b/srcpkgs/cmake/template @@ -1,7 +1,7 @@ # Template file for 'cmake' pkgname=cmake -version=3.15.2 -revision=2 +version=3.15.4 +revision=1 build_style=configure make_check_target=test makedepends="expat-devel libarchive-devel libcurl-devel libuv-devel @@ -11,7 +11,7 @@ maintainer="Orphaned " license="LGPL-2.1-or-later, BSD-3-Clause" homepage="https://www.cmake.org" distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz" -checksum=539088cb29a68e6d6a8fba5c00951e5e5b1a92c68fa38a83e1ed2f355933f768 +checksum=8a211589ea21374e49b25fc1fc170e2d5c7462b795f1b29c84dd0e984301ed7a if [ "$CROSS_BUILD" ]; then # XXX ugly :-) diff --git a/srcpkgs/cmixer/patches/linux.patch b/srcpkgs/cmixer/patches/linux.patch new file mode 100644 index 00000000000..653488322b4 --- /dev/null +++ b/srcpkgs/cmixer/patches/linux.patch @@ -0,0 +1,34 @@ +--- cmixer.pl.orig ++++ cmixer.pl +@@ -34,23 +34,6 @@ + + sub read_mixerctl { + my $self = shift; +- foreach (`mixerctl 2>&1`) { +- #mixerctl: /dev/mixer: Device not configured +- die "No mixer device found" if (/^mixerctl: \/dev\/mixer.: Device not configured$/); +- #outputs.master=255,255 volume +- if (/^(outputs|inputs|record)\.([^\.]*)=(\d+),(\d+)\s+/) { +- $self->{mixer}{$1}{$2}{volume}{left} = $3; +- $self->{mixer}{$1}{$2}{volume}{right} = $4; +- # outputs.mono=255 volume +- } elsif (/^(outputs|inputs|record)\.([^\.]*)=(\d+)\s+/) { +- $self->{mixer}{$1}{$2}{volume}{center} = $3; +- # outputs.master.mute=off [ off on ] +- } elsif (/^(outputs|inputs|record)\.(.*)\.mute=(on|off)\s+/) { +- $self->{mixer}{$1}{$2}{mute} = $3; +- } +- #todo: record.source=mic [ mic cd video aux line mixerout mixeroutmono phone ] +- #inputs.mix_source=mic,beep,hp { mic mic2 beep hp } +- } + foreach (`aucatctl 2>&1`) { + die "Failed to connect to sndiod" if (/couldn't open MIDI device$/); + #mplayer0=127 +@@ -59,7 +42,6 @@ + $self->{mixer}{sndio}{$1}{volume}{center} = 2 * $2; + } + } +- die "No outputs found" unless (exists $self->{mixer}{outputs}); + } + + sub update_view { diff --git a/srcpkgs/cmixer/template b/srcpkgs/cmixer/template new file mode 100644 index 00000000000..1fefb2b529b --- /dev/null +++ b/srcpkgs/cmixer/template @@ -0,0 +1,20 @@ +# Template file for 'cmixer' +pkgname=cmixer +version=0.2 +revision=1 +depends="aucatctl perl-Curses-UI" +short_desc="Curses sndio mixer" +maintainer="Duncaen " +license="ISC" +homepage="https://rhaalovely.net/" +distfiles="https://rhaalovely.net/stuff/cmixer-${version}.tar.gz" +checksum=1ee4489a73f15b0a4a1c5698ac4476295b53c054c08a98ae94087f0f14104007 + +post_extract() { + sed -n '3,15p' cmixer.pl >LICENSE +} + +do_install() { + vbin cmixer.pl cmixer + vlicense LICENSE +} diff --git a/srcpkgs/cmocka/template b/srcpkgs/cmocka/template index f9c71a870e6..ea0384420a3 100644 --- a/srcpkgs/cmocka/template +++ b/srcpkgs/cmocka/template @@ -8,7 +8,7 @@ configure_args="-DUNIT_TESTING=ON" # It contains a filename "\makeindex" # hostmakedepends="doxygen graphviz" short_desc="Unit testing framework in C" -maintainer="maxice8 " +maintainer="Orphaned " license="Apache-2.0" homepage="https://cmocka.org/" distfiles="https://cmocka.org/files/${version%.*}/cmocka-${version}.tar.xz" diff --git a/srcpkgs/cmus/template b/srcpkgs/cmus/template index 811a16d7a82..cbc752370cf 100644 --- a/srcpkgs/cmus/template +++ b/srcpkgs/cmus/template @@ -1,18 +1,23 @@ # Template file for 'cmus' pkgname=cmus version=2.8.0 -revision=1 +revision=2 +build_style=configure +configure_args="prefix=/usr LD=$CC" hostmakedepends="pkg-config" makedepends="ncurses-devel faad2-devel libflac-devel libao-devel libmad-devel libmodplug-devel libmp4v2-devel libmpcdec-devel pulseaudio-devel opusfile-devel wavpack-devel alsa-lib-devel libvorbis-devel ffmpeg-devel - sndio-devel" + sndio-devel $(vopt_if elogind elogind-devel)" short_desc="Small, fast and powerful console music player" maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://cmus.github.io" distfiles="https://github.com/cmus/cmus/archive/v${version}.tar.gz" checksum=756ce2c6241b2104dc19097488225de559ac1802a175be0233cfb6fbc02f3bd2 +build_options="elogind" +build_options_default="elogind" +desc_option_elogind="Support MPRIS interface via elogind" case $XBPS_TARGET_MACHINE in armv6*) @@ -22,16 +27,6 @@ case $XBPS_TARGET_MACHINE in ;; esac -do_configure() { - ./configure prefix=/usr -} -do_build() { - make GCC=$CC CC=$CC LD=$CC LDFLAGS="$LDFLAGS" ${makejobs} -} -do_install() { - make DESTDIR=${DESTDIR} install -} - cmus-libao_package() { short_desc+=" - libao output plugin" depends="${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/cni-plugins/template b/srcpkgs/cni-plugins/template index ee57fb191ab..3c649fd8f74 100644 --- a/srcpkgs/cni-plugins/template +++ b/srcpkgs/cni-plugins/template @@ -1,6 +1,6 @@ # Template file for 'cni-plugins' pkgname=cni-plugins -version=0.8.1 +version=0.8.2 revision=1 wrksrc="plugins-${version}" build_style=go @@ -10,7 +10,7 @@ maintainer="Cameron Nemo " license="Apache-2.0" homepage="https://github.com/containernetworking/plugins" distfiles="https://github.com/containernetworking/plugins/archive/v${version}.tar.gz" -checksum=1b6f66835b52eb382f625cb98b70ddfaa02bbaf016ef4d9eb5faa21d0648e519 +checksum=91994d305a86a2c5a70e9dd7add9e277074065678b605bf12983e6e43fdcd4d8 do_build() { ./build_linux.sh diff --git a/srcpkgs/cnping/INSTALL b/srcpkgs/cnping/INSTALL new file mode 100644 index 00000000000..6c7a28b1aa5 --- /dev/null +++ b/srcpkgs/cnping/INSTALL @@ -0,0 +1,5 @@ +case "${ACTION}" in +post) + setcap cap_net_raw+ep usr/bin/cnping + ;; +esac diff --git a/srcpkgs/cnping/template b/srcpkgs/cnping/template new file mode 100644 index 00000000000..cfbbe6b4029 --- /dev/null +++ b/srcpkgs/cnping/template @@ -0,0 +1,19 @@ +# Template file for 'cnping' +pkgname=cnping +version=1.0.0 +revision=1 +build_style=gnu-makefile +makedepends="libXinerama-devel libX11-devel" +depends="libcap-progs" +short_desc="Minimal Graphical IPV4 Ping Tool" +maintainer="Jan Christian Grünhage " +license="MIT, BSD-3-Clause" +homepage="https://github.com/cnlohr/cnping" +distfiles="https://github.com/cnlohr/cnping/archive/${version}.tar.gz" +checksum=43e4737e27a2ab5bd8f90c73efa0ce998c2cc1d767e4948f50ded0d29e683e2d + +do_install() { + vbin cnping + vlicense LICENSE.MIT + vlicense LICENSE.BSD-3-Clause +} diff --git a/srcpkgs/codecrypt/template b/srcpkgs/codecrypt/template index 697c9672d6a..13c8b79abd7 100644 --- a/srcpkgs/codecrypt/template +++ b/srcpkgs/codecrypt/template @@ -1,14 +1,14 @@ # Template file for 'codecrypt' pkgname=codecrypt version=1.8 -revision=2 +revision=3 build_style=gnu-configure hostmakedepends="automake libtool pkg-config" makedepends="crypto++-devel fftw-devel gmp-devel" -maintainer="Orphaned " short_desc="Post-quantum cryptography tool" +maintainer="Orphaned " +license="LGPL-3.0-or-later" homepage="https://e-x-a.org/codecrypt" -license="LGPL-3" distfiles="https://github.com/exaexa/codecrypt/archive/v${version}.tar.gz" checksum=25f11bc361b4f8aca7245698334b5715b7d594d708a75e8cdb2aa732dc46eb96 diff --git a/srcpkgs/codelite/template b/srcpkgs/codelite/template index cb2ef04fca4..9ca8123dafe 100644 --- a/srcpkgs/codelite/template +++ b/srcpkgs/codelite/template @@ -1,7 +1,7 @@ # Template file for 'codelite' pkgname=codelite version=13.0 -revision=1 +revision=2 build_style=cmake configure_args="-DWITH_PCH=0 $(vopt_if sftp -DENABLE_SFTP=1) diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template index a6957f46b40..328e5aaa360 100644 --- a/srcpkgs/collectd/template +++ b/srcpkgs/collectd/template @@ -1,7 +1,7 @@ # Template file for 'collectd' pkgname=collectd version=5.9.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 diff --git a/srcpkgs/composer/template b/srcpkgs/composer/template index 5ef0064c24a..0171dc5e520 100644 --- a/srcpkgs/composer/template +++ b/srcpkgs/composer/template @@ -1,6 +1,6 @@ # Template file for 'composer' pkgname=composer -version=1.8.5 +version=1.9.0 revision=1 archs=noarch build_style=fetch @@ -11,7 +11,7 @@ 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="6faf282db067f0f7625a5a1d80f4ecd3228ccc9a0388aec1599824c610d5d4e3 +checksum="1126fd7501ae6ff1dc9f91f0a3eca7430b1ea060d018d21521dc5e2d1ba01606 7855ac293067aebe7e51afdd23b9dea54b8be24187dbecc9b9142581c37f596c" do_install() { @@ -19,7 +19,6 @@ do_install() { vlicense LICENSE vmkdir /etc/php/conf.d - echo "extension=phar" > ${DESTDIR}/etc/php/conf.d/composer.ini - echo "extension=zip" >> ${DESTDIR}/etc/php/conf.d/composer.ini - echo "extension=openssl" >> ${DESTDIR}/etc/php/conf.d/composer.ini + printf 'extension=%s\n' phar iconv openssl zip \ + >${DESTDIR}/etc/php/conf.d/composer.ini } diff --git a/srcpkgs/compton/template b/srcpkgs/compton/template index 61c3dcfa02f..a7f8f6d170f 100644 --- a/srcpkgs/compton/template +++ b/srcpkgs/compton/template @@ -1,20 +1,20 @@ # Template file for 'compton' pkgname=compton -version=6.2 +version=7.4 revision=1 build_style=meson configure_args="-Dbuild_docs=true" hostmakedepends="pkg-config asciidoc" makedepends="MesaLib-devel dbus-devel libconfig-devel libev-devel pcre-devel pixman-devel xcb-util-image-devel xcb-util-renderutil-devel - libxdg-basedir-devel" + libxdg-basedir-devel uthash" depends="desktop-file-utils" short_desc="Compositor for X11 (fork of xcompmgr-dana)" -maintainer="Orphaned " +maintainer="Frank Steinborn " license="MIT, MPL-2.0" homepage="https://github.com/yshui/compton/" distfiles="https://github.com/yshui/compton/archive/v${version}.tar.gz" -checksum=1333133ca9dfea768256c3fff8362d12a98b4d129e6ab1e56b1e630353f269bb +checksum=1911aebb49f765586f655933ee016828e126bc7b2bb016b13c9a34a4865a8fd3 pre_build() { export COMPTON_VERSION="v${version}" diff --git a/srcpkgs/conky-cli/template b/srcpkgs/conky-cli/template index 74a564b96b9..cbb7cb7c4e7 100644 --- a/srcpkgs/conky-cli/template +++ b/srcpkgs/conky-cli/template @@ -1,6 +1,6 @@ # Template file for 'conky-cli' pkgname=conky-cli -version=1.11.3 +version=1.11.5 revision=1 wrksrc="${pkgname/-cli/}-${version}" build_style=cmake @@ -16,7 +16,7 @@ maintainer="Orphaned " license="BSD-3-Clause, GPL-3.0-or-later" homepage="https://github.com/brndnmtthws/conky" distfiles="https://github.com/brndnmtthws/conky/archive/v${version}.tar.gz" -checksum=0140e749537d4d05bf33fbac436e54756faa26021e16f2bca418e9eeea724eb4 +checksum=4cefdd92219a90934c28297e4ac7448a3f69d6aeec5d48c5763b23f6b214ef13 provides="conky-${version}_${revision}" conflicts="conky>=0" diff --git a/srcpkgs/conky/template b/srcpkgs/conky/template index f1853949ba7..67d2397c19e 100644 --- a/srcpkgs/conky/template +++ b/srcpkgs/conky/template @@ -1,6 +1,6 @@ # Template file for 'conky' pkgname=conky -version=1.11.4 +version=1.11.5 revision=1 build_style=cmake conf_files="/etc/conky/conky.conf /etc/conky/conky_no_x11.conf" @@ -18,7 +18,7 @@ maintainer="Orphaned " license="BSD-3-Clause, GPL-3.0-or-later" homepage="https://github.com/brndnmtthws/conky" distfiles="https://github.com/brndnmtthws/conky/archive/v${version}.tar.gz" -checksum=344637646c15c4cb7cf0afdde4651ee3100f7812e7bb8434ca757eba5c621a48 +checksum=4cefdd92219a90934c28297e4ac7448a3f69d6aeec5d48c5763b23f6b214ef13 do_install() { make -C build DESTDIR=${DESTDIR} install @@ -29,4 +29,3 @@ do_install() { vlicense COPYING } - diff --git a/srcpkgs/conmon/template b/srcpkgs/conmon/template index c92bf445e2e..1b88fb61e50 100644 --- a/srcpkgs/conmon/template +++ b/srcpkgs/conmon/template @@ -1,6 +1,6 @@ # Template file for 'conmon' pkgname=conmon -version=2.0.0 +version=2.0.1 revision=1 build_style=gnu-makefile hostmakedepends="pkg-config" @@ -10,7 +10,7 @@ maintainer="Cameron Nemo " license="Apache-2.0" homepage="https://github.com/containers/conmon" distfiles="https://github.com/containers/conmon/archive/v${version}.tar.gz" -checksum=841ee6c8085f4d1092a330481b2d56ddaceedee9e78aa6698765bf2a693e06e7 +checksum=809508bd6f76599516f5a5a8f509e1257c2bdbcdc623c11b49e99287bba3d293 do_install() { vbin bin/conmon diff --git a/srcpkgs/connman/files/connmand/run b/srcpkgs/connman/files/connmand/run index accfc763830..e90eed5ba4a 100755 --- a/srcpkgs/connman/files/connmand/run +++ b/srcpkgs/connman/files/connmand/run @@ -1,2 +1,3 @@ #!/bin/sh -exec connmand -n +[ -r conf ] && . ./conf +exec connmand -n ${OPTS} diff --git a/srcpkgs/connman/files/musl/freeaddrinfo.patch b/srcpkgs/connman/files/musl/freeaddrinfo.patch new file mode 100644 index 00000000000..b5c1aca390d --- /dev/null +++ b/srcpkgs/connman/files/musl/freeaddrinfo.patch @@ -0,0 +1,17 @@ +musl > 1.1.21 segfaults on null pointers to freeaddrinfo + +diff --git a/gweb/gweb.c b/gweb/gweb.c +index 393afe0a..12fcb1d8 100644 +--- a/gweb/gweb.c ++++ b/gweb/gweb.c +@@ -1274,7 +1274,8 @@ static bool is_ip_address(const char *host) + addr = NULL; + + result = getaddrinfo(host, NULL, &hints, &addr); +- freeaddrinfo(addr); ++ if(!result) ++ freeaddrinfo(addr); + + return result == 0; + } + diff --git a/srcpkgs/connman/template b/srcpkgs/connman/template index f9cb3085a4d..fdc7f434a1e 100644 --- a/srcpkgs/connman/template +++ b/srcpkgs/connman/template @@ -1,7 +1,7 @@ # Template file for 'connman' pkgname=connman version=1.37 -revision=1 +revision=3 build_style=gnu-configure configure_args="--enable-polkit --enable-client --enable-pie --enable-ethernet --enable-wifi --enable-bluetooth --enable-loopback --enable-nmcompat diff --git a/srcpkgs/consul-template/template b/srcpkgs/consul-template/template new file mode 100644 index 00000000000..a121a52f453 --- /dev/null +++ b/srcpkgs/consul-template/template @@ -0,0 +1,13 @@ +# Template file for 'consul-template' +pkgname=consul-template +version=0.22.0 +revision=1 +build_style=go +go_import_path="github.com/hashicorp/$pkgname" +hostmakedepends="git" +short_desc="Template rendering, notifier, and supervisor for Consul and Vault data" +maintainer="Noel Cower " +license="MPL-2.0" +homepage="https://$go_import_path" +distfiles="$homepage/archive/v$version.tar.gz" +checksum=81f81ab5bcd91184eba1955f2729382fe800ef8e23b059f4f65a6a64dd4d6039 diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template index 9bd68c23f73..9680d40e176 100644 --- a/srcpkgs/consul/template +++ b/srcpkgs/consul/template @@ -1,10 +1,10 @@ # Template file for 'consul' pkgname=consul -version=1.5.3 +version=1.6.1 revision=1 build_style=go go_import_path="github.com/hashicorp/${pkgname}" -_git_commit=34eff659dcc5503b6eb117733c9f7def63f01bad +_git_commit=a42ded477cf4e5ac1a850b42ec5d25672cd2545d go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit} -X ${go_import_path}/version.GitDescribe=v${version}" # consul has a vendor directory, but relies on replace statements in go.mod, so # force default non-vendor behavior. @@ -15,7 +15,7 @@ maintainer="iaroki " license="MPL-2.0" homepage="https://www.consul.io/" distfiles="https://${go_import_path}/archive/v${version}.tar.gz" -checksum=9a29ee11e12d75980016db0685ce7eb81a36a97c90d6bd23529a310f4e2dc02a +checksum=e31ee84ee95efe3c27ebac46ba9f7973f1f7017589b7aece22715e304fccd464 post_install() { vlicense LICENSE diff --git a/srcpkgs/coq/template b/srcpkgs/coq/template index d69848b9254..9b7ba6bd9b9 100644 --- a/srcpkgs/coq/template +++ b/srcpkgs/coq/template @@ -1,13 +1,14 @@ +# Template file for 'coq' pkgname=coq -version=8.9.1 -revision=2 +version=8.10.0 +revision=1 hostmakedepends="ocaml ocaml-findlib ocaml-num camlp5" short_desc="Proof assistant written in OCaml" maintainer="Leah Neukirchen " -license="LGPL-2.1" +license="LGPL-2.1-only" homepage="https://coq.inria.fr" distfiles="https://github.com/coq/coq/archive/V${version}.tar.gz" -checksum=87251327e8a1e25c6b08b5c0ae8e7cdf3a91a5f30832bbe74ccc4f0bde9618ea +checksum=292c64162620c4c4825c323c1c71762d764ebc9ce39bd8eee900851eaca655f5 nopie=yes nocross=yes diff --git a/srcpkgs/coreboot-utils/template b/srcpkgs/coreboot-utils/template index 8083de45bf2..f16f14113b9 100644 --- a/srcpkgs/coreboot-utils/template +++ b/srcpkgs/coreboot-utils/template @@ -1,10 +1,10 @@ # Template file for 'coreboot-utils' pkgname=coreboot-utils -version=4.9 +version=4.10 revision=1 +archs="i686* x86_64*" wrksrc="coreboot-${version}" build_wrksrc="util" -archs="i686* x86_64*" build_style=gnu-makefile makedepends="pciutils-devel zlib-devel" short_desc="Coreboot firmware utilities" @@ -12,7 +12,7 @@ maintainer="m3tav3rse " license="GPL-2.0-only" homepage="https://coreboot.org" distfiles="https://coreboot.org/releases/coreboot-${version}.tar.xz" -checksum=32368d8b3d87a79376e30efd4ed279e90ace9a3d752ea6f98e2efdd18a896a76 +checksum=ca7136cd67309971b1f006bdc7e3c9fbf00234a29a9a2dc3c35444a74ef851cb do_build() { for util in cbfstool cbmem ectool ifdtool inteltool intelmetool \ diff --git a/srcpkgs/coyim/template b/srcpkgs/coyim/template new file mode 100644 index 00000000000..7597c891823 --- /dev/null +++ b/srcpkgs/coyim/template @@ -0,0 +1,19 @@ +# Template file for 'coyim' +pkgname=coyim +version=0.3.11 +revision=1 +build_style=go +go_import_path=github.com/coyim/$pkgname +hostmakedepends="pkg-config" +makedepends="gtk+3-devel" +short_desc="Safe and secure XMPP chat client" +maintainer="Illia Shestakov " +license="GPL-3.0-only" +homepage="https://coy.im" +distfiles="https://github.com/coyim/coyim/archive/v${version}.tar.gz" +checksum=4717901462f027578369358c8772eb5b14e22f053fc30e4c9dbcc2b053374a41 + +post_install() { + vlicense LICENSE + vdoc README.md +} diff --git a/srcpkgs/cozy/template b/srcpkgs/cozy/template index da15249275f..a35aff61f37 100644 --- a/srcpkgs/cozy/template +++ b/srcpkgs/cozy/template @@ -1,6 +1,6 @@ # Template file for 'cozy' pkgname=cozy -version=0.6.7 +version=0.6.8 revision=1 archs=noarch build_style=meson @@ -13,5 +13,5 @@ maintainer="johannes " license="GPL-3.0-only, LGPL-3.0-only" homepage="https://github.com/geigi/cozy" distfiles="https://github.com/geigi/cozy/archive/${version}.tar.gz" -checksum=d007bc1aa5aa08e1aca06af1b5504323b53be4597ab3998c7abf24efc6673722 +checksum=fce7e9a46dc6b7a56c243727310fdef2eb948ce4c44974104e03918e936bedda nocross="requires python3-gobject" diff --git a/srcpkgs/cppcheck/template b/srcpkgs/cppcheck/template index a6d26d33f10..fc12ca4663a 100644 --- a/srcpkgs/cppcheck/template +++ b/srcpkgs/cppcheck/template @@ -1,24 +1,25 @@ # Template file for 'cppcheck' pkgname=cppcheck -version=1.87 +version=1.89 revision=1 -hostmakedepends="libxslt docbook-xsl" -depends="python" +build_style=gnu-makefile +make_build_args=" + FILESDIR=/usr/share/cppcheck + MATCHCOMPILER=yes + DB2MAN=/usr/share/xsl/docbook/manpages/docbook.xsl" +make_install_args=" + FILESDIR=/usr/share/cppcheck" +make_build_target="cppcheck man" +python_version="3" +hostmakedepends="libxslt docbook-xsl python3" +depends="python3" short_desc="Static analysis of C/C++ code" -maintainer="maxice8 " +maintainer="Duncaen " license="GPL-3.0-or-later" homepage="http://cppcheck.sourceforge.net" distfiles="https://github.com/danmar/cppcheck/archive/${version}.tar.gz" -checksum=ea7ac1cd2f5c00ecffd596fd0f7281cba44308e565a634fae02b77ecd927c153 +checksum=37452d378825c7bd78116b4d7073df795fa732207d371ad5348287f811755783 -do_build() { - make ${makejobs} CFGDIR=/usr/share/cppcheck/cfg - make ${makejobs} DB2MAN=/usr/share/xsl/docbook/manpages/docbook.xsl all man -} - -do_install() { - make DESTDIR=${DESTDIR} CFGDIR=/usr/share/cppcheck/cfg install +post_install() { vman cppcheck.1 - vmkdir usr/share/${pkgname} - vcopy cfg/ usr/share/${pkgname}/cfg } diff --git a/srcpkgs/cpufrequtils/template b/srcpkgs/cpufrequtils/template index 62f700490ee..bbb798db7d6 100644 --- a/srcpkgs/cpufrequtils/template +++ b/srcpkgs/cpufrequtils/template @@ -14,7 +14,7 @@ homepage="https://git.kernel.org/pub/scm/linux/kernel/git/brodo/cpufrequtils.git distfiles="${homepage}/snapshot/${pkgname}-${_commit}.tar.gz" checksum=53b0fd1092e2053d31f4707ae0485f0d09b7faafcfac0e53da06c28ecfe23c95 -archs="i686* x86_64* ppc64-musl ppc64le*" +archs="i686* x86_64* ppc*" post_extract() { sed -i "s|/usr/bin/install|install|g" Makefile diff --git a/srcpkgs/crash/template b/srcpkgs/crash/template index 077e3619c38..e1b71f0c4d8 100644 --- a/srcpkgs/crash/template +++ b/srcpkgs/crash/template @@ -1,6 +1,6 @@ # Template file for 'crash' pkgname=crash -version=7.2.6 +version=7.2.7 revision=1 archs="i686 x86_64" # broken on musl build_style=gnu-makefile @@ -12,7 +12,7 @@ license="GPL-3.0-or-later" homepage="http://people.redhat.com/anderson/" changelog="https://people.redhat.com/anderson/crash.changelog.html" distfiles="http://people.redhat.com/anderson/${pkgname}-${version}.tar.gz" -checksum=c8bc0892061e7cec838e641a8e61319d656f33de5f211502296d1c9a23058ec2 +checksum=16b96b350f56ea0f73f04003b8ca7604e8bdb3809c2e9e8cf89799da5b9b2dad nocross=yes LDFLAGS=-llzo2 diff --git a/srcpkgs/cri-tools/template b/srcpkgs/cri-tools/template index 9dca672cfae..66a936fcd1b 100644 --- a/srcpkgs/cri-tools/template +++ b/srcpkgs/cri-tools/template @@ -1,6 +1,6 @@ # Template file for 'cri-tools' pkgname=cri-tools -version=1.15.0 +version=1.16.0 revision=1 build_style=go go_import_path=github.com/kubernetes-sigs/cri-tools @@ -9,8 +9,14 @@ maintainer="Kyle Nusbaum " license="Apache-2.0" homepage="https://github.com/kubernetes-sigs/cri-tools" distfiles="https://github.com/kubernetes-sigs/cri-tools/archive/v${version}.tar.gz" -checksum=7827777ffb085918ef454210ce158a464f1b7326eb339deb348cc8cd3aee2931 +checksum=4c382c3929f1536c36f3a6c8593ce49dd5b7831d3c0f9e41cd4f48163ec05b90 do_build() { make ${makejobs} } + +do_install() { + for bin in _output/*; do + vbin $bin + done +} diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template index 7aab8b8d324..3be23a0a2d4 100644 --- a/srcpkgs/croc/template +++ b/srcpkgs/croc/template @@ -1,6 +1,6 @@ # Template file for 'croc' pkgname=croc -version=6.1.1 +version=6.1.4 revision=1 build_style=go go_import_path=github.com/schollz/croc/v6 @@ -10,7 +10,7 @@ maintainer="Orphaned " license="MIT" homepage="https://github.com/schollz/croc" distfiles="https://github.com/schollz/croc/archive/v${version}.tar.gz" -checksum=4636edd8c76e8a2a52b7b156332f8a5414e8124305cd94633bcff92998dcf166 +checksum=3eb8f7a1c3ca45270841b374ea0ccaf1423de38492dbb4c8696678bae271c701 post_install() { vlicense LICENSE diff --git a/srcpkgs/cropgui/template b/srcpkgs/cropgui/template index 96f2a549694..82042037f30 100644 --- a/srcpkgs/cropgui/template +++ b/srcpkgs/cropgui/template @@ -7,7 +7,7 @@ makedepends="python" depends="python python-Pillow python-gobject2 pygtk libjpeg-turbo-tools ImageMagick exiftool" short_desc="Gtk frontend for lossless cropping of jpeg images" -maintainer="maxice8 " +maintainer="Orphaned " license="GPL-2" homepage="https://github.com/jepler/cropgui" distfiles="https://github.com/jepler/cropgui/archive/v${version}.tar.gz" diff --git a/srcpkgs/cross-aarch64-linux-gnu/files/non-nullness.patch b/srcpkgs/cross-aarch64-linux-gnu/files/non-nullness.patch deleted file mode 120000 index c8b653748fe..00000000000 --- a/srcpkgs/cross-aarch64-linux-gnu/files/non-nullness.patch +++ /dev/null @@ -1 +0,0 @@ -../../gcc/patches/non-nullness.patch \ No newline at end of file diff --git a/srcpkgs/cross-aarch64-linux-gnu/template b/srcpkgs/cross-aarch64-linux-gnu/template index e4f1544040e..cecc02ec7b8 100644 --- a/srcpkgs/cross-aarch64-linux-gnu/template +++ b/srcpkgs/cross-aarch64-linux-gnu/template @@ -1,8 +1,8 @@ # Template build file for 'cross-aarch64-linux-gnu' # _binutils_version=2.32 -_gcc_version=9.1.0 -_glibc_version=2.29 +_gcc_version=9.2.0 +_glibc_version=2.30 _linux_version=4.19 _triplet=aarch64-linux-gnu @@ -10,7 +10,7 @@ _archflags="-march=armv8-a" _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} -version=0.31 +version=0.32 revision=1 short_desc="GNU Cross toolchain for the ${_triplet} LE target (binutils/gcc/glibc)" maintainer="Leah Neukirchen " @@ -22,15 +22,15 @@ distfiles=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz" checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04 - 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0 - f3eeb8d57e25ca9fc13c2af3dae97754f9f643bc69229546828e3a240e2af04b + ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206 + e2c4114e569afbe7edbc29131a43be833850ab9a459d81beb2588016d2bbb8af 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1" lib32disabled=yes nocross=yes nopie=yes create_wrksrc=yes -hostmakedepends="flex perl python3" +hostmakedepends="gcc-objc gcc-go flex perl python3" makedepends="isl15-devel libmpc-devel zlib-devel" depends="${pkgname}-libc-${version}_${revision}" nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a @@ -94,7 +94,6 @@ _gcc_bootstrap() { cd ${wrksrc}/gcc-${_gcc_version} _apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch - _apply_patch -p0 ${FILESDIR}/non-nullness.patch msg_normal "Building cross gcc bootstrap\n" @@ -234,7 +233,7 @@ _gcc_build() { _args+=" --libdir=/usr/lib" _args+=" --target=${_triplet}" _args+=" --with-sysroot=${_sysroot}" - _args+=" --enable-languages=c,ada,c++,fortran,lto" + _args+=" --enable-languages=c,ada,c++,objc,obj-c++,go,fortran,lto" _args+=" --with-gnu-as" _args+=" --with-gnu-ld" _args+=" --disable-multilib" @@ -250,7 +249,6 @@ _gcc_build() { _args+=" --enable-default-pie" _args+=" --enable-default-ssp" _args+=" --disable-libquadmath" - _args+=" --disable-libatomic" _args+=" --disable-libssp" _args+=" --disable-libmudflap" _args+=" --disable-libsanitizer" @@ -334,6 +332,11 @@ do_install() { ln -svf libgnat-${_majorver}.so libgnat.so rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so + # We need to build libatomic in target gcc as gccgo needs it to + # build... but it's not needed at runtime, so remove it from the + # destdir so it doesn't conflict with the libatomic package + rm -f ${DESTDIR}/${_sysroot}/usr/lib/libatomic.* + # Remove unnecessary stuff rm -f ${DESTDIR}/usr/lib*/libiberty.a rm -rf ${DESTDIR}/usr/share diff --git a/srcpkgs/cross-aarch64-linux-musl/files/gccgo-musl.patch b/srcpkgs/cross-aarch64-linux-musl/files/gccgo-musl.patch new file mode 120000 index 00000000000..a093af85773 --- /dev/null +++ b/srcpkgs/cross-aarch64-linux-musl/files/gccgo-musl.patch @@ -0,0 +1 @@ +../../gcc/files/gccgo-musl.patch \ No newline at end of file diff --git a/srcpkgs/cross-aarch64-linux-musl/files/non-nullness.patch b/srcpkgs/cross-aarch64-linux-musl/files/non-nullness.patch deleted file mode 120000 index c8b653748fe..00000000000 --- a/srcpkgs/cross-aarch64-linux-musl/files/non-nullness.patch +++ /dev/null @@ -1 +0,0 @@ -../../gcc/patches/non-nullness.patch \ No newline at end of file diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template index a40e53f532e..7fc76c3d726 100644 --- a/srcpkgs/cross-aarch64-linux-musl/template +++ b/srcpkgs/cross-aarch64-linux-musl/template @@ -1,17 +1,18 @@ # Template build file for 'cross-aarch64-linux-musl' # _binutils_version=2.32 -_gcc_version=9.1.0 +_gcc_version=9.2.0 _musl_version=1.1.23 _linux_version=4.19 +_libucontext_version=0.9.0 _triplet=aarch64-linux-musl _archflags="-march=armv8-a" _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} -version=0.31 -revision=3 +version=0.32 +revision=1 short_desc="Cross toolchain for ARM64 LE target (musl)" maintainer="Orphaned " homepage="https://www.voidlinux.org/" @@ -20,11 +21,13 @@ distfiles=" ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz - ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz" + ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz + https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz" checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04 - 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0 + ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206 8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa - 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1" + 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1 + 0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68" lib32disabled=yes nocross=yes @@ -33,7 +36,7 @@ nodebug=yes create_wrksrc=yes archs="x86_64* ppc64le" -hostmakedepends="flex perl python3" +hostmakedepends="gcc-objc gcc-go flex perl python3" makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel" nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a" @@ -81,10 +84,10 @@ _gcc_bootstrap() { cd ${wrksrc}/gcc-${_gcc_version} _apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch - _apply_patch -p0 ${FILESDIR}/non-nullness.patch _apply_patch -p0 ${FILESDIR}/musl-ada.patch _apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch _apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch + _apply_patch -p0 ${FILESDIR}/gccgo-musl.patch msg_normal "Building cross gcc bootstrap\n" @@ -153,6 +156,22 @@ _musl_build() { touch ${wrksrc}/.musl_build_done } +_libucontext_build() { + [ -f ${wrksrc}/.libucontext_build_done ] && return 0 + + cd ${wrksrc}/libucontext-${_libucontext_version} + msg_normal "Building cross libucontext\n" + + # it's ok if we're static only here + CC="${_triplet}-gcc" AR="${_triplet}-ar" AS="${_triplet}-as" \ + CFLAGS="-Os -pipe ${_archflags}" \ + make ARCH=aarch64 libucontext.a + + cp libucontext.a ${_sysroot}/usr/lib + + touch ${wrksrc}/.libucontext_build_done +} + _gcc_build() { local _args @@ -168,7 +187,7 @@ _gcc_build() { _args+=" --libexecdir=/usr/lib" _args+=" --target=${_triplet}" _args+=" --with-sysroot=${_sysroot}" - _args+=" --enable-languages=c,ada,c++,fortran,lto" + _args+=" --enable-languages=c,ada,c++,objc,obj-c++,go,fortran,lto" _args+=" --enable-libada" _args+=" --enable-lto" _args+=" --enable-default-pie" @@ -208,6 +227,7 @@ do_build() { _gcc_bootstrap _linux_headers _musl_build + _libucontext_build _gcc_build } @@ -263,6 +283,11 @@ do_install() { ln -svf libgnat-${_majorver}.so libgnat.so rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so + # We need to build libatomic in target gcc as gccgo needs it to + # build... but it's not needed at runtime, so remove it from the + # destdir so it doesn't conflict with the libatomic package + rm -f ${DESTDIR}/${_sysroot}/usr/lib/libatomic.* + # Remove unnecessary stuff rm -f ${DESTDIR}/usr/lib*/libiberty.a rm -rf ${DESTDIR}/usr/share diff --git a/srcpkgs/cross-arm-linux-gnueabi/files/non-nullness.patch b/srcpkgs/cross-arm-linux-gnueabi/files/non-nullness.patch deleted file mode 120000 index c8b653748fe..00000000000 --- a/srcpkgs/cross-arm-linux-gnueabi/files/non-nullness.patch +++ /dev/null @@ -1 +0,0 @@ -../../gcc/patches/non-nullness.patch \ No newline at end of file diff --git a/srcpkgs/cross-arm-linux-gnueabi/template b/srcpkgs/cross-arm-linux-gnueabi/template index 53b16264218..99b23a88538 100644 --- a/srcpkgs/cross-arm-linux-gnueabi/template +++ b/srcpkgs/cross-arm-linux-gnueabi/template @@ -1,8 +1,8 @@ # Template build file for 'cross-arm-linux-gnueabi' # _binutils_version=2.32 -_gcc_version=9.1.0 -_glibc_version=2.29 +_gcc_version=9.2.0 +_glibc_version=2.30 _linux_version=4.19 _triplet=arm-linux-gnueabi @@ -11,7 +11,7 @@ _archflags="-march=armv5te -msoft-float -mfloat-abi=soft" _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} -version=0.31 +version=0.32 revision=1 short_desc="GNU Cross toolchain for the ${_triplet} LE target (binutils/gcc/glibc)" maintainer="Orphaned " @@ -23,8 +23,8 @@ distfiles=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz" checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04 - 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0 - f3eeb8d57e25ca9fc13c2af3dae97754f9f643bc69229546828e3a240e2af04b + ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206 + e2c4114e569afbe7edbc29131a43be833850ab9a459d81beb2588016d2bbb8af 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1" lib32disabled=yes @@ -33,7 +33,7 @@ nopie=yes nodebug=yes create_wrksrc=yes -hostmakedepends="flex perl python3" +hostmakedepends="gcc-objc gcc-go flex perl python3" makedepends="isl15-devel libmpc-devel zlib-devel" depends="${pkgname}-libc-${version}_${revision}" nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a @@ -97,7 +97,6 @@ _gcc_bootstrap() { cd ${wrksrc}/gcc-${_gcc_version} _apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch - _apply_patch -p0 ${FILESDIR}/non-nullness.patch msg_normal "Building cross gcc bootstrap\n" @@ -238,7 +237,7 @@ _gcc_build() { _args+=" --libexecdir=/usr/lib" _args+=" --target=${_triplet}" _args+=" --with-sysroot=${_sysroot}" - _args+=" --enable-languages=c,ada,c++,fortran,lto" + _args+=" --enable-languages=c,ada,c++,objc,obj-c++,go,fortran,lto" _args+=" --with-gnu-as" _args+=" --with-gnu-ld" _args+=" --disable-multilib" @@ -255,7 +254,6 @@ _gcc_build() { _args+=" --enable-default-pie" _args+=" --enable-default-ssp" _args+=" --disable-libquadmath" - _args+=" --disable-libatomic" _args+=" --disable-libssp" _args+=" --disable-libmpx" _args+=" --disable-libmudflap" @@ -337,6 +335,11 @@ do_install() { ln -svf libgnat-${_majorver}.so libgnat.so rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so + # We need to build libatomic in target gcc as gccgo needs it to + # build... but it's not needed at runtime, so remove it from the + # destdir so it doesn't conflict with the libatomic package + rm -f ${DESTDIR}/${_sysroot}/usr/lib/libatomic.* + # Remove unnecessary stuff rm -f ${DESTDIR}/usr/lib*/libiberty.a rm -rf ${DESTDIR}/usr/share diff --git a/srcpkgs/cross-arm-linux-gnueabihf/files/non-nullness.patch b/srcpkgs/cross-arm-linux-gnueabihf/files/non-nullness.patch deleted file mode 120000 index c8b653748fe..00000000000 --- a/srcpkgs/cross-arm-linux-gnueabihf/files/non-nullness.patch +++ /dev/null @@ -1 +0,0 @@ -../../gcc/patches/non-nullness.patch \ No newline at end of file diff --git a/srcpkgs/cross-arm-linux-gnueabihf/template b/srcpkgs/cross-arm-linux-gnueabihf/template index 32006480282..85a724d3c87 100644 --- a/srcpkgs/cross-arm-linux-gnueabihf/template +++ b/srcpkgs/cross-arm-linux-gnueabihf/template @@ -1,8 +1,8 @@ # Template build file for 'cross-arm-linux-gnueabihf' # _binutils_version=2.32 -_gcc_version=9.1.0 -_glibc_version=2.29 +_gcc_version=9.2.0 +_glibc_version=2.30 _linux_version=4.19 _triplet=arm-linux-gnueabihf @@ -11,7 +11,7 @@ _archflags="-march=armv6 -mfpu=vfp -mfloat-abi=hard" _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} -version=0.31 +version=0.32 revision=1 short_desc="GNU Cross toolchain for the ${_triplet} LE target (binutils/gcc/glibc)" maintainer="Orphaned " @@ -23,8 +23,8 @@ distfiles=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz" checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04 - 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0 - f3eeb8d57e25ca9fc13c2af3dae97754f9f643bc69229546828e3a240e2af04b + ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206 + e2c4114e569afbe7edbc29131a43be833850ab9a459d81beb2588016d2bbb8af 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1" lib32disabled=yes @@ -33,7 +33,7 @@ nopie=yes nodebug=yes create_wrksrc=yes -hostmakedepends="flex perl python3" +hostmakedepends="gcc-objc gcc-go flex perl python3" makedepends="isl15-devel libmpc-devel zlib-devel" depends="${pkgname}-libc-${version}_${revision}" nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a @@ -98,7 +98,6 @@ _gcc_bootstrap() { cd ${wrksrc}/gcc-${_gcc_version} _apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch - _apply_patch -p0 ${FILESDIR}/non-nullness.patch msg_normal "Building cross gcc bootstrap\n" @@ -238,7 +237,7 @@ _gcc_build() { _args+=" --libexecdir=/usr/lib" _args+=" --target=${_triplet}" _args+=" --with-sysroot=${_sysroot}" - _args+=" --enable-languages=c,ada,c++,fortran,lto" + _args+=" --enable-languages=c,ada,c++,objc,obj-c++,go,fortran,lto" _args+=" --with-gnu-as" _args+=" --with-gnu-ld" _args+=" --disable-multilib" @@ -255,7 +254,6 @@ _gcc_build() { _args+=" --enable-default-pie" _args+=" --enable-default-ssp" _args+=" --disable-libquadmath" - _args+=" --disable-libatomic" _args+=" --disable-libssp" _args+=" --disable-libmpx" _args+=" --disable-libmudflap" @@ -337,6 +335,11 @@ do_install() { ln -svf libgnat-${_majorver}.so libgnat.so rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so + # We need to build libatomic in target gcc as gccgo needs it to + # build... but it's not needed at runtime, so remove it from the + # destdir so it doesn't conflict with the libatomic package + rm -f ${DESTDIR}/${_sysroot}/usr/lib/libatomic.* + # Remove unnecessary stuff rm -f ${DESTDIR}/usr/lib*/libiberty.a rm -rf ${DESTDIR}/usr/share diff --git a/srcpkgs/cross-arm-linux-musleabi/files/gccgo-musl.patch b/srcpkgs/cross-arm-linux-musleabi/files/gccgo-musl.patch new file mode 120000 index 00000000000..a093af85773 --- /dev/null +++ b/srcpkgs/cross-arm-linux-musleabi/files/gccgo-musl.patch @@ -0,0 +1 @@ +../../gcc/files/gccgo-musl.patch \ No newline at end of file diff --git a/srcpkgs/cross-arm-linux-musleabi/files/non-nullness.patch b/srcpkgs/cross-arm-linux-musleabi/files/non-nullness.patch deleted file mode 120000 index c8b653748fe..00000000000 --- a/srcpkgs/cross-arm-linux-musleabi/files/non-nullness.patch +++ /dev/null @@ -1 +0,0 @@ -../../gcc/patches/non-nullness.patch \ No newline at end of file diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template index f1434fe9b26..985af935aac 100644 --- a/srcpkgs/cross-arm-linux-musleabi/template +++ b/srcpkgs/cross-arm-linux-musleabi/template @@ -1,9 +1,10 @@ # Template build file for 'cross-arm-linux-musleabi' # _binutils_version=2.32 -_gcc_version=9.1.0 +_gcc_version=9.2.0 _musl_version=1.1.23 _linux_version=4.19 +_libucontext_version=0.9.0 _triplet=arm-linux-musleabi _fpuflags="--with-arch=armv5te --without-fp --with-float=soft" @@ -11,8 +12,8 @@ _archflags="-march=armv5te -msoft-float -mfloat-abi=soft" _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} -version=0.31 -revision=3 +version=0.32 +revision=1 short_desc="Cross toolchain for ARMv5 TE target (musl)" maintainer="Orphaned " homepage="https://www.voidlinux.org/" @@ -21,11 +22,13 @@ distfiles=" ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz - ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz" + ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz + https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz" checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04 - 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0 + ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206 8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa - 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1" + 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1 + 0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68" lib32disabled=yes nocross=yes @@ -33,7 +36,7 @@ nopie=yes nodebug=yes create_wrksrc=yes -hostmakedepends="flex perl python3" +hostmakedepends="gcc-objc gcc-go flex perl python3" makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel" nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a" @@ -84,10 +87,10 @@ _gcc_bootstrap() { cd ${wrksrc}/gcc-${_gcc_version} _apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch - _apply_patch -p0 ${FILESDIR}/non-nullness.patch _apply_patch -p0 ${FILESDIR}/musl-ada.patch _apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch _apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch + _apply_patch -p0 ${FILESDIR}/gccgo-musl.patch msg_normal "Building cross gcc bootstrap\n" @@ -155,6 +158,22 @@ _musl_build() { touch ${wrksrc}/.musl_build_done } +_libucontext_build() { + [ -f ${wrksrc}/.libucontext_build_done ] && return 0 + + cd ${wrksrc}/libucontext-${_libucontext_version} + msg_normal "Building cross libucontext\n" + + # it's ok if we're static only here + CC="${_triplet}-gcc" AR="${_triplet}-ar" AS="${_triplet}-as" \ + CFLAGS="-Os -pipe ${_archflags}" \ + make ARCH=arm libucontext.a + + cp libucontext.a ${_sysroot}/usr/lib + + touch ${wrksrc}/.libucontext_build_done +} + _gcc_build() { local _args @@ -169,7 +188,7 @@ _gcc_build() { _args="--prefix=/usr" _args+=" --target=${_triplet}" _args+=" --with-sysroot=${_sysroot}" - _args+=" --enable-languages=c,ada,c++,fortran,lto" + _args+=" --enable-languages=c,ada,c++,objc,obj-c++,go,fortran,lto" _args+=" --enable-libada" _args+=" --enable-lto" _args+=" --enable-default-pie" @@ -211,6 +230,7 @@ do_build() { _gcc_bootstrap _linux_headers _musl_build + _libucontext_build _gcc_build } @@ -261,6 +281,11 @@ do_install() { ln -svf libgnat-${_majorver}.so libgnat.so rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so + # We need to build libatomic in target gcc as gccgo needs it to + # build... but it's not needed at runtime, so remove it from the + # destdir so it doesn't conflict with the libatomic package + rm -f ${DESTDIR}/${_sysroot}/usr/lib/libatomic.* + # Remove unnecessary stuff rm -f ${DESTDIR}/usr/lib*/libiberty.a rm -rf ${DESTDIR}/usr/share diff --git a/srcpkgs/cross-arm-linux-musleabihf/files/gccgo-musl.patch b/srcpkgs/cross-arm-linux-musleabihf/files/gccgo-musl.patch new file mode 120000 index 00000000000..a093af85773 --- /dev/null +++ b/srcpkgs/cross-arm-linux-musleabihf/files/gccgo-musl.patch @@ -0,0 +1 @@ +../../gcc/files/gccgo-musl.patch \ No newline at end of file diff --git a/srcpkgs/cross-arm-linux-musleabihf/files/non-nullness.patch b/srcpkgs/cross-arm-linux-musleabihf/files/non-nullness.patch deleted file mode 120000 index c8b653748fe..00000000000 --- a/srcpkgs/cross-arm-linux-musleabihf/files/non-nullness.patch +++ /dev/null @@ -1 +0,0 @@ -../../gcc/patches/non-nullness.patch \ No newline at end of file diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template index 6b9194ebc65..a5b5fc028c7 100644 --- a/srcpkgs/cross-arm-linux-musleabihf/template +++ b/srcpkgs/cross-arm-linux-musleabihf/template @@ -1,9 +1,10 @@ # Template build file for 'cross-arm-linux-musleabihf' # _binutils_version=2.32 -_gcc_version=9.1.0 +_gcc_version=9.2.0 _musl_version=1.1.23 _linux_version=4.19 +_libucontext_version=0.9.0 _triplet=arm-linux-musleabihf _fpuflags="--with-arch=armv6 --with-fpu=vfp --with-float=hard" @@ -11,8 +12,8 @@ _archflags="-march=armv6 -mfpu=vfp -mfloat-abi=hard" _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} -version=0.31 -revision=3 +version=0.32 +revision=1 short_desc="Cross toolchain for ARMv6 LE Hard Float target (musl)" maintainer="Orphaned " homepage="https://www.voidlinux.org/" @@ -21,11 +22,13 @@ distfiles=" ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz - ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz" + ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz + https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz" checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04 - 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0 + ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206 8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa - 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1" + 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1 + 0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68" lib32disabled=yes nocross=yes @@ -33,7 +36,7 @@ nopie=yes nodebug=yes create_wrksrc=yes -hostmakedepends="flex perl python3" +hostmakedepends="gcc-objc gcc-go flex perl python3" makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel" nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a" @@ -84,10 +87,10 @@ _gcc_bootstrap() { cd ${wrksrc}/gcc-${_gcc_version} _apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch - _apply_patch -p0 ${FILESDIR}/non-nullness.patch _apply_patch -p0 ${FILESDIR}/musl-ada.patch _apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch _apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch + _apply_patch -p0 ${FILESDIR}/gccgo-musl.patch msg_normal "Building cross gcc bootstrap\n" @@ -155,6 +158,22 @@ _musl_build() { touch ${wrksrc}/.musl_build_done } +_libucontext_build() { + [ -f ${wrksrc}/.libucontext_build_done ] && return 0 + + cd ${wrksrc}/libucontext-${_libucontext_version} + msg_normal "Building cross libucontext\n" + + # it's ok if we're static only here + CC="${_triplet}-gcc" AR="${_triplet}-ar" AS="${_triplet}-as" \ + CFLAGS="-Os -pipe ${_archflags}" \ + make ARCH=arm libucontext.a + + cp libucontext.a ${_sysroot}/usr/lib + + touch ${wrksrc}/.libucontext_build_done +} + _gcc_build() { local _args [ -f ${wrksrc}/.gcc_build_done ] && return 0 @@ -168,7 +187,7 @@ _gcc_build() { _args="--prefix=/usr" _args+=" --target=${_triplet}" _args+=" --with-sysroot=${_sysroot}" - _args+=" --enable-languages=c,ada,c++,fortran,lto" + _args+=" --enable-languages=c,ada,c++,objc,obj-c++,go,fortran,lto" _args+=" --enable-libada" _args+=" --enable-lto" _args+=" --enable-default-pie" @@ -210,6 +229,7 @@ do_build() { _gcc_bootstrap _linux_headers _musl_build + _libucontext_build _gcc_build } @@ -260,6 +280,11 @@ do_install() { ln -svf libgnat-${_majorver}.so libgnat.so rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so + # We need to build libatomic in target gcc as gccgo needs it to + # build... but it's not needed at runtime, so remove it from the + # destdir so it doesn't conflict with the libatomic package + rm -f ${DESTDIR}/${_sysroot}/usr/lib/libatomic.* + # Remove unnecessary stuff rm -f ${DESTDIR}/usr/lib*/libiberty.a rm -rf ${DESTDIR}/usr/share diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf/files/non-nullness.patch b/srcpkgs/cross-armv7l-linux-gnueabihf/files/non-nullness.patch deleted file mode 120000 index c8b653748fe..00000000000 --- a/srcpkgs/cross-armv7l-linux-gnueabihf/files/non-nullness.patch +++ /dev/null @@ -1 +0,0 @@ -../../gcc/patches/non-nullness.patch \ No newline at end of file diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf/template b/srcpkgs/cross-armv7l-linux-gnueabihf/template index 23864834772..bb60304d610 100644 --- a/srcpkgs/cross-armv7l-linux-gnueabihf/template +++ b/srcpkgs/cross-armv7l-linux-gnueabihf/template @@ -1,8 +1,8 @@ # Template build file for 'cross-armv7l-linux-gnueabihf' # _binutils_version=2.32 -_gcc_version=9.1.0 -_glibc_version=2.29 +_gcc_version=9.2.0 +_glibc_version=2.30 _linux_version=4.19 _triplet=armv7l-linux-gnueabihf @@ -11,7 +11,7 @@ _archflags="-march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard" _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} -version=0.31 +version=0.32 revision=1 short_desc="GNU Cross toolchain for the ${_triplet} LE target (binutils/gcc/glibc)" maintainer="Orphaned " @@ -23,8 +23,8 @@ distfiles=" http://ftp.gnu.org/gnu/glibc/glibc-${_glibc_version}.tar.xz ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz" checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04 - 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0 - f3eeb8d57e25ca9fc13c2af3dae97754f9f643bc69229546828e3a240e2af04b + ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206 + e2c4114e569afbe7edbc29131a43be833850ab9a459d81beb2588016d2bbb8af 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1" lib32disabled=yes @@ -33,7 +33,7 @@ nopie=yes nodebug=yes create_wrksrc=yes -hostmakedepends="flex perl python3" +hostmakedepends="gcc-objc gcc-go flex perl python3" makedepends="isl15-devel libmpc-devel zlib-devel" depends="${pkgname}-libc-${version}_${revision}" nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a @@ -98,7 +98,6 @@ _gcc_bootstrap() { cd ${wrksrc}/gcc-${_gcc_version} _apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch - _apply_patch -p0 ${FILESDIR}/non-nullness.patch msg_normal "Building cross gcc bootstrap\n" @@ -239,7 +238,7 @@ _gcc_build() { _args+=" --libexecdir=/usr/lib" _args+=" --target=${_triplet}" _args+=" --with-sysroot=${_sysroot}" - _args+=" --enable-languages=c,ada,c++,fortran,lto" + _args+=" --enable-languages=c,ada,c++,objc,obj-c++,go,fortran,lto" _args+=" --with-gnu-as" _args+=" --with-gnu-ld" _args+=" --disable-multilib" @@ -256,7 +255,6 @@ _gcc_build() { _args+=" --enable-default-pie" _args+=" --enable-default-ssp" _args+=" --disable-libquadmath" - _args+=" --disable-libatomic" _args+=" --disable-libssp" _args+=" --disable-libmpx" _args+=" --disable-libmudflap" @@ -338,6 +336,11 @@ do_install() { ln -svf libgnat-${_majorver}.so libgnat.so rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so + # We need to build libatomic in target gcc as gccgo needs it to + # build... but it's not needed at runtime, so remove it from the + # destdir so it doesn't conflict with the libatomic package + rm -f ${DESTDIR}/${_sysroot}/usr/lib/libatomic.* + # Remove unnecessary stuff rm -f ${DESTDIR}/usr/lib*/libiberty.a rm -rf ${DESTDIR}/usr/share diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/files/gccgo-musl.patch b/srcpkgs/cross-armv7l-linux-musleabihf/files/gccgo-musl.patch new file mode 120000 index 00000000000..a093af85773 --- /dev/null +++ b/srcpkgs/cross-armv7l-linux-musleabihf/files/gccgo-musl.patch @@ -0,0 +1 @@ +../../gcc/files/gccgo-musl.patch \ No newline at end of file diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/files/non-nullness.patch b/srcpkgs/cross-armv7l-linux-musleabihf/files/non-nullness.patch deleted file mode 120000 index c8b653748fe..00000000000 --- a/srcpkgs/cross-armv7l-linux-musleabihf/files/non-nullness.patch +++ /dev/null @@ -1 +0,0 @@ -../../gcc/patches/non-nullness.patch \ No newline at end of file diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template index 37daba36ac9..5704eb067a9 100644 --- a/srcpkgs/cross-armv7l-linux-musleabihf/template +++ b/srcpkgs/cross-armv7l-linux-musleabihf/template @@ -1,9 +1,10 @@ # Template build file for 'cross-armv7l-linux-musleabihf' # _binutils_version=2.32 -_gcc_version=9.1.0 +_gcc_version=9.2.0 _musl_version=1.1.23 _linux_version=4.19 +_libucontext_version=0.9.0 _triplet=armv7l-linux-musleabihf _fpuflags="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard" @@ -11,8 +12,8 @@ _archflags="-march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard" _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} -version=0.31 -revision=3 +version=0.32 +revision=1 short_desc="Cross toolchain for ARMv7 LE Hard Float target (musl)" maintainer="Orphaned " homepage="https://www.voidlinux.org/" @@ -21,11 +22,13 @@ distfiles=" ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz - ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz" + ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz + https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz" checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04 - 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0 + ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206 8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa - 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1" + 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1 + 0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68" lib32disabled=yes nocross=yes @@ -33,7 +36,7 @@ nopie=yes nodebug=yes create_wrksrc=yes -hostmakedepends="flex perl python3" +hostmakedepends="gcc-objc gcc-go flex perl python3" makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel" nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a" @@ -84,10 +87,10 @@ _gcc_bootstrap() { cd ${wrksrc}/gcc-${_gcc_version} _apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch - _apply_patch -p0 ${FILESDIR}/non-nullness.patch _apply_patch -p0 ${FILESDIR}/musl-ada.patch _apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch _apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch + _apply_patch -p0 ${FILESDIR}/gccgo-musl.patch msg_normal "Building cross gcc bootstrap\n" @@ -156,6 +159,22 @@ _musl_build() { touch ${wrksrc}/.musl_build_done } +_libucontext_build() { + [ -f ${wrksrc}/.libucontext_build_done ] && return 0 + + cd ${wrksrc}/libucontext-${_libucontext_version} + msg_normal "Building cross libucontext\n" + + # it's ok if we're static only here + CC="${_triplet}-gcc" AR="${_triplet}-ar" AS="${_triplet}-as" \ + CFLAGS="-Os -pipe ${_archflags}" \ + make ARCH=arm libucontext.a + + cp libucontext.a ${_sysroot}/usr/lib + + touch ${wrksrc}/.libucontext_build_done +} + _gcc_build() { local _args @@ -170,7 +189,7 @@ _gcc_build() { _args="--prefix=/usr" _args+=" --target=${_triplet}" _args+=" --with-sysroot=${_sysroot}" - _args+=" --enable-languages=c,ada,c++,fortran,lto" + _args+=" --enable-languages=c,ada,c++,objc,obj-c++,go,fortran,lto" _args+=" --enable-libada" _args+=" --enable-lto" _args+=" --enable-default-pie" @@ -212,6 +231,7 @@ do_build() { _gcc_bootstrap _linux_headers _musl_build + _libucontext_build _gcc_build } @@ -262,6 +282,11 @@ do_install() { ln -svf libgnat-${_majorver}.so libgnat.so rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so + # We need to build libatomic in target gcc as gccgo needs it to + # build... but it's not needed at runtime, so remove it from the + # destdir so it doesn't conflict with the libatomic package + rm -f ${DESTDIR}/${_sysroot}/usr/lib/libatomic.* + # Remove unnecessary stuff rm -f ${DESTDIR}/usr/lib*/libiberty.a rm -rf ${DESTDIR}/usr/share diff --git a/srcpkgs/cross-i686-linux-musl/files/bug90756.patch b/srcpkgs/cross-i686-linux-musl/files/bug90756.patch deleted file mode 120000 index 02ae43b18b4..00000000000 --- a/srcpkgs/cross-i686-linux-musl/files/bug90756.patch +++ /dev/null @@ -1 +0,0 @@ -../../gcc/patches/bug90756.patch \ No newline at end of file diff --git a/srcpkgs/cross-i686-linux-musl/files/gccgo-musl.patch b/srcpkgs/cross-i686-linux-musl/files/gccgo-musl.patch new file mode 120000 index 00000000000..a093af85773 --- /dev/null +++ b/srcpkgs/cross-i686-linux-musl/files/gccgo-musl.patch @@ -0,0 +1 @@ +../../gcc/files/gccgo-musl.patch \ No newline at end of file diff --git a/srcpkgs/cross-i686-linux-musl/files/non-nullness.patch b/srcpkgs/cross-i686-linux-musl/files/non-nullness.patch deleted file mode 120000 index c8b653748fe..00000000000 --- a/srcpkgs/cross-i686-linux-musl/files/non-nullness.patch +++ /dev/null @@ -1 +0,0 @@ -../../gcc/patches/non-nullness.patch \ No newline at end of file diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template index 905bacb0e27..25d8042180a 100644 --- a/srcpkgs/cross-i686-linux-musl/template +++ b/srcpkgs/cross-i686-linux-musl/template @@ -1,17 +1,18 @@ # Template build file for 'cross-i686-linux-musl' # _binutils_version=2.32 -_gcc_version=9.1.0 +_gcc_version=9.2.0 _musl_version=1.1.23 _linux_version=4.19 +_libucontext_version=0.9.0 _triplet=i686-linux-musl _sysroot="/usr/${_triplet}" _archflags="-march=i686" pkgname=cross-${_triplet} -version=0.31 -revision=4 +version=0.32 +revision=1 short_desc="Cross toolchain for i686 target (musl)" maintainer="Orphaned " homepage="https://www.voidlinux.org/" @@ -20,18 +21,20 @@ distfiles=" ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz - ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz" + ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz + https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz" checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04 - 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0 + ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206 8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa - 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1" + 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1 + 0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68" lib32disabled=yes nocross=yes nopie=yes nodebug=yes create_wrksrc=yes -hostmakedepends="flex perl python3" +hostmakedepends="gcc-objc gcc-go flex perl python3" makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel" nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a" @@ -83,12 +86,11 @@ _gcc_bootstrap() { cd ${wrksrc}/gcc-${_gcc_version} _apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch - _apply_patch -p0 ${FILESDIR}/non-nullness.patch _apply_patch -p0 ${FILESDIR}/no-stack_chk_fail_local.patch _apply_patch -p0 ${FILESDIR}/musl-ada.patch _apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch _apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch - _apply_patch -p0 ${FILESDIR}/bug90756.patch + _apply_patch -p0 ${FILESDIR}/gccgo-musl.patch msg_normal "Building cross gcc bootstrap\n" @@ -155,6 +157,25 @@ _musl_build() { touch ${wrksrc}/.musl_build_done } +_libucontext_build() { + [ -f ${wrksrc}/.libucontext_build_done ] && return 0 + + cd ${wrksrc}/libucontext-${_libucontext_version} + msg_normal "Building cross libucontext\n" + + sed -i arch/x86/startcontext.S -e \ + "s;__i686.get_pc_thunk.bx;i686_get_pc_thunk_bx;g" + + # it's ok if we're static only here + CC="${_triplet}-gcc" AR="${_triplet}-ar" AS="${_triplet}-as" \ + CFLAGS="-Os -pipe ${_archflags}" \ + make ARCH=x86 libucontext.a + + cp libucontext.a ${_sysroot}/usr/lib + + touch ${wrksrc}/.libucontext_build_done +} + _gcc_build() { local _args [ -f ${wrksrc}/.gcc_build_done ] && return 0 @@ -168,7 +189,7 @@ _gcc_build() { _args="--target=${_triplet}" _args+=" --with-sysroot=${_sysroot}" _args+=" --prefix=/usr" - _args+=" --enable-languages=c,ada,c++,fortran,lto" + _args+=" --enable-languages=c,ada,c++,objc,obj-c++,go,fortran,lto" _args+=" --enable-lto" _args+=" --enable-default-pie" _args+=" --enable-default-ssp" @@ -209,6 +230,7 @@ do_build() { _gcc_bootstrap _linux_headers _musl_build + _libucontext_build _gcc_build } @@ -266,6 +288,11 @@ do_install() { ln -svf libgnat-${_majorver}.so libgnat.so rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so + # We need to build libatomic in target gcc as gccgo needs it to + # build... but it's not needed at runtime, so remove it from the + # destdir so it doesn't conflict with the libatomic package + rm -f ${DESTDIR}/${_sysroot}/usr/lib/libatomic.* + # Remove unnecessary stuff rm -f ${DESTDIR}/usr/lib*/libiberty.a rm -rf ${DESTDIR}/usr/share diff --git a/srcpkgs/cross-i686-pc-linux-gnu/files/bug90756.patch b/srcpkgs/cross-i686-pc-linux-gnu/files/bug90756.patch deleted file mode 120000 index 02ae43b18b4..00000000000 --- a/srcpkgs/cross-i686-pc-linux-gnu/files/bug90756.patch +++ /dev/null @@ -1 +0,0 @@ -../../gcc/patches/bug90756.patch \ No newline at end of file diff --git a/srcpkgs/cross-i686-pc-linux-gnu/files/non-nullness.patch b/srcpkgs/cross-i686-pc-linux-gnu/files/non-nullness.patch deleted file mode 120000 index c8b653748fe..00000000000 --- a/srcpkgs/cross-i686-pc-linux-gnu/files/non-nullness.patch +++ /dev/null @@ -1 +0,0 @@ -../../gcc/patches/non-nullness.patch \ No newline at end of file diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template index 34dc2a3827e..c5b0e414cae 100644 --- a/srcpkgs/cross-i686-pc-linux-gnu/template +++ b/srcpkgs/cross-i686-pc-linux-gnu/template @@ -1,8 +1,8 @@ # Template build file for 'cross-i686-pc-linux-gnu' # _binutils_version=2.32 -_gcc_version=9.1.0 -_glibc_version=2.29 +_gcc_version=9.2.0 +_glibc_version=2.30 _linux_version=4.19 _triplet=i686-pc-linux-gnu @@ -10,8 +10,8 @@ _archflags="-march=i686 -mtune=generic" _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} -version=0.31 -revision=2 +version=0.32 +revision=1 short_desc="GNU Cross toolchain for the ${_triplet} target (binutils/gcc/glibc)" maintainer="Orphaned " homepage="https://www.voidlinux.org/" @@ -22,8 +22,8 @@ distfiles=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz" checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04 - 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0 - f3eeb8d57e25ca9fc13c2af3dae97754f9f643bc69229546828e3a240e2af04b + ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206 + e2c4114e569afbe7edbc29131a43be833850ab9a459d81beb2588016d2bbb8af 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1" archs="armv6l armv7l x86_64" @@ -32,7 +32,7 @@ nopie=yes nodebug=yes lib32disabled=yes create_wrksrc=yes -hostmakedepends="flex perl python3" +hostmakedepends="gcc-objc gcc-go flex perl python3" makedepends="isl15-devel libmpc-devel zlib-devel" depends="${pkgname}-libc-${version}_${revision}" nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a @@ -81,9 +81,7 @@ _gcc_bootstrap() { cd ${wrksrc}/gcc-${_gcc_version} _apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch - _apply_patch -p0 ${FILESDIR}/non-nullness.patch _apply_patch -p0 ${FILESDIR}/no-stack_chk_fail_local.patch - _apply_patch -p0 ${FILESDIR}/bug90756.patch msg_normal "Building cross gcc bootstrap\n" @@ -235,7 +233,7 @@ _gcc_build() { _args+=" --prefix=/usr" _args+=" --libdir=/usr/lib" _args+=" --with-sysroot=${_sysroot}" - _args+=" --enable-languages=c,ada,c++,fortran,lto" + _args+=" --enable-languages=c,ada,c++,objc,obj-c++,go,fortran,lto" _args+=" --with-gnu-as" _args+=" --with-gnu-ld" _args+=" --disable-multilib" @@ -252,7 +250,6 @@ _gcc_build() { _args+=" --enable-default-ssp" _args+=" --enable-gnu-indirect-function" _args+=" --enable-libquadmath" - _args+=" --disable-libatomic" _args+=" --disable-libssp" _args+=" --disable-libmpx" _args+=" --disable-libmudflap" @@ -338,6 +335,11 @@ do_install() { ln -svf libgnat-${_majorver}.so libgnat.so rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so + # We need to build libatomic in target gcc as gccgo needs it to + # build... but it's not needed at runtime, so remove it from the + # destdir so it doesn't conflict with the libatomic package + rm -f ${DESTDIR}/${_sysroot}/usr/lib/libatomic.* + # Remove unnecessary stuff rm -f ${DESTDIR}/usr/lib*/libiberty.a rm -rf ${DESTDIR}/usr/share diff --git a/srcpkgs/cross-mips-linux-musl/files/non-nullness.patch b/srcpkgs/cross-mips-linux-musl/files/non-nullness.patch deleted file mode 120000 index c8b653748fe..00000000000 --- a/srcpkgs/cross-mips-linux-musl/files/non-nullness.patch +++ /dev/null @@ -1 +0,0 @@ -../../gcc/patches/non-nullness.patch \ No newline at end of file diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template index a129e937dbf..213d288cafc 100644 --- a/srcpkgs/cross-mips-linux-musl/template +++ b/srcpkgs/cross-mips-linux-musl/template @@ -1,7 +1,7 @@ # Template build file for 'cross-mips-linux-musl' # _binutils_version=2.32 -_gcc_version=9.1.0 +_gcc_version=9.2.0 _musl_version=1.1.23 _linux_version=4.19 @@ -11,8 +11,8 @@ _archflags="-march=mips32r2 -msoft-float" _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} -version=0.31 -revision=3 +version=0.32 +revision=1 short_desc="Cross toolchain for MIPS32r2 BE softfloat target (musl)" maintainer="Orphaned " homepage="https://www.voidlinux.org/" @@ -23,7 +23,7 @@ distfiles=" http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz" checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04 - 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0 + ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206 8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1" @@ -33,7 +33,7 @@ nopie=yes nodebug=yes create_wrksrc=yes -hostmakedepends="flex perl python3" +hostmakedepends="gcc-objc flex perl python3" makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel" nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a" @@ -84,7 +84,6 @@ _gcc_bootstrap() { cd ${wrksrc}/gcc-${_gcc_version} _apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch - _apply_patch -p0 ${FILESDIR}/non-nullness.patch _apply_patch -p0 ${FILESDIR}/musl-ada.patch _apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch _apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch @@ -169,7 +168,7 @@ _gcc_build() { _args+=" --target=${_triplet}" _args+=" --with-sysroot=${_sysroot}" _args+=" --libexecdir=/usr/lib" - _args+=" --enable-languages=c,ada,c++,fortran,lto" + _args+=" --enable-languages=c,ada,c++,objc,obj-c++,fortran,lto" _args+=" --enable-libada" _args+=" --enable-lto" _args+=" --enable-default-pie" @@ -180,6 +179,7 @@ _gcc_build() { _args+=" --disable-libquadmath" _args+=" --disable-libmpx" _args+=" --disable-libmudflap" + _args+=" --disable-libatomic" _args+=" --enable-shared" _args+=" ${_fpuflags}" diff --git a/srcpkgs/cross-mips-linux-muslhf/files/non-nullness.patch b/srcpkgs/cross-mips-linux-muslhf/files/non-nullness.patch deleted file mode 120000 index c8b653748fe..00000000000 --- a/srcpkgs/cross-mips-linux-muslhf/files/non-nullness.patch +++ /dev/null @@ -1 +0,0 @@ -../../gcc/patches/non-nullness.patch \ No newline at end of file diff --git a/srcpkgs/cross-mips-linux-muslhf/template b/srcpkgs/cross-mips-linux-muslhf/template index 5ad364ecf40..84892aa48ba 100644 --- a/srcpkgs/cross-mips-linux-muslhf/template +++ b/srcpkgs/cross-mips-linux-muslhf/template @@ -1,7 +1,7 @@ # Template build file for 'cross-mips-linux-muslhf' # _binutils_version=2.32 -_gcc_version=9.1.0 +_gcc_version=9.2.0 _musl_version=1.1.23 _linux_version=4.19 @@ -11,8 +11,8 @@ _archflags="-march=mips32r2 -mhard-float" _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} -version=0.31 -revision=3 +version=0.32 +revision=1 short_desc="Cross toolchain for MIPS32r2 BE hardfloat target (musl)" maintainer="hipperson0 " homepage="https://www.voidlinux.org/" @@ -23,7 +23,7 @@ distfiles=" https://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz" checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04 - 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0 + ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206 8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1" @@ -33,7 +33,7 @@ nopie=yes nodebug=yes create_wrksrc=yes -hostmakedepends="flex perl python3" +hostmakedepends="gcc-objc flex perl python3" makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel" nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a" @@ -84,7 +84,6 @@ _gcc_bootstrap() { cd ${wrksrc}/gcc-${_gcc_version} _apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch - _apply_patch -p0 ${FILESDIR}/non-nullness.patch _apply_patch -p0 ${FILESDIR}/musl-ada.patch _apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch _apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch @@ -169,7 +168,7 @@ _gcc_build() { _args+=" --target=${_triplet}" _args+=" --with-sysroot=${_sysroot}" _args+=" --libexecdir=/usr/lib" - _args+=" --enable-languages=c,ada,c++,fortran,lto" + _args+=" --enable-languages=c,ada,c++,objc,obj-c++,fortran,lto" _args+=" --enable-libada" _args+=" --enable-lto" _args+=" --enable-default-pie" @@ -180,6 +179,7 @@ _gcc_build() { _args+=" --disable-libquadmath" _args+=" --disable-libmpx" _args+=" --disable-libmudflap" + _args+=" --disable-libatomic" _args+=" --enable-shared" _args+=" ${_fpuflags}" diff --git a/srcpkgs/cross-mipsel-linux-musl/files/non-nullness.patch b/srcpkgs/cross-mipsel-linux-musl/files/non-nullness.patch deleted file mode 120000 index c8b653748fe..00000000000 --- a/srcpkgs/cross-mipsel-linux-musl/files/non-nullness.patch +++ /dev/null @@ -1 +0,0 @@ -../../gcc/patches/non-nullness.patch \ No newline at end of file diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template index 1621d1005d5..20cbe0fed03 100644 --- a/srcpkgs/cross-mipsel-linux-musl/template +++ b/srcpkgs/cross-mipsel-linux-musl/template @@ -1,7 +1,7 @@ # Template build file for 'cross-mipsel-linux-musl' # _binutils_version=2.32 -_gcc_version=9.1.0 +_gcc_version=9.2.0 _musl_version=1.1.23 _linux_version=4.19 @@ -11,8 +11,8 @@ _archflags="-march=mips32r2 -msoft-float" _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} -version=0.31 -revision=3 +version=0.32 +revision=1 short_desc="Cross toolchain for MIPS32r2 LE softfloat target (musl)" maintainer="Orphaned " homepage="https://www.voidlinux.org/" @@ -23,7 +23,7 @@ distfiles=" http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz" checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04 - 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0 + ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206 8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1" @@ -33,7 +33,7 @@ nopie=yes nodebug=yes create_wrksrc=yes -hostmakedepends="flex perl python3" +hostmakedepends="gcc-objc flex perl python3" makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel" nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a" @@ -84,7 +84,6 @@ _gcc_bootstrap() { cd ${wrksrc}/gcc-${_gcc_version} _apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch - _apply_patch -p0 ${FILESDIR}/non-nullness.patch _apply_patch -p0 ${FILESDIR}/musl-ada.patch _apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch _apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch @@ -169,7 +168,7 @@ _gcc_build() { _args+=" --libexecdir=/usr/lib" _args+=" --target=${_triplet}" _args+=" --with-sysroot=${_sysroot}" - _args+=" --enable-languages=c,ada,c++,fortran,lto" + _args+=" --enable-languages=c,ada,c++,objc,obj-c++,fortran,lto" _args+=" --enable-libada" _args+=" --enable-lto" _args+=" --enable-default-pie" @@ -180,6 +179,7 @@ _gcc_build() { _args+=" --disable-libquadmath" _args+=" --disable-libmpx" _args+=" --disable-libmudflap" + _args+=" --disable-libatomic" _args+=" --enable-shared" _args+=" ${_fpuflags}" diff --git a/srcpkgs/cross-mipsel-linux-muslhf/files/non-nullness.patch b/srcpkgs/cross-mipsel-linux-muslhf/files/non-nullness.patch deleted file mode 120000 index c8b653748fe..00000000000 --- a/srcpkgs/cross-mipsel-linux-muslhf/files/non-nullness.patch +++ /dev/null @@ -1 +0,0 @@ -../../gcc/patches/non-nullness.patch \ No newline at end of file diff --git a/srcpkgs/cross-mipsel-linux-muslhf/template b/srcpkgs/cross-mipsel-linux-muslhf/template index 3f02ba22d27..d2a692b48fe 100644 --- a/srcpkgs/cross-mipsel-linux-muslhf/template +++ b/srcpkgs/cross-mipsel-linux-muslhf/template @@ -1,7 +1,7 @@ # Template build file for 'cross-mipsel-linux-muslhf' # _binutils_version=2.32 -_gcc_version=9.1.0 +_gcc_version=9.2.0 _musl_version=1.1.23 _linux_version=4.19 @@ -11,8 +11,8 @@ _archflags="-march=mips32r2 -mhard-float" _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} -version=0.31 -revision=3 +version=0.32 +revision=1 short_desc="Cross toolchain for MIPS32r2 LE hardfloat target (musl)" maintainer="Orphaned " homepage="https://www.voidlinux.org/" @@ -23,7 +23,7 @@ distfiles=" http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz" checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04 - 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0 + ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206 8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1" @@ -33,7 +33,7 @@ nopie=yes nodebug=yes create_wrksrc=yes -hostmakedepends="flex perl python3" +hostmakedepends="gcc-objc flex perl python3" makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel" nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a" @@ -84,7 +84,6 @@ _gcc_bootstrap() { cd ${wrksrc}/gcc-${_gcc_version} _apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch - _apply_patch -p0 ${FILESDIR}/non-nullness.patch _apply_patch -p0 ${FILESDIR}/musl-ada.patch _apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch _apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch @@ -169,7 +168,7 @@ _gcc_build() { _args+=" --libexecdir=/usr/lib" _args+=" --target=${_triplet}" _args+=" --with-sysroot=${_sysroot}" - _args+=" --enable-languages=c,ada,c++,fortran,lto" + _args+=" --enable-languages=c,ada,c++,objc,obj-c++,fortran,lto" _args+=" --enable-libada" _args+=" --enable-lto" _args+=" --enable-default-pie" @@ -180,6 +179,7 @@ _gcc_build() { _args+=" --disable-libquadmath" _args+=" --disable-libmpx" _args+=" --disable-libmudflap" + _args+=" --disable-libatomic" _args+=" --enable-shared" _args+=" ${_fpuflags}" diff --git a/srcpkgs/cross-powerpc-linux-gnu/files/non-nullness.patch b/srcpkgs/cross-powerpc-linux-gnu/files/non-nullness.patch deleted file mode 120000 index c8b653748fe..00000000000 --- a/srcpkgs/cross-powerpc-linux-gnu/files/non-nullness.patch +++ /dev/null @@ -1 +0,0 @@ -../../gcc/patches/non-nullness.patch \ No newline at end of file diff --git a/srcpkgs/cross-powerpc-linux-gnu/template b/srcpkgs/cross-powerpc-linux-gnu/template index d599721bad6..c36b8c1c307 100644 --- a/srcpkgs/cross-powerpc-linux-gnu/template +++ b/srcpkgs/cross-powerpc-linux-gnu/template @@ -1,8 +1,7 @@ -# Template build file for 'cross-powerpc-linux-gnu' -# +# Template file for 'cross-powerpc-linux-gnu' _binutils_version=2.32 -_gcc_version=9.1.0 -_glibc_version=2.29 +_gcc_version=9.2.0 +_glibc_version=2.30 _linux_version=4.19 _triplet=powerpc-linux-gnu @@ -10,7 +9,7 @@ _archflags="-mcpu=powerpc -msecure-plt" _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} -version=0.31 +version=0.32 revision=1 short_desc="GNU Cross toolchain for the ${_triplet} target (binutils/gcc/glibc)" maintainer="Thomas Batten " @@ -22,15 +21,15 @@ distfiles=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz" checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04 - 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0 - f3eeb8d57e25ca9fc13c2af3dae97754f9f643bc69229546828e3a240e2af04b + ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206 + e2c4114e569afbe7edbc29131a43be833850ab9a459d81beb2588016d2bbb8af 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1" lib32disabled=yes nocross=yes nopie=yes create_wrksrc=yes -hostmakedepends="flex perl python3" +hostmakedepends="gcc-objc gcc-go flex perl python3" makedepends="isl15-devel libmpc-devel zlib-devel" depends="${pkgname}-libc-${version}_${revision}" nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a @@ -95,7 +94,6 @@ _gcc_bootstrap() { cd ${wrksrc}/gcc-${_gcc_version} _apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch - _apply_patch -p0 ${FILESDIR}/non-nullness.patch msg_normal "Building cross gcc bootstrap\n" @@ -236,7 +234,7 @@ _gcc_build() { _args+=" --libdir=/usr/lib" _args+=" --target=${_triplet}" _args+=" --with-sysroot=${_sysroot}" - _args+=" --enable-languages=c,ada,c++,fortran,lto" + _args+=" --enable-languages=c,ada,c++,objc,obj-c++,go,fortran,lto" _args+=" --with-gnu-as" _args+=" --with-gnu-ld" _args+=" --disable-multilib" @@ -252,7 +250,6 @@ _gcc_build() { _args+=" --enable-default-pie" _args+=" --enable-default-ssp" _args+=" --disable-libquadmath" - _args+=" --disable-libatomic" _args+=" --disable-libssp" _args+=" --disable-libmudflap" _args+=" --disable-libsanitizer" @@ -328,14 +325,19 @@ do_install() { cd ${wrksrc}/glibc-build make install_root=${DESTDIR}/${_sysroot} install install-headers - # symlinks for gnarl and gnat shared libraries - _majorver=${_gcc_version%.*.*} - _adalib=usr/lib/gcc/${_triplet}/${_gcc_version}/adalib - mv -v ${DESTDIR}/${_adalib}/libgnarl-${_majorver}.so ${DESTDIR}/${_sysroot}/usr/lib - mv -v ${DESTDIR}/${_adalib}/libgnat-${_majorver}.so ${DESTDIR}/${_sysroot}/usr/lib - ln -svf libgnarl-${_majorver}.so libgnarl.so - ln -svf libgnat-${_majorver}.so libgnat.so - rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so + # symlinks for gnarl and gnat shared libraries + _majorver=${_gcc_version%.*.*} + _adalib=usr/lib/gcc/${_triplet}/${_gcc_version}/adalib + mv -v ${DESTDIR}/${_adalib}/libgnarl-${_majorver}.so ${DESTDIR}/${_sysroot}/usr/lib + mv -v ${DESTDIR}/${_adalib}/libgnat-${_majorver}.so ${DESTDIR}/${_sysroot}/usr/lib + ln -svf libgnarl-${_majorver}.so libgnarl.so + ln -svf libgnat-${_majorver}.so libgnat.so + rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so + + # We need to build libatomic in target gcc as gccgo needs it to + # build... but it's not needed at runtime, so remove it from the + # destdir so it doesn't conflict with the libatomic package + rm -f ${DESTDIR}/${_sysroot}/usr/lib/libatomic.* # Remove unnecessary stuff rm -f ${DESTDIR}/usr/lib*/libiberty.a diff --git a/srcpkgs/cross-powerpc-linux-musl/files/gccgo-musl.patch b/srcpkgs/cross-powerpc-linux-musl/files/gccgo-musl.patch new file mode 120000 index 00000000000..a093af85773 --- /dev/null +++ b/srcpkgs/cross-powerpc-linux-musl/files/gccgo-musl.patch @@ -0,0 +1 @@ +../../gcc/files/gccgo-musl.patch \ No newline at end of file diff --git a/srcpkgs/cross-powerpc-linux-musl/files/non-nullness.patch b/srcpkgs/cross-powerpc-linux-musl/files/non-nullness.patch deleted file mode 120000 index c8b653748fe..00000000000 --- a/srcpkgs/cross-powerpc-linux-musl/files/non-nullness.patch +++ /dev/null @@ -1 +0,0 @@ -../../gcc/patches/non-nullness.patch \ No newline at end of file diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template index 856e8fb0885..9d61d406ace 100644 --- a/srcpkgs/cross-powerpc-linux-musl/template +++ b/srcpkgs/cross-powerpc-linux-musl/template @@ -1,9 +1,9 @@ -# Template build file for 'cross-powerpc-linux-musl' -# +# Template file for 'cross-powerpc-linux-musl' _binutils_version=2.32 -_gcc_version=9.1.0 +_gcc_version=9.2.0 _musl_version=1.1.23 _linux_version=4.19 +_libucontext_version=0.9.0 _triplet=powerpc-linux-musl _fpuflags= @@ -11,8 +11,8 @@ _archflags="-mcpu=powerpc -msecure-plt" _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} -version=0.31 -revision=3 +version=0.32 +revision=1 short_desc="Cross toolchain for PowerPC (musl)" maintainer="Thomas Batten " @@ -21,13 +21,14 @@ license="GPL-3.0-or-later, GPL-2.0-only, MIT" distfiles=" ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz + http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz - http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz" -checksum=" - 0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04 - 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0 + https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz" +checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04 + ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206 + 8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1 - 8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa" + 0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68" lib32disabled=yes nocross=yes @@ -36,7 +37,7 @@ nodebug=yes create_wrksrc=yes archs="i686* x86_64* ppc64*" -hostmakedepends="flex perl python3" +hostmakedepends="gcc-objc gcc-go flex perl python3" makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel" nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a" @@ -86,13 +87,13 @@ _gcc_bootstrap() { cd ${wrksrc}/gcc-${_gcc_version} _apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch - _apply_patch -p0 ${FILESDIR}/non-nullness.patch _apply_patch -p0 ${FILESDIR}/musl-ada.patch _apply_patch -p0 ${FILESDIR}/no-stack_chk_fail_local.patch _apply_patch -p0 ${FILESDIR}/0010-ldbl128-config.patch _apply_patch -p0 ${FILESDIR}/libgcc-musl-ldbl128-config.patch _apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch _apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch + _apply_patch -p0 ${FILESDIR}/gccgo-musl.patch msg_normal "Building cross gcc bootstrap\n" @@ -166,6 +167,22 @@ _musl_build() { touch ${wrksrc}/.musl_build_done } +_libucontext_build() { + [ -f ${wrksrc}/.libucontext_build_done ] && return 0 + + cd ${wrksrc}/libucontext-${_libucontext_version} + msg_normal "Building cross libucontext\n" + + # it's ok if we're static only here + CC="${_triplet}-gcc" AR="${_triplet}-ar" AS="${_triplet}-as" \ + CFLAGS="-Os -pipe ${_archflags}" \ + make ARCH=ppc libucontext.a + + cp libucontext.a ${_sysroot}/usr/lib + + touch ${wrksrc}/.libucontext_build_done +} + _gcc_build() { local _args @@ -181,7 +198,7 @@ _gcc_build() { _args+=" --target=${_triplet}" _args+=" --with-sysroot=${_sysroot}" _args+=" --libexecdir=/usr/lib" - _args+=" --enable-languages=c,ada,c++,fortran,lto" + _args+=" --enable-languages=c,ada,c++,objc,obj-c++,go,fortran,lto" _args+=" --enable-lto" _args+=" --enable-libada" _args+=" --enable-default-pie" @@ -226,6 +243,7 @@ do_build() { _gcc_bootstrap _linux_headers _musl_build + _libucontext_build _gcc_build } @@ -268,15 +286,20 @@ do_install() { ln -sf libc.so ${DESTDIR}/${_sysroot}/usr/lib/ld-musl-powerpc.so.1 ln -sf libc.so ${DESTDIR}/${_sysroot}/usr/lib/ld-musl-powerpc-sf.so.1 - # symlinks for gnarl and gnat shared libraries - _majorver=${_gcc_version%.*.*} - _adalib=usr/lib/gcc/${_triplet}/${_gcc_version}/adalib - mv -v ${DESTDIR}/${_adalib}/libgnarl-${_majorver}.so ${DESTDIR}/${_sysroot}/usr/lib - mv -v ${DESTDIR}/${_adalib}/libgnat-${_majorver}.so ${DESTDIR}/${_sysroot}/usr/lib - ln -svf libgnarl-${_majorver}.so libgnarl.so - ln -svf libgnat-${_majorver}.so libgnat.so + # symlinks for gnarl and gnat shared libraries + _majorver=${_gcc_version%.*.*} + _adalib=usr/lib/gcc/${_triplet}/${_gcc_version}/adalib + mv -v ${DESTDIR}/${_adalib}/libgnarl-${_majorver}.so ${DESTDIR}/${_sysroot}/usr/lib + mv -v ${DESTDIR}/${_adalib}/libgnat-${_majorver}.so ${DESTDIR}/${_sysroot}/usr/lib + ln -svf libgnarl-${_majorver}.so libgnarl.so + ln -svf libgnat-${_majorver}.so libgnat.so rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so + # We need to build libatomic in target gcc as gccgo needs it to + # build... but it's not needed at runtime, so remove it from the + # destdir so it doesn't conflict with the libatomic package + rm -f ${DESTDIR}/${_sysroot}/usr/lib/libatomic.* + # Remove unnecessary stuff rm -f ${DESTDIR}/usr/lib*/libiberty.a rm -rf ${DESTDIR}/usr/share diff --git a/srcpkgs/cross-powerpc64-linux-gnu/files/darn.patch b/srcpkgs/cross-powerpc64-linux-gnu/files/darn.patch new file mode 120000 index 00000000000..dc81f1f9657 --- /dev/null +++ b/srcpkgs/cross-powerpc64-linux-gnu/files/darn.patch @@ -0,0 +1 @@ +../../gcc/patches/darn.patch \ No newline at end of file diff --git a/srcpkgs/cross-powerpc64-linux-gnu/files/non-nullness.patch b/srcpkgs/cross-powerpc64-linux-gnu/files/non-nullness.patch deleted file mode 120000 index c8b653748fe..00000000000 --- a/srcpkgs/cross-powerpc64-linux-gnu/files/non-nullness.patch +++ /dev/null @@ -1 +0,0 @@ -../../gcc/patches/non-nullness.patch \ No newline at end of file diff --git a/srcpkgs/cross-powerpc64-linux-gnu/template b/srcpkgs/cross-powerpc64-linux-gnu/template index 51973934ea6..9788de4ffc1 100644 --- a/srcpkgs/cross-powerpc64-linux-gnu/template +++ b/srcpkgs/cross-powerpc64-linux-gnu/template @@ -1,14 +1,14 @@ # Template file for 'cross-powerpc64le-linux-gnu' _binutils_version=2.32 -_gcc_version=9.1.0 -_glibc_version=2.29 +_gcc_version=9.2.0 +_glibc_version=2.30 _linux_version=4.19 _triplet="powerpc64-linux-gnu" _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} -version=0.31 +version=0.32 revision=1 short_desc="GNU cross toolchain for the ${_triplet} targets (binutils/gcc/glibc)" maintainer="Jürgen Buchmüller " @@ -20,8 +20,8 @@ distfiles=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz" checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04 - 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0 - f3eeb8d57e25ca9fc13c2af3dae97754f9f643bc69229546828e3a240e2af04b + ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206 + e2c4114e569afbe7edbc29131a43be833850ab9a459d81beb2588016d2bbb8af 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1" lib32disabled=yes @@ -29,7 +29,7 @@ nocross=yes nopie=yes nodebug=yes create_wrksrc=yes -hostmakedepends="flex perl python3" +hostmakedepends="gcc-objc gcc-go flex perl python3" makedepends="isl15-devel libmpc-devel zlib-devel" nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a" @@ -81,7 +81,7 @@ _gcc_bootstrap() { cd ${wrksrc}/gcc-${_gcc_version} _apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch - _apply_patch -p0 ${FILESDIR}/non-nullness.patch + _apply_patch -p0 ${FILESDIR}/darn.patch _apply_patch -p0 ${FILESDIR}/ppc64-pure64.patch sed -i 's/lib64/lib/' gcc/config/rs6000/linux64.h @@ -241,7 +241,7 @@ _gcc_build() { _args+=" --target=${_triplet}" _args+=" --with-sysroot=${_sysroot}" _args+=" --with-abi=elfv2" - _args+=" --enable-languages=c,ada,c++,fortran,lto" + _args+=" --enable-languages=c,ada,c++,objc,obj-c++,go,fortran,lto" _args+=" --enable-secureplt" _args+=" --enable-targets=powerpcle-linux" _args+=" --with-gnu-as" @@ -338,6 +338,11 @@ do_install() { ln -svf libgnat-${_majorver}.so libgnat.so rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so + # We need to build libatomic in target gcc as gccgo needs it to + # build... but it's not needed at runtime, so remove it from the + # destdir so it doesn't conflict with the libatomic package + rm -f ${DESTDIR}/${_sysroot}/usr/lib/libatomic.* + # Remove unnecessary stuff rm -f ${DESTDIR}/usr/lib*/libiberty.a rm -rf ${DESTDIR}/usr/share diff --git a/srcpkgs/cross-powerpc64-linux-musl/files/darn.patch b/srcpkgs/cross-powerpc64-linux-musl/files/darn.patch new file mode 120000 index 00000000000..dc81f1f9657 --- /dev/null +++ b/srcpkgs/cross-powerpc64-linux-musl/files/darn.patch @@ -0,0 +1 @@ +../../gcc/patches/darn.patch \ No newline at end of file diff --git a/srcpkgs/cross-powerpc64-linux-musl/files/gccgo-musl.patch b/srcpkgs/cross-powerpc64-linux-musl/files/gccgo-musl.patch new file mode 120000 index 00000000000..a093af85773 --- /dev/null +++ b/srcpkgs/cross-powerpc64-linux-musl/files/gccgo-musl.patch @@ -0,0 +1 @@ +../../gcc/files/gccgo-musl.patch \ No newline at end of file diff --git a/srcpkgs/cross-powerpc64-linux-musl/files/non-nullness.patch b/srcpkgs/cross-powerpc64-linux-musl/files/non-nullness.patch deleted file mode 120000 index c8b653748fe..00000000000 --- a/srcpkgs/cross-powerpc64-linux-musl/files/non-nullness.patch +++ /dev/null @@ -1 +0,0 @@ -../../gcc/patches/non-nullness.patch \ No newline at end of file diff --git a/srcpkgs/cross-powerpc64-linux-musl/template b/srcpkgs/cross-powerpc64-linux-musl/template index d3a9a758fe9..ea2800df634 100644 --- a/srcpkgs/cross-powerpc64-linux-musl/template +++ b/srcpkgs/cross-powerpc64-linux-musl/template @@ -1,15 +1,16 @@ # Template file for 'cross-powerpc64-linux-musl' _binutils_version=2.32 -_gcc_version=9.1.0 +_gcc_version=9.2.0 _musl_version=1.1.23 _linux_version=4.19 +_libucontext_version=0.9.0 _triplet="powerpc64-linux-musl" _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} -version=0.31 -revision=3 +version=0.32 +revision=1 short_desc="Cross toolchain for powerpc64 with musl" maintainer="q66 " homepage="https://www.voidlinux.org/" @@ -18,18 +19,20 @@ distfiles=" ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz - ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz" + ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz + https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz" checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04 - 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0 + ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206 8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa - 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1" + 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1 + 0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68" lib32disabled=yes nocross=yes nopie=yes nodebug=yes create_wrksrc=yes -hostmakedepends="flex perl python3" +hostmakedepends="gcc-objc gcc-go flex perl python3" makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel" nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a" @@ -81,13 +84,14 @@ _gcc_bootstrap() { cd ${wrksrc}/gcc-${_gcc_version} _apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch - _apply_patch -p0 ${FILESDIR}/non-nullness.patch _apply_patch -p0 ${FILESDIR}/0010-ldbl128-config.patch _apply_patch -p0 ${FILESDIR}/ppc64-pure64.patch _apply_patch -p0 ${FILESDIR}/libgcc-musl-ldbl128-config.patch _apply_patch -p0 ${FILESDIR}/musl-ada.patch + _apply_patch -p0 ${FILESDIR}/darn.patch _apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch _apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch + _apply_patch -p0 ${FILESDIR}/gccgo-musl.patch sed -i 's/lib64/lib/' gcc/config/rs6000/linux64.h @@ -161,6 +165,22 @@ _musl_build() { touch ${wrksrc}/.musl_build_done } +_libucontext_build() { + [ -f ${wrksrc}/.libucontext_build_done ] && return 0 + + cd ${wrksrc}/libucontext-${_libucontext_version} + msg_normal "Building cross libucontext\n" + + # it's ok if we're static only here + CC="${_triplet}-gcc" AR="${_triplet}-ar" AS="${_triplet}-as" \ + CFLAGS="-Os -pipe ${_archflags}" \ + make ARCH=ppc64 libucontext.a + + cp libucontext.a ${_sysroot}/usr/lib + + touch ${wrksrc}/.libucontext_build_done +} + _gcc_build() { local _args [ -f ${wrksrc}/.gcc_build_done ] && return 0 @@ -176,7 +196,7 @@ _gcc_build() { _args+=" --target=${_triplet}" _args+=" --with-sysroot=${_sysroot}" _args+=" --with-abi=elfv2" - _args+=" --enable-languages=c,ada,c++,fortran,lto" + _args+=" --enable-languages=c,ada,c++,objc,obj-c++,go,fortran,lto" _args+=" --enable-decimal-float=no" _args+=" --enable-secureplt" _args+=" --enable-targets=powerpc-linux" @@ -219,6 +239,7 @@ do_build() { _gcc_bootstrap _linux_headers _musl_build + _libucontext_build _gcc_build } @@ -270,6 +291,11 @@ do_install() { ln -svf libgnat-${_majorver}.so libgnat.so rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so + # We need to build libatomic in target gcc as gccgo needs it to + # build... but it's not needed at runtime, so remove it from the + # destdir so it doesn't conflict with the libatomic package + rm -f ${DESTDIR}/${_sysroot}/usr/lib/libatomic.* + # Remove unnecessary stuff rm -f ${DESTDIR}/usr/lib*/libiberty.a rm -rf ${DESTDIR}/usr/share diff --git a/srcpkgs/cross-powerpc64le-linux-gnu/files/darn.patch b/srcpkgs/cross-powerpc64le-linux-gnu/files/darn.patch new file mode 120000 index 00000000000..dc81f1f9657 --- /dev/null +++ b/srcpkgs/cross-powerpc64le-linux-gnu/files/darn.patch @@ -0,0 +1 @@ +../../gcc/patches/darn.patch \ No newline at end of file diff --git a/srcpkgs/cross-powerpc64le-linux-gnu/files/non-nullness.patch b/srcpkgs/cross-powerpc64le-linux-gnu/files/non-nullness.patch deleted file mode 120000 index c8b653748fe..00000000000 --- a/srcpkgs/cross-powerpc64le-linux-gnu/files/non-nullness.patch +++ /dev/null @@ -1 +0,0 @@ -../../gcc/patches/non-nullness.patch \ No newline at end of file diff --git a/srcpkgs/cross-powerpc64le-linux-gnu/template b/srcpkgs/cross-powerpc64le-linux-gnu/template index 485f6bfe397..30bde74b769 100644 --- a/srcpkgs/cross-powerpc64le-linux-gnu/template +++ b/srcpkgs/cross-powerpc64le-linux-gnu/template @@ -1,14 +1,14 @@ # Template file for 'cross-powerpc64le-linux-gnu' _binutils_version=2.32 -_gcc_version=9.1.0 -_glibc_version=2.29 +_gcc_version=9.2.0 +_glibc_version=2.30 _linux_version=4.19 _triplet="powerpc64le-linux-gnu" _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} -version=0.31 +version=0.32 revision=1 short_desc="GNU cross toolchain for the ${_triplet} targets (binutils/gcc/glibc)" maintainer="q66 " @@ -20,8 +20,8 @@ distfiles=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz" checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04 - 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0 - f3eeb8d57e25ca9fc13c2af3dae97754f9f643bc69229546828e3a240e2af04b + ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206 + e2c4114e569afbe7edbc29131a43be833850ab9a459d81beb2588016d2bbb8af 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1" lib32disabled=yes @@ -29,7 +29,7 @@ nocross=yes nopie=yes nodebug=yes create_wrksrc=yes -hostmakedepends="flex perl python3" +hostmakedepends="gcc-objc gcc-go flex perl python3" makedepends="isl15-devel libmpc-devel zlib-devel" nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a" @@ -81,7 +81,7 @@ _gcc_bootstrap() { cd ${wrksrc}/gcc-${_gcc_version} _apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch - _apply_patch -p0 ${FILESDIR}/non-nullness.patch + _apply_patch -p0 ${FILESDIR}/darn.patch _apply_patch -p0 ${FILESDIR}/ppc64-pure64.patch sed -i 's/lib64/lib/' gcc/config/rs6000/linux64.h @@ -241,7 +241,7 @@ _gcc_build() { _args+=" --target=${_triplet}" _args+=" --with-sysroot=${_sysroot}" _args+=" --with-abi=elfv2" - _args+=" --enable-languages=c,ada,c++,fortran,lto" + _args+=" --enable-languages=c,ada,c++,objc,obj-c++,go,fortran,lto" _args+=" --enable-secureplt" _args+=" --enable-targets=powerpcle-linux" _args+=" --with-gnu-as" @@ -338,6 +338,11 @@ do_install() { ln -svf libgnat-${_majorver}.so libgnat.so rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so + # We need to build libatomic in target gcc as gccgo needs it to + # build... but it's not needed at runtime, so remove it from the + # destdir so it doesn't conflict with the libatomic package + rm -f ${DESTDIR}/${_sysroot}/usr/lib/libatomic.* + # Remove unnecessary stuff rm -f ${DESTDIR}/usr/lib*/libiberty.a rm -rf ${DESTDIR}/usr/share diff --git a/srcpkgs/cross-powerpc64le-linux-musl/files/darn.patch b/srcpkgs/cross-powerpc64le-linux-musl/files/darn.patch new file mode 120000 index 00000000000..dc81f1f9657 --- /dev/null +++ b/srcpkgs/cross-powerpc64le-linux-musl/files/darn.patch @@ -0,0 +1 @@ +../../gcc/patches/darn.patch \ No newline at end of file diff --git a/srcpkgs/cross-powerpc64le-linux-musl/files/gccgo-musl.patch b/srcpkgs/cross-powerpc64le-linux-musl/files/gccgo-musl.patch new file mode 120000 index 00000000000..a093af85773 --- /dev/null +++ b/srcpkgs/cross-powerpc64le-linux-musl/files/gccgo-musl.patch @@ -0,0 +1 @@ +../../gcc/files/gccgo-musl.patch \ No newline at end of file diff --git a/srcpkgs/cross-powerpc64le-linux-musl/files/non-nullness.patch b/srcpkgs/cross-powerpc64le-linux-musl/files/non-nullness.patch deleted file mode 120000 index c8b653748fe..00000000000 --- a/srcpkgs/cross-powerpc64le-linux-musl/files/non-nullness.patch +++ /dev/null @@ -1 +0,0 @@ -../../gcc/patches/non-nullness.patch \ No newline at end of file diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template index 7e75d7b1c5c..475f2f725ca 100644 --- a/srcpkgs/cross-powerpc64le-linux-musl/template +++ b/srcpkgs/cross-powerpc64le-linux-musl/template @@ -1,15 +1,16 @@ # Template file for 'cross-powerpc64le-linux-musl' _binutils_version=2.32 -_gcc_version=9.1.0 +_gcc_version=9.2.0 _musl_version=1.1.23 _linux_version=4.19 +_libucontext_version=0.9.0 _triplet="powerpc64le-linux-musl" _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} -version=0.31 -revision=3 +version=0.32 +revision=1 short_desc="Cross toolchain for powerpc64le with musl" maintainer="q66 " homepage="https://www.voidlinux.org/" @@ -18,18 +19,20 @@ distfiles=" ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz - ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz" + ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz + https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz" checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04 - 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0 + ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206 8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa - 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1" + 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1 + 0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68" lib32disabled=yes nocross=yes nopie=yes nodebug=yes create_wrksrc=yes -hostmakedepends="flex perl python3" +hostmakedepends="gcc-objc gcc-go flex perl python3" makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel" nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a" @@ -81,13 +84,14 @@ _gcc_bootstrap() { cd ${wrksrc}/gcc-${_gcc_version} _apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch - _apply_patch -p0 ${FILESDIR}/non-nullness.patch _apply_patch -p0 ${FILESDIR}/0010-ldbl128-config.patch _apply_patch -p0 ${FILESDIR}/ppc64-pure64.patch _apply_patch -p0 ${FILESDIR}/libgcc-musl-ldbl128-config.patch _apply_patch -p0 ${FILESDIR}/musl-ada.patch + _apply_patch -p0 ${FILESDIR}/darn.patch _apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch _apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch + _apply_patch -p0 ${FILESDIR}/gccgo-musl.patch sed -i 's/lib64/lib/' gcc/config/rs6000/linux64.h @@ -161,6 +165,22 @@ _musl_build() { touch ${wrksrc}/.musl_build_done } +_libucontext_build() { + [ -f ${wrksrc}/.libucontext_build_done ] && return 0 + + cd ${wrksrc}/libucontext-${_libucontext_version} + msg_normal "Building cross libucontext\n" + + # it's ok if we're static only here + CC="${_triplet}-gcc" AR="${_triplet}-ar" AS="${_triplet}-as" \ + CFLAGS="-Os -pipe ${_archflags}" \ + make ARCH=ppc64 libucontext.a + + cp libucontext.a ${_sysroot}/usr/lib + + touch ${wrksrc}/.libucontext_build_done +} + _gcc_build() { local _args [ -f ${wrksrc}/.gcc_build_done ] && return 0 @@ -176,7 +196,7 @@ _gcc_build() { _args+=" --target=${_triplet}" _args+=" --with-sysroot=${_sysroot}" _args+=" --with-abi=elfv2" - _args+=" --enable-languages=c,ada,c++,fortran,lto" + _args+=" --enable-languages=c,ada,c++,objc,obj-c++,go,fortran,lto" _args+=" --enable-decimal-float=no" _args+=" --enable-secureplt" _args+=" --enable-targets=powerpcle-linux" @@ -219,6 +239,7 @@ do_build() { _gcc_bootstrap _linux_headers _musl_build + _libucontext_build _gcc_build } @@ -270,6 +291,11 @@ do_install() { ln -svf libgnat-${_majorver}.so libgnat.so rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so + # We need to build libatomic in target gcc as gccgo needs it to + # build... but it's not needed at runtime, so remove it from the + # destdir so it doesn't conflict with the libatomic package + rm -f ${DESTDIR}/${_sysroot}/usr/lib/libatomic.* + # Remove unnecessary stuff rm -f ${DESTDIR}/usr/lib*/libiberty.a rm -rf ${DESTDIR}/usr/share diff --git a/srcpkgs/cross-vpkg-dummy/template b/srcpkgs/cross-vpkg-dummy/template index d763d7f14c4..60a5c4f63f1 100644 --- a/srcpkgs/cross-vpkg-dummy/template +++ b/srcpkgs/cross-vpkg-dummy/template @@ -1,7 +1,7 @@ # Template file for 'cross-vpkg-dummy' pkgname=cross-vpkg-dummy -version=0.31 -revision=2 +version=0.33 +revision=1 build_style=meta short_desc="Dummy meta-pkg for cross building packages with xbps-src" maintainer="Orphaned " @@ -16,26 +16,42 @@ provides=" libada-9999_1 libada-devel-9999_1 libgcc-9999_1 + libgcc-devel-9999_1 libstdc++-9999_1 libstdc++-devel-9999_1 libgfortran-9999_1 libgfortran-devel-9999_1 + libgo-9999_1 + libgo-devel-9999_1 + libobjc-9999_1 + libobjc-devel-9999_1 gcc-9999_1 gcc-fortran-9999_1 - gcc-ada-9999_1" + gcc-ada-9999_1 + gcc-go-9999_1 + gcc-objc-9999_1 + gcc-objc++-9999_1" conflicts=" kernel-libc-headers>=0 binutils>=0 libada>=0 libada-devel>=0 libgcc>=0 + libgcc-devel>=0 libstdc++>=0 libstdc++-devel>=0 libgfortran>=0 libgfortran-devel>=0 + libgo>=0 + libgo-devel>=0 + libobjc>=0 + libobjc-devel>=0 gcc>=0 gcc-fortran>=0 - gcc-ada>=0" + gcc-ada>=0 + gcc-go>=0 + gcc-objc>=0 + gcc-objc++>=0" shlib_provides=" libgcc_s.so.1 libgnat-9.so diff --git a/srcpkgs/cross-x86_64-linux-musl/files/gccgo-musl.patch b/srcpkgs/cross-x86_64-linux-musl/files/gccgo-musl.patch new file mode 120000 index 00000000000..a093af85773 --- /dev/null +++ b/srcpkgs/cross-x86_64-linux-musl/files/gccgo-musl.patch @@ -0,0 +1 @@ +../../gcc/files/gccgo-musl.patch \ No newline at end of file diff --git a/srcpkgs/cross-x86_64-linux-musl/files/non-nullness.patch b/srcpkgs/cross-x86_64-linux-musl/files/non-nullness.patch deleted file mode 120000 index c8b653748fe..00000000000 --- a/srcpkgs/cross-x86_64-linux-musl/files/non-nullness.patch +++ /dev/null @@ -1 +0,0 @@ -../../gcc/patches/non-nullness.patch \ No newline at end of file diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template index 2f6a2a4241d..349eacf973c 100644 --- a/srcpkgs/cross-x86_64-linux-musl/template +++ b/srcpkgs/cross-x86_64-linux-musl/template @@ -1,16 +1,17 @@ # Template file for 'cross-x86_64-linux-musl' # _binutils_version=2.32 -_gcc_version=9.1.0 +_gcc_version=9.2.0 _musl_version=1.1.23 _linux_version=4.19 +_libucontext_version=0.9.0 _triplet=x86_64-linux-musl _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} -version=0.31 -revision=3 +version=0.32 +revision=1 archs="i686* x86_64 ppc64le" short_desc="Cross toolchain for x86_64 with musl" maintainer="Orphaned " @@ -20,18 +21,20 @@ distfiles=" ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz - ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz" + ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz + https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz" checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04 - 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0 + ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206 8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa - 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1" + 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1 + 0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68" lib32disabled=yes nocross=yes nopie=yes nodebug=yes create_wrksrc=yes -hostmakedepends="flex perl python3" +hostmakedepends="gcc-objc gcc-go flex perl python3" makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel" nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a" @@ -83,10 +86,10 @@ _gcc_bootstrap() { cd ${wrksrc}/gcc-${_gcc_version} _apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch - _apply_patch -p0 ${FILESDIR}/non-nullness.patch _apply_patch -p0 ${FILESDIR}/musl-ada.patch _apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch _apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch + _apply_patch -p0 ${FILESDIR}/gccgo-musl.patch sed -i '/m64=/s/lib64/lib/' gcc/config/i386/t-linux64 sed -i 's/lib64/lib/' gcc/config/i386/linux64.h @@ -158,6 +161,22 @@ _musl_build() { touch ${wrksrc}/.musl_build_done } +_libucontext_build() { + [ -f ${wrksrc}/.libucontext_build_done ] && return 0 + + cd ${wrksrc}/libucontext-${_libucontext_version} + msg_normal "Building cross libucontext\n" + + # it's ok if we're static only here + CC="${_triplet}-gcc" AR="${_triplet}-ar" AS="${_triplet}-as" \ + CFLAGS="-Os -pipe ${_archflags}" \ + make ARCH=x86_64 libucontext.a + + cp libucontext.a ${_sysroot}/usr/lib + + touch ${wrksrc}/.libucontext_build_done +} + _gcc_build() { local _args [ -f ${wrksrc}/.gcc_build_done ] && return 0 @@ -171,7 +190,7 @@ _gcc_build() { _args="--prefix=/usr" _args+=" --target=${_triplet}" _args+=" --with-sysroot=${_sysroot}" - _args+=" --enable-languages=c,ada,c++,fortran,lto" + _args+=" --enable-languages=c,ada,c++,objc,obj-c++,go,fortran,lto" _args+=" --enable-libada" _args+=" --enable-lto" _args+=" --enable-default-pie" @@ -213,6 +232,7 @@ do_build() { _gcc_bootstrap _linux_headers _musl_build + _libucontext_build _gcc_build } @@ -264,6 +284,11 @@ do_install() { ln -svf libgnat-${_majorver}.so libgnat.so rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so + # We need to build libatomic in target gcc as gccgo needs it to + # build... but it's not needed at runtime, so remove it from the + # destdir so it doesn't conflict with the libatomic package + rm -f ${DESTDIR}/${_sysroot}/usr/lib/libatomic.* + # Remove unnecessary stuff rm -f ${DESTDIR}/usr/lib*/libiberty.a rm -rf ${DESTDIR}/usr/share diff --git a/srcpkgs/cross-x86_64-w64-mingw32/template b/srcpkgs/cross-x86_64-w64-mingw32/template index 2e5bc454ba8..ccc30402e15 100644 --- a/srcpkgs/cross-x86_64-w64-mingw32/template +++ b/srcpkgs/cross-x86_64-w64-mingw32/template @@ -1,5 +1,5 @@ # Template file for 'cross-x86_64-w64-mingw32' -_gcc_version=9.1.0 +_gcc_version=9.2.0 _binutils_version=2.32 _gmp_version=6.1.2 _mpfr_version=4.0.1 @@ -9,7 +9,7 @@ _mingw_version=6.0.0 pkgname=cross-x86_64-w64-mingw32 version=$_mingw_version -revision=2 +revision=3 archs="x86_64* i686*" create_wrksrc=yes hostmakedepends="flex perl python3" @@ -31,7 +31,7 @@ distfiles=" http://isl.gforge.inria.fr/isl-${_isl_version}.tar.bz2 ${SOURCEFORGE_SITE}/project/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${_mingw_version}.tar.bz2" checksum="de38b15c902eb2725eac6af21183a5f34ea4634cb0bcef19612b50e5ed31072d - 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0 + ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206 6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e 87b565e89a9a684fe4ebeeddb8399dce2599f9c9049854ca8c0dfbdea0e21912 67874a60826303ee2fb6affc6dc0ddd3e749e9bfcb4c8655e3953d0458a6e16e diff --git a/srcpkgs/crypto++/patches/arm-native.patch b/srcpkgs/crypto++/patches/arm-native.patch deleted file mode 100644 index ff7678735d3..00000000000 --- a/srcpkgs/crypto++/patches/arm-native.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- GNUmakefile.orig -+++ GNUmakefile -@@ -125,23 +125,6 @@ - endif - endif - --# Guard use of -march=native --ifeq ($(GCC42_OR_LATER)$(IS_NETBSD),10) -- CXXFLAGS += -march=native --else ifneq ($(CLANG_COMPILER)$(INTEL_COMPILER),00) -- CXXFLAGS += -march=native --else -- # GCC 3.3 and "unknown option -march=" -- # Ubuntu GCC 4.1 compiler crash with -march=native -- # NetBSD GCC 4.8 compiler and "bad value (native) for -march= switch" -- # Sun compiler is handled below -- ifeq ($(SUN_COMPILER)$(IS_X64),01) -- CXXFLAGS += -m64 -- else ifeq ($(SUN_COMPILER)$(IS_X86),01) -- CXXFLAGS += -m32 -- endif # X86/X32/X64 --endif -- - # Aligned access required for -O3 and above due to vectorization - UNALIGNED_ACCESS := $(shell $(EGREP) -c "^[[:space:]]*//[[:space:]]*\#[[:space:]]*define[[:space:]]*CRYPTOPP_NO_UNALIGNED_DATA_ACCESS" config.h) - ifneq ($(UNALIGNED_ACCESS),0) diff --git a/srcpkgs/crypto++/patches/musl-soname-links.patch b/srcpkgs/crypto++/patches/musl-soname-links.patch deleted file mode 100644 index 34f3b4fbfe6..00000000000 --- a/srcpkgs/crypto++/patches/musl-soname-links.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- GNUmakefile.orig 2017-09-22 10:27:03.000000000 +0000 -+++ GNUmakefile 2017-09-22 10:34:42.897537258 +0000 -@@ -581,6 +581,7 @@ - -$(CHMOD) 0755 $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_VERSION_SUFFIX) - ifeq ($(HAS_SOLIB_VERSION),1) - -$(LN) -sf libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so -+ -$(LN) -sf libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_COMPAT_SUFFIX) - $(LDCONF) $(DESTDIR)$(LIBDIR) - endif - endif diff --git a/srcpkgs/crypto++/template b/srcpkgs/crypto++/template index bce3e38a963..9fc17a0d4fd 100644 --- a/srcpkgs/crypto++/template +++ b/srcpkgs/crypto++/template @@ -1,20 +1,24 @@ -# Template build file for 'crypto++'. +# Template file for 'crypto++' pkgname=crypto++ -version=565 -revision=3 +version=820 +revision=1 create_wrksrc=yes build_style=gnu-makefile make_build_target="libcryptopp.so libcryptopp.a" hostmakedepends="unzip" -short_desc="A free C++ class library of cryptographic schemes" +short_desc="Free C++ class library of cryptographic schemes" maintainer="Orphaned " +license="BSL-1.0" homepage="http://www.cryptopp.com/" -license="Boost Software License 1.0, Public domain" distfiles="http://www.cryptopp.com/cryptopp${version}.zip" -checksum=a75ef486fe3128008bbb201efee3dcdcffbe791120952910883b26337ec32c34 +checksum=03f0e2242e11b9d19b28d0ec5a3fa8ed5cc7b27640e6bed365744f593e858058 CXXFLAGS="-DNDEBUG -fPIC" +if [ "$XBPS_CROSS" ]; then + make_build_args="-f GNUmakefile-cross" +fi + post_extract() { sed -i -e 's/^CXXFLAGS/#CXXFLAGS/' GNUmakefile } diff --git a/srcpkgs/cryptsetup/template b/srcpkgs/cryptsetup/template index 725b5838e13..c2629720de0 100644 --- a/srcpkgs/cryptsetup/template +++ b/srcpkgs/cryptsetup/template @@ -1,7 +1,7 @@ # Template file for 'cryptsetup' pkgname=cryptsetup -version=2.1.0 -revision=2 +version=2.2.1 +revision=1 build_style=gnu-configure configure_args="--with-crypto_backend=openssl $(vopt_enable pwquality) --enable-cryptsetup-reencrypt --enable-libargon2" @@ -9,12 +9,12 @@ hostmakedepends="pkg-config" makedepends="device-mapper-devel json-c-devel libressl-devel popt-devel libargon2-devel $(vopt_if pwquality 'libpwquality-devel')" short_desc="Setup virtual encryption devices under Linux dm-crypt" -maintainer="Orphaned " +maintainer="Daniel Eyßer " license="GPL-2.0-or-later" homepage="https://gitlab.com/cryptsetup/cryptsetup" changelog="https://gitlab.com/cryptsetup/cryptsetup/raw/master/docs/v${version}-ReleaseNotes" distfiles="${KERNEL_SITE}/utils/cryptsetup/v${version%.*}/${pkgname}-${version}.tar.xz" -checksum=a3eeb2741f8f3376d16585191f3c60e067dd987e096c3c4b073fab7748b1c897 +checksum=94e79a31ed38bdb0acd9af7ccca1605a2ac62ca850ed640202876b1ee11c1c61 subpackages="libcryptsetup cryptsetup-devel" build_options="pwquality" @@ -22,9 +22,9 @@ desc_option_pwquality="Enable support for checking password quality via libpwqua case $XBPS_TARGET_MACHINE in *-musl) - configure_args+=" --enable-static-cryptsetup" - subpackages+=" cryptsetup-static" - ;; + configure_args+=" --enable-static-cryptsetup" + subpackages+=" cryptsetup-static" + ;; esac cryptsetup-static_package() { diff --git a/srcpkgs/crystal/template b/srcpkgs/crystal/template index c0a23e87e63..2bb0db5dc81 100644 --- a/srcpkgs/crystal/template +++ b/srcpkgs/crystal/template @@ -1,10 +1,10 @@ # Template file for 'crystal' pkgname=crystal -version=0.30.0 +version=0.31.1 revision=1 archs="x86_64* i686* aarch64* arm*" _shardsversion=0.9.0 -_bootstrapversion=0.30.0 +_bootstrapversion=0.31.1 _bootstraprevision=1 hostmakedepends="git llvm8" makedepends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel @@ -19,7 +19,7 @@ homepage="https://crystal-lang.org/" distfiles=" https://github.com/crystal-lang/crystal/archive/${version}.tar.gz https://github.com/crystal-lang/shards/archive/v${_shardsversion}.tar.gz" -checksum="fc884970089e382344540676a9c5aa4f369c9a0f45d1858e079b4ce26878164a +checksum="b4a51164763b891572492e2445d3a69b462675184ea0ccf06fcc57a070f07b80 90f230c87cc7b94ca845e6fe34f2523edcadb562d715daaf98603edfa2a94d65" nocross="FIXME: someone needs to sort out the llvm --cxxflags for cross building" _crystalflags="--release --no-debug --progress" @@ -32,11 +32,11 @@ if [ "$build_option_binary_bootstrap" ]; then case "$XBPS_MACHINE" in x86_64) distfiles+=" https://github.com/crystal-lang/crystal/releases/download/${_bootstrapversion}/crystal-${_bootstrapversion}-${_bootstraprevision}-linux-x86_64.tar.gz" - checksum+=" 1995420a5d9146fd21322c96fe8bf87ddf73d5e0273b3c24c3c71d0e6f54cba2" + checksum+=" 308a5891322287852ba492e6e0dcc1484af361c189525349b6b98b531c551a65" ;; i686) distfiles+=" https://github.com/crystal-lang/crystal/releases/download/${_bootstrapversion}/crystal-${_bootstrapversion}-${_bootstraprevision}-linux-i686.tar.gz" - checksum+=" 81282e2fdaba77a31aeb682deac7cde545a72dfd0ad5b6554002b8fd861e9d3e" + checksum+=" 394bfe422bd2e74b6c5a99d31dcd873ec3f25c3f06834e1dd779efa2a36d3143" ;; *) broken="cannot be built on $XBPS_MACHINE" diff --git a/srcpkgs/cups-filters/template b/srcpkgs/cups-filters/template index 8c232894061..df7daba3a5e 100644 --- a/srcpkgs/cups-filters/template +++ b/srcpkgs/cups-filters/template @@ -1,7 +1,7 @@ # Template file for 'cups-filters' pkgname=cups-filters -version=1.25.2 -revision=1 +version=1.25.10 +revision=2 build_style=gnu-configure configure_args="--disable-static --with-rcdir=no --enable-avahi --with-browseremoteprotocols=DNSSD,CUPS @@ -18,7 +18,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later, LGPL-2.1-or-later, MIT" homepage="https://wiki.linuxfoundation.org/openprinting/cups-filters" distfiles="http://openprinting.org/download/cups-filters/${pkgname}-${version}.tar.xz" -checksum=c1f172afdc060d105a80ef8e8123fd2c0d9f2fabf8c7c38f5abdace576d82e0e +checksum=4338dc314558f796ab5169a99440cc4fc4d65df33878dddc1525f7fe5683a45b lib32disabled=yes diff --git a/srcpkgs/cups/patches/cups-no-gzip-man.patch b/srcpkgs/cups/patches/cups-no-gzip-man.patch deleted file mode 100644 index b96df8963a0..00000000000 --- a/srcpkgs/cups/patches/cups-no-gzip-man.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- config-scripts/cups-manpages.m4.orig 2016-09-17 23:43:25.901857459 +0200 -+++ config-scripts/cups-manpages.m4 2016-09-17 23:43:53.797006791 +0200 -@@ -53,10 +53,10 @@ case "$uname" in - ;; - Linux* | GNU* | Darwin*) - # Linux, GNU Hurd, and macOS -- MAN1EXT=1.gz -- MAN5EXT=5.gz -- MAN7EXT=7.gz -- MAN8EXT=8.gz -+ MAN1EXT=1 -+ MAN5EXT=5 -+ MAN7EXT=7 -+ MAN8EXT=8 - MAN8DIR=8 - ;; - *) diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template index 0f3bbb1e894..d8f045937a2 100644 --- a/srcpkgs/cups/template +++ b/srcpkgs/cups/template @@ -1,6 +1,6 @@ # Template file for 'cups' pkgname=cups -version=2.2.12 +version=2.3.0 revision=1 hostmakedepends="automake avahi-libs-devel gnutls-devel pkg-config poppler-utils" @@ -13,7 +13,7 @@ maintainer="Orphaned " license="GPL-2.0-only" homepage="https://www.cups.org/" distfiles="https://github.com/apple/cups/releases/download/v${version}/cups-${version}-source.tar.gz" -checksum=0f61ab449e4748a24c6ab355b481ff7691247a140d327b2b7526fce34b7f9aa8 +checksum=acaf0229cf008ea8f06353ffd1bbd62d71dbe88990dd3330650ef87edb95a1a5 conf_files="/etc/pam.d/cups /etc/cups/*.conf /etc/xinetd.d/cups-lpd" make_dirs=" diff --git a/srcpkgs/cura-engine/patches/0001-Remove-default-none-so-that-it-compiles-in-gcc9.patch b/srcpkgs/cura-engine/patches/0001-Remove-default-none-so-that-it-compiles-in-gcc9.patch deleted file mode 100644 index ce7d6a2a41b..00000000000 --- a/srcpkgs/cura-engine/patches/0001-Remove-default-none-so-that-it-compiles-in-gcc9.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 45cab061494467165ba515055a828cdd39567c0e Mon Sep 17 00:00:00 2001 -From: Jasper Chan -Date: Mon, 5 Aug 2019 23:37:35 -0700 -Subject: [PATCH] Remove default(none) so that it compiles in gcc9 - ---- - src/layerPart.cpp | 2 +- - src/support.cpp | 6 +++--- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git src/layerPart.cpp src/layerPart.cpp -index ba3e7157..d36a31f6 100644 ---- src/layerPart.cpp -+++ src/layerPart.cpp -@@ -52,7 +52,7 @@ void createLayerParts(SliceMeshStorage& mesh, Slicer* slicer) - { - const auto total_layers = slicer->layers.size(); - assert(mesh.layers.size() == total_layers); --#pragma omp parallel for default(none) shared(mesh, slicer) schedule(dynamic) -+#pragma omp parallel for shared(mesh, slicer) schedule(dynamic) - // Use a signed type for the loop counter so MSVC compiles (because it uses OpenMP 2.0, an old version). - for (int layer_nr = 0; layer_nr < static_cast(total_layers); layer_nr++) - { -diff --git src/support.cpp src/support.cpp -index 9bd531a6..0a43de2f 100644 ---- src/support.cpp -+++ src/support.cpp -@@ -816,7 +816,7 @@ void AreaSupport::generateOverhangAreasForMesh(SliceDataStorage& storage, SliceM - } - - //Generate the actual areas and store them in the mesh. -- #pragma omp parallel for default(none) shared(storage, mesh) schedule(dynamic) -+ #pragma omp parallel for shared(storage, mesh) schedule(dynamic) - // Use a signed type for the loop counter so MSVC compiles (because it uses OpenMP 2.0, an old version). - for (int layer_idx = 1; layer_idx < static_cast(storage.print_layer_count); layer_idx++) - { -@@ -875,7 +875,7 @@ void AreaSupport::generateSupportAreasForMesh(SliceDataStorage& storage, const S - constexpr bool no_prime_tower = false; - xy_disallowed_per_layer[0] = storage.getLayerOutlines(0, no_support, no_prime_tower).offset(xy_distance); - // for all other layers (of non support meshes) compute the overhang area and possibly use that when calculating the support disallowed area -- #pragma omp parallel for default(none) shared(xy_disallowed_per_layer, storage, mesh) schedule(dynamic) -+ #pragma omp parallel for shared(xy_disallowed_per_layer, storage, mesh) schedule(dynamic) - // Use a signed type for the loop counter so MSVC compiles (because it uses OpenMP 2.0, an old version). - for (int layer_idx = 1; layer_idx < static_cast(layer_count); layer_idx++) - { -@@ -1070,7 +1070,7 @@ void AreaSupport::generateSupportAreasForMesh(SliceDataStorage& storage, const S - const int max_checking_layer_idx = std::max(0, - std::min(static_cast(storage.support.supportLayers.size()), - static_cast(layer_count - (layer_z_distance_top - 1)))); --#pragma omp parallel for default(none) shared(support_areas, storage) schedule(dynamic) -+#pragma omp parallel for shared(support_areas, storage) schedule(dynamic) - // Use a signed type for the loop counter so MSVC compiles (because it uses OpenMP 2.0, an old version). - for (int layer_idx = 0; layer_idx < max_checking_layer_idx; layer_idx++) - { --- -2.22.0 - diff --git a/srcpkgs/cura-engine/template b/srcpkgs/cura-engine/template index 63b00cda8e7..04184076df0 100644 --- a/srcpkgs/cura-engine/template +++ b/srcpkgs/cura-engine/template @@ -1,6 +1,6 @@ # Template file for 'cura-engine' pkgname=cura-engine -version=4.2.0 +version=4.3.0 revision=1 wrksrc="CuraEngine-${version}" build_style=cmake @@ -12,7 +12,7 @@ maintainer="Karl Nilsson " license="AGPL-3.0-or-later" homepage="https://github.com/Ultimaker/CuraEngine" distfiles="https://github.com/Ultimaker/CuraEngine/archive/${version}.tar.gz" -checksum=9e66c2840c46ad5ba91da872d73cc8d8d03bf163fe8ce9a81ec5188a6d7b4593 +checksum=4922a21ae90f95daae918baf21b51d94e36b8aac8e160b73c8088b993dd78ccb post_install() { vlicense LICENSE diff --git a/srcpkgs/cura-fdm-materials/template b/srcpkgs/cura-fdm-materials/template index 79542c83947..153ec525b1f 100644 --- a/srcpkgs/cura-fdm-materials/template +++ b/srcpkgs/cura-fdm-materials/template @@ -1,6 +1,7 @@ # Template file for 'cura-fdm-materials' pkgname=cura-fdm-materials -version=4.2.0 +reverts="2019.08.21_1" +version=4.3.0 revision=1 archs=noarch wrksrc="fdm_materials-${version}" @@ -10,7 +11,7 @@ maintainer="Karl Nilsson " license="CC0-1.0" homepage="https://github.com/Ultimaker/fdm_materials" distfiles="https://github.com/Ultimaker/fdm_materials/archive/${version}.tar.gz" -checksum=96b2946ced9dec98fa73d82644dcaf6ce5801d9d9edc23d3f42b73a76fda0ef3 +checksum=b31b997cae18a85f8c913b4d1f0fe0a5a009f94689d4cc26682f6614d0dc3f09 post_install() { vlicense LICENSE diff --git a/srcpkgs/cura/template b/srcpkgs/cura/template index f4ff4f24b0f..31318e5aecf 100644 --- a/srcpkgs/cura/template +++ b/srcpkgs/cura/template @@ -1,6 +1,6 @@ # Template file for 'cura' pkgname=cura -version=4.2.1 +version=4.3.0 revision=1 archs=noarch wrksrc="Cura-${version}" @@ -17,4 +17,4 @@ maintainer="Karl Nilsson " license="LGPL-3.0-or-later" homepage="https://github.com/Ultimaker/Cura" distfiles="https://github.com/Ultimaker/Cura/archive/${version}.tar.gz" -checksum=e3b54947a8722dbbdef4510beb724d43952f6dbd1e7c32b52e1a3c9358be3fa1 +checksum=a27f5671250452d685069d8fe8018438ec32c096cd5b2c0d54ada7022ded1ccf diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template index a3bc8dcf862..7dc0542bc5d 100644 --- a/srcpkgs/curl/template +++ b/srcpkgs/curl/template @@ -1,10 +1,10 @@ # Template file for 'curl' pkgname=curl -version=7.65.3 +version=7.66.0 revision=1 build_style=gnu-configure configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6 - $(vopt_with rtmp) $(vopt_with gssapi) $(vopt_enable ldap) $(vopt_with gnuts) + $(vopt_with rtmp) $(vopt_with gssapi) $(vopt_enable ldap) $(vopt_with gnutls) $(vopt_enable ldap ldaps) $(vopt_with ssh libssh2) $(vopt_with ssl) --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --without-libidn2" hostmakedepends="groff perl pkg-config" @@ -13,14 +13,14 @@ makedepends="nghttp2-devel zlib-devel $(vopt_if gnutls 'gnutls-devel') $(vopt_if rtmp 'librtmp-devel') $(vopt_if ssh 'libssh2-devel') $(vopt_if ssl 'libressl-devel')" depends="ca-certificates" -checkdepends="python" +checkdepends="python3" short_desc="Client that groks URLs" maintainer="Orphaned " license="MIT" homepage="https://curl.haxx.se" changelog="https://curl.haxx.se/changes.html#${version//./_}" distfiles="${homepage}/download/${pkgname}-${version}.tar.bz2" -checksum=0a855e83be482d7bc9ea00e05bdb1551a44966076762f9650959179c89fce509 +checksum=6618234e0235c420a21f4cb4c2dd0badde76e6139668739085a70c4e2fe7a141 build_options="gnutls gssapi ldap rtmp ssh ssl" build_options_default="ssh ssl" vopt_conflict ssl gnutls @@ -40,7 +40,7 @@ libcurl_package() { shlib_provides="libcurl-gnutls.so.4" pkg_install() { vmove "usr/lib/*.so.*" - ln -sf libcurl.so.4.5.0 ${PKGDESTDIR}/usr/lib/libcurl-gnutls.so.4 + ln -sf libcurl.so.4.6.0 ${PKGDESTDIR}/usr/lib/libcurl-gnutls.so.4 } } diff --git a/srcpkgs/cutter/template b/srcpkgs/cutter/template index 917510733ed..aa4c57ef4ad 100644 --- a/srcpkgs/cutter/template +++ b/srcpkgs/cutter/template @@ -1,7 +1,7 @@ # Template file for 'cutter' pkgname=cutter -version=1.8.3 -revision=2 +version=1.9.0 +revision=3 build_wrksrc=src build_style=qmake hostmakedepends="pkg-config qt5-declarative-devel qt5-location-devel @@ -13,4 +13,4 @@ maintainer="johannes " license="GPL-3.0-only" homepage="https://github.com/radareorg/cutter" distfiles="https://github.com/radareorg/${pkgname}/archive/v${version}.tar.gz" -checksum=71014ec5a00f1255978c8298a3e1a84fa968ac327188333b5ea684b515e61fda +checksum=798aa696970030dfef2a1ecf2a058982089ac58db9b2ce008de5757b7fc20d84 diff --git a/srcpkgs/datamash/template b/srcpkgs/datamash/template index 90a4512b2e5..cecbef14f95 100644 --- a/srcpkgs/datamash/template +++ b/srcpkgs/datamash/template @@ -1,6 +1,6 @@ # Template file for 'datamash' pkgname=datamash -version=1.4 +version=1.5 revision=1 build_style=gnu-configure short_desc="Command-line program that performs simple calculations on input files" @@ -8,4 +8,4 @@ maintainer="oliver JH " license="GPL-3.0-or-later" homepage="https://www.gnu.org/software/datamash/" distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=fa44dd2d5456bcb94ef49dfc6cfe62c83fd53ac435119a85d34e6812f6e6472a +checksum=226249d5fe54024f96404798778f45963a3041714229d4225cd5d9acdaba21ad diff --git a/srcpkgs/dav1d/template b/srcpkgs/dav1d/template index 5288ecb9415..ba6673de755 100644 --- a/srcpkgs/dav1d/template +++ b/srcpkgs/dav1d/template @@ -7,7 +7,7 @@ configure_args="-Dbuild_tests=false -Dbuild_asm=true -Dbuild_tools=true -Dfuzzing_engine=none -Dtestdata_tests=false" hostmakedepends="nasm" short_desc="Small and fast AV1 Decoder" -maintainer="maxice8 " +maintainer="Orphaned " license="BSD-2-Clause" homepage="https://code.videolan.org/videolan/dav1d" distfiles="https://code.videolan.org/videolan/dav1d/-/archive//${version}/dav1d-${version}.tar.bz2" diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template index bbf30e1ccdf..3280e83a5f2 100644 --- a/srcpkgs/dbeaver/template +++ b/srcpkgs/dbeaver/template @@ -1,6 +1,6 @@ # Template file for 'dbeaver' pkgname=dbeaver -version=6.1.3 +version=6.2.1 revision=1 archs="x86_64" hostmakedepends="apache-maven-bin" @@ -9,7 +9,7 @@ maintainer="Kyle Nusbaum " license="Apache-2.0" homepage="https://dbeaver.io" distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz" -checksum=b7e0c74a912b60b26f7ab74a0917435c61198393207abc3a4ca08f7b7428a16d +checksum=1a049c3a5aea98d371a1833bca19b08dd34a8a857513787a3843885e7c9fc2c2 nopie=true do_build() { diff --git a/srcpkgs/dconf-editor/template b/srcpkgs/dconf-editor/template index cbd5ccc5d67..3617e12dacf 100644 --- a/srcpkgs/dconf-editor/template +++ b/srcpkgs/dconf-editor/template @@ -1,6 +1,6 @@ # Template file for 'dconf-editor' pkgname=dconf-editor -version=3.32.0 +version=3.34.1 revision=1 build_style=meson hostmakedepends="docbook-xsl glib-devel libxslt pkg-config vala" @@ -10,4 +10,4 @@ maintainer="Enno Boland " license="GPL-3.0-or-later" homepage="https://wiki.gnome.org/Projects/dconf" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=f19d1332ac27e23ef3dc2ed07ba4e4646d9d7f05e2e78748aa525a1320adbaba +checksum=32ad3e899840e0b17d36a1c4dab60bfb1eedfcf4e46f3ae428076132f37ff335 diff --git a/srcpkgs/ddcutil/template b/srcpkgs/ddcutil/template index 060d65b9b24..9c0103ed481 100644 --- a/srcpkgs/ddcutil/template +++ b/srcpkgs/ddcutil/template @@ -1,6 +1,6 @@ # Template file for 'ddcutil' pkgname=ddcutil -version=0.9.5 +version=0.9.7 revision=1 build_style=gnu-configure hostmakedepends="automake libtool pkg-config" @@ -11,7 +11,7 @@ maintainer="lemmi " license="GPL-2.0-or-later" homepage="http://www.ddcutil.com" distfiles="https://github.com/rockowitz/ddcutil/archive/v${version}.tar.gz" -checksum=aab0284d27c9537f995e8b79904b42099050ec05557b81ee29ff2045909e0933 +checksum=56a520a68e00e519a3ea5562238b2a67c0b9c4133a9b61983fe82b24e7066222 case "$XBPS_TARGET_MACHINE" in *-musl) makedepends+=" libexecinfo-devel" diff --git a/srcpkgs/ddgr/template b/srcpkgs/ddgr/template index ec714a808b2..79c49b1e2f2 100644 --- a/srcpkgs/ddgr/template +++ b/srcpkgs/ddgr/template @@ -1,13 +1,13 @@ # Template file for 'ddgr' pkgname=ddgr -version=1.6 +version=1.7 revision=1 archs=noarch build_style=gnu-makefile depends="python3-requests" -maintainer="Orphaned " short_desc="DuckDuckGo from the terminal" +maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://github.com/jarun/ddgr" distfiles="https://github.com/jarun/ddgr/archive/v${version}.tar.gz" -checksum=eae7ff1ab44dfda168a8bbe46593e80ca4a26ab45a9efbab13e6f466349e0e5c +checksum=1e3d01dc71337b2a59b96ab89ee422a7ef9e6ddcd42813ac08d57db194bc4fea diff --git a/srcpkgs/debootstrap/template b/srcpkgs/debootstrap/template index e4316aaa7ff..f3deb671ad9 100644 --- a/srcpkgs/debootstrap/template +++ b/srcpkgs/debootstrap/template @@ -1,6 +1,6 @@ # Template file for 'debootstrap' pkgname=debootstrap -version=1.0.115 +version=1.0.116 revision=1 build_style=fetch depends="binutils gnupg gzip tar wget xz" @@ -9,13 +9,13 @@ maintainer="Leah Neukirchen " license="MIT" homepage="http://packages.qa.debian.org/d/debootstrap.html" distfiles="${DEBIAN_SITE}/main/d/${pkgname}/${pkgname}_${version}_all.deb - ${DEBIAN_SITE}/main/d/debian-archive-keyring/debian-archive-keyring_2017.5_all.deb" -checksum="d7955a6e88bec5f86a531429b1819d49c35b0d8cf49b9cf7bd901d86c6e41f89 - 6a38407c47fefad2d8459dc271d109f1841ee857f993ed3ce2884e33f7f0f734" + ${DEBIAN_SITE}/main/d/debian-archive-keyring/debian-archive-keyring_2019.1_all.deb" +checksum="e5b060eb86c8955d91e7193d796b9928dd7d803bdd61f8df008f42a8fe2f8b69 + 9cefd8917f3d97a999c136aa87f04a3024408b5bc1de470de7d6dfa5e4bd4361" do_install() { ar p ${pkgname}_${version}_all.deb data.tar.gz | tar xvzf - -C ${DESTDIR} - ar p debian-archive-keyring_2017.5_all.deb data.tar.xz | tar xvJf - -C ${DESTDIR} ./usr/share/keyrings/debian-archive-keyring.gpg + ar p debian-archive-keyring_2019.1_all.deb data.tar.xz | tar xvJf - -C ${DESTDIR} ./usr/share/keyrings/debian-archive-keyring.gpg mv ${DESTDIR}/usr/sbin ${DESTDIR}/usr/bin sed -i 's|export PATH|export PATH="/usr/sbin:/sbin:/usr/bin:/bin"|' ${DESTDIR}/usr/bin/debootstrap vlicense ${DESTDIR}/usr/share/doc/debootstrap/copyright LICENSE diff --git a/srcpkgs/dejagnu/template b/srcpkgs/dejagnu/template index e8025073628..5a2572644c1 100644 --- a/srcpkgs/dejagnu/template +++ b/srcpkgs/dejagnu/template @@ -6,7 +6,7 @@ build_style=gnu-configure makedepends="expect-devel" depends="expect" short_desc="Framework for running test suites on GNU tools" -maintainer="maxice8 " +maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://www.gnu.org/software/dejagnu/" distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" diff --git a/srcpkgs/delta/template b/srcpkgs/delta/template new file mode 100644 index 00000000000..ca651c2dfc8 --- /dev/null +++ b/srcpkgs/delta/template @@ -0,0 +1,15 @@ +# Template file for 'delta' +pkgname=delta +version=0.0.13 +revision=1 +build_style=cargo +short_desc="Syntax-highlighting pager for git" +maintainer="Andrew Benson " +license="MIT" +homepage="https://github.com/dandavison/delta" +distfiles="${homepage}/archive/${version}.tar.gz" +checksum=60e8d1dc7710d892c5e612c608baa29e357df4bd895efc4e01e453e2336a47d6 + +post_install() { + vlicense LICENSE +} diff --git a/srcpkgs/deluge/files/deluge-web/run b/srcpkgs/deluge/files/deluge-web/run index 44c75c99053..b90477d7a45 100644 --- a/srcpkgs/deluge/files/deluge-web/run +++ b/srcpkgs/deluge/files/deluge-web/run @@ -1,3 +1,3 @@ #!/bin/sh sv check deluged >/dev/null || exit 1 -exec chpst -u deluge:deluge deluge-web 2>&1 +exec chpst -u deluge:deluge deluge-web -d 2>&1 diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template index dee8b8d96dd..6dc7f26184d 100644 --- a/srcpkgs/deluge/template +++ b/srcpkgs/deluge/template @@ -1,7 +1,7 @@ # Template file for 'deluge' pkgname=deluge version=2.0.3 -revision=2 +revision=3 archs=noarch build_style=python3-module pycompile_module="deluge" diff --git a/srcpkgs/delve/template b/srcpkgs/delve/template index fc5e2b03d12..089343cab3d 100644 --- a/srcpkgs/delve/template +++ b/srcpkgs/delve/template @@ -1,20 +1,30 @@ # Template file for 'delve' pkgname=delve -version=1.2.0 +version=1.3.0 revision=1 +# Version bump to 1.3.0 has been done after the release tag, so using +# specific commit for this version. +_commit=dd3c2d63cc5b2aa84d7970eca0c91b45c71e9dd9 build_style=go -go_import_path=github.com/go-delve/delve/cmd/dlv +go_import_path="github.com/go-delve/delve" +go_package="${go_import_path}/cmd/dlv" short_desc="Debugger for the Go programming language" maintainer="Renato Aguiar " license="MIT" homepage="https://github.com/go-delve/delve" -distfiles="https://github.com/go-delve/delve/archive/v${version}.tar.gz" -checksum=eebf6cd9647a2c3987fd38e8dd6e0e968ff41300cab20dc178a789a77b92627d +distfiles="https://github.com/go-delve/delve/archive/${_commit}.tar.gz" +checksum=1a3ac2e709dd5a373c0c4379f614b2e68c2e8fd848a725b9a97b8aaa25910319 case "$XBPS_TARGET_MACHINE" in i686*|arm*|aarch64*|ppc*) broken=yes ;; esac +post_extract() { + mv "${XBPS_BUILDDIR}/delve-${_commit}" "$wrksrc" +} + post_install() { vlicense LICENSE + vmkdir "usr/share/doc/${pkgname}" + vcopy Documentation/* "usr/share/doc/${pkgname}" } diff --git a/srcpkgs/deutex/template b/srcpkgs/deutex/template index 7c232bbe83d..88846dd7f70 100644 --- a/srcpkgs/deutex/template +++ b/srcpkgs/deutex/template @@ -1,16 +1,16 @@ # Template file for 'deutex' pkgname=deutex -version=5.1.2 -revision=3 +version=5.2.1 +revision=1 build_style=gnu-configure hostmakedepends="automake libtool pkg-config asciidoc" makedepends="libpng-devel" short_desc="WAD composer for DOOM and others" -maintainer="maxice8 " +maintainer="Benjamín Albiñana " license="GPL-2.0-only, LGPL-2.0-or-later" homepage="https://github.com/Doom-Utils/deutex" distfiles="https://github.com/Doom-Utils/deutex/archive/v${version}.tar.gz" -checksum=b91b1cd40098cc8f5e1e9a18ea4b5b785a4f54ff2ce5c6d9524f22ca84a83bd0 +checksum=5b4b2d5a0c85fcccb206a94685ecf5558a891ee6ce9e0cdbf96d4c4a129d5bcc pre_configure() { autoreconf -fi diff --git a/srcpkgs/devedeng/template b/srcpkgs/devedeng/template index 3a28ed5e49b..d971b2e207b 100644 --- a/srcpkgs/devedeng/template +++ b/srcpkgs/devedeng/template @@ -1,6 +1,6 @@ # Template file for 'devedeng' pkgname=devedeng -version=4.14.0 +version=4.16.0 revision=1 archs=noarch build_style=python3-module @@ -9,8 +9,8 @@ hostmakedepends="python3" depends="cdrtools desktop-file-utils dvdauthor ffmpeg gtk+3 hicolor-icon-theme python3-gobject python3-setuptools vcdimager" short_desc="Create video DVDs and CDs" -maintainer="Orphaned " +maintainer="Benjamín Albiñana " license="GPL-3.0-or-later" homepage="http://www.rastersoft.com/programas/devede.html" distfiles="https://gitlab.com/rastersoft/devedeng/-/archive/${version}/${pkgname}-${version}.tar.bz2" -checksum=9e443e66bcb515008584061ee52a8a8a7404343befeb747647725544adb8d973 +checksum=fe2715aa8f73133fc2d809d840fd662dcf9776fcedfb68169984af2e762b5164 diff --git a/srcpkgs/dhcpcd/template b/srcpkgs/dhcpcd/template index b6214863908..35b108a355f 100644 --- a/srcpkgs/dhcpcd/template +++ b/srcpkgs/dhcpcd/template @@ -1,8 +1,9 @@ # Template file for 'dhcpcd' pkgname=dhcpcd -version=8.0.2 +version=8.0.6 revision=1 build_style=configure +make_check_target=test configure_args="--prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --rundir=/run" hostmakedepends="ntp pkg-config" makedepends="eudev-libudev-devel" @@ -11,7 +12,7 @@ maintainer="Enno Boland " license="BSD-2-Clause" homepage="https://roy.marples.name/projects/dhcpcd" distfiles="https://roy.marples.name/downloads/dhcpcd/dhcpcd-${version}.tar.xz" -checksum=33a26ad561546cd2cfe1e6de6352a85df72b41c37def8c7eb00e90e57c627a5c +checksum=66b50199ed83bf502af3fab9ac001b417f0fac7e69c92d97a9c41499cebabd4f lib32disabled=yes conf_files=/etc/dhcpcd.conf diff --git a/srcpkgs/dialog/template b/srcpkgs/dialog/template index 287735b3bf9..a257a5b4485 100644 --- a/srcpkgs/dialog/template +++ b/srcpkgs/dialog/template @@ -9,7 +9,7 @@ build_style=gnu-configure configure_args="--with-ncursesw --disable-nls" makedepends="ncurses-devel" short_desc="Tool to display dialog boxes from shell scripts" -maintainer="maxice8 " +maintainer="Orphaned " license="LGPL-2.1-only" homepage="https://invisible-island.net/dialog/" distfiles="https://invisible-mirror.net/archives/${pkgname}/${pkgname}-${_distver}-${_date}.tgz" diff --git a/srcpkgs/diffr/template b/srcpkgs/diffr/template new file mode 100644 index 00000000000..96d43f10ed0 --- /dev/null +++ b/srcpkgs/diffr/template @@ -0,0 +1,18 @@ +# Template file for 'diffr' +pkgname=diffr +version=0.1.2 +revision=1 +build_style=cargo +short_desc="LCS based diff highlighting tool to ease code review from your terminal" +maintainer="Andy Weidenbaum " +license="MIT" +homepage="https://github.com/mookid/diffr" +changelog="https://github.com/mookid/diffr/raw/master/CHANGELOG.md" +distfiles="https://github.com/mookid/diffr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz" +checksum=76767fec7bcec1f86ed0c21c05ce4fee3ac41e00f2b88e91249102b02c0f7307 + +do_install() { + vbin "target/${RUST_TARGET}/release/diffr" + vlicense LICENSE.txt + vdoc README.md +} diff --git a/srcpkgs/digikam/template b/srcpkgs/digikam/template index 782d55424a2..b35d66bed0b 100644 --- a/srcpkgs/digikam/template +++ b/srcpkgs/digikam/template @@ -1,6 +1,6 @@ # Template file for 'digikam' pkgname=digikam -version=6.2.0 +version=6.3.0 revision=2 build_style=cmake hostmakedepends="extra-cmake-modules pkg-config bison flex" @@ -18,4 +18,6 @@ maintainer="Helmut Pozimski " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://www.digikam.org" distfiles="${KDE_SITE}/digikam/${version}/digikam-${version}.tar.xz" -checksum=28762ea0f03a82e3b2473c0682a358c9b83f5013aec827dd5ab6556a1f29baeb +checksum=94dc05e3f9c08b83419010d1689c7b0398d4eced4fef42375249c974622874ba + +CXXFLAGS="-Wl,-lpthread" diff --git a/srcpkgs/diskus/template b/srcpkgs/diskus/template index b125ef984ec..c171cbacb56 100644 --- a/srcpkgs/diskus/template +++ b/srcpkgs/diskus/template @@ -1,14 +1,14 @@ # Template file for 'diskus' pkgname=diskus -version=0.5.0 +version=0.6.0 revision=1 build_style=cargo -short_desc="A minimal, fast alternative to du -sh" +short_desc="Minimal, fast alternative to du -sh" maintainer="travankor " license="Apache-2.0, MIT" homepage="https://github.com/sharkdp/diskus" distfiles="https://github.com/sharkdp/diskus/archive/v${version}.tar.gz" -checksum=90d785f3f24899a6adcc497846f29112812a887c8042d0657d6b258d5a5352bc +checksum=661687edefa3218833677660a38ccd4e2a3c45c4a66055c5bfa4667358b97500 post_install() { vlicense LICENSE-MIT diff --git a/srcpkgs/dispcalGUI/template b/srcpkgs/dispcalGUI/template index d871b860cbe..42960daa3d8 100644 --- a/srcpkgs/dispcalGUI/template +++ b/srcpkgs/dispcalGUI/template @@ -1,6 +1,6 @@ # Template file for 'dispcalGUI' pkgname=dispcalGUI -version=3.8.5.0 +version=3.8.6.0 revision=1 _name="DisplayCAL" wrksrc="${_name}-${version}" @@ -14,7 +14,7 @@ maintainer="lemmi " license="GPL-3.0-or-later" homepage="https://displaycal.net/" distfiles="${SOURCEFORGE_SITE}/dispcalgui/${_name}-${version}.tar.gz" -checksum=20b0db965f0e25f237000ba299b5ddf8035b05327dd1b2505792465d182bd440 +checksum=7be913f4a13f4461f5cdcea57395ba99ad4efaa6206e891ed1c69c78626305fb pre_configure() { sed -i 's|MimeType=model/vrml;x-world/x-vrml;|MimeType=model/vrml;|' misc/displaycal-vrml-to-x3d-converter.desktop diff --git a/srcpkgs/dive/template b/srcpkgs/dive/template index b21319204e1..0307068e30c 100644 --- a/srcpkgs/dive/template +++ b/srcpkgs/dive/template @@ -1,6 +1,6 @@ # Template file for 'dive' pkgname=dive -version=0.7.2 +version=0.8.1 revision=1 build_style=go go_import_path="github.com/wagoodman/dive" @@ -10,7 +10,7 @@ maintainer="Cameron Nemo " license="MIT" homepage="https://github.com/wagoodman/dive" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=2ec6d77b662e0d709f6fc4282dbd8f0d3f6509f78133451b6b17d9b8fb594cf1 +checksum=6663960b974a6aad1d1271fb04cdaa9c527adbffdb37b9ab62fa9ad323f0bcda post_install() { vlicense LICENSE diff --git a/srcpkgs/dkms/files/kernel.d/dkms.postinst b/srcpkgs/dkms/files/kernel.d/dkms.postinst index 8c83c4723a0..314f2454bda 100644 --- a/srcpkgs/dkms/files/kernel.d/dkms.postinst +++ b/srcpkgs/dkms/files/kernel.d/dkms.postinst @@ -17,6 +17,8 @@ if [ ! -e /lib/modules/${VERSION}/build/include ] ; then exit 0 fi +export IGNORE_CC_MISMATCH=1 + if [ ! -f /lib/modules/${VERSION}/build/scripts/basic/fixdep ] ; then make -C /lib/modules/${VERSION}/build scripts fi diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template index d7aa2ef86db..73749260055 100644 --- a/srcpkgs/dkms/template +++ b/srcpkgs/dkms/template @@ -1,7 +1,7 @@ # Template file for 'dkms' pkgname=dkms version=2.7.1 -revision=1 +revision=2 conf_files="/etc/dkms/framework.conf" depends="bash kmod gcc make coreutils linux-headers" short_desc="Dynamic Kernel Modules System" diff --git a/srcpkgs/dma/patches/musl_sys_param_h.patch b/srcpkgs/dma/patches/musl_sys_param_h.patch deleted file mode 100644 index 170b6895bdc..00000000000 --- a/srcpkgs/dma/patches/musl_sys_param_h.patch +++ /dev/null @@ -1,12 +0,0 @@ -Include for roundup() declaration with musl libc - ---- dns.c 2013-06-03 16:03:15.000000000 +0200 -+++ dns.c 2015-08-07 14:53:01.499713464 +0200 -@@ -33,6 +33,7 @@ - */ - - #include -+#include - #include - #include - #include diff --git a/srcpkgs/dma/template b/srcpkgs/dma/template index eeae971c688..d521dcfc0b7 100644 --- a/srcpkgs/dma/template +++ b/srcpkgs/dma/template @@ -1,17 +1,17 @@ # Template file for 'dma' pkgname=dma -version=0.11 -revision=10 +version=0.12 +revision=1 conf_files="/etc/dma/*.conf" make_dirs="/var/spool/dma 2775 root mail" hostmakedepends="flex" makedepends="libressl-devel" short_desc="Small Mail Transport Agent (MTA), designed for home and office use" maintainer="Enno Boland " -license="BSD" +license="BSD-3-Clause" homepage="https://github.com/corecode/dma" distfiles="https://github.com/corecode/dma/archive/v${version}.tar.gz" -checksum=288bd57f17aba696b6423b1fa0cd0f7d9b7228d32811f1cd7b821d5f020051b8 +checksum=054a40203d43bc1182dcadf2375ccf01944329dce472444acb42d56cf01de367 system_accounts="mail" provides="smtp-server-0_1 smtp-forwarder-0_1" @@ -20,6 +20,7 @@ replaces="smtp-server>=0 smtp-forwarder>=0" do_build() { make PREFIX=/usr SBIN=/usr/bin CC=$CC LEX=flex ${makejobs} } + do_install() { vmkdir usr/bin make PREFIX=/usr SBIN=/usr/bin DESTDIR=${DESTDIR} sendmail-link mailq-link install-etc install diff --git a/srcpkgs/dmd/template b/srcpkgs/dmd/template index 2cf833eb56e..e96f79cdf8a 100644 --- a/srcpkgs/dmd/template +++ b/srcpkgs/dmd/template @@ -1,12 +1,12 @@ # Template file for 'dmd' pkgname=dmd -version=2.085.0 +version=2.087.1 revision=1 create_wrksrc=yes makedepends="dmd2.081 git" depends="libphobos>=${version} gcc" short_desc="Digital Mars D compiler" -maintainer="Orphaned " +maintainer="streaks " license="BSL-1.0" homepage="http://www.digitalmars.com/d/2.0/" distfiles=" @@ -14,10 +14,10 @@ distfiles=" https://github.com/dlang/druntime/archive/v${version}.tar.gz>druntime-${version}.tar.gz https://github.com/dlang/phobos/archive/v${version}.tar.gz>phobos-${version}.tar.gz http://downloads.dlang.org/releases/2.x/${version}/dmd.${version}.linux.tar.xz" -checksum="5e45e9ccf07fb0b500f63500b143f8b66dbaf3f4348d2a5250799fc2d22f8225 - b490b04afbd771a51188fd864497b5bf01b28d5a49fb06da420036fc8ea2f7d2 - c2018c8275cf83b542a9cc2c8dc99a770e9b8b89e638f8971dc9945bd0e5385e - 25d53bb87ff337f99984fcf77d4216d0b9af53ce9dfaf1c3fadf9c3959338487" +checksum="4239b8b6dc09acf3cdaa1c924f3a2b3cddd0fb532f817c4027b8966f1e96b3a8 + 19b7f18e11934a582d67dcb39c3ea91d5c24444c3be311f93160e0016ccc58fa + 84c7120e972255b4c66c532ff771ecbbb615b87140d0ffcb214d04b0d418f28f + c3c6cc865f5aa66dce4244467797b596ed0ada2bde93031350dc36713733cfc1" conf_files="/etc/dmd.conf" provides="d-compiler-${version}_${revision}" conflicts="dmd-bootstrap dmd2.081" @@ -74,7 +74,7 @@ do_install() { dmd-doc_package() { short_desc="Documentation and sample code for D programming language" replaces="dmd-docs>=0" - license="Boost License" + license="BSL-1.0" pkg_install() { cd dmd2 @@ -91,7 +91,7 @@ dmd-doc_package() { libphobos_package() { short_desc+=" - standard library" - license="Boost License" + license="BSL-1.0" conflicts="dmd-bootstrap" pkg_install() { vinstall ${wrksrc}/druntime/generated/linux/release/$_archbits/libdruntime.a 644 usr/lib libdruntime.a diff --git a/srcpkgs/dmenu-wayland/template b/srcpkgs/dmenu-wayland/template index baa380dca42..d36244bbbe7 100644 --- a/srcpkgs/dmenu-wayland/template +++ b/srcpkgs/dmenu-wayland/template @@ -1,9 +1,9 @@ # Template file for 'dmenu-wayland' pkgname=dmenu-wayland version=0.1 -revision=1 +revision=2 build_style=meson -hostmakedepends="cmake pkg-config" +hostmakedepends="cmake pkg-config wayland-devel" makedepends="cairo-devel glib-devel gobject-introspection libxkbcommon-devel pango-devel wayland-devel wayland-protocols" short_desc="Dmenu for wayland-compositors" @@ -12,7 +12,6 @@ license="MIT" homepage="https://github.com/nyyManni/dmenu-wayland" distfiles="https://github.com/nyyManni/dmenu-wayland/archive/v${version}.tar.gz" checksum=dcbc70156e138b2bb8788aeebf75af14f75e188ed78865840e341b5375ed6614 -nocross=yes #wait for wayland to use meson https://gitlab.freedesktop.org/wayland/weston/merge_requests/157 post_install() { vlicense LICENSE diff --git a/srcpkgs/dmenu/template b/srcpkgs/dmenu/template index 8eaa67ef39c..045b64e1635 100644 --- a/srcpkgs/dmenu/template +++ b/srcpkgs/dmenu/template @@ -4,7 +4,7 @@ version=4.9 revision=1 makedepends="libXinerama-devel libXft-devel freetype-devel" short_desc="Generic menu for X" -maintainer="Orphaned " +maintainer="Lugubris " license="MIT" homepage="https://tools.suckless.org/dmenu/" distfiles="https://dl.suckless.org/tools/${pkgname}-${version}.tar.gz" diff --git a/srcpkgs/dnscrypt-proxy/template b/srcpkgs/dnscrypt-proxy/template index b89455ac3e1..1ff59848058 100644 --- a/srcpkgs/dnscrypt-proxy/template +++ b/srcpkgs/dnscrypt-proxy/template @@ -1,17 +1,17 @@ # Template file for 'dnscrypt-proxy' pkgname=dnscrypt-proxy -version=2.0.25 +version=2.0.27 revision=1 build_style=go go_import_path=github.com/jedisct1/dnscrypt-proxy go_package="${go_import_path}/dnscrypt-proxy" short_desc="DNS proxy that encrypts queries" -maintainer="Orphaned " +maintainer="Lugubris " license="ISC" homepage="https://github.com/jedisct1/dnscrypt-proxy" changelog="https://raw.githubusercontent.com/jedisct1/dnscrypt-proxy/master/ChangeLog" distfiles="https://github.com/jedisct1/dnscrypt-proxy/archive/${version}.tar.gz" -checksum=774696004c9e306e1723b4cbbe66a961128a335543d318d0786492ce69b906fa +checksum=a501f44af39cb43e00489ef9e6678aa8adba2bc98f9042dd61ce60e9ad074d5a conf_files="/etc/dnscrypt-proxy.toml" system_accounts="dnscrypt_proxy" make_dirs="/var/log/dnscrypt-proxy 0750 dnscrypt_proxy dnscrypt_proxy" diff --git a/srcpkgs/dnsmasq/patches/nettle35.patch b/srcpkgs/dnsmasq/patches/nettle35.patch new file mode 100644 index 00000000000..90e83d2e00d --- /dev/null +++ b/srcpkgs/dnsmasq/patches/nettle35.patch @@ -0,0 +1,42 @@ +From: Vladislav Grishenko +Date: Wed, 26 Jun 2019 15:27:11 +0000 (+0500) +Subject: Fix build with libnettle 3.5 +X-Git-Url: http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commitdiff_plain;h=ab73a746a0d6fcac2e682c5548eeb87fb9c9c82e;hp=69bc94779c2f035a9fffdb5327a54c3aeca73ed5 + +Fix build with libnettle 3.5 +--- + +diff --git a/src/crypto.c b/src/crypto.c +index ebb871e..fecc64a 100644 +--- src/crypto.c ++++ src/crypto.c +@@ -275,6 +275,10 @@ static int dnsmasq_ecdsa_verify(struct blockdata *key_data, unsigned int key_len + static struct ecc_point *key_256 = NULL, *key_384 = NULL; + static mpz_t x, y; + static struct dsa_signature *sig_struct; ++#if NETTLE_VERSION_MAJOR == 3 && NETTLE_VERSION_MINOR < 4 ++#define nettle_get_secp_256r1() (&nettle_secp_256r1) ++#define nettle_get_secp_384r1() (&nettle_secp_384r1) ++#endif + + if (!sig_struct) + { +@@ -294,7 +298,7 @@ static int dnsmasq_ecdsa_verify(struct blockdata *key_data, unsigned int key_len + if (!(key_256 = whine_malloc(sizeof(struct ecc_point)))) + return 0; + +- nettle_ecc_point_init(key_256, &nettle_secp_256r1); ++ nettle_ecc_point_init(key_256, nettle_get_secp_256r1()); + } + + key = key_256; +@@ -307,7 +311,7 @@ static int dnsmasq_ecdsa_verify(struct blockdata *key_data, unsigned int key_len + if (!(key_384 = whine_malloc(sizeof(struct ecc_point)))) + return 0; + +- nettle_ecc_point_init(key_384, &nettle_secp_384r1); ++ nettle_ecc_point_init(key_384, nettle_get_secp_384r1()); + } + + key = key_384; + diff --git a/srcpkgs/docker-compose/patches/pyyaml_version.patch b/srcpkgs/docker-compose/patches/pyyaml_version.patch new file mode 100644 index 00000000000..77c69fd89a5 --- /dev/null +++ b/srcpkgs/docker-compose/patches/pyyaml_version.patch @@ -0,0 +1,13 @@ +diff --git a/setup.py b/setup.py +index 8371cc756ee0..5e27ab7c5d0e 100644 +--- a/setup.py ++++ b/setup.py +@@ -32,7 +32,7 @@ def find_version(*file_paths): + install_requires = [ + 'cached-property >= 1.2.0, < 2', + 'docopt >= 0.6.1, < 0.7', +- 'PyYAML >= 3.10, < 4.3', ++ 'PyYAML >= 3.10', + 'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0, < 2.21', + 'texttable >= 0.9.0, < 0.10', + 'websocket-client >= 0.32.0, < 1.0', diff --git a/srcpkgs/docker-compose/template b/srcpkgs/docker-compose/template index eaa967790b6..c3383fdf1ad 100644 --- a/srcpkgs/docker-compose/template +++ b/srcpkgs/docker-compose/template @@ -1,7 +1,7 @@ # Template file for 'docker-compose' pkgname=docker-compose -version=1.24.0 -revision=1 +version=1.24.1 +revision=2 archs=noarch wrksrc="compose-${version}" build_style=python3-module @@ -16,7 +16,9 @@ maintainer="pancake " license="Apache-2.0" homepage="https://docs.docker.com/compose/" distfiles="https://github.com/docker/compose/archive/${version}.tar.gz" -checksum=31933e401d295812617f23377f63fc2b8da13d8456b61a60cec0e02afcad5672 +checksum=63a0e0d3819ff77aebd3d5ea30f77b36475ed522c4dabed2eb10636e35aa9370 +patch_args="-Np1" + pre_build() { # relax texttable and requests upper bound diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template index f23caafc3f8..d9e389417c6 100644 --- a/srcpkgs/docker/template +++ b/srcpkgs/docker/template @@ -1,6 +1,6 @@ # Template file for 'docker' pkgname=docker -version=19.03.1 +version=19.03.3 revision=1 wrksrc="${pkgname}-ce-${version}" hostmakedepends="git go pkg-config curl cmake" @@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni " license="Apache-2.0" homepage="http://www.docker.io" distfiles="https://github.com/docker/docker-ce/archive/v${version}.tar.gz" -checksum=dad9123e203751ce9981bc34773721593655231c32412e310e748b18f10f0053 +checksum=63b0d28608f32573b9c03fa46247c6f959e9c08133ddf30a71276919de0194c0 # These are required at run-time. depends+=" iptables xz git" diff --git a/srcpkgs/dolphin/template b/srcpkgs/dolphin/template index 0d5f02f3788..ab48334e3de 100644 --- a/srcpkgs/dolphin/template +++ b/srcpkgs/dolphin/template @@ -1,6 +1,6 @@ # Template file for 'dolphin' pkgname=dolphin -version=19.08.0 +version=19.08.2 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -14,7 +14,7 @@ maintainer="John " license="GPL-2.0-or-later, GFDL-1.2-or-later" homepage="https://userbase.kde.org/Dolphin" distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz" -checksum=fd44714541ae7082d4615e441242afdba2d7810a373bfc8c3e64ff5c7db0a0f0 +checksum=0c56515737fc0f96020b3c157a93023095d1a1e23637e7670e068c6c286bbc3b if [ "$CROSS_BUILD" ]; then LDFLAGS=" -Wl,-rpath-link,../bin" diff --git a/srcpkgs/doomretro/template b/srcpkgs/doomretro/template index a247a172b0c..400fe78615d 100644 --- a/srcpkgs/doomretro/template +++ b/srcpkgs/doomretro/template @@ -1,6 +1,6 @@ # Template file for 'doomretro' pkgname=doomretro -version=2.9.3 +version=3.0.4 revision=1 build_style=cmake hostmakedepends="pkg-config" @@ -10,4 +10,4 @@ maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://www.doomretro.com" distfiles="https://github.com/bradharding/doomretro/archive/v${version}.tar.gz" -checksum=4e72f7b15a85be187c33e2e304c0d3306abfc4459e41d1e0e1f5413c336173e2 +checksum=60887a4edc3013cad5965ed2f39c5a3e114ef182c3dc83055caf3b682e2a638b diff --git a/srcpkgs/dos2unix/template b/srcpkgs/dos2unix/template index a354c26d2d2..862b49c8314 100644 --- a/srcpkgs/dos2unix/template +++ b/srcpkgs/dos2unix/template @@ -1,14 +1,14 @@ # Template file for 'dos2unix' pkgname=dos2unix -version=7.4.0 +version=7.4.1 revision=1 build_style=gnu-makefile +short_desc="Text file format converter" maintainer="Leah Neukirchen " -license="2-clause-BSD" +license="BSD-2-Clause" homepage="http://waterlan.home.xs4all.nl/dos2unix.html" -short_desc="Text file format converter" distfiles="http://waterlan.home.xs4all.nl/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=bac765abdbd95cdd87a71989d4382c32cf3cbfeee2153f0086cb9cf18261048a +checksum=1cd58a60b03ed28fa39046102a185c5e88c4f7665e1e0417c25de7f8b9f78623 post_install() { rm -rf ${DESTDIR}/usr/share/doc/${pkgname}-${version} diff --git a/srcpkgs/dosbox/template b/srcpkgs/dosbox/template index f9ecd89eefc..4518697790a 100644 --- a/srcpkgs/dosbox/template +++ b/srcpkgs/dosbox/template @@ -13,9 +13,6 @@ homepage="http://www.dosbox.com" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${wrksrc}.tar.gz" checksum=c0d13dd7ed2ed363b68de615475781e891cd582e8162b5c3669137502222260a -pre_configure() { - sed -i 's/png_check_sig/png_sig_cmp/' configure -} post_install() { vdoc README vdoc docs/README.video @@ -23,4 +20,3 @@ post_install() { vinstall ${FILESDIR}/${pkgname}.png 644 usr/share/pixmaps vinstall ${FILESDIR}/${pkgname}.desktop 644 usr/share/applications } - diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template index a931292cbbd..908febe902c 100644 --- a/srcpkgs/dovecot-plugin-pigeonhole/template +++ b/srcpkgs/dovecot-plugin-pigeonhole/template @@ -1,6 +1,6 @@ # Template file for 'dovecot-plugin-pigeonhole' pkgname=dovecot-plugin-pigeonhole -version=0.5.7.1 +version=0.5.8 revision=1 wrksrc="dovecot-2.3-pigeonhole-${version}" build_style=gnu-configure @@ -15,11 +15,11 @@ make_build_args="LIBDOVECOT_INCLUDE=-I${XBPS_CROSS_BASE}/usr/include/dovecot hostmakedepends="libldap-devel" makedepends="dovecot-devel libressl-devel libldap-devel" short_desc="Sieve implementation for Dovecot" -maintainer="John Regan " +maintainer="Leah Neukirchen " license="LGPL-2.1-or-later" homepage="https://pigeonhole.dovecot.org" distfiles="${homepage}/releases/2.3/${wrksrc}.tar.gz" -checksum=3270b24c1f75a7c144f54d6d08ce994176e39c2cdb3ac4dd80ad5e64aaaa2028 +checksum=8fb860d50c1b1a09aea9e25f8ee89c22e34ecedfb0e11a1c48a7f67310759022 dovecot-plugin-pigeonhole-devel_package() { depends="${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template index 78b1b26a7c9..4b195f2bf44 100644 --- a/srcpkgs/dovecot/template +++ b/srcpkgs/dovecot/template @@ -1,7 +1,7 @@ # Template file for 'dovecot' # revbump dovecot-plugin-pigeonhole when updating dovecot! pkgname=dovecot -version=2.3.7.1 +version=2.3.8 revision=1 build_style=gnu-configure configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin @@ -15,11 +15,11 @@ makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel libressl-devel clucene-devel libldap-devel libcap-devel pam-devel libcurl-devel expat-devel libsodium-devel" short_desc="IMAP and POP3 server written with security primarily in mind" -maintainer="Orphaned " +maintainer="Leah Neukirchen " license="LGPL-2.1-or-later" homepage="https://dovecot.org" distfiles="${homepage}/releases/2.3/${pkgname}-${version}.tar.gz" -checksum=c5a51d6f76e6e9c843df69e52a364a4c65c4c60e0c51d992eaa45f22f71803c3 +checksum=c5778d03bf26ab34a605854098035badec455d07adfab38d974f610c8f78b649 keep_libtool_archives=yes diff --git a/srcpkgs/dracut/patches/ppc-mac-thermal.patch b/srcpkgs/dracut/patches/ppc-mac-thermal.patch new file mode 100644 index 00000000000..16ce4dbff1d --- /dev/null +++ b/srcpkgs/dracut/patches/ppc-mac-thermal.patch @@ -0,0 +1,144 @@ +From 3b146ac6c0397f4a73c7b4ee498bff4e98479066 Mon Sep 17 00:00:00 2001 +From: q66 +Date: Mon, 22 Jul 2019 18:52:08 +0200 +Subject: [PATCH] modules.d: add a module for early fan control on PowerPC Macs + +The goal of this module is to enable automatic loading of the +thermal/fan control modules on PowerPC based Macs, as on some +modular kernel configurations this will not happen automatically +which will result in the fans spinning up to 100% until they are +manually loaded. + +This is especially a problem in live systems where it takes some +time to boot up and the spin-up happens before the system even +leaves initramfs. +--- + modules.d/90ppcmac/load-thermal.sh | 29 +++++++++++ + modules.d/90ppcmac/module-setup.sh | 82 ++++++++++++++++++++++++++++++ + 2 files changed, 111 insertions(+) + create mode 100644 modules.d/90ppcmac/load-thermal.sh + create mode 100644 modules.d/90ppcmac/module-setup.sh + +diff --git a/modules.d/90ppcmac/load-thermal.sh b/modules.d/90ppcmac/load-thermal.sh +new file mode 100644 +index 000000000..1e548f052 +--- /dev/null ++++ modules.d/90ppcmac/load-thermal.sh +@@ -0,0 +1,29 @@ ++#!/bin/sh ++# ++# This hook attempts to load the appropriate thermal modules ++# for PowerPC Macs depending on the specific machine you have. ++ ++[ -r /proc/cpuinfo ] || exit 0 ++ ++load_windfarm() { ++ local pm_model="$(sed -n '/model/p' /proc/cpuinfo)" ++ pm_model="${pm_model##*: }" ++ ++ # load quietly and respect the blacklist ++ # this way if the modules are for some reason missing, it will ++ # still exit successfully and not affect the boot process ++ case "$pm_model" in ++ PowerMac3,6) modprobe -b -q therm_windtunnel ;; ++ PowerMac7,2|PowerMac7,3) modprobe -b -q windfarm_pm72 ;; ++ PowerMac8,1|PowerMac8,2) modprobe -b -q windfarm_pm81 ;; ++ PowerMac9,1) modprobe -b -q windfarm_pm91 ;; ++ PowerMac11,2) modprobe -b -q windfarm_pm112 ;; ++ PowerMac12,1) modprobe -b -q windfarm_pm121 ;; ++ RackMac3,1) modprobe -b -q windfarm_rm31 ;; ++ *) ;; ++ esac ++ ++ return 0 ++} ++ ++load_windfarm +diff --git a/modules.d/90ppcmac/module-setup.sh b/modules.d/90ppcmac/module-setup.sh +new file mode 100644 +index 000000000..59221ec4d +--- /dev/null ++++ modules.d/90ppcmac/module-setup.sh +@@ -0,0 +1,82 @@ ++#!/bin/bash ++# ++# This module attempts to properly deal with thermal behavior on PowerPC ++# based Mac systems, by installing the model-appropriate (when hostonly) ++# or all (when not) fan control/thermal kernel modules and loading them ++# in a hook. ++# ++# While this is not strictly necessary for all kernels, particularly ++# modular kernels will not autoload those drivers, even once the full ++# system is up, which results in the fans spinning up to 100%; this is ++# particularly annoying on live systems, where the system takes a while ++# to load, so it's best to load the drivers early in initramfs stage. ++# ++# The behavior of this is inspired by the thermal hook in Debian's ++# initramfs-tools, but written for dracut specifically and updated ++# for modern kernels (2012+). ++ ++# called by dracut ++check() { ++ local _arch="$(uname -m)" ++ # only for PowerPC Macs ++ [[ "$_arch" == ppc* && "$_arch" != ppc*le ]] || return 1 ++ return 0 ++} ++ ++# called by dracut ++depends() { ++ return 0 ++} ++ ++# called by dracut ++installkernel() { ++ pmac_model() { ++ local pm_model="$(grep model /proc/cpuinfo)" ++ echo "${pm_model##*: }" ++ } ++ ++ # only PowerMac3,6 has a module, special case ++ if [[ "$(uname -m)" == ppc ]]; then ++ if ! [[ $hostonly ]] || [[ "$(pmac_model)" == "PowerMac3,6" ]]; then ++ instmods therm_windtunnel ++ fi ++ return 0 ++ fi ++ ++ windfarm_modules() { ++ if ! [[ $hostonly ]]; then ++ # include all drivers when not hostonly ++ instmods \ ++ windfarm_pm72 windfarm_pm81 windfarm_pm91 windfarm_pm112 \ ++ windfarm_pm121 windfarm_rm31 ++ else ++ # guess model specific module, then install the rest ++ case "$(pmac_model)" in ++ PowerMac7,2|PowerMac7,3) instmods windfarm_pm72 ;; ++ PowerMac8,1|PowerMac8,2) instmods windfarm_pm81 ;; ++ PowerMac9,1) instmods windfarm_pm91 ;; ++ PowerMac11,2) instmods windfarm_pm112 ;; ++ PowerMac12,1) instmods windfarm_pm121 ;; ++ RackMac3,1) instmods windfarm_rm31 ;; ++ # no match, so skip installation of the rest ++ *) return 1 ;; ++ esac ++ fi ++ return 0 ++ } ++ ++ # hostonly and didn't match a model; skip installing other modules ++ windfarm_modules || return 0 ++ # these are all required by the assorted windfarm_pm* ++ instmods \ ++ windfarm_core windfarm_cpufreq_clamp windfarm_pid \ ++ windfarm_smu_controls windfarm_smu_sat windfarm_smu_sensors \ ++ windfarm_fcu_controls windfarm_ad7417_sensor windfarm_max6690_sensor \ ++ windfarm_lm75_sensor windfarm_lm87_sensor ++} ++ ++# called by dracut ++install() { ++ # this will attempt to load the appropriate modules ++ inst_hook pre-udev 99 "$moddir/load-thermal.sh" ++} diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template index 6eb4125fb56..25614b2d3e2 100644 --- a/srcpkgs/dracut/template +++ b/srcpkgs/dracut/template @@ -1,7 +1,7 @@ # Template file for 'dracut' pkgname=dracut version=049 -revision=1 +revision=2 build_style=configure configure_args="--prefix=/usr --sysconfdir=/etc" conf_files="/etc/dracut.conf" @@ -9,7 +9,7 @@ hostmakedepends="asciidoc pkg-config" makedepends="libkmod-devel" depends="bash coreutils cpio psmisc" short_desc="Low-level tool for generating an initramfs/initrd image" -maintainer="Orphaned " +maintainer="q66 " license="GPL-2.0-or-later, LGPL-2.0-or-later" homepage="http://www.kernel.org/pub/linux/utils/boot/dracut/dracut.html" distfiles="https://github.com/dracutdevs/dracut/archive/${version}.tar.gz" diff --git a/srcpkgs/dragon-player/template b/srcpkgs/dragon-player/template index a2cea075394..826bc54fc8c 100644 --- a/srcpkgs/dragon-player/template +++ b/srcpkgs/dragon-player/template @@ -1,6 +1,6 @@ # Template file for 'dragon-player' pkgname=dragon-player -version=19.04.3 +version=19.08.2 revision=1 wrksrc="dragon-${version}" build_style=cmake @@ -13,4 +13,4 @@ maintainer="1is7ac3 " license="GPL-2.0-or-later" homepage="https://www.kde.org/applications/multimedia/dragonplayer" distfiles="${KDE_SITE}/applications/${version}/src/dragon-${version}.tar.xz" -checksum=498bbcf3441a32a588568981ee3ad563b6c4fd88b226d1673d83da09901f117a +checksum=3924dba504f370415c0d68cb5079acfc941aa761e9d9d2df2ea48b302ef9ce61 diff --git a/srcpkgs/drone-cli/template b/srcpkgs/drone-cli/template index 086015f3347..603c76fd72d 100644 --- a/srcpkgs/drone-cli/template +++ b/srcpkgs/drone-cli/template @@ -1,14 +1,14 @@ # Template file for 'drone-cli' pkgname=drone-cli -version=1.1.2 +version=1.2.0 revision=1 build_style=go go_import_path=github.com/drone/drone-cli go_package="${go_import_path}/drone" go_ldflags="-X main.version=${version}" short_desc="CLI for Drone continuous delivery platform" -maintainer="maxice8 " +maintainer="Orphaned " license="Apache-2.0" homepage="https://github.com/drone/drone-cli" distfiles="https://github.com/drone/drone-cli/archive/v${version}.tar.gz" -checksum=ba315c38dd36af898900fd0149d5228775f9f96d491d40dcaa3daddafd03aac4 +checksum=2f7cfb0ab99c94a2406f057ab509ed4974bf715a743979e62f542d889bb7bcc7 diff --git a/srcpkgs/drumstick-devel b/srcpkgs/drumstick-devel new file mode 120000 index 00000000000..e953fd56e31 --- /dev/null +++ b/srcpkgs/drumstick-devel @@ -0,0 +1 @@ +drumstick \ No newline at end of file diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template new file mode 100644 index 00000000000..bbc8f563897 --- /dev/null +++ b/srcpkgs/drumstick/template @@ -0,0 +1,33 @@ +# Template file for 'drumstick' +pkgname=drumstick +version=1.1.3 +revision=1 +build_style=cmake +configure_args="-DLIB_SUFFIX=" +hostmakedepends="pkg-config doxygen libxslt docbook-xsl" +makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel" +short_desc="Set of MIDI libraries using C++/Qt5 idioms and style" +maintainer="Mohammad Amin Sameti " +license="GPL-2.0-or-later" +homepage="http://drumstick.sourceforge.net" +distfiles="${SOURCEFORGE_SITE}/drumstick/drumstick-${version}.tar.bz2" +checksum=75aca4281da25fe0186b44c07772c5f0b4d1f2bba875c4667e7e6e9fcedb3cd9 + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" qt5-qmake qt5-host-tools" +fi + +post_install() { + for doc in TODO NEWS ChangeLog AUTHORS; do + vdoc $doc + done +} + +drumstick-devel_package() { + short_desc+=" - development libraries" + depends="${makedepends} ${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + } +} diff --git a/srcpkgs/dssi/template b/srcpkgs/dssi/template index 4478cb3ef37..fac019b9f57 100644 --- a/srcpkgs/dssi/template +++ b/srcpkgs/dssi/template @@ -1,12 +1,12 @@ # Template file for 'dssi' pkgname=dssi version=1.1.1 -revision=7 +revision=8 build_style=gnu-configure hostmakedepends="pkg-config" makedepends=" liblo-devel libsndfile-devel libsamplerate-devel alsa-lib-devel jack-devel - ladspa-sdk libSM-devel libX11-devel qt-devel" + ladspa-sdk libSM-devel libX11-devel" short_desc="API for audio processing plugins" maintainer="Orphaned " license="LGPL-2.1" @@ -14,10 +14,6 @@ homepage="http://dssi.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" checksum=f2c82b073a947c8255284249097667f9b14e660bf86186f3fcd3b3b3e087814e -if [ -n "$CROSS_BUILD" ]; then - hostmakedepends+=" qt-host-tools qt-devel" -fi - dssi-devel_package() { depends="dssi>=${version}" short_desc+=" - development files" diff --git a/srcpkgs/dtc/template b/srcpkgs/dtc/template index 72bcd3d08ea..3c1e4c05628 100644 --- a/srcpkgs/dtc/template +++ b/srcpkgs/dtc/template @@ -1,6 +1,6 @@ # Template file for 'dtc' pkgname=dtc -version=1.5.0 +version=1.5.1 revision=1 build_style=gnu-makefile make_build_args="NO_PYTHON=1" @@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni " license="GPL-2.0-only" homepage="https://git.kernel.org/pub/scm/utils/dtc/dtc.git" distfiles="https://www.kernel.org/pub/software/utils/dtc/dtc-${version}.tar.xz" -checksum=c672e443c9f7e39f5a7c8e602da6777f9ad55ad70de87de300a43828c8050172 +checksum=660b74039690fc37013660544d09191834efb58503c73c555c5513ba75ab031f CFLAGS="-fPIC" diff --git a/srcpkgs/dte/template b/srcpkgs/dte/template index 4836cb3d1f9..ea15247d6a2 100644 --- a/srcpkgs/dte/template +++ b/srcpkgs/dte/template @@ -1,6 +1,6 @@ # Template file for 'dte' pkgname=dte -version=1.8.2 +version=1.9.1 revision=1 build_style=gnu-makefile make_install_args="prefix=/usr" @@ -10,4 +10,4 @@ maintainer="Leah Neukirchen " license="GPL-2.0-only" homepage="https://github.com/craigbarnes/dte" distfiles="https://github.com/craigbarnes/dte/archive/v${version}.tar.gz" -checksum=778786c0b2588f0d9a651ebfde939885a5579745dae8f5d9adc480f4895d6c04 +checksum=80d2732269a308b5e1126ecc16c28cda032864f625a95184821a73c054f81a2d diff --git a/srcpkgs/duktape/template b/srcpkgs/duktape/template index a77c759199e..c7d5a957a18 100644 --- a/srcpkgs/duktape/template +++ b/srcpkgs/duktape/template @@ -1,6 +1,6 @@ # Template file for 'duktape' pkgname=duktape -version=2.3.0 +version=2.4.0 revision=1 build_style=gnu-makefile make_build_args="-f Makefile.sharedlibrary" @@ -10,7 +10,7 @@ maintainer="Christopher Brannon " license="MIT" homepage="http://duktape.org" distfiles="https://github.com/svaarala/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.xz" -checksum=ed6e2f3ab2061628a7aeee27ccff16538ba6a151480cccf2e846bd061e45afe8 +checksum=86a89307d1633b5cedb2c6e56dc86e92679fc34b05be551722d8cc69ab0771fc pre_build() { sed -i 's|^CC.*||g' Makefile.sharedlibrary diff --git a/srcpkgs/duplicity/template b/srcpkgs/duplicity/template index cae0d5556d0..c5b03faa53c 100644 --- a/srcpkgs/duplicity/template +++ b/srcpkgs/duplicity/template @@ -9,7 +9,7 @@ makedepends="python-devel librsync-devel" depends="python-fasteners gnupg" checkdepends="python-pexpect python-mock python-fasteners gnupg par2cmdline" short_desc="Encrypted bandwidth-efficient backup using the rsync algorithm" -maintainer="Leah Neukirchen " +maintainer="Orphaned " license="GPL-2.0-or-later" homepage="http://duplicity.nongnu.org/" changelog="http://duplicity.nongnu.org/CHANGELOG" diff --git a/srcpkgs/dutree/template b/srcpkgs/dutree/template index c6873cf8a00..d2faee7ab31 100644 --- a/srcpkgs/dutree/template +++ b/srcpkgs/dutree/template @@ -1,6 +1,6 @@ # Template file for 'dutree' pkgname=dutree -version=0.2.9 +version=0.2.12 revision=2 build_style=cargo short_desc="Tool to analyze file system usage written in Rust" @@ -8,4 +8,4 @@ maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://github.com/nachoparker/dutree" distfiles="https://github.com/nachoparker/dutree/archive/v${version}.tar.gz" -checksum=38e621e813b6d3ee37bf765ac68b98e77bdf7fc58b8b788d54153bd929c1fda1 +checksum=6304eaf2ee0913bd0521a351fe5138b3ae44103927655ec43672cadeac559c08 diff --git a/srcpkgs/e2fsprogs/template b/srcpkgs/e2fsprogs/template index 0fd0da5bce1..b9a2cbc85e1 100644 --- a/srcpkgs/e2fsprogs/template +++ b/srcpkgs/e2fsprogs/template @@ -1,6 +1,6 @@ # Template file for 'e2fsprogs' pkgname=e2fsprogs -version=1.45.3 +version=1.45.4 revision=1 build_style=gnu-configure configure_args="--enable-elf-shlibs --disable-fsck @@ -17,7 +17,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="http://e2fsprogs.sourceforge.net/" distfiles="${KERNEL_SITE}/kernel/people/tytso/e2fsprogs/v${version}/e2fsprogs-${version}.tar.xz" -checksum=90d10066b815e27b0b4875f0d5e396c663e0bf55aa3ca10868978d10c6ffe595 +checksum=65faf6b590ca1da97440d6446bd11de9e0914b42553740ba5d9d2a796fa0dc02 conf_files="/etc/mke2fs.conf /etc/e2scrub.conf" do_check() { diff --git a/srcpkgs/eclipse/template b/srcpkgs/eclipse/template index c097b29e622..e81765c0264 100644 --- a/srcpkgs/eclipse/template +++ b/srcpkgs/eclipse/template @@ -1,9 +1,9 @@ # Template file for 'eclipse' pkgname=eclipse -version=4.12 +version=4.13 revision=1 #code name of version -_release=2019-06 +_release=2019-09 archs="x86_64" wrksrc="eclipse" depends="virtual?java-environment unzip gtk+3 webkit2gtk libXtst hicolor-icon-theme desktop-file-utils" @@ -17,7 +17,7 @@ _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=bafa1143704f0bba32ed933fdf0f620bb956221b2ebba8e2a822c43671d8acf4 +checksum=18f55219c86fa4fe52f8a1a51b17c4eb99af6c215d6af8702555ea82af83acaa do_install() { vmkdir usr/lib/eclipse diff --git a/srcpkgs/edbrowse/patches/curl-7.62.patch b/srcpkgs/edbrowse/patches/curl-7.62.patch deleted file mode 100644 index ec9e85124e2..00000000000 --- a/srcpkgs/edbrowse/patches/curl-7.62.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 5d2b9e21fdf019f461ebe62738d615428d5db963 Mon Sep 17 00:00:00 2001 -From: Po-Chuan Hsieh -Date: Sat, 3 Nov 2018 18:11:14 +0800 -Subject: [PATCH] Fix build with curl 7.62.0 - -from CHANGES: -ssl: deprecate CURLE_SSL_CACERT in favour of a unified error code -Long live CURLE_PEER_FAILED_VERIFICATION ---- - src/http.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/http.c b/src/http.c -index 56eebab..ccafc8f 100644 ---- src/http.c -+++ src/http.c -@@ -1557,7 +1557,9 @@ void ebcurl_setError(CURLcode curlret, const char *url, int action, - break; - - case CURLE_PEER_FAILED_VERIFICATION: -+#if LIBCURL_VERSION_NUM < 0x073e00 - case CURLE_SSL_CACERT: -+#endif - (*fn) (MSG_NoCertify, host); - break; - - diff --git a/srcpkgs/edbrowse/template b/srcpkgs/edbrowse/template index 72671ae7797..b3e93dc9613 100644 --- a/srcpkgs/edbrowse/template +++ b/srcpkgs/edbrowse/template @@ -1,7 +1,7 @@ # Template file for 'edbrowse' pkgname=edbrowse -version=3.7.4 -revision=3 +version=3.7.5.1 +revision=1 hostmakedepends="perl pkg-config" build_style=cmake makedepends="duktape-devel libcurl-devel libtidy5-devel pcre-devel @@ -11,7 +11,7 @@ maintainer="Leah Neukirchen " license="GPL-3.0-or-later" homepage="http://edbrowse.org/" distfiles="https://github.com/CMB/${pkgname}/archive/v${version}.tar.gz" -checksum=b79e6417c1170c96ef68968c33d585725f0f2d27859e3fe807c980a9c33ea719 +checksum=096eb9051f9cde4cf71c833fa43f602fb3db40af056d1fab98a1711abf42caba do_install() { vbin build/edbrowse diff --git a/srcpkgs/editline/template b/srcpkgs/editline/template index c97f4c2a196..50f10aab097 100644 --- a/srcpkgs/editline/template +++ b/srcpkgs/editline/template @@ -4,7 +4,7 @@ version=1.16.1 revision=1 build_style=gnu-configure short_desc="Minimal readline() replacement" -maintainer="maxice8 " +maintainer="Orphaned " license="Spencer-94" homepage="http://troglobit.com/projects/editline/" distfiles="https://github.com/troglobit/editline/releases/download/${version}/editline-${version}.tar.xz" diff --git a/srcpkgs/eggdrop/template b/srcpkgs/eggdrop/template new file mode 100644 index 00000000000..dd274acdb61 --- /dev/null +++ b/srcpkgs/eggdrop/template @@ -0,0 +1,44 @@ +# Template file for 'eggdrop' +pkgname=eggdrop +version=1.8.4 +revision=1 +build_style=gnu-configure +hostmakedepends="tcl-devel" +makedepends="tcl-devel libressl-devel zlib-devel" +short_desc="Internet relay chat (IRC) bot" +maintainer="Andrew Benson " +license="GPL-2.0-or-later" +homepage="https://www.eggheads.org/" +distfiles="https://ftp.eggheads.org/pub/eggdrop/source/${version%.*}/eggdrop-${version}.tar.gz" +checksum=79644eb27a5568934422fa194ce3ec21cfb9a71f02069d39813e85d99cdebf9e + +pre_build() { + make config +} + +do_install() { + _lib="usr/lib/eggdrop" + _share="usr/share/eggdrop" + _conf="etc/eggdrop" + + make install DEST=ed_staging + + vbin eggdrop + + vmkdir "${_lib}" + vcopy "ed_staging/modules/*.so" "${_lib}" + vsed -e "s|modules/|/${_lib}/|" -i eggdrop.conf + + for _asset in language scripts help; do + vmkdir "${_share}/${_asset}/" + vcopy "ed_staging/${_asset}/*" "${_share}/${_asset}" + vsed -e "s|${_asset}/|/${_share}/&|" -i eggdrop.conf + done + + vmkdir "${_conf}/text" + vcopy "ed_staging/text/*" "${_conf}/text" + vsed -e "s|text/|/${_conf}/&|" -i eggdrop.conf + + vsconf eggdrop.conf + vsconf eggdrop-basic.conf +} diff --git a/srcpkgs/elfinfo/template b/srcpkgs/elfinfo/template index 17f8e262008..ecec045e604 100644 --- a/srcpkgs/elfinfo/template +++ b/srcpkgs/elfinfo/template @@ -1,7 +1,7 @@ # Template file for 'elfinfo' pkgname=elfinfo -version=0.7.5 -revision=2 +version=0.7.6 +revision=1 build_style=go go_import_path=github.com/xyproto/elfinfo hostmakedepends="git" @@ -10,7 +10,7 @@ maintainer="Alexander F. Rødseth " license="MIT" homepage="https://elfinfo.roboticoverlords.org/" distfiles="https://github.com/xyproto/elfinfo/releases/download/${version}/elfinfo-${version}.tar.xz" -checksum=430feccaeb102cb9bcef95a25d1fbf12cef2a693b7834446139eba1bc91c8af0 +checksum=194e782bf811ddb3f503af3621158bf9ff50aa6161ff51cbf899b6ebef5f2e7c post_install() { vlicense LICENSE diff --git a/srcpkgs/elfutils/template b/srcpkgs/elfutils/template index 40cd4b44ef9..3a7671de6b1 100644 --- a/srcpkgs/elfutils/template +++ b/srcpkgs/elfutils/template @@ -13,7 +13,7 @@ homepage="https://sourceware.org/elfutils/" distfiles="https://sourceware.org/${pkgname}/ftp/${version}/${pkgname}-${version}.tar.bz2" checksum=eb5747c371b0af0f71e86215a5ebb88728533c3a104a43d4231963f308cd1023 -CFLAGS="-Wno-error" +CFLAGS="-Wno-error -Wno-error=null-dereference" case "$XBPS_TARGET_MACHINE" in *-musl) makedepends+=" argp-standalone musl-fts-devel musl-obstack" ;; diff --git a/srcpkgs/elixir/template b/srcpkgs/elixir/template index 4b0ac69330d..2eece311b26 100644 --- a/srcpkgs/elixir/template +++ b/srcpkgs/elixir/template @@ -1,6 +1,6 @@ # Template file for 'elixir' pkgname=elixir -version=1.9.1 +version=1.9.2 revision=1 build_style=gnu-makefile make_check_target="test" @@ -12,4 +12,4 @@ maintainer="Duncaen " license="Apache-2.0" homepage="http://elixir-lang.org/" distfiles="https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz" -checksum=94daa716abbd4493405fb2032514195077ac7bc73dc2999922f13c7d8ea58777 +checksum=02aaa3ffd21f9cf51aceb3aa5a5bc2c1e2636b1611867e44f19693dcf856e25c diff --git a/srcpkgs/ell/template b/srcpkgs/ell/template index 83e3812da5f..8a2c91f4371 100644 --- a/srcpkgs/ell/template +++ b/srcpkgs/ell/template @@ -1,17 +1,17 @@ # Template file for 'ell' pkgname=ell -version=0.21 +version=0.24 revision=1 build_style=gnu-configure configure_args="--enable-glib" hostmakedepends="pkg-config" makedepends="libglib-devel" short_desc="Linux library for embedded development" -maintainer="maxice8 " +maintainer="Peter Bui " license="GPL-2.0-only" homepage="https://01.org/ell" distfiles="https://mirrors.edge.kernel.org/pub/linux/libs/ell/ell-${version}.tar.xz" -checksum=a0db4e3057ba41035637354b6af2aa4c74f83509e0c3e563d682df9d72eaff17 +checksum=2f96de39c48cc7facf91015a4dbb123541a8f7818cffa7885db6f8837837cc15 ell-devel_package() { depends="ell-${version}_${revision}" diff --git a/srcpkgs/elogind/template b/srcpkgs/elogind/template index 7d03f4e5fc0..3573956c521 100644 --- a/srcpkgs/elogind/template +++ b/srcpkgs/elogind/template @@ -1,7 +1,7 @@ # Template file for 'elogind' pkgname=elogind version=241.3 -revision=2 +revision=3 build_style=meson configure_args="-Dcgroup-controller=elogind -Dhalt-path=/usr/bin/halt -Drootlibexecdir=/usr/libexec/elogind -Dreboot-path=/usr/bin/reboot @@ -20,6 +20,10 @@ distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz" checksum=d6a465479c8a629d49ea9374f6199b0c60e7e42eade0fcd8265fc37085386365 conf_files="/etc/elogind/logind.conf" +if [ "$XBPS_TARGET_LIBC" = "musl" ]; then + configure_args+=" -Dutmp=false" +fi + pre_check() { # test-fs-util checks for /etc/machine-id/foo and expects ENOTDIR # since /etc/machine-id is expected to be a file. diff --git a/srcpkgs/emacs/template b/srcpkgs/emacs/template index 8e4ddd6736c..be1dd6da5b0 100644 --- a/srcpkgs/emacs/template +++ b/srcpkgs/emacs/template @@ -1,6 +1,6 @@ # Template file for 'emacs' pkgname=emacs -version=26.2 +version=26.3 revision=1 build_style=gnu-configure configure_args="--with-file-notification=inotify --with-modules @@ -21,7 +21,7 @@ maintainer="Leah Neukirchen " license="GPL-3.0-or-later" homepage="http://www.gnu.org/software/emacs/" distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=151ce69dbe5b809d4492ffae4a4b153b2778459de6deb26f35691e1281a9c58e +checksum=4d90e6751ad8967822c6e092db07466b9d383ef1653feb2f95c93e7de66d3485 replaces="emacs>=0" nocross=yes nopie=yes diff --git a/srcpkgs/enchant2/template b/srcpkgs/enchant2/template index be08603478a..f0094c23526 100644 --- a/srcpkgs/enchant2/template +++ b/srcpkgs/enchant2/template @@ -1,6 +1,6 @@ # Template file for 'enchant2' pkgname=enchant2 -version=2.2.5 +version=2.2.7 revision=1 wrksrc="enchant-${version}" build_style=gnu-configure @@ -9,11 +9,11 @@ make_install_args="$make_build_args" hostmakedepends="pkg-config" makedepends="libglib-devel hunspell-devel aspell-devel libvoikko-devel" short_desc="Generic spell checking library" -maintainer="maxice8 " +maintainer="Orphaned " license="LGPL-2.1-or-later" homepage="https://abiword.github.io/enchant/" distfiles="https://github.com/AbiWord/enchant/releases/download/v${version}/enchant-${version}.tar.gz" -checksum=ffce4ea00dbda1478d91c3e1538cadfe5761d9d6c0ceb27bc3dba51882fe1c47 +checksum=1b22976135812b35cb5b8d21a53ad11d5e7c1426c93f51e7a314a2a42cab3a09 enchant2-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/encodings/template b/srcpkgs/encodings/template index fab5215d3df..eb2ef08e8e6 100644 --- a/srcpkgs/encodings/template +++ b/srcpkgs/encodings/template @@ -1,17 +1,17 @@ -# Template build file for 'encodings'. +# Template file for 'encodings' pkgname=encodings -version=1.0.4 -revision=6 +version=1.0.5 +revision=1 archs=noarch build_style=gnu-configure hostmakedepends="pkg-config font-util" depends="font-util" short_desc="X11 Font Index Generator" -homepage="http://xorg.freedesktop.org" -license="Public domain" maintainer="Orphaned " +license="custom:Public domain" +homepage="http://xorg.freedesktop.org" distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2" -checksum=ced6312988a45d23812c2ac708b4595f63fd7a49c4dcd9f66bdcd50d1057d539 +checksum=bd96e16143a044b19e87f217cf6a3763a70c561d1076aad6f6d862ec41774a31 pre_build() { sed -e 's|^\(encodings_DATA = $(DATA_FILES)\).*|\1|' -i Makefile @@ -19,4 +19,5 @@ pre_build() { post_install() { # encodings.dir are generated at pkg post-install time. find ${DESTDIR} -name encodings.dir -delete + vlicense COPYING } diff --git a/srcpkgs/endless-sky/template b/srcpkgs/endless-sky/template index f3e4da66ece..57355b3ea1e 100644 --- a/srcpkgs/endless-sky/template +++ b/srcpkgs/endless-sky/template @@ -1,6 +1,6 @@ # Template file for 'endless-sky' pkgname=endless-sky -version=0.9.9 +version=0.9.10 revision=1 build_style=scons makedepends="SDL2-devel glew-devel libjpeg-turbo-devel libmad-devel @@ -11,7 +11,7 @@ maintainer="CoolOhm " license="GPL-3.0-or-later" homepage="http://endless-sky.github.io/" distfiles="https://github.com/endless-sky/endless-sky/archive/v${version}.tar.gz" -checksum=8bb9a17fd28177b2c17cadb282edcf4ef9a8b3de146f177cc4ca37c6f0aed8a5 +checksum=58f2e405e171be8426004216df4df7bb3a2792a507a5d01f77a0f02346332f6f endless-sky-data_package() { short_desc+=" - data files" diff --git a/srcpkgs/engrampa/template b/srcpkgs/engrampa/template index 573bcf722bb..9e7c329d19c 100644 --- a/srcpkgs/engrampa/template +++ b/srcpkgs/engrampa/template @@ -1,6 +1,6 @@ # Template file for 'engrampa' pkgname=engrampa -version=1.22.1 +version=1.22.2 revision=1 build_style=gnu-configure configure_args="--enable-magic --disable-schemas-compile --disable-packagekit" @@ -13,4 +13,4 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://mate-desktop.org" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=336b05cf891b82c55373454e5c03bed09d5296c39aed977366c595a0dd46e31b +checksum=ed21d1ceafbbe31e35c9225f0dc6a451ae2f8aff454bacef60df5a31e6b3075e diff --git a/srcpkgs/entr/template b/srcpkgs/entr/template index f6f734af09e..cff7bf64a2d 100644 --- a/srcpkgs/entr/template +++ b/srcpkgs/entr/template @@ -1,17 +1,16 @@ # Template file for 'entr' pkgname=entr -version=4.2 +version=4.3 revision=1 build_style=gnu-makefile -short_desc="A utility for running arbitrary commands when files change" +short_desc="Utility for running arbitrary commands when files change" maintainer="Andrea Brancaleoni " license="ISC" homepage="http://entrproject.org" distfiles="$homepage/code/$pkgname-$version.tar.gz" -checksum=27300215df0aab8b773002da25c7bf60681d8c392f5d5702946c46798e9b5d70 +checksum=b081c1dbdac7723e91f6d528a0d736f90cb2fb1458888aa3b446699d9d26235a post_extract() { - mv ${XBPS_BUILDDIR}/eradman-entr-* $wrksrc case "$XBPS_TARGET_MACHINE" in *-musl) # No need for _LINUX_PORT compat.h and strlcpy.c sed -i $wrksrc/Makefile.linux -e "s;-D_LINUX_PORT;;" diff --git a/srcpkgs/eog/template b/srcpkgs/eog/template index 672830a87d6..e0c978ad2fe 100644 --- a/srcpkgs/eog/template +++ b/srcpkgs/eog/template @@ -1,6 +1,6 @@ # Template file for 'eog' pkgname=eog -version=3.32.2 +version=3.34.1 revision=1 build_helper="gir" build_style=meson @@ -14,7 +14,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/EyeOfGnome" distfiles="${GNOME_SITE}/eog/${version%.*}/eog-${version}.tar.xz" -checksum=be971985c9b997cd302e2be7303374425e588d81658de538f14c4cfa1fbe9dad +checksum=fdb0739f8420af2ffb8e91c766a154afefdf20f721ad34b56cab27fd1569f42c shlib_provides="libeog.so" lib32disabled=yes nocross="Can not use target eog as a generator because it is cross-built" diff --git a/srcpkgs/eom/template b/srcpkgs/eom/template index 492bf5c32e7..a048c63c3f5 100644 --- a/srcpkgs/eom/template +++ b/srcpkgs/eom/template @@ -16,11 +16,6 @@ homepage="https://mate-desktop.org" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" checksum=64d73069ba4db8515a6c2c90fadba87e1c5cac67dd1e102b271f62e537ee970e -case "$XBPS_TARGET_MACHINE" in - i686-musl|x86_64-musl) ;; - *-musl) broken="gobject-introspection" ;; -esac - eom-devel_package() { short_desc+=" - development files" depends="${sourcepkg}-${version}_${revision}" diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template index bc0dedc6a1c..b5a3b890c75 100644 --- a/srcpkgs/epiphany/template +++ b/srcpkgs/epiphany/template @@ -1,7 +1,7 @@ # Template file for 'epiphany' pkgname=epiphany version=3.32.4 -revision=1 +revision=2 build_helper="gir" build_style=meson configure_args="-Ddistributor_name=VoidLinux -Dunit_tests=disabled" diff --git a/srcpkgs/eqonomize/template b/srcpkgs/eqonomize/template index 060d4878602..702247a68e4 100644 --- a/srcpkgs/eqonomize/template +++ b/srcpkgs/eqonomize/template @@ -1,6 +1,6 @@ # Template file for 'eqonomize' pkgname=eqonomize -version=1.4.1 +version=1.4.2 revision=1 build_style=qmake makedepends="qt5-charts-devel" @@ -11,7 +11,7 @@ license="GPL-3.0-or-later" homepage="http://eqonomize.github.io" changelog="https://raw.githubusercontent.com/Eqonomize/Eqonomize/master/ChangeLog" distfiles="https://github.com/Eqonomize/Eqonomize/releases/download/v${version}/${pkgname}-${version}.tar.gz" -checksum=b3856aa4ecd25618a26a101ed5cf80bdf0973e64fe681b7e2353dfc959256688 +checksum=1972efad7afad7c516cae8ef65894a4f205f722ab039748b132212cf7e1a6d8d if [ "$CROSS_BUILD" ]; then hostmakedepends="qt5-charts-devel" diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template index f031b19ebee..3afb2833920 100644 --- a/srcpkgs/erlang/template +++ b/srcpkgs/erlang/template @@ -1,6 +1,6 @@ # Template file for 'erlang' pkgname=erlang -version=22.0.7 +version=22.1.3 revision=1 create_wrksrc=yes build_wrksrc="otp-OTP-${version}" @@ -15,7 +15,7 @@ maintainer="Leah Neukirchen " license="Apache-2.0" homepage="http://www.erlang.org/" distfiles="https://github.com/erlang/otp/archive/OTP-${version}.tar.gz" -checksum=04c090b55ec4a01778e7e1a5b7fdf54012548ca72737965b7aa8c4d7878c92bc +checksum=53a828c1199a41cb54bd3bc6c2c49af977a8834e702c030a5ea34013a3fcacdd build_options="x11" diff --git a/srcpkgs/eselect/template b/srcpkgs/eselect/template index 0c84234daf7..e65a82933b1 100644 --- a/srcpkgs/eselect/template +++ b/srcpkgs/eselect/template @@ -1,17 +1,17 @@ # Template file for 'eselect' pkgname=eselect -version=1.4.14 +version=1.4.15 revision=1 archs=noarch build_style=gnu-configure hostmakedepends="automake libtool" depends="bash" short_desc="Modular configuration framework for Gentoo systems" -maintainer="maxice8 " +maintainer="Orphaned " license="GPL-2.0-only" homepage="https://wiki.gentoo.org/wiki/Project:Eselect" distfiles="https://gitweb.gentoo.org/proj/eselect.git/snapshot/eselect-${version}.tar.gz" -checksum=0e1799f9fd4c9dbc421930b33a7705bfd0171d39092fa4cb323bd5c5798af663 +checksum=77fc8449f6ebc0026512a06d6429a8848058516efbbb4fa1193508a9b43398a3 pre_configure() { ./autogen.bash diff --git a/srcpkgs/etcd/template b/srcpkgs/etcd/template index f2cbe6e5978..a115313af74 100644 --- a/srcpkgs/etcd/template +++ b/srcpkgs/etcd/template @@ -1,6 +1,6 @@ # Template file for 'etcd' pkgname=etcd -version=3.3.13 +version=3.3.15 revision=1 build_style=go short_desc="Distributed reliable key-value store" @@ -11,7 +11,7 @@ go_import_path="github.com/coreos/etcd" go_package="${go_import_path} ${go_import_path}/etcdctl" homepage="https://coreos.com/etcd/docs/latest/" distfiles="https://${go_import_path}/archive/v${version}.tar.gz" -checksum=02df2eb25d67dafc355d19a91791f686fcf59b04cea46110c3a11fcd5e365100 +checksum=3da9bba24d1d4c434d39b8f603c0f481d5888c2a9b7600d3d2cd0cc5d58804e2 conf_files="/etc/sv/etcd/conf" system_accounts="etcd" make_dirs="/var/lib/etcd 0755 etcd etcd" diff --git a/srcpkgs/etcetera/template b/srcpkgs/etcetera/template index a45f194810b..cfcb25f5b92 100644 --- a/srcpkgs/etcetera/template +++ b/srcpkgs/etcetera/template @@ -1,17 +1,17 @@ # Template file for 'etcetera' pkgname=etcetera -version=0.92 -revision=2 +version=1.0 +revision=1 archs=noarch -pycompile_version="$py3_ver" -pycompile_dirs="usr/lib/etcetera" depends="python3" short_desc="Config file management with a touch of wisdom" maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://gitlab.com/jeancf/etcetera" +pycompile_dirs="usr/lib/etcetera" distfiles="https://gitlab.com/jeancf/etcetera/-/archive/${version}/etcetera-${version}.tar.gz" -checksum=83e553454aaf56edb71e300c415523724c5e9df4e29adba3523502ed3d7bf6fe +checksum=3e4b7ff9095f6d311b12e30d745cc5d6b5c777f5daca7d01f7f1c46d273760c1 +pycompile_version="$py3_ver" conf_files="/etc/etcetera.conf" do_install() { diff --git a/srcpkgs/ethtool/template b/srcpkgs/ethtool/template index e1bee9ee0e9..23702d81012 100644 --- a/srcpkgs/ethtool/template +++ b/srcpkgs/ethtool/template @@ -1,6 +1,6 @@ # Template file for 'ethtool' pkgname=ethtool -version=5.2 +version=5.3 revision=1 build_style=gnu-configure short_desc="Utility for controlling network drivers and hardware" @@ -8,4 +8,4 @@ maintainer="Enno Boland " license="GPL-2.0-only" homepage="http://www.kernel.org/pub/software/network/ethtool/" distfiles="http://www.kernel.org/pub/software/network/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=665fd70841860d6cb974387e3ab97e0dde7745f95cb3ef35b98ef9aace137805 +checksum=f3dac0dbce7066af05fbe92812cc33a042d03fb00a45bcf9959f20455efe24c4 diff --git a/srcpkgs/eventviews/template b/srcpkgs/eventviews/template index cc34479c69c..9b6cbc02cb2 100644 --- a/srcpkgs/eventviews/template +++ b/srcpkgs/eventviews/template @@ -1,7 +1,7 @@ # Template file for 'eventviews' pkgname=eventviews -version=19.08.0 -revision=1 +version=19.08.2 +revision=2 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kcoreaddons kconfig" makedepends="calendarsupport-devel kdiagram-devel" @@ -10,7 +10,7 @@ maintainer="Helmut Pozimski " license="GPL-2.0-or-later" homepage="https://community.kde.org/KDE_PIM" distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz" -checksum=2f7713173b3820800d7927aff64eb7bcc84c643d9da43adbe6560cb842081295 +checksum=48da7f85c86bcc7a64d475c5bbcbb531471e70cfc9f4bda76030280f0671132d eventviews-devel_package() { short_desc+=" - development" diff --git a/srcpkgs/evince/template b/srcpkgs/evince/template index 0196ddc36a8..6e4ec3ecb97 100644 --- a/srcpkgs/evince/template +++ b/srcpkgs/evince/template @@ -1,7 +1,7 @@ # Template file for 'evince' pkgname=evince -version=3.32.0 -revision=2 +version=3.34.1 +revision=1 build_helper="gir" build_style=gnu-configure configure_args="$(vopt_enable gir introspection) --disable-schemas-compile @@ -19,7 +19,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Evince" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=f0d977216466ed2f5a6de64476ef7113dc7c7c9832336f1ff07f3c03c5324c40 +checksum=85e407cde396147b249120d816c7715fb6df191ca561cf65ff3554a5d67626df build_options="gir" build_options_default="gir" diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template index d781766e49a..5f7abc2ba3b 100644 --- a/srcpkgs/evolution-data-server/template +++ b/srcpkgs/evolution-data-server/template @@ -1,13 +1,13 @@ # Template file for 'evolution-data-server' pkgname=evolution-data-server -version=3.32.4 -revision=1 +version=3.34.1 +revision=2 build_style=cmake configure_args="-DENABLE_UOA=OFF $(vopt_if gir '-DENABLE_INTROSPECTION=ON -DENABLE_VALA_BINDINGS=ON' '-DENABLE_WEATHER=OFF')" hostmakedepends="flex glib-devel gperf intltool pkg-config libglib-devel $(vopt_if gir 'gobject-introspection')" -makedepends="libcanberra-devel libgdata-devel $(vopt_if gir libgweather-devel) +makedepends="boost-devel libcanberra-devel libgdata-devel $(vopt_if gir libgweather-devel) libical-devel libsecret-devel mit-krb5-devel $(vopt_if gir 'vala-devel') webkit2gtk-devel" depends="$(vopt_if gir libgweather) libsoup-gnome" short_desc="Centralized access to appointments and contacts" @@ -16,7 +16,7 @@ license="LGPL-2.1-only" homepage="https://wiki.gnome.org/Apps/Evolution" changelog="https://raw.githubusercontent.com/GNOME/evolution-data-server/gnome-3-30/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=83f67cb4b680e892b22b51bcde64c788b7ac63e92a99de401fb347e3794f4c7f +checksum=6ff56ba04cb639e627fe9d6e0ada106a10cadd68a0d53b8ec72b4e285df53abe build_options="gir" if [ -z "$CROSS_BUILD" ]; then diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template index 8d187a40d75..d96c66b7c19 100644 --- a/srcpkgs/evolution-ews/template +++ b/srcpkgs/evolution-ews/template @@ -1,6 +1,6 @@ # Template file for 'evolution-ews' pkgname=evolution-ews -version=3.32.1 +version=3.34.1 revision=1 build_style=cmake configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution" @@ -12,4 +12,4 @@ license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Apps/Evolution" changelog="https://raw.githubusercontent.com/GNOME/evolution-ews/gnome-3-30/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=0a6cf6d682060ed4bc7065d8320bc63022caa1885c5503d06b8087ae9eb284b0 +checksum=b7479de9eca74dfb99ba0303da830c4b9e21cba89e904ea6f5d158eaea3d5316 diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template index c29be1fa0b8..fc93468dded 100644 --- a/srcpkgs/evolution/template +++ b/srcpkgs/evolution/template @@ -1,7 +1,7 @@ # Template file for 'evolution' pkgname=evolution -version=3.32.4 -revision=1 +version=3.34.1 +revision=4 build_style=cmake configure_args="-DENABLE_AUTOAR=OFF -DENABLE_LIBCRYPTUI=OFF -DENABLE_GTKSPELL=OFF -DENABLE_TEXT_HIGHLIGHT=OFF -DENABLE_PST_IMPORT=OFF @@ -9,7 +9,7 @@ configure_args="-DENABLE_AUTOAR=OFF -DENABLE_LIBCRYPTUI=OFF -DENABLE_GTKSPELL=OF hostmakedepends="gnome-doc-utils gobject-introspection intltool itstool pkg-config" makedepends="NetworkManager-devel clutter-gtk-devel enchant2-devel - evolution-data-server-devel gtkhtml-devel libcanberra-devel + evolution-data-server-devel gspell-devel gtkhtml-devel libcanberra-devel $(vopt_if gir libgweather-devel) libnotify-devel webkit2gtk-devel ytnef-devel gnome-desktop-devel" depends="gnome-keyring" @@ -19,7 +19,7 @@ license="LGPL-2.1-or-later, LGPL-3.0-or-later, GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Evolution" changelog="https://raw.githubusercontent.com/GNOME/evolution/gnome-3-28/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=10af2af919bc0b5e7f6acbd1231ad573f6101ff095469613ce485b07c9ab1502 +checksum=656a92dd7f3e1afb6eef4f824fd17ae307c0904a67587ca5bb14ab9bd6f8bd42 shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so libevolution-mail.so libevolution-shell.so" diff --git a/srcpkgs/evtest/patches/0001-Add-missing-limits.h-include.patch b/srcpkgs/evtest/patches/0001-Add-missing-limits.h-include.patch new file mode 100644 index 00000000000..88ccfc13fdd --- /dev/null +++ b/srcpkgs/evtest/patches/0001-Add-missing-limits.h-include.patch @@ -0,0 +1,37 @@ +From 5eb4ab1c139ea38ebe6bb4acba08b09ee7d77d3c Mon Sep 17 00:00:00 2001 +From: Baruch Siach +Date: Sun, 18 Aug 2019 10:01:06 +0300 +Subject: [PATCH] Add missing limits.h include +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes build with musl libc that does not include limits.h indirectly via +other headers. + +evtest.c: In function ‘scan_devices’: +evtest.c:886:14: error: ‘PATH_MAX’ undeclared (first use in this function); did you mean INT8_MAX’? + char fname[PATH_MAX]; + ^~~~~~~~ + +Signed-off-by: Baruch Siach +Signed-off-by: Peter Hutterer +--- + evtest.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git evtest.c evtest.c +index 37d4f85..548c203 100644 +--- evtest.c ++++ evtest.c +@@ -56,6 +56,7 @@ + #include + #include + #include ++#include + #include + #include + #include +-- +2.23.0 + diff --git a/srcpkgs/evtest/template b/srcpkgs/evtest/template index b5e0c956c7f..1feed55a9d6 100644 --- a/srcpkgs/evtest/template +++ b/srcpkgs/evtest/template @@ -1,7 +1,7 @@ # Template file for 'evtest' pkgname=evtest -version=1.33 -revision=2 +version=1.34 +revision=1 build_style=gnu-configure hostmakedepends="automake" short_desc="Command line tool for displaying device input information" @@ -9,7 +9,7 @@ maintainer="sen " license="GPL-2.0-or-later" homepage="https://cgit.freedesktop.org/evtest/" distfiles="https://cgit.freedesktop.org/evtest/snapshot/evtest-${version}.tar.xz" -checksum=928f6e81c73bd71ce88be03f7fdad204087a04dccd0250462106af0c2d813532 +checksum=e49f1f160b30c8f7c2a4caef5ab655f1caf816483d19fdedd6db2d251d7ab80e pre_configure() { autoreconf -fi diff --git a/srcpkgs/exa/template b/srcpkgs/exa/template index 998e0ef1b77..2a2af04ee57 100644 --- a/srcpkgs/exa/template +++ b/srcpkgs/exa/template @@ -6,7 +6,7 @@ build_style=cargo hostmakedepends="cmake" makedepends="libgit2-devel" short_desc="Modern replacement for ls" -maintainer="maxice8 " +maintainer="Orphaned " license="MIT" homepage="https://the.exa.website/" distfiles="https://github.com/ogham/exa/archive/v${version}.tar.gz" diff --git a/srcpkgs/exec-on-git-staged/template b/srcpkgs/exec-on-git-staged/template new file mode 100644 index 00000000000..4f41115f8d9 --- /dev/null +++ b/srcpkgs/exec-on-git-staged/template @@ -0,0 +1,16 @@ +# Template file for 'exec-on-git-staged' +pkgname=exec-on-git-staged +version=1.1.0 +revision=1 +archs=noarch +depends="git" +short_desc="Execute commands on staged tree" +maintainer="Jan Christian Grünhage " +license="GPL-3.0-or-later" +homepage="https://github.com/jcgruenhage/exec-on-git-staged" +distfiles="https://github.com/jcgruenhage/exec-on-git-staged/archive/v${version}.tar.gz" +checksum=c163104e8d9539bec253275fd32a4241717db0f502bb43654a52d70ba71b745d + +do_install() { + vbin exec-on-git-staged +} diff --git a/srcpkgs/execline/template b/srcpkgs/execline/template index 154cf56a200..887045b728d 100644 --- a/srcpkgs/execline/template +++ b/srcpkgs/execline/template @@ -1,6 +1,6 @@ # Template file for 'execline' pkgname=execline -version=2.5.1.0 +version=2.5.2.0 revision=1 build_style=configure makedepends="skalibs-devel" @@ -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=b1a756842947488404db8173bbae179d6e78b6ef551ec683acca540ecaf22677 +checksum=280bb633cbe96088193225729ad32d80493d68380a127e6bc1789aac64375e29 CFLAGS="-fPIC" diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template index d22bf6a2f65..e76784b1b23 100644 --- a/srcpkgs/exiftool/template +++ b/srcpkgs/exiftool/template @@ -1,6 +1,6 @@ # Template file for 'exiftool' pkgname=exiftool -version=11.62 +version=11.71 revision=1 archs=noarch wrksrc="Image-ExifTool-${version}" @@ -14,4 +14,4 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="https://www.sno.phy.queensu.ca/~phil/exiftool/" changelog="https://sno.phy.queensu.ca/~phil/exiftool/history.html" distfiles="https://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-${version}.tar.gz" -checksum=60c11ca7ab19d069582dd950da97e4e574fea83b4c14175a5a2418d8942c4731 +checksum=5258817bea57e0eb76d6783acb387f01bb5212ecb27e9db722f3e7f16cf0b5b5 diff --git a/srcpkgs/exiv2/patches/musl.patch b/srcpkgs/exiv2/patches/musl.patch deleted file mode 100644 index 7baa5ba2b64..00000000000 --- a/srcpkgs/exiv2/patches/musl.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/src/futils.cpp b/src/futils.cpp -index a30acd9..24250fa 100644 ---- src/futils.cpp -+++ src/futils.cpp -@@ -54,7 +54,7 @@ - #include - - #ifdef EXV_HAVE_STRERROR_R --#ifdef _GNU_SOURCE -+#if defined(_GNU_SOURCE) && defined(__GLIBC__) - extern char *strerror_r(int errnum, char *buf, size_t n); - #else - extern int strerror_r(int errnum, char *buf, size_t n); -@@ -348,7 +348,7 @@ namespace Exiv2 { - std::ostringstream os; - #ifdef EXV_HAVE_STRERROR_R - const size_t n = 1024; --#ifdef _GNU_SOURCE -+#if defined(_GNU_SOURCE) && defined(__GLIBC__) - char *buf = 0; - char buf2[n]; - std::memset(buf2, 0x0, n); - diff --git a/srcpkgs/exiv2/template b/srcpkgs/exiv2/template index 7bd2e2be5db..90696f471ca 100644 --- a/srcpkgs/exiv2/template +++ b/srcpkgs/exiv2/template @@ -1,6 +1,6 @@ # Template file for 'exiv2' pkgname=exiv2 -version=0.27.0 +version=0.27.2 revision=1 wrksrc="exiv2-${version}-Source" build_style=cmake @@ -9,17 +9,18 @@ makedepends="zlib-devel expat-devel" short_desc="Image metadata manipulation" maintainer="Enno Boland " license="GPL-2.0-or-later" -homepage="http://www.exiv2.org" -distfiles="http://www.exiv2.org/releases/exiv2-${version}-Source.tar.gz" -checksum=ee88bc81539b73c65010651785d094fad0b39760a424b3c16c17e1856cfef2d7 +homepage="https://www.exiv2.org" +distfiles="https://www.exiv2.org/builds/exiv2-${version}-Source.tar.gz" +checksum=2652f56b912711327baff6dc0c90960818211cf7ab79bb5e1eb59320b78d153f exiv2-devel_package() { depends="${makedepends} ${sourcepkg}-${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include + vmove usr/lib/cmake vmove usr/lib/pkgconfig - vmove usr/lib/*.a - vmove usr/lib/*.so + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" } } diff --git a/srcpkgs/expat/template b/srcpkgs/expat/template index fe72ec47a9b..b26e9ee9a93 100644 --- a/srcpkgs/expat/template +++ b/srcpkgs/expat/template @@ -1,14 +1,14 @@ # Template file for 'expat' pkgname=expat -version=2.2.7 +version=2.2.9 revision=1 build_style=gnu-configure short_desc="XML parser library written in C" -maintainer="Orphaned " +maintainer="Leah Neukirchen " license="MIT" homepage="http://expat.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/expat/${pkgname}-${version}.tar.bz2" -checksum=cbc9102f4a31a8dafd42d642e9a3aa31e79a0aedaa1f6efd2795ebc83174ec18 +checksum=f1063084dc4302a427dabcca499c8312b3a32a29b7d2506653ecc8f950a9a237 post_install() { vlicense COPYING diff --git a/srcpkgs/expect/template b/srcpkgs/expect/template index cc157437666..66936f261e7 100644 --- a/srcpkgs/expect/template +++ b/srcpkgs/expect/template @@ -1,9 +1,10 @@ # Template file for 'expect' pkgname=expect version=5.45.4 -revision=1 +revision=2 wrksrc=${pkgname}${version} build_style=gnu-configure +make_check_target="test" makedepends="tcl-devel" short_desc="Programmed dialogue with interactive programs" maintainer="Leah Neukirchen " @@ -11,13 +12,18 @@ license="Public Domain" homepage="http://www.nist.gov/el/msid/expect.cfm" distfiles="${SOURCEFORGE_SITE}/${pkgname}/Expect/${version}/${pkgname}${version}.tar.gz" checksum=49a7da83b0bdd9f46d04a04deec19c7767bb9a323e40c4781f89caf760b92c34 -make_check_target="test" nocross=yes +alternatives=" + mkpasswd:mkpasswd:/usr/bin/expect-mkpasswd + mkpasswd:mkpasswd.1:/usr/share/man/man1/expect-mkpasswd.1" + LDFLAGS+=" -Wl,-rpath=/usr/lib:/usr/lib/${pkgname}${version}" post_install() { rm ${DESTDIR}/usr/bin/weather + mv ${DESTDIR}/usr/bin/{,expect-}mkpasswd + mv ${DESTDIR}/usr/share/man/man1/{,expect-}mkpasswd.1 } expect-devel_package() { depends="${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/extra-cmake-modules/template b/srcpkgs/extra-cmake-modules/template index acbc140778a..dace69919fe 100644 --- a/srcpkgs/extra-cmake-modules/template +++ b/srcpkgs/extra-cmake-modules/template @@ -1,6 +1,6 @@ # Template file for 'extra-cmake-modules' pkgname=extra-cmake-modules -version=5.61.0 +version=5.63.0 revision=1 archs=noarch build_style=cmake @@ -12,7 +12,7 @@ maintainer="John " license="BSD-3-Clause" homepage="https://projects.kde.org/projects/kdesupport/extra-cmake-modules" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=a86a3b12c8a540af822131a8d65586d985267b1d642c29b4815b6c7870bc126c +checksum=79926a0a2c6f5aa760a5a63209a7cad641476591b9bf4e51819f4fb752280792 post_install() { vlicense COPYING-CMAKE-SCRIPTS diff --git a/srcpkgs/extrace/template b/srcpkgs/extrace/template index 9d1d5a286e2..da7cf1f1bfb 100644 --- a/srcpkgs/extrace/template +++ b/srcpkgs/extrace/template @@ -1,8 +1,9 @@ # Template file for 'extrace' pkgname=extrace version=0.7 -revision=2 +revision=3 build_style=gnu-makefile +depends="libcap-progs" short_desc="Trace exec(2) calls system-wide" maintainer="Leah Neukirchen " license="GPL-2.0-or-later, BSD-2-Clause" diff --git a/srcpkgs/extractpdfmark/template b/srcpkgs/extractpdfmark/template index e52abb050ae..c42abd61a87 100644 --- a/srcpkgs/extractpdfmark/template +++ b/srcpkgs/extractpdfmark/template @@ -1,7 +1,7 @@ # Template file for 'extractpdfmark' pkgname=extractpdfmark version=1.1.0 -revision=4 +revision=5 build_wrksrc=build build_style=gnu-configure configure_script="../configure" diff --git a/srcpkgs/f2fs-tools/template b/srcpkgs/f2fs-tools/template index 77b37d14ee2..84c7744a71d 100644 --- a/srcpkgs/f2fs-tools/template +++ b/srcpkgs/f2fs-tools/template @@ -1,7 +1,7 @@ # Template file for 'f2fs-tools' pkgname=f2fs-tools -version=1.12.0 -revision=2 +version=1.13.0 +revision=1 build_style=gnu-configure configure_args="--disable-static ac_cv_file__git=yes" hostmakedepends="automake libtool pkg-config git" @@ -11,7 +11,7 @@ maintainer="Enno Boland " license="GPL-2.0-only" homepage="https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git" distfiles="https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/${pkgname}-${version}.tar.gz" -checksum=e2124e4dffaba865d41495d817bcb924d096adaec67ff777b8c7da99aa13f696 +checksum=b39d3ae9224267aab0070b5f17d91d0c5143f6d960166a27f6b11c8c87072c7d case "$XBPS_TARGET_MACHINE" in *-musl) makedepends+=" musl-legacy-compat" diff --git a/srcpkgs/faketime/template b/srcpkgs/faketime/template index 614743b1a8a..ba9acf87766 100644 --- a/srcpkgs/faketime/template +++ b/srcpkgs/faketime/template @@ -1,14 +1,14 @@ # Template file for 'faketime' pkgname=faketime -version=0.9.7 +version=0.9.8 revision=1 +wrksrc=lib$pkgname-$version build_style=gnu-makefile -short_desc="modifies the system time for a single application" +short_desc="Modifies the system time for a single application" maintainer="Enno Boland " -license="GPL-3" +license="GPL-2.0-only" homepage="https://github.com/wolfcw/libfaketime" distfiles="https://github.com/wolfcw/libfaketime/archive/v$version.tar.gz" -checksum=4d65f368b2d53ee2f93a25d5e9541ce27357f2b95e5e5afff210e0805042811e +checksum=06288237cd5890eca148489e5b904ed852ed0ffa8424bfb479342f4daa8442a3 CFLAGS='-fPIC -DPREFIX=\"/usr\" -DLIBDIRNAME=\"/lib/faketime\"' LDFLAGS='-lpthread' -wrksrc=lib$pkgname-$version diff --git a/srcpkgs/fastmod/template b/srcpkgs/fastmod/template index 8bc8629d07f..2297553303f 100644 --- a/srcpkgs/fastmod/template +++ b/srcpkgs/fastmod/template @@ -1,6 +1,6 @@ # Template file for 'fastmod' pkgname=fastmod -version=0.2.5 +version=0.2.6 revision=1 build_style=cargo short_desc="Tool for partially automating codebase refactors" @@ -8,4 +8,4 @@ maintainer="Adam Beckmeyer " license="Apache-2.0" homepage="https://github.com/facebookincubator/fastmod" distfiles="https://github.com/facebookincubator/fastmod/archive/v${version}.tar.gz" -checksum=fe90fb206a0e1081328423a68b931f2c381205366fcce7daee3e84c59023d629 +checksum=b70f615e883cc6cc235b62ee15ec2ec7ef4b04618b42fb79d8ee807440f6cf3c diff --git a/srcpkgs/fatrace/template b/srcpkgs/fatrace/template index ab39e67c22f..dae605bdd22 100644 --- a/srcpkgs/fatrace/template +++ b/srcpkgs/fatrace/template @@ -1,16 +1,15 @@ # Template file for 'fatrace' pkgname=fatrace -version=0.13 +version=0.14 revision=1 build_style=gnu-makefile short_desc="Report system wide file access events" maintainer="Leah Neukirchen " -license="GPL-3" +license="GPL-3.0-or-later" homepage="http://launchpad.net/fatrace" -distfiles="http://launchpad.net/fatrace/trunk/${version}/+download/${pkgname}-${version}.tar.bz2" -checksum=7d8b0670896b10600c89caedeec52c26237260d5a20fdea7049cd97f57213043 +distfiles="http://launchpad.net/fatrace/trunk/${version}/+download/${pkgname}-${version}.tar.xz" +checksum=d876999a801398e981e1a4d09b2259b92249fc55f05b31e60010deb27557bb8c post_extract() { sed -i 's/sbin/bin/g' Makefile - sed -i 's/KERNEL_O_LARGEFILE 00100000/KERNEL_O_LARGEFILE 0/g' fatrace.c } diff --git a/srcpkgs/fava/template b/srcpkgs/fava/template index 83d3632fc58..24e66cac45b 100644 --- a/srcpkgs/fava/template +++ b/srcpkgs/fava/template @@ -1,6 +1,6 @@ # Template file for 'fava' pkgname=fava -version=1.10 +version=1.11 revision=1 archs=noarch build_style=python3-module @@ -9,12 +9,18 @@ hostmakedepends="python3-setuptools" depends="python3-Babel python3-Cheroot python3-Flask-Babel python3-Flask python3-Jinja2 beancount python3-click python3-markdown2 python3-ply python3-simplejson" +checkdepends="$depends" short_desc="Web interface for Beancount" maintainer="Aluísio Augusto Silva Gonçalves " license="MIT" homepage="https://beancount.github.io/fava/" distfiles="${PYPI_SITE}/f/fava/fava-${version}.tar.gz" -checksum=5207d0ee49f86b5f7520ea7d556e769321853bb8eaa760acc606e4f76d49a990 +checksum=0cfeb20e2082a64aae1cda76538a9cca9f5027a19ad174ad742fa2ec2aeed93f + +do_check() { + # CLI test expects fava on $PATH. Not sure why static_url fails. + python3 -m pytest tests -k 'not cli and not static_url' +} post_install() { vlicense LICENSE diff --git a/srcpkgs/fd/template b/srcpkgs/fd/template index bf7396a727d..2094d0dd5f0 100644 --- a/srcpkgs/fd/template +++ b/srcpkgs/fd/template @@ -1,6 +1,6 @@ # Template file for 'fd' pkgname=fd -version=7.3.0 +version=7.4.0 revision=1 build_style=cargo short_desc="Simple, fast and user-friendly alternative to find" @@ -8,7 +8,7 @@ maintainer="Jerry Tegno " license="Apache-2.0, MIT" homepage="https://github.com/sharkdp/fd" distfiles="https://github.com/sharkdp/fd/archive/v${version}.tar.gz" -checksum=fbd48cc83c90a0ab09fc3bbe865708a3a528876a99f8304a17d07af7fb378170 +checksum=33570ba65e7f8b438746cb92bb9bc4a6030b482a0d50db37c830c4e315877537 case "$XBPS_TARGET_MACHINE" in aarch64-musl) broken="MAP_32BIT; not found in libc" ;; diff --git a/srcpkgs/fdk-aac/template b/srcpkgs/fdk-aac/template index 43076213592..05db31c4647 100644 --- a/srcpkgs/fdk-aac/template +++ b/srcpkgs/fdk-aac/template @@ -1,6 +1,6 @@ # Template file for 'fdk-aac' pkgname=fdk-aac -version=2.0.0 +version=2.0.1 revision=1 build_style=gnu-configure short_desc="Fraunhofer FDK AAC codec library" @@ -8,7 +8,7 @@ maintainer="Leah Neukirchen " license="Fraunhofer FDK AAC Codec license" homepage="http://www.iis.fraunhofer.de/en/ff/amm/impl/fdkaaccodec.html" distfiles="${SOURCEFORGE_SITE}/opencore-amr/${pkgname}-${version}.tar.gz" -checksum=f7d6e60f978ff1db952f7d5c3e96751816f5aef238ecf1d876972697b85fd96c +checksum=840133aa9412153894af03b27b03dde1188772442c316a4ce2a24ed70093f271 post_install() { vlicense NOTICE LICENSE diff --git a/srcpkgs/fetchmail/patches/patch-socket_c.diff b/srcpkgs/fetchmail/patches/patch-socket_c.diff deleted file mode 100644 index 6f92aef0258..00000000000 --- a/srcpkgs/fetchmail/patches/patch-socket_c.diff +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-socket_c,v 1.9 2015/08/25 17:44:09 jca Exp $ - -Fixed upstream - - https://gitlab.com/fetchmail/fetchmail/commit/a2ae6f8d15d7caf815d7bdd13df833fd1b2af5cc - ---- socket.c.orig Fri Jul 17 22:01:09 2015 -+++ socket.c Fri Jul 17 22:19:47 2015 -@@ -914,7 +914,12 @@ int SSLOpen(int sock, char *mycert, char *mykey, const - return -1; - #endif - } else if(!strcasecmp("ssl3",myproto)) { -+#if HAVE_DECL_SSLV3_CLIENT_METHOD + 0 > 0 - _ctx[sock] = SSL_CTX_new(SSLv3_client_method()); -+#else -+ report(stderr, GT_("Your operating system does not support SSLv3.\n")); -+ return -1; -+#endif - } else if(!strcasecmp("tls1",myproto)) { - _ctx[sock] = SSL_CTX_new(TLSv1_client_method()); - } else if (!strcasecmp("ssl23",myproto)) { diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template index 45e8c1efa2a..706d3b4fa0e 100644 --- a/srcpkgs/fetchmail/template +++ b/srcpkgs/fetchmail/template @@ -1,15 +1,15 @@ # Template file for 'fetchmail' pkgname=fetchmail -version=6.3.26 -revision=15 +version=6.4.1 +revision=1 build_style=gnu-configure configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr" hostmakedepends="python-devel" makedepends="libressl-devel" depends="python" -short_desc="A remote-mail retrieval utility" +short_desc="Remote-mail retrieval utility" maintainer="Orphaned " -license="GPL-2" +license="GPL-2.0-only" homepage="http://fetchmail.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=79b4c54cdbaf02c1a9a691d9948fcb1a77a1591a813e904283a8b614b757e850 +checksum=3f33f11dd08c3e8cc3e9d18eec686b1626d4818f4d5a72791507bbc4dce6a9a0 diff --git a/srcpkgs/ffcall/template b/srcpkgs/ffcall/template index 62b9560e70d..874a2344a71 100644 --- a/srcpkgs/ffcall/template +++ b/srcpkgs/ffcall/template @@ -1,6 +1,6 @@ # Template file for 'ffcall' pkgname=ffcall -version=2.1 +version=2.2 revision=1 wrksrc="libffcall-${version}" build_style=gnu-configure @@ -9,7 +9,7 @@ maintainer="Martin Riese " license="GPL-2.0-or-later" homepage="https://www.gnu.org/software/libffcall" distfiles="${GNU_SITE}/libffcall/libffcall-${version}.tar.gz" -checksum=a091fb8bbabf17c94a2dae2d41161b96a08ab92b5f75d3364157a2c34d538c47 +checksum=ebfa37f97b6c94fac24ecf3193f9fc829517cf81aee9ac2d191af993d73cb747 # won't work with parallel_build so just turn it off (thanks to JuanRP for the Hint) disable_parallel_build=yes diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template index f38a74a5e71..01287fc19a3 100644 --- a/srcpkgs/ffmpeg/template +++ b/srcpkgs/ffmpeg/template @@ -1,7 +1,7 @@ # Template file for 'ffmpeg' # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname! pkgname=ffmpeg -version=4.2 +version=4.2.1 revision=1 short_desc="Decoding, encoding and streaming software" maintainer="Johannes " @@ -9,7 +9,7 @@ license="GPL-3.0-or-later" homepage="https://www.ffmpeg.org" changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog" distfiles="${homepage}/releases/ffmpeg-${version}.tar.xz" -checksum=023f10831a97ad93d798f53a3640e55cd564abfeba807ecbe8524dac4fedecd5 +checksum=cec7c87e9b60d174509e263ac4011b522385fd0775292e1670ecc1180c9bb6d4 hostmakedepends="pkg-config perl yasm" makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel @@ -21,10 +21,11 @@ makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-deve $(vopt_if vdpau libvdpau-devel) $(vopt_if v4l2 v4l-utils-devel) libbs2b-devel libvidstab-devel $(vopt_if faac faac-devel) $(vopt_if fdk_aac fdk-aac-devel) $(vopt_if vpx libvpx-devel) $(vopt_if aom libaom-devel) - $(vopt_if nvenc nv-codec-headers) $(vopt_if sndio sndio-devel)" + $(vopt_if nvenc nv-codec-headers) $(vopt_if sndio sndio-devel) + $(vopt_if dav1d libdav1d-devel)" -build_options="x265 v4l2 vaapi vdpau vpx faac fdk_aac aom nvenc sndio pulseaudio" -build_options_default="x265 v4l2 vpx sndio pulseaudio" +build_options="x265 v4l2 vaapi vdpau vpx faac fdk_aac aom nvenc sndio pulseaudio dav1d" +build_options_default="x265 v4l2 vpx sndio pulseaudio dav1d" case "$XBPS_TARGET_MACHINE" in i686*|x86_64*) build_options_default+=" vaapi vdpau nvenc";; @@ -74,7 +75,8 @@ do_configure() { $(vopt_if x265 '--enable-libx265' '--disable-libx265') \ $(vopt_if v4l2 '--enable-libv4l2' '--disable-libv4l2') \ $(vopt_enable aom libaom) $(vopt_enable vaapi) $(vopt_enable vdpau) \ - --enable-libbs2b --enable-avresample --enable-libvidstab + --enable-libbs2b --enable-avresample --enable-libvidstab \ + $(vopt_if dav1d '--enable-libdav1d') } do_build() { rm ${XBPS_WRAPPERDIR}/strip diff --git a/srcpkgs/ffmpegthumbnailer/template b/srcpkgs/ffmpegthumbnailer/template index 9fd2f4ec011..ab627032c2e 100644 --- a/srcpkgs/ffmpegthumbnailer/template +++ b/srcpkgs/ffmpegthumbnailer/template @@ -1,7 +1,7 @@ # Template file for 'ffmpegthumbnailer' pkgname=ffmpegthumbnailer -version=2.2.0 -revision=4 +version=2.2.2 +revision=1 build_style=cmake hostmakedepends="pkg-config" makedepends="libpng-devel libjpeg-turbo-devel ffmpeg-devel" @@ -11,15 +11,12 @@ maintainer="Jürgen Buchmüller " license="GPL-2.0-or-later" homepage="https://github.com/dirkvdb/${pkgname}" distfiles="${homepage}/releases/download/${version}/${pkgname}-${version}.tar.bz2" -checksum=e5c31299d064968198cd378f7488e52cd5e738fac998eea780bc77d7f32238c2 +checksum=1cb24059c38223f657b300c84dd80491b7040d4b69471c4fea69be862bc99b5b -CXXFLAGS="-D_GLIBCXX_USE_C99_STDIO=1 -D_GLIBCXX_USE_C99_STDLIB=1" - -post_configure() { - # Patch wrong man1 path - sed -e 's;DESTINATION "/usr/man/man1";DESTINATION "/usr/share/man/man1";' \ - -i ${wrksrc}/build/cmake_install.cmake +post_install() { + vinstall dist/ffmpegthumbnailer.thumbnailer 644 usr/share/thumbnailers } + ffmpegthumbnailer-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" diff --git a/srcpkgs/ffmpegthumbs/template b/srcpkgs/ffmpegthumbs/template index 870aca2b770..ed00015b1bc 100644 --- a/srcpkgs/ffmpegthumbs/template +++ b/srcpkgs/ffmpegthumbs/template @@ -1,6 +1,6 @@ # Template file for 'ffmpegthumbs' pkgname=ffmpegthumbs -version=19.04.3 +version=19.08.2 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -12,4 +12,4 @@ maintainer="Michael Straube " license="GPL-2.0-or-later" homepage="${KDE_SITE}/applications" distfiles="${KDE_SITE}/applications/${version}/src/ffmpegthumbs-${version}.tar.xz" -checksum=ddd6cb3388c1af96a14d611de9575f6f6c22c6acfe52e63e44b746709ac8024b +checksum=deba57ff10525efdf404401f6b605c1be0f02ec0bfe00465e080b42dc379d570 diff --git a/srcpkgs/ffsend/template b/srcpkgs/ffsend/template index c897b5f2e8d..3b9af5402a2 100644 --- a/srcpkgs/ffsend/template +++ b/srcpkgs/ffsend/template @@ -1,6 +1,6 @@ # Template file for 'ffsend' pkgname=ffsend -version=0.2.49 +version=0.2.52 revision=1 build_style=cargo hostmakedepends="pkg-config" @@ -10,4 +10,4 @@ maintainer="Jasper Chan " license="GPL-3.0-or-later" homepage="https://github.com/timvisee/ffsend" distfiles="https://github.com/timvisee/ffsend/archive/v${version}.tar.gz" -checksum=3f39dd5f8be525904f4486228fcd51c7f3c0263e23eba096d6f6ceb71e6d73f5 +checksum=b5fd937604eeccd85d7b30d8510784d95497c2412da29c586430275db55043ef diff --git a/srcpkgs/ffuf/template b/srcpkgs/ffuf/template new file mode 100644 index 00000000000..9ba257e4a61 --- /dev/null +++ b/srcpkgs/ffuf/template @@ -0,0 +1,16 @@ +# Template file for 'ffuf' +pkgname=ffuf +version=0.10 +revision=1 +build_style=go +go_import_path="github.com/ffuf/ffuf" +short_desc="Fast web fuzzer" +maintainer="Andrew Benson " +license="MIT" +homepage="https://github.com/ffuf/ffuf" +distfiles="${homepage}/archive/v${version}.tar.gz" +checksum=7efbedace2798dd970a801ed2ede6ef41ef48414140efda71f8018e7df23edf3 + +post_install() { + vlicense LICENSE +} diff --git a/srcpkgs/fierce/template b/srcpkgs/fierce/template new file mode 100644 index 00000000000..86dedb39ad2 --- /dev/null +++ b/srcpkgs/fierce/template @@ -0,0 +1,15 @@ +# Template file for 'fierce' +pkgname=fierce +version=1.3.0 +revision=1 +archs=noarch +build_style=python3-module +pycompile_module="fierce" +hostmakedepends="python3-setuptools" +depends="python3-dnspython" +short_desc="DNS reconnaissance tool" +maintainer="Andrew Benson " +license="GPL-3.0-or-later" +homepage="https://github.com/mschwager/fierce" +distfiles="${homepage}/archive/${version}.tar.gz" +checksum=ca6938c6ecb2cb3ff0484ee3d90566e044bf35c30237e921d439310fa6cb788b diff --git a/srcpkgs/figurine/template b/srcpkgs/figurine/template index 522e604fe6f..bef430fa4ba 100644 --- a/srcpkgs/figurine/template +++ b/srcpkgs/figurine/template @@ -1,7 +1,7 @@ # Template file for 'figurine' pkgname=figurine -version=0.3.0 -revision=2 +version=1.0.1 +revision=1 build_style=go go_import_path=github.com/arsham/figurine hostmakedepends="git" @@ -10,4 +10,4 @@ maintainer="travankor " license="Apache-2.0" homepage="https://github.com/arsham/figurine" distfiles="https://github.com/arsham/figurine/archive/v${version}.tar.gz" -checksum=beea08f1bfcf2d5875dfaa948b43772304f552945a5a299910117b4208280488 +checksum=5af66e90009dae130b8e75678d038ba770b46b8488bff975f5f0f52c0e928bd6 diff --git a/srcpkgs/file-roller/template b/srcpkgs/file-roller/template index 278635cab95..837fdb7a7af 100644 --- a/srcpkgs/file-roller/template +++ b/srcpkgs/file-roller/template @@ -1,6 +1,6 @@ # Template file for 'file-roller' pkgname=file-roller -version=3.32.1 +version=3.32.2 revision=1 build_style=meson hostmakedepends="glib-devel itstool pkg-config" @@ -12,4 +12,4 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/FileRoller" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=1cab0847845b3236725a99f81a638c504d06ac0576c7a947824208e498383547 +checksum=c60a79e0baf74cb1c09a1c8f5ffe0d6e311227ca14ecc5b1156beb3715341a71 diff --git a/srcpkgs/filelight/template b/srcpkgs/filelight/template index 42571cfc632..23a704a1ed8 100644 --- a/srcpkgs/filelight/template +++ b/srcpkgs/filelight/template @@ -1,17 +1,14 @@ # Template file for 'filelight' pkgname=filelight -version=19.08.0 +version=19.08.2 revision=1 build_style=cmake -hostmakedepends="extra-cmake-modules kcoreaddons" +hostmakedepends="extra-cmake-modules kcoreaddons kdoctools + qt5-host-tools qt5-qmake" makedepends="kparts-devel qt5-devel" short_desc="Interactive map that helps visualize disk usage on your computer" maintainer="Piotr Wójcik " license="GPL-2.0-only" homepage="https://utils.kde.org/projects/filelight/" distfiles="${KDE_SITE}/applications/${version}/src/filelight-${version}.tar.xz" -checksum=bdd3d32f6666b3d2fa4c614f5f058571c8849484e1ba17a97996680503f8e8e6 - -if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" kconfig kdoctools python qt5-host-tools qt5-qmake" -fi +checksum=313ff23fceb427509b37efa012535e651618d42bde35c62cdc7732e463c346a6 diff --git a/srcpkgs/filezilla/template b/srcpkgs/filezilla/template index aca479c816f..c6de4dde1c3 100644 --- a/srcpkgs/filezilla/template +++ b/srcpkgs/filezilla/template @@ -1,6 +1,6 @@ # Template file for 'filezilla' pkgname=filezilla -version=3.44.2 +version=3.45.1 revision=1 build_style=gnu-configure configure_args="--disable-static --disable-manualupdatecheck --disable-autoupdatecheck @@ -15,7 +15,7 @@ license="GPL-2.0-or-later" homepage="https://filezilla-project.org" changelog="https://svn.filezilla-project.org/filezilla/FileZilla3/trunk/NEWS?view=co" distfiles="https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2" -checksum=5d4d20105859cee72be3ac171e844080f58031f5f96ee483bf86d6bfbc09deb6 +checksum=889c08a7247f05507ca4bd76f4e2cd0e0504deb1815c7a2a28d8cfbdaa9d1ec2 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" wxWidgets-gtk3-devel xdg-utils" diff --git a/srcpkgs/findutils/patches/gnulib-freadahead.patch b/srcpkgs/findutils/patches/gnulib-freadahead.patch deleted file mode 100644 index 5d8e5af28bf..00000000000 --- a/srcpkgs/findutils/patches/gnulib-freadahead.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gl/lib/freadahead.c -+++ gl/lib/freadahead.c -@@ -30,7 +30,7 @@ extern size_t __sreadahead (FILE *); - size_t - freadahead (FILE *fp) - { --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - if (fp->_IO_write_ptr > fp->_IO_write_base) - return 0; - return (fp->_IO_read_end - fp->_IO_read_ptr) diff --git a/srcpkgs/findutils/patches/gnulib-fseeko.patch b/srcpkgs/findutils/patches/gnulib-fseeko.patch deleted file mode 100644 index 6d4c75ac737..00000000000 --- a/srcpkgs/findutils/patches/gnulib-fseeko.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- gl/lib/fseeko.c -+++ gl/lib/fseeko.c -@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int whence) - #endif - - /* These tests are based on fpurge.c. */ --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - if (fp->_IO_read_end == fp->_IO_read_ptr - && fp->_IO_write_ptr == fp->_IO_write_base - && fp->_IO_save_base == NULL) -@@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int whence) - return -1; - } - --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - fp->_flags &= ~_IO_EOF_SEEN; - fp->_offset = pos; - #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ - diff --git a/srcpkgs/findutils/patches/gnulib-mountlist.patch b/srcpkgs/findutils/patches/gnulib-mountlist.patch deleted file mode 100644 index bb58385a69a..00000000000 --- a/srcpkgs/findutils/patches/gnulib-mountlist.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- gl/lib/mountlist.c -+++ gl/lib/mountlist.c -@@ -37,6 +37,12 @@ - # include - #endif - -+#if MAJOR_IN_MKDEV -+# include -+#elif MAJOR_IN_SYSMACROS -+# include -+#endif -+ - #if defined MOUNTED_GETFSSTAT /* OSF_1 and Darwin1.3.x */ - # if HAVE_SYS_UCRED_H - # include /* needed on OSF V4.0 for definition of NGROUPS, diff --git a/srcpkgs/findutils/patches/gnulib-stdio-impl.patch b/srcpkgs/findutils/patches/gnulib-stdio-impl.patch deleted file mode 100644 index e054879d577..00000000000 --- a/srcpkgs/findutils/patches/gnulib-stdio-impl.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- gl/lib/stdio-impl.h -+++ gl/lib/stdio-impl.h -@@ -18,6 +18,12 @@ - the same implementation of stdio extension API, except that some fields - have different naming conventions, or their access requires some casts. */ - -+/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this -+ problem by defining it ourselves. FIXME: Do not rely on glibc -+ internals. */ -+#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN -+# define _IO_IN_BACKUP 0x100 -+#endif - - /* BSD stdio derived implementations. */ diff --git a/srcpkgs/findutils/template b/srcpkgs/findutils/template index d2e6737291f..2155bdd80bd 100644 --- a/srcpkgs/findutils/template +++ b/srcpkgs/findutils/template @@ -1,16 +1,16 @@ # Template file for 'findutils' pkgname=findutils -version=4.6.0 -revision=4 +version=4.7.0 +revision=1 bootstrap=yes build_style=gnu-configure configure_args="--program-prefix=g" -short_desc="The GNU Find Utilities" +short_desc="GNU Find Utilities" maintainer="Enno Boland " -license="GPL-3" +license="GPL-3.0-or-later" homepage="http://www.gnu.org/software/findutils" -distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=ded4c9f73731cd48fec3b6bdaccce896473b6d8e337e9612e16cf1431bb1169d +distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz" +checksum=c5fefbdf9858f7e4feb86f036e1247a54c79fc2d8e4b7064d5aaa1f47dfa789a alternatives=" xargs:xargs:/usr/bin/gxargs diff --git a/srcpkgs/fio/template b/srcpkgs/fio/template index 540c8d4584a..74f9a2b02c6 100644 --- a/srcpkgs/fio/template +++ b/srcpkgs/fio/template @@ -1,6 +1,6 @@ # Template file for 'fio' pkgname=fio -version=3.15 +version=3.16 revision=1 wrksrc="${pkgname}-${pkgname}-${version}" build_style=configure @@ -12,7 +12,7 @@ maintainer="Leah Neukirchen " license="GPL-2.0-only" homepage="https://github.com/axboe/fio" distfiles="https://github.com/axboe/${pkgname}/archive/${pkgname}-${version}.tar.gz" -checksum=c0c0e40e770abcd5ab013af4bd8b16dfa83645145871063939db2a14270e2545 +checksum=c7731a9e831581bab7104da9ea60c9f44e594438dbe95dff26726ca0285e7b93 case "$XBPS_TARGET_MACHINE" in i686*|x86_64*|ppc64*) makedepends+=" libnuma-devel" diff --git a/srcpkgs/firebird3/template b/srcpkgs/firebird3/template index f163475c253..1adc010439f 100644 --- a/srcpkgs/firebird3/template +++ b/srcpkgs/firebird3/template @@ -42,6 +42,13 @@ CFLAGS="-fno-strict-aliasing" CXXFLAGS="-fno-delete-null-pointer-checks" pre_configure() { + # musl does not have gcrt1.o needed for -p + case "$XBPS_TARGET_MACHINE" in + ppc*-musl) + sed -i '/FLAGS=/s/ \-p / /g' builds/posix/prefix.linux_powerpc* + ;; + esac + # Avoid errors telling we are not 'root' and # do not change ownership to root:root and # do not change permissions to read-only diff --git a/srcpkgs/firefox-esr-i18n-as b/srcpkgs/firefox-esr-i18n-bn similarity index 100% rename from srcpkgs/firefox-esr-i18n-as rename to srcpkgs/firefox-esr-i18n-bn diff --git a/srcpkgs/firefox-esr-i18n-bn-BD b/srcpkgs/firefox-esr-i18n-en-CA similarity index 100% rename from srcpkgs/firefox-esr-i18n-bn-BD rename to srcpkgs/firefox-esr-i18n-en-CA diff --git a/srcpkgs/firefox-esr-i18n-bn-IN b/srcpkgs/firefox-esr-i18n-ia similarity index 100% rename from srcpkgs/firefox-esr-i18n-bn-IN rename to srcpkgs/firefox-esr-i18n-ia diff --git a/srcpkgs/firefox-esr-i18n-en-ZA b/srcpkgs/firefox-esr-i18n-ne-NP similarity index 100% rename from srcpkgs/firefox-esr-i18n-en-ZA rename to srcpkgs/firefox-esr-i18n-ne-NP diff --git a/srcpkgs/firefox-esr-i18n-mai b/srcpkgs/firefox-esr-i18n-oc similarity index 100% rename from srcpkgs/firefox-esr-i18n-mai rename to srcpkgs/firefox-esr-i18n-oc diff --git a/srcpkgs/firefox-esr-i18n-or b/srcpkgs/firefox-esr-i18n-or deleted file mode 120000 index 0707c37f205..00000000000 --- a/srcpkgs/firefox-esr-i18n-or +++ /dev/null @@ -1 +0,0 @@ -firefox-esr-i18n \ No newline at end of file diff --git a/srcpkgs/firefox-esr-i18n-ml b/srcpkgs/firefox-esr-i18n-ur similarity index 100% rename from srcpkgs/firefox-esr-i18n-ml rename to srcpkgs/firefox-esr-i18n-ur diff --git a/srcpkgs/firefox-esr-i18n/files/update-lang-list b/srcpkgs/firefox-esr-i18n/files/update-lang-list new file mode 120000 index 00000000000..d6e91286846 --- /dev/null +++ b/srcpkgs/firefox-esr-i18n/files/update-lang-list @@ -0,0 +1 @@ +../../firefox-i18n/files/update-lang-list \ No newline at end of file diff --git a/srcpkgs/firefox-esr-i18n/template b/srcpkgs/firefox-esr-i18n/template index 8c43a8ace7c..b4e17fb16f0 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=60.8.0 +version=68.1.0 revision=1 build_style=meta homepage="https://www.mozilla.org/firefox/" @@ -19,13 +19,11 @@ _languages=( 'af "Afrikaans"' 'an "Aragonese"' 'ar "Arabic"' - 'as "Assamese"' 'ast "Asturian"' 'az "Azerbaijani"' 'be "Belarusian"' 'bg "Bulgarian"' - 'bn-BD "Bengali (Bangladesh)"' - 'bn-IN "Bengali (India)"' + 'bn "Bengali"' 'br "Breton"' 'bs "Bosnian"' 'ca "Catalan"' @@ -36,9 +34,9 @@ _languages=( 'de "German"' 'dsb "Lower Sorbian"' 'el "Greek"' + 'en-CA "English (Canada)"' 'en-GB "English (British)"' 'en-US "English (US)"' - 'en-ZA "English (South African)"' 'eo "Esperanto"' 'es-AR "Spanish (Argentina)"' 'es-CL "Spanish (Chile)"' @@ -62,6 +60,7 @@ _languages=( 'hsb "Upper Sorbian"' 'hu "Hungarian"' 'hy-AM "Armenian"' + 'ia "Interlingua"' 'id "Indonesian"' 'is "Icelandic"' 'it "Italian"' @@ -75,16 +74,15 @@ _languages=( 'lij "Ligurian"' 'lt "Lithuanian"' 'lv "Latvian"' - 'mai "Maithili"' 'mk "Macedonian"' - 'ml "Malayalam"' 'mr "Marathi"' 'ms "Malay"' 'my "Burmese"' 'nb-NO "Norwegian (Bokmål)"' + 'ne-NP "Nepali"' 'nl "Dutch"' 'nn-NO "Norwegian (Nynorsk)"' - 'or "Oriya"' + 'oc "Occitan"' 'pa-IN "Punjabi"' 'pl "Polish"' 'pt-BR "Portuguese (Brazilian)"' @@ -104,6 +102,7 @@ _languages=( 'th "Thai"' 'tr "Turkish"' 'uk "Ukrainian"' + 'ur "Urdu"' 'uz "Uzbek"' 'vi "Vietnamese"' 'xh "Xhosa"' @@ -136,97 +135,96 @@ _pkgtmpl() { } } -checksum="ff8a0e5081e1bf6f1794ea47dab8f32f5b28580c423bccc149e16f4749e36c50 - eb86ab716a1d6a32bd102952f3ac13b7708ac9fdb947e72e0f66891f872c1cb0 - beb35664f371716cebd1a4a4c84b44129c381a1dc9a38dea19684fd5f15e407c - 25e8cdd8d22a1073143e2c88e5d3c4d96b505edbe9c18bf29fb5fbf4c68db620 - 7a05659ee866abc198bd55169b189f8e1f4daa1259b28bef78918ee0e84ed669 - 610f0c658af4d93eb7d70a459317323845a641b229f1dd42c4ee66ee660067d9 - 021d5f86239831892335f8d4b434bff3e129b774588e8b49758b3ff97534b055 - b3d75d79148ef5000aaca5d6948e09dcc43673f9d51a91bd21c51eaee34a4bf0 - 6481896744f2a0e596f425de2590ab78e153463a8bd16fc9398bb0e6a2278f3c - a03b62fe0dba6a9aaf080505299d632dec7eb98d2973c42b53330ec25695d9c7 - db332375bf0224ac90a0aec2475c70d0262f52a0f856ef5d244ba7ab8d89bb90 - ff234f75fe294bf4278d7976a7c44815f5aa9e981e9742fb322f19726a38dcbc - 5f0d36853f12f5fc3d8a85874718bcef77103903cb732c370b4e301dffb38a51 - 6b336951b07e1dd63472027d7603439ee5384b3f6a814c7be34d0cdeac1bd4d0 - 21e196147819aab031a733a4ad78b4c67d77120cd8976e7aa0b364823a3beb01 - 4edbad866270ef310932149188d4e4b0d786abc22db3196430d9db9b9113e992 - 0acf0db94b5e56fd81c14a763e2b4dd32c10f21824464195e30adc7ed9e4c021 - 440ac13c8d241d537c7de382a10ca1da1716cc302dc200ac5039ac43efcfd8a6 - bb7fc4aeffeca0c89a2ba33a7c762f4764cd70334f74cfa5d4b51fc4449aabed - feebf56ff307f191ebd2af9990840db9e3e447c0cfbdea3219320b108838202a - 9ced74783c6e21ae934243b3558ba1ecbe2858b6cfe57a031389d4c91b4887dc - 958ff950724abf9c593685991246325ff6d04f73ea9c518dcefe24e289770c9e - d8f5ef61b8a2bbe021fef63d09cb8e83a848a8100331acecdd70c47cf0cf9d43 - db9f3432a6a364791e0c4c8e47516c60182a0640a8ef795e24b7fc2465c7a7b3 - 7558f05cc6319ef57cf54a176b41bb9ac6d4650de9099998d3d4ad83163d07cf - 8f8ef308c6c5d06f20feae2e4f6b29aa0db271f1a91f1d3ad097aa7a51948384 - 987c9758f4a71bd3e7602cfd977a611fe28d58ae28f324ba1325382958735aa7 - 1ac4c54b7ed0bc407711c589328d192b1b49a4b23417d294bd3608bbc5f40581 - 71d5f764c000ad31f252fa36a94d6a178b552c1a9e4815ae883e7c490ed4d401 - 74441cfbfdbd111ab87318598dd4a3c8aaa4c4db2b86a12bc6cf41fa05881ea8 - 43bffe371b4cb25f21bf767f618631a96b24e72a658a72759f4bb6a06bc5bf32 - 50fa12cc74afb9faca4ebb8ae47d2e22756f4cae70e3c8169fbf0f568dc64fc8 - 85e3332ce6656d8df3a492ed837192df3991aab1314c1c5ef25a67bf61360cbf - a3dadeaca0193cb249b087b165e1d6fbbd322cf06485a7cf1a35c090b4adeb31 - 55cbc207ea34d61519f48946c077cc9dfa17d24eed5310f58838af289ea0b60f - 31c6f72f72743a4b085eb699627a3917e92531066388343a40ffc6412277027a - 38f1b0d8091f864256464cec0e7f78f474020feb7c4748b84160c6e074088b60 - cf2c4efce1203eb8c8f8a984b90c61672cfe9a6d05da3cfecee52e12189301a0 - ca8e8da872f5053cfa15d8395d8f10a66794589833714538b0c67fd83c340466 - c15707031179223c545a4299306b3df107ded62b685363a5e3274e318b88f219 - c1699a128003f23ef5662919ed1b33c5d61caf914985e39853df29a1ba35828c - 3fb4a2283723b2ef3709c88baeb99e77bbba33c9e835c2dfedf28c6b2ecad2fa - 344b3b3149aa3b77f10f49b86a76c6ff0179043048093c541944058f620e8845 - b43880065a4a92aeff823e4913eabe953e88cafb9cd414b2f616475cd7af69af - 94b414e2f89f030c131742de0d9ba48f13b16b40e06dd568c10cea417b57b5ba - 177ca8c3883d9c5d7e4a84b79dbc7b64e430fabaa247b0cee78f9ef65e2b5aa0 - a2a071c6e3604287a99e78042b34d02d4d91b27d3b23b9ea90945da7d9456012 - ae57f94246c078f8e2d4b8c297b281115bb008a811bf2a783278deb916007da4 - a222763e7d2d5eda8a15869f85c19765111841a2ccf4d18993eb83f20bdf4933 - 7771989dad60a20756517a6f696d939039cf5f10aa47d271e2ff5c465bd7b4c0 - 389b3c1b09e744c8fe843e3784088ea72214571b975ea9d69aaeb7c4264a990b - d5fea97921089f0b4a6a8667ddf19a430eca78223118818480a202e563088943 - 617b9daf4d828bc66fc8061601adc9c40b25f1338c5f527d9fbf83dfa3e8770b - 87d2ec6cadb2a61909888af5cc80a4dacd64493d82d0282679ba3c597918fb07 - 1afe05f69af9bc0b0e37d1c6d0942073349b173433a41a83b3a732e6fa026511 - 68b80d99dc3ff2c2828622cdf7d21c32e6f00904a239eef3f5eedb8fb8476386 - 853ec1ad7ef319a60586902c5b3dec73e0800c7af2d94e44b549d4f03f114fd7 - d0c9e3dfd07994ebf26d4ad98ef997cb62c90c07f9d0e70c8b2f7771f39b1b95 - f5b14095e891af078ef256460a41b19e00fbcd81eba66e0331af8bc096288963 - bec28861d16cf418fa06d650765c3be8fbc02b69b41b079d3907bb01c3d8096a - b042d80a54dbc7cd0fdf24ba3599404632d84635ae73204235dbf66ef7a35a26 - 7b791bfc3bd843a291d74d86f88c0a5a31af13d9da9f135841fd7859c442f733 - f12eb8be3a7ef93146c161f6ba02b9d9b892b792d0c190adb92398802f5365fe - 49addce322b6020d69b65f72ee4e82a140cd0e712c647127f6fac5b66e6f51b5 - acdc9ae4ae7397ade4c4053dc3b1f22ef42cc844bf853e5e846d1f6b0c5d5cab - 02ac07e226734f1f693283784816b3c96a48b4e592c676673901104c5dcc72b2 - b102cf97790415b804182743426e8eb1304675fb4bf360e64ae9055cce87b2f1 - f8988dfc783c4b39d8a3a44e1000c6376bc211ab6297a49eddf5194b71fdfbde - 58cad897f3bd51b9a1fcb7d4e4d3fc6bac47e5b2d4c6c19096732556eaec1314 - 23af8e26632da7c5d791a8891295eb2a83cde54390d9cd17692525f6e32ff6ed - 0d38ca007291146731793d1a2c7e07bad2d2ed82668dfbd5be14daacf7abdce7 - a5957711b3fd9665dd2fed5fdbbb0a2fcbce54ad43ccd6800ddf7ccf5be731e5 - fcc2580a8ab3e95d23af7ee373a9bfcdce52e2a5ce59bb59d1ba1dca75772239 - bc3a8480ff73c752cc1cbfa80c327b155b194553c3568534b9d20f7e2176df1e - 196abc6109092f326b387f5cffad880e5b6a857203127cf1f76622ca5a823ad2 - 002109cec6f2e40fb4ffc07b04c72a8debd128357925e8d51e5a84614004a086 - 83be2c2c9f9c93c0c31c5d30c0e6fdef3df2381f7c62c64a8313066f64c98b0f - c7c83b2c405c432c3de1c187cfc800025502b1931e07ff1108648e77279441ab - 8156b74896fd7b69fc306f90f1fd5291316d3c9b4c5ab4df620cab8d782b466e - 27ff153a51f800ea9620042acc47aad6b2392c3551a4be30e982652ef89fcdf2 - abbbd74fb4e2ce5cfb254837c8383c9cca637bbdfd05d403526a50b08806c050 - 0c6ada2d7bf26be43d4f3fa8f37581a1f1a3113c3399ebd328736802dbe7623f - b8c50654545a923e7ad7ef43bb1f2ea56b845b3443ffa0410b9bb7a6be9b8b91 - 4e49460bd3cd763e9527c771c4030237700e2eb73a359fefce3bd2146db7d56e - 82bab7b006ab019d2bf2d6b3ed9aa85796f8dc1f827ed7350b0286dbd19bbc78 - 9b6adcd828ed3c2bb4950df6a2634bc943768b3d852e2e258e52c7e2da7a5ca7 - ccd0aa23ba2662e766e2adcab201076dfdcfc5cf288e4c4bbeff6d0d3c451abb - f3709e35f5d4d317733f943aec9e977fd83acc1eaa9a35cf149dbf05e345146c - 282d60e14be013a29ba09611f7ebe37d1fa5fe6dd8e441a1f10270d4e10323d6 - 742960a8b13cab9901267237accfcbcded21018aff9b6fc1bfd0ab37b7c8b607 - 0ae68434908b9512c46f22a6f3149b0f611f77306887a7641527d5df55725517 - 432353f98d29dbec0bc0eb50f0316220f155dee755ea0b4cb45b0636a0fcffde - 8c1bbca429dd81d9180639ed1e526892908d26c1784f5f9c37093577b82d25fe - c9651a78d2d2395711d320f6fac1ffd37048d4bffc544a2f2e182cedd237d090" +checksum="c3fafda87192d9b98dc9b2b99d62b7109dbd72f73e8d5de1ea2a418ed086317b + 93af0702aae30332eecdc0f407dc29080923660508018fca14fe1307fdf375a1 + a40baf64e7376e4916fa96d7199bad099edc7e897d65b5ecc4a2dc9fdbba2e75 + 1e915f6a0860f2f7f583a70a5668ec5033969fbba177c3d3da4e244d01ba5cb4 + d6c45490cec27609f43fb9af406ba15e25fff544f10d038e650a5b25d2ba5a69 + 2b5d84d3f7800d162b095d0ee77da8264af9eac3a98dfff7e14b26510c92be1e + f317a73af579bbb42bc6635900e5b529f5198daaf54c5a7f51756b7707747444 + 6e65702a500ef4d2841eacbd9e16ca692d25a9aa3fcf38be2603657bfb03a80d + 7b056d739b64407e92a6738c8e3a5f6fe070380196c057d3f832be4015e7957c + 6bdd5ab6efd06bd384e227d78de6cffeac4c828ce6254d152e0137c70eb7b2e9 + b60364c109f3fe94387bfb27258c65c09b7761248e309adb8f92eda0c6c1dddb + 3b91a27432306a6152f6cee7b19d684476c4282743259eb0e5f90db6483216e6 + a17149908edf9a173b9d7ca3eac644cf45cd0e35ba40c565903ea9af9580e41e + b404f670ce1f3cc7fbdb170e9f0286e0a7608d779c5dae83ce5adee911876e6d + b41236a8ce2e96edf02165bd1ad91de967d8605ed7a9c77f079027ea0b13a7cf + 1f444a10561108bdfb98d43531c33d377a2565763d1299c96ef3c1f746b10555 + f15e57588ccdf2a6be3b51fba066dc030e2808071b29957c3da844b272d1dd25 + d51b8bdbc415fcdf5df587e364b8a3edb6296a988c38dbfb0fbec40b5dec856e + bcfbd612f55efff2dc98cdf9ff6ddf3d8e91274ead7d8d8bf1023cb28b815623 + f711d9206635ac98b3eec788791089d1a64316dc55ad4be2f6043acca79317b8 + a48efe9f0a885060fe2844ae056fb9de8932e45cfda399959ff8a4f54c99dc3f + c919c3557a66188ea7ab58210f6fe629f5e111bd73c0f94f298e4635c21b5f05 + edf74a83a03f85dfb2172053cf1816736fdfb4c42fbacdf4626b128186fb15db + 76bc68c806add52aa205f9f6a55dd6c141ecfaa29ce5b63fe06cb8bf1ce0c567 + af3763e63550893a001a651c5d89e4bb529004de98d58f2dc2a49336239171bf + 979725bd9b1b8aade54e0e24efdc2c716381130559615f45c007f0d68a0b0b69 + db96fd8658bc75f4813ddaf457c888e3f0656dc407b12d7799dbdebb7cc1a9ae + ba5e81b435217c15e2d55a42d34e3313e9ad1302b34599a25b48a23846dfc920 + fd3988b0ddcfa721fd702c126dd531f5b77f1f5af8ac61e8b23307c5b84e8e72 + a58a245d30efb8ad6553166dd2469da504d6cf3c773e52da15c3677899f37c4e + 3fd377be34a8786a726a13c88d28b2b73155b1f527b2909e6841474631ce8226 + 790af48c82bf520bcd8f915af77d1e0c8f156ae6c028b1fa0f39c3c991865d1c + 46b8071a1e23d8c5af1ced98cfbdb1a2258f679425434e092fbe1c42dfa26066 + a4eefa1ff84e33059d055c984dbb47283d117cb63ad9e39d7cc4c4e61ea9c11a + 5a91be294ac35aac472c4ba8324221551abb2e8cb66f995806606c191dca0428 + 9a4a582673dc466a684fd2beacbe77a152047e6023b1e247f5eda7b513e5e30d + 039af250c8b2dc6254b2f24975704095406c70090de9d21ecc73975d8d874675 + 3c77fd2a4cfc49ff94994b46a9b80ea24e534299838dd64a11a5dc2ef110f901 + feaeb14a016d732b3ec0be6266bd078fdf220c48c38683a4dd7315e076839b82 + a4756471f45168ff28fdc0e87c65b33288ca1f7fd2eedb7e31a726ee4766fb3c + 4eb62cbed52d1cdad08551a38d1f7656c71ef986df49eee0381e9aec7b11c0ba + 8e967ef8ff1f1a2fc21ea537d629d40a38d6b8789ce344e79d7a3b3b78138968 + e008e241c41900d6df1128d5dd55d41e1ed43d7c60d48329a321716968397b09 + 7011776c661b07bc3fd7d24b62765aeee10ba2a72ea4112862989f759aceb466 + 760c44d1512be5f10264d195785e45d47c46595ef57c24de81c070a81ba65456 + 531ec7550a9ab4e2410e9c69495852eaa0e7df43e022ed7ec0f0c50e148a4506 + c46413f7aa225147712fb634483f64c9368f43d03ba6f66405e4c9dc281421b4 + 42debde9c9341fc910ff382e94fade233b3ad23e4f474d89426648c659a99a12 + 50f1088649f77e0f83dffe3e81dd8ac993d1d8f06d8f231acdf98a69cda9147a + 2a4f6162bfbf5ea44c832c0d5896079b0ce69e590dc377e3bbd37a92f9780e6c + 60aa95eb50d59ddb2bf57d5cfacf860d4cc2c8b86a219f35ceaa30d82fd6e593 + 73a416254d022b051bb38ebf085772c031ecba18ab4896634ba8599fcb396f7b + ae3aa802087754458465af30a4ddafc8baa08e101a4e177b144b4f606a78b941 + 30c7498935e0d4529ccbe3a5c7671aec9505d0132cd6123f97c0680c80cbb917 + 99b76ac0f7cf4c5d5ae8b66ae3e54e3932c6a6f101aba8b156cf8d78a67e3f0b + 1bcb69081c99b27781c81becce86baaf2f1da54ceba009904ad2a5a8614eaa68 + bb3152472d5582b365722a83972b416d78b8bddfc6dbea40d1c778c37eb86623 + 426115a07ce25b7d2ae89024bf81e8b5957df9d8709bd6e5c1da704633af3c85 + 24918b9cd56f5fe12c7e02b0cedcdaf2abeeb7ec3cdb75a4aee3ca2d4aaaa961 + 8497c47c4f151966538836b0dfa312a044d8496ffc4647fcf62c8ed19b2337d9 + e160dd5b88f37562d7cbace3f46b8fd8edc5b9211f4240d8e38aec3dd81d915d + 298ab33911b8c425e6032eba867bc31925ea24b2457298bbf965bd6b194edc3f + 4c53367e4ddcff92733a95139baf9610390bf3eaf78ef5a5d10b4530c359e8eb + f340c62b77eaaa6bde0e61944c508b32785619ad4ca54b7dfbf281fcb986eac0 + 99201be46e35f22312a27da2a2afc54f46043342a1c577fa64696ef365198329 + 41e4d2d255435d2b50a8e0c4c59b13a0a0aafae925cd32e20bf9005cd066d11e + 266141c6c9a6729da904dfa040ae20d80a6b5c39efc31fcf2d039ed65e9c2b28 + 33daee0ac659ec7d1fb1cb101798dae2ed0077653fc9170bcbb5bc554ee3e433 + 23b74270aef1c6a4bff5194103a430e6854fe4c460e5c684769bd7c59d1afa0d + 9405687dbb0a81e8be8f842824f2fe65830b70a0dd0dcde84cc8a21d6637f841 + 40a608e720136044f4b95728474fcb82764e61d649551be438e330b63753635f + 0ef710447a36e81a6c86b17ee28d2cf463242834936af2578074df6e11c2baea + 3f0d0d33abda068465d7747149cdf11a4b1dc819f7da7f1f7a3d9c2a45307231 + 9d2c3438776531077e379e97a449e714882896c53dbb87052de7e7ac77ea3d67 + de9b4ec945265f5539025fb73b713322924da2d1a51b5bd6ad1baba4584c76e1 + 7b66c7d5e1b9eb6959295a76416271220e84ecc43a97a5f5f07ec99986579cb1 + 4404f5fe56868f5c551208d72630b91a88c68f78d7463e8e1d221fd7406c0783 + 3f55ec2730a870951759961c83d6654c7122a3114e136a6e2bce7c05d6062d89 + 873819bc254911aa3a443d0a9db306b472f7f31af8d986d54c535bce67a4b1c0 + 07326e95015601946706f50333c32b0919025376abcdf88dc225dae2c167b19a + bfdd58d9f0f0e809e6b801f65c722c61b4dbb5e6635cecd7390d1403f1dd6f42 + 8c2d716291a28cc64f93078d2bdf8d756a6521e3b0107815788c48452eac95f0 + 9b07735b4d8e8359e38d671ed054b373c4ed50a232013807d09ca4fae31e8223 + 5592ee66611515f8583a48211d70764fdb28c54b1ad4de5b4b87a9d3b101a182 + d36e2c9a894beb94b62855bd07d4b54e41fc96c0736b5e2e702422e75b3cf21e + caf7dd282fb6dc065eb6a0c124cd458716d877a500c094ff650c4d40302dd49e + 80bd3c70433f6b3aacdbd370b70d4fe0eab13547d1f6368b80eb5c28a759141a + 67b359947cbe15b2be1ad2567d74a36cfe5f27665a058b0fab19ed37ddd63a30 + b3347d5cec7f9f6e3aa4b5ccdd49350fd0879c20938bfc22664782c377dd73a6 + 79b512427977c359ec8f93e4880cd5397ccddb013676d2d39837f06433fe4041 + 883d5daa5b041778b0984a7e86ecfc4892af1aed1ec09285ac031e335075524c + bc1981c7cb2e6d5aecec7fb0f370c1da52895f00d238c1afa2b4e31b93580eb6 + 6278e5c054f50d3de62de9d070d21d2842d4d0ff9212d852af8eb672fad7ecea" diff --git a/srcpkgs/firefox-esr/files/mozconfig b/srcpkgs/firefox-esr/files/mozconfig index 5b3c6e46d6f..0798fdd40ef 100644 --- a/srcpkgs/firefox-esr/files/mozconfig +++ b/srcpkgs/firefox-esr/files/mozconfig @@ -1,11 +1,6 @@ ac_add_options --prefix=/usr ac_add_options --libdir=/usr/lib -ac_add_options --with-pthreads -# XXX build without system cairo see: -# - https://github.com/voidlinux/void-packages/issues/2308#issuecomment-135426813 -# - https://bugs.gentoo.org/show_bug.cgi?id=558150 -# ac_add_options --with-system-cairo ac_add_options --with-system-nspr ac_add_options --with-system-nss ac_add_options --with-system-bz2 @@ -39,7 +34,6 @@ ac_add_options --disable-install-strip ac_add_options --disable-strip ac_add_options --disable-profiling ac_add_options --enable-optimize="$CFLAGS" -ac_add_options --enable-pie ac_add_options --enable-official-branding ac_add_options --enable-application=browser diff --git a/srcpkgs/firefox-esr/patches/disable-image-format-warning.patch b/srcpkgs/firefox-esr/patches/disable-image-format-warning.patch new file mode 100644 index 00000000000..bd56e6bc37c --- /dev/null +++ b/srcpkgs/firefox-esr/patches/disable-image-format-warning.patch @@ -0,0 +1,15 @@ +Imported from Adélie. Firefox is prone to this warning on BE and +it leads to huge .xsession-errors, and the warning is not very +important or meaningful, so just disable it. + +--- gfx/2d/HelpersCairo.h ++++ gfx/2d/HelpersCairo.h +@@ -147,7 +147,7 @@ + case SurfaceFormat::R5G6B5_UINT16: + return CAIRO_FORMAT_RGB16_565; + default: +- gfxCriticalError() << "Unknown image format " << (int)format; ++ //gfxCriticalError() << "Unknown image format " << (int)format; + return CAIRO_FORMAT_ARGB32; + } + } diff --git a/srcpkgs/firefox-esr/patches/fix-arm-opus-include.patch b/srcpkgs/firefox-esr/patches/fix-arm-opus-include.patch new file mode 100644 index 00000000000..6e0c5875da3 --- /dev/null +++ b/srcpkgs/firefox-esr/patches/fix-arm-opus-include.patch @@ -0,0 +1,11 @@ +--- media/libopus/silk/arm/arm_silk_map.c.orig 2019-03-19 20:55:01.249609964 +0100 ++++ media/libopus/silk/arm/arm_silk_map.c 2019-03-19 20:55:25.769400255 +0100 +@@ -28,7 +28,7 @@ + # include "config.h" + #endif + +-#include "main_FIX.h" ++#include "../fixed/main_FIX.h" + #include "NSQ.h" + #include "SigProc_FIX.h" + diff --git a/srcpkgs/firefox-esr/patches/fix-i686-musl.patch b/srcpkgs/firefox-esr/patches/fix-i686-musl.patch index 5345a3cd3df..6df609bbf16 100644 --- a/srcpkgs/firefox-esr/patches/fix-i686-musl.patch +++ b/srcpkgs/firefox-esr/patches/fix-i686-musl.patch @@ -9,12 +9,3 @@ ((defined(__GNUC__) && (defined(__i386) || defined(PPC))) || \ defined(HAVE__UNWIND_BACKTRACE))) #define MOZ_STACKWALK_SUPPORTS_LINUX 1 -@@ -911,7 +911,7 @@ - } - - // {x86, ppc} x {Linux, Mac} stackwalking code. --#if ((defined(__i386) || defined(PPC) || defined(__ppc__)) && \ -+#if defined(__GLIBC__) && ((defined(__i386) || defined(PPC) || defined(__ppc__)) && \ - (MOZ_STACKWALK_SUPPORTS_MACOSX || MOZ_STACKWALK_SUPPORTS_LINUX)) - - MFBT_API bool diff --git a/srcpkgs/firefox-esr/patches/fix-toolkit.patch b/srcpkgs/firefox-esr/patches/fix-toolkit.patch index ce4d7d01f82..86e8ef47855 100644 --- a/srcpkgs/firefox-esr/patches/fix-toolkit.patch +++ b/srcpkgs/firefox-esr/patches/fix-toolkit.patch @@ -47,18 +47,28 @@ #include #endif +--- toolkit.orig/mozapps/update/common/updatedefines.h 2019-01-29 11:34:36.416804577 +0100 ++++ toolkit/mozapps/update/common/updatedefines.h 2019-01-29 11:34:59.193583777 +0100 +@@ -102,7 +102,7 @@ + # ifdef SOLARIS + # include +-# else ++# elif !(defined(__linux__)) || defined(__GLIBC__) + # include + # endif + # include --- toolkit.orig/mozapps/update/updater/updater.cpp 2014-03-15 05:19:37.000000000 +0000 +++ toolkit/mozapps/update/updater/updater.cpp 2014-04-17 10:24:33.796765327 +0000 -@@ -3432,6 +3432,7 @@ - int add_dir_entries(const NS_tchar *dirpath, ActionList *list) - { +@@ -3978,6 +3978,7 @@ + + int add_dir_entries(const NS_tchar* dirpath, ActionList* list) { int rv = OK; +#if !defined(__linux__) || defined(__GLIBC__) - FTS *ftsdir; - FTSENT *ftsdirEntry; - NS_tchar searchpath[MAXPATHLEN]; -@@ -3534,6 +3535,7 @@ + FTS* ftsdir; + FTSENT* ftsdirEntry; + mozilla::UniquePtr searchpath(get_full_path(dirpath)); +@@ -4085,6 +4086,7 @@ } fts_close(ftsdir); @@ -66,14 +76,3 @@ return rv; } ---- toolkit/mozapps/update/common/updatedefines.h 2019-01-24 18:31:42.000000000 +0100 -+++ - 2019-01-31 11:15:53.946747750 +0100 -@@ -100,7 +100,7 @@ - - #ifdef SOLARIS - #include --#else -+#elif !defined(__linux__) || defined(__GLIBC__) - #include - #endif - #include diff --git a/srcpkgs/firefox-esr/patches/fix-tools.patch b/srcpkgs/firefox-esr/patches/fix-tools.patch index 1e2fc4f7d39..0ed043fb5b5 100644 --- a/srcpkgs/firefox-esr/patches/fix-tools.patch +++ b/srcpkgs/firefox-esr/patches/fix-tools.patch @@ -1,33 +1,24 @@ ---- tools/profiler/core/platform.h -+++ tools/profiler/core/platform.h -@@ -29,6 +29,8 @@ - #ifndef TOOLS_PLATFORM_H_ - #define TOOLS_PLATFORM_H_ - -+#include -+ - #include - #include - #include "MainThreadUtils.h" ---- tools/profiler/lul/LulElf.cpp 2019-01-24 18:31:42.000000000 +0100 -+++ - 2019-01-31 11:19:53.198257189 +0100 -@@ -460,9 +460,9 @@ +--- tools/profiler/lul/LulElf.cpp.orig 2019-01-29 12:05:34.223834130 +0100 ++++ tools/profiler/lul/LulElf.cpp 2019-01-29 12:08:02.480400845 +0100 +@@ -469,10 +469,10 @@ + // Return the non-directory portion of FILENAME: the portion after the // last slash, or the whole filename if there are no slashes. string BaseFileName(const string& filename) { - // Lots of copies! basename's behavior is less than ideal. +- // Lots of copies! basename's behavior is less than ideal. - char* c_filename = strdup(filename.c_str()); - string base = basename(c_filename); - free(c_filename); -+ const char* c_filename = filename.c_str(); ++ // basename's behavior is less than ideal so avoid it ++ const char *c_filename = filename.c_str(); + const char *p = strrchr(c_filename, '/'); + string base = p ? p+1 : c_filename; return base; } ---- tools/profiler/core/platform-linux-android.cpp 2019-01-24 18:31:43.000000000 +0100 -+++ - 2019-01-31 11:23:07.911772317 +0100 +--- tools/profiler/core/platform-linux-android.cpp.orig 2019-01-29 12:09:40.980448579 +0100 ++++ tools/profiler/core/platform-linux-android.cpp 2019-01-29 12:11:09.689590967 +0100 @@ -253,7 +253,11 @@ - + // Request profiling signals. struct sigaction sa; +#if defined(GP_ARCH_arm) @@ -38,7 +29,7 @@ sigemptyset(&sa.sa_mask); sa.sa_flags = SA_RESTART | SA_SIGINFO; if (sigaction(SIGPROF, &sa, &mOldSigprofHandler) != 0) { -@@ -497,8 +497,10 @@ +@@ -497,8 +501,10 @@ ucontext_t sSyncUContext; void Registers::SyncPopulate() { diff --git a/srcpkgs/firefox-esr/patches/fix-wasm-arm.patch b/srcpkgs/firefox-esr/patches/fix-wasm-arm.patch new file mode 100644 index 00000000000..e6ad61c9f44 --- /dev/null +++ b/srcpkgs/firefox-esr/patches/fix-wasm-arm.patch @@ -0,0 +1,15 @@ +--- js/src/wasm/WasmSignalHandlers.cpp ++++ js/src/wasm/WasmSignalHandlers.cpp +@@ -243,9 +243,9 @@ + // If you run into compile problems on a tier-3 platform, you can disable the + // emulation here. + +-#if defined(__linux__) && defined(__arm__) +-# define WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS +-#endif ++// #if defined(__linux__) && defined(__arm__) ++// # define WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS ++// #endif + + #ifdef WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS + # include diff --git a/srcpkgs/firefox-esr/patches/fix-webrtc-arm.patch b/srcpkgs/firefox-esr/patches/fix-webrtc-arm.patch deleted file mode 100644 index 222be5f9e21..00000000000 --- a/srcpkgs/firefox-esr/patches/fix-webrtc-arm.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features.cc 2019-01-24 18:31:10.000000000 +0100 -+++ - 2019-02-01 00:13:35.690776711 +0100 -@@ -67,7 +67,7 @@ - return 0; - } - --#if !defined(ANDROID) -+#if !defined(ANDROID) && !defined(__linux__) - #ifdef WEBRTC_ARCH_ARM_V7 - uint64_t WebRtc_GetCPUFeaturesARM(void) { - return kCPUFeatureARMv7 diff --git a/srcpkgs/firefox-esr/patches/fix-webrtc-glibcisms.patch b/srcpkgs/firefox-esr/patches/fix-webrtc-glibcisms.patch index 3ff2570b12b..cf895dd8448 100644 --- a/srcpkgs/firefox-esr/patches/fix-webrtc-glibcisms.patch +++ b/srcpkgs/firefox-esr/patches/fix-webrtc-glibcisms.patch @@ -1,18 +1,15 @@ ---- media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features_linux.c 2019-02-01 00:49:18.472382771 +0100 -+++ - 2019-02-01 00:50:25.928007236 +0100 -@@ -11,7 +11,10 @@ - #include - #include - #include +--- media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features_linux.c.orig 2019-01-29 11:20:52.298793223 +0100 ++++ media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features_linux.c 2019-01-29 11:21:48.250250850 +0100 +@@ -14,7 +14,7 @@ + #ifndef __GLIBC_PREREQ + #define __GLIBC_PREREQ(a, b) 0 + #endif -#if __GLIBC_PREREQ(2, 16) -+#ifndef __GLIBC_PREREQ -+#define __GLIBC_PREREQ(a, b) 0 -+#endif +#if !__GLIBC__ || __GLIBC_PREREQ(2, 16) #include #else #include -@@ -29,7 +32,7 @@ +@@ -32,7 +32,7 @@ int architecture = 0; unsigned long hwcap = 0; const char* platform = NULL; diff --git a/srcpkgs/firefox-esr/patches/fix-xpcom.patch b/srcpkgs/firefox-esr/patches/fix-xpcom.patch deleted file mode 100644 index 38dd582d96b..00000000000 --- a/srcpkgs/firefox-esr/patches/fix-xpcom.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xpcom/base/nsMemoryReporterManager.cpp.orig 2015-12-16 11:53:14.211144456 +0100 -+++ xpcom/base/nsMemoryReporterManager.cpp 2015-12-16 11:55:26.859476381 +0100 -@@ -46,7 +46,7 @@ using namespace mozilla; - # include "mozmemory.h" - #endif // MOZ_MEMORY - --#if defined(XP_LINUX) -+#if defined(XP_LINUX) && defined(__GLIBC__) - - #include - #include diff --git a/srcpkgs/firefox/patches/fix-musl.patch b/srcpkgs/firefox-esr/patches/gettid-musl.patch similarity index 100% rename from srcpkgs/firefox/patches/fix-musl.patch rename to srcpkgs/firefox-esr/patches/gettid-musl.patch diff --git a/srcpkgs/firefox-esr/patches/mallinfo.patch b/srcpkgs/firefox-esr/patches/mallinfo.patch index c9a38d45bdf..afea86c0a2c 100644 --- a/srcpkgs/firefox-esr/patches/mallinfo.patch +++ b/srcpkgs/firefox-esr/patches/mallinfo.patch @@ -1,18 +1,34 @@ ---- xpcom/base/nsMemoryReporterManager.cpp -+++ xpcom/base/nsMemoryReporterManager.cpp -@@ -153,6 +153,7 @@ ResidentUniqueDistinguishedAmount(int64_t* aN) +--- xpcom/base/nsMemoryReporterManager.cpp.orig 2019-03-19 17:12:20.844810044 +0100 ++++ xpcom/base/nsMemoryReporterManager.cpp 2019-03-19 17:13:32.505133615 +0100 +@@ -123,6 +123,7 @@ return GetProcSelfSmapsPrivate(aN); } +#ifdef __GLIBC__ - #define HAVE_SYSTEM_HEAP_REPORTER 1 - nsresult - SystemHeapSize(int64_t* aSizeOut) -@@ -172,6 +173,7 @@ SystemHeapSize(int64_t* aSizeOut) - *aSizeOut = size_t(info.hblkhd) + size_t(info.uordblks); - return NS_OK; + # ifdef HAVE_MALLINFO + # define HAVE_SYSTEM_HEAP_REPORTER 1 + static MOZ_MUST_USE nsresult SystemHeapSize(int64_t* aSizeOut) { +@@ -142,6 +143,7 @@ + return NS_OK; } -+#endif + # endif ++#endif // __GLIBC__ - #elif defined(__DragonFly__) || defined(__FreeBSD__) \ - || defined(__NetBSD__) || defined(__OpenBSD__) \ + #elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || \ + defined(__OpenBSD__) || defined(__FreeBSD_kernel__) +@@ -642,6 +644,7 @@ + return NS_OK; + } + ++#ifdef __GLIBC__ + # define HAVE_SYSTEM_HEAP_REPORTER 1 + // Windows can have multiple separate heaps. During testing there were multiple + // heaps present but the non-default ones had sizes no more than a few 10s of +@@ -698,6 +701,7 @@ + *aSizeOut = heapsSize; + return NS_OK; + } ++#endif // __GLIBC__ + + struct SegmentKind { + DWORD mState; diff --git a/srcpkgs/firefox-esr/patches/ppc-no-static-sizes.patch b/srcpkgs/firefox-esr/patches/ppc-no-static-sizes.patch deleted file mode 100644 index 3f77023bb5f..00000000000 --- a/srcpkgs/firefox-esr/patches/ppc-no-static-sizes.patch +++ /dev/null @@ -1,19 +0,0 @@ -# HG changeset patch -# Parent b735e618c2a860972197942f6680c941e3c9a67f -# User Gustavo Luiz Duarte -Bug 997353 - Do not use compile-time page size for PowerPC. - -The PowerPC architecture allows various memory page sizes, making it impossible -to predict the runtime page size. - ---- memory/build/mozjemalloc.cpp -+++ memory/build/mozjemalloc.cpp -@@ -369,7 +369,7 @@ - // Debug builds are opted out too, for test coverage. - #ifndef MOZ_DEBUG - #if !defined(__ia64__) && !defined(__sparc__) && !defined(__mips__) && \ -- !defined(__aarch64__) -+ !defined(__aarch64__) && !defined(__powerpc__) && !defined(__powerpc64__) - #define MALLOC_STATIC_PAGESIZE 1 - #endif - #endif diff --git a/srcpkgs/firefox-esr/patches/remove-rustc-check.patch b/srcpkgs/firefox-esr/patches/remove-rustc-check.patch index f6bebc8aab1..84077f4fc88 100644 --- a/srcpkgs/firefox-esr/patches/remove-rustc-check.patch +++ b/srcpkgs/firefox-esr/patches/remove-rustc-check.patch @@ -1,8 +1,19 @@ Mozilla rustc check does not support crossbuild: let's remove it +Remove calls to unwrap_rustup, they fail if rustup isn't present ---- build/moz.configure/rust.configure 2018-10-01 16:28:31.000000000 +0200 -+++ build/moz.configure/rust.configure 2018-10-20 14:21:35.510000000 +0200 -@@ -204,26 +204,6 @@ +--- build/moz.configure/rust.configure 2019-07-06 03:48:30.000000000 +0200 ++++ build/moz.configure/rust.configure 2019-07-09 22:35:23.326851798 +0200 +@@ -79,9 +79,6 @@ + + return unwrap + +-rustc = unwrap_rustup(rustc, 'rustc') +-cargo = unwrap_rustup(cargo, 'cargo') +- + + set_config('CARGO', cargo) + set_config('RUSTC', rustc) +@@ -294,26 +291,6 @@ os.write(in_fd, source) os.close(in_fd) @@ -29,4 +40,3 @@ Mozilla rustc check does not support crossbuild: let's remove it finally: os.remove(in_path) os.remove(out_path) - diff --git a/srcpkgs/firefox-esr/patches/rust-cssparser.patch b/srcpkgs/firefox-esr/patches/rust-cssparser.patch new file mode 100644 index 00000000000..1ebef87c014 --- /dev/null +++ b/srcpkgs/firefox-esr/patches/rust-cssparser.patch @@ -0,0 +1,90 @@ +backport of: + +From 3c98d22c5de3b696bf1fde2b6c90069812312aa6 Mon Sep 17 00:00:00 2001 +From: Simon Sapin +Date: Tue, 23 Apr 2019 13:47:25 +0200 +Subject: [PATCH] Fix a future-compat warning + +``` +warning[E0506]: cannot assign to `self.input.cached_token` because it is borrowed + --> src/parser.rs:591:17 + | +566 | pub fn next_including_whitespace_and_comments(&mut self) -> Result<&Token<'i>, BasicParseError<'i>> { + | - let's call the lifetime of this reference `'1` +... +579 | Some(ref cached_token) + | ---------------- borrow of `self.input.cached_token` occurs here +... +591 | self.input.cached_token = Some(CachedToken { + | ^^^^^^^^^^^^^^^^^^^^^^^ assignment to borrowed `self.input.cached_token` occurs here +... +603 | Ok(token) + | --------- returning this value requires that `self.input.cached_token.0` is borrowed for `'1` + | + = warning: this error has been downgraded to a warning for backwards compatibility with previous releases + = warning: this represents potential undefined behavior in your code and this warning will become a hard error in the future +``` +--- + src/parser.rs | 50 +++++++++++++++++++++++++++----------------------- + 1 file changed, 27 insertions(+), 23 deletions(-) + +diff --git a/src/parser.rs b/src/parser.rs +index 51f441e4..7cef117c 100644 +--- third_party/rust/cssparser/src/parser.rs ++++ third_party/rust/cssparser/src/parser.rs +@@ -555,28 +555,34 @@ + } + + let token_start_position = self.input.tokenizer.position(); +- let token; +- match self.input.cached_token { +- Some(ref cached_token) +- if cached_token.start_position == token_start_position => { +- self.input.tokenizer.reset(&cached_token.end_state); +- match cached_token.token { +- Token::Function(ref name) => self.input.tokenizer.see_function(name), +- _ => {} +- } +- token = &cached_token.token ++ let using_cached_token = self ++ .input ++ .cached_token ++ .as_ref() ++ .map_or(false, |cached_token| { ++ cached_token.start_position == token_start_position ++ }); ++ let token = if using_cached_token { ++ let cached_token = self.input.cached_token.as_ref().unwrap(); ++ self.input.tokenizer.reset(&cached_token.end_state); ++ match cached_token.token { ++ Token::Function(ref name) => self.input.tokenizer.see_function(name), ++ _ => {} + } +- _ => { +- let new_token = self.input.tokenizer.next() +- .map_err(|()| self.new_basic_error(BasicParseErrorKind::EndOfInput))?; +- self.input.cached_token = Some(CachedToken { +- token: new_token, +- start_position: token_start_position, +- end_state: self.input.tokenizer.state(), +- }); +- token = self.input.cached_token_ref() +- } +- } ++ &cached_token.token ++ } else { ++ let new_token = self ++ .input ++ .tokenizer ++ .next() ++ .map_err(|()| self.new_basic_error(BasicParseErrorKind::EndOfInput))?; ++ self.input.cached_token = Some(CachedToken { ++ token: new_token, ++ start_position: token_start_position, ++ end_state: self.input.tokenizer.state(), ++ }); ++ self.input.cached_token_ref() ++ }; + + if let Some(block_type) = BlockType::opening(token) { + self.at_start_of = Some(block_type); diff --git a/srcpkgs/firefox-esr/patches/rust-unitialized-field.patch b/srcpkgs/firefox-esr/patches/rust-unitialized-field.patch deleted file mode 100644 index 67ef3a02ab8..00000000000 --- a/srcpkgs/firefox-esr/patches/rust-unitialized-field.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- ./media/audioipc/audioipc/src/cmsg.rs.orig 2018-05-09 22:19:14.748631939 +0200 -+++ ./media/audioipc/audioipc/src/cmsg.rs 2018-05-09 22:19:22.961620862 +0200 -@@ -106,11 +106,11 @@ impl ControlMsgBuilder { - return Err(Error::NoSpace); - } - -- let cmsghdr = cmsghdr { -- cmsg_len: cmsg_len as _, -- cmsg_level: level, -- cmsg_type: kind, -- }; -+ use std::mem; -+ let mut cmsghdr: cmsghdr = unsafe { mem::zeroed() }; -+ cmsghdr.cmsg_len = cmsg_len as _; -+ cmsghdr.cmsg_level = level; -+ cmsghdr.cmsg_type = kind; - - let cmsghdr = unsafe { - slice::from_raw_parts(&cmsghdr as *const _ as *const _, mem::size_of::()) diff --git a/srcpkgs/firefox-esr/patches/rust133.patch b/srcpkgs/firefox-esr/patches/rust133.patch deleted file mode 100644 index ebdcac7e3a3..00000000000 --- a/srcpkgs/firefox-esr/patches/rust133.patch +++ /dev/null @@ -1,24 +0,0 @@ -This fixes build errors under recent Rust. - ---- servo/components/style_traits/lib.rs -+++ servo/components/style_traits/lib.rs -@@ -9,7 +9,7 @@ - #![crate_name = "style_traits"] - #![crate_type = "rlib"] - --#![deny(unsafe_code, missing_docs)] -+#![deny(unsafe_code)] - - extern crate app_units; - #[macro_use] extern crate bitflags; ---- servo/components/style/lib.rs -+++ servo/components/style/lib.rs -@@ -23,8 +23,6 @@ - //! [cssparser]: ../cssparser/index.html - //! [selectors]: ../selectors/index.html - --#![deny(missing_docs)] -- - extern crate app_units; - extern crate arrayvec; - extern crate atomic_refcell; diff --git a/srcpkgs/firefox-esr/patches/save-and-restore-non-volatile-x28-on-arm64.patch b/srcpkgs/firefox-esr/patches/save-and-restore-non-volatile-x28-on-arm64.patch deleted file mode 100644 index fa303f6d1e9..00000000000 --- a/srcpkgs/firefox-esr/patches/save-and-restore-non-volatile-x28-on-arm64.patch +++ /dev/null @@ -1,64 +0,0 @@ -# HG changeset patch -# User Lars T Hansen -# Date 1519822672 -3600 -# Node ID 800abe66894d6b07b24bccecbf6a65e2261076f6 -# Parent 223c97459e96183eb616aed39147207bdb953ba8 -Bug 1375074 - Save and restore non-volatile x28 on ARM64 for generated unboxed object constructor. r=sstangl - -Origin: upstream -Applied-upstream: 61, commit: https://hg.mozilla.org/mozilla-central/rev/800abe66894d ---- - js/src/vm/UnboxedObject.cpp | 30 ++++++++++++++++++++++++++---- - 1 file changed, 26 insertions(+), 4 deletions(-) - -diff --git a/js/src/vm/UnboxedObject.cpp b/js/src/vm/UnboxedObject.cpp -index 35ca20d7405f..1c20a1093d13 100644 ---- js/src/vm/UnboxedObject.cpp -+++ js/src/vm/UnboxedObject.cpp -@@ -86,9 +86,16 @@ static const uintptr_t CLEAR_CONSTRUCTOR_CODE_TOKEN = 0x1; - #endif - - #ifdef JS_CODEGEN_ARM64 -- // ARM64 communicates stack address via sp, but uses a pseudo-sp for -- // addressing. -- masm.initStackPtr(); -+ // ARM64 communicates stack address via sp, but uses a pseudo-sp (PSP) for -+ // addressing. The register we use for PSP may however also be used by -+ // calling code, and it is nonvolatile, so save it. Do this as a special -+ // case first because the generic save/restore code needs the PSP to be -+ // initialized already. -+ MOZ_ASSERT(PseudoStackPointer64.Is(masm.GetStackPointer64())); -+ masm.Str(PseudoStackPointer64, vixl::MemOperand(sp, -16, vixl::PreIndex)); -+ -+ // Initialize the PSP from the SP. -+ masm.initStackPtr(); - #endif - - MOZ_ASSERT(propertiesReg.volatile_()); -@@ -239,7 +246,22 @@ static const uintptr_t CLEAR_CONSTRUCTOR_CODE_TOKEN = 0x1; - if (ScratchDoubleReg.volatile_()) masm.pop(ScratchDoubleReg); - masm.PopRegsInMask(savedNonVolatileRegisters); - -- masm.abiret(); -+#ifdef JS_CODEGEN_ARM64 -+ // Now restore the value that was in the PSP register on entry, and return. -+ -+ // Obtain the correct SP from the PSP. -+ masm.Mov(sp, PseudoStackPointer64); -+ -+ // Restore the saved value of the PSP register, this value is whatever the -+ // caller had saved in it, not any actual SP value, and it must not be -+ // overwritten subsequently. -+ masm.Ldr(PseudoStackPointer64, vixl::MemOperand(sp, 16, vixl::PostIndex)); -+ -+ // Perform a plain Ret(), as abiret() will move SP <- PSP and that is wrong. -+ masm.Ret(vixl::lr); -+#else -+ masm.abiret(); -+#endif - - masm.bind(&failureStoreOther); - --- -2.21.0 - diff --git a/srcpkgs/firefox-esr/patches/save-x28-before-clobbering-it-in-the-regex-compiler.patch b/srcpkgs/firefox-esr/patches/save-x28-before-clobbering-it-in-the-regex-compiler.patch deleted file mode 100644 index aa2dcc6ba8d..00000000000 --- a/srcpkgs/firefox-esr/patches/save-x28-before-clobbering-it-in-the-regex-compiler.patch +++ /dev/null @@ -1,97 +0,0 @@ -# HG changeset patch -# User Lars T Hansen -# Date 1521449886 -3600 -# Node ID 903a79a1efff18fc7cc50db09a3fe5d768adc9a8 -# Parent 4d2955a9ca7e30ca4c3af9c214ccc77fb2fe7fb8 -Bug 1445907 - Save x28 before clobbering it in the regex compiler. r=sstangl - -Origin: upstream -Applied-upstream: 61, commit: https://hg.mozilla.org/mozilla-central/rev/903a79a1efff ---- -diff --git a/js/src/irregexp/NativeRegExpMacroAssembler.cpp b/js/src/irregexp/NativeRegExpMacroAssembler.cpp ---- js/src/irregexp/NativeRegExpMacroAssembler.cpp -+++ js/src/irregexp/NativeRegExpMacroAssembler.cpp -@@ -118,17 +118,25 @@ NativeRegExpMacroAssembler::GenerateCode - - Label return_temp0; - - // Finalize code - write the entry point code now we know how many - // registers we need. - masm.bind(&entry_label_); - - #ifdef JS_CODEGEN_ARM64 -- // ARM64 communicates stack address via sp, but uses a pseudo-sp for addressing. -+ // ARM64 communicates stack address via SP, but uses a pseudo-sp (PSP) for -+ // addressing. The register we use for PSP may however also be used by -+ // calling code, and it is nonvolatile, so save it. Do this as a special -+ // case first because the generic save/restore code needs the PSP to be -+ // initialized already. -+ MOZ_ASSERT(PseudoStackPointer64.Is(masm.GetStackPointer64())); -+ masm.Str(PseudoStackPointer64, vixl::MemOperand(sp, -16, vixl::PreIndex)); -+ -+ // Initialize the PSP from the SP. - masm.initStackPtr(); - #endif - - // Push non-volatile registers which might be modified by jitcode. - size_t pushedNonVolatileRegisters = 0; - for (GeneralRegisterForwardIterator iter(savedNonVolatileRegisters); iter.more(); ++iter) { - masm.Push(*iter); - pushedNonVolatileRegisters++; -@@ -416,17 +424,32 @@ NativeRegExpMacroAssembler::GenerateCode - masm.pop(temp0); - masm.movePtr(temp0, StackPointer); - #endif - - // Restore non-volatile registers which were saved on entry. - for (GeneralRegisterBackwardIterator iter(savedNonVolatileRegisters); iter.more(); ++iter) - masm.Pop(*iter); - -+#ifdef JS_CODEGEN_ARM64 -+ // Now restore the value that was in the PSP register on entry, and return. -+ -+ // Obtain the correct SP from the PSP. -+ masm.Mov(sp, PseudoStackPointer64); -+ -+ // Restore the saved value of the PSP register, this value is whatever the -+ // caller had saved in it, not any actual SP value, and it must not be -+ // overwritten subsequently. -+ masm.Ldr(PseudoStackPointer64, vixl::MemOperand(sp, 16, vixl::PostIndex)); -+ -+ // Perform a plain Ret(), as abiret() will move SP <- PSP and that is wrong. -+ masm.Ret(vixl::lr); -+#else - masm.abiret(); -+#endif - - // Backtrack code (branch target for conditional backtracks). - if (backtrack_label_.used()) { - masm.bind(&backtrack_label_); - Backtrack(); - } - - // Backtrack stack overflow code. -diff --git a/js/src/jit-test/tests/regexp/bug1445907.js b/js/src/jit-test/tests/regexp/bug1445907.js -new file mode 100644 ---- /dev/null -+++ js/src/jit-test/tests/regexp/bug1445907.js -@@ -0,0 +1,15 @@ -+// On ARM64, we failed to save x28 properly when generating code for the regexp -+// matcher. -+// -+// There's wasm and Debugger code here because the combination forces the use of -+// x28 and exposes the bug when running on the simulator. -+ -+if (!wasmIsSupported()) -+ quit(); -+ -+var g = newGlobal(''); -+var dbg = new Debugger(g); -+g.eval(`var m = new WebAssembly.Instance(new WebAssembly.Module(wasmTextToBinary('(module (func (export "test")))')))`); -+var re = /./; -+dbg.onEnterFrame = function(frame) { re.exec("x") }; -+result = g.eval("m.exports.test()"); - --- -2.21.0 - diff --git a/srcpkgs/firefox-esr/patches/sndio.patch b/srcpkgs/firefox-esr/patches/sndio.patch index 097b313e90b..6c72284c19b 100644 --- a/srcpkgs/firefox-esr/patches/sndio.patch +++ b/srcpkgs/firefox-esr/patches/sndio.patch @@ -51,14 +51,14 @@ ] --- build/moz.configure/old.configure.orig +++ build/moz.configure/old.configure -@@ -159,6 +159,7 @@ - '--enable-accessibility', - '--enable-address-sanitizer', - '--enable-alsa', +@@ -169,6 +169,7 @@ + @old_configure_options( + '--cache-file', + '--datadir', + '--enable-sndio', - '--enable-bundled-fonts', - '--enable-clang-plugin', '--enable-content-sandbox', + '--enable-cookies', + '--enable-cpp-rtti', --- security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp.orig +++ security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp @@ -349,6 +349,21 @@ diff --git a/srcpkgs/firefox-esr/patches/yuv-be.patch b/srcpkgs/firefox-esr/patches/yuv-be.patch new file mode 100644 index 00000000000..1c26f2ecced --- /dev/null +++ b/srcpkgs/firefox-esr/patches/yuv-be.patch @@ -0,0 +1,48 @@ +# HG changeset patch +# User A. Wilcox +# Date 1543674229 0 +# Sat Dec 01 14:23:49 2018 +0000 +# Node ID 0309ff19e46b126c527e633518d7de8570442114 +# Parent 53107afbc21ec78e7ac46d37af212505f2032d5d +Bug 1511604 - Swizzle YCbCr->RGB data on big-endian machines + +diff -r 53107afbc21e -r 0309ff19e46b gfx/ycbcr/YCbCrUtils.cpp +--- gfx/ycbcr/YCbCrUtils.cpp Wed Nov 07 04:50:21 2018 +0000 ++++ gfx/ycbcr/YCbCrUtils.cpp Sat Dec 01 14:23:49 2018 +0000 +@@ -3,7 +3,9 @@ + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + ++#include "mozilla/EndianUtils.h" + #include "gfx2DGlue.h" ++#include "mozilla/gfx/Swizzle.h" + + #include "YCbCrUtils.h" + #include "yuv_convert.h" +@@ -236,6 +238,13 @@ + yuvtype, + srcData.mYUVColorSpace); + } ++#if MOZ_BIG_ENDIAN ++ // libyuv makes endian-correct result, which needs to be swapped to BGRX ++ if (aDestFormat != SurfaceFormat::R5G6B5_UINT16) ++ gfx::SwizzleData(aDestBuffer, aStride, gfx::SurfaceFormat::X8R8G8B8, ++ aDestBuffer, aStride, gfx::SurfaceFormat::B8G8R8X8, ++ srcData.mPicSize); ++#endif + } + + void +@@ -257,6 +266,12 @@ + aSrcStrideYA, + aSrcStrideUV, + aDstStrideARGB); ++#if MOZ_BIG_ENDIAN ++ // libyuv makes endian-correct result, which needs to be swapped to BGRA ++ gfx::SwizzleData(aDstARGB, aDstStrideARGB, gfx::SurfaceFormat::A8R8G8B8, ++ aDstARGB, aDstStrideARGB, gfx::SurfaceFormat::B8G8R8A8, ++ IntSize(aWidth, aHeight)); ++#endif + } + + } // namespace gfx diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template index 05a0a521341..8f1c983c8b4 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=60.8.0 +version=68.1.0 revision=2 build_helper="rust" wrksrc="firefox-${version}" @@ -12,11 +12,11 @@ maintainer="Eivind Uggedal " 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=c13387d944e635aebd5f1d2ce9ab77cb706a74043a240cbb7b70654519487fbe +checksum=f56f5fa5a4744be0b9acf259cb991254d708a50b9a0a12d1d846ffa5a6c409ac lib32disabled=yes hostmakedepends="autoconf213 unzip zip pkg-config perl python yasm - cargo llvm clang rust cbindgen" + python3 cargo llvm clang rust cbindgen nasm nodejs" makedepends="nss-devel libjpeg-turbo-devel gtk+-devel gtk+3-devel icu-devel pixman-devel sqlite-devel libevent-devel libnotify-devel libvpx5-devel libXrender-devel libXcomposite-devel libSM-devel libXt-devel rust-std @@ -30,10 +30,6 @@ conflicts="firefox>=0" build_options="alsa dbus gtk3 pulseaudio startup_notification xscreensaver sndio" build_options_default="alsa dbus gtk3 pulseaudio startup_notification xscreensaver sndio" -if [ "$XBPS_WORDSIZE" -eq 32 ]; then - nodebug=yes -fi - case $XBPS_TARGET_MACHINE in armv6*) broken="required NEON extensions are not supported on armv6" @@ -42,6 +38,13 @@ case $XBPS_TARGET_MACHINE in ppc*) broken="ftbfs in several places" ;; esac +# we need this because cargo verifies checksums of all files in vendor +# crates when it builds and gives us no way to override or update the +# file sanely... so just clear out the file list +_clear_vendor_checksums() { + sed -i 's/\("files":{\)[^}]*/\1/' third_party/rust/$1/.cargo-checksum.json +} + post_extract() { case "$XBPS_TARGET_MACHINE" in *-musl) @@ -57,6 +60,11 @@ post_extract() { # Note: This is for Void Linux use ONLY. echo -n "cd894504-7a2a-4263-abff-ff73ee89ffca" > mozilla-api-key } + +post_patch() { + _clear_vendor_checksums cssparser +} + do_build() { cp "${FILESDIR}/mozconfig" "${wrksrc}/.mozconfig" @@ -112,9 +120,14 @@ do_build() { ;; esac - if [ "$XBPS_WORDSIZE" -eq 32 ]; then - # ENOMEM - echo "ac_add_options --disable-debug-symbols" >>.mozconfig + # work around large debug symbols on 32-bit hosts + if [ "$XBPS_WORDSIZE" = "32" ]; then + export CFLAGS="${CFLAGS/-g/-g1}" + export CXXFLAGS="${CXXFLAGS/-g/-g1}" + export LDFLAGS+=" -Wl,--no-keep-memory" + # patch the rust debug level, this is hardcoded + sed -i "s/debug_info = '2'/debug_info = '1'/" \ + build/moz.configure/toolchain.configure fi export LDFLAGS+=" -Wl,-rpath=/usr/lib/firefox" diff --git a/srcpkgs/firefox-i18n-bn b/srcpkgs/firefox-i18n-bn new file mode 120000 index 00000000000..6b9610b993c --- /dev/null +++ b/srcpkgs/firefox-i18n-bn @@ -0,0 +1 @@ +firefox-i18n \ No newline at end of file diff --git a/srcpkgs/firefox-i18n-en-CA b/srcpkgs/firefox-i18n-en-CA new file mode 120000 index 00000000000..6b9610b993c --- /dev/null +++ b/srcpkgs/firefox-i18n-en-CA @@ -0,0 +1 @@ +firefox-i18n \ No newline at end of file diff --git a/srcpkgs/firefox-i18n-ia b/srcpkgs/firefox-i18n-ia new file mode 120000 index 00000000000..6b9610b993c --- /dev/null +++ b/srcpkgs/firefox-i18n-ia @@ -0,0 +1 @@ +firefox-i18n \ No newline at end of file diff --git a/srcpkgs/firefox-i18n-ne-NP b/srcpkgs/firefox-i18n-ne-NP new file mode 120000 index 00000000000..6b9610b993c --- /dev/null +++ b/srcpkgs/firefox-i18n-ne-NP @@ -0,0 +1 @@ +firefox-i18n \ No newline at end of file diff --git a/srcpkgs/firefox-i18n-oc b/srcpkgs/firefox-i18n-oc new file mode 120000 index 00000000000..6b9610b993c --- /dev/null +++ b/srcpkgs/firefox-i18n-oc @@ -0,0 +1 @@ +firefox-i18n \ No newline at end of file diff --git a/srcpkgs/firefox-i18n-ur b/srcpkgs/firefox-i18n-ur new file mode 120000 index 00000000000..6b9610b993c --- /dev/null +++ b/srcpkgs/firefox-i18n-ur @@ -0,0 +1 @@ +firefox-i18n \ No newline at end of file diff --git a/srcpkgs/firefox-i18n/files/update-lang-list b/srcpkgs/firefox-i18n/files/update-lang-list new file mode 100755 index 00000000000..ff8042113bf --- /dev/null +++ b/srcpkgs/firefox-i18n/files/update-lang-list @@ -0,0 +1,81 @@ +#!/bin/bash +# Copyright (c) 2019 Danh Doan +# All rights reserved. +# +# Permission to use, copy, modify, and/or distribute this software for any +# purpose with or without fee is hereby granted. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH +# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +# AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, +# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR +# OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. + +version=$1 + +esr="" +[[ $version =~ esr$ ]] && esr="-esr" + +tmpldir="firefox${esr}-i18n" + +tmpoldfile="$(mktemp)" +tmpnewfile="$(mktemp)" + +xoldlangexpr="^_languages=" + +xlistold() { + source "${tmpldir}/template" + for _lang in "${_languages[@]}"; do + _locale="${_lang%%\"*}" + [ $_locale ] && echo "$_locale" + done +} + +xlink () { + ln -sf "$tmpldir" "$tmpldir-$1" +} + +xnewlang () { + lang=$1 + padded=$(printf '%-7s' $lang) + xoldexpr=$xoldlangexpr + xoldlangexpr="'$lang \+\"" + grep -q "'$lang \+\"" "$tmpldir/template" && return 0 + sed -i "/$xoldexpr/a\\ + '$padded\"Unknown\"' + /checksum=/a\\ + badbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadb" \ + "$tmpldir/template" +} + +xprocessnew() { + while read lang; do + printf '%-7s\n' $lang >&3 + xlink $lang + xnewlang $lang + done +} + +xcleanlang() { + while read lang; do + padded=$(printf '%-7s' $lang) + sed -i "/'$padded\"/d" $tmpldir/template + unlink "$tmpldir-$lang" || true + done +} + +cd $(xdistdir)/srcpkgs + +xlistold >| "$tmpoldfile" + +curl "https://ftp.mozilla.org/pub/firefox/releases/$1/linux-i686/xpi/" \ + | grep -o 'xpi/[a-z]\+\(-[A-Z]\+\)\?' \ + | cut -d/ -f2 \ + | xprocessnew 3>$tmpnewfile + +grep -vF -f $tmpnewfile $tmpoldfile \ + | xcleanlang + +rm -rf $tmpoldfile $tmpnewfile diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template index a18f552af2c..c901f5c9123 100644 --- a/srcpkgs/firefox-i18n/template +++ b/srcpkgs/firefox-i18n/template @@ -1,6 +1,6 @@ # Template file for 'firefox-i18n' pkgname=firefox-i18n -version=68.0.2 +version=69.0.2 revision=1 build_style=meta homepage="https://www.mozilla.org/firefox/" @@ -23,6 +23,7 @@ _languages=( 'az "Azerbaijani"' 'be "Belarusian"' 'bg "Bulgarian"' + 'bn "Bengali"' 'br "Breton"' 'bs "Bosnian"' 'ca "Catalan"' @@ -33,6 +34,7 @@ _languages=( 'de "German"' 'dsb "Lower Sorbian"' 'el "Greek"' + 'en-CA "English (Canada)"' 'en-GB "English (British)"' 'en-US "English (US)"' 'eo "Esperanto"' @@ -58,6 +60,7 @@ _languages=( 'hsb "Upper Sorbian"' 'hu "Hungarian"' 'hy-AM "Armenian"' + 'ia "Interlingua"' 'id "Indonesian"' 'is "Icelandic"' 'it "Italian"' @@ -76,8 +79,10 @@ _languages=( 'ms "Malay"' 'my "Burmese"' 'nb-NO "Norwegian (Bokmål)"' + 'ne-NP "Nepali"' 'nl "Dutch"' 'nn-NO "Norwegian (Nynorsk)"' + 'oc "Occitan"' 'pa-IN "Punjabi"' 'pl "Polish"' 'pt-BR "Portuguese (Brazilian)"' @@ -97,6 +102,7 @@ _languages=( 'th "Thai"' 'tr "Turkish"' 'uk "Ukrainian"' + 'ur "Urdu"' 'uz "Uzbek"' 'vi "Vietnamese"' 'xh "Xhosa"' @@ -129,90 +135,96 @@ _pkgtmpl() { } } -checksum="2ea325dae9dfd9725a533d7a4630b9326d408ab9a4b925b70468d28a2d45d2ba - 7ac5d43f433ccd68bb96ac92cc7485755348a03c0bcb74d66e12925afd9463ae - 88914e2a4d070d307ab4483538f3b863179dc4f1ba148bd3ae28cff4d87a390f - 54627c8ba83781677dde0fc917eea5926a53906cad6283143cb917868e764b98 - 2f03fd4a024dc82920cbbec72140899d7fb1ab84c8913e01bdf2444de1faff95 - 129bfb200b92ff372be47d7b6482f509643448dfe620b725a3dc4932c1fecb83 - 841ad3f8ddae023fc2d426b83512f62d8ca0e6c96933166b3e53a144d08abf53 - 65326e4b1bf378e6971fb29f5532b5de81f355346e5310a63db093c6156255c3 - edd830c87ca09dc9764600b484f763322f9771c6557b960baa690872fcdfd3bb - c686c3fd8a62b4fad79748f56c0306844545828aa8bf5a2f06a3710e21f64fa4 - 70ad36174d88e06f4ab068e55d3b737ffad7847014765b94bfc0de6bcdc52c5e - 42381fad38549111e5ff2d57887318727159815b7b6ce19a8665fc049615f0e5 - ebef3a70259d887cb83ed61826dc4f4efb7e934a17a1315921232a0be0c78faa - c3502cb60c44d1dbdec77046ca1d00b4d5b600f546a7964f4e27bfd52b42d193 - dfb94b9b6665284b1bedd6c9e13aa78f8ac43d64d5337825645c064e89bb5077 - 0c52ae1e1d8492193221f4ca71c77e3447521169202b615644b618ca09a02b92 - 1e01f718a7b5e4f7b1e7ba383c4a83c336658398bd8ed579511e099399eb7659 - 4a81323c5c564a903da4e58ed9e6ce968c96530bec924a143a83a153d2a3f712 - 870d58d9ea7615b9c4d7425970c1fad96ea7ec8864b55509fff5c501138eb724 - 595109a433b969231f5efb0b1de5585d2b3a82be0338166418ad84b7472fd6db - b6ab79f793a7558e074d53f210721c9fb61b10ebd6ca219c47890c2066262ab8 - d059897607824b2cd3fe68b7a3bce3214ebd490d486517838a41ac21a9d66cd8 - 1db3f913dcadbdc63e38c8c41fe7f9d58b94bd372f2ed815ef98d7210376281d - 9a0aa04d643dff8eed58b9167a8f8d373962c5df2b5c240dd280fc46add25cb2 - 5c2d1c6de35b41c534f98bbf53bf68dfcba7f81ee44fa41670852f0b7cb6034d - 253d0275b7c3be1ad387f27901ed8f6a8e1c8f06c6052bd1ba4432cdf8987e40 - 282b17de74487d4af0b6471ebb86702635b51b658d4dc1040b2a1bc0173d75cd - f0cdbc7b603345ce782efdda2cdd97cb3086a35ba8a8dc93316a408aa008ce4c - 539a457d13deb4ac0e4149af5894f6a34348d00311212117d1ba5472b3eb7630 - d975fa37a38d88ecd2e539082200d7243ba00c1d0388ba3a79b32cbb237cb5be - 1bb93ab89e1b29b13e88280817f22478f734f8b401e8a46e45842f80dd12dc91 - 7f92bb80877a94b06a9d21fd4c8773828b2ffb00d76fcada5fe6d63046f50e56 - 5cc79d40e9d9ac053f42a62ca6bf3fceeb734a7c4ae3c4dae730ce5326dcee53 - b991ad7abc56fe09f8784d82b5ce31490c54ccc0336f8df3735f39442eb408a8 - 914e3dd3902056311f0b31891dd5829e44c9b1d21e5527b5d5fc02a0a9163231 - d4a34da51853ce5ceeb44c717bff8e0e43e8a7a3573a5b8d37bfbc7535a7ab8c - 2af29f4878ab8d2a68374ed5e548389defc08dd7ed4afc922a0ecdd469d323aa - 3fbb71fcd7fbfdc7df8e992fad3cf4101b1d8864fe2a3adc4cce6c9260789892 - c2e8f0ceb5b585038189e7e29ab44ef847b302ff12769a576d9ed84f4c6b1733 - 808ecfcb890009a5a8aec761019f7365dee0472f56a66cab3dff5aab96f5092e - e3b41849929b2b339aeb31187e5a8212645d4352b84c6da2d00427f4704701fa - 61526c0ed945e0c4fa7e3c74a50b1c850640ad1127583b261d98d96e051ab8a7 - 27b8f857c0cd3a0cfc4b672dafd97b5058141c9c2611f3bc3dcdf0cbc7bbb0f6 - 87825f138676242e47e5feea13416b7f0b80d2abcd6d1e9e9c176cbf2b16fc4a - 25adc223948abbf53e2485ef7e2ba7c6cd57035539a328bc1bed0ef5a2e98151 - 29117feb77725cb04612ecf4d5fc2cdd99cf83ec5a5443bc7ad70d5087f067e7 - a9313a9102e7076cdb2fb6d93c521c7125fc7bb238a1c10b7fe7aad83ed1a832 - 8ac5b14e77083a78ea452370c388216827a74a535238f46b68e54f583fb9d28e - 8fbeaacb8eb49fcbdedfbad2ea8ddc6ef6c439ffeaf760ce8951399f130f2e70 - 7e90cebdc49ba304cbcacf1e2402e1d04a74915655e51736f77cbf06ef96b15b - 6a05ca1dea4d1d1df7403909765469fd64f930687f10c4f12d6df47b316b01a0 - 7385224b6cb45a987ccf7a78e14e4d2962f7d8053226907db7d221871a1d9654 - 6cf181372cdbd6e71d391e3d301862df861d09294b21e60aca2439adaed90f1c - e52b3fffda04b1a1b53f3de317e5e1c0632284ee49f99a1639a5e153f18eb7e1 - 79a2c8da2175659ec63d62414b6f6d39342f705f3e973f886a0e05979dbbb5e2 - 56d52734e4be44d91bfb993ad8ff71a8adb467781a562219d62f58f13a588ed7 - 96f4ec00964d3c9f0f5db9243ed2486ef4f705d822427de1303d25decb1d8091 - 97b6e1980fa99a5edac112f25a4873b88ebb1c28f010c7e7dc2197216740f916 - 1b14434f61257ce16bdeef681383b6371b0ad2004c0ca165d819b559f1db57e6 - 4908fe09e5da90f608d1abbcad948f4b4b6622ebb6bbbd22c61233736c402281 - 92967023816682d0991bdf50e08eb9a199a45c95b848b5aeceefc0906d267a1e - 65e4a1bac6db7d51f67d3d522ffa5104031619fc5a427e446de90a959cf1b5ae - 774d4102558b9744c141dbb6b89915beee1401c7997caafc5e84c3d3431505aa - 2c8af1b518a1ab9470a2a8a6b2728a107ae92043dfe63a0bfbfb1423e11561b4 - 772c0e432e5e2a07ce0f7f150a0e999e291490e1c8b1d7a47085c231e1bfb551 - cb144fe7128393e757eb0e89fbfa1a64a98d75645563ef23538c81ea2395c54b - b1fc0e8abe44a489728a5d35a7e30b2c189b3afee57ccf1ca3d457863bcaf613 - 3672383cd1054cbc082c7b2ea423461af6088f80784b72ab0c961f648dcb6046 - d13c1b0ffb1325352b0abd42dba05d3932814dcbbf01049d8e3e96c35ca4cecc - 5197f27b5f1a6fda42dfdd23ab26e7852e6055d949b3421a604107f07d9ffab3 - a931a967980d2c85436a24035eb2da0de6996fcfcf2013b1b2c7481a5e3de81b - bf136d69e10bb4300753e1bde4a4287837ab1576669c51f679bf37d8de4961e6 - c265e73b9bc51156e04f69073d10dd4ea82f70bdfbd4d1246648a4158f9887f9 - 840fc9402492c653f07709d04ffe8e33b96e6c7a8873fe14ec6d382f9650769c - c0e795d692d62262a8e300e2ae573873b21538d79a9ad0bb3fd5c12486e12cef - fa1ce8c4e3c8d0c25817766e9eb1897a055d032d4a6b69b9bf83a07d1d9234ac - c3bbcd6f00dfe6e8c086489a03797366dcddca55326269d32239f5a1a5466836 - 638fa687bd1f367b88a983c66a3644cbef2d86608bb17cf8a71f1fa149156138 - 1098aeed113c1050e1ba6b42ae22fb547912a8fd864b56ba44e561a60ea19203 - 7dcb700b1bf6ae29a2c76362337bd5b34f8951b5fbcd5316e892c81e5434092d - d4deb3fc82619bf21f5e30fa488724da3ac17d0b3002661f95345a4fdfa5342c - 7121d04c37484902cd0c68a7fd2c68af25b43d5a71872cff65e408845029885c - d02e0982655a560b547629a9635abb0e491163ea7eb443d454f9e09ff0a05904 - 0bfe3a70d2b393973eb5c097191a38ecfe57cdd61000dc5b1d01acc8ac700604 - b4824070be3c764c0e1be0baea8baf5cc4700732bdf4f7a5f946f81227caceea - 3f8ec0fb6428fcf7eeba212165e4c5d4d61b865e3e26780e2a893704e1a169d8 - 093fe238df44efe1491c952454142222662c4c58ea953d558d7a3b344ead0799" +checksum="2dedbef23c189a3ae79601848bda9494ac94a54b62912f27c475a76f0fd689fe + b7b58f8567304c7acdf15e68b22f26f44fa4aa26fb9ce51adc9ab8091e62df70 + d65eacf7031f09d3f17da10c9043cf0db3b2a27acfc94ce1642d62986aabc9d4 + 4da10714359d8433741ccba376c782e1b8774b85ce186f99927dc09add8bea0f + 0635d930e2ba2da6362f7838d98bf50f21d7d69bac8b67a69e34981d22bb450b + e8bb7f3b9443e6bd2efe7bfaaf4f7be169ceba14ee3c4acde169d454df613b4d + 0bbd6e920bb09d055f23813af147d8f532a7288e992f4dc72b301c40ba165153 + 5023d7f804189f5a25a65a649fe3e2dafd723a4ecfa236db00eb51c2ae8b2c9f + ccdb7e5537debe2a97cb05ef20a63683e984770fbd4bf1315a9ca7d1b675e6e2 + e6a449b1280d337b549bc5ae8fa6a81a5f20632dce4807e54cff313fa848b273 + 885df228e7a5821d4a036a206bf1d8b39415a740a470eca581d1488ca68642b4 + 72585b3125e0253fa9fb7cec59ad332e35bdc40865e6d30e85dd77426fb1b88c + e74e73bf2746608c9f6bea7b44cbf99699170d19f48c588b48bcb20673dde6ab + 81a1172ce4e0075cbbed9090b4e193ebef9fae0f01d1ea0b599e6ba2e5b9d676 + 9e048a7648e4d9b32df68117a206e4d48d4a648c4e7fb0555c152b80a3fdb01a + afca69f4448ee277d6f0ec6fb564dbdcf52daeaa678ec792968a25a1b4089395 + 1f1da038f72fc2d120e791711813883e782b6e5896248bad8a9bc637656c7c64 + 2c0ef8f7f85e5ee2992c7ca972b0f379c69bce20e8891ceedc1249c7de6977e7 + b61a3b03d7663aa7a9d4b41442bbc1c36a53917baa9ac6ea40586ddfc8b46fd6 + be3993297bc3a2e5a5143948bf77bf68341602cad991e2ffb3440ea91684eee7 + abbc3505714d14afab1ee31dddf1c740400849e91ae0940894608c439d14ca1b + cb9caf3791adeaaf028dc3ea49190a7261dbac1d819e773745da43bd5e20baf3 + 310044e3dc20c8e5a6f93b8a1431e4e483a64ef7e85a363205c0f099d022c101 + ada24eec9c0ee87bf91a1c7615d5626683cc5f71299682abd1d9623ed1c3ac4d + 45c56e1f272f7888c955be0012e10fdae24eaa966a092b390ba3fb3290331da7 + 6ebc3c7478047bf4cab9c3a8c21750c11b735860118838dc88eafcb682520f83 + 5e9443506779ba3ec0e6142b6933e21653a5e73df183c4f139ad5a03fdce808f + 802a8e645735dc796889854356943c68f93111f091189c8604c2bef31e3a887e + d71d2df409aab2dcfa1b01d0223b6ff2a89490e95b3be5606ad03de215c03dc5 + e5f7c195566375f6bc042b2eef47ff32ca92ec5e199d3c8ce074abac4f17b141 + f9afb0d6f77df96a9b7aef610b7da9162a87610d9f7567604f785dbe08ac78b7 + b56b78228ddb7a323e2c45c155098663df00068011904febe69d29e9c7b3ede9 + 791c498fb02559f77a8d6e7b3f206bc27de60e6447ca472d034678cf59636321 + c2fcc7d13fe09910b4a615720c983d7ad23e69ecfa4615ff22ea9701e022f978 + 2ac17793f016a00dec9c08795252f0b32b2820ece859b231334fa2b6ff34264f + 13801b073d6deece09b33ae445b1b10f01bb71d45a5378699c72d7bd8a914a78 + 6d5add1a5b7d1a33aeb604b7ba9194932f86811b83efcc5752fcfe1775e08f23 + 30117c68fcd691f3159a328c5a3c7948ca3e77ca4688a73a9d0c644b8a4246f9 + f90f0f0fd894566dc0eaaf60919a09d1ccee9321524871e1331cff757fb7bfea + 7d96458df5f800936e4561fb185ecc9b581eca9578137296c9bdeceb44daf193 + a7bb9478be3d6e013ad5f9e35d32eb71a62797a705404bff6cc2cae8487743b1 + f08c737abd560cea089152758d792e5beaedc9ccede7983388dd807fe7d2a11f + 95e7475adabd240f0972757a7da25261bc47e83ac2c67944a8a6ac7992d9ec29 + 099b50cd890420b3a2d62070e45ce7c0705ef39e7dd9c2300bd4aae69fda726c + bad88b58dfca9079037ce94f42f77374ef9f9a3bd638e87bf7287b47a5dc9ffb + 6efda86537326063b96b5e77131dc6412e75589d84131dac96a482c788c50a7b + 2a62edb917fc00d292ee020e9f8d134ebfe9c5673ce200da45cd19d5c2a8802f + 26aa9c6b1de4d536ec1c0aae8c226b151207f172aa4afb52152955f3d9419b36 + d163cde2b231fbbf0e59e43ae7e9df9d90af63063f17e0422e693eec40a51521 + 02f4e66ff8693498527505c3a32fd6ddf7a5039b7a7ccd6c2c747523a910754b + 892960fd4783c002e2474d16e9d7b70845e8bb93964ff681812a0cad6b763304 + fa2f66fbd0dedf186650768547553aba45a15fa5ea2a1dcdfcd9ff157838ec54 + ad143cf3848376f5391842ff8e5f8adbd1dde0f02cceef48e48d0903cd174578 + 0707af0cf8a4074839844a6c21632746d2a5fd6f114805d3876d018de20aca88 + fca407ec651962e21618c06cff83e68a8ed03e579cff9323336e8d78d13cee9e + b335c60db936421f1a2a77944aa9156821c3d350f8dba689d5a6fec6bbc88092 + ef3a4d8335a856f3ce0aa7ba4c48265ca043edf90f4050922a134584fc9a0b9f + 2434ae11c76063aa7685d0445993cb09b2566ae5a5d50cf2080c977cb5af98fc + ad02956d6bc1b49925170ad1a172b5e830dae346986913ce6002f46c3d998dd0 + e6b2562e083f74d82ff9665c182ffa61c4cf1a2e28777b6be8169f2b81d3e6a5 + 4907238801a5db0c6736995c4cd907b4247274abcea7828684e61c0d07e6cfff + 6ba4938cd5bee47c97eb469a0d7d4a74dae140f6ec2c571e4bad7e7e0516503a + 5eb3c903dc6f77080bb7863bddac704ff9f54b01af8c85a18b6d09e2c421b30f + 0ad0c770e64b3269f99f0c675bfa3462e04375134db585b75e5948ad5aaaf8d8 + 5414854b7f2125093a369e5b239f62822aca0b9109a0338a5f92bc3e66b61c92 + 7e7e198016ca1a8d26f3818cee938f72b11e8c73a9321cf9daa1fb9b12781c6e + f0a7269039e2bc34e12d0fea551f658c05bf7f8867f723f557ac6da6ef9ef139 + 2d24d04287306fe490f6d512d2589ba04dc146212b41e87997fe15fb825ea52d + 24b5910b9ff7bef6d3f6f3da15451374f1322c26a08cc8120f9c3f56657df3bb + 14bb80304f93b629e78d174cc11bf0e9291662d223a9e7d2cf28218026835426 + 77383381d09a8bc6f3d119a831b7f143b28f1ca5ca0af328cc4085d83e9b2cd7 + ab1f80d1df6096f608a7b3868b555f372f1d4453718dc7a193ffca551e1d8dc7 + 89c5b8410c2b29dafd062f6fc2caad4ed70d582400882509919b56628aa917a5 + f81e32bddb4d1c0bf8d6b969ce14f365cc604c51bfae3c757188ecac0d182415 + f0b6652eb519c081a704cbed0aacca367eb13449b0643c2690aaef6cf4387539 + e6fc7b8ea756fcb0ddc9830f804cd818c7e18db3fce9f070c9fa0a4aa837cb87 + 1594712d37d0deea3d7b8483be8a17f6151cc05dab24f63fa0bedbea0744e798 + 478930a36ca9bb22b56554099a569f351799b50f39b291ab18cde013fcf866b1 + d28be7e2d566576c62183d745c2d19605312c5264988ede6b0feb6fd9e5a2567 + 74de8c32bffa4c7442a187548c3cc0b878e2c2b2f34a4009fdb09fe1a5287f74 + 00c1d6ba56aef0121bc48db84500d5b0fdb67b93ec0719da024f96b425817115 + 783e5458dad544dcef3ba2bada77d9d74d1856729f81a9a703cd6bdcaab77eeb + c63b8ea8ad7449c99c87cba1c7db2351aef0d4ad5e44aa7e74420f2b29579b9c + 28b08801c0e429d3de1a72e3c54653220305dd64ddb791a6c75d8f22c18cf9f9 + e4b70ed881bb5cfe718e16d16570bd85887e87c859de72e2699bd6935b41c5c6 + 86f15fa6884f8513921c57c7884d57fb00ecfd08284a54522b1e7ea463029e8e + 72eba55bf5f37386ed1fd81bf246ed99ba37a77d099cb78d60f8c145eab55545 + 96ee4b5ebd85508e5dfa4cb1e12c36e47006b3aaed3779950dcf681678c23380 + b060a98122104f8b0f9b352b5406ba92182a91078588caadbdf30f56f2682415 + 5d511cf3086366c319e5ac900f20afd12fca2e245cd54656282ea39c86eb8764 + 569949c84e9db4a9057f60f3b30739c17e06ac7fb9efac760e5af66dc283f8d9 + 3aade6bf9b7fa18750dc31faaf330d67f053f7fc48fab9bd2569ad9c1409e518 + 80868aa4719be5bae403a5d962ddb0097a1566f900ef20ae947c15ed2f647f89" diff --git a/srcpkgs/firefox/files/firefox-wayland b/srcpkgs/firefox/files/firefox-wayland index bd7b93c7a92..495f901320c 100644 --- a/srcpkgs/firefox/files/firefox-wayland +++ b/srcpkgs/firefox/files/firefox-wayland @@ -1,5 +1,2 @@ #!/bin/sh - -export GDK_BACKEND=wayland - -exec /usr/lib/firefox/firefox "$@" +exec env MOZ_ENABLE_WAYLAND= /usr/lib/firefox/firefox "$@" diff --git a/srcpkgs/firefox/patches/initialize_sched_param.patch b/srcpkgs/firefox/patches/initialize_sched_param.patch new file mode 100644 index 00000000000..ee593c3c217 --- /dev/null +++ b/srcpkgs/firefox/patches/initialize_sched_param.patch @@ -0,0 +1,22 @@ +source: https://github.com/padenot/audio_thread_priority/commit/a1443a02667c649cb72873a45b98fffbd2eac5a8 + +commit a1443a02667c649cb72873a45b98fffbd2eac5a8 +Author: Paul Adenot +Date: Mon Aug 19 15:00:39 2019 +0200 + + initialize sched_param using std::mem::zeroed to fix compilation against other libc than glibc + +diff --git a/src/rt_linux.rs b/src/rt_linux.rs +index d8c0114..fbb4fde 100644 +--- third_party/rust/audio_thread_priority/src/rt_linux.rs.orig 2019-09-03 22:57:00.197152845 +0200 ++++ third_party/rust/audio_thread_priority/src/rt_linux.rs 2019-09-03 23:05:42.219159018 +0200 +@@ -93,8 +93,8 @@ pub fn promote_current_thread_to_real_time_internal(audio_buffer_frames: u32, + { + let thread_id = unsafe { libc::syscall(libc::SYS_gettid) }; + let pthread_id = unsafe { libc::pthread_self() }; ++ let mut param = unsafe { std::mem::zeroed::() }; + let mut policy = 0; +- let mut param = libc::sched_param { sched_priority: 0 }; + + if unsafe { libc::pthread_getschedparam(pthread_id, &mut policy, &mut param) } < 0 { + error!("pthread_getschedparam error {}", pthread_id); diff --git a/srcpkgs/firefox/patches/ppc64le-bug-1512162.patch b/srcpkgs/firefox/patches/ppc64le-bug-1512162.patch deleted file mode 100644 index ec38f2262be..00000000000 --- a/srcpkgs/firefox/patches/ppc64le-bug-1512162.patch +++ /dev/null @@ -1,50 +0,0 @@ - -diff --git a/js/xpconnect/src/XPCWrappedNative.cpp b/js/xpconnect/src/XPCWrappedNative.cpp ---- js/xpconnect/src/XPCWrappedNative.cpp -+++ js/xpconnect/src/XPCWrappedNative.cpp -@@ -1152,16 +1152,20 @@ bool XPCWrappedNative::CallMethod(XPCCal - if (NS_FAILED(rv)) { - return Throw(rv, ccx); - } - - JS::Rooted helper(ccx, /* init = */ ccx); - return helper.get().Call(); - } - -+#if (__GNUC__ && __linux__ && __PPC64__ && _LITTLE_ENDIAN) -+// Work around a compiler bug on ppc64le (bug 1512162). -+__attribute__ ((noinline,noclone)) -+#endif - bool CallMethodHelper::Call() { - mCallContext.SetRetVal(JS::UndefinedValue()); - - mCallContext.GetContext()->SetPendingException(nullptr); - - if (mVTableIndex == 0) { - return QueryInterfaceFastPath(); - } -@@ -1310,16 +1314,20 @@ bool CallMethodHelper::GetOutParamSource - return false; - } - } - } - - return true; - } - -+#if (__GNUC__ && __linux__ && __PPC64__ && _LITTLE_ENDIAN) -+// Work around a compiler bug on ppc64le (bug 1512162). -+__attribute__ ((noinline,noclone)) -+#endif - bool CallMethodHelper::GatherAndConvertResults() { - // now we iterate through the native params to gather and convert results - uint8_t paramCount = mMethodInfo->GetParamCount(); - for (uint8_t i = 0; i < paramCount; i++) { - const nsXPTParamInfo& paramInfo = mMethodInfo->GetParam(i); - if (!paramInfo.IsOut()) { - continue; - } - - - - diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template index 82d454d0f68..ec5516269f3 100644 --- a/srcpkgs/firefox/template +++ b/srcpkgs/firefox/template @@ -3,7 +3,7 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n". # pkgname=firefox -version=68.0.2 +version=69.0.2 revision=1 build_helper="rust" short_desc="Mozilla Firefox web browser" @@ -11,7 +11,7 @@ maintainer="Johannes " license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://www.mozilla.org/firefox/" distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz" -checksum=9b3e6d8f99819f9eda9ebba403b644a2b96d19450b42cae422bbf4386902a840 +checksum=2904ef954626d2a7f320670ccb7cb5d9060610f091c94190a6cbee14aa2cd82e lib32disabled=yes @@ -31,11 +31,6 @@ conflicts="firefox-esr>=0" build_options="alsa dbus pulseaudio startup_notification xscreensaver sndio wayland" build_options_default="alsa dbus pulseaudio startup_notification xscreensaver sndio wayland" -# 19:55.85 /usr/bin/ld: failed to set dynamic section sizes: memory exhausted -if [ "$XBPS_WORDSIZE" -eq 32 ]; then - nodebug=yes -fi - case $XBPS_TARGET_MACHINE in armv6*) broken="required NEON extensions are not supported on armv6" @@ -44,6 +39,13 @@ case $XBPS_TARGET_MACHINE in ppc*) broken="ftbfs in several places" ;; esac +# we need this because cargo verifies checksums of all files in vendor +# crates when it builds and gives us no way to override or update the +# file sanely... so just clear out the file list +_clear_vendor_checksums() { + sed -i 's/\("files":{\)[^}]*/\1/' third_party/rust/$1/.cargo-checksum.json +} + post_extract() { case "$XBPS_TARGET_MACHINE" in *-musl) @@ -59,6 +61,11 @@ post_extract() { # Note: This is for Void Linux use ONLY. echo -n "cd894504-7a2a-4263-abff-ff73ee89ffca" > mozilla-api-key } + +post_patch() { + _clear_vendor_checksums audio_thread_priority +} + do_build() { cp "${FILESDIR}/mozconfig" "${wrksrc}/.mozconfig" @@ -104,19 +111,20 @@ do_build() { mkdir -p third_party/rust/libloading/.deps case "$XBPS_TARGET_MACHINE" in - i686*) - export CFLAGS+=" -D_FILE_OFFSET_BITS=64" - export CXXFLAGS+=" -D_FILE_OFFSET_BITS=64" - ;; armv7*) export CFLAGS+=" -mfpu=neon -Wno-psabi" export CXXFLAGS+=" -mfpu=neon -Wno-psabi" ;; esac - if [ "$XBPS_WORDSIZE" -eq 32 ]; then - # ENOMEM - echo "ac_add_options --disable-debug-symbols" >>.mozconfig + # work around large debug symbols on 32-bit hosts + if [ "$XBPS_WORDSIZE" = "32" ]; then + export CFLAGS="${CFLAGS/-g/-g1}" + export CXXFLAGS="${CXXFLAGS/-g/-g1}" + export LDFLAGS+=" -Wl,--no-keep-memory" + # patch the rust debug level, this is hardcoded + sed -i "s/debug_info = '2'/debug_info = '1'/" \ + build/moz.configure/toolchain.configure fi export LDFLAGS+=" -Wl,-rpath=/usr/lib/firefox" diff --git a/srcpkgs/fish-shell/template b/srcpkgs/fish-shell/template index b48ac921bda..9a3930ad586 100644 --- a/srcpkgs/fish-shell/template +++ b/srcpkgs/fish-shell/template @@ -7,7 +7,7 @@ build_style=cmake makedepends="ncurses-devel pcre2-devel gettext-devel" depends="bc groff" short_desc="User friendly shell intended mostly for interactive use" -maintainer="maxice8 " +maintainer="Orphaned " license="GPL-2.0-only" homepage="https://fishshell.com/" distfiles="https://github.com/fish-shell/fish-shell/releases/download/${version}/fish-${version}.tar.gz" diff --git a/srcpkgs/flac/template b/srcpkgs/flac/template index aa1a8b3fa52..03c29f4f72a 100644 --- a/srcpkgs/flac/template +++ b/srcpkgs/flac/template @@ -15,8 +15,11 @@ license="BSD-3-Clause, GPL-2" distfiles="https://downloads.xiph.org/releases/flac/flac-${version}.tar.xz" checksum=213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748 +# TODO: make into options case "$XBPS_TARGET_MACHINE" in - ppc64|ppc64-musl) configure_args+=" --disable-vsx";; + ppc64le*) configure_args+=" --enable-altivec --enable-vsx" ;; + ppc64*) configure_args+=" --enable-altivec --disable-vsx" ;; + ppc*) configure_args+=" --disable-altivec --disable-vsx" ;; esac post_install() { diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template index 016e1732d7d..907355a6413 100644 --- a/srcpkgs/flacon/template +++ b/srcpkgs/flacon/template @@ -1,6 +1,6 @@ # Template file for 'flacon' pkgname=flacon -version=5.2.0 +version=5.5.1 revision=1 build_style=cmake hostmakedepends="pkg-config" @@ -12,7 +12,7 @@ license="LGPL-2.1-or-later" homepage="https://flacon.github.io/" changelog="https://flacon.github.io/changelog/" distfiles="https://github.com/Flacon/flacon/archive/v${version}.tar.gz" -checksum=701fb0ebee98a697baa3060645ca4203771714994bb1fa8eeebfd2274e4704ac +checksum=bdeac2268536c790ede8928156c7a35019dd05ed1b16f04238394a238950d287 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake" diff --git a/srcpkgs/flake8/template b/srcpkgs/flake8/template index 6a885e01ccb..d8f2b095644 100644 --- a/srcpkgs/flake8/template +++ b/srcpkgs/flake8/template @@ -1,6 +1,6 @@ # Template file for 'flake8' pkgname=flake8 -version=3.7.7 +version=3.7.8 revision=1 archs=noarch build_style=python3-module @@ -14,10 +14,10 @@ maintainer="Alessio Sergi " license="MIT" homepage="https://gitlab.com/pycqa/flake8" distfiles="${PYPI_SITE}/f/flake8/flake8-${version}.tar.gz" -checksum=859996073f341f2670741b51ec1e67a01da142831aa1fdc6242dbf88dffbe661 +checksum=19241c1cbc971b9962473e4438a2ca19749a7dd002dd1a946eaba171b4114548 pre_build() { - sed -i '/setup_requires/d' setup.py + vsed -i '/setup_requires/d' setup.py } post_install() { vlicense LICENSE diff --git a/srcpkgs/flatbuffers/patches/install.patch b/srcpkgs/flatbuffers/patches/install.patch deleted file mode 100644 index 6669eaffaa8..00000000000 --- a/srcpkgs/flatbuffers/patches/install.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- CMakeLists.txt -+++ CMakeLists.txt -@@ -320,7 +320,7 @@ if(FLATBUFFERS_INSTALL) - install( - TARGETS flatc EXPORT FlatcTargets - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -- CONFIGURATIONS Release -+ CONFIGURATIONS Release RelWithDebInfo - ) - - install( -@@ -328,7 +328,7 @@ if(FLATBUFFERS_INSTALL) - FILE FlatcTargets.cmake - NAMESPACE flatbuffers:: - DESTINATION ${FB_CMAKE_DIR} -- CONFIGURATIONS Release -+ CONFIGURATIONS Release RelWithDebInfo - ) - endif() - diff --git a/srcpkgs/flatbuffers/template b/srcpkgs/flatbuffers/template index 2888235df1a..d437677c768 100644 --- a/srcpkgs/flatbuffers/template +++ b/srcpkgs/flatbuffers/template @@ -1,20 +1,24 @@ # Template file for 'flatbuffers' pkgname=flatbuffers -version=1.10.0 +version=1.11.0 revision=1 build_style=cmake short_desc="Memory Efficient Serialization Library" maintainer="Elie ROUDNINSKI " -license="GPL-3.0-or-later" +license="Apache-2.0" homepage="https://google.github.io/flatbuffers/" distfiles="https://github.com/google/${pkgname}/archive/v${version}.tar.gz" -checksum=3714e3db8c51e43028e10ad7adffb9a36fc4aa5b1a363c2d0c4303dd1be59a7c +checksum=3f4a286642094f45b1b77228656fbd7ea123964f19502f9ecfd29933fd23a50b if [ "$CROSS_BUILD" ]; then # Disable tests to prevent executing target binaries on host - configure_args="-DFLATBUFFERS_BUILD_TESTS=OFF" + configure_args+=" -DFLATBUFFERS_BUILD_TESTS=OFF" fi +case "$XBPS_TARGET_MACHINE" in + *-musl) configure_args+=" -DFLATBUFFERS_LOCALE_INDEPENDENT=0";; +esac + flatbuffers-devel_package() { short_desc+=" - development files" depends="${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/flatpak-builder/template b/srcpkgs/flatpak-builder/template index 1cc55f9ba13..056d33ce5ca 100644 --- a/srcpkgs/flatpak-builder/template +++ b/srcpkgs/flatpak-builder/template @@ -1,6 +1,6 @@ # Template file for 'flatpak-builder' pkgname=flatpak-builder -version=1.0.6 +version=1.0.9 revision=1 build_style=gnu-configure hostmakedepends="pkg-config xmlto" @@ -11,7 +11,7 @@ maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://github.com/flatpak/flatpak-builder" distfiles="${homepage}/releases/download/${version}/${pkgname}-${version}.tar.xz" -checksum=3b572ad7b7cce9ca6a8632ca69a49a47b20e99066fe064b7b56e7896dca789bb +checksum=d6ef390a1cd927db1cfb12b6d2e340227a69de3fd64308316a3e6a89c1390d03 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" flatpak-devel" diff --git a/srcpkgs/flatpak/template b/srcpkgs/flatpak/template index d4bab0c9a13..0a572fd11a1 100644 --- a/srcpkgs/flatpak/template +++ b/srcpkgs/flatpak/template @@ -1,7 +1,7 @@ # Template file for 'flatpak' pkgname=flatpak -version=1.4.2 -revision=3 +version=1.5.0 +revision=1 build_style=gnu-configure build_helper="gir" configure_args=" @@ -20,7 +20,7 @@ license="LGPL-2.1-or-later" homepage="https://flatpak.org/" changelog="https://github.com/flatpak/flatpak/blob/master/NEWS" distfiles="https://github.com/flatpak/flatpak/releases/download/${version}/flatpak-${version}.tar.xz" -checksum=f2799a6d973a052529b52943021108f148706d3e69725ac7dd60bf6ac4bdd522 +checksum=1a13f4c54c136e728e96406846f26b84d9d5986caf17868aa73917d7588c471e build_options="gir" build_options_default="gir" diff --git a/srcpkgs/fldigi/template b/srcpkgs/fldigi/template index 8e86893ebb4..8b34b4c8027 100644 --- a/srcpkgs/fldigi/template +++ b/srcpkgs/fldigi/template @@ -1,6 +1,6 @@ # Template file for 'fldigi' pkgname=fldigi -version=4.1.07 +version=4.1.08 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" @@ -11,4 +11,4 @@ maintainer="Andy Cobaugh " license="GPL-3.0-or-later" homepage="http://www.w1hkj.com" distfiles="http://www.w1hkj.com/files/fldigi/fldigi-${version}.tar.gz" -checksum=dc4864b6e63c688b9dd932587bdaf7becfa17558380f7deff1236eb6b66921f0 +checksum=004b54fa4ff03c85e088bf1706270db5f3976afcaaf1003b4d6d3b0ef8007349 diff --git a/srcpkgs/flowblade/patches/00-add-bin-directories.patch b/srcpkgs/flowblade/patches/00-add-bin-directories.patch index b73fe73df61..91622e5cc53 100644 --- a/srcpkgs/flowblade/patches/00-add-bin-directories.patch +++ b/srcpkgs/flowblade/patches/00-add-bin-directories.patch @@ -1,11 +1,11 @@ ---- flowblade-trunk/flowblade 2019-02-04 02:29:07.000000000 -0700 -+++ flowblade-trunk/flowblade 2019-07-06 17:48:47.295155396 -0600 -@@ -34,7 +34,7 @@ print "Launch script dir:", launch_dir +--- flowblade-trunk/flowblade 2019-08-31 20:09:32.877338976 +0200 ++++ flowblade-trunk/flowblade 2019-08-31 20:09:50.706337258 +0200 +@@ -34,7 +34,7 @@ # Update sys.path to include modules # When running on distro --if launch_dir == "/usr/bin": -+if launch_dir in {"/usr/bin", "/bin", "/usr/local/bin"}: +-if launch_dir in {"bin", "/usr/bin", "/usr/local/bin"}: ++if launch_dir in {"/bin", "/usr/bin", "/usr/local/bin"}: print "Running from installation..." modules_path = "/usr/share/flowblade/Flowblade" if not os.path.isdir(modules_path): diff --git a/srcpkgs/flowblade/template b/srcpkgs/flowblade/template index 4e8e509f9f9..765ac779be1 100644 --- a/srcpkgs/flowblade/template +++ b/srcpkgs/flowblade/template @@ -1,7 +1,7 @@ # Template file for 'flowblade' pkgname=flowblade -version=2.0 -revision=2 +version=2.2 +revision=1 archs=noarch build_wrksrc=flowblade-trunk build_style=python2-module @@ -11,8 +11,8 @@ hostmakedepends="python-setuptools" depends="frei0r-plugins gmic mlt-python python-Pillow python-dbus gtk+3 python-gobject python-numpy swh-plugins" short_desc="Non-linear video editor for Linux" -maintainer="maxice8 " +maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://jliljebl.github.io/flowblade/" distfiles="https://github.com/jliljebl/flowblade/archive/v${version}.tar.gz" -checksum=c8f21d76803d9ed44585e6d960b12ba1930661e58ee36456fc424d41e2945b33 +checksum=4c7bc61d2d38dbf91bbae9f835fbf82504a47d973983427264706a0596573e70 diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template index 793aa081ea1..3a3ab9cfc57 100644 --- a/srcpkgs/fmt/template +++ b/srcpkgs/fmt/template @@ -5,7 +5,7 @@ revision=1 build_style=cmake configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF" short_desc="Modern formatting library" -maintainer="maxice8 " +maintainer="Orphaned " license="BSD-2-Clause" homepage="https://github.com/fmtlib/fmt" distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz" diff --git a/srcpkgs/fmtools/template b/srcpkgs/fmtools/template new file mode 100644 index 00000000000..9ae54b6cf28 --- /dev/null +++ b/srcpkgs/fmtools/template @@ -0,0 +1,11 @@ +# Template file for 'fmtools' +pkgname=fmtools +version=2.0.7 +revision=1 +build_style=gnu-configure +short_desc="Utility for adjusting the frequency and volume of FM radio cards" +maintainer="Foxlet " +license="GPL-2.0-only" +homepage="https://benpfaff.org/fmtools/" +distfiles="https://benpfaff.org/fmtools/fmtools-${version}.tar.gz" +checksum=75174e07d8cde6d4a8a5d7bbaa3a3b0760a850e7f6840cb7c6246227b18f5a39 diff --git a/srcpkgs/focuswriter/template b/srcpkgs/focuswriter/template index 0999b4b8cdd..ca42da753d1 100644 --- a/srcpkgs/focuswriter/template +++ b/srcpkgs/focuswriter/template @@ -1,6 +1,6 @@ # Template file for 'focuswriter' pkgname=focuswriter -version=1.7.2 +version=1.7.3 revision=1 build_style=qmake hostmakedepends="pkg-config" @@ -10,7 +10,7 @@ maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://gottcode.org/focuswriter/" distfiles="https://github.com/gottcode/focuswriter/archive/v${version}.tar.gz" -checksum=0d6c2795445f2d124ba2e7e1a12db20a4a25731215935f228794ae79f0cc553c +checksum=3fed103a3088e2f71ead38f19b46726aabd5d2b2f27ef6716ce1b05cb609fb3d if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-multimedia-devel" diff --git a/srcpkgs/foliate/template b/srcpkgs/foliate/template index 25b0f0badce..95d3ba64672 100644 --- a/srcpkgs/foliate/template +++ b/srcpkgs/foliate/template @@ -1,14 +1,14 @@ # Template file for 'foliate' pkgname=foliate -version=1.4.0 +version=1.5.3 revision=1 archs=noarch build_style=meson -hostmakedepends="pkg-config gjs glib-devel ninja" +hostmakedepends="pkg-config gjs glib-devel ninja desktop-file-utils" depends="webkit2gtk gjs" short_desc="Simple and modern GTK eBook reader" 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=481d051299dcc26918f453e635730313ad00fac33cc8d61594e4289fff1159fd +checksum=95f45c0511493a3c732f9a199ddc2b5851a220d74d93e6d14976f29f243ee2d7 diff --git a/srcpkgs/folks/template b/srcpkgs/folks/template index 376f1522505..9a75a1f3c7b 100644 --- a/srcpkgs/folks/template +++ b/srcpkgs/folks/template @@ -1,7 +1,7 @@ # Template file for 'folks' pkgname=folks -version=0.12.1 -revision=2 +version=0.13.1 +revision=1 build_style=meson configure_args="-Db_lto=false -Dlibsocialweb-backend=false $(vopt_bool vala vala)" hostmakedepends="pkg-config intltool glib-devel $(vopt_if vala vala) @@ -11,10 +11,10 @@ makedepends="readline-devel telepathy-glib-devel zeitgeist-devel depends="zeitgeist" short_desc="GObject Library to aggregate people into metacontacts" maintainer="Enno Boland " -license="LGPL-2.1.0-or-later" +license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/Folks" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=3ca9f2d50fdf5a7a3d3f59c49bd54ceaf8d8181938762370e07535f86d36d475 +checksum=3df1c663b82fe211aead2b31cae1fc41d124e85436375762f6745c45ba46aa5d nocross="Needs Vala, which needs evolution-dataserver GIR" # NOTE: Vala build opt is broken because upstream doesn't package all necessary diff --git a/srcpkgs/font-FixedMisc/template b/srcpkgs/font-FixedMisc/template index d4ad7c471a5..dc11ffcd791 100644 --- a/srcpkgs/font-FixedMisc/template +++ b/srcpkgs/font-FixedMisc/template @@ -1,6 +1,6 @@ # Template file for 'font-FixedMisc' pkgname=font-FixedMisc -version=20190604 +version=20190911 revision=1 archs=noarch wrksrc=FixedMisc @@ -11,7 +11,7 @@ maintainer="Leah Neukirchen " license="Public Domain" homepage="https://www.mirbsd.org/cvs.cgi/contrib/fonts/fixed/" distfiles="https://www.mirbsd.org/MirOS/dist/mir/Foundry/FixedMisc-${version}.tgz" -checksum=6b883d84036f79d6d148313ff0a3c5389e516bd00497e6b610eab97965340a48 +checksum=1aa35a3128b3e5ca452467fca8150ad394054f60f847eca7296480bd23039dd7 font_dirs="/usr/share/fonts/X11/misc" diff --git a/srcpkgs/font-Hasklig/template b/srcpkgs/font-Hasklig/template index eea3082cf8d..656492ec093 100644 --- a/srcpkgs/font-Hasklig/template +++ b/srcpkgs/font-Hasklig/template @@ -7,7 +7,7 @@ create_wrksrc=yes hostmakedepends="unzip" depends="font-util xbps-triggers" short_desc="Monospaced font with ligatures" -maintainer="maxice8 " +maintainer="Orphaned " license="OFL-1.1" homepage="https://github.com/i-tu/Hasklig/" distfiles="https://github.com/i-tu/Hasklig/releases/download/${version}/Hasklig-${version}.zip" diff --git a/srcpkgs/font-awesome5/template b/srcpkgs/font-awesome5/template index 0a027800f19..bb4cfcb0b58 100644 --- a/srcpkgs/font-awesome5/template +++ b/srcpkgs/font-awesome5/template @@ -1,16 +1,16 @@ # Template file for 'font-awesome5' pkgname=font-awesome5 -version=5.10.1 +version=5.11.2 revision=1 archs=noarch wrksrc="Font-Awesome-${version}" depends="font-util" short_desc="Iconic font (version 5)" -maintainer="Orphaned " +maintainer="mobinmob " license="OFL-1.1" homepage="https://fontawesome.com" distfiles="https://github.com/FortAwesome/Font-Awesome/archive/${version}.tar.gz" -checksum=8c58f94b774ad7e1b86b2a0ec4de8795acdf7ad2fc5339276fd245023e74913a +checksum=f4e4622b944267cbd063cb75c6b606924eea1f801bd3585075695f681cebd723 conflicts="font-awesome>=0" font_dirs="/usr/share/fonts/OTF" diff --git a/srcpkgs/font-firacode/template b/srcpkgs/font-firacode/template index 534b1e217f7..ef7704f3a3a 100644 --- a/srcpkgs/font-firacode/template +++ b/srcpkgs/font-firacode/template @@ -1,6 +1,6 @@ # Template file for 'font-firacode' pkgname=font-firacode -version=1.207 +version=2 revision=1 archs=noarch create_wrksrc=yes @@ -11,7 +11,7 @@ license="OFL-1.1" homepage="https://github.com/tonsky/${pkgname#*-}" changelog="https://github.com/tonsky/FiraCode/raw/master/CHANGELOG.md" distfiles="${homepage}/releases/download/${version}/${pkgname#*-}_${version}.zip" -checksum=ba8d1a9ff3ad1bce7decc48db7a1e95c6116959cc5b9b80dc307b615eec3dfee +checksum=60d5b1106b708cc134c521aae4e503bb1d2ec3c9bf8ad978f2c659820505d492 font_dirs="/usr/share/fonts/OTF" do_install() { diff --git a/srcpkgs/font-ibm-plex-ttf/template b/srcpkgs/font-ibm-plex-ttf/template index 2de952c018a..fed6cc4c85b 100644 --- a/srcpkgs/font-ibm-plex-ttf/template +++ b/srcpkgs/font-ibm-plex-ttf/template @@ -1,6 +1,6 @@ # Template file for 'font-ibm-plex-ttf' pkgname=font-ibm-plex-ttf -version=2.0.0 +version=3.0.0 revision=1 archs=noarch wrksrc="plex-${version}" @@ -10,7 +10,7 @@ maintainer="Vintodrimmer " license="OFL-1.1" homepage="https://github.com/IBM/plex" distfiles="https://github.com/IBM/plex/archive/v${version}.tar.gz" -checksum=5f19741813ffdb4218253dbb0be26b56bf021b8919c42f8c6762d64e71109063 +checksum=3f17785a532507b855e9efe0166d3dedb24451a832a8739ff4c5c191fd64058b font_dirs="/usr/share/fonts/TTF" diff --git a/srcpkgs/font-ionicons-ttf/template b/srcpkgs/font-ionicons-ttf/template index bb1afd2ea89..5a1b9153095 100644 --- a/srcpkgs/font-ionicons-ttf/template +++ b/srcpkgs/font-ionicons-ttf/template @@ -1,6 +1,6 @@ # Template file for 'font-ionicons-ttf' pkgname=font-ionicons-ttf -version=4.6.2 +version=4.6.3 revision=1 archs=noarch wrksrc="ionicons-$version" @@ -10,7 +10,7 @@ maintainer="Daniel Eyßer " license="MIT" homepage="https://ionicons.com/" distfiles="https://github.com/ionic-team/ionicons/archive/v${version}.tar.gz" -checksum=fae86345ddeda1449ecb016010e473f5e036c2f8c0ac6514d141998f8934ea05 +checksum=de8d4208a95f82ba5336e4ce3729bed5bc530332083c44de49790d1f0081d321 font_dirs="/usr/share/fonts/TTF" diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template index 5db390c3a30..2e1ad9abaa3 100644 --- a/srcpkgs/font-iosevka/template +++ b/srcpkgs/font-iosevka/template @@ -1,6 +1,6 @@ # Template file for 'font-iosevka' pkgname=font-iosevka -version=2.2.1 +version=2.3.2 revision=1 archs=noarch create_wrksrc=yes @@ -13,7 +13,7 @@ homepage="https://be5invis.github.io/Iosevka/" distfiles="https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENSE.md>LICENSE.txt https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-iosevka-${version}.zip" checksum="ecfd74a1d6749bf509cee122870da0186bccfae446e3f6bc5faff253577ab000 - 65cec2bc3672f8aa3cc427effa62a8aa9e26386db983ce0ff4a876e85bf77e5f" + dbb8737eb147dcfcb3e3130fb07193fc1308c9af3dd70cc850d6d73184ffea1a" font_dirs="/usr/share/fonts/TTF" diff --git a/srcpkgs/font-material-design-icons-ttf/template b/srcpkgs/font-material-design-icons-ttf/template index 111cd2c44b7..70565c4255b 100644 --- a/srcpkgs/font-material-design-icons-ttf/template +++ b/srcpkgs/font-material-design-icons-ttf/template @@ -7,7 +7,7 @@ wrksrc="material-design-icons-${version}" hostmakedepends="unzip" depends="font-util xbps-triggers" short_desc="Material Design icons by Google" -maintainer="maxice8 " +maintainer="Orphaned " license="Apache-2.0" homepage="https://github.com/google/material-design-icons" distfiles="https://github.com/google/material-design-icons/releases/download/${version}/material-design-icons-${version}.zip" diff --git a/srcpkgs/font-mplus-ttf/template b/srcpkgs/font-mplus-ttf/template index 865d8fad9a9..102d839baac 100644 --- a/srcpkgs/font-mplus-ttf/template +++ b/srcpkgs/font-mplus-ttf/template @@ -1,16 +1,16 @@ # Template file for 'font-mplus-ttf' pkgname=font-mplus-ttf -version=063 +version=063a revision=1 archs=noarch wrksrc="mplus-TESTFLIGHT-${version}" depends="fontconfig font-util" short_desc="M+ Japanese outline fonts" maintainer="Satoshi Amemiya " -license="custom" +license="CC0-1.0" homepage="https://mplus-fonts.osdn.jp/" distfiles="http://jaist.dl.osdn.jp/mplus-fonts/62344/mplus-TESTFLIGHT-${version}.tar.xz" -checksum=149a5c97c35624d79ffb3cbbdd56559319085229acaf72b49b56adc5ede0979c +checksum=44eb973b4b6aff574de454db105ddc23e6749c2294734bd9cb1e0d734e4cdd79 font_dirs="/usr/share/fonts/TTF" do_install() { diff --git a/srcpkgs/font-sarasa-gothic/template b/srcpkgs/font-sarasa-gothic/template index eb31ac8b75c..15ef1025e18 100644 --- a/srcpkgs/font-sarasa-gothic/template +++ b/srcpkgs/font-sarasa-gothic/template @@ -1,6 +1,6 @@ # Template file for 'font-sarasa-gothic' pkgname=font-sarasa-gothic -version=0.8.0 +version=0.9.1 revision=1 archs=noarch create_wrksrc=yes @@ -11,7 +11,7 @@ maintainer="B. Wilson " license="OFL-1.1" homepage="https://github.com/be5invis/Sarasa-Gothic" distfiles="https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z" -checksum=6a78ce58fc5c572e2f6e17d6af84589b26dc97cccaf253851496c6773ae40f65 +checksum=d8d0b566b2ca7ff0964e00a2fca7737cc73f041c3e3d3badbc62a10e07e2a83b font_dirs="/usr/share/fonts/TTF" diff --git a/srcpkgs/font-spleen/template b/srcpkgs/font-spleen/template index 82a443e418d..0bf164819ee 100644 --- a/srcpkgs/font-spleen/template +++ b/srcpkgs/font-spleen/template @@ -1,10 +1,9 @@ # Template file for 'font-spleen' pkgname=font-spleen -version=1.0.5 +version=1.5.0 revision=1 archs=noarch wrksrc="spleen-${version}" -font_dirs="/usr/share/fonts/X11/spleen" hostmakedepends="bdftopcf" depends="font-util" short_desc="Monospaced bitmap fonts" @@ -12,7 +11,8 @@ maintainer="Renato Aguiar " license="BSD-2-Clause" homepage="https://github.com/fcambus/spleen" distfiles="https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz" -checksum=cf26c313da53857353e48a93540845cf6f773908fe19d2a509249f061776dfe0 +checksum=a346844625416ede531bcb720bc786924792a0538fe90c8f1215d619dcd0f6c2 +font_dirs="/usr/share/fonts/X11/spleen" do_install() { vmkdir usr/share/fonts/X11/spleen @@ -21,6 +21,6 @@ do_install() { bdftopcf -t $f | gzip -n9 > $out vinstall $out 644 usr/share/fonts/X11/spleen done - vinstall fonts.alias-spleen 644 usr/share/fonts/X11/spleen fonts.alias + vinstall fonts.alias 644 usr/share/fonts/X11/spleen vlicense LICENSE } diff --git a/srcpkgs/font-unifont-bdf/template b/srcpkgs/font-unifont-bdf/template index a607a113744..63908286b21 100644 --- a/srcpkgs/font-unifont-bdf/template +++ b/srcpkgs/font-unifont-bdf/template @@ -1,6 +1,6 @@ # Template file for 'font-unifont-bdf' pkgname=font-unifont-bdf -version=12.1.02 +version=12.1.03 revision=1 archs=noarch create_wrksrc=yes @@ -10,7 +10,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="http://unifoundry.com/unifont/index.html" distfiles="http://unifoundry.com/pub/unifont/unifont-${version}/font-builds/unifont-${version}.bdf.gz" -checksum=04d652be1e28a6d464965c75c71ac84633085cd0960c2687466651c34c94bd89 +checksum=6067bda8daa1f3c49d8876107992e19fc9ab905ad54c01c3131b9649977c3746 font_dirs=/usr/share/fonts/misc do_install() { diff --git a/srcpkgs/font-util/template b/srcpkgs/font-util/template index f71db68e265..5b9946003b5 100644 --- a/srcpkgs/font-util/template +++ b/srcpkgs/font-util/template @@ -1,7 +1,7 @@ # Template file for 'font-util' pkgname=font-util -version=1.3.1 -revision=4 +version=1.3.2 +revision=1 build_style=gnu-configure hostmakedepends="pkg-config bdftopcf" # @@ -10,11 +10,11 @@ hostmakedepends="pkg-config bdftopcf" # depends="font-alias expat freetype fontconfig mkfontscale" short_desc="Tools for truncating and subseting of ISO10646-1 BDF fonts" -maintainer="Orphaned " +maintainer="Duncaen " license="MIT" homepage="http://xorg.freedesktop.org" distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2" -checksum=aa7ebdb0715106dd255082f2310dbaa2cd7e225957c2a77d719720c7cc92b921 +checksum=3ad880444123ac06a7238546fa38a2a6ad7f7e0cc3614de7e103863616522282 lib32disabled=yes post_install() { diff --git a/srcpkgs/font-vazir/template b/srcpkgs/font-vazir/template index faea8ba6438..61d1651ea35 100755 --- a/srcpkgs/font-vazir/template +++ b/srcpkgs/font-vazir/template @@ -1,6 +1,6 @@ # Template file for 'font-vazir' pkgname=font-vazir -version=20.1.0 +version=21.1.0 revision=1 archs=noarch create_wrksrc=yes @@ -11,7 +11,7 @@ maintainer="linarcx " license="OFL-1.1" homepage="https://github.com/rastikerdar/vazir-font" distfiles="https://github.com/rastikerdar/vazir-font/releases/download/v${version}/vazir-font-v${version}.zip" -checksum=843f6bfbc7c214ab339f3e7a555bfeb20c6ddebbe3885a33a2c3b4098cf64576 +checksum=5a4abd2e5a21c1659d1a89232559a0936717a9bfaa586da1a3390ee2a3dc63a2 font_dirs="/usr/share/fonts/TTF" diff --git a/srcpkgs/forkstat/template b/srcpkgs/forkstat/template index f9928be8323..f301b41bdba 100644 --- a/srcpkgs/forkstat/template +++ b/srcpkgs/forkstat/template @@ -1,6 +1,6 @@ # Template file for 'forkstat' pkgname=forkstat -version=0.02.10 +version=0.02.11 revision=1 build_style=gnu-makefile short_desc="Program that logs process fork(), exec() and exit() activity" @@ -8,5 +8,5 @@ maintainer="Wilson Birney " license="GPL-3.0-or-later" homepage="https://kernel.ubuntu.com/~cking/forkstat/" distfiles="https://kernel.ubuntu.com/~cking/tarballs/forkstat/forkstat-${version}.tar.xz" -checksum=af039bcd9f11ee76721d96c2c65d7e9c8d5df0a3f688bcbe0a5add2dd5dbb6da +checksum=717ad3c2a22f5dc68d51ac25cc86deb69820dffbc8ea1101b9792040a843921a CFLAGS="-DVERSION=\'\"${version}\"\'" diff --git a/srcpkgs/fossil/template b/srcpkgs/fossil/template index cb6a810b6db..19c29ffe70a 100644 --- a/srcpkgs/fossil/template +++ b/srcpkgs/fossil/template @@ -1,6 +1,6 @@ # Template file for 'fossil' pkgname=fossil -version=2.9 +version=2.10 revision=1 build_style=configure configure_args="--disable-internal-sqlite --prefix=/usr" @@ -11,8 +11,11 @@ maintainer="Orphaned " license="BSD-2-Clause" homepage="https://www.fossil-scm.org" distfiles="https://www.fossil-scm.org/index.html/uv/fossil-src-${version}.tar.gz" -checksum=1cb2ada92d43e3e7e008fe77f5e743d301c7ea34d4c36c42f255f873e73d8b4f +checksum=d8a3776d2ce77385ed5ff20a2776d13bb534fb2508e87351e14e94f91cd12b10 +post_extract() { + vsed -i 's/test_system_sqlite$/# &/' auto.def # failing on cross +} post_install() { vman fossil.1 vlicense COPYRIGHT-BSD2.txt LICENSE diff --git a/srcpkgs/fotoxx/template b/srcpkgs/fotoxx/template index 877f4804cdd..db8f3461a70 100644 --- a/srcpkgs/fotoxx/template +++ b/srcpkgs/fotoxx/template @@ -1,6 +1,6 @@ # Template file for 'fotoxx' pkgname=fotoxx -version=19.12 +version=19.17 revision=1 wrksrc=fotoxx build_style=gnu-makefile @@ -13,7 +13,7 @@ maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://www.kornelix.net/fotoxx/fotoxx.html" distfiles="https://www.kornelix.net/downloads/downloads/fotoxx-${version}.tar.gz" -checksum=a5fa5ab5d2a4289c49fb87b0ffa843953daec3439686643db1edbc69ee65407c +checksum=0da39c534205b6a8124a8191b2004d6deb56f1862077449e84733fa3a307408c case "$XBPS_TARGET_MACHINE" in *-musl) broken="execinfo.h is a GNU specific header, and doesn’t exist under musl.";; @@ -27,4 +27,3 @@ post_install() { rm -v ${DESTDIR}/usr/share/doc/fotoxx/{changelog.gz,copyright,fotoxx.man} rm -rv ${DESTDIR}/usr/share/appdata } - diff --git a/srcpkgs/four-in-a-row/template b/srcpkgs/four-in-a-row/template index e11d20dff2a..db1aae3d87d 100644 --- a/srcpkgs/four-in-a-row/template +++ b/srcpkgs/four-in-a-row/template @@ -1,13 +1,13 @@ # Template file for 'four-in-a-row' pkgname=four-in-a-row -version=3.32.0 -revision=2 +version=3.34.1 +revision=1 build_style=meson hostmakedepends="glib-devel itstool pkg-config vala" -makedepends="gtk+3-devel libcanberra-devel librsvg-devel" +makedepends="gsound-devel gtk+3-devel libcanberra-devel librsvg-devel" short_desc="GNOME four in a row game" maintainer="Jürgen Buchmüller " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Four-in-a-row" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=f4a74ee13b1fc846f5045817477c3416551386a2bbf6a5d37da39fdbe6aa9c40 +checksum=239ced156386c51528d5ccf4f7c9c3788bcbafccac2ca0c42a9e6f2f60f65784 diff --git a/srcpkgs/fpc-src/template b/srcpkgs/fpc-src/template index fe2f75fdee9..477b62368b6 100644 --- a/srcpkgs/fpc-src/template +++ b/srcpkgs/fpc-src/template @@ -4,7 +4,7 @@ version=3.0.4 revision=1 wrksrc="fpcbuild-${version}" short_desc="Source code for FreePascal compiler" -maintainer="maxice8 " +maintainer="Orphaned " license="LGPL-2.0-or-later" homepage="https://www.freepascal.org" distfiles="ftp://ftp.freepascal.org/pub/fpc/dist/${version}/source/fpcbuild-${version}.tar.gz" diff --git a/srcpkgs/frameworkintegration/template b/srcpkgs/frameworkintegration/template index 048644f2624..24431fccd29 100644 --- a/srcpkgs/frameworkintegration/template +++ b/srcpkgs/frameworkintegration/template @@ -1,6 +1,6 @@ # Template file for 'frameworkintegration' pkgname=frameworkintegration -version=5.61.0 +version=5.63.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://projects.kde.org/projects/frameworks/frameworkintegration" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=a1a2bbb15d287b67643750cb5414ceb10c6583861dd5c00118010d409f106efb +checksum=a080657c5fae216b596dd04cca7d0b1eb4b959264b788c08c22272fd2d351659 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake python" diff --git a/srcpkgs/freecad/patches/020-namespace-missing-std.patch b/srcpkgs/freecad/patches/020-namespace-missing-std.patch new file mode 100644 index 00000000000..82033cd5afb --- /dev/null +++ b/srcpkgs/freecad/patches/020-namespace-missing-std.patch @@ -0,0 +1,127 @@ +# reason: fix build with gcc9 +# upstream: yes + +diff --git src/3rdParty/salomesmesh/inc/Rn.h src/3rdParty/salomesmesh/inc/Rn.h +index 6ec871d93..e92d2275a 100644 +--- src/3rdParty/salomesmesh/inc/Rn.h ++++ src/3rdParty/salomesmesh/inc/Rn.h +@@ -180,12 +180,12 @@ class R4: public R3 + { + friend std::ostream& operator <<(std::ostream& f, const R4 & P ) + { f << P.x << ' ' << P.y << ' ' << P.z << ' ' << P.omega; return f; } +- friend istream& operator >>(istream& f, R4 & P) ++ friend std::istream& operator >>(std::istream& f, R4 & P) + { f >> P.x >> P.y >> P.z >> P.omega ; return f; } + + friend std::ostream& operator <<(std::ostream& f, const R4 * P ) + { f << P->x << ' ' << P->y << ' ' << P->z << ' ' << P->omega; return f; } +- friend istream& operator >>(istream& f, R4 * P) ++ friend std::istream& operator >>(std::istream& f, R4 * P) + { f >> P->x >> P->y >> P->z >> P->omega ; return f; } + + public: + + +diff --git src/Mod/Drawing/App/DrawingExport.cpp src/Mod/Drawing/App/DrawingExport.cpp +index 0c3c23231..550b12c25 100644 +--- src/Mod/Drawing/App/DrawingExport.cpp ++++ src/Mod/Drawing/App/DrawingExport.cpp +@@ -81,6 +81,7 @@ + #include + + using namespace Drawing; ++using namespace std; + + TopoDS_Edge DrawingOutput::asCircle(const BRepAdaptor_Curve& c) const + { +diff --git src/Mod/Part/App/Geometry2d.cpp src/Mod/Part/App/Geometry2d.cpp +index fb1de909c..979465533 100644 +--- src/Mod/Part/App/Geometry2d.cpp ++++ src/Mod/Part/App/Geometry2d.cpp +@@ -83,6 +83,7 @@ + #include + + using namespace Part; ++using namespace std; + + extern const char* gce_ErrorStatusText(gce_ErrorType et); + +diff --git src/Mod/Raytracing/App/AppRaytracingPy.cpp src/Mod/Raytracing/App/AppRaytracingPy.cpp +index d48c51c97..1bb2b1b01 100644 +--- src/Mod/Raytracing/App/AppRaytracingPy.cpp ++++ src/Mod/Raytracing/App/AppRaytracingPy.cpp +@@ -40,6 +40,8 @@ + #include + #include + ++using namespace std; ++ + + namespace Raytracing { + class Module : public Py::ExtensionModule +diff --git src/Mod/Raytracing/App/LuxFeature.cpp src/Mod/Raytracing/App/LuxFeature.cpp +index 930fe12b7..d1e0a0089 100644 +--- src/Mod/Raytracing/App/LuxFeature.cpp ++++ src/Mod/Raytracing/App/LuxFeature.cpp +@@ -38,6 +38,7 @@ + + + using namespace Raytracing; ++using namespace std; + + PROPERTY_SOURCE(Raytracing::LuxFeature, Raytracing::RaySegment) + +diff --git src/Mod/Raytracing/App/RayFeature.cpp src/Mod/Raytracing/App/RayFeature.cpp +index cdd2cb6dc..235a98685 100644 +--- src/Mod/Raytracing/App/RayFeature.cpp ++++ src/Mod/Raytracing/App/RayFeature.cpp +@@ -36,6 +36,7 @@ + + + using namespace Raytracing; ++using namespace std; + + PROPERTY_SOURCE(Raytracing::RayFeature, Raytracing::RaySegment) + +diff --git src/Mod/TechDraw/App/Geometry.cpp src/Mod/TechDraw/App/Geometry.cpp +index c10b63177..d34eeb9bb 100644 +--- src/Mod/TechDraw/App/Geometry.cpp ++++ src/Mod/TechDraw/App/Geometry.cpp +@@ -80,6 +80,7 @@ + #include "Geometry.h" + + using namespace TechDraw; ++using namespace std; + + // Collection of Geometric Features + Wire::Wire() + + +--- src/Mod/Part/App/PropertyTopoShape.cpp ++++ src/Mod/Part/App/PropertyTopoShape.cpp +@@ -281,11 +281,11 @@ + static Standard_Boolean BRepTools_Write(const TopoDS_Shape& Sh, + const Standard_CString File) + { +- ofstream os; ++ std::ofstream os; + #if OCC_VERSION_HEX >= 0x060800 +- OSD_OpenStream(os, File, ios::out); ++ OSD_OpenStream(os, File, std::ios::out); + #else +- os.open(File, ios::out); ++ os.open(File, std::ios::out); + #endif + if (!os.rdbuf()->is_open()) return Standard_False; + + +--- src/Mod/Part/App/Geometry.cpp ++++ src/Mod/Part/App/Geometry.cpp +@@ -141,6 +141,7 @@ + #include "Geometry.h" + + using namespace Part; ++using namespace std; + + + const char* gce_ErrorStatusText(gce_ErrorType et) diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template index e641ed2a603..9e9375c4444 100644 --- a/srcpkgs/freecad/template +++ b/srcpkgs/freecad/template @@ -1,7 +1,7 @@ # Template file for 'freecad' pkgname=freecad version=0.18.3 -revision=1 +revision=2 wrksrc="FreeCAD-${version}" build_style=cmake diff --git a/srcpkgs/freecell-solver/template b/srcpkgs/freecell-solver/template index 57a6df76b18..0de23aae8df 100644 --- a/srcpkgs/freecell-solver/template +++ b/srcpkgs/freecell-solver/template @@ -1,17 +1,17 @@ # Template file for 'freecell-solver' pkgname=freecell-solver -version=5.10.0 +version=5.12.0 revision=1 build_style=cmake +configure_args="-DFCS_WITH_TEST_SUITE=OFF" hostmakedepends="perl-Template-Toolkit gperf perl-Path-Tiny pysolfc python3-pysol_cards python3-random2 python3-six" -configure_args="-DFCS_WITH_TEST_SUITE=OFF" -short_desc="Automatically solves layouts of Freecell and similar variants of solitaire" +short_desc="Automatically solves Freecell and similar variants of solitaire" maintainer="Piotr Wójcik " license="MIT" homepage="https://fc-solve.shlomifish.org/" distfiles="https://fc-solve.shlomifish.org/downloads/fc-solve/freecell-solver-${version}.tar.xz" -checksum=cc8671d315e69f6b16fc52ee9fe7515671dcc286ce871b2c13347e1afcfbdd39 +checksum=2579b89a1d4b42308f64e3d97511dede84ccc7137af8c674b094cbf4eaf1d6db post_install() { vlicense COPYING.txt diff --git a/srcpkgs/freeipmi/template b/srcpkgs/freeipmi/template index adcd64037ce..c79faf11ffa 100644 --- a/srcpkgs/freeipmi/template +++ b/srcpkgs/freeipmi/template @@ -1,6 +1,6 @@ # Template file for 'freeipmi' pkgname=freeipmi -version=1.6.3 +version=1.6.4 revision=1 build_style=gnu-configure configure_args="--without-systemdsystemunitdir ac_cv_header_sys_stropts_h=no" @@ -12,7 +12,7 @@ license="GPL-3.0-or-later" # Changelog: http://www.gnu.org/software/freeipmi/NEWS homepage="http://www.gnu.org/software/freeipmi/" distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=aad4e735a7ac4a1f8ade20caadb35dfefc2a352fa2ef41d3f6e589179917e1e9 +checksum=65dfbb95a30438ba247f01a58498862a37d2e71c8c950bcfcee459d079241a3c conf_files="/etc/freeipmi/*.conf" make_dirs="/var/cache/ipmiseld 0755 root root" diff --git a/srcpkgs/fribidi/template b/srcpkgs/fribidi/template index e90ef057beb..1a05f24153c 100644 --- a/srcpkgs/fribidi/template +++ b/srcpkgs/fribidi/template @@ -1,16 +1,16 @@ # Template file for 'fribidi' pkgname=fribidi -version=1.0.5 +version=1.0.7 revision=1 build_style=gnu-configure configure_args="--disable-docs" hostmakedepends="automake libtool pkg-config" short_desc="Free Implementation of the Unicode Bidirectional Algorithm" -maintainer="maxice8 " +maintainer="Orphaned " license="LGPL-2.1-or-later" homepage="https://github.com/fribidi/fribidi/" distfiles="https://github.com/fribidi/fribidi/archive/v${version}.tar.gz" -checksum=aee3a93d081c293eaca9157700f17dc780a0b6674bc911decc5aaa43aec9abd7 +checksum=4352e95aa26bc0c4a45a224d606df0aba5f17f8cadcbcde36dd976e585a320e8 disable_parallel_build=yes pre_configure() { diff --git a/srcpkgs/frp/template b/srcpkgs/frp/template index ea9573a42a1..02289ab2483 100644 --- a/srcpkgs/frp/template +++ b/srcpkgs/frp/template @@ -1,6 +1,6 @@ # Template file for 'frp' pkgname=frp -version=0.28.0 +version=0.29.0 revision=1 build_style=go go_import_path=github.com/fatedier/frp @@ -10,7 +10,7 @@ maintainer="Anachron " license="Apache-2.0" homepage="https://github.com/fatedier/frp" distfiles="https://github.com/fatedier/frp/archive/v${version}.tar.gz" -checksum=61afbd0e84fc1ab92eacce5a642e2590d1b8c1a972a78f6499165c1778aa62cf +checksum=5d7980b81cfd055e3e5bb7a120098f94342656f647cb906ea075912f63568816 conf_files="/etc/frp/*.ini" diff --git a/srcpkgs/fselect/template b/srcpkgs/fselect/template index 6197dab708e..93775c99ce2 100644 --- a/srcpkgs/fselect/template +++ b/srcpkgs/fselect/template @@ -1,6 +1,6 @@ # Template file for 'fselect' pkgname=fselect -version=0.6.3 +version=0.6.5 revision=1 build_style=cargo short_desc="Find files with SQL-like queries" @@ -8,7 +8,7 @@ maintainer="SolitudeSF " license="Apache-2.0, MIT" homepage="https://github.com/jhspetersson/fselect" distfiles="${homepage}/archive/${version}.tar.gz" -checksum=cc0655057cc4a6ce771670ff72b52468adac27efc6bda1db08039a37866f2858 +checksum=6c50f0c7874045bee7721c8dcb687fa1ba2278f4eb86c4e638d4b1c8592129a3 post_install() { vlicense LICENSE-MIT diff --git a/srcpkgs/fuse-mp3fs/template b/srcpkgs/fuse-mp3fs/template new file mode 100644 index 00000000000..75b031ad9cf --- /dev/null +++ b/srcpkgs/fuse-mp3fs/template @@ -0,0 +1,14 @@ +# Template file for 'fuse-mp3fs' +pkgname=fuse-mp3fs +version=0.91 +revision=1 +wrksrc="mp3fs-${version}" +build_style=gnu-configure +hostmakedepends="pkg-config" +makedepends="fuse-devel libflac-devel libvorbis-devel libid3tag-devel lame-devel" +short_desc="FUSE client to transcode FLAC to MP3" +maintainer="Zach Dykstra " +license="GPL-3.0-or-later" +homepage="https://khenriks.github.io/mp3fs/" +distfiles="https://github.com/khenriks/mp3fs/releases/download/v${version}/mp3fs-${version}.tar.gz" +checksum=a47b5e351b7660e6f535a3c5b489c5a8191209957f8c0b8d066a5c221e8ecf92 diff --git a/srcpkgs/fuse-overlayfs/template b/srcpkgs/fuse-overlayfs/template index 9de2b442941..d90f41438a5 100644 --- a/srcpkgs/fuse-overlayfs/template +++ b/srcpkgs/fuse-overlayfs/template @@ -1,16 +1,16 @@ # Template file for 'fuse-overlayfs' pkgname=fuse-overlayfs -version=0.5.1 +version=0.6.4 revision=1 build_style=gnu-configure hostmakedepends="autoconf automake pkg-config" makedepends="fuse3-devel" short_desc="FUSE implementation for overlayfs" -maintainer="Cameron Nemo " +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=2f65877839a8b4a857197035f26c33f391d2af44fdfcc6c39e34050873071355 +checksum=e95590ce77cfff07779b977f4e8445cf82c9927391d21c41d1cc28326ad0133a pre_configure() { ./autogen.sh diff --git a/srcpkgs/fuse-zip/template b/srcpkgs/fuse-zip/template index 948133ad053..02f71f082f7 100644 --- a/srcpkgs/fuse-zip/template +++ b/srcpkgs/fuse-zip/template @@ -1,6 +1,6 @@ # Template file for 'fuse-zip' pkgname=fuse-zip -version=0.6.0 +version=0.7.0 revision=1 build_style=gnu-makefile make_build_args="all doc" @@ -12,7 +12,7 @@ maintainer="Matthias von Faber " license="GPL-3.0-or-later" homepage="https://bitbucket.org/agalanin/fuse-zip" distfiles="${homepage}/downloads/${pkgname}-${version}.tar.gz" -checksum=21985c78ab9787033cff7afe4d9a29252383fd28ce83eb0d9cc2b963a1c5d656 +checksum=47306bab2b8b0db8ca6fac01833ccfb4394ddae1943ab2e7020b1bdbb210410b pre_build() { vsed -i '/^CXXFLAGS=/d' Makefile lib/Makefile diff --git a/srcpkgs/fuse3/template b/srcpkgs/fuse3/template index d3bd632c203..87ca26bb94e 100644 --- a/srcpkgs/fuse3/template +++ b/srcpkgs/fuse3/template @@ -1,6 +1,6 @@ # Template file for 'fuse3' pkgname=fuse3 -version=3.6.2 +version=3.7.0 revision=1 wrksrc="fuse-${version}" build_style=meson @@ -12,7 +12,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://github.com/libfuse/libfuse" distfiles="https://github.com/libfuse/libfuse/releases/download/fuse-${version}/fuse-${version}.tar.xz" -checksum=f45869427575e1e59ab743a67deb57addbf2cb8f9ce431199dbd40ddab71f281 +checksum=3aea4766da5e2751aba82e8f77047d5d3c412bc3c298e4ec9532e59d7bd73a7a conf_files="/etc/fuse.conf" post_install() { diff --git a/srcpkgs/fvwm/template b/srcpkgs/fvwm/template index 5d84887898a..f5c988338a9 100644 --- a/srcpkgs/fvwm/template +++ b/srcpkgs/fvwm/template @@ -1,7 +1,7 @@ # Template file for 'fvwm' pkgname=fvwm -version=2.6.8 -revision=2 +version=2.6.9 +revision=1 build_style=gnu-configure hostmakedepends="libxslt pkg-config python" makedepends="fribidi-devel libXcursor-devel libXft-devel libXinerama-devel @@ -12,7 +12,7 @@ maintainer="Leah Neukirchen " license="GPL-2.0-or-later, MIT" homepage="http://fvwm.org/" distfiles="https://github.com/fvwmorg/fvwm/releases/download/${version}/fvwm-${version}.tar.gz" -checksum=fb36c9235d157411efb7383d09d7d4d25a90fe02d0b2b4f752ca4acc7e9bf341 +checksum=1bc64cf3ccd0073008758168327a8265b8059def9b239b451d6b9fab2cc391ae nocross=yes post_install() { diff --git a/srcpkgs/fwup/template b/srcpkgs/fwup/template index 72210e7bd4b..713aac43d0e 100644 --- a/srcpkgs/fwup/template +++ b/srcpkgs/fwup/template @@ -1,6 +1,6 @@ # Template file for 'fwup' pkgname=fwup -version=1.3.1 +version=1.3.2 revision=1 build_style=gnu-configure hostmakedepends="automake libtool pkg-config" @@ -9,10 +9,10 @@ checkdepends="mtools unzip zip dosfstools" short_desc="Configurable embedded Linux firmware update creator and runner" maintainer="Duncaen " license="Apache-2.0" -#changelog="https://github.com/fhunleth/fwup/raw/master/CHANGELOG.md" +changelog="https://github.com/fhunleth/fwup/raw/master/CHANGELOG.md" homepage="https://github.com/fhunleth/fwup" distfiles="https://github.com/fhunleth/fwup/archive/v${version}.tar.gz" -checksum=8bf62b9fa1f791394ca94bb973f0f52b2054c67d93a6c8f65e19e8545be5002f +checksum=897580814709aabe1575d47c8d7a264f01dd6e65a62fa13f42b24416d0944c2b if [ -z "$CROSS_BUILD" ]; then hostmakedepends+=" help2man" @@ -25,5 +25,5 @@ pre_configure() { pre_check() { # mtools.conf requires manual configuration for usage, but not for out tests # so we just remove the unrecognized keyword - sed -i '/SAMPLE FILE/d' /etc/mtools.conf + vsed -i '/SAMPLE FILE/d' /etc/mtools.conf } diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template index bb1e714de03..06a68a00754 100644 --- a/srcpkgs/fwupd/template +++ b/srcpkgs/fwupd/template @@ -1,6 +1,6 @@ # Template file for 'fwupd' pkgname=fwupd -version=1.2.10 +version=1.2.11 revision=1 build_style=meson build_helper="gir" @@ -18,11 +18,11 @@ makedepends="libxmlb-devel cairo-devel colord-devel libarchive-devel sqlite-devel libsoup-devel gcab-devel pango-devel python3-gobject python3-Pillow elogind-devel" short_desc="Daemon to allow session software to update firmware" -maintainer="maxice8 " +maintainer="Orphaned " license="LGPL-2.1-or-later" homepage="https://github.com/hughsie/fwupd" distfiles="https://github.com/hughsie/fwupd/archive/${version}.tar.gz" -checksum=d9cd36f633e98a1b40f6020fd5e066ed05bfb445be69b8357806b0dd6ae189db +checksum=8f9238053689aaa29e80328122012ddb3fb8a6432d19af24904b3db62ec167ca conf_files=" /etc/dbus-1/system.d/org.freedesktop.fwupd.conf diff --git a/srcpkgs/fwupdate/template b/srcpkgs/fwupdate/template index 231f714913f..e00c79225b9 100644 --- a/srcpkgs/fwupdate/template +++ b/srcpkgs/fwupdate/template @@ -10,7 +10,7 @@ hostmakedepends="pkg-config" makedepends="elfutils-devel gnu-efi-libs libefivar-devel popt-devel" checkdepends="libabigail-tools" short_desc="Tool for using the ESRT and UpdateCapsule() to apply firmware updates" -maintainer="maxice8 " +maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://github.com/rhboot/fwupdate" distfiles="https://github.com/rhboot/fwupdate/releases/download/${version}/fwupdate-${version}.tar.bz2" diff --git a/srcpkgs/g810-led/template b/srcpkgs/g810-led/template index d978c0c7665..9bb9b6a548e 100644 --- a/srcpkgs/g810-led/template +++ b/srcpkgs/g810-led/template @@ -1,6 +1,6 @@ # Template file for 'g810-led' pkgname=g810-led -version=0.3.5 +version=0.3.9 revision=1 build_style=gnu-makefile makedepends="hidapi-devel" @@ -9,7 +9,7 @@ maintainer="Alex Childs " license="GPL-3.0-only" homepage="https://github.com/MatMoul/g810-led/" distfiles="https://github.com/MatMoul/g810-led/archive/v${version}.tar.gz" -checksum=8a971be4b77111aa54b250a39b6fcead78188f46999b2aa9b8280c2506753e69 +checksum=e08c3f411711dbaa0659d7b9d1ec9ab7c93d2e5a23352161092a83c7c8628b89 do_install() { vbin bin/g810-led diff --git a/srcpkgs/gallery-dl/template b/srcpkgs/gallery-dl/template index 22d69108df2..a1e8c633fe3 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.10.1 +version=1.10.5 revision=1 archs=noarch build_style=python3-module @@ -13,4 +13,14 @@ 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=8b6da4cde53c15dbd2204b822c50f9828f6141cee167051075d719d7f4a8fad6 +checksum=0ed5935a5b40aad339f680c194bfe66be073a4c852b994606fb84bede86d5942 + +post_build() { + make man completion +} + +post_install() { + vmkdir usr/share/bash-completion/completions + mv ${DESTDIR}/usr/etc/bash_completion.d/gallery-dl.bash_completion \ + ${DESTDIR}/usr/share/bash-completion/completions/gallery-dl +} diff --git a/srcpkgs/gc/template b/srcpkgs/gc/template index 3ef3f1b7c74..f7ed0c10010 100644 --- a/srcpkgs/gc/template +++ b/srcpkgs/gc/template @@ -7,7 +7,7 @@ configure_args="--enable-static --enable-mmap" hostmakedepends="pkg-config" makedepends="libatomic_ops-devel" short_desc="Garbage collector for C and C++" -maintainer="maxice8 " +maintainer="Orphaned " license="GPL-2.0-or-later" homepage="http://www.hboehm.info/gc/" distfiles="https://github.com/ivmai/bdwgc/releases/download/v${version}/gc-${version}.tar.gz" diff --git a/srcpkgs/gcc/files/gccgo-musl.patch b/srcpkgs/gcc/files/gccgo-musl.patch new file mode 100644 index 00000000000..cc3ed7d17ae --- /dev/null +++ b/srcpkgs/gcc/files/gccgo-musl.patch @@ -0,0 +1,200 @@ +This is not among the normal patches as these changes are musl specific and +there is no way to easily conditionalize it in source for some of the changes. + +Souurce: Adélie Linux, q66 +URL: https://code.foxkit.us/adelie/packages/tree/master/system/gcc + +--- Makefile.in ++++ Makefile.in +@@ -46325,7 +46325,7 @@ configure-target-libgo: + esac; \ + module_srcdir=libgo; \ + rm -f no-such-file || : ; \ +- CONFIG_SITE=no-such-file $(SHELL) \ ++ CONFIG_SITE=no-such-file LIBS="-lucontext $$LIBS" $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ +--- libgo/mksysinfo.sh ++++ libgo/mksysinfo.sh +@@ -379,11 +379,7 @@ fi + # Some basic types. + echo 'type Size_t _size_t' >> ${OUT} + echo "type Ssize_t _ssize_t" >> ${OUT} +-if grep '^const _HAVE_OFF64_T = ' gen-sysinfo.go > /dev/null 2>&1; then +- echo "type Offset_t _off64_t" >> ${OUT} +-else +- echo "type Offset_t _off_t" >> ${OUT} +-fi ++echo "type Offset_t _off_t" >> ${OUT} + echo "type Mode_t _mode_t" >> ${OUT} + echo "type Pid_t _pid_t" >> ${OUT} + echo "type Uid_t _uid_t" >> ${OUT} +--- libgo/go/runtime/mem_gccgo.go ++++ libgo/go/runtime/mem_gccgo.go +@@ -16,7 +16,7 @@ import ( + //go:linkname sysFree runtime.sysFree + + //extern mmap +-func sysMmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off uintptr) unsafe.Pointer ++func sysMmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off int64) unsafe.Pointer + + //extern munmap + func munmap(addr unsafe.Pointer, length uintptr) int32 +@@ -38,7 +38,7 @@ func init() { + } + } + +-func mmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off uintptr) (unsafe.Pointer, int) { ++func mmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off int64) (unsafe.Pointer, int) { + p := sysMmap(addr, n, prot, flags, fd, off) + if uintptr(p) == _MAP_FAILED { + return nil, errno() +--- libgo/go/runtime/signal_gccgo.go ++++ libgo/go/runtime/signal_gccgo.go +@@ -111,7 +111,7 @@ func getsig(i uint32) uintptr { + if sigaction(i, nil, &sa) < 0 { + // On GNU/Linux glibc rejects attempts to call + // sigaction with signal 32 (SIGCANCEL) or 33 (SIGSETXID). +- if GOOS == "linux" && (i == 32 || i == 33) { ++ if GOOS == "linux" && (i == 32 || i == 33 || i == 34) { + return _SIG_DFL + } + throw("sigaction read failure") +--- libgo/go/syscall/errstr.go ++++ libgo/go/syscall/errstr.go +@@ -5,7 +5,6 @@ + // license that can be found in the LICENSE file. + + // +build !hurd +-// +build !linux + + package syscall + +--- libgo/go/syscall/errstr_glibc.go ++++ /dev/null +@@ -1,33 +0,0 @@ +-// errstr_glibc.go -- GNU/Linux and GNU/Hurd specific error strings. +- +-// Copyright 2010 The Go Authors. All rights reserved. +-// Use of this source code is governed by a BSD-style +-// license that can be found in the LICENSE file. +- +-// We use this rather than errstr.go because on GNU/Linux sterror_r +-// returns a pointer to the error message, and may not use buf at all. +- +-// +build hurd linux +- +-package syscall +- +-import "unsafe" +- +-//sysnb strerror_r(errnum int, b []byte) (errstr *byte) +-//strerror_r(errnum _C_int, b *byte, len Size_t) *byte +- +-func Errstr(errnum int) string { +- a := make([]byte, 128) +- p := strerror_r(errnum, a) +- b := (*[1000]byte)(unsafe.Pointer(p)) +- i := 0 +- for b[i] != 0 { +- i++ +- } +- // Lowercase first letter: Bad -> bad, but STREAM -> STREAM. +- if i > 1 && 'A' <= b[0] && b[0] <= 'Z' && 'a' <= b[1] && b[1] <= 'z' { +- c := b[0] + 'a' - 'A' +- return string(c) + string(b[1:i]) +- } +- return string(b[:i]) +-} +--- libgo/go/syscall/libcall_linux.go ++++ libgo/go/syscall/libcall_linux.go +@@ -206,19 +206,19 @@ func Gettid() (tid int) { + //sys Setxattr(path string, attr string, data []byte, flags int) (err error) + //setxattr(path *byte, name *byte, value *byte, size Size_t, flags _C_int) _C_int + +-//sys splice(rfd int, roff *_loff_t, wfd int, woff *_loff_t, len int, flags int) (n int64, err error) +-//splice(rfd _C_int, roff *_loff_t, wfd _C_int, woff *_loff_t, len Size_t, flags _C_uint) Ssize_t ++//sys splice(rfd int, roff *_off_t, wfd int, woff *_off_t, len int, flags int) (n int64, err error) ++//splice(rfd _C_int, roff *_off_t, wfd _C_int, woff *_off_t, len Size_t, flags _C_uint) Ssize_t + func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error) { +- var lroff _loff_t +- var plroff *_loff_t ++ var lroff _off_t ++ var plroff *_off_t + if roff != nil { +- lroff = _loff_t(*roff) ++ lroff = _off_t(*roff) + plroff = &lroff + } +- var lwoff _loff_t +- var plwoff *_loff_t ++ var lwoff _off_t ++ var plwoff *_off_t + if woff != nil { +- lwoff = _loff_t(*woff) ++ lwoff = _off_t(*woff) + plwoff = &lwoff + } + n, err = splice(rfd, plroff, wfd, plwoff, len, flags) +--- libgo/mksigtab.sh ++++ libgo/mksigtab.sh +@@ -82,7 +82,7 @@ checksig _SIGPWR '{_SigNotify, "SIGPWR: power failure restart"}' + checksig _SIGEMT '{_SigThrow, "SIGEMT: emulate instruction executed"}' + checksig _SIGINFO '{_SigNotify, "SIGINFO: status request from keyboard"}' + checksig _SIGTHR '{_SigNotify, "SIGTHR: reserved"}' +-checksig _SIGPOLL '{_SigNotify, "SIGPOLL: pollable event occurred"}' ++#checksig _SIGPOLL '{_SigNotify, "SIGPOLL: pollable event occurred"}' + checksig _SIGWAITING '{_SigNotify, "SIGWAITING: reserved signal no longer used by"}' + checksig _SIGLWP '{_SigNotify, "SIGLWP: reserved signal no longer used by"}' + checksig _SIGFREEZE '{_SigNotify, "SIGFREEZE: special signal used by CPR"}' +@@ -95,10 +95,12 @@ checksig _SIGLOST ' {_SigNotify, "SIGLOST: resource lost (Sun); server died (G + + # Special handling of signals 32 and 33 on GNU/Linux systems, + # because they are special to glibc. ++# Signal 34 is additionally special to Linux systems with musl. + if test "${GOOS}" = "linux"; then +- SIGLIST=$SIGLIST"_32__33_" ++ SIGLIST=$SIGLIST"_32__33__34_" + echo ' 32: {_SigSetStack + _SigUnblock, "signal 32"}, /* SIGCANCEL; see issue 6997 */' + echo ' 33: {_SigSetStack + _SigUnblock, "signal 33"}, /* SIGSETXID; see issues 3871, 9400, 12498 */' ++ echo ' 34: {_SigSetStack + _SigUnblock, "signal 34"}, /* see issue 30062 */' + fi + + if test "${GOOS}" = "aix"; then +--- libgo/runtime/go-signal.c ++++ libgo/runtime/go-signal.c +@@ -222,7 +222,11 @@ getSiginfo(siginfo_t *info, void *context __attribute__((unused))) + #endif + #ifdef __PPC__ + #ifdef __linux__ +- ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.regs->nip; ++ #ifdef __PPC64__ ++ ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.gp_regs[32]; ++ #else ++ ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.gregs[32]; ++ #endif + #endif + #ifdef _AIX + ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.jmp_context.iar; +@@ -343,7 +343,7 @@ dumpregs(siginfo_t *info __attribute__((unused)), void *context __attribute__((u + #endif + #endif + +-#if defined(__PPC__) && defined(__LITTLE_ENDIAN__) ++#if defined(__PPC__) && defined(__LITTLE_ENDIAN__) && defined(__GLIBC__) + #ifdef __linux__ + { + mcontext_t *m = &((ucontext_t*)(context))->uc_mcontext; +--- libgo/sysinfo.c ++++ libgo/sysinfo.c +@@ -73,9 +73,6 @@ + #include + #include + #include +-#if defined(HAVE_SYS_USER_H) +-#include +-#endif + #if defined(HAVE_SYS_UTSNAME_H) + #include + #endif diff --git a/srcpkgs/gcc/patches/bug90756.patch b/srcpkgs/gcc/patches/bug90756.patch deleted file mode 100644 index cf78dad9cce..00000000000 --- a/srcpkgs/gcc/patches/bug90756.patch +++ /dev/null @@ -1,23 +0,0 @@ -Bug 90756 - [7/8/9 Regression] g++ ICE in convert_move, at expr.c:218 on i686 and s390x -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90756 - ---- gcc/explow.c 2019/07/04 02:39:58 273035 -+++ gcc/explow.c 2019/07/04 04:49:22 273036 -@@ -892,16 +892,7 @@ - - tree type = TREE_TYPE (name); - int unsignedp = TYPE_UNSIGNED (type); -- machine_mode mode = TYPE_MODE (type); -- -- /* Bypass TYPE_MODE when it maps vector modes to BLKmode. */ -- if (mode == BLKmode) -- { -- gcc_assert (VECTOR_TYPE_P (type)); -- mode = type->type_common.mode; -- } -- -- machine_mode pmode = promote_mode (type, mode, &unsignedp); -+ machine_mode pmode = promote_mode (type, TYPE_MODE (type), &unsignedp); - if (punsignedp) - *punsignedp = unsignedp; - diff --git a/srcpkgs/gcc/patches/darn.patch b/srcpkgs/gcc/patches/darn.patch new file mode 100644 index 00000000000..97f7de3f438 --- /dev/null +++ b/srcpkgs/gcc/patches/darn.patch @@ -0,0 +1,504 @@ +Upstream: yes +Reference: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91481 + +https://gcc.gnu.org/viewcvs/gcc?view=revision&revision=275170 +https://gcc.gnu.org/viewcvs/gcc?view=revision&revision=275181 + +Fixes a security issue with the hardware random number generator +when compiling for POWER9. Since Void compiles for POWER8 by +default, it's not affected, but people building custom binaries +might be. + +--- gcc/config/rs6000/altivec.md ++++ gcc/config/rs6000/altivec.md +@@ -80,9 +80,6 @@ + UNSPEC_VUPKHPX + UNSPEC_VUPKLPX + UNSPEC_CONVERT_4F32_8I16 +- UNSPEC_DARN +- UNSPEC_DARN_32 +- UNSPEC_DARN_RAW + UNSPEC_DST + UNSPEC_DSTT + UNSPEC_DSTST +@@ -161,9 +158,6 @@ + UNSPEC_BCDADD + UNSPEC_BCDSUB + UNSPEC_BCD_OVERFLOW +- UNSPEC_CMPRB +- UNSPEC_CMPRB2 +- UNSPEC_CMPEQB + UNSPEC_VRLMI + UNSPEC_VRLNM + ]) +@@ -4101,223 +4095,6 @@ + "bcd. %0,%1,%2,%3" + [(set_attr "type" "vecsimple")]) + +-(define_insn "darn_32" +- [(set (match_operand:SI 0 "register_operand" "=r") +- (unspec:SI [(const_int 0)] UNSPEC_DARN_32))] +- "TARGET_P9_MISC" +- "darn %0,0" +- [(set_attr "type" "integer")]) +- +-(define_insn "darn_raw" +- [(set (match_operand:DI 0 "register_operand" "=r") +- (unspec:DI [(const_int 0)] UNSPEC_DARN_RAW))] +- "TARGET_P9_MISC && TARGET_64BIT" +- "darn %0,2" +- [(set_attr "type" "integer")]) +- +-(define_insn "darn" +- [(set (match_operand:DI 0 "register_operand" "=r") +- (unspec:DI [(const_int 0)] UNSPEC_DARN))] +- "TARGET_P9_MISC && TARGET_64BIT" +- "darn %0,1" +- [(set_attr "type" "integer")]) +- +-;; Test byte within range. +-;; +-;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx +-;; represents a byte whose value is ignored in this context and +-;; vv, the least significant byte, holds the byte value that is to +-;; be tested for membership within the range specified by operand 2. +-;; The bytes of operand 2 are organized as xx:xx:hi:lo. +-;; +-;; Return in target register operand 0 a value of 1 if lo <= vv and +-;; vv <= hi. Otherwise, set register operand 0 to 0. +-;; +-;; Though the instructions to which this expansion maps operate on +-;; 64-bit registers, the current implementation only operates on +-;; SI-mode operands as the high-order bits provide no information +-;; that is not already available in the low-order bits. To avoid the +-;; costs of data widening operations, future enhancements might allow +-;; DI mode for operand 0 and/or might allow operand 1 to be QI mode. +-(define_expand "cmprb" +- [(set (match_dup 3) +- (unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r") +- (match_operand:SI 2 "gpc_reg_operand" "r")] +- UNSPEC_CMPRB)) +- (set (match_operand:SI 0 "gpc_reg_operand" "=r") +- (if_then_else:SI (lt (match_dup 3) +- (const_int 0)) +- (const_int -1) +- (if_then_else (gt (match_dup 3) +- (const_int 0)) +- (const_int 1) +- (const_int 0))))] +- "TARGET_P9_MISC" +-{ +- operands[3] = gen_reg_rtx (CCmode); +-}) +- +-;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx +-;; represents a byte whose value is ignored in this context and +-;; vv, the least significant byte, holds the byte value that is to +-;; be tested for membership within the range specified by operand 2. +-;; The bytes of operand 2 are organized as xx:xx:hi:lo. +-;; +-;; Set bit 1 (the GT bit, 0x4) of CR register operand 0 to 1 if +-;; lo <= vv and vv <= hi. Otherwise, set the GT bit to 0. The other +-;; 3 bits of the target CR register are all set to 0. +-(define_insn "*cmprb_internal" +- [(set (match_operand:CC 0 "cc_reg_operand" "=y") +- (unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r") +- (match_operand:SI 2 "gpc_reg_operand" "r")] +- UNSPEC_CMPRB))] +- "TARGET_P9_MISC" +- "cmprb %0,0,%1,%2" +- [(set_attr "type" "logical")]) +- +-;; Set operand 0 register to -1 if the LT bit (0x8) of condition +-;; register operand 1 is on. Otherwise, set operand 0 register to 1 +-;; if the GT bit (0x4) of condition register operand 1 is on. +-;; Otherwise, set operand 0 to 0. Note that the result stored into +-;; register operand 0 is non-zero iff either the LT or GT bits are on +-;; within condition register operand 1. +-(define_insn "setb_signed" +- [(set (match_operand:SI 0 "gpc_reg_operand" "=r") +- (if_then_else:SI (lt (match_operand:CC 1 "cc_reg_operand" "y") +- (const_int 0)) +- (const_int -1) +- (if_then_else (gt (match_dup 1) +- (const_int 0)) +- (const_int 1) +- (const_int 0))))] +- "TARGET_P9_MISC" +- "setb %0,%1" +- [(set_attr "type" "logical")]) +- +-(define_insn "setb_unsigned" +- [(set (match_operand:SI 0 "gpc_reg_operand" "=r") +- (if_then_else:SI (ltu (match_operand:CCUNS 1 "cc_reg_operand" "y") +- (const_int 0)) +- (const_int -1) +- (if_then_else (gtu (match_dup 1) +- (const_int 0)) +- (const_int 1) +- (const_int 0))))] +- "TARGET_P9_MISC" +- "setb %0,%1" +- [(set_attr "type" "logical")]) +- +-;; Test byte within two ranges. +-;; +-;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx +-;; represents a byte whose value is ignored in this context and +-;; vv, the least significant byte, holds the byte value that is to +-;; be tested for membership within the range specified by operand 2. +-;; The bytes of operand 2 are organized as hi_1:lo_1:hi_2:lo_2. +-;; +-;; Return in target register operand 0 a value of 1 if (lo_1 <= vv and +-;; vv <= hi_1) or if (lo_2 <= vv and vv <= hi_2). Otherwise, set register +-;; operand 0 to 0. +-;; +-;; Though the instructions to which this expansion maps operate on +-;; 64-bit registers, the current implementation only operates on +-;; SI-mode operands as the high-order bits provide no information +-;; that is not already available in the low-order bits. To avoid the +-;; costs of data widening operations, future enhancements might allow +-;; DI mode for operand 0 and/or might allow operand 1 to be QI mode. +-(define_expand "cmprb2" +- [(set (match_dup 3) +- (unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r") +- (match_operand:SI 2 "gpc_reg_operand" "r")] +- UNSPEC_CMPRB2)) +- (set (match_operand:SI 0 "gpc_reg_operand" "=r") +- (if_then_else:SI (lt (match_dup 3) +- (const_int 0)) +- (const_int -1) +- (if_then_else (gt (match_dup 3) +- (const_int 0)) +- (const_int 1) +- (const_int 0))))] +- "TARGET_P9_MISC" +-{ +- operands[3] = gen_reg_rtx (CCmode); +-}) +- +-;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx +-;; represents a byte whose value is ignored in this context and +-;; vv, the least significant byte, holds the byte value that is to +-;; be tested for membership within the ranges specified by operand 2. +-;; The bytes of operand 2 are organized as hi_1:lo_1:hi_2:lo_2. +-;; +-;; Set bit 1 (the GT bit, 0x4) of CR register operand 0 to 1 if +-;; (lo_1 <= vv and vv <= hi_1) or if (lo_2 <= vv and vv <= hi_2). +-;; Otherwise, set the GT bit to 0. The other 3 bits of the target +-;; CR register are all set to 0. +-(define_insn "*cmprb2_internal" +- [(set (match_operand:CC 0 "cc_reg_operand" "=y") +- (unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r") +- (match_operand:SI 2 "gpc_reg_operand" "r")] +- UNSPEC_CMPRB2))] +- "TARGET_P9_MISC" +- "cmprb %0,1,%1,%2" +- [(set_attr "type" "logical")]) +- +-;; Test byte membership within set of 8 bytes. +-;; +-;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx +-;; represents a byte whose value is ignored in this context and +-;; vv, the least significant byte, holds the byte value that is to +-;; be tested for membership within the set specified by operand 2. +-;; The bytes of operand 2 are organized as e0:e1:e2:e3:e4:e5:e6:e7. +-;; +-;; Return in target register operand 0 a value of 1 if vv equals one +-;; of the values e0, e1, e2, e3, e4, e5, e6, or e7. Otherwise, set +-;; register operand 0 to 0. Note that the 8 byte values held within +-;; operand 2 need not be unique. +-;; +-;; Though the instructions to which this expansion maps operate on +-;; 64-bit registers, the current implementation requires that operands +-;; 0 and 1 have mode SI as the high-order bits provide no information +-;; that is not already available in the low-order bits. To avoid the +-;; costs of data widening operations, future enhancements might allow +-;; DI mode for operand 0 and/or might allow operand 1 to be QI mode. +-(define_expand "cmpeqb" +- [(set (match_dup 3) +- (unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r") +- (match_operand:DI 2 "gpc_reg_operand" "r")] +- UNSPEC_CMPEQB)) +- (set (match_operand:SI 0 "gpc_reg_operand" "=r") +- (if_then_else:SI (lt (match_dup 3) +- (const_int 0)) +- (const_int -1) +- (if_then_else (gt (match_dup 3) +- (const_int 0)) +- (const_int 1) +- (const_int 0))))] +- "TARGET_P9_MISC && TARGET_64BIT" +-{ +- operands[3] = gen_reg_rtx (CCmode); +-}) +- +-;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx +-;; represents a byte whose value is ignored in this context and +-;; vv, the least significant byte, holds the byte value that is to +-;; be tested for membership within the set specified by operand 2. +-;; The bytes of operand 2 are organized as e0:e1:e2:e3:e4:e5:e6:e7. +-;; +-;; Set bit 1 (the GT bit, 0x4) of CR register operand 0 to 1 if vv +-;; equals one of the values e0, e1, e2, e3, e4, e5, e6, or e7. Otherwise, +-;; set the GT bit to zero. The other 3 bits of the target CR register +-;; are all set to 0. +-(define_insn "*cmpeqb_internal" +- [(set (match_operand:CC 0 "cc_reg_operand" "=y") +- (unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r") +- (match_operand:DI 2 "gpc_reg_operand" "r")] +- UNSPEC_CMPEQB))] +- "TARGET_P9_MISC && TARGET_64BIT" +- "cmpeqb %0,%1,%2" +- [(set_attr "type" "logical")]) +- + (define_expand "bcd_" + [(parallel [(set (reg:CCFP CR6_REGNO) + (compare:CCFP +--- gcc/config/rs6000/rs6000.md ++++ gcc/config/rs6000/rs6000.md +@@ -137,6 +137,9 @@ + UNSPEC_LSQ + UNSPEC_FUSION_GPR + UNSPEC_STACK_CHECK ++ UNSPEC_CMPRB ++ UNSPEC_CMPRB2 ++ UNSPEC_CMPEQB + UNSPEC_ADD_ROUND_TO_ODD + UNSPEC_SUB_ROUND_TO_ODD + UNSPEC_MUL_ROUND_TO_ODD +@@ -164,6 +167,9 @@ + UNSPECV_EH_RR ; eh_reg_restore + UNSPECV_ISYNC ; isync instruction + UNSPECV_MFTB ; move from time base ++ UNSPECV_DARN ; darn 1 (deliver a random number) ++ UNSPECV_DARN_32 ; darn 2 ++ UNSPECV_DARN_RAW ; darn 0 + UNSPECV_NLGR ; non-local goto receiver + UNSPECV_MFFS ; Move from FPSCR + UNSPECV_MFFSL ; Move from FPSCR light instruction version +@@ -13853,6 +13859,224 @@ + [(set_attr "type" "vecmove") + (set_attr "size" "128")]) + ++;; Miscellaneous ISA 3.0 (power9) instructions ++ ++(define_insn "darn_32" ++ [(set (match_operand:SI 0 "register_operand" "=r") ++ (unspec_volatile:SI [(const_int 0)] UNSPECV_DARN_32))] ++ "TARGET_P9_MISC" ++ "darn %0,0" ++ [(set_attr "type" "integer")]) ++ ++(define_insn "darn_raw" ++ [(set (match_operand:DI 0 "register_operand" "=r") ++ (unspec_volatile:DI [(const_int 0)] UNSPECV_DARN_RAW))] ++ "TARGET_P9_MISC && TARGET_64BIT" ++ "darn %0,2" ++ [(set_attr "type" "integer")]) ++ ++(define_insn "darn" ++ [(set (match_operand:DI 0 "register_operand" "=r") ++ (unspec_volatile:DI [(const_int 0)] UNSPECV_DARN))] ++ "TARGET_P9_MISC && TARGET_64BIT" ++ "darn %0,1" ++ [(set_attr "type" "integer")]) ++ ++;; Test byte within range. ++;; ++;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx ++;; represents a byte whose value is ignored in this context and ++;; vv, the least significant byte, holds the byte value that is to ++;; be tested for membership within the range specified by operand 2. ++;; The bytes of operand 2 are organized as xx:xx:hi:lo. ++;; ++;; Return in target register operand 0 a value of 1 if lo <= vv and ++;; vv <= hi. Otherwise, set register operand 0 to 0. ++;; ++;; Though the instructions to which this expansion maps operate on ++;; 64-bit registers, the current implementation only operates on ++;; SI-mode operands as the high-order bits provide no information ++;; that is not already available in the low-order bits. To avoid the ++;; costs of data widening operations, future enhancements might allow ++;; DI mode for operand 0 and/or might allow operand 1 to be QI mode. ++(define_expand "cmprb" ++ [(set (match_dup 3) ++ (unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r") ++ (match_operand:SI 2 "gpc_reg_operand" "r")] ++ UNSPEC_CMPRB)) ++ (set (match_operand:SI 0 "gpc_reg_operand" "=r") ++ (if_then_else:SI (lt (match_dup 3) ++ (const_int 0)) ++ (const_int -1) ++ (if_then_else (gt (match_dup 3) ++ (const_int 0)) ++ (const_int 1) ++ (const_int 0))))] ++ "TARGET_P9_MISC" ++{ ++ operands[3] = gen_reg_rtx (CCmode); ++}) ++ ++;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx ++;; represents a byte whose value is ignored in this context and ++;; vv, the least significant byte, holds the byte value that is to ++;; be tested for membership within the range specified by operand 2. ++;; The bytes of operand 2 are organized as xx:xx:hi:lo. ++;; ++;; Set bit 1 (the GT bit, 0x4) of CR register operand 0 to 1 if ++;; lo <= vv and vv <= hi. Otherwise, set the GT bit to 0. The other ++;; 3 bits of the target CR register are all set to 0. ++(define_insn "*cmprb_internal" ++ [(set (match_operand:CC 0 "cc_reg_operand" "=y") ++ (unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r") ++ (match_operand:SI 2 "gpc_reg_operand" "r")] ++ UNSPEC_CMPRB))] ++ "TARGET_P9_MISC" ++ "cmprb %0,0,%1,%2" ++ [(set_attr "type" "logical")]) ++ ++;; Set operand 0 register to -1 if the LT bit (0x8) of condition ++;; register operand 1 is on. Otherwise, set operand 0 register to 1 ++;; if the GT bit (0x4) of condition register operand 1 is on. ++;; Otherwise, set operand 0 to 0. Note that the result stored into ++;; register operand 0 is non-zero iff either the LT or GT bits are on ++;; within condition register operand 1. ++(define_insn "setb_signed" ++ [(set (match_operand:SI 0 "gpc_reg_operand" "=r") ++ (if_then_else:SI (lt (match_operand:CC 1 "cc_reg_operand" "y") ++ (const_int 0)) ++ (const_int -1) ++ (if_then_else (gt (match_dup 1) ++ (const_int 0)) ++ (const_int 1) ++ (const_int 0))))] ++ "TARGET_P9_MISC" ++ "setb %0,%1" ++ [(set_attr "type" "logical")]) ++ ++(define_insn "setb_unsigned" ++ [(set (match_operand:SI 0 "gpc_reg_operand" "=r") ++ (if_then_else:SI (ltu (match_operand:CCUNS 1 "cc_reg_operand" "y") ++ (const_int 0)) ++ (const_int -1) ++ (if_then_else (gtu (match_dup 1) ++ (const_int 0)) ++ (const_int 1) ++ (const_int 0))))] ++ "TARGET_P9_MISC" ++ "setb %0,%1" ++ [(set_attr "type" "logical")]) ++ ++;; Test byte within two ranges. ++;; ++;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx ++;; represents a byte whose value is ignored in this context and ++;; vv, the least significant byte, holds the byte value that is to ++;; be tested for membership within the range specified by operand 2. ++;; The bytes of operand 2 are organized as hi_1:lo_1:hi_2:lo_2. ++;; ++;; Return in target register operand 0 a value of 1 if (lo_1 <= vv and ++;; vv <= hi_1) or if (lo_2 <= vv and vv <= hi_2). Otherwise, set register ++;; operand 0 to 0. ++;; ++;; Though the instructions to which this expansion maps operate on ++;; 64-bit registers, the current implementation only operates on ++;; SI-mode operands as the high-order bits provide no information ++;; that is not already available in the low-order bits. To avoid the ++;; costs of data widening operations, future enhancements might allow ++;; DI mode for operand 0 and/or might allow operand 1 to be QI mode. ++(define_expand "cmprb2" ++ [(set (match_dup 3) ++ (unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r") ++ (match_operand:SI 2 "gpc_reg_operand" "r")] ++ UNSPEC_CMPRB2)) ++ (set (match_operand:SI 0 "gpc_reg_operand" "=r") ++ (if_then_else:SI (lt (match_dup 3) ++ (const_int 0)) ++ (const_int -1) ++ (if_then_else (gt (match_dup 3) ++ (const_int 0)) ++ (const_int 1) ++ (const_int 0))))] ++ "TARGET_P9_MISC" ++{ ++ operands[3] = gen_reg_rtx (CCmode); ++}) ++ ++;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx ++;; represents a byte whose value is ignored in this context and ++;; vv, the least significant byte, holds the byte value that is to ++;; be tested for membership within the ranges specified by operand 2. ++;; The bytes of operand 2 are organized as hi_1:lo_1:hi_2:lo_2. ++;; ++;; Set bit 1 (the GT bit, 0x4) of CR register operand 0 to 1 if ++;; (lo_1 <= vv and vv <= hi_1) or if (lo_2 <= vv and vv <= hi_2). ++;; Otherwise, set the GT bit to 0. The other 3 bits of the target ++;; CR register are all set to 0. ++(define_insn "*cmprb2_internal" ++ [(set (match_operand:CC 0 "cc_reg_operand" "=y") ++ (unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r") ++ (match_operand:SI 2 "gpc_reg_operand" "r")] ++ UNSPEC_CMPRB2))] ++ "TARGET_P9_MISC" ++ "cmprb %0,1,%1,%2" ++ [(set_attr "type" "logical")]) ++ ++;; Test byte membership within set of 8 bytes. ++;; ++;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx ++;; represents a byte whose value is ignored in this context and ++;; vv, the least significant byte, holds the byte value that is to ++;; be tested for membership within the set specified by operand 2. ++;; The bytes of operand 2 are organized as e0:e1:e2:e3:e4:e5:e6:e7. ++;; ++;; Return in target register operand 0 a value of 1 if vv equals one ++;; of the values e0, e1, e2, e3, e4, e5, e6, or e7. Otherwise, set ++;; register operand 0 to 0. Note that the 8 byte values held within ++;; operand 2 need not be unique. ++;; ++;; Though the instructions to which this expansion maps operate on ++;; 64-bit registers, the current implementation requires that operands ++;; 0 and 1 have mode SI as the high-order bits provide no information ++;; that is not already available in the low-order bits. To avoid the ++;; costs of data widening operations, future enhancements might allow ++;; DI mode for operand 0 and/or might allow operand 1 to be QI mode. ++(define_expand "cmpeqb" ++ [(set (match_dup 3) ++ (unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r") ++ (match_operand:DI 2 "gpc_reg_operand" "r")] ++ UNSPEC_CMPEQB)) ++ (set (match_operand:SI 0 "gpc_reg_operand" "=r") ++ (if_then_else:SI (lt (match_dup 3) ++ (const_int 0)) ++ (const_int -1) ++ (if_then_else (gt (match_dup 3) ++ (const_int 0)) ++ (const_int 1) ++ (const_int 0))))] ++ "TARGET_P9_MISC && TARGET_64BIT" ++{ ++ operands[3] = gen_reg_rtx (CCmode); ++}) ++ ++;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx ++;; represents a byte whose value is ignored in this context and ++;; vv, the least significant byte, holds the byte value that is to ++;; be tested for membership within the set specified by operand 2. ++;; The bytes of operand 2 are organized as e0:e1:e2:e3:e4:e5:e6:e7. ++;; ++;; Set bit 1 (the GT bit, 0x4) of CR register operand 0 to 1 if vv ++;; equals one of the values e0, e1, e2, e3, e4, e5, e6, or e7. Otherwise, ++;; set the GT bit to zero. The other 3 bits of the target CR register ++;; are all set to 0. ++(define_insn "*cmpeqb_internal" ++ [(set (match_operand:CC 0 "cc_reg_operand" "=y") ++ (unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r") ++ (match_operand:DI 2 "gpc_reg_operand" "r")] ++ UNSPEC_CMPEQB))] ++ "TARGET_P9_MISC && TARGET_64BIT" ++ "cmpeqb %0,%1,%2" ++ [(set_attr "type" "logical")]) + + (define_insn "*nabs2_hw" + [(set (match_operand:IEEE128 0 "altivec_register_operand" "=v") diff --git a/srcpkgs/gcc/patches/libffi_gnulinux.patch b/srcpkgs/gcc/patches/libffi_gnulinux.patch new file mode 100644 index 00000000000..413b4aef5af --- /dev/null +++ b/srcpkgs/gcc/patches/libffi_gnulinux.patch @@ -0,0 +1,11 @@ +--- libffi/src/closures.c.orig ++++ libffi/src/closures.c +@@ -34,7 +34,7 @@ + #include + + #if !FFI_MMAP_EXEC_WRIT && !FFI_EXEC_TRAMPOLINE_TABLE +-# if __gnu_linux__ && !defined(__ANDROID__) ++# if __linux__ && !defined(__ANDROID__) + /* This macro indicates it may be forbidden to map anonymous memory + with both write and execute permission. Code compiled when this + option is defined will attempt to map such pages once, but if it diff --git a/srcpkgs/gcc/patches/non-nullness.patch b/srcpkgs/gcc/patches/non-nullness.patch deleted file mode 100644 index 7e0e4425ce4..00000000000 --- a/srcpkgs/gcc/patches/non-nullness.patch +++ /dev/null @@ -1,88 +0,0 @@ -Source: 2019-06-21 Jeff Law -Upstream: yes -Reason: PR tree-optimization/90949 -* tree-ssa-copy.c (fini_copy_prop): Use reset_flow_sensitive_info. -* tree-ssanames.c (reset_flow_sensitive_info): Reset non-null state. - ---- gcc/tree-ssa-copy.c 2019-01-01 13:31:55.000000000 +0100 -+++ gcc/tree-ssa-copy.c 2019-06-26 18:50:01.030395471 +0200 -@@ -545,13 +545,12 @@ - duplicate_ssa_name_ptr_info (copy_of[i].value, - SSA_NAME_PTR_INFO (var)); - /* Points-to information is cfg insensitive, -- but alignment info might be cfg sensitive, if it -- e.g. is derived from VRP derived non-zero bits. -- So, do not copy alignment info if the two SSA_NAMEs -- aren't defined in the same basic block. */ -+ but [E]VRP might record context sensitive alignment -+ info, non-nullness, etc. So reset context sensitive -+ info if the two SSA_NAMEs aren't defined in the same -+ basic block. */ - if (var_bb != copy_of_bb) -- mark_ptr_info_alignment_unknown -- (SSA_NAME_PTR_INFO (copy_of[i].value)); -+ reset_flow_sensitive_info (copy_of[i].value); - } - else if (!POINTER_TYPE_P (TREE_TYPE (var)) - && SSA_NAME_RANGE_INFO (var) ---- gcc/tree-ssanames.c 2019-03-18 14:59:11.000000000 +0100 -+++ gcc/tree-ssanames.c 2019-06-26 18:50:11.282394906 +0200 -@@ -820,7 +820,12 @@ - { - /* points-to info is not flow-sensitive. */ - if (SSA_NAME_PTR_INFO (name)) -- mark_ptr_info_alignment_unknown (SSA_NAME_PTR_INFO (name)); -+ { -+ /* [E]VRP can derive context sensitive alignment info and -+ non-nullness properties. We must reset both. */ -+ mark_ptr_info_alignment_unknown (SSA_NAME_PTR_INFO (name)); -+ SSA_NAME_PTR_INFO (name)->pt.null = 1; -+ } - } - else - SSA_NAME_RANGE_INFO (name) = NULL; ---- /dev/null -+++ gcc/testsuite/gcc.c-torture/pr90949.c 2019-06-26 18:53:16.870384679 +0200 -@@ -0,0 +1,42 @@ -+void __attribute__ ((noipa, noinline)) my_puts (const char *str) { } -+ -+void __attribute__ ((noipa, noinline)) my_free (void *p) { } -+ -+ -+struct Node -+{ -+ struct Node *child; -+}; -+ -+struct Node space[2] = { }; -+ -+struct Node * __attribute__ ((noipa, noinline)) my_malloc (int bytes) -+{ -+ return &space[0]; -+} -+ -+void -+walk (struct Node *module, int cleanup) -+{ -+ if (module == 0) -+ { -+ return; -+ } -+ if (!cleanup) -+ { -+ my_puts ("No cleanup"); -+ } -+ walk (module->child, cleanup); -+ if (cleanup) -+ { -+ my_free (module); -+ } -+} -+ -+int -+main () -+{ -+ struct Node *node = my_malloc (sizeof (struct Node)); -+ node->child = 0; -+ walk (node, 1); -+} diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template index bab33d798ae..6774b8a5826 100644 --- a/srcpkgs/gcc/template +++ b/srcpkgs/gcc/template @@ -1,14 +1,14 @@ # Template file for 'gcc' _majorver=9 -_minorver=${_majorver}.1 +_minorver=${_majorver}.2 _gmp_version=6.1.2 -_mpfr_version=4.0.1 +_mpfr_version=4.0.2 _mpc_version=1.1.0 -_isl_version=0.19 +_isl_version=0.21 pkgname=gcc version=${_minorver}.0 -revision=3 +revision=1 short_desc="GNU Compiler Collection" maintainer="Enno Boland " homepage="http://gcc.gnu.org" @@ -20,11 +20,11 @@ distfiles=" https://www.mpfr.org/mpfr-${_mpfr_version}/mpfr-${_mpfr_version}.tar.xz ${GNU_SITE}/mpc/mpc-${_mpc_version}.tar.gz http://isl.gforge.inria.fr/isl-${_isl_version}.tar.bz2" -checksum="79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0 +checksum="ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206 87b565e89a9a684fe4ebeeddb8399dce2599f9c9049854ca8c0dfbdea0e21912 - 67874a60826303ee2fb6affc6dc0ddd3e749e9bfcb4c8655e3953d0458a6e16e + 1d3be708604eae0e42d578ba93b390c2a145f17743a744d8f3f8c2ad5855a38a 6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e - d59726f34f7852a081fbd3defd1ab2136f174110fc2e0c8d10bb122173fa9ed8" + d18ca11f8ad1a39ab6d03d3dcb3365ab416720fcb65b42d69f34f51bf0a0e859" nopie=yes lib32disabled=yes @@ -32,6 +32,13 @@ bootstrap=yes replaces="gcc-gcj<7.2.0 gcc-gcj-jdk-compat<7.2.0 libmpx>=0 libmpx-devel>=0" alternatives="cc:cc:/usr/bin/gcc" +_have_gccgo=yes + +# MIPS does not have libucontext yet +case "$XBPS_TARGET_MACHINE" in + mips*-musl) _have_gccgo=no ;; +esac + if [ "$CHROOT_READY" ]; then hostmakedepends="perl flex" fi @@ -67,14 +74,13 @@ fi if [ "$CHROOT_READY" ]; then subpackages+=" gcc-fortran libgfortran-devel libgfortran" - if [ -z "$CROSS_BUILD" ]; then - subpackages+=" gcc-objc gcc-objc++ libobjc-devel libobjc" - case "$XBPS_TARGET_MACHINE" in - *-musl) # Go won't link for musl libc - ;; - *) subpackages+=" gcc-go gcc-go-tools libgo-devel libgo" - ;; - esac + subpackages+=" gcc-objc gcc-objc++ libobjc-devel libobjc" + if [ "$_have_gccgo" = "yes" ]; then + subpackages+=" gcc-go gcc-go-tools libgo-devel libgo" + # we need this for gcc-go on musl + if [ "$XBPS_TARGET_LIBC" = "musl" ]; then + makedepends+=" libucontext-devel" + fi fi fi @@ -129,7 +135,6 @@ case "$XBPS_TARGET_MACHINE" in esac if [ "$CROSS_BUILD" ]; then hostmakedepends+=" cross-${_triplet}" - export GFORTRAN_FOR_TARGET=" ${_triplet}-gfortran" if [ "$build_option_ada" ]; then hostmakedepends+=" gcc-ada libada-devel" fi @@ -162,7 +167,10 @@ pre_configure() { # _FORTIFY_SOURCE needs an optimization level. sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {gcc,libiberty}/configure case "$XBPS_TARGET_MACHINE" in - *-musl) patch -p1 -i ${FILESDIR}/libgnarl-musl.patch ;; + *-musl) + patch -p1 -i ${FILESDIR}/libgnarl-musl.patch + patch -p0 -i ${FILESDIR}/gccgo-musl.patch + ;; esac } do_configure() { @@ -216,26 +224,26 @@ do_configure() { export CC_FOR_TARGET="$CC" export GCC_FOR_TARGET="$CC" export CXX_FOR_TARGET="$CXX" + export GOC_FOR_TARGET="${_triplet}-gccgo" + export GFORTRAN_FOR_TARGET="${_triplet}-gfortran" _args+=" --host=$XBPS_CROSS_TRIPLET" _args+=" --with-build-sysroot=${XBPS_CROSS_BASE}" _args+=" --enable-sjlj-exceptions=no" - _langs+=",fortran" + _langs+=",objc,obj-c++,fortran" elif [ -z "$CHROOT_READY" ]; then export LD_LIBRARY_PATH="${XBPS_MASTERDIR}/usr/lib" _args+=" --build=${_triplet}" else _langs="c,c++,objc,obj-c++,fortran,lto" - case "$XBPS_TARGET_MACHINE" in - *-musl) # Linking libgo.so is broken for musl libc - ;; - *) _langs+=",go" - ;; - esac _args+=" --build=${_triplet}" _args+=" --enable-fast-character" fi + if [ "$_have_gccgo" = "yes" ]; then + _langs+=",go" + fi + case "$XBPS_TARGET_MACHINE" in *-musl) _args+=" --disable-libsanitizer";; esac diff --git a/srcpkgs/gcdemu/template b/srcpkgs/gcdemu/template index 70841043db3..6dba7c01bb6 100644 --- a/srcpkgs/gcdemu/template +++ b/srcpkgs/gcdemu/template @@ -1,6 +1,6 @@ # Template file for 'gcdemu' pkgname=gcdemu -version=3.2.1 +version=3.2.3 revision=1 archs=noarch wrksrc="gcdemu-${version}" @@ -12,4 +12,4 @@ maintainer="Helmut Pozimski " license="GPL-2.0-or-later" homepage="http://cdemu.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/cdemu/gcdemu-${version}.tar.bz2" -checksum=aff033fb19b1e7f6c001780ccf7c54743de26113720c2526aa8c9fe216dcbe52 +checksum=e4794a36f932e1044cdb04eac506bdc3bb3c9cbad6a8a1a463472305b90a7ea7 diff --git a/srcpkgs/gcompris-qt/template b/srcpkgs/gcompris-qt/template index 725c71638bf..2c7d2fed9f0 100644 --- a/srcpkgs/gcompris-qt/template +++ b/srcpkgs/gcompris-qt/template @@ -1,6 +1,6 @@ # Template file for 'gcompris-qt' pkgname=gcompris-qt -version=0.96 +version=0.97 revision=1 build_style=cmake configure_args="-DQML_BOX2D_LIBRARY=/usr/lib/qt5/qml/Box2D.2.0" @@ -15,7 +15,7 @@ maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://gcompris.net/index-en.html" distfiles="https://gcompris.net/download/qt/src/gcompris-qt-${version}.tar.xz" -checksum=a2bc2ce6e2687120d7ff2dee036fd85cfed70a793a9cc385b786d054681c8818 +checksum=2b8911a9121fe1c754afae4084092552b0dd21aba1a36b2653f485b0f659c2ef if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake" diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template index 8d3c51745d4..9f84e4869e9 100644 --- a/srcpkgs/gdb/template +++ b/srcpkgs/gdb/template @@ -1,6 +1,6 @@ # Template file for 'gdb' pkgname=gdb -version=8.3 +version=8.3.1 revision=1 build_style=gnu-configure pycompile_dirs="/usr/share/gdb" @@ -10,12 +10,12 @@ configure_args="--disable-werror --disable-nls --with-system-readline $(vopt_if python --with-python=/usr/bin/python3)" hostmakedepends="perl $(vopt_if python python3-devel)" makedepends="ncurses-devel zlib-devel readline-devel expat-devel $(vopt_if python 'python3-devel gettext-libs')" -short_desc="The GNU Debugger" -maintainer="Orphaned " +short_desc="GNU Debugger" +maintainer="Anthony Iliopoulos " license="GPL-3.0-or-later" homepage="https://www.gnu.org/software/gdb/" distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=802f7ee309dcc547d65a68d61ebd6526762d26c3051f52caebe2189ac1ffd72e +checksum=1e55b4d7cdca7b34be12f4ceae651623aa73b2fd640152313f9f66a7149757c4 patch_args="-Np1" if [ "${CROSS_BUILD}" ]; then diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template index ee3a71f2900..d9947d330ef 100644 --- a/srcpkgs/gdm/template +++ b/srcpkgs/gdm/template @@ -1,7 +1,7 @@ # Template file for 'gdm' pkgname=gdm -version=3.32.0 -revision=2 +version=3.34.1 +revision=1 build_helper="gir" build_style=gnu-configure configure_args="$(vopt_enable gir introspection) @@ -21,7 +21,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/GDM" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=643db0c8c5089a96282b4c259b8823ca6dfad1ead6f2d0025d1c1211d36fd78b +checksum=e85df657aa8d9361af4fb122014d8f123a93bfe45a7662fba2b373d839dbd8d3 nocross="gnome-shell can't be crosscompiled yet" conf_files=" diff --git a/srcpkgs/geany-plugins/template b/srcpkgs/geany-plugins/template index db0775ae22f..7047183241d 100644 --- a/srcpkgs/geany-plugins/template +++ b/srcpkgs/geany-plugins/template @@ -1,7 +1,7 @@ # Template file for 'geany-plugins' pkgname=geany-plugins -version=1.35.0 -revision=2 +version=1.36.0 +revision=1 build_style=gnu-configure configure_args="PYTHON=/usr/bin/python2 --enable-all-plugins --disable-devhelp --disable-webhelper --disable-debugger --disable-geanypy --disable-multiterm" @@ -15,7 +15,7 @@ maintainer="Steve Prybylski " license="GPL-2.0-or-later" homepage="http://plugins.geany.org" distfiles="https://github.com/geany/${pkgname}/archive/${version}.tar.gz" -checksum=8a46ed8ed79443ec891e0ac2da039ece666de1601178afe030dd50bcd6515fce +checksum=39409e948502a7d6d88a290f201b7c6c678ce8ecaff7c73589ee0f6dcc059568 pre_configure() { NOCONFIGURE=1 ./autogen.sh @@ -52,4 +52,3 @@ geany-plugins-extra_package() { vmove usr/lib/geany-plugins/geanylua } } - diff --git a/srcpkgs/geany/template b/srcpkgs/geany/template index 0cbd92aeafd..e99051eedb8 100644 --- a/srcpkgs/geany/template +++ b/srcpkgs/geany/template @@ -1,6 +1,6 @@ # Template file for 'geany' pkgname=geany -version=1.35 +version=1.36 revision=1 build_style=gnu-configure configure_args="--enable-vte --enable-gtk3" @@ -9,11 +9,11 @@ hostmakedepends="automake gettext-devel glib-devel libtool pkg-config intltool makedepends="gtk+3-devel" depends="hicolor-icon-theme desktop-file-utils" short_desc="Fast and lightweight IDE" -maintainer="Orphaned " +maintainer="Benjamín Albiñana " license="GPL-2.0-or-later" homepage="https://www.geany.org" distfiles="https://download.${pkgname}.org/${pkgname}-${version}.tar.bz2" -checksum=35ee1d3ddfadca8bf1764e174ba3a5f348b1f1f430d32a36295b7706b7753d9d +checksum=9184dd3dd40b7b84fca70083284bb9dbf2ee8022bf2be066bdc36592d909d53e pre_configure() { autoreconf -fi diff --git a/srcpkgs/geary/template b/srcpkgs/geary/template index 91d1f6cc8d5..94798e329a2 100644 --- a/srcpkgs/geary/template +++ b/srcpkgs/geary/template @@ -1,6 +1,6 @@ # Template file for 'geary' pkgname=geary -version=3.32.2 +version=3.34.1 revision=1 build_helper="gir" build_style=meson @@ -8,14 +8,14 @@ configure_args="-Dcontractor=true" hostmakedepends="desktop-file-utils iso-codes pkg-config itstool gobject-introspection vala glib-devel" makedepends="enchant2-devel gcr-devel gmime-devel libsoup-devel libglib-devel - libgee08-devel libnotify-devel libsecret-devel webkit2gtk-devel libxml2-devel + libgee08-devel libsecret-devel webkit2gtk-devel libxml2-devel gnome-online-accounts-devel json-glib-devel libunwind-devel libcanberra-devel - folks-devel" + folks-devel appstream-glib-devel gspell-devel ytnef-devel libhandy-devel" depends="gir-freedesktop gnome-keyring" short_desc="Lightweight email program for the GNOME desktop" -maintainer="Cameron Nemo " +maintainer="Cameron Nemo " license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Apps/Geary" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/geary-${version}.tar.xz" -checksum=f821632356f1c0f694e6fe7c301952fa393e3522a0151f718348ec80f01fe569 +checksum=7ba4948312f556d972a8e899ec62f677862714b3b4817403c4eca614d03ba5af nocross="folks GIR can't be crossbuilt" diff --git a/srcpkgs/geckodriver/template b/srcpkgs/geckodriver/template index 9c019745d1a..34e4b9d996f 100644 --- a/srcpkgs/geckodriver/template +++ b/srcpkgs/geckodriver/template @@ -1,6 +1,6 @@ # Template file for 'geckodriver' pkgname=geckodriver -version=0.24.0 +version=0.25.0 revision=1 build_style=cargo short_desc="WebDriver for Firefox" @@ -8,7 +8,7 @@ maintainer="m3tav3rse " license="MPL-2.0" homepage="https://github.com/mozilla/geckodriver" distfiles="https://github.com/mozilla/geckodriver/archive/v${version}.tar.gz" -checksum=e6f86b3b6411f078c0a762f978c00ee99926463036a68be01d111bd91f25340e +checksum=9ba9b1be1a2e47ddd11216ce863903853975a4805e72b9ed5da8bcbcaebbcea9 case $XBPS_TARGET_MACHINE in armv6*) diff --git a/srcpkgs/geda/patches/snarf_cpp_opts.patch b/srcpkgs/geda/patches/snarf_cpp_opts.patch new file mode 100644 index 00000000000..1eec9b6f6db --- /dev/null +++ b/srcpkgs/geda/patches/snarf_cpp_opts.patch @@ -0,0 +1,17 @@ +--- gschem/src/Makefile.orig 2019-10-08 20:33:14.000000000 +0200 ++++ gschem/src/Makefile.in 2019-10-12 15:49:39.966600662 +0200 +@@ -2693,12 +2693,12 @@ + $(AM_V_SNARF)CPP="$(CPP)" $(GUILE_SNARF) -o $@ $< $(snarf_cpp_opts) + + actions.decl.x: actions.decl.h actions.c Makefile +- $(AM_V_GEN)$(CPP) -I$(srcdir) -c $< | \ ++ $(AM_V_GEN)$(CPP) -I$(srcdir) $< | \ + sed -e '/^.*KEEP_LINE /!d' -e 's/^.*KEEP_LINE //' > $@.tmp && \ + mv $@.tmp $@ + + actions.init.x: actions.init.c actions.c Makefile +- $(AM_V_GEN)$(CPP) -I$(srcdir) -c $< | \ ++ $(AM_V_GEN)$(CPP) -I$(srcdir) $< | \ + sed -e '/^.*KEEP_LINE /!d' -e 's/^.*KEEP_LINE //' > $@.tmp && \ + mv $@.tmp $@ + diff --git a/srcpkgs/geda/template b/srcpkgs/geda/template index 23d895d1381..db74437e903 100644 --- a/srcpkgs/geda/template +++ b/srcpkgs/geda/template @@ -1,12 +1,12 @@ # Template file for 'geda' pkgname=geda -version=1.8.2 -revision=7 +version=1.10.0 +revision=1 wrksrc="${pkgname}-gaf-${version}" build_style=gnu-configure -configure_args="--with-sysroot=/${XBPS_CROSS_BASE}" -hostmakedepends="pkg-config guile desktop-file-utils shared-mime-info" -makedepends="gc-devel gtk+-devel guile-devel" +make_build_args="V=1" +hostmakedepends="pkg-config guile python desktop-file-utils shared-mime-info" +makedepends="gamin-devel gc-devel gtk+-devel guile-devel python-devel libatomic_ops-devel" depends="guile geda-data" checkdepends="perl" short_desc="Electronic Design Automation tool" @@ -14,12 +14,19 @@ maintainer="Jürgen Buchmüller " license="GPL-2.0-or-later" homepage="http://www.geda-project.org/" distfiles="http://ftp.geda-project.org/geda-gaf/stable/v${version%.*}/${version}/geda-gaf-${version}.tar.gz" -checksum=bbf4773aef1b5a51a8d6f4c3fa288c047340cc62dd6e14d7928fcc6e4051b721 +checksum=5eb7a619f9d9cbcfa895468d6eae888d7e1d519dfff717b9f8f22fbeb37a3b1a -if [ "${XBPS_ARCH}" = "x86_64" ]; then - hostmakedepends+=" glibc-devel-32bit" +if [ "$CROSS_BUILD" ]; then + if [ "$XBPS_WORDSIZE" != "$XBPS_TARGET_WORDSIZE" ]; then + broken="The host ($XBPS_WORDSIZE) and target ($XBPS_TARGET_WORDSIZE) word sizes need to be the same for cross building." + fi fi +pre_configure() { + mkdir -p gnu + touch gnu/stubs-32.h +} + geda-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template index e652eb37668..cdec13159fd 100644 --- a/srcpkgs/gerbera/template +++ b/srcpkgs/gerbera/template @@ -1,7 +1,7 @@ # Template file for 'gerbera' pkgname=gerbera version=1.3.1 -revision=1 +revision=2 build_style=cmake configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1" makedepends="duktape-devel expat-devel ffmpeg-devel file-devel libcurl-devel @@ -11,7 +11,7 @@ maintainer="Alexander Gehrke " license="GPL-2.0-only" homepage="http://gerbera.io/" distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz" -checksum=89bbcebcf6beebb50b9453329b13e6a20e3e505dee5655486e90e1f085591f4a +checksum=9c4509189eab6bff0fe183e1dd54ea8cb17d7fb0bc6e21bb5b1a8ccaaf6c60d9 # libupnp uses large file support, so users must do that, too CXXFLAGS="-D_FILE_OFFSET_BITS=64" diff --git a/srcpkgs/getmail/template b/srcpkgs/getmail/template index ede082939ab..51a5c4a109f 100644 --- a/srcpkgs/getmail/template +++ b/srcpkgs/getmail/template @@ -1,6 +1,6 @@ # Template file for 'getmail' pkgname=getmail -version=5.13 +version=5.14 revision=1 archs=noarch build_style=python2-module @@ -8,8 +8,8 @@ pycompile_module="getmailcore" hostmakedepends="python-devel" depends="python" short_desc="POP3/IMAP mail retriever with reliable Maildir and command delivery" -maintainer="maxice8 " +maintainer="Lugubris " license="GPL-2.0-only" homepage="http://pyropus.ca/software/getmail" distfiles="http://pyropus.ca/software/getmail/old-versions/${pkgname}-${version}.tar.gz" -checksum=04d52f6475f09e9f99b4e3d2f1d2eb967a68b67f09af2a6a5151857f060b0a9d +checksum=f3a99fe74564237d12ca8d4582e113c067c9205b5ab640f72b4e8447606a99c1 diff --git a/srcpkgs/gfuzz/template b/srcpkgs/gfuzz/template new file mode 100644 index 00000000000..6df0db9c47e --- /dev/null +++ b/srcpkgs/gfuzz/template @@ -0,0 +1,14 @@ +# Template file for 'gfuzz' +pkgname=gfuzz +version=0.1 +revision=1 +wrksrc="gfuzz-${version}" +build_style=go +go_import_path=github.com/braaaax/gfuzz +hostmakedepends="git" +short_desc="Web fuzzer like wfuzz written in Golang" +maintainer="Alex Childs " +license="Apache-2.0" +homepage="https://github.com/braaaax/gfuzz" +distfiles="https://github.com/braaaax/gfuzz/archive/v${version}.tar.gz" +checksum=9e5b371d4b571fa9970e7678090f010d9adf23eb4f0f3c90da9b64b452f99e63 diff --git a/srcpkgs/giflib/template b/srcpkgs/giflib/template index 956bc731e84..4f01f28e079 100644 --- a/srcpkgs/giflib/template +++ b/srcpkgs/giflib/template @@ -5,7 +5,7 @@ revision=1 build_style=gnu-makefile hostmakedepends="xmlto" short_desc="Library to handle, display and manipulate GIF images" -maintainer="maxice8 " +maintainer="Orphaned " license="MIT" homepage="https://sourceforge.net/projects/giflib/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" diff --git a/srcpkgs/gifski/template b/srcpkgs/gifski/template index 6d2040e9f19..8ecb5d725f7 100644 --- a/srcpkgs/gifski/template +++ b/srcpkgs/gifski/template @@ -1,16 +1,16 @@ # Template file for 'gifski' pkgname=gifski -version=0.8.7 +version=0.9.2 revision=1 build_style=cargo configure_args="--features=openmp" -makedepends="libgomp-devel" +makedepends="libgomp-devel libomp-devel" short_desc="Highest-quality GIF encoder based on pngquant" -maintainer="Orphaned " +maintainer="Benjamín Albiñana " license="AGPL-3.0-only" homepage="https://gif.ski" distfiles="https://github.com/ImageOptim/gifski/archive/${version}.tar.gz" -checksum=e8d8d2fdb816953315989b3ecf39ac88f33b8c49aa7c79a0df8f53b4032755ab +checksum=e2f6a44e5422527f1a6c582f371b637fefa9f0420c25cbce5831b1c95a2c91c9 post_install() { vlicense LICENSE diff --git a/srcpkgs/gip/template b/srcpkgs/gip/template index 590b7a0d5d0..17b19df9814 100644 --- a/srcpkgs/gip/template +++ b/srcpkgs/gip/template @@ -1,7 +1,7 @@ # Template file for 'gip' pkgname=gip version=0.6.0 -revision=1 +revision=2 build_style=cargo short_desc="CLI tool to get global IP address" maintainer="Jan Christian Grünhage " @@ -10,6 +10,13 @@ homepage="https://github.com/dalance/gip" distfiles="https://github.com/dalance/gip/archive/v${version}.tar.gz" checksum=b8f5ba15a554ba4cb85a32449a8f665db24ab9dde7c47e7e6e10724fc9a76422 +pre_build() { + # the defined version (0.2.39 at the time of writing) is buggy on + # ppc64*-musl, pin the oldest newer working version; on next update + # please check Cargo.lock to verify if this is still necessary + cargo update --package libc --precise 0.2.43 +} + post_install() { vlicense LICENSE-MIT } diff --git a/srcpkgs/girara/template b/srcpkgs/girara/template index 23657857b6b..8dcb84f51d5 100644 --- a/srcpkgs/girara/template +++ b/srcpkgs/girara/template @@ -1,17 +1,17 @@ # Template file for 'girara' pkgname=girara -version=0.3.2 +version=0.3.3 revision=1 build_style=meson configure_args="-Dnotify=auto -Dtests=disabled" hostmakedepends="pkg-config intltool doxygen glib-devel" makedepends="gtk+3-devel libnotify-devel libglib-devel json-c-devel" -short_desc="A library implementing a user interface that focuses on minimalism" +short_desc="Library implementing a user interface that focuses on minimalism" maintainer="lemmi " license="Zlib" homepage="https://pwmt.org/projects/girara/" -distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz" -checksum=1700353a101f3c520f9b22e79d71ea5b268a9ec324796cf9e64775d96bb086cd +distfiles="https://git.pwmt.org/pwmt/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz" +checksum=4456ddd6f0420fa6f1677a4a8f438f0401c38c2521585db3ee42e339a730798f post_install() { vlicense LICENSE diff --git a/srcpkgs/git-cola/template b/srcpkgs/git-cola/template index 98978120b91..7eaba90f3be 100644 --- a/srcpkgs/git-cola/template +++ b/srcpkgs/git-cola/template @@ -1,6 +1,6 @@ # Template file for 'git-cola' pkgname=git-cola -version=3.4 +version=3.5 revision=1 archs=noarch build_style=python3-module @@ -12,4 +12,4 @@ maintainer="Andrea Brancaleoni " license="GPL-2" homepage="https://git-cola.github.io/" distfiles="https://github.com/git-cola/git-cola/archive/v${version}.tar.gz" -checksum=763e382d8b32427539585d17ec6fe92026c073f6d31a864a5816ebe22cf245bc +checksum=7fdcfc4326b35e384b97bd4bb2189b4cb5cf258948352759c302e632b41bb2e2 diff --git a/srcpkgs/git-mediate/template b/srcpkgs/git-mediate/template new file mode 100644 index 00000000000..07f93c2e42f --- /dev/null +++ b/srcpkgs/git-mediate/template @@ -0,0 +1,14 @@ +# Template file for 'git-mediate' +pkgname=git-mediate +version=1.0.5 +revision=1 +build_style=haskell-stack +depends="git" +short_desc="Tool to help resolving git conflicts" +maintainer="Peter Wang " +license="GPL-2.0-only" +homepage="https://github.com/Peaker/git-mediate" +distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz" +checksum=a3f01abc25e7f5a89833131b07ba1a69ab497b099972acf6f333ef43be31b8bc +nocross=yes +nopie_files="/usr/bin/git-mediate" diff --git a/srcpkgs/git-revise/template b/srcpkgs/git-revise/template index 0f3d478bc60..4179a52bddc 100644 --- a/srcpkgs/git-revise/template +++ b/srcpkgs/git-revise/template @@ -1,7 +1,8 @@ # Template file for 'git-revise' pkgname=git-revise -version=0.4.2 -revision=3 +version=0.5.0 +revision=1 +archs=noarch build_style=python3-module pycompile_module="gitrevise" hostmakedepends="python3 python3-setuptools" @@ -11,7 +12,7 @@ maintainer="Leah Neukirchen " license="MIT" homepage="https://github.com/mystor/git-revise" distfiles="https://github.com/mystor/git-revise/archive/${version}.tar.gz" -checksum=217b1bb9a3b34d0c7e7544b516a9eed5bc061b9bafd3a97bc7edfd83ea54c0d6 +checksum=f2bd6ad51b2acdd6fb6acf51807ce4b951d92cd039fc9e5a7dbb1e182fdf38b4 post_extract() { vsed -e 's|"man/man1"|"share/man/man1"|g' -i setup.py diff --git a/srcpkgs/github-opml/template b/srcpkgs/github-opml/template index a7ab953b773..3d2f6f49a48 100644 --- a/srcpkgs/github-opml/template +++ b/srcpkgs/github-opml/template @@ -6,7 +6,7 @@ build_style=go go_import_path=github.com/jojomi/github-opml hostmakedepends="git" short_desc="Create opml file with references to all starred repos by a github user" -maintainer="maxice8 " +maintainer="Orphaned " license="MIT" homepage="https://github.com/jojomi/github-opml" distfiles="https://github.com/jojomi/github-opml/archive/v${version}.tar.gz" diff --git a/srcpkgs/gitlab-runner/template b/srcpkgs/gitlab-runner/template index 5f2bc003abd..a2aed99abb9 100644 --- a/srcpkgs/gitlab-runner/template +++ b/srcpkgs/gitlab-runner/template @@ -1,6 +1,6 @@ # Template file for 'gitlab-runner' pkgname=gitlab-runner -version=12.1.0 +version=12.3.0 revision=1 wrksrc="${pkgname}-v${version}" build_style=go @@ -10,7 +10,7 @@ maintainer="Christian Poulwey " license="MIT" homepage="https://docs.gitlab.com/runner/" distfiles="https://gitlab.com/gitlab-org/gitlab-runner/-/archive/v${version}/gitlab-runner-v${version}.tar.gz" -checksum=e6e89a3dd7039ecd34403830eee70aa1de4e3831c61a8da5c6925942ae071c32 +checksum=@eae777591b276f44edb1ebc0b12608180347d779657397065d121a869b90f178 post_install() { vsv gitlab-runner diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template index 99454afca87..f17eac8a1f2 100644 --- a/srcpkgs/gjs/template +++ b/srcpkgs/gjs/template @@ -1,6 +1,6 @@ # Template file for 'gjs' pkgname=gjs -version=1.56.2 +version=1.58.1 revision=1 build_style=gnu-configure build_helper="gir" @@ -13,7 +13,7 @@ license="MIT, LGPL-2.0-or-later" homepage="https://wiki.gnome.org/action/show/Projects/Gjs" changelog="https://gitlab.gnome.org/GNOME/gjs/blob/gnome-3-30/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=4c89818c3d0e2186fcc4cb5228e9bf2a1866dd7d6646a18f1b37219b6710a3ac +checksum=b4df16ea87dc78c0df5412f9134efb14f7c510773aee117d5ad4cda75646c6f5 case "$XBPS_TARGET_MACHINE" in *-musl) configure_args+=" --disable-profiler" # https://gitlab.gnome.org/GNOME/gjs/issues/132 diff --git a/srcpkgs/glances/template b/srcpkgs/glances/template index 3f185b9e294..6d4766493c3 100644 --- a/srcpkgs/glances/template +++ b/srcpkgs/glances/template @@ -1,19 +1,19 @@ # Template file for 'glances' pkgname=glances -version=3.1.0 +version=3.1.2 revision=1 archs=noarch wrksrc="Glances-${version}" build_style=python3-module pycompile_module="glances" hostmakedepends="python3-setuptools" -depends="${hostmakedepends} python3-psutil" +depends="${hostmakedepends} python3-future python3-psutil" short_desc="Cross-platform curses-based monitoring tool" maintainer="Alessio Sergi " license="LGPL-3.0-or-later" homepage="https://github.com/nicolargo/glances" distfiles="${PYPI_SITE}/G/Glances/Glances-${version}.tar.gz" -checksum=904e3dbbebe261dd98d02f4f0a340e4934b12192e8b303b78473f617c0fcd6ca +checksum=733a30ee580d062759640a3ce9d7f5798b80c24e6dbf8f96269227bed7256894 post_install() { vsconf conf/glances.conf diff --git a/srcpkgs/glib-networking/template b/srcpkgs/glib-networking/template index 601e05089f0..98520abb635 100644 --- a/srcpkgs/glib-networking/template +++ b/srcpkgs/glib-networking/template @@ -1,6 +1,6 @@ # Template file for 'glib-networking' pkgname=glib-networking -version=2.60.3 +version=2.62.1 revision=1 build_style=meson configure_args="-Dinstalled_tests=false -Dgnutls=enabled -Dlibproxy=enabled @@ -14,7 +14,7 @@ maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://gitlab.gnome.org/GNOME/glib-networking/" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=d50183046a4ff955d8cc7e953067cdfc94f14dbfda3024bf377ff37a3121dcd5 +checksum=3c55ae6771ad7a79fa606a834f4686ed555c2774ed6e9ece6f3c0f6a3dab7110 lib32disabled=yes post_install() { diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template index 48c20a0be6f..5fdfff1410d 100644 --- a/srcpkgs/glib/template +++ b/srcpkgs/glib/template @@ -1,6 +1,6 @@ # Template file for 'glib' pkgname=glib -version=2.60.6 +version=2.62.1 revision=1 build_style=meson configure_args="-Dfam=false -Dman=true -Dselinux=disabled @@ -14,7 +14,7 @@ license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/GLib" changelog="https://gitlab.gnome.org/GNOME/glib/raw/master/NEWS" distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz" -checksum=ff8fab8d8deaa4fd0536c90f90d9769a09071779c7e6183907f6855645bffb6c +checksum=3dd9024e1d0872a6da7ac509937ccf997161b11d7d35be337c7e829cbae0f9df build_options="gtk_doc" diff --git a/srcpkgs/glibmm/template b/srcpkgs/glibmm/template index 141c8058787..23ef47c5994 100644 --- a/srcpkgs/glibmm/template +++ b/srcpkgs/glibmm/template @@ -1,6 +1,6 @@ # Template file for 'glibmm' pkgname=glibmm -version=2.60.0 +version=2.62.0 revision=1 build_style=gnu-configure hostmakedepends="glib-devel perl pkg-config" @@ -10,7 +10,7 @@ maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://www.gtkmm.org" distfiles="${GNOME_SITE}/glibmm/${version%.*}/glibmm-${version}.tar.xz" -checksum=a3a1b1c9805479a16c0018acd84b3bfff23a122aee9e3c5013bb81231aeef2bc +checksum=36659f13cc73282392d1305858f3bbca46fbd1ce2f078cc9db8b9f79b2e93cfe glibmm-doc_package() { archs=noarch diff --git a/srcpkgs/glslViewer/template b/srcpkgs/glslViewer/template index 5f458d21f46..a94a2e84992 100644 --- a/srcpkgs/glslViewer/template +++ b/srcpkgs/glslViewer/template @@ -9,7 +9,7 @@ makedepends="glfw-devel glu-devel MesaLib-devel libX11-devel libXrandr-devel libXi-devel libXxf86vm-devel libXcursor-devel libXinerama-devel libXext-devel libXrender-devel libXdamage-devel" short_desc="Live GLSL coding render" -maintainer="maxice8 " +maintainer="Orphaned " license="BSD-3-Clause" homepage="http://patriciogonzalezvivo.com/2015/glslViewer/" distfiles="https://github.com/patriciogonzalezvivo/glslViewer/archive/${version}.tar.gz" diff --git a/srcpkgs/glslang/template b/srcpkgs/glslang/template index 59526f9966c..cde1162b93f 100644 --- a/srcpkgs/glslang/template +++ b/srcpkgs/glslang/template @@ -6,7 +6,7 @@ build_style=cmake configure_args="-DBUILD_SHARED_LIBS=ON" hostmakedepends="python bison" short_desc="Khronos reference front-end for GLSL, ESSL, and sample SPIR-V generator" -maintainer="maxice8 " +maintainer="Orphaned " license="BSD-3-Clause" homepage="https://github.com/KhronosGroup/glslang" distfiles="https://github.com/KhronosGroup/glslang/archive/${version}.tar.gz" diff --git a/srcpkgs/glusterfs/template b/srcpkgs/glusterfs/template index 81cd6b5a496..a1304e266fe 100644 --- a/srcpkgs/glusterfs/template +++ b/srcpkgs/glusterfs/template @@ -1,6 +1,6 @@ # Template file for 'glusterfs' pkgname=glusterfs -version=6.4 +version=6.5 revision=1 build_style=gnu-configure configure_args="--with-mountutildir=/usr/bin ac_cv_file__etc_debian_version=no @@ -17,7 +17,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later, LGPL-3.0-only" homepage="https://www.gluster.org/" distfiles="https://download.gluster.org/pub/gluster/glusterfs/${version%.*}/${version}/${pkgname}-${version}.tar.gz" -checksum=82ff052e58b7eccf3cc04ce21ec99479722a5b9bfb6f29a48de2622a571ed1bd +checksum=83548320df35d9552c9053a7a6ceea6dd17971d9962275ed6dfedb06a308847b case "$XBPS_TARGET_MACHINE" in *-musl) broken="not yet supported";; diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template index 1e8de636605..6c9af4917f1 100644 --- a/srcpkgs/gmic/template +++ b/srcpkgs/gmic/template @@ -1,6 +1,6 @@ # Template file for 'gmic' pkgname=gmic -version=2.6.7 +version=2.7.1 revision=1 build_wrksrc="src" build_style=gnu-makefile @@ -13,7 +13,7 @@ maintainer="Jakub Skrzypnik " license="CECILL-2.1" homepage="http://gmic.eu/" distfiles="http://gmic.eu/files/source/gmic_${version}.tar.gz" -checksum="2e5535d1bae66254136e928428750aac8efcef6f4413fc352b6de9ce8ac8b0ff" +checksum="c71e784abd2141252efad505b6a48b6974c388788db5530b3ca0dfb07baeafeb" disable_parallel_build="yes" nocross="https://build.voidlinux.org/builders/armv7l_builder/builds/8869/steps/shell_3/logs/stdio" diff --git a/srcpkgs/gmime3/template b/srcpkgs/gmime3/template index 63d319ef519..a6a34d2306b 100644 --- a/srcpkgs/gmime3/template +++ b/srcpkgs/gmime3/template @@ -1,7 +1,7 @@ # Template file for 'gmime3' pkgname=gmime3 -version=3.2.3 -revision=6 +version=3.2.4 +revision=1 wrksrc="gmime-${version}" build_style=gnu-configure build_helper="gir" @@ -16,7 +16,7 @@ maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://github.com/jstedfast/gmime" distfiles="${GNOME_SITE}/gmime/${version%.*}/gmime-${version}.tar.xz" -checksum=6a0875eeb552ab447dd54853a68ced62217d863631048737dd97eaa2713e7311 +checksum=249ea7c0e080b067aa9669162c36b181b402f6cf6cebc4999d838c6f1e81d024 # Package build options build_options="gir vala" diff --git a/srcpkgs/gnome-backgrounds/template b/srcpkgs/gnome-backgrounds/template index a5585c4b932..bf2d7679ac5 100644 --- a/srcpkgs/gnome-backgrounds/template +++ b/srcpkgs/gnome-backgrounds/template @@ -1,6 +1,6 @@ # Template file for 'gnome-backgrounds' pkgname=gnome-backgrounds -version=3.32.0 +version=3.34.0 revision=1 archs=noarch build_style=meson @@ -9,4 +9,4 @@ maintainer="Enno Boland " license="GPL-2.0-or-later, CC-BY-2.0, CC-BY-SA-2.0, CC-BY-SA-3.0" homepage="https://gitlab.gnome.org/GNOME/gnome-backgrounds" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=3f53c31bc9ff31b27408159afe77d06875174bc554e4e7c225a4d5d16acbb3e8 +checksum=c2b7fb6db98c05e205053daaa7f58c7f06ff91b45c4006052af17c578ae7b47f diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template index 26d33435dbe..988a7f19b6d 100644 --- a/srcpkgs/gnome-bluetooth/template +++ b/srcpkgs/gnome-bluetooth/template @@ -1,7 +1,7 @@ # Template file for 'gnome-bluetooth' pkgname=gnome-bluetooth -version=3.32.1 -revision=2 +version=3.34.0 +revision=1 build_helper="gir" build_style=meson configure_args="-Dicon-update=false -Dgtk_doc=false @@ -15,7 +15,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/GnomeBluetooth" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=6441cafd313af94fba28b701698074f97d693b9023788a74e8e6f16f817ba1aa +checksum=e867e67423e1dc78c56c2ea11dec066ce0254238d559e4777c80fa2935eb6baf build_options="gir" build_options_default="gir" diff --git a/srcpkgs/gnome-books/template b/srcpkgs/gnome-books/template index 43bb31e4939..638d9140e43 100644 --- a/srcpkgs/gnome-books/template +++ b/srcpkgs/gnome-books/template @@ -1,6 +1,6 @@ # Template file for 'gnome-books' pkgname=gnome-books -version=3.32.0 +version=3.34.0 revision=1 build_helper="gir" build_style=meson @@ -12,5 +12,5 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Books" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=a49e2ff49f1ee96ca66836e48c80f6f0fc863f7b9682dc684df26bce19f76cf2 +checksum=ca5716a09e526ee43aa69dafffe5057b30edc648f56f554070c54a1db19d7b94 nocross="Mozjs60 .pc file's Cflags don't honor the sysroot which leads to missing includes" diff --git a/srcpkgs/gnome-builder/patches/dont-require-FNM_EXTMATCH.patch b/srcpkgs/gnome-builder/patches/dont-require-FNM_EXTMATCH.patch deleted file mode 100644 index 46d327bd94b..00000000000 --- a/srcpkgs/gnome-builder/patches/dont-require-FNM_EXTMATCH.patch +++ /dev/null @@ -1,25 +0,0 @@ -commit ec3f94cf7430b8c4120a9a2b352a238163696bec -Author: Ting-Wei Lan -Date: Mon Jul 29 23:24:27 2019 +0800 - - foundry: don't require FNM_EXTMATCH - - If the system doesn't support FNM_EXTMATCH, we just fallback to 0. It - seems to be safe because nothing depends on its extra features currently. - -diff --git src/libide/foundry/ide-simple-build-system-discovery.c src/libide/foundry/ide-simple-build-system-discovery.c -index c62eeb155..57883996f 100644 ---- src/libide/foundry/ide-simple-build-system-discovery.c -+++ src/libide/foundry/ide-simple-build-system-discovery.c -@@ -289,7 +289,11 @@ ide_simple_build_system_discovery_match (IdeSimpleBuildSystemDiscovery *self, - g_assert (IDE_IS_SIMPLE_BUILD_SYSTEM_DISCOVERY (self)); - g_assert (name != NULL); - -+#ifdef FNM_EXTMATCH - return fnmatch (priv->glob, name, FNM_EXTMATCH) == 0; -+#else -+ return fnmatch (priv->glob, name, 0) == 0; -+#endif - } - - static gboolean diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template index ebed528508f..9ae9ff9d94c 100644 --- a/srcpkgs/gnome-builder/template +++ b/srcpkgs/gnome-builder/template @@ -1,7 +1,7 @@ # Template file for 'gnome-builder' pkgname=gnome-builder -version=3.32.4 -revision=2 +version=3.34.1 +revision=1 build_style=meson configure_args="-Dwith_webkit=true -Dwith_sysprof=true -Dhelp=true" hostmakedepends="appdata-tools desktop-file-utils flex gobject-introspection @@ -16,9 +16,9 @@ short_desc="IDE for GNOME" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Builder" -changelog="https://gitlab.gnome.org/GNOME/gnome-builder/raw/gnome-builder-3-32/NEWS" +changelog="https://gitlab.gnome.org/GNOME/gnome-builder/raw/gnome-builder-3-34/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=19a388402e429277751b54e6587f2ff9533f3df143818b84e2e81a202a2a3776 +checksum=0b6e461057ea8151e80524c0ea7ef1cb948e92afda9dc6bd33ae3392f04501a4 nocross="Cannot build gresources on cross musl, unresolvable shlibs on glibc cross" case "$XBPS_TARGET_MACHINE" in diff --git a/srcpkgs/gnome-calendar/template b/srcpkgs/gnome-calendar/template index ef2c96c3323..2b0a27b9f25 100644 --- a/srcpkgs/gnome-calendar/template +++ b/srcpkgs/gnome-calendar/template @@ -1,6 +1,6 @@ # Template file for 'gnome-calendar' pkgname=gnome-calendar -version=3.32.2 +version=3.34.1 revision=1 build_style=meson hostmakedepends="glib-devel pkg-config $(vopt_if gir 'gobject-introspection')" @@ -13,7 +13,7 @@ license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Calendar" changelog="https://gitlab.gnome.org/GNOME/gnome-calendar/raw/master/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=f3500bedc257e3c7b82c5f4187b189dec99b76f445c96b01ca2d22f9371be71e +checksum=fed47b23e3fe2c356092e25bc8d455e87ef0eeb39fa90bf3d0be925dfa3e90e2 build_options="gir" build_options_default="gir" diff --git a/srcpkgs/gnome-chess/template b/srcpkgs/gnome-chess/template index 6cc8597d570..9733e3937a6 100644 --- a/srcpkgs/gnome-chess/template +++ b/srcpkgs/gnome-chess/template @@ -1,6 +1,6 @@ # Template file for 'gnome-chess' pkgname=gnome-chess -version=3.32.0 +version=3.34.0 revision=1 build_style=meson hostmakedepends="pkg-config vala glib-devel itstool librsvg-devel" @@ -11,4 +11,4 @@ maintainer="Jürgen Buchmüller " license="GPL-3.0-or-later" homepage="https://wiki.gnome.org/Apps/Chess" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=6998a9bc6cee1d7b6b203f9ec744f33c6f1983adb0b0a7b477c1bbca8936eb43 +checksum=6504054499e08801cb5e321b70a186f74d399699b3e29a5babf772d8cd933bd8 diff --git a/srcpkgs/gnome-clocks/template b/srcpkgs/gnome-clocks/template index a62c3591576..3b6e5895080 100644 --- a/srcpkgs/gnome-clocks/template +++ b/srcpkgs/gnome-clocks/template @@ -1,7 +1,7 @@ # Template file for 'gnome-clocks' pkgname=gnome-clocks -version=3.32.0 -revision=1 +version=3.34.0 +revision=2 build_helper="gir" build_style=meson hostmakedepends="pkg-config intltool itstool glib-devel vala" @@ -15,4 +15,4 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Clocks" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=6c8d90b0044f535f239bd94a7d0e46d0c9da32a6a141ff1233a78fa99a7cd4f0 +checksum=61195f357c63b65b75e209494e12a122a802c75333290e136813565dca94f03c diff --git a/srcpkgs/gnome-contacts/patches/ambiguous.patch b/srcpkgs/gnome-contacts/patches/ambiguous.patch deleted file mode 100644 index 3569e0e303f..00000000000 --- a/srcpkgs/gnome-contacts/patches/ambiguous.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- src/contacts-window.vala -+++ src/contacts-window.vala -@@ -35,9 +35,9 @@ public class Contacts.Window : Gtk.ApplicationWindow { - [GtkChild] - private TitleBar titlebar; - [GtkChild] -- private HeaderBar left_header; -+ private Gtk.HeaderBar left_header; - [GtkChild] -- private HeaderBar right_header; -+ private Gtk.HeaderBar right_header; - [GtkChild] - private Overlay notification_overlay; - [GtkChild] diff --git a/srcpkgs/gnome-contacts/template b/srcpkgs/gnome-contacts/template index 9b861442c14..5595ef8ce06 100644 --- a/srcpkgs/gnome-contacts/template +++ b/srcpkgs/gnome-contacts/template @@ -1,7 +1,7 @@ # Template file for 'gnome-contacts' pkgname=gnome-contacts -version=3.32.2 -revision=1 +version=3.34.0 +revision=2 wrksrc="gnome-contacts-${version%.*}" build_style=meson hostmakedepends="docbook-xsl glib-devel libxslt pkg-config vala" @@ -13,4 +13,4 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Contacts" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version%.*}.tar.xz" -checksum=fc49f9821fe7a2491287bc25979bb428d39c6510d23c59bf031a4e555a39798b +checksum=99602ec8d660c1f3c92cae6356f64f72fb6db58e55bce27a599330bf7b622f12 diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template index b71bd9cbe42..0e2787898ae 100644 --- a/srcpkgs/gnome-control-center/template +++ b/srcpkgs/gnome-control-center/template @@ -1,6 +1,6 @@ # Template file for 'gnome-control-center' pkgname=gnome-control-center -version=3.32.2 +version=3.34.1 revision=1 build_style=meson build_helper="gir" @@ -24,7 +24,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-control-center" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=faa5092d1eb12dfe85c54fe025e0fb29520654bb219cc5086f7326ea6005d70e +checksum=5f82ecd5554136c462248ec5363b82d95358b39dfd6787006d8307b4504e515e build_options="cheese" desc_option_cheese="Add support for adding user account images with your webcam" diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template index e8cd6c94cbc..38baffaa5c8 100644 --- a/srcpkgs/gnome-desktop/template +++ b/srcpkgs/gnome-desktop/template @@ -1,6 +1,6 @@ # Template file for 'gnome-desktop' pkgname=gnome-desktop -version=3.32.2 +version=3.34.1 revision=1 build_style=meson build_helper="gir" @@ -16,7 +16,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-desktop" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=099f71b29310c999c28f2bf272c846bbd7efc8c6c438b37d15f374230ce92d2e +checksum=c1dbeb5666dad27166c769e48e2ab41dd5ed74718ea35eb57c8488790662dc5a build_options="gir" build_options_default="gir" diff --git a/srcpkgs/gnome-documents/template b/srcpkgs/gnome-documents/template index b33f4b1bd65..62d9bddbc1e 100644 --- a/srcpkgs/gnome-documents/template +++ b/srcpkgs/gnome-documents/template @@ -1,7 +1,7 @@ # Template file for 'gnome-documents' pkgname=gnome-documents version=3.32.0 -revision=2 +revision=3 build_helper="gir" build_style=meson hostmakedepends="docbook-xsl itstool pkg-config glib-devel libxslt gdk-pixbuf diff --git a/srcpkgs/gnome-flashback/template b/srcpkgs/gnome-flashback/template index 1201adbb01d..bc5ae868cb8 100644 --- a/srcpkgs/gnome-flashback/template +++ b/srcpkgs/gnome-flashback/template @@ -1,7 +1,7 @@ # Template file for 'gnome-flashback' pkgname=gnome-flashback -version=3.30.0 -revision=2 +version=3.34.1 +revision=1 build_style=gnu-configure configure_args="--enable-compile-warnings=minimum" hostmakedepends="pkg-config automake glib-devel" @@ -16,5 +16,5 @@ maintainer="shizonic " license="GPL-3.0-or-later" homepage="https://wiki.gnome.org/Projects/GnomeFlashback" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=a7786f43760b63d3036aa92240c5efe897e83a2831dc9f6829019d7805c53ca3 +checksum=ddba0c9661ad93b58ccbde267f6ecbc02da2c15f9d38d87d5504f4670c2fbc77 nocross="gobject-introspection" diff --git a/srcpkgs/gnome-font-viewer/template b/srcpkgs/gnome-font-viewer/template index 085b7d013bc..6d035366d44 100644 --- a/srcpkgs/gnome-font-viewer/template +++ b/srcpkgs/gnome-font-viewer/template @@ -1,6 +1,6 @@ # Template file for 'gnome-font-viewer' pkgname=gnome-font-viewer -version=3.32.0 +version=3.34.0 revision=1 build_style=meson hostmakedepends="pkg-config glib-devel" @@ -12,4 +12,4 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-font-viewer" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=43e1b0e759882d3597e650eb043e3d89c64cff9c124ceb6889e1a4a134286181 +checksum=aa6f0583e5f93aec095e537f0638b29de3d02491f0131ef584a7c55d39d6b98b diff --git a/srcpkgs/gnome-games/template b/srcpkgs/gnome-games/template index d83f3dd9853..dd83b22de09 100644 --- a/srcpkgs/gnome-games/template +++ b/srcpkgs/gnome-games/template @@ -1,16 +1,15 @@ # Template file for 'gnome-games' pkgname=gnome-games -version=3.30.2 +version=3.34.0 revision=1 build_style=meson hostmakedepends="glib-devel pkg-config vala-devel" makedepends="libarchive-devel grilo-devel gtk+3-devel libglib-devel libmanette-devel librsvg-devel libsoup-devel libxml2-devel retro-gtk-devel - sqlite-devel tracker-devel" + sqlite-devel tracker-devel libhandy-devel" short_desc="Browse and play your games" maintainer="Enno Boland " license="GPL-3.0-or-later" homepage="https://wiki.gnome.org/Apps/Games" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=5607c4071d3b07809ec1a88deb52bb289c29b2f5fb91374e244ebe7f8dee31a1 -nocross="depends on libmanette, which hard depends on gobject-introspection" +checksum=0fd7246d61ce21c0fc121c5488051a5866c19de2c2835ad7fe4b18c06627dcba diff --git a/srcpkgs/gnome-getting-started-docs/template b/srcpkgs/gnome-getting-started-docs/template index 9801d25e75c..5bec93490ba 100644 --- a/srcpkgs/gnome-getting-started-docs/template +++ b/srcpkgs/gnome-getting-started-docs/template @@ -1,6 +1,6 @@ # Template file for 'gnome-getting-started-docs' pkgname=gnome-getting-started-docs -version=3.32.2 +version=3.34.0 revision=1 archs=noarch build_style=gnu-configure @@ -11,4 +11,4 @@ license="CC-BY-SA-3.0" homepage="https://gitlab.gnome.org/GNOME/gnome-getting-started-docs" #changelog="https://gitlab.gnome.org/GNOME/gnome-getting-started-docs/raw/master/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=98af5c388808a81334806f3c69bacb3e520f6a5d46ffd61a7b307f5a8b2193ec +checksum=f70ce2ca23ad786215f3c92ec85783e3aabed07e4f78700fa27f9b2cf76e03db diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template index cda29a3406a..aba5a094c28 100644 --- a/srcpkgs/gnome-initial-setup/template +++ b/srcpkgs/gnome-initial-setup/template @@ -1,9 +1,9 @@ # Template file for 'gnome-initial-setup' pkgname=gnome-initial-setup -version=3.32.1 -revision=1 +version=3.34.1 +revision=2 build_style=meson -configure_args="-Dsoftware-sources=disabled" +configure_args="-Dsoftware-sources=disabled -Dsystemd=false" hostmakedepends="pkg-config glib-devel" makedepends="NetworkManager-devel accountsservice-devel libglib-devel gnome-desktop-devel cheese-devel libgweather-devel webkit2gtk-devel @@ -17,4 +17,4 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Design/OS/InitialSetup" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=3ea709826ee87e837518e316bc72334dc8dc6e65c6a82b96fe8879aadab990bf +checksum=e71f10ef6b631cd92ffde774e4130b32b2494b4df5ef288375d8b1957eeabfa1 diff --git a/srcpkgs/gnome-klotski/template b/srcpkgs/gnome-klotski/template index a1ba3965238..73929851e1d 100644 --- a/srcpkgs/gnome-klotski/template +++ b/srcpkgs/gnome-klotski/template @@ -1,7 +1,7 @@ # Template file for 'gnome-klotski' pkgname=gnome-klotski -version=3.32.0 -revision=2 +version=3.34.0 +revision=1 build_style=meson hostmakedepends="glib itstool pkg-config vala glib-devel" makedepends="librsvg-devel libgnome-games-support-devel" @@ -10,4 +10,4 @@ maintainer="Jürgen Buchmüller " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Klotski" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=e2c4259f6b3199423336dbe4ceb63329f4ec45a73b7d217ad4ea19d95f099adc +checksum=8e3442f5d7e08ce3de512557a468f0c97284ce7f67a32b1313908ae1ff027d69 diff --git a/srcpkgs/gnome-mahjongg/template b/srcpkgs/gnome-mahjongg/template index 69fc096f1f3..20f4a0011fd 100644 --- a/srcpkgs/gnome-mahjongg/template +++ b/srcpkgs/gnome-mahjongg/template @@ -1,7 +1,7 @@ # Template file for 'gnome-mahjongg' pkgname=gnome-mahjongg -version=3.32.0 -revision=2 +version=3.34.0 +revision=1 build_style=meson hostmakedepends="glib-devel itstool pkg-config vala" makedepends="librsvg-devel gtk+3-devel libglib-devel" @@ -10,4 +10,4 @@ maintainer="Jürgen Buchmüller " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Mahjongg" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=52843745a17ef1e9e80820432b3317aa885ec7417ac1e9239946c0d56daf6a8a +checksum=e5cfcf839cc86003708dfaa35c13a05aa4751618e316afb3f65284f0a61cd163 diff --git a/srcpkgs/gnome-mines/template b/srcpkgs/gnome-mines/template index e534547cfd4..af283c58320 100644 --- a/srcpkgs/gnome-mines/template +++ b/srcpkgs/gnome-mines/template @@ -1,6 +1,6 @@ # Template file for 'gnome-mines' pkgname=gnome-mines -version=3.32.2 +version=3.34.0 revision=1 build_style=meson hostmakedepends="glib-devel itstool pkg-config vala" @@ -10,4 +10,4 @@ maintainer="Jürgen Buchmüller " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Mines" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=0f757f4cc8526ecbffedd3e68f156b0acbfb17e5cb9cd5d8ef388b3bb93169db +checksum=a4f0189ef0fc45d5d5554197649f15014db82ff791ddad732e1af990b151fdea diff --git a/srcpkgs/gnome-mpv b/srcpkgs/gnome-mpv new file mode 120000 index 00000000000..ce77c85be34 --- /dev/null +++ b/srcpkgs/gnome-mpv @@ -0,0 +1 @@ +celluloid \ No newline at end of file diff --git a/srcpkgs/gnome-mpv/template b/srcpkgs/gnome-mpv/template deleted file mode 100644 index 96e5a00911c..00000000000 --- a/srcpkgs/gnome-mpv/template +++ /dev/null @@ -1,13 +0,0 @@ -# Template file for 'gnome-mpv' -pkgname=gnome-mpv -version=0.16 -revision=1 -build_style=meson -hostmakedepends="glib-devel pkg-config" -makedepends="gtk+3-devel libepoxy-devel libglib-devel mpv-devel" -short_desc="Simple GTK+ frontend for mpv" -maintainer="Enno Boland " -license="GPL-3.0-or-later" -homepage="https://gnome-mpv.github.io/" -distfiles="https://github.com/${pkgname}/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.xz" -checksum=22cd8a9257ea57449f3120993e668d11e5e3be31444c6e63b8b25ccce0feed4b diff --git a/srcpkgs/gnome-nibbles/template b/srcpkgs/gnome-nibbles/template index 056876156ff..ec89cbca3f8 100644 --- a/srcpkgs/gnome-nibbles/template +++ b/srcpkgs/gnome-nibbles/template @@ -1,15 +1,15 @@ # Template file for 'gnome-nibbles' pkgname=gnome-nibbles -version=3.32.0 +version=3.34.1 revision=1 -build_style=gnu-configure -hostmakedepends="glib-devel intltool itstool pkg-config" -makedepends="clutter-gtk-devel libcanberra-devel libgnome-games-support-devel - librsvg-devel" +build_style=meson +hostmakedepends="glib-devel intltool itstool pkg-config vala" +makedepends="clutter-gtk-devel gsound-devel libcanberra-devel + libgnome-games-support-devel librsvg-devel" short_desc="GNOME snake eats diamonds game" maintainer="Jürgen Buchmüller " license="GPL-3.0-or-later" changelog="https://github.com/GNOME/gnome-nibbles/raw/gnome-3-24/NEWS" homepage="https://wiki.gnome.org/Apps/Nibbles" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=375143d127ecf9921f23dce78b6a9144274bd76b5111a8b3f0917bb7fe3dc23c +checksum=77f0070af8294ac8795c07982fed4144d581f7336817eb6c6c377bdd370fde59 diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template index 1a74bb3a834..469ba370503 100644 --- a/srcpkgs/gnome-online-accounts/template +++ b/srcpkgs/gnome-online-accounts/template @@ -1,7 +1,7 @@ # Template file for 'gnome-online-accounts' pkgname=gnome-online-accounts -version=3.32.0 -revision=2 +version=3.34.1 +revision=1 build_style=gnu-configure build_helper="gir" configure_args="$(vopt_enable gir introspection) @@ -20,7 +20,7 @@ maintainer="Enno Boland " license="LGPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/GnomeOnlineAccounts" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=1c19e65771c8d16fa0016ab70d9a1ee2b75a84aeeedd24527a4e41b132e8d4aa +checksum=4832ca8e48d3a497fc676e7b6f146009ab4206995362977b9805aa39f164783a build_options="gir vala" build_options_default="gir vala" diff --git a/srcpkgs/gnome-online-miners/template b/srcpkgs/gnome-online-miners/template index b1a93746c94..43b21bf5b9c 100644 --- a/srcpkgs/gnome-online-miners/template +++ b/srcpkgs/gnome-online-miners/template @@ -1,6 +1,6 @@ # Template file for 'gnome-online-miners' pkgname=gnome-online-miners -version=3.30.0 +version=3.34.0 revision=1 lib32disabled=yes build_style=gnu-configure @@ -15,7 +15,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/GnomeOnlineMiners" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=2c29a9922b1d32aeb0e615db6717c8e060417d3b6568ed617c9817fb39af4a5e +checksum=845c2260fb12f14315c800d04d60f37e076c7c7b4222587ae75f108562fa52d8 build_options="gir" if [ -z "$CROSS_BUILD" ]; then diff --git a/srcpkgs/gnome-panel/template b/srcpkgs/gnome-panel/template index 60b50fc2192..18a2ea4ca94 100644 --- a/srcpkgs/gnome-panel/template +++ b/srcpkgs/gnome-panel/template @@ -1,7 +1,7 @@ # Template file for 'gnome-panel' pkgname=gnome-panel -version=3.32.0 -revision=1 +version=3.34.1 +revision=2 build_style=gnu-configure hostmakedepends="gettext-devel glib-devel itstool pkg-config" makedepends="cairo-devel dconf-devel elogind-devel evolution-data-server-devel @@ -13,5 +13,5 @@ maintainer="Enno Boland " license="GPL-2.0-or-later, GFDL-1.1-or-later, LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/GnomePanel" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=6a6079d3d22d480d53cf552bbe18e061276d2d0b458cce4dfb822cb064883f29 +checksum=a6bc0255252eeb4b964bcbe55fd7908b69f914c062c5ec8dff5ac0262d29b90d patch_args="-Np1" diff --git a/srcpkgs/gnome-passwordsafe/template b/srcpkgs/gnome-passwordsafe/template index cec9f84e238..f310ce03a08 100644 --- a/srcpkgs/gnome-passwordsafe/template +++ b/srcpkgs/gnome-passwordsafe/template @@ -1,14 +1,15 @@ # Template file for 'gnome-passwordsafe' pkgname=gnome-passwordsafe version=3.32.0 -revision=1 +revision=2 archs=noarch wrksrc="PasswordSafe-${version}" build_style=meson pycompile_module="passwordsafe" hostmakedepends="glib-devel pkg-config gobject-introspection python3-pykeepass" makedepends="gtk+3-devel libhandy-devel python3-pykeepass libpwquality-devel" -depends="gtk+3 libnotify libhandy python3-gobject python3-pykeepass python3-construct" +depends="gtk+3 libnotify libhandy python3-gobject python3-pykeepass python3-construct + libpwquality-python3" short_desc="Keepass compatible password manager for GNOME" maintainer="Enno Boland " license="GPL-3.0-or-later" diff --git a/srcpkgs/gnome-robots/template b/srcpkgs/gnome-robots/template index 572c6632bb7..3184fafe0fa 100644 --- a/srcpkgs/gnome-robots/template +++ b/srcpkgs/gnome-robots/template @@ -1,14 +1,14 @@ # Template file for 'gnome-robots' pkgname=gnome-robots -version=3.32.0 +version=3.34.0 revision=1 build_style=meson hostmakedepends="glib-devel itstool pkg-config" -makedepends="gtk+3-devel libcanberra-devel librsvg-devel +makedepends="gsound-devel gtk+3-devel libcanberra-devel librsvg-devel libglib-devel libgnome-games-support-devel" short_desc="GNOME classic robots game" maintainer="Jürgen Buchmüller " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Robots" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=d0db7879288e1a9e0d2bad5ae6ce24e7be2e1581af41b096adfccc4265d4e1f6 +checksum=ab82885194a536b8ad74512541a1dad6614d1d4caa127ea26075349340e976a3 diff --git a/srcpkgs/gnome-screensaver/template b/srcpkgs/gnome-screensaver/template index 1381c5d9219..363fcf12e10 100644 --- a/srcpkgs/gnome-screensaver/template +++ b/srcpkgs/gnome-screensaver/template @@ -1,7 +1,7 @@ # Template file for 'gnome-screensaver' pkgname=gnome-screensaver version=3.6.1 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-compile-warnings=minimum" hostmakedepends="pkg-config automake intltool glib-devel" diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template index 359c08d41f5..4444f162bf1 100644 --- a/srcpkgs/gnome-session/template +++ b/srcpkgs/gnome-session/template @@ -1,7 +1,7 @@ # Template file for 'gnome-session' pkgname=gnome-session -version=3.32.0 -revision=2 +version=3.34.1 +revision=1 build_style=meson configure_args="-Dsystemd_journal=false" hostmakedepends="glib-devel intltool pkg-config xmlto" @@ -15,4 +15,4 @@ maintainer="Enno Boland " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-session" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=bbd4c4ead32f0b805d0e372a63207e4e0c756dd16e1d456b2a211a40da9d3f7f +checksum=d7801fe2d5a751b19cb58081771316a76aabd5c550cd58d4e4c6a5a4ed356660 diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template index 7f179f2be4a..a70e28be5fa 100644 --- a/srcpkgs/gnome-settings-daemon/template +++ b/srcpkgs/gnome-settings-daemon/template @@ -1,10 +1,11 @@ # Template file for 'gnome-settings-daemon' pkgname=gnome-settings-daemon -version=3.32.1 -revision=1 +version=3.34.1 +revision=2 build_style=meson -hostmakedepends="docbook-xsl glib-devel libglib-devel libxslt perl pkg-config" -makedepends="NetworkManager-devel alsa-lib-devel colord-devel cups-devel +configure_args+="-Dsystemd=false" +hostmakedepends="cmake docbook-xsl glib-devel libglib-devel libxslt perl pkg-config" +makedepends="NetworkManager-devel alsa-lib-devel colord-devel cups-devel gcr-devel geoclue2-devel gnome-desktop-devel ibus-devel libcanberra-devel libgnomekbd-devel libgweather-devel libnotify-devel librsvg-devel libwacom-devel nss-devel polkit-devel pulseaudio-devel startup-notification-devel upower-devel @@ -17,7 +18,7 @@ maintainer="Enno Boland " license="GPL-3.0-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-settings-daemon" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=7a36d14f5ca1aaa5b5d4cd0a8a743017819c12014e8f4cc88a0ed72a1ed0a009 +checksum=9981a20babf8da7744b7fbe175b9e36078bf08f3bf65fe5aedeb82cfe27ac11f if [ "$CROSS_BUILD" ]; then hostmakedepends+=" polkit" diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template index a66ab15c374..97168b40f66 100644 --- a/srcpkgs/gnome-shell-extensions/template +++ b/srcpkgs/gnome-shell-extensions/template @@ -1,6 +1,6 @@ # Template file for 'gnome-shell-extensions' pkgname=gnome-shell-extensions -version=3.32.1 +version=3.34.1 revision=1 archs=noarch build_style=meson @@ -12,4 +12,4 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=02b2b2fb477fcd8277ee3ce34ec156d97724011f2660dd2e14c412f18d5b911e +checksum=b0ad51143b1bf40def4a10f8fd0ab0ffb47218304800794e62cadd29d0acc75b diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template index 577c58e5c19..3968ffa805f 100644 --- a/srcpkgs/gnome-shell/template +++ b/srcpkgs/gnome-shell/template @@ -1,18 +1,18 @@ # Template file for 'gnome-shell' pkgname=gnome-shell -version=3.32.2 +version=3.34.1 revision=1 build_style=meson configure_args="-Dsystemd=false" hostmakedepends="gobject-introspection gtk-doc libxslt pkg-config python3 sassc - perl" + asciidoc perl" makedepends="at-spi2-atk caribou-devel evolution-data-server-devel folks-devel gcr-devel gjs-devel gnome-bluetooth-devel gnome-control-center-devel gnome-desktop-devel gnome-menus-devel gsettings-desktop-schemas-devel gstreamer1-devel gtk+3-devel ibus-devel json-glib-devel libcanberra-devel libcroco-devel libglib-devel libsecret-devel libsoup-devel libX11-devel libxml2-devel mutter-devel network-manager-applet-devel polkit-devel pulseaudio-devel - startup-notification-devel telepathy-logger-devel" + startup-notification-devel telepathy-logger-devel gnome-autoar-devel" depends="caribou elogind glxinfo gnome-control-center gsettings-desktop-schemas upower" short_desc="GNOME core user interface" maintainer="Enno Boland " @@ -20,5 +20,5 @@ license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/GnomeShell" changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-30/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=e5561b0d5c1fb3b0b66e99f1ad7f2f9db918ee953897f4eac6ae5c8d6d9bd42a +checksum=ccd86559b9c897c219d2d2ebfdb8413efa4c1bee846427c750cb8a301b3f6d1e nocross="Evolution-dataserver cross gir doesn't work yet." diff --git a/srcpkgs/gnome-ssh-askpass/template b/srcpkgs/gnome-ssh-askpass/template index 2192837714d..0843e73d44b 100644 --- a/srcpkgs/gnome-ssh-askpass/template +++ b/srcpkgs/gnome-ssh-askpass/template @@ -1,6 +1,6 @@ # Template file for 'gnome-ssh-askpass' pkgname=gnome-ssh-askpass -version=8.0p1 +version=8.1p1 revision=1 wrksrc="openssh-${version}" hostmakedepends="pkg-config" @@ -10,7 +10,7 @@ maintainer="Leah Neukirchen " license="BSD-3-Clause, BSD-2-Clause" homepage="http://www.openssh.org" distfiles="https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${version}.tar.gz" -checksum=bd943879e69498e8031eb6b7f44d08cdc37d59a7ab689aa0b437320c3481fd68 +checksum=02f5dbef3835d0753556f973cd57b4c19b6b1f6cd24c03445e23ac77ca1b93ff alternatives=" ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/gnome-ssh-askpass diff --git a/srcpkgs/gnome-sudoku/template b/srcpkgs/gnome-sudoku/template index e7451d42579..ee321a337a6 100644 --- a/srcpkgs/gnome-sudoku/template +++ b/srcpkgs/gnome-sudoku/template @@ -1,6 +1,6 @@ # Template file for 'gnome-sudoku' pkgname=gnome-sudoku -version=3.32.0 +version=3.34.0 revision=1 build_helper="gir" build_style=meson @@ -11,7 +11,7 @@ maintainer="Jürgen Buchmüller " license="GPL-3.0-or-later" homepage="https://wiki.gnome.org/Apps/Sudoku" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=14388541ca7bbc01a45cb29a46cfc0794a2bcb7d0cef67361b7dd1c0a9938df3 +checksum=7e30b859a31e832738719808cede0c41e14daa059ed3f3a3619ab629094f9eaf case "$XBPS_TARGET_MACHINE" in i686-musl|x86_64-musl) ;; diff --git a/srcpkgs/gnome-tetravex/template b/srcpkgs/gnome-tetravex/template index ff11bb618f4..d2e2be6ccf3 100644 --- a/srcpkgs/gnome-tetravex/template +++ b/srcpkgs/gnome-tetravex/template @@ -1,6 +1,6 @@ # Template file for 'gnome-tetravex' pkgname=gnome-tetravex -version=3.32.0 +version=3.34.1 revision=1 build_style=meson hostmakedepends="itstool pkg-config vala glib-devel" @@ -10,4 +10,4 @@ maintainer="Jürgen Buchmüller " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Tetravex" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=544e702558d9d2a17e4f34b0db40ee728c1d83ad4761433bf7560a39c8edb9a1 +checksum=e06ddb08f810314553c7745c8476221a8b1425599f64388157ee4495baf12916 diff --git a/srcpkgs/gnome-todo/patches/6cdabc4dd0c6c804a093b94c269461ce376fed4f.patch b/srcpkgs/gnome-todo/patches/6cdabc4dd0c6c804a093b94c269461ce376fed4f.patch deleted file mode 100644 index d7a5f123bb3..00000000000 --- a/srcpkgs/gnome-todo/patches/6cdabc4dd0c6c804a093b94c269461ce376fed4f.patch +++ /dev/null @@ -1,30 +0,0 @@ -Upstream: yes -From 6cdabc4dd0c6c804a093b94c269461ce376fed4f Mon Sep 17 00:00:00 2001 -From: Emmanuele Bassi -Date: Mon, 21 Jan 2019 10:47:09 +0000 -Subject: [PATCH] Drop the autoptr definition for ESource - -Evolution-data-server includes the autoptr definition for ESource. - -See: GNOME/evolution-data-server#73 - -Without this change, GNOME Todo does not build on the Continuous CI -infrastructure. - -Signed-off-by: Emmanuele Bassi ---- - plugins/eds/gtd-eds-autoptr.h | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/plugins/eds/gtd-eds-autoptr.h b/plugins/eds/gtd-eds-autoptr.h -index eb9b011..42709ee 100644 ---- plugins/eds/gtd-eds-autoptr.h -+++ plugins/eds/gtd-eds-autoptr.h -@@ -25,4 +25,3 @@ - G_DEFINE_AUTOPTR_CLEANUP_FUNC (ECalComponent, g_object_unref); - G_DEFINE_AUTOPTR_CLEANUP_FUNC (ECalComponentId, e_cal_component_free_id); - G_DEFINE_AUTOPTR_CLEANUP_FUNC (ECalClient, g_object_unref); --G_DEFINE_AUTOPTR_CLEANUP_FUNC (ESource, g_object_unref); --- -2.18.1 - diff --git a/srcpkgs/gnome-todo/patches/gnome-todo-eds-libecal-2.0.patch b/srcpkgs/gnome-todo/patches/gnome-todo-eds-libecal-2.0.patch new file mode 100644 index 00000000000..549c3ce9c4a --- /dev/null +++ b/srcpkgs/gnome-todo/patches/gnome-todo-eds-libecal-2.0.patch @@ -0,0 +1,567 @@ +diff --git a/plugins/eds/gtd-eds-autoptr.h b/plugins/eds/gtd-eds-autoptr.h +index eb9b011..78bd944 100644 +--- a/plugins/eds/gtd-eds-autoptr.h ++++ b/plugins/eds/gtd-eds-autoptr.h +@@ -23,6 +23,5 @@ + #include + + G_DEFINE_AUTOPTR_CLEANUP_FUNC (ECalComponent, g_object_unref); +-G_DEFINE_AUTOPTR_CLEANUP_FUNC (ECalComponentId, e_cal_component_free_id); ++G_DEFINE_AUTOPTR_CLEANUP_FUNC (ECalComponentId, e_cal_component_id_free); + G_DEFINE_AUTOPTR_CLEANUP_FUNC (ECalClient, g_object_unref); +-G_DEFINE_AUTOPTR_CLEANUP_FUNC (ESource, g_object_unref); +diff --git a/plugins/eds/gtd-provider-eds.c b/plugins/eds/gtd-provider-eds.c +index a403226..def4235 100644 +--- a/plugins/eds/gtd-provider-eds.c ++++ b/plugins/eds/gtd-provider-eds.c +@@ -554,6 +554,7 @@ gtd_provider_eds_create_task (GtdProvider *provider, + + e_cal_client_create_object (client, + e_cal_component_get_icalcomponent (component), ++ E_CAL_OPERATION_FLAG_NONE, + NULL, + (GAsyncReadyCallback) on_task_created_cb, + new_task); +@@ -587,6 +588,7 @@ gtd_provider_eds_update_task (GtdProvider *provider, + e_cal_client_modify_object (client, + e_cal_component_get_icalcomponent (component), + E_CAL_OBJ_MOD_THIS, ++ E_CAL_OPERATION_FLAG_NONE, + NULL, + (GAsyncReadyCallback) on_task_modified_cb, + task); +@@ -616,9 +618,10 @@ gtd_provider_eds_remove_task (GtdProvider *provider, + gtd_object_push_loading (GTD_OBJECT (provider)); + + e_cal_client_remove_object (client, +- id->uid, +- id->rid, ++ e_cal_component_id_get_uid (id), ++ e_cal_component_id_get_rid (id), + E_CAL_OBJ_MOD_THIS, ++ E_CAL_OPERATION_FLAG_NONE, + NULL, + (GAsyncReadyCallback) on_task_removed_cb, + provider); +diff --git a/plugins/eds/gtd-task-eds.c b/plugins/eds/gtd-task-eds.c +index 2c8cd8e..bd8f7ac 100644 +--- a/plugins/eds/gtd-task-eds.c ++++ b/plugins/eds/gtd-task-eds.c +@@ -46,19 +46,19 @@ static GParamSpec *properties [N_PROPS]; + */ + + static GDateTime* +-convert_icaltime (const icaltimetype *date) ++convert_icaltime (const ICalTime *date) + { + GDateTime *dt; + + if (!date) + return NULL; + +- dt = g_date_time_new_utc (date->year, +- date->month, +- date->day, +- date->is_date ? 0 : date->hour, +- date->is_date ? 0 : date->minute, +- date->is_date ? 0 : date->second); ++ dt = g_date_time_new_utc (i_cal_time_get_year (date), ++ i_cal_time_get_month (date), ++ i_cal_time_get_day (date), ++ i_cal_time_is_date (date) ? 0 : i_cal_time_get_hour (date), ++ i_cal_time_is_date (date) ? 0 : i_cal_time_get_minute (date), ++ i_cal_time_is_date (date) ? 0 : i_cal_time_get_second (date)); + + return dt; + } +@@ -67,19 +67,20 @@ static void + set_description (GtdTaskEds *self, + const gchar *description) + { +- ECalComponentText text; ++ ECalComponentText *text; + GSList note; + +- text.value = description && *description ? description : ""; +- text.altrep = NULL; ++ text = e_cal_component_text_new (description ? description : "", NULL); + +- note.data = &text; ++ note.data = text; + note.next = NULL; + + g_clear_pointer (&self->description, g_free); + self->description = g_strdup (description); + +- e_cal_component_set_description_list (self->component, ¬e); ++ e_cal_component_set_descriptions (self->component, (description && *description) ? ¬e : NULL); ++ ++ e_cal_component_text_free (text); + } + + static void +@@ -90,7 +91,7 @@ setup_description (GtdTaskEds *self) + GSList *l; + + /* concatenates the multiple descriptions a task may have */ +- e_cal_component_get_description_list (self->component, &text_list); ++ text_list = e_cal_component_get_descriptions (self->component); + + for (l = text_list; l != NULL; l = l->next) + { +@@ -105,21 +106,21 @@ setup_description (GtdTaskEds *self) + { + carrier = g_strconcat (desc, + "\n", +- text->value, ++ e_cal_component_text_get_value (text), + NULL); + g_free (desc); + desc = carrier; + } + else + { +- desc = g_strdup (text->value); ++ desc = g_strdup (e_cal_component_text_get_value (text)); + } + } + } + + set_description (self, desc); + +- e_cal_component_free_text_list (text_list); ++ g_slist_free_full (text_list, e_cal_component_text_free); + } + + +@@ -138,7 +139,7 @@ gtd_task_eds_get_uid (GtdObject *object) + self = GTD_TASK_EDS (object); + + if (self->component) +- e_cal_component_get_uid (self->component, &uid); ++ uid = e_cal_component_get_uid (self->component); + else + uid = NULL; + +@@ -159,7 +160,7 @@ gtd_task_eds_set_uid (GtdObject *object, + if (!self->component) + return; + +- e_cal_component_get_uid (self->component, ¤t_uid); ++ current_uid = e_cal_component_get_uid (self->component); + + if (g_strcmp0 (current_uid, uid) != 0) + { +@@ -177,7 +178,7 @@ gtd_task_eds_set_uid (GtdObject *object, + static gboolean + gtd_task_eds_get_complete (GtdTask *task) + { +- icalproperty_status status; ++ ICalPropertyStatus status; + GtdTaskEds *self; + gboolean completed; + +@@ -185,8 +186,8 @@ gtd_task_eds_get_complete (GtdTask *task) + + self = GTD_TASK_EDS (task); + +- e_cal_component_get_status (self->component, &status); +- completed = status == ICAL_STATUS_COMPLETED; ++ status = e_cal_component_get_status (self->component); ++ completed = status == I_CAL_STATUS_COMPLETED; + + return completed; + } +@@ -195,8 +196,8 @@ static void + gtd_task_eds_set_complete (GtdTask *task, + gboolean complete) + { +- icalproperty_status status; +- icaltimetype *dt; ++ ICalPropertyStatus status; ++ ICalTime *dt; + GtdTaskEds *self; + gint percent; + +@@ -209,54 +210,54 @@ gtd_task_eds_set_complete (GtdTask *task, + percent = 100; + status = ICAL_STATUS_COMPLETED; + +- dt = g_new0 (icaltimetype, 1); +- dt->year = g_date_time_get_year (now); +- dt->month = g_date_time_get_month (now); +- dt->day = g_date_time_get_day_of_month (now); +- dt->hour = g_date_time_get_hour (now); +- dt->minute = g_date_time_get_minute (now); +- dt->second = g_date_time_get_seconds (now); +- dt->zone = icaltimezone_get_utc_timezone (); ++ dt = i_cal_time_new_null_time (); ++ i_cal_time_set_date (dt, ++ g_date_time_get_year (now), ++ g_date_time_get_month (now), ++ g_date_time_get_day_of_month (now)); ++ i_cal_time_set_time (dt, ++ g_date_time_get_hour (now), ++ g_date_time_get_minute (now), ++ g_date_time_get_seconds (now)); ++ i_cal_time_set_timezone (dt, i_cal_timezone_get_utc_timezone ()); + + /* convert timezone + * + * FIXME: This does not do anything until we have an ical + * timezone associated with the task + */ +- icaltimezone_convert_time (dt, NULL, icaltimezone_get_utc_timezone ()); ++ i_cal_time_convert_timezone (dt, NULL, i_cal_timezone_get_utc_timezone ()); + } + else + { + dt = NULL; + percent = 0; +- status = ICAL_STATUS_NEEDSACTION; ++ status = I_CAL_STATUS_NEEDSACTION; + } + +- e_cal_component_set_percent_as_int (self->component, percent); ++ e_cal_component_set_percent_complete (self->component, percent); + e_cal_component_set_status (self->component, status); + e_cal_component_set_completed (self->component, dt); + +- if (dt) +- e_cal_component_free_icaltimetype (dt); ++ g_clear_object (&dt); + } + + static GDateTime* + gtd_task_eds_get_creation_date (GtdTask *task) + { +- icaltimetype *idt; ++ ICalTime *idt; + GtdTaskEds *self; + GDateTime *dt; + + self = GTD_TASK_EDS (task); +- idt = NULL; + dt = NULL; + +- e_cal_component_get_created (self->component, &idt); ++ idt = e_cal_component_get_created (self->component); + + if (idt) + dt = convert_icaltime (idt); + +- g_clear_pointer (&idt, e_cal_component_free_icaltimetype); ++ g_clear_object (&idt); + + return dt; + } +@@ -286,7 +287,7 @@ gtd_task_eds_set_description (GtdTask *task, + static GDateTime* + gtd_task_eds_get_due_date (GtdTask *task) + { +- ECalComponentDateTime comp_dt; ++ ECalComponentDateTime *comp_dt; + GtdTaskEds *self; + GDateTime *date; + +@@ -294,10 +295,12 @@ gtd_task_eds_get_due_date (GtdTask *task) + + self = GTD_TASK_EDS (task); + +- e_cal_component_get_due (self->component, &comp_dt); ++ comp_dt = e_cal_component_get_due (self->component); ++ if (!comp_dt) ++ return NULL; + +- date = convert_icaltime (comp_dt.value); +- e_cal_component_free_datetime (&comp_dt); ++ date = convert_icaltime (e_cal_component_datetime_get_value (comp_dt)); ++ e_cal_component_datetime_free (comp_dt); + + return date; + } +@@ -317,11 +320,10 @@ gtd_task_eds_set_due_date (GtdTask *task, + + if (dt != current_dt) + { +- ECalComponentDateTime comp_dt; +- icaltimetype *idt; ++ ECalComponentDateTime *comp_dt; ++ ICalTime *idt; + +- comp_dt.value = NULL; +- comp_dt.tzid = NULL; ++ comp_dt = NULL; + idt = NULL; + + if (!current_dt || +@@ -329,36 +331,34 @@ gtd_task_eds_set_due_date (GtdTask *task, + dt && + g_date_time_compare (current_dt, dt) != 0)) + { +- idt = g_new0 (icaltimetype, 1); ++ idt = i_cal_time_new_null_time (); + + g_date_time_ref (dt); + + /* Copy the given dt */ +- idt->year = g_date_time_get_year (dt); +- idt->month = g_date_time_get_month (dt); +- idt->day = g_date_time_get_day_of_month (dt); +- idt->hour = g_date_time_get_hour (dt); +- idt->minute = g_date_time_get_minute (dt); +- idt->second = g_date_time_get_seconds (dt); +- idt->is_date = (idt->hour == 0 && +- idt->minute == 0 && +- idt->second == 0); +- +- comp_dt.tzid = g_strdup ("UTC"); ++ i_cal_time_set_date (idt, ++ g_date_time_get_year (dt), ++ g_date_time_get_month (dt), ++ g_date_time_get_day_of_month (dt)); ++ i_cal_time_set_time (idt, ++ g_date_time_get_hour (dt), ++ g_date_time_get_minute (dt), ++ g_date_time_get_seconds (dt)); ++ i_cal_time_set_is_date (idt, ++ i_cal_time_get_hour (idt) == 0 && ++ i_cal_time_get_minute (idt) == 0 && ++ i_cal_time_get_second (idt) == 0); + +- comp_dt.value = idt; ++ comp_dt = e_cal_component_datetime_new_take (idt, g_strdup ("UTC")); + +- e_cal_component_set_due (self->component, &comp_dt); ++ e_cal_component_set_due (self->component, comp_dt); + +- e_cal_component_free_datetime (&comp_dt); ++ e_cal_component_datetime_free (comp_dt); + + g_date_time_unref (dt); + } + else if (!dt) + { +- idt = NULL; +- comp_dt.tzid = NULL; +- + e_cal_component_set_due (self->component, NULL); + } + } +@@ -369,19 +369,13 @@ gtd_task_eds_set_due_date (GtdTask *task, + static gint32 + gtd_task_eds_get_priority (GtdTask *task) + { +- g_autofree gint *priority = NULL; + GtdTaskEds *self; + + g_assert (GTD_IS_TASK_EDS (task)); + + self = GTD_TASK_EDS (task); + +- e_cal_component_get_priority (self->component, &priority); +- +- if (!priority) +- return -1; +- +- return *priority; ++ return e_cal_component_get_priority (self->component); + } + + static void +@@ -394,29 +388,26 @@ gtd_task_eds_set_priority (GtdTask *task, + + self = GTD_TASK_EDS (task); + +- e_cal_component_set_priority (self->component, &priority); ++ e_cal_component_set_priority (self->component, priority); + } + + static const gchar* + gtd_task_eds_get_title (GtdTask *task) + { +- ECalComponentText summary; + GtdTaskEds *self; + + g_return_val_if_fail (GTD_IS_TASK_EDS (task), NULL); + + self = GTD_TASK_EDS (task); + +- e_cal_component_get_summary (self->component, &summary); +- +- return summary.value; ++ return i_cal_component_get_summary (e_cal_component_get_icalcomponent (self->component)); + } + + static void + gtd_task_eds_set_title (GtdTask *task, + const gchar *title) + { +- ECalComponentText new_summary; ++ ECalComponentText *new_summary; + GtdTaskEds *self; + + g_return_if_fail (GTD_IS_TASK_EDS (task)); +@@ -424,10 +415,11 @@ gtd_task_eds_set_title (GtdTask *task, + + self = GTD_TASK_EDS (task); + +- new_summary.value = title; +- new_summary.altrep = NULL; ++ new_summary = e_cal_component_text_new (title, NULL); + +- e_cal_component_set_summary (self->component, &new_summary); ++ e_cal_component_set_summary (self->component, new_summary); ++ ++ e_cal_component_text_free (new_summary); + } + + +@@ -436,10 +428,10 @@ gtd_task_eds_subtask_added (GtdTask *task, + GtdTask *subtask) + { + g_autoptr (GList) subtasks = NULL; +- ECalComponentId *id; ++ const gchar *uid; + ECalComponent *comp; +- icalcomponent *ical_comp; +- icalproperty *property; ++ ICalComponent *ical_comp; ++ ICalProperty *property; + GtdTaskEds *subtask_self; + GtdTaskEds *self; + +@@ -450,17 +442,17 @@ gtd_task_eds_subtask_added (GtdTask *task, + /* Hook with parent's :subtask_added */ + GTD_TASK_CLASS (gtd_task_eds_parent_class)->subtask_added (task, subtask); + +- id = e_cal_component_get_id (self->component); ++ uid = e_cal_component_get_uid (self->component); + comp = subtask_self->component; + ical_comp = e_cal_component_get_icalcomponent (comp); +- property = icalcomponent_get_first_property (ical_comp, ICAL_RELATEDTO_PROPERTY); ++ property = i_cal_component_get_first_property (ical_comp, I_CAL_RELATEDTO_PROPERTY); + + if (property) +- icalproperty_set_relatedto (property, id->uid); ++ i_cal_property_set_relatedto (property, uid); + else +- icalcomponent_add_property (ical_comp, icalproperty_new_relatedto (id->uid)); ++ i_cal_component_take_property (ical_comp, i_cal_property_new_relatedto (uid)); + +- e_cal_component_free_id (id); ++ g_clear_object (&property); + } + + static void +@@ -468,8 +460,8 @@ gtd_task_eds_subtask_removed (GtdTask *task, + GtdTask *subtask) + { + g_autoptr (GList) subtasks = NULL; +- icalcomponent *ical_comp; +- icalproperty *property; ++ ICalComponent *ical_comp; ++ ICalProperty *property; + GtdTaskEds *subtask_self; + + subtask_self = GTD_TASK_EDS (subtask); +@@ -480,12 +472,13 @@ gtd_task_eds_subtask_removed (GtdTask *task, + + /* Remove the parent link from the subtask's component */ + ical_comp = e_cal_component_get_icalcomponent (subtask_self->component); +- property = icalcomponent_get_first_property (ical_comp, ICAL_RELATEDTO_PROPERTY); ++ property = i_cal_component_get_first_property (ical_comp, I_CAL_RELATEDTO_PROPERTY); + + if (!property) + return; + +- icalcomponent_remove_property (ical_comp, property); ++ i_cal_component_remove_property (ical_comp, property); ++ g_object_unref (property); + } + + +diff --git a/plugins/eds/gtd-task-list-eds.c b/plugins/eds/gtd-task-list-eds.c +index eb48a73..5b71718 100644 +--- a/plugins/eds/gtd-task-list-eds.c ++++ b/plugins/eds/gtd-task-list-eds.c +@@ -85,19 +85,19 @@ setup_parent_task (GtdTaskListEds *self, + GtdTask *task) + { + ECalComponent *component; +- icalcomponent *ical_comp; +- icalproperty *property; ++ ICalComponent *ical_comp; ++ ICalProperty *property; + GtdTask *parent_task; + const gchar *parent_uid; + + component = gtd_task_eds_get_component (GTD_TASK_EDS (task)); + ical_comp = e_cal_component_get_icalcomponent (component); +- property = icalcomponent_get_first_property (ical_comp, ICAL_RELATEDTO_PROPERTY); ++ property = i_cal_component_get_first_property (ical_comp, I_CAL_RELATEDTO_PROPERTY); + + if (!property) + return; + +- parent_uid = icalproperty_get_relatedto (property); ++ parent_uid = i_cal_property_get_relatedto (property); + parent_task = gtd_task_list_get_task_by_id (GTD_TASK_LIST (self), parent_uid); + + if (parent_task) +@@ -112,6 +112,8 @@ setup_parent_task (GtdTaskListEds *self, + + g_ptr_array_add (self->pending_subtasks, data); + } ++ ++ g_object_unref (property); + } + + static void +@@ -161,8 +163,8 @@ on_view_objects_added_cb (ECalClientView *view, + GtdTask *task; + const gchar *uid; + +- component = e_cal_component_new_from_string (icalcomponent_as_ical_string (l->data)); +- e_cal_component_get_uid (component, &uid); ++ component = e_cal_component_new_from_icalcomponent (i_cal_component_clone (l->data)); ++ uid = e_cal_component_get_uid (component); + + task = gtd_task_list_get_task_by_id (self, uid); + +@@ -211,8 +213,8 @@ on_view_objects_modified_cb (ECalClientView *view, + GtdTask *task; + const gchar *uid; + +- component = e_cal_component_new_from_string (icalcomponent_as_ical_string (l->data)); +- e_cal_component_get_uid (component, &uid); ++ component = e_cal_component_new_from_icalcomponent (i_cal_component_clone (l->data)); ++ uid = e_cal_component_get_uid (component); + + task = gtd_task_list_get_task_by_id (self, uid); + +@@ -244,7 +246,7 @@ on_view_objects_removed_cb (ECalClientView *view, + GtdTask *task; + + id = l->data; +- task = gtd_task_list_get_task_by_id (self, id->uid); ++ task = gtd_task_list_get_task_by_id (self, e_cal_component_id_get_uid (id)); + + if (!task) + continue; +diff --git a/plugins/eds/meson.build b/plugins/eds/meson.build +index ea84426..b37f0c6 100644 +--- a/plugins/eds/meson.build ++++ b/plugins/eds/meson.build +@@ -8,10 +8,9 @@ plugins_ldflags += ['-Wl,--undefined=gtd_plugin_eds_register_types'] + ################ + + eds_plugin_deps = [ +- dependency('libecal-1.2', version: '>= 3.13.90'), ++ dependency('libecal-2.0', version: '>= 3.33.1'), + dependency('libedataserver-1.2', version: '>= 3.17.1'), + dependency('libedataserverui-1.2', version: '>= 3.17.1'), +- dependency('libical', version: '>= 0.43'), + ] + + eds_plugin_deps += gnome_todo_deps diff --git a/srcpkgs/gnome-todo/template b/srcpkgs/gnome-todo/template index 16cb152ff9c..1ab0a81432d 100644 --- a/srcpkgs/gnome-todo/template +++ b/srcpkgs/gnome-todo/template @@ -1,7 +1,7 @@ # Template file for 'gnome-todo' pkgname=gnome-todo version=3.28.1 -revision=4 +revision=5 build_style=meson build_helper="gir" configure_args="-Dintrospection=$(vopt_if gir true false)" @@ -14,7 +14,11 @@ license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Todo" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" checksum=c7571fc040d8901dd0e528282ef0655687f23f29d304057c72548ab3e2c2cf23 -nocross="https://build.voidlinux.org/builders/aarch64_builder/builds/19471/steps/shell_3/logs/stdio" +patch_args="-Np1" + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" qemu-user-static" +fi build_options="gir" build_options_default="gir" diff --git a/srcpkgs/gnome-tweaks/template b/srcpkgs/gnome-tweaks/template index ff9d1828c60..ac1f8bdb873 100644 --- a/srcpkgs/gnome-tweaks/template +++ b/srcpkgs/gnome-tweaks/template @@ -1,17 +1,17 @@ # Template file for 'gnome-tweaks' pkgname=gnome-tweaks -version=3.32.0 -revision=1 +version=3.34.0 +revision=2 archs=noarch build_style=meson pycompile_module="gtweak" -depends="gtk+3 dconf gnome-settings-daemon mutter libnotify python3-gobject" +depends="gtk+3 dconf gnome-settings-daemon mutter libnotify python3-gobject libhandy" short_desc="GNOME3 tool to customize advanced options" maintainer="Enno Boland " license="GPL-3.0-or-later, CC0-1.0" homepage="https://wiki.gnome.org/Apps/Tweaks" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=a54061b2c9150567ff22874c0c3a9e36c04ab6b0093b738c662e92c15919f90c +checksum=003326fab46e6faad9485924bca503f0c583e3b4553d6f673406eda396205250 nocross=yes replaces="gnome-tweak-tool>=0" diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template index 9d96116ae29..431c54f3934 100644 --- a/srcpkgs/gnome-user-docs/template +++ b/srcpkgs/gnome-user-docs/template @@ -1,6 +1,6 @@ # Template file for 'gnome-user-docs' pkgname=gnome-user-docs -version=3.32.3 +version=3.34.0 revision=1 archs=noarch build_style=gnu-configure @@ -13,4 +13,4 @@ license="CC-BY-3.0" homepage="https://github.com/GNOME/gnome-user-docs" #changelog="https://raw.githubusercontent.com/GNOME/gnome-user-docs/master/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=2fc2b50dcdb0ae49dd9a4f9d8bd993efe840ec0dbb910cb03f2ea3d728a07a37 +checksum=8f9907ff15fff97da75ece645cc86766703ac54d716d25563ba67ffed1af24ed diff --git a/srcpkgs/gnu-efi-libs/template b/srcpkgs/gnu-efi-libs/template index 80bed8b52f6..1d6e1e057e9 100644 --- a/srcpkgs/gnu-efi-libs/template +++ b/srcpkgs/gnu-efi-libs/template @@ -1,16 +1,16 @@ # Template file for 'gnu-efi-libs' pkgname=gnu-efi-libs reverts="3.0w_1" # Not an actual revert, xbps considers 3.0w higher than 3.0.8 -version=3.0.9 -revision=2 +version=3.0.10 +revision=1 wrksrc="gnu-efi-${version}" makedepends="pciutils-devel" short_desc="Library for building UEFI Applications using GNU toolchain" -maintainer="maxice8 " +maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://sourceforge.net/projects/gnu-efi/" distfiles="${SOURCEFORGE_SITE}/gnu-efi/gnu-efi-${version}.tar.bz2" -checksum=6715ea7eae1c7e4fc5041034bd3f107ec2911962ed284a081e491646b12277f0 +checksum=f12082a3a5f0c3e38c67262a9f34245d139ac2cdfc0a0bdcf03c9b1f56fa4fed nostrip=yes # If we are cross-building we need to pass the cross-compilation triplet diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template index cd02e38eb44..68bb811fc42 100644 --- a/srcpkgs/gnucash/template +++ b/srcpkgs/gnucash/template @@ -1,7 +1,7 @@ # Template file for 'gnucash' pkgname=gnucash -version=3.6 -revision=2 +version=3.7 +revision=1 build_style=cmake configure_args="-DWITH_SQL=0 -DWITH_PYTHON=1" hostmakedepends="pkg-config guile python3 libxslt perl" @@ -14,7 +14,7 @@ maintainer="Helmut Pozimski " license="GPL-2.0-or-later" homepage="http://www.gnucash.org" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2" -checksum=f1cb86de60bb0eb2cf5c2c3868e7dab7d889017e233230f944f158f84eb85f25 +checksum=6b8eb09f3980531509bcb3a589ab0334d827c32f860ce8a209aa2fe0ed8858b4 pycompile_module="gnucash" pycompile_dirs="usr/share/gnucash/python" diff --git a/srcpkgs/gnumeric/template b/srcpkgs/gnumeric/template index ae54b7b997a..bd198be684a 100644 --- a/srcpkgs/gnumeric/template +++ b/srcpkgs/gnumeric/template @@ -1,7 +1,7 @@ # Template file for 'gnumeric' pkgname=gnumeric version=1.12.45 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="bison gdk-pixbuf-devel glib-devel intltool itstool pkg-config " makedepends="goffice-devel librsvg-devel libxslt-devel" diff --git a/srcpkgs/gnupg2/patches/use-versioned-pcsclite.patch b/srcpkgs/gnupg2/patches/use-versioned-pcsclite.patch new file mode 100644 index 00000000000..0f12e5f446f --- /dev/null +++ b/srcpkgs/gnupg2/patches/use-versioned-pcsclite.patch @@ -0,0 +1,11 @@ +--- scd/scdaemon.c.orig 2019-09-29 12:18:47.810111976 +0700 ++++ scd/scdaemon.c 2019-09-29 12:20:38.079117234 +0700 +@@ -189,7 +189,7 @@ + #define DEFAULT_PCSC_DRIVER "winscard.dll" + #elif defined(__APPLE__) + #define DEFAULT_PCSC_DRIVER "/System/Library/Frameworks/PCSC.framework/PCSC" +-#elif defined(__GLIBC__) ++#elif defined(__linux__) + #define DEFAULT_PCSC_DRIVER "libpcsclite.so.1" + #else + #define DEFAULT_PCSC_DRIVER "libpcsclite.so" diff --git a/srcpkgs/gnupg2/template b/srcpkgs/gnupg2/template index 2d8b288a3e8..7b8037886bc 100644 --- a/srcpkgs/gnupg2/template +++ b/srcpkgs/gnupg2/template @@ -1,22 +1,25 @@ # Template file for 'gnupg2' pkgname=gnupg2 version=2.2.17 -revision=1 +revision=3 wrksrc="gnupg-${version}" build_style=gnu-configure configure_args="--with-libgcrypt-prefix=${XBPS_CROSS_BASE} --with-ksba-prefix=${XBPS_CROSS_BASE} --with-npth-prefix=${XBPS_CROSS_BASE} - --with-libassuan-prefix=${XBPS_CROSS_BASE} --enable-gpg-is-gpg2" + --with-libassuan-prefix=${XBPS_CROSS_BASE} --enable-gpg-is-gpg2 + $(vopt_enable ldap)" hostmakedepends="pkg-config" makedepends="bzip2-devel gnutls-devel libassuan-devel libcurl-devel libksba-devel libldap-devel libusb-compat-devel npth-devel sqlite-devel" depends="pinentry" short_desc="GNU Privacy Guard (2.x)" -maintainer="maxice8 " +maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://www.gnupg.org/" distfiles="https://gnupg.org/ftp/gcrypt/gnupg/gnupg-${version}.tar.bz2" checksum=afa262868e39b651a2db4c071fba90415154243e83a830ca00516f9a807fd514 +build_options="ldap" +build_options_default="ldap" pre_configure() { vsed -i '/examples\/systemd-user/d' doc/Makefile.in diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template index 88f0bb3e6df..d4b9123540b 100644 --- a/srcpkgs/gnutls/template +++ b/srcpkgs/gnutls/template @@ -1,10 +1,11 @@ # Template file for 'gnutls' pkgname=gnutls -version=3.6.9 +version=3.6.10 revision=1 build_style=gnu-configure configure_args="--with-zlib --disable-guile --disable-static - --disable-valgrind-tests --disable-rpath" + --disable-valgrind-tests --disable-rpath + --with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt" hostmakedepends="gettext-devel pkg-config libtool" # add autogen when #6550 is solved makedepends="zlib-devel lzo-devel readline-devel libgpg-error-devel @@ -15,7 +16,7 @@ maintainer="Orphaned " license="GPL-3.0-only, LGPL-2.1-or-later" homepage="https://gnutls.org" distfiles="https://www.gnupg.org/ftp/gcrypt/gnutls/v${version%.*}/gnutls-${version}.tar.xz" -checksum=4331fca55817ecdd74450b908a6c29b4f05bb24dd13144c6284aa34d872e1fcb +checksum=b1f3ca67673b05b746a961acf2243eaae0ffe658b6a6494265c648e7c7812293 gnutls-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/go-for-it/template b/srcpkgs/go-for-it/template index 87e86aa98cc..daa46e150b2 100644 --- a/srcpkgs/go-for-it/template +++ b/srcpkgs/go-for-it/template @@ -1,6 +1,6 @@ # Template file for 'go-for-it' pkgname=go-for-it -version=1.7.2 +version=1.7.3 revision=1 wrksrc="Go-For-It-${version}" build_style=cmake @@ -11,4 +11,4 @@ maintainer="Piraty " license="GPL-3.0-only" homepage="https://github.com/JMoerman/Go-For-It" distfiles="https://github.com/JMoerman/Go-For-It/archive/${version}.tar.gz" -checksum=446a461b148e7df2ed81f1340adba0181ba1f0f698c0b7b539223a2ee5aa54f6 +checksum=582ec27876dbfdab71c5fc681a74c3e4f5a4d0d73cd634a0c5db64e5c4c51ea7 diff --git a/srcpkgs/go-jira/template b/srcpkgs/go-jira/template index 537d365eca8..fc3668fa323 100644 --- a/srcpkgs/go-jira/template +++ b/srcpkgs/go-jira/template @@ -1,25 +1,15 @@ # Template file for 'go-jira' pkgname=go-jira -version=1.0.20 -revision=2 +version=1.0.21 +revision=1 +wrksrc="jira-${version}" build_style=go +go_import_path="github.com/go-jira/jira" +go_package="$go_import_path/cmd/jira" hostmakedepends="dep" short_desc="Simple jira command line client in Go" maintainer="Andrea Brancaleoni " -license="Apache" -go_import_path="github.com/Netflix-Skunkworks/go-jira" -go_package="$go_import_path/cmd/jira" +license="Apache-2.0" homepage="https://$go_import_path" distfiles="$homepage/archive/v$version.tar.gz" -checksum=0adf6d68e4a0700578706d9707dab633db8ee336151ce4232de93c7332459c45 - -pre_build() { - git config --global http.https://gopkg.in.followRedirects true - - cd $GOSRCPATH - dep ensure -} - -post_install() { - vlicense LICENSE -} +checksum=c76089423fc0d4b9dcdd39822d6d94452136f8f24b8c17ec75b0e702e40fbcc2 diff --git a/srcpkgs/go-md2man/template b/srcpkgs/go-md2man/template index e2cbc9a0073..c19f0817804 100644 --- a/srcpkgs/go-md2man/template +++ b/srcpkgs/go-md2man/template @@ -6,7 +6,7 @@ build_style=go go_import_path=github.com/cpuguy83/go-md2man hostmakedepends="git" short_desc="Convert md to manpages" -maintainer="maxice8 " +maintainer="Orphaned " license="MIT" homepage="https://${go_import_path}" distfiles="https://github.com/cpuguy83/go-md2man/archive/v${version}.tar.gz" diff --git a/srcpkgs/go-review/template b/srcpkgs/go-review/template new file mode 100644 index 00000000000..01cd9d00848 --- /dev/null +++ b/srcpkgs/go-review/template @@ -0,0 +1,18 @@ +# Template file for 'go-review' +pkgname=go-review +version=0.3.1 +revision=1 +build_style=go +go_import_path="github.com/heppu/go-review" +go_package="${go_import_path}/cmd/${pkgname}" +hostmakedepends="git" +short_desc="Publish reports from different Go linters as gerrit reviews" +maintainer="Renato Aguiar " +license="MIT" +homepage="https://github.com/heppu/go-review" +distfiles="https://github.com/heppu/go-review/archive/v${version}.tar.gz" +checksum=284eea5ec9184f169454de1f15a64beafd774653852d3e952171d9850651a553 + +post_install() { + vlicense LICENSE +} diff --git a/srcpkgs/go/patches/gohostarch-bootstrap-fix.patch b/srcpkgs/go/patches/gohostarch-bootstrap-fix.patch new file mode 100644 index 00000000000..7791b92abe7 --- /dev/null +++ b/srcpkgs/go/patches/gohostarch-bootstrap-fix.patch @@ -0,0 +1,28 @@ +From e1b1b7856f416ca6ff086adc00adc89fd900992c Mon Sep 17 00:00:00 2001 +From: Brad Fitzpatrick +Date: Thu, 26 Sep 2019 19:04:00 +0000 +Subject: [PATCH] cmd/dist: fix bootstrap failure when GOHOSTARCH is set + +Fixes #33977 + +Change-Id: I4b136788f08b08c53087af8d3cd56125e620b51b +Reviewed-on: https://go-review.googlesource.com/c/go/+/197602 +Run-TryBot: Brad Fitzpatrick +TryBot-Result: Gobot Gobot +Reviewed-by: Cherry Zhang +--- + +diff --git a/src/cmd/dist/buildtool.go b/src/cmd/dist/buildtool.go +index f293891..f27ea17 100644 +--- go/src/cmd/dist/buildtool.go ++++ go/src/cmd/dist/buildtool.go +@@ -250,6 +250,9 @@ + archCaps = fileArch + fileArch = strings.ToLower(fileArch) + fileArch = strings.TrimSuffix(fileArch, "splitload") ++ if fileArch == os.Getenv("GOHOSTARCH") { ++ return "", false ++ } + if fileArch == strings.TrimSuffix(runtime.GOARCH, "le") { + return "", false + } diff --git a/srcpkgs/go/template b/srcpkgs/go/template index 683e651aa7a..f74f4c9a0ce 100644 --- a/srcpkgs/go/template +++ b/srcpkgs/go/template @@ -1,6 +1,6 @@ # Template file for 'go' pkgname=go -version=1.12.8 +version=1.13.1 revision=1 create_wrksrc=yes build_wrksrc=go @@ -10,7 +10,7 @@ maintainer="Michael Aldridge " license="BSD-3-Clause" homepage="http://golang.org/" distfiles="https://golang.org/dl/go${version}.src.tar.gz" -checksum=11ad2e2e31ff63fcf8a2bdffbe9bfa2e1845653358daed593c8c2d03453c9898 +checksum=81f154e69544b9fa92b1475ff5f11e64270260d46e7e36c34aafc8bc96209358 nostrip=yes noverifyrdeps=yes diff --git a/srcpkgs/gocryptfs/template b/srcpkgs/gocryptfs/template index 98b28535695..65172c644aa 100644 --- a/srcpkgs/gocryptfs/template +++ b/srcpkgs/gocryptfs/template @@ -1,7 +1,7 @@ # Template file for 'gocryptfs' pkgname=gocryptfs -version=1.7 -revision=2 +version=1.7.1 +revision=1 wrksrc="${pkgname}_v${version}_src-deps" build_style=go go_import_path="github.com/rfjakob/gocryptfs" @@ -14,7 +14,7 @@ license="MIT" homepage="https://nuetzlich.net/gocryptfs" changelog="https://github.com/rfjakob/gocryptfs#changelog" distfiles="https://github.com/rfjakob/${pkgname}/releases/download/v${version}/${pkgname}_v${version}_src-deps.tar.gz" -checksum=2d1a2cfd072d554a28ee6e6807474b00ac710fb1aaf7aa81f3d8e94e80f6a703 +checksum=d3fc2c87b869025cd51e4abea030e58e7383197a7458f26bf99a71b224402bda post_install() { vlicense $GOSRCPATH/LICENSE diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template index 8eb582bfb7c..25c7e41ffc8 100644 --- a/srcpkgs/godot/template +++ b/srcpkgs/godot/template @@ -1,7 +1,7 @@ # Template file for 'godot' pkgname=godot -version=3.1 -revision=2 +version=3.1.1 +revision=1 wrksrc="${pkgname}-${version}-stable" build_style=scons # Godot contains private copies of libraries @@ -16,7 +16,7 @@ maintainer="Nick Hahn " license="MIT" homepage="https://www.godotengine.org/" distfiles="https://github.com/godotengine/${pkgname}/archive/${version}-stable.tar.gz" -checksum=cd66354b2397f28193ba3add8d8cc5c3562775f662887b56f16de82974f041e3 +checksum=3d952cda12a43d71c53c508bc64ca82cc165a3345976b6d128f869d5bd7a61d2 nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio CFLAGS+=" -fPIE -fPIC" diff --git a/srcpkgs/golangci-lint/template b/srcpkgs/golangci-lint/template index fd6dc0df15c..c493e5b6534 100644 --- a/srcpkgs/golangci-lint/template +++ b/srcpkgs/golangci-lint/template @@ -1,6 +1,6 @@ # Template file for 'golangci-lint' pkgname=golangci-lint -version=1.17.1 +version=1.20.0 revision=1 build_style=go go_import_path=github.com/golangci/golangci-lint/cmd/golangci-lint @@ -9,7 +9,7 @@ maintainer="Renato Aguiar " license="GPL-3.0-only" homepage="https://github.com/golangci/golangci-lint" distfiles="https://github.com/golangci/golangci-lint/archive/v${version}.tar.gz" -checksum=7e76e57cdd24b48e4bacc55575dd61e955789c705173f31994bccae894da1625 +checksum=9ea46fc1db83e7242c0188afd5e201b6a83afef9650de4e96ea8a60fddd93973 post_install() { vdoc README.md diff --git a/srcpkgs/golly/template b/srcpkgs/golly/template index ce2e403c661..3512fd71b72 100644 --- a/srcpkgs/golly/template +++ b/srcpkgs/golly/template @@ -1,7 +1,7 @@ # Template file for 'golly' pkgname=golly -version=3.2 -revision=4 +version=3.3 +revision=1 wrksrc="${pkgname}-${version}-src" build_style=gnu-configure configure_script="gui-wx/configure/configure" @@ -14,7 +14,7 @@ maintainer="Leah Neukirchen " license="GPL-2.0-or-later" homepage="http://golly.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-src.tar.gz" -checksum=4d02f78592b5ea211f1ceda2d5ba55eb10e013ecf95b8a61c7061357f9aae931 +checksum=88fd776b1afd763ef32ac6e6d95ddfcbc51b74f6ef6a1f3ba9aa659295d573c8 post_extract() { # POSIX name clash diff --git a/srcpkgs/gomatrix/template b/srcpkgs/gomatrix/template new file mode 100644 index 00000000000..fae7a4343ed --- /dev/null +++ b/srcpkgs/gomatrix/template @@ -0,0 +1,17 @@ +# Template file for 'gomatrix' +pkgname=gomatrix +version=101.0.0 +revision=1 +build_style=go +go_import_path=github.com/GeertJohan/gomatrix +hostmakedepends="git" +short_desc="Terminal Matrix display in golang" +maintainer="Alex Childs " +license="BSD-2-Clause" +homepage="https://github.com/GeertJohan/gomatrix" +distfiles="https://github.com/GeertJohan/gomatrix/archive/v${version}.tar.gz" +checksum=4d71d2509ac84f2340537d5e6f0eb9810b4173706f13cd6fe5e5e8ee5a69a50c + +post_install() { + vlicense LICENSE +} diff --git a/srcpkgs/goodvibes/template b/srcpkgs/goodvibes/template index 2f38a88a1ca..730fc7a27be 100644 --- a/srcpkgs/goodvibes/template +++ b/srcpkgs/goodvibes/template @@ -1,6 +1,6 @@ # Template file for 'goodvibes' pkgname=goodvibes -version=0.4.2 +version=0.4.3 revision=1 wrksrc="goodvibes-v${version}" build_style=meson @@ -14,4 +14,4 @@ license="GPL-3.0-or-later" homepage="https://gitlab.com/goodvibes/goodvibes" changelog="https://gitlab.com/goodvibes/goodvibes/raw/v${version}/NEWS" distfiles="https://gitlab.com/goodvibes/goodvibes/-/archive/v${version}/${pkgname}-v${version}.tar.gz" -checksum=aaa2650ee330e7b4cb97d9783ac8d2e5fbadd0af339a562638acebe674045fa1 +checksum=521a8b35380ddcb28795de9a749daea163fcd99486c866a276f776fa1fc683ae diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template index ee5cdf60538..5f93d6c5e28 100644 --- a/srcpkgs/google-chrome/template +++ b/srcpkgs/google-chrome/template @@ -1,5 +1,5 @@ # Template file for 'google-chrome' -_chromeVersion=76.0.3809.100 +_chromeVersion=77.0.3865.90 _chromeRevision=1 _channel=stable @@ -20,7 +20,7 @@ _filename="google-chrome-${_channel}_${_chromeVersion}-${_chromeRevision}_amd64. _chromeUrl="${_baseUrl}/${_filename}" distfiles="$_chromeUrl" -checksum=1dbf606dfa051a927fbd9a241a9032148d25be0851b2f27849a26ca81fa6b9b0 +checksum=f443503c88164f018ddb88247d2824431efcb863935ae476f4ada6218f41fdda do_extract() { mkdir -p ${DESTDIR} @@ -31,7 +31,7 @@ do_install() { tar xf data.tar.xz -C ${DESTDIR} # Install the icons - for size in 16 22 24 32 48 64 128 256; do + for size in 16 24 32 48 64 128 256; do # Create the google chrome xdg directory mkdir -p ${DESTDIR}/usr/share/icons/hicolor/${size}x${size}/apps diff --git a/srcpkgs/google-cloud-sdk/template b/srcpkgs/google-cloud-sdk/template index abf4ab1ba45..646b701d0ed 100644 --- a/srcpkgs/google-cloud-sdk/template +++ b/srcpkgs/google-cloud-sdk/template @@ -1,6 +1,6 @@ # Template file for 'google-cloud-sdk' pkgname=google-cloud-sdk -version=256.0.0 +version=267.0.0 revision=1 archs=noarch wrksrc=$pkgname @@ -10,7 +10,7 @@ maintainer="Daniel Santana " license="Apache-2.0" homepage="https://cloud.google.com/sdk" distfiles="https://dl.google.com/dl/cloudsdk/release/downloads/for_packagers/linux/${pkgname}_${version}.orig.tar.gz" -checksum=b53debf3c1a9a0d3f6e3df6f8dce6aa0d9d9010221b604ef5140c9453b28d140 +checksum=2a3ebea6294d9bb1e62fcfd3a84e0d2e9e760cce6dcf5542013590640ccc0204 do_install() { vmkdir usr/lib/$pkgname @@ -40,5 +40,4 @@ do_install() { vdoc README vdoc VERSION vdoc RELEASE_NOTES - vlicense LICENSE } diff --git a/srcpkgs/googler/template b/srcpkgs/googler/template index fff59844076..a22598c4058 100644 --- a/srcpkgs/googler/template +++ b/srcpkgs/googler/template @@ -6,7 +6,7 @@ build_style=gnu-makefile make_build_target=disable-self-upgrade depends="python3 xsel xclip" short_desc="Google Search, Site Search and News from the terminal" -maintainer="maxice8 " +maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://github.com/jarun/googler" distfiles="https://github.com/jarun/googler/archive/v${version}.tar.gz" diff --git a/srcpkgs/gopls/template b/srcpkgs/gopls/template new file mode 100644 index 00000000000..64243fe9908 --- /dev/null +++ b/srcpkgs/gopls/template @@ -0,0 +1,20 @@ +# Template file for 'gopls' +pkgname=gopls +version=0.1.7 +revision=1 +wrksrc=tools-gopls-v${version} +build_style=go +go_import_path=golang.org/x/tools/gopls +hostmakedepends="git" +short_desc="Official language server for the Go language" +maintainer="Renato Aguiar " +license="MIT" +homepage="https://github.com/golang/tools" +distfiles="https://github.com/golang/tools/archive/gopls/v${version}.tar.gz" +checksum=3081a1ec963228baf18063c914ec04916030d87f443126ec8ae56cbc114ef747 + +post_install() { + vlicense LICENSE + vdoc gopls/README.md + vcopy gopls/doc usr/share/doc/${pkgname} +} diff --git a/srcpkgs/goversion/template b/srcpkgs/goversion/template index 304044bc0c5..390551d2b42 100644 --- a/srcpkgs/goversion/template +++ b/srcpkgs/goversion/template @@ -6,7 +6,7 @@ build_style=go go_import_path=rsc.io/goversion hostmakedepends="git" short_desc="Print version used to build Go executables" -maintainer="maxice8 " +maintainer="Orphaned " license="BSD-3-Clause" homepage="https://github.com/rsc/goversion" distfiles="https://github.com/rsc/goversion/archive/v${version}.tar.gz" diff --git a/srcpkgs/gperftools/patches/elf-mem-image-musl.patch b/srcpkgs/gperftools/patches/elf-mem-image-musl.patch new file mode 100644 index 00000000000..541cde28b2b --- /dev/null +++ b/srcpkgs/gperftools/patches/elf-mem-image-musl.patch @@ -0,0 +1,13 @@ +This relies on link.h, which is present in musl as well as glibc. + +--- src/base/elf_mem_image.h ++++ src/base/elf_mem_image.h +@@ -43,7 +43,7 @@ + + // Maybe one day we can rewrite this file not to require the elf + // symbol extensions in glibc, but for right now we need them. +-#if defined(__ELF__) && defined(__GLIBC__) && !defined(__native_client__) ++#if defined(__ELF__) && !defined(__native_client__) + + #define HAVE_ELF_MEM_IMAGE 1 + diff --git a/srcpkgs/gperftools/patches/ppc-musl.patch b/srcpkgs/gperftools/patches/ppc-musl.patch new file mode 100644 index 00000000000..d7a3645d6d7 --- /dev/null +++ b/srcpkgs/gperftools/patches/ppc-musl.patch @@ -0,0 +1,76 @@ +Compatibility fixes for musl. + +--- m4/pc_from_ucontext.m4 ++++ m4/pc_from_ucontext.m4 +@@ -31,6 +31,7 @@ AC_DEFUN([AC_PC_FROM_UCONTEXT], + pc_fields="$pc_fields uc_mcontext.gregs[[R15]]" # Linux (arm old [untested]) + pc_fields="$pc_fields uc_mcontext.arm_pc" # Linux (arm arch 5) + pc_fields="$pc_fields uc_mcontext.gp_regs[[PT_NIP]]" # Suse SLES 11 (ppc64) ++ pc_fields="$pc_fields uc_mcontext.gregs[[PT_NIP]]" + pc_fields="$pc_fields uc_mcontext.mc_eip" # FreeBSD (i386) + pc_fields="$pc_fields uc_mcontext.mc_rip" # FreeBSD (x86_64 [untested]) + pc_fields="$pc_fields uc_mcontext.__gregs[[_REG_EIP]]" # NetBSD (i386) +@@ -55,7 +56,8 @@ AC_DEFUN([AC_PC_FROM_UCONTEXT], + pc_field_found=true) + elif test "x$ac_cv_header_sys_ucontext_h" = xyes; then + AC_TRY_COMPILE([#define _GNU_SOURCE 1 +- #include ], ++ #include ++ #include ], + [ucontext_t u; return u.$pc_field == 0;], + AC_DEFINE_UNQUOTED(PC_FROM_UCONTEXT, $pc_field, + How to access the PC from a struct ucontext) +@@ -63,7 +65,8 @@ AC_DEFUN([AC_PC_FROM_UCONTEXT], + pc_field_found=true) + elif test "x$ac_cv_header_ucontext_h" = xyes; then + AC_TRY_COMPILE([#define _GNU_SOURCE 1 +- #include ], ++ #include ++ #include ], + [ucontext_t u; return u.$pc_field == 0;], + AC_DEFINE_UNQUOTED(PC_FROM_UCONTEXT, $pc_field, + How to access the PC from a struct ucontext) +--- src/getpc.h ++++ src/getpc.h +@@ -65,6 +65,9 @@ + typedef ucontext ucontext_t; + #endif + ++#if defined(__powerpc__) && !defined(PT_NIP) ++#define PT_NIP 32 ++#endif + + // Take the example where function Foo() calls function Bar(). For + // many architectures, Bar() is responsible for setting up and tearing +--- src/stacktrace_powerpc-linux-inl.h ++++ src/stacktrace_powerpc-linux-inl.h +@@ -186,7 +186,7 @@ static int GET_STACK_TRACE_OR_FRAMES { + ucontext_t uc; + // We don't care about the rest, since the IP value is at 'uc' field. + } *sigframe = reinterpret_cast(current); +- result[n] = (void*) sigframe->uc.uc_mcontext.gp_regs[PT_NIP]; ++ result[n] = (void*) sigframe->uc.uc_mcontext.gp_regs[32]; + } + #else + if (sigtramp32_vdso && (sigtramp32_vdso == current->return_addr)) { +@@ -196,7 +196,7 @@ static int GET_STACK_TRACE_OR_FRAMES { + mcontext_t mctx; + // We don't care about the rest, since IP value is at 'mctx' field. + } *sigframe = reinterpret_cast(current); +- result[n] = (void*) sigframe->mctx.gregs[PT_NIP]; ++ result[n] = (void*) sigframe->mctx.gregs[32]; + } else if (sigtramp32_rt_vdso && (sigtramp32_rt_vdso == current->return_addr)) { + struct rt_signal_frame_32 { + char dummy[64 + 16]; +@@ -204,7 +204,11 @@ static int GET_STACK_TRACE_OR_FRAMES { + ucontext_t uc; + // We don't care about the rest, since IP value is at 'uc' field.A + } *sigframe = reinterpret_cast(current); ++#if defined(__GLIBC__) + result[n] = (void*) sigframe->uc.uc_mcontext.uc_regs->gregs[PT_NIP]; ++#else ++ result[n] = (void*) sigframe->uc.uc_mcontext.gregs[32]; ++#endif + } + #endif + diff --git a/srcpkgs/gperftools/template b/srcpkgs/gperftools/template index 0cb00c5fb97..bded7024477 100644 --- a/srcpkgs/gperftools/template +++ b/srcpkgs/gperftools/template @@ -1,8 +1,9 @@ # Template file for 'gperftools' pkgname=gperftools version=2.7 -revision=2 +revision=3 build_style=gnu-configure +hostmakedepends="automake libtool" makedepends="libunwind-devel" checkdepends="perl" short_desc="Multi-threaded malloc() and performance analysis tools" @@ -12,11 +13,22 @@ homepage="https://github.com/gperftools/gperftools" distfiles="https://github.com/${pkgname}/${pkgname}/releases/download/${pkgname}-${version}/${pkgname}-${version}.tar.gz" checksum=1ee8c8699a0eff6b6a203e59b43330536b22bbcbe6448f54c7091e5efb0763c9 +if [ "$XBPS_TARGET_LIBC" = "musl" ]; then + # needed by some newly enabled code + CXXFLAGS+=" -D__WORDSIZE=$XBPS_TARGET_WORDSIZE" + # needed on musl other than x86_64 + if [ "$XBPS_TARGET_MACHINE" != "x86_64-musl" ]; then + makedepends+=" libucontext-devel" + LDFLAGS+=" -lucontext" + fi +fi + case "$XBPS_TARGET_MACHINE" in arm*-musl|aarch64-musl) + # having libunwind in makedepends still causes failures... makedepends="libucontext-devel" - LDFLAGS=" -lucontext" - configure_args="--disable-libunwind" + configure_args+=" --disable-libunwind" + ;; esac post_extract() { @@ -24,6 +36,10 @@ post_extract() { src/base/linux_syscall_support.h src/malloc_hook_mmap_linux.h } +pre_configure() { + autoreconf -fi +} + post_install() { vlicense COPYING rm -rf ${DESTDIR}/usr/share/doc diff --git a/srcpkgs/gpgme/template b/srcpkgs/gpgme/template index 3492b8c29f6..cbc08afe773 100644 --- a/srcpkgs/gpgme/template +++ b/srcpkgs/gpgme/template @@ -16,13 +16,13 @@ homepage="https://www.gnupg.org/software/gpgme/index.html" distfiles="https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-${version}.tar.bz2" checksum=c4e30b227682374c23cddc7fdb9324a99694d907e79242a25a4deeedb393be46 -case "$XBPS_TARGET_MACHINE" in - *-musl) configure_args+=" ac_cv_sys_file_offset_bits=no";; - i686*|arm*) - CFLAGS="-D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1" - CXXFLAGS="${CFLAGS}" - ;; -esac +if [ "$XBPS_TARGET_LIBC" = "musl" ]; then + configure_args+=" ac_cv_sys_file_offset_bits=no" +elif [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then + CFLAGS="-D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1" + CXXFLAGS="${CFLAGS}" +fi + CXXFLAGS+=" -D_GLIBCXX_USE_C99_STDIO=1" post_extract() { diff --git a/srcpkgs/gpodder/template b/srcpkgs/gpodder/template index ae495f11f13..7c7414e19cd 100644 --- a/srcpkgs/gpodder/template +++ b/srcpkgs/gpodder/template @@ -1,6 +1,6 @@ # Template file for 'gpodder' pkgname=gpodder -version=3.10.9 +version=3.10.11 revision=1 archs=noarch wrksrc="gpodder-${version}" @@ -16,8 +16,7 @@ maintainer="bra1nwave " license="GPL-3.0-or-later" homepage="https://github.com/gpodder/gpodder" distfiles="${homepage}/archive/${version}.tar.gz" -checksum=ab7eab4e9e63556c463a9efdcf0b26069f56c047d7cef7fd22931b71ba025dbf -nocross="gobject-introspection" +checksum=eaa5b0b74ba00699342dbf317d52f1c4e52d77b7313fc9144cd01eea68b314cc do_install() { make install DESTDIR=${DESTDIR} diff --git a/srcpkgs/gpsim/template b/srcpkgs/gpsim/template index 18a284ae05d..1778e73658e 100644 --- a/srcpkgs/gpsim/template +++ b/srcpkgs/gpsim/template @@ -1,6 +1,6 @@ # Template file for 'gpsim' pkgname=gpsim -version=0.30.0 +version=0.31.0 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" @@ -10,7 +10,11 @@ maintainer="Robert Lowry " license="GPL-2.0-or-later" homepage="http://gpsim.sourceforge.net/" distfiles="https://sourceforge.net/projects/gpsim/files/gpsim/${version}/gpsim-${version}.tar.gz" -checksum=e1927312c37119bc26d6abf2c250072a279a9c764c49ae9d71b4ccebb8154f86 +checksum=110ee6be3a5d02b32803a91e480cbfc9d423ef72e0830703fc0bc97b9569923f + +pre_configure() { + vsed -i -e 's/#include "error.h"//' src/modules.cc +} gpsim-devel_package() { short_desc+=" - development files" diff --git a/srcpkgs/gradle/template b/srcpkgs/gradle/template index e1dd49e3fe5..6cc8ee612f3 100644 --- a/srcpkgs/gradle/template +++ b/srcpkgs/gradle/template @@ -1,6 +1,6 @@ # Template file for 'gradle' pkgname=gradle -version=4.10.3 +version=5.6.2 revision=1 archs=noarch hostmakedepends="unzip" @@ -11,15 +11,13 @@ license="Apache-2.0" homepage="https://gradle.org/" changelog="https://docs.gradle.org/${version}/release-notes.html" distfiles="https://services.gradle.org/distributions/gradle-${version}-bin.zip" -checksum=8626cbf206b4e201ade7b87779090690447054bc93f052954c78480fa6ed186e +checksum=32fce6628848f799b0ad3205ae8db67d0d828c10ffe62b748a7c0d9f4a5d9ee0 nocross=yes do_install() { vmkdir "usr/lib/gradle" - vmkdir "usr/share/doc/gradle" sed ${FILESDIR}/gradle -e "s;@VERSION@;${version};" > gradle vbin gradle - - cp -v getting-started.html ${DESTDIR}/usr/share/doc/gradle + vdoc getting-started.html mv lib ${DESTDIR}/usr/lib/gradle/ } diff --git a/srcpkgs/grafana/template b/srcpkgs/grafana/template index 079b943a502..5a03e8944ba 100644 --- a/srcpkgs/grafana/template +++ b/srcpkgs/grafana/template @@ -1,6 +1,6 @@ # Template file for 'grafana' pkgname=grafana -version=6.3.2 +version=6.3.5 revision=1 build_style=go go_import_path=github.com/grafana/grafana @@ -11,7 +11,7 @@ maintainer="Michael Aldridge " license="Apache-2.0" homepage="https://grafana.com" distfiles="https://github.com/grafana/grafana/archive/v${version}.tar.gz" -checksum=b6b6fa21969c3dc2e1241f2f00ca1dc5aa291a691cccefff21b0bf9606b8fdb4 +checksum=193974115bf868272dbff08e53fdc0c97af3a07a24758390178ce53e5c9e179b system_accounts="_grafana" _grafana_homedir="/var/lib/grafana" diff --git a/srcpkgs/gramps/template b/srcpkgs/gramps/template index 0b71cbced3a..9d1d1a4616a 100644 --- a/srcpkgs/gramps/template +++ b/srcpkgs/gramps/template @@ -1,6 +1,6 @@ # Template file for 'gramps' pkgname=gramps -version=5.0.1 +version=5.1.1 revision=1 archs=noarch build_style=python3-module @@ -11,9 +11,9 @@ short_desc="Genealogy program" maintainer="7185 <7185@free.fr>" license="GPL-2.0-or-later" homepage="https://gramps-project.org" -changelog="${homepage}/introduction-WP/2018/12/gramps-5-0-1-released" +changelog="https://gramps-project.org/introduction-WP/2019/09/gramps-5-1-1-released/" distfiles="https://github.com/gramps-project/${pkgname}/archive/v${version}.tar.gz" -checksum=3a81265764a314cca0540593ccd639c5b76199615b3b0aace0b2540fc186eba5 +checksum=7623c1e976a19e121f6fa799ca619def18672000ba7fd505abdaa9e782920eda post_install() { echo -n '/usr/share' > ${DESTDIR}${py3_sitelib}/gramps/gen/utils/resource-path diff --git a/srcpkgs/granite/template b/srcpkgs/granite/template index f5af855b5ee..6aed37e4689 100644 --- a/srcpkgs/granite/template +++ b/srcpkgs/granite/template @@ -1,6 +1,6 @@ # Template file for 'granite' pkgname=granite -version=5.2.4 +version=5.2.5 revision=1 build_style=meson build_helper="gir" @@ -12,13 +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=45349b24f3f5e9216354894f5598104e08d72992d81a41dadc373602853419fb - -case "$XBPS_TARGET_MACHINE" in - i686-musl|x86_64-musl) ;; - *-musl) broken="gobject introspection" ;; - *) ;; -esac +checksum=1c1cbe94b18a3ba2e3a099206906827d1ecf0c9572c349059fee23b6b0738966 granite-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/grantleetheme/template b/srcpkgs/grantleetheme/template index a6d80f86b0f..c457c93435c 100644 --- a/srcpkgs/grantleetheme/template +++ b/srcpkgs/grantleetheme/template @@ -1,6 +1,6 @@ # Template file for 'grantleetheme' pkgname=grantleetheme -version=19.08.0 +version=19.08.2 revision=1 build_style=cmake configure_args="KDE_INSTALL_USE_QT_SYS_PATHS=TRUE" @@ -12,7 +12,7 @@ maintainer="John " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://community.kde.org/KDE_PIM" distfiles="${KDE_SITE}/applications/${version}/src/grantleetheme-${version}.tar.xz" -checksum=c966ad7ef55a784c8cf97a69d4885b9b9d7956c84a4e323404e5cf88154cc543 +checksum=a9d4e70089debdfaffb4af881cf2064ba68a0ad3fe007985c8e5997f0cf0e836 grantleetheme-devel_package() { depends="${sourcepkg}>=${version}_${revision} ${makedpends}" diff --git a/srcpkgs/graphene/template b/srcpkgs/graphene/template index 1dab79df685..f2fe81a3f47 100644 --- a/srcpkgs/graphene/template +++ b/srcpkgs/graphene/template @@ -1,7 +1,7 @@ # Template file for 'graphene' pkgname=graphene version=1.8.2 -revision=1 +revision=2 build_style=meson build_helper="gir" configure_args="-Dtests=false -Dbenchmarks=false @@ -16,12 +16,7 @@ distfiles="${GNOME_SITE}/graphene/${version%.*}/graphene-${version}.tar.xz" checksum=b3fcf20996e57b1f4df3941caac10f143bb29890a42f7a65407cd19271fc89f7 build_options="gir" - -case "$XBPS_TARGET_MACHINE" in - i686-musl|x86_64-musl) build_options_default+=" gir" ;; - *-musl) ;; - *) build_options_default+=" gir" ;; -esac +build_options_default="gir" post_install() { vlicense LICENSE diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template index 87571420750..be38ef148ac 100644 --- a/srcpkgs/grpc/template +++ b/srcpkgs/grpc/template @@ -1,23 +1,28 @@ # Template file for 'grpc' pkgname=grpc -version=1.22.0 +version=1.24.2 revision=1 +_upbver=931bbecbd3230ae7f22efa5d203639facc47f719 build_style=gnu-makefile make_build_args="prefix=\$(DESTDIR)/usr AROPTS=rc LD=\$(CC)" make_install_args="prefix=\$(DESTDIR)/usr" hostmakedepends="protobuf" -makedepends="zlib-devel c-ares-devel libressl-devel libprotoc-devel protobuf-devel gperftools-devel" -depends="" +makedepends="zlib-devel c-ares-devel libressl-devel libprotoc-devel + protobuf-devel gperftools-devel" short_desc="High performance, open source, general RPC framework" maintainer="Leah Neukirchen " license="Apache-2.0" homepage="https://github.com/grpc/grpc" -distfiles="https://github.com/$pkgname/$pkgname/archive/v${version}/$pkgname-${version}.tar.gz" -checksum=11ac793c562143d52fd440f6549588712badc79211cdc8c509b183cb69bddad8 +distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}/${pkgname}-${version}.tar.gz + https://github.com/protocolbuffers/upb/archive/${_upbver}/upb-${_upbver}.tar.gz" +checksum="fd040f5238ff1e32b468d9d38e50f0d7f8da0828019948c9001e9a03093e1d8f + 95150db57b51b65f3422c38953956e0f786945d842d76f8ab685fbcd93ab5caa" nocross=yes post_extract() { sed -r 's/-Werror//g;/ldconfig/d;s/ strip-(static|shared)_c(xx)? / /' -i Makefile + rm -rf third_party/upb + mv ../upb-${_upbver} third_party/upb } post_install() { vlicense NOTICE.txt diff --git a/srcpkgs/grub/files/kernel.d/grub.post b/srcpkgs/grub/files/kernel.d/grub.post index f28257d999d..561d8b2f179 100644 --- a/srcpkgs/grub/files/kernel.d/grub.post +++ b/srcpkgs/grub/files/kernel.d/grub.post @@ -7,6 +7,8 @@ PKGNAME="$1" VERSION="$2" +export ZPOOL_VDEV_NAME_PATH=YES + if command -v grub-mkconfig >/dev/null 2>&1; then if [ -d $ROOTDIR/boot/grub ]; then grub-mkconfig -o $ROOTDIR/boot/grub/grub.cfg diff --git a/srcpkgs/grub/template b/srcpkgs/grub/template index cd6b168036d..16f3f5eb01c 100644 --- a/srcpkgs/grub/template +++ b/srcpkgs/grub/template @@ -1,7 +1,7 @@ # Template file for 'grub' pkgname=grub version=2.04 -revision=1 +revision=2 hostmakedepends="python3 pkg-config flex freetype-devel font-unifont-bdf" makedepends="libusb-compat-devel ncurses-devel freetype-devel liblzma-devel device-mapper-devel fuse-devel" diff --git a/srcpkgs/gscan2pdf/template b/srcpkgs/gscan2pdf/template index c760df42221..31c1b7be9a0 100644 --- a/srcpkgs/gscan2pdf/template +++ b/srcpkgs/gscan2pdf/template @@ -1,6 +1,6 @@ # Template file for 'gscan2pdf' pkgname=gscan2pdf -version=2.5.5 +version=2.5.7 revision=1 archs=noarch build_style=perl-module @@ -17,7 +17,7 @@ maintainer="Helmut Pozimski " license="GPL-3.0-or-later" homepage="http://gscan2pdf.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=68570af787b04f8425091a1cfe5a53f34dab0384b28a2907151d22737695d03d +checksum=11a26c7070437359d1d7c3b6e3e9009317cd82a8ae96df737a555c8687630974 nocross=yes do_check() { diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template index f421fa43e3b..7c3e76e6b3d 100644 --- a/srcpkgs/gsettings-desktop-schemas/template +++ b/srcpkgs/gsettings-desktop-schemas/template @@ -1,7 +1,7 @@ # Template file for 'gsettings-desktop-schemas' pkgname=gsettings-desktop-schemas -version=3.32.0 -revision=2 +version=3.34.0 +revision=1 build_helper="gir" build_style=meson configure_args="-Dintrospection=$(vopt_if gir true false)" @@ -12,7 +12,7 @@ maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=2d59b4b3a548859dfae46314ee4666787a00d5c82db382e97df7aa9d0e310a35 +checksum=288b04260f7040b0e004a8d59c773cfb4e32df4f1b4a0f9d705c51afccc95ead # Package build options build_options="gir" diff --git a/srcpkgs/gsl/patches/ppc-musl.patch b/srcpkgs/gsl/patches/ppc-musl.patch new file mode 100644 index 00000000000..807ae163675 --- /dev/null +++ b/srcpkgs/gsl/patches/ppc-musl.patch @@ -0,0 +1,36 @@ +fpu_control.h is glibc specific, but we only need some bits from it. + +--- ieee-utils/fp-gnuppc.c ++++ ieee-utils/fp-gnuppc.c +@@ -18,7 +18,31 @@ + */ + + #include ++ ++#if defined(__GLIBC__) + #include ++#else ++/* copied from fpu_control.h, only stuff that is needed here */ ++# define _FPU_RC_NEAREST 0x00 ++# define _FPU_RC_DOWN 0x03 ++# define _FPU_RC_UP 0x02 ++# define _FPU_RC_ZERO 0x01 ++ ++# define _FPU_MASK_ZM 0x10 ++# define _FPU_MASK_OM 0x40 ++# define _FPU_MASK_UM 0x20 ++# define _FPU_MASK_IM 0x80 ++ ++# define _FPU_SETCW(cw) \ ++ { union { double __d; unsigned long long __ll; } __u; \ ++ register double __fr; \ ++ __u.__ll = 0xfff80000LL << 32; /* This is a QNaN. */ \ ++ __u.__ll |= (cw) & 0xffffffffLL; \ ++ __fr = __u.__d; \ ++ __asm__ __volatile__("mtfsf 255,%0" : : "f" (__fr)); \ ++ } ++#endif ++ + #include + #include + diff --git a/srcpkgs/gst-libav/template b/srcpkgs/gst-libav/template index f8b2729621e..d0187de47eb 100644 --- a/srcpkgs/gst-libav/template +++ b/srcpkgs/gst-libav/template @@ -1,6 +1,6 @@ # Template file for 'gst-libav' pkgname=gst-libav -version=1.16.0 +version=1.16.1 revision=1 wrksrc="${pkgname}-${version}" build_style=meson @@ -13,7 +13,7 @@ maintainer="Orphaned " license="LGPL-2.0-or-later" homepage="https://gstreamer.freedesktop.org" distfiles="${homepage}/src/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=dfac119043a9cfdcacd7acde77f674ab172cf2537b5812be52f49e9cddc53d9a +checksum=e8a5748ae9a4a7be9696512182ea9ffa6efe0be9b7976916548e9d4381ca61c4 case "$XBPS_TARGET_MACHINE" in *-musl) # Required by musl for M_SQRT1_2 diff --git a/srcpkgs/gst-omx/template b/srcpkgs/gst-omx/template index 1f9c2550df0..9c5aae67430 100644 --- a/srcpkgs/gst-omx/template +++ b/srcpkgs/gst-omx/template @@ -1,6 +1,6 @@ # Template file for 'gst-omx' pkgname=gst-omx -version=1.16.0 +version=1.16.1 revision=1 build_style=gnu-configure configure_args="--disable-examples" @@ -11,7 +11,7 @@ maintainer="Orphaned " license="LGPL-2.1-only" homepage="https://gstreamer.freedesktop.org" distfiles="${homepage}/src/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=fef77cddc02784608451c46b9def880b63230a246decf8900f2da2ed54a8af4a +checksum=cbf54121a2cba575d460833e8132265781252ce32cf5b8f9fa8753e42ab24bb2 case "$XBPS_TARGET_MACHINE" in i686*|x86_64*|aarch64*|ppc64*) diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template index 476d0c11bbc..4a293277495 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.0 -revision=4 +version=1.16.1 +revision=1 wrksrc="${pkgname/1/}-${version}" build_helper="gir" build_style=meson @@ -35,7 +35,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://gstreamer.freedesktop.org" distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz" -checksum=22139de35626ada6090bdfa3423b27b7fc15a0198331d25c95e6b12cb1072b05 +checksum=56481c95339b8985af13bac19b18bc8da7118c2a7d9440ed70e7dcd799c2adb5 build_options="gir" build_options_default="gir" diff --git a/srcpkgs/gst-plugins-base1/template b/srcpkgs/gst-plugins-base1/template index 06e984fbe45..3f33619ee90 100644 --- a/srcpkgs/gst-plugins-base1/template +++ b/srcpkgs/gst-plugins-base1/template @@ -1,6 +1,6 @@ # Template file for 'gst-plugins-base1' pkgname=gst-plugins-base1 -version=1.16.0 +version=1.16.1 revision=1 wrksrc="${pkgname/1/}-${version}" build_style=meson @@ -21,7 +21,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later, LGPL-2.0-or-later" homepage="https://gstreamer.freedesktop.org" distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz" -checksum=4093aa7b51e28fb24dfd603893fead8d1b7782f088b05ed0f22a21ef176fb5ae +checksum=5c3cc489933d0597087c9bc6ba251c93693d64554bcc563539a084fa2d5fcb2b # Package build options build_options="cdparanoia gir sndio" diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template index c5902e3df78..d83d85fff42 100644 --- a/srcpkgs/gst-plugins-good1/template +++ b/srcpkgs/gst-plugins-good1/template @@ -1,7 +1,7 @@ # Template file for 'gst-plugins-good1' pkgname=gst-plugins-good1 -version=1.16.0 -revision=2 +version=1.16.1 +revision=1 wrksrc="${pkgname/1/}-${version}" build_style=meson configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled @@ -23,7 +23,7 @@ maintainer="Orphaned " license="LGPL-2.1-or-later" homepage="https://gstreamer.freedesktop.org" distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz" -checksum=654adef33380d604112f702c2927574cfc285e31307b79e584113858838bb0fd +checksum=9fbabe69018fcec707df0b71150168776040cde6c1a26bb5a82a136755fa8f1f lib32disabled=yes build_options="gtk3 qt" diff --git a/srcpkgs/gst-plugins-ugly1/template b/srcpkgs/gst-plugins-ugly1/template index 81e821f677b..e7bd16be207 100644 --- a/srcpkgs/gst-plugins-ugly1/template +++ b/srcpkgs/gst-plugins-ugly1/template @@ -1,6 +1,6 @@ # Template file for 'gst-plugins-ugly1'. pkgname=gst-plugins-ugly1 -version=1.16.0 +version=1.16.1 revision=1 lib32disabled=yes wrksrc="${pkgname/1/}-${version}" @@ -17,4 +17,4 @@ maintainer="Orphaned " license="LGPL-2.1-or-later" homepage="https://gstreamer.freedesktop.org" distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz" -checksum=e30964c5f031c32289e0b25e176c3c95a5737f2052dfc81d0f7427ef0233a4c2 +checksum=4bf913b2ca5195ac3b53b5e3ade2dc7c45d2258507552ddc850c5fa425968a1d diff --git a/srcpkgs/gst1-editing-services/template b/srcpkgs/gst1-editing-services/template index 02666970553..ea4e9fb9262 100644 --- a/srcpkgs/gst1-editing-services/template +++ b/srcpkgs/gst1-editing-services/template @@ -1,6 +1,6 @@ # Template file for 'gst1-editing-services' pkgname=gst1-editing-services -version=1.16.0 +version=1.16.1 revision=1 wrksrc="${pkgname/gst1/gstreamer}-${version}" build_style=meson @@ -13,7 +13,7 @@ maintainer="Toyam Cox " license="LGPL-2.0-or-later" homepage="https://gstreamer.freedesktop.org" distfiles="${homepage}/src/${pkgname/gst1/gst}/${pkgname/gst1/gstreamer}-${version}.tar.xz" -checksum=82a3faefb2b0d91e134fd02cddeee718b7846a07cbf0127fed7aa03e25495ad1 +checksum=c884878f9e6ddac96e4f174654d12fe52e3d48eaaec27a80767c0d56cb2f6780 gst1-editing-services-devel_package() { short_desc+=" - development files" diff --git a/srcpkgs/gst1-python/template b/srcpkgs/gst1-python/template index ad5617b814e..40fba1f6536 100644 --- a/srcpkgs/gst1-python/template +++ b/srcpkgs/gst1-python/template @@ -1,6 +1,6 @@ # Template file for 'gst1-python'. pkgname=gst1-python -version=1.16.0 +version=1.16.1 revision=1 wrksrc="gst-python-${version}" build_style=gnu-configure @@ -14,7 +14,7 @@ maintainer="Orphaned " license="LGPL-2.1-or-later" homepage="https://gstreamer.freedesktop.org" distfiles="${homepage}/src/gst-python/gst-python-${version}.tar.xz" -checksum=55dc7aaed1855565f9b9ef842d93e93bfc5cb2b376faef6af5b463e1774e2d38 +checksum=b469c8955126f41b8ce0bf689b7029f182cd305f422b3a8df35b780bd8347489 pre_configure() { if [ "$CROSS_BUILD" ]; then diff --git a/srcpkgs/gst1-python3/template b/srcpkgs/gst1-python3/template index 7704de67c2a..6f02f19aca3 100644 --- a/srcpkgs/gst1-python3/template +++ b/srcpkgs/gst1-python3/template @@ -1,6 +1,6 @@ # Template file for 'gst1-python3' pkgname=gst1-python3 -version=1.16.0 +version=1.16.1 revision=1 wrksrc="gst-python-${version}" build_style=meson @@ -13,4 +13,4 @@ maintainer="Orphaned " license="LGPL-2.1-or-later" homepage="https://gstreamer.freedesktop.org" distfiles="${homepage}/src/gst-python/gst-python-${version}.tar.xz" -checksum=55dc7aaed1855565f9b9ef842d93e93bfc5cb2b376faef6af5b463e1774e2d38 +checksum=b469c8955126f41b8ce0bf689b7029f182cd305f422b3a8df35b780bd8347489 diff --git a/srcpkgs/gstreamer-vaapi/template b/srcpkgs/gstreamer-vaapi/template index 4cdd701c673..e3d2c49f139 100644 --- a/srcpkgs/gstreamer-vaapi/template +++ b/srcpkgs/gstreamer-vaapi/template @@ -1,6 +1,6 @@ # Template file for 'gstreamer-vaapi' pkgname=gstreamer-vaapi -version=1.16.0 +version=1.16.1 revision=1 build_style=meson hostmakedepends="pkg-config" @@ -11,4 +11,4 @@ license="LGPL-2.1-or-later" homepage="https://gstreamer.freedesktop.org" changelog="https://raw.githubusercontent.com/GStreamer/gstreamer-vaapi/master/ChangeLog" distfiles="${homepage}/src/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.xz" -checksum=4e7fce626ee0590dca74b5a8341d25bac76307945131a970b414fc5895f5171f +checksum=cb570f6f1e78cb364fbe3c4fb8751824ee9db0c942ba61b62380b9b5abb7603a diff --git a/srcpkgs/gstreamer1/template b/srcpkgs/gstreamer1/template index 6db91b8cde5..29629189d62 100644 --- a/srcpkgs/gstreamer1/template +++ b/srcpkgs/gstreamer1/template @@ -1,6 +1,6 @@ # Template file for 'gstreamer1' pkgname=gstreamer1 -version=1.16.0 +version=1.16.1 revision=1 wrksrc="gstreamer-${version}" build_style=meson @@ -18,7 +18,7 @@ maintainer="Orphaned " license="LGPL-2.0-or-later" homepage="https://gstreamer.freedesktop.org" distfiles="${homepage}/src/gstreamer/gstreamer-${version}.tar.xz" -checksum=0e8e2f7118be437cba879353970cf83c2acced825ecb9275ba05d9186ef07c00 +checksum=02211c3447c4daa55919c5c0f43a82a6fbb51740d57fc3af0639d46f1cf4377d # Package build options build_options="gir gtk_doc" diff --git a/srcpkgs/gtk+3/template b/srcpkgs/gtk+3/template index 45115dd7cee..975925d33f3 100644 --- a/srcpkgs/gtk+3/template +++ b/srcpkgs/gtk+3/template @@ -1,6 +1,6 @@ # Template file for 'gtk+3' pkgname=gtk+3 -version=3.24.10 +version=3.24.11 revision=1 wrksrc="gtk+-${version}" build_style=gnu-configure @@ -26,7 +26,7 @@ maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://www.gtk.org/" distfiles="${GNOME_SITE}/gtk+/${version%.*}/gtk+-${version}.tar.xz" -checksum=35a8f107e2b90fda217f014c0c15cb20a6a66678f6fd7e36556d469372c01b03 +checksum=dba7658d0a2e1bfad8260f5210ca02988f233d1d86edacb95eceed7eca982895 # Package build options build_options="broadway colord cups gir cloudproviders wayland x11" diff --git a/srcpkgs/gtk3-nocsd/template b/srcpkgs/gtk3-nocsd/template index 36e60a61ebe..8c9af5a68f0 100644 --- a/srcpkgs/gtk3-nocsd/template +++ b/srcpkgs/gtk3-nocsd/template @@ -1,16 +1,16 @@ # Template file for 'gtk3-nocsd' pkgname=gtk3-nocsd -version=3 +version=3.0.1 revision=1 build_style=gnu-makefile hostmakedepends="pkg-config" makedepends="gtk+3-devel libgirepository-devel" -short_desc="A hack to disable gtk+ 3 client side decoration" +short_desc="Hack to disable gtk+ 3 client side decoration" maintainer="Helmut Pozimski " -license="LGPL-2.1" -homepage="https://github.com/PCMan/gtk3-nocsd" -distfiles="https://github.com/PCMan/gtk3-nocsd/archive/v${version}.tar.gz" -checksum=779c47d894ee3b6751ddb02b62a76757b77eb81232c4f9335564654817889570 +license="LGPL-2.1-or-later" +homepage="https://github.com/ZaWertun/gtk3-nocsd" +distfiles="https://github.com/ZaWertun/gtk3-nocsd/archive/v${version}.tar.gz" +checksum=c4cc5e8fa49a145013430cdce7f0fddad648c0cf6d53a8085b4500612c37cbf7 do_install() { vbin gtk3-nocsd diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template index 783705b0729..58388b515c0 100644 --- a/srcpkgs/gtk4/template +++ b/srcpkgs/gtk4/template @@ -1,7 +1,7 @@ # Template file for 'gtk4' pkgname=gtk4 version=3.94.0 -revision=1 +revision=2 wrksrc="gtk+-${version}" build_style=meson build_helper="gir" @@ -35,13 +35,7 @@ build_options="broadway colord cups gir cloudproviders wayland x11" desc_option_broadway="Enable support for the HTML5 Broadway backend" desc_option_cloudproviders="Enable integration with cloudproviders, such as Nextcloud" -build_options_default="colord cups broadway wayland x11 cloudproviders vulkan" - -case "$XBPS_TARGET_MACHINE" in - x86_64-musl) build_options_default+=" gir" ;; - *-musl) ;; - *) build_options_default+=" gir" ;; -esac +build_options_default="colord cups broadway wayland x11 cloudproviders vulkan gir" gtk4-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/gtkwave/template b/srcpkgs/gtkwave/template index 16cf79a3d40..f60eba6fc8f 100644 --- a/srcpkgs/gtkwave/template +++ b/srcpkgs/gtkwave/template @@ -1,6 +1,6 @@ # Template file for 'gtkwave' pkgname=gtkwave -version=3.3.98 +version=3.3.102 revision=1 build_style=gnu-configure configure_args="--with-tcl=${XBPS_CROSS_BASE}/usr/lib --with-tk=${XBPS_CROSS_BASE}/usr/lib" @@ -11,7 +11,7 @@ maintainer="allan " license="GPL-2.0-or-later, MIT" homepage="http://gtkwave.sourceforge.net/" distfiles="http://gtkwave.sourceforge.net/gtkwave-${version}.tar.gz" -checksum=efa6bbbeb3bd54104425a69a2aa0d079bb5c3ecc1c420ba57dcaa1c97c5a22f6 +checksum=80bb7cb92db45872209f4ca48fc95a0460e0d89b0fe0c310c836d9b04c77fec7 post_install() { vlicense LICENSE.TXT diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template new file mode 100644 index 00000000000..2383ae4c09f --- /dev/null +++ b/srcpkgs/gucci/template @@ -0,0 +1,17 @@ +# Template file for 'gucci' +pkgname=gucci +version=1.2.2 +revision=1 +build_style=go +go_import_path="github.com/noqcks/gucci" +hostmakedepends="git" +short_desc="Simple CLI templating tool written in Go" +maintainer="Leah Neukirchen " +license="MIT" +homepage="https://github.com/noqcks/gucci" +distfiles="https://github.com/noqcks/gucci/archive/${version}.tar.gz" +checksum=b31ebdb94d227331ac954262e43e39e3b9a1fb25bab96fd0cccb7ddfb997e383 + +post_install() { + vlicense LICENSE +} diff --git a/srcpkgs/guitarix2/patches/musl.patch b/srcpkgs/guitarix2/patches/musl.patch deleted file mode 100644 index ee07fe904c4..00000000000 --- a/srcpkgs/guitarix2/patches/musl.patch +++ /dev/null @@ -1,15 +0,0 @@ -There is no mallopt in musl. - ---- src/gx_head/gui/machine.cpp.orig 2018-07-22 06:24:50.000000000 +0200 -+++ src/gx_head/gui/machine.cpp 2018-08-26 09:31:01.815078037 +0200 -@@ -44,8 +44,10 @@ - long int total_size = 0; - if (mlockall(MCL_CURRENT | MCL_FUTURE)) - gx_print_error("system init", "mlockall failed:"); -+#ifdef __GLIBC__ - mallopt(M_TRIM_THRESHOLD, -1); - mallopt(M_MMAP_MAX, 0); -+#endif - for (unsigned int i = 0; i < sizeof(regions)/sizeof(regions[0]); i++) { - total_size +=regions[i].len; - if (mlock(regions[i].start, regions[i].len) != 0) { diff --git a/srcpkgs/guitarix2/template b/srcpkgs/guitarix2/template index bd26f268bca..8b2e5ec85f4 100644 --- a/srcpkgs/guitarix2/template +++ b/srcpkgs/guitarix2/template @@ -1,15 +1,15 @@ # Template file for 'guitarix2' pkgname=guitarix2 -version=0.37.3 -revision=4 +version=0.38.1 +revision=1 wrksrc="guitarix-${version}" build_style=waf -configure_args="--cxxflags-release=-DNDEBUG --ladspa --new-ladspa --no-faust --no-lv2 +configure_args="--cxxflags-release=-DNDEBUG --ladspa --new-ladspa --no-faust $(vopt_if avahi '' '--no-avahi') $(vopt_if bluez '' '--no-bluez')" make_build_args="--progress" hostmakedepends="gperf intltool pkg-config" makedepends="boost-devel eigen fftw-devel gtkmm2-devel jack-devel - ladspa-sdk liblrdf-devel libsndfile-devel lilv-devel sratom-devel + ladspa-sdk liblrdf-devel libsndfile-devel lilv-devel lv2 sratom-devel zita-convolver-devel zita-resampler-devel $(vopt_if avahi avahi-glib-libs-devel) $(vopt_if bluez libbluetooth-devel)" depends="desktop-file-utils" @@ -18,7 +18,7 @@ maintainer="Orphaned " license="GPL-3.0-or-later" homepage="http://guitarix.org" distfiles="${SOURCEFORGE_SITE}/guitarix/guitarix/guitarix2-${version}.tar.xz" -checksum=4ca93bd4226cd175456f37612acd28b46e13133db61c0f235917dbcc3347d5f1 +checksum=00fda3e1ce1d5f1691665f9ff32bb3c9800381313d49b7c2e25618d0b3ed872f build_options="avahi bluez" desc_option_avahi="Build with avahi support" @@ -34,7 +34,6 @@ esac if [ -n "$CROSS_BUILD" ]; then post_extract() { # don’t test load the ladspa plugin when cross compiling - sed -i "s/\(features='cxx cshlib\) test_loadable/\1/" src/ladspa/wscript + vsed -i "s/\(features='cxx cshlib\) test_loadable/\1/" src/ladspa/wscript } fi - diff --git a/srcpkgs/gummiboot/template b/srcpkgs/gummiboot/template index 77ab2f99fa5..d23620e6170 100644 --- a/srcpkgs/gummiboot/template +++ b/srcpkgs/gummiboot/template @@ -7,7 +7,7 @@ build_style=gnu-configure hostmakedepends="automake pkg-config libxslt docbook-xsl" makedepends="gnu-efi-libs liblzma-devel libblkid-devel" short_desc="Simple UEFI Boot Manager" -maintainer="maxice8 " +maintainer="Orphaned " license="LGPL-2.0-or-later" # Homepage is long dead and the project has an unofficial release under Alpine # homepage="http://freedesktop.org/wiki/Software/gummiboot" diff --git a/srcpkgs/gutenprint/patches/musl.patch b/srcpkgs/gutenprint/patches/musl.patch deleted file mode 100644 index 52edda6269c..00000000000 --- a/srcpkgs/gutenprint/patches/musl.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit 6b8ae64056133e2b4775a201eb527fdc143d669c -Author: Cameron Nemo -Date: Sun Nov 25 10:09:21 2018 -0800 - - src/xml/printers: remove assignment to read-only variable - -diff --git src/xml/printers/check_duplicate_printers.test.c src/xml/printers/check_duplicate_printers.test.c -index 52c46e65..d5d2771c 100644 ---- src/xml/printers/check_duplicate_printers.c -+++ src/xml/printers/check_duplicate_printers.c -@@ -34,7 +34,7 @@ main(int argc, char **argv) - if (getenv("BUILD_VERBOSE")) - dup2(2, 3); - (void) snprintf(path, PATH_MAX, "%scheck_duplicate_printers_%d.log", getenv("STP_TEST_LOG_PREFIX"), getpid()); -- stdout = freopen(path, "w", stdout); -+ freopen(path, "w", stdout); - dup2(1, 2); - } - setenv("STP_CHECK_DUPLICATE_PRINTERS", "TRUE", 1); diff --git a/srcpkgs/gutenprint/template b/srcpkgs/gutenprint/template index 1ae82e5b37a..e94fa323629 100644 --- a/srcpkgs/gutenprint/template +++ b/srcpkgs/gutenprint/template @@ -1,6 +1,6 @@ # Template file for 'gutenprint' pkgname=gutenprint -version=5.3.1 +version=5.3.3 revision=1 build_style=gnu-configure configure_args="--disable-rpath --enable-samples --disable-static @@ -13,7 +13,7 @@ maintainer="Anachron " license="GPL-2.0-or-later" homepage="http://gimp-print.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/gimp-print/$pkgname-$version.tar.xz" -checksum=d80d8f5272d15bca5710f6ef4a2bb95e76d34e1155c5bcd5e83cb9f0a111d0d4 +checksum=7279ecbc8e67d1858c53cb24e423ea1be98e214872006b79e6e03650dd54a072 nocross="https://sourceforge.net/p/gimp-print/mailman/message/34782748/" post_install() { diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template index 552062513bd..4eee8094057 100644 --- a/srcpkgs/gvfs/template +++ b/srcpkgs/gvfs/template @@ -1,25 +1,25 @@ # Template file for 'gvfs' pkgname=gvfs -version=1.40.2 +version=1.42.0 revision=1 build_style=meson configure_args="-Dsystemduserunitdir=no -Dtmpfilesdir=no -Dlogind=false -Dman=true" hostmakedepends="docbook-xsl glib-devel intltool libxslt openssh pkg-config polkit-devel" -makedepends="avahi-glib-libs-devel dbus-glib-devel fuse-devel gcr-devel +makedepends="avahi-glib-libs-devel dbus-glib-devel fuse3-devel gcr-devel libarchive-devel libbluetooth-devel libbluray-devel libcap-devel libcdio-paranoia-devel libgcrypt-devel libgdata-devel libglib-devel libgphoto2-devel libgudev-devel libimobiledevice-devel libmtp-devel libnfs-devel libsecret-devel libsoup-gnome-devel libxml2-devel polkit-devel - samba-devel udisks2-devel" + samba-devel udisks2-devel gsettings-desktop-schemas-devel" short_desc="Userspace virtual filesystem" maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/gvfs" changelog="https://gitlab.gnome.org/GNOME/gvfs/raw/gnome-3-32/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=bdefe8fec6a1097f0c126fa2a4533667c98a86e237ac640518000e16b363971e +checksum=d0958d9ceefb54bb8ddda74ef51e10fe03dff93f74634784bd309ea434066cf1 # Manually declare shlibs used by the subpkgs. shlib_provides="libgvfscommon.so libgvfsdaemon.so" diff --git a/srcpkgs/gwenview/template b/srcpkgs/gwenview/template index 2a2399ddf16..a279261dc4b 100644 --- a/srcpkgs/gwenview/template +++ b/srcpkgs/gwenview/template @@ -1,6 +1,6 @@ # Template file for 'gwenview' pkgname=gwenview -version=19.08.0 +version=19.08.2 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools @@ -14,7 +14,7 @@ maintainer="Helmut Pozimski " license="GPL-2.0-or-later" homepage="https://www.kde.org/applications/graphics/gwenview" distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz" -checksum=1d1d4713bcebdd8c7c458c075b7101055c81cf94a802ac8b9b3528a3c3c961a3 +checksum=fa49352a208c9472c911d3579f7601fb915831ad42caf74a053ed749bf5bb1fb patch_args="-Np1" pre_configure() { diff --git a/srcpkgs/gxi b/srcpkgs/gxi new file mode 120000 index 00000000000..3008d527e75 --- /dev/null +++ b/srcpkgs/gxi @@ -0,0 +1 @@ +tau \ No newline at end of file diff --git a/srcpkgs/gxi/template b/srcpkgs/gxi/template deleted file mode 100644 index 8fa53d00432..00000000000 --- a/srcpkgs/gxi/template +++ /dev/null @@ -1,23 +0,0 @@ -# Template file for 'gxi' -pkgname=gxi -version=0.8.1 -revision=1 -build_style=meson -build_helper=rust -hostmakedepends="cargo pkg-config rust gettext glib-devel" -makedepends="gtk+3-devel rust-std gettext-devel" -checkdepends="appstream-glib desktop-file-utils" -short_desc="GTK frontend for the xi text editor, written in Rust" -maintainer="Enno Boland " -license="MIT" -homepage="https://github.com/Cogitri/gxi" -distfiles="https://github.com/Cogitri/gxi/releases/download/v${version}/gxi-${version}.tar.xz" -checksum=7f970239815cd688218c360fba7f00b8e1eb9ee9bafc9ce578e61018cca087a1 - -case $XBPS_MACHINE in - *-musl) broken="crashes rustc" ;; -esac - -post_install() { - vlicense LICENSE -} diff --git a/srcpkgs/h2o/template b/srcpkgs/h2o/template index 4446b84b03c..93b3281be50 100644 --- a/srcpkgs/h2o/template +++ b/srcpkgs/h2o/template @@ -1,7 +1,7 @@ # Template file for 'h2o' pkgname=h2o -version=2.2.5 -revision=4 +version=2.2.6 +revision=1 build_style=cmake conf_files="/etc/h2o.conf" hostmakedepends="pkg-config" @@ -12,7 +12,7 @@ maintainer="Eivind Uggedal " license="MIT" homepage="https://h2o.examp1e.net/" distfiles="https://github.com/h2o/h2o/archive/v${version}.tar.gz" -checksum=eafb40aa2d93b3de1af472bb046c17b2335c3e5a894462310e1822e126c97d24 +checksum=f8cbc1b530d85ff098f6efc2c3fdbc5e29baffb30614caac59d5c710f7bda201 system_accounts="h2o" @@ -31,6 +31,7 @@ h2o-devel_package() { depends="${makedepends}" pkg_install() { vmove usr/include - vmove usr/lib/*.a + vmove usr/lib/pkgconfig + vmove "usr/lib/*.a" } } diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template index 5d8f9346919..87c29a2baf9 100644 --- a/srcpkgs/harfbuzz/template +++ b/srcpkgs/harfbuzz/template @@ -1,18 +1,18 @@ # Template file for 'harfbuzz' pkgname=harfbuzz -version=2.6.0 +version=2.6.2 revision=1 build_style=gnu-configure configure_args="--with-glib --with-freetype --with-cairo --with-icu --with-graphite2" hostmakedepends="automake glib-devel libtool pkg-config" makedepends="cairo-devel graphite-devel icu-devel" short_desc="OpenType text shaping engine" -maintainer="maxice8 " +maintainer="Duncaen " license="MIT" homepage="http://www.freedesktop.org/wiki/Software/HarfBuzz/" changelog="https://raw.githubusercontent.com/harfbuzz/harfbuzz/master/NEWS" distfiles="${FREEDESKTOP_SITE}/harfbuzz/release/${pkgname}-${version}.tar.xz" -checksum=9cf7d117548265f95ca884e2f4c9fafaf4e17d45a67b11107147b79eed76c966 +checksum=3b4c6a72f7f2b05d54f6c3112b3ebee5131c199fe4de4cf9bbbf71a56666f624 pre_configure() { autoreconf -fi diff --git a/srcpkgs/haveged/template b/srcpkgs/haveged/template index bfc2fc6229e..5707e4adb46 100644 --- a/srcpkgs/haveged/template +++ b/srcpkgs/haveged/template @@ -1,14 +1,14 @@ # Template file for 'haveged' pkgname=haveged -version=1.9.4 +version=1.9.8 revision=1 build_style=gnu-configure short_desc="Entropy harvesting daemon using CPU timings" -maintainer="Orphaned " +maintainer="Anthony Iliopoulos " license="GPL-3.0-or-later" homepage="http://www.issihosts.com/haveged" -distfiles="https://github.com/jirka-h/haveged/archive/${version}.tar.gz" -checksum=c4959d3cb1fa6391d16a3aa1ba4d82cd3a0d497206ae4b87d638088c0664e5aa +distfiles="https://github.com/jirka-h/haveged/archive/v${version}.tar.gz" +checksum=99aa1996c6e39ea2459cfc37addfb8b1eecc63f3a2b6da9db17b22e76b6851ae post_install() { vsv $pkgname diff --git a/srcpkgs/help2man/template b/srcpkgs/help2man/template index 8a284973530..36d4b1b6684 100644 --- a/srcpkgs/help2man/template +++ b/srcpkgs/help2man/template @@ -1,14 +1,14 @@ # Template file for 'help2man' pkgname=help2man -version=1.47.10 +version=1.47.11 revision=1 build_style=gnu-configure hostmakedepends="perl-Locale-gettext" depends="$hostmakedepends" short_desc="GNU conversion tool to create man files" -maintainer="maxice8 " +maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://www.gnu.org/software/help2man" distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=f371cbfd63f879065422b58fa6b81e21870cd791ef6e11d4528608204aa4dcfb +checksum=5985b257f86304c8791842c0c807a37541d0d6807ee973000cf8a3fe6ad47b88 lib32disabled=yes diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template index 1a46e08ae99..fbeaf28ae8a 100644 --- a/srcpkgs/hexchat/template +++ b/srcpkgs/hexchat/template @@ -1,7 +1,7 @@ # Template file for 'hexchat' pkgname=hexchat version=2.14.2 -revision=5 +revision=6 build_style=meson configure_args="-Dwith-dbus=true -Dwith-ssl=true -Dwith-text=false -Dwith-perl=/usr/bin/perl -Dwith-python=python3 diff --git a/srcpkgs/hexyl/template b/srcpkgs/hexyl/template index 094dadfe87e..2054496993f 100644 --- a/srcpkgs/hexyl/template +++ b/srcpkgs/hexyl/template @@ -1,14 +1,14 @@ # Template file for 'hexyl' pkgname=hexyl -version=0.5.1 -revision=2 +version=0.6.0 +revision=1 build_style=cargo short_desc="Command-line hex viewer" maintainer="SolitudeSF " license="Apache-2.0, MIT" homepage="https://github.com/sharkdp/hexyl" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=9c12bc6377d1efedc4a1731547448f7eb6ed17ee1c267aad9a35995b42091163 +checksum=5031b20c13b3ccb27abbf119b54609cef16c4152aca2823ee5c53cd5f434b97e case "$XBPS_TARGET_MACHINE" in aarch64-musl) broken="https://github.com/nix-rust/nix/issues/951" diff --git a/srcpkgs/hiawatha/template b/srcpkgs/hiawatha/template index 3ec6202b494..ce962ab6d35 100644 --- a/srcpkgs/hiawatha/template +++ b/srcpkgs/hiawatha/template @@ -1,6 +1,6 @@ # Template file for 'hiawatha' pkgname=hiawatha -version=10.9 +version=10.10 revision=1 build_style=cmake configure_args="-DLOG_DIR=/var/log/hiawatha -DPID_DIR=/run @@ -13,7 +13,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://hiawatha-webserver.org" distfiles="${homepage}/files/${pkgname}-${version}.tar.gz" -checksum=74dd43812272c3ddbf067b6d4da1773cdeef2ffe71e8f164449fabf8431752b8 +checksum=b5e46f5757fa647e77d21d24f7eea912d59f26a75558cba780b45c1c3a33a4d9 conf_files="/etc/${pkgname}/*.conf /etc/${pkgname}/*.xslt" make_dirs="/var/log/hiawatha 0755 root root" diff --git a/srcpkgs/hitori/template b/srcpkgs/hitori/template index dc367cdadd5..2144995be0d 100644 --- a/srcpkgs/hitori/template +++ b/srcpkgs/hitori/template @@ -1,8 +1,8 @@ # Template file for 'hitori' pkgname=hitori -version=3.22.4 +version=3.34.0 revision=1 -build_style=gnu-configure +build_style=meson hostmakedepends="glib-devel intltool itstool pkg-config" makedepends="gtk+3-devel" short_desc="GNOME eponymous puzzle game" @@ -10,4 +10,4 @@ maintainer="Jürgen Buchmüller " license="GPL-2" homepage="https://wiki.gnome.org/Apps/Hitori" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=dcac6909b6007857ee425ac8c65fed179f2c71da138d5e5300cd62c8b9ea15d3 +checksum=65d14068f83f4a59f1f9c83c9a813508a54fd19a2d91e4ef7dcf56d10c862298 diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template index 0d9a04b2434..8e5e87f341c 100644 --- a/srcpkgs/homebank/template +++ b/srcpkgs/homebank/template @@ -1,6 +1,6 @@ # Template file for 'homebank' pkgname=homebank -version=5.2.6 +version=5.2.8 revision=1 build_style=gnu-configure hostmakedepends="intltool pkg-config" @@ -10,5 +10,5 @@ short_desc="Free personal finance software" maintainer="Orphaned " license="GPL-2.0-or-later" homepage="http://homebank.free.fr/" -distfiles="http://homebank.free.fr/public/${pkgname}-${version}.tar.gz" -checksum=9a14cbf7029080f208d76b27a2d8066964426685ddc86fd1abed30bd428c9881 +distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz" +checksum=fe98a3585a23ed66695a96b9162dbf1872f4fd78c01471019b60786476bc558d diff --git a/srcpkgs/hopper/template b/srcpkgs/hopper/template index 1160a36b1a0..e68d8e1a804 100644 --- a/srcpkgs/hopper/template +++ b/srcpkgs/hopper/template @@ -1,6 +1,6 @@ # Template file for 'hopper' pkgname=hopper -version=4.5.13 +version=4.5.16 revision=1 _build=1 create_wrksrc=yes @@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni " license="EULA" homepage="https://www.hopperapp.com" distfiles="https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-v4-${version}-Linux.pkg.tar.xz" -checksum=aea44d9ee0eb61b65a39627a7c43b910ec0f4eedfd46eddb2e5b81b47568d88c +checksum=04951a9a2fdde8f95f5e268c836fae4013308fca48ae45a621ddad68dcb1563e archs="x86_64" restricted=yes diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template index 337189e7393..07a707569f6 100644 --- a/srcpkgs/hplip/template +++ b/srcpkgs/hplip/template @@ -1,6 +1,6 @@ # Template file for 'hplip' pkgname=hplip -version=3.19.6 +version=3.19.8 revision=1 build_style=gnu-configure pycompile_dirs="usr/share/hplip" @@ -31,7 +31,7 @@ maintainer="Orphaned " license="GPL-2.0-only, BSD-3-Clause, MIT" homepage="https://developers.hp.com/hp-linux-imaging-and-printing" distfiles="${SOURCEFORGE_SITE}/hplip/hplip/${version}/hplip-${version}.tar.gz" -checksum=fcdaedee9ed17d2e70f3aff9558a452d99443d1b93d6623132faf3f3ae61d66d +checksum=a385fea00241592d148ef1a20082799fa45b36031742157db181d5d94a84ba32 conflicts="hplip-gui" CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libusb-1.0 -I${XBPS_CROSS_BASE}/${py3_inc}" diff --git a/srcpkgs/httpie/template b/srcpkgs/httpie/template index 7e435e11fe2..387af8ebf05 100644 --- a/srcpkgs/httpie/template +++ b/srcpkgs/httpie/template @@ -1,6 +1,6 @@ # Template file for 'httpie' pkgname=httpie -version=1.0.2 +version=1.0.3 revision=1 archs=noarch build_style=python3-module @@ -9,10 +9,10 @@ hostmakedepends="python3-setuptools" depends="python3-setuptools python3-requests python3-Pygments" short_desc="Human-friendly command line HTTP client" maintainer="Alessio Sergi " -homepage="https://httpie.org/" license="BSD-3-Clause" +homepage="https://httpie.org/" distfiles="https://github.com/jakubroztocil/httpie/archive/${version}.tar.gz" -checksum=f11f5ecdbcc0571aa865fb29cd5db68ba6bce4f15a5aae3f27a32d19b0854dc9 +checksum=ecfb1ecdfd1468100bd9ffecebe1bea6d7d72c72149ea91f3d0112dc8ef03c7a post_install() { vinstall extras/httpie-completion.bash 644 usr/share/bash-completion/completions http diff --git a/srcpkgs/hub/template b/srcpkgs/hub/template index dfad19b6565..47b26514f6b 100644 --- a/srcpkgs/hub/template +++ b/srcpkgs/hub/template @@ -1,6 +1,6 @@ # Template file for 'hub' pkgname=hub -version=2.12.3 +version=2.12.8 revision=1 build_style=go go_import_path=github.com/github/hub @@ -11,7 +11,7 @@ license="MIT" homepage="https://hub.github.com/" changelog="https://github.com/github/hub/releases" distfiles="https://github.com/github/hub/archive/v${version}.tar.gz" -checksum=197242fea670353688c541d2e4584b449f18c354a01d89bf1667ea33c0071ddc +checksum=72d09397967c85b118fc1be25dc0fc54353f4dea09f804687a287949c7de7ebe if [ "$CROSS_BUILD" ]; then hostmakedepends+=" hub" diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template index c785474fcbc..c8b96e9f0eb 100644 --- a/srcpkgs/hugo/template +++ b/srcpkgs/hugo/template @@ -1,6 +1,6 @@ # Template file for 'hugo' pkgname=hugo -version=0.56.2 +version=0.58.3 revision=1 build_style=go go_import_path="github.com/gohugoio/${pkgname}" @@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni " license="Apache-2.0" homepage="https://gohugo.io" distfiles="https://${go_import_path}/archive/v${version}.tar.gz" -checksum=5fecdda6630ed585daa931d6087d95d8e05a24c30cfe7bdd2b29fba340d2650d +checksum=4733f22fc447d745c88f7c688407d67e9ab67e7e276557f3a48edd8b37900718 build_options="pygments" desc_option_pygments="Alternative syntax highlighter" diff --git a/srcpkgs/hunspell-en_AU/template b/srcpkgs/hunspell-en_AU/template index 6a748d6ccd5..f8f3b94e6ab 100644 --- a/srcpkgs/hunspell-en_AU/template +++ b/srcpkgs/hunspell-en_AU/template @@ -1,6 +1,6 @@ # Template file for 'hunspell-en_AU' pkgname=hunspell-en_AU -version=2018.04.16 +version=2019.10.06 revision=1 archs=noarch create_wrksrc=yes @@ -10,7 +10,7 @@ maintainer="Alexis " license="SCOWL" # not in SPDX homepage="http://wordlist.aspell.net/dicts" distfiles="${SOURCEFORGE_SITE}/wordlist/speller/${version}/${pkgname}-${version}.zip" -checksum=c599f7d420ddac12785bf13eccbf007d04c6a3784c949c6a2da0cd40af35e0ce +checksum=32dbd174c143acdd670f08c1757c7402a197e1e7d5fa634b61e68bb1a26cdcbc do_install() { vinstall en_AU.aff 644 /usr/share/hunspell diff --git a/srcpkgs/hunspell-en_GB-ize/template b/srcpkgs/hunspell-en_GB-ize/template index 69588d7ace7..41001a413a8 100644 --- a/srcpkgs/hunspell-en_GB-ize/template +++ b/srcpkgs/hunspell-en_GB-ize/template @@ -2,20 +2,20 @@ _vpkgname=hunspell-en_GB _variant="ize" pkgname=${_vpkgname}-${_variant} -version=2018.04.16 +version=2019.10.06 revision=1 -maintainer="Leah Neukirchen " -homepage="http://wordlist.aspell.net/dicts" -license="SCOWL" archs=noarch +create_wrksrc=yes hostmakedepends="unzip" short_desc="English dictionary for hunspell ${_variant} variant" -create_wrksrc=yes +maintainer="Leah Neukirchen " +license="SCOWL" +homepage="http://wordlist.aspell.net/dicts" provides="${_vpkgname}-${version}_${revision}" replaces="${_vpkgname}>=0" distfiles="${SOURCEFORGE_SITE}/wordlist/speller/${version}/${pkgname}-${version}.zip" -checksum=fa0a52131ec3a3b73cc2b41687c245026b129ef90a1527390380b4dab5f1bce6 +checksum=20990e242c78ae46e3179dcaf1885d0af2fa3fae67b19facda8dd0246f6fc2b5 do_install() { vinstall en_GB-${_variant}.aff 644 /usr/share/hunspell en_GB.aff diff --git a/srcpkgs/hunspell-en_US/template b/srcpkgs/hunspell-en_US/template index bac820aaa00..0d100851774 100644 --- a/srcpkgs/hunspell-en_US/template +++ b/srcpkgs/hunspell-en_US/template @@ -1,16 +1,16 @@ # Template file for 'hunspell-en_US' pkgname=hunspell-en_US -version=2018.04.16 +version=2019.10.06 revision=1 +archs=noarch +create_wrksrc=yes hostmakedepends="unzip" +short_desc="American English en_US dictionary for hunspell" maintainer="Leah Neukirchen " license="SCOWL" # not in SPDX -short_desc="American English en_US dictionary for hunspell" homepage="http://wordlist.aspell.net/dicts" distfiles="${SOURCEFORGE_SITE}/wordlist/speller/${version}/${pkgname}-${version}.zip" -checksum=4efdba6438b916a61c4a12933952f458564f2f2af3db9ab3c27f328b37b30ba2 -create_wrksrc=yes -archs=noarch +checksum=e0f9c8bbc20da9998ea9daaa8b221f4b1bbaba4211e116318a838354cc856ba5 do_install() { sed -i 's/SET UTF8/SET UTF-8/g' en_US.aff diff --git a/srcpkgs/hunspell-es_ES/template b/srcpkgs/hunspell-es_ES/template index a4b6f84c06c..f24f904620f 100644 --- a/srcpkgs/hunspell-es_ES/template +++ b/srcpkgs/hunspell-es_ES/template @@ -1,6 +1,6 @@ # Template file for 'hunspell-es_ES' pkgname=hunspell-es_ES -version=2.4 +version=2.5 revision=1 archs=noarch create_wrksrc=yes @@ -10,7 +10,7 @@ maintainer="Orphaned " license="GPL-3.0-or-later, LGPL-3.0-or-later, MPL-1.1" homepage="https://github.com/sbosio/rla-es" distfiles="https://github.com/sbosio/rla-es/releases/download/v${version}/es_ES.oxt>dict-es.zip" -checksum=c1b47643e694b1bb1002d964684b8669a9a4976ca3db48d4a20f5bc3f9d8d40e +checksum=22a3b973f1667ddfd2d5c130623a16e22f9722a27437ba66d1de4fe569d32d0f do_install() { vinstall es_ES.aff 644 /usr/share/hunspell diff --git a/srcpkgs/hunspell-pl_PL/template b/srcpkgs/hunspell-pl_PL/template index 11974615d5e..31158cc9bec 100644 --- a/srcpkgs/hunspell-pl_PL/template +++ b/srcpkgs/hunspell-pl_PL/template @@ -1,6 +1,6 @@ # Template file for 'hunspell-pl_PL' pkgname=hunspell-pl_PL -version=20190812 +version=20191005 revision=1 archs=noarch create_wrksrc=yes @@ -10,7 +10,7 @@ maintainer="m-cz " license="GPL-2.0-only, LGPL-2.1-only, CC-BY-4.0, MPL-1.1, Apache-2.0" homepage="https://sjp.pl/slownik/ort/" distfiles="https://sjp.pl/slownik/ort/sjp-myspell-pl-${version}.zip" -checksum=60bf16820551816acec9d708dbc7982ecfe3d6caeb377021324124583030a1b7 +checksum=45035bb507849a203a835c211720e3e65ef401a3605c5f7f1951c7450242156f post_extract() { unzip pl_PL.zip diff --git a/srcpkgs/hwids/template b/srcpkgs/hwids/template index e44c19a39ca..a7ee61a427d 100644 --- a/srcpkgs/hwids/template +++ b/srcpkgs/hwids/template @@ -1,15 +1,15 @@ # Template file for 'hwids' pkgname=hwids -version=20190316 +version=20190818 revision=1 archs=noarch wrksrc="hwids-hwids-${version}" short_desc="Hardware Identification Databases" -maintainer="Orphaned " +maintainer="John " license="GPL-2.0-or-later" homepage="https://github.com/gentoo/hwids" distfiles="https://github.com/gentoo/hwids/archive/hwids-${version}.tar.gz" -checksum=e4498020b2c1a1ea5faf1e9d30bda0ae161aaf8e8fb17f40e1c6b8dc896c5d9e +checksum=cee0947dd345fbd3aa2dc008c53d81d05358f7fbebc4eadd626b688a586e83fd do_install() { vmkdir usr/share/hwdata diff --git a/srcpkgs/hydroxide/template b/srcpkgs/hydroxide/template index 6ea22f860f8..2181a2120ae 100644 --- a/srcpkgs/hydroxide/template +++ b/srcpkgs/hydroxide/template @@ -1,6 +1,6 @@ # Template file for 'hydroxide' pkgname=hydroxide -version=0.2.6 +version=0.2.9 revision=1 build_style=go go_import_path=github.com/emersion/hydroxide/cmd/hydroxide @@ -10,9 +10,8 @@ maintainer="DirectorX " license="MIT" homepage="https://github.com/emersion/hydroxide" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=49b1cea513fd3c012dc1b09a60d19656fe7f12be647b4cbb25b36be580772b40 +checksum=dacf8720620855171bbb201bdcd757364701c53071e3b82a00646ae95e019829 post_install() { vlicense LICENSE } - diff --git a/srcpkgs/hyperfine/template b/srcpkgs/hyperfine/template index 7743009e710..66d27d51a8f 100644 --- a/srcpkgs/hyperfine/template +++ b/srcpkgs/hyperfine/template @@ -1,15 +1,15 @@ # Template file for 'hyperfine' pkgname=hyperfine -version=1.5.0 +version=1.8.0 revision=1 build_style=cargo short_desc="Command-line benchmarking tool" maintainer="Wilson Birney " -license="MIT" +license="MIT, Apache-2.0" homepage="https://github.com/sharkdp/hyperfine" changelog="https://github.com/sharkdp/hyperfine/releases" distfiles="https://github.com/sharkdp/hyperfine/archive/v${version}.tar.gz" -checksum=d5183611348e696e579dda846cee92b7b78c8ef18c00bfb9b0a62d0a63034823 +checksum=14de63b44eb4c2c5d6a6f9354acbcff350c9a2ba50b2397de5798c152cc2a029 post_install() { vlicense LICENSE-MIT diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template index f96adface6b..1ba8e910453 100644 --- a/srcpkgs/i2pd/template +++ b/srcpkgs/i2pd/template @@ -1,6 +1,6 @@ # Template file for 'i2pd' pkgname=i2pd -version=2.27.0 +version=2.28.0 revision=1 build_style=gnu-makefile make_build_args="USE_UPNP=yes" @@ -12,7 +12,7 @@ license="BSD-3-Clause" homepage="https://i2pd.website/" changelog="https://raw.githubusercontent.com/PurpleI2P/i2pd/openssl/ChangeLog" distfiles="https://github.com/PurpleI2P/i2pd/archive/${version}.tar.gz" -checksum=46aa20760c85e3c5bf79229cd86b75a4c7e163271d400d0f104913d64cb8e093 +checksum=181327edc7cf5b3c25ee51ecc518a4da90fa9e421eca2107996791038a514a21 disable_parallel_build=yes conf_files=" diff --git a/srcpkgs/i3-gaps/template b/srcpkgs/i3-gaps/template index 7e3e60ea9ea..1092e5fad4d 100644 --- a/srcpkgs/i3-gaps/template +++ b/srcpkgs/i3-gaps/template @@ -1,6 +1,6 @@ # Template file for 'i3-gaps' pkgname=i3-gaps -version=4.17 +version=4.17.1 revision=1 wrksrc="i3-${version}" build_style=gnu-configure @@ -17,7 +17,7 @@ maintainer="ian c. " license="BSD-3-Clause" homepage="https://github.com/Airblader/i3" distfiles="${homepage}/archive/${version}.tar.gz>${version}.tar.gz" -checksum=4fbe0d80f8ef8814f266705318885e15e316774e98fb26f40199e51ed2eea2ed +checksum=10d75b32786f54cc8854287478f83ff428e6996b73b3cd9b6ba86cee2adf570a provides="i3-${version}_${revision}" replaces="i3>=0" diff --git a/srcpkgs/i3/template b/srcpkgs/i3/template index f4f13d4c9cd..542b1fe701f 100644 --- a/srcpkgs/i3/template +++ b/srcpkgs/i3/template @@ -1,6 +1,6 @@ # Template file for 'i3' pkgname=i3 -version=4.17 +version=4.17.1 revision=1 build_style=gnu-configure configure_args="--disable-builddir" @@ -16,7 +16,7 @@ maintainer="Frank Steinborn " license="BSD-3-Clause" homepage="https://i3wm.org/" distfiles="${homepage}/downloads/${pkgname}-${version}.tar.bz2" -checksum=4ebe13e47d6b88fb31d0cb1492e9d968d96aafcd834b8d3cae18b684e7ac18fd +checksum=1e8fe133a195c29a8e2aa3b1c56e5bc77e7f5534f2dd92e09faabe2ca2d85f45 case "$XBPS_TARGET_MACHINE" in *-musl) makedepends+=" libglob-devel";; diff --git a/srcpkgs/i3lock-color/template b/srcpkgs/i3lock-color/template index 1ec44f0c738..07bd585c69d 100644 --- a/srcpkgs/i3lock-color/template +++ b/srcpkgs/i3lock-color/template @@ -1,7 +1,7 @@ # Template file for 'i3lock-color' pkgname=i3lock-color version=2.12 -revision=1 +revision=2 wrksrc="${pkgname}-${version}.c" build_style=gnu-configure hostmakedepends="pkg-config automake" @@ -20,6 +20,10 @@ pre_configure() { autoreconf -i } +pre_build() { + vsed -i 's:login:system-auth:' pam/i3lock +} + post_install() { vlicense LICENSE } diff --git a/srcpkgs/i3lock-fancy/template b/srcpkgs/i3lock-fancy/template index fbbf22d0143..5bb3502b4ed 100644 --- a/srcpkgs/i3lock-fancy/template +++ b/srcpkgs/i3lock-fancy/template @@ -5,7 +5,7 @@ revision=1 archs=noarch depends="util-linux bash ImageMagick i3lock wmctrl gawk" short_desc="Fancy lockscreen using i3lock" -maintainer="maxice8 " +maintainer="Orphaned " license="MIT" homepage="https://github.com/meskarune/i3lock-fancy" distfiles="https://github.com/meskarune/i3lock-fancy/archive/${version}.tar.gz" diff --git a/srcpkgs/i3status-rust/patches/fix-32bit.patch b/srcpkgs/i3status-rust/patches/fix-32bit.patch index d77308460ea..dc05dfa9eca 100644 --- a/srcpkgs/i3status-rust/patches/fix-32bit.patch +++ b/srcpkgs/i3status-rust/patches/fix-32bit.patch @@ -5,20 +5,20 @@ diff --git a/src/blocks/disk_space.rs b/src/blocks/disk_space.rs let mut result; let mut converted = 0.0f64; let mut converted_str = String::new(); -- let total = statvfs.blocks() * statvfs.fragment_size(); -- let used = (statvfs.blocks() - statvfs.blocks_free()) * statvfs.fragment_size(); -+ let total = (statvfs.blocks() as u64 * statvfs.fragment_size() as u64) as u64; -+ let used = ((statvfs.blocks() as u64 - statvfs.blocks_free() as u64) * statvfs.fragment_size() as u64) as u64; +- let total = (statvfs.blocks() * statvfs.fragment_size()) as u64; +- let used = ((statvfs.blocks() - statvfs.blocks_free()) * statvfs.fragment_size()) as u64; ++ let total = (statvfs.blocks() as u64) * (statvfs.fragment_size() as u64); ++ let used = ((statvfs.blocks() as u64) - (statvfs.blocks_free() as u64)) * (statvfs.fragment_size() as u64); match self.info_type { InfoType::Available => { -- result = statvfs.blocks_available() * statvfs.block_size(); -+ result = (statvfs.blocks_available() as u64 * statvfs.block_size() as u64) as u64; +- result = (statvfs.blocks_available() * statvfs.block_size()) as u64; ++ result = (statvfs.blocks_available() as u64) * (statvfs.block_size() as u64); converted = Unit::bytes_in_unit(self.unit, result); } InfoType::Free => { -- result = statvfs.blocks_free() * statvfs.block_size(); -+ result = (statvfs.blocks_free() as u64 * statvfs.block_size() as u64) as u64; +- result = (statvfs.blocks_free() * statvfs.block_size()) as u64; ++ result = (statvfs.blocks_free() as u64) * (statvfs.block_size() as u64); converted = Unit::bytes_in_unit(self.unit, result); } InfoType::Total => { diff --git a/srcpkgs/i3status-rust/template b/srcpkgs/i3status-rust/template index 8e01ed53609..8d7775ee134 100644 --- a/srcpkgs/i3status-rust/template +++ b/srcpkgs/i3status-rust/template @@ -1,7 +1,7 @@ # Template file for 'i3status-rust' pkgname=i3status-rust -version=0.10.0 -revision=3 +version=0.11.0 +revision=1 build_style=cargo hostmakedepends="pkg-config" makedepends="dbus-devel pulseaudio-devel" @@ -10,8 +10,4 @@ maintainer="Jan Christian Grünhage " license="GPL-3.0-only" homepage="https://github.com/greshake/i3status-rust" distfiles="https://github.com/greshake/i3status-rust/archive/v${version}.tar.gz" -checksum=84a12a91419fda35109a0be3980671c1d58e13c5987e6dc999cbe786d05053d9 - -case "$XBPS_TARGET_MACHINE" in - ppc*) broken="old broken version of nix (0.8.1) in dep tree" ;; -esac +checksum=2f749ba4646e2fc0af62d31c990ae8d59d454eb0e5fe947b39d64cfeabbb0a1c diff --git a/srcpkgs/i3status/patches/pulseaudio-optional.patch b/srcpkgs/i3status/patches/pulseaudio-optional.patch new file mode 100644 index 00000000000..895097d221c --- /dev/null +++ b/srcpkgs/i3status/patches/pulseaudio-optional.patch @@ -0,0 +1,95 @@ +# reason: make pulseaudio optional +# upstream: yes (>2.13) +# ``` +# cd i3status +# git diff --no-prefix 2.13..23da59920c -- configure.ac Makefile.am i3status.c src/print_volume.c +# ``` + +diff --git Makefile.am Makefile.am +index bb251f0..c2c1c0a 100644 +--- Makefile.am ++++ Makefile.am +@@ -68,8 +68,11 @@ i3status_SOURCES = \ + src/print_volume.c \ + src/print_wireless_info.c \ + src/print_file_contents.c \ +- src/process_runs.c \ +- src/pulse.c ++ src/process_runs.c ++ ++if PULSE ++i3status_SOURCES += src/pulse.c ++endif + + dist_sysconf_DATA = \ + i3status.conf +diff --git configure.ac configure.ac +index cf9e430..11caa33 100644 +--- configure.ac ++++ configure.ac +@@ -80,11 +80,24 @@ AC_CANONICAL_HOST + PKG_CHECK_MODULES([CONFUSE], [libconfuse]) + PKG_CHECK_MODULES([YAJL], [yajl]) + ++AC_ARG_ENABLE(pulseaudio, ++ AS_HELP_STRING( ++ [--disable-pulseaudio], ++ [build without pulseaudio support]), ++ [ax_pulse=$enableval], ++ [ax_pulse=yes]) ++AM_CONDITIONAL([PULSE], [test x$ax_pulse = xyes]) ++AS_IF([test x"$ax_pulse" = x"yes"], ++ [PKG_CHECK_MODULES([PULSE], [libpulse])]) ++pulse_def=0 ++AS_IF([test x"$ax_pulse" = x"yes"], ++ [pulse_def=1]) ++AC_DEFINE_UNQUOTED([HAS_PULSEAUDIO], [$pulse_def], [Build with pulseaudio]) ++ + case $host_os in + linux*) + PKG_CHECK_MODULES([NLGENL], [libnl-genl-3.0]) + PKG_CHECK_MODULES([ALSA], [alsa]) +- PKG_CHECK_MODULES([PULSE], [libpulse]) + ;; + netbsd*) + AC_SEARCH_LIBS([prop_string_create], [prop]) +@@ -151,6 +164,7 @@ AS_HELP_STRING([is release version:], [${is_release}]) + AS_HELP_STRING([enable debug flags:], [${ax_enable_debug}]) + AS_HELP_STRING([code coverage:], [${CODE_COVERAGE_ENABLED}]) + AS_HELP_STRING([enabled sanitizers:], [${ax_enabled_sanitizers}]) ++AS_HELP_STRING([pulseaudio support:], [${ax_pulse}]) + + To compile, run: + +diff --git i3status.c i3status.c +index 0898da3..1ab8400 100644 +--- i3status.c ++++ i3status.c +@@ -565,7 +565,13 @@ int main(int argc, char *argv[]) { + return 0; + break; + case 'v': +- printf("i3status " VERSION " © 2008 Michael Stapelberg and contributors\n"); ++ printf("i3status " VERSION " © 2008 Michael Stapelberg and contributors\n" ++#if HAS_PULSEAUDIO ++ "Built with pulseaudio support\n" ++#else ++ "Built without pulseaudio support\n" ++#endif ++ ); + return 0; + break; + case 0: +diff --git src/print_volume.c src/print_volume.c +index 91e8ce2..7364d47 100644 +--- src/print_volume.c ++++ src/print_volume.c +@@ -86,7 +86,7 @@ void print_volume(yajl_gen json_gen, char *buffer, const char *fmt, const char * + free(instance); + } + +-#if !defined(__DragonFly__) && !defined(__OpenBSD__) ++#if HAS_PULSEAUDIO + /* Try PulseAudio first */ + + /* If the device name has the format "pulse[:N]" where N is the diff --git a/srcpkgs/i3status/template b/srcpkgs/i3status/template index 3bfa6a3481e..9474d13234b 100644 --- a/srcpkgs/i3status/template +++ b/srcpkgs/i3status/template @@ -1,39 +1,48 @@ # Template file for 'i3status' pkgname=i3status -version=2.12 +version=2.13 revision=1 -hostmakedepends="asciidoc pkg-config" +build_style=gnu-configure +configure_args="--disable-builddir $(vopt_if pulseaudio '' --disable-pulseaudio)" +hostmakedepends="automake asciidoc pkg-config xmlto" makedepends="alsa-lib-devel confuse-devel libcap-devel libnl3-devel - pulseaudio-devel yajl-devel" + yajl-devel $(vopt_if pulseaudio pulseaudio-devel)" depends="libcap-progs" short_desc="Status bar generator for i3bar, dzen2, xmobar or similar programs" -maintainer="Orphaned " +maintainer="Lugubris " license="BSD-3-Clause" homepage="https://www.i3wm.org/i3status/" #changelog="https://raw.githubusercontent.com/i3/i3status/master/CHANGELOG" distfiles="${homepage}/${pkgname}-${version}.tar.bz2" -checksum=6fc6881536043391ab4bed369d956f99d1088965d8bcebed18d1932de3ba791a +checksum=ce89c9ff8565f62e88299f1a611229afdfc356b4e97368a5f8c4f06ad2fa1466 conf_files="/etc/i3status.conf" +build_options="pulseaudio" +build_options_default="pulseaudio" + case "$XBPS_TARGET_MACHINE" in - *-musl) makedepends+=" libglob-devel";; + *-musl) + makedepends+=" libglob-devel" + export LIBS="${XBPS_CROSS_BASE}/usr/lib/libglob.a" + ;; esac -do_build() { +post_patch() { case "$XBPS_TARGET_MACHINE" in *-musl) - sed -i '/include/s,glob.h,libglob/glob.h,g' src/process_runs.c src/print_cpu_temperature.c i3status.c - sed -i '/GLOB_TILDE/s/glob(/g_glob(/g' src/process_runs.c src/print_cpu_temperature.c i3status.c - sed -i 's/globfree(/g_globfree(/g' src/process_runs.c src/print_cpu_temperature.c i3status.c - export LIBS="$XBPS_CROSS_BASE/usr/lib/libglob.a" + vsed \ + -e '/include/s,glob.h,libglob/glob.h,g' \ + -e '/GLOB_TILDE/s/glob(/g_glob(/g' \ + -e 's/globfree(/g_globfree(/g' \ + -i src/process_runs.c src/print_cpu_temperature.c i3status.c ;; esac - make CC=$CC ${makejobs} } -do_install() { - make PREFIX=/usr DESTDIR=${DESTDIR} install - # detect dhcpcd. - sed -i -e "s#dhclient#dhcpcd#g" ${DESTDIR}/etc/i3status.conf +pre_configure() { + autoreconf -vfi +} + +post_install() { vlicense LICENSE } diff --git a/srcpkgs/iagno/template b/srcpkgs/iagno/template index 42215135b1d..76fed345932 100644 --- a/srcpkgs/iagno/template +++ b/srcpkgs/iagno/template @@ -1,13 +1,13 @@ # Template file for 'iagno' pkgname=iagno -version=3.32.0 -revision=2 +version=3.34.2 +revision=1 build_style=meson hostmakedepends="glib-devel itstool pkg-config vala" -makedepends="libcanberra-devel librsvg-devel" +makedepends="gsound-devel libcanberra-devel librsvg-devel" short_desc="GNOME Reversi (Othello) game" maintainer="Jürgen Buchmüller " license="GPL-3.0-or-later" homepage="https://wiki.gnome.org/Apps/Iagno" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=ed040e8fc6a7e965f20dc267136cd693a497e75402137b10ef2654751f5998e5 +checksum=c9beb1788339965bafc1bb14ce0f9ede9c93db7d2445580a2bf6e18a96996164 diff --git a/srcpkgs/ibus-bamboo/template b/srcpkgs/ibus-bamboo/template index 6db7c943552..0e14d425b64 100644 --- a/srcpkgs/ibus-bamboo/template +++ b/srcpkgs/ibus-bamboo/template @@ -1,6 +1,6 @@ # Template file for 'ibus-bamboo' pkgname=ibus-bamboo -version=0.5.3 +version=0.5.8 revision=1 hostmakedepends="go" makedepends="libXtst-devel libX11-devel" @@ -10,7 +10,7 @@ maintainer="ndgnuh " license="GPL-3.0-or-later" homepage="https://github.com/BambooEngine/ibus-bamboo" distfiles="${homepage}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum="8718418f5cb616808ca6827b0851ead83ee4660a981bcb9143edf0a5cf12e43a" +checksum="e4fbf2df5d6bab75323bc8ad1dd6f2d1e847db41a49b63e69169acb1ba9e94e5" nocross="armv7l-linux-gnueabihf-gcc: error: unrecognized command line option '-m64'" _engine_dir="usr/share/ibus-bamboo/" _ibus_dir="usr/share/ibus" diff --git a/srcpkgs/ibus-m17n/INSTALL.msg b/srcpkgs/ibus-m17n/INSTALL.msg new file mode 100644 index 00000000000..fbc9da6e6d1 --- /dev/null +++ b/srcpkgs/ibus-m17n/INSTALL.msg @@ -0,0 +1,2 @@ +If the M17N languages don't appear in ibus-setup or GNOME Control Center +run `ibus-daemon -xdr` or simply reboot. diff --git a/srcpkgs/ibus-m17n/template b/srcpkgs/ibus-m17n/template new file mode 100644 index 00000000000..db0ab6ea93a --- /dev/null +++ b/srcpkgs/ibus-m17n/template @@ -0,0 +1,19 @@ +# Template file for 'ibus-m17n' +pkgname=ibus-m17n +version=1.4.1 +revision=1 +build_style=gnu-configure +configure_args="--prefix=/usr --libexecdir=/usr/lib/ibus" +hostmakedepends="ibus m17n-db m17n-lib gnome-common xz pkg-config automake libtool gettext-devel" +makedepends="ibus-devel m17n-lib-devel" +depends="ibus m17n-db" +short_desc="M17N engine for IBus" +maintainer="reback00 " +license="GPL-2.0-or-later" +homepage="https://github.com/ibus/ibus-m17n" +distfiles="https://github.com/ibus/ibus-m17n/releases/download/${version}/ibus-m17n-${version}.tar.gz" +checksum=5207f0b99bd17cae05251f96649dd26ec09f2feedb47dbe92a5128c7eeea4762 + +pre_configure() { + autoreconf -fi +} diff --git a/srcpkgs/icdiff/template b/srcpkgs/icdiff/template index 8aba093e5d7..31cfc3e2354 100644 --- a/srcpkgs/icdiff/template +++ b/srcpkgs/icdiff/template @@ -1,7 +1,7 @@ # Template file for 'icdiff' pkgname=icdiff -version=1.9.4 -revision=2 +version=1.9.5 +revision=1 wrksrc="${pkgname}-release-${version}" archs=noarch build_style=python-module @@ -14,7 +14,7 @@ license="Python-2.0" homepage="http://www.jefftk.com/icdiff" changelog="https://github.com/jeffkaufman/icdiff/raw/master/ChangeLog" distfiles="https://github.com/jeffkaufman/icdiff/archive/release-${version}.tar.gz" -checksum=dabceff1986d45f1e0e6a396ed71836586acfb99092a91303f14052b879ca59a +checksum=f2e3df30e93df92224538ef3c62a73891af92de4caf94e8117582835e1040fc7 alternatives=" icdiff:icdiff:/usr/bin/icdiff2 diff --git a/srcpkgs/ice-ssb/template b/srcpkgs/ice-ssb/template index 62315cc7211..e604b9bfbc3 100644 --- a/srcpkgs/ice-ssb/template +++ b/srcpkgs/ice-ssb/template @@ -1,6 +1,6 @@ # Template file for 'ice-ssb' pkgname=ice-ssb -version=6.0.5 +version=6.0.6 revision=1 archs=noarch wrksrc="ice-$version" @@ -11,7 +11,7 @@ license="GPL-2.0-or-later" homepage="https://github.com/peppermintos/ice/" changelog="https://github.com/peppermintos/ice/blob/${version}/debian/changelog" distfiles="https://github.com/peppermintos/ice/archive/v${version}.tar.gz" -checksum=390bd16de7a6eff6a382a5efc2779bd60b74b65943234b628bf9a839fc1a1f80 +checksum=5422094e74cb9b77059631b5bc4ed6c74e7d3d48390aef142f638c8735a942cf post_extract() { sed -i -e 's/chromium-browser/chromium/g' usr/bin/ice diff --git a/srcpkgs/firefox-esr/patches/fix-musl.patch b/srcpkgs/icecat/patches/fix-gettid.patch similarity index 61% rename from srcpkgs/firefox-esr/patches/fix-musl.patch rename to srcpkgs/icecat/patches/fix-gettid.patch index c32921d39e1..6abd59b30c3 100644 --- a/srcpkgs/firefox-esr/patches/fix-musl.patch +++ b/srcpkgs/icecat/patches/fix-gettid.patch @@ -1,3 +1,6 @@ +originally, the gettid wrapper was needed on glibc and musl, +glibc-2.30 added a gettid function, so now it is only needed on musl + --- tools/profiler/core/platform.h.orig +++ tools/profiler/core/platform.h @@ -56,7 +56,7 @@ @@ -5,7 +8,7 @@ // We need a definition of gettid(), but glibc doesn't provide a // wrapper for it. -#if defined(__GLIBC__) -+#if defined(__linux__) ++#if defined(__linux__) && !defined(__GLIBC__) #include #include static inline pid_t gettid() diff --git a/srcpkgs/icecat/patches/fix-musl.patch b/srcpkgs/icecat/patches/fix-musl.patch deleted file mode 100644 index c32921d39e1..00000000000 --- a/srcpkgs/icecat/patches/fix-musl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- tools/profiler/core/platform.h.orig -+++ tools/profiler/core/platform.h -@@ -56,7 +56,7 @@ - - // We need a definition of gettid(), but glibc doesn't provide a - // wrapper for it. --#if defined(__GLIBC__) -+#if defined(__linux__) - #include - #include - static inline pid_t gettid() diff --git a/srcpkgs/icecat/patches/rust-cssparser.patch b/srcpkgs/icecat/patches/rust-cssparser.patch new file mode 100644 index 00000000000..1ebef87c014 --- /dev/null +++ b/srcpkgs/icecat/patches/rust-cssparser.patch @@ -0,0 +1,90 @@ +backport of: + +From 3c98d22c5de3b696bf1fde2b6c90069812312aa6 Mon Sep 17 00:00:00 2001 +From: Simon Sapin +Date: Tue, 23 Apr 2019 13:47:25 +0200 +Subject: [PATCH] Fix a future-compat warning + +``` +warning[E0506]: cannot assign to `self.input.cached_token` because it is borrowed + --> src/parser.rs:591:17 + | +566 | pub fn next_including_whitespace_and_comments(&mut self) -> Result<&Token<'i>, BasicParseError<'i>> { + | - let's call the lifetime of this reference `'1` +... +579 | Some(ref cached_token) + | ---------------- borrow of `self.input.cached_token` occurs here +... +591 | self.input.cached_token = Some(CachedToken { + | ^^^^^^^^^^^^^^^^^^^^^^^ assignment to borrowed `self.input.cached_token` occurs here +... +603 | Ok(token) + | --------- returning this value requires that `self.input.cached_token.0` is borrowed for `'1` + | + = warning: this error has been downgraded to a warning for backwards compatibility with previous releases + = warning: this represents potential undefined behavior in your code and this warning will become a hard error in the future +``` +--- + src/parser.rs | 50 +++++++++++++++++++++++++++----------------------- + 1 file changed, 27 insertions(+), 23 deletions(-) + +diff --git a/src/parser.rs b/src/parser.rs +index 51f441e4..7cef117c 100644 +--- third_party/rust/cssparser/src/parser.rs ++++ third_party/rust/cssparser/src/parser.rs +@@ -555,28 +555,34 @@ + } + + let token_start_position = self.input.tokenizer.position(); +- let token; +- match self.input.cached_token { +- Some(ref cached_token) +- if cached_token.start_position == token_start_position => { +- self.input.tokenizer.reset(&cached_token.end_state); +- match cached_token.token { +- Token::Function(ref name) => self.input.tokenizer.see_function(name), +- _ => {} +- } +- token = &cached_token.token ++ let using_cached_token = self ++ .input ++ .cached_token ++ .as_ref() ++ .map_or(false, |cached_token| { ++ cached_token.start_position == token_start_position ++ }); ++ let token = if using_cached_token { ++ let cached_token = self.input.cached_token.as_ref().unwrap(); ++ self.input.tokenizer.reset(&cached_token.end_state); ++ match cached_token.token { ++ Token::Function(ref name) => self.input.tokenizer.see_function(name), ++ _ => {} + } +- _ => { +- let new_token = self.input.tokenizer.next() +- .map_err(|()| self.new_basic_error(BasicParseErrorKind::EndOfInput))?; +- self.input.cached_token = Some(CachedToken { +- token: new_token, +- start_position: token_start_position, +- end_state: self.input.tokenizer.state(), +- }); +- token = self.input.cached_token_ref() +- } +- } ++ &cached_token.token ++ } else { ++ let new_token = self ++ .input ++ .tokenizer ++ .next() ++ .map_err(|()| self.new_basic_error(BasicParseErrorKind::EndOfInput))?; ++ self.input.cached_token = Some(CachedToken { ++ token: new_token, ++ start_position: token_start_position, ++ end_state: self.input.tokenizer.state(), ++ }); ++ self.input.cached_token_ref() ++ }; + + if let Some(block_type) = BlockType::opening(token) { + self.at_start_of = Some(block_type); diff --git a/srcpkgs/icecat/template b/srcpkgs/icecat/template index 64a466766d9..655d7cab66e 100644 --- a/srcpkgs/icecat/template +++ b/srcpkgs/icecat/template @@ -37,6 +37,13 @@ if [ "$XBPS_WORDSIZE" -eq 32 ]; then nodebug=yes fi +# we need this because cargo verifies checksums of all files in vendor +# crates when it builds and gives us no way to override or update the +# file sanely... so just clear out the file list +_clear_vendor_checksums() { + sed -i 's/\("files":{\)[^}]*/\1/' third_party/rust/$1/.cargo-checksum.json +} + post_extract() { case "$XBPS_TARGET_MACHINE" in *-musl) @@ -51,6 +58,11 @@ post_extract() { # Note: This is for Void Linux use ONLY. echo -n "cd894504-7a2a-4263-abff-ff73ee89ffca" > mozilla-api-key } + +post_patch() { + _clear_vendor_checksums cssparser +} + do_build() { local triplet cp ${FILESDIR}/mozconfig .mozconfig diff --git a/srcpkgs/icewm/patches/use-NULL.patch b/srcpkgs/icewm/patches/use-NULL.patch deleted file mode 100644 index 855c1a446c6..00000000000 --- a/srcpkgs/icewm/patches/use-NULL.patch +++ /dev/null @@ -1,45 +0,0 @@ -For unknown reasons g++ complains about these usages -of 'nullptr' being unknown and suggests to use 'fileptr' -instead, which of course is wrong. -Use the C way of describing a null pointer as NULL for now. - ---- src/wmconfig.cc 2019-05-07 12:15:34.814033408 +0200 -+++ src/wmconfig.cc 2019-05-07 12:17:38.655028470 +0200 -@@ -50,7 +50,7 @@ - if (!append) { - for (long i = 0; i < workspaceCount; i++) { - delete[] workspaceNames[i]; -- workspaceNames[i] = nullptr; -+ workspaceNames[i] = NULL; - } - workspaceCount = 0; - } ---- src/icewmhint.cc 2019-04-23 22:12:00.000000000 +0200 -+++ src/icewmhint.cc 2019-05-07 12:19:35.440023813 +0200 -@@ -32,7 +32,7 @@ - Hinter() : - display(XOpenDisplay(NULL)) - { -- if (display == nullptr) -+ if (display == NULL) - die(1, _("Can't open display: %s. " - "X must be running and $DISPLAY set."), - XDisplayName(NULL)); -@@ -52,7 +52,7 @@ - size += 1 + strlen(args[i]); - - unsigned char *hint = new unsigned char [size]; -- if (hint == nullptr) -+ if (hint == NULL) - die(1, _("Out of memory (len=%d)."), int(size)); - - size_t copy = 0; -@@ -79,7 +79,7 @@ - - char** arg = &argv[1]; - for (; arg < &argv[argc] && **arg == '-'; ++arg) { -- char* value = nullptr; -+ char* value = NULL; - if (GetArgument(value, "d", "display", arg, argv + argc)) { - setenv("DISPLAY", value, True); - } diff --git a/srcpkgs/icewm/template b/srcpkgs/icewm/template index 70a445f4874..a011b4a8d7d 100644 --- a/srcpkgs/icewm/template +++ b/srcpkgs/icewm/template @@ -1,19 +1,29 @@ # Template file for 'icewm' pkgname=icewm -version=1.5.4 -revision=3 +version=1.6.2 +revision=1 build_style=cmake configure_args="-DENABLE_LTO=ON -DCONFIG_LIBRSVG=ON -DENABLE_ALSA=ON -DCFGDIR=/etc/icewm" hostmakedepends="asciidoc gettext-devel libtool mkfontdir perl pkg-config" makedepends="libSM-devel libXft-devel libXinerama-devel libXpm-devel - libXrandr-devel libao-devel librsvg-devel libsndfile-devel" + libXrandr-devel libao-devel librsvg-devel libsndfile-devel libXcomposite-devel fribidi-devel" depends="shared-mime-info" short_desc="Window Manager designed for speed, usability, and consistency" maintainer="Orphaned " license="GPL-2.0-or-later" -homepage="https://github.com/bbidulock/icewm" -distfiles="https://github.com/ice-wm/icewm/releases/download/${version}/icewm-${version}.tar.xz" -checksum=895c81d6672a3eaa91c76a0807ea8fea6789b8a3c8626635f1c11d7c5ca059ea +homepage="https://ice-wm.org/" +distfiles="https://github.com/ice-wm/icewm/archive/${version}.tar.gz" +checksum=1008c17caa7d69a0bd29e5122efee278c99f0082b4c02b1e2a45c188ea9396dc # No c++ warnings for 'One Defintion Rules' and make sure LTO goes ok CXXFLAGS="-Wno-odr -fno-strict-aliasing" + + +if [ "$CROSS_BUILD" ]; then + makedepends+=" libXdamage-devel" +fi + + +pre_install() { + cp lib/IceWM.jpg build/lib/IceWM.jpg +} diff --git a/srcpkgs/iio-sensor-proxy/template b/srcpkgs/iio-sensor-proxy/template index d87d043350b..b8bd7003535 100644 --- a/srcpkgs/iio-sensor-proxy/template +++ b/srcpkgs/iio-sensor-proxy/template @@ -1,6 +1,6 @@ # Template file for 'iio-sensor-proxy' pkgname=iio-sensor-proxy -version=2.7 +version=2.8 revision=1 build_style=gnu-configure hostmakedepends="automake gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool" @@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni " license="GPL-3" homepage="https://github.com/hadess/iio-sensor-proxy" distfiles="$homepage/archive/$version.tar.gz" -checksum=14e8919e1ec913660230a88bb7dcd667d32b9199e7abf3c84b34e06a1c39e87c +checksum=3129e89777ad308400685d3da16931b404ecc4d6b0a48fe217b405e3310a8373 patch_args="-Np1" pre_configure() { diff --git a/srcpkgs/imgp/template b/srcpkgs/imgp/template index 764fe7b9426..2ddccac758c 100644 --- a/srcpkgs/imgp/template +++ b/srcpkgs/imgp/template @@ -6,7 +6,7 @@ archs=noarch build_style=gnu-makefile depends="python3-Pillow" short_desc="Multi-core batch image resizer and rotator" -maintainer="maxice8 " +maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://github.com/jarun/imgp" distfiles="https://github.com/jarun/imgp/archive/v${version}.tar.gz" diff --git a/srcpkgs/immortal/template b/srcpkgs/immortal/template index 518af7fde1d..6f7ad74ac7b 100644 --- a/srcpkgs/immortal/template +++ b/srcpkgs/immortal/template @@ -9,7 +9,7 @@ go_package="${go_import_path}/cmd/immortal ${go_import_path}/cmd/immortalctl go_ldflags="-X main.Version=v${version}" hostmakedepends="git" short_desc="*nix cross-platform (OS agnostic) supervisor" -maintainer="maxice8 " +maintainer="Orphaned " license="BSD-3-Clause" homepage="https://github.com/immortal/immortal" #changelog="https://raw.githubusercontent.com/immortal/immortal/master/CHANGELOG.md" diff --git a/srcpkgs/imv/template b/srcpkgs/imv/template index 540b1b6b017..42c3664cf63 100644 --- a/srcpkgs/imv/template +++ b/srcpkgs/imv/template @@ -1,19 +1,20 @@ # Template file for 'imv' pkgname=imv -version=3.1.2 +version=4.0.1 revision=1 build_style=gnu-makefile hostmakedepends="asciidoc pkg-config" -makedepends="SDL2_ttf-devel cmocka-devel fontconfig-devel freeimage-devel - librsvg-devel" +makedepends="cmocka-devel freeimage-devel glu-devel librsvg-devel libxkbcommon-devel + pango-devel wayland-devel" depends="desktop-file-utils" conf_files="/etc/imv_config" short_desc="Image viewer for X11/Wayland" -maintainer="Arvin Ignaci " +maintainer="bra1nwave " license="GPL-2.0-or-later, MIT" homepage="https://github.com/eXeC64/imv" +changelog="https://raw.githubusercontent.com/eXeC64/imv/master/CHANGELOG" distfiles="https://github.com/eXeC64/imv/archive/v${version}.tar.gz" -checksum=4d98696ea5c16b4cb6f7b3c3e7da8ee9e1814e9fc78e66ee1a2015f5dfd0d450 +checksum=b2370c7ab88056b4c832fa24ac837ac645378d9fa028f4bb8828da6a832b2e27 conflicts="renameutils>=0" post_install() { diff --git a/srcpkgs/incidenceeditor/template b/srcpkgs/incidenceeditor/template index 941ed1b4f43..5b4cfd69808 100644 --- a/srcpkgs/incidenceeditor/template +++ b/srcpkgs/incidenceeditor/template @@ -1,7 +1,7 @@ # Template file for 'incidenceeditor' pkgname=incidenceeditor -version=19.08.0 -revision=1 +version=19.08.2 +revision=2 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kcoreaddons kconfig" makedepends="calendarsupport-devel eventviews-devel kdiagram-devel" @@ -10,7 +10,7 @@ maintainer="Helmut Pozimski " license="GPL-2.0-or-later" homepage="https://community.kde.org/KDE_PIM" distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz" -checksum=43915613a5db71847be425bc4434c0e04f5410b3575cea3141ffcd99b2cdb9ea +checksum=f2f7bf3a12af21e6f9e4a5f2ba93346e06a6988366af7b452d6268ac9fb4fc3d incidenceeditor-devel_package() { short_desc+=" - development" diff --git a/srcpkgs/include-what-you-use/template b/srcpkgs/include-what-you-use/template index 5ebf9a70d2a..331c4441fa2 100644 --- a/srcpkgs/include-what-you-use/template +++ b/srcpkgs/include-what-you-use/template @@ -1,7 +1,7 @@ # Template file for 'include-what-you-use' pkgname=include-what-you-use version=0.12 -revision=1 +revision=2 wrksrc="${pkgname}" build_style=cmake configure_args="-DIWYU_LLVM_ROOT_PATH=${XBPS_CROSS_BASE}/usr " diff --git a/srcpkgs/influxdb/template b/srcpkgs/influxdb/template index 77d8b68e1d7..4814650dc0c 100644 --- a/srcpkgs/influxdb/template +++ b/srcpkgs/influxdb/template @@ -1,6 +1,6 @@ # Template file for 'influxdb' pkgname=influxdb -version=1.7.7 +version=1.7.8 revision=1 build_style=go go_import_path=github.com/influxdata/influxdb @@ -17,7 +17,7 @@ license="MIT" homepage="https://influxdata.com/time-series-platform/influxdb/" changelog="https://raw.githubusercontent.com/influxdata/influxdb/master/CHANGELOG.md" distfiles="https://${go_import_path}/archive/v${version}.tar.gz" -checksum=2ac8d6edb7eb736ba1a7c2c3fc3d529c6685a27d0a0c11ef51b02f4561e44166 +checksum=ed52925bb71ca8912e4daecce66a4c32935f396cf3f021464aab99934b41db51 system_accounts="_influxdb" _influxdb_homedir="/var/lib/influxdb" diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template index f25db667498..092c279b09e 100644 --- a/srcpkgs/inkscape/template +++ b/srcpkgs/inkscape/template @@ -1,7 +1,7 @@ # Template file for 'inkscape' pkgname=inkscape version=0.92.4 -revision=6 +revision=7 wrksrc="${pkgname}-INKSCAPE_${version//./_}" build_style=gnu-configure configure_args="--enable-lcms --enable-poppler-cairo diff --git a/srcpkgs/innoextract/template b/srcpkgs/innoextract/template index 5a6766d23dd..c578d7cd0d3 100644 --- a/srcpkgs/innoextract/template +++ b/srcpkgs/innoextract/template @@ -1,14 +1,14 @@ # Template file for 'innoextract' pkgname=innoextract -version=1.7 -revision=4 +version=1.8 +revision=1 build_style=cmake configure_args="-DCMAKE_INSTALL_PREFIX=/usr" -hostmakedepends="boost" +hostmakedepends="boost extra-cmake-modules" makedepends="boost-devel liblzma-devel" -short_desc="A tool to unpack installers created by Inno Setup" +short_desc="Tool to unpack installers created by Inno Setup" maintainer="Antonio Malcolm " license="Zlib" homepage="http://constexpr.org/innoextract/" distfiles="${homepage}files/${pkgname}-${version}/${pkgname}-${version}.tar.gz" -checksum=c1efb732f2bc3a80065c5f51a0d4ea6027aebf528c609d3f336aea2055d2f0a4 +checksum=5e78f6295119eeda08a54dcac75306a1a4a40d0cb812ff3cd405e9862c285269 diff --git a/srcpkgs/intel-ucode/template b/srcpkgs/intel-ucode/template index 109edac179b..dfcd239f283 100644 --- a/srcpkgs/intel-ucode/template +++ b/srcpkgs/intel-ucode/template @@ -1,6 +1,6 @@ # Template file for 'intel-ucode' pkgname=intel-ucode -version=20190618 +version=20190918 revision=1 archs="i686* x86_64*" wrksrc="Intel-Linux-Processor-Microcode-Data-Files-microcode-${version}" @@ -9,7 +9,7 @@ maintainer="Orphaned " license="custom: Proprietary" homepage="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files" distfiles="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-${version}.tar.gz" -checksum=74ec7415988d40fa53686d994cf8cb27accdbd35c5373c4c3afc2e93372ebba5 +checksum=2b6b728d351764dfbf6a9763ac96ae7e04085f382a309fed3abc0118f094c943 repository=nonfree do_install() { diff --git a/srcpkgs/intellij-idea-community-edition/template b/srcpkgs/intellij-idea-community-edition/template index 961c22781af..b079e18e35c 100644 --- a/srcpkgs/intellij-idea-community-edition/template +++ b/srcpkgs/intellij-idea-community-edition/template @@ -1,6 +1,6 @@ # Template file for 'intellij-idea-community-edition' pkgname=intellij-idea-community-edition -version=2019.1.3 +version=2019.2.3 revision=1 archs="i686 x86_64" depends="virtual?java-environment giflib libXtst" @@ -9,7 +9,7 @@ maintainer="John " license="Apache-2.0" homepage="https://www.jetbrains.org/" distfiles="https://download.jetbrains.com/idea/ideaIC-${version}-no-jbr.tar.gz" -checksum=6fbb1f99b467a7c7a39d74b835414288b113a9a136f9ba22b25ea44f87952fff +checksum=9742d4c65b8ce20c31e993f0e04d526b0f368d7703e34ad4d6a01713b886353a repository=nonfree nopie=yes @@ -27,21 +27,28 @@ do_install() { rm ${DESTDIR}/usr/lib/intellij-idea/bin/fsnotifier-arm rm ${DESTDIR}/usr/lib/intellij-idea/plugins/android/lib/libwebp/win -rf rm ${DESTDIR}/usr/lib/intellij-idea/plugins/android/lib/libwebp/mac -rf + rm ${DESTDIR}/usr/lib/intellij-idea/plugins/maven/lib/maven3/lib/jansi-native/windows32 -rf + rm ${DESTDIR}/usr/lib/intellij-idea/plugins/maven/lib/maven3/lib/jansi-native/windows64 -rf + rm ${DESTDIR}/usr/lib/intellij-idea/plugins/maven/lib/maven3/lib/jansi-native/osx -rf + rm ${DESTDIR}/usr/lib/intellij-idea/plugins/maven/lib/maven3/lib/jansi-native/freebsd32 -rf + rm ${DESTDIR}/usr/lib/intellij-idea/plugins/maven/lib/maven3/lib/jansi-native/freebsd64 -rf case $XBPS_TARGET_MACHINE in x86_64) rm ${DESTDIR}/usr/lib/intellij-idea/bin/fsnotifier rm ${DESTDIR}/usr/lib/intellij-idea/bin/idea.vmoptions - rm ${DESTDIR}/usr/lib/intellij-idea/plugins/android/lib/libwebp/linux/libwebp_jni.so rm ${DESTDIR}/usr/lib/intellij-idea/lib/pty4j-native/linux/x86 -rf rm ${DESTDIR}/usr/lib/intellij-idea/lib/pty4j-native/linux/ppc64le -rf + rm ${DESTDIR}/usr/lib/intellij-idea/plugins/android/lib/libwebp/linux/libwebp_jni.so + rm ${DESTDIR}/usr/lib/intellij-idea/plugins/maven/lib/maven3/lib/jansi-native/linux32 -rf ;; i686) rm ${DESTDIR}/usr/lib/intellij-idea/bin/fsnotifier64 rm ${DESTDIR}/usr/lib/intellij-idea/bin/idea64.vmoptions - rm ${DESTDIR}/usr/lib/intellij-idea/plugins/android/lib/libwebp/linux/libwebp_jni64.so rm ${DESTDIR}/usr/lib/intellij-idea/bin/libdbm64.so rm ${DESTDIR}/usr/lib/intellij-idea/lib/pty4j-native/linux/x86_64 -rf rm ${DESTDIR}/usr/lib/intellij-idea/lib/pty4j-native/linux/ppc64le -rf + rm ${DESTDIR}/usr/lib/intellij-idea/plugins/android/lib/libwebp/linux/libwebp_jni64.so + rm ${DESTDIR}/usr/lib/intellij-idea/plugins/maven/lib/maven3/lib/jansi-native/linux64 -rf ;; esac diff --git a/srcpkgs/inxi/template b/srcpkgs/inxi/template index bd2c820eb76..76afaf8b7f4 100644 --- a/srcpkgs/inxi/template +++ b/srcpkgs/inxi/template @@ -1,17 +1,17 @@ # Template file for 'inxi' pkgname=inxi -version=3.0.34 +version=3.0.36 revision=1 archs=noarch wrksrc="inxi-${version}-1" depends="dmidecode file glxinfo pciutils perl usbutils xdpyinfo xprop xrandr" short_desc="Full featured system information script" -maintainer="Orphaned " +maintainer="bra1nwave " 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=db3c331706772f68de68191abcde8f9eedabef001fc39c1683dd71f54610c77e +checksum=2826ee041f4ce2be91063be1ba92c47f6a2b7f1ee97ed236af4c71494d6a1bd0 do_install() { vbin inxi diff --git a/srcpkgs/io.elementary.calendar/template b/srcpkgs/io.elementary.calendar/template index 6e8ac639231..5e9ae316d95 100644 --- a/srcpkgs/io.elementary.calendar/template +++ b/srcpkgs/io.elementary.calendar/template @@ -1,8 +1,9 @@ # Template file for 'io.elementary.calendar' pkgname=io.elementary.calendar version=5.0 -revision=2 -wrksrc="calendar-${version}" +revision=3 +_git_commit=46346e48b53e9d3d59d9f567b622532338f50f32 +wrksrc="calendar-${_git_commit}" build_style=meson build_helper="gir" hostmakedepends="intltool pkg-config vala desktop-file-utils AppStream" @@ -13,8 +14,8 @@ short_desc="Desktop calendar app designed for elementary OS" maintainer="Cameron Nemo " license="GPL-3.0-only" homepage="https://github.com/elementary/calendar" -distfiles="${homepage}/archive/${version}.tar.gz" -checksum=f47bae213163ec87c2e4f2c0563a40be8cf080cab70094a6a4f41936803fb3fa +distfiles="${homepage}/archive/${_git_commit}.tar.gz" +checksum=3be3851baeed67144e5cbed209b2c1b982fe9830db13372e3051423295dee345 libio.elementary.calendar_package() { short_desc+=" - library" diff --git a/srcpkgs/io.elementary.code/template b/srcpkgs/io.elementary.code/template index e597d61eff5..68018aabb00 100644 --- a/srcpkgs/io.elementary.code/template +++ b/srcpkgs/io.elementary.code/template @@ -1,7 +1,7 @@ # Template file for 'io.elementary.code' pkgname=io.elementary.code version=3.1.1 -revision=2 +revision=3 wrksrc="code-${version}" build_style=meson hostmakedepends="pkg-config vala intltool glib-devel" diff --git a/srcpkgs/io.elementary.files/template b/srcpkgs/io.elementary.files/template index 4c7c798bcc3..3eb6525b0b0 100644 --- a/srcpkgs/io.elementary.files/template +++ b/srcpkgs/io.elementary.files/template @@ -1,6 +1,6 @@ # Template file for 'io.elementary.files' pkgname=io.elementary.files -version=4.1.9 +version=4.2.0 revision=1 wrksrc="files-${version}" build_style=meson @@ -8,13 +8,13 @@ configure_args="-Dwith-unity=false" hostmakedepends="vala glib-devel pkg-config" makedepends="gtk+3-devel libglib-devel libgee08-devel sqlite-devel plank-devel libcanberra-devel granite-devel pango-devel zeitgeist-devel dbus-glib-devel - libnotify-devel" + libnotify-devel libcloudproviders-devel" short_desc="File browser designed for elementary OS" -maintainer="Cameron Nemo " +maintainer="Cameron Nemo " license="GPL-3.0-or-later" homepage="https://github.com/elementary/files" distfiles="https://github.com/elementary/files/archive/${version}.tar.gz" -checksum=9948e6476095095f922d723279e974be249dc7ea1d5b4b5f8ea19ac6314a4546 +checksum=6151db8279f38abd7a938ea63ea43371148b0e9d9a989351f77ac51c85a10325 libio.elementary.files_package() { short_desc+=" - library" diff --git a/srcpkgs/ipe/template b/srcpkgs/ipe/template index e79cc29ab00..ee84562db3d 100644 --- a/srcpkgs/ipe/template +++ b/srcpkgs/ipe/template @@ -1,7 +1,7 @@ # Template file for 'ipe' pkgname=ipe -version=7.2.12 -revision=2 +version=7.2.13 +revision=1 _tools_commit=6a2b0fd899dad765c67d3ec5cf95790d5ba090a7 hostmakedepends="pkg-config qt5-qmake qt5-tools qt5-host-tools" makedepends="qt5-devel lua52-devel libjpeg-turbo-devel cairo-devel poppler-devel" @@ -11,18 +11,15 @@ license="GPL-3.0-or-later" homepage="http://ipe.otfried.org/" distfiles="https://dl.bintray.com/otfried/generic/ipe/${version%.*}/ipe-${version}-src.tar.gz https://github.com/otfried/ipe-tools/archive/${_tools_commit}.tar.gz" -checksum="7c9a78b20e7d08be5850299240b9cd2b45982ff1299a903a999d8ff8796581e3 +checksum="af3ca3d713ae99d65cfeb9cddea56c9d1a3b1e52e2fc30cd0fe017793242caa8 143c6c99de2e5548c1666717c5b9cbba1a360d322c8f934695c2bfe0ac5c3d2c" -case "$XBPS_TARGET_MACHINE" in - *-musl) broken=yes ;; -esac - post_extract() { mv $XBPS_BUILDDIR/ipe-tools* ipe-tools sed -i 's/xlocale.h/locale.h/g' src/ipelib/ipeplatform.cpp sed -i '/cstdio/i#include ' src/include/ipebase.h + sed -i '/cstdio/i#include ' src/include/ipebase.h } do_build() { diff --git a/srcpkgs/iperf/template b/srcpkgs/iperf/template index 126de357156..d992f0d3d67 100644 --- a/srcpkgs/iperf/template +++ b/srcpkgs/iperf/template @@ -6,7 +6,7 @@ build_style=gnu-configure configure_args="--enable-ipv6 --enable-multicast --enable-threads ac_cv_sizeof_bool=0" short_desc="Perform network throughput tests" -maintainer="maxice8 " +maintainer="Orphaned " license="NCSA" homepage="https://iperf.fr/" distfiles="${SOURCEFORGE_SITE}/${pkgname}2/${pkgname}-${version}.tar.gz" diff --git a/srcpkgs/iperf3/template b/srcpkgs/iperf3/template index 06602de120e..75a980b17df 100644 --- a/srcpkgs/iperf3/template +++ b/srcpkgs/iperf3/template @@ -6,7 +6,7 @@ wrksrc="iperf-${version}" build_style=gnu-configure make_build_args="iperf3_profile_LDFLAGS= iperf3_profile_CFLAGS=" short_desc="Active measurements of the maximum achievable bandwidth on IP networks" -maintainer="maxice8 " +maintainer="Orphaned " license="BSD-3-Clause" homepage="http://software.es.net/iperf/" changelog="https://raw.githubusercontent.com/esnet/iperf/master/RELEASE_NOTES" diff --git a/srcpkgs/iproute2/template b/srcpkgs/iproute2/template index 8ea63613526..1e918d98abf 100644 --- a/srcpkgs/iproute2/template +++ b/srcpkgs/iproute2/template @@ -1,6 +1,6 @@ # Template file for 'iproute2' pkgname=iproute2 -version=5.2.0 +version=5.3.0 revision=1 build_style=configure make_install_args="SBINDIR=/usr/bin" @@ -11,7 +11,7 @@ maintainer="Enno Boland " license="GPL-2.0-only" homepage="https://wiki.linuxfoundation.org/networking/iproute2" distfiles="${KERNEL_SITE}/utils/net/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=a5b95dec26353fc71dba9bb403e9343fad2a06bd69fb154a22a2aa2914f74da8 +checksum=cb1c1e45993a3bd2438543fd4332d70f1726a6e6ff97dc613a8258c993117b3f conf_files=" /etc/iproute2/ematch_map diff --git a/srcpkgs/ipv6calc/template b/srcpkgs/ipv6calc/template index e4a811678a4..40701608f4b 100644 --- a/srcpkgs/ipv6calc/template +++ b/srcpkgs/ipv6calc/template @@ -1,6 +1,6 @@ # Template file for 'ipv6calc' pkgname=ipv6calc -version=2.1.0 +version=2.1.1 revision=1 build_style=gnu-configure configure_args="--enable-geoip" @@ -11,4 +11,4 @@ maintainer="Lon Willett " license="GPL-2.0-only" homepage="https://www.deepspace6.net/projects/ipv6calc.html" distfiles="https://github.com/pbiering/ipv6calc/archive/${version}.tar.gz" -checksum=a0ec4a1ff197210162f8a644381dd08b2c552cf50c68041748ea7e067df70080 +checksum=964957e79505cbc71ebc706a0fc0b67c6e08c55ed53335470ed7f8309eb84405 diff --git a/srcpkgs/ipvsadm/template b/srcpkgs/ipvsadm/template index 7df99d4c5f1..9f1db9abdf9 100644 --- a/srcpkgs/ipvsadm/template +++ b/srcpkgs/ipvsadm/template @@ -1,15 +1,15 @@ # Template file for 'ipvsadm' pkgname=ipvsadm -version=1.29 +version=1.30 revision=1 hostmakedepends="pkg-config" makedepends="libnl3-devel popt-devel" -short_desc="The IP Virtual Server administration utility" +short_desc="IP Virtual Server administration utility" maintainer="Orphaned " -license="GPL-2" +license="GPL-2.0-or-later" homepage="http://www.linuxvirtualserver.org/software/ipvs.html" distfiles="${KERNEL_SITE}/utils/kernel/ipvsadm/$pkgname-$version.tar.xz" -checksum=c3de4a21d90a02c621f0c72ee36a7aa27374b6f29fd4178f33fbf71b4c66c149 +checksum=95573d70df473c9f63fc4ac496c044c69e3a6de7ccac119922210c0b44cd7a0c CFLAGS="-Du_int16_t=uint16_t -Du_int32_t=uint32_t" diff --git a/srcpkgs/irssi/template b/srcpkgs/irssi/template index bbd6a19d527..bf029cbcb4c 100644 --- a/srcpkgs/irssi/template +++ b/srcpkgs/irssi/template @@ -1,7 +1,7 @@ # Template file for 'irssi' pkgname=irssi -version=1.2.1 -revision=1 +version=1.2.2 +revision=2 build_style=gnu-configure configure_args="--disable-static --with-proxy --enable-true-color --with-otr" hostmakedepends="pkg-config" @@ -13,7 +13,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://www.irssi.org" distfiles="https://github.com/irssi/irssi/releases/download/${version}/irssi-${version}.tar.gz" -checksum=fd8b0ef2544fdb691211293dded3dcf6ed87f21781db19e7df62ead797f18a06 +checksum=53182861d4d2be6db35fa7e3f0524a64d2a54a374307574dab5f5362bfea563c LDFLAGS="-lncursesw" subpackages="irssi-devel irssi-otr" diff --git a/srcpkgs/iso-codes/template b/srcpkgs/iso-codes/template index c3434030ca7..548fc15aea7 100644 --- a/srcpkgs/iso-codes/template +++ b/srcpkgs/iso-codes/template @@ -1,6 +1,6 @@ # Template file for 'iso-codes' pkgname=iso-codes -version=4.3 +version=4.4 revision=1 archs=noarch build_style=gnu-configure @@ -10,4 +10,4 @@ maintainer="Orphaned " license="LGPL-2.1-or-later" homepage="https://salsa.debian.org/iso-codes-team/iso-codes" distfiles="${DEBIAN_SITE}/main/i/iso-codes/${pkgname}_${version}.orig.tar.xz" -checksum=643eb83b2d714e8650ed7112706968d057bf5b101ba71c8ef219e20f1737b141 +checksum=5124ba64e5ce6e1a73c24d1a1cdc42f6a2d0db038791b28ac77aafeb07654e86 diff --git a/srcpkgs/ispc/template b/srcpkgs/ispc/template index a27cc129f01..2386fc710d3 100644 --- a/srcpkgs/ispc/template +++ b/srcpkgs/ispc/template @@ -1,10 +1,10 @@ # Template file for 'ispc' pkgname=ispc -version=1.11.0 +version=1.12.0 revision=1 archs="i686 x86_64" build_style=cmake -hostmakedepends="clang python m4 bison flex llvm" +hostmakedepends="clang python3 m4 bison flex llvm" configure_args="-DISPC_NO_DUMPS=yes" makedepends="ncurses-devel zlib-devel" short_desc="A compiler for high-performance SIMD programming on the CPU" @@ -13,9 +13,9 @@ license="BSD" homepage="https://ispc.github.io" distfiles="https://github.com/ispc/ispc/archive/v${version}.tar.gz" patch_args="-p1" -checksum=f48ef6e8a1fe5ad4fca691583bf7419f4dce1596e7ed850ff99cc017f8711b2f +checksum=9ebc29adcdf477659b45155d0f91e61120a12084e42113d0e9f4ce5cfdfbdcab nopie=yes pre_build() { sed -i '/tinfo/d' CMakeLists.txt -} \ No newline at end of file +} diff --git a/srcpkgs/iverilog/template b/srcpkgs/iverilog/template index 1eb6539c2b1..971cf2a8e12 100644 --- a/srcpkgs/iverilog/template +++ b/srcpkgs/iverilog/template @@ -1,7 +1,7 @@ # Template file for 'iverilog' pkgname=iverilog -version=10.2 -revision=3 +version=10.3 +revision=1 wrksrc="${pkgname}-${version/./_}" build_style=gnu-configure hostmakedepends="automake flex gperf" @@ -11,7 +11,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="http://iverilog.icarus.com/" distfiles="https://github.com/steveicarus/iverilog/archive/v${version/./_}.tar.gz" -checksum=f54d91821223c71c70f4735a1fb2af39c62efbccdeb9b0060ea1cf9c67647ee3 +checksum=4b884261645a73b37467242d6ae69264fdde2e7c4c15b245d902531efaaeb234 nocross="draw_tt.exe: cannot execute binary file: Exec format error" diff --git a/srcpkgs/iwd/template b/srcpkgs/iwd/template index eb57cb326d5..4ec4727d82b 100644 --- a/srcpkgs/iwd/template +++ b/srcpkgs/iwd/template @@ -1,20 +1,20 @@ # Template file for 'iwd' pkgname=iwd -version=0.19 +version=0.22 revision=1 build_style=gnu-configure -configure_args="--disable-systemd-service --enable-docs --enable-pie +configure_args="--disable-systemd-service --enable-pie --enable-external-ell --enable-dbus-policy --enable-wired" -hostmakedepends="asciidoc pkg-config automake libtool" +hostmakedepends="python3-docutils pkg-config automake libtool" makedepends="readline-devel dbus-devel ell-devel" depends="dbus" checkdepends="python3" short_desc="Internet Wireless Daemon by Intel that aims to replace wpa_supplicant" -maintainer="maxice8 " +maintainer="Peter Bui " license="LGPL-2.1-or-later" homepage="https://iwd.wiki.kernel.org/" distfiles="${KERNEL_SITE}/network/wireless/iwd-${version}.tar.xz" -checksum=f041e21531b5d4a9b705e366dc95d99434c2c337b7508d72e295620b6182ccf4 +checksum=b50c778716a2a1f9da961de0cac4711ad43ab104a67405935248f33ea8a6559a make_dirs="/var/lib/iwd 0600 root root /etc/iwd 755 root root" diff --git a/srcpkgs/jack/template b/srcpkgs/jack/template index 3303ec5a9b7..4c60f0ede3b 100644 --- a/srcpkgs/jack/template +++ b/srcpkgs/jack/template @@ -1,33 +1,31 @@ # Template file for 'jack' pkgname=jack -version=1.9.12 -revision=12 +version=1.9.13 +revision=1 wrksrc="jack2-${version}" -# XXX libffado (firewire) -hostmakedepends="pkg-config python" -makedepends="opus-devel libsamplerate-devel readline-devel dbus-devel celt-devel" -depends="python-dbus" +build_style=waf3 +configure_args="--alsa --classic --dbus" +hostmakedepends="pkg-config" +makedepends="opus-devel libsamplerate-devel readline-devel dbus-devel celt-devel + $(vopt_if ffado libffado-devel)" +depends="python3-dbus" short_desc="JACK Audio Connection Kit low-latency sound server (pro audio)" -maintainer="Orphaned " -license="GPL-2, LGPL-2.1" -homepage="http://jackaudio.org/" +maintainer="Daniel Eyßer " +license="GPL-2.0-or-later, LGPL-2.1-or-later" +homepage="https://jackaudio.org/" distfiles="https://github.com/jackaudio/jack2/archive/v${version}.tar.gz" -checksum=deefe2f936dc32f59ad3cef7e37276c2035ef8a024ca92118f35c9a292272e33 +checksum=2a683eef63b608b292411d66482fd45aa7fa8dc004bed4184e06f9f9ca83c075 +python_version=3 + +# Package build options +build_options="ffado" +desc_option_ffado="Enable support for FireWire audio devices" if [ -z "CROSS_BUILD" ]; then makedepends+=" eigen" fi -do_configure() { - python2 waf configure --prefix=/usr --alsa --classic --dbus -} -do_build() { - python2 waf build ${makejobs} -} - -do_install() { - python2 waf install --destdir=${DESTDIR} - +post_install() { # pam_limits(8) support vinstall ${FILESDIR}/jack-limitsd.conf 644 etc/security/limits.d jack.conf # audio group permissions for realtime diff --git a/srcpkgs/jansson/template b/srcpkgs/jansson/template index 318fb67c5b5..a3c2a171822 100644 --- a/srcpkgs/jansson/template +++ b/srcpkgs/jansson/template @@ -4,7 +4,7 @@ version=2.12 revision=1 build_style=gnu-configure short_desc="Library for encoding, decoding and manipulating JSON data" -maintainer="maxice8 " +maintainer="Orphaned " license="MIT" homepage="http://www.digip.org/jansson/" distfiles="http://www.digip.org/jansson/releases/jansson-${version}.tar.bz2" diff --git a/srcpkgs/jbig2dec/patches/2002_abi_compat.patch b/srcpkgs/jbig2dec/patches/2002_abi_compat.patch new file mode 100644 index 00000000000..bd4f4c4b72f --- /dev/null +++ b/srcpkgs/jbig2dec/patches/2002_abi_compat.patch @@ -0,0 +1,24 @@ +Description: Restore ABI compatibility +Author: Julien Cristau +Source: https://bugs.debian.org/cgi-bin/bugreport.cgi?att=1;bug=940605;filename=0001-Restore-ABI-compatibility-closes-940605.patch;msg=21 +Bug-Debian: https://bugs.debian.org/940605 +Forwarded: no +Last-Update: 2019-09-19 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- jbig2.c ++++ jbig2.c +@@ -99,6 +99,13 @@ + return -1; + } + ++#undef jbig2_ctx_new ++Jbig2Ctx * ++jbig2_ctx_new(Jbig2Allocator *allocator, Jbig2Options options, Jbig2GlobalCtx *global_ctx, Jbig2ErrorCallback error_callback, void *error_callback_data) ++{ ++ return jbig2_ctx_new_imp((allocator), (options), (global_ctx), (error_callback), (error_callback_data), JBIG2_VERSION_MAJOR, JBIG2_VERSION_MINOR); ++} ++ + Jbig2Ctx * + jbig2_ctx_new_imp(Jbig2Allocator *allocator, Jbig2Options options, Jbig2GlobalCtx *global_ctx, Jbig2ErrorCallback error_callback, void *error_callback_data, int jbig2_version_major, int jbig2_version_minor) + { diff --git a/srcpkgs/jbig2dec/template b/srcpkgs/jbig2dec/template index f08ea768410..41bc57bcb54 100644 --- a/srcpkgs/jbig2dec/template +++ b/srcpkgs/jbig2dec/template @@ -1,7 +1,7 @@ # Template file for 'jbig2dec' pkgname=jbig2dec -version=0.16 -revision=1 +version=0.17 +revision=2 build_style=gnu-configure hostmakedepends="automake libtool" makedepends="libpng-devel" @@ -10,7 +10,7 @@ maintainer="Orphaned " license="AGPL-3.0-or-later" homepage="https://www.jbig2dec.com" distfiles="https://github.com/ArtifexSoftware/jbig2dec/archive/${version}.tar.gz" -checksum=30f706a67604237ffffaece96ae20ee86b2cfebd6277a95f8b0f2ab0f8859850 +checksum=e14c0a978332e0cad011b1aeb9aab7555c73b55e9907f08cb1c74bb6d78a7c59 pre_configure() { sed -i '$ d' autogen.sh diff --git a/srcpkgs/jdupes/template b/srcpkgs/jdupes/template index c300803d985..c42464c566a 100644 --- a/srcpkgs/jdupes/template +++ b/srcpkgs/jdupes/template @@ -1,6 +1,6 @@ # Template file for 'jdupes' pkgname=jdupes -version=1.13.1 +version=1.13.2 revision=1 build_style=gnu-makefile make_build_args="ENABLE_BTRFS=1" @@ -10,7 +10,7 @@ license="MIT" homepage="https://github.com/jbruchon/jdupes" changelog="https://raw.githubusercontent.com/jbruchon/jdupes/master/CHANGES" distfiles="https://github.com/jbruchon/jdupes/archive/v${version}.tar.gz" -checksum=6b68ea30b0d8fceb31ccbc07187133dbff0cc84678752e89ad3270c89322710f +checksum=41376ace274320a77e35ffed170ff0cbca2cd0cfd0ff1cea53d7464e97d4341f post_install() { vlicense LICENSE diff --git a/srcpkgs/jemalloc/template b/srcpkgs/jemalloc/template index 1800fc5e15d..aba5e005696 100644 --- a/srcpkgs/jemalloc/template +++ b/srcpkgs/jemalloc/template @@ -1,6 +1,6 @@ # Template file for 'jemalloc' pkgname=jemalloc -version=5.2.0 +version=5.2.1 revision=1 build_style=gnu-configure configure_args="je_cv_static_page_shift=12" @@ -10,7 +10,7 @@ license="BSD-2-Clause" homepage="http://jemalloc.net/" #changelog="https://raw.githubusercontent.com/jemalloc/jemalloc/master/ChangeLog" distfiles="https://github.com/jemalloc/jemalloc/releases/download/${version}/jemalloc-${version}.tar.bz2" -checksum=74be9f44a60d2a99398e706baa921e4efde82bf8fd16e5c0643c375c5851e3b4 +checksum=34330e5ce276099e2e8950d9335db5a875689a4c6a56751ef3b1d8c537f887f6 post_install() { vlicense COPYING diff --git a/srcpkgs/jenkins/files/jenkins/run b/srcpkgs/jenkins/files/jenkins/run index 5ccc479d35f..05d8a79c68d 100755 --- a/srcpkgs/jenkins/files/jenkins/run +++ b/srcpkgs/jenkins/files/jenkins/run @@ -8,4 +8,4 @@ export JENKINS_HOME=/var/lib/jenkins cd / unset OLDPWD -exec chpst -u jenkins:jenkins java -Xmx512m -jar /opt/jenkins/jenkins.war $OPTS +exec chpst -u jenkins:${JENKINS_GROUPS:=jenkins} java ${JAVAOPTS:=-Xmx512m} -jar /opt/jenkins/jenkins.war $OPTS diff --git a/srcpkgs/jenkins/template b/srcpkgs/jenkins/template index 37902fdcdcc..bc818a21b91 100644 --- a/srcpkgs/jenkins/template +++ b/srcpkgs/jenkins/template @@ -1,7 +1,7 @@ # Template file for 'jenkins' pkgname=jenkins -version=2.176.2 -revision=1 +version=2.190.1 +revision=2 build_style=fetch make_dirs="/var/lib/jenkins 0755 jenkins jenkins" depends="virtual?java-runtime" @@ -10,7 +10,7 @@ maintainer="Renato Aguiar " license="MIT" homepage="https://jenkins.io/" distfiles="http://mirrors.jenkins.io/war-stable/${version}/jenkins.war" -checksum=33a6c3161cf8de9c8729fd83914d781319fd1569acf487c7b1121681dba190a5 +checksum=46fb1d25d9423fc66aadd648dc74b9772863a7fbbd89bfc14c873cd0c3436f05 # Create 'jenkins' user system_accounts="jenkins" jenkins_homedir="/var/lib/jenkins" diff --git a/srcpkgs/jgmenu/template b/srcpkgs/jgmenu/template index 1a0c5c0163b..9cc43358ca6 100644 --- a/srcpkgs/jgmenu/template +++ b/srcpkgs/jgmenu/template @@ -1,6 +1,6 @@ # Template file for 'jgmenu' pkgname=jgmenu -version=3.3 +version=3.4 revision=1 build_style=gnu-makefile make_use_env=yes @@ -15,4 +15,4 @@ license="GPL-2.0-only" homepage="https://www.github.com/johanmalm/jgmenu" changelog="https://raw.githubusercontent.com/johanmalm/jgmenu/master/docs/relnotes/${version}.txt" distfiles="https://www.github.com/johanmalm/jgmenu/archive/v${version}.tar.gz" -checksum=65ae338ab604e6deadfcfcfef02f6eb54d9c25eac6c477ecb11084af25b0a453 +checksum=973491a756296e66520874f35c590d8c2de5417afcfc4f5117c47e35841cb171 diff --git a/srcpkgs/jmol/template b/srcpkgs/jmol/template index b0a7403c1a0..d0f06d14215 100644 --- a/srcpkgs/jmol/template +++ b/srcpkgs/jmol/template @@ -1,6 +1,6 @@ # Template file for 'jmol' pkgname=jmol -version=14.29.42 +version=14.29.54 revision=1 hostmakedepends="unzip" depends="virtual?java-environment" @@ -10,7 +10,7 @@ license="LGPL-2.1-or-later" homepage="http://jmol.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/jmol/Jmol/Version%20${version%.*}/Jmol%20${version}/Jmol-${version}-binary.tar.gz http://jmol.sourceforge.net/images/Jmol_icon_128.png" -checksum="d762553e4bb3bd80c5bf900898e8afbd36c69db46f055cc8af5f29c33a8bfa3a +checksum="ebb630d11f9d2b46e5c2f6585fc9350f044615f095d44d5a0a0fa93533288a38 d84e5e4b5c9b440b3b90432db87e0d4bd5c8237d7d2891c174fac71f0a5a2127" skip_extraction="Jmol_icon_128.png" nocross="openjdk is nocross" diff --git a/srcpkgs/jreen-qt5 b/srcpkgs/jreen-qt5 new file mode 120000 index 00000000000..adda684e0c9 --- /dev/null +++ b/srcpkgs/jreen-qt5 @@ -0,0 +1 @@ +jreen \ No newline at end of file diff --git a/srcpkgs/jreen-qt5-devel b/srcpkgs/jreen-qt5-devel index 9aff5c71925..adda684e0c9 120000 --- a/srcpkgs/jreen-qt5-devel +++ b/srcpkgs/jreen-qt5-devel @@ -1 +1 @@ -jreen-qt5 \ No newline at end of file +jreen \ No newline at end of file diff --git a/srcpkgs/jreen-qt5/template b/srcpkgs/jreen-qt5/template deleted file mode 100644 index 92f3aa73b09..00000000000 --- a/srcpkgs/jreen-qt5/template +++ /dev/null @@ -1,28 +0,0 @@ -# Template file for 'jreen' -pkgname=jreen-qt5 -version=1.3.0 -revision=1 -wrksrc="${pkgname%-*}-${version}" -build_style=cmake -hostmakedepends="pkg-config" -makedepends="gsasl-devel speex-devel qt5-devel zlib-devel" -short_desc="Qt5 Jabber/XMPP extensible library" -maintainer="Duncaen " -license="LGPL-3" -homepage="https://github.com/euroelessar/jreen" -distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=f93c3d338c011c0945dacb14eb9da3be9541028c9eaa6f2024e688eb8a49b07e - -if [ -n "$CROSS_BUILD" ]; then - hostmakedepends+=" qt5-host-tools qt5-devel" -fi - -jreen-qt5-devel_package() { - depends="${sourcepkg}>=${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove usr/lib/*.so - vmove usr/lib/pkgconfig - } -} diff --git a/srcpkgs/jreen/template b/srcpkgs/jreen/template index 61fbb204312..f23ba291354 100644 --- a/srcpkgs/jreen/template +++ b/srcpkgs/jreen/template @@ -1,20 +1,23 @@ # Template file for 'jreen' pkgname=jreen -version=1.2.1 -revision=1 +version=1.3.0 +revision=2 build_style=cmake -configure_args="-DJREEN_FORCE_QT4=yes" hostmakedepends="pkg-config" -makedepends="gsasl-devel speex-devel qt-devel zlib-devel" -short_desc="Extensible XMPP library written in C++ using Qt" -maintainer="Duncan Overbruck " -license="GPL-2" -homepage="http://qutim.org/jreen" -distfiles="http://github.com/euroelessar/${pkgname}/archive/v${version}.tar.gz" -checksum=be5de04b6f54e47bdec92707600441a39e46add958181ad2b5b2d1bf92693fbd +makedepends="gsasl-devel speex-devel qt5-devel zlib-devel" +short_desc="Qt5 Jabber/XMPP extensible library" +maintainer="Duncaen " +license="LGPL-3.0-or-later" +homepage="https://github.com/euroelessar/jreen" +distfiles="${homepage}/archive/v${version}.tar.gz" +checksum=f93c3d338c011c0945dacb14eb9da3be9541028c9eaa6f2024e688eb8a49b07e + +if [ -n "$CROSS_BUILD" ]; then + hostmakedepends+=" qt5-host-tools qt5-devel" +fi jreen-devel_package() { - depends="jreen>=${version}_${revision}" + depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include @@ -22,3 +25,15 @@ jreen-devel_package() { vmove usr/lib/pkgconfig } } + +jreen-qt5_package() { + build_style=meta + short_desc+=" (transitional dummy package)" + depends="${sourcepkg}>=${version}_${revision}" +} + +jreen-qt5-devel_package() { + build_style=meta + short_desc+=" (transitional dummy package)" + depends="jreen-devel>=${version}_${revision}" +} diff --git a/srcpkgs/json-glib/template b/srcpkgs/json-glib/template index ac71f34e3b4..0fbdb69905c 100644 --- a/srcpkgs/json-glib/template +++ b/srcpkgs/json-glib/template @@ -8,7 +8,7 @@ configure_args="-Dintrospection=$(vopt_if gir true false)" hostmakedepends="pkg-config glib-devel" makedepends="libglib-devel" short_desc="JSON parser for GLib-based libraries and applications" -maintainer="maxice8 " +maintainer="Orphaned " license="LGPL-2.1-or-later" homepage="http://live.gnome.org/JsonGlib" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" diff --git a/srcpkgs/jsonnet/template b/srcpkgs/jsonnet/template index e1e0ef2d07c..f6074776e92 100644 --- a/srcpkgs/jsonnet/template +++ b/srcpkgs/jsonnet/template @@ -1,14 +1,15 @@ # Template file for 'jsonnet' pkgname=jsonnet -version=0.13.0 +version=0.14.0 revision=1 build_style=gnu-makefile +make_build_args="bins" short_desc="Data templating language" maintainer="Leah Neukirchen " license="Apache-2.0" homepage="https://github.com/google/jsonnet" distfiles="https://github.com/google/jsonnet/archive/v${version}.tar.gz" -checksum=f6f0c4ea333f3423f1a7237a8a107c589354c38be8a2a438198f9f7c69b77596 +checksum=7f41cdc4cb366cfc1de3aada926a2f7e640ef025887eb05cdaf8342d6e4e088b CXXFLAGS="-Iinclude -Ithird_party/md5 -Ithird_party/json" CFLAGS="-Iinclude" diff --git a/srcpkgs/juCi++/patches/libgit2-0.28.patch b/srcpkgs/juCi++/patches/libgit2-0.28.patch deleted file mode 100644 index 9eb910f4db3..00000000000 --- a/srcpkgs/juCi++/patches/libgit2-0.28.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/src/git.cc b/src/git.cc -index 9da2d7b..45e9007 100644 ---- src/git.cc -+++ src/git.cc -@@ -6,7 +6,7 @@ bool Git::initialized = false; - std::mutex Git::mutex; - - std::string Git::Error::message() noexcept { -- const git_error *last_error = giterr_last(); -+ const git_error *last_error = git_error_last(); - if(last_error == nullptr) - return std::string(); - else -@@ -244,7 +244,7 @@ boost::filesystem::path Git::Repository::get_root_path(const boost::filesystem:: - throw std::runtime_error(error.message()); - } - auto root_path = Git::path(root.ptr, root.size); -- git_buf_free(&root); -+ git_buf_dispose(&root); - return root_path; - } - - diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template index c7c0e3f275a..dffd1d7119d 100644 --- a/srcpkgs/juCi++/template +++ b/srcpkgs/juCi++/template @@ -1,9 +1,9 @@ # Template file for 'juCi++' pkgname=juCi++ -version=1.4.6 -revision=5 -_libclangmm_commit="2b2f2ead1f685a9efb28ee2c0ff3cbe452a724dd" -_tiny_commit="54b95a21cf35f8467e21038f523fd3342a77de4c" +version=1.5.0 +revision=2 +_libclangmm_commit="687b9c231d850504ec515acb9ccab73f26c34063" +_tiny_commit="a6773276efdbc322f1abb0159301f5502647eb52" wrksrc="jucipp-v${version}" build_style=cmake hostmakedepends="pkg-config" @@ -16,9 +16,9 @@ homepage="https://gitlab.com/cppit/jucipp" distfiles="https://gitlab.com/cppit/jucipp/-/archive/v${version}/jucipp-v${version}.tar.gz https://gitlab.com/cppit/libclangmm/-/archive/${_libclangmm_commit}/libclangmm-${_libclangmm_commit}.tar.gz https://gitlab.com/eidheim/tiny-process-library/-/archive/${_tiny_commit}/tiny-process-library-${_tiny_commit}.tar.gz" -checksum="e46863c272b1ff153f8e834ec8f3902b8c7de01b4f1ef4d980e27e1d6e7bd1e4 - 8d7f83a6f4544033cd6a790cc497475521bf15ed620fbcd0014597a2d5ae6481 - 9f5713440aa0c1d4dcd665a1e264a1d0c6bed75edf1a80996b1f6e2231184d1e" +checksum="178f25db2105ee35db0a1b9a4a19205c737b416adda7d05d3b34a2b7cecd3c87 + bdc4ecf59f5de2a3ade04fac1c298b87c1af59653eaa2993d45adc0fa7d8389d + 99e0c1a2ddc59bbb30f0e6cccd9669ddc79952d4aa54ae1d6c72f9d1cf297231" nocross=yes #clang cannot be installed as makedepends when cross compiling post_extract() { diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template index 5116d95e6d1..3273989dd88 100644 --- a/srcpkgs/juk/template +++ b/srcpkgs/juk/template @@ -1,6 +1,6 @@ # Template file for 'juk' pkgname=juk -version=19.04.3 +version=19.08.2 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools @@ -12,4 +12,4 @@ maintainer="1is7ac3 " license="GPL-2.0-or-later" homepage="https://juk.kde.org/" distfiles="${KDE_SITE}/applications/${version}/src/juk-${version}.tar.xz" -checksum=f4a272aa677ac7b5eb8c3f30234dea129e41863c5c78d812b27d30dde0f5d750 +checksum=b3f0e006d6defa58e0724088a1c99c1c412bc5764f8d1bebadf31b5f331d51d3 diff --git a/srcpkgs/julia/template b/srcpkgs/julia/template index 3f35d555d4b..a8f107f0eee 100644 --- a/srcpkgs/julia/template +++ b/srcpkgs/julia/template @@ -1,12 +1,12 @@ # Template file for 'julia' pkgname=julia -version=1.1.1 -revision=2 +version=1.2.0 +revision=1 archs="i686* x86_64*" build_style=gnu-makefile make_build_args="prefix=/usr sysconfdir=/etc USE_SYSTEM_LLVM=0 USE_LLVM_SHLIB=1 USE_SYSTEM_PCRE=1 USE_SYSTEM_BLAS=1 USE_SYSTEM_LAPACK=1 USE_SYSTEM_GMP=1 - USE_SYSTEM_MPFR=1 USE_SYSTEM_LIBUV=0 USE_SYSTEM_LIBGIT2=1 + USE_SYSTEM_MPFR=1 USE_SYSTEM_LIBUV=0 USE_SYSTEM_LIBGIT2=1 USE_BINARYBUILDER=0 LIBLAPACK=-lopenblas LIBLAPACKNAME=libopenblas LIBBLAS=-lopenblas LIBBLASNAME=libopenblas" make_install_args="$make_build_args" @@ -22,10 +22,10 @@ maintainer="Adam Beckmeyer " license="MIT" homepage="https://julialang.org" distfiles="https://github.com/JuliaLang/julia/releases/download/v${version}/julia-${version}-full.tar.gz" -checksum=3c5395dd3419ebb82d57bcc49dc729df3b225b9094e74376f8c649ee35ed79c2 +checksum=2419b268fc5c3666dd9aeb554815fe7cf9e0e7265bc9b94a43957c31a68d9184 nocross=yes # Falsely detects dependency on libllvm -skiprdeps="/usr/lib/libjulia.so.1.1 /usr/lib/julia/libllvmcalltest.so" +skiprdeps="/usr/lib/libjulia.so.1.2 /usr/lib/julia/libllvmcalltest.so" case "$XBPS_TARGET_MACHINE" in *-musl) diff --git a/srcpkgs/jwm-settings-manager/template b/srcpkgs/jwm-settings-manager/template index 5dbaf7e2488..fc09f90e26c 100644 --- a/srcpkgs/jwm-settings-manager/template +++ b/srcpkgs/jwm-settings-manager/template @@ -6,7 +6,7 @@ build_style=cmake hostmakedepends="pkg-config fltk" makedepends="fltk-devel libXpm-devel" short_desc="Full configuration manager for JWM" -maintainer="maxice8 " +maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://github.com/Israel-D/jwm-settings-manager" distfiles="https://github.com/Israel-D/jwm-settings-manager/archive/${version}.tar.gz" diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template index 83ec9c394a8..f6592f9b5e7 100644 --- a/srcpkgs/k3b/template +++ b/srcpkgs/k3b/template @@ -1,6 +1,6 @@ # Template file for 'k3b' pkgname=k3b -version=19.04.3 +version=19.08.2 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules pkg-config qt5-qmake" @@ -14,5 +14,5 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://www.kde.org/applications/multimedia/k3b/" distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz" -checksum=c92b7b811f47d31b107aa14fb1e21d01a8635c208c1503f4ddf183522501df61 +checksum=a16796a873018bc5fd9f562297fea56d3f6d32a1e903a3e145814ea7d9be5209 diff --git a/srcpkgs/k3s/files/k3s-agent/log/run b/srcpkgs/k3s/files/k3s-agent/log/run new file mode 100755 index 00000000000..6a3f7aaa612 --- /dev/null +++ b/srcpkgs/k3s/files/k3s-agent/log/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec logger -t k3s-agent diff --git a/srcpkgs/k3s/files/k3s-agent/run b/srcpkgs/k3s/files/k3s-agent/run new file mode 100755 index 00000000000..48244292cf9 --- /dev/null +++ b/srcpkgs/k3s/files/k3s-agent/run @@ -0,0 +1,10 @@ +#!/bin/sh +set -- +[ -r /etc/k3s/config ] && . /etc/k3s/config +[ -r conf ] && . ./conf +if [ 0 = $# ]; then + set -- \ + ${K3S_SERVER:+--server="${K3S_SERVER}"} \ + ${K3S_TOKEN:+--token="${K3S_TOKEN}"} +fi +exec k3s agent ${K3S_OPTIONS} ${K3S_AGENT_OPTIONS} "$@" diff --git a/srcpkgs/k3s/files/k3s-server/log/run b/srcpkgs/k3s/files/k3s-server/log/run new file mode 100755 index 00000000000..e78f852bb29 --- /dev/null +++ b/srcpkgs/k3s/files/k3s-server/log/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec logger -t k3s-server diff --git a/srcpkgs/k3s/files/k3s-server/run b/srcpkgs/k3s/files/k3s-server/run new file mode 100755 index 00000000000..03ada62d4a4 --- /dev/null +++ b/srcpkgs/k3s/files/k3s-server/run @@ -0,0 +1,5 @@ +#!/bin/sh +set -- +[ -r /etc/k3s/config ] && . /etc/k3s/config +[ -r ./conf ] && . ./conf +exec k3s server ${K3S_OPTIONS} ${K3S_SERVER_OPTIONS} "$@" diff --git a/srcpkgs/k3s/template b/srcpkgs/k3s/template new file mode 100644 index 00000000000..1657a9b7823 --- /dev/null +++ b/srcpkgs/k3s/template @@ -0,0 +1,65 @@ +# Template file for 'k3s' +pkgname=k3s +version=0.9.1 +revision=2 +create_wrksrc=yes +build_wrksrc="${pkgname}-${version}" +build_style=go +go_import_path="github.com/rancher/k3s" +hostmakedepends="git pkg-config" +makedepends="libseccomp-devel" +short_desc="Lightweight Kubernetes" +maintainer="Cameron Nemo " +license="Apache-2.0" +homepage="https://k3s.io" +# _traefik_* variables' values from scripts/download in source distfile +_traefik_version="1.77.1" +_traefik_file="traefik-${_traefik_version}.tgz" +distfiles="https://${go_import_path}/archive/v${version}.tar.gz + https://kubernetes-charts.storage.googleapis.com/${_traefik_file}" +checksum="dee3ddfcdb61f292bcfe778d7677e436309511e15c6bbdd326ebec42ea41bbac + 15dd78d136d7c9bae7144072052ef6cd12821ae081a7c085f145d834d96c5d5c" +skip_extraction="${_traefik_file}" +conflicts="kubernetes" + +_git_commit=755bd1c63bafe80f9b5fe8d4bba527f988625364 + +pre_build() { + # Modify version.sh to use template variables' values. + vsed -i scripts/version.sh -e ' + s@^COMMIT=.*@COMMIT='"${_git_commit}"'@; + s@^GIT_TAG=.*@GIT_TAG=v'"${version}"'@ + ' + # Remove -s (strip) and -w (no dwarf) linker arguments. + vsed -i scripts/build -e 's@-w -s@@' + # Remove BIN_SUFFIX, nullify GOARCH for go generate. The latter + # is needed because 'go run' will try to run binaries for the + # target given by GOOS/GOARCH. The -x prints what 'go generate' + # is executing. CGO_ENABLED is set to 0 because cross builds + # won't necessarily be able to handle 64-bit builds performed by + # 'go run'. + vsed -i scripts/package-cli -e ' + s@BIN_SUFFIX="[^"]\+"@BIN_SUFFIX=""@; + s@^go generate$@CGO_ENABLED=0 GOARCH= & -x@; + s@-w -s@@g + ' + + # Recreate behavior of scripts/download minus downloading + # anything or having anything to do with busybox. + mkdir -p bin + + mkdir -p build/static/charts + cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_traefik_file} build/static/charts/${_traefik_file} +} + +do_build() { + scripts/build + scripts/package-cli +} + +do_install() { + vbin dist/artifacts/k3s + vbin dist/artifacts/hyperkube + vsv k3s-server + vsv k3s-agent +} diff --git a/srcpkgs/kColorPicker-devel b/srcpkgs/kColorPicker-devel new file mode 120000 index 00000000000..bc2cf83a861 --- /dev/null +++ b/srcpkgs/kColorPicker-devel @@ -0,0 +1 @@ +kColorPicker \ No newline at end of file diff --git a/srcpkgs/kColorPicker/template b/srcpkgs/kColorPicker/template new file mode 100644 index 00000000000..954ae0e8a76 --- /dev/null +++ b/srcpkgs/kColorPicker/template @@ -0,0 +1,28 @@ +# Template file for 'kColorPicker' +pkgname=kColorPicker +version=0.1.0 +revision=1 +build_style=cmake +configure_args="-DBUILD_TESTS=ON -DBUILD_EXAMPLE=OFF -DBUILD_SHARED_LIBS=ON" +hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools" +makedepends="qt5-devel" +short_desc="Qt based Color Picker with popup menu" +maintainer="John " +license="LGPL-2.0-or-later" +homepage="https://github.com/DamirPorobic/kColorPicker" +distfiles="https://github.com/DamirPorobic/kColorPicker/archive/v${version}.tar.gz" +checksum=104a5c8c507786219c99ab62511189f4f7fb9435f88c11774e78ed628509ddb5 + +pre_check() { + export QT_QPA_PLATFORM=offscreen +} + +kColorPicker-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/cmake + vmove "usr/lib/*.so" + } +} diff --git a/srcpkgs/kImageAnnotator-devel b/srcpkgs/kImageAnnotator-devel new file mode 120000 index 00000000000..d26188257d4 --- /dev/null +++ b/srcpkgs/kImageAnnotator-devel @@ -0,0 +1 @@ +kImageAnnotator \ No newline at end of file diff --git a/srcpkgs/kImageAnnotator/template b/srcpkgs/kImageAnnotator/template new file mode 100644 index 00000000000..90defcba517 --- /dev/null +++ b/srcpkgs/kImageAnnotator/template @@ -0,0 +1,28 @@ +# Template file for 'kImageAnnotator' +pkgname=kImageAnnotator +version=0.1.0 +revision=2 +build_style=cmake +configure_args="-DBUILD_TESTS=ON -DBUILD_EXAMPLE=OFF -DBUILD_SHARED_LIBS=ON" +hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools" +makedepends="qt5-devel kColorPicker-devel" +short_desc="Tool for annotating images" +maintainer="John " +license="LGPL-2.0-or-later" +homepage="https://github.com/DamirPorobic/kImageAnnotator" +distfiles="https://github.com/DamirPorobic/kImageAnnotator/archive/v${version}.tar.gz" +checksum=5172586c337d018fe988659ea728e023ca660becd5c2e10304438972aff1eced + +pre_check() { + export QT_QPA_PLATFORM=offscreen +} + +kImageAnnotator-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/cmake + vmove "usr/lib/*.so" + } +} diff --git a/srcpkgs/kaccounts-integration/template b/srcpkgs/kaccounts-integration/template index 0bc23e4af89..9e31e95ecd5 100644 --- a/srcpkgs/kaccounts-integration/template +++ b/srcpkgs/kaccounts-integration/template @@ -1,6 +1,6 @@ # Template file for 'kaccounts-integration' pkgname=kaccounts-integration -version=19.08.0 +version=19.08.2 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake" @@ -11,7 +11,7 @@ maintainer="Piotr Wójcik " license="GPL-2.0-or-later" homepage="https://cgit.kde.org/kaccounts-integration.git/" distfiles="${KDE_SITE}/applications/${version}/src/kaccounts-integration-${version}.tar.xz" -checksum=b6602a1270037c8c9dc366e3bf6ddf6d7dcd14ca66623e3ecc6641fd474c0d2a +checksum=b422c23eb3eefc3a79c4ccb9360ae6269a86982575e981bb949c0782f1f813ce nocross="libaccounts-qt5 is nocross" kaccounts-integration-devel_package() { diff --git a/srcpkgs/kaccounts-providers/template b/srcpkgs/kaccounts-providers/template index f6724171147..178c10c4abe 100644 --- a/srcpkgs/kaccounts-providers/template +++ b/srcpkgs/kaccounts-providers/template @@ -1,6 +1,6 @@ # Template file for 'kaccounts-providers' pkgname=kaccounts-providers -version=19.08.0 +version=19.08.2 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules intltool qt5-qmake qt5-host-tools pkg-config" @@ -10,5 +10,5 @@ maintainer="Piotr Wójcik " license="GPL-2.0-or-later" homepage="https://cgit.kde.org/kaccounts-providers.git/" distfiles="${KDE_SITE}/applications/${version}/src/kaccounts-providers-${version}.tar.xz" -checksum=9fc235e2140e76e4b95589a8a5b1e98f7aac00f4c9ad8ba774be0d0d360df8c3 +checksum=d5ad6882ff151d2f0cff2b76a83e38cf37c72a0dbdf4a0aff64420903266a309 nocross="kaccounts-integration is nocross" diff --git a/srcpkgs/kactivities5-stats/template b/srcpkgs/kactivities5-stats/template index a7812efec66..b73aa726d3e 100644 --- a/srcpkgs/kactivities5-stats/template +++ b/srcpkgs/kactivities5-stats/template @@ -1,6 +1,6 @@ # Template file for 'kactivities5-stats' pkgname=kactivities5-stats -version=5.61.0 +version=5.63.0 revision=1 wrksrc="${pkgname/5/}-${version}" build_style=cmake @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://api.kde.org/frameworks/kactivities/html/index.html" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname/5/}-${version}.tar.xz" -checksum=9062eb0f189f1b50674e65a7db9a4b821c628acd1ac650000cebbf1f7bdf0068 +checksum=85f817fd3380be1e4641cb280c1b56e697bd8eabf386784f1876da2b12f5eea0 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake" @@ -23,6 +23,7 @@ kactivities5-stats-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" pkg_install() { vmove usr/include + vmove usr/lib/pkgconfig vmove usr/lib/qt5/mkspecs vmove usr/lib/cmake vmove "usr/lib/*.so" diff --git a/srcpkgs/kactivities5/template b/srcpkgs/kactivities5/template index cf154f2302f..85578669aa0 100644 --- a/srcpkgs/kactivities5/template +++ b/srcpkgs/kactivities5/template @@ -1,6 +1,6 @@ # Template file for 'kactivities5' pkgname=kactivities5 -version=5.61.0 +version=5.63.0 revision=1 wrksrc="${pkgname%5}-${version}" build_style=cmake @@ -15,7 +15,7 @@ maintainer="John " license="LGPL-2.1-or-later, GPL-2.0-or-later" homepage="https://projects.kde.org/projects/frameworks/kactivities" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz" -checksum=0d7d7e5bd68541ad1dcf1f96c7205330cb7b075c6ff0d8b46774e781eff84af5 +checksum=fa08c5de949efc6ec972c0e0e2234d445ed88e0df30fa9b683891025fec9050e if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools" @@ -26,6 +26,7 @@ kactivities5-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" pkg_install() { vmove usr/include + vmove usr/lib/pkgconfig vmove usr/lib/qt5/mkspecs vmove usr/lib/cmake vmove "usr/lib/*.so" diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template index db1c3bb19be..4120ce48dfd 100644 --- a/srcpkgs/kactivitymanagerd/template +++ b/srcpkgs/kactivitymanagerd/template @@ -1,6 +1,6 @@ # Template file for 'kactivitymanagerd' pkgname=kactivitymanagerd -version=5.16.4 +version=5.17.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -12,7 +12,7 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://projects.kde.org/projects/plasma/kactivitymanagerd" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=a287fc9624390c8493a35a5440e2161d1bb67252b6986231acb6268440bb4770 +checksum=23ef9043a968d0f6920b1ca677673c09282c94482be1bfdf5fb38e7b2d09fe3f if [ "$CROSS_BUILD" ]; then configure_args+=" -DRUN_RESULT_VAR=0" diff --git a/srcpkgs/kaddressbook/template b/srcpkgs/kaddressbook/template index cd2c5972eb8..54ee81f552f 100644 --- a/srcpkgs/kaddressbook/template +++ b/srcpkgs/kaddressbook/template @@ -1,7 +1,7 @@ # Template file for 'kaddressbook' pkgname=kaddressbook -version=19.08.0 -revision=1 +version=19.08.2 +revision=2 build_style=cmake configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson" hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kconfig @@ -12,4 +12,4 @@ maintainer="Helmut Pozimski " license="GPL-2.0-or-later" homepage="https://www.kde.org/applications/office/kaddressbook" distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz" -checksum=9639047be5c5ea245844831e315fa0f0baca40d243f611a98bbab3503af127cf +checksum=4d67480ebf8ee96fcde85e66f8ad32119b006e36c87f4e4ac20ecfa967599260 diff --git a/srcpkgs/kak-lsp/template b/srcpkgs/kak-lsp/template index 99154ab54b0..e80a7ce5044 100644 --- a/srcpkgs/kak-lsp/template +++ b/srcpkgs/kak-lsp/template @@ -1,6 +1,6 @@ # Template file for 'kak-lsp' pkgname=kak-lsp -version=6.2.1 +version=7.0.0 revision=1 build_style=cargo short_desc="Language Server Protocol client for Kakoune" @@ -8,7 +8,7 @@ maintainer="Emerson Ferreira " license="Unlicense" homepage="https://github.com/ul/kak-lsp" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=00ca9f8b9a875790a24030fd1a7304c84cd94aa918be6846af5ef84898ef569b +checksum=94af509062471a4e2dac760ac10704c05fb803983509cd85e20c6036240ef4c4 post_install() { vlicense UNLICENSE diff --git a/srcpkgs/kalarm/template b/srcpkgs/kalarm/template index 645193252f6..50501dd8e74 100644 --- a/srcpkgs/kalarm/template +++ b/srcpkgs/kalarm/template @@ -1,7 +1,7 @@ # Template file for 'kalarm' pkgname=kalarm -version=19.08.0 -revision=1 +version=19.08.2 +revision=2 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools libxslt kdoctools kauth kconfig" @@ -11,4 +11,4 @@ maintainer="Helmut Pozimski " license="GPL-2.0-or-later" homepage="https://www.kde.org/applications/utilities/kalarm" distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz" -checksum=e0ddabb2abfc2d593ec88864179c30eda219f7db4c25b7fc9951ac3b388eee84 +checksum=54d61b469042d27b8df903c5fc95dd68c1d108218f1402a733d974ab02576d24 diff --git a/srcpkgs/kalarmcal/template b/srcpkgs/kalarmcal/template index aa9bd7830ad..25da48afe2b 100644 --- a/srcpkgs/kalarmcal/template +++ b/srcpkgs/kalarmcal/template @@ -1,6 +1,6 @@ # Template file for 'kalarmcal' pkgname=kalarmcal -version=19.08.0 +version=19.08.2 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://community.kde.org/KDE_PIM" distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz" -checksum=5f764d58716e7d271fac4cb3a4df6ab157014533782c47c38bacab59ca669419 +checksum=4dc6e1cd8a9cbf6e3f8e593e68ef6fa912819ece56efa64852ab33e3f582e6b7 kalarmcal-devel_package() { depends="${sourcepkg}>=${version}_${revision} ${makedepends}" diff --git a/srcpkgs/kapidox/template b/srcpkgs/kapidox/template index 84f1082d08a..4e3cbb00ff0 100644 --- a/srcpkgs/kapidox/template +++ b/srcpkgs/kapidox/template @@ -1,6 +1,6 @@ # Template file for 'kapidox' pkgname=kapidox -version=5.61.0 +version=5.63.0 revision=1 archs=noarch build_style=cmake @@ -13,7 +13,7 @@ maintainer="John " license="BSD-2-Clause" homepage="https://projects.kde.org/projects/frameworks/kapidox" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=3c948c87c7f7b16a3835f7df8387c110efe5fefecf8a7d6ffa1cae647be0669f +checksum=29ccea641395a73a83c040a63aea25b14c7318352a6f9321c62b8cf32fcc9733 post_install() { vlicense LICENSE diff --git a/srcpkgs/karchive/template b/srcpkgs/karchive/template index cd42e95c827..29953fff154 100644 --- a/srcpkgs/karchive/template +++ b/srcpkgs/karchive/template @@ -1,6 +1,6 @@ # Template file for 'karchive' pkgname=karchive -version=5.61.0 +version=5.63.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-only, LGPL-2.0-or-later" homepage="https://projects.kde.org/projects/frameworks/karchive" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=457ed420449630625cb161fcc9bedc7c6a16527f48d6db4008aea76cdb948387 +checksum=fa733531ddc6059eb92d4eaceb5b84177ee832e9303afdf229bf25da979ffe7a karchive-devel_package() { short_desc+=" - development" diff --git a/srcpkgs/kate5/template b/srcpkgs/kate5/template index a133a7af785..2fc5bdf1377 100644 --- a/srcpkgs/kate5/template +++ b/srcpkgs/kate5/template @@ -1,6 +1,6 @@ # Template file for 'kate5' pkgname=kate5 -version=19.08.0 +version=19.08.2 revision=1 wrksrc="${pkgname%5}-${version}" build_style=cmake @@ -14,7 +14,7 @@ maintainer="John " license="GPL-3.0-or-later, LGPL-2.0-or-later, GPL-2.0-or-later" homepage="https://projects.kde.org/projects/applications/kate" distfiles="${KDE_SITE}/applications/${version}/src/${pkgname%5}-${version}.tar.xz" -checksum=6acc3172429191ab47722d788f324292ea5ee2f1e419d48c72200579b9b30878 +checksum=9897f652996e3ebca8a749562cc2d609d704c80b08ec4716622def38f5980b47 if [ "$CROSS_BUILD" ]; then configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake" diff --git a/srcpkgs/kauth/template b/srcpkgs/kauth/template index 8285e54ee4e..7c78e0fde61 100644 --- a/srcpkgs/kauth/template +++ b/srcpkgs/kauth/template @@ -1,6 +1,6 @@ # Template file for 'kauth' pkgname=kauth -version=5.61.0 +version=5.63.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules pkg-config" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://projects.kde.org/projects/frameworks/kauth" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=b04458f32046b2dd61b48118646180df63d2c843cb2d53560aaa15168df087f1 +checksum=2c4917f0bb49f09b232aeda9d3282eef0e235124fab1dab0deeae2ae7a7df321 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kcoreaddons qt5-host-tools qt5-qmake qt5-tools-devel polkit-qt5-devel" diff --git a/srcpkgs/kbfs b/srcpkgs/kbfs new file mode 120000 index 00000000000..c02e554306a --- /dev/null +++ b/srcpkgs/kbfs @@ -0,0 +1 @@ +keybase \ No newline at end of file diff --git a/srcpkgs/kbfs/template b/srcpkgs/kbfs/template deleted file mode 100644 index 5bd004bae82..00000000000 --- a/srcpkgs/kbfs/template +++ /dev/null @@ -1,23 +0,0 @@ -# Template file for 'kbfs' -pkgname=kbfs -version=2.11.0 -revision=1 -build_style=go -go_import_path="github.com/keybase/kbfs" -go_package="${go_import_path}/kbfsfuse ${go_import_path}/kbfsgit/git-remote-keybase ${go_import_path}/kbfstool ${go_import_path}/redirector" -go_build_tags="production" -depends="keybase util-linux" -short_desc="Keybase Filesystem" -maintainer="Toyam Cox " -license="BSD-3-Clause" -homepage="https://keybase.io/docs/kbfs" -distfiles="https://github.com/keybase/kbfs/archive/v${version}.tar.gz" -checksum=0e97cab1c90592035ec6763e22c78c08a95dd3467419d15b9e45b3d0887b594d - -post_install() { - mv ${DESTDIR}/usr/bin/redirector ${DESTDIR}/usr/bin/keybase-redirector - # setuid - chmod 4755 ${DESTDIR}/usr/bin/keybase-redirector - - vlicense LICENSE -} diff --git a/srcpkgs/kbookmarks/template b/srcpkgs/kbookmarks/template index 9e7dff7a8c4..4ac73909960 100644 --- a/srcpkgs/kbookmarks/template +++ b/srcpkgs/kbookmarks/template @@ -1,6 +1,6 @@ # Template file for 'kbookmarks' pkgname=kbookmarks -version=5.61.0 +version=5.63.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-only" homepage="https://projects.kde.org/projects/frameworks/kbookmarks" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=24f87ff1acc5f0c257518f67af277b454566e607f82eb09e75b4a6ed02403377 +checksum=5be8d8640f7a4519c25c55e59ea7a640ea48a2646560a0ea2c9ff95374153904 kbookmarks-devel_package() { short_desc+=" - development" diff --git a/srcpkgs/kcachegrind/template b/srcpkgs/kcachegrind/template index 1be4cb29aca..04600c9f09f 100644 --- a/srcpkgs/kcachegrind/template +++ b/srcpkgs/kcachegrind/template @@ -1,10 +1,10 @@ # Template file for 'kcachegrind' pkgname=kcachegrind -version=19.08.0 +version=19.08.2 revision=1 build_style=cmake -hostmakedepends="extra-cmake-modules kconfig kcoreaddons kdoctools - pkg-config python qt5-host-tools qt5-qmake" +hostmakedepends="extra-cmake-modules kcoreaddons kdoctools + pkg-config qt5-host-tools qt5-qmake" makedepends="kparts-devel qt5-devel" depends="python hicolor-icon-theme" short_desc="Visualization of Performance Profiling Data" @@ -12,4 +12,4 @@ maintainer="Piotr Wójcik " license="GPL-2.0-only, GFDL-1.2-only" homepage="https://kde.org/applications/development/kcachegrind/" distfiles="${KDE_SITE}/applications/${version}/src/kcachegrind-${version}.tar.xz" -checksum=676dd522eb9976789da17eea1dc103c9c67b6df7bfa70d998e29c0e7dde0608b +checksum=baf17a5c11f21deb7b019a7e3a9819348ec8d20af5c8c4a6108b96266e425b46 diff --git a/srcpkgs/kcalc/template b/srcpkgs/kcalc/template index cbcacfc0bac..183963ce4f1 100644 --- a/srcpkgs/kcalc/template +++ b/srcpkgs/kcalc/template @@ -1,14 +1,14 @@ # Template file for 'kcalc' pkgname=kcalc -version=19.04.3 +version=19.08.2 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" hostmakedepends="extra-cmake-modules kcoreaddons kconfig kdoctools python qt5-host-tools qt5-qmake" -makedepends="gmp-devel kinit-devel kparts-devel qt5-devel" +makedepends="gmp-devel kinit-devel kparts-devel qt5-devel mpfr-devel" short_desc="Simple and scientific calculator" maintainer="Norbert Vegh " license="GPL-2.0-or-later" homepage="https://www.kde.org/applications/utilities/kcalc/" distfiles="${KDE_SITE}/applications/${version}/src/kcalc-${version}.tar.xz" -checksum=42da5439af4f59402d27f2c48d4ee9c68d4a84bfda8d16a5ab9d7ab6bdcc02d5 +checksum=94a6d004266813449b6b9efbe0e3b0da3e5368059134668277a344a720f65fd9 diff --git a/srcpkgs/kcalcore/template b/srcpkgs/kcalcore/template index 35408d42a75..f8d6810fdd0 100644 --- a/srcpkgs/kcalcore/template +++ b/srcpkgs/kcalcore/template @@ -1,6 +1,6 @@ # Template file for 'kcalcore' pkgname=kcalcore -version=19.08.0 +version=19.08.2 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python bison" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://community.kde.org/KDE_PIM" distfiles="${KDE_SITE}/applications/${version}/src/kcalcore-${version}.tar.xz" -checksum=7c7bbca70ada8c8317d6d3d91e0357b2b5886328189423e0b7fac1d326f8ed85 +checksum=f7d33ec65cf954a0460258694ecb2e14bf6c00cee5ea9fdc3e015e78947d896a case $XBPS_TARGET_MACHINE in *-musl) CFLAGS="-D_GNU_SOURCE";; diff --git a/srcpkgs/kcalutils/template b/srcpkgs/kcalutils/template index bd17013d547..5c97991a0c2 100644 --- a/srcpkgs/kcalutils/template +++ b/srcpkgs/kcalutils/template @@ -1,6 +1,6 @@ # Template file for 'kcalutils' pkgname=kcalutils -version=19.08.0 +version=19.08.2 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://community.kde.org/KDE_PIM" distfiles="${KDE_SITE}/applications/${version}/src/kcalutils-${version}.tar.xz" -checksum=ce0cb6633d7f85fdfa54085710c421f0465b286e9236f55c0297737abdfbaf7e +checksum=3f789a18348152f9fc70965dbc2e9a8bd0ba872968c3d0631afacd0e78d3ce13 kcalutils-devel_package() { depends="${sourcepkg}>=${version}_${revision} ${makedepends}" diff --git a/srcpkgs/kcharselect/template b/srcpkgs/kcharselect/template index 5a5afc15f60..368e9579a11 100644 --- a/srcpkgs/kcharselect/template +++ b/srcpkgs/kcharselect/template @@ -1,6 +1,6 @@ # Template file for 'kcharselect' pkgname=kcharselect -version=19.08.0 +version=19.08.2 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -11,7 +11,7 @@ maintainer="travankor " license="GPL-2.0-or-later" homepage="https://www.kde.org/applications/utilities/kcharselect/" distfiles="${KDE_SITE}/applications/${version}/src/kcharselect-${version}.tar.xz" -checksum=31caf29e82327d7e31badff141dd7d5f179b87e9547c322b074f58bc07063020 +checksum=ff2a8c78fc4a12dd727e8ad8677216d5a480a8c82aff97269397ee8ae01e36df if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kdoctools python qt5-host-tools qt5-qmake" diff --git a/srcpkgs/kcmutils/template b/srcpkgs/kcmutils/template index ab43f153b67..9381f9f0727 100644 --- a/srcpkgs/kcmutils/template +++ b/srcpkgs/kcmutils/template @@ -1,6 +1,6 @@ # Template file for 'kcmutils' pkgname=kcmutils -version=5.61.0 +version=5.63.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-or-later, LGPL-2.0-only" homepage="https://projects.kde.org/projects/frameworks/kcmutils" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=b8b79ef2f4513fbe5e4c61cf4726ed33b95efffabdd512fcc2dcff23c23cdfa7 +checksum=c8bc32268307656b73aaa9c5c28ba05c92bd5e8a85eaab1772a2e6e774b222e0 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake python" diff --git a/srcpkgs/kcodecs/template b/srcpkgs/kcodecs/template index 86da1801e9f..96b04beb038 100644 --- a/srcpkgs/kcodecs/template +++ b/srcpkgs/kcodecs/template @@ -1,6 +1,6 @@ # Template file for 'kcodecs' pkgname=kcodecs -version=5.61.0 +version=5.63.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-only, LGPL-2.0-or-later" homepage="https://projects.kde.org/projects/frameworks/kcodecs" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=4604323e44c1be7547f25b43b71bd541048c3d036a7fc5ca74e5ece9792ff5ee +checksum=30214dcc48ac4214c4f0b7bb0e36174fd8de13d4e9cd210e41d4ff86e919b870 kcodecs-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/kcolorchooser/template b/srcpkgs/kcolorchooser/template index 9a113dc2d95..3fbf0f825e4 100644 --- a/srcpkgs/kcolorchooser/template +++ b/srcpkgs/kcolorchooser/template @@ -1,6 +1,6 @@ # Template file for 'kcolorchooser' pkgname=kcolorchooser -version=19.08.0 +version=19.08.2 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -11,7 +11,7 @@ maintainer="travankor " license="MIT" homepage="https://www.kde.org/applications/graphics/kcolorchooser" distfiles="${KDE_SITE}/applications/${version}/src/kcolorchooser-${version}.tar.xz" -checksum=bd9fa8940218f686b0a2d8c6fbe38b996646508a1908dd53925c2513f6fd39eb +checksum=4eb50f314b190f1980e73212a45fe86db39f278f789288cd76cb0763f3176edc if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-devel" diff --git a/srcpkgs/kcompletion/template b/srcpkgs/kcompletion/template index 650cbb6b61d..09435678b91 100644 --- a/srcpkgs/kcompletion/template +++ b/srcpkgs/kcompletion/template @@ -1,6 +1,6 @@ # Template file for 'kcompletion' pkgname=kcompletion -version=5.61.0 +version=5.63.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://projects.kde.org/projects/frameworks/kcompletion" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=68697be65d6c9e0053fc3e504170d23c3162c05a0a9027249c575bc6dc8bd3ec +checksum=4bc7458e44fe5fba0e18aa296236de4523acb47b51f73d5f0a8ca904def5ef81 if [ "CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools-devel" @@ -22,6 +22,7 @@ kcompletion-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/qt5/mkspecs + vmove usr/lib/qt5/plugins/designer vmove usr/lib/cmake vmove "usr/lib/*.so" } diff --git a/srcpkgs/kconfig/template b/srcpkgs/kconfig/template index 7586fda6649..ab78d8832cb 100644 --- a/srcpkgs/kconfig/template +++ b/srcpkgs/kconfig/template @@ -1,6 +1,6 @@ # Template file for 'kconfig' pkgname=kconfig -version=5.61.0 +version=5.63.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://projects.kde.org/projects/frameworks/kconfig" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=94c0e292a5d57e014aa745be6b59a989118ead1252d56c768f2719b5c6471372 +checksum=6165d493323562026a0341c0e2fbad6a603fa7bd92353f7951844797f37640f9 kconfig-devel_package() { short_desc+=" - development" diff --git a/srcpkgs/kconfigwidgets/template b/srcpkgs/kconfigwidgets/template index 7b5fcb2b959..9ff9e58631c 100644 --- a/srcpkgs/kconfigwidgets/template +++ b/srcpkgs/kconfigwidgets/template @@ -1,6 +1,6 @@ # Template file for 'kconfigwidgets' pkgname=kconfigwidgets -version=5.61.0 +version=5.63.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://projects.kde.org/projects/frameworks/kconfigwidgets" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=4cc1e55c5f994abbec03b32bef73bdf54c2613199a446ad63f4ced6e3a0e2165 +checksum=e577c68523721cbdbe2f019098f382cdcd4db4c805fb68d86c2b7d6fb76b1d25 kconfigwidgets-devel_package() { short_desc+=" - development" @@ -20,6 +20,7 @@ kconfigwidgets-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/qt5/mkspecs + vmove usr/lib/qt5/plugins/designer vmove usr/lib/cmake vmove "usr/lib/*.so" } diff --git a/srcpkgs/kcontacts/template b/srcpkgs/kcontacts/template index db382cc59c2..cba2a980065 100644 --- a/srcpkgs/kcontacts/template +++ b/srcpkgs/kcontacts/template @@ -1,17 +1,18 @@ # Template file for 'kcontacts' pkgname=kcontacts -version=19.08.0 +reverts="19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1" +version=5.63.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python kcoreaddons" makedepends="qt5-devel kcoreaddons-devel ki18n-devel kconfig-devel kcodecs-devel" short_desc="Address book API for KDE" -maintainer="Helmut Pozimski " +maintainer="John " license="LGPL-2.1-or-later" homepage="https://projects.kde.org/projects/applications/kcontacts" -distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz" -checksum=b245832fe6150a915d3bcbf1ec4c2c37b6aab541b2568f4955dcd76afa1c486e +distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=10f0bb2cbcab33332830763a0f9313c0c5919c0d5dc974908965b24d68614577 kcontacts-devel_package() { short_desc+=" - development" diff --git a/srcpkgs/kcoreaddons/template b/srcpkgs/kcoreaddons/template index f156f339f63..84f70cd6acd 100644 --- a/srcpkgs/kcoreaddons/template +++ b/srcpkgs/kcoreaddons/template @@ -1,6 +1,6 @@ # Template file for 'kcoreaddons' pkgname=kcoreaddons -version=5.61.0 +version=5.63.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://projects.kde.org/projects/frameworks/kcoreaddons" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=6a4ea2eca77944c24fe63d2f7111913db721533d5971497cb5bdd2cac896e813 +checksum=4d6e76e2a191b7a4c5f46b4cf8ed14edee25eb4357a82b1dc8f4753d1d47c5f0 post_install() { vsed -e 's;${_IMPORT_PREFIX};/usr;g' \ diff --git a/srcpkgs/kcrash/template b/srcpkgs/kcrash/template index cec785ec607..22877acfd88 100644 --- a/srcpkgs/kcrash/template +++ b/srcpkgs/kcrash/template @@ -1,6 +1,6 @@ # Template file for 'kcrash' pkgname=kcrash -version=5.61.0 +version=5.63.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://projects.kde.org/projects/frameworks/kcrash" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=83e6333ea0cd7d1ded3fa84f126e3c86a010d7bdb7fd183e7c5d42a8b8e74db8 +checksum=8c3baa5143eb6927c9ed0b90183ab76ea880df016fd0482f73ca41e6fa5f83f6 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools kwindowsystem-devel kcoreaddons" diff --git a/srcpkgs/kcron/template b/srcpkgs/kcron/template index b000a5759c4..3742daff90c 100644 --- a/srcpkgs/kcron/template +++ b/srcpkgs/kcron/template @@ -1,14 +1,14 @@ # Template file for 'kcron' pkgname=kcron -version=19.08.0 +version=19.08.2 revision=1 build_style=cmake -hostmakedepends="extra-cmake-modules kconfig kcoreaddons kdoctools - pkg-config python qt5-host-tools qt5-qmake" +hostmakedepends="extra-cmake-modules kcoreaddons kdoctools + pkg-config qt5-host-tools qt5-qmake" makedepends="kparts-devel qt5-devel" short_desc="KDE Configure and schedule tasks" maintainer="Piotr Wójcik " license="GPL-2.0-or-later" homepage="https://userbase.kde.org/System_Settings/Task_Scheduler" distfiles="${KDE_SITE}/applications/${version}/src/kcron-${version}.tar.xz" -checksum=1594aafc964d8e6c9ff31056d8f6f9ca6ee51ef9067b3ee1c991744baf54a88c +checksum=270ee81cba5ef9d92158a3fc71cf8c50c658468018eb0415c9d3d0bc7abea5e5 diff --git a/srcpkgs/kdav/template b/srcpkgs/kdav/template index 75e136b6286..fd84cb81c4a 100644 --- a/srcpkgs/kdav/template +++ b/srcpkgs/kdav/template @@ -1,6 +1,6 @@ # Template file for 'kdav' pkgname=kdav -version=19.08.0 +version=19.08.2 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 @@ -11,7 +11,7 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://community.kde.org/KDE_PIM" distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz" -checksum=8bfd0657c0eaa74068c7601208baacb9d11bc6574cd353d4d346473c6c43b6f6 +checksum=8572a77ee3d0f8a7e09e4975fcf0420394c16e908c4a19aecc409415770595f9 kdav-devel_package() { depends="${sourcepkg}>=${version}_${revision} ${makedepends}" diff --git a/srcpkgs/kdbusaddons/template b/srcpkgs/kdbusaddons/template index e6038bca1f2..c049cdb4788 100644 --- a/srcpkgs/kdbusaddons/template +++ b/srcpkgs/kdbusaddons/template @@ -1,6 +1,6 @@ # Template file for 'kdbusaddons' pkgname=kdbusaddons -version=5.61.0 +version=5.63.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://projects.kde.org/projects/frameworks/kdbusaddons" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=f24fadc71670591bb679cde68147e53819f6c3d56126ecbafe59688fc47b347d +checksum=1b0ba356dd285b6785d14b91f17eb1bcb9c5c84f23ff5c8608954cb013cafc87 kdbusaddons-devel_package() { short_desc+=" - development" diff --git a/srcpkgs/kde-cli-tools/template b/srcpkgs/kde-cli-tools/template index 63c730d8e47..8d69866f1ef 100644 --- a/srcpkgs/kde-cli-tools/template +++ b/srcpkgs/kde-cli-tools/template @@ -1,6 +1,6 @@ # Template file for 'kde-cli-tools' pkgname=kde-cli-tools -version=5.16.4 +version=5.17.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-2.1-or-later, GPL-2.0-or-later" homepage="https://cgit.kde.org/kde-cli-tools.git" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=56c7c2566217704a9d613757767c3b8ee8d1bc4601b9414a44acb50aaaaedc0d +checksum=1d554bc8c68b9a7ec7e467bcd38b64ed706c5c6a6de566c4b205b536f5490744 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kdoctools kcoreaddons python qt5-host-tools qt5-qmake" diff --git a/srcpkgs/kde-gtk-config5/template b/srcpkgs/kde-gtk-config5/template index dfc301bb91a..3793a80c221 100644 --- a/srcpkgs/kde-gtk-config5/template +++ b/srcpkgs/kde-gtk-config5/template @@ -1,6 +1,6 @@ # Template file for 'kde-gtk-config5' pkgname=kde-gtk-config5 -version=5.16.4 +version=5.17.0 revision=1 wrksrc="${pkgname%5}-${version}" build_style=cmake @@ -8,13 +8,13 @@ configure_args="-DBUILD_TESTING=OFF" hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools" makedepends="kcmutils-devel knewstuff-devel gtk+-devel gtk+3-devel gsettings-desktop-schemas-devel" -depends="kde-cli-tools" +depends="kde-cli-tools gsettings-desktop-schemas" short_desc="GTK2 and GTK3 Configurator for KDE" maintainer="John " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://projects.kde.org/projects/plasma/kde-gtk-config" distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz" -checksum=c271b1caebac0837483af7ae11d2e4786a7770ff85753f1a3da4c8d28681111c +checksum=a6eb212078877ef37cd103d92d2d342d6306c5c1f16778586dd271ecb75a3bd6 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kcoreaddons" diff --git a/srcpkgs/kde5-baseapps/template b/srcpkgs/kde5-baseapps/template index 70be2d94cb9..c7b66b346e5 100644 --- a/srcpkgs/kde5-baseapps/template +++ b/srcpkgs/kde5-baseapps/template @@ -1,6 +1,6 @@ # Template file for 'kde5-baseapps' pkgname=kde5-baseapps -version=19.08.0 +version=19.08.2 revision=1 build_style=meta depends=" diff --git a/srcpkgs/kde5/template b/srcpkgs/kde5/template index dcadced3bf3..3666ff0c305 100644 --- a/srcpkgs/kde5/template +++ b/srcpkgs/kde5/template @@ -1,32 +1,33 @@ # Template file for 'kde5' pkgname=kde5 -version=5.15.0 +version=5.16.90 revision=1 build_style=meta -depends=" - bluedevil>=${version} - breeze-gtk>=${version} - kde-gtk-config5>=${version} - kdeplasma-addons5>=${version} - kgamma5>=${version} - kinfocenter>=${version} - kscreen>=${version} - ksshaskpass>=${version} - ksysguard>=${version} - kwallet-pam>=${version} - kwayland-integration>=${version} - kwrited>=${version} - oxygen>=${version} - plasma-desktop>=${version} - plasma-nm>=${version} - plasma-pa>=${version} - plasma-sdk>=${version} - plasma-workspace-wallpapers>=${version} - powerdevil>=${version} - sddm-kcm>=${version} - user-manager>=${version} - xdg-desktop-portal-kde>=${version}" -short_desc="The kde 5 meta-package for Void Linux" +depends="bluedevil>=${version} + breeze-gtk>=${version} + kde-gtk-config5>=${version} + kdeplasma-addons5>=${version} + kgamma5>=${version} + kinfocenter>=${version} + kscreen>=${version} + ksshaskpass>=${version} + ksysguard>=${version} + kwallet-pam>=${version} + kwayland-integration>=${version} + kwrited>=${version} + oxygen>=${version} + plasma-desktop>=${version} + plasma-nm>=${version} + plasma-pa>=${version} + plasma-sdk>=${version} + plasma-workspace-wallpapers>=${version} + powerdevil>=${version} + sddm-kcm>=${version} + user-manager>=${version} + xdg-desktop-portal-kde>=${version} + plasma-thunderbolt>=${version} + elogind" +short_desc="The KDE Plasma Desktop meta-package for Void Linux" maintainer="John " license="GPL-2, LGPL-2.1, FDL" -homepage="http://www.kde.org" +homepage="https://kde.org/plasma-desktop" diff --git a/srcpkgs/kdeclarative/template b/srcpkgs/kdeclarative/template index 9e27ec3c858..6d0d296d5c4 100644 --- a/srcpkgs/kdeclarative/template +++ b/srcpkgs/kdeclarative/template @@ -1,6 +1,6 @@ # Template file for 'kdeclarative' pkgname=kdeclarative -version=5.61.0 +version=5.63.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://projects.kde.org/projects/frameworks/kdeclarative" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=464a77f88cce72c1616654c371068c11d51e484e0de5c0c5e032126d71afedaa +checksum=c873ab1076fce137090c341c9f2c1751b5aacf85eeb62b899bdda5936bb6fc08 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake python kconfig" diff --git a/srcpkgs/kdecoration/template b/srcpkgs/kdecoration/template index e5ed2420728..d8bf65a6428 100644 --- a/srcpkgs/kdecoration/template +++ b/srcpkgs/kdecoration/template @@ -1,6 +1,6 @@ # Template file for 'kdecoration' pkgname=kdecoration -version=5.16.4 +version=5.17.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://projects.kde.org/projects/plasma/kdecoration" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=aa77507dcf357243cca9002764f8c8d1c8404d7e5b7249ad0d0f900f0a47ace4 +checksum=d6d25e6894d941001af035497388aa998599d89df0ca2847c8aa6275b9bf9266 kdecoration-devel_package() { short_desc+=" - development" diff --git a/srcpkgs/kded/template b/srcpkgs/kded/template index c4b1b95eb9f..23ebe5b0bd2 100644 --- a/srcpkgs/kded/template +++ b/srcpkgs/kded/template @@ -1,6 +1,6 @@ # Template file for 'kded' pkgname=kded -version=5.61.0 +version=5.63.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-only, LGPL-2.0-or-later" homepage="https://projects.kde.org/projects/frameworks/kded" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=ca970111cb2d0073305a226cc005e2085952c2a02703168a775f954d27d723bc +checksum=055087306a3c7c970a13f8ba3fddaba433cc68fc67a5a88b56be9b179c33594e if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools" diff --git a/srcpkgs/kdegraphics-mobipocket/template b/srcpkgs/kdegraphics-mobipocket/template index d0cca875cc8..896f5d1667b 100644 --- a/srcpkgs/kdegraphics-mobipocket/template +++ b/srcpkgs/kdegraphics-mobipocket/template @@ -1,6 +1,6 @@ # Template file for 'kdegraphics-mobipocket' pkgname=kdegraphics-mobipocket -version=19.04.3 +version=19.08.2 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -11,7 +11,7 @@ maintainer="Denis Revin " license="GPL-2.0-or-later" homepage="https://projects.kde.org/projects/kde/kdegraphics-mobipocket" distfiles="${KDE_SITE}/applications/${version}/src/kdegraphics-mobipocket-${version}.tar.xz" -checksum=c073730b7f3d468f4e710a67bdb90d794b69bf0f2c149f7fac705b44b912fa94 +checksum=9621b0b3564ce7fcd6890c15c48e11d00c1cf2d3b408b255ec590bd6d113439f libqmobipocket_package() { short_desc+=" - runtime library" diff --git a/srcpkgs/kdegraphics-thumbnailers/template b/srcpkgs/kdegraphics-thumbnailers/template index 980248c0a89..79e79fd946f 100644 --- a/srcpkgs/kdegraphics-thumbnailers/template +++ b/srcpkgs/kdegraphics-thumbnailers/template @@ -1,6 +1,6 @@ # Template file for 'kdegraphics-thumbnailers' pkgname=kdegraphics-thumbnailers -version=19.04.3 +version=19.08.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules kcoreaddons kconfig-devel pkg-config" @@ -11,4 +11,4 @@ maintainer="1is7ac3 " license="GPL-2.0-or-later" homepage="https://projects.kde.org/projects/kde/kdegraphics-thumbnailers" distfiles="${KDE_SITE}/applications/${version}/src/kdegraphics-thumbnailers-${version}.tar.xz" -checksum=1cca91081a97e851156d187794037bdcbffe996f607a1eed59a2ea00049a9f78 +checksum=86a81ff786168778cbe0ad7c185320dbf052b1df2e6269f14323df04b48ed2ff diff --git a/srcpkgs/kdelibs4support/template b/srcpkgs/kdelibs4support/template index c47237be96d..74c82becf02 100644 --- a/srcpkgs/kdelibs4support/template +++ b/srcpkgs/kdelibs4support/template @@ -1,6 +1,6 @@ # Template file for 'kdelibs4support' pkgname=kdelibs4support -version=5.61.0 +version=5.63.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -14,7 +14,7 @@ maintainer="John " license="LGPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://projects.kde.org/projects/frameworks/kdelibs4support" distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz" -checksum=ae6f7c10e1fe67ded687f38a8ab3c8d483ae06ae69344bd1e683af752cf40b5c +checksum=8cd614941fc201bac296a0e8ab010f73791ffb5cd72bce6f6cdf87fb2ae3be9e if [ "$CROSS_BUILD" ]; then makedepends+=" qt5-tools-devel" @@ -31,6 +31,7 @@ kdelibs4support-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/cmake + vmove usr/lib/qt5/plugins/designer vmove usr/lib/*.so } } diff --git a/srcpkgs/kdenlive/template b/srcpkgs/kdenlive/template index cf8eda2d1aa..69f53c77cf9 100644 --- a/srcpkgs/kdenlive/template +++ b/srcpkgs/kdenlive/template @@ -1,6 +1,6 @@ # Template file for 'kdenlive' pkgname=kdenlive -version=19.04.3 +version=19.08.2 revision=1 build_style=cmake hostmakedepends=" @@ -17,7 +17,7 @@ maintainer="johannes " license="GPL-3.0-or-later" homepage="https://kdenlive.org" distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz" -checksum=c981954ce9759da2878b4c76d97b9bb7aa92fc1f073a9f759142870e287d2a1e +checksum=5ca3b7a2457d2aa355309bc7471791f691edd8774af9a19cbfc8fac39ad53c78 # needed for mlt to work on musl CXXFLAGS="-DHAVE_LOCALE_H=1" diff --git a/srcpkgs/kdepim-apps-libs/template b/srcpkgs/kdepim-apps-libs/template index 70db766ac79..f4e78b047d6 100644 --- a/srcpkgs/kdepim-apps-libs/template +++ b/srcpkgs/kdepim-apps-libs/template @@ -1,7 +1,7 @@ # Template file for 'kdepim-apps-libs' pkgname=kdepim-apps-libs -version=19.08.0 -revision=1 +version=19.08.2 +revision=2 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python kcoreaddons kconfig" @@ -12,7 +12,7 @@ maintainer="John " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://community.kde.org/KDE_PIM" distfiles="${KDE_SITE}/applications/${version}/src/kdepim-apps-libs-${version}.tar.xz" -checksum=2a19e9b0c3b6b2fecaeb4054bf101170056b8c9e831e45fb796b59666f103f2e +checksum=d542b1d532d3ce3d9f1c63f4455175c7e855cd1e095a1addf1322074afc11923 kdepim-apps-libs-devel_package() { depends="${sourcepkg}>=${version}_${revision} ${makedepends}" diff --git a/srcpkgs/kdepim-runtime/template b/srcpkgs/kdepim-runtime/template index 49f313d77b0..8928c20ccec 100644 --- a/srcpkgs/kdepim-runtime/template +++ b/srcpkgs/kdepim-runtime/template @@ -1,7 +1,7 @@ # Template file for 'kdepim-runtime' pkgname=kdepim-runtime -version=19.08.0 -revision=1 +version=19.08.2 +revision=2 build_style=cmake # XXX KolabLibraries, Kolabxml hostmakedepends="extra-cmake-modules python3 kdoctools kdesignerplugin @@ -14,7 +14,7 @@ maintainer="John " license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later, AGPL-3.0-or-later" homepage="https://projects.kde.org/projects/kde/kdepimlibs" distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz" -checksum=634419978329902a1877810d87d4ddae8cb07adbabbfa4540b521689d8bc85ef +checksum=9b98980003d2d107596e9acc9482dfc3ea26a2485c75a700bd82b53b9be72ebf post_install() { vlicense COPYING.agpl3 COPYING.agpl3 diff --git a/srcpkgs/kdeplasma-addons5/template b/srcpkgs/kdeplasma-addons5/template index a54452c8537..5048fdc9628 100644 --- a/srcpkgs/kdeplasma-addons5/template +++ b/srcpkgs/kdeplasma-addons5/template @@ -1,6 +1,6 @@ # Template file for 'kdeplasma-addons5' pkgname=kdeplasma-addons5 -version=5.16.4 +version=5.17.0 revision=1 wrksrc="${pkgname%5}-${version}" build_style=cmake @@ -13,7 +13,7 @@ maintainer="John " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://projects.kde.org/projects/plasma/kdeplasma-addons" distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz" -checksum=4c0884dcb8413fa836d7e390b1c12fc71127c0e5e6fa278a338c253d1539f4a1 +checksum=d4c6ab840f61dcdc52b925045614f9de4089dc2fdf89726fd7c8638c521eb42e if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework" diff --git a/srcpkgs/kdesignerplugin/template b/srcpkgs/kdesignerplugin/template index aa47dd98f42..acad7c1faf2 100644 --- a/srcpkgs/kdesignerplugin/template +++ b/srcpkgs/kdesignerplugin/template @@ -1,6 +1,6 @@ # Template file for 'kdesignerplugin' pkgname=kdesignerplugin -version=5.61.0 +version=5.63.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -12,8 +12,8 @@ short_desc="Integrating KDE frameworks widgets with Qt Designer" maintainer="John " license="LGPL-2.1-only" homepage="https://projects.kde.org/projects/frameworks/kdesignerplugin" -distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=6b204dffbb4897f51143650d75383b5a3ddf4254455e5827d316c7b4ee7b3f33 +distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz" +checksum=c9f63d672cbc04465e77eff07d62530e8f9a9129e0d6dfa7e13e0ad4bea6eff0 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools python kgendesignerplugin kdoctools" diff --git a/srcpkgs/kdesu/template b/srcpkgs/kdesu/template index e2c4f650afc..94a6cc8f9e0 100644 --- a/srcpkgs/kdesu/template +++ b/srcpkgs/kdesu/template @@ -1,6 +1,6 @@ # Template file for 'kdesu' pkgname=kdesu -version=5.61.0 +version=5.63.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-only" homepage="https://projects.kde.org/projects/frameworks/kdesu" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=398e74bdfe695ec2d7b57ce78f9fce3e19bb447a8eb5924441718a8f7384f888 +checksum=bd5f8f7a8d9e097e95d5189d32601e231931f9794ea3f34605c56b7b9b06150d if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake python" diff --git a/srcpkgs/kdevelop-php/template b/srcpkgs/kdevelop-php/template index 959d1979099..ab2b462aa62 100644 --- a/srcpkgs/kdevelop-php/template +++ b/srcpkgs/kdevelop-php/template @@ -1,6 +1,6 @@ # Template file for 'kdevelop-php' pkgname=kdevelop-php -version=5.3.3 +version=5.4.2 revision=1 wrksrc="kdev-php-${version}" build_style=cmake @@ -13,5 +13,5 @@ maintainer="yopito " license="GPL-2.0-or-later, LGPL-2.0-or-later" homepage="https://www.kdevelop.org/" distfiles="${KDE_SITE}/kdevelop/${version}/src/kdev-php-${version}.tar.xz" -checksum=8499c46f676a9cd37e56b5635f63dfcab1f2875875b2c65a9f66d84ed4f72972 +checksum=360444b7ac7c2f35144b4e13054a169b705b44e66219bd988ec1137e07994967 nocross="kdevelop-devel is not available" diff --git a/srcpkgs/kdevelop-python/template b/srcpkgs/kdevelop-python/template index ba6a5e203b7..0265916a3d0 100644 --- a/srcpkgs/kdevelop-python/template +++ b/srcpkgs/kdevelop-python/template @@ -1,21 +1,21 @@ # Template file for 'kdevelop-python' pkgname=kdevelop-python -version=5.3.3 +version=5.4.2 revision=1 wrksrc="kdev-python-${version}" build_style=cmake +pycompile_dirs="usr/share/kdevpythonsupport" hostmakedepends="extra-cmake-modules python3 qt5-qmake python3-devel" makedepends="python3-devel qt5-devel knewstuff-devel kitemmodels-devel threadweaver-devel ktexteditor-devel kcmutils-devel knotifyconfig-devel grantlee5-devel kdevelop-devel" -pycompile_dirs="usr/share/kdevpythonsupport" -pycompile_version="$py3_ver" short_desc="Python 3 language and Django project support for KDevelop" maintainer="yopito " license="LGPL-2.0-or-later, GPL-2.0-or-later" homepage="https://www.kdevelop.org/" distfiles="${KDE_SITE}/kdevelop/${version}/src/kdev-python-${version}.tar.xz" -checksum=80c4bab96aede589ebdb6d4b33d0339766ac645cc0e4fe10674df12008f37f04 +checksum=bb32205081d55723bc5948f93fe0cdb9baeadacf0d0eba74f131d58477679867 +pycompile_version="$py3_ver" nocross="kdevelop-devel is not available" post_install() { diff --git a/srcpkgs/kdevelop/patches/use-std-c99.patch b/srcpkgs/kdevelop/patches/use-std-c99.patch index da373e3ab2c..d766e446f69 100644 --- a/srcpkgs/kdevelop/patches/use-std-c99.patch +++ b/srcpkgs/kdevelop/patches/use-std-c99.patch @@ -4,13 +4,12 @@ Let's use C99 instead. --- CMakeLists.txt.ORIG +++ CMakeLists.txt -@@ -21,6 +21,9 @@ - endif() - +@@ -15,6 +15,8 @@ + include(KDEInstallDirs) + include(KDECMakeSettings) include(KDECompilerSettings NO_POLICY_SCOPE) # needs to be first, as set policies influence following macros +string(REPLACE " -std=iso9899:1990" "" CMAKE_C_FLAGS " ${CMAKE_C_FLAGS} ") +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99") -+ + include(ECMOptionalAddSubdirectory) include(ECMInstallIcons) - include(ECMAddAppIcon) diff --git a/srcpkgs/kdevelop/template b/srcpkgs/kdevelop/template index 434820fe9d8..94900870527 100644 --- a/srcpkgs/kdevelop/template +++ b/srcpkgs/kdevelop/template @@ -1,6 +1,6 @@ # Template file for 'kdevelop' pkgname=kdevelop -version=5.3.3 +version=5.4.2 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools" @@ -15,8 +15,8 @@ maintainer="yopito " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://www.kdevelop.org/" distfiles="${KDE_SITE}/${pkgname}/${version}/src/${pkgname}-${version}.tar.xz" -checksum=cedd1c7ba8e352a76ec021218cf2e35a6c060875ef3d27964246c48d0f2ae81c -nocross="plasma-framework-devel is not available" +checksum=52e253da4892428ef3059568a93263bf7f9dec5ddeb17b0e5d258726492dc6c4 +nocross="subversion-devel is not available" kdevelop-devel_package() { depends="kdevelop>=${version}_${revision}" diff --git a/srcpkgs/kdewebkit/template b/srcpkgs/kdewebkit/template index 33c1bd2efba..14cc070c6bd 100644 --- a/srcpkgs/kdewebkit/template +++ b/srcpkgs/kdewebkit/template @@ -1,6 +1,6 @@ # Template file for 'kdewebkit' pkgname=kdewebkit -version=5.61.0 +version=5.63.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://projects.kde.org/projects/frameworks/kdewebkit" distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz" -checksum=1ee2a00ee3d95df9270e8c3d434568cda8f42151e361bc07fe374bf0f7afe211 +checksum=db78cf8b167562a211c20a081e23540d0613d2e6feec67d461bb9fc982ad6be8 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake python" diff --git a/srcpkgs/kdialog/template b/srcpkgs/kdialog/template index 732acbd084f..c4b0190f178 100644 --- a/srcpkgs/kdialog/template +++ b/srcpkgs/kdialog/template @@ -1,6 +1,6 @@ # Template file for 'kdialog' pkgname=kdialog -version=19.04.3 +version=19.08.2 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -11,4 +11,4 @@ maintainer="Denis Revin " license="GPL-2.0-or-later" homepage="https://projects.kde.org/projects/applications/kdialog" distfiles="${KDE_SITE}/applications/${version}/src/kdialog-${version}.tar.xz" -checksum=647c5eac9d34f2cc8011f6214bc5a8ddc1eca8f0b381c66eaf20848eccdf9823 +checksum=7aef7b5a5f340cc0066e02572ec8cef8b227bc6c7f5b066677ef6422632db95a diff --git a/srcpkgs/kdnssd/template b/srcpkgs/kdnssd/template index 866387ff5a5..1182a2cd898 100644 --- a/srcpkgs/kdnssd/template +++ b/srcpkgs/kdnssd/template @@ -1,6 +1,6 @@ # Template file for 'kdnssd' pkgname=kdnssd -version=5.61.0 +version=5.63.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://projects.kde.org/projects/frameworks/kdnssd" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=02d70e5ee18697867c1a12373c1dbe31e1efba1fcb1e26bba3c75472cd3b271d +checksum=f58d8260b5cdbef3eb777990d53666ab1df5be3f978e880ed1d6d810a361c9ae kdnssd-devel_package() { short_desc+=" - development" diff --git a/srcpkgs/kdoctools/template b/srcpkgs/kdoctools/template index bf5590ac34f..6e11282d67d 100644 --- a/srcpkgs/kdoctools/template +++ b/srcpkgs/kdoctools/template @@ -1,6 +1,6 @@ # Template file for 'kdoctools' pkgname=kdoctools -version=5.61.0 +version=5.63.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://projects.kde.org/projects/frameworks/kdoctools" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=e48d8f8f075171c6b83189999a10552c772c6a7e9a115a2643414f9ecec77c6f +checksum=a46a10424d6cd4dcb3d8a59b9fbd1bf9fe4f409af42decf853298b18bf4ecafe if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools-devel" diff --git a/srcpkgs/kea/patches/fix-musl-getopt.patch b/srcpkgs/kea/patches/fix-musl-getopt.patch deleted file mode 100644 index 273e126c684..00000000000 --- a/srcpkgs/kea/patches/fix-musl-getopt.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- src/bin/perfdhcp/command_options.cc 2016-09-27 12:32:02.000000000 +0200 -+++ src/bin/perfdhcp/command_options.cc 2016-12-07 12:19:55.784883734 +0100 -@@ -7,6 +7,7 @@ - #include - - #include "command_options.h" -+#include - #include - #include - #include diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template index c6a0a34f317..45709e4a108 100644 --- a/srcpkgs/kea/template +++ b/srcpkgs/kea/template @@ -1,13 +1,13 @@ # Template file for 'kea' pkgname=kea -version=1.5.0 -revision=6 +version=1.7.0 +revision=1 build_style=gnu-configure configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr $(vopt_if mysql --with-dhcp-mysql) $(vopt_if pgsql --with-dhcp-pgsql=${XBPS_CROSS_BASE}/usr/bin/pg_config)" hostmakedepends="flex bison perl pkg-config - doxygen elinks libxslt docbook-xsl" + doxygen elinks libxslt docbook-xsl python3-Sphinx python3-sphinx_rtd_theme" makedepends="boost-devel log4cplus-devel python3-devel $(vopt_if botan botan-devel libressl-devel) $(vopt_if mysql libmysqlclient-devel) @@ -20,7 +20,7 @@ maintainer="Jürgen Buchmüller " license="MPL-2.0, Apache-2.0" homepage="https://kea.isc.org" distfiles="http://ftp.isc.org/isc/kea/${version/.P/-P}/kea-${version/.P/-P}.tar.gz" -checksum=edce4fab68ca7af607cf7f5bc86596e04fe0ef4b8e88906e339cdefcf21daaec +checksum=173c8e893690a611bc1d1c6fbe54a5c20fcd54429399a8dc3a0d7d2eb01bf8cc nocross="Tools required for messages are not built for the host arch" build_options="botan mysql pgsql" @@ -67,6 +67,5 @@ libkea-devel_package() { vmove usr/include vmove usr/lib/*.a vmove usr/lib/*.so - vmove usr/lib/pkgconfig } } diff --git a/srcpkgs/keditbookmarks/template b/srcpkgs/keditbookmarks/template index 2638b8f2242..1de44014edc 100644 --- a/srcpkgs/keditbookmarks/template +++ b/srcpkgs/keditbookmarks/template @@ -1,9 +1,8 @@ # Template file for 'keditbookmarks' pkgname=keditbookmarks -version=19.08.0 +version=19.08.2 revision=1 build_style=cmake -configure_args="-DBUILD_TESTING=OFF" hostmakedepends="extra-cmake-modules kcoreaddons kconfig kdoctools pkg-config qt5-host-tools qt5-qmake" makedepends="kparts-devel qt5-devel" @@ -12,4 +11,8 @@ maintainer="Piotr Wójcik " license="GPL-2.0-or-later, GFDL-1.2-only" homepage="https://www.kde.org/" distfiles="${KDE_SITE}/applications/${version}/src/keditbookmarks-${version}.tar.xz" -checksum=98c539e63a0e2bb62680003022d9ea5aececc4aa1c2d19a7b4c4aa3d8999e7ac +checksum=6a22c3ccdd89d07ad13b34b89704afcc9bf3b5a177d4dc137dcb5eaf1580f6dd + +pre_check() { + export QT_QPA_PLATFORM=offscreen +} diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template index 1414e1a54d3..afaa82c31dd 100644 --- a/srcpkgs/keepalived/template +++ b/srcpkgs/keepalived/template @@ -1,7 +1,7 @@ # Template file for 'keepalived' pkgname=keepalived -version=2.0.16 -revision=2 +version=2.0.18 +revision=1 build_style=gnu-configure configure_args="--enable-sha1" hostmakedepends="pkg-config" @@ -11,7 +11,7 @@ maintainer="Orphaned " license="GPL-2-or-later" homepage="http://www.keepalived.org/" distfiles="http://www.keepalived.org/software/${pkgname}-${version}.tar.gz" -checksum=f0c7dc86147a286913c1c2c918f557735016285d25779d4d2fce5732fcb888df +checksum=1423a2b1b8e541211029b9e1e1452e683bbe5f4b0b287eddd609aaf5ff024fd0 conf_files="/etc/keepalived/keepalived.conf" diff --git a/srcpkgs/kemoticons/template b/srcpkgs/kemoticons/template index d4a66b32f7e..a8d9d4e82f8 100644 --- a/srcpkgs/kemoticons/template +++ b/srcpkgs/kemoticons/template @@ -1,6 +1,6 @@ # Template file for 'kemoticons' pkgname=kemoticons -version=5.61.0 +version=5.63.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later, CC-BY-4.0" homepage="https://projects.kde.org/projects/frameworks/kemoticons" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=cfc17de43320fbb353be30ae8d5b448b88da6f83bd23e29d678cd95a4bd7a380 +checksum=4d9b0608e9badcce1376032d75c650265108f2b4a38b65f0db9f513ccba72152 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake" diff --git a/srcpkgs/keybase-desktop/template b/srcpkgs/keybase-desktop/template index 4296259c3d2..4892e48f464 100644 --- a/srcpkgs/keybase-desktop/template +++ b/srcpkgs/keybase-desktop/template @@ -1,16 +1,16 @@ # Template file for 'keybase-desktop' pkgname=keybase-desktop -version=4.3.2 +version=4.6.0 revision=1 wrksrc="client-${version}" -hostmakedepends="git nodejs-lts yarn" +hostmakedepends="git nodejs-lts yarn unzip" depends="keybase kbfs" short_desc="Keybase desktop client" maintainer="Dominic Monroe " license="BSD-3-Clause" homepage="https://keybase.io" distfiles="https://github.com/keybase/client/archive/v${version}.tar.gz" -checksum=95300e1729b74a8fddd13b5f2ab35a3bd6f2e53402568d723e671b5cfc5d3778 +checksum=ee97b78e27dc77f55e0533dfbf4ecde2563c14e0f8c708cdb6066361c56ff8f8 nostrip_files="Keybase" case "${XBPS_TARGET_MACHINE}" in diff --git a/srcpkgs/kbfs/INSTALL b/srcpkgs/keybase/kbfs.INSTALL similarity index 100% rename from srcpkgs/kbfs/INSTALL rename to srcpkgs/keybase/kbfs.INSTALL diff --git a/srcpkgs/keybase/template b/srcpkgs/keybase/template index a505df25165..050920ee3eb 100644 --- a/srcpkgs/keybase/template +++ b/srcpkgs/keybase/template @@ -1,20 +1,39 @@ # Template file for 'keybase' pkgname=keybase -version=4.3.2 +version=4.6.0 revision=1 wrksrc="client-${version}" build_style=go go_import_path="github.com/keybase/client" -go_package="${go_import_path}/go/keybase" +go_package="${go_import_path}/go/keybase +${go_import_path}/go/kbfs/kbfsfuse +${go_import_path}/go/kbfs/kbfsgit/git-remote-keybase +${go_import_path}/go/kbfs/kbfstool ${go_import_path}/go/kbfs/redirector" go_build_tags="production" +hostmakedepends="git" depends="gnupg2" short_desc="Client for keybase.io" maintainer="Toyam Cox " license="BSD-3-Clause" homepage="https://keybase.io/" distfiles="https://github.com/keybase/client/archive/v${version}.tar.gz" -checksum=95300e1729b74a8fddd13b5f2ab35a3bd6f2e53402568d723e671b5cfc5d3778 +checksum=ee97b78e27dc77f55e0533dfbf4ecde2563c14e0f8c708cdb6066361c56ff8f8 post_install() { vlicense LICENSE } + +kbfs_package() { + depends="keybase fuse" + short_desc="Keybase Filesystem" + + pkg_install() { + vmove usr/bin/redirector + mv ${PKGDESTDIR}/usr/bin/redirector ${PKGDESTDIR}/usr/bin/keybase-redirector + # setuid + chmod 4755 ${PKGDESTDIR}/usr/bin/keybase-redirector + vmove usr/bin/kbfsfuse + vmove usr/bin/kbfstool + vmove usr/bin/git-remote-keybase + } +} diff --git a/srcpkgs/keyutils/template b/srcpkgs/keyutils/template index cade0250d73..9cb16a10485 100644 --- a/srcpkgs/keyutils/template +++ b/srcpkgs/keyutils/template @@ -1,14 +1,13 @@ # Template file for 'keyutils' pkgname=keyutils -version=1.6 +version=1.6.1 revision=1 -makedepends="mit-krb5-devel" short_desc="Linux Key Management Utilities" -maintainer="Orphaned " +maintainer="Anthony Iliopoulos " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="http://www.kernel.org" -distfiles="http://people.redhat.com/~dhowells/${pkgname}/${pkgname}-${version}.tar.bz2" -checksum=d3aef20cec0005c0fa6b4be40079885567473185b1a57b629b030e67942c7115 +distfiles="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/snapshot/${pkgname}-${version}.tar.gz" +checksum=3c71dcfc6900d07b02f4e061d8fb218a4ae6519c1d283d6a57b8e27718e2f557 conf_files="/etc/request-key.conf" pre_build() { diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template index 479154afef1..8b3c4143a40 100644 --- a/srcpkgs/kfilemetadata5/template +++ b/srcpkgs/kfilemetadata5/template @@ -1,6 +1,6 @@ # Template file for 'kfilemetadata5' pkgname=kfilemetadata5 -version=5.61.0 +version=5.63.0 revision=1 wrksrc="${pkgname%5}-${version}" build_style=cmake @@ -14,7 +14,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://projects.kde.org/projects/frameworks/kfilemetadata" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz" -checksum=15f20af053c71c1e5ba6c6ade90b7cce27645b27ee30f1e6e73038e81a2c958e +checksum=a000dbfa729306c07e631c1ec2bd306c572ac605aa0f1b7389be617b566b9b87 kfilemetadata5-devel_package() { short_desc+=" - development" @@ -22,6 +22,7 @@ kfilemetadata5-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/cmake + vmove usr/lib/qt5/mkspecs vmove "usr/lib/*.so" } } diff --git a/srcpkgs/kfind/template b/srcpkgs/kfind/template index 8e45a324975..f1e127072f4 100644 --- a/srcpkgs/kfind/template +++ b/srcpkgs/kfind/template @@ -1,9 +1,9 @@ # Template file for 'kfind' pkgname=kfind -version=19.08.0 +version=19.08.2 revision=1 build_style=cmake -hostmakedepends="extra-cmake-modules kcoreaddons qt5-host-tools qt5-qmake python +hostmakedepends="extra-cmake-modules kcoreaddons qt5-host-tools qt5-qmake kdoctools" makedepends="kfilemetadata5-devel kparts-devel" short_desc="Find files and folders" @@ -11,4 +11,4 @@ maintainer="Piotr Wójcik " license="GPL-2.0-or-later" homepage="https://www.kde.org/applications/utilities/kfind/" distfiles="${KDE_SITE}/applications/${version}/src/kfind-${version}.tar.xz" -checksum=25b7b442600c4e109b0a6f7f09962a4d95d419673f6b64eebf226dcdae8cc6ff +checksum=7ce5255fa4ef3e98db937eb23e8cdc89bd6b5e5429ccb5fea769e99da2bc424a diff --git a/srcpkgs/kgamma5/template b/srcpkgs/kgamma5/template index d065c905aa2..f7f19b38819 100644 --- a/srcpkgs/kgamma5/template +++ b/srcpkgs/kgamma5/template @@ -1,6 +1,6 @@ # Template file for 'kgamma5' pkgname=kgamma5 -version=5.16.4 +version=5.17.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -11,7 +11,7 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://projects.kde.org/projects/plasma/kgamma5" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=18c01c6a9d73f2450da24ac7a52c00b9d355a1ba41bd346eb71fbe271de85f46 +checksum=5d4c7cfc63896746a994128db03037bff666132e8e35378de60ac91a3959493d if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-devel kdoctools" diff --git a/srcpkgs/kget/template b/srcpkgs/kget/template index e2119f4e30b..9a4680bf335 100644 --- a/srcpkgs/kget/template +++ b/srcpkgs/kget/template @@ -1,6 +1,6 @@ # Template file for 'kget' pkgname=kget -version=19.08.0 +version=19.08.2 revision=1 build_style=cmake configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson" @@ -14,4 +14,4 @@ maintainer="Helmut Pozimski " license="GPL-2.0-or-later" homepage="https://projects.kde.org/projects/applications/kpimtextedit" distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz" -checksum=4db589499c8e5fc3cbb5e398054b1292f68fa23ad1798f2bb2065ba56723d06b +checksum=e93795eec8f51cac2719ab31cfa6f5f4f642b166ffbb3f876ab3c866a4cd7df1 diff --git a/srcpkgs/kglobalaccel/template b/srcpkgs/kglobalaccel/template index 6f97844ccb8..470a124b80d 100644 --- a/srcpkgs/kglobalaccel/template +++ b/srcpkgs/kglobalaccel/template @@ -1,6 +1,6 @@ # Template file for 'kglobalaccel' pkgname=kglobalaccel -version=5.61.0 +version=5.63.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://projects.kde.org/projects/frameworks/kglobalaccel" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=ad6bd2648e39854369555dd8a0823b08d9631f3638472627eb80e01d9902150e +checksum=e670675025657acecd6795c584a6adbfbf64c83ac30a10db983520992ddfeef6 kglobalaccel-devel_package() { short_desc+=" - development" diff --git a/srcpkgs/kgpg/template b/srcpkgs/kgpg/template new file mode 100644 index 00000000000..8fa3dd4e0ff --- /dev/null +++ b/srcpkgs/kgpg/template @@ -0,0 +1,22 @@ +# Template file for 'kgpg' +pkgname=kgpg +version=19.08.2 +revision=1 +build_style=cmake +configure_args="-DBUILD_TESTING=OFF" +hostmakedepends="extra-cmake-modules" +makedepends="kwindowsystem-devel kcrash-devel kdbusaddons-devel + kiconthemes-devel kjobwidgets-devel kio-devel + kservice-devel ktextwidgets-devel kxmlgui-devel + kwidgetsaddons-devel knotifications-devel kdoctools-devel + akonadi-contacts-devel kcontacts-devel boost-devel" +short_desc="Simple interface for GnuPG, a powerful encryption utility" +maintainer="k4leg " +license="GPL-2.0-only" +homepage="https://kde.org/applications/utilities/kgpg/" +distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz" +checksum=90795c649cd32b65b6030ed965e0db5b0570719afa36abb5d4893268461aa841 + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" qt5-qmake kcoreaddons-devel kdoctools kconfig" +fi diff --git a/srcpkgs/kguiaddons/template b/srcpkgs/kguiaddons/template index 42065ade21f..fce92161d27 100644 --- a/srcpkgs/kguiaddons/template +++ b/srcpkgs/kguiaddons/template @@ -1,6 +1,6 @@ # Template file for 'kguiaddons' pkgname=kguiaddons -version=5.61.0 +version=5.63.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://projects.kde.org/projects/frameworks/kguiaddons" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=40cefa421b5ad5cf211875a35408ba526a5fb34e5ba19ebbda718dbf6b742520 +checksum=b91ad511bbdacc60c1a41104011492d71a5116483dcccf1390c075fcb29a424c kguiaddons-devel_package() { short_desc+=" - development" diff --git a/srcpkgs/khelpcenter/template b/srcpkgs/khelpcenter/template index cd7839c9993..bcec6e8d411 100644 --- a/srcpkgs/khelpcenter/template +++ b/srcpkgs/khelpcenter/template @@ -1,6 +1,6 @@ # Template file for 'khelpcenter' pkgname=khelpcenter -version=19.08.0 +version=19.08.2 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -11,7 +11,7 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://projects.kde.org/projects/applications/khelpcenter" distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz" -checksum=36810c12ae5d163738101b0f5f13c03cda03ee4c157f641df0f73105a894644f +checksum=22b9f5225dfb9e8ad85becb7c2986cbee2a1366f84257fcbf76d5d7292dccdd9 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kconfig kdoctools python qt5-host-tools qt5-qmake" diff --git a/srcpkgs/kholidays/template b/srcpkgs/kholidays/template index e31fdacf854..dd921f0e97b 100644 --- a/srcpkgs/kholidays/template +++ b/srcpkgs/kholidays/template @@ -1,7 +1,7 @@ # Template file for 'kholidays' pkgname=kholidays reverts="17.12.3_1 17.12.1_1 17.12.0_1 17.04.3_1" -version=5.61.0 +version=5.63.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://projects.kde.org/projects/applications/kholidays" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=ce3d879824a3e429b468008c1ccec5de44c07299d412ea32f9a2a814c27c08c1 +checksum=c728d03732c8570ec50359daf6166924847c9a0d17456d2fb91c1265019c6580 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake" diff --git a/srcpkgs/khotkeys/template b/srcpkgs/khotkeys/template index cf72107331a..93dfac3c5c0 100644 --- a/srcpkgs/khotkeys/template +++ b/srcpkgs/khotkeys/template @@ -1,6 +1,6 @@ # Template file for 'khotkeys' pkgname=khotkeys -version=5.16.4 +version=5.17.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -12,7 +12,7 @@ maintainer="John " license="GPL-2.0-only, LGPL-2.0-or-later" homepage="https://projects.kde.org/projects/plasma/khotkeys" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=a8646ab20cd067a515d4a9318c814760be0030f27856f155edf11920caeddd0d +checksum=da7d2a1db9f49b34ea5b24ec9bd6450142cb4e708c9a8f478adc94eb7f190d69 if [ "$CROSS_BUILD" ]; then configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson" diff --git a/srcpkgs/khtml/template b/srcpkgs/khtml/template index dfc5ac899e7..6a01b99c7f3 100644 --- a/srcpkgs/khtml/template +++ b/srcpkgs/khtml/template @@ -1,6 +1,6 @@ # Template file for 'khtml' pkgname=khtml -version=5.61.0 +version=5.63.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://projects.kde.org/projects/frameworks/khtml" distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz" -checksum=5d8612b584eecf96959d56bb75b1470b3b34ff7176cef7a0a15bc2531b21720b +checksum=8d7ba064ffd5391e9b7a2b9d9784f815f2f1f1519cf6ddb7887bcede4c3ec795 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake python perl kcoreaddons" diff --git a/srcpkgs/ki18n/template b/srcpkgs/ki18n/template index daaa5b95297..c3aeb88ae7f 100644 --- a/srcpkgs/ki18n/template +++ b/srcpkgs/ki18n/template @@ -1,6 +1,6 @@ # Template file for 'ki18n' pkgname=ki18n -version=5.61.0 +version=5.63.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://projects.kde.org/projects/frameworks/ki18n" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=d8c0594268b386ee42823360aa937c664cf04eedac8232bc18a653a9c52491d9 +checksum=491395d2d725e1f25acefeea542d1e12e51673636bbc657d5f1f2fbcdb02b7b9 ki18n-devel_package() { short_desc+=" - development" diff --git a/srcpkgs/kiconthemes/template b/srcpkgs/kiconthemes/template index 2d9ebd433f9..1d387aeba07 100644 --- a/srcpkgs/kiconthemes/template +++ b/srcpkgs/kiconthemes/template @@ -1,6 +1,6 @@ # Template file for 'kiconthemes' pkgname=kiconthemes -version=5.61.0 +version=5.63.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-only, GPL-2.0-or-later" homepage="https://projects.kde.org/projects/frameworks/kiconthemes" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=341741abd0b8aeeec8a2a87fe781b4ec1ab593563b1c063cdfdccead3706cdd7 +checksum=dce004b5a210b7a96e78533909cb91ed2168534ae6303499f0777ac8c8b5e4a2 kiconthemes-devel_package() { short_desc+=" - development" @@ -19,6 +19,7 @@ kiconthemes-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/qt5/mkspecs + vmove usr/lib/qt5/plugins/designer vmove usr/lib/cmake vmove "usr/lib/*.so" } diff --git a/srcpkgs/kidentitymanagement/template b/srcpkgs/kidentitymanagement/template index 90dcdb1fa35..233f13e350a 100644 --- a/srcpkgs/kidentitymanagement/template +++ b/srcpkgs/kidentitymanagement/template @@ -1,6 +1,6 @@ # Template file for 'kidentitymanagement' pkgname=kidentitymanagement -version=19.08.0 +version=19.08.2 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python @@ -12,7 +12,7 @@ maintainer="Helmut Pozimski " license="LGPL-2.1-or-later" homepage="https://projects.kde.org/projects/applications/kidentitymanagement" distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz" -checksum=9fe5c473af0d042b482f1d1dac499c1d8227b60a79f1b5678043f0f49f19013d +checksum=8f93f9546d570c8f7b2602a3a171641d488595ec8da3c47b0a08ef4f5083e884 kidentitymanagement-devel_package() { short_desc+=" - development" diff --git a/srcpkgs/kidletime/template b/srcpkgs/kidletime/template index afad9254cf5..34275f7f297 100644 --- a/srcpkgs/kidletime/template +++ b/srcpkgs/kidletime/template @@ -1,6 +1,6 @@ # Template file for 'kidletime' pkgname=kidletime -version=5.61.0 +version=5.63.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://projects.kde.org/projects/frameworks/kidletime" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=8fb302dcc5b891ac2f06b5278bd6e08043772f3325bc209175c945280621fca2 +checksum=196cb99c7f30ea571f9a7e8c0b507ef95aa54731457f4bc9e4380ff1350da57d kidletime-devel_package() { short_desc+=" - development" diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template index 883bd006181..6150dcf8457 100644 --- a/srcpkgs/kig/template +++ b/srcpkgs/kig/template @@ -1,17 +1,14 @@ # Template file for 'kig' pkgname=kig -version=19.08.0 +version=19.08.2 revision=1 build_style=cmake -hostmakedepends="extra-cmake-modules kcoreaddons pkg-config python" +hostmakedepends="extra-cmake-modules kcoreaddons kdoctools + pkg-config qt5-host-tools qt5-qmake" makedepends="boost-devel kparts-devel ktexteditor-devel python-devel" short_desc="KDE education tool for interactive geometry" maintainer="Piotr Wójcik " license="GPL-2.0-only" homepage="https://www.kde.org/applications/education/kig/" distfiles="${KDE_SITE}/applications/${version}/src/kig-${version}.tar.xz" -checksum=ec35f8e9c10e0a984ab7ff06fc810a26e0abc825ee5674af238bb04e83ce38ee - -if [ -n "$CROSS_BUILD" ]; then - hostmakedepends+=" kdoctools qt5-host-tools qt5-qmake" -fi +checksum=60bab2ccdf69df8ebaed672dc9201e468563d78761f191c43ee5673f9a54246a diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template index 0f7b304aaf5..f2509d882dd 100644 --- a/srcpkgs/kimageformats/template +++ b/srcpkgs/kimageformats/template @@ -1,6 +1,6 @@ # Template file for 'kimageformats' pkgname=kimageformats -version=5.61.0 +version=5.63.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -11,4 +11,4 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://projects.kde.org/projects/frameworks/kimageformats" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=5a81359a043e201b29e205dd93559de077e0317d26712cb1c07e624d76aeb207 +checksum=4be4247672c21538afecc2f784cee8d0e963a31a7a8c855d5d7acbe3571ac397 diff --git a/srcpkgs/kimap/template b/srcpkgs/kimap/template index ec5bc9de3cb..b1b020cba2b 100644 --- a/srcpkgs/kimap/template +++ b/srcpkgs/kimap/template @@ -1,6 +1,6 @@ # Template file for 'kimap' pkgname=kimap -version=19.08.0 +version=19.08.2 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python @@ -11,7 +11,7 @@ maintainer="John " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://community.kde.org/KDE_PIM" distfiles="${KDE_SITE}/applications/${version}/src/kimap-${version}.tar.xz" -checksum=d9e3af3e1bb03d929a08287b1a29540915d25dbb6a38d152560302c93e4c5060 +checksum=250479c78517610aab810f54184d8826fb981438ec9f0d5c423ad781a796ee00 kimap-devel_package() { short_desc+=" - development" diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template index 1c841ebcfd6..198d1e4d416 100644 --- a/srcpkgs/kinfocenter/template +++ b/srcpkgs/kinfocenter/template @@ -1,6 +1,6 @@ # Template file for 'kinfocenter' pkgname=kinfocenter -version=5.16.4 +version=5.17.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -13,7 +13,7 @@ maintainer="John " license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2" homepage="https://projects.kde.org/projects/plasma/kinfocenter" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=30e4df2d641c4faa385a718c772d893900eca99591ffee5787d6563fe5130426 +checksum=f9866450a795b6c458011de457f27e51258803459d5d384b7366f13f9a1c8d7e if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel kdoctools-devel" diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template index eb199f3bca9..94262d45761 100644 --- a/srcpkgs/kinit/template +++ b/srcpkgs/kinit/template @@ -1,6 +1,6 @@ # Template file for 'kinit' pkgname=kinit -version=5.61.0 +version=5.63.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-only" homepage="https://projects.kde.org/projects/frameworks/kinit" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=1806bba9cc3f4d9c5ed23f49eca30707e8f74a99d35f5022130a46a395f2858f +checksum=9dcb8d59419066a11b11b64dc028f8cccf7713cd5230451ca8ea5b724c8ae01a if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools" diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template index 079309d6aee..c121e472129 100644 --- a/srcpkgs/kio-extras/template +++ b/srcpkgs/kio-extras/template @@ -1,6 +1,6 @@ # Template file for 'kio-extras' pkgname=kio-extras -version=19.04.3 +version=19.08.2 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -15,7 +15,7 @@ maintainer="Denis Revin " license="GPL-2.0-or-later, LGPL-2.0-or-later" homepage="https://cgit.kde.org/kio-extras.git" distfiles="${KDE_SITE}/applications/${version}/src/kio-extras-${version}.tar.xz" -checksum=b65cb37a5965782a9eaae80840fdd7e06505aece33cc6774510c65e1fea3f55b +checksum=a0b8f08ab8f9d36cfdc950470f75726e90e9fba159bc2035931cfa6efbfe4394 if [ -z "$CROSS_BUILD" ]; then makedepends+=" libssh-devel" diff --git a/srcpkgs/kio-gdrive/template b/srcpkgs/kio-gdrive/template index baae49e3505..dc1da9d3f25 100644 --- a/srcpkgs/kio-gdrive/template +++ b/srcpkgs/kio-gdrive/template @@ -1,6 +1,6 @@ # Template file for 'kio-gdrive' pkgname=kio-gdrive -version=1.2.6 +version=1.2.7 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules intltool pkg-config qt5-qmake qt5-host-tools" @@ -11,5 +11,5 @@ maintainer="Piotr Wójcik " license="GPL-2.0-or-later" homepage="https://community.kde.org/KIO_GDrive" distfiles="${KDE_SITE}/kio-gdrive/${version}/src/kio-gdrive-${version}.tar.xz" -checksum=7a9169e1d464641eb0ae4013ca1732b46bdfd50a13b3e87810c19ba794527f7b +checksum=1b59e4d9940deb290cc4d7441d4ae8762ccb1de8d14dbd0bdbd3bc9a5fc266a4 nocross="kaccounts-integration is nocross" diff --git a/srcpkgs/kio/template b/srcpkgs/kio/template index 901df89ad41..a7fb31f8d2d 100644 --- a/srcpkgs/kio/template +++ b/srcpkgs/kio/template @@ -1,6 +1,6 @@ # Template file for 'kio' pkgname=kio -version=5.61.0 +version=5.63.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://projects.kde.org/projects/frameworks/kio" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=1fa35126f8167bdbe029e515d01c8d4b91a07556ce6d5c9418e0ea10d7c2e44e +checksum=9478aa457b6059cba00a2263fefe01a678c3272012e5cb94fed6c486a4c10f11 CXXFLAGS+=" -fpermissive" @@ -28,6 +28,7 @@ kio-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/qt5/mkspecs + vmove usr/lib/qt5/plugins/designer vmove usr/lib/cmake vmove "usr/lib/*.so" } diff --git a/srcpkgs/kirigami2/template b/srcpkgs/kirigami2/template index 027017ce238..d4879e795df 100644 --- a/srcpkgs/kirigami2/template +++ b/srcpkgs/kirigami2/template @@ -1,6 +1,6 @@ # Template file for 'kirigami2' pkgname=kirigami2 -version=5.61.0 +version=5.63.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools" @@ -12,7 +12,7 @@ maintainer="Sir_Boops " license="LGPL-2.0-or-later" homepage="https://techbase.kde.org/Kirigami" distfiles="${KDE_SITE}/frameworks/${version%.*}/kirigami2-${version}.tar.xz" -checksum=afdbe922f0627330319f22834d6631af13edb0081c687422d36acb8697a88c30 +checksum=db03144ea410bf9c400589f05b52e51c06ddd5cfc613cc639f33c5fa7a68e6ec kirigami2-devel_package() { short_desc+=" - development" @@ -20,6 +20,7 @@ kirigami2-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/cmake + vmove usr/lib/qt5/mkspecs vmove "usr/lib/*.so" } } diff --git a/srcpkgs/kismet/template b/srcpkgs/kismet/template index 942e19c11c0..46de3290e0e 100644 --- a/srcpkgs/kismet/template +++ b/srcpkgs/kismet/template @@ -1,6 +1,6 @@ # Template file for 'kismet' pkgname=kismet -version=2019.08.R1 +version=2019.09.R1 revision=1 _realver="${version//./-}" wrksrc="${pkgname}-${_realver}" @@ -17,5 +17,5 @@ maintainer="Leah Neukirchen " license="GPL-2.0-or-later" homepage="http://www.kismetwireless.net/" distfiles="http://www.kismetwireless.net/code/${pkgname}-${_realver}.tar.xz" -checksum=3a0bde964f34c5eceaa085b9f1dc4eb008a4ce3a38b68bec6d962d3404a0d96b +checksum=c3f33ae4044ba9951f9f5f4f17c7980919b73afb3055a68a69f39cd3fd66ce6d system_groups="kismet" diff --git a/srcpkgs/kitemmodels/template b/srcpkgs/kitemmodels/template index d801687da30..4e6d12b40c0 100644 --- a/srcpkgs/kitemmodels/template +++ b/srcpkgs/kitemmodels/template @@ -1,6 +1,6 @@ # Template file for 'kitemmodels' pkgname=kitemmodels -version=5.61.0 +version=5.63.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://projects.kde.org/projects/frameworks/kitemmodels" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=47db271ba24904933629ed00f7a4f916a19969967dcfbfd59ae5e98f08f89d68 +checksum=2d978b4403c2b88f3b1c2795260c4a491d2c6278cf0ac02814afbdb41a787081 kitemmodels-devel_package() { short_desc+=" - development" diff --git a/srcpkgs/kitemviews/template b/srcpkgs/kitemviews/template index 7a5724876f4..af7adcceb4e 100644 --- a/srcpkgs/kitemviews/template +++ b/srcpkgs/kitemviews/template @@ -1,6 +1,6 @@ # Template file for 'kitemviews' pkgname=kitemviews -version=5.61.0 +version=5.63.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-only, LGPL-2.0-or-later" homepage="https://projects.kde.org/projects/frameworks/kitemviews" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=0447b361444a853409f65e2fb5650cc95eb799ca54a5d7e15cd6d8ca527002da +checksum=dfe37a7baf4069d18834485e2b5ce0a5fb3b22194bbe4d7e9f24c9c74de00096 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools-devel" @@ -23,6 +23,7 @@ kitemviews-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/qt5/mkspecs + vmove usr/lib/qt5/plugins/designer vmove usr/lib/cmake vmove "usr/lib/*.so" } diff --git a/srcpkgs/kitty/patches/musl.patch b/srcpkgs/kitty/patches/musl.patch deleted file mode 100644 index 99b86547a7b..00000000000 --- a/srcpkgs/kitty/patches/musl.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 9cbb726566f14454b24d05e6e94c640997fc77ff Mon Sep 17 00:00:00 2001 -From: Kovid Goyal -Date: Tue, 30 Jul 2019 06:20:54 +0530 -Subject: [PATCH] Fix #1865 - ---- - glfw/linux_joystick.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/glfw/linux_joystick.c b/glfw/linux_joystick.c -index d40bf0233..70a86f6f3 100644 ---- a/glfw/linux_joystick.c -+++ b/glfw/linux_joystick.c -@@ -144,10 +144,10 @@ static bool openJoystickDevice(const char* path) - char absBits[(ABS_CNT + 7) / 8] = {0}; - struct input_id id; - -- if (ioctl(linjs.fd, EVIOCGBIT(0, sizeof(evBits)), evBits) < 0 || -- ioctl(linjs.fd, EVIOCGBIT(EV_KEY, sizeof(keyBits)), keyBits) < 0 || -- ioctl(linjs.fd, EVIOCGBIT(EV_ABS, sizeof(absBits)), absBits) < 0 || -- ioctl(linjs.fd, EVIOCGID, &id) < 0) -+ if (ioctl(linjs.fd, (int32_t)EVIOCGBIT(0, sizeof(evBits)), evBits) < 0 || -+ ioctl(linjs.fd, (int32_t)EVIOCGBIT(EV_KEY, sizeof(keyBits)), keyBits) < 0 || -+ ioctl(linjs.fd, (int32_t)EVIOCGBIT(EV_ABS, sizeof(absBits)), absBits) < 0 || -+ ioctl(linjs.fd, (int32_t)EVIOCGID, &id) < 0) - { - _glfwInputError(GLFW_PLATFORM_ERROR, - "Linux: Failed to query input device: %s", -@@ -165,7 +165,7 @@ static bool openJoystickDevice(const char* path) - - char name[256] = ""; - -- if (ioctl(linjs.fd, EVIOCGNAME(sizeof(name)), name) < 0) -+ if (ioctl(linjs.fd, (int32_t)EVIOCGNAME(sizeof(name)), name) < 0) - strncpy(name, "Unknown", sizeof(name)); - - char guid[33] = ""; diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template index 7d06fcfaa3f..d79bcc4acce 100644 --- a/srcpkgs/kitty/template +++ b/srcpkgs/kitty/template @@ -1,6 +1,6 @@ # Template file for 'kitty' pkgname=kitty -version=0.14.3 +version=0.14.6 revision=1 pycompile_dirs="usr/lib/kitty" hostmakedepends="ncurses pkg-config python3 wayland-devel wayland-protocols" @@ -13,7 +13,7 @@ license="GPL-3.0-or-later" homepage="https://sw.kovidgoyal.net/kitty/" changelog="https://sw.kovidgoyal.net/kitty/changelog.html" distfiles="https://github.com/kovidgoyal/kitty/releases/download/v${version}/kitty-${version}.tar.xz" -checksum=f5e522a6e477acd8b4a9637261f20dc66d6f7b9e9229a4a957f10811708b8d8b +checksum=f07e0b2398b21e546ead8bb7755b140ee2d9cd1be10b720263b2578a0396a9b8 patch_args="-Np1" pycompile_version="$py3_ver" LDFLAGS+=" -Wl,-z,stack-size=2097152" diff --git a/srcpkgs/kiwix-lib/template b/srcpkgs/kiwix-lib/template index cb2f5253bfb..4db31bb4ca6 100644 --- a/srcpkgs/kiwix-lib/template +++ b/srcpkgs/kiwix-lib/template @@ -1,6 +1,6 @@ # Template file for 'kiwix-lib' pkgname=kiwix-lib -version=6.0.0 +version=8.1.0 revision=1 build_style=meson hostmakedepends="pkg-config" @@ -12,7 +12,7 @@ license="GPL-3.0-or-later" homepage="https://www.kiwix.org/" changelog="https://github.com/kiwix/kiwix-lib/blob/${version}/ChangeLog" distfiles="https://github.com/kiwix/kiwix-lib/archive/${version}.tar.gz" -checksum=00fcc067ae7abeb8043b0270f234d40f2ad1b1085da5df143e2ba23443a8a16c +checksum=d5e498db7d24b2df3c77ff3521810949204de69793eecf8245b2366b93da27e0 case "$XBPS_TARGET_MACHINE" in armv6l*) diff --git a/srcpkgs/kiwix-tools/template b/srcpkgs/kiwix-tools/template index d10729c482d..0959d5bac62 100644 --- a/srcpkgs/kiwix-tools/template +++ b/srcpkgs/kiwix-tools/template @@ -1,7 +1,7 @@ # Template file for 'kiwix-tools' pkgname=kiwix-tools -version=3.0.0 -revision=1 +version=3.0.1 +revision=3 build_style=meson hostmakedepends="pkg-config" makedepends="kiwix-lib-devel zlib-devel libmicrohttpd-devel libuuid-devel" @@ -11,7 +11,7 @@ license="GPL-3.0-or-later" homepage="https://kiwix.org" changelog="https://github.com/kiwix/kiwix-tools/blob/${version}/Changelog" distfiles="https://github.com/kiwix/kiwix-tools/archive/${version}.tar.gz" -checksum=ee22a7f939bcf51999327736461c988bfa8c9e0c83562d335eb2a400c4df3758 +checksum=b4d2ff9dfb7d71bb06ee837392a714cf8934d21dba65d5d051c0caa0112e4974 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kiwix-lib-devel" diff --git a/srcpkgs/kjobwidgets/template b/srcpkgs/kjobwidgets/template index 757be66de11..626693590ff 100644 --- a/srcpkgs/kjobwidgets/template +++ b/srcpkgs/kjobwidgets/template @@ -1,6 +1,6 @@ # Template file for 'kjobwidgets' pkgname=kjobwidgets -version=5.61.0 +version=5.63.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-only, LGPL-2.0-or-later" homepage="https://projects.kde.org/projects/frameworks/kjobwidgets" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=5246c2a230e3b4e9d7ba87c5a6b13b5f96fef6af0d1262f27f91fa0c619cf378 +checksum=f68e9cfd949a2c981e048fdde2905419853bb40f7a00bb43f6c9d45b5529e05d kjobwidgets-devel_package() { short_desc+=" - development" diff --git a/srcpkgs/kjs/template b/srcpkgs/kjs/template index 2454eb23906..921ee2f13dd 100644 --- a/srcpkgs/kjs/template +++ b/srcpkgs/kjs/template @@ -1,6 +1,6 @@ # Template file for 'kjs' pkgname=kjs -version=5.61.0 +version=5.63.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://projects.kde.org/projects/frameworks/kjs" distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz" -checksum=968e1592c98ee260d80644bf4631bf09479512e48fa878887ee3b9d6d57d3d17 +checksum=37ab39659cec1ea141d244b3c59678f19d1609299e0c084e2d6a4dc49255fa9b if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools kjs" diff --git a/srcpkgs/kjsembed/template b/srcpkgs/kjsembed/template index 643664aea7c..d3837119784 100644 --- a/srcpkgs/kjsembed/template +++ b/srcpkgs/kjsembed/template @@ -1,6 +1,6 @@ # Template file for 'kjsembed' pkgname=kjsembed -version=5.61.0 +version=5.63.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -11,12 +11,16 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://projects.kde.org/projects/frameworks/kjsembed" distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz" -checksum=d8e0afad638574c31c89d716d78456ce51ffe6dd03eae6787bc9b4f8b52d5b44 +checksum=eb444305618f04c0e804ea661956e217f57549b71c6fae94f1222a1b36355903 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools" fi +case "$XBPS_TARGET_MACHINE" in + armv6l-musl) makedepends+=" libatomic-devel";; +esac + kjsembed-devel_package() { short_desc+=" - development" depends="${makedepends} ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template index d82891012ce..729074583df 100644 --- a/srcpkgs/kldap/template +++ b/srcpkgs/kldap/template @@ -1,6 +1,6 @@ # Template file for 'kldap' pkgname=kldap -version=19.08.0 +version=19.08.2 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://community.kde.org/KDE_PIM" distfiles="${KDE_SITE}/applications/${version}/src/kldap-${version}.tar.xz" -checksum=4bee7b041aff8e1a76330bde12ab9368176181136be1136c4b0c0b733eb9bc16 +checksum=79c540693b85c138ae7bf4f72213dfad6dfa48dfc0ab414004d93f15d2ffac6e kldap-devel_package() { depends="${sourcepkg}>=${version}_${revision} ${makedepends}" diff --git a/srcpkgs/kmag/template b/srcpkgs/kmag/template index 17d86ceb798..bda8c831330 100644 --- a/srcpkgs/kmag/template +++ b/srcpkgs/kmag/template @@ -1,13 +1,13 @@ # Template file for 'kmag' pkgname=kmag -version=19.08.0 +version=19.08.2 revision=1 build_style=cmake -hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python qt5-host-tools qt5-qmake" +hostmakedepends="extra-cmake-modules kcoreaddons kdoctools qt5-host-tools qt5-qmake" makedepends="kparts-devel libqaccessibilityclient-devel qt5-devel" short_desc="Screen Magnifier" maintainer="Piotr Wójcik " license="GPL-2.0-or-later" homepage="https://www.kde.org/applications/utilities/kmag/" distfiles="${KDE_SITE}/applications/${version}/src/kmag-${version}.tar.xz" -checksum=7d42c254e62750899e429482c2b6ed3b4b1e8c5a66fbc371eec656421817d0a4 +checksum=6e8ecfab87dca12804a5a8d0a8adf1545e9e17039e0f9667b10a8f2832512e71 diff --git a/srcpkgs/kmail-account-wizard/template b/srcpkgs/kmail-account-wizard/template index 3b261bed1b7..4a5639ce8a4 100644 --- a/srcpkgs/kmail-account-wizard/template +++ b/srcpkgs/kmail-account-wizard/template @@ -1,6 +1,6 @@ # Template file for 'kmail-account-wizard' pkgname=kmail-account-wizard -version=19.08.0 +version=19.08.2 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python" @@ -11,4 +11,4 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://community.kde.org/KDE_PIM" distfiles="${KDE_SITE}/applications/${version}/src/kmail-account-wizard-${version}.tar.xz" -checksum=5eddd4029047b3c37146c49e043d17c1f9086bc738726d5da2756cbe9ad28622 +checksum=769b151d0de47d49e41eaeca501526de41c174f9df99b46418e955163c38e9a8 diff --git a/srcpkgs/kmail/template b/srcpkgs/kmail/template index d0b81f4ce3b..bb44f5f051d 100644 --- a/srcpkgs/kmail/template +++ b/srcpkgs/kmail/template @@ -1,7 +1,7 @@ # Template file for 'kmail' pkgname=kmail -version=19.08.0 -revision=1 +version=19.08.2 +revision=2 build_style=cmake hostmakedepends="extra-cmake-modules python qt5-host-tools qt5-qmake kdoctools kconfig kcoreaddons" @@ -15,7 +15,7 @@ maintainer="John " license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later" homepage="https://userbase.kde.org/KMail" distfiles="${KDE_SITE}/applications/${version}/src/kmail-${version}.tar.xz" -checksum=052d5b0da402024646673f5e57785b509c328bd5f5ac064f742f9c63e75f3b28 +checksum=0ad2a5439da7f255923eeb4c4cf267ece721619aa046a04439f56763aeabac85 case $XBPS_TARGET_MACHINE in *-musl) broken="segfaults on start";; diff --git a/srcpkgs/kmailtransport/template b/srcpkgs/kmailtransport/template index 4648ea3ab40..cdf51104c1b 100644 --- a/srcpkgs/kmailtransport/template +++ b/srcpkgs/kmailtransport/template @@ -1,6 +1,6 @@ # Template file for 'kmailtransport' pkgname=kmailtransport -version=19.08.0 +version=19.08.2 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://community.kde.org/KDE_PIM" distfiles="${KDE_SITE}/applications/${version}/src/kmailtransport-${version}.tar.xz" -checksum=cc5f865f2059e8fd8d45d1597d8483bbfe0b743e472d91dd4e7cc3837c3fa2dd +checksum=c545fb5546e82f7dfcea4c6e1a8b565ad04e34851c33876c9bf74c9fbc3165c7 kmailtransport-devel_package() { depends="${sourcepkg}>=${version}_${revision} ${makedepends}" diff --git a/srcpkgs/kmbox/template b/srcpkgs/kmbox/template index 40ca1239993..98f5daea1eb 100644 --- a/srcpkgs/kmbox/template +++ b/srcpkgs/kmbox/template @@ -1,6 +1,6 @@ # Template file for 'kmbox' pkgname=kmbox -version=19.08.0 +version=19.08.2 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://community.kde.org/KDE_PIM" distfiles="${KDE_SITE}/applications/${version}/src/kmbox-${version}.tar.xz" -checksum=6600033298b0d5ff84705dc66fa529156cb08aeda7503ba7890581b618f83228 +checksum=82e2f64b90a1386100e13f9b2afea5d71952a1cb9547f965ddcdb3b8c59c35b1 kmbox-devel_package() { depends="${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/kmediaplayer/template b/srcpkgs/kmediaplayer/template index 7b872a211f0..85d38112930 100644 --- a/srcpkgs/kmediaplayer/template +++ b/srcpkgs/kmediaplayer/template @@ -1,6 +1,6 @@ # Template file for 'kmediaplayer' pkgname=kmediaplayer -version=5.61.0 +version=5.63.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -11,7 +11,7 @@ maintainer="John " license="X11" homepage="https://projects.kde.org/projects/frameworks/kmediaplayer" distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz" -checksum=ae15a4a39e6530b505d699fb1b1ab3fd5f0e64d87dd758db17702463e44ce181 +checksum=b54d4184ff04e5c02dec06259dd6002fa4a9d2b32d3325b3cf43fb49071c65a7 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake python" diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template index 1229a63c622..99d0438e348 100644 --- a/srcpkgs/kmenuedit/template +++ b/srcpkgs/kmenuedit/template @@ -1,6 +1,6 @@ # Template file for 'kmenuedit' pkgname=kmenuedit -version=5.16.4 +version=5.17.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -13,4 +13,4 @@ maintainer="John " license="GPL-2" homepage="https://projects.kde.org/projects/plasma/kmenuedit" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=f749ca062d9c7bfd2033c4016e8a3dcc9f849f83f941dd9a60fd5b0232d023a2 +checksum=c8c433e8d4e3e13a5ace0ebc265756441aa01a07b1e68e45ce71387f128cc706 diff --git a/srcpkgs/kmime/template b/srcpkgs/kmime/template index da7fc849579..1c3e5c12b1e 100644 --- a/srcpkgs/kmime/template +++ b/srcpkgs/kmime/template @@ -1,6 +1,6 @@ # Template file for 'kmime' pkgname=kmime -version=19.08.0 +version=19.08.2 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules python3" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://community.kde.org/KDE_PIM" distfiles="${KDE_SITE}/applications/${version}/src/kmime-${version}.tar.xz" -checksum=1422e6235659b66b3ee5e91cdd732d8c3738d42f81435e69f3cbb18f04a0be75 +checksum=f153332bb71de9d4451b8d28135a914059f5156fc8dda33f6375671603477771 if [ "CROSS_BUILD" ];then hostmakedepends+=" qt5-qmake qt5-host-tools" diff --git a/srcpkgs/kmix/template b/srcpkgs/kmix/template index ff00210781a..75fba0ba9e0 100644 --- a/srcpkgs/kmix/template +++ b/srcpkgs/kmix/template @@ -1,6 +1,6 @@ # Template file for 'kmix' pkgname=kmix -version=19.04.3 +version=19.08.2 revision=1 build_style=cmake configure_args="-DSYSCONF_INSTALL_DIR=/etc -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson" @@ -9,8 +9,8 @@ hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools makedepends="plasma-framework-devel kinit-devel alsa-lib-devel pulseaudio-devel libcanberra-devel ksolid-devel" short_desc="KDE's mixer application" -maintainer="Orphaned " +maintainer="Helmut Pozimski " license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-only" homepage="https://www.kde.org/applications/multimedia/kmix/" distfiles="${KDE_SITE}/applications/${version}/src/kmix-${version}.tar.xz" -checksum=d08a0d40fb9a7a3f032f8995dbd9260777119b249669323447fa2575e44e3bf9 +checksum=5d852df8b54d3abca98db4aa2b259973231fed0a597d511d54fb41c6389ce61a diff --git a/srcpkgs/kmymoney/template b/srcpkgs/kmymoney/template index c6a7242810f..5e99dc91cff 100644 --- a/srcpkgs/kmymoney/template +++ b/srcpkgs/kmymoney/template @@ -1,7 +1,7 @@ # Template file for 'kmymoney' pkgname=kmymoney version=5.0.6 -revision=1 +revision=3 build_style=cmake configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson -DBUILD_TESTING=OFF" diff --git a/srcpkgs/knewstuff/template b/srcpkgs/knewstuff/template index d6da21e4d16..16aad91f138 100644 --- a/srcpkgs/knewstuff/template +++ b/srcpkgs/knewstuff/template @@ -1,6 +1,6 @@ # Template file for 'knewstuff' pkgname=knewstuff -version=5.61.0 +version=5.63.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://projects.kde.org/projects/frameworks/knewstuff" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=87f8ec030223f5f0e4e39de8407fc0d28542e48e057c1752adb2466c55fe365b +checksum=5b63a5f5ca144536ffd8748855947fce120af0a3dc490debf53db579153e755e if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake python" diff --git a/srcpkgs/knights/template b/srcpkgs/knights/template index 68fba321c7b..cc8da33217c 100644 --- a/srcpkgs/knights/template +++ b/srcpkgs/knights/template @@ -1,6 +1,6 @@ # Template file for 'knights' pkgname=knights -version=19.08.0 +version=19.08.2 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 @@ -11,4 +11,4 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://www.kde.org/applications/games/knights/" distfiles="${KDE_SITE}/applications/${version}/src/knights-${version}.tar.xz" -checksum=1e22413a23b8afeab8b5d46a4d6d81a5e00a891636676b99c5bd08806f97795c +checksum=2b70338d1cb2b770157a5b061a797620d8dd7dd8c6da0bcb7e2a9db375e71a07 diff --git a/srcpkgs/knot-resolver/files/kresd/run b/srcpkgs/knot-resolver/files/kresd/run index 7134f8c2c1b..2342892a135 100644 --- a/srcpkgs/knot-resolver/files/kresd/run +++ b/srcpkgs/knot-resolver/files/kresd/run @@ -1,4 +1,4 @@ #!/bin/sh [ -r ./conf ] && . ./conf -install -d -m0755 -o _knot-resolver -g _knot-resolver /run/knot-resolver +install -d -m0755 -o _knot_resolver -g _knot_resolver /run/knot-resolver exec kresd ${OPTS:--f 1} diff --git a/srcpkgs/knot-resolver/template b/srcpkgs/knot-resolver/template index 58d884c04de..4179479a87a 100644 --- a/srcpkgs/knot-resolver/template +++ b/srcpkgs/knot-resolver/template @@ -1,7 +1,7 @@ # Template file for 'knot-resolver' pkgname=knot-resolver -version=4.2.0 -revision=1 +version=4.2.2 +revision=2 build_style=meson configure_args=" -Dclient=enabled @@ -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=b37ff9ceefbaa4e4527d183fb1bbb63e641d34d9889ce92715128bc1423c7ef4 +checksum=03b68dff16429aed7a5b0cea7189276c8056e8ecd567b678c2595d48d9a51458 system_accounts="_knot_resolver" _knot_resolver_homedir="/var/cache/knot-resolver" diff --git a/srcpkgs/knot/template b/srcpkgs/knot/template index e1d92e5f540..1f1f5c3c846 100644 --- a/srcpkgs/knot/template +++ b/srcpkgs/knot/template @@ -1,6 +1,6 @@ # Template file for 'knot' pkgname=knot -version=2.8.3 +version=2.9.0 revision=1 build_style=gnu-configure configure_args=" @@ -18,7 +18,7 @@ maintainer="Duncaen " license="GPL-3.0-or-later" homepage="https://www.knot-dns.cz/" distfiles="https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz" -checksum=8a62d81e5cf3df938f469b60ed4e46d9161007c2b89fbf7ae07525fa68368bad +checksum=df7434eaefbabbf7cca2d6cba5038be48a4668e508215ca197532bac7c9b21a2 system_accounts="_knot" _knot_homedir="/var/lib/knot" diff --git a/srcpkgs/knotes/template b/srcpkgs/knotes/template index 513c5fa8702..7d88b28a288 100644 --- a/srcpkgs/knotes/template +++ b/srcpkgs/knotes/template @@ -1,7 +1,7 @@ # Template file for 'knotes' pkgname=knotes -version=19.08.0 -revision=1 +version=19.08.2 +revision=2 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools libxslt kcoreaddons kdoctools kconfig" @@ -12,4 +12,4 @@ maintainer="Helmut Pozimski " license="GPL-2.0-or-later, GFDL-1.2-only" homepage="https://www.kde.org/applications/utilities/knotes" distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz" -checksum=578afb9d879023db9fef4e58e326927d0e2e24edd1e1ac0d46eee968a0ab7030 +checksum=aa0aa4d215507750b055e9af91f552e723aee8163b36f65a3dd19786cf327cf3 diff --git a/srcpkgs/knotifications/template b/srcpkgs/knotifications/template index 50d9d624179..eaf91a0c0cf 100644 --- a/srcpkgs/knotifications/template +++ b/srcpkgs/knotifications/template @@ -1,6 +1,6 @@ # Template file for 'knotifications' pkgname=knotifications -version=5.61.0 +version=5.63.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://projects.kde.org/projects/frameworks/knotifications" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=f72ce6394465316a5324e38afb07f4f71d5f8e281d09b5cf340246c9905568ac +checksum=886aa99e21deaf35ba626f38d60fcb4f6ce831b1e03dcade79d6e0098a7576e6 knotifications-devel_package() { short_desc+=" - development" diff --git a/srcpkgs/knotifyconfig/template b/srcpkgs/knotifyconfig/template index c1e40bdc819..bb7d93156f2 100644 --- a/srcpkgs/knotifyconfig/template +++ b/srcpkgs/knotifyconfig/template @@ -1,6 +1,6 @@ # Template file for 'knotifyconfig' pkgname=knotifyconfig -version=5.61.0 +version=5.63.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://projects.kde.org/projects/frameworks/knotifyconfig" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=bbd2260a98f70779415369ca1d99807bc3e57f618024b9663d2a462a74169bee +checksum=24ffc43ec414f6dee675f630c275317c74ce5ba60ece159c69780edfad7e20b5 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake python" diff --git a/srcpkgs/kodi-addon-inputstream-adaptive/template b/srcpkgs/kodi-addon-inputstream-adaptive/template index d16b4008479..7d923115e36 100644 --- a/srcpkgs/kodi-addon-inputstream-adaptive/template +++ b/srcpkgs/kodi-addon-inputstream-adaptive/template @@ -1,6 +1,6 @@ # Template file for 'kodi-addon-inputstream-adaptive' pkgname=kodi-addon-inputstream-adaptive -version=2.3.22 +version=2.4.2 revision=1 _kodi_release=Leia wrksrc="inputstream.adaptive-${version}-${_kodi_release}" @@ -12,5 +12,5 @@ maintainer="Helmut Pozimski " license="GPL-2.0-or-later" homepage="https://github.com/peak3d/inputstream.adaptive" distfiles="https://github.com/peak3d/inputstream.adaptive/archive/${version}-${_kodi_release}.tar.gz" -checksum=2c21abeead9dc172de297c47930f62050f382c449682cbdb6c70c7e19a2d561b +checksum=e47263240ac9276546ead439ba14ee26c3f3b45f2882351a9081e5502e296329 nocross="depends on kodi-platform" diff --git a/srcpkgs/kodi-addon-pvr-iptvsimple/template b/srcpkgs/kodi-addon-pvr-iptvsimple/template index d83b02a1f97..c288602b850 100644 --- a/srcpkgs/kodi-addon-pvr-iptvsimple/template +++ b/srcpkgs/kodi-addon-pvr-iptvsimple/template @@ -1,6 +1,6 @@ # Template file for 'kodi-addon-pvr-iptvsimple' pkgname=kodi-addon-pvr-iptvsimple -version=3.5.8 +version=3.8.3 revision=1 _kodi_release=Leia wrksrc="pvr.iptvsimple-${version}-${_kodi_release}" @@ -13,5 +13,5 @@ maintainer="Helmut Pozimski " license="GPL-2.0-or-later" homepage="https://github.com/kodi-pvr/pvr.iptvsimple" distfiles="https://github.com/kodi-pvr/pvr.iptvsimple/archive/${version}-${_kodi_release}.tar.gz" -checksum=84e985b5b31044352eaf54914c266a1775f6b7c32a6ce6a46001ddb7d1f9d7fa +checksum=feac27e3bd97d115ad9f3920be6f43447972194246d0f33fa295d9a4f33e4c48 nocross="depends on kodi-platform" diff --git a/srcpkgs/kodi-rpi/files/swig.nojava-18.3 b/srcpkgs/kodi-rpi/files/swig.nojava-18.3 deleted file mode 120000 index 2dba4f75239..00000000000 --- a/srcpkgs/kodi-rpi/files/swig.nojava-18.3 +++ /dev/null @@ -1 +0,0 @@ -../../kodi/files/swig.nojava-18.3 \ No newline at end of file diff --git a/srcpkgs/kodi-rpi/files/swig.nojava-18.4 b/srcpkgs/kodi-rpi/files/swig.nojava-18.4 new file mode 120000 index 00000000000..849e63c3370 --- /dev/null +++ b/srcpkgs/kodi-rpi/files/swig.nojava-18.4 @@ -0,0 +1 @@ +../../kodi/files/swig.nojava-18.4 \ No newline at end of file diff --git a/srcpkgs/kodi-rpi/files/xbmc-standalone/run b/srcpkgs/kodi-rpi/files/xbmc-standalone/run index 94ad9da1cd4..e4fc93b47ed 100755 --- a/srcpkgs/kodi-rpi/files/xbmc-standalone/run +++ b/srcpkgs/kodi-rpi/files/xbmc-standalone/run @@ -1,2 +1,3 @@ #!/bin/sh +PATH=$PATH:/opt/vc/bin exec chpst -P sudo LD_LIBRARY_PATH=/opt/vc/lib -u xbmc -- /usr/lib/kodi/kodi-rbpi --standalone diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template index d26e9462abb..05e92d9fab4 100644 --- a/srcpkgs/kodi-rpi/template +++ b/srcpkgs/kodi-rpi/template @@ -1,7 +1,7 @@ # Template file for 'kodi-rpi' pkgname=kodi-rpi -version=18.3 -revision=1 +version=18.4 +revision=2 build_style=cmake _codename="Leia" wrksrc="xbmc-${version}-${_codename}" @@ -10,7 +10,7 @@ maintainer="Helmut Pozimski " homepage="http://www.kodi.tv/" license="GPL-2.0-or-later" distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz" -checksum=4f265901c00f582beb8d6ad96c9c303e5ab82611e828c7121ae822b07c0915cc +checksum=bf2be186d8ae5b5377e43c06a538012bb9f51a0e98f8244b70a401006861d110 LDFLAGS+=" -Wl,-z,stack-size=1048576" patch_args="-Np1" diff --git a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmc.i.cpp b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmc.i.cpp similarity index 99% rename from srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmc.i.cpp rename to srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmc.i.cpp index ff397fb3686..42f767ab0f8 100644 --- a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmc.i.cpp +++ b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmc.i.cpp @@ -9714,7 +9714,7 @@ namespace PythonBindings // constants PyModule_AddStringConstant(module, "__author__", "Team Kodi "); - PyModule_AddStringConstant(module, "__date__", "Wed Jun 19 18:36:55 GMT 2019"); + PyModule_AddStringConstant(module, "__date__", "Sun Sep 01 10:47:01 GMT 2019"); PyModule_AddStringConstant(module, "__version__", "2.26.0"); PyModule_AddStringConstant(module, "__credits__", "Team Kodi"); PyModule_AddStringConstant(module, "__platform__", "ALL"); diff --git a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmc.i.xml b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmc.i.xml similarity index 61% rename from srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmc.i.xml rename to srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmc.i.xml index 44a83fa491f..cd136323a35 100644 --- a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmc.i.xml +++ b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmc.i.xml @@ -1,146 +1,146 @@ - - - - - - - - - + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - + + + - - + + - - - + + + - - - - - - + + + + + + - - + + - - + + - - - - - + + + + + - - - + + + -