From fe3d0e5be94e7f7514ad3948bc170e9d3e3c2046 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sat, 25 May 2019 21:49:50 +0200 Subject: [PATCH 001/400] linux4.19: update to 4.19.46. [skip ci] --- srcpkgs/linux4.19/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template index 91b3454df69..097d1748d88 100644 --- a/srcpkgs/linux4.19/template +++ b/srcpkgs/linux4.19/template @@ -1,6 +1,6 @@ # Template file for 'linux4.19' pkgname=linux4.19 -version=4.19.45 +version=4.19.46 revision=1 wrksrc="linux-${version}" short_desc="Linux kernel and modules (${version%.*} series)" @@ -8,7 +8,7 @@ maintainer="Helmut Pozimski " license="GPL-2.0-only" homepage="https://www.kernel.org" distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz" -checksum=eb31e62fbb30aaeedb892cecdd8ac9746d42cbbef2ef2356f9ca8e13514b9d2b +checksum=097b52fe8a872259f4a3dba571b2eaf7b9863d9cde5399c6b316dec0ef57e67a patch_args="-Np1" nodebug=yes # -dbg package is generated below manually From 29377d47ff1f11145a51c3c593a173eeb50185d4 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sat, 25 May 2019 21:51:13 +0200 Subject: [PATCH 002/400] linux4.14: update to 4.14.122. [skip ci] --- srcpkgs/linux4.14/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template index 57945c37578..f6a4dd57a0d 100644 --- a/srcpkgs/linux4.14/template +++ b/srcpkgs/linux4.14/template @@ -1,6 +1,6 @@ # Template file for 'linux4.14' pkgname=linux4.14 -version=4.14.120 +version=4.14.122 revision=1 patch_args="-Np1" wrksrc="linux-${version}" @@ -9,7 +9,7 @@ homepage="http://www.kernel.org" license="GPL-2.0-only" short_desc="Linux kernel and modules (${version%.*} series)" distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz" -checksum=ddb8e86cf65e6f53f782bc46f026823b6b3fc472aa1385b601f22dce2dbccb4c +checksum=c8a3f40ef877e18b3d2890e0954f2d81b6d012a7321836ca4e5b036ef93f68f5 nodebug=yes # -dbg package is generated below manually nostrip=yes From 26dc504657e5b4c3e3357884c74302a40318fee8 Mon Sep 17 00:00:00 2001 From: Peter Bui Date: Sun, 26 May 2019 13:35:29 -0400 Subject: [PATCH 003/400] vba-m: update to 2.1.3. - Remove unnecessary patch - Add libgomp-devel as makedepends - Remove -DwxWidgets_CONFIG_EXECUTABLE configure_arg to fix cross-compilation --- srcpkgs/vba-m/patches/fix-stutter.patch | 44 ------------------------- srcpkgs/vba-m/template | 12 +++---- 2 files changed, 5 insertions(+), 51 deletions(-) delete mode 100644 srcpkgs/vba-m/patches/fix-stutter.patch diff --git a/srcpkgs/vba-m/patches/fix-stutter.patch b/srcpkgs/vba-m/patches/fix-stutter.patch deleted file mode 100644 index 3d1b05a6ebc..00000000000 --- a/srcpkgs/vba-m/patches/fix-stutter.patch +++ /dev/null @@ -1,44 +0,0 @@ -From a8d0508cf299a58b2a659d6017b049db121de8ba Mon Sep 17 00:00:00 2001 -From: Rafael Kitover -Date: Mon, 2 Jul 2018 18:32:18 -0700 -Subject: [PATCH] use GetWindow()->Refresh() in Wayland only - -Some people are reporting stuttering, and @retro-wertz tested both -DrawArea() and Refresh() on wxgtk3 under xorg and found that the -Refresh() method produces more stuttering. - -Change the compile check for wxgtk2 to a runtime check for wayland, and -use Refresh() under Wayland only. ---- - src/wx/panel.cpp | 11 ++++------- - 1 file changed, 4 insertions(+), 7 deletions(-) - -diff --git a/src/wx/panel.cpp b/src/wx/panel.cpp -index e4b86301..faaf6e4d 100644 ---- a/src/wx/panel.cpp -+++ b/src/wx/panel.cpp -@@ -1817,19 +1817,16 @@ void DrawingPanelBase::DrawArea(uint8_t** data) - } - - // next, draw the frame (queue a PaintEv) Refresh must be used under -- // Wayland or nothing is drawn, however it causes high CPU usage with GTK2, -- // so use the old method in that case --#if !defined(__WXGTK__) || defined(__WXGTK3__) -- GetWindow()->Refresh(); --#else -- { -+ // Wayland or nothing is drawn. -+ if (wxGetApp().UsingWayland()) -+ GetWindow()->Refresh(); -+ else { - DrawingPanelBase* panel = wxGetApp().frame->GetPanel()->panel; - if (panel) { - wxClientDC dc(panel->GetWindow()); - panel->DrawArea(dc); - } - } --#endif - - // finally, draw on-screen text using wx method, if possible - // this method flickers too much right now - diff --git a/srcpkgs/vba-m/template b/srcpkgs/vba-m/template index 0edec52ce3c..94f7c6dd367 100644 --- a/srcpkgs/vba-m/template +++ b/srcpkgs/vba-m/template @@ -1,20 +1,18 @@ # Template file for 'vba-m' pkgname=vba-m reverts=1292_2 -version=2.1.0 -revision=5 +version=2.1.3 +revision=1 wrksrc="visualboyadvance-m-${version}" -patch_args="-Np1" build_style=cmake -configure_args="-DENABLE_GTK=TRUE -DENABLE_FFMPEG=TRUE -DENABLE_LINK=TRUE - -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3" +configure_args="-DENABLE_GTK=TRUE -DENABLE_FFMPEG=TRUE -DENABLE_LINK=TRUE" hostmakedepends="unzip pkg-config zip yasm wxWidgets-common-devel" makedepends="zlib-devel libpng-devel MesaLib-devel libopenal-devel SDL2-devel gtkmm2-devel gtkglext-devel gtkglextmm-devel ffmpeg-devel gtk+3-devel - SFML-devel wxWidgets-gtk3-devel" + SFML-devel wxWidgets-gtk3-devel libgomp-devel" short_desc="Gameboy Advance Emulator" maintainer="Andrea Brancaleoni " license="GPL-2.0-or-later" homepage="https://github.com/visualboyadvance-m/visualboyadvance-m/" distfiles="https://github.com/visualboyadvance-m/visualboyadvance-m/archive/v${version}.tar.gz" -checksum=e8d59c5adba451396c88a72960923e615b843d5f8a990b75dbba5d730acb1ae9 +checksum=c64a8b400e9af862e0be74148760a7c73f98d08dcbb7d01eca81e6dc5ad376fd From d949e0c814a3a435e7b80646dd216ec37a3646d7 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sat, 25 May 2019 21:52:56 +0200 Subject: [PATCH 004/400] linux4.9: update to 4.9.179. [skip ci] --- srcpkgs/linux4.9/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/linux4.9/template b/srcpkgs/linux4.9/template index ca2a047c48c..b03e18d519e 100644 --- a/srcpkgs/linux4.9/template +++ b/srcpkgs/linux4.9/template @@ -1,6 +1,6 @@ # Template file for 'linux4.9' pkgname=linux4.9 -version=4.9.177 +version=4.9.179 revision=1 patch_args="-Np1" wrksrc="linux-${version}" @@ -9,7 +9,7 @@ homepage="https://www.kernel.org" license="GPL-2.0-only" short_desc="Linux kernel and modules (${version%.*} series)" distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz" -checksum=c73b1e3ebcc35b653f7b673ca151fc67b814bdb27269799fa7cda251827887ee +checksum=532e4b7b0103806dad9124fd09d15d19594eca08e7f900e94ff805d3b4171ee3 nodebug=yes # -dbg package is generated below manually nostrip=yes From ee1c278c9d7526ac828c9e96cde5158c91149e56 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Sun, 26 May 2019 18:31:34 -0500 Subject: [PATCH 005/400] minetest: enable server build --- srcpkgs/minetest/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/minetest/template b/srcpkgs/minetest/template index f3d0cf057bd..f6c05d7d814 100644 --- a/srcpkgs/minetest/template +++ b/srcpkgs/minetest/template @@ -1,9 +1,9 @@ # Template file for 'minetest' pkgname=minetest version=5.0.1 -revision=1 +revision=2 build_style=cmake -configure_args="-DRUN_IN_PLACE=0 -DENABLE_GETTEXT=1 -DENABLE_FREETYPE=1" +configure_args="-DRUN_IN_PLACE=0 -DENABLE_GETTEXT=1 -DENABLE_FREETYPE=1 -DBUILD_SERVER=TRUE" hostmakedepends="pkg-config" makedepends="LuaJIT-devel MesaLib-devel freetype-devel gmp-devel irrlicht-devel libcurl-devel libjpeg-turbo-devel libopenal-devel libvorbis-devel lua52-devel From 0bcd295be7a0db63e823a125d3731db3a402e9cc Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Sun, 26 May 2019 20:08:13 -0500 Subject: [PATCH 006/400] wpa_gui: update to 2.8 --- srcpkgs/wpa_gui/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/wpa_gui/template b/srcpkgs/wpa_gui/template index f11822f2708..e817f9a74cc 100644 --- a/srcpkgs/wpa_gui/template +++ b/srcpkgs/wpa_gui/template @@ -1,6 +1,6 @@ # Template file for 'wpa_gui' pkgname=wpa_gui -version=2.7 +version=2.8 revision=1 wrksrc="wpa_supplicant-${version}" build_wrksrc="wpa_supplicant/wpa_gui-qt4" @@ -13,7 +13,7 @@ maintainer="Leah Neukirchen " license="BSD-3-Clause" homepage="https://w1.fi/wpa_supplicant/" distfiles="https://w1.fi/releases/wpa_supplicant-${version}.tar.gz" -checksum=76ea6b06b7a2ea8e6d9eb1a9166166f1656e6d48c7508914f592100c95c73074 +checksum=a689336a12a99151b9de5e25bfccadb88438f4f4438eb8db331cd94346fd3d96 do_install() { vbin wpa_gui From 5d9b536d8ba38b45c15d2dcd7060eb76af8d74f8 Mon Sep 17 00:00:00 2001 From: Peter Bui Date: Sun, 26 May 2019 16:34:51 -0400 Subject: [PATCH 007/400] strace: update to 5.1. --- srcpkgs/strace/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/strace/template b/srcpkgs/strace/template index c4f8bb7085c..df22e5cd368 100644 --- a/srcpkgs/strace/template +++ b/srcpkgs/strace/template @@ -1,6 +1,6 @@ # Template file for 'strace' pkgname=strace -version=5.0 +version=5.1 revision=1 build_style=gnu-configure configure_args="--with-libunwind" @@ -10,7 +10,7 @@ maintainer="Juan RP " license="LGPL-2.1-or-later" homepage="https://strace.io/" distfiles="https://github.com/strace/strace/releases/download/v${version}/strace-${version}.tar.xz" -checksum=3b7ad77eb2b81dc6078046a9cc56eed5242b67b63748e7fc28f7c2daf4e647da +checksum=f5a341b97d7da88ee3760626872a4899bf23cf8dee56901f114be5b1837a9a8b case "$XBPS_TARGET_MACHINE" in aarch64-musl) configure_args=; makedepends= ;; From 4070fb017a670805173b8f26b0f5e434f8cc48ee Mon Sep 17 00:00:00 2001 From: Peter Bui Date: Sun, 26 May 2019 16:27:45 -0400 Subject: [PATCH 008/400] rdesktop: update to 1.8.6. Need to bootstrap before configuration to resolve issues with pkg-config: https://github.com/rdesktop/rdesktop/issues/331 --- srcpkgs/rdesktop/template | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/srcpkgs/rdesktop/template b/srcpkgs/rdesktop/template index c16210e7b3b..a85f5e148af 100644 --- a/srcpkgs/rdesktop/template +++ b/srcpkgs/rdesktop/template @@ -1,10 +1,10 @@ # Template file for 'rdesktop' pkgname=rdesktop -version=1.8.4 +version=1.8.6 revision=1 build_style=gnu-configure configure_args="--with-ipv6 --with-sound=alsa --with-openssl=${XBPS_CROSS_BASE}/usr" -hostmakedepends="pkg-config" +hostmakedepends="pkg-config automake" makedepends="libressl-devel alsa-lib-devel libsamplerate-devel libXrandr-devel pcsclite-devel libgssglue-devel" short_desc="Open source client for Windows Remote Desktop Services" @@ -12,4 +12,8 @@ maintainer="Juan RP " license="GPL-3.0-or-later" homepage="http://www.rdesktop.org/" distfiles="https://github.com/rdesktop/rdesktop/releases/download/v${version}/rdesktop-${version}.tar.gz" -checksum=9b98b8e73aa83e93aa1d9ae82ce38c08395f64b67799edc24821bb26a84dcd2d +checksum=44426d2b34d6a32bb84e5aa72369ea8039c168b8bd58277b94ce32db0fc8f466 + +pre_configure() { + ./bootstrap +} From 2dad4c58d016d6e1e8f0499d3cb81d8fdaa6d586 Mon Sep 17 00:00:00 2001 From: Peter Bui Date: Sun, 26 May 2019 16:05:42 -0400 Subject: [PATCH 009/400] p11-kit: update to 0.23.16.1. --- srcpkgs/p11-kit/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/p11-kit/template b/srcpkgs/p11-kit/template index 67d233aa05e..c611f4d4dfc 100644 --- a/srcpkgs/p11-kit/template +++ b/srcpkgs/p11-kit/template @@ -1,7 +1,7 @@ # Template file for 'p11-kit' pkgname=p11-kit -version=0.23.15 -revision=2 +version=0.23.16.1 +revision=1 build_style=gnu-configure configure_args="--with-module-path=/usr/lib/pkcs11" hostmakedepends="automake libtool pkg-config" @@ -11,7 +11,7 @@ maintainer="Juan RP " license="BSD-3-Clause" homepage="https://github.com/p11-glue/p11-kit" distfiles="${homepage}/releases/download/${version}/p11-kit-${version}.tar.gz" -checksum=f7c139a0c77a1f0012619003e542060ba8f94799a0ef463026db390680e4d798 +checksum=4b34e92ae36fa493e0d94366c767f06d5f9951e3d8581d10fd935d738db1574d conf_files="/etc/pkcs11/pkcs11.conf" pre_configure() { From 23c5f07c1a72e03c1d66b61f7cd105f67baa7582 Mon Sep 17 00:00:00 2001 From: DirectorX Date: Sun, 26 May 2019 22:59:59 +0300 Subject: [PATCH 010/400] Waybar: update to 0.6.6. --- srcpkgs/Waybar/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template index 62afb5a69e4..4f29c074197 100644 --- a/srcpkgs/Waybar/template +++ b/srcpkgs/Waybar/template @@ -1,13 +1,13 @@ # Template file for 'Waybar' pkgname=Waybar -version=0.6.5 +version=0.6.6 revision=1 build_style=meson configure_args="-Dlibnl=$(vopt_if libnl enabled disabled) -Dpulseaudio=$(vopt_if pulseaudio enabled disabled) -Ddbusmenu-gtk=$(vopt_if dbusmenugtk enabled disabled)" hostmakedepends="pkg-config glib-devel wayland-devel sway" -makedepends="libinput-devel wayland-devel wlroots-devel gtkmm-devel +makedepends="libinput-devel wayland-devel wlroots-devel gtkmm-devel spdlog jsoncpp-devel libglib-devel libsigc++-devel fmt-devel $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if libnl libnl3-devel) $(vopt_if dbusmenugtk libdbusmenu-gtk3-devel) @@ -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=104fa3c1bb23858fb56a072858910e61a6fc3184104b98c679b5b11a2d528228 +checksum=03bc5019bd46175d2d9b2112ca2baa265a71e17bbd0dd2fdc51156f1ed9b021a build_options="libnl pulseaudio dbusmenugtk mpd" build_options_default="pulseaudio mpd" From e9d0b0e40c79b87d7e7d47e5793e9d9f4862b961 Mon Sep 17 00:00:00 2001 From: Peter Bui Date: Sun, 26 May 2019 15:42:49 -0400 Subject: [PATCH 011/400] mupdf: update to 1.15.0. - Remove CVE patches (integrated upstream) - Remove extra-apps make target (no longer exists) - Remove mujstest from mupdf-tools (no longer exists) --- .../mupdf/patches/mupdf-CVE-2018-16647.patch | 77 ------------------- .../mupdf/patches/mupdf-CVE-2018-16648.patch | 48 ------------ .../mupdf/patches/mupdf-CVE-2018-18662.patch | 62 --------------- srcpkgs/mupdf/template | 16 ++-- 4 files changed, 6 insertions(+), 197 deletions(-) delete mode 100644 srcpkgs/mupdf/patches/mupdf-CVE-2018-16647.patch delete mode 100644 srcpkgs/mupdf/patches/mupdf-CVE-2018-16648.patch delete mode 100644 srcpkgs/mupdf/patches/mupdf-CVE-2018-18662.patch diff --git a/srcpkgs/mupdf/patches/mupdf-CVE-2018-16647.patch b/srcpkgs/mupdf/patches/mupdf-CVE-2018-16647.patch deleted file mode 100644 index 5b06974c3ab..00000000000 --- a/srcpkgs/mupdf/patches/mupdf-CVE-2018-16647.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 351c99d8ce23bbf7099dbd52771a095f67e45a2c Mon Sep 17 00:00:00 2001 -Message-Id: <351c99d8ce23bbf7099dbd52771a095f67e45a2c.1542272011.git.mjg@fedoraproject.org> -From: Sebastian Rasmussen -Date: Mon, 1 Oct 2018 15:13:13 +0800 -Subject: [PATCH] Avoid being smart about keeping only a single reference to - the buffer. - -When pdf_dev_pop() is called it will drop the reference to the buffer. -pdf_dev_push_new_buf() will either create a new buffer reference or take a reference to the existing buffer. -When pdf_dev_pop() is called unbalance this creates a problem as the -top level buffer will be unreferenced too many times. - -fails-32.pdf ---- - source/pdf/pdf-device.c | 15 +++++++++------ - 1 file changed, 9 insertions(+), 6 deletions(-) - -diff --git a/source/pdf/pdf-device.c b/source/pdf/pdf-device.c -index 31a7a10f..0103e9a7 100644 ---- a/source/pdf/pdf-device.c -+++ b/source/pdf/pdf-device.c -@@ -66,7 +66,6 @@ struct pdf_device_s - - pdf_document *doc; - pdf_obj *resources; -- fz_buffer *buffer; - - int in_text; - -@@ -1061,7 +1060,10 @@ pdf_dev_drop_device(fz_context *ctx, fz_device *dev) - int i; - - for (i = pdev->num_gstates-1; i >= 0; i--) -+ { -+ fz_drop_buffer(ctx, pdev->gstates[i].buf); - fz_drop_stroke_state(ctx, pdev->gstates[i].stroke_state); -+ } - - for (i = pdev->num_cid_fonts-1; i >= 0; i--) - fz_drop_font(ctx, pdev->cid_fonts[i]); -@@ -1069,7 +1071,6 @@ pdf_dev_drop_device(fz_context *ctx, fz_device *dev) - for (i = pdev->num_groups - 1; i >= 0; i--) - pdf_drop_obj(ctx, pdev->groups[i].ref); - -- fz_drop_buffer(ctx, pdev->buffer); - pdf_drop_obj(ctx, pdev->resources); - fz_free(ctx, pdev->cid_fonts); - fz_free(ctx, pdev->image_indices); -@@ -1111,10 +1112,13 @@ fz_device *pdf_new_pdf_device(fz_context *ctx, pdf_document *doc, fz_matrix topc - dev->super.begin_tile = pdf_dev_begin_tile; - dev->super.end_tile = pdf_dev_end_tile; - -+ fz_var(buf); -+ - fz_try(ctx) - { -- dev->buffer = fz_keep_buffer(ctx, buf); -- if (!buf) -+ if (buf) -+ buf = fz_keep_buffer(ctx, buf); -+ else - buf = fz_new_buffer(ctx, 256); - dev->doc = doc; - dev->resources = pdf_keep_obj(ctx, resources); -@@ -1136,8 +1140,7 @@ fz_device *pdf_new_pdf_device(fz_context *ctx, pdf_document *doc, fz_matrix topc - } - fz_catch(ctx) - { -- if (dev->gstates && dev->buffer == NULL) -- fz_drop_buffer(ctx, dev->gstates[0].buf); -+ fz_drop_buffer(ctx, buf); - fz_free(ctx, dev); - fz_rethrow(ctx); - } --- -2.19.1.1238.g4b45f61cc0 - diff --git a/srcpkgs/mupdf/patches/mupdf-CVE-2018-16648.patch b/srcpkgs/mupdf/patches/mupdf-CVE-2018-16648.patch deleted file mode 100644 index 54f64b6a67b..00000000000 --- a/srcpkgs/mupdf/patches/mupdf-CVE-2018-16648.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 38f883fe129a5e89306252a4676eaaf4bc968824 Mon Sep 17 00:00:00 2001 -Message-Id: <38f883fe129a5e89306252a4676eaaf4bc968824.1542272532.git.mjg@fedoraproject.org> -From: Tor Andersson -Date: Mon, 22 Oct 2018 17:16:35 +0200 -Subject: [PATCH] Fix text used as clip mask in pdfwrite device. - -Push the clip state, and pass the correct text rendering mode state. ---- - source/pdf/pdf-device.c | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/source/pdf/pdf-device.c b/source/pdf/pdf-device.c -index 4dd729b8..427e3b38 100644 ---- a/source/pdf/pdf-device.c -+++ b/source/pdf/pdf-device.c -@@ -734,9 +734,13 @@ pdf_dev_clip_text(fz_context *ctx, fz_device *dev, const fz_text *text, fz_matri - { - pdf_device *pdev = (pdf_device*)dev; - fz_text_span *span; -+ -+ pdf_dev_end_text(ctx, pdev); -+ pdf_dev_push(ctx, pdev); -+ - for (span = text->head; span; span = span->next) - { -- pdf_dev_begin_text(ctx, pdev, span->trm, 0); -+ pdf_dev_begin_text(ctx, pdev, span->trm, 7); - pdf_dev_ctm(ctx, pdev, ctm); - pdf_dev_font(ctx, pdev, span->font); - pdf_dev_text_span(ctx, pdev, span); -@@ -748,9 +752,13 @@ pdf_dev_clip_stroke_text(fz_context *ctx, fz_device *dev, const fz_text *text, c - { - pdf_device *pdev = (pdf_device*)dev; - fz_text_span *span; -+ -+ pdf_dev_end_text(ctx, pdev); -+ pdf_dev_push(ctx, pdev); -+ - for (span = text->head; span; span = span->next) - { -- pdf_dev_begin_text(ctx, pdev, span->trm, 0); -+ pdf_dev_begin_text(ctx, pdev, span->trm, 7); - pdf_dev_font(ctx, pdev, span->font); - pdf_dev_ctm(ctx, pdev, ctm); - pdf_dev_text_span(ctx, pdev, span); --- -2.19.1.1238.g4b45f61cc0 - diff --git a/srcpkgs/mupdf/patches/mupdf-CVE-2018-18662.patch b/srcpkgs/mupdf/patches/mupdf-CVE-2018-18662.patch deleted file mode 100644 index c9cfec9cf58..00000000000 --- a/srcpkgs/mupdf/patches/mupdf-CVE-2018-18662.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 164ddc22ee0d5b63a81d5148f44c37dd132a9356 Mon Sep 17 00:00:00 2001 -Message-Id: <164ddc22ee0d5b63a81d5148f44c37dd132a9356.1542272812.git.mjg@fedoraproject.org> -From: Tor Andersson -Date: Mon, 5 Nov 2018 17:49:09 +0100 -Subject: [PATCH] Fix 700043: Don't assume a font is t3 just because - fz_outline_glyph fails. - ---- - source/fitz/svg-device.c | 31 ++++++++++++++++--------------- - 1 file changed, 16 insertions(+), 15 deletions(-) - -diff --git a/source/fitz/svg-device.c b/source/fitz/svg-device.c -index 2876a89b..aaf53b99 100644 ---- a/source/fitz/svg-device.c -+++ b/source/fitz/svg-device.c -@@ -472,27 +472,28 @@ svg_dev_text_span_as_paths_defs(fz_context *ctx, fz_device *dev, fz_text_span *s - /* Need to send this one */ - fz_rect rect; - fz_path *path; -- path = fz_outline_glyph(ctx, span->font, gid, fz_identity); -- if (path) -+ out = start_def(ctx, sdev); -+ fz_write_printf(ctx, out, "\n", fnt->id, gid); -+ if (fz_font_ft_face(ctx, span->font)) - { -- rect = fz_bound_path(ctx, path, NULL, fz_identity); -- shift.e = -rect.x0; -- shift.f = -rect.y0; -- fz_transform_path(ctx, path, shift); -- out = start_def(ctx, sdev); -- fz_write_printf(ctx, out, "\n", fnt->id, gid); -- fz_write_printf(ctx, out, "\n"); -- fz_drop_path(ctx, path); -+ path = fz_outline_glyph(ctx, span->font, gid, fz_identity); -+ if (path) -+ { -+ rect = fz_bound_path(ctx, path, NULL, fz_identity); -+ shift.e = -rect.x0; -+ shift.f = -rect.y0; -+ fz_transform_path(ctx, path, shift); -+ fz_write_printf(ctx, out, "\n"); -+ fz_drop_path(ctx, path); -+ } - } -- else -+ else if (fz_font_t3_procs(ctx, span->font)) - { - rect = fz_bound_glyph(ctx, span->font, gid, fz_identity); - shift.e = -rect.x0; - shift.f = -rect.y0; -- out = start_def(ctx, sdev); -- fz_write_printf(ctx, out, "\n", fnt->id, gid); - fz_run_t3_glyph(ctx, span->font, gid, shift, dev); - } - fz_write_printf(ctx, out, "\n"); --- -2.19.1.1238.g4b45f61cc0 - diff --git a/srcpkgs/mupdf/template b/srcpkgs/mupdf/template index fc39dacc368..aad45a9dda8 100644 --- a/srcpkgs/mupdf/template +++ b/srcpkgs/mupdf/template @@ -1,7 +1,7 @@ # Template file for 'mupdf' pkgname=mupdf -version=1.14.0 -revision=2 +version=1.15.0 +revision=1 wrksrc="${pkgname}-${version}-source" hostmakedepends="pkg-config zlib-devel libcurl-devel freetype-devel libjpeg-turbo-devel jbig2dec-devel libXext-devel libXcursor-devel @@ -14,16 +14,13 @@ maintainer="Rasmus Thomsen " license="AGPL-3.0-only" homepage="https://mupdf.com" distfiles="https://mupdf.com/downloads/archive/${pkgname}-${version}-source.tar.gz" -checksum=c443483a678c3fc258fa4adc124146225d0bb443c522619faadebf6b363d7724 +checksum=9fe6773ee0dc192d1878b7886b51150cbeb1a8ad81d3cd806d8e1ab343ffd471 patch_args="-Np1" pre_build() { # libmupdf-{threads,pkcs7}.a are required by fbpdf sed 's/INSTALL_LIBS :=/& $(THREAD_LIB) $(PKCS7_LIB)/' -i Makefile - # Also install EXTRA_APPS for mupdf-tools package - sed '/Generated depe/i INSTALL_APPS += $(EXTRA_APPS)' -i Makefile - if [ "$CROSS_BUILD" ]; then make CC=cc LD=ld AR=ar CFLAGS="-fPIC" LDFLAGS='' build=release generate fi @@ -33,16 +30,16 @@ do_build() { CFLAGS+=" -fPIC" CXXFLAGS+=" -fPIC" if [ "$CROSS_BUILD" ]; then - make USE_SYSTEM_LIBS=yes CURL_LIBS='-lcurl -lpthread' build=release CROSSCOMPILE=yes all extra-apps + make USE_SYSTEM_LIBS=yes CURL_LIBS='-lcurl -lpthread' build=release CROSSCOMPILE=yes all make CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" build=release CROSSCOMPILE=yes -C thirdparty/mujs else - make USE_SYSTEM_LIBS=yes CURL_LIBS='-lcurl -lpthread' build=release all extra-apps + make USE_SYSTEM_LIBS=yes CURL_LIBS='-lcurl -lpthread' build=release all make V=1 CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" build=release -C thirdparty/mujs fi } do_install() { - make USE_SYSTEM_LIBS=yes build=release prefix=${DESTDIR}/usr install third extra-apps + make USE_SYSTEM_LIBS=yes build=release prefix=${DESTDIR}/usr install ln -rs ${DESTDIR}/usr/bin/mupdf-x11-curl ${DESTDIR}/usr/bin/mupdf @@ -66,7 +63,6 @@ mupdf-devel_package() { mupdf-tools_package() { short_desc+=" - tools" pkg_install() { - vmove usr/bin/mujstest vmove usr/bin/muraster vmove usr/bin/mutool vmove usr/share/man/man1/mutool.1 From 065e87d1367b71e0eb2f3b9517d8f925d36277a1 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Mon, 27 May 2019 07:33:58 +0200 Subject: [PATCH 012/400] yquake2: update to 7.41. --- srcpkgs/yquake2/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/yquake2/template b/srcpkgs/yquake2/template index 0e9c6cc7867..b7d99c05d35 100644 --- a/srcpkgs/yquake2/template +++ b/srcpkgs/yquake2/template @@ -1,6 +1,6 @@ # Template file for 'yquake2' pkgname=yquake2 -version=7.40 +version=7.41 revision=1 wrksrc="quake2-${version}" build_style=gnu-makefile @@ -15,7 +15,7 @@ maintainer="Helmut Pozimski " license="GPL-2.0-or-later" homepage="https://www.yamagi.org/quake2/" distfiles="https://deponie.yamagi.org/quake2/quake2-${version}.tar.xz" -checksum=1c2fbd3815ece1125f20a14dd7b92749a8735efb5dfb0bf35c3cd412f2389129 +checksum=7ae543fac9e8a74ecd706ac0fa0f94098912aa5aafcb33f1c2c3f57b48011364 case "$XBPS_TARGET_MACHINE" in armv*) makedepends+=" MesaLib-devel";; From e115aa57ba114e30a604d1ef1a17d196460f8ea6 Mon Sep 17 00:00:00 2001 From: Peter Bui Date: Sun, 26 May 2019 14:59:07 -0400 Subject: [PATCH 013/400] polkit: update to 0.116. - Remove CVE-2018-19788.patch (integrated upstream) - Update make-innetgr-optional.patch - Upstream contains CVE-2019-6133 Slowfork vulnerability fix - Update dependency from mozjs52 to mozjs60 (upstream change) --- srcpkgs/polkit/patches/CVE-2018-19788.patch | 150 ------------------ .../patches/make-innetgr-optional.patch | 10 +- srcpkgs/polkit/template | 10 +- 3 files changed, 10 insertions(+), 160 deletions(-) delete mode 100644 srcpkgs/polkit/patches/CVE-2018-19788.patch diff --git a/srcpkgs/polkit/patches/CVE-2018-19788.patch b/srcpkgs/polkit/patches/CVE-2018-19788.patch deleted file mode 100644 index c7c125a50c4..00000000000 --- a/srcpkgs/polkit/patches/CVE-2018-19788.patch +++ /dev/null @@ -1,150 +0,0 @@ ---- src/polkit/polkitunixgroup.c -+++ src/polkit/polkitunixgroup.c -@@ -71,6 +71,7 @@ G_DEFINE_TYPE_WITH_CODE (PolkitUnixGroup, polkit_unix_group, G_TYPE_OBJECT, - static void - polkit_unix_group_init (PolkitUnixGroup *unix_group) - { -+ unix_group->gid = -1; /* (git_t) -1 is not a valid GID under Linux */ - } - - static void -@@ -100,11 +101,14 @@ polkit_unix_group_set_property (GObject *object, - GParamSpec *pspec) - { - PolkitUnixGroup *unix_group = POLKIT_UNIX_GROUP (object); -+ gint val; - - switch (prop_id) - { - case PROP_GID: -- unix_group->gid = g_value_get_int (value); -+ val = g_value_get_int (value); -+ g_return_if_fail (val != -1); -+ unix_group->gid = val; - break; - - default: -@@ -131,9 +135,9 @@ polkit_unix_group_class_init (PolkitUnixGroupClass *klass) - g_param_spec_int ("gid", - "Group ID", - "The UNIX group ID", -- 0, -+ G_MININT, - G_MAXINT, -- 0, -+ -1, - G_PARAM_CONSTRUCT | - G_PARAM_READWRITE | - G_PARAM_STATIC_NAME | -@@ -166,9 +170,10 @@ polkit_unix_group_get_gid (PolkitUnixGroup *group) - */ - void - polkit_unix_group_set_gid (PolkitUnixGroup *group, -- gint gid) -+ gint gid) - { - g_return_if_fail (POLKIT_IS_UNIX_GROUP (group)); -+ g_return_if_fail (gid != -1); - group->gid = gid; - } - -@@ -183,6 +188,8 @@ polkit_unix_group_set_gid (PolkitUnixGroup *group, - PolkitIdentity * - polkit_unix_group_new (gint gid) - { -+ g_return_val_if_fail (gid != -1, NULL); -+ - return POLKIT_IDENTITY (g_object_new (POLKIT_TYPE_UNIX_GROUP, - "gid", gid, - NULL)); ---- src/polkit/polkitunixprocess.c -+++ src/polkit/polkitunixprocess.c -@@ -159,9 +159,14 @@ polkit_unix_process_set_property (GObject *object, - polkit_unix_process_set_pid (unix_process, g_value_get_int (value)); - break; - -- case PROP_UID: -- polkit_unix_process_set_uid (unix_process, g_value_get_int (value)); -+ case PROP_UID: { -+ gint val; -+ -+ val = g_value_get_int (value); -+ g_return_if_fail (val != -1); -+ polkit_unix_process_set_uid (unix_process, val); - break; -+ } - - case PROP_START_TIME: - polkit_unix_process_set_start_time (unix_process, g_value_get_uint64 (value)); -@@ -239,7 +244,7 @@ polkit_unix_process_class_init (PolkitUnixProcessClass *klass) - g_param_spec_int ("uid", - "User ID", - "The UNIX user ID", -- -1, -+ G_MININT, - G_MAXINT, - -1, - G_PARAM_CONSTRUCT | -@@ -303,7 +308,6 @@ polkit_unix_process_set_uid (PolkitUnixProcess *process, - gint uid) - { - g_return_if_fail (POLKIT_IS_UNIX_PROCESS (process)); -- g_return_if_fail (uid >= -1); - process->uid = uid; - } - ---- src/polkit/polkitunixuser.c -+++ src/polkit/polkitunixuser.c -@@ -72,6 +72,7 @@ G_DEFINE_TYPE_WITH_CODE (PolkitUnixUser, polkit_unix_user, G_TYPE_OBJECT, - static void - polkit_unix_user_init (PolkitUnixUser *unix_user) - { -+ unix_user->uid = -1; /* (uid_t) -1 is not a valid UID under Linux */ - unix_user->name = NULL; - } - -@@ -112,11 +113,14 @@ polkit_unix_user_set_property (GObject *object, - GParamSpec *pspec) - { - PolkitUnixUser *unix_user = POLKIT_UNIX_USER (object); -+ gint val; - - switch (prop_id) - { - case PROP_UID: -- unix_user->uid = g_value_get_int (value); -+ val = g_value_get_int (value); -+ g_return_if_fail (val != -1); -+ unix_user->uid = val; - break; - - default: -@@ -144,9 +148,9 @@ polkit_unix_user_class_init (PolkitUnixUserClass *klass) - g_param_spec_int ("uid", - "User ID", - "The UNIX user ID", -- 0, -+ G_MININT, - G_MAXINT, -- 0, -+ -1, - G_PARAM_CONSTRUCT | - G_PARAM_READWRITE | - G_PARAM_STATIC_NAME | -@@ -182,6 +186,7 @@ polkit_unix_user_set_uid (PolkitUnixUser *user, - gint uid) - { - g_return_if_fail (POLKIT_IS_UNIX_USER (user)); -+ g_return_if_fail (uid != -1); - user->uid = uid; - } - -@@ -196,6 +201,8 @@ polkit_unix_user_set_uid (PolkitUnixUser *user, - PolkitIdentity * - polkit_unix_user_new (gint uid) - { -+ g_return_val_if_fail (uid != -1, NULL); -+ - return POLKIT_IDENTITY (g_object_new (POLKIT_TYPE_UNIX_USER, - "uid", uid, - NULL)); diff --git a/srcpkgs/polkit/patches/make-innetgr-optional.patch b/srcpkgs/polkit/patches/make-innetgr-optional.patch index d641225cf25..e1e4e9ae255 100644 --- a/srcpkgs/polkit/patches/make-innetgr-optional.patch +++ b/srcpkgs/polkit/patches/make-innetgr-optional.patch @@ -50,15 +50,15 @@ --- src/polkitbackend/polkitbackendjsauthority.cpp +++ src/polkitbackend/polkitbackendjsauthority.cpp -@@ -1499,6 +1499,7 @@ js_polkit_user_is_in_netgroup (JSContext *cx, +@@ -1502,6 +1502,7 @@ JS::CallArgs args = JS::CallArgsFromVp (argc, vp); +#if defined HAVE_GETNETGRENT - user = JS_EncodeString (cx, args[0].toString()); - netgroup = JS_EncodeString (cx, args[1].toString()); - -@@ -1514,6 +1515,7 @@ js_polkit_user_is_in_netgroup (JSContext *cx, + JS::RootedString usrstr (authority->priv->cx); + usrstr = args[0].toString(); + user = JS_EncodeStringToUTF8 (cx, usrstr); +@@ -1521,6 +1522,7 @@ JS_free (cx, user); ret = true; diff --git a/srcpkgs/polkit/template b/srcpkgs/polkit/template index e2b9da98fd5..23fd2454916 100644 --- a/srcpkgs/polkit/template +++ b/srcpkgs/polkit/template @@ -1,24 +1,24 @@ # Template file for 'polkit' pkgname=polkit -version=0.115 -revision=5 +version=0.116 +revision=1 build_style=gnu-configure build_helper="gir" configure_args="$(vopt_enable gir introspection) --disable-systemd --disable-libsystemd-login --disable-libelogind --disable-static - --with-authfw=pam --with-os-type=void --with-mozjs=mozjs-52.0" + --with-authfw=pam --with-os-type=void --with-mozjs=mozjs-60.0" make_dirs=" /etc/polkit-1/rules.d 0700 polkitd polkitd /usr/share/polkit-1/rules.d 0700 polkitd polkitd" hostmakedepends="autoconf-archive automake gettext-devel git glib-devel gobject-introspection gtk-doc intltool libtool pkg-config" -makedepends="mozjs52-devel pam-devel" +makedepends="mozjs60-devel pam-devel" short_desc="Authorization Toolkit" maintainer="Rasmus Thomsen " license="GPL-2.0-or-later" homepage="https://www.freedesktop.org/wiki/Software/polkit" distfiles="${FREEDESKTOP_SITE}/${pkgname}/releases/${pkgname}-${version}.tar.gz" -checksum=2f87ecdabfbd415c6306673ceadc59846f059b18ef2fce42bac63fe283f12131 +checksum=88170c9e711e8db305a12fdb8234fac5706c61969b94e084d0f117d8ec5d34b1 system_accounts="polkitd" # Package build options From e108420b8bb072e6218ab54988be762f62550a97 Mon Sep 17 00:00:00 2001 From: Peter Bui Date: Sun, 26 May 2019 14:37:49 -0400 Subject: [PATCH 014/400] python-cachetools: update to 3.1.1. --- srcpkgs/python-cachetools/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python-cachetools/template b/srcpkgs/python-cachetools/template index 82a8014bb13..ee3ed3a4c94 100644 --- a/srcpkgs/python-cachetools/template +++ b/srcpkgs/python-cachetools/template @@ -1,6 +1,6 @@ # Template file for 'python-cachetools' pkgname=python-cachetools -version=3.1.0 +version=3.1.1 revision=1 archs=noarch wrksrc="cachetools-${version}" @@ -13,7 +13,7 @@ maintainer="Peter Bui " license="MIT" homepage="https://github.com/tkem/cachetools/" distfiles="${PYPI_SITE}/c/cachetools/cachetools-${version}.tar.gz" -checksum=9efcc9fab3b49ab833475702b55edd5ae07af1af7a4c627678980b45e459c460 +checksum=8ea2d3ce97850f31e4a08b0e2b5e6c34997d7216a9d2c98e0f3978630d4da69a post_install() { vlicense LICENSE From 1a043aced4ddadd62bd463bdd8193a69b3fffd57 Mon Sep 17 00:00:00 2001 From: Peter Bui Date: Sun, 26 May 2019 14:29:51 -0400 Subject: [PATCH 015/400] tilix: update to 1.9.3. --- srcpkgs/tilix/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/tilix/template b/srcpkgs/tilix/template index dc329c6213c..af2ab289a6a 100644 --- a/srcpkgs/tilix/template +++ b/srcpkgs/tilix/template @@ -1,6 +1,6 @@ # Template file for 'tilix' pkgname=tilix -version=1.9.0 +version=1.9.3 revision=1 build_style=gnu-configure hostmakedepends="automake gettext-devel gdk-pixbuf glib-devel ldc po4a pkg-config @@ -12,7 +12,7 @@ maintainer="Rasmus Thomsen " license="MPL-2.0" homepage="https://gnunn1.github.io/tilix-web/" distfiles="https://github.com/gnunn1/${pkgname}/archive/${version}.tar.gz" -checksum=192b86776b0e8e89fe3963a4c6b54884dc1909f762758390a407c4de744ab3f0 +checksum=f1b4dbbd60f4b9a91e0ab0954e3e6b8ebe5442d5fbb760a554a733903e44a1de pre_configure() { case "$XBPS_TARGET_MACHINE" in From 6820bd9230ef873191d5416f16cd6067df00b498 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Mon, 27 May 2019 07:59:15 +0200 Subject: [PATCH 016/400] libidn2: update to 2.2.0. --- srcpkgs/libidn2/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libidn2/template b/srcpkgs/libidn2/template index f4423dd05b0..337b64dd7ae 100644 --- a/srcpkgs/libidn2/template +++ b/srcpkgs/libidn2/template @@ -1,6 +1,6 @@ # Template file for 'libidn2' pkgname=libidn2 -version=2.1.1 +version=2.2.0 revision=1 build_style=gnu-configure hostmakedepends="automake gettext-devel libtool pkg-config" @@ -10,7 +10,7 @@ maintainer="Rasmus Thomsen " license="GPL-3.0-or-later, LGPL-3.0-or-later" homepage="https://www.gnu.org/software/libidn/#libidn2" distfiles="${GNU_SITE}/libidn/libidn2-${version}.tar.gz" -checksum=95416080329298a13269e13175041b530cec3d98b54cafae9424b8dfd22078b1 +checksum=fc734732b506d878753ec6606982bf7b936e868c25c30ddb0d83f7d7056381fe pre_configure() { autoreconf -if From b06ae199275064f8c1f9cea5fc92fdc750a2a0ae Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Mon, 27 May 2019 08:14:03 +0200 Subject: [PATCH 017/400] dkms: update to 2.7.1. --- srcpkgs/dkms/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template index 4d1d0abb6ff..44d7ffc7caa 100644 --- a/srcpkgs/dkms/template +++ b/srcpkgs/dkms/template @@ -1,7 +1,7 @@ # Template file for 'dkms' pkgname=dkms -version=2.6.1 -revision=5 +version=2.7.1 +revision=1 conf_files="/etc/dkms/framework.conf" depends="bash kmod gcc make coreutils linux-headers" short_desc="Dynamic Kernel Modules System" @@ -9,7 +9,7 @@ maintainer="Juan RP " license="GPL-2.0-or-later" homepage="https://github.com/dell/dkms" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=9a34f42a80e01682efcb13c513692e72f1d21570bbc7a9eba855dde30f116ce7 +checksum=b30408db599367d8268e3db8de81ff0ad4d0d6da56f426f768baee5c22c15a69 if [ "$CROSS_BUILD" ]; then depends+=" libressl-devel gmp-devel libada-devel libmpc-devel flex" From 9db325e0d1f0aee32df3c6b55e6512680a8d8309 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Mon, 27 May 2019 08:37:33 +0200 Subject: [PATCH 018/400] libaio: update to 0.3.112. --- srcpkgs/libaio/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/libaio/template b/srcpkgs/libaio/template index e1c1dfb5ab6..4e653f21d3b 100644 --- a/srcpkgs/libaio/template +++ b/srcpkgs/libaio/template @@ -1,13 +1,13 @@ # Template file for 'libaio' pkgname=libaio -version=0.3.111 +version=0.3.112 revision=1 short_desc="The Linux-native asynchronous I/O facility (aio) library" maintainer="Juan RP " license="LGPL-2.1-or-later" homepage="http://lse.sourceforge.net/io/aio.html" -distfiles="${DEBIAN_SITE}/main/liba/$pkgname/${pkgname}_${version}.orig.tar.gz" -checksum=62cf871ad8fd09eb3418f00aca7a7d449299b8e1de31c65f28bf6a2ef1fa502a +distfiles="${DEBIAN_SITE}/main/liba/$pkgname/${pkgname}_${version}.orig.tar.xz" +checksum=f69e5800425f4ea957426693ac09f9896bb993db5490fa021644454adcc72a32 do_build() { CFLAGS="${CFLAGS/-fstack-protector-strong/} -fno-stack-protector" From d174eeee66b4da301de418b6ae2867a7b33338da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Mon, 27 May 2019 12:29:33 +0200 Subject: [PATCH 019/400] rocksdb: fix cross build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/rocksdb/template | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/srcpkgs/rocksdb/template b/srcpkgs/rocksdb/template index 9d42ed3979b..2d44b9e3e34 100644 --- a/srcpkgs/rocksdb/template +++ b/srcpkgs/rocksdb/template @@ -1,7 +1,7 @@ # Template file for 'rocksdb' pkgname=rocksdb version=5.18.3 -revision=1 +revision=2 build_style=cmake configure_args="-DCMAKE_BUILD_TYPE=Release -DPORTABLE=1 -DWITH_TESTS=0 -DUSE_RTTI=0 -DWITH_LZ4=1" @@ -14,8 +14,19 @@ distfiles="${homepage}/archive/v${version}.tar.gz" checksum=7fb6738263d3f2b360d7468cf2ebe333f3109f3ba1ff80115abd145d75287254 case "$XBPS_TARGET_MACHINE" in - armv[56]l*) broken="Requires libatomic workaround" ;; + armv[56]*|mips*|ppc|ppc-musl) makedepends+=" libatomic-devel";; esac +# Use the C++17 feature to align new +CXXFLAGS="-faligned-new" + +pre_configure() { + case "$XBPS_TARGET_MACHINE" in + armv[56]*|mips*|ppc|ppc-musl) + vsed -i CMakeLists.txt \ + -e 's;target_link_libraries(${ROCKSDB_SHARED_LIB};& atomic;' + ;; + esac +} post_install() { vcopy "include/rocksdb/*" usr/include/rocksdb From 6f2313c2aebaa9258c42a1a6efe93b2e0334874d Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Mon, 27 May 2019 08:40:18 +0200 Subject: [PATCH 020/400] libcdio: update to 2.1.0. --- common/shlibs | 2 +- srcpkgs/libcdio/template | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/shlibs b/common/shlibs index b368836487f..63a3accb9b0 100644 --- a/common/shlibs +++ b/common/shlibs @@ -415,7 +415,7 @@ libcdio_cdda.so.2 libcdio-paranoia-10.2_1 libcdio_paranoia.so.2 libcdio-paranoia-10.2_1 libiso9660++.so.0 libcdio-0.83_1 libcdio++.so.1 libcdio-2.0.0_1 -libcdio.so.18 libcdio-2.0.0_1 +libcdio.so.19 libcdio-2.1.0_1 libmpcdec.so.5 libmpcdec-1.2.6_1 libproxy.so.1 libproxy-0.4.6_1 libmoar.so MoarVM-2015.11_1 diff --git a/srcpkgs/libcdio/template b/srcpkgs/libcdio/template index ad90f3f2e6e..83acc1cc2ba 100644 --- a/srcpkgs/libcdio/template +++ b/srcpkgs/libcdio/template @@ -1,6 +1,6 @@ # Template file for 'libcdio' pkgname=libcdio -version=2.0.0 +version=2.1.0 revision=1 build_style=gnu-configure hostmakedepends="automake libtool pkg-config" @@ -9,8 +9,8 @@ short_desc="CD-ROM access library" maintainer="Juan RP " license="GPL-3" homepage="http://www.gnu.org/software/libcdio/" -distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.gz" -checksum=1b481b5da009bea31db875805665974e2fc568e2b2afa516f4036733657cf958 +distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.bz2" +checksum=8550e9589dbd594bfac93b81ecf129b1dc9d0d51e90f9696f1b2f9b2af32712b pre_configure() { autoreconf -fi From 587e01a1bc604672195e176424740d01f9887d04 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Mon, 27 May 2019 08:43:43 +0200 Subject: [PATCH 021/400] QMPlay2: rebuild against libcdio-2.1.0 --- srcpkgs/QMPlay2/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template index 690533fe4db..c509cf8ec78 100644 --- a/srcpkgs/QMPlay2/template +++ b/srcpkgs/QMPlay2/template @@ -1,13 +1,14 @@ # Template file for 'QMPlay2' pkgname=QMPlay2 version=18.12.26 -revision=1 +revision=2 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" + qt5-svg-devel qt5-tools-devel qt5-x11extras-devel taglib-devel + libcdio-paranoia-devel" short_desc="Video and audio player which can play most formats and codecs" maintainer="Andrew Benson " license="LGPL-3.0-only" From ae0cf33741546a5e3a9712b01db3782f05bd6255 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Mon, 27 May 2019 08:43:43 +0200 Subject: [PATCH 022/400] audacious-plugins: rebuild against libcdio-2.1.0 --- srcpkgs/audacious-plugins/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/audacious-plugins/template b/srcpkgs/audacious-plugins/template index 9289678cf98..36ed6252c4b 100644 --- a/srcpkgs/audacious-plugins/template +++ b/srcpkgs/audacious-plugins/template @@ -1,7 +1,7 @@ # Template file for 'audacious-plugins' pkgname=audacious-plugins version=3.10.1 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="audacious-devel alsa-lib-devel pulseaudio-devel jack-devel From a00f88119756859d67d12a378d5317c350c08ff8 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Mon, 27 May 2019 08:43:43 +0200 Subject: [PATCH 023/400] bomi: rebuild against libcdio-2.1.0 --- srcpkgs/bomi/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/bomi/template b/srcpkgs/bomi/template index 2eadbbb59fe..3be1bd2881f 100644 --- a/srcpkgs/bomi/template +++ b/srcpkgs/bomi/template @@ -1,7 +1,7 @@ # Template file for 'bomi' pkgname=bomi version=0.9.11 -revision=12 +revision=13 build_style=configure configure_args="--disable-systemd --release --prefix=/usr" hostmakedepends="pkg-config curl perl" From 9a0db44f08b928d3d2ebb29561c16dc80fba25ce Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Mon, 27 May 2019 08:43:43 +0200 Subject: [PATCH 024/400] clementine: rebuild against libcdio-2.1.0 --- srcpkgs/clementine/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template index a9b50dd9ca0..6e99f249328 100644 --- a/srcpkgs/clementine/template +++ b/srcpkgs/clementine/template @@ -1,7 +1,7 @@ # Template file for 'clementine' pkgname=clementine version=1.3.1 -revision=17 +revision=18 wrksrc="Clementine-${version}" build_style=cmake hostmakedepends="sparsehash pkg-config qt-host-tools qt-devel protobuf" From 0329c8fd3d1cf1f3f165349dc29a4cbdb3006742 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Mon, 27 May 2019 08:43:44 +0200 Subject: [PATCH 025/400] deadbeef: rebuild against libcdio-2.1.0 --- srcpkgs/deadbeef/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/deadbeef/template b/srcpkgs/deadbeef/template index 8bb7490a4f0..fd5fc687127 100644 --- a/srcpkgs/deadbeef/template +++ b/srcpkgs/deadbeef/template @@ -1,7 +1,7 @@ # Template file for 'deadbeef' pkgname=deadbeef version=1.8.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-oss $(vopt_if gtk3 --disable-gtk2 --disable-gtk3)" hostmakedepends="intltool pkg-config yasm $(vopt_if gtk3 glib-devel)" From 42a0f5a7bf565f858c9d925e61edf08ca56c6443 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Mon, 27 May 2019 08:43:44 +0200 Subject: [PATCH 026/400] gst-plugins-ugly1: rebuild against libcdio-2.1.0 --- srcpkgs/gst-plugins-ugly1/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gst-plugins-ugly1/template b/srcpkgs/gst-plugins-ugly1/template index b9eacd31d45..e063af3695f 100644 --- a/srcpkgs/gst-plugins-ugly1/template +++ b/srcpkgs/gst-plugins-ugly1/template @@ -1,7 +1,7 @@ # Template file for 'gst-plugins-ugly1'. pkgname=gst-plugins-ugly1 version=1.14.4 -revision=2 +revision=3 lib32disabled=yes wrksrc="${pkgname/1/}-${version}" build_style=gnu-configure From d4c9e111d56f36c2e7013fa3a175c7102968c30b Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Mon, 27 May 2019 08:43:44 +0200 Subject: [PATCH 027/400] gvfs: rebuild against libcdio-2.1.0 --- srcpkgs/gvfs/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template index 75bf1b1b88f..b8b6a4a76a2 100644 --- a/srcpkgs/gvfs/template +++ b/srcpkgs/gvfs/template @@ -1,7 +1,7 @@ # Template file for 'gvfs' pkgname=gvfs version=1.40.1 -revision=1 +revision=2 build_style=meson configure_args="-Dsystemduserunitdir=no -Dtmpfilesdir=no -Dlogind=false -Dman=true" From 8720a3fbffbb3807429a98376ea7ee0d8d0169ce Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Mon, 27 May 2019 08:43:44 +0200 Subject: [PATCH 028/400] kodi: rebuild against libcdio-2.1.0 --- srcpkgs/kodi/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template index de7916b1cbe..30bd88d80ef 100644 --- a/srcpkgs/kodi/template +++ b/srcpkgs/kodi/template @@ -1,7 +1,7 @@ # Template file for 'kodi' pkgname=kodi version=18.2 -revision=1 +revision=2 _codename="Leia" wrksrc="xbmc-${version}-${_codename}" build_style=cmake @@ -34,7 +34,7 @@ makedepends=" taglib-devel libcap-devel lame-devel libbluray-devel libnfs-devel ffmpeg-devel giflib-devel libxslt-devel gnutls-devel libssh-devel libmicrohttpd-devel libcec-devel dcadec-devel crossguid flatbuffers-devel fmt-devel lcms2-devel - libfstrcmp-devel rapidjson" + libfstrcmp-devel rapidjson libcdio-paranoia" # The following dependencies are dlopen(3)ed. depends="libbluray libmad libvorbis libcurl libflac libmodplug libass libmpeg2 From 1b4e8b67091dd0848c3352261c2fff3fb5d11793 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Mon, 27 May 2019 08:43:44 +0200 Subject: [PATCH 029/400] libcdio-paranoia: rebuild against libcdio-2.1.0 --- srcpkgs/libcdio-paranoia/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libcdio-paranoia/template b/srcpkgs/libcdio-paranoia/template index 7c26696bc17..892121a6a0a 100644 --- a/srcpkgs/libcdio-paranoia/template +++ b/srcpkgs/libcdio-paranoia/template @@ -1,7 +1,7 @@ # Template file for 'libcdio-paranoia' pkgname=libcdio-paranoia version=10.2+2.0.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-cpp-progs --disable-example-progs" hostmakedepends="automake libtool pkg-config" From 971f313e608759cbe30790ed578b53ce5484ac1b Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Mon, 27 May 2019 08:43:45 +0200 Subject: [PATCH 030/400] mpd: rebuild against libcdio-2.1.0 --- srcpkgs/mpd/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template index e042c77ac54..bee29cbaa43 100644 --- a/srcpkgs/mpd/template +++ b/srcpkgs/mpd/template @@ -1,7 +1,7 @@ # Template file for 'mpd' pkgname=mpd version=0.21.9 -revision=1 +revision=2 build_style=meson configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true -Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled From c14a8275a1c7f0f067bdf013d0ec31f33ca5bf24 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Mon, 27 May 2019 08:43:45 +0200 Subject: [PATCH 031/400] mplayer: rebuild against libcdio-2.1.0 --- srcpkgs/mplayer/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mplayer/template b/srcpkgs/mplayer/template index 8776859e0b4..d4e17460e67 100644 --- a/srcpkgs/mplayer/template +++ b/srcpkgs/mplayer/template @@ -1,7 +1,7 @@ # Template file for 'mplayer' pkgname=mplayer version=1.4 -revision=2 +revision=3 wrksrc="MPlayer-${version}" build_style=configure hostmakedepends="pkg-config yasm" From 4c877e094fdfda661135f65f36eb89819cbe7d92 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Mon, 27 May 2019 08:43:45 +0200 Subject: [PATCH 032/400] mpv: rebuild against libcdio-2.1.0 --- srcpkgs/mpv/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mpv/template b/srcpkgs/mpv/template index 5909ed60c5c..db3ae4e64de 100644 --- a/srcpkgs/mpv/template +++ b/srcpkgs/mpv/template @@ -1,7 +1,7 @@ # Template file for 'mpv' pkgname=mpv version=0.29.1 -revision=5 +revision=6 build_style=waf configure_args="--confdir=/etc/mpv --docdir=/usr/share/examples/mpv --enable-dvdread --enable-dvdnav --enable-cdda --enable-libmpv-shared From 21634cd8e515d31127234360bcdc49781bcb817f Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Mon, 27 May 2019 08:43:45 +0200 Subject: [PATCH 033/400] pcsxr: rebuild against libcdio-2.1.0 --- srcpkgs/pcsxr/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/pcsxr/template b/srcpkgs/pcsxr/template index afd374bb64e..31a54167d52 100644 --- a/srcpkgs/pcsxr/template +++ b/srcpkgs/pcsxr/template @@ -1,7 +1,7 @@ # Template file for 'pcsxr' pkgname=pcsxr version=1.9.93 -revision=5 +revision=6 lib32disabled=yes wrksrc="${pkgname}" build_style=gnu-configure From d6fafd7c7d41cab38127bbe39b56357a9a3e68cf Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Mon, 27 May 2019 08:43:46 +0200 Subject: [PATCH 034/400] pragha: rebuild against libcdio-2.1.0 --- srcpkgs/pragha/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template index 4594eb8815b..fef3510d75c 100644 --- a/srcpkgs/pragha/template +++ b/srcpkgs/pragha/template @@ -1,7 +1,7 @@ # Template file for 'pragha' pkgname=pragha version=1.3.3 -revision=4 +revision=5 build_style=gnu-configure hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel pkg-config" makedepends=" From 65a43790662a90f66ec012496c3b00269e8bd48d Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Mon, 27 May 2019 08:43:46 +0200 Subject: [PATCH 035/400] qmmp: rebuild against libcdio-2.1.0 --- srcpkgs/qmmp/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template index 92c17ff70f6..8ef4aa05885 100644 --- a/srcpkgs/qmmp/template +++ b/srcpkgs/qmmp/template @@ -1,7 +1,7 @@ # Template file for 'qmmp' pkgname=qmmp version=1.3.2 -revision=1 +revision=2 build_style=cmake configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple" hostmakedepends="pkg-config qt5-host-tools qt5-qmake" From 1765872f30e2e9e96a2b9efd86476611864fb799 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Mon, 27 May 2019 08:43:46 +0200 Subject: [PATCH 036/400] tellico: rebuild against libcdio-2.1.0 --- srcpkgs/tellico/template | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template index 64b47a957f4..f58f663d0a2 100644 --- a/srcpkgs/tellico/template +++ b/srcpkgs/tellico/template @@ -1,14 +1,16 @@ # Template file for 'tellico' pkgname=tellico version=3.1.4 -revision=1 +revision=2 build_style=cmake configure_args="-DENABLE_WEBCAM=$(vopt_if webcam ON OFF)" -hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kdoctools kconfig" +hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kdoctools kconfig + kcoreaddons" makedepends="kfilemetadata5-devel khtml-devel kitemmodels-devel knewstuff-devel $(vopt_if webcam v4l-utils-devel) $(vopt_if yaz yaz-devel) $(vopt_if xmp exempi-devel) $(vopt_if cdio libcdio-devel) - $(vopt_if cddb libkcddb-devel) $(vopt_if scanner libksane-devel)" + $(vopt_if cddb libkcddb-devel) $(vopt_if scanner libksane-devel) + libcdio-paranoia-devel" short_desc="Collection manager for KDE" maintainer="John " license="GPL-3.0-or-later" From a8964168465aaa5dfb8b0cbfcf3b8ab91757c324 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Mon, 27 May 2019 08:43:46 +0200 Subject: [PATCH 037/400] vcdimager: rebuild against libcdio-2.1.0 --- srcpkgs/vcdimager/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/vcdimager/template b/srcpkgs/vcdimager/template index 9ac04a07908..5bc5c2f39b4 100644 --- a/srcpkgs/vcdimager/template +++ b/srcpkgs/vcdimager/template @@ -1,10 +1,10 @@ # Template file for 'vcdimager' pkgname=vcdimager version=2.0.1 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config" -makedepends="libcdio-devel libxml2-devel popt-devel" +makedepends="libcdio-devel libxml2-devel popt-devel libcdio-paranoia-devel" short_desc="Mastering suite for authoring, disassembling and analyzing Video CDs" maintainer="Orphaned " license="GPL-2.0-or-later" From f8a4e58d1f6e3b5bf23757c5bb64f01e682316d1 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Mon, 27 May 2019 09:28:02 +0200 Subject: [PATCH 038/400] kodi-rpi: rebuild against libcdio-2.1.0 --- srcpkgs/kodi-rpi/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template index c8c24cfc65a..0c1a584106e 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.2 -revision=2 +revision=3 build_style=cmake _codename="Leia" wrksrc="xbmc-${version}-${_codename}" @@ -33,7 +33,7 @@ makedepends=" libxslt-devel libuuid-devel giflib-devel libcec-devel libmicrohttpd-devel libcdio-devel python-devel libssh-devel rpi-userland-devel dcadec-devel flatbuffers-devel fmt-devel lcms2-devel libfstrcmp-devel rapidjson crossguid - libinput-devel libxkbcommon-devel" + libinput-devel libxkbcommon-devel libcdio-paranoia" # gold broken with musl case "$XBPS_MACHINE" in From fc08a7e361ffa08627544ab7498490b9a29faacd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Mon, 27 May 2019 13:08:57 +0200 Subject: [PATCH 039/400] openimageio: fix cross ppc{,-musl} MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/openimageio/template | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template index 9c09783c911..9362e49a0aa 100644 --- a/srcpkgs/openimageio/template +++ b/srcpkgs/openimageio/template @@ -21,21 +21,24 @@ checksum=a019086c05a6150d445a2240bab1723dff540dde5f5c327c36a97f0b5ae0e157 CXXFLAGS="-faligned-new" case "$XBPS_TARGET_MACHINE" in i686*|x86_64*) configure_args+=" -DUSE_SIMD=sse2" ;; - armv[56]*|mips*) makedepends+=" libatomic-devel" ;; + armv[56]*|mips*|ppc|ppc-musl) makedepends+=" libatomic-devel" ;; esac +if [ "$CROSS_BUILD" ]; then + configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0" +fi pre_build() { local f # Replace -isystem with -I to avoid "#include_next " file not found - sed -i src/cmake/compiler.cmake -e "s;-isystem;-I;g" + vsed -i src/cmake/compiler.cmake -e "s;-isystem;-I;g" case "$XBPS_TARGET_MACHINE" in - armv[56]*|mips*) + armv[56]*|mips*|ppc|ppc-musl) # Add libatomic to the targets - sed -i src/libOpenImageIO/CMakeLists.txt \ + vsed -i src/libOpenImageIO/CMakeLists.txt \ -e "s;^\(target_link_libraries (OpenImageIO ${ZLIB_LIBRARIES}\));\1 atomic);" for f in idiff igrep iconvert iinfo maketx testtex oiiotool; do - sed -i src/${f}/CMakeLists.txt \ + vsed -i src/${f}/CMakeLists.txt \ -e "s;^\(target_link_libraries .*\));\1 atomic);" done ;; From 40adc440ceacfdff8fc0d274f0254ffc1355a88d Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Mon, 27 May 2019 13:52:26 +0200 Subject: [PATCH 040/400] libdmapsharing: update to 3.9.7. --- srcpkgs/libdmapsharing/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/libdmapsharing/template b/srcpkgs/libdmapsharing/template index c43648a542c..f9efed8662f 100644 --- a/srcpkgs/libdmapsharing/template +++ b/srcpkgs/libdmapsharing/template @@ -1,7 +1,7 @@ # Template file for 'libdmapsharing' pkgname=libdmapsharing -version=2.9.39 -revision=2 +version=3.9.7 +revision=1 build_style=gnu-configure build_helper=gir configure_args="--with-mdns=avahi --disable-tests" @@ -13,7 +13,7 @@ maintainer="Juan RP " license="LGPL-2.1" homepage="http://www.flyn.org/projects/libdmapsharing/index.html" distfiles="http://www.flyn.org/projects/libdmapsharing/$pkgname-$version.tar.gz" -checksum=a90dc0681ae81700e46efc539f70edb6edd936b782a9a695434bea660a43a5ef +checksum=745f4dc0b00db3e40721d041c883d813489814eaad3ca0f9ffb091e7e1acfa88 libdmapsharing-devel_package() { depends="libsoup-devel libgee08-devel ${sourcepkg}>=${version}_${revision}" From b46fb12b73ffc51c748b2a92eeef31b80713dc79 Mon Sep 17 00:00:00 2001 From: Christian Poulwey Date: Mon, 27 May 2019 13:52:49 +0200 Subject: [PATCH 041/400] gitlab-runner: update to 11.11.1 --- srcpkgs/gitlab-runner/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gitlab-runner/template b/srcpkgs/gitlab-runner/template index 5e8e889922e..b5f1ebef0cc 100644 --- a/srcpkgs/gitlab-runner/template +++ b/srcpkgs/gitlab-runner/template @@ -1,6 +1,6 @@ # Template file for 'gitlab-runner' pkgname=gitlab-runner -version=11.10.1 +version=11.11.1 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=@b4d140f0ef7932c4451c348bd719e4fd7996bdcae54be4514e5160aa374ad3db +checksum=0c3d1caf44d8d2e5a9c9f0a5e26d03dbbdab851080920458552e5d2f9802012d post_install() { vsv gitlab-runner From 421ee61642756f6b298e78adbd2b730dfff3199f Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Mon, 27 May 2019 13:59:16 +0200 Subject: [PATCH 042/400] libevent: update to 2.1.10. --- .../libevent/patches/fix-libressl-2.7.patch | 23 ------------------- srcpkgs/libevent/template | 6 ++--- 2 files changed, 3 insertions(+), 26 deletions(-) delete mode 100644 srcpkgs/libevent/patches/fix-libressl-2.7.patch diff --git a/srcpkgs/libevent/patches/fix-libressl-2.7.patch b/srcpkgs/libevent/patches/fix-libressl-2.7.patch deleted file mode 100644 index 5a42a4a577a..00000000000 --- a/srcpkgs/libevent/patches/fix-libressl-2.7.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- openssl-compat.h.orig 2018-04-23 16:26:06.271112397 +0200 -+++ openssl-compat.h 2018-04-23 16:27:06.157202883 +0200 -@@ -1,7 +1,11 @@ - #ifndef OPENSSL_COMPAT_H - #define OPENSSL_COMPAT_H - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL -+#define BIO_get_init(b) (b)->init -+#define BIO_get_data(b) (b)->ptr -+#define BIO_get_shutdown(b) (b)->shutdown -+#elif (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) - - static inline BIO_METHOD *BIO_meth_new(int type, const char *name) - { -@@ -30,6 +34,6 @@ static inline BIO_METHOD *BIO_meth_new(i - - #define TLS_method SSLv23_method - --#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ -+#endif /* (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) */ - - #endif /* OPENSSL_COMPAT_H */ diff --git a/srcpkgs/libevent/template b/srcpkgs/libevent/template index 1105394201a..0e424c73831 100644 --- a/srcpkgs/libevent/template +++ b/srcpkgs/libevent/template @@ -1,7 +1,7 @@ # Template file for 'libevent' pkgname=libevent -version=2.1.8 -revision=6 +version=2.1.10 +revision=1 wrksrc="${pkgname}-${version}-stable" build_style=gnu-configure makedepends="libressl-devel" @@ -10,7 +10,7 @@ maintainer="Juan RP " homepage="http://libevent.org/" license="3-clause-BSD" distfiles="https://github.com/libevent/libevent/releases/download/release-${version}-stable/libevent-${version}-stable.tar.gz" -checksum=965cc5a8bb46ce4199a47e9b2c9e1cae3b137e8356ffdad6d94d3b9069b71dc2 +checksum=e864af41a336bb11dab1a23f32993afe963c1f69618bd9292b89ecf6904845b0 post_install() { vlicense LICENSE From 5d8bbf1c2731b600717ad0949339733917eb4033 Mon Sep 17 00:00:00 2001 From: yopito Date: Tue, 21 May 2019 23:16:29 +0200 Subject: [PATCH 043/400] okteta: update to 0.26.1 --- srcpkgs/okteta/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/okteta/template b/srcpkgs/okteta/template index f6a1922f96b..fd04605c6a8 100644 --- a/srcpkgs/okteta/template +++ b/srcpkgs/okteta/template @@ -1,7 +1,7 @@ # Template file for 'okteta' pkgname=okteta reverts="4.14.3_1" -version=0.26.0 +version=0.26.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules python qt5-qmake qt5-host-tools @@ -14,7 +14,7 @@ maintainer="yopito " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://www.kde.org/applications/utilities/okteta/" distfiles="${KDE_SITE}/okteta/${version}/src/okteta-${version}.tar.xz" -checksum=5ec42bcd926529e5b45d482ee12074af2f2ba44cebbe7f90a19f7c1d295dbb67 +checksum=a4c4ee823b225c8bbffed366d9ca73f7951534d4ba1bcb671cd5f743ba1a18af pre_check() { #this one requires xserver running From 74f254dffa79b489f7962bc7bf49815eaa7e81ee Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Mon, 27 May 2019 16:02:24 +0200 Subject: [PATCH 044/400] strawberry: rebuild against libcdio-2.1.0 --- srcpkgs/strawberry/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template index cbf3bee7259..e54ddf8f0bd 100644 --- a/srcpkgs/strawberry/template +++ b/srcpkgs/strawberry/template @@ -1,7 +1,7 @@ # Template file for 'strawberry' pkgname=strawberry version=0.5.3 -revision=1 +revision=2 build_style=cmake hostmakedepends="pkg-config qt5-host-tools qt5-devel protobuf" makedepends="alsa-lib-devel boost-devel chromaprint-devel From f80fe032640b795b96c9abab2c2b1065b68fbb8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= Date: Mon, 27 May 2019 15:04:00 +0200 Subject: [PATCH 045/400] youtube-dl: update to 2019.05.20. --- srcpkgs/youtube-dl/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/youtube-dl/template b/srcpkgs/youtube-dl/template index 533971e4b80..3f19382f819 100644 --- a/srcpkgs/youtube-dl/template +++ b/srcpkgs/youtube-dl/template @@ -1,6 +1,6 @@ # Template file for 'youtube-dl' pkgname=youtube-dl -version=2019.05.11 +version=2019.05.20 revision=1 archs=noarch wrksrc="$pkgname" @@ -14,7 +14,7 @@ license="Unlicense" homepage="https://rg3.github.io/youtube-dl/" changelog="https://raw.githubusercontent.com/rg3/youtube-dl/master/ChangeLog" distfiles="https://yt-dl.org/downloads/${version}/${pkgname}-${version}.tar.gz" -checksum=4126221a6567c1c78dfa9d9abbf340bc5eb13e40963afca5150e72dc9e1447f8 +checksum=a8a6cdf24bcbfa3d3ac9ff9f7efad917c707f9834876b4269036e379b76bbca3 alternatives="youtube-dl:youtube-dl:/usr/bin/youtube-dl2" post_install() { From d07cc09c9331eba1db9af0ee6fbaa2ff4469f04d Mon Sep 17 00:00:00 2001 From: not-chicken Date: Mon, 27 May 2019 07:28:32 +0530 Subject: [PATCH 046/400] mutt: Update to 1.12.0 --- srcpkgs/mutt/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template index 2e4bf20c240..2905cae8280 100644 --- a/srcpkgs/mutt/template +++ b/srcpkgs/mutt/template @@ -1,6 +1,6 @@ # Template file for 'mutt' pkgname=mutt -version=1.11.3 +version=1.12.0 revision=1 build_style=gnu-configure configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache @@ -16,9 +16,9 @@ short_desc="Mutt Mail Client" maintainer="Jan S. " license="GPL-2.0-or-later" homepage="http://www.mutt.org" -changelog="http://mutt.org/relnotes/1.11" +changelog="http://mutt.org/relnotes/1.12" distfiles="http://ftp.mutt.org/pub/mutt/${pkgname}-${version}.tar.gz" -checksum=a542f4c02faecd171b4215ddbd368910faee4a634cca7aea5337586118ab1941 +checksum=ca12448784ed7b6c86d498921e18bc7b152d45494a452df56a7a0c8aaf13f98f provides="mutt-0_1" # Begin alternatives: From 2f7aaa739c618bf43b436278bf6ce08ad86302c5 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Mon, 27 May 2019 17:06:41 +0200 Subject: [PATCH 047/400] Revert "libdmapsharing: update to 3.9.7." This reverts commit 40adc440ceacfdff8fc0d274f0254ffc1355a88d. --- srcpkgs/libdmapsharing/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/libdmapsharing/template b/srcpkgs/libdmapsharing/template index f9efed8662f..b43e43df47f 100644 --- a/srcpkgs/libdmapsharing/template +++ b/srcpkgs/libdmapsharing/template @@ -1,7 +1,8 @@ # Template file for 'libdmapsharing' pkgname=libdmapsharing -version=3.9.7 -revision=1 +reverts="3.9.7_1" +version=2.9.39 +revision=3 build_style=gnu-configure build_helper=gir configure_args="--with-mdns=avahi --disable-tests" @@ -13,7 +14,7 @@ maintainer="Juan RP " license="LGPL-2.1" homepage="http://www.flyn.org/projects/libdmapsharing/index.html" distfiles="http://www.flyn.org/projects/libdmapsharing/$pkgname-$version.tar.gz" -checksum=745f4dc0b00db3e40721d041c883d813489814eaad3ca0f9ffb091e7e1acfa88 +checksum=a90dc0681ae81700e46efc539f70edb6edd936b782a9a695434bea660a43a5ef libdmapsharing-devel_package() { depends="libsoup-devel libgee08-devel ${sourcepkg}>=${version}_${revision}" From eaea45593fc2c3fe008a1bdf07ec98341a6adddc Mon Sep 17 00:00:00 2001 From: q66 Date: Fri, 24 May 2019 17:45:28 +0200 Subject: [PATCH 048/400] rust: update to 1.35.0 [ci skip] --- .../patches/internal-llvm/llvm-001-musl.patch | 58 -------- .../llvm-002-musl-ppc64-elfv2.patch | 18 --- .../static-llvm/llvm-with-dependencies.patch | 13 ++ srcpkgs/rust/patches/libunwind.patch | 27 ++-- .../rust/patches/link-musl-dynamically.patch | 24 ++-- .../use-correct-llvm-when-cross.patch | 0 .../rust/patches/use-elfv2-everywhere.patch | 12 +- srcpkgs/rust/template | 132 ++++++++++-------- 8 files changed, 114 insertions(+), 170 deletions(-) delete mode 100644 srcpkgs/rust/files/patches/internal-llvm/llvm-001-musl.patch delete mode 100644 srcpkgs/rust/files/patches/internal-llvm/llvm-002-musl-ppc64-elfv2.patch create mode 100644 srcpkgs/rust/files/patches/static-llvm/llvm-with-dependencies.patch rename srcpkgs/rust/{files/patches/sys-llvm => patches}/use-correct-llvm-when-cross.patch (100%) diff --git a/srcpkgs/rust/files/patches/internal-llvm/llvm-001-musl.patch b/srcpkgs/rust/files/patches/internal-llvm/llvm-001-musl.patch deleted file mode 100644 index 05afc89be30..00000000000 --- a/srcpkgs/rust/files/patches/internal-llvm/llvm-001-musl.patch +++ /dev/null @@ -1,58 +0,0 @@ -From faca3fbd15d0c3108493c3c54cd93138e049ac43 Mon Sep 17 00:00:00 2001 -From: Andrea Brancaleoni -Date: Tue, 8 Sep 2015 22:03:02 +0200 -Subject: [PATCH 3/3] musl - ---- - include/llvm/Analysis/TargetLibraryInfo.h | 9 +++++++++ - lib/Support/DynamicLibrary.cpp | 2 +- - lib/Support/Unix/Signals.inc | 6 +++--- - utils/unittest/googletest/src/gtest.cc | 1 + - 5 files changed, 17 insertions(+), 6 deletions(-) - -diff --git a/include/llvm/Analysis/TargetLibraryInfo.h b/include/llvm/Analysis/TargetLibraryInfo.h -index e0a1ee3..465b65a 100644 ---- a/include/llvm/Analysis/TargetLibraryInfo.h -+++ b/include/llvm/Analysis/TargetLibraryInfo.h -@@ -18,6 +18,15 @@ - #include "llvm/IR/Module.h" - #include "llvm/Pass.h" - -+#undef fopen64 -+#undef fseeko64 -+#undef fstat64 -+#undef fstatvfs64 -+#undef ftello64 -+#undef lstat64 -+#undef stat64 -+#undef tmpfile64 -+ - namespace llvm { - /// VecDesc - Describes a possible vectorization of a function. - /// Function 'VectorFnName' is equivalent to 'ScalarFnName' vectorized -diff --git a/utils/unittest/googletest/src/gtest.cc b/utils/unittest/googletest/src/gtest.cc -index 5780764..1d548c1 100644 ---- a/utils/unittest/googletest/src/gtest.cc -+++ b/utils/unittest/googletest/src/gtest.cc -@@ -120,6 +120,7 @@ - - #if GTEST_CAN_STREAM_RESULTS_ - # include // NOLINT -+# include // NOLINT - # include // NOLINT - #endif - --- -2.5.1 - ---- llvm-5.0.0.src/lib/Support/Unix/DynamicLibrary.inc.orig -+++ llvm-5.0.0.src/lib/Support/Unix/DynamicLibrary.inc -@@ -103,7 +103,7 @@ - - // This macro returns the address of a well-known, explicit symbol - #define EXPLICIT_SYMBOL(SYM) \ -- if (!strcmp(SymbolName, #SYM)) return &SYM -+ if (!strcmp(SymbolName, #SYM)) return (void *)&SYM - - // Under glibc we have a weird situation. The stderr/out/in symbols are both - // macros and global variables because of standards requirements. So, we diff --git a/srcpkgs/rust/files/patches/internal-llvm/llvm-002-musl-ppc64-elfv2.patch b/srcpkgs/rust/files/patches/internal-llvm/llvm-002-musl-ppc64-elfv2.patch deleted file mode 100644 index 7b62fff6678..00000000000 --- a/srcpkgs/rust/files/patches/internal-llvm/llvm-002-musl-ppc64-elfv2.patch +++ /dev/null @@ -1,18 +0,0 @@ -This patches LLVM to use ELFv2 on ppc64 uncoditionally unless overridden. We -need this because unlike most distros we use ELFv2 for both glibc and musl -on big endian ppc64. - ---- a/lib/Target/PowerPC/PPCTargetMachine.cpp -+++ b/lib/Target/PowerPC/PPCTargetMachine.cpp -@@ -197,9 +197,9 @@ static PPCTargetMachine::PPCABI computeTargetABI(const Triple &TT, - - switch (TT.getArch()) { - case Triple::ppc64le: -- return PPCTargetMachine::PPC_ABI_ELFv2; - case Triple::ppc64: -- return PPCTargetMachine::PPC_ABI_ELFv1; -+ /* we use elfv2 by default for both endians and both libcs */ -+ return PPCTargetMachine::PPC_ABI_ELFv2; - default: - return PPCTargetMachine::PPC_ABI_UNKNOWN; - } diff --git a/srcpkgs/rust/files/patches/static-llvm/llvm-with-dependencies.patch b/srcpkgs/rust/files/patches/static-llvm/llvm-with-dependencies.patch new file mode 100644 index 00000000000..01ee0ac0dac --- /dev/null +++ b/srcpkgs/rust/files/patches/static-llvm/llvm-with-dependencies.patch @@ -0,0 +1,13 @@ +--- rustc-1.30.0-src/src/librustc_llvm/lib.rs.orig ++++ rustc-1.30.0-src/src/librustc_llvm/lib.rs +@@ -121,3 +121,10 @@ + LLVMInitializeWebAssemblyTargetMC, + LLVMInitializeWebAssemblyAsmPrinter); + } ++ ++#[link(name = "ffi")] ++extern {} ++#[link(name = "z")] ++extern {} ++#[link(name = "ncursesw")] ++extern {} diff --git a/srcpkgs/rust/patches/libunwind.patch b/srcpkgs/rust/patches/libunwind.patch index d258e7d0866..fbc6b1c1cde 100644 --- a/srcpkgs/rust/patches/libunwind.patch +++ b/srcpkgs/rust/patches/libunwind.patch @@ -1,13 +1,11 @@ we use libgcc_s for unwind, no need for libunwind.a https://github.com/void-linux/void-packages/issues/3605 - - ---- rustc-1.28.0-src/src/libunwind/build.rs.orig 2018-10-11 10:37:16.617653976 +0200 -+++ rustc-1.28.0-src/src/libunwind/build.rs 2018-10-11 10:37:33.584492467 +0200 -@@ -15,9 +15,7 @@ - let target = env::var("TARGET").expect("TARGET was not set"); - - if target.contains("linux") { +--- rustc-1.35.0-src/src/libunwind/build.rs ++++ rustc-1.35.0-src/src/libunwind/build.rs +@@ -11,9 +11,7 @@ fn main() { + #[cfg(feature = "llvm-libunwind")] + llvm_libunwind::compile(); + } else if target.contains("linux") { - if target.contains("musl") { - // musl is handled in lib.rs - } else if !target.contains("android") { @@ -15,9 +13,9 @@ https://github.com/void-linux/void-packages/issues/3605 println!("cargo:rustc-link-lib=gcc_s"); } } else if target.contains("freebsd") { ---- rustc-1.28.0-src/src/libunwind/lib.rs.orig 2018-10-11 10:37:51.012326568 +0200 -+++ rustc-1.28.0-src/src/libunwind/lib.rs 2018-10-11 10:38:03.512207577 +0200 -@@ -33,8 +33,3 @@ +--- rustc-1.35.0-src/src/libunwind/lib.rs ++++ rustc-1.35.0-src/src/libunwind/lib.rs +@@ -24,8 +24,3 @@ cfg_if! { pub use libunwind::*; } } @@ -27,9 +25,9 @@ https://github.com/void-linux/void-packages/issues/3605 -#[link(name = "gcc_s", cfg(not(target_feature = "crt-static")))] -extern {} ---- rustc-1.28.0-src/src/bootstrap/sanity.rs.orig 2018-10-11 10:29:34.169735519 +0200 -+++ rustc-1.28.0-src/src/bootstrap/sanity.rs 2018-10-11 10:30:02.467509880 +0200 -@@ -186,34 +186,6 @@ +--- rustc-1.35.0-src/src/bootstrap/sanity.rs ++++ rustc-1.35.0-src/src/bootstrap/sanity.rs +@@ -171,34 +171,6 @@ pub fn check(build: &mut Build) { } } @@ -64,4 +62,3 @@ https://github.com/void-linux/void-packages/issues/3605 if target.contains("msvc") { // There are three builds of cmake on windows: MSVC, MinGW, and // Cygwin. The Cygwin build does not have generators for Visual - diff --git a/srcpkgs/rust/patches/link-musl-dynamically.patch b/srcpkgs/rust/patches/link-musl-dynamically.patch index ed0c1b52196..94c9e2ad20d 100644 --- a/srcpkgs/rust/patches/link-musl-dynamically.patch +++ b/srcpkgs/rust/patches/link-musl-dynamically.patch @@ -1,7 +1,7 @@ ---- rustc-1.33.0-src/src/bootstrap/compile.rs -+++ rustc-1.33.0-src/src/bootstrap/compile.rs -@@ -114,21 +114,6 @@ impl Step for Std { - fn copy_third_party_objects(builder: &Builder, compiler: &Compiler, target: Interned) { +--- rustc-1.35.0-src/src/bootstrap/compile.rs ++++ rustc-1.35.0-src/src/bootstrap/compile.rs +@@ -114,20 +114,7 @@ impl Step for Std { + fn copy_third_party_objects(builder: &Builder<'_>, compiler: &Compiler, target: Interned) { let libdir = builder.sysroot_libdir(*compiler, target); - // Copies the crt(1,i,n).o startup objects @@ -17,14 +17,14 @@ - &libdir.join(obj), - ); - } -- } -- - // Copies libunwind.a compiled to be linked wit x86_64-fortanix-unknown-sgx. - // - // This target needs to be linked to Fortanix's port of llvm's libunwind. ---- rustc-1.33.0-src/vendor/libc/src/unix/mod.rs -+++ rustc-1.33.0-src/vendor/libc/src/unix/mod.rs -@@ -317,13 +317,6 @@ cfg_if! { +- } else if target.ends_with("-wasi") { ++ if target.ends_with("-wasi") { + for &obj in &["crt1.o"] { + builder.copy( + &builder.wasi_root(target).unwrap().join("lib/wasm32-wasi").join(obj), +--- rustc-1.35.0-src/vendor/libc/src/unix/mod.rs ++++ rustc-1.35.0-src/vendor/libc/src/unix/mod.rs +@@ -306,13 +306,6 @@ cfg_if! { } else if #[cfg(feature = "use_std")] { // cargo build, don't pull in anything extra as the libstd dep // already pulls in all libs. diff --git a/srcpkgs/rust/files/patches/sys-llvm/use-correct-llvm-when-cross.patch b/srcpkgs/rust/patches/use-correct-llvm-when-cross.patch similarity index 100% rename from srcpkgs/rust/files/patches/sys-llvm/use-correct-llvm-when-cross.patch rename to srcpkgs/rust/patches/use-correct-llvm-when-cross.patch diff --git a/srcpkgs/rust/patches/use-elfv2-everywhere.patch b/srcpkgs/rust/patches/use-elfv2-everywhere.patch index d329ee8adb7..200b0334525 100644 --- a/srcpkgs/rust/patches/use-elfv2-everywhere.patch +++ b/srcpkgs/rust/patches/use-elfv2-everywhere.patch @@ -3,8 +3,8 @@ LLVM. While this is not perfect (it does not allow rustc to compile legacy binaries), rustc never requests specific ABI from llvm in the first place, so at least match the environment we have. ---- a/src/librustc_target/abi/call/powerpc64.rs -+++ b/src/librustc_target/abi/call/powerpc64.rs +--- rustc-1.35.0-src/src/librustc_target/abi/call/powerpc64.rs ++++ rustc-1.35.0-src/src/librustc_target/abi/call/powerpc64.rs @@ -124,7 +124,7 @@ pub fn compute_abi_info<'a, Ty, C>(cx: &C, fty: &mut FnType<'a, Ty>) where Ty: TyLayoutMethods<'a, C> + Copy, C: LayoutOf> + HasDataLayout + HasTargetSpec @@ -14,11 +14,11 @@ so at least match the environment we have. ELFv2 } else { match cx.data_layout().endian { ---- a/src/librustc_target/spec/powerpc64_unknown_linux_gnu.rs -+++ b/src/librustc_target/spec/powerpc64_unknown_linux_gnu.rs +--- rustc-1.35.0-src/src/librustc_target/spec/powerpc64_unknown_linux_gnu.rs ++++ rustc-1.35.0-src/src/librustc_target/spec/powerpc64_unknown_linux_gnu.rs @@ -1,4 +1,4 @@ --use crate::spec::{LinkerFlavor, Target, TargetResult, RelroLevel}; -+use crate::spec::{LinkerFlavor, Target, TargetResult}; +-use crate::spec::{LinkerFlavor, Target, TargetOptions, TargetResult, RelroLevel}; ++use crate::spec::{LinkerFlavor, Target, TargetOptions, TargetResult}; pub fn target() -> TargetResult { let mut base = super::linux_base::opts(); diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template index 5a3a86517f0..af7da209e5c 100644 --- a/srcpkgs/rust/template +++ b/srcpkgs/rust/template @@ -1,78 +1,73 @@ # Template file for 'rust' pkgname=rust -version=1.34.2 +version=1.35.0 revision=1 -_rust_dist_version=1.33.0 -_cargo_dist_version=0.33.0 -# NB. if you push any(!) new version, don't forget to put a build -# output of musl to https://alpha.de.repo.voidlinux.org/distfiles/ +_rust_dist_version=1.35.0 +_cargo_dist_version=0.36.0 +# Always make sure custom distfiles used for bootstrap are +# uploaded to https://alpha.de.repo.voidlinux.org/distfiles/ wrksrc="rustc-${version}-src" build_style=configure make_build_args="dist VERBOSE=1" hostmakedepends="cmake curl pkg-config python" -makedepends="libffi-devel ncurses-devel libxml2-devel zlib-devel - $(vopt_if internal_llvm python-devel llvm)" +makedepends="libffi-devel ncurses-devel libxml2-devel zlib-devel llvm" depends="rust-std" short_desc="Safe, concurrent, practical systems language" maintainer="Enno Boland " license="MIT, Apache-2.0" homepage="https://www.rust-lang.org/" distfiles="https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz" -checksum=c69a4a85a1c464368597df8878cb9e1121aae93e215616d45ad7d23af3052f56 +checksum=5a4d637a716bac18d085f44dd87ef48b32195f71b967d872d80280b38cff712d lib32disabled=yes patch_args="-Np1" -build_options="internal_llvm" +build_options="static_llvm" if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" cargo $(vopt_if internal_llvm '' llvm)" - + hostmakedepends+=" cargo llvm" # These are required for building the buildhost's stage0/1 - hostmakedepends+=" libffi-devel libxml2-devel - ncurses-devel zlib-devel" + hostmakedepends+=" libffi-devel libxml2-devel ncurses-devel zlib-devel" else case "$XBPS_MACHINE" in x86_64-musl) distfiles+=" - https://alpha.de.repo.voidlinux.org/distfiles/rustc-${_rust_dist_version}-x86_64-unknown-linux-musl.tar.xz - https://alpha.de.repo.voidlinux.org/distfiles/rust-std-${_rust_dist_version}-x86_64-unknown-linux-musl.tar.xz - https://alpha.de.repo.voidlinux.org/distfiles/cargo-${_cargo_dist_version}-x86_64-unknown-linux-musl.tar.xz" + https://static.rust-lang.org/dist/rustc-${_rust_dist_version}-x86_64-unknown-linux-musl.tar.xz + https://static.rust-lang.org/dist/rust-std-${_rust_dist_version}-x86_64-unknown-linux-musl.tar.xz + https://static.rust-lang.org/dist/cargo-${_cargo_dist_version}-x86_64-unknown-linux-musl.tar.xz" checksum+=" - 27133fe50d7f43009b802d608654c828e4589cf27810fd7151b67de7de3706e0 - 6971b0b9147371eaf81ece7ac6ee91d2f7adbbd3129b9a80170f394c9a35636a - 7d3e669dc5ddde7529ab0df2d0397648a679426fc56dd4c93d94f84fd68366d5" + 961df84a116c7b1b11eb912d33c8edb233b76980f97983f9ed3989621f9f90c3 + 3574e0d43b2746ea0cb9f8084670699f5cb920cee646026cec1da152818c51ba + 0466ed241c44d137ee65aa7dbba8fc1cc94e56b252c323c387523b5cb430210e" ;; x86_64) - # extract from src/stage0.txt distfiles+=" https://static.rust-lang.org/dist/rustc-${_rust_dist_version}-x86_64-unknown-linux-gnu.tar.gz https://static.rust-lang.org/dist/rust-std-${_rust_dist_version}-x86_64-unknown-linux-gnu.tar.gz https://static.rust-lang.org/dist/cargo-${_cargo_dist_version}-x86_64-unknown-linux-gnu.tar.xz" checksum+=" - 54a342f718b712d8a17fd7878ebd37d22a82ebc70b59c421168cd4153fd04c2b - 661c2ba717ae1502f002b4c6e7aeb8941685c7ea8fe7ac26ed9ede26f615b7af - c2c31db68c4dcb50ad856a19e6f11489a0d4df1212f31bd068dfbb73c5425761" + bb3a07a1f2fdc3eeeee25fc40131d3f05494e3838dfd4e9275475ffc500d7a9e + 5dfa92661ff1a22680785bd6999b6117ae66841e2bd9e5318eb97002956131e4 + ab5a6ff1947463dbd2477ca5dac2012494dae821112098ae0c54add652adfdc3" ;; i686) - # extract from src/stage0.txt distfiles+=" https://static.rust-lang.org/dist/rustc-${_rust_dist_version}-i686-unknown-linux-gnu.tar.gz https://static.rust-lang.org/dist/rust-std-${_rust_dist_version}-i686-unknown-linux-gnu.tar.gz https://static.rust-lang.org/dist/cargo-${_cargo_dist_version}-i686-unknown-linux-gnu.tar.xz" checksum+=" - be4cdc82b511b0f2499fc9b7048b01069257ca2dedb270a7938e1846beb5a349 - f4bba5b77c61a30f0a4c83e152f216c62f974185c4c012c295a5d19d44381a62 - 13acdb3c9f2505805ceed8a696f5f62ab8cd73e443cd43d6edd588aad88e1c32" + b05ca05cfb6f106f92283bb06158845f29abb3c1145a8dc306d2aa210f42d106 + ab41c886af02a16a9a38780043d7f3da24c637629afa222b38f616fe6de86402 + 4c1521691a22e24e40aac18e75ea95957477284adda9ad79df64d56861aec610" ;; ppc64le) distfiles+=" https://static.rust-lang.org/dist/rustc-${_rust_dist_version}-powerpc64le-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-std-${_rust_dist_version}-powerpc64le-unknown-linux-gnu.tar.xz - https://alpha.de.repo.voidlinux.org/distfiles/cargo-${_cargo_dist_version}-powerpc64le-unknown-linux-gnu.tar.xz" + https://static.rust-lang.org/dist/cargo-${_cargo_dist_version}-powerpc64le-unknown-linux-gnu.tar.xz" checksum+=" - 75ef3992b3de501f0b3442315e6ddef9d6f10070174fdd0f3d62e87534fddbc5 - 984d3ca2a47db04345a2bddd657761f66d209ef95a02097ad4bd549f45a0dc9f - 03ece4d677ad59f08a514eb90dd3bd6cad4399fbbaf3d0e916323fbce38e25d1" + fd7709e00ff49d8e388f52c92a386cef075897b4363e76bec1c850d8d5d67145 + b09fe43521f1e50d4b40eb8b4803a5d49dc9c5447eb0ef4da1ab723c093877ba + 46419ba92849bcf8f4970ae042c333c1d82c1e18fda0531a745f88baee0e7f22" ;; ppc64le-musl) distfiles+=" @@ -80,9 +75,19 @@ else https://alpha.de.repo.voidlinux.org/distfiles/rust-std-${_rust_dist_version}-powerpc64le-unknown-linux-musl.tar.xz https://alpha.de.repo.voidlinux.org/distfiles/cargo-${_cargo_dist_version}-powerpc64le-unknown-linux-musl.tar.xz" checksum+=" - f3a493414b07e9b1b535269cd39552ece586ccad3bfadddd92a952e08179844d - 698dbec4d359bb4a378eef807035c9b0b4fffe478e50af044ae47b485b9b6f8e - 801490f04eac96e883f56434747042c375aa3d210b224c2735e02a3a1eab95a0" + 1e2831db0a45c3e3bd44f375678a1738407cf8f7d44af9fd3444248bc1b5d574 + 0bf05a5d0521dec481d67ea3a74626e884fd18f8215b774ba89d818bbdb3d8c0 + 9347f6c8b391e0142cda60988690f7bc9a877f8012ea2e71c35343a4cb9b7ee4" + ;; + ppc64) + distfiles+=" + https://alpha.de.repo.voidlinux.org/distfiles/rustc-${_rust_dist_version}-powerpc64-unknown-linux-gnu.tar.xz + https://alpha.de.repo.voidlinux.org/distfiles/rust-std-${_rust_dist_version}-powerpc64-unknown-linux-gnu.tar.xz + https://alpha.de.repo.voidlinux.org/distfiles/cargo-${_cargo_dist_version}-powerpc64-unknown-linux-gnu.tar.xz" + checksum+=" + 7ba9b81bdc3bda8e0945d37424c5a47364961f90c4765d5223afe8c7ae865d78 + abb807fbb6c3ca86f9f05014581b84a8105e2fc4ecdac33817093ba6fdb5c613 + 512c69762fe2a18b6d9781186e77f76333f7ac179e76135cb85ba19e703afaca" ;; ppc64-musl) distfiles+=" @@ -90,9 +95,29 @@ else https://alpha.de.repo.voidlinux.org/distfiles/rust-std-${_rust_dist_version}-powerpc64-unknown-linux-musl.tar.xz https://alpha.de.repo.voidlinux.org/distfiles/cargo-${_cargo_dist_version}-powerpc64-unknown-linux-musl.tar.xz" checksum+=" - 56805b5a8a7a2d07937ab12a00154a64bf756d0c85d0d69573bc27365fc3157b - e9e15702928f2633b1b971911c992c5ed5c552cf4a05f40bc177e53daa05a764 - ae90844974681c3ee85a855ae0ed27f06d22215e40f825f3b7ca705d8a7cfe7b" + fa843921197f51a9c5042528789531daef0e89b7b861cf94116d079bbfc2a523 + 01145b57d2e11ca7bd06dd57a8582ac5d34c683a9cd827920f2489dbdbc51539 + 9b8cdacbb4859addfe63cf8ea1df9eb32343e25a18bef2a6422f990728d0e78a" + ;; + ppc) + distfiles+=" + https://static.rust-lang.org/dist/rustc-${_rust_dist_version}-powerpc-unknown-linux-gnu.tar.xz + https://static.rust-lang.org/dist/rust-std-${_rust_dist_version}-powerpc-unknown-linux-gnu.tar.xz + https://static.rust-lang.org/dist/cargo-${_cargo_dist_version}-powerpc-unknown-linux-gnu.tar.xz" + checksum+=" + 194ae7493942b5b291870c5857a1e3126b95b6f3b028d5cbfe997f10875a78c4 + 901b169e011b6d2f675939c014165330756acd5bf2233c4c770229712cd9f19e + 42b997dc8b562241d563993b11c070394cf48ced55c6cf86c387d0a15ff0847e" + ;; + ppc-musl) + distfiles+=" + https://alpha.de.repo.voidlinux.org/distfiles/rustc-${_rust_dist_version}-powerpc-unknown-linux-musl.tar.xz + https://alpha.de.repo.voidlinux.org/distfiles/rust-std-${_rust_dist_version}-powerpc-unknown-linux-musl.tar.xz + https://alpha.de.repo.voidlinux.org/distfiles/cargo-${_cargo_dist_version}-powerpc-unknown-linux-musl.tar.xz" + checksum+=" + 163dfdeaeda1237a37c59b436d0288529da3277098286d7d92aa577a3e658433 + e47a378ddd4d54520c2ae1a8aba74ec2933ce33a5ce30687ef14ef0303085207 + eee6637b48d9bbf6375a2de75e36b8670fae26d8da9c53a9890380b9a29d0bcf" ;; esac fi @@ -104,13 +129,7 @@ post_extract() { cp -bflr ../rustc-*/rustc/* stage0 rm ../rust-std-*/rust-std-*/manifest.in cp -bflr ../rust-std-*/rust-std-*/* stage0 - case "$XBPS_MACHINE" in - *-musl|ppc64*) cp -bflr ../cargo stage0/bin;; - *) - rm ../cargo-*/cargo/manifest.in - cp -flr ../cargo-*/cargo/* stage0 - ;; - esac + cp -bflr ../cargo-${_cargo_dist_version}-${RUST_TARGET}/cargo/bin/cargo stage0/bin fi } @@ -122,18 +141,9 @@ _clear_vendor_checksums() { } post_patch() { - if [ "$build_option_internal_llvm" ]; then - # patches for Rust's bundled LLVM - pushd src/llvm-project/llvm - for x in ${FILESDIR}/patches/internal-llvm/llvm-*.patch; do - msg_normal "Applying $x to llvm\n" - patch -sNp1 -i ${x} - done - popd - else - rm -rf src/llvm-project - # patches for system LLVM - for x in ${FILESDIR}/patches/sys-llvm/*.patch; do + rm -rf src/llvm-project + if [ "$build_option_static_llvm" ]; then + for x in ${FILESDIR}/patches/static-llvm/*.patch; do msg_normal "Applying patch $x\n" patch -sNp1 -i ${x} done @@ -160,13 +170,14 @@ do_configure() { --disable-docs --disable-codegen-tests --enable-vendor + --llvm-root=/usr + --set=target.${RUST_BUILD}.llvm-config=/usr/bin/llvm-config + --set=target.${RUST_TARGET}.llvm-config=/usr/bin/llvm-config + --set=target.${RUST_TARGET}.crt-static=false " - if ! [ "$build_option_internal_llvm" ]; then + if [ ! "$build_option_static_llvm" ]; then configure_args+=" - --llvm-root=/usr - --set=target.${RUST_BUILD}.llvm-config=/usr/bin/llvm-config - --set=target.${RUST_TARGET}.llvm-config=/usr/bin/llvm-config --enable-llvm-link-shared " fi @@ -209,7 +220,6 @@ pre_build() { # Set the correct CFLAGS for the build host, we have to compile libbacktrace # for it during stage1. Otherwise it attemps to use CFLAGS, which are the CFLAGS # of the cross host. -# Unset LDFLAGS, otherwise cross builds to the same arch will fail do_build() { env CFLAGS_${RUST_BUILD}="${CFLAGS_host}" make ${makejobs} ${make_build_args} } From 38cece3ce2a6930e01e1edf5e9e6b417ce226f4d Mon Sep 17 00:00:00 2001 From: Johannes Date: Mon, 27 May 2019 18:13:31 +0200 Subject: [PATCH 049/400] rust: disable cross builds --- srcpkgs/rust/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template index af7da209e5c..db219ef8977 100644 --- a/srcpkgs/rust/template +++ b/srcpkgs/rust/template @@ -24,6 +24,7 @@ patch_args="-Np1" build_options="static_llvm" if [ "$CROSS_BUILD" ]; then + broken="wait for native builds to finish" hostmakedepends+=" cargo llvm" # These are required for building the buildhost's stage0/1 hostmakedepends+=" libffi-devel libxml2-devel ncurses-devel zlib-devel" From cc8c5ff9c587e9fbefea94b80873e5184a321953 Mon Sep 17 00:00:00 2001 From: Johannes Date: Mon, 27 May 2019 18:56:35 +0200 Subject: [PATCH 050/400] rust: trigger cross builds --- srcpkgs/rust/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template index db219ef8977..af7da209e5c 100644 --- a/srcpkgs/rust/template +++ b/srcpkgs/rust/template @@ -24,7 +24,6 @@ patch_args="-Np1" build_options="static_llvm" if [ "$CROSS_BUILD" ]; then - broken="wait for native builds to finish" hostmakedepends+=" cargo llvm" # These are required for building the buildhost's stage0/1 hostmakedepends+=" libffi-devel libxml2-devel ncurses-devel zlib-devel" From 95592502d5b2371e91506a10e440e01a51704454 Mon Sep 17 00:00:00 2001 From: Robert Lowry Date: Mon, 27 May 2019 13:31:09 -0500 Subject: [PATCH 051/400] CImg: update to 2.6.4 --- srcpkgs/CImg/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/CImg/template b/srcpkgs/CImg/template index 8601faccf78..73c357def11 100644 --- a/srcpkgs/CImg/template +++ b/srcpkgs/CImg/template @@ -1,6 +1,6 @@ # Template file for 'CImg' pkgname=CImg -version=2.6.2 +version=2.6.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=8e734f5546f0f4c9143bd5699fd4a6cee8950b564cacf0af383bda5d3acc0aa3 +checksum=40e4ca88eaf74d5dd922bbf59692b9ce817359bb4f98920069c57654034a3485 do_install() { vlicense Licence_CeCILL_V2-en.txt From 09a18982e6eed8180e9950bdb496a4ca50baeae6 Mon Sep 17 00:00:00 2001 From: Johannes Date: Mon, 27 May 2019 18:00:32 +0200 Subject: [PATCH 052/400] rustup: update to 1.18.3. --- srcpkgs/rustup/patches/dont-copy-rustup-bin.patch | 15 ++++++++------- srcpkgs/rustup/template | 4 ++-- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/srcpkgs/rustup/patches/dont-copy-rustup-bin.patch b/srcpkgs/rustup/patches/dont-copy-rustup-bin.patch index d76404ee118..bf35ebe6875 100644 --- a/srcpkgs/rustup/patches/dont-copy-rustup-bin.patch +++ b/srcpkgs/rustup/patches/dont-copy-rustup-bin.patch @@ -1,14 +1,15 @@ Upstream: No, not upstreamable like this Reason: We want the rustup binary in $CARGO_HOME/bin to be of the same version as the one we distribute in this rustup package. ---- src/rustup-cli/self_update.rs.1 2018-12-13 21:56:55.211778812 +0100 -+++ src/rustup-cli/self_update.rs 2018-12-13 21:56:42.763779768 +0100 -@@ -671,8 +671,7 @@ +--- src/cli/self_update.rs.orig 2019-05-27 16:17:21.432715136 +0200 ++++ src/cli/self_update.rs 2019-05-27 16:18:56.537718683 +0200 +@@ -619,8 +619,7 @@ if rustup_path.exists() { - utils::remove_file("rustup-bin", rustup_path)?; + utils::remove_file("rustup-bin", &rustup_path)?; } -- utils::copy_file(this_exe_path, rustup_path)?; -- utils::make_executable(rustup_path)?; -+ utils::symlink_file(this_exe_path, rustup_path)?; +- utils::copy_file(&this_exe_path, &rustup_path)?; +- utils::make_executable(&rustup_path)?; ++ utils::symlink_file(&this_exe_path, &rustup_path)?; install_proxies() } + diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template index 79fa51e502f..27d9bec34d0 100644 --- a/srcpkgs/rustup/template +++ b/srcpkgs/rustup/template @@ -1,6 +1,6 @@ # Template file for 'rustup' pkgname=rustup -version=1.17.0 +version=1.18.3 revision=1 wrksrc="${pkgname}.rs-${version}" build_style=cargo @@ -12,7 +12,7 @@ maintainer="Daniel Lee Ramírez " license="Apache-2.0, MIT" homepage="https://www.rustup.rs" distfiles="https://github.com/rust-lang-nursery/${pkgname}.rs/archive/${version}.tar.gz" -checksum=6db73f9684b4d93de47cd511ebd56c2821c37bb41054a4a60060b496764f1f4d +checksum=9a2ae2c85bbbfc838b25d86d049bc677532950d78765725beabb8a61df1c2710 do_install() { vbin target/${RUST_TARGET}/release/rustup-init From 9b4b43233a2ad1a17bbeb8ed769ae0165d57f2d2 Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 5 Mar 2019 23:15:01 +0100 Subject: [PATCH 053/400] cargo: update to 0.36.0 [ci skip] --- srcpkgs/cargo/template | 45 ++++++++++++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template index 439f0f9ed59..5598a5a693e 100644 --- a/srcpkgs/cargo/template +++ b/srcpkgs/cargo/template @@ -1,6 +1,6 @@ # Template file for 'cargo' pkgname=cargo -version=0.35.0 +version=0.36.0 revision=1 build_helper=rust hostmakedepends="rust python curl cmake pkg-config" @@ -11,8 +11,8 @@ maintainer="Enno Boland " license="MIT, Apache-2.0" homepage="https://crates.io/" distfiles="https://github.com/rust-lang/cargo/archive/${version}.tar.gz" -checksum=59d27a00be827f30a26700240dc0651ded5e0ff035f6efb0319a0a0267fea22d -_cargo_dist_version=0.33.0 +checksum=532a39ce9acc1436c5d33ce0643d050bc29183c46abe69934622c4f24f4c6831 +_cargo_dist_version=0.36.0 build_options="static" if [ "$CROSS_BUILD" ]; then @@ -22,39 +22,57 @@ else case "$XBPS_MACHINE" in x86_64-musl) distfiles+=" - https://alpha.de.repo.voidlinux.org/distfiles/cargo-${_cargo_dist_version}-x86_64-unknown-linux-musl.tar.xz" + https://static.rust-lang.org/dist/cargo-${_cargo_dist_version}-x86_64-unknown-linux-musl.tar.gz" checksum+=" - 7d3e669dc5ddde7529ab0df2d0397648a679426fc56dd4c93d94f84fd68366d5" + 7a84d006688ffe9e292db59690e7fc99616d6d1a6d981affb93d121fca9e8bb5" ;; x86_64) distfiles+=" https://static.rust-lang.org/dist/cargo-${_cargo_dist_version}-x86_64-unknown-linux-gnu.tar.gz" checksum+=" - 9dd7f79a0ab882ed7c892731514a4aed6435f7bc8a20381a8346b471c8a14209" + 77586f2fb5b6f6caef0cb6d3cc32a18559d4fcd6a6db4e75f4b3fb7adb050437" ;; i686) distfiles+=" https://static.rust-lang.org/dist/cargo-${_cargo_dist_version}-i686-unknown-linux-gnu.tar.gz" checksum+=" - 163f46bd84ba6348dfe1ac3c10bc4730059f321791d2a7d4d4704fe8ddf8a755" + 6ef32560bfa7c85dee6ef932a5e35994457f3e05e2cf8979c19971b8a5b805e4" ;; ppc64le) distfiles+=" - https://alpha.de.repo.voidlinux.org/distfiles/cargo-${_cargo_dist_version}-powerpc64le-unknown-linux-gnu.tar.xz" + https://static.rust-lang.org/dist/cargo-${_cargo_dist_version}-powerpc64le-unknown-linux-gnu.tar.gz" checksum+=" - 03ece4d677ad59f08a514eb90dd3bd6cad4399fbbaf3d0e916323fbce38e25d1" + d196e4e506c89653c533e34c77fb5be7928a1667bca64a3fd866dd0d1aecfc6d" ;; ppc64le-musl) distfiles+=" https://alpha.de.repo.voidlinux.org/distfiles/cargo-${_cargo_dist_version}-powerpc64le-unknown-linux-musl.tar.xz" checksum+=" - 801490f04eac96e883f56434747042c375aa3d210b224c2735e02a3a1eab95a0" + 9347f6c8b391e0142cda60988690f7bc9a877f8012ea2e71c35343a4cb9b7ee4" + ;; + ppc64) + distfiles+=" + https://alpha.de.repo.voidlinux.org/distfiles/cargo-${_cargo_dist_version}-powerpc64-unknown-linux-gnu.tar.xz" + checksum+=" + 512c69762fe2a18b6d9781186e77f76333f7ac179e76135cb85ba19e703afaca" ;; ppc64-musl) distfiles+=" https://alpha.de.repo.voidlinux.org/distfiles/cargo-${_cargo_dist_version}-powerpc64-unknown-linux-musl.tar.xz" checksum+=" - ae90844974681c3ee85a855ae0ed27f06d22215e40f825f3b7ca705d8a7cfe7b" + 9b8cdacbb4859addfe63cf8ea1df9eb32343e25a18bef2a6422f990728d0e78a" + ;; + ppc) + distfiles+=" + https://static.rust-lang.org/dist/cargo-${_cargo_dist_version}-powerpc-unknown-linux-gnu.tar.gz" + checksum+=" + 821b4acd67c438b533436e1a57d11e9e267f6641493c9d49650ace657f59e106" + ;; + ppc-musl) + distfiles+=" + https://alpha.de.repo.voidlinux.org/distfiles/cargo-${_cargo_dist_version}-powerpc-unknown-linux-musl.tar.xz" + checksum+=" + eee6637b48d9bbf6375a2de75e36b8670fae26d8da9c53a9890380b9a29d0bcf" ;; esac fi @@ -62,10 +80,7 @@ fi post_extract() { if [ -z "$CROSS_BUILD" ]; then mkdir -p target/snapshot - case "$XBPS_MACHINE" in - x86_64-musl|ppc64*) cp ../cargo cargo;; - *) cp ../cargo-${_cargo_dist_version}-${RUST_TARGET}/cargo/bin/cargo cargo;; - esac + cp ../cargo-${_cargo_dist_version}-${RUST_TARGET}/cargo/bin/cargo cargo fi } From ee37d7c4ea7292182d70ace782021614d724362b Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Mon, 27 May 2019 15:00:27 -0700 Subject: [PATCH 054/400] apache-tomcat: update to 9.0.20. --- srcpkgs/apache-tomcat/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/apache-tomcat/template b/srcpkgs/apache-tomcat/template index 0c217d7e3d1..81d48640625 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.19 +version=9.0.20 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=7c6754ec97952af5d6c6f26c9b174539f9de8872821a479a4120fd751a18b4b0 +checksum=1ebe58dff96a08315c17a947dc32485948b09e23149013a9f4494d0f549ef069 system_accounts="tomcat" make_dirs="/usr/share/${pkgname}/webapps 0755 tomcat tomcat From cadb6d7095d17ce902ba772a610f89460f26a4eb Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Sat, 11 May 2019 18:44:54 -0700 Subject: [PATCH 055/400] GCP-Guest-Environment: Update to 20190522. --- srcpkgs/GCP-Guest-Environment/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/GCP-Guest-Environment/template b/srcpkgs/GCP-Guest-Environment/template index 530d05f8a2d..91c6d99856b 100644 --- a/srcpkgs/GCP-Guest-Environment/template +++ b/srcpkgs/GCP-Guest-Environment/template @@ -1,9 +1,10 @@ # Template file for 'GCP-Guest-Environment' pkgname=GCP-Guest-Environment -version=20190124 +version=20190522 revision=1 archs=noarch wrksrc="compute-image-packages-${version}" +build_wrksrc="packages/python-google-compute-engine" build_style=python2-module pycompile_module="google_compute_engine" hostmakedepends="python-setuptools" @@ -13,7 +14,7 @@ maintainer="Michael Aldridge " license="Apache-2.0" homepage="https://github.com/GoogleCloudPlatform/compute-image-packages" distfiles="https://github.com/GoogleCloudPlatform/compute-image-packages/archive/${version}.tar.gz" -checksum=09637f951245729c66eb5b7b9ed49bead31349b29829baf5c8a4e5d45405a2f4 +checksum=8cfb338c3c768ea7e76e479728a1438b2f10b0df13bddd70c9fbcbfc1273efd6 post_install() { for _i in Guest-Initialization accounts clock-skew ip-forwarding ; do From cc0d45202b2f563300982a0104b51e1dc2c817cc Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Mon, 27 May 2019 15:33:18 -0700 Subject: [PATCH 056/400] atlantis: update to 0.8.0. --- srcpkgs/atlantis/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/atlantis/template b/srcpkgs/atlantis/template index 02ca0ac3701..6c712d03214 100644 --- a/srcpkgs/atlantis/template +++ b/srcpkgs/atlantis/template @@ -1,6 +1,6 @@ # Template file for 'atlantis' pkgname=atlantis -version=0.7.2 +version=0.8.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=ecb0068f6ee1cacc4710b4f77e67b88e5d6b5d1dfae3bf6ce480980c93efa50d +checksum=5b53152f0eda41f4e5c2b9727e262dea35fb7da46fc0e0eb732956675f0bed8b pre_build() { cd $GOSRCPATH From 43e20002794715f8fa649041dd777de666e3d415 Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Mon, 27 May 2019 15:37:59 -0700 Subject: [PATCH 057/400] google-chrome: update to 74.0.3729.169. --- srcpkgs/google-chrome/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template index 288a404bf03..9db1c06549a 100644 --- a/srcpkgs/google-chrome/template +++ b/srcpkgs/google-chrome/template @@ -1,5 +1,5 @@ # Template file for 'google-chrome' -_chromeVersion=74.0.3729.131 +_chromeVersion=74.0.3729.169 _chromeRevision=1 _channel=stable @@ -20,7 +20,7 @@ _filename="google-chrome-${_channel}_${_chromeVersion}-${_chromeRevision}_amd64. _chromeUrl="${_baseUrl}/${_filename}" distfiles="$_chromeUrl" -checksum=9692639784df823ead0a67706dbbcbc8b944029257b0a7c6e88b200666009c0c +checksum=bd61afdf6b23220c22ab7cc9aba8048f8356f92a956b31e909e2a6c1f9ab2545 do_extract() { mkdir -p ${DESTDIR} From 341b70ec7f0d39bb7ea958ac73776b2bced5bfa7 Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Mon, 27 May 2019 15:50:38 -0700 Subject: [PATCH 058/400] grafana: update to 6.2.0. --- srcpkgs/grafana/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/grafana/template b/srcpkgs/grafana/template index 6260dacbb4c..10fac797ef0 100644 --- a/srcpkgs/grafana/template +++ b/srcpkgs/grafana/template @@ -1,6 +1,6 @@ # Template file for 'grafana' pkgname=grafana -version=6.1.6 +version=6.2.0 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=0df0e32c8f72384826bfe2f5daeb8b15f7fcf06acb12ced2b7211f831e47b5e5 +checksum=0fe025c12cffcc2e280e338693bfcfd523808c605be0b7ded169784709c68598 system_accounts="_grafana" _grafana_homedir="/var/lib/grafana" From 35d75e73475bb87dbc820a0b867b7597e285031b Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Mon, 27 May 2019 16:10:26 -0700 Subject: [PATCH 059/400] telegraf: update to 1.10.4. --- srcpkgs/telegraf/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/telegraf/template b/srcpkgs/telegraf/template index 783fe65e58b..18288bfc288 100644 --- a/srcpkgs/telegraf/template +++ b/srcpkgs/telegraf/template @@ -1,6 +1,6 @@ # Template file for 'telegraf' pkgname=telegraf -version=1.10.3 +version=1.10.4 revision=1 build_style=go go_import_path=github.com/influxdata/telegraf @@ -12,7 +12,7 @@ maintainer="Michael Aldridge " license="MIT" homepage="https://www.influxdata.com/time-series-platform/telegraf/" distfiles="https://github.com/influxdata/${pkgname}/archive/${version}.tar.gz" -checksum=656ba709e7b66e6ed0d67f3f946efa35f32fc1ae3b94f1c5f84275b42f9bef1d +checksum=07ac076aed2aa5795bbbb17b94a4ef869dd003cd06402ba831d8b5f677b529ed system_accounts="_telegraf" pre_build() { From 85b4b1ce96cf9a66407fd519d5be6b73e9e79210 Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Mon, 27 May 2019 15:53:44 -0700 Subject: [PATCH 060/400] netdata: update to 1.15.0. --- srcpkgs/netdata/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/netdata/template b/srcpkgs/netdata/template index 37fd5646bd7..50350982ca1 100644 --- a/srcpkgs/netdata/template +++ b/srcpkgs/netdata/template @@ -1,6 +1,6 @@ # Template file for 'netdata' pkgname=netdata -version=1.14.0 +version=1.15.0 revision=1 build_style=gnu-configure configure_args="--with-user=_netdata" @@ -11,7 +11,7 @@ maintainer="Michael Aldridge " license="GPL-3.0-or-later" homepage="http://my-netdata.io" distfiles="https://github.com/netdata/netdata/archive/v${version}.tar.gz" -checksum=8658d688fcd358415cadd28ba8c9717e1c2f668fa5e278a16bfb6b90ecb5de3b +checksum=60cf4a15c25c828e25ae1218a485c21ef23423f7b6a9a1148ce9eea9c9726a39 system_accounts="_netdata" conf_files="/etc/${pkgname}/*.conf" From 048557d15d5d0ade9c74b43c0887aa57ecf4820f Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Mon, 27 May 2019 16:18:31 -0700 Subject: [PATCH 061/400] xlunch: update to 4.4.4. --- srcpkgs/xlunch/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xlunch/template b/srcpkgs/xlunch/template index 227bbc8e231..8d25b1a7fe0 100644 --- a/srcpkgs/xlunch/template +++ b/srcpkgs/xlunch/template @@ -1,6 +1,6 @@ # Template file for 'xlunch' pkgname=xlunch -version=4.4.2 +version=4.4.4 revision=1 build_style=gnu-makefile make_build_target=xlunch @@ -10,7 +10,7 @@ maintainer="Michael Aldridge " license="GPL-3.0-or-later" homepage="http://xlunch.org/" distfiles="https://github.com/Tomas-M/xlunch/archive/v${version}.tar.gz" -checksum=2ba0c06e403339cbfc31a0e0a4e619201b2298779de5172974c59d5c9adf6bd2 +checksum=730245daa58a2ae41bd9bde1fbcb447ac76095f70a467cc3ee8da5b808cb3cfc do_install() { vbin xlunch From 3dbc2af55102e86edcc5ddc54448fdda8204024c Mon Sep 17 00:00:00 2001 From: Noel Cower Date: Fri, 24 May 2019 20:14:30 -0700 Subject: [PATCH 062/400] terraform: update to 0.12.0. Closes: #11943 [via git-merge-pr] --- srcpkgs/terraform/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template index 8926d3eb2c5..bb2f0821b1f 100644 --- a/srcpkgs/terraform/template +++ b/srcpkgs/terraform/template @@ -1,6 +1,6 @@ # Template file for 'terraform' pkgname=terraform -version=0.11.14 +version=0.12.0 revision=1 build_style=go go_import_path="github.com/hashicorp/$pkgname" @@ -9,4 +9,4 @@ maintainer="Andrea Brancaleoni " license="MPL-2.0" homepage="https://www.terraform.io/" distfiles="https://$go_import_path/archive/v$version.tar.gz" -checksum=50b75c94c4d3bfe44cfc12c740126747b6b34c014602777154356caa85a783f4 +checksum=0e13fec7d1ecde21369f2ae9eeb06405c078d392cb373a43e8fe34a6a373417d From 4ea5145371dffdf01151d09be160fe62ae7085c0 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 27 May 2019 10:20:52 +0200 Subject: [PATCH 063/400] earlyoom: update to 1.3. --- srcpkgs/earlyoom/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/earlyoom/template b/srcpkgs/earlyoom/template index f342da3669d..e73ce4a43f4 100644 --- a/srcpkgs/earlyoom/template +++ b/srcpkgs/earlyoom/template @@ -1,6 +1,6 @@ # Template file for 'earlyoom' pkgname=earlyoom -version=1.2 +version=1.3 revision=1 build_style=gnu-makefile make_check_target=test @@ -11,7 +11,7 @@ maintainer="Leah Neukirchen " license="MIT" homepage="https://github.com/rfjakob/earlyoom" distfiles="https://github.com/rfjakob/${pkgname}/archive/v${version}.tar.gz" -checksum=ce4e8b435eda9bd1427b6606558356249486a405850b9869c0006e7fbd454c5f +checksum=2c605017d1208e43b92708e9bae623bc860b6ab2e5390c935e5e10ac932016f8 CFLAGS="-DVERSION='\"${version}\"'" do_install() { From cff5ef29e87540f01194c12ce4381571ae3034bc Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 27 May 2019 18:17:17 +0200 Subject: [PATCH 064/400] erlang: update to 22.0.1. --- srcpkgs/erlang/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template index b3b5e418cb5..b6244e07081 100644 --- a/srcpkgs/erlang/template +++ b/srcpkgs/erlang/template @@ -1,6 +1,6 @@ # Template file for 'erlang' pkgname=erlang -version=22.0 +version=22.0.1 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=7efb93a542d66137ba4f38f9734ee7b03adc17d949fac561cca3b2d8f6fafcd2 +checksum=694f133abfca3c7fb8376b223ea484413bcd16b82354f178fba798f37335f163 build_options="x11" From 30f48eebc923a6aaf6114ecde6298bd22e6ccf79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Tue, 28 May 2019 11:09:52 +0200 Subject: [PATCH 065/400] libva-glx: fix checksum MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/libva-glx/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libva-glx/template b/srcpkgs/libva-glx/template index ee891ac5b7e..a3c7d1cc009 100644 --- a/srcpkgs/libva-glx/template +++ b/srcpkgs/libva-glx/template @@ -20,7 +20,7 @@ license="MIT" homepage="https://01.org/linuxmedia" changelog="https://raw.githubusercontent.com/intel/libva/master/NEWS" distfiles="https://github.com/intel/libva/archive/${version}.tar.gz" -checksum=8d65764d2efb1fdeb0c2ad51c7e2f9db1b2d6b005c58a85fd814f8f7b8c89a2d +checksum=68ca8d071dcb84ac82e3c6d7f02a55937d9f690fcb215853f4aa1de8d459812f post_install() { # We are only interested in the glx component, remove everything else. From 7545d4dbbc352d682d54e4e962df16511fcb1a95 Mon Sep 17 00:00:00 2001 From: Daniel Lewan Date: Tue, 28 May 2019 09:53:06 +0200 Subject: [PATCH 066/400] io.elementary.photos: update to 2.6.4. --- srcpkgs/io.elementary.photos/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/io.elementary.photos/template b/srcpkgs/io.elementary.photos/template index 995c600d19a..cb48d38658c 100644 --- a/srcpkgs/io.elementary.photos/template +++ b/srcpkgs/io.elementary.photos/template @@ -1,21 +1,22 @@ # Template file for 'io.elementary.photos' pkgname=io.elementary.photos -version=2.6.3 +version=2.6.4 revision=1 wrksrc="photos-${version}" build_style=meson configure_args="-Dlibunity=false" hostmakedepends="desktop-file-utils intltool pkg-config vala AppStream - glib-devel python-scour" + glib-devel python3-scour" makedepends="libaccounts-glib-devel libexif-devel libgee08-devel geocode-glib-devel libgexiv2-devel libglib-devel libgphoto2-devel gst-plugins-base1-devel gstreamer1-devel gtk+3-devel libgudev-devel json-glib-devel libraw-devel rest-devel libsoup-devel sqlite-devel - webkit2gtk-devel libwebp-devel libxml2-devel granite-devel libnotify-devel vte3-devel" + webkit2gtk-devel libwebp-devel libxml2-devel granite-devel libnotify-devel + vte3-devel" depends="desktop-file-utils gsettings-desktop-schemas" short_desc="Photo viewer and organizer designed for elementary OS" maintainer="Cameron Nemo " license="LGPL-2.1-or-later" homepage="https://github.com/elementary/photos" distfiles="https://github.com/elementary/photos/archive/${version}.tar.gz" -checksum=506040150dce9a1d45422e56754ef0d14c20bf79bd7015512d582524444ee93c +checksum=ca7069e7ab815722fae1b750350e82ce0ef16a5fcc595aee4b117eef93115151 From 8b92ddb72a8749c2c440aaf2289216633a47c08e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Tue, 28 May 2019 11:14:22 +0200 Subject: [PATCH 067/400] mozjs60: fix build for ppc{,-musl} MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/mozjs60/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mozjs60/template b/srcpkgs/mozjs60/template index aca91d22aca..7b631330f7e 100644 --- a/srcpkgs/mozjs60/template +++ b/srcpkgs/mozjs60/template @@ -17,7 +17,7 @@ patch_args="-Np1" LDFLAGS+=" -Wl,-z,stack-size=1048576" case "$XBPS_TARGET_MACHINE" in - mips*|armv[56]*) makedepends+=" libatomic-devel" ; LDFLAGS+=" -latomic" ;; + armv[56]*|mips*|ppc|ppc-musl) makedepends+=" libatomic-devel" ; LDFLAGS+=" -latomic" ;; esac do_configure() { From 1f77c40b635893bef322c8efb329c9d29372ad90 Mon Sep 17 00:00:00 2001 From: Daniel Lewan Date: Tue, 28 May 2019 09:28:34 +0200 Subject: [PATCH 068/400] Minder: update to 1.3.0. --- srcpkgs/Minder/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/Minder/template b/srcpkgs/Minder/template index 486e61766fb..4cbfd3575c2 100644 --- a/srcpkgs/Minder/template +++ b/srcpkgs/Minder/template @@ -1,6 +1,6 @@ # Template file for 'Minder' pkgname=Minder -version=1.2.1 +version=1.3.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=a947fbf78e70a98916b9b301ec85ce358746b96ba51baf65e28d3120343b22ab +checksum=bb4f73855948d06b7fe79146d28f5ae260877cf495ddec917e163bd6b2179ace From 431c9b6bf1d9a392575c4b877dc7af825cc1b9e8 Mon Sep 17 00:00:00 2001 From: Johannes Date: Tue, 28 May 2019 11:53:40 +0200 Subject: [PATCH 069/400] mate-menus: fix python bindings by setting python2 explicitly --- srcpkgs/mate-menus/template | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mate-menus/template b/srcpkgs/mate-menus/template index 1b238018e85..0fb93b4214b 100644 --- a/srcpkgs/mate-menus/template +++ b/srcpkgs/mate-menus/template @@ -1,11 +1,12 @@ # Template file for 'mate-menus' pkgname=mate-menus version=1.20.2 -revision=2 +revision=3 build_style=gnu-configure build_helper="gir" configure_args="--disable-static $(vopt_enable python)" -hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection)" +hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection) + $(vopt_if python python)" makedepends="libglib-devel $(vopt_if python python-devel)" short_desc="MATE menu specifications" maintainer="Juan RP " @@ -17,6 +18,10 @@ checksum=e277df3b3072c2177277644a8c7b0191cc5c3779f1b8db99ef183734d4b4c4a3 build_options="gir python" build_options_default="gir python" +pre_configure() { + export PYTHON=/usr/bin/python2 +} + mate-menus-devel_package() { short_desc+=" - development files" depends="${sourcepkg}>=${version}_${revision}" From f9590020d988c9263e7350395a8e6284a12b53b7 Mon Sep 17 00:00:00 2001 From: teldra Date: Tue, 28 May 2019 11:45:13 +0200 Subject: [PATCH 070/400] portage: update to 2.3.67 --- srcpkgs/portage/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/portage/template b/srcpkgs/portage/template index bb1b8dbf86e..fd388e1f072 100644 --- a/srcpkgs/portage/template +++ b/srcpkgs/portage/template @@ -1,6 +1,6 @@ # Template file for 'portage' pkgname=portage -version=2.3.66 +version=2.3.67 revision=1 wrksrc="${pkgname}-${pkgname}-${version}" build_style=python3-module @@ -13,7 +13,7 @@ maintainer="teldra " license="GPL-2.0-only" homepage="https://wiki.gentoo.org/wiki/Portage" distfiles="https://github.com/gentoo/${pkgname}/archive/${pkgname}-${version}.tar.gz" -checksum=b55c24341e7d890d2930ac3ca2990ed6daf1442cf9e86803ee1b9a97ae734b57 +checksum=63cf9c01aa15c738bee153361d808d5e467a2714762f753c46dbcba449ae9b51 conf_files=" /etc/dispatch-conf.conf From 12d24f1120bfbd721191ce0d03915d9d0bf96d77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Tue, 28 May 2019 12:50:16 +0200 Subject: [PATCH 071/400] glibc: update patches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/glibc/patches/glibc-upstream-11.patch | 1 + srcpkgs/glibc/patches/glibc-upstream-12.patch | 66 ++ srcpkgs/glibc/patches/glibc-upstream-13.patch | 206 +++++ srcpkgs/glibc/patches/glibc-upstream-14.patch | 69 ++ srcpkgs/glibc/patches/glibc-upstream-15.patch | 67 ++ srcpkgs/glibc/patches/glibc-upstream-16.patch | 852 ++++++++++++++++++ srcpkgs/glibc/patches/glibc-upstream-17.patch | 616 +++++++++++++ srcpkgs/glibc/patches/glibc-upstream-18.patch | 37 + srcpkgs/glibc/patches/glibc-upstream-19.patch | 144 +++ srcpkgs/glibc/patches/glibc-upstream-20.patch | 93 ++ srcpkgs/glibc/patches/glibc-upstream-21.patch | 22 + srcpkgs/glibc/patches/glibc-upstream-22.patch | 79 ++ srcpkgs/glibc/template | 2 +- 13 files changed, 2253 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/glibc/patches/glibc-upstream-12.patch create mode 100644 srcpkgs/glibc/patches/glibc-upstream-13.patch create mode 100644 srcpkgs/glibc/patches/glibc-upstream-14.patch create mode 100644 srcpkgs/glibc/patches/glibc-upstream-15.patch create mode 100644 srcpkgs/glibc/patches/glibc-upstream-16.patch create mode 100644 srcpkgs/glibc/patches/glibc-upstream-17.patch create mode 100644 srcpkgs/glibc/patches/glibc-upstream-18.patch create mode 100644 srcpkgs/glibc/patches/glibc-upstream-19.patch create mode 100644 srcpkgs/glibc/patches/glibc-upstream-20.patch create mode 100644 srcpkgs/glibc/patches/glibc-upstream-21.patch create mode 100644 srcpkgs/glibc/patches/glibc-upstream-22.patch diff --git a/srcpkgs/glibc/patches/glibc-upstream-11.patch b/srcpkgs/glibc/patches/glibc-upstream-11.patch index 2930fbbf361..f08c5dca020 100644 --- a/srcpkgs/glibc/patches/glibc-upstream-11.patch +++ b/srcpkgs/glibc/patches/glibc-upstream-11.patch @@ -50,3 +50,4 @@ index 1fd2fee44b..9bfbb2bb9b 100644 "+:6:1873//01//01:1912//07//29::%EC%Ey";/ "+:1:0001//01//01:1872//12//31::%EC%Ey";/ "+:1:-0001//12//31:-*::%EC%Ey" + diff --git a/srcpkgs/glibc/patches/glibc-upstream-12.patch b/srcpkgs/glibc/patches/glibc-upstream-12.patch new file mode 100644 index 00000000000..cbf7641b468 --- /dev/null +++ b/srcpkgs/glibc/patches/glibc-upstream-12.patch @@ -0,0 +1,66 @@ +From 0941350c20a52447e53c5169354408e3db591f73 Mon Sep 17 00:00:00 2001 +From: TAMUKI Shoichi +Date: Tue, 2 Apr 2019 16:46:55 +0900 +Subject: [PATCH 12] ja_JP locale: Add entry for the new Japanese era [BZ + #22964] + +The Japanese era name will be changed on May 1, 2019. The Japanese +government made a preliminary announcement on April 1, 2019. + +The glibc ja_JP locale must be updated to include the new era name for +strftime's alternative year format support. + +This is a minimal cherry pick of just the required locale changes. + +(cherry picked from commit 466afec30896585b60c2106df7a722a86247c9f3) +--- + ChangeLog | 6 ++++++ + NEWS | 4 ++++ + localedata/locales/ja_JP | 4 +++- + 3 files changed, 13 insertions(+), 1 deletion(-) + +diff --git a/ChangeLog b/ChangeLog +index 048ca9644c..3b5d24cf67 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,9 @@ ++2019-04-02 TAMUKI Shoichi ++ ++ [BZ #22964] ++ * localedata/locales/ja_JP (LC_TIME): Add entry for the new Japanese ++ era. ++ + 2019-03-02 TAMUKI Shoichi + + [BZ #24162] +diff --git a/NEWS b/NEWS +index 271bf7a2cd..703864ac75 100644 +--- a/NEWS ++++ b/NEWS +@@ -7,6 +7,10 @@ using `glibc' in the "product" field. + + Version 2.29.1 + ++Major new features: ++ ++* The entry for the new Japanese era has been added for ja_JP locale. ++ + The following bugs are resolved with this release: + + [24155] x32 memcmp can treat positive length as 0 (if sign bit in RDX is set) (CVE-2019-7309) +diff --git a/localedata/locales/ja_JP b/localedata/locales/ja_JP +index 9bfbb2bb9b..c64aaaff55 100644 +--- a/localedata/locales/ja_JP ++++ b/localedata/locales/ja_JP +@@ -14946,7 +14946,9 @@ am_pm "";"" + + t_fmt_ampm "%p%I%M%S" + +-era "+:2:1990//01//01:+*::%EC%Ey";/ ++era "+:2:2020//01//01:+*::%EC%Ey";/ ++ "+:1:2019//05//01:2019//12//31::%EC";/ ++ "+:2:1990//01//01:2019//04//30::%EC%Ey";/ + "+:1:1989//01//08:1989//12//31::%EC";/ + "+:2:1927//01//01:1989//01//07::%EC%Ey";/ + "+:1:1926//12//25:1926//12//31::%EC";/ + diff --git a/srcpkgs/glibc/patches/glibc-upstream-13.patch b/srcpkgs/glibc/patches/glibc-upstream-13.patch new file mode 100644 index 00000000000..7aa56ba8deb --- /dev/null +++ b/srcpkgs/glibc/patches/glibc-upstream-13.patch @@ -0,0 +1,206 @@ +From dcd2b97dd1d695445d45beb4daa815cfe06691dd Mon Sep 17 00:00:00 2001 +From: Carlos O'Donell +Date: Mon, 15 Apr 2019 20:49:32 +0200 +Subject: [PATCH 13] malloc: Set and reset all hooks for tracing (Bug 16573) + +If an error occurs during the tracing operation, particularly during a +call to lock_and_info() which calls _dl_addr, we may end up calling back +into the malloc-subsystem and relock the loader lock and deadlock. For +all intents and purposes the call to _dl_addr can call any of the malloc +family API functions and so we should disable all tracing before calling +such loader functions. This is similar to the strategy that the new +malloc tracer takes when calling the real malloc, namely that all +tracing ceases at the boundary to the real function and any faults at +that point are the purvue of the library (though the new tracer does +this on a per-thread basis in an MT-safe fashion). Since the new tracer +and the hook deprecation are not yet complete we must fix these issues +where we can. + +Tested on x86_64 with no regressions. + +Co-authored-by: Kwok Cheung Yeung +Reviewed-by: DJ Delorie +(cherry picked from commit e621246ec6393ea08ae50310f9d5e72500f8c9bc) +--- + ChangeLog | 15 +++++++++++ + NEWS | 1 + + malloc/mtrace.c | 72 +++++++++++++++++++++++++++++++------------------ + 3 files changed, 62 insertions(+), 26 deletions(-) + +diff --git a/ChangeLog b/ChangeLog +index 3b5d24cf67..077d0dae29 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,18 @@ ++2019-04-09 Carlos O'Donell ++ Kwok Cheung Yeung ++ ++ [BZ #16573] ++ * malloc/mtrace.c: Define prototypes for all hooks. ++ (set_default_hooks): New function. ++ (set_trace_hooks): Likewise. ++ (save_default_hooks): Likewise. ++ (tr_freehook): Use new s*_hooks functions. ++ (tr_mallochook): Likewise. ++ (tr_reallochook): Likewise. ++ (tr_memalignhook): Likewise. ++ (mtrace): Likewise. ++ (muntrace): Likewise. ++ + 2019-04-02 TAMUKI Shoichi + + [BZ #22964] +diff --git a/NEWS b/NEWS +index 703864ac75..117646df7b 100644 +--- a/NEWS ++++ b/NEWS +@@ -13,6 +13,7 @@ Major new features: + + The following bugs are resolved with this release: + ++ [16573] malloc: Set and reset all hooks for tracing + [24155] x32 memcmp can treat positive length as 0 (if sign bit in RDX is set) (CVE-2019-7309) + [24164] Systemtap probes need to use "nr" constraint on 32-bit Arm + [24161] __run_fork_handlers self-deadlocks in malloc/tst-mallocfork2 +diff --git a/malloc/mtrace.c b/malloc/mtrace.c +index a2facf65ea..2fda262508 100644 +--- a/malloc/mtrace.c ++++ b/malloc/mtrace.c +@@ -121,6 +121,41 @@ lock_and_info (const void *caller, Dl_info *mem) + return res; + } + ++static void tr_freehook (void *, const void *); ++static void * tr_mallochook (size_t, const void *); ++static void * tr_reallochook (void *, size_t, const void *); ++static void * tr_memalignhook (size_t, size_t, const void *); ++ ++/* Set all the default non-trace hooks. */ ++static __always_inline void ++set_default_hooks (void) ++{ ++ __free_hook = tr_old_free_hook; ++ __malloc_hook = tr_old_malloc_hook; ++ __realloc_hook = tr_old_realloc_hook; ++ __memalign_hook = tr_old_memalign_hook; ++} ++ ++/* Set all of the tracing hooks used for mtrace. */ ++static __always_inline void ++set_trace_hooks (void) ++{ ++ __free_hook = tr_freehook; ++ __malloc_hook = tr_mallochook; ++ __realloc_hook = tr_reallochook; ++ __memalign_hook = tr_memalignhook; ++} ++ ++/* Save the current set of hooks as the default hooks. */ ++static __always_inline void ++save_default_hooks (void) ++{ ++ tr_old_free_hook = __free_hook; ++ tr_old_malloc_hook = __malloc_hook; ++ tr_old_realloc_hook = __realloc_hook; ++ tr_old_memalign_hook = __memalign_hook; ++} ++ + static void + tr_freehook (void *ptr, const void *caller) + { +@@ -138,12 +173,12 @@ tr_freehook (void *ptr, const void *caller) + tr_break (); + __libc_lock_lock (lock); + } +- __free_hook = tr_old_free_hook; ++ set_default_hooks (); + if (tr_old_free_hook != NULL) + (*tr_old_free_hook)(ptr, caller); + else + free (ptr); +- __free_hook = tr_freehook; ++ set_trace_hooks (); + __libc_lock_unlock (lock); + } + +@@ -155,12 +190,12 @@ tr_mallochook (size_t size, const void *caller) + Dl_info mem; + Dl_info *info = lock_and_info (caller, &mem); + +- __malloc_hook = tr_old_malloc_hook; ++ set_default_hooks (); + if (tr_old_malloc_hook != NULL) + hdr = (void *) (*tr_old_malloc_hook)(size, caller); + else + hdr = (void *) malloc (size); +- __malloc_hook = tr_mallochook; ++ set_trace_hooks (); + + tr_where (caller, info); + /* We could be printing a NULL here; that's OK. */ +@@ -185,16 +220,12 @@ tr_reallochook (void *ptr, size_t size, const void *caller) + Dl_info mem; + Dl_info *info = lock_and_info (caller, &mem); + +- __free_hook = tr_old_free_hook; +- __malloc_hook = tr_old_malloc_hook; +- __realloc_hook = tr_old_realloc_hook; ++ set_default_hooks (); + if (tr_old_realloc_hook != NULL) + hdr = (void *) (*tr_old_realloc_hook)(ptr, size, caller); + else + hdr = (void *) realloc (ptr, size); +- __free_hook = tr_freehook; +- __malloc_hook = tr_mallochook; +- __realloc_hook = tr_reallochook; ++ set_trace_hooks (); + + tr_where (caller, info); + if (hdr == NULL) +@@ -230,14 +261,12 @@ tr_memalignhook (size_t alignment, size_t size, const void *caller) + Dl_info mem; + Dl_info *info = lock_and_info (caller, &mem); + +- __memalign_hook = tr_old_memalign_hook; +- __malloc_hook = tr_old_malloc_hook; ++ set_default_hooks (); + if (tr_old_memalign_hook != NULL) + hdr = (void *) (*tr_old_memalign_hook)(alignment, size, caller); + else + hdr = (void *) memalign (alignment, size); +- __memalign_hook = tr_memalignhook; +- __malloc_hook = tr_mallochook; ++ set_trace_hooks (); + + tr_where (caller, info); + /* We could be printing a NULL here; that's OK. */ +@@ -305,14 +334,8 @@ mtrace (void) + malloc_trace_buffer = mtb; + setvbuf (mallstream, malloc_trace_buffer, _IOFBF, TRACE_BUFFER_SIZE); + fprintf (mallstream, "= Start\n"); +- tr_old_free_hook = __free_hook; +- __free_hook = tr_freehook; +- tr_old_malloc_hook = __malloc_hook; +- __malloc_hook = tr_mallochook; +- tr_old_realloc_hook = __realloc_hook; +- __realloc_hook = tr_reallochook; +- tr_old_memalign_hook = __memalign_hook; +- __memalign_hook = tr_memalignhook; ++ save_default_hooks (); ++ set_trace_hooks (); + #ifdef _LIBC + if (!added_atexit_handler) + { +@@ -338,10 +361,7 @@ muntrace (void) + file. */ + FILE *f = mallstream; + mallstream = NULL; +- __free_hook = tr_old_free_hook; +- __malloc_hook = tr_old_malloc_hook; +- __realloc_hook = tr_old_realloc_hook; +- __memalign_hook = tr_old_memalign_hook; ++ set_default_hooks (); + + fprintf (f, "= End\n"); + fclose (f); + diff --git a/srcpkgs/glibc/patches/glibc-upstream-14.patch b/srcpkgs/glibc/patches/glibc-upstream-14.patch new file mode 100644 index 00000000000..ce4e75d90e1 --- /dev/null +++ b/srcpkgs/glibc/patches/glibc-upstream-14.patch @@ -0,0 +1,69 @@ +From 42dfc13abf6fbb4c7a0215238eb636b7d374e0e0 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Wed, 24 Apr 2019 19:07:46 +0200 +Subject: [PATCH 14] memusagestat: use local glibc when linking [BZ #18465] + +The memusagestat is the only binary that has its own link line which +causes it to be linked against the existing installed C library. It +has been this way since it was originally committed in 1999, but I +don't see any reason as to why. Since we want all the programs we +build locally to be against the new copy of glibc, change the build +to be like all other programs. + +(cherry picked from commit f9b645b4b0a10c43753296ce3fa40053fa44606a) +--- + ChangeLog | 7 +++++++ + NEWS | 1 + + malloc/Makefile | 4 ++-- + 3 files changed, 10 insertions(+), 2 deletions(-) + +diff --git a/ChangeLog b/ChangeLog +index 077d0dae29..5291a88f85 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,10 @@ ++2019-04-24 Mike Frysinger ++ ++ [BZ #18465] ++ * malloc/Makefile (others): Add memusagestat. ++ ($(objpfx)memusagestat): Delete rule. ++ (LDLIBS-memusagestat): New variable. ++ + 2019-04-09 Carlos O'Donell + Kwok Cheung Yeung + +diff --git a/NEWS b/NEWS +index 117646df7b..07e099b5ec 100644 +--- a/NEWS ++++ b/NEWS +@@ -14,6 +14,7 @@ Major new features: + The following bugs are resolved with this release: + + [16573] malloc: Set and reset all hooks for tracing ++ [18465] memusagestat: use local glibc when linking + [24155] x32 memcmp can treat positive length as 0 (if sign bit in RDX is set) (CVE-2019-7309) + [24164] Systemtap probes need to use "nr" constraint on 32-bit Arm + [24161] __run_fork_handlers self-deadlocks in malloc/tst-mallocfork2 +diff --git a/malloc/Makefile b/malloc/Makefile +index ab2eed09c6..aadf602dfd 100644 +--- a/malloc/Makefile ++++ b/malloc/Makefile +@@ -131,6 +131,7 @@ ifneq ($(cross-compiling),yes) + # If the gd library is available we build the `memusagestat' program. + ifneq ($(LIBGD),no) + others: $(objpfx)memusage ++others += memusagestat + install-bin = memusagestat + install-bin-script += memusage + generated += memusagestat memusage +@@ -154,8 +155,7 @@ cpp-srcs-left := $(memusagestat-modules) + lib := memusagestat + include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left)) + +-$(objpfx)memusagestat: $(memusagestat-modules:%=$(objpfx)%.o) +- $(LINK.o) -o $@ $^ $(libgd-LDFLAGS) -lgd -lpng -lz -lm ++LDLIBS-memusagestat = $(libgd-LDFLAGS) -lgd -lpng -lz -lm + + ifeq ($(run-built-tests),yes) + ifeq (yes,$(build-shared)) + diff --git a/srcpkgs/glibc/patches/glibc-upstream-15.patch b/srcpkgs/glibc/patches/glibc-upstream-15.patch new file mode 100644 index 00000000000..51b163b4ce6 --- /dev/null +++ b/srcpkgs/glibc/patches/glibc-upstream-15.patch @@ -0,0 +1,67 @@ +From 0744a268bc73e42b14b83e4cf3d083c6df6344e8 Mon Sep 17 00:00:00 2001 +From: Florian Weimer +Date: Thu, 25 Apr 2019 14:58:13 +0200 +Subject: [PATCH 15] Revert "memusagestat: use local glibc when linking [BZ + #18465]" + +This reverts commit 42dfc13abf6fbb4c7a0215238eb636b7d374e0e0. + +The position of the -Wl,-rpath-link= options on the linker command +line is not correct, so the new way of linking memusagestat does not +always work. +--- + ChangeLog | 7 ------- + NEWS | 1 - + malloc/Makefile | 4 ++-- + 3 files changed, 2 insertions(+), 10 deletions(-) + +diff --git a/ChangeLog b/ChangeLog +index 5291a88f85..077d0dae29 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,10 +1,3 @@ +-2019-04-24 Mike Frysinger +- +- [BZ #18465] +- * malloc/Makefile (others): Add memusagestat. +- ($(objpfx)memusagestat): Delete rule. +- (LDLIBS-memusagestat): New variable. +- + 2019-04-09 Carlos O'Donell + Kwok Cheung Yeung + +diff --git a/NEWS b/NEWS +index 07e099b5ec..117646df7b 100644 +--- a/NEWS ++++ b/NEWS +@@ -14,7 +14,6 @@ Major new features: + The following bugs are resolved with this release: + + [16573] malloc: Set and reset all hooks for tracing +- [18465] memusagestat: use local glibc when linking + [24155] x32 memcmp can treat positive length as 0 (if sign bit in RDX is set) (CVE-2019-7309) + [24164] Systemtap probes need to use "nr" constraint on 32-bit Arm + [24161] __run_fork_handlers self-deadlocks in malloc/tst-mallocfork2 +diff --git a/malloc/Makefile b/malloc/Makefile +index aadf602dfd..ab2eed09c6 100644 +--- a/malloc/Makefile ++++ b/malloc/Makefile +@@ -131,7 +131,6 @@ ifneq ($(cross-compiling),yes) + # If the gd library is available we build the `memusagestat' program. + ifneq ($(LIBGD),no) + others: $(objpfx)memusage +-others += memusagestat + install-bin = memusagestat + install-bin-script += memusage + generated += memusagestat memusage +@@ -155,7 +154,8 @@ cpp-srcs-left := $(memusagestat-modules) + lib := memusagestat + include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left)) + +-LDLIBS-memusagestat = $(libgd-LDFLAGS) -lgd -lpng -lz -lm ++$(objpfx)memusagestat: $(memusagestat-modules:%=$(objpfx)%.o) ++ $(LINK.o) -o $@ $^ $(libgd-LDFLAGS) -lgd -lpng -lz -lm + + ifeq ($(run-built-tests),yes) + ifeq (yes,$(build-shared)) + diff --git a/srcpkgs/glibc/patches/glibc-upstream-16.patch b/srcpkgs/glibc/patches/glibc-upstream-16.patch new file mode 100644 index 00000000000..62678a26319 --- /dev/null +++ b/srcpkgs/glibc/patches/glibc-upstream-16.patch @@ -0,0 +1,852 @@ +From f62d21a1f0107e6f7182f346293583c9121a877d Mon Sep 17 00:00:00 2001 +From: Adhemerval Zanella +Date: Fri, 12 Apr 2019 17:39:53 -0300 +Subject: [PATCH 16] support: Add support_capture_subprogram + +Its API is similar to support_capture_subprocess, but rather creates a +new process based on the input path and arguments. Under the hoods it +uses posix_spawn to create the new process. + +It also allows the use of other support_capture_* functions to check +for expected results and free the resources. + +Checked on x86_64-linux-gnu. + + * support/Makefile (libsupport-routines): Add support_subprocess, + xposix_spawn, xposix_spawn_file_actions_addclose, and + xposix_spawn_file_actions_adddup2. + (tst-support_capture_subprocess-ARGS): New rule. + * support/capture_subprocess.h (support_capture_subprogram): New + prototype. + * support/support_capture_subprocess.c (support_capture_subprocess): + Refactor to use support_subprocess and support_capture_poll. + (support_capture_subprogram): New function. + * support/tst-support_capture_subprocess.c (write_mode_to_str, + str_to_write_mode, test_common, parse_int, handle_restart, + do_subprocess, do_subprogram, do_multiple_tests): New functions. + (do_test): Add support_capture_subprogram tests. + * support/subprocess.h: New file. + * support/support_subprocess.c: Likewise. + * support/xposix_spawn.c: Likewise. + * support/xposix_spawn_file_actions_addclose.c: Likewise. + * support/xposix_spawn_file_actions_adddup2.c: Likewise. + * support/xspawn.h: Likewise. + +Reviewed-by: Carlos O'Donell +(cherry picked from commit 0e169691290a6d2187a4ff41495fc5678cbfdcdc) +--- + ChangeLog | 22 +++ + support/Makefile | 6 + + support/capture_subprocess.h | 6 + + support/subprocess.h | 49 +++++ + support/support_capture_subprocess.c | 80 ++++---- + support/support_subprocess.c | 152 +++++++++++++++ + support/tst-support_capture_subprocess.c | 183 ++++++++++++++++++- + support/xposix_spawn.c | 32 ++++ + support/xposix_spawn_file_actions_addclose.c | 29 +++ + support/xposix_spawn_file_actions_adddup2.c | 30 +++ + support/xspawn.h | 34 ++++ + 11 files changed, 573 insertions(+), 50 deletions(-) + create mode 100644 support/subprocess.h + create mode 100644 support/support_subprocess.c + create mode 100644 support/xposix_spawn.c + create mode 100644 support/xposix_spawn_file_actions_addclose.c + create mode 100644 support/xposix_spawn_file_actions_adddup2.c + create mode 100644 support/xspawn.h + +diff --git a/ChangeLog b/ChangeLog +index 077d0dae29..2524e25697 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,25 @@ ++2019-04-17 Adhemerval Zanella ++ ++ * support/Makefile (libsupport-routines): Add support_subprocess, ++ xposix_spawn, xposix_spawn_file_actions_addclose, and ++ xposix_spawn_file_actions_adddup2. ++ (tst-support_capture_subprocess-ARGS): New rule. ++ * support/capture_subprocess.h (support_capture_subprogram): New ++ prototype. ++ * support/support_capture_subprocess.c (support_capture_subprocess): ++ Refactor to use support_subprocess and support_capture_poll. ++ (support_capture_subprogram): New function. ++ * support/tst-support_capture_subprocess.c (write_mode_to_str, ++ str_to_write_mode, test_common, parse_int, handle_restart, ++ do_subprocess, do_subprogram, do_multiple_tests): New functions. ++ (do_test): Add support_capture_subprogram tests. ++ * support/subprocess.h: New file. ++ * support/support_subprocess.c: Likewise. ++ * support/xposix_spawn.c: Likewise. ++ * support/xposix_spawn_file_actions_addclose.c: Likewise. ++ * support/xposix_spawn_file_actions_adddup2.c: Likewise. ++ * support/xspawn.h: Likewise. ++ + 2019-04-09 Carlos O'Donell + Kwok Cheung Yeung + +diff --git a/support/Makefile b/support/Makefile +index c15b93647c..8d61de6c57 100644 +--- a/support/Makefile ++++ b/support/Makefile +@@ -63,6 +63,7 @@ libsupport-routines = \ + support_record_failure \ + support_run_diff \ + support_shared_allocate \ ++ support_subprocess \ + support_test_compare_blob \ + support_test_compare_failure \ + support_test_compare_string \ +@@ -148,6 +149,9 @@ libsupport-routines = \ + xsignal \ + xsigstack \ + xsocket \ ++ xposix_spawn \ ++ xposix_spawn_file_actions_addclose \ ++ xposix_spawn_file_actions_adddup2 \ + xstrdup \ + xstrndup \ + xsymlink \ +@@ -223,4 +227,6 @@ endif + + $(objpfx)tst-support_format_dns_packet: $(common-objpfx)resolv/libresolv.so + ++tst-support_capture_subprocess-ARGS = -- $(host-test-program-cmd) ++ + include ../Rules +diff --git a/support/capture_subprocess.h b/support/capture_subprocess.h +index 2dce42e3a3..2832cfc635 100644 +--- a/support/capture_subprocess.h ++++ b/support/capture_subprocess.h +@@ -35,6 +35,12 @@ struct support_capture_subprocess + struct support_capture_subprocess support_capture_subprocess + (void (*callback) (void *), void *closure); + ++/* Issue FILE with ARGV arguments by using posix_spawn and capture standard ++ output, standard error, and the exit status. The out.buffer and err.buffer ++ are handle as support_capture_subprocess. */ ++struct support_capture_subprocess support_capture_subprogram ++ (const char *file, char *const argv[]); ++ + /* Deallocate the subprocess data captured by + support_capture_subprocess. */ + void support_capture_subprocess_free (struct support_capture_subprocess *); +diff --git a/support/subprocess.h b/support/subprocess.h +new file mode 100644 +index 0000000000..c031878d94 +--- /dev/null ++++ b/support/subprocess.h +@@ -0,0 +1,49 @@ ++/* Create a subprocess. ++ Copyright (C) 2019 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#ifndef SUPPORT_SUBPROCESS_H ++#define SUPPORT_SUBPROCESS_H ++ ++#include ++ ++struct support_subprocess ++{ ++ int stdout_pipe[2]; ++ int stderr_pipe[2]; ++ pid_t pid; ++}; ++ ++/* Invoke CALLBACK (CLOSURE) in a subprocess created with fork and return ++ its PID, a pipe redirected to STDOUT, and a pipe redirected to STDERR. */ ++struct support_subprocess support_subprocess ++ (void (*callback) (void *), void *closure); ++ ++/* Issue FILE with ARGV arguments by using posix_spawn and return is PID, a ++ pipe redirected to STDOUT, and a pipe redirected to STDERR. */ ++struct support_subprocess support_subprogram ++ (const char *file, char *const argv[]); ++ ++/* Wait for the subprocess indicated by PROC::PID. Return the status ++ indicate by waitpid call. */ ++int support_process_wait (struct support_subprocess *proc); ++ ++/* Terminate the subprocess indicated by PROC::PID, first with a SIGTERM and ++ then with a SIGKILL. Return the status as for waitpid call. */ ++int support_process_terminate (struct support_subprocess *proc); ++ ++#endif +diff --git a/support/support_capture_subprocess.c b/support/support_capture_subprocess.c +index 167514faf1..948ce5a0c6 100644 +--- a/support/support_capture_subprocess.c ++++ b/support/support_capture_subprocess.c +@@ -16,6 +16,7 @@ + License along with the GNU C Library; if not, see + . */ + ++#include + #include + + #include +@@ -23,6 +24,7 @@ + #include + #include + #include ++#include + + static void + transfer (const char *what, struct pollfd *pfd, struct xmemstream *stream) +@@ -50,59 +52,53 @@ transfer (const char *what, struct pollfd *pfd, struct xmemstream *stream) + } + } + +-struct support_capture_subprocess +-support_capture_subprocess (void (*callback) (void *), void *closure) ++static void ++support_capture_poll (struct support_capture_subprocess *result, ++ struct support_subprocess *proc) + { +- struct support_capture_subprocess result; +- xopen_memstream (&result.out); +- xopen_memstream (&result.err); +- +- int stdout_pipe[2]; +- xpipe (stdout_pipe); +- TEST_VERIFY (stdout_pipe[0] > STDERR_FILENO); +- TEST_VERIFY (stdout_pipe[1] > STDERR_FILENO); +- int stderr_pipe[2]; +- xpipe (stderr_pipe); +- TEST_VERIFY (stderr_pipe[0] > STDERR_FILENO); +- TEST_VERIFY (stderr_pipe[1] > STDERR_FILENO); +- +- TEST_VERIFY (fflush (stdout) == 0); +- TEST_VERIFY (fflush (stderr) == 0); +- +- pid_t pid = xfork (); +- if (pid == 0) +- { +- xclose (stdout_pipe[0]); +- xclose (stderr_pipe[0]); +- xdup2 (stdout_pipe[1], STDOUT_FILENO); +- xdup2 (stderr_pipe[1], STDERR_FILENO); +- xclose (stdout_pipe[1]); +- xclose (stderr_pipe[1]); +- callback (closure); +- _exit (0); +- } +- xclose (stdout_pipe[1]); +- xclose (stderr_pipe[1]); +- + struct pollfd fds[2] = + { +- { .fd = stdout_pipe[0], .events = POLLIN }, +- { .fd = stderr_pipe[0], .events = POLLIN }, ++ { .fd = proc->stdout_pipe[0], .events = POLLIN }, ++ { .fd = proc->stderr_pipe[0], .events = POLLIN }, + }; + + do + { + xpoll (fds, 2, -1); +- transfer ("stdout", &fds[0], &result.out); +- transfer ("stderr", &fds[1], &result.err); ++ transfer ("stdout", &fds[0], &result->out); ++ transfer ("stderr", &fds[1], &result->err); + } + while (fds[0].events != 0 || fds[1].events != 0); +- xclose (stdout_pipe[0]); +- xclose (stderr_pipe[0]); + +- xfclose_memstream (&result.out); +- xfclose_memstream (&result.err); +- xwaitpid (pid, &result.status, 0); ++ xfclose_memstream (&result->out); ++ xfclose_memstream (&result->err); ++ ++ result->status = support_process_wait (proc); ++} ++ ++struct support_capture_subprocess ++support_capture_subprocess (void (*callback) (void *), void *closure) ++{ ++ struct support_capture_subprocess result; ++ xopen_memstream (&result.out); ++ xopen_memstream (&result.err); ++ ++ struct support_subprocess proc = support_subprocess (callback, closure); ++ ++ support_capture_poll (&result, &proc); ++ return result; ++} ++ ++struct support_capture_subprocess ++support_capture_subprogram (const char *file, char *const argv[]) ++{ ++ struct support_capture_subprocess result; ++ xopen_memstream (&result.out); ++ xopen_memstream (&result.err); ++ ++ struct support_subprocess proc = support_subprogram (file, argv); ++ ++ support_capture_poll (&result, &proc); + return result; + } + +diff --git a/support/support_subprocess.c b/support/support_subprocess.c +new file mode 100644 +index 0000000000..0c8cc6af30 +--- /dev/null ++++ b/support/support_subprocess.c +@@ -0,0 +1,152 @@ ++/* Create subprocess. ++ Copyright (C) 2019 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++static struct support_subprocess ++support_suprocess_init (void) ++{ ++ struct support_subprocess result; ++ ++ xpipe (result.stdout_pipe); ++ TEST_VERIFY (result.stdout_pipe[0] > STDERR_FILENO); ++ TEST_VERIFY (result.stdout_pipe[1] > STDERR_FILENO); ++ ++ xpipe (result.stderr_pipe); ++ TEST_VERIFY (result.stderr_pipe[0] > STDERR_FILENO); ++ TEST_VERIFY (result.stderr_pipe[1] > STDERR_FILENO); ++ ++ TEST_VERIFY (fflush (stdout) == 0); ++ TEST_VERIFY (fflush (stderr) == 0); ++ ++ return result; ++} ++ ++struct support_subprocess ++support_subprocess (void (*callback) (void *), void *closure) ++{ ++ struct support_subprocess result = support_suprocess_init (); ++ ++ result.pid = xfork (); ++ if (result.pid == 0) ++ { ++ xclose (result.stdout_pipe[0]); ++ xclose (result.stderr_pipe[0]); ++ xdup2 (result.stdout_pipe[1], STDOUT_FILENO); ++ xdup2 (result.stderr_pipe[1], STDERR_FILENO); ++ xclose (result.stdout_pipe[1]); ++ xclose (result.stderr_pipe[1]); ++ callback (closure); ++ _exit (0); ++ } ++ xclose (result.stdout_pipe[1]); ++ xclose (result.stderr_pipe[1]); ++ ++ return result; ++} ++ ++struct support_subprocess ++support_subprogram (const char *file, char *const argv[]) ++{ ++ struct support_subprocess result = support_suprocess_init (); ++ ++ posix_spawn_file_actions_t fa; ++ /* posix_spawn_file_actions_init does not fail. */ ++ posix_spawn_file_actions_init (&fa); ++ ++ xposix_spawn_file_actions_addclose (&fa, result.stdout_pipe[0]); ++ xposix_spawn_file_actions_addclose (&fa, result.stderr_pipe[0]); ++ xposix_spawn_file_actions_adddup2 (&fa, result.stdout_pipe[1], STDOUT_FILENO); ++ xposix_spawn_file_actions_adddup2 (&fa, result.stderr_pipe[1], STDERR_FILENO); ++ xposix_spawn_file_actions_addclose (&fa, result.stdout_pipe[1]); ++ xposix_spawn_file_actions_addclose (&fa, result.stderr_pipe[1]); ++ ++ result.pid = xposix_spawn (file, &fa, NULL, argv, NULL); ++ ++ xclose (result.stdout_pipe[1]); ++ xclose (result.stderr_pipe[1]); ++ ++ return result; ++} ++ ++int ++support_process_wait (struct support_subprocess *proc) ++{ ++ xclose (proc->stdout_pipe[0]); ++ xclose (proc->stderr_pipe[0]); ++ ++ int status; ++ xwaitpid (proc->pid, &status, 0); ++ return status; ++} ++ ++ ++static bool ++support_process_kill (int pid, int signo, int *status) ++{ ++ /* Kill the whole process group. */ ++ kill (-pid, signo); ++ /* In case setpgid failed in the child, kill it individually too. */ ++ kill (pid, signo); ++ ++ /* Wait for it to terminate. */ ++ pid_t killed; ++ for (int i = 0; i < 5; ++i) ++ { ++ int status; ++ killed = xwaitpid (pid, &status, WNOHANG|WUNTRACED); ++ if (killed != 0) ++ break; ++ ++ /* Delay, give the system time to process the kill. If the ++ nanosleep() call return prematurely, all the better. We ++ won't restart it since this probably means the child process ++ finally died. */ ++ nanosleep (&((struct timespec) { 0, 100000000 }), NULL); ++ } ++ if (killed != 0 && killed != pid) ++ return false; ++ ++ return true; ++} ++ ++int ++support_process_terminate (struct support_subprocess *proc) ++{ ++ xclose (proc->stdout_pipe[0]); ++ xclose (proc->stderr_pipe[0]); ++ ++ int status; ++ pid_t killed = xwaitpid (proc->pid, &status, WNOHANG|WUNTRACED); ++ if (killed != 0 && killed == proc->pid) ++ return status; ++ ++ /* Subprocess is still running, terminate it. */ ++ if (!support_process_kill (proc->pid, SIGTERM, &status) ) ++ support_process_kill (proc->pid, SIGKILL, &status); ++ ++ return status; ++} +diff --git a/support/tst-support_capture_subprocess.c b/support/tst-support_capture_subprocess.c +index d8ba42ea8b..ab363e41ac 100644 +--- a/support/tst-support_capture_subprocess.c ++++ b/support/tst-support_capture_subprocess.c +@@ -23,8 +23,20 @@ + #include + #include + #include ++#include + #include + #include ++#include ++#include ++#include ++#include ++#include ++ ++/* Nonzero if the program gets called via 'exec'. */ ++static int restart; ++ ++/* Hold the four initial argument used to respawn the process. */ ++static char *initial_argv[5]; + + /* Write one byte at *P to FD and advance *P. Do nothing if *P is + '\0'. */ +@@ -42,6 +54,30 @@ transfer (const unsigned char **p, int fd) + enum write_mode { out_first, err_first, interleave, + write_mode_last = interleave }; + ++static const char * ++write_mode_to_str (enum write_mode mode) ++{ ++ switch (mode) ++ { ++ case out_first: return "out_first"; ++ case err_first: return "err_first"; ++ case interleave: return "interleave"; ++ default: return "write_mode_last"; ++ } ++} ++ ++static enum write_mode ++str_to_write_mode (const char *mode) ++{ ++ if (strcmp (mode, "out_first") == 0) ++ return out_first; ++ else if (strcmp (mode, "err_first") == 0) ++ return err_first; ++ else if (strcmp (mode, "interleave") == 0) ++ return interleave; ++ return write_mode_last; ++} ++ + /* Describe what to write in the subprocess. */ + struct test + { +@@ -52,11 +88,9 @@ struct test + int status; + }; + +-/* For use with support_capture_subprocess. */ +-static void +-callback (void *closure) ++_Noreturn static void ++test_common (const struct test *test) + { +- const struct test *test = closure; + bool mode_ok = false; + switch (test->write_mode) + { +@@ -95,6 +129,40 @@ callback (void *closure) + exit (test->status); + } + ++static int ++parse_int (const char *str) ++{ ++ char *endptr; ++ long int ret = strtol (str, &endptr, 10); ++ TEST_COMPARE (errno, 0); ++ TEST_VERIFY (ret >= 0 && ret <= INT_MAX); ++ return ret; ++} ++ ++/* For use with support_capture_subprogram. */ ++_Noreturn static void ++handle_restart (char *out, char *err, const char *write_mode, ++ const char *signal, const char *status) ++{ ++ struct test test = ++ { ++ out, ++ err, ++ str_to_write_mode (write_mode), ++ parse_int (signal), ++ parse_int (status) ++ }; ++ test_common (&test); ++} ++ ++/* For use with support_capture_subprocess. */ ++_Noreturn static void ++callback (void *closure) ++{ ++ const struct test *test = closure; ++ test_common (test); ++} ++ + /* Create a heap-allocated random string of letters. */ + static char * + random_string (size_t length) +@@ -130,12 +198,59 @@ check_stream (const char *what, const struct xmemstream *stream, + } + } + ++static struct support_capture_subprocess ++do_subprocess (struct test *test) ++{ ++ return support_capture_subprocess (callback, test); ++} ++ ++static struct support_capture_subprocess ++do_subprogram (const struct test *test) ++{ ++ /* Three digits per byte plus null terminator. */ ++ char signalstr[3 * sizeof(int) + 1]; ++ snprintf (signalstr, sizeof (signalstr), "%d", test->signal); ++ char statusstr[3 * sizeof(int) + 1]; ++ snprintf (statusstr, sizeof (statusstr), "%d", test->status); ++ ++ int argc = 0; ++ enum { ++ /* 4 elements from initial_argv (path to ld.so, '--library-path', the ++ path', and application name'), 2 for restart argument ('--direct', ++ '--restart'), 5 arguments plus NULL. */ ++ argv_size = 12 ++ }; ++ char *args[argv_size]; ++ ++ for (char **arg = initial_argv; *arg != NULL; arg++) ++ args[argc++] = *arg; ++ ++ args[argc++] = (char*) "--direct"; ++ args[argc++] = (char*) "--restart"; ++ ++ args[argc++] = test->out; ++ args[argc++] = test->err; ++ args[argc++] = (char*) write_mode_to_str (test->write_mode); ++ args[argc++] = signalstr; ++ args[argc++] = statusstr; ++ args[argc] = NULL; ++ TEST_VERIFY (argc < argv_size); ++ ++ return support_capture_subprogram (args[0], args); ++} ++ ++enum test_type ++{ ++ subprocess, ++ subprogram, ++}; ++ + static int +-do_test (void) ++do_multiple_tests (enum test_type type) + { + const int lengths[] = {0, 1, 17, 512, 20000, -1}; + +- /* Test multiple combinations of support_capture_subprocess. ++ /* Test multiple combinations of support_capture_sub{process,program}. + + length_idx_stdout: Index into the lengths array above, + controls how many bytes are written by the subprocess to +@@ -164,8 +279,10 @@ do_test (void) + TEST_VERIFY (strlen (test.out) == lengths[length_idx_stdout]); + TEST_VERIFY (strlen (test.err) == lengths[length_idx_stderr]); + +- struct support_capture_subprocess result +- = support_capture_subprocess (callback, &test); ++ struct support_capture_subprocess result ++ = type == subprocess ? do_subprocess (&test) ++ : do_subprogram (&test); ++ + check_stream ("stdout", &result.out, test.out); + check_stream ("stderr", &result.err, test.err); + +@@ -199,4 +316,54 @@ do_test (void) + return 0; + } + ++static int ++do_test (int argc, char *argv[]) ++{ ++ /* We must have either: ++ ++ - one or four parameters if called initially: ++ + argv[1]: path for ld.so optional ++ + argv[2]: "--library-path" optional ++ + argv[3]: the library path optional ++ + argv[4]: the application name ++ ++ - six parameters left if called through re-execution: ++ + argv[1]: the application name ++ + argv[2]: the stdout to print ++ + argv[3]: the stderr to print ++ + argv[4]: the write mode to use ++ + argv[5]: the signal to issue ++ + argv[6]: the exit status code to use ++ ++ * When built with --enable-hardcoded-path-in-tests or issued without ++ using the loader directly. ++ */ ++ ++ if (argc != (restart ? 6 : 5) && argc != (restart ? 6 : 2)) ++ FAIL_EXIT1 ("wrong number of arguments (%d)", argc); ++ ++ if (restart) ++ { ++ handle_restart (argv[1], /* stdout */ ++ argv[2], /* stderr */ ++ argv[3], /* write_mode */ ++ argv[4], /* signal */ ++ argv[5]); /* status */ ++ } ++ ++ initial_argv[0] = argv[1]; /* path for ld.so */ ++ initial_argv[1] = argv[2]; /* "--library-path" */ ++ initial_argv[2] = argv[3]; /* the library path */ ++ initial_argv[3] = argv[4]; /* the application name */ ++ initial_argv[4] = NULL; ++ ++ do_multiple_tests (subprocess); ++ do_multiple_tests (subprogram); ++ ++ return 0; ++} ++ ++#define CMDLINE_OPTIONS \ ++ { "restart", no_argument, &restart, 1 }, ++#define TEST_FUNCTION_ARGV do_test + #include +diff --git a/support/xposix_spawn.c b/support/xposix_spawn.c +new file mode 100644 +index 0000000000..e846017632 +--- /dev/null ++++ b/support/xposix_spawn.c +@@ -0,0 +1,32 @@ ++/* xposix_spawn implementation. ++ Copyright (C) 2019 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++ ++pid_t ++xposix_spawn (const char *file, const posix_spawn_file_actions_t *fa, ++ const posix_spawnattr_t *attr, char *const args[], ++ char *const envp[]) ++{ ++ pid_t pid; ++ int status = posix_spawn (&pid, file, fa, attr, args, envp); ++ if (status != 0) ++ FAIL_EXIT1 ("posix_spawn to %s file failed: %m", file); ++ return pid; ++} +diff --git a/support/xposix_spawn_file_actions_addclose.c b/support/xposix_spawn_file_actions_addclose.c +new file mode 100644 +index 0000000000..eed54a6514 +--- /dev/null ++++ b/support/xposix_spawn_file_actions_addclose.c +@@ -0,0 +1,29 @@ ++/* xposix_spawn_file_actions_addclose implementation. ++ Copyright (C) 2019 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++ ++int ++xposix_spawn_file_actions_addclose (posix_spawn_file_actions_t *fa, int fd) ++{ ++ int status = posix_spawn_file_actions_addclose (fa, fd); ++ if (status == -1) ++ FAIL_EXIT1 ("posix_spawn_file_actions_addclose failed: %m\n"); ++ return status; ++} +diff --git a/support/xposix_spawn_file_actions_adddup2.c b/support/xposix_spawn_file_actions_adddup2.c +new file mode 100644 +index 0000000000..a43b6490be +--- /dev/null ++++ b/support/xposix_spawn_file_actions_adddup2.c +@@ -0,0 +1,30 @@ ++/* xposix_spawn_file_actions_adddup2 implementation. ++ Copyright (C) 2019 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++ ++int ++xposix_spawn_file_actions_adddup2 (posix_spawn_file_actions_t *fa, int fd, ++ int newfd) ++{ ++ int status = posix_spawn_file_actions_adddup2 (fa, fd, newfd); ++ if (status == -1) ++ FAIL_EXIT1 ("posix_spawn_file_actions_adddup2 failed: %m\n"); ++ return status; ++} +diff --git a/support/xspawn.h b/support/xspawn.h +new file mode 100644 +index 0000000000..bbf89132e4 +--- /dev/null ++++ b/support/xspawn.h +@@ -0,0 +1,34 @@ ++/* posix_spawn with support checks. ++ Copyright (C) 2019 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#ifndef SUPPORT_XSPAWN_H ++#define SUPPORT_XSPAWN_H ++ ++#include ++ ++__BEGIN_DECLS ++ ++int xposix_spawn_file_actions_addclose (posix_spawn_file_actions_t *, int); ++int xposix_spawn_file_actions_adddup2 (posix_spawn_file_actions_t *, int, int); ++ ++pid_t xposix_spawn (const char *, const posix_spawn_file_actions_t *, ++ const posix_spawnattr_t *, char *const [], char *const []); ++ ++__END_DECLS ++ ++#endif + diff --git a/srcpkgs/glibc/patches/glibc-upstream-17.patch b/srcpkgs/glibc/patches/glibc-upstream-17.patch new file mode 100644 index 00000000000..742cfaac4c0 --- /dev/null +++ b/srcpkgs/glibc/patches/glibc-upstream-17.patch @@ -0,0 +1,616 @@ +From eaea1dfbe95a31c29adc259100569962cddb6f19 Mon Sep 17 00:00:00 2001 +From: Adhemerval Zanella +Date: Fri, 26 Apr 2019 13:58:31 +0200 +Subject: [PATCH 17] elf: Fix pldd (BZ#18035) + +Since 9182aa67994 (Fix vDSO l_name for GDB's, BZ#387) the initial link_map +for executable itself and loader will have both l_name and l_libname->name +holding the same value due: + + elf/dl-object.c + + 95 new->l_name = *realname ? realname : (char *) newname->name + libname_len - 1; + +Since newname->name points to new->l_libname->name. + +This leads to pldd to an infinite call at: + + elf/pldd-xx.c + +203 again: +204 while (1) +205 { +206 ssize_t n = pread64 (memfd, tmpbuf.data, tmpbuf.length, name_offset); + +228 /* Try the l_libname element. */ +229 struct E(libname_list) ln; +230 if (pread64 (memfd, &ln, sizeof (ln), m.l_libname) == sizeof (ln)) +231 { +232 name_offset = ln.name; +233 goto again; +234 } + +Since the value at ln.name (l_libname->name) will be the same as previously +read. The straightforward fix is just avoid the check and read the new list +entry. + +I checked also against binaries issues with old loaders with fix for BZ#387, +and pldd could dump the shared objects. + +Checked on x86_64-linux-gnu, i686-linux-gnu, aarch64-linux-gnu, and +powerpc64le-linux-gnu. + + [BZ #18035] + * elf/Makefile (tests-container): Add tst-pldd. + * elf/pldd-xx.c: Use _Static_assert in of pldd_assert. + (E(find_maps)): Avoid use alloca, use default read file operations + instead of explicit LFS names, and fix infinite loop. + * elf/pldd.c: Explicit set _FILE_OFFSET_BITS, cleanup headers. + (get_process_info): Use _Static_assert instead of assert, use default + directory operations instead of explicit LFS names, and free some + leadek pointers. + * elf/tst-pldd.c: New file. + +(cherry picked from commit 1a4c27355e146b6d8cc6487b998462c7fdd1048f) +--- + ChangeLog | 13 ++++++ + NEWS | 1 + + elf/Makefile | 1 + + elf/pldd-xx.c | 114 +++++++++++++++++------------------------------ + elf/pldd.c | 64 +++++++++++++-------------- + elf/tst-pldd.c | 118 +++++++++++++++++++++++++++++++++++++++++++++++++ + 6 files changed, 203 insertions(+), 108 deletions(-) + create mode 100644 elf/tst-pldd.c + +diff --git a/ChangeLog b/ChangeLog +index 2524e25697..5af8e27ab9 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,16 @@ ++2019-04-23 Adhemerval Zanella ++ ++ [BZ #18035] ++ * elf/Makefile (tests-container): Add tst-pldd. ++ * elf/pldd-xx.c: Use _Static_assert in of pldd_assert. ++ (E(find_maps)): Avoid use alloca, use default read file operations ++ instead of explicit LFS names, and fix infinite loop. ++ * elf/pldd.c: Explicit set _FILE_OFFSET_BITS, cleanup headers. ++ (get_process_info): Use _Static_assert instead of assert, use default ++ directory operations instead of explicit LFS names, and free some ++ leadek pointers. ++ * elf/tst-pldd.c: New file. ++ + 2019-04-17 Adhemerval Zanella + + * support/Makefile (libsupport-routines): Add support_subprocess, +diff --git a/NEWS b/NEWS +index 117646df7b..b39a0ccf91 100644 +--- a/NEWS ++++ b/NEWS +@@ -14,6 +14,7 @@ Major new features: + The following bugs are resolved with this release: + + [16573] malloc: Set and reset all hooks for tracing ++ [18035] Fix pldd hang + [24155] x32 memcmp can treat positive length as 0 (if sign bit in RDX is set) (CVE-2019-7309) + [24164] Systemtap probes need to use "nr" constraint on 32-bit Arm + [24161] __run_fork_handlers self-deadlocks in malloc/tst-mallocfork2 +diff --git a/elf/Makefile b/elf/Makefile +index 9cf5cd8dfd..e7457e809f 100644 +--- a/elf/Makefile ++++ b/elf/Makefile +@@ -194,6 +194,7 @@ tests-internal += loadtest unload unload2 circleload1 \ + tst-tls3 tst-tls6 tst-tls7 tst-tls8 tst-dlmopen2 \ + tst-ptrguard1 tst-stackguard1 tst-libc_dlvsym \ + tst-create_format1 ++tests-container += tst-pldd + ifeq ($(build-hardcoded-path-in-tests),yes) + tests += tst-dlopen-aout + tst-dlopen-aout-no-pie = yes +diff --git a/elf/pldd-xx.c b/elf/pldd-xx.c +index 547f840ee1..756f6d7a1c 100644 +--- a/elf/pldd-xx.c ++++ b/elf/pldd-xx.c +@@ -23,10 +23,6 @@ + #define EW_(e, w, t) EW__(e, w, _##t) + #define EW__(e, w, t) e##w##t + +-#define pldd_assert(name, exp) \ +- typedef int __assert_##name[((exp) != 0) - 1] +- +- + struct E(link_map) + { + EW(Addr) l_addr; +@@ -39,12 +35,12 @@ struct E(link_map) + EW(Addr) l_libname; + }; + #if CLASS == __ELF_NATIVE_CLASS +-pldd_assert (l_addr, (offsetof (struct link_map, l_addr) +- == offsetof (struct E(link_map), l_addr))); +-pldd_assert (l_name, (offsetof (struct link_map, l_name) +- == offsetof (struct E(link_map), l_name))); +-pldd_assert (l_next, (offsetof (struct link_map, l_next) +- == offsetof (struct E(link_map), l_next))); ++_Static_assert (offsetof (struct link_map, l_addr) ++ == offsetof (struct E(link_map), l_addr), "l_addr"); ++_Static_assert (offsetof (struct link_map, l_name) ++ == offsetof (struct E(link_map), l_name), "l_name"); ++_Static_assert (offsetof (struct link_map, l_next) ++ == offsetof (struct E(link_map), l_next), "l_next"); + #endif + + +@@ -54,10 +50,10 @@ struct E(libname_list) + EW(Addr) next; + }; + #if CLASS == __ELF_NATIVE_CLASS +-pldd_assert (name, (offsetof (struct libname_list, name) +- == offsetof (struct E(libname_list), name))); +-pldd_assert (next, (offsetof (struct libname_list, next) +- == offsetof (struct E(libname_list), next))); ++_Static_assert (offsetof (struct libname_list, name) ++ == offsetof (struct E(libname_list), name), "name"); ++_Static_assert (offsetof (struct libname_list, next) ++ == offsetof (struct E(libname_list), next), "next"); + #endif + + struct E(r_debug) +@@ -69,16 +65,17 @@ struct E(r_debug) + EW(Addr) r_map; + }; + #if CLASS == __ELF_NATIVE_CLASS +-pldd_assert (r_version, (offsetof (struct r_debug, r_version) +- == offsetof (struct E(r_debug), r_version))); +-pldd_assert (r_map, (offsetof (struct r_debug, r_map) +- == offsetof (struct E(r_debug), r_map))); ++_Static_assert (offsetof (struct r_debug, r_version) ++ == offsetof (struct E(r_debug), r_version), "r_version"); ++_Static_assert (offsetof (struct r_debug, r_map) ++ == offsetof (struct E(r_debug), r_map), "r_map"); + #endif + + + static int + +-E(find_maps) (pid_t pid, void *auxv, size_t auxv_size) ++E(find_maps) (const char *exe, int memfd, pid_t pid, void *auxv, ++ size_t auxv_size) + { + EW(Addr) phdr = 0; + unsigned int phnum = 0; +@@ -104,12 +101,9 @@ E(find_maps) (pid_t pid, void *auxv, size_t auxv_size) + if (phdr == 0 || phnum == 0 || phent == 0) + error (EXIT_FAILURE, 0, gettext ("cannot find program header of process")); + +- EW(Phdr) *p = alloca (phnum * phent); +- if (pread64 (memfd, p, phnum * phent, phdr) != phnum * phent) +- { +- error (0, 0, gettext ("cannot read program header")); +- return EXIT_FAILURE; +- } ++ EW(Phdr) *p = xmalloc (phnum * phent); ++ if (pread (memfd, p, phnum * phent, phdr) != phnum * phent) ++ error (EXIT_FAILURE, 0, gettext ("cannot read program header")); + + /* Determine the load offset. We need this for interpreting the + other program header entries so we do this in a separate loop. +@@ -129,24 +123,18 @@ E(find_maps) (pid_t pid, void *auxv, size_t auxv_size) + if (p[i].p_type == PT_DYNAMIC) + { + EW(Dyn) *dyn = xmalloc (p[i].p_filesz); +- if (pread64 (memfd, dyn, p[i].p_filesz, offset + p[i].p_vaddr) ++ if (pread (memfd, dyn, p[i].p_filesz, offset + p[i].p_vaddr) + != p[i].p_filesz) +- { +- error (0, 0, gettext ("cannot read dynamic section")); +- return EXIT_FAILURE; +- } ++ error (EXIT_FAILURE, 0, gettext ("cannot read dynamic section")); + + /* Search for the DT_DEBUG entry. */ + for (unsigned int j = 0; j < p[i].p_filesz / sizeof (EW(Dyn)); ++j) + if (dyn[j].d_tag == DT_DEBUG && dyn[j].d_un.d_ptr != 0) + { + struct E(r_debug) r; +- if (pread64 (memfd, &r, sizeof (r), dyn[j].d_un.d_ptr) ++ if (pread (memfd, &r, sizeof (r), dyn[j].d_un.d_ptr) + != sizeof (r)) +- { +- error (0, 0, gettext ("cannot read r_debug")); +- return EXIT_FAILURE; +- } ++ error (EXIT_FAILURE, 0, gettext ("cannot read r_debug")); + + if (r.r_map != 0) + { +@@ -160,13 +148,10 @@ E(find_maps) (pid_t pid, void *auxv, size_t auxv_size) + } + else if (p[i].p_type == PT_INTERP) + { +- interp = alloca (p[i].p_filesz); +- if (pread64 (memfd, interp, p[i].p_filesz, offset + p[i].p_vaddr) ++ interp = xmalloc (p[i].p_filesz); ++ if (pread (memfd, interp, p[i].p_filesz, offset + p[i].p_vaddr) + != p[i].p_filesz) +- { +- error (0, 0, gettext ("cannot read program interpreter")); +- return EXIT_FAILURE; +- } ++ error (EXIT_FAILURE, 0, gettext ("cannot read program interpreter")); + } + + if (list == 0) +@@ -174,14 +159,16 @@ E(find_maps) (pid_t pid, void *auxv, size_t auxv_size) + if (interp == NULL) + { + // XXX check whether the executable itself is the loader +- return EXIT_FAILURE; ++ exit (EXIT_FAILURE); + } + + // XXX perhaps try finding ld.so and _r_debug in it +- +- return EXIT_FAILURE; ++ exit (EXIT_FAILURE); + } + ++ free (p); ++ free (interp); ++ + /* Print the PID and program name first. */ + printf ("%lu:\t%s\n", (unsigned long int) pid, exe); + +@@ -192,47 +179,27 @@ E(find_maps) (pid_t pid, void *auxv, size_t auxv_size) + do + { + struct E(link_map) m; +- if (pread64 (memfd, &m, sizeof (m), list) != sizeof (m)) +- { +- error (0, 0, gettext ("cannot read link map")); +- status = EXIT_FAILURE; +- goto out; +- } ++ if (pread (memfd, &m, sizeof (m), list) != sizeof (m)) ++ error (EXIT_FAILURE, 0, gettext ("cannot read link map")); + + EW(Addr) name_offset = m.l_name; +- again: + while (1) + { +- ssize_t n = pread64 (memfd, tmpbuf.data, tmpbuf.length, name_offset); ++ ssize_t n = pread (memfd, tmpbuf.data, tmpbuf.length, name_offset); + if (n == -1) +- { +- error (0, 0, gettext ("cannot read object name")); +- status = EXIT_FAILURE; +- goto out; +- } ++ error (EXIT_FAILURE, 0, gettext ("cannot read object name")); + + if (memchr (tmpbuf.data, '\0', n) != NULL) + break; + + if (!scratch_buffer_grow (&tmpbuf)) +- { +- error (0, 0, gettext ("cannot allocate buffer for object name")); +- status = EXIT_FAILURE; +- goto out; +- } ++ error (EXIT_FAILURE, 0, ++ gettext ("cannot allocate buffer for object name")); + } + +- if (((char *)tmpbuf.data)[0] == '\0' && name_offset == m.l_name +- && m.l_libname != 0) +- { +- /* Try the l_libname element. */ +- struct E(libname_list) ln; +- if (pread64 (memfd, &ln, sizeof (ln), m.l_libname) == sizeof (ln)) +- { +- name_offset = ln.name; +- goto again; +- } +- } ++ /* The m.l_name and m.l_libname.name for loader linkmap points to same ++ values (since BZ#387 fix). Trying to use l_libname name as the ++ shared object name might lead to an infinite loop (BZ#18035). */ + + /* Skip over the executable. */ + if (((char *)tmpbuf.data)[0] != '\0') +@@ -242,7 +209,6 @@ E(find_maps) (pid_t pid, void *auxv, size_t auxv_size) + } + while (list != 0); + +- out: + scratch_buffer_free (&tmpbuf); + return status; + } +diff --git a/elf/pldd.c b/elf/pldd.c +index f3fac4e487..69629bd5d2 100644 +--- a/elf/pldd.c ++++ b/elf/pldd.c +@@ -17,23 +17,17 @@ + License along with the GNU C Library; if not, see + . */ + +-#include ++#define _FILE_OFFSET_BITS 64 ++ + #include +-#include + #include +-#include +-#include + #include + #include + #include +-#include +-#include + #include + #include +-#include + #include + #include +-#include + #include + #include + +@@ -76,14 +70,9 @@ static struct argp argp = + options, parse_opt, args_doc, doc, NULL, more_help, NULL + }; + +-// File descriptor of /proc/*/mem file. +-static int memfd; +- +-/* Name of the executable */ +-static char *exe; + + /* Local functions. */ +-static int get_process_info (int dfd, long int pid); ++static int get_process_info (const char *exe, int dfd, long int pid); + static void wait_for_ptrace_stop (long int pid); + + +@@ -102,8 +91,10 @@ main (int argc, char *argv[]) + return 1; + } + +- assert (sizeof (pid_t) == sizeof (int) +- || sizeof (pid_t) == sizeof (long int)); ++ _Static_assert (sizeof (pid_t) == sizeof (int) ++ || sizeof (pid_t) == sizeof (long int), ++ "sizeof (pid_t) != sizeof (int) or sizeof (long int)"); ++ + char *endp; + errno = 0; + long int pid = strtol (argv[remaining], &endp, 10); +@@ -119,25 +110,24 @@ main (int argc, char *argv[]) + if (dfd == -1) + error (EXIT_FAILURE, errno, gettext ("cannot open %s"), buf); + +- struct scratch_buffer exebuf; +- scratch_buffer_init (&exebuf); ++ /* Name of the executable */ ++ struct scratch_buffer exe; ++ scratch_buffer_init (&exe); + ssize_t nexe; + while ((nexe = readlinkat (dfd, "exe", +- exebuf.data, exebuf.length)) == exebuf.length) ++ exe.data, exe.length)) == exe.length) + { +- if (!scratch_buffer_grow (&exebuf)) ++ if (!scratch_buffer_grow (&exe)) + { + nexe = -1; + break; + } + } + if (nexe == -1) +- exe = (char *) ""; ++ /* Default stack allocation is at least 1024. */ ++ snprintf (exe.data, exe.length, ""); + else +- { +- exe = exebuf.data; +- exe[nexe] = '\0'; +- } ++ ((char*)exe.data)[nexe] = '\0'; + + /* Stop all threads since otherwise the list of loaded modules might + change while we are reading it. */ +@@ -155,8 +145,8 @@ main (int argc, char *argv[]) + error (EXIT_FAILURE, errno, gettext ("cannot prepare reading %s/task"), + buf); + +- struct dirent64 *d; +- while ((d = readdir64 (dir)) != NULL) ++ struct dirent *d; ++ while ((d = readdir (dir)) != NULL) + { + if (! isdigit (d->d_name[0])) + continue; +@@ -182,7 +172,7 @@ main (int argc, char *argv[]) + + wait_for_ptrace_stop (tid); + +- struct thread_list *newp = alloca (sizeof (*newp)); ++ struct thread_list *newp = xmalloc (sizeof (*newp)); + newp->tid = tid; + newp->next = thread_list; + thread_list = newp; +@@ -190,17 +180,22 @@ main (int argc, char *argv[]) + + closedir (dir); + +- int status = get_process_info (dfd, pid); ++ if (thread_list == NULL) ++ error (EXIT_FAILURE, 0, gettext ("no valid %s/task entries"), buf); ++ ++ int status = get_process_info (exe.data, dfd, pid); + +- assert (thread_list != NULL); + do + { + ptrace (PTRACE_DETACH, thread_list->tid, NULL, NULL); ++ struct thread_list *prev = thread_list; + thread_list = thread_list->next; ++ free (prev); + } + while (thread_list != NULL); + + close (dfd); ++ scratch_buffer_free (&exe); + + return status; + } +@@ -281,9 +276,10 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ + + + static int +-get_process_info (int dfd, long int pid) ++get_process_info (const char *exe, int dfd, long int pid) + { +- memfd = openat (dfd, "mem", O_RDONLY); ++ /* File descriptor of /proc//mem file. */ ++ int memfd = openat (dfd, "mem", O_RDONLY); + if (memfd == -1) + goto no_info; + +@@ -333,9 +329,9 @@ get_process_info (int dfd, long int pid) + + int retval; + if (e_ident[EI_CLASS] == ELFCLASS32) +- retval = find_maps32 (pid, auxv, auxv_size); ++ retval = find_maps32 (exe, memfd, pid, auxv, auxv_size); + else +- retval = find_maps64 (pid, auxv, auxv_size); ++ retval = find_maps64 (exe, memfd, pid, auxv, auxv_size); + + free (auxv); + close (memfd); +diff --git a/elf/tst-pldd.c b/elf/tst-pldd.c +new file mode 100644 +index 0000000000..ed19cedd05 +--- /dev/null ++++ b/elf/tst-pldd.c +@@ -0,0 +1,118 @@ ++/* Basic tests for pldd program. ++ Copyright (C) 2019 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++ ++#include ++#include ++#include ++ ++static void ++target_process (void *arg) ++{ ++ pause (); ++} ++ ++/* The test runs in a container because pldd does not support tracing ++ a binary started by the loader iself (as with testrun.sh). */ ++ ++static int ++do_test (void) ++{ ++ /* Create a copy of current test to check with pldd. */ ++ struct support_subprocess target = support_subprocess (target_process, NULL); ++ ++ /* Run 'pldd' on test subprocess. */ ++ struct support_capture_subprocess pldd; ++ { ++ /* Three digits per byte plus null terminator. */ ++ char pid[3 * sizeof (uint32_t) + 1]; ++ snprintf (pid, array_length (pid), "%d", target.pid); ++ ++ const char prog[] = "/usr/bin/pldd"; ++ ++ pldd = support_capture_subprogram (prog, ++ (char *const []) { (char *) prog, pid, NULL }); ++ ++ support_capture_subprocess_check (&pldd, "pldd", 0, sc_allow_stdout); ++ } ++ ++ /* Check 'pldd' output. The test is expected to be linked against only ++ loader and libc. */ ++ { ++ pid_t pid; ++ char buffer[512]; ++#define STRINPUT(size) "%" # size "s" ++ ++ FILE *out = fmemopen (pldd.out.buffer, pldd.out.length, "r"); ++ TEST_VERIFY (out != NULL); ++ ++ /* First line is in the form of : */ ++ TEST_COMPARE (fscanf (out, "%u: " STRINPUT (512), &pid, buffer), 2); ++ ++ TEST_COMPARE (pid, target.pid); ++ TEST_COMPARE (strcmp (basename (buffer), "tst-pldd"), 0); ++ ++ /* It expects only one loader and libc loaded by the program. */ ++ bool interpreter_found = false, libc_found = false; ++ while (fgets (buffer, array_length (buffer), out) != NULL) ++ { ++ /* Ignore vDSO. */ ++ if (buffer[0] != '/') ++ continue; ++ ++ /* Remove newline so baseline (buffer) can compare against the ++ LD_SO and LIBC_SO macros unmodified. */ ++ if (buffer[strlen(buffer)-1] == '\n') ++ buffer[strlen(buffer)-1] = '\0'; ++ ++ if (strcmp (basename (buffer), LD_SO) == 0) ++ { ++ TEST_COMPARE (interpreter_found, false); ++ interpreter_found = true; ++ continue; ++ } ++ ++ if (strcmp (basename (buffer), LIBC_SO) == 0) ++ { ++ TEST_COMPARE (libc_found, false); ++ libc_found = true; ++ continue; ++ } ++ } ++ TEST_COMPARE (interpreter_found, true); ++ TEST_COMPARE (libc_found, true); ++ ++ fclose (out); ++ } ++ ++ support_capture_subprocess_free (&pldd); ++ support_process_terminate (&target); ++ ++ return 0; ++} ++ ++#include + diff --git a/srcpkgs/glibc/patches/glibc-upstream-18.patch b/srcpkgs/glibc/patches/glibc-upstream-18.patch new file mode 100644 index 00000000000..e6059c51cb0 --- /dev/null +++ b/srcpkgs/glibc/patches/glibc-upstream-18.patch @@ -0,0 +1,37 @@ +From 52b7cd6e9a701bb203023d56e84551943dc6a4c0 Mon Sep 17 00:00:00 2001 +From: Adam Maris +Date: Thu, 14 Mar 2019 16:51:16 -0400 +Subject: [PATCH 18] malloc: Check for large bin list corruption when + inserting unsorted chunk + +Fixes bug 24216. This patch adds security checks for bk and bk_nextsize pointers +of chunks in large bin when inserting chunk from unsorted bin. It was possible +to write the pointer to victim (newly inserted chunk) to arbitrary memory +locations if bk or bk_nextsize pointers of the next large bin chunk +got corrupted. + +(cherry picked from commit 5b06f538c5aee0389ed034f60d90a8884d6d54de) +--- + malloc/malloc.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/malloc/malloc.c b/malloc/malloc.c +index feaf7ee0bf..ce771375b6 100644 +--- a/malloc/malloc.c ++++ b/malloc/malloc.c +@@ -3876,10 +3876,14 @@ _int_malloc (mstate av, size_t bytes) + { + victim->fd_nextsize = fwd; + victim->bk_nextsize = fwd->bk_nextsize; ++ if (__glibc_unlikely (fwd->bk_nextsize->fd_nextsize != fwd)) ++ malloc_printerr ("malloc(): largebin double linked list corrupted (nextsize)"); + fwd->bk_nextsize = victim; + victim->bk_nextsize->fd_nextsize = victim; + } + bck = fwd->bk; ++ if (bck->fd != fwd) ++ malloc_printerr ("malloc(): largebin double linked list corrupted (bk)"); + } + } + else + diff --git a/srcpkgs/glibc/patches/glibc-upstream-19.patch b/srcpkgs/glibc/patches/glibc-upstream-19.patch new file mode 100644 index 00000000000..18ce8aa33bf --- /dev/null +++ b/srcpkgs/glibc/patches/glibc-upstream-19.patch @@ -0,0 +1,144 @@ +From c6177be4b92d5d7df50a785652d1912db511423e Mon Sep 17 00:00:00 2001 +From: Andreas Schwab +Date: Wed, 15 May 2019 17:09:05 +0200 +Subject: [PATCH 19] Fix crash in _IO_wfile_sync (bug 20568) + +When computing the length of the converted part of the stdio buffer, use +the number of consumed wide characters, not the (negative) distance to the +end of the wide buffer. + +(cherry picked from commit 32ff397533715988c19cbf3675dcbd727ec13e18) +--- + ChangeLog | 10 ++++++++++ + NEWS | 1 + + libio/Makefile | 3 ++- + libio/tst-wfile-sync.c | 39 ++++++++++++++++++++++++++++++++++++++ + libio/tst-wfile-sync.input | 1 + + libio/wfileops.c | 5 +++-- + 6 files changed, 56 insertions(+), 3 deletions(-) + create mode 100644 libio/tst-wfile-sync.c + create mode 100644 libio/tst-wfile-sync.input + +diff --git a/ChangeLog b/ChangeLog +index 5af8e27ab9..d3fcf73e47 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,13 @@ ++2019-05-15 Andreas Schwab ++ ++ [BZ #20568] ++ * libio/wfileops.c (_IO_wfile_sync): Correct last argument to ++ __codecvt_do_length. ++ * libio/Makefile (tests): Add tst-wfile-sync. ++ ($(objpfx)tst-wfile-sync.out): Depend on $(gen-locales). ++ * libio/tst-wfile-sync.c: New file. ++ * libio/tst-wfile-sync.input: New file. ++ + 2019-04-23 Adhemerval Zanella + + [BZ #18035] +diff --git a/NEWS b/NEWS +index b39a0ccf91..c10ab5e851 100644 +--- a/NEWS ++++ b/NEWS +@@ -15,6 +15,7 @@ The following bugs are resolved with this release: + + [16573] malloc: Set and reset all hooks for tracing + [18035] Fix pldd hang ++ [20568] Fix crash in _IO_wfile_sync + [24155] x32 memcmp can treat positive length as 0 (if sign bit in RDX is set) (CVE-2019-7309) + [24164] Systemtap probes need to use "nr" constraint on 32-bit Arm + [24161] __run_fork_handlers self-deadlocks in malloc/tst-mallocfork2 +diff --git a/libio/Makefile b/libio/Makefile +index 5bee83e55c..ee3a34cc3b 100644 +--- a/libio/Makefile ++++ b/libio/Makefile +@@ -65,7 +65,7 @@ tests = tst_swprintf tst_wprintf tst_swscanf tst_wscanf tst_getwc tst_putwc \ + tst-setvbuf1 tst-popen1 tst-fgetwc bug-wsetpos tst-fseek \ + tst-fwrite-error tst-ftell-partial-wide tst-ftell-active-handler \ + tst-ftell-append tst-fputws tst-bz22415 tst-fgetc-after-eof \ +- tst-sprintf-ub tst-sprintf-chk-ub ++ tst-sprintf-ub tst-sprintf-chk-ub tst-wfile-sync + + tests-internal = tst-vtables tst-vtables-interposed tst-readline + +@@ -212,6 +212,7 @@ $(objpfx)tst-ungetwc1.out: $(gen-locales) + $(objpfx)tst-ungetwc2.out: $(gen-locales) + $(objpfx)tst-widetext.out: $(gen-locales) + $(objpfx)tst_wprintf2.out: $(gen-locales) ++$(objpfx)tst-wfile-sync.out: $(gen-locales) + endif + + $(objpfx)test-freopen.out: test-freopen.sh $(objpfx)test-freopen +diff --git a/libio/tst-wfile-sync.c b/libio/tst-wfile-sync.c +new file mode 100644 +index 0000000000..618682064d +--- /dev/null ++++ b/libio/tst-wfile-sync.c +@@ -0,0 +1,39 @@ ++/* Test that _IO_wfile_sync does not crash (bug 20568). ++ Copyright (C) 2019 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++#include ++#include ++#include ++ ++static int ++do_test (void) ++{ ++ TEST_VERIFY_EXIT (setlocale (LC_ALL, "de_DE.UTF-8") != NULL); ++ /* Fill the stdio buffer and advance the read pointer. */ ++ TEST_VERIFY_EXIT (fgetwc (stdin) != WEOF); ++ /* This calls _IO_wfile_sync, it should not crash. */ ++ TEST_VERIFY_EXIT (setvbuf (stdin, NULL, _IONBF, 0) == 0); ++ /* Verify that the external file offset has been synchronized. */ ++ TEST_COMPARE (xlseek (0, 0, SEEK_CUR), 1); ++ ++ return 0; ++} ++ ++#include +diff --git a/libio/tst-wfile-sync.input b/libio/tst-wfile-sync.input +new file mode 100644 +index 0000000000..12d0958f7a +--- /dev/null ++++ b/libio/tst-wfile-sync.input +@@ -0,0 +1 @@ ++This is a test of _IO_wfile_sync. +diff --git a/libio/wfileops.c b/libio/wfileops.c +index 78f20486e5..bab2ba4892 100644 +--- a/libio/wfileops.c ++++ b/libio/wfileops.c +@@ -508,11 +508,12 @@ _IO_wfile_sync (FILE *fp) + generate the wide characters up to the current reading + position. */ + int nread; +- ++ size_t wnread = (fp->_wide_data->_IO_read_ptr ++ - fp->_wide_data->_IO_read_base); + fp->_wide_data->_IO_state = fp->_wide_data->_IO_last_state; + nread = (*cv->__codecvt_do_length) (cv, &fp->_wide_data->_IO_state, + fp->_IO_read_base, +- fp->_IO_read_end, delta); ++ fp->_IO_read_end, wnread); + fp->_IO_read_ptr = fp->_IO_read_base + nread; + delta = -(fp->_IO_read_end - fp->_IO_read_base - nread); + } + diff --git a/srcpkgs/glibc/patches/glibc-upstream-20.patch b/srcpkgs/glibc/patches/glibc-upstream-20.patch new file mode 100644 index 00000000000..cd2baca69de --- /dev/null +++ b/srcpkgs/glibc/patches/glibc-upstream-20.patch @@ -0,0 +1,93 @@ +From e3f828b8bd6e21922da8be8dee35edef09382d8d Mon Sep 17 00:00:00 2001 +From: Mark Wielaard +Date: Wed, 15 May 2019 17:14:01 +0200 +Subject: [PATCH 20] dlfcn: Guard __dlerror_main_freeres with + __libc_once_get (once) [BZ#24476] + +dlerror.c (__dlerror_main_freeres) will try to free resources which only +have been initialized when init () has been called. That function is +called when resources are needed using __libc_once (once, init) where +once is a __libc_once_define (static, once) in the dlerror.c file. +Trying to free those resources if init () hasn't been called will +produce errors under valgrind memcheck. So guard the freeing of those +resources using __libc_once_get (once) and make sure we have a valid +key. Also add a similar guard to __dlerror (). + + * dlfcn/dlerror.c (__dlerror_main_freeres): Guard using + __libc_once_get (once) and static_bug == NULL. + (__dlerror): Check we have a valid key, set result to static_buf + otherwise. + +Reviewed-by: Carlos O'Donell +(cherry picked from commit 11b451c8868d8a2b0edc5dfd44fc58d9ee538be0) +--- + ChangeLog | 8 ++++++++ + dlfcn/dlerror.c | 29 +++++++++++++++++++++-------- + 2 files changed, 29 insertions(+), 8 deletions(-) + +diff --git a/ChangeLog b/ChangeLog +index d3fcf73e47..de8c5c214d 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,11 @@ ++2019-05-15 Mark Wielaard ++ ++ [BZ#24476] ++ * dlfcn/dlerror.c (__dlerror_main_freeres): Guard using ++ __libc_once_get (once) and static_buf == NULL. ++ (__dlerror): Check we have a valid key, set result to static_buf ++ otherwise. ++ + 2019-05-15 Andreas Schwab + + [BZ #20568] +diff --git a/dlfcn/dlerror.c b/dlfcn/dlerror.c +index 27376582d0..ca42c126c1 100644 +--- a/dlfcn/dlerror.c ++++ b/dlfcn/dlerror.c +@@ -72,9 +72,16 @@ __dlerror (void) + __libc_once (once, init); + + /* Get error string. */ +- result = (struct dl_action_result *) __libc_getspecific (key); +- if (result == NULL) +- result = &last_result; ++ if (static_buf != NULL) ++ result = static_buf; ++ else ++ { ++ /* init () has been run and we don't use the static buffer. ++ So we have a valid key. */ ++ result = (struct dl_action_result *) __libc_getspecific (key); ++ if (result == NULL) ++ result = &last_result; ++ } + + /* Test whether we already returned the string. */ + if (result->returned != 0) +@@ -230,13 +237,19 @@ free_key_mem (void *mem) + void + __dlerror_main_freeres (void) + { +- void *mem; + /* Free the global memory if used. */ + check_free (&last_result); +- /* Free the TSD memory if used. */ +- mem = __libc_getspecific (key); +- if (mem != NULL) +- free_key_mem (mem); ++ ++ if (__libc_once_get (once) && static_buf == NULL) ++ { ++ /* init () has been run and we don't use the static buffer. ++ So we have a valid key. */ ++ void *mem; ++ /* Free the TSD memory if used. */ ++ mem = __libc_getspecific (key); ++ if (mem != NULL) ++ free_key_mem (mem); ++ } + } + + struct dlfcn_hook *_dlfcn_hook __attribute__((nocommon)); + diff --git a/srcpkgs/glibc/patches/glibc-upstream-21.patch b/srcpkgs/glibc/patches/glibc-upstream-21.patch new file mode 100644 index 00000000000..c46d58d7fc3 --- /dev/null +++ b/srcpkgs/glibc/patches/glibc-upstream-21.patch @@ -0,0 +1,22 @@ +From 980cb43f15c4320afc6272e7a508f1415413b945 Mon Sep 17 00:00:00 2001 +From: Mark Wielaard +Date: Thu, 16 May 2019 15:25:40 +0200 +Subject: [PATCH 21] Update NEWS for BZ#24476 Guard __dlerror_main_freeres. + +--- + NEWS | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/NEWS b/NEWS +index c10ab5e851..17dcaa7b74 100644 +--- a/NEWS ++++ b/NEWS +@@ -20,6 +20,7 @@ The following bugs are resolved with this release: + [24164] Systemtap probes need to use "nr" constraint on 32-bit Arm + [24161] __run_fork_handlers self-deadlocks in malloc/tst-mallocfork2 + [24211] Use-after-free in Systemtap probe in pthread_join ++ [24476] dlfcn: Guard __dlerror_main_freeres with __libc_once_get (once) + + Security related changes: + + diff --git a/srcpkgs/glibc/patches/glibc-upstream-22.patch b/srcpkgs/glibc/patches/glibc-upstream-22.patch new file mode 100644 index 00000000000..c8effc2b3a8 --- /dev/null +++ b/srcpkgs/glibc/patches/glibc-upstream-22.patch @@ -0,0 +1,79 @@ +From 95d66fecaabbc92ab53027e808f0fc1929c9f21a Mon Sep 17 00:00:00 2001 +From: Wilco Dijkstra +Date: Fri, 10 May 2019 16:38:21 +0100 +Subject: [PATCH 22] Fix tcache count maximum (BZ #24531) + +The tcache counts[] array is a char, which has a very small range and thus +may overflow. When setting tcache_count tunable, there is no overflow check. +However the tunable must not be larger than the maximum value of the tcache +counts[] array, otherwise it can overflow when filling the tcache. + + [BZ #24531] + * malloc/malloc.c (MAX_TCACHE_COUNT): New define. + (do_set_tcache_count): Only update if count is small enough. + * manual/tunables.texi (glibc.malloc.tcache_count): Document max value. + +(cherry picked from commit 5ad533e8e65092be962e414e0417112c65d154fb) +--- + ChangeLog | 7 +++++++ + malloc/malloc.c | 9 +++++++-- + manual/tunables.texi | 4 ++-- + 3 files changed, 16 insertions(+), 4 deletions(-) + +diff --git a/ChangeLog b/ChangeLog +index de8c5c214d..f4586d34a3 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,10 @@ ++2019-05-22 Wilco Dijkstra ++ ++ [BZ #24531] ++ * malloc/malloc.c (MAX_TCACHE_COUNT): New define. ++ (do_set_tcache_count): Only update if count is small enough. ++ * manual/tunables.texi (glibc.malloc.tcache_count): Document max value. ++ + 2019-05-15 Mark Wielaard + + [BZ#24476] +diff --git a/malloc/malloc.c b/malloc/malloc.c +index ce771375b6..0abd653be2 100644 +--- a/malloc/malloc.c ++++ b/malloc/malloc.c +@@ -2919,6 +2919,8 @@ typedef struct tcache_perthread_struct + tcache_entry *entries[TCACHE_MAX_BINS]; + } tcache_perthread_struct; + ++#define MAX_TCACHE_COUNT 127 /* Maximum value of counts[] entries. */ ++ + static __thread bool tcache_shutting_down = false; + static __thread tcache_perthread_struct *tcache = NULL; + +@@ -5124,8 +5126,11 @@ static inline int + __always_inline + do_set_tcache_count (size_t value) + { +- LIBC_PROBE (memory_tunable_tcache_count, 2, value, mp_.tcache_count); +- mp_.tcache_count = value; ++ if (value <= MAX_TCACHE_COUNT) ++ { ++ LIBC_PROBE (memory_tunable_tcache_count, 2, value, mp_.tcache_count); ++ mp_.tcache_count = value; ++ } + return 1; + } + +diff --git a/manual/tunables.texi b/manual/tunables.texi +index af820820e0..8edfea4edd 100644 +--- a/manual/tunables.texi ++++ b/manual/tunables.texi +@@ -189,8 +189,8 @@ per-thread cache. The default (and maximum) value is 1032 bytes on + + @deftp Tunable glibc.malloc.tcache_count + The maximum number of chunks of each size to cache. The default is 7. +-There is no upper limit, other than available system memory. If set +-to zero, the per-thread cache is effectively disabled. ++The upper limit is 127. If set to zero, the per-thread cache is effectively ++disabled. + + The approximate maximum overhead of the per-thread cache is thus equal + to the number of bins times the chunk count in each bin times the size diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template index 37592c7fc01..29358d3ef79 100644 --- a/srcpkgs/glibc/template +++ b/srcpkgs/glibc/template @@ -1,7 +1,7 @@ # Template file for 'glibc' pkgname=glibc version=2.29 -revision=3 +revision=4 bootstrap=yes short_desc="GNU C library" maintainer="Juan RP " From 97efb571f50ebd5ef8b6e9ec5ac17ca84f05c93a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Tue, 28 May 2019 13:06:21 +0200 Subject: [PATCH 072/400] cross-aarch64-linux-gnu: revbump for glibc patches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/cross-aarch64-linux-gnu/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cross-aarch64-linux-gnu/template b/srcpkgs/cross-aarch64-linux-gnu/template index 62a888e410e..370d1e17dfe 100644 --- a/srcpkgs/cross-aarch64-linux-gnu/template +++ b/srcpkgs/cross-aarch64-linux-gnu/template @@ -11,7 +11,7 @@ _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} version=0.30 -revision=1 +revision=2 short_desc="GNU Cross toolchain for the ${_triplet} LE target (binutils/gcc/glibc)" maintainer="Leah Neukirchen " homepage="https://www.voidlinux.org/" From 76adfb402fd8056a0b70b166010168021db47864 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Tue, 28 May 2019 13:06:23 +0200 Subject: [PATCH 073/400] cross-arm-linux-gnueabi: revbump for glibc patches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/cross-arm-linux-gnueabi/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cross-arm-linux-gnueabi/template b/srcpkgs/cross-arm-linux-gnueabi/template index 0f342d67901..c8b55b62693 100644 --- a/srcpkgs/cross-arm-linux-gnueabi/template +++ b/srcpkgs/cross-arm-linux-gnueabi/template @@ -12,7 +12,7 @@ _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} version=0.30 -revision=1 +revision=2 short_desc="GNU Cross toolchain for the ${_triplet} LE target (binutils/gcc/glibc)" maintainer="Juan RP " homepage="https://www.voidlinux.org/" From 1d5ff88ba84f5f0c71994eb2b5c04c24c8262843 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Tue, 28 May 2019 13:06:24 +0200 Subject: [PATCH 074/400] cross-arm-linux-gnueabihf: revbump for glibc patches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/cross-arm-linux-gnueabihf/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cross-arm-linux-gnueabihf/template b/srcpkgs/cross-arm-linux-gnueabihf/template index 0b5c34b94d6..c235071734d 100644 --- a/srcpkgs/cross-arm-linux-gnueabihf/template +++ b/srcpkgs/cross-arm-linux-gnueabihf/template @@ -12,7 +12,7 @@ _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} version=0.30 -revision=1 +revision=2 short_desc="GNU Cross toolchain for the ${_triplet} LE target (binutils/gcc/glibc)" maintainer="Juan RP " homepage="https://www.voidlinux.org/" From f84f25aa16a935579547b6452f2720203f997b0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Tue, 28 May 2019 13:06:24 +0200 Subject: [PATCH 075/400] cross-armv7l-linux-gnueabihf: revbump for glibc patches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/cross-armv7l-linux-gnueabihf/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf/template b/srcpkgs/cross-armv7l-linux-gnueabihf/template index 6964c0eba00..7de622dcadc 100644 --- a/srcpkgs/cross-armv7l-linux-gnueabihf/template +++ b/srcpkgs/cross-armv7l-linux-gnueabihf/template @@ -12,7 +12,7 @@ _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} version=0.30 -revision=4 +revision=5 short_desc="GNU Cross toolchain for the ${_triplet} LE target (binutils/gcc/glibc)" maintainer="Juan RP " homepage="https://www.voidlinux.org/" From f12a2d11e6ff1d3b7fb188c08e81c09a08ec1ae4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Tue, 28 May 2019 13:06:24 +0200 Subject: [PATCH 076/400] cross-i686-pc-linux-gnu: revbump for glibc patches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/cross-i686-pc-linux-gnu/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template index eadf49f1b57..3b17881f2c5 100644 --- a/srcpkgs/cross-i686-pc-linux-gnu/template +++ b/srcpkgs/cross-i686-pc-linux-gnu/template @@ -11,7 +11,7 @@ _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} version=0.30 -revision=1 +revision=2 short_desc="GNU Cross toolchain for the ${_triplet} target (binutils/gcc/glibc)" maintainer="Juan RP " homepage="https://www.voidlinux.org/" From 60070a3bd12c95c25edfc949d45d7e29b1bdd2ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Tue, 28 May 2019 13:06:25 +0200 Subject: [PATCH 077/400] cross-powerpc-linux-gnu: revbump for glibc patches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/cross-powerpc-linux-gnu/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cross-powerpc-linux-gnu/template b/srcpkgs/cross-powerpc-linux-gnu/template index 95535d35e61..cd2ea3f1ce2 100644 --- a/srcpkgs/cross-powerpc-linux-gnu/template +++ b/srcpkgs/cross-powerpc-linux-gnu/template @@ -11,7 +11,7 @@ _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} version=0.30 -revision=1 +revision=2 short_desc="GNU Cross toolchain for the ${_triplet} target (binutils/gcc/glibc)" maintainer="Thomas Batten " homepage="http://www.voidlinux.eu" From 44ed458798e43a50c14879faba139f9f2a73f4ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Tue, 28 May 2019 13:06:25 +0200 Subject: [PATCH 078/400] cross-powerpc64-linux-gnu: revbump for glibc patches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/cross-powerpc64-linux-gnu/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cross-powerpc64-linux-gnu/template b/srcpkgs/cross-powerpc64-linux-gnu/template index c77b0b44ff5..3f531d96b26 100644 --- a/srcpkgs/cross-powerpc64-linux-gnu/template +++ b/srcpkgs/cross-powerpc64-linux-gnu/template @@ -9,7 +9,7 @@ _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} version=0.30 -revision=1 +revision=2 short_desc="GNU cross toolchain for the ${_triplet} targets (binutils/gcc/glibc)" maintainer="Jürgen Buchmüller " homepage="https://www.voidlinux.org/" From aecdf6d9f6a62e8de06395c8ca21fd9b79312750 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Tue, 28 May 2019 13:06:26 +0200 Subject: [PATCH 079/400] cross-powerpc64le-linux-gnu: revbump for glibc patches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/cross-powerpc64le-linux-gnu/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cross-powerpc64le-linux-gnu/template b/srcpkgs/cross-powerpc64le-linux-gnu/template index e38d9fc394e..bf4520116d4 100644 --- a/srcpkgs/cross-powerpc64le-linux-gnu/template +++ b/srcpkgs/cross-powerpc64le-linux-gnu/template @@ -9,7 +9,7 @@ _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} version=0.30 -revision=2 +revision=3 short_desc="GNU cross toolchain for the ${_triplet} targets (binutils/gcc/glibc)" maintainer="q66 " homepage="https://www.voidlinux.org/" From 55bfc073af0ed01a378c080d8e6a224b0b54a4a7 Mon Sep 17 00:00:00 2001 From: not-chicken Date: Tue, 28 May 2019 15:37:52 +0530 Subject: [PATCH 080/400] nnn: update to 2.5 --- srcpkgs/nnn/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/nnn/template b/srcpkgs/nnn/template index 6686fc704ce..850cf3f08a0 100644 --- a/srcpkgs/nnn/template +++ b/srcpkgs/nnn/template @@ -1,6 +1,6 @@ # Template file for 'nnn' pkgname=nnn -version=2.4 +version=2.5 revision=1 build_style=gnu-makefile hostmakedepends="pkg-config" @@ -11,7 +11,7 @@ license="BSD-2-Clause" homepage="https://github.com/jarun/nnn" changelog="https://raw.githubusercontent.com/jarun/nnn/master/CHANGELOG" distfiles="https://github.com/jarun/nnn/archive/v${version}.tar.gz" -checksum=859ba5bd4892016aed9a4830ee1e1b03eb74e94c4f1bd82f0288dc559f7327eb +checksum=3636f172a024de5c12420a80dbe3d006d42b5e0a17e70a527963c864af22655c post_install() { vlicense LICENSE From b4706b31cc062e85d90e70408b9cfd3c221f2cdc Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 28 May 2019 13:37:05 +0200 Subject: [PATCH 081/400] kubecfg: set version information. --- srcpkgs/kubecfg/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/kubecfg/template b/srcpkgs/kubecfg/template index 12c924be303..89307eabbc0 100644 --- a/srcpkgs/kubecfg/template +++ b/srcpkgs/kubecfg/template @@ -1,12 +1,13 @@ # Template file for 'kubecfg' pkgname=kubecfg -version=0.11.0 -revision=1 +version=0.12.0 +revision=2 build_style=go go_import_path="github.com/bitnami/kubecfg" +go_ldflags="-X main.version=v${version}" short_desc="Tool for managing Kubernetes resources as code" maintainer="Leah Neukirchen " license="Apache-2.0" homepage="https://github.com/bitnami/kubecfg" distfiles="https://github.com/bitnami/kubecfg/archive/v${version}.tar.gz" -checksum=79dcd7e680e2bba156e48ef7ecfa47b151560265b7bac9fdbe7bf193cddf3c28 +checksum=328acbf238b24a3cd25d13f872f6f640c4048ea8ca0120927349bd966e98ecc7 From 559cea984d6d742bf6b278610078417ddec5519e Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 28 May 2019 13:37:17 +0200 Subject: [PATCH 082/400] libnftnl: update to 1.1.3. --- srcpkgs/libnftnl/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libnftnl/template b/srcpkgs/libnftnl/template index 1cac9ce6935..688d6be3d48 100644 --- a/srcpkgs/libnftnl/template +++ b/srcpkgs/libnftnl/template @@ -1,6 +1,6 @@ # Template file for 'libnftnl' pkgname=libnftnl -version=1.1.2 +version=1.1.3 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" @@ -10,7 +10,7 @@ maintainer="Leah Neukirchen " license="GPL-2.0-or-later" homepage="https://www.netfilter.org/projects/libnftnl/" distfiles="https://www.netfilter.org/projects/${pkgname}/files/${pkgname}-${version}.tar.bz2" -checksum=a5c7b7a6c13c9c5898b13fcb1126fefce2015d5a96d7c354b19aaa40b6aece5d +checksum=22dd97d3b06ae8c67499506e2bfd6803ce116479076ec3700e7a4c7cd9fcba0f libnftnl-devel_package() { depends="${sourcepkg}>=${version}_${revision}" From 9f8a8555b2ae8d0367f4742fc2ce2a9ab5023d10 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 28 May 2019 13:37:20 +0200 Subject: [PATCH 083/400] sbcl: update to 1.5.3. --- srcpkgs/sbcl/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template index a3492f7ef54..45e3f8590e5 100644 --- a/srcpkgs/sbcl/template +++ b/srcpkgs/sbcl/template @@ -1,6 +1,6 @@ # Template file for 'sbcl' pkgname=sbcl -version=1.5.2 +version=1.5.3 revision=1 archs="i686 x86_64* armv7l aarch64" @@ -13,7 +13,7 @@ license="custom" homepage="http://www.sbcl.org/" changelog="http://www.sbcl.org/news.html" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.tar.bz2" -checksum=dac6aef3ec7628c284a31f2222ede5d47d9d94f9cfdffe0f00ef40f9531e3c3f +checksum=d2a7901144d227a7194661dc3ccee28873c8d5cbbd167013660c78b9ad63640c nocross=yes nopie=yes @@ -21,7 +21,7 @@ _bootstrap_lisp="bash ../sbcl-*-linux/run-sbcl.sh --no-sysinit --no-userinit --d case "$XBPS_TARGET_MACHINE" in x86_64) distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-x86-64-linux-binary.tar.bz2" - checksum+=" 22ccd9409b2ea16d4be69235c5ad5fde833452955cb24483815312d3b1d7401c" + checksum+=" 6fbd04e6fc81bc3b755372ba02410bc52466301b571337ff0a5f2b0ede6d76dc" ;; i686) distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.4.3-x86-linux-binary.tar.bz2" From 998aac300abce57662e745f94632ac2177a88c82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Tue, 28 May 2019 15:11:37 +0200 Subject: [PATCH 084/400] hooks/pre-pkg/05-prepare-32bit.sh: fix symlinks MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If lib32symlinks contains plain library names without a path as in the case of glibc (lib32symlinks="ld-linux.so.2") the expression ${f%/*} is not empty, but returns the basename. Handle that case by verifying that ${f%/*} is different from ${f}. Signed-off-by: Jürgen Buchmüller --- common/hooks/pre-pkg/05-prepare-32bit.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/common/hooks/pre-pkg/05-prepare-32bit.sh b/common/hooks/pre-pkg/05-prepare-32bit.sh index 2056d7fa9e8..fd6fdf88217 100644 --- a/common/hooks/pre-pkg/05-prepare-32bit.sh +++ b/common/hooks/pre-pkg/05-prepare-32bit.sh @@ -156,7 +156,11 @@ hook() { # Additional symlinks to the native libdir. for f in ${lib32symlinks}; do echo "$pkgver: symlinking $f to the native libdir..." - mkdir -p ${destdir32}/usr/lib{,32}/${f%/*}/ + if [ "${f%/*}" != "${f}" ]; then + mkdir -p ${destdir32}/usr/lib{,32}/${f%/*}/ + else + mkdir -p ${destdir32}/usr/lib{,32}/ + fi ln -sfr ${destdir32}/usr/lib32/$f ${destdir32}/usr/lib/$f done # If it's a development pkg add a dependency to the 64bit pkg. From a5f1853bb623c3fac87b8c625ec5952a8e1dfbc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Tue, 28 May 2019 15:16:20 +0200 Subject: [PATCH 085/400] glibc: revbump for glibc-32bit symlink MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/glibc/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template index 29358d3ef79..db4c5f025ea 100644 --- a/srcpkgs/glibc/template +++ b/srcpkgs/glibc/template @@ -1,7 +1,7 @@ # Template file for 'glibc' pkgname=glibc version=2.29 -revision=4 +revision=5 bootstrap=yes short_desc="GNU C library" maintainer="Juan RP " From fe883cd611e580f1e0eb45ff7b11ec3a0153455c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sin=C3=A9sio=20Neto?= Date: Fri, 24 May 2019 18:22:55 -0300 Subject: [PATCH 086/400] i3lockr: update to 1.0.0. --- srcpkgs/i3lockr/template | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/srcpkgs/i3lockr/template b/srcpkgs/i3lockr/template index 4c1b76f8031..4b261d4d45d 100644 --- a/srcpkgs/i3lockr/template +++ b/srcpkgs/i3lockr/template @@ -1,6 +1,6 @@ # Template file for 'i3lockr' pkgname=i3lockr -version=0.1.1 +version=1.0.0 revision=1 build_style=cargo hostmakedepends="python3" @@ -10,10 +10,8 @@ maintainer="Sinésio Neto " license="MIT, Apache-2.0" homepage="https://github.com/owenthewizard/i3lockr" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=da72b6a0e6231bc966e09b06234508b325d8887480be2d1764147451c5fc6bba +checksum=d4b31fb67cbb4d231437e02589146a1cfea7d49afbaf123109f6b0eec359d71c post_install() { vlicense LICENSE-MIT.md } - - From 9a25be77530ea4c3e6db53950f763c56c8246425 Mon Sep 17 00:00:00 2001 From: Imran Khan Date: Sun, 26 May 2019 18:13:59 +0000 Subject: [PATCH 087/400] New package: cutechess-gui-1.0.0 --- srcpkgs/cutechess-cli | 1 + srcpkgs/cutechess-gui/template | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 120000 srcpkgs/cutechess-cli create mode 100644 srcpkgs/cutechess-gui/template diff --git a/srcpkgs/cutechess-cli b/srcpkgs/cutechess-cli new file mode 120000 index 00000000000..dc1bda2e124 --- /dev/null +++ b/srcpkgs/cutechess-cli @@ -0,0 +1 @@ +cutechess-gui \ No newline at end of file diff --git a/srcpkgs/cutechess-gui/template b/srcpkgs/cutechess-gui/template new file mode 100644 index 00000000000..3aca9dc84c9 --- /dev/null +++ b/srcpkgs/cutechess-gui/template @@ -0,0 +1,32 @@ +# Template file for 'cutechess-gui' +pkgname=cutechess-gui +version=1.0.0 +revision=1 +build_style=qmake +hostmakedepends="qt5-qmake" +makedepends="qt5-devel qt5-svg-devel" +short_desc="GUI for playing chess" +maintainer="Imran Khan " +license="GPL-3.0-or-later, MIT" +homepage="https://github.com/cutechess/cutechess" +distfiles="https://github.com/cutechess/cutechess/archive/gui-${version}.tar.gz" +checksum=b85967c225e70eed88c1b64d42542bdb21c8f3f52fd17765200073e390aaba04 + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" qt5-host-tools qt5-devel qt5-svg-devel" +fi + +do_install() { + vbin projects/gui/cutechess + vinstall dist/linux/cutechess.desktop 644 usr/share/applications + sed -n '2,23s:^[ ]*::p' projects/gui/components/pgnhighlighter/src/pgnhighlighter.h > COPYING.gui + vlicense COPYING.gui +} + +cutechess-cli_package() { + short_desc="CLI tool to automate chess engine tournaments" + pkg_install() { + vbin projects/cli/cutechess-cli + vman docs/cutechess-cli.6 + } +} From 10976a5e3adab2f15e057b22f73204c29d60ab6a Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Tue, 28 May 2019 16:36:02 +0200 Subject: [PATCH 088/400] qalculate: update to 3.2.0. --- srcpkgs/qalculate/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template index 82ab23ab502..a50d82582c1 100644 --- a/srcpkgs/qalculate/template +++ b/srcpkgs/qalculate/template @@ -1,6 +1,6 @@ # Template file for 'qalculate' pkgname=qalculate -version=3.1.0 +version=3.2.0 revision=1 wrksrc="lib${pkgname}-${version}" build_style=gnu-configure @@ -12,7 +12,7 @@ maintainer="Helmut Pozimski " license="GPL-2.0-or-later" homepage="https://qalculate.github.io" distfiles="https://github.com/Qalculate/libqalculate/releases/download/v${version}/libqalculate-${version}.tar.gz" -checksum=40174309c59a0eebdc42d63b230662d8b897bee21a6a31f10d7387b17b133a11 +checksum=15a7456eb084ecacf3959b78cd764371e4f68a4a9cc3655ec4f335ca14cdefd9 libqalculate-data_package() { archs=noarch From 9cb539f1b5679a82842bb6abb612fa140b2b07b2 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Tue, 28 May 2019 16:39:03 +0200 Subject: [PATCH 089/400] qalculate-gtk: update to 3.2.0. --- srcpkgs/qalculate-gtk/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qalculate-gtk/template b/srcpkgs/qalculate-gtk/template index ca410226cae..1d16a1dee15 100644 --- a/srcpkgs/qalculate-gtk/template +++ b/srcpkgs/qalculate-gtk/template @@ -1,6 +1,6 @@ # Template file for 'qalculate-gtk' pkgname=qalculate-gtk -version=3.1.0 +version=3.2.0 revision=1 build_style=gnu-configure hostmakedepends="intltool pkg-config" @@ -11,4 +11,4 @@ maintainer="Helmut Pozimski " license="GPL-2.0-or-later" homepage="https://qalculate.github.io" distfiles="https://github.com/Qalculate/qalculate-gtk/releases/download/v${version}/qalculate-gtk-${version}.tar.gz" -checksum=62ab7bc95ed5c7973d4b1c0aea416d622b9cfb3b027e4a59f5524584b821cbba +checksum=b9374d6c253418c8666db29102ff7525b9785a123318702a55c422b70c1b36b5 From 0c719ffe53f783cc0e9d412dc604e37248f62789 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Tue, 28 May 2019 22:30:40 +0200 Subject: [PATCH 090/400] firejail: update to 0.9.60. --- srcpkgs/firejail/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/firejail/template b/srcpkgs/firejail/template index f6698dbe827..c87ec1fc78a 100644 --- a/srcpkgs/firejail/template +++ b/srcpkgs/firejail/template @@ -1,6 +1,6 @@ # Template file for 'firejail' pkgname=firejail -version=0.9.58.2 +version=0.9.60 revision=1 build_style=gnu-configure configure_args="--enable-apparmor" @@ -11,7 +11,7 @@ license="GPL-2.0-or-later" homepage="https://firejail.wordpress.com" #changelog="https://raw.githubusercontent.com/netblue30/firejail/master/RELNOTES" distfiles="https://github.com/netblue30/firejail/archive/${version}.tar.gz" -checksum=80a7afb2aa128cbffe537eaa2cad82fe8ecd7879184f5aa0d2ff12268e8edab8 +checksum=dd3059b19365c2c095b85e3f86737fdcaca0a05357680f0e377bebf07791bc70 conf_files="/etc/firejail/* /etc/apparmor.d/local/firejail-local" if [ "$CROSS_BUILD" ]; then From 9c46f444fc8a31837fb6e53295ea9f9e5ca2d0e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Wed, 29 May 2019 12:33:25 +0200 Subject: [PATCH 091/400] netpbm: enable cross build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/netpbm/template | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template index 3eff398d361..b5cf84de0e1 100644 --- a/srcpkgs/netpbm/template +++ b/srcpkgs/netpbm/template @@ -18,7 +18,6 @@ distfiles="https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash}.t https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz" checksum="8803d0a9d9f70f3c0266564cedbefa9c5fdccaf1a7949425b8bee1e86da3d152 0cd2e34b79f98009a1779425b403bc185b5827394d2962eca03a26431a72652a" -nocross=yes post_extract() { cd $build_wrksrc @@ -31,6 +30,7 @@ post_extract() { } do_configure() { + local endian bitsperlong cat config.mk.in ${FILESDIR}/config.mk >config.mk if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then echo "WANT_SSE = Y" >>config.mk @@ -38,6 +38,27 @@ do_configure() { sed -i 's|misc|share/netpbm|' common.mk sed -i 's|/link|/lib|' lib/Makefile sed -i 's|install.manwebmain install.manweb install.man|install.man|' GNUmakefile + if [ "$CROSS_BUILD" ]; then + # Patch buildutils/endiangen.c to return the endianess + # and word size for the target architecture + # XXX: perhaps add XBPS_ENDIAN to common/cross-profiles/*.sh + case "$XBPS_TARGET_MACHINE" in + ppc|ppc-musl|ppc64|ppc64-musl) endian="ENDIAN_BIG";; + *) endian="ENDIAN_LITTLE";; + esac + # XXX: perhaps add XBPS_BITSPERLONG to common/cross-files/*.sh + case "$XBPS_TARGET_MACHINE" in + aarch64*|x86_64*|ppc64*) bitsperlong="64";; + *) bitsperlong="32";; + esac + vsed -i buildtools/endiangen.c \ + -e "s;byteOrder();$endian;" \ + -e "s;bitsPerLong();$bitsperlong;" + # ... now build the tools for the host + CC=$CC_host CFLAGS="$CFLAGS_host" \ + LD=$LD_host LDFLAGS="$LDFLAGS_host" \ + make -C buildtools + fi } do_build() { From 5c542065e87ce9e6895e7340a9c1927f84fa62b8 Mon Sep 17 00:00:00 2001 From: Paper Mountain Studio Date: Wed, 29 May 2019 12:04:59 +0200 Subject: [PATCH 092/400] mupdf: fix symlink --- srcpkgs/mupdf/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mupdf/template b/srcpkgs/mupdf/template index aad45a9dda8..02b3c7e78e2 100644 --- a/srcpkgs/mupdf/template +++ b/srcpkgs/mupdf/template @@ -1,7 +1,7 @@ # Template file for 'mupdf' pkgname=mupdf version=1.15.0 -revision=1 +revision=2 wrksrc="${pkgname}-${version}-source" hostmakedepends="pkg-config zlib-devel libcurl-devel freetype-devel libjpeg-turbo-devel jbig2dec-devel libXext-devel libXcursor-devel @@ -41,7 +41,7 @@ do_build() { do_install() { make USE_SYSTEM_LIBS=yes build=release prefix=${DESTDIR}/usr install - ln -rs ${DESTDIR}/usr/bin/mupdf-x11-curl ${DESTDIR}/usr/bin/mupdf + ln -rs ${DESTDIR}/usr/bin/mupdf-x11 ${DESTDIR}/usr/bin/mupdf vinstall ${FILESDIR}/mupdf.xpm 644 usr/share/pixmaps vinstall ${FILESDIR}/mupdf.desktop 644 usr/share/applications From 4aca40746c4901db40a48a786a7eab74d7da00ad Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Tue, 28 May 2019 15:06:30 -0500 Subject: [PATCH 093/400] renderdoc: update to 1.4 --- srcpkgs/renderdoc/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/renderdoc/template b/srcpkgs/renderdoc/template index 0875b30edd7..32d051864d3 100644 --- a/srcpkgs/renderdoc/template +++ b/srcpkgs/renderdoc/template @@ -1,6 +1,6 @@ # Template file for 'renderdoc' pkgname=renderdoc -version=1.2 +version=1.4 revision=1 build_style=cmake configure_args="-DENABLE_GL=ON -DENABLE_GLES=ON -DENABLE_QRENDERDOC=ON @@ -14,7 +14,7 @@ maintainer="Urs Schulz " license="MIT" homepage="https://github.com/baldurk/renderdoc" distfiles="https://github.com/baldurk/${pkgname}/archive/v${version}.tar.gz" -checksum=5050be7eea5f5721f530ad3d58ac80b3d47e1b81347e6551e4281bd06cf97a3a +checksum=9a78951f386fb7c3ecf7df6919d300db59719d14f0621438963ae30a75d33677 case "$XBPS_TARGET_MACHINE" in *-musl) broken="This package uses execnfo.h which is not available on musl" From 51628c8b87b59c640981115dd1987d1003a33b1c Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Tue, 28 May 2019 14:46:38 -0500 Subject: [PATCH 094/400] flare-engine: update to 1.10 --- srcpkgs/flare-engine/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/flare-engine/template b/srcpkgs/flare-engine/template index 93a0df09524..aa480d35d01 100644 --- a/srcpkgs/flare-engine/template +++ b/srcpkgs/flare-engine/template @@ -1,6 +1,6 @@ # Template file for 'flare-engine' pkgname=flare-engine -version=1.09.01 +version=1.10 revision=1 build_style=cmake configure_args="-DBINDIR=/usr/bin -DDATADIR=share/flare" @@ -12,7 +12,7 @@ license="GPL-3.0-or-later" homepage="http://flarerpg.org/" changelog="https://raw.githubusercontent.com/flareteam/flare-engine/master/RELEASE_NOTES.txt" distfiles="https://github.com/flareteam/flare-engine/archive/v${version}.tar.gz" -checksum=c6d56c7e379a3757fdb3eb20a2a032199bfaf47325a748cece997a8a21b9e3fc +checksum=adec72c1dbe49c6ab99cfa0677254a5f279e486763f43e4e8ed433d00057da07 flare-engine-data_package() { short_desc+=" - data" From 6a381212125da0834c0c386c6e7c8c6144168a0a Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Tue, 28 May 2019 14:31:42 -0500 Subject: [PATCH 095/400] jmol: update to 14.29.42 --- srcpkgs/jmol/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/jmol/template b/srcpkgs/jmol/template index 762e04e525d..b0a7403c1a0 100644 --- a/srcpkgs/jmol/template +++ b/srcpkgs/jmol/template @@ -1,6 +1,6 @@ # Template file for 'jmol' pkgname=jmol -version=14.29.32 +version=14.29.42 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="b19dd27eb6cd23ed53e2ca8532fb3b3206155f55cc191cfa68577a49ab46f44a +checksum="d762553e4bb3bd80c5bf900898e8afbd36c69db46f055cc8af5f29c33a8bfa3a d84e5e4b5c9b440b3b90432db87e0d4bd5c8237d7d2891c174fac71f0a5a2127" skip_extraction="Jmol_icon_128.png" nocross="openjdk is nocross" From 3dc9a671e231a1ac68d76ab4b9c658245cbaab34 Mon Sep 17 00:00:00 2001 From: Paper Mountain Studio Date: Tue, 28 May 2019 11:47:08 +0200 Subject: [PATCH 096/400] bftpd: update to 5.1 --- srcpkgs/bftpd/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/bftpd/template b/srcpkgs/bftpd/template index f2ec7aff294..c0e566e7878 100644 --- a/srcpkgs/bftpd/template +++ b/srcpkgs/bftpd/template @@ -1,17 +1,17 @@ # Template file for 'bftpd' pkgname=bftpd -version=5.0 +version=5.1 revision=1 wrksrc="$pkgname" build_style=gnu-configure configure_args="--enable-libz" makedepends="zlib-devel" -short_desc="A simple FTP server" +short_desc="Simple FTP server" maintainer="Norbert Vegh " license="GPL-2" homepage="http://bftpd.sourceforge.net/" -checksum=177b905e9da308d7b341cabef315c909e0e0ca3c44e63d1e9c74fdf396c64fe1 distfiles="${SOURCEFORGE_SITE}/bftpd/bftpd-${version}.tar.gz" +checksum=d0173b6c7ee2df202a270561b8fb470af8df37409a7eec87f3c333c393ee65ce pre_build() { sed -i "s|LDFLAGS=$|LDFLAGS=${LDFLAGS}|" Makefile From 73dce99add3cfff22e79cdef63d1bea504818ad8 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Tue, 28 May 2019 14:27:10 -0500 Subject: [PATCH 097/400] freeplane: update to 1.7.8 --- srcpkgs/freeplane/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/freeplane/template b/srcpkgs/freeplane/template index 1c0d896e7fb..c7e91d8d434 100644 --- a/srcpkgs/freeplane/template +++ b/srcpkgs/freeplane/template @@ -1,6 +1,6 @@ # Template file for 'freeplane' pkgname=freeplane -version=1.7.7 +version=1.7.8 revision=1 archs=noarch hostmakedepends="apache-ant openjdk unzip gradle" @@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni " license="GPL-2.0-or-later" homepage="http://freeplane.sourceforge.net/" distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname%20stable/${pkgname}_src-$version.tar.gz" -checksum=4a78ca91dc31e3f93c622bb70b8586719cf7f8d052cab2be01cd0e98b90907f1 +checksum=a96d8f5c85219276ee8456a8f08cfe96cd98be2d4a0eb51b9697091849ba44b5 make_dirs=" /usr/share/freeplane/fwdir/condperm/ 755 root root From ed80d6e161406d10f2315dbfe1b112128ac47b09 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Tue, 28 May 2019 14:51:33 -0500 Subject: [PATCH 098/400] vte3: update to 0.56.3 --- srcpkgs/vte3/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template index 01bb685d496..7fe00d03692 100644 --- a/srcpkgs/vte3/template +++ b/srcpkgs/vte3/template @@ -1,6 +1,6 @@ # Template file for 'vte3' pkgname=vte3 -version=0.56.2 +version=0.56.3 revision=1 wrksrc="vte-${version}" build_style=gnu-configure @@ -16,7 +16,7 @@ maintainer="Enno Boland " license="GPL-3.0-or-later, LGPL-2.1-or-later, LGPL-3.0-or-later" homepage="https://wiki.gnome.org/Apps/Terminal/VTE" distfiles="${GNOME_SITE}/vte/${version%.*}/vte-${version}.tar.xz" -checksum=6e95357098752848c78892b00c434b5c63c7a7f0db7425773be3aabf7013d237 +checksum=17a1d4bc8848f1d2acfa4c20aaa24b9bac49f057b8909c56d3dafec2e2332648 # Suppress warnings as errors for NULL format strings (musl libc) CXXFLAGS="-Wno-error=format=" From 1f6f736fb49be73c4d412248cc5647a6ed31b15a Mon Sep 17 00:00:00 2001 From: Piraty Date: Fri, 8 Jun 2018 15:18:53 +0200 Subject: [PATCH 099/400] texstudio: update to 2.12.16 --- srcpkgs/texstudio/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/texstudio/template b/srcpkgs/texstudio/template index 5aebe0e428e..b29b5fe630b 100644 --- a/srcpkgs/texstudio/template +++ b/srcpkgs/texstudio/template @@ -1,12 +1,13 @@ # Template file for 'texstudio' pkgname=texstudio -version=2.12.14 +version=2.12.16 revision=1 build_style=qmake -configure_args="$(vopt_if phonon PHONON=true) - $(vopt_if poppler '' NO_POPPLER_PREVIEW=true)" +configure_args="USE_SYSTEM_HUNSPELL=y USE_SYSTEM_QUAZIP=y + $(vopt_if phonon PHONON=true) $(vopt_if poppler '' NO_POPPLER_PREVIEW=true)" hostmakedepends="pkg-config qt5-qmake" makedepends="qt5-webkit-devel qt5-svg-devel qt5-script-devel qt5-tools-devel + hunspell-devel quazip-qt5-devel $(vopt_if phonon phonon-qt5-devel) $(vopt_if poppler poppler-qt5-devel)" depends="qt5-svg" short_desc="Powerful Tex/LaTeX editor based on texmaker" @@ -14,7 +15,7 @@ maintainer="Piraty " license="GPL-2.0-or-later" homepage="https://texstudio.org/" distfiles="https://github.com/texstudio-org/texstudio/archive/${version}.tar.gz" -checksum=61df71f368bbf21f865645534f63840fd48dbd2996d6d0188aa26d3b647fede0 +checksum=a14b8912bfd15d982cfbe5f00deed37ca85fb6e38d3aa0c2dac23b4ecaab0984 build_options="phonon poppler" desc_option_phonon="build with phonon support" From 228d792880549cf823d9838d221f3dbde79f9a98 Mon Sep 17 00:00:00 2001 From: Dawid Potocki Date: Wed, 29 May 2019 15:05:58 +1200 Subject: [PATCH 100/400] yaru: update to 19.04.2 --- srcpkgs/yaru/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/yaru/template b/srcpkgs/yaru/template index 6840d85e434..a3924839edd 100644 --- a/srcpkgs/yaru/template +++ b/srcpkgs/yaru/template @@ -1,6 +1,6 @@ # Template file for 'yaru' pkgname=yaru -version=19.04.1 +version=19.04.2 revision=1 archs=noarch build_style=meson @@ -11,4 +11,4 @@ maintainer="Dawid Potocki " license="GPL-3.0-or-later, CC-BY-SA-4.0" homepage="https://github.com/ubuntu/yaru" distfiles="https://github.com/ubuntu/yaru/archive/$version.tar.gz" -checksum=1be0954421b934c8381a0b87ff356c9d3daa7eb4545ef6c812cf739d1b373266 +checksum=7a5d3cea919bb9b92fa929bbf8bfd76f7b5bf640ddeb1f256e785d5f7b0e5bf1 From 512cdcc4e05a8eb686be39b71286efed3e9f59b0 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 24 May 2019 21:41:09 +0200 Subject: [PATCH 101/400] deepin-screenshot: update to 4.2.0. --- srcpkgs/deepin-screenshot/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/deepin-screenshot/template b/srcpkgs/deepin-screenshot/template index 595104884e8..8441bde1e19 100644 --- a/srcpkgs/deepin-screenshot/template +++ b/srcpkgs/deepin-screenshot/template @@ -1,6 +1,6 @@ # Template file for 'deepin-screenshot' pkgname=deepin-screenshot -version=4.1.11 +version=4.2.0 revision=1 build_style=cmake hostmakedepends="pkg-config qt5-qmake" @@ -13,7 +13,7 @@ license="GPL-3.0-or-later" homepage="https://github.com/linuxdeepin/deepin-screenshot" changelog="https://github.com/linuxdeepin/deepin-screenshot/blob/${version}/CHANGELOG.md" distfiles="https://github.com/linuxdeepin/deepin-screenshot/archive/${version}.tar.gz" -checksum=8019584d8fa0b72d02b807d17a0ef13759a171e66d2314e828313336dabef71d +checksum=53f04b3866a087dacc61323ebedcf2969ea4aac5f27482dcd0f20f2af5a3dccb CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libdtk-2.0.6/DWidget" CXXFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/libdtk-2.0.6/DCore" CXXFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/libdtk-2.0.6/DWm" From 9efe517a6f52b1cd39a38020cdc2d4afba9e7912 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 24 May 2019 21:41:15 +0200 Subject: [PATCH 102/400] frameworkintegration: update to 5.58.2. --- srcpkgs/frameworkintegration/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/frameworkintegration/template b/srcpkgs/frameworkintegration/template index 46c04d268ad..47460253d0b 100644 --- a/srcpkgs/frameworkintegration/template +++ b/srcpkgs/frameworkintegration/template @@ -1,6 +1,6 @@ # Template file for 'frameworkintegration' pkgname=frameworkintegration -version=5.58.1 +version=5.58.2 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=30a9e6c4bde295a031f94ea622ce2324b8a98536f51f0a008b148ea11c44a274 +checksum=ffd5ef5191bfa4810ae394303daf2ded6904cc3e5743b3e82f0c21e4a110053c if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake python" From 58029a47987b249ea7982720beff8b6c82c703b4 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 25 May 2019 17:54:44 +0200 Subject: [PATCH 103/400] proj: update to 6.1.0. --- common/shlibs | 2 +- srcpkgs/proj/template | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/common/shlibs b/common/shlibs index 63a3accb9b0..c8da71f4ee1 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2858,7 +2858,7 @@ libunshield.so.0 libunshield-0.6_1 libMyGUIEngine.so.3 libmygui-3.2.2_1 libEditorFramework.so libmygui-devel-3.2.2_3 Plugin_StrangeButton.so libmygui-devel-3.2.2_3 -libproj.so.15 proj-6.0.0_1 +libproj.so.16 proj-6.1.0_1 libnlopt.so.0 nlopt-2.4.2_1 libeb.so.16 libeb-4.3.3_1 libchipcard.so.6 libchipcard-5.0.4_1 diff --git a/srcpkgs/proj/template b/srcpkgs/proj/template index ef15b305444..9a2bf607c54 100644 --- a/srcpkgs/proj/template +++ b/srcpkgs/proj/template @@ -1,8 +1,9 @@ # Template file for 'proj' pkgname=proj -version=6.0.0 +version=6.1.0 revision=1 build_style=cmake +configure_args="-DPROJ_TESTS=OFF" hostmakedepends="python3" makedepends="sqlite-devel" short_desc="Cartographic Projections Library" @@ -10,7 +11,7 @@ maintainer="John " license="MIT" homepage="https://proj4.org" distfiles="https://download.osgeo.org/proj/proj-${version}.tar.gz" -checksum=4510a2c1c8f9056374708a867c51b1192e8d6f9a5198dd320bf6a168e44a3657 +checksum=676165c54319d2f03da4349cbd7344eb430b225fe867a90191d848dc64788008 post_install() { vlicense COPYING From 346f6fe09150a6c673f9274b85752297757e8457 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 25 May 2019 19:04:54 +0200 Subject: [PATCH 104/400] sumo: rebump for proj-6.1.0 --- srcpkgs/sumo/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/sumo/template b/srcpkgs/sumo/template index c8682a127de..506589ca5a5 100644 --- a/srcpkgs/sumo/template +++ b/srcpkgs/sumo/template @@ -1,7 +1,7 @@ # Template file for 'sumo' pkgname=sumo version=1.2.0 -revision=2 +revision=3 build_style=cmake hostmakedepends="libgdal-tools pkg-config swig python3" makedepends="fox-devel gl2ps-devel libgdal-devel libxerces-c-devel osg-devel proj-devel" From 23f4a5571393455413c57ad351597478166ac1b6 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 25 May 2019 19:04:54 +0200 Subject: [PATCH 105/400] libgdal: rebump for proj-6.1.0 --- srcpkgs/libgdal/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template index 4c5a91b5014..3bd19133fdc 100644 --- a/srcpkgs/libgdal/template +++ b/srcpkgs/libgdal/template @@ -1,7 +1,7 @@ # Template file for 'libgdal' pkgname=libgdal version=3.0.0 -revision=1 +revision=2 wrksrc="gdal-${version}" build_style=gnu-configure configure_args="--with-liblzma --with-webp --with-zstd --with-podofo" From 7fe5aef6c143dbd4e0d9696ba68cb5682ae30d8d Mon Sep 17 00:00:00 2001 From: John Date: Sat, 25 May 2019 19:04:54 +0200 Subject: [PATCH 106/400] merkaartor: rebump for proj-6.1.0 --- srcpkgs/merkaartor/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/merkaartor/template b/srcpkgs/merkaartor/template index 6a1dedbb469..3ee40185ab7 100644 --- a/srcpkgs/merkaartor/template +++ b/srcpkgs/merkaartor/template @@ -1,7 +1,7 @@ # Template file for 'merkaartor' pkgname=merkaartor version=0.18.3 -revision=8 +revision=9 build_style=qmake configure_args="SYSTEM_QUAZIP=1 SYSTEM_QUAZIP_LDFLAGS=-lquazip5" hostmakedepends="qt5-qmake libgdal-tools" From f9b9e12a1f911c40f2ad7d578fae247504fa10b8 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 25 May 2019 19:04:54 +0200 Subject: [PATCH 107/400] OpenOrienteering-Mapper: rebump for proj-6.1.0 --- srcpkgs/OpenOrienteering-Mapper/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/OpenOrienteering-Mapper/template b/srcpkgs/OpenOrienteering-Mapper/template index b86a306e076..8e8c4b625c6 100644 --- a/srcpkgs/OpenOrienteering-Mapper/template +++ b/srcpkgs/OpenOrienteering-Mapper/template @@ -1,7 +1,7 @@ # Template file for 'OpenOrienteering-Mapper' pkgname=OpenOrienteering-Mapper version=0.8.4 -revision=2 +revision=3 wrksrc="mapper-${version}" build_style=cmake hostmakedepends="doxygen qt5-host-tools qt5-plugin-sqlite qt5-qmake qt5-tools" From 78bd4eb7a6a2471afe45c84bf5e2bb5dea1fced2 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 25 May 2019 19:04:55 +0200 Subject: [PATCH 108/400] XyGrib: rebump for proj-6.1.0 --- srcpkgs/XyGrib/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/XyGrib/template b/srcpkgs/XyGrib/template index 181e8c693c8..59b12d92bb1 100644 --- a/srcpkgs/XyGrib/template +++ b/srcpkgs/XyGrib/template @@ -1,7 +1,7 @@ # Template file for 'XyGrib' pkgname=XyGrib version=1.2.4 -revision=2 +revision=3 patch_args="-Np1" build_style=cmake hostmakedepends="qt5-devel pkg-config" From 1210f529b6662cb9c0efaf453d83a6de1da072c7 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 25 May 2019 19:04:55 +0200 Subject: [PATCH 109/400] grass: rebump for proj-6.1.0 --- srcpkgs/grass/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/grass/template b/srcpkgs/grass/template index de0fd44d207..1c9c90e7c2d 100644 --- a/srcpkgs/grass/template +++ b/srcpkgs/grass/template @@ -1,7 +1,7 @@ # Template file for 'grass' pkgname=grass version=7.6.1 -revision=1 +revision=2 _binver=${version//./} _binver=${_binver:0:2} build_style=gnu-configure From c9ed9504eeb941bda742b7e7e1121d14ce26a9fd Mon Sep 17 00:00:00 2001 From: John Date: Sat, 25 May 2019 19:04:55 +0200 Subject: [PATCH 110/400] postgis: rebump for proj-6.1.0 --- srcpkgs/postgis/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/postgis/template b/srcpkgs/postgis/template index b16fd06d90d..2dd7858ffc7 100644 --- a/srcpkgs/postgis/template +++ b/srcpkgs/postgis/template @@ -1,7 +1,7 @@ # Template file for 'postgis' pkgname=postgis version=2.5.2 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-projdir=${XBPS_CROSS_BASE}/usr --with-projdir=${XBPS_CROSS_BASE}/usr From 0151a88d1506ac1cf10babbabdc28e5dee45bc54 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 28 May 2019 23:57:28 +0200 Subject: [PATCH 111/400] krita: update to 4.2.0. --- common/shlibs | 50 +++++++++++++++++++++--------------------- srcpkgs/krita/template | 6 ++--- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/common/shlibs b/common/shlibs index c8da71f4ee1..527bca80f5d 100644 --- a/common/shlibs +++ b/common/shlibs @@ -918,31 +918,31 @@ libdmapsharing-3.0.so.2 libdmapsharing-2.9.12_1 libgexiv2.so.2 libgexiv2-0.6.1_1 libraw.so.19 libraw-0.19.0_1 libraw_r.so.19 libraw-0.19.0_1 -libkritaversion.so.17 krita-4.1.0_4 -libkritaglobal.so.17 krita-4.1.0_4 -libkritaplugin.so.17 krita-4.1.0_4 -libkritawidgetutils.so.17 krita-4.1.0_4 -libkritawidgets.so.17 krita-4.1.0_4 -libkritastore.so.17 krita-4.1.0_4 -libkritaodf.so.17 krita-4.1.0_4 -libkritaflake.so.17 krita-4.1.0_4 -libkritabasicflakes.so.17 krita-4.1.0_4 -libkritapigment.so.17 krita-4.1.0_4 -libkritacommand.so.17 krita-4.1.0_4 -libkritalibbrush.so.17 krita-4.1.0_4 -libkritapsd.so.17 krita-4.1.0_4 -libkritacolor.so.17 krita-4.1.0_4 -libkritacolord.so.17 krita-4.1.0_4 -libkritaimage.so.17 krita-4.1.0_4 -libkritaui.so.17 krita-4.1.0_4 -libkritavectorimage.so.17 krita-4.1.0_4 -libkritaimpex.so.17 krita-4.1.0_4 -libkritalibkis.so.17 krita-4.1.0_4 -libkritaqml.so.17 krita-4.1.0_4 -libkritatextlayout.so.17 krita-4.1.0_4 -libkritatext.so.17 krita-4.1.0_4 -libkritalibkra.so.17 krita-4.1.0_4 -libkritalibpaintop.so.17 krita-4.1.0_4 +libkritaversion.so.18 krita-4.2.0_1 +libkritaglobal.so.18 krita-4.2.0_1 +libkritaplugin.so.18 krita-4.2.0_1 +libkritawidgetutils.so.18 krita-4.2.0_1 +libkritawidgets.so.18 krita-4.2.0_1 +libkritastore.so.18 krita-4.2.0_1 +libkritaodf.so.18 krita-4.2.0_1 +libkritaflake.so.18 krita-4.2.0_1 +libkritabasicflakes.so.18 krita-4.2.0_1 +libkritapigment.so.18 krita-4.2.0_1 +libkritacommand.so.18 krita-4.2.0_1 +libkritalibbrush.so.18 krita-4.2.0_1 +libkritapsd.so.18 krita-4.2.0_1 +libkritacolor.so.18 krita-4.2.0_1 +libkritacolord.so.18 krita-4.2.0_1 +libkritaimage.so.18 krita-4.2.0_1 +libkritaui.so.18 krita-4.2.0_1 +libkritavectorimage.so.18 krita-4.2.0_1 +libkritaimpex.so.18 krita-4.2.0_1 +libkritalibkis.so.18 krita-4.2.0_1 +libkritaqml.so.18 krita-4.2.0_1 +libkritatextlayout.so.18 krita-4.2.0_1 +libkritatext.so.18 krita-4.2.0_1 +libkritalibkra.so.18 krita-4.2.0_1 +libkritalibpaintop.so.18 krita-4.2.0_1 libdjvulibre.so.21 libdjvulibre-3.5.24_1 libgxps.so.2 libgxps-0.2.0_1 libt1.so.5 libt1-5.1.2_1 diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template index f29a6e387d3..2b3bc6c0745 100644 --- a/srcpkgs/krita/template +++ b/srcpkgs/krita/template @@ -1,6 +1,6 @@ # Template file for 'krita' pkgname=krita -version=4.1.8 +version=4.2.0 revision=1 build_style=cmake configure_args="-Wno-dev -DBUILD_TESTING=OFF" @@ -10,12 +10,12 @@ makedepends="karchive-devel kconfig-devel kwidgetsaddons-devel kcompletion-devel kwindowsystem-devel kio-devel kcrash-devel qt5-svg-devel qt5-multimedia-devel boost-devel gsl-devel tiff-devel libjpeg-turbo-devel libraw-devel fftw-devel opencolorio-devel eigen vc exiv2-devel libXi-devel libopenexr-devel libgomp-devel - poppler-qt5-devel giflib-devel python3-sip-devel python3-PyQt5" + poppler-qt5-devel giflib-devel python3-sip-devel python3-PyQt5 quazip-devel" short_desc="Painting and image editing program" maintainer="John " license="GPL-3.0-only" homepage="https://krita.org/" distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.gz" -checksum=0476c9e2279f0ae690c2ed02e1aa9c3d491943643f9859355a02657318bd5940 +checksum=d5eb5cce8bdb68bc669e8f8f6a41d09821bcc4ef5a4c99de6f7838b1c884abd0 nocross=yes replaces="calligra-krita>=0" From d64ef2012534e164b969d6d1fac0c5c69915f91a Mon Sep 17 00:00:00 2001 From: John Date: Wed, 29 May 2019 01:28:51 +0200 Subject: [PATCH 112/400] amdvlk: update to 2019.Q2.4. --- srcpkgs/amdvlk/template | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/srcpkgs/amdvlk/template b/srcpkgs/amdvlk/template index 1104fc299cc..81915407cc7 100644 --- a/srcpkgs/amdvlk/template +++ b/srcpkgs/amdvlk/template @@ -1,13 +1,13 @@ # Template file for 'amdvlk' pkgname=amdvlk -version=2019.Q2.3 +version=2019.Q2.4 revision=1 -_llpc_commit=fdd5e24be2d9031ab685690cad1c9259d96518f6 -_xgl_commit=eaecf6b9ad7bc3d310e752528f84fd52fba23747 -_pal_commit=fb9a4dc951c0afd737460b26afb716c96e966b77 -_llvm_commit=f41e1a873108a371ae5574d518c1ee6eb3814cee +_llpc_commit=b153a902b0a574fb0ab2356c87c3446d9a9d80b2 +_xgl_commit=4d91a4045078cf6884ee05007eac9eec2b881dbb +_pal_commit=9a1f99f049f3b417242dc7c09b86c52fd7d9ceaf +_llvm_commit=4305f776f1207189667a383e22661ccd1e99cd25 _wsa_commit=f558403d3292039de4d17334e562bda58abfc72c -_spvgen_commit=5378c7618a2a3bf60ba01a86db980930e8581146 +_spvgen_commit=64013f150c2d41965a3d36fa159b55fba52b727a archs="i686* x86_64*" create_wrksrc=yes build_wrksrc="xgl" @@ -27,13 +27,13 @@ distfiles="https://github.com/GPUOpen-Drivers/AMDVLK/archive/v-${version}.tar.gz https://github.com/GPUOpen-Drivers/llvm/archive/${_llvm_commit}.tar.gz https://github.com/GPUOpen-Drivers/wsa/archive/${_wsa_commit}.tar.gz https://github.com/GPUOpen-Drivers/spvgen/archive/${_spvgen_commit}.tar.gz" -checksum="72574e88e336e24bbcbd1573edf24e786c6640f2716ddad602b39a440b9d9b29 - b55da7fd4712a1c9c1738c7e639c7aea2f469ae76e8276980c185a6fb6fbcffa - 5125b70b1f6319fb1da958f84c9c694c86dc0b9d029f6ca7f829db44c3d5763e - 36ce31be34c8c52b39865c9db1302ffe2ea91182530b327b402be3d865de80a2 - 7e5688a66aff1e011f438e94dbe0b531ed65c6bfcea5a3a75fc5d9b49e42ead7 +checksum="24e78dfc6b4f16da6ab158e27d35671b6873fa515d36f918a36b77cb664c5238 + ffe19cb54421720cede69b23bcbfd6fa076f007101b2ec2a7a04fc4fc1ad9e1c + b4980757d848dff0b7060a25f38fa11a948c76fc6c4e6c201900552958a5ec22 + 1982ebf4260fa36a354b2eb0dff485f685f669fc211f98a0902b559b7bac9fb0 + 139d391fe0f31a6e3ae1862260506f5ffa9bb6320186bc5a9b380f9c3ac0162e b23e9453fa7b14bb13157fb645936ec74b18b12cdef301758452a92b23f27705 - 48766a2ab78023b2c0e8c56eb45fb654e43440ef32c08978a303908e02dfca2a" + 01b156285b25c4f84fc098f334b3959d8fd1d7f77589618449288506eadb92d4" nocross=yes case $XBPS_TARGET_MACHINE in From b965d6cd977013388492105c64f367890b8f91b7 Mon Sep 17 00:00:00 2001 From: Thomas Batten Date: Sat, 25 May 2019 18:02:12 +0200 Subject: [PATCH 113/400] grub: move font-unifont-bdf to hostmakedepends MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/grub/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/grub/template b/srcpkgs/grub/template index 1bdc652676a..81ea1bbeb67 100644 --- a/srcpkgs/grub/template +++ b/srcpkgs/grub/template @@ -2,9 +2,9 @@ pkgname=grub version=2.02 revision=4 -hostmakedepends="flex freetype-devel" +hostmakedepends="flex freetype-devel font-unifont-bdf" makedepends="libusb-compat-devel ncurses-devel freetype-devel - liblzma-devel device-mapper-devel font-unifont-bdf fuse-devel" + liblzma-devel device-mapper-devel fuse-devel" depends="os-prober" conf_files="/etc/default/grub /etc/grub.d/*" short_desc="GRand Unified Bootloader 2" From fcfba827446205a1002a13351d93ea1007c06d43 Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 21 May 2019 18:37:23 +0200 Subject: [PATCH 114/400] grub: add extra patches for ieee1275/disable altivec for ppc64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: #11851 [via git-merge-pr] Signed-off-by: Jürgen Buchmüller --- .../grub/patches/ieee1275-clear-reset.patch | 32 +++ .../patches/install_powerpc_machtypes.patch | 220 ++++++++++++++++++ ...fnet-init-structs-in-bootpath-parser.patch | 40 ++++ .../grub/patches/ppc64el-disable-vsx.patch | 52 +++++ srcpkgs/grub/template | 7 +- 5 files changed, 350 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/grub/patches/ieee1275-clear-reset.patch create mode 100644 srcpkgs/grub/patches/install_powerpc_machtypes.patch create mode 100644 srcpkgs/grub/patches/ofnet-init-structs-in-bootpath-parser.patch create mode 100644 srcpkgs/grub/patches/ppc64el-disable-vsx.patch diff --git a/srcpkgs/grub/patches/ieee1275-clear-reset.patch b/srcpkgs/grub/patches/ieee1275-clear-reset.patch new file mode 100644 index 00000000000..96b9bd63f12 --- /dev/null +++ b/srcpkgs/grub/patches/ieee1275-clear-reset.patch @@ -0,0 +1,32 @@ +From 54b741317568867fc4ad801a65397d05f3ea0f59 Mon Sep 17 00:00:00 2001 +From: Paulo Flabiano Smorigo +Date: Thu, 25 Sep 2014 18:41:29 -0300 +Subject: Include a text attribute reset in the clear command for ppc + +Always clear text attribute for clear command in order to avoid problems +after it boots. + +* grub-core/term/terminfo.c: Add escape for text attribute reset + +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1295255 +Origin: other, https://lists.gnu.org/archive/html/grub-devel/2014-09/msg00076.html +Last-Update: 2014-09-26 + +Patch-Name: ieee1275-clear-reset.patch +--- + grub-core/term/terminfo.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/grub-core/term/terminfo.c b/grub-core/term/terminfo.c +index f0d3e3deb..7cb7909c8 100644 +--- grub-core/term/terminfo.c ++++ grub-core/term/terminfo.c +@@ -151,7 +151,7 @@ grub_terminfo_set_current (struct grub_term_output *term, + /* Clear the screen. Using serial console, screen(1) only recognizes the + * ANSI escape sequence. Using video console, Apple Open Firmware + * (version 3.1.1) only recognizes the literal ^L. So use both. */ +- data->cls = grub_strdup (" \e[2J"); ++ data->cls = grub_strdup (" \e[2J\e[m"); + data->reverse_video_on = grub_strdup ("\e[7m"); + data->reverse_video_off = grub_strdup ("\e[m"); + if (grub_strcmp ("ieee1275", str) == 0) diff --git a/srcpkgs/grub/patches/install_powerpc_machtypes.patch b/srcpkgs/grub/patches/install_powerpc_machtypes.patch new file mode 100644 index 00000000000..ce5e36cb4a5 --- /dev/null +++ b/srcpkgs/grub/patches/install_powerpc_machtypes.patch @@ -0,0 +1,220 @@ +From 35118b5023b0d9b4e3ad82f6e15fb696ad8e2a10 Mon Sep 17 00:00:00 2001 +From: Colin Watson +Date: Tue, 28 Jan 2014 14:40:02 +0000 +Subject: Port yaboot logic for various powerpc machine types + +Some powerpc machines require not updating the NVRAM. This can be handled +by existing grub-install command-line options, but it's friendlier to detect +this automatically. + +On chrp_ibm machines, use the nvram utility rather than nvsetenv. (This +is possibly suitable for other machines too, but that needs to be +verified.) + +Forwarded: no +Last-Update: 2014-10-15 + +Patch-Name: install_powerpc_machtypes.patch +--- + grub-core/osdep/basic/platform.c | 5 +++ + grub-core/osdep/linux/platform.c | 72 ++++++++++++++++++++++++++++++ + grub-core/osdep/unix/platform.c | 28 +++++++++--- + grub-core/osdep/windows/platform.c | 6 +++ + include/grub/util/install.h | 3 ++ + util/grub-install.c | 11 +++++ + 6 files changed, 119 insertions(+), 6 deletions(-) + +diff --git a/grub-core/osdep/basic/platform.c b/grub-core/osdep/basic/platform.c +index 4b5502aeb..2ab907976 100644 +--- grub-core/osdep/basic/platform.c ++++ grub-core/osdep/basic/platform.c +@@ -24,3 +24,8 @@ grub_install_get_default_x86_platform (void) + return "i386-pc"; + } + ++const char * ++grub_install_get_default_powerpc_machtype (void) ++{ ++ return "generic"; ++} +diff --git a/grub-core/osdep/linux/platform.c b/grub-core/osdep/linux/platform.c +index 35f1bcc0e..9805c36d4 100644 +--- grub-core/osdep/linux/platform.c ++++ grub-core/osdep/linux/platform.c +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + #include + + #include +@@ -145,3 +146,74 @@ grub_install_get_default_x86_platform (void) + grub_util_info ("... not found"); + return "i386-pc"; + } ++ ++const char * ++grub_install_get_default_powerpc_machtype (void) ++{ ++ FILE *fp; ++ char *buf = NULL; ++ size_t len = 0; ++ const char *machtype = "generic"; ++ ++ fp = grub_util_fopen ("/proc/cpuinfo", "r"); ++ if (! fp) ++ return machtype; ++ ++ while (getline (&buf, &len, fp) > 0) ++ { ++ if (strncmp (buf, "pmac-generation", ++ sizeof ("pmac-generation") - 1) == 0) ++ { ++ if (strstr (buf, "NewWorld")) ++ { ++ machtype = "pmac_newworld"; ++ break; ++ } ++ if (strstr (buf, "OldWorld")) ++ { ++ machtype = "pmac_oldworld"; ++ break; ++ } ++ } ++ ++ if (strncmp (buf, "motherboard", sizeof ("motherboard") - 1) == 0 && ++ strstr (buf, "AAPL")) ++ { ++ machtype = "pmac_oldworld"; ++ break; ++ } ++ ++ if (strncmp (buf, "machine", sizeof ("machine") - 1) == 0 && ++ strstr (buf, "CHRP IBM")) ++ { ++ if (strstr (buf, "qemu")) ++ { ++ machtype = "chrp_ibm_qemu"; ++ break; ++ } ++ else ++ { ++ machtype = "chrp_ibm"; ++ break; ++ } ++ } ++ ++ if (strncmp (buf, "platform", sizeof ("platform") - 1) == 0) ++ { ++ if (strstr (buf, "Maple")) ++ { ++ machtype = "maple"; ++ break; ++ } ++ if (strstr (buf, "Cell")) ++ { ++ machtype = "cell"; ++ break; ++ } ++ } ++ } ++ ++ free (buf); ++ fclose (fp); ++ return machtype; ++} +diff --git a/grub-core/osdep/unix/platform.c b/grub-core/osdep/unix/platform.c +index a3fcfcaca..28cb37e15 100644 +--- grub-core/osdep/unix/platform.c ++++ grub-core/osdep/unix/platform.c +@@ -212,13 +212,29 @@ grub_install_register_ieee1275 (int is_prep, const char *install_device, + else + boot_device = get_ofpathname (install_device); + +- if (grub_util_exec ((const char * []){ "nvsetenv", "boot-device", +- boot_device, NULL })) ++ if (strcmp (grub_install_get_default_powerpc_machtype (), "chrp_ibm") == 0) + { +- char *cmd = xasprintf ("setenv boot-device %s", boot_device); +- grub_util_error (_("`nvsetenv' failed. \nYou will have to set `boot-device' variable manually. At the IEEE1275 prompt, type:\n %s\n"), +- cmd); +- free (cmd); ++ char *arg = xasprintf ("boot-device=%s", boot_device); ++ if (grub_util_exec ((const char * []){ "nvram", ++ "--update-config", arg, NULL })) ++ { ++ char *cmd = xasprintf ("setenv boot-device %s", boot_device); ++ grub_util_error (_("`nvram' failed. \nYou will have to set `boot-device' variable manually. At the IEEE1275 prompt, type:\n %s\n"), ++ cmd); ++ free (cmd); ++ } ++ free (arg); ++ } ++ else ++ { ++ if (grub_util_exec ((const char * []){ "nvsetenv", "boot-device", ++ boot_device, NULL })) ++ { ++ char *cmd = xasprintf ("setenv boot-device %s", boot_device); ++ grub_util_error (_("`nvsetenv' failed. \nYou will have to set `boot-device' variable manually. At the IEEE1275 prompt, type:\n %s\n"), ++ cmd); ++ free (cmd); ++ } + } + + free (boot_device); +diff --git a/grub-core/osdep/windows/platform.c b/grub-core/osdep/windows/platform.c +index 912269191..c30025b13 100644 +--- grub-core/osdep/windows/platform.c ++++ grub-core/osdep/windows/platform.c +@@ -128,6 +128,12 @@ grub_install_get_default_x86_platform (void) + return "i386-efi"; + } + ++const char * ++grub_install_get_default_powerpc_machtype (void) ++{ ++ return "generic"; ++} ++ + static void * + get_efi_variable (const wchar_t *varname, ssize_t *len) + { +diff --git a/include/grub/util/install.h b/include/grub/util/install.h +index 5ca4811cd..9f517a1bb 100644 +--- include/grub/util/install.h ++++ include/grub/util/install.h +@@ -206,6 +206,9 @@ grub_install_create_envblk_file (const char *name); + const char * + grub_install_get_default_x86_platform (void); + ++const char * ++grub_install_get_default_powerpc_machtype (void); ++ + void + grub_install_register_efi (grub_device_t efidir_grub_dev, + const char *efifile_path, +diff --git a/util/grub-install.c b/util/grub-install.c +index e1a0202da..70b22eec4 100644 +--- util/grub-install.c ++++ util/grub-install.c +@@ -1155,7 +1155,18 @@ main (int argc, char *argv[]) + + if (platform == GRUB_INSTALL_PLATFORM_POWERPC_IEEE1275) + { ++ const char *machtype = grub_install_get_default_powerpc_machtype (); + int is_guess = 0; ++ ++ if (strcmp (machtype, "pmac_oldworld") == 0) ++ update_nvram = 0; ++ else if (strcmp (machtype, "cell") == 0) ++ update_nvram = 0; ++ else if (strcmp (machtype, "generic") == 0) ++ update_nvram = 0; ++ else if (strcmp (machtype, "chrp_ibm_qemu") == 0) ++ update_nvram = 0; ++ + if (!macppcdir) + { + char *d; diff --git a/srcpkgs/grub/patches/ofnet-init-structs-in-bootpath-parser.patch b/srcpkgs/grub/patches/ofnet-init-structs-in-bootpath-parser.patch new file mode 100644 index 00000000000..0f666a99945 --- /dev/null +++ b/srcpkgs/grub/patches/ofnet-init-structs-in-bootpath-parser.patch @@ -0,0 +1,40 @@ +From 7c52efa9093592ade59a986c5606450741fb8e59 Mon Sep 17 00:00:00 2001 +From: Julian Andres Klode +Date: Thu, 23 Aug 2018 13:25:30 +0200 +Subject: ofnet: Initialize structs in bootpath parser + +Code later on checks if variables inside the struct are +0 to see if they have been set, like if there were addresses +in the bootpath. + +The variables were not initialized however, so the check +might suceed with uninitialized data, and a new interface +with random addresses has been added. This caused a weird +bug in Ubuntu, because when booting from network, we now +had two interfaces with the same name, and net_default_mac +pointed to the random one. + +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1785859 +Signed-off-by: Julian Andres Klode +Patch-Name: ofnet-init-structs-in-bootpath-parser.patch +Forwarded: https://lists.gnu.org/archive/html/grub-devel/2018-08/msg00074.html +Last-Update: 2018-08-23 +--- + grub-core/net/drivers/ieee1275/ofnet.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/grub-core/net/drivers/ieee1275/ofnet.c b/grub-core/net/drivers/ieee1275/ofnet.c +index a78d164db..3a753658b 100644 +--- grub-core/net/drivers/ieee1275/ofnet.c ++++ grub-core/net/drivers/ieee1275/ofnet.c +@@ -154,8 +154,8 @@ grub_ieee1275_parse_bootpath (const char *devpath, char *bootpath, + char *equal_char = 0; + grub_size_t field_counter = 0; + +- grub_net_network_level_address_t client_addr, gateway_addr, subnet_mask; +- grub_net_link_level_address_t hw_addr; ++ grub_net_network_level_address_t client_addr = {}, gateway_addr = {}, subnet_mask = {}; ++ grub_net_link_level_address_t hw_addr = {}; + grub_net_interface_flags_t flags = 0; + struct grub_net_network_level_interface *inter = NULL; + diff --git a/srcpkgs/grub/patches/ppc64el-disable-vsx.patch b/srcpkgs/grub/patches/ppc64el-disable-vsx.patch new file mode 100644 index 00000000000..1f4c4018152 --- /dev/null +++ b/srcpkgs/grub/patches/ppc64el-disable-vsx.patch @@ -0,0 +1,52 @@ +From efc381a55124b12fc74ed8117283f11367c9372a Mon Sep 17 00:00:00 2001 +From: Paulo Flabiano Smorigo +Date: Thu, 25 Sep 2014 19:33:39 -0300 +Subject: Disable VSX instruction + +VSX bit is enabled by default for Power7 and Power8 CPU models, +so we need to disable them in order to avoid instruction exceptions. +Kernel will activate it when necessary. + +* grub-core/kern/powerpc/ieee1275/startup.S: Disable VSX. + +Also-By: Adhemerval Zanella +Also-By: Colin Watson + +Origin: other, https://lists.gnu.org/archive/html/grub-devel/2014-09/msg00078.html +Last-Update: 2015-01-27 + +Patch-Name: ppc64el-disable-vsx.patch +--- + grub-core/kern/powerpc/ieee1275/startup.S | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/grub-core/kern/powerpc/ieee1275/startup.S b/grub-core/kern/powerpc/ieee1275/startup.S +index 21c884b43..de9a9601a 100644 +--- grub-core/kern/powerpc/ieee1275/startup.S ++++ grub-core/kern/powerpc/ieee1275/startup.S +@@ -20,6 +20,8 @@ + #include + #include + ++#define MSR_VSX 0x80 ++ + .extern __bss_start + .extern _end + +@@ -28,6 +30,16 @@ + .globl start, _start + start: + _start: ++ _start: ++ ++ /* Disable VSX instruction */ ++ mfmsr 0 ++ oris 0,0,MSR_VSX ++ /* The "VSX Available" bit is in the lower half of the MSR, so we ++ don't need mtmsrd, which in any case won't work in 32-bit mode. */ ++ mtmsr 0 ++ isync ++ + li 2, 0 + li 13, 0 + diff --git a/srcpkgs/grub/template b/srcpkgs/grub/template index 81ea1bbeb67..97ce99b71ff 100644 --- a/srcpkgs/grub/template +++ b/srcpkgs/grub/template @@ -1,7 +1,7 @@ # Template file for 'grub' pkgname=grub version=2.02 -revision=4 +revision=5 hostmakedepends="flex freetype-devel font-unifont-bdf" makedepends="libusb-compat-devel ncurses-devel freetype-devel liblzma-devel device-mapper-devel fuse-devel" @@ -50,6 +50,11 @@ do_configure() { unset CC AS LD RANLIB CPP CFLAGS="$CFLAGS -fno-stack-protector" + # building with altivec generates broken grub core + case "$XBPS_TARGET_MACHINE" in + ppc64*) CFLAGS="$CFLAGS -mno-altivec" ;; + esac + configure_args+=" --enable-device-mapper --enable-cache-stats --enable-nls --enable-grub-mkfont --enable-grub-mount --disable-werror --sbindir=/usr/bin" From 80374c89b33c793600e94c5182c689c734784872 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 29 May 2019 20:24:12 +0200 Subject: [PATCH 115/400] sblg: update to 0.4.25. --- srcpkgs/sblg/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/sblg/template b/srcpkgs/sblg/template index bd81995bffe..8650cf9b914 100644 --- a/srcpkgs/sblg/template +++ b/srcpkgs/sblg/template @@ -1,6 +1,6 @@ # Template file for 'sblg' pkgname=sblg -version=0.4.24 +version=0.4.25 revision=1 build_style=configure configure_args="PREFIX=/usr MANDIR=/usr/share/man" @@ -11,7 +11,7 @@ license="ISC" homepage="https://kristaps.bsd.lv/sblg/" changelog="https://kristaps.bsd.lv/sblg/archive.html" distfiles="https://kristaps.bsd.lv/sblg/snapshots/${pkgname}-${version}.tar.gz" -checksum=0f62862e157a9374ea80b60c1b03e94e5f0a2c5afd96bf33f4a0032a4be90a81 +checksum=5add5ac9cdf3d2b899c37a275d1dbf879f533e9664d5f54ca044e4fcccba6b8b pre_configure() { if [ "$CROSS_BUILD" ]; then From 2533b71d810e9659e494ad5318d51250b58ea1cf Mon Sep 17 00:00:00 2001 From: John Date: Wed, 29 May 2019 20:24:26 +0200 Subject: [PATCH 116/400] tellico: update to 3.2. --- srcpkgs/tellico/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template index f58f663d0a2..4efef78e98f 100644 --- a/srcpkgs/tellico/template +++ b/srcpkgs/tellico/template @@ -1,7 +1,7 @@ # Template file for 'tellico' pkgname=tellico -version=3.1.4 -revision=2 +version=3.2 +revision=1 build_style=cmake configure_args="-DENABLE_WEBCAM=$(vopt_if webcam ON OFF)" hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kdoctools kconfig @@ -16,7 +16,7 @@ maintainer="John " license="GPL-3.0-or-later" homepage="http://tellico-project.org/files/" distfiles="http://tellico-project.org/files/${pkgname}-${version}.tar.xz" -checksum=8f611e3be8be095de38fe27d76f3ddeae09962c9aec00298031cc3e71eae95f9 +checksum=f20ec2bbfa9d4e0b4c0c38feb86d0cc4ae72ca6a680932cf58ed9f5b8f26114e build_options="webcam yaz xmp cdio cddb scanner" build_options_default="webcam yaz xmp cdio cddb scanner" desc_option_cdio="Support for reading cdtext from audio CDs" From 8a7fa99e38539103d0b33be92f39ce6e6fcdcae2 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 29 May 2019 20:24:38 +0200 Subject: [PATCH 117/400] v4l2loopback: update to 0.12.2. --- srcpkgs/v4l2loopback/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/v4l2loopback/template b/srcpkgs/v4l2loopback/template index b403b6624cb..82175b48ece 100644 --- a/srcpkgs/v4l2loopback/template +++ b/srcpkgs/v4l2loopback/template @@ -1,6 +1,6 @@ # Template file for 'v4l2loopback' pkgname=v4l2loopback -version=0.12.1 +version=0.12.2 revision=1 hostmakedepends="help2man" depends="dkms" @@ -9,7 +9,7 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://github.com/umlaeute/v4l2loopback" distfiles="https://github.com/umlaeute/v4l2loopback/archive/v${version}.tar.gz" -checksum=f2b9b7f8611c1a77b2f496ee505e49860121079c998bb735e4bb6b8954132348 +checksum=6d2c27a69d982bf39d7330b92f084fd0388beef486879320ccf263e4716cd549 dkms_modules="v4l2loopback ${version}" do_install() { From 084968baa9b75af7525f62a8fc076fede98b3d69 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 29 May 2019 20:24:58 +0200 Subject: [PATCH 118/400] qt5dxcb-plugin: update to 1.2.2. --- srcpkgs/qt5dxcb-plugin/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt5dxcb-plugin/template b/srcpkgs/qt5dxcb-plugin/template index 43ed392fa96..df49819c0bf 100644 --- a/srcpkgs/qt5dxcb-plugin/template +++ b/srcpkgs/qt5dxcb-plugin/template @@ -1,6 +1,6 @@ # Template file for 'qt5dxcb-plugin' pkgname=qt5dxcb-plugin -version=1.2.1 +version=1.2.2 revision=1 build_style=qmake make_build_args="VERSION=${version}" @@ -15,7 +15,7 @@ license="GPL-3.0-or-later" homepage="https://github.com/linuxdeepin/qt5dxcb-plugin/" changelog="https://github.com/linuxdeepin/qt5dxcb-plugin/blob/master/CHANGELOG.md" distfiles="https://github.com/linuxdeepin/qt5dxcb-plugin/archive/${version}.tar.gz" -checksum=8e64220f4bcc9713e92eacb9e2c69587086ae241d11af21f194c0e2501549575 +checksum=2a4a5542f6b957c6175dd296a71822346e35b275e769b71ba3f296c3da86a949 patch_args="-Np1" pre_configure() { From 5589535dc61de80656ee659c82239479c7c58222 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 29 May 2019 20:25:12 +0200 Subject: [PATCH 119/400] deepin-voice-recorder: update to 1.4.1. --- srcpkgs/deepin-voice-recorder/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/deepin-voice-recorder/template b/srcpkgs/deepin-voice-recorder/template index 21f78b37a7b..df2d8078c8c 100644 --- a/srcpkgs/deepin-voice-recorder/template +++ b/srcpkgs/deepin-voice-recorder/template @@ -1,6 +1,6 @@ # Template file for 'deepin-voice-recorder' pkgname=deepin-voice-recorder -version=1.4.0 +version=1.4.1 revision=1 build_style=qmake hostmakedepends="qt5-qmake pkg-config" @@ -12,7 +12,7 @@ license="GPL-3.0-or-later" homepage="https://github.com/linuxdeepin/deepin-voice-recorder/" changelog="https://raw.githubusercontent.com/linuxdeepin/deepin-voice-recorder/${version}/CHANGELOG.md" distfiles="https://github.com/linuxdeepin/deepin-voice-recorder/archive/${version}.tar.gz" -checksum=b73dd37bdb2d6a0b0a703c71a86b353befe59aa0debd8bd4ab1fab0ec6c16d96 +checksum=05f429099d3c71c81f3ec89da4427019f431b3b3aaa38735c14d0b8ac4dab509 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-multimedia-devel" From d9d4bb2ec986ca87071fe86362b0934c301d3a1d Mon Sep 17 00:00:00 2001 From: John Date: Wed, 29 May 2019 20:25:25 +0200 Subject: [PATCH 120/400] deepin-screenshot: update to 4.2.1. --- srcpkgs/deepin-screenshot/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/deepin-screenshot/template b/srcpkgs/deepin-screenshot/template index 8441bde1e19..ae4900765ce 100644 --- a/srcpkgs/deepin-screenshot/template +++ b/srcpkgs/deepin-screenshot/template @@ -1,6 +1,6 @@ # Template file for 'deepin-screenshot' pkgname=deepin-screenshot -version=4.2.0 +version=4.2.1 revision=1 build_style=cmake hostmakedepends="pkg-config qt5-qmake" @@ -13,7 +13,7 @@ license="GPL-3.0-or-later" homepage="https://github.com/linuxdeepin/deepin-screenshot" changelog="https://github.com/linuxdeepin/deepin-screenshot/blob/${version}/CHANGELOG.md" distfiles="https://github.com/linuxdeepin/deepin-screenshot/archive/${version}.tar.gz" -checksum=53f04b3866a087dacc61323ebedcf2969ea4aac5f27482dcd0f20f2af5a3dccb +checksum=da99ff243e8027f0ad9e8d9a818829abcbc7d0cc207b3aedea241bf673cdf33b CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libdtk-2.0.6/DWidget" CXXFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/libdtk-2.0.6/DCore" CXXFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/libdtk-2.0.6/DWm" From f6ab65d9638ef75a79e98d66e1bce21f9025ed65 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 29 May 2019 20:25:48 +0200 Subject: [PATCH 121/400] dde-qt-dbus-factory: update to 1.1.4. --- srcpkgs/dde-qt-dbus-factory/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/dde-qt-dbus-factory/template b/srcpkgs/dde-qt-dbus-factory/template index 4b2026910ac..c7dc1a54541 100644 --- a/srcpkgs/dde-qt-dbus-factory/template +++ b/srcpkgs/dde-qt-dbus-factory/template @@ -1,6 +1,6 @@ # Template file for 'dde-qt-dbus-factory' pkgname=dde-qt-dbus-factory -version=1.1.2 +version=1.1.4 revision=1 build_style=qmake hostmakedepends="qt5-qmake python" @@ -11,7 +11,7 @@ license="GPL-3.0-or-later" homepage="https://github.com/linuxdeepin/dde-qt-dbus-factory" changelog="https://github.com/linuxdeepin/dde-qt-dbus-factory/blob/${version}/CHANGELOG.md" distfiles="https://github.com/linuxdeepin/dde-qt-dbus-factory/archive/${version}.tar.gz" -checksum=75a7686d4a9f2620d40e069c96f6c14229ef9128b07e4263c73791dd3e66314e +checksum=75b836c1e9a052be7c24eb095eb880c1ac76333398a499778525b2b71236ee4f if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-devel dde-qt-dbus-factory-devel" From 49a764352cb9128f59bd44025c293b89ca131085 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Thu, 30 May 2019 10:47:39 +0200 Subject: [PATCH 122/400] dialog: fix "no blanks" issue w/ BE targets MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/dialog/patches/trim-blank.patch | 21 +++++++++++++++++++++ srcpkgs/dialog/template | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/dialog/patches/trim-blank.patch diff --git a/srcpkgs/dialog/patches/trim-blank.patch b/srcpkgs/dialog/patches/trim-blank.patch new file mode 100644 index 00000000000..9888ed2e788 --- /dev/null +++ b/srcpkgs/dialog/patches/trim-blank.patch @@ -0,0 +1,21 @@ +Source: @pullmoll +Upstream: no (should be queried) +Reason: fix issue with dialog dropping blanks (BE targets) + +The conversion of isblank() to int is vague thus use constants. +Pre decrement the dst ptr and test for it being greater than base. + +--- util.c 2018-06-22 01:47:10.000000000 +0200 ++++ util.c 2019-05-30 10:35:00.517648968 +0200 +@@ -2330,9 +2330,9 @@ + static bool + trim_blank(char *base, char *dst) + { +- int count = isblank(UCH(*dst)); ++ int count = isblank(UCH(*dst)) ? 1 : 0; + +- while (dst-- != base) { ++ while (--dst > base) { + if (*dst == '\n') { + break; + } else if (isblank(UCH(*dst))) { diff --git a/srcpkgs/dialog/template b/srcpkgs/dialog/template index b7e83a46869..d333d70adea 100644 --- a/srcpkgs/dialog/template +++ b/srcpkgs/dialog/template @@ -3,7 +3,7 @@ pkgname=dialog _distver=1.3 _date=20190211 version="${_distver}.${_date}" -revision=1 +revision=2 wrksrc="${pkgname}-${_distver}-${_date}" build_style=gnu-configure configure_args="--with-ncursesw --disable-nls" From 5334ff27eda4a96d46e22a1e7380936e09e08d51 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Thu, 30 May 2019 13:20:33 +0200 Subject: [PATCH 123/400] kodi-addon-inputstream-adaptive: update to 2.3.19. --- srcpkgs/kodi-addon-inputstream-adaptive/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/kodi-addon-inputstream-adaptive/template b/srcpkgs/kodi-addon-inputstream-adaptive/template index ffc6ed86154..aa81e3fdade 100644 --- a/srcpkgs/kodi-addon-inputstream-adaptive/template +++ b/srcpkgs/kodi-addon-inputstream-adaptive/template @@ -1,8 +1,9 @@ # Template file for 'kodi-addon-inputstream-adaptive' pkgname=kodi-addon-inputstream-adaptive -version=2.3.18 +version=2.3.19 revision=1 -wrksrc="inputstream.adaptive-${version}" +_kodi_release=Leia +wrksrc="inputstream.adaptive-${version}-${_kodi_release}" build_style=cmake makedepends="kodi-devel kodi-platform-devel p8-platform-devel tinyxml-devel expat-devel" @@ -10,6 +11,6 @@ short_desc="Kodi inputstream addon for several manifest types" 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}.tar.gz" -checksum=11dab0e791c8fd6314adbf1bfb1b4f161889dd765c68d175bdebeb3e9b41b6c0 +distfiles="https://github.com/peak3d/inputstream.adaptive/archive/${version}-${_kodi_release}.tar.gz" +checksum=ca86a6151eb59a56ab4a791be526dedd2a1134c27a63bfef769defba9b756f81 nocross="depends on kodi-platform" From 27b4a2143e839a29b738edb0f69772df93244946 Mon Sep 17 00:00:00 2001 From: not-chicken Date: Thu, 30 May 2019 06:41:35 +0530 Subject: [PATCH 124/400] gparted: update to 1.0.0. --- srcpkgs/gparted/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gparted/template b/srcpkgs/gparted/template index 09045bd3248..1a8da424fc1 100644 --- a/srcpkgs/gparted/template +++ b/srcpkgs/gparted/template @@ -1,18 +1,18 @@ # Template file for 'gparted' pkgname=gparted -version=0.33.0 +version=1.0.0 revision=1 build_style=gnu-configure configure_args="--enable-libparted-dmraid" -hostmakedepends="gnome-doc-utils intltool pkg-config" -makedepends="libglib-devel gnome-doc-utils gtkmm2-devel libparted-devel" +hostmakedepends="intltool itstool pkg-config" +makedepends="libglib-devel gtkmm-devel libparted-devel yelp-tools" depends="desktop-file-utils hicolor-icon-theme" short_desc="Gnome Partition Editor" maintainer="Juan RP " license="GPL-2.0-or-later" homepage="https://gparted.sourceforge.io" distfiles="${SOURCEFORGE_SITE}/gparted/gparted/gparted-${version}/gparted-${version}.tar.gz" -checksum=5023b8c983f88a22e65bf6f09a12ea09369defc008981b52ee8b96a3879f81d6 +checksum=e48b8b07c0e024a7050711fdd01f8276fe99fa546de8668f73e2f82d0bb2bb55 pre_configure() { sed -i "s:@bindir@/gparted %f:@bindir@/gparted-pkexec %f:g" gparted.desktop.in.in From 0c3b248e4689ba72f949702548d03d33eebaf477 Mon Sep 17 00:00:00 2001 From: Kartik Singh Date: Wed, 29 May 2019 19:58:39 -0400 Subject: [PATCH 125/400] mgba: update to 0.7.2 --- srcpkgs/mgba/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mgba/template b/srcpkgs/mgba/template index 300afe79dd5..af567082b37 100644 --- a/srcpkgs/mgba/template +++ b/srcpkgs/mgba/template @@ -1,6 +1,6 @@ # Template file for 'mgba' pkgname=mgba -version=0.7.1 +version=0.7.2 revision=1 build_style=cmake hostmakedepends="pkg-config qt5-host-tools qt5-qmake" @@ -11,7 +11,7 @@ maintainer="Juan RP " license="MPL-2.0" homepage="https://www.mgba.io/" distfiles="https://github.com/mgba-emu/${pkgname}/archive/${version}.tar.gz" -checksum=665fbae8bcfaf3e3f4b83267ce5800b00b98f4bacbb36fc412e3829020019cf4 +checksum=ed635e05798d3fa0d55e5abb439f6d1708d519e4ecd5ed10b9bc6e319ed9dba7 libmgba_package() { short_desc+=" - shared library" From cb9fcb26bfdf36e8d2f3eec779664835ff1db142 Mon Sep 17 00:00:00 2001 From: Kyle Nusbaum Date: Wed, 29 May 2019 15:24:15 -0500 Subject: [PATCH 126/400] dbeaver: update to 6.0.5. --- srcpkgs/dbeaver/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template index c7f2049d8c0..2c1606f437d 100644 --- a/srcpkgs/dbeaver/template +++ b/srcpkgs/dbeaver/template @@ -1,6 +1,6 @@ # Template file for 'dbeaver' pkgname=dbeaver -version=6.0.4 +version=6.0.5 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=8357e63366868a6ae3894164ef19f873a0362c040bfb1cc8bfa979964fb791cc +checksum=a898961474765c67c9e595c4a4eed09c8c0041feff840d111bcf7a85936bceb2 nopie=true do_build() { From 393f77d74e9c54cd7e894436c803a86aabc41cfe Mon Sep 17 00:00:00 2001 From: Daniel Santana Date: Wed, 29 May 2019 17:16:07 -0300 Subject: [PATCH 127/400] google-cloud-sdk: update to 248.0.0. --- srcpkgs/google-cloud-sdk/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/google-cloud-sdk/template b/srcpkgs/google-cloud-sdk/template index 8744dd65ab7..22671980ee1 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=246.0.0 +version=248.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=2c273d86dc8d40c7a0b55fe10f00441648a3630b8c40427079f9bcca5a9d25df +checksum=a80a8646a6d04ea8f060b5761e0067f7b791253dee5bb97818b4d552dfe67cdb do_install() { vmkdir usr/lib/$pkgname From e09124129e9417c2bb6703e61ceb6ef50a174028 Mon Sep 17 00:00:00 2001 From: SolitudeSF Date: Wed, 29 May 2019 18:50:06 +0300 Subject: [PATCH 128/400] kitty: update to 0.14.1 --- srcpkgs/kitty/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template index bb5bc975a12..a191f54d1b8 100644 --- a/srcpkgs/kitty/template +++ b/srcpkgs/kitty/template @@ -1,6 +1,6 @@ # Template file for 'kitty' pkgname=kitty -version=0.14.0 +version=0.14.1 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=8f5a3262ce41e90b6ce316e0ef54879e8593fd7ea71790d1c55b039bdc34b2f4 +checksum=248b17f98f8e2b8ee6000ea27c0e8f66df8b7dc7f7d2f6902499b42d845d41a7 pycompile_version="$py3_ver" LDFLAGS+=" -Wl,-z,stack-size=2097152" From 044363d24e28469676191815e409f6233e220b24 Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 29 May 2019 14:33:42 +0300 Subject: [PATCH 129/400] xournalpp: update to 1.0.12 --- srcpkgs/xournalpp/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xournalpp/template b/srcpkgs/xournalpp/template index 15fd128d65e..2228e3f77a7 100644 --- a/srcpkgs/xournalpp/template +++ b/srcpkgs/xournalpp/template @@ -1,6 +1,6 @@ # Template file for 'xournalpp' pkgname=xournalpp -version=1.0.10 +version=1.0.12 revision=1 build_style=cmake hostmakedepends="pkg-config git texlive-bin" @@ -12,7 +12,7 @@ maintainer="mobinmob " license="GPL-2.0-or-later" homepage="https://github.com/xournalpp/xournalpp" distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz" -checksum=1583cfb34267a0f03273e5894b3f47833cdbbdb1b1bd2130287c9f805ece95c8 +checksum=625cff6a951de355c3cc5b5285fa4e8f69e25b2800f3386008a5c14177233492 case "$XBPS_TARGET_MACHINE" in *-musl) makedepends+=" libexecinfo-devel" From 478fab8b631284418abb91b68b6c80e7c492c183 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Tue, 28 May 2019 15:27:28 -0500 Subject: [PATCH 130/400] slack-desktop: update to 3.4.2 --- common/shlibs | 1 + srcpkgs/slack-desktop/template | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/common/shlibs b/common/shlibs index 527bca80f5d..e94680f2d39 100644 --- a/common/shlibs +++ b/common/shlibs @@ -128,6 +128,7 @@ libGLESv2.so keybase-desktop-3.1.2_1 libGLESv2.so riot-desktop-0.17.9_2 libGLESv2.so wire-desktop-3.6.2885_1 libGLESv2.so Signal-Desktop-1.23.2_1 +libGLESv2.so slack-desktop-3.4.2_1 libbrcmEGL.so rpi-userland-20180103_2 libbrcmGLESv2.so rpi-userland-20180103_2 libbrcmOpenVG.so rpi-userland-20180103_2 diff --git a/srcpkgs/slack-desktop/template b/srcpkgs/slack-desktop/template index 2e5112002e3..0d7174790da 100644 --- a/srcpkgs/slack-desktop/template +++ b/srcpkgs/slack-desktop/template @@ -1,6 +1,6 @@ # Template file for 'slack-desktop' pkgname=slack-desktop -version=3.4.0 +version=3.4.2 revision=1 archs="x86_64" short_desc="Messaging app for teams" @@ -8,7 +8,7 @@ maintainer="Diogo Leal " license="Proprietary" homepage="https://slack.com/" distfiles="https://slack-ssb-updates.global.ssl.fastly.net/linux_releases/${pkgname}-${version}-amd64.deb" -checksum=857b38862aa732a27c1cee5fcfdce490d624f22a5d8b4fd389d7ad06de1ba551 +checksum=3833c1abdbd15b50d9f3e4f77deb4bf6d578cfebfeab2b6ee0e84f567d207261 restricted=yes repository="nonfree" nopie=yes From 3e3dc639970dc06c9439fb51da82d2685c830c95 Mon Sep 17 00:00:00 2001 From: Noel Cower Date: Tue, 28 May 2019 12:43:50 -0700 Subject: [PATCH 131/400] vault: update to 1.1.2. --- srcpkgs/vault/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template index 89cacbfeb49..6daa418e1fa 100644 --- a/srcpkgs/vault/template +++ b/srcpkgs/vault/template @@ -1,6 +1,6 @@ # Template file for 'vault' pkgname=vault -version=1.0.3 +version=1.1.2 revision=1 build_style=go go_import_path="github.com/hashicorp/${pkgname}" @@ -11,7 +11,7 @@ maintainer="iaroki " license="MPL-2.0" homepage="https://www.vaultproject.io/" distfiles="https://github.com/hashicorp/${pkgname}/archive/v${version}.tar.gz" -checksum=6ece62b75265a963ac70981c529ea82f2383ea4fdef47fdb14953aff22bfff6c +checksum=d7766d1d76d0fd6ea61858b9dc5df4a0b7217989b7ded91b5006713c336f3fe9 system_accounts="_vault" post_install() { From 6c224325a474940c8f2a4bc8fac741516be71b2a Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Tue, 28 May 2019 14:42:57 -0500 Subject: [PATCH 132/400] font-3270: update to 2.0.1 --- srcpkgs/font-3270/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/font-3270/template b/srcpkgs/font-3270/template index 73b27d73ac7..420ed4136a3 100644 --- a/srcpkgs/font-3270/template +++ b/srcpkgs/font-3270/template @@ -1,6 +1,6 @@ # Template file for 'font-3270' pkgname=font-3270 -version=2.0.0 +version=2.0.1 revision=1 archs=noarch wrksrc="3270font-${version}" @@ -13,7 +13,7 @@ maintainer="Diogo Leal " license="BSD-3-Clause" homepage="https://github.com/rbanffy/3270font" distfiles="https://github.com/rbanffy/3270font/archive/v${version}.tar.gz" -checksum=46eae7e13ca38037e55c269c2a8fa26af7e9db10abf203fd35494dbc3d39a15c +checksum=e1c6e72765083777cf5324b7ecf2b65b05c8f0fd6d2d6c4c64a8f4583896b1df do_install() { vmkdir usr/share/fonts/TTF From fb93c0f44657580a70aede0e06119a6d2ac49fff Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 30 May 2019 16:39:03 +0300 Subject: [PATCH 133/400] apt: update to 1.8.2 --- srcpkgs/apt/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/apt/template b/srcpkgs/apt/template index 8d972589728..cbb652c1e91 100644 --- a/srcpkgs/apt/template +++ b/srcpkgs/apt/template @@ -1,6 +1,6 @@ # Template file for 'apt' pkgname=apt -version=1.8.1 +version=1.8.2 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=7e0cb5c84da847d8be375e3678a29bbbc3fca12e1e6c7a5c86c5c5ea5c0f5893 +checksum=6ff2ede3ffc707ae51c80e5026199816ce7baab038e55aa96aa7eabe0e910bb6 case "$XBPS_TARGET_MACHINE" in *-musl) broken="error: void value not ignored as it ought to be" ;; From c824a694124d4a981962b78396a088d46f77d237 Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 30 May 2019 16:11:13 +0300 Subject: [PATCH 134/400] ack: update to 3.0.0 --- srcpkgs/ack/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/ack/template b/srcpkgs/ack/template index f202116d408..c6bedd6e256 100644 --- a/srcpkgs/ack/template +++ b/srcpkgs/ack/template @@ -1,8 +1,9 @@ # Template file for 'ack' pkgname=ack -version=2.28 +version=3.0.0 revision=1 archs=noarch +wrksrc="$pkgname-v$version" build_style=perl-module hostmakedepends="perl-File-Next" makedepends="$hostmakedepends" @@ -11,5 +12,5 @@ short_desc="Tool like grep, optimized for programmers" maintainer="Jan S. " license="Artistic-2.0" homepage="https://beyondgrep.com/" -distfiles="${CPAN_SITE}/App/ack-${version}.tar.gz" -checksum=8a6ecbf0ab9aee75faa0b8975d4a47fe002a7f3885455ae45d71e2b04db2ef9b +distfiles="${CPAN_SITE}/App/ack-v${version}.tar.gz" +checksum=8daddb225226b3cd532f8ab9ce4abfd31e651ad300deb7a4e419beb9197c4ded From ed8520299963178cc46cb9c074f91d6ab5dd4e97 Mon Sep 17 00:00:00 2001 From: Daniel Lewan Date: Thu, 30 May 2019 14:13:17 +0200 Subject: [PATCH 135/400] quickDocs: update to 2.2.6. --- srcpkgs/quickDocs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/quickDocs/template b/srcpkgs/quickDocs/template index d2dfb5e5dfa..940ad376d9c 100644 --- a/srcpkgs/quickDocs/template +++ b/srcpkgs/quickDocs/template @@ -1,6 +1,6 @@ # Template file for 'quickDocs' pkgname=quickDocs -version=2.2.5 +version=2.2.6 revision=1 build_style=meson hostmakedepends="vala pkg-config" @@ -10,4 +10,4 @@ maintainer="Daniel Lewan " license="GPL-3.0-or-later" homepage="https://github.com/mdh34/quickDocs" distfiles="https://github.com/mdh34/quickDocs/archive/${version}.tar.gz" -checksum=1ef1272fcdba00e7c641c1bd781eaca89524f0d9b256c23a1f955283ae4c75ab +checksum=a973b41cfbd2af088c53e7085208e215c49372e080f11385b339b43418ce771d From 0600d0af3bd7c908274a1eaad089059354a2cdfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alu=C3=ADsio=20Augusto=20Silva=20Gon=C3=A7alves?= Date: Thu, 30 May 2019 08:27:46 -0300 Subject: [PATCH 136/400] python-markdown2: update to 2.3.8. --- .../disable-building-wheel-by-default.patch | 10 ---------- srcpkgs/python-markdown2/template | 16 ++++++++++++++-- 2 files changed, 14 insertions(+), 12 deletions(-) delete mode 100644 srcpkgs/python-markdown2/patches/disable-building-wheel-by-default.patch diff --git a/srcpkgs/python-markdown2/patches/disable-building-wheel-by-default.patch b/srcpkgs/python-markdown2/patches/disable-building-wheel-by-default.patch deleted file mode 100644 index 3e9c800cdde..00000000000 --- a/srcpkgs/python-markdown2/patches/disable-building-wheel-by-default.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git setup.cfg setup.cfg -index 4fe3b74..139986d 100644 ---- setup.cfg -+++ setup.cfg -@@ -1,5 +1,4 @@ - [aliases] --build=sdist bdist_wheel - - [wheel] - universal = 1 diff --git a/srcpkgs/python-markdown2/template b/srcpkgs/python-markdown2/template index 6b13537efd4..2d352ba029d 100644 --- a/srcpkgs/python-markdown2/template +++ b/srcpkgs/python-markdown2/template @@ -1,6 +1,6 @@ # Template file for 'python-markdown2' pkgname=python-markdown2 -version=2.3.7 +version=2.3.8 revision=1 archs=noarch build_style=python-module @@ -11,7 +11,19 @@ maintainer="Aluísio Augusto Silva Gonçalves " license="MIT" homepage="https://github.com/trentm/python-markdown2" distfiles="https://github.com/trentm/python-markdown2/archive/${version}.tar.gz" -checksum=@4576ebde09526f20c873a73775192851b7e9ed5f521fac34303ed0a8b8eda1ed +checksum=@f2439906b925fb3991b8e4c01909bd2e6cb3aa75ce64a053b5495f9c72726f77 + +do_check() { + PY2PATH="${PWD}/build-2.7/lib" + PY3PATH="${PWD}/build-${py3_ver}/lib" + + cd test + # On python2 markdown2/phpmarkdown/email_auto_links is broken; + # cf. https://github.com/trentm/python-markdown2/issues/5 + #PYTHONPATH="${PY2PATH}" python2 test.py -- -knownfailure + PYTHONPATH="${PY3PATH}" python3 test.py -- -knownfailure +} + post_install() { vlicense LICENSE.txt From 1baa22b6784f549da9f1a152d7183f085eecd464 Mon Sep 17 00:00:00 2001 From: q66 Date: Thu, 30 May 2019 16:51:55 +0200 Subject: [PATCH 137/400] glibc: explicitly override xbps architecture on i686/ppc/arm This is in order to fix xbps when running on 64-bit kernels with 32-bit userland style setups. Musl already does this in order to append the -musl suffix, so no fix there necessary. Closes: #12036 [via git-merge-pr] --- srcpkgs/glibc/template | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template index db4c5f025ea..90ec126ffab 100644 --- a/srcpkgs/glibc/template +++ b/srcpkgs/glibc/template @@ -1,7 +1,7 @@ # Template file for 'glibc' pkgname=glibc version=2.29 -revision=5 +revision=6 bootstrap=yes short_desc="GNU C library" maintainer="Juan RP " @@ -171,6 +171,18 @@ do_install() { rm -f ${DESTDIR}/usr/bin/z{dump,ic} mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin + + # Create xbps.d(5) arch override file for 32-bit architectures + # 32-bit userlands may be used with 64-bit kernels and then + # xbps will report an incorrect architecture by default + case "$XBPS_TARGET_MACHINE" in + i686|ppc|armv*) + vmkdir usr/share/xbps.d + echo "architecture=${XBPS_TARGET_MACHINE}" > \ + ${DESTDIR}/usr/share/xbps.d/arch-32bit.conf + ;; + *) ;; + esac } glibc-devel_package() { From aabd8a46c487054b29c8345dba2a77a58465467a Mon Sep 17 00:00:00 2001 From: q66 Date: Thu, 30 May 2019 17:14:47 +0200 Subject: [PATCH 138/400] gcc: enable secureplt for powerpc and remove redundant option Secureplt is already matched in our crosstoolchains, it was just forgotten in the main template. Also remove the with-long-double option as it's already handled by one of our patches and is therefore redundant. Similarly, --with-cpu is also unnecessary. [ci skip] Closes: #12037 [via git-merge-pr] --- srcpkgs/gcc/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template index ef6ea28585d..9793c23bd56 100644 --- a/srcpkgs/gcc/template +++ b/srcpkgs/gcc/template @@ -186,8 +186,8 @@ do_configure() { _args+=" --with-arch=armv8-a" sed -i '/m64=/s/lib64/lib/' gcc/config/aarch64/t-aarch64-linux ;; - ppc) _args+=" --with-cpu=powerpc --target=powerpc-linux-gnu";; - ppc-musl) _args+=" --with-cpu=powerpc --target=powerpc-linux-musl --disable-decimal-float --with-long-double=64";; + ppc) _args+=" --target=powerpc-linux-gnu --enable-secureplt";; + ppc-musl) _args+=" --target=powerpc-linux-musl --enable-secureplt --disable-decimal-float";; ppc64le*) # use lib not lib64 by default _args+=" --target=${_triplet} --with-abi=elfv2 --enable-secureplt --enable-targets=powerpcle-linux" sed -i 's/lib64/lib/' gcc/config/rs6000/linux64.h From e36181d749a2664a5876b70904a5c72e38c4ce71 Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 30 May 2019 17:04:58 +0300 Subject: [PATCH 139/400] fotoxx: update to 19.11 --- srcpkgs/fotoxx/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fotoxx/template b/srcpkgs/fotoxx/template index d847c63434d..7d35f1a1c68 100644 --- a/srcpkgs/fotoxx/template +++ b/srcpkgs/fotoxx/template @@ -1,6 +1,6 @@ # Template file for 'fotoxx' pkgname=fotoxx -version=19.7 +version=19.11 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=9ae291d523079460e765e25fa1660faff6a3c5169fa2c60079986d054ab69416 +checksum=2b13d0f05e7432034ae562b90701b37977fb30c01761e5307cbdfb4bb5283322 case "$XBPS_TARGET_MACHINE" in *-musl) broken="execinfo.h is a GNU specific header, and doesn’t exist under musl.";; From 04a5cbdea7caa63efd67f60e03fb06404c21ccfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Thu, 30 May 2019 21:35:18 +0200 Subject: [PATCH 140/400] wxMaxima: update to 19.05.7. --- srcpkgs/wxMaxima/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/wxMaxima/template b/srcpkgs/wxMaxima/template index e6045e92b4d..06b870f5b83 100644 --- a/srcpkgs/wxMaxima/template +++ b/srcpkgs/wxMaxima/template @@ -1,6 +1,6 @@ # Template file for 'wxMaxima' pkgname=wxMaxima -version=19.05.3 +version=19.05.7 revision=1 wrksrc="wxmaxima-Version-${version}" build_style=cmake @@ -12,7 +12,7 @@ maintainer="Martin Riese " license="GPL-2.0-or-later" homepage="https://wxmaxima-developers.github.io/wxmaxima/" distfiles="https://github.com/wxMaxima-developers/wxmaxima/archive/Version-${version}.tar.gz" -checksum=dffca11f848a6f54ac5d32126cbe03c837cc68647752c403ce8f8be9db9533e6 +checksum=06da51b6032dd5941b6ef09f8d7705f7c0a14b8dc7d0065f571369df9c339b7a nocross="clisp is nocross" post_install() { From 03ef452af0a622d364910e3308ab138a80e5360e Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 May 2019 22:13:05 +0200 Subject: [PATCH 141/400] dtkwm: correctly set library version --- srcpkgs/dtkwm/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/dtkwm/template b/srcpkgs/dtkwm/template index baa87d3df95..5def616771b 100644 --- a/srcpkgs/dtkwm/template +++ b/srcpkgs/dtkwm/template @@ -3,6 +3,7 @@ pkgname=dtkwm version=2.0.11 revision=1 build_style=qmake +configure_args="VERSION=${version}" hostmakedepends="qt5-qmake pkg-config" makedepends="qt5-devel qt5-x11extras-devel qt5-multimedia-devel xcb-util-devel dtkcore-devel" From c93779ca951a9abb136ad890eaccf2d24f3c1fed Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 May 2019 22:13:05 +0200 Subject: [PATCH 142/400] dtkwidget: correctly set library version --- srcpkgs/dtkwidget/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/dtkwidget/template b/srcpkgs/dtkwidget/template index 2e5a968407b..7dc6547b2b7 100644 --- a/srcpkgs/dtkwidget/template +++ b/srcpkgs/dtkwidget/template @@ -3,7 +3,7 @@ pkgname=dtkwidget version=2.0.14 revision=1 build_style=qmake -configure_args="DBUS_VERSION_0_4_2=YES LIB_INSTALL_DIR=/usr/lib" +configure_args="DBUS_VERSION_0_4_2=YES LIB_INSTALL_DIR=/usr/lib VERSION=${version}" hostmakedepends="pkg-config qt5-host-tools qt5-qmake" makedepends="dde-qt-dbus-factory-devel dtkcore-devel gsettings-qt-devel librsvg-devel pulseaudio-devel qt5-multimedia-devel qt5-svg-devel From 64da2cda33d0511f4ac5de44d4541f6969c11a85 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 May 2019 22:13:04 +0200 Subject: [PATCH 143/400] dtkcore: correctly set library version --- srcpkgs/dtkcore/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/dtkcore/template b/srcpkgs/dtkcore/template index cbb94bcd3ab..c2eb731d949 100644 --- a/srcpkgs/dtkcore/template +++ b/srcpkgs/dtkcore/template @@ -3,7 +3,7 @@ pkgname=dtkcore version=2.0.14 revision=1 build_style=qmake -configure_args="LIB_INSTALL_DIR=/usr/lib/" +configure_args="LIB_INSTALL_DIR=/usr/lib/ VERSION=${version}" hostmakedepends="qt5-qmake pkg-config" makedepends="qt5-devel gsettings-qt-devel" short_desc="Base devlopment tool of all C++/Qt work on Deepin" From 985a75057e1956039b507887a1af1e650acd99e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= Date: Thu, 30 May 2019 23:29:22 +0200 Subject: [PATCH 144/400] gnutls: update to 3.6.8. --- srcpkgs/gnutls/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template index 1dead915c23..37022c77c37 100644 --- a/srcpkgs/gnutls/template +++ b/srcpkgs/gnutls/template @@ -1,6 +1,6 @@ # Template file for 'gnutls' pkgname=gnutls -version=3.6.7 +version=3.6.8 revision=2 build_style=gnu-configure configure_args="--with-zlib --disable-guile --disable-static @@ -15,7 +15,7 @@ maintainer="Juan RP " 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=5b3409ad5aaf239808730d1ee12fdcd148c0be00262c7edf157af655a8a188e2 +checksum=aa81944e5635de981171772857e72be231a7e0f559ae0292d2737de475383e83 gnutls-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" From 21b071019fc996d433f642766f510a7060e11fe6 Mon Sep 17 00:00:00 2001 From: Johannes Date: Fri, 31 May 2019 11:00:11 +0200 Subject: [PATCH 145/400] armadillo: update to 9.400.4. --- srcpkgs/armadillo/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/armadillo/template b/srcpkgs/armadillo/template index 4839502133a..f542d2195f9 100644 --- a/srcpkgs/armadillo/template +++ b/srcpkgs/armadillo/template @@ -1,6 +1,6 @@ # Template file for 'armadillo' pkgname=armadillo -version=9.400.3 +version=9.400.4 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=f4c9ce4ee719e935f0046dcafb3fe40ffd8e1b80cc16a4d2c03332ea37d857a6 +checksum=b498ba84f2b7736a4efdfaaab351231f1218ddaa73503a3bd7d0045c514460f3 build_options="hdf5" desc_option_hdf5="HDF5 support" From 7af51d7b7c0afcef538b427f984e843afb53d7a1 Mon Sep 17 00:00:00 2001 From: Johannes Date: Fri, 31 May 2019 10:55:54 +0200 Subject: [PATCH 146/400] ImageMagick: update to 7.0.8.47. --- srcpkgs/ImageMagick/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template index ffd04df8e59..811515f7973 100644 --- a/srcpkgs/ImageMagick/template +++ b/srcpkgs/ImageMagick/template @@ -1,7 +1,7 @@ # Template file for 'ImageMagick' pkgname=ImageMagick _majorver=7.0.8 -_patchver=46 +_patchver=47 version="${_majorver}.${_patchver}" revision=1 wrksrc="${pkgname}-${_majorver}-${_patchver}" @@ -21,7 +21,7 @@ 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=e6f49b5883d26c7f85207779397bdb083e629acec8de423e6b1d32038e23ded8 +checksum=8d2bfa68fea5ca04b62c095da8c4707bb62cd1961a25d03162ac3112d42b346a subpackages="libmagick libmagick-devel" From d0b0446ba97aa370968096342f0bf8808edc6d6f Mon Sep 17 00:00:00 2001 From: Johannes Date: Fri, 31 May 2019 10:56:08 +0200 Subject: [PATCH 147/400] ImageMagick6: update to 6.9.10.47. --- srcpkgs/ImageMagick6/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ImageMagick6/template b/srcpkgs/ImageMagick6/template index 1cc9da7180a..15ae8bdb04e 100644 --- a/srcpkgs/ImageMagick6/template +++ b/srcpkgs/ImageMagick6/template @@ -1,7 +1,7 @@ # Template file for 'ImageMagick6' pkgname=ImageMagick6 _majorver=6.9.10 -_patchver=46 +_patchver=47 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=99d3fe8774a5b22d9d27ebd5d4ca656b86784b20b5a74a398cdfbcc799d8c5db +checksum=664fd4dd4a9cdd9b1dfa522b7c450c8e486e16df647d9e59f9c5acbea1bbc556 keep_libtool_archives=yes conf_files="/etc/ImageMagick-${_majorver%%.*}/*.xml" From dcde0521a7e5e7dba3b81d86c40612e65cd6489f Mon Sep 17 00:00:00 2001 From: Johannes Date: Fri, 31 May 2019 11:34:21 +0200 Subject: [PATCH 148/400] exiftool: update to 11.45. --- srcpkgs/exiftool/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template index 9b57c945d43..f2cedf375b6 100644 --- a/srcpkgs/exiftool/template +++ b/srcpkgs/exiftool/template @@ -1,6 +1,6 @@ # Template file for 'exiftool' pkgname=exiftool -version=11.37 +version=11.45 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=e8cea0dfe2604b89285b3e4a4e627144e07e2e6eb2601cd7e7196dc45fe12eee +checksum=87a99d07b594a55893da36c61f2c7f01e3c28777f90944847f3d01ae4e6d03af From 859745c0fb1ba4cd6c2191ae66d37812b144786d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Fri, 31 May 2019 11:20:14 +0200 Subject: [PATCH 149/400] qtcreator: update to 4.9.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/qtcreator/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qtcreator/template b/srcpkgs/qtcreator/template index 6de71bd0b28..7a76c6f3db2 100644 --- a/srcpkgs/qtcreator/template +++ b/srcpkgs/qtcreator/template @@ -1,6 +1,6 @@ # Template file for 'qtcreator' pkgname=qtcreator -version=4.9.0 +version=4.9.1 revision=1 wrksrc="qt-creator-opensource-src-${version}" build_style=qmake @@ -14,7 +14,7 @@ maintainer="Jürgen Buchmüller " license="GPL-3.0-only,QtCompany-GPL-Exception-1.0" homepage="https://wiki.qt.io/Category:Tools::QtCreator" distfiles="https://download.qt.io/official_releases/qtcreator/${version%.*}/${version}/${wrksrc}.tar.xz" -checksum=46ee1992531b769450f8be96cf63520b609d7dd305df345d7cd8216ac396e6a8 +checksum=79b8228d0871927837681e6af9ab91e3ea28154cecfba317f9c0e56246b8ad81 nocross="clang in makedepends: at-spi2-atk-2.30.0_1: broken, unresolvable shlib 'ld-linux-armhf.so.3'" From 0a4108a9cf1059599fdf6c8ab43dc04b0b6a0fc7 Mon Sep 17 00:00:00 2001 From: q66 Date: Fri, 31 May 2019 02:08:17 +0200 Subject: [PATCH 150/400] grub: patch out creation of OS X menu entries on non-x86 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ci skip] Closes: #12046 [via git-merge-pr] Signed-off-by: Jürgen Buchmüller --- srcpkgs/grub/patches/os-prober-osx86.patch | 16 ++++++++++++++++ srcpkgs/grub/template | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/grub/patches/os-prober-osx86.patch diff --git a/srcpkgs/grub/patches/os-prober-osx86.patch b/srcpkgs/grub/patches/os-prober-osx86.patch new file mode 100644 index 00000000000..5fabbeb6d99 --- /dev/null +++ b/srcpkgs/grub/patches/os-prober-osx86.patch @@ -0,0 +1,16 @@ +Patches OS X detection out of os-prober hook on non-x86 architectures. The +menu entries generated for those are invalid for non-x86 Mac stuff. +--- util/grub.d/30_os-prober.in ++++ util/grub.d/30_os-prober.in +@@ -42,6 +42,11 @@ if [ -z "${OSPROBED}" ] ; then + fi + + osx_entry() { ++ # GRUB won't load OS X outside of x86, no entry ++ case "x`uname -m`" in ++ xi?86|xx86_64) ;; ++ *) return ;; ++ esac + if [ x$2 = x32 ]; then + # TRANSLATORS: it refers to kernel architecture (32-bit) + bitstr="$(gettext "(32-bit)")" diff --git a/srcpkgs/grub/template b/srcpkgs/grub/template index 97ce99b71ff..c14322f4ed4 100644 --- a/srcpkgs/grub/template +++ b/srcpkgs/grub/template @@ -1,7 +1,7 @@ # Template file for 'grub' pkgname=grub version=2.02 -revision=5 +revision=6 hostmakedepends="flex freetype-devel font-unifont-bdf" makedepends="libusb-compat-devel ncurses-devel freetype-devel liblzma-devel device-mapper-devel fuse-devel" From ef869c8f35187282ca1261f37f67fcf6f0770ade Mon Sep 17 00:00:00 2001 From: q66 Date: Fri, 31 May 2019 02:06:03 +0200 Subject: [PATCH 151/400] os-prober: fix the way scripts are installed for different archs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The old way simply installed stuff for all as if they were x86, the new way follows what the Debian scripts do. Closes: #12045 [via git-merge-pr] Signed-off-by: Jürgen Buchmüller --- srcpkgs/os-prober/template | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/srcpkgs/os-prober/template b/srcpkgs/os-prober/template index 1947724669f..5433bc9ecce 100644 --- a/srcpkgs/os-prober/template +++ b/srcpkgs/os-prober/template @@ -1,7 +1,7 @@ # Template file for 'os-prober' pkgname=os-prober version=1.77 -revision=1 +revision=2 build_style=gnu-makefile make_dirs="/var/lib/os-prober 0755 root root" short_desc="Utility to detect other OSes on a set of drives" @@ -11,6 +11,12 @@ homepage="https://packages.debian.org/sid/os-prober" distfiles="${DEBIAN_SITE}/main/o/${pkgname}/${pkgname}_${version}.tar.xz" checksum=8d8ea4afbe1aeef3c8b73f74a0fb37b06185e21a6abc78f80fc2160009cf705f +case "$XBPS_TARGET_MACHINE" in + i686*|x86_64*) _ARCH="x86";; + ppc*) _ARCH="powerpc";; + *) ;; +esac + do_install() { vbin linux-boot-prober vbin os-prober @@ -20,7 +26,9 @@ do_install() { for dir in os-probes os-probes/mounted os-probes/init linux-boot-probes linux-boot-probes/mounted; do vmkdir usr/lib/${dir} install -m755 -t ${DESTDIR}/usr/lib/${dir} ${dir}/common/* - [ -d ${dir}/x86 ] && cp -r ${dir}/x86/* ${DESTDIR}/usr/lib/${dir} + [ -n "$_ARCH" -a -d ${dir}/${_ARCH} ] && cp -r ${dir}/${_ARCH}/* ${DESTDIR}/usr/lib/${dir} done - vinstall os-probes/mounted/powerpc/20macosx 755 usr/lib/os-probes/mounted + if [ -n "$_ARCH" -a "$_ARCH" = "x86" ]; then + vinstall os-probes/mounted/powerpc/20macosx 755 usr/lib/os-probes/mounted + fi } From 3193c69375857e485184183a768724118e5b4d6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= Date: Fri, 31 May 2019 01:56:47 +0200 Subject: [PATCH 152/400] e2fsprogs: update to 1.45.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: #12047 [via git-merge-pr] Signed-off-by: Jürgen Buchmüller --- srcpkgs/e2fsprogs/patches/fix-glibcism.patch | 243 ------------------- srcpkgs/e2fsprogs/template | 5 +- 2 files changed, 3 insertions(+), 245 deletions(-) delete mode 100644 srcpkgs/e2fsprogs/patches/fix-glibcism.patch diff --git a/srcpkgs/e2fsprogs/patches/fix-glibcism.patch b/srcpkgs/e2fsprogs/patches/fix-glibcism.patch deleted file mode 100644 index 7d02fa91d57..00000000000 --- a/srcpkgs/e2fsprogs/patches/fix-glibcism.patch +++ /dev/null @@ -1,243 +0,0 @@ ---- lib/ext2fs/ext4_acl.h -+++ lib/ext2fs/ext4_acl.h -@@ -50,13 +50,17 @@ typedef struct { - - typedef struct { - __le32 a_version; -+#ifdef __GNUC_PREREQ - #if __GNUC_PREREQ (4, 8) - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wpedantic" -+#endif - #endif - posix_acl_xattr_entry a_entries[0]; -+#ifdef __GNUC_PREREQ - #if __GNUC_PREREQ (4, 8) - #pragma GCC diagnostic pop - #endif -+#endif - } posix_acl_xattr_header; - ---- lib/ext2fs/fiemap.h -+++ lib/ext2fs/fiemap.h -@@ -31,14 +31,18 @@ struct fiemap { - __u32 fm_mapped_extents;/* number of extents that were mapped (out) */ - __u32 fm_extent_count; /* size of fm_extents array (in) */ - __u32 fm_reserved; -+#ifdef __GNUC_PREREQ - #if __GNUC_PREREQ (4, 8) - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wpedantic" -+#endif - #endif - struct fiemap_extent fm_extents[0]; /* array of mapped extents (out) */ -+#ifdef __GNUC_PREREQ - #if __GNUC_PREREQ (4, 8) - #pragma GCC diagnostic pop - #endif -+#endif - }; - - #if defined(__linux__) && !defined(FS_IOC_FIEMAP) ---- lib/ext2fs/mmp.c -+++ lib/ext2fs/mmp.c -@@ -34,8 +34,10 @@ - #define O_DIRECT 0 - #endif - -+#ifdef __GNUC_PREREQ - #if __GNUC_PREREQ (4, 6) - #pragma GCC diagnostic push -+#endif - #ifndef CONFIG_MMP - #pragma GCC diagnostic ignored "-Wunused-parameter" - #endif -@@ -467,6 +469,8 @@ mmp_error: - return EXT2_ET_OP_NOT_SUPPORTED; - #endif - } -+#ifdef __GNUC_PREREQ - #if __GNUC_PREREQ (4, 6) - #pragma GCC diagnostic pop - #endif -+#endif ---- lib/ext2fs/unix_io.c -+++ lib/ext2fs/unix_io.c -@@ -1127,10 +1127,12 @@ unimplemented: - } - - /* parameters might not be used if OS doesn't support zeroout */ -+#ifdef __GNUC_PREREQ - #if __GNUC_PREREQ (4, 6) - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wunused-parameter" - #endif -+#endif - static errcode_t unix_zeroout(io_channel channel, unsigned long long block, - unsigned long long count) - { -@@ -1197,9 +1199,11 @@ err: - unimplemented: - return EXT2_ET_UNIMPLEMENTED; - } -+#ifdef __GNUC_PREREQ - #if __GNUC_PREREQ (4, 6) - #pragma GCC diagnostic pop - #endif -+#endif - - static struct struct_io_manager struct_unix_manager = { - .magic = EXT2_ET_MAGIC_IO_MANAGER, ---- lib/ext2fs/hashmap.h -+++ lib/ext2fs/hashmap.h -@@ -17,14 +17,18 @@ struct ext2fs_hashmap { - struct ext2fs_hashmap_entry *next; - struct ext2fs_hashmap_entry *list_next; - struct ext2fs_hashmap_entry *list_prev; -+#ifdef __GNUC_PREREQ - #if __GNUC_PREREQ (4, 8) - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wpedantic" -+#endif - #endif - } *entries[0]; -+#ifdef __GNUC_PREREQ - #if __GNUC_PREREQ (4, 8) - #pragma GCC diagnostic pop - #endif -+#endif - }; - - struct ext2fs_hashmap *ext2fs_hashmap_create( ---- lib/uuid/gen_uuid.c -+++ lib/uuid/gen_uuid.c -@@ -484,7 +484,9 @@ static void close_all_fds(void) - } - #endif /* defined(USE_UUIDD) && defined(HAVE_SYS_UN_H) */ - -+#ifdef __GNUC_PREREQ - #if __GNUC_PREREQ (4, 6) -+#endif - #pragma GCC diagnostic push - #if !defined(USE_UUIDD) || !defined(HAVE_SYS_UN_H) - #pragma GCC diagnostic ignored "-Wunused-parameter" -@@ -572,9 +574,11 @@ fail: - #endif - return -1; - } -+#ifdef __GNUC_PREREQ - #if __GNUC_PREREQ (4, 6) - #pragma GCC diagnostic pop - #endif -+#endif - - void uuid__generate_time(uuid_t out, int *num) - { ---- e2fsck/problem.c -+++ e2fsck/problem.c -@@ -99,10 +99,12 @@ static const char *preen_msg[] = { - "", /* 20 */ - }; - -+#ifdef __GNUC_PREREQ - #if __GNUC_PREREQ (4, 6) - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wmissing-field-initializers" - #endif -+#endif - - static struct e2fsck_problem problem_table[] = { - -@@ -2094,9 +2096,11 @@ static struct latch_descr pr_latch_info[] = { - { PR_LATCH_OPTIMIZE_EXT, PR_1E_OPTIMIZE_EXT_HEADER, PR_1E_OPTIMIZE_EXT_END }, - { -1, 0, 0 }, - }; -+#ifdef __GNUC_PREREQ - #if __GNUC_PREREQ (4, 6) - #pragma GCC diagnostic pop - #endif -+#endif - - static struct e2fsck_problem *find_problem(problem_t code) - { ---- misc/e2undo.c -+++ misc/e2undo.c -@@ -81,14 +81,18 @@ struct undo_key_block { - __le32 magic; /* KEYBLOCK_MAGIC number */ - __le32 crc; /* block checksum */ - __le64 reserved; /* zero */ -+#ifdef __GNUC_PREREQ - #if __GNUC_PREREQ (4, 8) - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wpedantic" -+#endif - #endif - struct undo_key keys[0]; /* keys, which come immediately after */ -+#ifdef __GNUC_PREREQ - #if __GNUC_PREREQ (4, 8) - #pragma GCC diagnostic pop - #endif -+#endif - }; - - struct undo_key_info { ---- misc/filefrag.c -+++ misc/filefrag.c -@@ -535,9 +535,11 @@ int main(int argc, char**argv) - char *end; - blocksize = strtoul(optarg, &end, 0); - if (end) { -+#ifdef __GNUC_PREREQ - #if __GNUC_PREREQ (7, 0) - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wimplicit-fallthrough" -+#endif - #endif - switch (end[0]) { - case 'g': -@@ -555,8 +557,10 @@ int main(int argc, char**argv) - default: - break; - } -+#ifdef __GNUC_PREREQ - #if __GNUC_PREREQ (7, 0) - #pragma GCC diagnostic pop -+#endif - #endif - } - } else { /* Allow -b without argument for compat. Remove ---- misc/fuse2fs.c -+++ misc/fuse2fs.c -@@ -118,14 +118,18 @@ typedef struct { - - typedef struct { - u_int32_t a_version; -+#ifdef __GNUC_PREREQ - #if __GNUC_PREREQ (4, 8) - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wpedantic" -+#endif - #endif - acl_ea_entry a_entries[0]; -+#ifdef __GNUC_PREREQ - #if __GNUC_PREREQ (4, 8) - #pragma GCC diagnostic pop - #endif -+#endif - } acl_ea_header; - - static inline size_t acl_ea_size(int count) ---- debugfs/set_fields.c -+++ debugfs/set_fields.c -@@ -291,9 +292,11 @@ static struct field_set_info mmp_fields[] = { - { "checksum", &set_mmp.mmp_checksum, NULL, 4, parse_uint }, - { 0, 0, 0, 0 } - }; -+#ifdef __GNUC_PREREQ - #if __GNUC_PREREQ (4, 6) - #pragma GCC diagnostic pop - #endif -+#endif - - #ifdef UNITTEST - diff --git a/srcpkgs/e2fsprogs/template b/srcpkgs/e2fsprogs/template index 4875bc8e062..83d6e8e37c7 100644 --- a/srcpkgs/e2fsprogs/template +++ b/srcpkgs/e2fsprogs/template @@ -1,6 +1,6 @@ # Template file for 'e2fsprogs' pkgname=e2fsprogs -version=1.45.0 +version=1.45.2 revision=1 build_style=gnu-configure configure_args="--enable-elf-shlibs --disable-fsck @@ -11,12 +11,13 @@ configure_args="--enable-elf-shlibs --disable-fsck make_install_args="install-libs" hostmakedepends="pkg-config" makedepends="libuuid-devel libblkid-devel" +checkdepends="diffutils perl" short_desc="Ext2/3/4 Filesystem Utilities" maintainer="Juan RP " 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=1fa9d0e13f30f1cae9035fe74ed8ad01bfaae99c2c0b9b970318bdb5d738fcd4 +checksum=4952c9ae91e36d762e13cc5b9e8f7eeb5453e4aee4cd9b7402e73f2d4e65e009 conf_files="/etc/mke2fs.conf /etc/e2scrub.conf" do_check() { From 62eb91cbc9caa9d8a24d768f3e9a92dacfba01a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= Date: Thu, 30 May 2019 23:37:41 +0200 Subject: [PATCH 153/400] gnupg2: update to 2.2.16. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: #12043 [via git-merge-pr] Signed-off-by: Jürgen Buchmüller --- srcpkgs/gnupg2/template | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gnupg2/template b/srcpkgs/gnupg2/template index fb732c1e949..4bd0b4b1e61 100644 --- a/srcpkgs/gnupg2/template +++ b/srcpkgs/gnupg2/template @@ -1,6 +1,6 @@ # Template file for 'gnupg2' pkgname=gnupg2 -version=2.2.15 +version=2.2.16 revision=1 wrksrc="gnupg-${version}" build_style=gnu-configure @@ -16,11 +16,10 @@ maintainer="maxice8 " license="GPL-3.0-or-later" homepage="https://www.gnupg.org/" distfiles="https://gnupg.org/ftp/gcrypt/gnupg/gnupg-${version}.tar.bz2" -checksum=cb8ce298d7b36558ffc48aec961b14c830ff1783eef7a623411188b5e0f5d454 +checksum=6cbe8d454bf5dc204621eed3016d721b66298fa95363395bb8eeceb1d2fd14cb pre_configure() { - sed -i '/^CFLAGS=$/d' configure - sed -i '/examples\/systemd-user/d' doc/Makefile.in + vsed -i '/examples\/systemd-user/d' doc/Makefile.in } post_install() { From b7276f58e338067e842046c283c25b77466a8c5b Mon Sep 17 00:00:00 2001 From: Kai Stian Olstad Date: Thu, 30 May 2019 20:32:17 +0200 Subject: [PATCH 154/400] New package: kodi-addon-vfs-rar-2.0.7 --- srcpkgs/kodi-addon-vfs-rar/template | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 srcpkgs/kodi-addon-vfs-rar/template diff --git a/srcpkgs/kodi-addon-vfs-rar/template b/srcpkgs/kodi-addon-vfs-rar/template new file mode 100644 index 00000000000..21a5dd8b785 --- /dev/null +++ b/srcpkgs/kodi-addon-vfs-rar/template @@ -0,0 +1,15 @@ +# Template file for 'kodi-addon-vfs-rar' +pkgname=kodi-addon-vfs-rar +version=2.0.7 +revision=1 +_kodi_release=Leia +wrksrc="vfs.rar-${version}-${_kodi_release}" +build_style=cmake +makedepends="kodi-devel kodi-platform p8-platform-devel" +short_desc="RAR VFS addon for Kodi" +maintainer="Kai Stian Olstad " +license="GPL-2.0-or-later" +homepage="https://github.com/xbmc/vfs.rar" +distfiles="https://github.com/xbmc/vfs.rar/archive/${version}-${_kodi_release}.tar.gz" +checksum=b42db08aae80a10cfe3534b72241737c3fac39fc1d4bbb8473163b9a30d12251 +nocross="depends on kodi-platform" From cf6e60c7a23a70b0441ceae61f129fc6b757b0f6 Mon Sep 17 00:00:00 2001 From: Kai Stian Olstad Date: Thu, 30 May 2019 20:37:06 +0200 Subject: [PATCH 155/400] kodi-binary-addons: update to 18.2, add kodi-addon-vfs-rar to depends --- srcpkgs/kodi-binary-addons/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/kodi-binary-addons/template b/srcpkgs/kodi-binary-addons/template index 4c60c767311..3de8815175d 100644 --- a/srcpkgs/kodi-binary-addons/template +++ b/srcpkgs/kodi-binary-addons/template @@ -1,12 +1,13 @@ # Template file for 'kodi-binary-addons' pkgname=kodi-binary-addons -version=18.1 -revision=5 +version=18.2 +revision=1 archs=noarch build_style=meta depends="kodi-addon-pvr-zattoo kodi-addon-game-libretro kodi-addon-peripheral-joystick kodi-addon-inputstream-rtmp - kodi-addon-inputstream-adaptive kodi-addon-pvr-hts kodi-addon-pvr-iptvsimple" + kodi-addon-inputstream-adaptive kodi-addon-pvr-hts kodi-addon-pvr-iptvsimple + kodi-addon-vfs-rar" short_desc="Meta-package for binary kodi addons" maintainer="Helmut Pozimski " license="metapackage" From f9ed50f8a417aaf05aff229a1e48216b7afcd22c Mon Sep 17 00:00:00 2001 From: DirectorX Date: Fri, 31 May 2019 14:05:15 +0300 Subject: [PATCH 156/400] Waybar: update to 0.6.7. --- srcpkgs/Waybar/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template index 4f29c074197..863ab71a8dd 100644 --- a/srcpkgs/Waybar/template +++ b/srcpkgs/Waybar/template @@ -1,6 +1,6 @@ # Template file for 'Waybar' pkgname=Waybar -version=0.6.6 +version=0.6.7 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=03bc5019bd46175d2d9b2112ca2baa265a71e17bbd0dd2fdc51156f1ed9b021a +checksum=45f8d24c628569b7691654a6079bc4fb70fee474e2c996e46af044e3dcffd036 build_options="libnl pulseaudio dbusmenugtk mpd" build_options_default="pulseaudio mpd" From bea2c9065c47600db3852e4b3018d05612997bdc Mon Sep 17 00:00:00 2001 From: Dawid Potocki Date: Fri, 31 May 2019 22:22:13 +1200 Subject: [PATCH 157/400] ufetch: fix license to isc --- srcpkgs/ufetch/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ufetch/template b/srcpkgs/ufetch/template index 063f5e9a917..989dcb76523 100644 --- a/srcpkgs/ufetch/template +++ b/srcpkgs/ufetch/template @@ -1,13 +1,13 @@ # Template file for 'ufetch' pkgname=ufetch version=0.1 -revision=1 +revision=2 archs=noarch wrksrc="ufetch-v${version}" depends="xbps coreutils ncurses" short_desc="Tiny system info for Void" maintainer="maxice8 " -license="MIT" +license="ISC" homepage="https://gitlab.com/jschx/ufetch" distfiles="https://gitlab.com/jschx/ufetch/-/archive/v${version}/ufetch-v${version}.tar.gz" checksum=e4149fc8d0c75e431e99250e0cd2597ea389b488d8c9febc845eadd0f7b6e947 From fde95c6adff073280e90dff86ba88b147533471a Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Fri, 31 May 2019 07:47:14 +0000 Subject: [PATCH 158/400] New package: containers.image-1.5.1 --- srcpkgs/containers.image/template | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 srcpkgs/containers.image/template diff --git a/srcpkgs/containers.image/template b/srcpkgs/containers.image/template new file mode 100644 index 00000000000..13f0bd4e641 --- /dev/null +++ b/srcpkgs/containers.image/template @@ -0,0 +1,28 @@ +# Template file for 'containers.image' +pkgname=containers.image +version=1.5.1 +revision=1 +wrksrc="image-${version}" +conf_files="/etc/containers/registries.conf" +hostmakedepends="go-md2man" +short_desc="Configuration shared by podman, buildah, and skopeo" +maintainer="Cameron Nemo " +license="Apache-2.0" +homepage="https://github.com/containers/image" +distfiles="https://github.com/containers/image/archive/v${version}.tar.gz" +checksum=369dd8a90eae5d25acd843f8eff5c571392a43582d3eced5bbdc4b3f0e81c551 + +do_build() { + mkdir -p build + for doc in docs/*.*.md; do + docbase="${doc##*/}" + go-md2man -in "${doc}" -out "build/${docbase/.md/}" + done +} + +do_install() { + for man in build/*; do + vman "${man}" + done + vinstall registries.conf 0644 etc/containers +} From e35bea72573aaa8f427b07283dd8684dd536b140 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Fri, 31 May 2019 07:48:00 +0000 Subject: [PATCH 159/400] buildah: use registries.conf from containers.image --- srcpkgs/buildah/template | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/srcpkgs/buildah/template b/srcpkgs/buildah/template index dde0990be24..7355e1fa98c 100644 --- a/srcpkgs/buildah/template +++ b/srcpkgs/buildah/template @@ -1,7 +1,7 @@ # Template file for 'buildah' pkgname=buildah version=1.8.2 -revision=1 +revision=2 build_style=go go_import_path=github.com/containers/buildah go_package="${go_import_path}/cmd/buildah" @@ -9,25 +9,20 @@ go_build_tags=containers_image_ostree_stub hostmakedepends="pkg-config go-md2man" makedepends="libostree-devel libbtrfs-devel device-mapper-devel gpgme-devel libassuan-devel libseccomp-devel" -depends="runc skopeo" -short_desc="OCI image building tool" -maintainer="Cameron Nemo " +depends="runc skopeo containers.image" +short_desc="Dockerfile compatible OCI image building tool" +maintainer="Cameron Nemo " license="Apache-2.0" homepage="https://github.com/containers/buildah" distfiles="${homepage}/archive/v${version}.tar.gz" checksum=2a659687210fd1219c73e2d35e87caadb9e06f12e08973c18058d073fe8ecfb7 -case "$XBPS_TARGET_ARCH" in - *-musl) broken="/lib/libmount.so.1: undefined reference to getrandom" ;; -esac - post_build() { make -C docs } post_install() { vinstall contrib/completions/bash/buildah 644 /usr/share/bash-completion/completions - vinstall tests/registries.conf 644 /etc/containers for _i in docs/*.1; do vman $_i done From 3226c912975d0580b09677ed447f63968e8d4133 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Fri, 31 May 2019 07:48:53 +0000 Subject: [PATCH 160/400] podman: update to 1.3.2 Drop buildah dependency for containers.image --- srcpkgs/podman/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template index c3c5ea9ac98..b4b2564a709 100644 --- a/srcpkgs/podman/template +++ b/srcpkgs/podman/template @@ -1,6 +1,6 @@ # Template file for 'podman' pkgname=podman -version=1.3.1 +version=1.3.2 revision=1 wrksrc="libpod-${version}" build_style=go @@ -10,13 +10,13 @@ go_build_tags="seccomp apparmor containers_image_ostree_stub btrfs_noversion exclude_graphdriver_btrfs" hostmakedepends="pkg-config go-md2man" makedepends="gpgme-devel libseccomp-devel device-mapper-devel" -depends="runc cri-o cni-plugins skopeo buildah slirp4netns" +depends="runc cri-o cni-plugins skopeo slirp4netns containers.image" short_desc="Simple management tool for containers and images" maintainer="Cameron Nemo " license="Apache-2.0" homepage="https://podman.io/" distfiles="https://github.com/containers/libpod/archive/v${version}.tar.gz" -checksum=7ccbfa80900cd438468986911038da4c38382ef507a2fa717217faefb738fbc4 +checksum=ff860e009746ecf566c9228960e7721e8aeababbf9688e24724e6b31b0aefa00 if [ "$CROSS_BUILD" ]; then go_build_tags+=" containers_image_openpgp exclude_graphdriver_overlay" From fe0af917685de3fc95b7369f4db905a4ef0cf01f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= Date: Fri, 31 May 2019 00:41:09 +0200 Subject: [PATCH 161/400] iptables: update to 1.8.3. --- common/shlibs | 4 +-- .../patches/0001-Fix-glibc-build.patch | 28 ------------------- .../patches/0002-Fix-musl-build.patch | 26 ----------------- srcpkgs/iptables/template | 6 ++-- 4 files changed, 5 insertions(+), 59 deletions(-) delete mode 100644 srcpkgs/iptables/patches/0001-Fix-glibc-build.patch delete mode 100644 srcpkgs/iptables/patches/0002-Fix-musl-build.patch diff --git a/common/shlibs b/common/shlibs index e94680f2d39..fe557cc4411 100644 --- a/common/shlibs +++ b/common/shlibs @@ -633,9 +633,9 @@ libedata-cal-1.2.so.29 evolution-data-server-3.30.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 -libip6tc.so.0 iptables-1.4.7_1 +libip6tc.so.2 iptables-1.8.3_1 libxtables.so.12 iptables-1.6.1_1 -libip4tc.so.0 iptables-1.4.7_1 +libip4tc.so.2 iptables-1.8.3_1 libipq.so.0 iptables-1.4.7_1 libnm-util.so.2 libnm-0.9.1.90_1 libnm-glib.so.4 libnm-0.9.1.90_1 diff --git a/srcpkgs/iptables/patches/0001-Fix-glibc-build.patch b/srcpkgs/iptables/patches/0001-Fix-glibc-build.patch deleted file mode 100644 index f120ac962ad..00000000000 --- a/srcpkgs/iptables/patches/0001-Fix-glibc-build.patch +++ /dev/null @@ -1,28 +0,0 @@ -From e8ba70f898179ede0170e36db49ca27570b12371 Mon Sep 17 00:00:00 2001 -From: Nathan -Date: Wed, 9 Jan 2019 21:03:56 -0600 -Subject: [PATCH 1/2] Fix glibc build - ---- - include/linux/netfilter.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git include/linux/netfilter.h include/linux/netfilter.h -index c3f087a..c934044 100644 ---- include/linux/netfilter.h -+++ include/linux/netfilter.h -@@ -2,9 +2,10 @@ - #define __LINUX_NETFILTER_H - - #include -- -+#ifndef __GLIBC__ - #include - #include -+#endif - #include - - /* Responses from hook functions. */ --- -2.20.1 - diff --git a/srcpkgs/iptables/patches/0002-Fix-musl-build.patch b/srcpkgs/iptables/patches/0002-Fix-musl-build.patch deleted file mode 100644 index 365f03926f6..00000000000 --- a/srcpkgs/iptables/patches/0002-Fix-musl-build.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 3186b4418d5c11fd7943623722478eec9727282a Mon Sep 17 00:00:00 2001 -From: Nathan -Date: Wed, 9 Jan 2019 21:04:59 -0600 -Subject: [PATCH 2/2] Fix musl build - ---- - extensions/libebt_vlan.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git extensions/libebt_vlan.c extensions/libebt_vlan.c -index 4a2eb71..a5c7dc4 100644 ---- extensions/libebt_vlan.c -+++ extensions/libebt_vlan.c -@@ -13,7 +13,9 @@ - #include - #include - #include -+#ifdef __GLIBC__ - #include -+#endif - #include "iptables/nft.h" - #include "iptables/nft-bridge.h" - --- -2.20.1 - diff --git a/srcpkgs/iptables/template b/srcpkgs/iptables/template index 5d39ee796fd..1b2d42bf7ea 100644 --- a/srcpkgs/iptables/template +++ b/srcpkgs/iptables/template @@ -1,6 +1,6 @@ # Template file for 'iptables' pkgname=iptables -version=1.8.2 +version=1.8.3 revision=1 build_style=gnu-configure configure_args="--enable-libipq --enable-shared --enable-devel --enable-bpf-compiler" @@ -11,8 +11,8 @@ short_desc="Linux IPv[46] packet filtering ruleset" maintainer="Juan RP " license="GPL-2.0-or-later" homepage="https://www.netfilter.org/" -distfiles="${homepage}/projects/iptables/files/${pkgname}-${version}.tar.bz2" -checksum=a3778b50ed1a3256f9ca975de82c2204e508001fc2471238c8c97f3d1c4c12af +distfiles="https://www.netfilter.org/projects/iptables/files/iptables-${version}.tar.bz2" +checksum=a23cac034181206b4545f4e7e730e76e08b5f3dd78771ba9645a6756de9cdd80 pre_build() { rm include/linux/types.h From 1b0ebeb71684ef3cfa62ebccc8e2566d981f553c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= Date: Fri, 31 May 2019 00:41:33 +0200 Subject: [PATCH 162/400] collectd: rebuild against iptables-1.8.3 --- srcpkgs/collectd/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template index e5ab2e73e92..473cb2314b3 100644 --- a/srcpkgs/collectd/template +++ b/srcpkgs/collectd/template @@ -1,7 +1,7 @@ # Template file for 'collectd' pkgname=collectd version=5.8.1 -revision=3 +revision=4 build_style=gnu-configure configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl) $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt From ff632e74d23034ef38233e5f65fb6efc77d0748e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= Date: Fri, 31 May 2019 00:41:34 +0200 Subject: [PATCH 163/400] miniupnpd: rebuild against iptables-1.8.3 --- srcpkgs/miniupnpd/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/miniupnpd/template b/srcpkgs/miniupnpd/template index bfda27edac8..8d46cb7514d 100644 --- a/srcpkgs/miniupnpd/template +++ b/srcpkgs/miniupnpd/template @@ -1,7 +1,7 @@ # Template file for 'miniupnpd' pkgname=miniupnpd version=2.1 -revision=1 +revision=2 build_style=gnu-makefile make_cmd="make -f Makefile.linux" make_install_args="PREFIX= SBININSTALLDIR=/usr/bin" From cec1965e7314340372a4365850c779a706f75e9e Mon Sep 17 00:00:00 2001 From: Ivan Sokolov Date: Wed, 22 May 2019 23:25:06 +0300 Subject: [PATCH 164/400] New package: bintuils-doc-2.32 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/binutils-doc | 1 + srcpkgs/binutils/template | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) create mode 120000 srcpkgs/binutils-doc diff --git a/srcpkgs/binutils-doc b/srcpkgs/binutils-doc new file mode 120000 index 00000000000..695eb82eae6 --- /dev/null +++ b/srcpkgs/binutils-doc @@ -0,0 +1 @@ +binutils \ No newline at end of file diff --git a/srcpkgs/binutils/template b/srcpkgs/binutils/template index 2ebd7c5d9a2..5a156c4c4c9 100644 --- a/srcpkgs/binutils/template +++ b/srcpkgs/binutils/template @@ -96,8 +96,6 @@ do_install() { echo "INPUT ( /usr/lib/libopcodes.a -lbfd )" \ >${DESTDIR}/usr/lib/libopcodes.so - # Remove info file that conflicts with autoconf. - rm -f ${DESTDIR}/usr/share/info/standards.info rm -f ${DESTDIR}/usr/lib64 # Remove useless manpages. @@ -119,3 +117,13 @@ binutils-devel_package() { vmove "usr/lib/*.so" } } + +binutils-doc_package() { + archs=noarch + short_desc+=" - info files" + pkg_install() { + vmove usr/share/info + # Remove info file that conflicts with autoconf. + rm -f ${PKGDESTDIR}/usr/share/info/standards.info + } +} From 539ed31ffd2d476ccb0b520b79201dfccb76ce55 Mon Sep 17 00:00:00 2001 From: Ivan Sokolov Date: Wed, 22 May 2019 23:28:15 +0300 Subject: [PATCH 165/400] cross-arm-none-eabi-binutils: add dependency on documentation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/cross-arm-none-eabi-binutils/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/cross-arm-none-eabi-binutils/template b/srcpkgs/cross-arm-none-eabi-binutils/template index 3bee321d7c8..fd106a2c40a 100644 --- a/srcpkgs/cross-arm-none-eabi-binutils/template +++ b/srcpkgs/cross-arm-none-eabi-binutils/template @@ -3,7 +3,7 @@ _triplet=arm-none-eabi _pkgname=binutils pkgname=cross-${_triplet}-${_pkgname} version=2.32 -revision=1 +revision=2 wrksrc="${_pkgname}-${version}" build_style=gnu-configure configure_args=" @@ -24,6 +24,7 @@ configure_args=" " hostmakedepends="autoconf automake bison flex perl" makedepends="zlib-devel" +depends="binutils-doc" short_desc="GNU binary utilities" maintainer="Ivan Sokolov " license="GPL-3.0-or-later" From f045b8f7eb188d0364e22051a9ceaf0652498b54 Mon Sep 17 00:00:00 2001 From: Ivan Sokolov Date: Thu, 23 May 2019 03:36:53 +0300 Subject: [PATCH 166/400] binutils: add dependency on documentation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: #11884 [via git-merge-pr] Signed-off-by: Jürgen Buchmüller --- srcpkgs/binutils/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/binutils/template b/srcpkgs/binutils/template index 5a156c4c4c9..2607ab5f817 100644 --- a/srcpkgs/binutils/template +++ b/srcpkgs/binutils/template @@ -1,7 +1,7 @@ # Template file for 'binutils' pkgname=binutils version=2.32 -revision=2 +revision=3 bootstrap=yes short_desc="GNU binary utilities" maintainer="Juan RP " @@ -13,6 +13,7 @@ checksum=0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04 if [ "$CHROOT_READY" ]; then hostmakedepends="flex perl" checkdepends="bc" + depends="binutils-doc" else unset XBPS_CHECK_PKGS XBPS_TRIPLET=x86_64-unknown-linux-gnu From 5eabf60826a9f2cd0d84f99f0d527610f23b7502 Mon Sep 17 00:00:00 2001 From: DirectorX Date: Tue, 28 May 2019 20:38:07 +0300 Subject: [PATCH 167/400] flatpak: update to 1.4.0. Closes: #12006 [via git-merge-pr] --- srcpkgs/flatpak/template | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/srcpkgs/flatpak/template b/srcpkgs/flatpak/template index 0b2817d2d90..901e988f7ec 100644 --- a/srcpkgs/flatpak/template +++ b/srcpkgs/flatpak/template @@ -1,14 +1,14 @@ # Template file for 'flatpak' pkgname=flatpak -version=1.2.4 -revision=2 +version=1.4.0 +revision=1 build_style=gnu-configure build_helper="gir" configure_args="--disable-documentation --with-system-bubblewrap $(vopt_enable gir introspection)" hostmakedepends="bubblewrap glib-devel libxslt pkg-config bison" makedepends="appstream-glib-devel gpgme-devel json-glib-devel libcap-devel - libostree-devel libseccomp-devel polkit-devel dconf-devel" + libostree-devel libseccomp-devel polkit-devel dconf-devel fuse-devel" depends="bubblewrap gnupg2" checkdepends="bubblewrap dbus" short_desc="Application sandboxing and distribution framework" @@ -17,11 +17,15 @@ 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=1b6539d94d31e571661a2545cfcece7ec9267b4e2552e3cc0f617f4790f6c3e1 +checksum=82cff04f2e74e3216ce6b7b0ab78fa8d6ca37d81c0dc31156223c83a2d7568ff build_options="gir" build_options_default="gir" +if [ "$CROSS_BUILD" ]; then + configure_args+=" --enable-selinux-module=no" +fi + post_install() { rm -rf $DESTDIR/usr/lib/systemd } From 9110b8d26ce84dd5142e5eac38f42b9f2d086b89 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Fri, 31 May 2019 17:17:25 +0200 Subject: [PATCH 168/400] pipewire: update to 0.2.6. --- ...a358d1580dc06218d18a12a99611cac39e4e.patch | 22 ------------------- srcpkgs/pipewire/template | 6 ++--- 2 files changed, 3 insertions(+), 25 deletions(-) delete mode 100644 srcpkgs/pipewire/patches/371da358d1580dc06218d18a12a99611cac39e4e.patch diff --git a/srcpkgs/pipewire/patches/371da358d1580dc06218d18a12a99611cac39e4e.patch b/srcpkgs/pipewire/patches/371da358d1580dc06218d18a12a99611cac39e4e.patch deleted file mode 100644 index 6d0ae3cd28b..00000000000 --- a/srcpkgs/pipewire/patches/371da358d1580dc06218d18a12a99611cac39e4e.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 371da358d1580dc06218d18a12a99611cac39e4e Mon Sep 17 00:00:00 2001 -From: Jan Grulich -Date: Wed, 2 Jan 2019 10:05:40 +0100 -Subject: [PATCH] Avoid invalid conversion error with C++ compilators - ---- - src/pipewire/utils.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git src/pipewire/utils.h src/pipewire/utils.h -index 2ce9fdde..7262ff42 100644 ---- src/pipewire/utils.h -+++ src/pipewire/utils.h -@@ -58,7 +58,7 @@ pw_spa_pod_copy(const struct spa_pod *pod) - return NULL; - - size = SPA_POD_SIZE(pod); -- if ((c = malloc(size)) == NULL) -+ if ((c = (struct spa_pod *) malloc(size)) == NULL) - return NULL; - - return (struct spa_pod *) memcpy(c, pod, size); diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template index 963b123b097..1fa113b8935 100644 --- a/srcpkgs/pipewire/template +++ b/srcpkgs/pipewire/template @@ -1,7 +1,7 @@ # Template file for 'pipewire' pkgname=pipewire -version=0.2.5 -revision=2 +version=0.2.6 +revision=1 build_style=meson configure_args="-Dman=true -Dgstreamer=enabled -Ddocs=true -Dsystemd=false" hostmakedepends="doxygen graphviz pkg-config xmltoman" @@ -13,7 +13,7 @@ license="LGPL-2.1-or-later" homepage="https://pipewire.org/" changelog="https://raw.githubusercontent.com/PipeWire/pipewire/master/NEWS" distfiles="https://github.com/PipeWire/pipewire/archive/${version}.tar.gz" -checksum=6e75bb88a329f97984925bd303643075788df8d51b345bb43feb1be2c3b7102c +checksum=8592bcc2a83b078fee6cfb8560397cf2747346f28e88689197e780069b19cb17 libpipewire_package() { short_desc+=" - pipewire library" From d3081afb2a9038f90c16f96c7666ad2f6535c552 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Fri, 31 May 2019 17:17:32 +0200 Subject: [PATCH 169/400] xdg-desktop-portal: update to 1.4.2. --- srcpkgs/xdg-desktop-portal/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xdg-desktop-portal/template b/srcpkgs/xdg-desktop-portal/template index 1a0820e7d4d..ea8a93bff3a 100644 --- a/srcpkgs/xdg-desktop-portal/template +++ b/srcpkgs/xdg-desktop-portal/template @@ -1,6 +1,6 @@ # Template file for 'xdg-desktop-portal' pkgname=xdg-desktop-portal -version=1.2.0 +version=1.4.2 revision=1 build_style=gnu-configure configure_args="--enable-pipewire --enable-geoclue" @@ -11,7 +11,7 @@ maintainer="Duncaen " license="LGPL-2.1-or-later" homepage="https://github.com/flatpak/xdg-desktop-portal" distfiles="https://github.com/flatpak/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz" -checksum=c9a4d6c415417aed3231ebc6c9a4091b90199bea4295aab311ce3dab4032e194 +checksum=10f887b8b84aedc12fa9b01cc65bc6e0c8a6674460dd72c09f0cd1985ac5c7ed post_install() { rm -rf "${DESTDIR}/usr/lib/systemd" From 50e5a11fe84a48b39aa5417c4106e34b600f2619 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Fri, 31 May 2019 17:17:35 +0200 Subject: [PATCH 170/400] xdg-desktop-portal-gtk: update to 1.4.0. --- srcpkgs/xdg-desktop-portal-gtk/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xdg-desktop-portal-gtk/template b/srcpkgs/xdg-desktop-portal-gtk/template index c09e00a9dbc..4aae3291a4b 100644 --- a/srcpkgs/xdg-desktop-portal-gtk/template +++ b/srcpkgs/xdg-desktop-portal-gtk/template @@ -1,6 +1,6 @@ # Template file for 'xdg-desktop-portal-gtk' pkgname=xdg-desktop-portal-gtk -version=1.2.0 +version=1.4.0 revision=1 build_style=gnu-configure hostmakedepends="pkg-config libxslt glib-devel xdg-desktop-portal" @@ -12,7 +12,7 @@ maintainer="Duncaen " license="LGPL-2.1-or-later" homepage="https://github.com/flatpak/xdg-desktop-portal-gtk" distfiles="https://github.com/flatpak/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz" -checksum=809e7f470643fdd655ed27193d2bc6aaf6c4e5f9634ca6afdad03173de0a7a3c +checksum=416ac74bcfc0e49e86508c07d91dc218d4b8e7e489b7fdc5060127a029692032 post_install() { rm -rf "${DESTDIR}/usr/lib/systemd" From bbe9b826d2f89728d207b5166aa0938422940fe2 Mon Sep 17 00:00:00 2001 From: Jasper Chan Date: Sun, 26 May 2019 03:10:04 -0700 Subject: [PATCH 171/400] Rename package: Slic3rPE-1.42.0 to PrusaSlicer-2.0.0 --- srcpkgs/PrusaSlicer/INSTALL.msg | 4 +++ srcpkgs/PrusaSlicer/Slic3rPE.INSTALL.msg | 4 +++ ...-sys-unistd.h-with-unistd.h-for-musl.patch | 25 +++++++++++++++++ srcpkgs/PrusaSlicer/template | 22 +++++++++++++++ srcpkgs/Slic3rPE | 1 + .../patches/fix-strerror_r-check.patch | 27 ------------------- srcpkgs/Slic3rPE/template | 22 --------------- 7 files changed, 56 insertions(+), 49 deletions(-) create mode 100644 srcpkgs/PrusaSlicer/INSTALL.msg create mode 100644 srcpkgs/PrusaSlicer/Slic3rPE.INSTALL.msg create mode 100644 srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch create mode 100644 srcpkgs/PrusaSlicer/template create mode 120000 srcpkgs/Slic3rPE delete mode 100644 srcpkgs/Slic3rPE/patches/fix-strerror_r-check.patch delete mode 100644 srcpkgs/Slic3rPE/template diff --git a/srcpkgs/PrusaSlicer/INSTALL.msg b/srcpkgs/PrusaSlicer/INSTALL.msg new file mode 100644 index 00000000000..190965371f6 --- /dev/null +++ b/srcpkgs/PrusaSlicer/INSTALL.msg @@ -0,0 +1,4 @@ +Slic3rPE has been renamed to PrusaSlicer + +The binary executable has been renamed from +/usr/bin/slic3r-pe to /usr/bin/prusa-slicer diff --git a/srcpkgs/PrusaSlicer/Slic3rPE.INSTALL.msg b/srcpkgs/PrusaSlicer/Slic3rPE.INSTALL.msg new file mode 100644 index 00000000000..190965371f6 --- /dev/null +++ b/srcpkgs/PrusaSlicer/Slic3rPE.INSTALL.msg @@ -0,0 +1,4 @@ +Slic3rPE has been renamed to PrusaSlicer + +The binary executable has been renamed from +/usr/bin/slic3r-pe to /usr/bin/prusa-slicer diff --git a/srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch b/srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch new file mode 100644 index 00000000000..4abae3ef38a --- /dev/null +++ b/srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch @@ -0,0 +1,25 @@ +From 7cdeb3dfbe01fc681c35e89e3f509c8e7ac9522e Mon Sep 17 00:00:00 2001 +From: Jasper Chan +Date: Mon, 27 May 2019 18:54:59 -0700 +Subject: [PATCH] Replace sys/unistd.h with unistd.h for musl + +--- + src/slic3r/Utils/Serial.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git src/slic3r/Utils/Serial.cpp src/slic3r/Utils/Serial.cpp +index 601719b50..43dab2390 100644 +--- src/slic3r/Utils/Serial.cpp ++++ src/slic3r/Utils/Serial.cpp +@@ -42,7 +42,7 @@ + #ifndef _WIN32 + #include + #include +- #include ++ #include + #include + #endif + +-- +2.21.0 + diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template new file mode 100644 index 00000000000..3cf78afd647 --- /dev/null +++ b/srcpkgs/PrusaSlicer/template @@ -0,0 +1,22 @@ +# Template file for 'PrusaSlicer' +pkgname=PrusaSlicer +version=2.0.0 +revision=1 +wrksrc="PrusaSlicer-version_${version}${_status}" +build_style=cmake +configure_args="-DSLIC3R_WX_STABLE=1 -DSLIC3R_FHS=1" +hostmakedepends="pkg-config" +makedepends="boost-devel tbb-devel libcurl-devel nlopt-devel gtest-devel + wxWidgets-devel glu-devel libpng-devel" +short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)" +maintainer="Jasper Chan " +license="GPL-3.0-or-later" +homepage="https://www.prusa3d.com/prusaslicer/" +distfiles="https://github.com/prusa3d/Prusaslicer/archive/version_${version}.tar.gz" +checksum=5d3c7fd745f2875be55f316cd779805ce1b6ce38634f0f4b0ccd01884da731b3 +nocross="tries to run avrdude-conf-gen which is compiled for target" + +Slic3rPE_package() { + build_style=meta + depends=${pkgname} +} diff --git a/srcpkgs/Slic3rPE b/srcpkgs/Slic3rPE new file mode 120000 index 00000000000..f9b60034c37 --- /dev/null +++ b/srcpkgs/Slic3rPE @@ -0,0 +1 @@ +PrusaSlicer \ No newline at end of file diff --git a/srcpkgs/Slic3rPE/patches/fix-strerror_r-check.patch b/srcpkgs/Slic3rPE/patches/fix-strerror_r-check.patch deleted file mode 100644 index 0380f333e85..00000000000 --- a/srcpkgs/Slic3rPE/patches/fix-strerror_r-check.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git src/png/error.hpp src/png/error.hpp -index c67f976..8ee2c87 100644 ---- src/png/error.hpp -+++ src/png/error.hpp -@@ -100,7 +100,7 @@ namespace png - strerror_s(buf, ERRBUF_SIZE, errnum); - return std::string(buf); - #else --#if (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE -+#if (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE || !defined(__GLIBC__) - char buf[ERRBUF_SIZE] = { 0 }; - strerror_r(errnum, buf, ERRBUF_SIZE); - return std::string(buf); -diff --git src/slic3r/Utils/Serial.cpp src/slic3r/Utils/Serial.cpp -index 601719b..43dab23 100644 ---- src/slic3r/Utils/Serial.cpp -+++ src/slic3r/Utils/Serial.cpp -@@ -42,7 +42,7 @@ - #ifndef _WIN32 - #include - #include -- #include -+ #include - #include - #endif - - diff --git a/srcpkgs/Slic3rPE/template b/srcpkgs/Slic3rPE/template deleted file mode 100644 index c2f5065e5c9..00000000000 --- a/srcpkgs/Slic3rPE/template +++ /dev/null @@ -1,22 +0,0 @@ -# Template file for 'Slic3rPE' -pkgname=Slic3rPE -version=1.42.0 -revision=2 -_status="-beta" -wrksrc="Slic3r-version_${version}${_status}" -build_style=cmake -configure_args="-DSLIC3R_WX_STABLE=1 -DSLIC3R_FHS=1" -hostmakedepends="pkg-config" -makedepends="boost-devel tbb-devel libcurl-devel nlopt-devel gtest-devel - wxWidgets-devel glu-devel libpng-devel" -short_desc="G-code generator for 3D printers, Prusa Edition" -maintainer="Jasper Chan " -license="GPL-3.0-or-later" -homepage="https://www.prusa3d.com/slic3r-prusa-edition/" -distfiles="https://github.com/prusa3d/Slic3r/archive/version_${version}${_status}.tar.gz" -checksum=d33f20b51dcf58eb048780df050e859969fbd8bcb8534f93a588035179804fcd -nocross="tries to run avrdude-conf-gen which is compiled for target" - -post_install() { - mv ${DESTDIR}/usr/bin/slic3r-{gui,pe} -} From 18261ae41815c7b15439ca1c54e46653def35f0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Fri, 31 May 2019 19:47:45 +0200 Subject: [PATCH 172/400] linux5.1: update to 5.1.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/linux5.1/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/linux5.1/template b/srcpkgs/linux5.1/template index 151e1ff57e0..a29976287c1 100644 --- a/srcpkgs/linux5.1/template +++ b/srcpkgs/linux5.1/template @@ -1,6 +1,6 @@ # Template file for 'linux5.1' pkgname=linux5.1 -version=5.1.5 +version=5.1.6 revision=1 wrksrc="linux-${version}" short_desc="Linux kernel and modules (${version%.*} series)" @@ -8,7 +8,7 @@ maintainer="Helmut Pozimski " license="GPL-2.0-only" homepage="https://www.kernel.org" distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz" -checksum=d79f90f5ca97befbfee4e247204b2ac4f45e7bb03d63a79184bc748cf3cf6ddb +checksum=9d68a206b0808d81ce582c861d0bda0d1095bcbd0f181db063665b68fc9cf478 patch_args="-Np1" nodebug=yes # -dbg package is generated below manually From d829172554894d4c9ee31cefe1355a3a41c47b27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Fri, 31 May 2019 20:49:03 +0200 Subject: [PATCH 173/400] linux5.1: fix arm64-dotconfig MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/linux5.1/files/arm64-dotconfig | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/linux5.1/files/arm64-dotconfig b/srcpkgs/linux5.1/files/arm64-dotconfig index 9362fbbbcb0..7663c2f6413 100644 --- a/srcpkgs/linux5.1/files/arm64-dotconfig +++ b/srcpkgs/linux5.1/files/arm64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.1.0 Kernel Configuration +# Linux/arm64 5.1.6 Kernel Configuration # # @@ -302,6 +302,7 @@ CONFIG_ARM64_ERRATUM_1024718=y CONFIG_ARM64_ERRATUM_1188873=y CONFIG_ARM64_ERRATUM_1165522=y CONFIG_ARM64_ERRATUM_1286807=y +CONFIG_ARM64_ERRATUM_1463225=y CONFIG_CAVIUM_ERRATUM_22375=y CONFIG_CAVIUM_ERRATUM_23154=y CONFIG_CAVIUM_ERRATUM_27456=y @@ -385,7 +386,6 @@ CONFIG_ARM64_CNP=y CONFIG_ARM64_PTR_AUTH=y CONFIG_ARM64_SVE=y CONFIG_ARM64_MODULE_PLTS=y -# CONFIG_ARM64_PSEUDO_NMI is not set CONFIG_RELOCATABLE=y CONFIG_RANDOMIZE_BASE=y CONFIG_RANDOMIZE_MODULE_REGION_FULL=y @@ -681,6 +681,7 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS=7 CONFIG_CLONE_BACKWARDS=y CONFIG_OLD_SIGSUSPEND3=y CONFIG_COMPAT_OLD_SIGACTION=y +CONFIG_64BIT_TIME=y CONFIG_COMPAT_32BIT_TIME=y CONFIG_HAVE_ARCH_VMAP_STACK=y CONFIG_VMAP_STACK=y From f180bee0934716f174eb921448c2a7674838a741 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Tue, 28 May 2019 22:30:38 +0200 Subject: [PATCH 174/400] kdiff3: update to 1.8.1. --- srcpkgs/kdiff3/template | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/srcpkgs/kdiff3/template b/srcpkgs/kdiff3/template index a560ef38d6a..0733c016e0d 100644 --- a/srcpkgs/kdiff3/template +++ b/srcpkgs/kdiff3/template @@ -1,21 +1,19 @@ # Template file for 'kdiff3' pkgname=kdiff3 -version=0.9.98 -revision=2 -build_wrksrc=src-QT4 -build_style=qmake -makedepends="qt5-devel" +version=1.8.1 +revision=1 +build_style=cmake +hostmakedepends="extra-cmake-modules kcoreaddons kdoctools + qt5-host-tools qt5-qmake" +makedepends="kparts-devel qt5-devel" short_desc="File comparator/merge tool" maintainer="Ben Sung Hsu " license="GPL-2.0-or-later" -homepage="http://kdiff3.sourceforge.net/" -distfiles="${SOURCEFORGE_SITE}/kdiff3/kdiff3-${version}.tar.gz" -checksum=802c1ababa02b403a5dca15955c01592997116a24909745016931537210fd668 +homepage="https://kde.org/applications/development/kdiff3" +distfiles="${KDE_SITE}/kdiff3/kdiff3-${version}.tar.xz" +checksum=7877c0f38d24f35edc6c61353fe6e12790aaa285663fe403133e4fc00bcf436e -if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" qt5-devel qt5-host-tools" -fi - -pre_install() { - vsed -i 's@usr\/local@usr@g' Makefile -} +case "$XBPS_TARGET_MACHINE" in + armv6*-musl) CXXFLAGS+=" -latomic";; + armv6*) broken="static assertion failed: template parameter is an integral of a size not supported on this platform";; +esac From 411e7a049a0324906004eabd2238b5851782ea6e Mon Sep 17 00:00:00 2001 From: John Date: Fri, 31 May 2019 23:50:58 +0200 Subject: [PATCH 175/400] PrusaSlicer: fix cross and subpackage deps --- srcpkgs/PrusaSlicer/Slic3rPE.INSTALL.msg | 4 ---- srcpkgs/PrusaSlicer/patches/cross.patch | 11 +++++++++++ srcpkgs/PrusaSlicer/template | 11 +++++++---- 3 files changed, 18 insertions(+), 8 deletions(-) delete mode 100644 srcpkgs/PrusaSlicer/Slic3rPE.INSTALL.msg create mode 100644 srcpkgs/PrusaSlicer/patches/cross.patch diff --git a/srcpkgs/PrusaSlicer/Slic3rPE.INSTALL.msg b/srcpkgs/PrusaSlicer/Slic3rPE.INSTALL.msg deleted file mode 100644 index 190965371f6..00000000000 --- a/srcpkgs/PrusaSlicer/Slic3rPE.INSTALL.msg +++ /dev/null @@ -1,4 +0,0 @@ -Slic3rPE has been renamed to PrusaSlicer - -The binary executable has been renamed from -/usr/bin/slic3r-pe to /usr/bin/prusa-slicer diff --git a/srcpkgs/PrusaSlicer/patches/cross.patch b/srcpkgs/PrusaSlicer/patches/cross.patch new file mode 100644 index 00000000000..2c82d96dcde --- /dev/null +++ b/srcpkgs/PrusaSlicer/patches/cross.patch @@ -0,0 +1,11 @@ +--- src/avrdude/CMakeLists.txt 2019-05-20 18:49:36.000000000 +0200 ++++ - 2019-05-31 23:42:15.542838510 +0200 +@@ -82,7 +82,7 @@ + add_custom_command( + DEPENDS avrdude-conf-gen ${CMAKE_CURRENT_SOURCE_DIR}/avrdude-slic3r.conf + OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/avrdude-slic3r.conf.h +- COMMAND $ avrdude-slic3r.conf avrdude_slic3r_conf > avrdude-slic3r.conf.h ++ COMMAND avrdude-conf-gen avrdude-slic3r.conf avrdude_slic3r_conf > avrdude-slic3r.conf.h + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + ) + diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template index 3cf78afd647..12eb7ff742b 100644 --- a/srcpkgs/PrusaSlicer/template +++ b/srcpkgs/PrusaSlicer/template @@ -1,8 +1,8 @@ # Template file for 'PrusaSlicer' pkgname=PrusaSlicer version=2.0.0 -revision=1 -wrksrc="PrusaSlicer-version_${version}${_status}" +revision=2 +wrksrc="PrusaSlicer-version_${version}" build_style=cmake configure_args="-DSLIC3R_WX_STABLE=1 -DSLIC3R_FHS=1" hostmakedepends="pkg-config" @@ -14,9 +14,12 @@ license="GPL-3.0-or-later" homepage="https://www.prusa3d.com/prusaslicer/" distfiles="https://github.com/prusa3d/Prusaslicer/archive/version_${version}.tar.gz" checksum=5d3c7fd745f2875be55f316cd779805ce1b6ce38634f0f4b0ccd01884da731b3 -nocross="tries to run avrdude-conf-gen which is compiled for target" + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" qemu-user-static" +fi Slic3rPE_package() { build_style=meta - depends=${pkgname} + depends="${sourcepkg}>=${version}_${revision}" } From 65735860a63ef8d432313549d0e288473e204b64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 1 Jun 2019 00:52:22 +0200 Subject: [PATCH 176/400] linux5.0: update to 5.0.20 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/linux5.0/files/arm64-dotconfig | 3 ++- srcpkgs/linux5.0/template | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/linux5.0/files/arm64-dotconfig b/srcpkgs/linux5.0/files/arm64-dotconfig index 590e9d637f8..dba91f60194 100644 --- a/srcpkgs/linux5.0/files/arm64-dotconfig +++ b/srcpkgs/linux5.0/files/arm64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.0.17 Kernel Configuration +# Linux/arm64 5.0.20 Kernel Configuration # # @@ -299,6 +299,7 @@ CONFIG_ARM64_ERRATUM_1024718=y CONFIG_ARM64_ERRATUM_1188873=y CONFIG_ARM64_ERRATUM_1165522=y CONFIG_ARM64_ERRATUM_1286807=y +CONFIG_ARM64_ERRATUM_1463225=y CONFIG_CAVIUM_ERRATUM_22375=y CONFIG_CAVIUM_ERRATUM_23154=y CONFIG_CAVIUM_ERRATUM_27456=y diff --git a/srcpkgs/linux5.0/template b/srcpkgs/linux5.0/template index fc1a8cc77b8..ac0fef6c5f5 100644 --- a/srcpkgs/linux5.0/template +++ b/srcpkgs/linux5.0/template @@ -1,6 +1,6 @@ # Template file for 'linux5.0' pkgname=linux5.0 -version=5.0.19 +version=5.0.20 revision=1 wrksrc="linux-${version}" short_desc="Linux kernel and modules (${version%.*} series)" @@ -8,7 +8,7 @@ maintainer="Helmut Pozimski " license="GPL-2.0-only" homepage="https://www.kernel.org" distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz" -checksum=0bf0d5c64dafc1184e9aafd2f3ebb77aa88ddee881a7766436258feaa214d9ec +checksum=3ba720f3189e5a08e7c533da8c12595d662a6c11d3466db6a0ff164ef4e54b68 patch_args="-Np1" nodebug=yes # -dbg package is generated below manually From c7989e56935b6e02cb8fbf9b06b5567065ec1f2e Mon Sep 17 00:00:00 2001 From: q66 Date: Fri, 31 May 2019 19:27:12 +0200 Subject: [PATCH 177/400] build-style/cmake: powerpc->ppc for CMAKE_SYSTEM_PROCESSOR MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ppc is the correct name which cmake reports in a native ppc32 environment, therefore the cross toolchain definition is wrong. Closes: #12061 [via git-merge-pr] Signed-off-by: Jürgen Buchmüller --- common/build-style/cmake.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh index fee1f4ec2d0..083a3bf5ff0 100644 --- a/common/build-style/cmake.sh +++ b/common/build-style/cmake.sh @@ -16,7 +16,7 @@ do_configure() { mips*) _CMAKE_SYSTEM_PROCESSOR=mips ;; ppc64le*) _CMAKE_SYSTEM_PROCESSOR=ppc64le ;; ppc64*) _CMAKE_SYSTEM_PROCESSOR=ppc64 ;; - ppc*) _CMAKE_SYSTEM_PROCESSOR=powerpc ;; + ppc*) _CMAKE_SYSTEM_PROCESSOR=ppc ;; *) _CMAKE_SYSTEM_PROCESSOR=generic ;; esac if [ -x "${XBPS_CROSS_BASE}/usr/bin/wx-config-gtk3" ]; then From e31ab5f494636f89ed248dde2d764b7ea0c896bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= Date: Sat, 1 Jun 2019 01:39:28 +0200 Subject: [PATCH 178/400] toybox: update to 0.8.1. --- srcpkgs/toybox/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/toybox/template b/srcpkgs/toybox/template index 7ea2b25a81f..8f56e95960c 100644 --- a/srcpkgs/toybox/template +++ b/srcpkgs/toybox/template @@ -1,14 +1,14 @@ # Template file for 'toybox' pkgname=toybox -version=0.8.0 +version=0.8.1 revision=1 create_wrksrc=yes short_desc="BSD-licensed alternative to busybox" maintainer="Steve Prybylski " license="0BSD" homepage="http://www.landley.net/toybox" -distfiles="${homepage}/downloads/${pkgname}-${version}.tar.gz" -checksum=e3ccecd9446db909437427a026c2788f2a96ac7ebc591c95b35df77f4e923956 +distfiles="http://www.landley.net/toybox/downloads/toybox-${version}.tar.gz" +checksum=1ac41e62b809d2ab656479f7f4e20bb71c63c14473f5c7d13f25d4f7fcfefdb3 post_extract() { mv toybox-${version} toybox @@ -31,10 +31,10 @@ do_build() { do_check() { cd toybox - make test + make tests cd ../toybox-static - make test + make tests } do_install() { From c165c54518e100f74189103393956efdbfbd1ef5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= Date: Sat, 1 Jun 2019 01:09:45 +0200 Subject: [PATCH 179/400] php: update to 7.3.6. --- srcpkgs/php/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/php/template b/srcpkgs/php/template index a5ea40f29c1..880b353bfe0 100644 --- a/srcpkgs/php/template +++ b/srcpkgs/php/template @@ -1,6 +1,6 @@ # Template file for 'php' pkgname=php -version=7.3.5 +version=7.3.6 revision=1 hostmakedepends="bison pkg-config" makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel @@ -12,7 +12,7 @@ maintainer="Steve Prybylski " license="PHP-3.01" homepage="https://www.php.net" distfiles="http://www.php.net/distributions/php-${version}.tar.xz" -checksum=e1011838a46fd4a195c8453b333916622d7ff5bce4aca2d9d99afac142db2472 +checksum=fefc8967daa30ebc375b2ab2857f97da94ca81921b722ddac86b29e15c54a164 conf_files="/etc/php/php.ini" From 24d6ab2fdec36a9adb9335ecd2c54e2d0d22b047 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Fri, 31 May 2019 16:23:46 -0500 Subject: [PATCH 180/400] bro: update to 2.6.2 --- srcpkgs/bro/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/bro/template b/srcpkgs/bro/template index 450b972fc7d..a8a4dac2ad1 100644 --- a/srcpkgs/bro/template +++ b/srcpkgs/bro/template @@ -1,7 +1,7 @@ # Template file for 'bro' pkgname=bro -version=2.6.1 -revision=2 +version=2.6.2 +revision=1 build_style=cmake hostmakedepends="flex pkg-config python3" makedepends="bind-devel geoip-devel libpcap-devel libressl-devel jemalloc-devel" @@ -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=d9718b83fdae0c76eea5254a4b9470304c4d1d3778687de9a4fe0b5dffea521b +checksum=6df6876f3f7b1dd8afeb3d5f88bfb9269f52d5d796258c4414bdd91aa2eac0a6 nocross="Needs to build part of itself to run, can't be built separately yet." case "$XBPS_TARGET_MACHINE" in From a8cdddd42874a22c3a029a3d99bde9bbe027c542 Mon Sep 17 00:00:00 2001 From: Noel Cower Date: Fri, 31 May 2019 10:12:17 -0700 Subject: [PATCH 181/400] rebar3: update to 3.11.0. Requires erlang>=22 now -- without this, if someone installs rebar3 while erlang is held on an earlier release, this breaks rebar3 (because no forward compatibility). --- srcpkgs/rebar3/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/rebar3/template b/srcpkgs/rebar3/template index b8e2061dc71..63702394812 100644 --- a/srcpkgs/rebar3/template +++ b/srcpkgs/rebar3/template @@ -1,16 +1,16 @@ # Template file for 'rebar3' pkgname=rebar3 -version=3.10.0 +version=3.11.0 revision=1 archs=noarch hostmakedepends=erlang -depends=erlang +depends="erlang>=22" short_desc="Erlang build tool to compile, test, and release applications" maintainer="Noel Cower " license="Apache-2.0" homepage="https://www.rebar3.org/" distfiles="https://github.com/erlang/rebar3/archive/${version}.tar.gz" -checksum=656b4a0bd75f340173e67a33c92e4d422b5ccf054f93ba35a9d780b545ee827e +checksum=d0f567bf5cfd60e16650b151a7caa24bf8164fb1c31359ce8b0452a683209421 do_build() { ./bootstrap From 5858f2aa1e24e65f2a49cb3084a7e113ac33b291 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alu=C3=ADsio=20Augusto=20Silva=20Gon=C3=A7alves?= Date: Fri, 31 May 2019 09:49:28 -0300 Subject: [PATCH 182/400] pgcli: update to 2.1.1. --- srcpkgs/pgcli/patches/relax-dependencies.patch | 16 ---------------- srcpkgs/pgcli/template | 4 ++-- 2 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 srcpkgs/pgcli/patches/relax-dependencies.patch diff --git a/srcpkgs/pgcli/patches/relax-dependencies.patch b/srcpkgs/pgcli/patches/relax-dependencies.patch deleted file mode 100644 index d89474344b2..00000000000 --- a/srcpkgs/pgcli/patches/relax-dependencies.patch +++ /dev/null @@ -1,16 +0,0 @@ -Seemingly the only breaking change in these updates is dropping support -for old Python releases, so we should be fine. - ---- setup.py -+++ setup.py -@@ -16,8 +16,8 @@ install_requirements = [ - 'click >= 4.1', - 'Pygments >= 2.0', # Pygments has to be Capitalcased. WTF? - 'prompt_toolkit>=2.0.6,<2.1.0', -- 'psycopg2 >= 2.7.4,<2.8', -- 'sqlparse >=0.2.2,<0.3.0', -+ 'psycopg2 >= 2.7.4,<2.9', -+ 'sqlparse >=0.2.2,<0.4.0', - 'configobj >= 5.0.6', - 'humanize >= 0.5.1', - 'cli_helpers[styles] >= 1.2.0', diff --git a/srcpkgs/pgcli/template b/srcpkgs/pgcli/template index 7a24c6c6ca4..b967287e9cb 100644 --- a/srcpkgs/pgcli/template +++ b/srcpkgs/pgcli/template @@ -1,6 +1,6 @@ # Template file for 'pgcli' pkgname=pgcli -version=2.1.0 +version=2.1.1 revision=1 archs=noarch build_style=python3-module @@ -14,7 +14,7 @@ maintainer="Aluísio Augusto Silva Gonçalves " license="BSD-3-Clause" homepage="https://www.pgcli.com" distfiles="${PYPI_SITE}/p/pgcli/pgcli-${version}.tar.gz" -checksum=3791a3c7734802fd14fefe9d18082a95687a02631f3287bd154cd27b4f12c05c +checksum=84e0817a29c3cacaaaf85351422bdb90f230f2550e4af558c25536fd235ab6ca do_check() { # pgcli tests require a PostgreSQL server; skip them. From 1f993635e2c94cc8a71065a28f7c10665778366d Mon Sep 17 00:00:00 2001 From: Thomas Batten Date: Fri, 31 May 2019 12:16:12 +0930 Subject: [PATCH 183/400] qt5-webkit: Fix building on ppc --- srcpkgs/qt5-webkit/template | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/srcpkgs/qt5-webkit/template b/srcpkgs/qt5-webkit/template index 3c570cf4b27..b2e996f30d8 100644 --- a/srcpkgs/qt5-webkit/template +++ b/srcpkgs/qt5-webkit/template @@ -34,9 +34,14 @@ case "$XBPS_TARGET_MACHINE" in ppc64*) # no JIT on ppc64 and other build workarounds configure_args+=" -DENABLE_JIT=OFF -DUSE_SYSTEM_MALLOC=ON" ;; - i686*) # try to reduce memory footprint when linking + i686*) # try to reduce memory footprint when linking nodebug=1 ;; + ppc*) # no JIT on ppc and need libatomic + configure_args+=" -DENABLE_JIT=OFF -DUSE_SYSTEM_MALLOC=ON" + makedepends+=" libatomic-devel" + LIBS+=" -latomic" + ;; esac pre_configure() { From 9f46664312626878d8f4993ed32ffef2574a827d Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sat, 1 Jun 2019 09:32:05 +0200 Subject: [PATCH 184/400] linux4.19: update to 4.19.47. --- srcpkgs/linux4.19/files/arm64-dotconfig | 3 ++- srcpkgs/linux4.19/template | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/linux4.19/files/arm64-dotconfig b/srcpkgs/linux4.19/files/arm64-dotconfig index cd11b86caf8..2fb9937a665 100644 --- a/srcpkgs/linux4.19/files/arm64-dotconfig +++ b/srcpkgs/linux4.19/files/arm64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.19.35 Kernel Configuration +# Linux/arm64 4.19.47 Kernel Configuration # # @@ -391,6 +391,7 @@ CONFIG_ARM64_ERRATUM_834220=y CONFIG_ARM64_ERRATUM_845719=y CONFIG_ARM64_ERRATUM_843419=y CONFIG_ARM64_ERRATUM_1024718=y +CONFIG_ARM64_ERRATUM_1463225=y CONFIG_CAVIUM_ERRATUM_22375=y CONFIG_CAVIUM_ERRATUM_23154=y CONFIG_CAVIUM_ERRATUM_27456=y diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template index 097d1748d88..306d9a0e36a 100644 --- a/srcpkgs/linux4.19/template +++ b/srcpkgs/linux4.19/template @@ -1,6 +1,6 @@ # Template file for 'linux4.19' pkgname=linux4.19 -version=4.19.46 +version=4.19.47 revision=1 wrksrc="linux-${version}" short_desc="Linux kernel and modules (${version%.*} series)" @@ -8,7 +8,7 @@ maintainer="Helmut Pozimski " license="GPL-2.0-only" homepage="https://www.kernel.org" distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz" -checksum=097b52fe8a872259f4a3dba571b2eaf7b9863d9cde5399c6b316dec0ef57e67a +checksum=5d08f3890e7ca2b94529675120f170c5b764f795e6dd184a1190c23a40ef5365 patch_args="-Np1" nodebug=yes # -dbg package is generated below manually From 5b01a4ace9d41722d89da75dcdfc700a57ba51fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Fri, 31 May 2019 23:55:14 +0200 Subject: [PATCH 185/400] radamsa: update to 0.6. --- srcpkgs/radamsa/template | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/srcpkgs/radamsa/template b/srcpkgs/radamsa/template index 070e70d415e..b84d35dd5df 100644 --- a/srcpkgs/radamsa/template +++ b/srcpkgs/radamsa/template @@ -1,17 +1,22 @@ # Template file for 'radamsa' pkgname=radamsa -version=0.5 -revision=2 +version=0.6 +revision=1 +wrksrc="radamsa-v${version}" build_style=gnu-makefile +make_check_target=test short_desc="Test case generator for robustness testing" maintainer="Juan RP " license="MIT" -homepage="https://github.com/aoh/radamsa" -distfiles="https://github.com/aoh/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz" -checksum=e21a86aa6dca7e4619085fc60fb664d0a1bd067ca6ebfbcb16ab2d57c8854cb4 +homepage="https://gitlab.com/akihe/radamsa" +# Makefile contains current location of ol.c.gz +distfiles="https://gitlab.com/akihe/radamsa/-/archive/v${version}/radamsa-v${version}.tar.bz2 + https://gitlab.com/owl-lisp/owl/uploads/0d0730b500976348d1e66b4a1756cdc3/ol-0.1.19.c.gz>ol.c.gz" +checksum="ba69f83ba0aa2cd87ce8798dd3da305d4380622be96b5d7a7ebad4c39d0aa66e + 86917b9145cf3745ee8294c81fb822d17106698aa1d021916dfb2e0b8cfbb54d" post_extract() { - sed -i '/CC.*-o/s/$/ $(LDFLAGS)/' Makefile + gzip < ../ol.c > ol.c.gz } post_install() { vlicense LICENCE From 24b042e01d967af77d88c28f4277b26c53d77a7a Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sat, 1 Jun 2019 13:19:27 +0200 Subject: [PATCH 186/400] linux4.14: update to 4.14.123. --- srcpkgs/linux4.14/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template index f6a4dd57a0d..a37cd0db6c5 100644 --- a/srcpkgs/linux4.14/template +++ b/srcpkgs/linux4.14/template @@ -1,6 +1,6 @@ # Template file for 'linux4.14' pkgname=linux4.14 -version=4.14.122 +version=4.14.123 revision=1 patch_args="-Np1" wrksrc="linux-${version}" @@ -9,7 +9,7 @@ homepage="http://www.kernel.org" license="GPL-2.0-only" short_desc="Linux kernel and modules (${version%.*} series)" distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz" -checksum=c8a3f40ef877e18b3d2890e0954f2d81b6d012a7321836ca4e5b036ef93f68f5 +checksum=25f58cb56bde388ac9bcee984f5f2d0ca094b0a8af6b92ad1f5b2fd0e6725b85 nodebug=yes # -dbg package is generated below manually nostrip=yes From dd9e7d25a4349f074de3b0ce51aed03b2367b6de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 1 Jun 2019 13:19:14 +0200 Subject: [PATCH 187/400] mame: update to 0.210 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/mame/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mame/template b/srcpkgs/mame/template index 3316660edb6..7206800bafa 100644 --- a/srcpkgs/mame/template +++ b/srcpkgs/mame/template @@ -1,6 +1,6 @@ # Template file for 'mame' pkgname=mame -version=0209 +version=0210 revision=1 wrksrc="mame-mame${version}" short_desc="Multiple Arcade Machine Emulator" @@ -8,7 +8,7 @@ maintainer="Jürgen Buchmüller " license="GPL-2.0-or-later" homepage="http://mamedev.org" distfiles="https://github.com/mamedev/mame/archive/mame${version}.tar.gz" -checksum=9442e88bd87cfe407eb093a2ecb42a3850cabe31cd52c4efdef1bf7f584a8eab +checksum=4d0b23f3c9f9b2f6283ed78d5afc9a6391d2ee6ce5f0f4bcc2a357ec14aa06c4 hostmakedepends="perl pkg-config python" makedepends="SDL2_ttf-devel glm libjpeg-turbo-devel libutf8proc-devel From b3e365efdfd9087a96486a12d72d078d4adef70f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Sat, 1 Jun 2019 14:20:22 +0200 Subject: [PATCH 188/400] olm: update to 3.1.2. --- srcpkgs/olm/template | 14 +++++++++----- srcpkgs/olm/update | 1 - 2 files changed, 9 insertions(+), 6 deletions(-) delete mode 100644 srcpkgs/olm/update diff --git a/srcpkgs/olm/template b/srcpkgs/olm/template index 9bb8e16c291..57f34b75989 100644 --- a/srcpkgs/olm/template +++ b/srcpkgs/olm/template @@ -1,15 +1,19 @@ # Template file for 'olm' pkgname=olm -version=3.0.0 +version=3.1.2 revision=1 build_style=cmake -configure_args="-DOLM_TESTS=OFF" short_desc="Implementation of the Double Ratchet cryptographic ratchet" maintainer="Adam Beckmeyer " license="Apache-2.0" -homepage="https://git.matrix.org/git/olm/about/" -distfiles="https://git.matrix.org/git/olm/snapshot/olm-${version}.tar.gz" -checksum=4c54f93e4f426a9d5c8e66e63113d42fd2afca240cdcff30a469a342a6ec3bc6 +homepage="https://gitlab.matrix.org/matrix-org/olm" +distfiles="https://gitlab.matrix.org/matrix-org/olm/-/archive/${version}/olm-${version}.tar.bz2" +checksum=d09f9082cdbaf4d95b0a372affdf6129a6b451913831c5915e799877acab6d49 + +do_check() { + cd build/tests + ctest +} olm-devel_package() { depends="${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/olm/update b/srcpkgs/olm/update deleted file mode 100644 index 8bd1e4e6b93..00000000000 --- a/srcpkgs/olm/update +++ /dev/null @@ -1 +0,0 @@ -site=https://git.matrix.org/git/olm/refs/ From fd377fe88a3d5db194c6b0aff534c71589ec9720 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Sat, 1 Jun 2019 14:20:23 +0200 Subject: [PATCH 189/400] olm-python: update to 3.1.2. --- srcpkgs/olm-python/template | 8 ++++---- srcpkgs/olm-python/update | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/olm-python/update diff --git a/srcpkgs/olm-python/template b/srcpkgs/olm-python/template index b081bbae205..3648ba29e6f 100644 --- a/srcpkgs/olm-python/template +++ b/srcpkgs/olm-python/template @@ -1,6 +1,6 @@ # Template file for 'olm-python' pkgname=olm-python -version=3.0.0 +version=3.1.2 revision=1 wrksrc="olm-${version}" build_wrksrc=python @@ -12,9 +12,9 @@ depends="python-cffi python-future python-typing" short_desc="Implementation of the Double Ratchet cryptographic ratchet (Python2)" maintainer="Adam Beckmeyer " license="Apache-2.0" -homepage="https://git.matrix.org/git/olm/about/" -distfiles="https://git.matrix.org/git/olm/snapshot/olm-${version}.tar.gz" -checksum=4c54f93e4f426a9d5c8e66e63113d42fd2afca240cdcff30a469a342a6ec3bc6 +homepage="https://gitlab.matrix.org/matrix-org/olm" +distfiles="https://gitlab.matrix.org/matrix-org/olm/-/archive/${version}/olm-${version}.tar.bz2" +checksum=d09f9082cdbaf4d95b0a372affdf6129a6b451913831c5915e799877acab6d49 pre_build() { make include/olm/olm.h diff --git a/srcpkgs/olm-python/update b/srcpkgs/olm-python/update new file mode 100644 index 00000000000..2bb7a73e586 --- /dev/null +++ b/srcpkgs/olm-python/update @@ -0,0 +1 @@ +pkgname=olm From 95e3a60feb6e39a63e67860ecb35f17a70442a4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Sat, 1 Jun 2019 14:23:37 +0200 Subject: [PATCH 190/400] update-check: recognize all gitlab instances --- common/xbps-src/shutils/update_check.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/common/xbps-src/shutils/update_check.sh b/common/xbps-src/shutils/update_check.sh index 870fea05a7c..e2cdee3d0fc 100644 --- a/common/xbps-src/shutils/update_check.sh +++ b/common/xbps-src/shutils/update_check.sh @@ -48,12 +48,13 @@ update_check() { *cpan.*|\ *pythonhosted.org*|\ *github.com*|\ - *gitlab.com*|*gitlab.gnome.org*|*gitlab.freedesktop.org*|\ + *//gitlab.*|\ *bitbucket.org*|\ *ftp.gnome.org*|\ *kernel.org/pub/linux/kernel/*|\ *cran.r-project.org/src/contrib*|\ - *rubygems.org*) + *rubygems.org*|\ + *crates.io*) continue ;; *) @@ -110,7 +111,7 @@ update_check() { githubname="$(printf %s "$url" | cut -d/ -f4,5)" url="https://github.com/$githubname/tags" rx='/archive/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar\.gz")';; - *gitlab.com*|*gitlab.gnome.org*|*gitlab.freedesktop.org*) + *//gitlab.*) gitlaburl="$(printf %s "$url" | cut -d/ -f1-5)" url="$gitlaburl/tags" rx='/archive/[^/]+/\Q'"$pkgname"'\E-v?\K[\d\.]+(?=\.tar\.gz")';; From eea08561c28c748d0eff0ce792f5636676a6d66d Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sat, 1 Jun 2019 16:21:00 +0200 Subject: [PATCH 191/400] linux4.9: update to 4.9.180. --- srcpkgs/linux4.9/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/linux4.9/template b/srcpkgs/linux4.9/template index b03e18d519e..d49d0eb73ef 100644 --- a/srcpkgs/linux4.9/template +++ b/srcpkgs/linux4.9/template @@ -1,6 +1,6 @@ # Template file for 'linux4.9' pkgname=linux4.9 -version=4.9.179 +version=4.9.180 revision=1 patch_args="-Np1" wrksrc="linux-${version}" @@ -9,7 +9,7 @@ homepage="https://www.kernel.org" license="GPL-2.0-only" short_desc="Linux kernel and modules (${version%.*} series)" distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz" -checksum=532e4b7b0103806dad9124fd09d15d19594eca08e7f900e94ff805d3b4171ee3 +checksum=d25a490d62a3e96a587333e163862585eac4086fc8d4893b4ec1711e7d387c5f nodebug=yes # -dbg package is generated below manually nostrip=yes From 79c8329e8fe39af55a358b94b4e85e92686b6987 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 1 Jun 2019 16:22:15 +0200 Subject: [PATCH 192/400] mozjs60: add endianness patches from Debian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This alone does not yet fix ppc64, though. Signed-off-by: Jürgen Buchmüller --- srcpkgs/mozjs60/patches/enddianness.patch | 127 ++++++++++++++++++ .../mozjs60/patches/jsproperty-endian.patch | 22 +++ 2 files changed, 149 insertions(+) create mode 100644 srcpkgs/mozjs60/patches/enddianness.patch create mode 100644 srcpkgs/mozjs60/patches/jsproperty-endian.patch diff --git a/srcpkgs/mozjs60/patches/enddianness.patch b/srcpkgs/mozjs60/patches/enddianness.patch new file mode 100644 index 00000000000..56352b74c70 --- /dev/null +++ b/srcpkgs/mozjs60/patches/enddianness.patch @@ -0,0 +1,127 @@ +Bug 1488552 - Ensure proper running on 64-bit and 32-bit BE platforms. + +Index: mozjs60/js/src/gc/Marking-inl.h +=================================================================== +--- a/js/src/gc/Marking-inl.h 2019-02-21 14:44:28.296951992 +0100 ++++ b/js/src/gc/Marking-inl.h 2019-02-22 10:22:54.612120604 +0100 +@@ -82,12 +82,28 @@ + MOZ_ASSERT(!isForwarded()); + // The location of magic_ is important because it must never be valid to see + // the value Relocated there in a GC thing that has not been moved. ++#if MOZ_LITTLE_ENDIAN || JS_BITS_PER_WORD == 32 ++ // On 32-bit, the magic_ aliases with whatever comes after the first ++ // pointer; on little-endian 64-bit, the magic_ aliases with the ++ // 32 most significant bits of the pointer, which are the second half. + static_assert(offsetof(RelocationOverlay, magic_) == + offsetof(JSObject, group_) + sizeof(uint32_t), + "RelocationOverlay::magic_ is in the wrong location"); + static_assert(offsetof(RelocationOverlay, magic_) == + offsetof(js::Shape, base_) + sizeof(uint32_t), + "RelocationOverlay::magic_ is in the wrong location"); ++#elif JS_BITS_PER_WORD == 64 ++ // On big-endian 64-bit, the magic_ aliases with the 32 most ++ // significant bits of the pointer, but now that's the first half. ++ static_assert(offsetof(RelocationOverlay, magic_) == ++ offsetof(JSObject, group_), ++ "RelocationOverlay::magic_ is in the wrong location"); ++ static_assert(offsetof(RelocationOverlay, magic_) == ++ offsetof(js::Shape, base_), ++ "RelocationOverlay::magic_ is in the wrong location"); ++#else ++# error "Unknown endianness or word size" ++#endif + static_assert( + offsetof(RelocationOverlay, magic_) == offsetof(JSString, d.u1.length), + "RelocationOverlay::magic_ is in the wrong location"); +Index: mozjs60/js/src/gc/RelocationOverlay.h +=================================================================== +--- a/js/src/gc/RelocationOverlay.h 2019-02-21 14:44:28.296951992 +0100 ++++ b/js/src/gc/RelocationOverlay.h 2019-02-22 10:19:41.816822202 +0100 +@@ -34,14 +34,25 @@ + /* See comment in js/public/HeapAPI.h. */ + static const uint32_t Relocated = js::gc::Relocated; + ++#if MOZ_LITTLE_ENDIAN || JS_BITS_PER_WORD == 32 + /* +- * Keep the low 32 bits untouched. Use them to distinguish strings from ++ * Keep the first 32 bits untouched. Use them to distinguish strings from + * objects in the nursery. + */ + uint32_t preserve_; + + /* Set to Relocated when moved. */ + uint32_t magic_; ++#elif JS_BITS_PER_WORD == 64 ++ /* ++ * On big-endian, we need to reorder to keep preserve_ lined up with the ++ * low 32 bits of the aligned group_ pointer in JSObject. ++ */ ++ uint32_t magic_; ++ uint32_t preserve_; ++#else ++# error "Unknown endianness or word size" ++#endif + + /* The location |this| was moved to. */ + Cell* newLocation_; +Index: mozjs60/js/src/jsfriendapi.h +=================================================================== +--- a/js/src/jsfriendapi.h 2019-02-21 14:44:28.484951245 +0100 ++++ b/js/src/jsfriendapi.h 2019-02-22 10:24:25.663774399 +0100 +@@ -9,6 +9,7 @@ + + #include "mozilla/Atomics.h" + #include "mozilla/Casting.h" ++#include "mozilla/EndianUtils.h" + #include "mozilla/Maybe.h" + #include "mozilla/MemoryReporting.h" + #include "mozilla/UniquePtr.h" +@@ -640,8 +641,15 @@ + static const uint32_t LATIN1_CHARS_BIT = JS_BIT(6); + static const uint32_t EXTERNAL_FLAGS = LINEAR_BIT | NON_ATOM_BIT | JS_BIT(5); + static const uint32_t TYPE_FLAGS_MASK = JS_BIT(6) - 1; ++#if MOZ_LITTLE_ENDIAN || JS_BITS_PER_WORD == 32 + uint32_t flags; + uint32_t length; ++#elif JS_BITS_PER_WORD == 64 ++ uint32_t length; ++ uint32_t flags; ++#else ++# error "Unknown endianness or word size" ++#endif + union { + const JS::Latin1Char* nonInlineCharsLatin1; + const char16_t* nonInlineCharsTwoByte; +Index: mozjs60/js/src/vm/StringType.h +=================================================================== +--- a/js/src/vm/StringType.h 2019-02-21 14:44:29.072948907 +0100 ++++ b/js/src/vm/StringType.h 2019-02-22 10:21:20.464469244 +0100 +@@ -7,6 +7,7 @@ + #ifndef vm_StringType_h + #define vm_StringType_h + ++#include "mozilla/EndianUtils.h" + #include "mozilla/MemoryReporting.h" + #include "mozilla/PodOperations.h" + #include "mozilla/Range.h" +@@ -166,8 +167,20 @@ + { + union { + struct { ++#if MOZ_LITTLE_ENDIAN || JS_BITS_PER_WORD == 32 + uint32_t flags; /* JSString */ + uint32_t length; /* JSString */ ++#elif JS_BITS_PER_WORD == 64 ++ /* ++ * On big-endian, we need to reorder to keep flags lined up ++ * with the low 32 bits of the aligned group_ pointer in ++ * JSObject. ++ */ ++ uint32_t length; /* JSString */ ++ uint32_t flags; /* JSString */ ++#else ++# error "Unknown endianness or word size" ++#endif + }; + uintptr_t flattenData; /* JSRope (temporary while flattening) */ + } u1; diff --git a/srcpkgs/mozjs60/patches/jsproperty-endian.patch b/srcpkgs/mozjs60/patches/jsproperty-endian.patch new file mode 100644 index 00000000000..dd01c37ac92 --- /dev/null +++ b/srcpkgs/mozjs60/patches/jsproperty-endian.patch @@ -0,0 +1,22 @@ +Bug 1543659 - fix JSPropertySpec::ValueWrapper on 64-bit big-endian platforms + +Add some padding to make the union's int32 member correspond to the +low-order bits of the string member. This fixes TypedArray tests on +s390x. + +--- a/js/src/jsapi.h ++++ b/js/src/jsapi.h +@@ -1702,7 +1702,12 @@ + uintptr_t type; + union { + const char* string; +- int32_t int32; ++ struct { ++#if MOZ_BIG_ENDIAN && JS_BITS_PER_WORD == 64 ++ uint32_t padding; ++#endif ++ int32_t int32; ++ }; + }; + }; + From 2339b3f8e729ca883fbbf8883cec8ac160f1df86 Mon Sep 17 00:00:00 2001 From: Thomas Batten Date: Fri, 31 May 2019 10:20:07 +0930 Subject: [PATCH 193/400] arcan: use -latomic on ppc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/arcan/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/arcan/template b/srcpkgs/arcan/template index 5dd372b486c..57c143cf3a7 100644 --- a/srcpkgs/arcan/template +++ b/srcpkgs/arcan/template @@ -26,7 +26,7 @@ case "${XBPS_TARGET_MACHINE}" in configure_args+=" -DDISABLE_JIT=ON" makedepends+=" MesaLib-devel lua51-devel" ;; - armv[56]*) + armv[56]*|ppc*) configure_args+=" -DDISABLE_JIT=ON" makedepends+=" MesaLib-devel lua51-devel libatomic-devel" CFLAGS+=" -latomic" From 06188dec836daad40cead5ec073fb18a1ae13ff3 Mon Sep 17 00:00:00 2001 From: Thomas Batten Date: Fri, 31 May 2019 10:25:12 +0930 Subject: [PATCH 194/400] chatterino2: use -latomic on ppc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/chatterino2/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template index 663bfb354c6..3b08256d381 100644 --- a/srcpkgs/chatterino2/template +++ b/srcpkgs/chatterino2/template @@ -24,7 +24,7 @@ addb1ec2e06c40e6b467b4bdcdbca0407098fe36009c62ac7e92f157d47b2cb5 5a5cd8338fcb0a14a4bbe0840f83505d0444a9000956145e85e5550feeb744b0" case "${XBPS_TARGET_MACHINE}" in - armv[56]*) + armv[56]*|ppc|ppc-musl) makedepends+=" libatomic-devel" configure_args+="LIBS+=-latomic" ;; From 8d1988993ac4c3dafbf864f66d52a4f40104af84 Mon Sep 17 00:00:00 2001 From: Thomas Batten Date: Fri, 31 May 2019 10:33:21 +0930 Subject: [PATCH 195/400] encfs: use -latomic on ppc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/encfs/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/encfs/template b/srcpkgs/encfs/template index 5af379b8f25..39ed4563dfe 100644 --- a/srcpkgs/encfs/template +++ b/srcpkgs/encfs/template @@ -17,7 +17,7 @@ checksum=4709f05395ccbad6c0a5b40a4619d60aafe3473b1a79bafb3aa700b1f756fd63 if [ "$CROSS_BUILD" ]; then configure_args="-DBUILD_UNIT_TESTS=0" case "${XBPS_TARGET_MACHINE}" in - armv[56]*) makedepends+=" libatomic-devel"; LDFLAGS="-latomic" ;; + armv[56]*|ppc|ppc-musl) makedepends+=" libatomic-devel"; LDFLAGS="-latomic" ;; esac fi From 06dacf06647a6b83383d685279f867597f252f51 Mon Sep 17 00:00:00 2001 From: Thomas Batten Date: Fri, 31 May 2019 10:35:02 +0930 Subject: [PATCH 196/400] fswatch: use -latomic on ppc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/fswatch/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/fswatch/template b/srcpkgs/fswatch/template index f3ca3b312bf..781b69a56a0 100644 --- a/srcpkgs/fswatch/template +++ b/srcpkgs/fswatch/template @@ -13,7 +13,7 @@ distfiles="https://github.com/emcrisostomo/fswatch/releases/download/${version}/ checksum=44d5707adc0e46d901ba95a5dc35c5cc282bd6f331fcf9dbf9fad4af0ed5b29d case "$XBPS_TARGET_MACHINE" in - armv[56]*) + armv[56]*|ppc|ppc-musl) makedepends+=" libatomic-devel" LDFLAGS=" -latomic" ;; From 63e2c2a903d4e5cf8cadb02cbfa27b2a5d848941 Mon Sep 17 00:00:00 2001 From: Thomas Batten Date: Fri, 31 May 2019 10:36:34 +0930 Subject: [PATCH 197/400] haproxy: use -latomic on ppc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/haproxy/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template index fa576622448..f14075402db 100644 --- a/srcpkgs/haproxy/template +++ b/srcpkgs/haproxy/template @@ -24,7 +24,7 @@ case "$XBPS_TARGET_MACHINE" in esac case "$XBPS_TARGET_MACHINE" in - armv[56]*|mips*) ADDLIB="-latomic"; makedepends+=" libatomic-devel";; + armv[56]*|mips*|ppc|ppc-musl) ADDLIB="-latomic"; makedepends+=" libatomic-devel";; esac From 0dc10897932266766fd745763c84223bf5e9e415 Mon Sep 17 00:00:00 2001 From: Thomas Batten Date: Fri, 31 May 2019 10:37:51 +0930 Subject: [PATCH 198/400] jack_capture: use -latomic on ppc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/jack_capture/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/jack_capture/template b/srcpkgs/jack_capture/template index 60a3faef5d6..023e2d9139f 100644 --- a/srcpkgs/jack_capture/template +++ b/srcpkgs/jack_capture/template @@ -14,7 +14,7 @@ checksum=21afb0257ed7437708cc9e5bec2f6299599461b7eec8bf66967d8ecadb0751de CFLAGS+=" -D__USE_GNU" case "$XBPS_TARGET_MACHINE" in - armv6l*) + armv6l*|ppc|ppc-musl) makedepends+=" libatomic-devel" LDFLAGS+=" -latomic" ;; From fd27b17a7f7ca6a8a19857444249f2853c9cb770 Mon Sep 17 00:00:00 2001 From: Thomas Batten Date: Fri, 31 May 2019 10:48:51 +0930 Subject: [PATCH 199/400] libbitcoin-explorer: use -latomic on ppc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/libbitcoin-explorer/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libbitcoin-explorer/template b/srcpkgs/libbitcoin-explorer/template index f56a5fd5802..76833b98186 100644 --- a/srcpkgs/libbitcoin-explorer/template +++ b/srcpkgs/libbitcoin-explorer/template @@ -20,7 +20,7 @@ checksum=630cffd577c0d10345b44ce8160f4604519b0ca69bf201f524f104c207b930aa conf_files="/etc/libbitcoin/bx.cfg" case "$XBPS_TARGET_MACHINE" in - armv6*) makedepends+=" libatomic-devel" LDFLAGS="-latomic" ;; + armv6*|ppc|ppc-musl) makedepends+=" libatomic-devel" LDFLAGS="-latomic" ;; esac pre_configure() { From 18d512a8ecc5ce4057080ac1ab7521506c7a00e6 Mon Sep 17 00:00:00 2001 From: Thomas Batten Date: Fri, 31 May 2019 11:02:24 +0930 Subject: [PATCH 200/400] monero: use -latomic on ppc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/monero/template | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template index 380cb6fc1a3..678aaee9f3d 100644 --- a/srcpkgs/monero/template +++ b/srcpkgs/monero/template @@ -43,6 +43,10 @@ case "$XBPS_TARGET_MACHINE" in ;; ppc64*) configure_args+=" -DARCH=ppc64" ;; + ppc*) configure_arch+=" -DARCH=ppc" + makedepends+=" libatomic-devel" + CFLAGS+=" -latomic" + ;; *) configure_args+=" -DARCH=default" ;; esac From 5458d492a4bf1e8c50d786057ecdc40091f2ef32 Mon Sep 17 00:00:00 2001 From: Thomas Batten Date: Fri, 31 May 2019 11:02:45 +0930 Subject: [PATCH 201/400] monero-gui: use -latomic on ppc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/monero-gui/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template index 9e7cd5459bd..417c25c04ad 100644 --- a/srcpkgs/monero-gui/template +++ b/srcpkgs/monero-gui/template @@ -18,7 +18,7 @@ pre_configure() { echo "var GUI_VERSION = \"${version}\"" > version.js echo "var GUI_MONERO_VERSION = \"${version}\"" >> version.js case "$XBPS_TARGET_MACHINE" in - armv[56]*) # armv[56]* need to link libatomic.a for __atomic_fetch_sub_8 + armv[56]*|ppc|ppc-musl) # armv[56]* and ppc need to link libatomic.a for __atomic_fetch_sub_8 sed -i *.pro -e "s;-leasylogging;-leasylogging -latomic;" ;; esac From fd8c634edbfdf86ab11ff1c3fa1fa0c10340ea63 Mon Sep 17 00:00:00 2001 From: Thomas Batten Date: Fri, 31 May 2019 11:06:46 +0930 Subject: [PATCH 202/400] musikcube: use -latomic on ppc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/musikcube/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template index 032e3642196..787ec98f96b 100644 --- a/srcpkgs/musikcube/template +++ b/srcpkgs/musikcube/template @@ -16,7 +16,7 @@ distfiles="https://github.com/clangen/musikcube/archive/${version}.tar.gz" checksum=e05d045d9b1fcfbb7d21c5fbdc4ab482388f47b57ac5ad894786d0613def6bc5 case "${XBPS_TARGET_MACHINE}" in - armv[56]*) + armv[56]*|ppc|ppc-musl) makedepends+=" libatomic-devel" configure_args+=" -DCMAKE_EXE_LINKER_FLAGS='-latomic'" ;; From 66cc775007e546dab3ed917365a4026059971ad7 Mon Sep 17 00:00:00 2001 From: Thomas Batten Date: Fri, 31 May 2019 11:13:23 +0930 Subject: [PATCH 203/400] namecoin: use -latomic on ppc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/namecoin/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template index 0c80529e76d..f40e0f92231 100644 --- a/srcpkgs/namecoin/template +++ b/srcpkgs/namecoin/template @@ -17,7 +17,7 @@ distfiles="https://github.com/namecoin/namecoin-core/archive/nc${version}.tar.gz checksum=b9e56cebd6756ad8ff7c8f6c9e633cb56cb139c7c4437189945b3f25acbe0082 case "${XBPS_TARGET_MACHINE}" in - armv[56]*) + armv[56]*|ppc|ppc-musl) makedepends+=" libatomic-devel" LDFLAGS+=" -latomic" ;; From 5a406acf7825fc242707d8af391b28968354b6f2 Mon Sep 17 00:00:00 2001 From: Thomas Batten Date: Fri, 31 May 2019 12:10:05 +0930 Subject: [PATCH 204/400] stockfish: use -latomic on ppc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: #12048 [via git-merge-pr] Signed-off-by: Jürgen Buchmüller --- srcpkgs/stockfish/template | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/srcpkgs/stockfish/template b/srcpkgs/stockfish/template index d162273a549..bfaa10703dd 100644 --- a/srcpkgs/stockfish/template +++ b/srcpkgs/stockfish/template @@ -38,6 +38,11 @@ case $XBPS_TARGET_MACHINE in ppc64*) make_build_args+="ARCH=ppc-64" ;; + ppc*) + make_build_args+="ARCH=ppc-32" + makedepends+="libatomic-devel" + LDFLAGS+=" -latomic" + ;; esac do_install() { From 38097762f61750c1cac9fddee27ab1057c9e1a45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Sat, 1 Jun 2019 12:01:06 +0200 Subject: [PATCH 205/400] x42-plugins: update to 20190507. --- srcpkgs/x42-plugins/template | 6 +++--- srcpkgs/x42-plugins/update | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/x42-plugins/update diff --git a/srcpkgs/x42-plugins/template b/srcpkgs/x42-plugins/template index 1eb682901b3..af61d613391 100644 --- a/srcpkgs/x42-plugins/template +++ b/srcpkgs/x42-plugins/template @@ -1,7 +1,7 @@ # Template file for 'x42-plugins' pkgname=x42-plugins -version=20190206 -revision=2 +version=20190507 +revision=1 build_style=gnu-makefile hostmakedepends="pkg-config" makedepends="cairo-devel pango-devel glu-devel jack-devel libsndfile-devel @@ -11,7 +11,7 @@ maintainer="bluntphenomena " license="GPL-2.0-or-later" homepage="https://github.com/x42/x42-plugins" distfiles="http://gareus.org/misc/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=0dab84018f9a8b5beca214d1fbe09d3900124c4329430e02a140e48f2a455767 +checksum=a728ac8ed5564072b09f95b69c1c9f3993285d7830cb7002dfee857de2993d2c pre_build() { export OPTIMIZATIONS="-fomit-frame-pointer -O3 -fno-finite-math-only -DNDEBUG" diff --git a/srcpkgs/x42-plugins/update b/srcpkgs/x42-plugins/update new file mode 100644 index 00000000000..75f13afad07 --- /dev/null +++ b/srcpkgs/x42-plugins/update @@ -0,0 +1 @@ +site='http://gareus.org/misc/x42-plugins.php' From 0097c3f7e4bf8f938c9550fea537228b55f2020e Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 1 Jun 2019 20:10:14 +0200 Subject: [PATCH 206/400] wireguard: update to 0.0.20190601. --- .../wireguard/patches/wg-quick-iproute2.patch | 28 ------------------- srcpkgs/wireguard/template | 6 ++-- 2 files changed, 3 insertions(+), 31 deletions(-) delete mode 100644 srcpkgs/wireguard/patches/wg-quick-iproute2.patch diff --git a/srcpkgs/wireguard/patches/wg-quick-iproute2.patch b/srcpkgs/wireguard/patches/wg-quick-iproute2.patch deleted file mode 100644 index d52804ee660..00000000000 --- a/srcpkgs/wireguard/patches/wg-quick-iproute2.patch +++ /dev/null @@ -1,28 +0,0 @@ -From c09671aa1318f52e0c0b5d2310b72644e9b2ea96 Mon Sep 17 00:00:00 2001 -From: "Jason A. Donenfeld" -Date: Fri, 17 May 2019 12:32:46 +0200 -Subject: wg-quick: look up existing routes properly - -This was never really correct, and then 5.1 broke it entirely. - -Reported-by: piraty1@inbox.ru ---- - src/tools/wg-quick/linux.bash | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/tools/wg-quick/linux.bash b/src/tools/wg-quick/linux.bash -index 5eaa5042..8f1812c1 100755 ---- src/tools/wg-quick/linux.bash -+++ src/tools/wg-quick/linux.bash -@@ -164,7 +164,7 @@ add_route() { - elif [[ $1 == */0 ]]; then - add_default "$1" - else -- [[ $(ip route get "$1" 2>/dev/null) == *dev\ $INTERFACE\ * ]] || cmd ip route add "$1" dev "$INTERFACE" -+ [[ -n $(ip route show dev "$INTERFACE" match "$1" 2>/dev/null) ]] || cmd ip route add "$1" dev "$INTERFACE" - fi - } - --- -cgit v1.2.1-20-gc37e - diff --git a/srcpkgs/wireguard/template b/srcpkgs/wireguard/template index 8e054f5c4ed..ffbf79b3a5b 100644 --- a/srcpkgs/wireguard/template +++ b/srcpkgs/wireguard/template @@ -1,7 +1,7 @@ # Template file for 'wireguard' pkgname=wireguard -version=0.0.20190406 -revision=2 +version=0.0.20190601 +revision=1 wrksrc="WireGuard-${version}" build_wrksrc="src/tools" build_style=gnu-makefile @@ -13,7 +13,7 @@ maintainer="Leah Neukirchen " license="GPL-2.0-only" homepage="https://www.wireguard.com/" distfiles="https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz" -checksum=2f06f3adf70b95e74a7736a22dcf6e9ef623b311a15b7d55b5474e57c3d0415b +checksum=7528461824a0174bd7d4f15e68d8f0ce9a8ea318411502b80759438e8ef65568 dkms_modules="wireguard ${version}" From be6f66e5cc32e4d367e51da53b16c823728221a4 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 1 Jun 2019 20:12:46 +0200 Subject: [PATCH 207/400] isync: update to 1.3.1. --- srcpkgs/isync/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template index 744cc7dca7f..a75057b2287 100644 --- a/srcpkgs/isync/template +++ b/srcpkgs/isync/template @@ -1,7 +1,7 @@ # Template file for 'isync' pkgname=isync -version=1.3.0 -revision=5 +version=1.3.1 +revision=1 build_style=gnu-configure hostmakedepends="perl pkg-config" makedepends="libressl-devel libsasl-devel db-devel zlib-devel" @@ -11,7 +11,7 @@ maintainer="Leah Neukirchen " license="GPL-2" homepage="http://isync.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=8d5f583976e3119705bdba27fa4fc962e807ff5996f24f354957178ffa697c9c +checksum=68cb4643d58152097f01c9b3abead7d7d4c9563183d72f3c2a31d22bc168f0ea post_install() { vsconf src/mbsyncrc.sample From fe75e4a3ce9df179ee3751e439ff4cf463161e2e Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 1 Jun 2019 20:32:04 +0200 Subject: [PATCH 208/400] gnuplot: update to 5.2.7. --- srcpkgs/gnuplot/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnuplot/template b/srcpkgs/gnuplot/template index 2a5d6ab63b6..97cf3296322 100644 --- a/srcpkgs/gnuplot/template +++ b/srcpkgs/gnuplot/template @@ -1,6 +1,6 @@ # Template file for 'gnuplot' pkgname=gnuplot -version=5.2.6 +version=5.2.7 revision=1 configure_args="--with-readline=builtin" hostmakedepends="pkg-config lua52" @@ -11,7 +11,7 @@ maintainer="Leah Neukirchen " homepage="http://www.gnuplot.info/" license="gnuplot" distfiles="${SOURCEFORGE_SITE}/gnuplot/gnuplot/${version}/gnuplot-${version}.tar.gz" -checksum=35dd8f013139e31b3028fac280ee12d4b1346d9bb5c501586d1b5a04ae7a94ee +checksum=97fe503ff3b2e356fe2ae32203fc7fd2cf9cef1f46b60fe46dc501a228b9f4ed subpackages="gnuplot-common" if [ -z "$CROSS_BUILD" ]; then From a55448ecd880458bf604871c53498a4551d2eaef Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 1 Jun 2019 21:09:34 +0200 Subject: [PATCH 209/400] bcc: update to 0.10.0. --- srcpkgs/bcc/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template index acc738800b4..807f1425c1d 100644 --- a/srcpkgs/bcc/template +++ b/srcpkgs/bcc/template @@ -1,7 +1,7 @@ # Template file for 'bcc' pkgname=bcc -version=0.9.0 -revision=2 +version=0.10.0 +revision=1 build_style=cmake configure_args="-DREVISION=${version}" hostmakedepends="flex" @@ -12,9 +12,9 @@ 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/5beb8a2ebffd1045e3edb9b522d6ff5bb477c541.tar.gz" -checksum="0703b752c501b37065f11436e6b38fd66a8153e963cec4989a730d8498451216 - 36d1f67c3648d4556bcf560e18cd20dac99e4c35c3a1b447b06e4d39724e3f9f" + https://github.com/libbpf/libbpf/archive/75db50f4a09d9dbac49b1ace9e4b6a722bdf0519.tar.gz" +checksum="b02a75bc469a33e6781c915361a49a97d4ec7b45d74cfeffb22693247438d4b0 + 22a7ba2343df699a0332015aa54d4a8aeba1756f58308fed120b60a8900e9d55" nocross=yes # https://github.com/voidlinux/void-packages/issues/4738 post_extract() { From 144d829c8a75e02516ffc800c73b080109bba744 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 1 Jun 2019 21:10:42 +0200 Subject: [PATCH 210/400] z3: update to 4.8.5. --- srcpkgs/z3/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/z3/template b/srcpkgs/z3/template index 3acc5c04e71..f4f7af3a8f9 100644 --- a/srcpkgs/z3/template +++ b/srcpkgs/z3/template @@ -1,8 +1,8 @@ # Template file for 'z3' pkgname=z3 -version=4.8.4 +version=4.8.5 revision=1 -wrksrc="${pkgname}-${pkgname}-${version}" +wrksrc="${pkgname}-Z3-${version}" build_style=configure configure_args="--prefix=/usr -g --python $(vopt_if ocaml --ml)" make_build_args="-C build all examples" @@ -15,8 +15,8 @@ short_desc="Z3 theorem prover and SMT solver (command line + Python3 module)" maintainer="Leah Neukirchen " license="MIT" homepage="https://github.com/Z3Prover/z3" -distfiles="https://github.com/Z3Prover/z3/archive/${pkgname}-${version}.tar.gz" -checksum=5a18fe616c2a30b56e5b2f5b9f03f405cdf2435711517ff70b076a01396ef601 +distfiles="https://github.com/Z3Prover/z3/archive/Z3-${version}.tar.gz" +checksum=4e8e232887ddfa643adb6a30dcd3743cb2fa6591735fbd302b49f7028cdc0363 build_options="ocaml" desc_option_ocaml="Enable support for OCaml bindings" From b8b5abab67f465f1dd78be6fe4498e94224329ec Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 1 Jun 2019 21:10:46 +0200 Subject: [PATCH 211/400] sysstat: update to 12.0.5. --- srcpkgs/sysstat/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/sysstat/template b/srcpkgs/sysstat/template index da12b52b7ed..cb99622c9d3 100644 --- a/srcpkgs/sysstat/template +++ b/srcpkgs/sysstat/template @@ -1,6 +1,6 @@ # Template file for 'sysstat' pkgname=sysstat -version=12.0.4 +version=12.0.5 revision=1 build_style=gnu-configure configure_args="--enable-copy-only --disable-file-attr @@ -14,7 +14,7 @@ maintainer="Leah Neukirchen " license="GPL-2.0-or-later" homepage="http://pagesperso-orange.fr/sebastien.godard/" distfiles="http://pagesperso-orange.fr/sebastien.godard/${pkgname}-${version}.tar.xz" -checksum=a500b0fe5e72f691e12eb8cc90389695a4e02072d32d258cfb5c5e58c621e075 +checksum=58583b0776b9addec69e42eebd6dd1a8e976da8a36bad2422659a1ad6c1a2600 post_extract() { sed -i 's/lib64/lib/' configure From 1953ed24889c0a4180f93322a5720f73adddff4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sun, 2 Jun 2019 00:01:10 +0200 Subject: [PATCH 212/400] bcc: fix musl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/bcc/patches/musl.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/srcpkgs/bcc/patches/musl.patch b/srcpkgs/bcc/patches/musl.patch index bc7ac1e7726..20def02c588 100644 --- a/srcpkgs/bcc/patches/musl.patch +++ b/srcpkgs/bcc/patches/musl.patch @@ -48,3 +48,15 @@ #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) From 5e8386b770b5f54c5677fbf7159f5449193b15ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sun, 2 Jun 2019 01:04:06 +0200 Subject: [PATCH 213/400] mozjs60: update to 60.7.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- ...nd-restore-non-volatile-x28-on-arm64.patch | 64 ++++++++++++ ...-clobbering-it-in-the-regex-compiler.patch | 97 +++++++++++++++++++ ...me-lib.patch => 0004-fix-soname-lib.patch} | 0 ...-build.patch => 0005-fix-musl-build.patch} | 0 ...nddianness.patch => 0006-endianness.patch} | 0 ...ian.patch => 0007-jsproperty-endian.patch} | 0 .../mozjs60/patches/0008-copy-headers.patch | 30 ++++++ srcpkgs/mozjs60/template | 4 +- 8 files changed, 193 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/mozjs60/patches/0002-save-and-restore-non-volatile-x28-on-arm64.patch create mode 100644 srcpkgs/mozjs60/patches/0003-save-x28-before-clobbering-it-in-the-regex-compiler.patch rename srcpkgs/mozjs60/patches/{fix-soname-lib.patch => 0004-fix-soname-lib.patch} (100%) rename srcpkgs/mozjs60/patches/{fix-musl-build.patch => 0005-fix-musl-build.patch} (100%) rename srcpkgs/mozjs60/patches/{enddianness.patch => 0006-endianness.patch} (100%) rename srcpkgs/mozjs60/patches/{jsproperty-endian.patch => 0007-jsproperty-endian.patch} (100%) create mode 100644 srcpkgs/mozjs60/patches/0008-copy-headers.patch diff --git a/srcpkgs/mozjs60/patches/0002-save-and-restore-non-volatile-x28-on-arm64.patch b/srcpkgs/mozjs60/patches/0002-save-and-restore-non-volatile-x28-on-arm64.patch new file mode 100644 index 00000000000..f92e1b2e70b --- /dev/null +++ b/srcpkgs/mozjs60/patches/0002-save-and-restore-non-volatile-x28-on-arm64.patch @@ -0,0 +1,64 @@ +# 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 +--- ajs/src/vm/UnboxedObject.cpp ++++ b/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/mozjs60/patches/0003-save-x28-before-clobbering-it-in-the-regex-compiler.patch b/srcpkgs/mozjs60/patches/0003-save-x28-before-clobbering-it-in-the-regex-compiler.patch new file mode 100644 index 00000000000..3886c0e9b21 --- /dev/null +++ b/srcpkgs/mozjs60/patches/0003-save-x28-before-clobbering-it-in-the-regex-compiler.patch @@ -0,0 +1,97 @@ +# 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 +--- a/js/src/irregexp/NativeRegExpMacroAssembler.cpp ++++ b/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 ++++ b/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/mozjs60/patches/fix-soname-lib.patch b/srcpkgs/mozjs60/patches/0004-fix-soname-lib.patch similarity index 100% rename from srcpkgs/mozjs60/patches/fix-soname-lib.patch rename to srcpkgs/mozjs60/patches/0004-fix-soname-lib.patch diff --git a/srcpkgs/mozjs60/patches/fix-musl-build.patch b/srcpkgs/mozjs60/patches/0005-fix-musl-build.patch similarity index 100% rename from srcpkgs/mozjs60/patches/fix-musl-build.patch rename to srcpkgs/mozjs60/patches/0005-fix-musl-build.patch diff --git a/srcpkgs/mozjs60/patches/enddianness.patch b/srcpkgs/mozjs60/patches/0006-endianness.patch similarity index 100% rename from srcpkgs/mozjs60/patches/enddianness.patch rename to srcpkgs/mozjs60/patches/0006-endianness.patch diff --git a/srcpkgs/mozjs60/patches/jsproperty-endian.patch b/srcpkgs/mozjs60/patches/0007-jsproperty-endian.patch similarity index 100% rename from srcpkgs/mozjs60/patches/jsproperty-endian.patch rename to srcpkgs/mozjs60/patches/0007-jsproperty-endian.patch diff --git a/srcpkgs/mozjs60/patches/0008-copy-headers.patch b/srcpkgs/mozjs60/patches/0008-copy-headers.patch new file mode 100644 index 00000000000..a4367411065 --- /dev/null +++ b/srcpkgs/mozjs60/patches/0008-copy-headers.patch @@ -0,0 +1,30 @@ +From: Rico Tzschichholz +Date: Wed, 5 Jul 2017 22:45:59 -0700 +Subject: build: Copy headers on install instead of symlinking + +Patch ported forward to mozjs52 by Philip Chimento +. +--- + python/mozbuild/mozbuild/backend/recursivemake.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild/mozbuild/backend/recursivemake.py +index dd9020d..6918ef8 100644 +--- a/python/mozbuild/mozbuild/backend/recursivemake.py ++++ b/python/mozbuild/mozbuild/backend/recursivemake.py +@@ -1427,11 +1427,11 @@ class RecursiveMakeBackend(CommonBackend): + raise Exception("Wildcards are only supported in the filename part of " + "srcdir-relative or absolute paths.") + +- install_manifest.add_pattern_link(basepath, wild, path) ++ install_manifest.add_pattern_copy(basepath, wild, path) + else: +- install_manifest.add_pattern_link(f.srcdir, f, path) ++ install_manifest.add_pattern_copy(f.srcdir, f, path) + else: +- install_manifest.add_link(f.full_path, dest) ++ install_manifest.add_copy(f.full_path, dest) + else: + install_manifest.add_optional_exists(dest) + backend_file.write('%s_FILES += %s\n' % ( + diff --git a/srcpkgs/mozjs60/template b/srcpkgs/mozjs60/template index 7b631330f7e..276a93f877f 100644 --- a/srcpkgs/mozjs60/template +++ b/srcpkgs/mozjs60/template @@ -1,6 +1,6 @@ # Template file for 'mozjs60' pkgname=mozjs60 -version=60.5.2 +version=60.7.0 revision=1 wrksrc="firefox-${version}" build_wrksrc=js/src @@ -12,7 +12,7 @@ maintainer="Rasmus Thomsen " license="MPL-2.0" homepage="https://www.mozilla.org/js/" distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz" -checksum=b95585982225a5246b663298de2fed275179d9299c46790468c49b6eee08cea4 +checksum=0a5f0c1d8d1e9443d85083d37fec32e5cc15c1001ea992d49745490065b4a023 patch_args="-Np1" LDFLAGS+=" -Wl,-z,stack-size=1048576" From df13465b416ebd91203c3105dcc26d4203b27108 Mon Sep 17 00:00:00 2001 From: Renato Aguiar Date: Sat, 1 Jun 2019 13:51:29 -0700 Subject: [PATCH 214/400] shadowfox-updater: update to 2.1.0 --- srcpkgs/shadowfox-updater/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/shadowfox-updater/template b/srcpkgs/shadowfox-updater/template index b7b12119130..e15b06b07eb 100644 --- a/srcpkgs/shadowfox-updater/template +++ b/srcpkgs/shadowfox-updater/template @@ -1,6 +1,6 @@ # Template file for 'shadowfox-updater' pkgname=shadowfox-updater -version=2.0.1 +version=2.1.0 revision=1 build_style=go go_import_path=github.com/SrKomodo/shadowfox-updater @@ -11,7 +11,7 @@ maintainer="Renato Aguiar " license="MIT" homepage="https://github.com/SrKomodo/shadowfox-updater" distfiles="https://github.com/SrKomodo/shadowfox-updater/archive/v${version}.tar.gz" -checksum=3a8e2e30395fddcf9a5ec7377531cf6b618d9ef55dbaba556953b2b3d13773a0 +checksum=2db6190473ac827d55fbbe6fa6a04704cf5ea2822f13eae56fed440de9268a18 post_install() { vdoc README.md From af8607fd8ece3d22d2fc2c76ce392c58c3b9176b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= Date: Sat, 1 Jun 2019 17:11:00 +0200 Subject: [PATCH 215/400] neovim: update to 0.3.7. --- srcpkgs/neovim/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/neovim/template b/srcpkgs/neovim/template index b640e0603c2..77788b3d59b 100644 --- a/srcpkgs/neovim/template +++ b/srcpkgs/neovim/template @@ -1,6 +1,6 @@ # Template file for 'neovim' pkgname=neovim -version=0.3.5 +version=0.3.7 revision=1 build_style=cmake configure_args="-DENABLE_JEMALLOC=0" @@ -11,7 +11,7 @@ maintainer="Steve Prybylski " license="Apache-2.0, custom:Vim" homepage="https://neovim.io" distfiles="https://github.com/neovim/neovim/archive/v${version}.tar.gz" -checksum=b8b30043963133214f78901cb6361189c8f94e9f5f1b2493a7cedb4c323236d6 +checksum=4c0f1b839ef2c8cfee63eb2a072324accf4f0c0badd2fbd087d3e7a12d538bca alternatives=" vi:vi:/usr/bin/nvim From 28f816973d6f13a356aae228430f9d266407b701 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Sat, 1 Jun 2019 15:11:58 +0000 Subject: [PATCH 216/400] apparmor: adjust dhcpcd and wpa_supplicant profiles --- srcpkgs/apparmor/files/profiles/usr.bin.dhcpcd | 2 ++ srcpkgs/apparmor/files/profiles/usr.bin.wpa_supplicant | 1 + srcpkgs/apparmor/template | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/srcpkgs/apparmor/files/profiles/usr.bin.dhcpcd b/srcpkgs/apparmor/files/profiles/usr.bin.dhcpcd index 92f3792487c..3e9d39be538 100644 --- a/srcpkgs/apparmor/files/profiles/usr.bin.dhcpcd +++ b/srcpkgs/apparmor/files/profiles/usr.bin.dhcpcd @@ -45,6 +45,8 @@ profile dhcpcd /{usr/,}bin/dhcpcd { /var/db/dhcpcd/** rw, /{usr/,}bin/dhcpcd mrix, + owner @{PROC}/@{pid}/mountinfo r, + # Site-specific additions and overrides. See local/README for details. #include } diff --git a/srcpkgs/apparmor/files/profiles/usr.bin.wpa_supplicant b/srcpkgs/apparmor/files/profiles/usr.bin.wpa_supplicant index dec2ff90c24..fbe20060de4 100644 --- a/srcpkgs/apparmor/files/profiles/usr.bin.wpa_supplicant +++ b/srcpkgs/apparmor/files/profiles/usr.bin.wpa_supplicant @@ -8,6 +8,7 @@ capability net_raw, capability chown, capability dac_override, + capability fsetid, network inet dgram, network inet raw, network packet dgram, diff --git a/srcpkgs/apparmor/template b/srcpkgs/apparmor/template index d00813bfe70..d565a425065 100644 --- a/srcpkgs/apparmor/template +++ b/srcpkgs/apparmor/template @@ -1,7 +1,7 @@ # Template file for 'apparmor' pkgname=apparmor version=2.13.2 -revision=5 +revision=6 wrksrc="${pkgname}-v${version}" build_wrksrc=libraries/libapparmor build_style=gnu-configure From 48175c17f27086370946e709c91ae871e1edf937 Mon Sep 17 00:00:00 2001 From: Renato Aguiar Date: Sat, 1 Jun 2019 13:54:13 -0700 Subject: [PATCH 217/400] font-spleen: update to 1.0.5 --- srcpkgs/font-spleen/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/font-spleen/template b/srcpkgs/font-spleen/template index 52bf2db167e..82a443e418d 100644 --- a/srcpkgs/font-spleen/template +++ b/srcpkgs/font-spleen/template @@ -1,6 +1,6 @@ # Template file for 'font-spleen' pkgname=font-spleen -version=1.0.4 +version=1.0.5 revision=1 archs=noarch wrksrc="spleen-${version}" @@ -12,7 +12,7 @@ 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=6f6860ae947a6bd507259175dbaa57fad88a6e26e633a5d67f370ffb7c51c2f4 +checksum=cf26c313da53857353e48a93540845cf6f773908fe19d2a509249f061776dfe0 do_install() { vmkdir usr/share/fonts/X11/spleen From 59009e2c3078cf7ac459ab0b99c20924c3c03cdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sun, 2 Jun 2019 13:46:42 +0200 Subject: [PATCH 218/400] polkit-elogind: update to 0.116 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- .../patches/CVE-2018-19788.patch | 150 ------------------ .../patches/make-innetgr-optional.patch | 10 +- srcpkgs/polkit-elogind/template | 8 +- 3 files changed, 9 insertions(+), 159 deletions(-) delete mode 100644 srcpkgs/polkit-elogind/patches/CVE-2018-19788.patch diff --git a/srcpkgs/polkit-elogind/patches/CVE-2018-19788.patch b/srcpkgs/polkit-elogind/patches/CVE-2018-19788.patch deleted file mode 100644 index c7c125a50c4..00000000000 --- a/srcpkgs/polkit-elogind/patches/CVE-2018-19788.patch +++ /dev/null @@ -1,150 +0,0 @@ ---- src/polkit/polkitunixgroup.c -+++ src/polkit/polkitunixgroup.c -@@ -71,6 +71,7 @@ G_DEFINE_TYPE_WITH_CODE (PolkitUnixGroup, polkit_unix_group, G_TYPE_OBJECT, - static void - polkit_unix_group_init (PolkitUnixGroup *unix_group) - { -+ unix_group->gid = -1; /* (git_t) -1 is not a valid GID under Linux */ - } - - static void -@@ -100,11 +101,14 @@ polkit_unix_group_set_property (GObject *object, - GParamSpec *pspec) - { - PolkitUnixGroup *unix_group = POLKIT_UNIX_GROUP (object); -+ gint val; - - switch (prop_id) - { - case PROP_GID: -- unix_group->gid = g_value_get_int (value); -+ val = g_value_get_int (value); -+ g_return_if_fail (val != -1); -+ unix_group->gid = val; - break; - - default: -@@ -131,9 +135,9 @@ polkit_unix_group_class_init (PolkitUnixGroupClass *klass) - g_param_spec_int ("gid", - "Group ID", - "The UNIX group ID", -- 0, -+ G_MININT, - G_MAXINT, -- 0, -+ -1, - G_PARAM_CONSTRUCT | - G_PARAM_READWRITE | - G_PARAM_STATIC_NAME | -@@ -166,9 +170,10 @@ polkit_unix_group_get_gid (PolkitUnixGroup *group) - */ - void - polkit_unix_group_set_gid (PolkitUnixGroup *group, -- gint gid) -+ gint gid) - { - g_return_if_fail (POLKIT_IS_UNIX_GROUP (group)); -+ g_return_if_fail (gid != -1); - group->gid = gid; - } - -@@ -183,6 +188,8 @@ polkit_unix_group_set_gid (PolkitUnixGroup *group, - PolkitIdentity * - polkit_unix_group_new (gint gid) - { -+ g_return_val_if_fail (gid != -1, NULL); -+ - return POLKIT_IDENTITY (g_object_new (POLKIT_TYPE_UNIX_GROUP, - "gid", gid, - NULL)); ---- src/polkit/polkitunixprocess.c -+++ src/polkit/polkitunixprocess.c -@@ -159,9 +159,14 @@ polkit_unix_process_set_property (GObject *object, - polkit_unix_process_set_pid (unix_process, g_value_get_int (value)); - break; - -- case PROP_UID: -- polkit_unix_process_set_uid (unix_process, g_value_get_int (value)); -+ case PROP_UID: { -+ gint val; -+ -+ val = g_value_get_int (value); -+ g_return_if_fail (val != -1); -+ polkit_unix_process_set_uid (unix_process, val); - break; -+ } - - case PROP_START_TIME: - polkit_unix_process_set_start_time (unix_process, g_value_get_uint64 (value)); -@@ -239,7 +244,7 @@ polkit_unix_process_class_init (PolkitUnixProcessClass *klass) - g_param_spec_int ("uid", - "User ID", - "The UNIX user ID", -- -1, -+ G_MININT, - G_MAXINT, - -1, - G_PARAM_CONSTRUCT | -@@ -303,7 +308,6 @@ polkit_unix_process_set_uid (PolkitUnixProcess *process, - gint uid) - { - g_return_if_fail (POLKIT_IS_UNIX_PROCESS (process)); -- g_return_if_fail (uid >= -1); - process->uid = uid; - } - ---- src/polkit/polkitunixuser.c -+++ src/polkit/polkitunixuser.c -@@ -72,6 +72,7 @@ G_DEFINE_TYPE_WITH_CODE (PolkitUnixUser, polkit_unix_user, G_TYPE_OBJECT, - static void - polkit_unix_user_init (PolkitUnixUser *unix_user) - { -+ unix_user->uid = -1; /* (uid_t) -1 is not a valid UID under Linux */ - unix_user->name = NULL; - } - -@@ -112,11 +113,14 @@ polkit_unix_user_set_property (GObject *object, - GParamSpec *pspec) - { - PolkitUnixUser *unix_user = POLKIT_UNIX_USER (object); -+ gint val; - - switch (prop_id) - { - case PROP_UID: -- unix_user->uid = g_value_get_int (value); -+ val = g_value_get_int (value); -+ g_return_if_fail (val != -1); -+ unix_user->uid = val; - break; - - default: -@@ -144,9 +148,9 @@ polkit_unix_user_class_init (PolkitUnixUserClass *klass) - g_param_spec_int ("uid", - "User ID", - "The UNIX user ID", -- 0, -+ G_MININT, - G_MAXINT, -- 0, -+ -1, - G_PARAM_CONSTRUCT | - G_PARAM_READWRITE | - G_PARAM_STATIC_NAME | -@@ -182,6 +186,7 @@ polkit_unix_user_set_uid (PolkitUnixUser *user, - gint uid) - { - g_return_if_fail (POLKIT_IS_UNIX_USER (user)); -+ g_return_if_fail (uid != -1); - user->uid = uid; - } - -@@ -196,6 +201,8 @@ polkit_unix_user_set_uid (PolkitUnixUser *user, - PolkitIdentity * - polkit_unix_user_new (gint uid) - { -+ g_return_val_if_fail (uid != -1, NULL); -+ - return POLKIT_IDENTITY (g_object_new (POLKIT_TYPE_UNIX_USER, - "uid", uid, - NULL)); diff --git a/srcpkgs/polkit-elogind/patches/make-innetgr-optional.patch b/srcpkgs/polkit-elogind/patches/make-innetgr-optional.patch index d641225cf25..e1e4e9ae255 100644 --- a/srcpkgs/polkit-elogind/patches/make-innetgr-optional.patch +++ b/srcpkgs/polkit-elogind/patches/make-innetgr-optional.patch @@ -50,15 +50,15 @@ --- src/polkitbackend/polkitbackendjsauthority.cpp +++ src/polkitbackend/polkitbackendjsauthority.cpp -@@ -1499,6 +1499,7 @@ js_polkit_user_is_in_netgroup (JSContext *cx, +@@ -1502,6 +1502,7 @@ JS::CallArgs args = JS::CallArgsFromVp (argc, vp); +#if defined HAVE_GETNETGRENT - user = JS_EncodeString (cx, args[0].toString()); - netgroup = JS_EncodeString (cx, args[1].toString()); - -@@ -1514,6 +1515,7 @@ js_polkit_user_is_in_netgroup (JSContext *cx, + JS::RootedString usrstr (authority->priv->cx); + usrstr = args[0].toString(); + user = JS_EncodeStringToUTF8 (cx, usrstr); +@@ -1521,6 +1522,7 @@ JS_free (cx, user); ret = true; diff --git a/srcpkgs/polkit-elogind/template b/srcpkgs/polkit-elogind/template index 38da6d01350..5b587e34315 100644 --- a/srcpkgs/polkit-elogind/template +++ b/srcpkgs/polkit-elogind/template @@ -1,7 +1,7 @@ # Template file for 'polkit-elogind' pkgname=polkit-elogind -version=0.115 -revision=5 +version=0.116 +revision=1 wrksrc="polkit-${version}" build_style=gnu-configure build_helper="gir" @@ -12,13 +12,13 @@ make_dirs=" /usr/share/polkit-1/rules.d 0700 polkitd polkitd" hostmakedepends="automake libtool gettext-devel git glib-devel gobject-introspection gtk-doc intltool pkg-config" -makedepends="elogind-devel libglib-devel mozjs52-devel pam-devel" +makedepends="elogind-devel libglib-devel mozjs60-devel pam-devel" short_desc="Authorization Toolkit" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://www.freedesktop.org/wiki/Software/polkit" distfiles="${FREEDESKTOP_SITE}/polkit/releases/polkit-${version}.tar.gz" -checksum=2f87ecdabfbd415c6306673ceadc59846f059b18ef2fce42bac63fe283f12131 +checksum=88170c9e711e8db305a12fdb8234fac5706c61969b94e084d0f117d8ec5d34b1 system_accounts="polkitd" provides="polkit-${version}_${revision}" replaces="polkit>=0" From a3ca5e3e2e0f1db316ea5322a900febfb9aa6c54 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 2 Jun 2019 17:04:31 +0300 Subject: [PATCH 219/400] xwallpaper: update to 0.5.0 --- srcpkgs/xwallpaper/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xwallpaper/template b/srcpkgs/xwallpaper/template index f6f98949fa2..6c34c01912e 100644 --- a/srcpkgs/xwallpaper/template +++ b/srcpkgs/xwallpaper/template @@ -1,6 +1,6 @@ # Template file for 'xwallpaper' pkgname=xwallpaper -version=0.4.1 +version=0.5.0 revision=2 build_style=gnu-configure hostmakedepends="automake pkg-config" @@ -11,7 +11,7 @@ maintainer="Orphaned " license="ISC" homepage="https://github.com/stoeckmann/xwallpaper" distfiles="https://github.com/stoeckmann/xwallpaper/archive/v${version}.tar.gz" -checksum=d99868a69125957bfd0209b6842d59b3626739abceb3c5bcf0859f8ebd7e852b +checksum=62274a2dcedc53575136482588577dc325635a4391930d4c15da4768ae2ab1fc case "$XBPS_TARGET_MACHINE" in i686*) configure_args+=" --without-seccomp" ;; From 4c6ff7c7b0d5ae9cb784bbedf6a496ba3041ade6 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 2 Jun 2019 16:53:43 +0300 Subject: [PATCH 220/400] fotoxx: update to 19.12 --- srcpkgs/fotoxx/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fotoxx/template b/srcpkgs/fotoxx/template index 7d35f1a1c68..877f4804cdd 100644 --- a/srcpkgs/fotoxx/template +++ b/srcpkgs/fotoxx/template @@ -1,6 +1,6 @@ # Template file for 'fotoxx' pkgname=fotoxx -version=19.11 +version=19.12 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=2b13d0f05e7432034ae562b90701b37977fb30c01761e5307cbdfb4bb5283322 +checksum=a5fa5ab5d2a4289c49fb87b0ffa843953daec3439686643db1edbc69ee65407c case "$XBPS_TARGET_MACHINE" in *-musl) broken="execinfo.h is a GNU specific header, and doesn’t exist under musl.";; From cfd709ba6600b01947fe8d272c5828df69a9eb48 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 2 Jun 2019 16:31:41 +0300 Subject: [PATCH 221/400] eqonomize: update to 1.3.4 --- srcpkgs/eqonomize/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/eqonomize/template b/srcpkgs/eqonomize/template index 92008549d1d..f3d39b634ce 100644 --- a/srcpkgs/eqonomize/template +++ b/srcpkgs/eqonomize/template @@ -1,6 +1,6 @@ # Template file for 'eqonomize' pkgname=eqonomize -version=1.3.3 +version=1.3.4 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=571cab4e83f408a46d61efad08ffcf7344ee60086a85689af89a706b4ddae84d +checksum=77375d85b83619ffa48c44ddd99caf527f5eadae08adca46ed4e20c5dd336f75 if [ "$CROSS_BUILD" ]; then hostmakedepends="qt5-charts-devel" From 1125dd11d8841c416d28bd011e735fe44ad07099 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 2 Jun 2019 16:10:09 +0300 Subject: [PATCH 222/400] doomretro: update to 2.9.2 --- srcpkgs/doomretro/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/doomretro/template b/srcpkgs/doomretro/template index 5a242038854..13fa340ef1a 100644 --- a/srcpkgs/doomretro/template +++ b/srcpkgs/doomretro/template @@ -1,6 +1,6 @@ # Template file for 'doomretro' pkgname=doomretro -version=2.9 +version=2.9.2 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=426479bbc7202a0aa5b49138649c41700b5271895dc475ee6aad8e5ed0f15877 +checksum=689b4723e89858fce377dab57749928941ea48624e4e3821b096613ded84de9b From 8f70f2c31baec85c103d9e9c7688a7205d778d1a Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 2 Jun 2019 15:55:01 +0300 Subject: [PATCH 223/400] croc: update to 6.0.6 --- srcpkgs/croc/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template index 0d6f5d72cb4..cf1d816c115 100644 --- a/srcpkgs/croc/template +++ b/srcpkgs/croc/template @@ -1,16 +1,16 @@ # Template file for 'croc' pkgname=croc -version=4.1.6 +version=6.0.6 revision=1 build_style=go -go_import_path=github.com/schollz/croc +go_import_path=github.com/schollz/croc/v6 hostmakedepends="git" short_desc="Easily and securely send things from one computer to another" maintainer="Orphaned " license="MIT" homepage="https://github.com/schollz/croc" distfiles="https://github.com/schollz/croc/archive/v${version}.tar.gz" -checksum=3eff11c33d5a70e10d26b5315a460c148d302e11ba1f80662d8fc475f1552676 +checksum=811eee0713b5bdf408dd53a31eff19372da833d46ff36357499c8df4109ec44b post_install() { vlicense LICENSE From 139e518a7e67d6df5e8155f4c281335691ff31e4 Mon Sep 17 00:00:00 2001 From: Peter Bui Date: Sun, 2 Jun 2019 08:45:16 -0400 Subject: [PATCH 224/400] rpi-kernel: update to 4.19.46. [ci skip] --- srcpkgs/rpi-kernel/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template index d1df81b62c8..ba1c41f372d 100644 --- a/srcpkgs/rpi-kernel/template +++ b/srcpkgs/rpi-kernel/template @@ -5,11 +5,11 @@ # # https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=224931 -_githash="2b1a992899f708567f69c052ae2768c215b22d5d" +_githash="55e0334cf5a43948b65788980cd8ab729427230e" _gitshort="${_githash:0:7}" pkgname=rpi-kernel -version=4.19.44 +version=4.19.46 revision=1 wrksrc="linux-${_githash}" maintainer="Juan RP " @@ -17,7 +17,7 @@ homepage="http://www.kernel.org" license="GPL-2.0-only" short_desc="The Linux kernel for Raspberry Pi (${version%.*} series [git ${_gitshort}])" distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz" -checksum=40affb820cf48a5036179fbfa9549d84b3c89b886cc2d99f4692e1ea2cd87704 +checksum=befe5e6d26f97c09c014234424457fa6e852a6343e3d3ee4f8143d4698ced8cf _kernver="${version}_${revision}" From 055418377b764e33d06cdae3b165e90650021b5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sun, 2 Jun 2019 17:45:32 +0200 Subject: [PATCH 225/400] xf86-video-intel: use git via https MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/xf86-video-intel/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/xf86-video-intel/template b/srcpkgs/xf86-video-intel/template index 75714ae6f12..733da92a640 100644 --- a/srcpkgs/xf86-video-intel/template +++ b/srcpkgs/xf86-video-intel/template @@ -20,7 +20,7 @@ lib32disabled=yes LDFLAGS="-Wl,-z,lazy" do_fetch() { - git clone git://anongit.freedesktop.org/xorg/driver/xf86-video-intel ${wrksrc} + git clone https://anongit.freedesktop.org/xorg/driver/xf86-video-intel ${wrksrc} cd ${wrksrc} git reset --hard $_commit } From 9fa92fe12f0690f61e16ae5f9b64282b7073ed18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sun, 2 Jun 2019 17:57:49 +0200 Subject: [PATCH 226/400] xf86-video-intel: new URL gitlab.freedesktop.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/xf86-video-intel/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/xf86-video-intel/template b/srcpkgs/xf86-video-intel/template index 733da92a640..d4657aca3b5 100644 --- a/srcpkgs/xf86-video-intel/template +++ b/srcpkgs/xf86-video-intel/template @@ -20,7 +20,7 @@ lib32disabled=yes LDFLAGS="-Wl,-z,lazy" do_fetch() { - git clone https://anongit.freedesktop.org/xorg/driver/xf86-video-intel ${wrksrc} + git clone https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel ${wrksrc} cd ${wrksrc} git reset --hard $_commit } From f6ec1f1ef25de511e379ed806aaf4ea6e84f1d60 Mon Sep 17 00:00:00 2001 From: Joshua Kraemer Date: Tue, 21 May 2019 22:01:25 +0200 Subject: [PATCH 227/400] New package: ctwm-4.0.2 --- srcpkgs/ctwm/template | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 srcpkgs/ctwm/template diff --git a/srcpkgs/ctwm/template b/srcpkgs/ctwm/template new file mode 100644 index 00000000000..3be377a0355 --- /dev/null +++ b/srcpkgs/ctwm/template @@ -0,0 +1,33 @@ +# Template file for 'ctwm' +pkgname=ctwm +version=4.0.2 +revision=1 +build_style=cmake +configure_args=" + -DUSE_M4=$(vopt_if m4 ON OFF) + -DUSE_XPM=$(vopt_if xpm ON OFF) + -DUSE_JPEG=$(vopt_if jpeg ON OFF) + -DUSE_EWMH=$(vopt_if ewmh ON OFF) + -DUSE_RPLAY=$(vopt_if rplay ON OFF) + -DUSE_XRANDR=$(vopt_if xrandr ON OFF)" +hostmakedepends="flex m4" +makedepends="libX11-devel libXext-devel libXmu-devel libXt-devel libSM-devel libICE-devel libXpm-devel libXrandr-devel" +depends="$(vopt_if m4 "m4")" +short_desc="Claude's Tab Window Manager" +maintainer="Joshua Krämer " +license="MIT" +homepage="https://ctwm.org" +distfiles="https://ctwm.org/dist/ctwm-${version}.tar.xz" +checksum=d4c97558c7eeebd11368d11cbe667706b9f12f2d253020f20b73d1cdd11c19aa + +build_options="m4 xpm jpeg ewmh rplay xrandr" +build_options_default="m4 xpm ewmh xrandr" +desc_option_m4="Use m4 to preprocess config files" +desc_option_xpm="Enable support for XPM images" +desc_option_ewmh="Enable support for EWMH" +desc_option_rplay="Enable sound support via rplay" +desc_option_xrandr="Enable multi-monitor support via xrandr" + +post_install() { + vlicense COPYRIGHT +} From 0d5abe5dc5c7c62858b065c6e143c274ef087e79 Mon Sep 17 00:00:00 2001 From: Renato Aguiar Date: Sun, 2 Jun 2019 08:25:23 -0700 Subject: [PATCH 228/400] shadowfox-updater: update to 2.2.0 --- srcpkgs/shadowfox-updater/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/shadowfox-updater/template b/srcpkgs/shadowfox-updater/template index e15b06b07eb..37e61375530 100644 --- a/srcpkgs/shadowfox-updater/template +++ b/srcpkgs/shadowfox-updater/template @@ -1,6 +1,6 @@ # Template file for 'shadowfox-updater' pkgname=shadowfox-updater -version=2.1.0 +version=2.2.0 revision=1 build_style=go go_import_path=github.com/SrKomodo/shadowfox-updater @@ -11,7 +11,7 @@ maintainer="Renato Aguiar " license="MIT" homepage="https://github.com/SrKomodo/shadowfox-updater" distfiles="https://github.com/SrKomodo/shadowfox-updater/archive/v${version}.tar.gz" -checksum=2db6190473ac827d55fbbe6fa6a04704cf5ea2822f13eae56fed440de9268a18 +checksum=2674bf5cabf3d478c15804164936d3baa06f6a7f96313a69176439c0a60e3bbd post_install() { vdoc README.md From 4e89b07b1ce363548e17291d982eb1ca22de1e92 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Sun, 2 Jun 2019 13:48:50 -0500 Subject: [PATCH 229/400] plantuml: update to 1.2019.6 --- srcpkgs/plantuml/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plantuml/template b/srcpkgs/plantuml/template index 2c002840f65..863826272c6 100644 --- a/srcpkgs/plantuml/template +++ b/srcpkgs/plantuml/template @@ -1,7 +1,7 @@ # Template file for 'plantuml' pkgname=plantuml reverts="8047_1 8053_1 8059_1" -version=1.2019.4 +version=1.2019.6 revision=1 archs=noarch create_wrksrc=yes @@ -12,7 +12,7 @@ maintainer="Julien Dehos " license="GPL-2.0-or-later" homepage="http://plantuml.com/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-jar-gplv2-${version}.zip" -checksum=ad6718f7ad03d6e5b4e378ab0895e2cb3661ca9bc240d50e0f31520e419508ba +checksum=32247b8d1026a0b2855e3c84876f8e4f68086814a149899e91f352b98af5e245 do_build() { mv ${pkgname}.jar ${pkgname}-${version}.jar From 295f3da5be8f85760a39c5b42992dadbff283541 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Sun, 2 Jun 2019 13:59:05 -0500 Subject: [PATCH 230/400] flare-game: update to 1.10 --- srcpkgs/flare-game/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/flare-game/template b/srcpkgs/flare-game/template index b2c909cfc92..f9c64baa992 100644 --- a/srcpkgs/flare-game/template +++ b/srcpkgs/flare-game/template @@ -1,6 +1,6 @@ # Template file for 'flare-game' pkgname=flare-game -version=1.09.01 +version=1.10 revision=1 archs=noarch build_style=cmake @@ -11,7 +11,7 @@ maintainer="Diogo Leal " license="GPL-3.0-or-later, CC-BY-SA-3.0" homepage="http://flarerpg.org/" distfiles="https://github.com/flareteam/flare-game/archive/v${version}.tar.gz" -checksum=47d48bc049e9f4facc83bc36e0e7d4c8d02e09000af64ebb2d76efc68ff0d004 +checksum=832dfca5c42dc8d3f059fdd654db637bb4d79553c68766c1a92863c9d80ce3f4 post_install() { vlicense LICENSE.txt From 10e7cad06ab89df9be2f457eed3d1f822637d6cd Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Sun, 2 Jun 2019 14:38:26 -0500 Subject: [PATCH 231/400] xkcdpass: update to 1.17.3 --- srcpkgs/xkcdpass/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xkcdpass/template b/srcpkgs/xkcdpass/template index 4753559c521..ba2bad454b4 100644 --- a/srcpkgs/xkcdpass/template +++ b/srcpkgs/xkcdpass/template @@ -1,6 +1,6 @@ # Template file for 'xkcdpass' pkgname=xkcdpass -version=1.17.2 +version=1.17.3 revision=1 archs=noarch wrksrc="XKCD-password-generator-xkcdpass-${version}" @@ -14,7 +14,7 @@ maintainer="Orphaned " license="BSD-3-Clause" homepage="https://github.com/redacted/XKCD-password-generator" distfiles="https://github.com/redacted/XKCD-password-generator/archive/xkcdpass-${version}.tar.gz" -checksum=060b80b33ccd2cfdbd689021374cfb0a16c19e4a121e814c4b039dabe76cc8b6 +checksum=793aa1803360033cefa24b386abb0f11f815ffd95824026605fe398e98f9efd4 do_check() { pytest3 From 6872c2fae5e7668cf4eed5edb1d1b48d03ca758d Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Sun, 2 Jun 2019 14:33:27 -0500 Subject: [PATCH 232/400] mbpfan: update to 2.1.1 --- srcpkgs/mbpfan/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mbpfan/template b/srcpkgs/mbpfan/template index 645b0b0ad0e..f87dd47859a 100644 --- a/srcpkgs/mbpfan/template +++ b/srcpkgs/mbpfan/template @@ -1,6 +1,6 @@ # Template file for 'mbpfan' pkgname=mbpfan -version=2.1.0 +version=2.1.1 revision=1 archs="x86_64* i686*" # it's Macbook-specific and Macbooks only have these arches. build_style=gnu-makefile @@ -10,7 +10,7 @@ maintainer="noah " license="GPL-3.0-or-later" homepage="https://github.com/dgraziotin/mbpfan" distfiles="https://github.com/dgraziotin/mbpfan/archive/v${version}.tar.gz" -checksum=97e631fda6d71eba989e4403883f74eb89f54e3c30a9c8068c5f7fb1f95d84c8 +checksum=fabe956ff4fefd1f0740ef6701338ce5de5d4731bf06693123f0724c0d8b2e6b pre_build() { sed -i 's|/usr/sbin|/usr/bin|' Makefile From 29f76c654ad2ad0b8e2bf08f27ca8b947a630f9d Mon Sep 17 00:00:00 2001 From: Daniel Santana Date: Thu, 30 May 2019 16:07:53 -0300 Subject: [PATCH 233/400] minikube: update to 1.1.0. Closes #12039. Signed-off-by: Enno Boland --- srcpkgs/minikube/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/minikube/template b/srcpkgs/minikube/template index 84853957105..40c3e1a734a 100644 --- a/srcpkgs/minikube/template +++ b/srcpkgs/minikube/template @@ -1,6 +1,6 @@ # Template file for 'minikube' pkgname=minikube -version=1.0.1 +version=1.1.0 revision=1 archs="x86_64* ppc64le*" build_wrksrc=src/k8s.io/minikube From 2151534a559ea06ebcbb7e6ef0d3221f5e7d8a96 Mon Sep 17 00:00:00 2001 From: Paper Mountain Studio Date: Tue, 28 May 2019 09:14:58 +0200 Subject: [PATCH 234/400] ansible: update to 2.8.0 Closes #11995. Signed-off-by: Enno Boland --- srcpkgs/ansible/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ansible/template b/srcpkgs/ansible/template index 850ff544770..b1d646d86dd 100644 --- a/srcpkgs/ansible/template +++ b/srcpkgs/ansible/template @@ -1,6 +1,6 @@ # Template file for 'ansible' pkgname=ansible -version=2.7.10 +version=2.8.0 revision=1 archs=noarch build_style=python3-module @@ -14,7 +14,7 @@ maintainer="Michael Aldridge " license="GPL-3.0-or-later" homepage="https://www.ansible.com/" distfiles="https://releases.ansible.com/ansible/${pkgname}-${version}.tar.gz" -checksum=84a42d1e371c4222c82e575cb6961fafd3afe920d84e4b6d87affabe400be294 +checksum=7234dd7d89150dc5bf035bc1ec3c084a8a0699d89e1c9b06b2af6dd34b2ef3ae post_install() { vsconf examples/ansible.cfg From ff435a15acbd3560a438c0434d66ca61f26fe357 Mon Sep 17 00:00:00 2001 From: not-chicken Date: Sun, 2 Jun 2019 13:37:15 +0530 Subject: [PATCH 235/400] New package: foliate-1.0.1 --- srcpkgs/foliate/template | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 srcpkgs/foliate/template diff --git a/srcpkgs/foliate/template b/srcpkgs/foliate/template new file mode 100644 index 00000000000..c5e42246660 --- /dev/null +++ b/srcpkgs/foliate/template @@ -0,0 +1,13 @@ +# Template file for 'foliate' +pkgname=foliate +version=1.1.0 +revision=1 +build_style=meson +hostmakedepends="pkg-config gjs glib-devel meson ninja" +depends="webkit2gtk libsoup" +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/${pkgname}/archive/${version}.tar.gz" +checksum=adf62b26a64011789a26745dc8b2b095b18f9620a3834b92a5e1a7435a195927 From ff6c4a7034afea85de4f5b064047d76dc7a4c04e Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 3 Jun 2019 12:21:40 +0200 Subject: [PATCH 236/400] xorg-server: update to 1.20.5. --- srcpkgs/xorg-server/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template index 1b62fd3448c..393dbfdb2f2 100644 --- a/srcpkgs/xorg-server/template +++ b/srcpkgs/xorg-server/template @@ -1,6 +1,6 @@ # Template file for 'xorg-server' pkgname=xorg-server -version=1.20.4 +version=1.20.5 revision=1 build_style=meson configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true @@ -23,7 +23,7 @@ maintainer="Juan RP " license="MIT, BSD-3-Clause" homepage="https://xorg.freedesktop.org" distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.bz2" -checksum=fe0fd493ebe93bfc56bede382fa204458ff5f636ea54d413a5d1bd58e19166ee +checksum=a81d8243f37e75a03d4f8c55f96d0bc25802be6ec45c3bfa5cb614c6d01bac9d lib32disabled=yes provides="xserver-abi-extension-10_1 xserver-abi-input-24_1 xserver-abi-video-24_1 xf86-video-modesetting-1_1" replaces="xf86-video-modesetting>=0" @@ -35,7 +35,7 @@ desc_option_elogind="Rootless Xorg support with elogind" case "$XBPS_TARGET_MACHINE" in i686*|x86_64*|aarch64*|ppc*) - # Enable glamor/dri/opengl/xwayland by default on x86. + # Enable glamor/dri/opengl/xwayland by default. configure_args+=" -Dglamor=true -Ddri2=true -Ddri3=true -Dglx=true -Dxwayland=true" replaces+=" glamor-egl>=0" subpackages+=" xorg-server-xwayland" From 7c7225f52847bae96da8e489053d5692fa899cf7 Mon Sep 17 00:00:00 2001 From: bra1nwave Date: Mon, 3 Jun 2019 11:39:11 +0200 Subject: [PATCH 237/400] calibre: update to 3.44.0. --- srcpkgs/calibre/files/calibre-viewer.desktop | 13 ------------- srcpkgs/calibre/files/calibre.desktop | 13 ------------- srcpkgs/calibre/template | 17 ++++++++--------- 3 files changed, 8 insertions(+), 35 deletions(-) delete mode 100644 srcpkgs/calibre/files/calibre-viewer.desktop delete mode 100644 srcpkgs/calibre/files/calibre.desktop diff --git a/srcpkgs/calibre/files/calibre-viewer.desktop b/srcpkgs/calibre/files/calibre-viewer.desktop deleted file mode 100644 index 41f7dd58a5d..00000000000 --- a/srcpkgs/calibre/files/calibre-viewer.desktop +++ /dev/null @@ -1,13 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Type=Application -Name=Calibre-viewer -GenericName=E-book viewer -Comment=E-book viewer -TryExec=ebook-viewer -Exec=ebook-viewer -Icon=/usr/share/calibre/images/viewer.png -Terminal=false -StartupNotify=false -Categories=Application;Office;Viewer -MimeType=application/x-sony-bbeb;application/epub+zip;text/lrs;application/x-mobipocket-ebook;application/x-topaz-ebook;application/x-kindle-application;application/x-mobipocket-subscription;application/x-mobipocket-subscription-magazine;application/x-mobi8-ebook diff --git a/srcpkgs/calibre/files/calibre.desktop b/srcpkgs/calibre/files/calibre.desktop deleted file mode 100644 index 7d6d91a2421..00000000000 --- a/srcpkgs/calibre/files/calibre.desktop +++ /dev/null @@ -1,13 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Type=Application -Name=Calibre -Comment=E-book library management -Comment[de]=E-Book Bibliotheksverwaltung -TryExec=calibre -Exec=calibre -Icon=/usr/share/calibre/images/library.png -Terminal=false -StartupNotify=false -Categories=Application;Office;Viewer -MimeType=application/x-sony-bbeb;application/epub+zip;text/lrs;application/x-mobipocket-ebook;application/x-topaz-ebook;application/x-kindle-application;application/x-mobipocket-subscription;application/x-mobipocket-subscription-magazine;application/x-mobi8-ebook diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template index 295e5b01b68..d9adac86c10 100644 --- a/srcpkgs/calibre/template +++ b/srcpkgs/calibre/template @@ -1,14 +1,17 @@ # Template file for 'calibre' pkgname=calibre -version=3.42.0 +version=3.44.0 revision=1 build_style=python2-module pycompile_dirs="/usr/lib/calibre/" make_build_args="gui" -hostmakedepends="pkg-config python-dateutil python-devel python-msgpack qt5-qmake" +hostmakedepends="pkg-config python-BeautifulSoup4 python-Pillow python-PyQt5-svg + python-PyQt5-webkit 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 - python-lxml qt5-devel sqlite-devel tslib-devel" + qt5-devel sqlite-devel tslib-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 @@ -20,7 +23,7 @@ maintainer="bra1nwave " license="GPL-3.0-only" homepage="https://calibre-ebook.com" distfiles="https://download.calibre-ebook.com/${version}/calibre-${version}.tar.xz" -checksum=b51194aecd452e6cea9681889cd1b2f868d379b07413b1dcb8842c363487ad7a +checksum=f15354b013cbf4090e1eeefdc150402dac589f51395f9c82424d2e8cec62a38d nocross=yes do_configure() { @@ -30,17 +33,13 @@ do_configure() { src/chardet # Desktop integration (e.g. enforce arch defaults) - sed -e "/self.create_uninstaller()/,/os.rmdir(config_dir)/d" \ - -e "/cc(\['xdg-desktop-menu', 'forceupdate'\])/d" \ - -e "/cc(\['xdg-mime', 'install', MIME\])/d" \ + sed -e "/import config_dir/,/os.rmdir(config_dir)/d" \ -e "s/'ctc-posml'/'text' not in mt and 'pdf' not in mt and 'xhtml'/" \ -e "s/^Name=calibre/Name=Calibre/g" \ -i src/calibre/linux.py } do_install() { - vinstall ${FILESDIR}/calibre.desktop 644 usr/share/applications - vinstall ${FILESDIR}/calibre-viewer.desktop 644 usr/share/applications python2 setup.py \ install --prefix=/usr --staging-root=${DESTDIR}/usr } From b68db8e7f60a6e5ce57e77d7f6865b9bc7b28f76 Mon Sep 17 00:00:00 2001 From: Johannes Date: Mon, 3 Jun 2019 14:31:46 +0200 Subject: [PATCH 238/400] cargo: fix build build fails on musl with more recent versions of the libc crate --- srcpkgs/cargo/template | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template index 5598a5a693e..dd237fb4c78 100644 --- a/srcpkgs/cargo/template +++ b/srcpkgs/cargo/template @@ -1,7 +1,7 @@ # Template file for 'cargo' pkgname=cargo version=0.36.0 -revision=1 +revision=2 build_helper=rust hostmakedepends="rust python curl cmake pkg-config" makedepends="libcurl-devel libgit2-devel" @@ -100,6 +100,8 @@ do_build() { cargo="./cargo" fi + $cargo update + $cargo update --package libc --precise 0.2.55 $cargo build --release $(vopt_if static --features="all-static") } From 562cf55d401bd5b39862546974619fd6d47233cb Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 3 Jun 2019 15:07:54 +0200 Subject: [PATCH 239/400] terminology: update to 1.4.1. --- srcpkgs/terminology/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/terminology/template b/srcpkgs/terminology/template index f42f36bb720..1ec65c043cc 100644 --- a/srcpkgs/terminology/template +++ b/srcpkgs/terminology/template @@ -1,6 +1,6 @@ # Template file for 'terminology' pkgname=terminology -version=1.4.0 +version=1.4.1 revision=1 build_style=meson hostmakedepends="pkg-config efl" @@ -11,7 +11,7 @@ maintainer="Juan RP " license="BSD-2-Clause" homepage="https://www.enlightenment.org" distfiles="https://download.enlightenment.org/rel/apps/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=ed5904ba5eb11c67790964306ec260b4134e2a443ef5abd5105610d9943b3e60 +checksum=d7b8b35fa38cb6a8746435c44f3517c47324d4c8362b35878ec90c9254d9a956 post_install() { vlicense COPYING From 5bdc4619a45b00a1f65e44bd2c606ac08e41fb6e Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 3 Jun 2019 12:15:47 +0200 Subject: [PATCH 240/400] efl: update to 1.22.2. - Added new build options: elogind, drm, gstreamer and vlc. - The same options that were available before are kept. - Tested on x86_64. --- common/options.description | 2 ++ srcpkgs/efl/template | 71 +++++++++++++++++--------------------- 2 files changed, 33 insertions(+), 40 deletions(-) diff --git a/common/options.description b/common/options.description index f7f206c5bbf..5d34d2f4068 100644 --- a/common/options.description +++ b/common/options.description @@ -94,3 +94,5 @@ desc_option_xml="Enable support for XML" desc_option_xscreensaver="Enable support for libXScrnSaver to determine idle time" desc_option_zeitgeist="Enable support for ZeitGeist" desc_option_zstd="Enable support for ZSTD compression format" +desc_option_elogind="Enable support for elogind" +desc_option_drm="Enable support for DRM" diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template index 761f25320ca..6f0fa1a28f4 100644 --- a/srcpkgs/efl/template +++ b/srcpkgs/efl/template @@ -1,17 +1,34 @@ # Template file for 'efl' pkgname=efl -version=1.22.1 +version=1.22.2 revision=1 build_style=gnu-configure -configure_args="CXX= --enable-multisense --enable-image-loader-webp --enable-liblz4 - --disable-systemd $(vopt_enable framebuffer fb) $(vopt_enable pulseaudio) - $(vopt_enable harfbuzz)" +configure_args="CXX= --disable-systemd --enable-liblz4 + --enable-multisense --enable-image-loader-webp + $(vopt_enable gstreamer gstreamer1) $(vopt_enable vlc libvlc) + $(vopt_enable framebuffer fb) $(vopt_enable pulseaudio) + $(vopt_enable harfbuzz) $(vopt_if opengl '--with-opengl=full') + $(vopt_if gles2 '--enable-egl --with-opengl=es') + $(vopt_if drm '--enable-drm --enable-elput') + $(vopt_if wayland '--enable-wayland --enable-wayland-ivi-shell') + $(vopt_if x11 '--enable-xinput22 --with-x11=xlib --enable-xpresent') + $(vopt_if elogind '--enable-elput --enable-elogind')" hostmakedepends="pkg-config" -makedepends="liblz4-devel libressl-devel glib-devel libjpeg-turbo-devel fontconfig-devel +makedepends=" + liblz4-devel libressl-devel glib-devel libjpeg-turbo-devel fontconfig-devel fribidi-devel giflib-devel libpng-devel tiff-devel libwebp-devel - gst-plugins-base1-devel avahi-libs-devel eudev-libudev-devel bullet-devel + avahi-libs-devel eudev-libudev-devel bullet-devel alsa-lib-devel libsndfile-devel libmount-devel LuaJIT-devel poppler-cpp-devel - librsvg-devel vlc-devel libspectre-devel libraw-devel + librsvg-devel libspectre-devel libraw-devel + $(vopt_if gstreamer gst-plugins-base1-devel) $(vopt_if opengl MesaLib-devel) + $(vopt_if vlc vlc-devel) $(vopt_if elogind 'elogind-devel libinput-devel libxkbcommon-devel') + $(vopt_if gles2 'libinput-devel libxkbcommon-devel MesaLib-devel') + $(vopt_if wayland 'libxkbcommon-devel wayland-protocols wayland-devel libinput-devel') + $(vopt_if x11 'libXcomposite-devel libXcursor-devel libXp-devel + libXrandr-devel libXScrnSaver-devel libXdamage-devel + libXrender-devel libXi-devel libXinerama-devel libXpresent-devel + xcb-util-devel xcb-util-keysyms-devel xcb-util-image-devel + xcb-util-renderutil-devel xcb-util-wm-devel xorgproto') $(vopt_if harfbuzz harfbuzz-devel) $(vopt_if pulseaudio pulseaudio-devel)" short_desc="Enlightenment Foundation Libraries" maintainer="Juan RP " @@ -19,7 +36,7 @@ license="LGPL-2.1-only" homepage="http://enlightenment.org" changelog="https://raw.githubusercontent.com/Enlightenment/efl/master/NEWS" distfiles="http://download.enlightenment.org/rel/libs/efl/efl-${version}.tar.xz" -checksum=20d3e5e945d54ae46ec916c7341b5dec24f904b6c0123b4d3ecb8cd8d596ae12 +checksum=1699891f825911622de0aa77fe1140eff7335aba619d2352485e54dcff6b1cd0 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" automake gettext-devel libtool efl-devel" @@ -37,13 +54,15 @@ if [ "$CROSS_BUILD" ]; then fi # Package build options -build_options="framebuffer gles2 harfbuzz opengl pulseaudio wayland x11" -# Enable harfbuzz, pulseaudio and x11 by default. -build_options_default="harfbuzz pulseaudio x11" +build_options="elogind drm framebuffer gles2 gstreamer harfbuzz opengl pulseaudio vlc wayland x11" +desc_option_gst="Enable support for video previews via gstreamer" +desc_option_vlc="Enable support for video previews via VLC" +# Enable gstreamer, harfbuzz, pulseaudio and x11 by default. +build_options_default="gstreamer harfbuzz pulseaudio x11" case "$XBPS_TARGET_MACHINE" in i686*|x86_64*|ppc64*) - # Enable gles2 by default on x86. + # Enable opengl by default on x86/ppc64. build_options_default+=" opengl" ;; armv6l*) @@ -59,34 +78,6 @@ case "$XBPS_TARGET_MACHINE" in ;; esac -if [ "$build_option_opengl" ]; then - configure_args+=" --with-opengl=full" - makedepends+=" MesaLib-devel" -elif [ "$build_option_gles2" ]; then - configure_args+=" --with-opengl=es" - makedepends+=" MesaLib-devel" -else - configure_args+=" --with-opengl=none" -fi - -if [ "$build_option_wayland" ]; then - configure_args+=" --enable-egl --enable-wayland --enable-wayland-ivi-shell" - makedepends+=" libxkbcommon-devel wayland-devel libinput-devel" -else - configure_args+=" --disable-egl --disable-wayland" -fi - -if [ "$build_option_x11" ]; then - configure_args+=" --with-x --enable-xinput22 --with-x11=xlib" - makedepends+=" libXcomposite-devel libXcursor-devel libXp-devel" - makedepends+=" libXrandr-devel libXScrnSaver-devel" - makedepends+=" libXdamage-devel libXrender-devel libXi-devel libXinerama-devel" - makedepends+=" xcb-util-devel xcb-util-keysyms-devel xcb-util-image-devel" - makedepends+=" xcb-util-renderutil-devel xcb-util-wm-devel xorgproto" -else - configure_args+=" --without-x --with-x11=none" -fi - efl-devel_package() { short_desc+=" - development files" depends="${makedepends} efl>=${version}_${revision}" From 2e2d97c01955ff8828cf3f3edde697656ebda32c Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 2 Jun 2019 16:12:11 +0200 Subject: [PATCH 241/400] tgt: update to 1.0.78. --- srcpkgs/tgt/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/tgt/template b/srcpkgs/tgt/template index b410b0d8591..3b0253b210a 100644 --- a/srcpkgs/tgt/template +++ b/srcpkgs/tgt/template @@ -1,6 +1,6 @@ # Template file for 'tgt' pkgname=tgt -version=1.0.77 +version=1.0.78 revision=1 build_style=gnu-makefile make_install_args="sbindir=/usr/bin" @@ -13,7 +13,7 @@ maintainer="Leah Neukirchen " license="GPL-2.0-only" homepage="http://stgt.sourceforge.net/" distfiles="https://github.com/fujita/tgt/archive/v${version}.tar.gz" -checksum=7eab72f47e69102c709be2b48b11228470d7a84c88e64f5c354b83ed84d2d04e +checksum=3ba44d5195b2007c6d9008f46a10f7754c90b9bcf6117a7f3e136accb209faac post_extract() { sed -i 's/CFLAGS/MYCFLAGS/; s/\$(MYCFLAGS)/& $(CFLAGS) -Wno-error=stringop-truncation/g' usr/Makefile From d0dd9592fe8d12ed4bcbef55902f453ff2c63ce8 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 3 Jun 2019 16:30:18 +0200 Subject: [PATCH 242/400] xsecurelock: update to 1.3.3. --- srcpkgs/xsecurelock/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/xsecurelock/template b/srcpkgs/xsecurelock/template index 1ea3b200df1..2d9c2f5bc95 100644 --- a/srcpkgs/xsecurelock/template +++ b/srcpkgs/xsecurelock/template @@ -1,21 +1,21 @@ # Template file for 'xsecurelock' pkgname=xsecurelock -version=1.3.1 +version=1.3.3 revision=1 build_style=gnu-configure configure_args="--with-pam-service-name=system-local-login" hostmakedepends="pkg-config automake" makedepends="libX11-devel libXcomposite-devel libXext-devel libXfixes-devel - libXft-devel libXmu-devel libXrandr-devel pam-devel" + libXft-devel libXmu-devel libXrandr-devel libXScrnSaver-devel + libXxf86misc-devel pam-devel" short_desc="X11 screen locker designed with the primary goal of security" maintainer="Sean R. Lang " license="Apache-2.0" homepage="https://github.com/google/xsecurelock" distfiles="https://github.com/google/xsecurelock/archive/v${version}.tar.gz" -checksum=a710b2bb43c807b8903b2fb9b524e3741ded1de726057bc78eb8b95d57e0e28a +checksum=92be5688679f5536d649cd16e1d023c24fdfb6aa77c86d189fdf5730310e8187 pre_configure() { sh autogen.sh - echo "const char *const git_version = \"${version}\";" > version.c } From b3981f2d364134200cb301c3bddb5218949a471f Mon Sep 17 00:00:00 2001 From: newbluemoon Date: Mon, 3 Jun 2019 17:26:07 +0200 Subject: [PATCH 243/400] klavaro: update to 3.07 --- srcpkgs/klavaro/patches/linking-order.patch | 16 ---------------- srcpkgs/klavaro/template | 5 ++--- 2 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 srcpkgs/klavaro/patches/linking-order.patch diff --git a/srcpkgs/klavaro/patches/linking-order.patch b/srcpkgs/klavaro/patches/linking-order.patch deleted file mode 100644 index 3fe09b94a10..00000000000 --- a/srcpkgs/klavaro/patches/linking-order.patch +++ /dev/null @@ -1,16 +0,0 @@ -When linking the libraries need to be in the proper order -to prevent an undefined reference error. - ---- src/Makefile.in.orig -+++ src/Makefile.in -@@ -369,8 +369,8 @@ - AM_CFLAGS = -Wextra -I$(top_srcdir)/gtkdatabox $(am__append_1) \ - $(am__append_3) - AM_LDFLAGS = -static --klavaro_LDADD = @GTK_LIBS@ -lgmodule-2.0 \ -- $(top_srcdir)/gtkdatabox/libgtkdataboks.la $(am__append_2) -+klavaro_LDADD = $(top_srcdir)/gtkdatabox/libgtkdataboks.la $(am__append_2) @GTK_LIBS@ -lgmodule-2.0 -+ - all: all-am - - .SUFFIXES: diff --git a/srcpkgs/klavaro/template b/srcpkgs/klavaro/template index 5c068544fe4..c4ecddc568a 100644 --- a/srcpkgs/klavaro/template +++ b/srcpkgs/klavaro/template @@ -1,6 +1,6 @@ # Template file for 'klavaro' pkgname=klavaro -version=3.05 +version=3.07 revision=1 build_style=gnu-configure hostmakedepends="intltool pkg-config" @@ -10,10 +10,9 @@ maintainer="newbluemoon " license="GPL-3.0-or-later" homepage="http://klavaro.sourceforge.net/en/" distfiles="${SOURCEFORGE_SITE}/klavaro/klavaro-${version}.tar.bz2" -checksum=fe82c6c108a3c40ab97902a8874c6d10fd891b4ff1accce757e5cba0e361dd10 +checksum=a0802c32675b0267e09f41ef8635e9581ec86817218bc1d711f6090ec5b92c32 post_install() { rm ${DESTDIR}/usr/lib/*.{a,so} rm -r ${DESTDIR}/usr/include - mv ${DESTDIR}/usr/{appdata,applications} ${DESTDIR}/usr/share } From df864acfe2c8569a79e15a4904dafeebf836cdcf Mon Sep 17 00:00:00 2001 From: Johannes Date: Mon, 3 Jun 2019 20:16:20 +0200 Subject: [PATCH 244/400] klavaro: mark as broken --- srcpkgs/klavaro/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/klavaro/template b/srcpkgs/klavaro/template index c4ecddc568a..87f5cdc8102 100644 --- a/srcpkgs/klavaro/template +++ b/srcpkgs/klavaro/template @@ -11,6 +11,7 @@ license="GPL-3.0-or-later" homepage="http://klavaro.sourceforge.net/en/" distfiles="${SOURCEFORGE_SITE}/klavaro/klavaro-${version}.tar.bz2" checksum=a0802c32675b0267e09f41ef8635e9581ec86817218bc1d711f6090ec5b92c32 +broken="distfiles are gone" post_install() { rm ${DESTDIR}/usr/lib/*.{a,so} From 4095214e35713d6a48132f1894088431f4c3266c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Mon, 3 Jun 2019 20:58:30 +0200 Subject: [PATCH 245/400] LuaJIT: fix build for ppc64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/LuaJIT/patches/fix-vm-jit-ppc64.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 srcpkgs/LuaJIT/patches/fix-vm-jit-ppc64.patch diff --git a/srcpkgs/LuaJIT/patches/fix-vm-jit-ppc64.patch b/srcpkgs/LuaJIT/patches/fix-vm-jit-ppc64.patch new file mode 100644 index 00000000000..ab6771110f9 --- /dev/null +++ b/srcpkgs/LuaJIT/patches/fix-vm-jit-ppc64.patch @@ -0,0 +1,11 @@ +--- src/vm_ppc.dasc 2019-06-03 19:41:50.214671731 +0200 ++++ src/vm_ppc.dasc 2019-06-03 19:44:40.229686143 +0200 +@@ -2774,7 +2774,7 @@ + | + |->vm_exit_handler: + |.if JIT +- | addi sp, TMP0, sp, -(EXIT_OFFSET+32*8+32*PSIZE) ++ | addi sp, sp, -(EXIT_OFFSET+32*8+32*PSIZE) + | saver 3 // CARG1 + | saver 4 // CARG2 + | saver 5 // CARG3 From 6bdb43ab7ec9d399b2b4905c239f41ca6037a028 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 3 Jun 2019 21:36:59 +0200 Subject: [PATCH 246/400] xterm: update to 346. Signed-off-by: Juan RP --- srcpkgs/xterm/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xterm/template b/srcpkgs/xterm/template index 497223dfd17..882b5e159d1 100644 --- a/srcpkgs/xterm/template +++ b/srcpkgs/xterm/template @@ -1,6 +1,6 @@ # Template file for 'xterm' pkgname=xterm -version=345 +version=346 revision=1 build_style=gnu-configure configure_args="--enable-wide-chars --enable-88-color --enable-broken-osc @@ -20,7 +20,7 @@ license="MIT" homepage="http://invisible-island.net/xterm/" changelog="http://invisible-island.net/xterm/xterm.log.html" distfiles="https://invisible-mirror.net/archives/xterm/xterm-${version}.tgz" -checksum=6649a782d179344011199241798133c2db822b158b8a6d7546b1d7fb76f2d535 +checksum=cf327d73c058354d6816250fbd2ce439da0fcfd991ad48adc0e7c0c715ac8a77 post_install() { for f in {u,}xterm.desktop; do From 1b8dc79f40b923faba52ba511e3e5088da307917 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 3 Jun 2019 21:06:13 +0200 Subject: [PATCH 247/400] topgrade: update to 2.0.0. --- srcpkgs/topgrade/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/topgrade/template b/srcpkgs/topgrade/template index ed0473f87ae..094a2d828a4 100644 --- a/srcpkgs/topgrade/template +++ b/srcpkgs/topgrade/template @@ -1,6 +1,6 @@ # Template file for 'topgrade' pkgname=topgrade -version=1.10.2 +version=2.0.0 revision=1 build_style=cargo short_desc="Meta upgrade tool for pip, flatpak, your distro and everything else" @@ -8,4 +8,4 @@ maintainer="jcgruenhage " license="GPL-3.0-only" homepage="https://github.com/r-darwish/topgrade" distfiles="https://github.com/r-darwish/topgrade/archive/v${version}.tar.gz" -checksum=c86a6335e0993c12b5bdf0bf43cfe36b510ebe6e3895cf5343689159b9bdbaa7 +checksum=34f4f5a037b54470da5067bb7be085f042fc1987d196f40faf8707fc2d4f8051 From e78340877cf4e6b8683fa04d5cd88b1399b871f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Mon, 3 Jun 2019 21:51:29 +0200 Subject: [PATCH 248/400] skype: update to 8.46.0.60 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/skype/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template index 972a4513f80..8ba0b8622a6 100644 --- a/srcpkgs/skype/template +++ b/srcpkgs/skype/template @@ -1,7 +1,7 @@ # Template file for 'skype' # This just repackages the debian package. pkgname=skype -version=8.45.0.41 +version=8.46.0.60 revision=1 archs="x86_64" repository="nonfree" @@ -13,7 +13,7 @@ maintainer="Lon Willett " license="skype" homepage="https://www.skype.com" distfiles="https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" -checksum=956d666ed4f0cf493d5c80164554b627b2b5fadaa2728a212e5b4e78d57da4cc +checksum=9ae62d31d2f6052128459ed28b73b42b262db75f4866e71fee35f4573f12ea6c do_extract() { ar p ${XBPS_SRCDISTDIR}/${pkgname}-${version}/skypeforlinux_${version}_amd64.deb data.tar.xz | tar xJpf - ./usr From 1a8d27925e409f45568c31ab0d0ccc89328fb2ee Mon Sep 17 00:00:00 2001 From: Johannes Date: Mon, 3 Jun 2019 15:11:38 +0200 Subject: [PATCH 249/400] gstreamer1: update to 1.14.5. --- srcpkgs/gstreamer1/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gstreamer1/template b/srcpkgs/gstreamer1/template index 8b693b28c3a..4f419e38488 100644 --- a/srcpkgs/gstreamer1/template +++ b/srcpkgs/gstreamer1/template @@ -1,7 +1,7 @@ # Template file for 'gstreamer1' pkgname=gstreamer1 -version=1.14.4 -revision=4 +version=1.14.5 +revision=1 wrksrc="gstreamer-${version}" build_style=gnu-configure build_helper="gir" @@ -15,7 +15,7 @@ maintainer="Juan RP " license="LGPL-2.0-or-later" homepage="https://gstreamer.freedesktop.org" distfiles="${homepage}/src/gstreamer/gstreamer-${version}.tar.xz" -checksum=f94f6696c5f05a3b3a9183e39c5f5c0b779f75a04c0efa497e7920afa985ffc7 +checksum=e40888752883177e97b2d90cd68591f87ccd213dc0178ff721d80a4cdaad34b5 # Package build options build_options="gir" From 16725ec1cde670ef3bbbe0e473ce83f722742de6 Mon Sep 17 00:00:00 2001 From: Johannes Date: Mon, 3 Jun 2019 15:11:49 +0200 Subject: [PATCH 250/400] gstreamer-vaapi: update to 1.14.5. --- srcpkgs/gstreamer-vaapi/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gstreamer-vaapi/template b/srcpkgs/gstreamer-vaapi/template index ef5ff855118..d99bbab91c9 100644 --- a/srcpkgs/gstreamer-vaapi/template +++ b/srcpkgs/gstreamer-vaapi/template @@ -1,7 +1,7 @@ # Template file for 'gstreamer-vaapi' pkgname=gstreamer-vaapi -version=1.14.4 -revision=2 +version=1.14.5 +revision=1 build_style=gnu-configure lib32disabled=yes configure_args="--disable-static" @@ -13,4 +13,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=ce18dbfe961c6a8d31270231686075586bf7a7df62b778c8e7f5ec148251d0a3 +checksum=ea7660efd508fe8986642cfbf58fab8af6601e96a12c2e3a8db989249de1ed27 From e3fb8d6d6dab574a7292bf74acc9682bc948e975 Mon Sep 17 00:00:00 2001 From: Johannes Date: Mon, 3 Jun 2019 15:11:57 +0200 Subject: [PATCH 251/400] gst-plugins-bad1: update to 1.14.5. --- srcpkgs/gst-plugins-bad1/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template index 30a1a066b54..7b361e44836 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.14.4 -revision=8 +version=1.14.5 +revision=1 wrksrc="${pkgname/1/}-${version}" build_style=gnu-configure configure_args="--enable-experimental --disable-static" @@ -21,7 +21,7 @@ maintainer="Juan RP " 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=910b4e0e2e897e8b6d06767af1779d70057c309f67292f485ff988d087aa0de5 +checksum=44da47126349fde90aed6c5ed0915f3b43f1d8802cd827139eb15a1fff1c6ad2 lib32disabled=yes if [ "${CROSS_BUILD}" ]; then From 74fe4aa4bf8fb8ec4df55b4e660a7856c456a997 Mon Sep 17 00:00:00 2001 From: Johannes Date: Mon, 3 Jun 2019 15:12:00 +0200 Subject: [PATCH 252/400] gst-plugins-base1: update to 1.14.5. --- srcpkgs/gst-plugins-base1/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gst-plugins-base1/template b/srcpkgs/gst-plugins-base1/template index b3e41a75792..f28fcc0b1a7 100644 --- a/srcpkgs/gst-plugins-base1/template +++ b/srcpkgs/gst-plugins-base1/template @@ -1,7 +1,7 @@ # Template file for 'gst-plugins-base1' pkgname=gst-plugins-base1 -version=1.14.4 -revision=4 +version=1.14.5 +revision=1 wrksrc="${pkgname/1/}-${version}" build_style=gnu-configure build_helper="gir" @@ -20,7 +20,7 @@ maintainer="Juan RP " 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=ca6139490e48863e7706d870ff4e8ac9f417b56f3b9e4b3ce490c13b09a77461 +checksum=7bfa9b329ea7f3c654fa1b2d43650bf2646598a5e3cb21f42c516b7e975d638e case "$XBPS_TARGET_MACHINE" in i686*) CFLAGS="-O2 -msse2";; From d62d93e67cf0f7d3fab5da2b27e01c18df390ae1 Mon Sep 17 00:00:00 2001 From: Johannes Date: Mon, 3 Jun 2019 15:12:05 +0200 Subject: [PATCH 253/400] gst-plugins-good1: update to 1.14.5. --- .../patches/remove-unused-flags.patch | 28 ------------------- srcpkgs/gst-plugins-good1/template | 6 ++-- 2 files changed, 3 insertions(+), 31 deletions(-) delete mode 100644 srcpkgs/gst-plugins-good1/patches/remove-unused-flags.patch diff --git a/srcpkgs/gst-plugins-good1/patches/remove-unused-flags.patch b/srcpkgs/gst-plugins-good1/patches/remove-unused-flags.patch deleted file mode 100644 index 65383bbaf1d..00000000000 --- a/srcpkgs/gst-plugins-good1/patches/remove-unused-flags.patch +++ /dev/null @@ -1,28 +0,0 @@ -This was unused in libvpx and removed later: - -https://github.com/webmproject/libvpx/commit/763f8318de2cee41d748539cee5810fc0efcad68 - -This reverts https://bugzilla.gnome.org/show_bug.cgi?id=641399 until upstream -reverts it themselves. - ---- ext/vpx/gstvpxdec.c -+++ ext/vpx/gstvpxdec.c -@@ -62,18 +62,6 @@ gst_vpx_dec_post_processing_flags_get_type (void) - {C_FLAGS (VP8_DEBLOCK), "Deblock", "deblock"}, - {C_FLAGS (VP8_DEMACROBLOCK), "Demacroblock", "demacroblock"}, - {C_FLAGS (VP8_ADDNOISE), "Add noise", "addnoise"}, -- {C_FLAGS (VP8_DEBUG_TXT_FRAME_INFO), -- "Print frame information", -- "visualize-frame-info"}, -- {C_FLAGS (VP8_DEBUG_TXT_MBLK_MODES), -- "Show macroblock mode selection overlaid on image", -- "visualize-macroblock-modes"}, -- {C_FLAGS (VP8_DEBUG_TXT_DC_DIFF), -- "Show dc diff for each macro block overlaid on image", -- "visualize-dc-diff"}, -- {C_FLAGS (VP8_DEBUG_TXT_RATE_INFO), -- "Print video rate info", -- "visualize-rate-info"}, - {C_FLAGS (VP8_MFQE), "Multi-frame quality enhancement", "mfqe"}, - {0, NULL, NULL} - }; diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template index 32bccc6cd1d..435febbcbeb 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.14.4 -revision=2 +version=1.14.5 +revision=1 wrksrc="${pkgname/1/}-${version}" lib32disabled=yes build_style=gnu-configure @@ -23,7 +23,7 @@ maintainer="Juan RP " license="LGPL-2.1-or-later" homepage="https://gstreamer.freedesktop.org" distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz" -checksum=5f8b553260cb0aac56890053d8511db1528d53cae10f0287cfce2cb2acc70979 +checksum=678221b3f0208b31b90df3ffa509857cc8bfc337f3f5073d195c5b365d616503 build_options="gtk3" build_options_default="gtk3" From 08b5737ccef8526355344cf20231a6cb5958bf80 Mon Sep 17 00:00:00 2001 From: Johannes Date: Mon, 3 Jun 2019 15:12:08 +0200 Subject: [PATCH 254/400] gst-plugins-ugly1: update to 1.14.5. --- srcpkgs/gst-plugins-ugly1/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gst-plugins-ugly1/template b/srcpkgs/gst-plugins-ugly1/template index e063af3695f..f6c4e316435 100644 --- a/srcpkgs/gst-plugins-ugly1/template +++ b/srcpkgs/gst-plugins-ugly1/template @@ -1,7 +1,7 @@ # Template file for 'gst-plugins-ugly1'. pkgname=gst-plugins-ugly1 -version=1.14.4 -revision=3 +version=1.14.5 +revision=1 lib32disabled=yes wrksrc="${pkgname/1/}-${version}" build_style=gnu-configure @@ -17,4 +17,4 @@ maintainer="Juan RP " license="LGPL-2.1-or-later" homepage="https://gstreamer.freedesktop.org" distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz" -checksum=ac02d837f166c35ff6ce0738e281680d0b90052cfb1f0255dcf6aaca5f0f6d23 +checksum=3ed802727286f18a9331cfed6ee85d07744d87cf868baae976615441f4bee04b From d3f7f4169ff90a12ec4d4e0ed725d54ed52e881e Mon Sep 17 00:00:00 2001 From: Johannes Date: Mon, 3 Jun 2019 15:12:18 +0200 Subject: [PATCH 255/400] gst-libav: update to 1.14.5. --- srcpkgs/gst-libav/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gst-libav/template b/srcpkgs/gst-libav/template index e998e5ee446..2dc78fcf642 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.14.4 +version=1.14.5 revision=1 lib32disabled=yes wrksrc="${pkgname}-${version}" @@ -15,7 +15,7 @@ maintainer="Juan RP " license="LGPL-2.0-or-later" homepage="https://gstreamer.freedesktop.org" distfiles="${homepage}/src/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=dfd78591901df7853eab7e56a86c34a1b03635da0d3d56b89aa577f1897865da +checksum=df10beebe794d316e6bbf019f16a8c6753cc28614f4ae8ce887bfd27761271fc case "$XBPS_TARGET_MACHINE" in *-musl) # Required by musl for M_SQRT1_2 From 28c3d4757278cd3d5eb8bc4847dd62fcacde7432 Mon Sep 17 00:00:00 2001 From: Johannes Date: Mon, 3 Jun 2019 15:12:24 +0200 Subject: [PATCH 256/400] gst-omx: update to 1.14.5. --- srcpkgs/gst-omx/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gst-omx/template b/srcpkgs/gst-omx/template index a2fc793c30e..9c9b2e53dcb 100644 --- a/srcpkgs/gst-omx/template +++ b/srcpkgs/gst-omx/template @@ -1,8 +1,9 @@ # Template file for 'gst-omx' pkgname=gst-omx -version=1.14.4 +version=1.14.5 revision=1 build_style=gnu-configure +configure_args="--disable-examples" hostmakedepends="pkg-config python glib-devel" makedepends="gst-plugins-base1-devel" short_desc="GStreamer OpenMAX IL wrapper plugin (1.x)" @@ -10,15 +11,15 @@ maintainer="Juan RP " license="LGPL-2.1-only" homepage="https://gstreamer.freedesktop.org" distfiles="${homepage}/src/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=969870e75c1f75c96f8783530e2c2932fc3afbfd976eb0c466f51dae268ea3d4 +checksum=7c8788dcc1f8a6c6abb5360f7d77e7b7a64f0e2c1bceded9ad7bb31650322ff4 case "$XBPS_TARGET_MACHINE" in i686*|x86_64*|aarch64*|ppc64*) # XXX bellagio target - configure_args=" --with-omx-target=generic" + configure_args+=" --with-omx-target=generic" ;; armv[67]*) - configure_args=" --with-omx-target=rpi --disable-examples" + configure_args+=" --with-omx-target=rpi" makedepends+=" rpi-firmware rpi-userland-devel" CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include/IL" CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include/interface/vcos/pthreads" From a4d20874f780aec18c68f48f8230c2668935bca7 Mon Sep 17 00:00:00 2001 From: Johannes Date: Mon, 3 Jun 2019 15:12:31 +0200 Subject: [PATCH 257/400] gst1-editing-services: update to 1.14.5. --- srcpkgs/gst1-editing-services/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gst1-editing-services/template b/srcpkgs/gst1-editing-services/template index bad5dffc243..fb2d9bd6ed7 100644 --- a/srcpkgs/gst1-editing-services/template +++ b/srcpkgs/gst1-editing-services/template @@ -1,9 +1,10 @@ # Template file for 'gst1-editing-services' pkgname=gst1-editing-services -version=1.14.4 +version=1.14.5 revision=1 wrksrc="${pkgname/gst1/gstreamer}-${version}" build_style=gnu-configure +build_helper="gir" hostmakedepends="python flex perl pkg-config gobject-introspection" makedepends="glib-devel gst-plugins-base1-devel" short_desc="GStreamer 1.x Editing Services" @@ -11,7 +12,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=53d1d25b356009505ae0d22c218d6c6b1215399d9f6e3fe5d7b88e156531b35f +checksum=eeb7795326281136b995d3edf5128c9aad08895d847e0ea90db9c04c99fc6a73 gst1-editing-services-devel_package() { short_desc+=" - development files" From 9738be7ca3ccae18f9c7a00e4c37d0fc7992d37a Mon Sep 17 00:00:00 2001 From: Johannes Date: Mon, 3 Jun 2019 15:12:37 +0200 Subject: [PATCH 258/400] gst1-python: update to 1.14.5. --- srcpkgs/gst1-python/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gst1-python/template b/srcpkgs/gst1-python/template index ddabf530db3..6710bedd303 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.14.4 +version=1.14.5 revision=1 wrksrc="gst-python-${version}" build_style=gnu-configure @@ -14,7 +14,7 @@ maintainer="Juan RP " license="LGPL-2.1-or-later" homepage="https://gstreamer.freedesktop.org" distfiles="${homepage}/src/gst-python/gst-python-${version}.tar.xz" -checksum=d0fdb24f93b6d889f309d2f526b8ea9577e0084ff0a62b4623ef1aed52e85a1b +checksum=18afc00a2d67e6c1bae172241ac2521b3c2cc74b8b0273433e71edc9572add5a pre_configure() { if [ "$CROSS_BUILD" ]; then From 61b6d74591d9acd2bf9565f9670323e83632d151 Mon Sep 17 00:00:00 2001 From: Johannes Date: Mon, 3 Jun 2019 15:12:39 +0200 Subject: [PATCH 259/400] gst1-python3: update to 1.14.5. --- srcpkgs/gst1-python3/template | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gst1-python3/template b/srcpkgs/gst1-python3/template index bacf830fa48..e9c8847b2a2 100644 --- a/srcpkgs/gst1-python3/template +++ b/srcpkgs/gst1-python3/template @@ -1,21 +1,25 @@ # Template file for 'gst1-python3' pkgname=gst1-python3 -version=1.14.4 -revision=2 +version=1.14.5 +revision=1 wrksrc="gst-python-${version}" build_style=gnu-configure configure_args="--disable-static" pycompile_module="gi/overrides" hostmakedepends="pkg-config python3" -makedepends="libglib-devel python-gobject-devel gst-plugins-base1-devel" +makedepends="libglib-devel python3-devel python-gobject-devel gst-plugins-base1-devel" depends="python3-gobject" short_desc="Python3 bindings for GStreamer 1.x" maintainer="Juan RP " license="LGPL-2.1-or-later" homepage="https://gstreamer.freedesktop.org" distfiles="${homepage}/src/gst-python/gst-python-${version}.tar.xz" -checksum=d0fdb24f93b6d889f309d2f526b8ea9577e0084ff0a62b4623ef1aed52e85a1b +checksum=18afc00a2d67e6c1bae172241ac2521b3c2cc74b8b0273433e71edc9572add5a pre_configure() { export PYTHON=/usr/bin/python3 + if [ "$CROSS_BUILD" ]; then + vsed -i -e "s,PYTHON_INCLUDES=.*,PYTHON_INCLUDES=-I${XBPS_CROSS_BASE}/usr/include/python3.6m,g" configure + vsed -i -e "s,PYTHON_LIBS=.*,PYTHON_LIBS=-lpython3.6m,g" configure + fi } From fa54e07d7b51732e811f1f38bf948a4e32a7eb05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Tue, 4 Jun 2019 02:20:11 +0200 Subject: [PATCH 260/400] stack: fix build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add naive patch to remedy deficienies of stack providing a reproduciable build environment. The patch disambiguates the use of exitError, exitSuccess, and exitWhat. Signed-off-by: Jürgen Buchmüller --- srcpkgs/stack/patches/fix-system-exit.patch | 147 ++++++++++++++++++++ 1 file changed, 147 insertions(+) create mode 100644 srcpkgs/stack/patches/fix-system-exit.patch diff --git a/srcpkgs/stack/patches/fix-system-exit.patch b/srcpkgs/stack/patches/fix-system-exit.patch new file mode 100644 index 00000000000..fb60abcaa70 --- /dev/null +++ b/srcpkgs/stack/patches/fix-system-exit.patch @@ -0,0 +1,147 @@ +--- src/Stack/Clean.hs 2018-11-18 14:02:03.000000000 +0100 ++++ src/Stack/Clean.hs 2019-06-03 19:51:07.175718943 +0200 +@@ -27,7 +27,7 @@ + clean :: HasEnvConfig env => CleanOpts -> RIO env () + clean cleanOpts = do + failures <- mapM cleanDir =<< dirsToDelete cleanOpts +- when (or failures) $ liftIO exitFailure ++ when (or failures) $ liftIO System.Exit.exitFailure + where + cleanDir dir = + liftIO (ignoringAbsence (removeDirRecur dir) >> return False) `catchAny` \ex -> do +--- src/Stack/Setup.hs 2018-11-18 14:02:03.000000000 +0100 ++++ src/Stack/Setup.hs 2019-06-03 23:56:53.426968944 +0200 +@@ -1118,7 +1118,7 @@ + "The following directories may now contain files, but won't be used by stack:" <> line <> + " -" <+> display tempDir <> line <> + " -" <+> display destDir <> line +- liftIO exitFailure ++ liftIO System.Exit.exitFailure + + logSticky $ + "Unpacking GHC into " <> +@@ -1310,7 +1310,7 @@ + buildInGhcjsEnv envConfig $ defaultBuildOptsCLI { boptsCLITargets = bootDepsToInstall } + let failedToFindErr = do + logError "This shouldn't happen, because it gets built to the snapshot bin directory, which should be treated as being on the PATH." +- liftIO exitFailure ++ liftIO System.Exit.exitFailure + when shouldInstallCabal $ do + mcabal' <- withProcessContext menv' getCabalInstallVersion + case mcabal' of +--- src/Stack/Docker.hs 2018-11-18 14:02:03.000000000 +0100 ++++ src/Stack/Docker.hs 2019-06-04 00:10:26.066037829 +0200 +@@ -200,7 +200,7 @@ + throwIO OnlyOnHostException + | inContainer -> + liftIO (do inner +- exitSuccess) ++ System.Exit.exitSuccess) + | not (dockerEnable (configDocker config)) -> + do fromMaybeAction mbefore + liftIO inner +@@ -205,7 +205,7 @@ + do fromMaybeAction mbefore + liftIO inner + fromMaybeAction mafter +- liftIO exitSuccess ++ liftIO System.Exit.exitSuccess + | otherwise -> + do fromMaybeAction mrelease + runContainerAndExit +@@ -376,7 +376,7 @@ + #endif + ) + case e of +- Left (ProcessExitedUnsuccessfully _ ec) -> liftIO (exitWith ec) ++ Left (ProcessExitedUnsuccessfully _ ec) -> liftIO (System.Exit.exitWith ec) + Right () -> do after + liftIO System.Exit.exitSuccess + where +@@ -378,7 +378,7 @@ + case e of + Left (ProcessExitedUnsuccessfully _ ec) -> liftIO (exitWith ec) + Right () -> do after +- liftIO exitSuccess ++ liftIO System.Exit.exitSuccess + where + -- This is using a hash of the Docker repository (without tag or digest) to ensure + -- binaries/libraries aren't shared between Docker and host (or incompatible Docker images) +--- src/Stack/Hoogle.hs 2018-11-18 14:02:03.000000000 +0100 ++++ src/Stack/Hoogle.hs 2019-06-04 01:16:35.000374265 +0200 +@@ -150,7 +150,7 @@ + (hoogleArgs ++ databaseArg) + runProcess_ + bail :: RIO EnvConfig a +- bail = liftIO (exitWith (ExitFailure (-1))) ++ bail = liftIO (System.Exit.exitWith (ExitFailure (-1))) + checkDatabaseExists = do + path <- hoogleDatabasePath + liftIO (doesFileExist path) +--- src/main/Main.hs 2018-11-18 14:02:03.000000000 +0100 ++++ src/main/Main.hs 2019-06-04 01:37:16.148479474 +0200 +@@ -203,10 +203,10 @@ + -- This special handler stops "stack: " from being printed before the + -- exception + case fromException e of +- Just ec -> exitWith ec ++ Just ec -> System.Exit.exitWith ec + Nothing -> do + hPrint stderr e +- exitFailure ++ System.Exit.exitFailure + + -- Vertically combine only the error component of the first argument with the + -- error component of the second. +@@ -638,7 +638,7 @@ + hPutStrLn stderr "Error: When building with stack, you should not use the -prof GHC option" + hPutStrLn stderr "Instead, please use --library-profiling and --executable-profiling" + hPutStrLn stderr "See: https://github.com/commercialhaskell/stack/issues/1015" +- exitFailure ++ System.Exit.exitFailure + case boptsCLIFileWatch opts of + FileWatchPoll -> fileWatchPoll stderr inner + FileWatch -> fileWatch stderr inner +@@ -710,13 +710,13 @@ + , flow "Can't find:" + , line <> invalidList + ] +- liftIO exitFailure ++ liftIO System.Exit.exitFailure + when (null files && null dirs) $ do + prettyErrorL + [ styleShell "stack upload" + , flow "expects a list of sdist tarballs or package directories, but none were specified." + ] +- liftIO exitFailure ++ liftIO System.Exit.exitFailure + config <- view configL + let hackageUrl = T.unpack $ configHackageBaseUrl config + getCreds <- liftIO (runOnce (Upload.loadCreds config)) +@@ -768,7 +768,7 @@ + , display stackYaml + , flow "contains no packages, so no sdist tarballs will be generated." + ] +- liftIO exitFailure ++ liftIO System.Exit.exitFailure + return dirs + else mapM resolveDir' (sdoptsDirsToWorkWith sdistOpts) + forM_ dirs' $ \dir -> do +@@ -848,7 +848,7 @@ + -- should never happen as we have already installed the packages + _ -> liftIO $ do + hPutStrLn stderr ("Could not find package id of package " ++ name) +- exitFailure ++ System.Exit.exitFailure + + getPkgOpts wc pkgs = + map ("-package-id=" ++) <$> mapM (getPkgId wc) pkgs +@@ -869,7 +869,7 @@ + return (T.unpack exe', args') + _ -> do + logError "No executables found." +- liftIO exitFailure ++ liftIO System.Exit.exitFailure + + getGhcCmd prefix pkgs args = do + wc <- view $ actualCompilerVersionL.whichCompilerL From 5163d0e87c846b4c5a1eaf6553b1fe1da1650b07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Tue, 4 Jun 2019 04:07:53 +0200 Subject: [PATCH 261/400] icecat: update to 60.7.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/icecat/files/musl-cmsghdr.patch | 10 -- srcpkgs/icecat/patches/fix-i686-musl.patch | 20 ++++ srcpkgs/icecat/patches/fix-toolkit.patch | 22 ++--- srcpkgs/icecat/patches/fix-tools.patch | 41 +++++--- srcpkgs/icecat/patches/fix-webrtc-arm.patch | 11 +++ .../icecat/patches/ppc-no-static-sizes.patch | 19 ++++ .../icecat/patches/remove-rustc-check.patch | 32 ++++++ .../patches/rust-unitialized-field.patch | 19 ++++ ...nd-restore-non-volatile-x28-on-arm64.patch | 64 ++++++++++++ ...-clobbering-it-in-the-regex-compiler.patch | 97 +++++++++++++++++++ srcpkgs/icecat/patches/sndio.patch | 97 +++++++++++++++++++ srcpkgs/icecat/template | 41 ++++---- 12 files changed, 417 insertions(+), 56 deletions(-) delete mode 100644 srcpkgs/icecat/files/musl-cmsghdr.patch create mode 100644 srcpkgs/icecat/patches/fix-i686-musl.patch create mode 100644 srcpkgs/icecat/patches/fix-webrtc-arm.patch create mode 100644 srcpkgs/icecat/patches/ppc-no-static-sizes.patch create mode 100644 srcpkgs/icecat/patches/remove-rustc-check.patch create mode 100644 srcpkgs/icecat/patches/rust-unitialized-field.patch create mode 100644 srcpkgs/icecat/patches/save-and-restore-non-volatile-x28-on-arm64.patch create mode 100644 srcpkgs/icecat/patches/save-x28-before-clobbering-it-in-the-regex-compiler.patch create mode 100644 srcpkgs/icecat/patches/sndio.patch diff --git a/srcpkgs/icecat/files/musl-cmsghdr.patch b/srcpkgs/icecat/files/musl-cmsghdr.patch deleted file mode 100644 index 0c28f524d9b..00000000000 --- a/srcpkgs/icecat/files/musl-cmsghdr.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- media/audioipc/audioipc/src/cmsg.rs 2018-11-10 19:58:24.408601195 +0100 -+++ media/audioipc/audioipc/src/cmsg.rs 2018-11-10 19:57:56.181599738 +0100 -@@ -108,6 +108,7 @@ - - let cmsghdr = cmsghdr { - cmsg_len: cmsg_len as _, -+ __pad1: 0, - cmsg_level: level, - cmsg_type: kind, - }; diff --git a/srcpkgs/icecat/patches/fix-i686-musl.patch b/srcpkgs/icecat/patches/fix-i686-musl.patch new file mode 100644 index 00000000000..5345a3cd3df --- /dev/null +++ b/srcpkgs/icecat/patches/fix-i686-musl.patch @@ -0,0 +1,20 @@ +--- mozglue/misc/StackWalk.cpp 2017-04-11 04:13:21.000000000 +0200 ++++ mozglue/misc/StackWalk.cpp 2017-11-29 15:23:07.218649970 +0100 +@@ -41,7 +41,7 @@ + #define MOZ_STACKWALK_SUPPORTS_MACOSX 0 + #endif + +-#if (defined(linux) && \ ++#if defined(__GLIBC__) && (defined(linux) && \ + ((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/icecat/patches/fix-toolkit.patch b/srcpkgs/icecat/patches/fix-toolkit.patch index 7d79879862d..ce4d7d01f82 100644 --- a/srcpkgs/icecat/patches/fix-toolkit.patch +++ b/srcpkgs/icecat/patches/fix-toolkit.patch @@ -48,17 +48,6 @@ #endif ---- toolkit.orig/mozapps/update/common/updatedefines.h 2014-03-15 05:19:37.000000000 +0000 -+++ toolkit/mozapps/update/common/updatedefines.h 2014-04-17 10:24:33.793431933 +0000 -@@ -105,7 +105,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 @@ @@ -77,3 +66,14 @@ 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/icecat/patches/fix-tools.patch b/srcpkgs/icecat/patches/fix-tools.patch index d5a94cb5798..1e2fc4f7d39 100644 --- a/srcpkgs/icecat/patches/fix-tools.patch +++ b/srcpkgs/icecat/patches/fix-tools.patch @@ -9,29 +9,39 @@ #include #include #include "MainThreadUtils.h" ---- tools/profiler/lul/LulElf.cpp -+++ tools/profiler/lul/LulElf.cpp -@@ -579,10 +579,10 @@ - // Return the non-directory portion of FILENAME: the portion after the +--- 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 @@ // 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. -- char *c_filename = strdup(filename.c_str()); + string BaseFileName(const string& filename) { + // 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); -+ // basename's behavior is less than ideal so avoid it -+ const char *c_filename = filename.c_str(); ++ 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 +@@ -253,7 +253,11 @@ ---- tools/profiler/core/platform-linux-android.cpp.orig -+++ tools/profiler/core/platform-linux-android.cpp -@@ -534,9 +534,11 @@ - void - Registers::SyncPopulate() - { + // Request profiling signals. + struct sigaction sa; ++#if defined(GP_ARCH_arm) ++ sa.sa_sigaction = SigprofHandler; ++#else + sa.sa_sigaction = MOZ_SIGNAL_TRAMPOLINE(SigprofHandler); ++#endif + sigemptyset(&sa.sa_mask); + sa.sa_flags = SA_RESTART | SA_SIGINFO; + if (sigaction(SIGPROF, &sa, &mOldSigprofHandler) != 0) { +@@ -497,8 +497,10 @@ + ucontext_t sSyncUContext; + + void Registers::SyncPopulate() { +#if defined(__GLIBC__) if (!getcontext(&sSyncUContext)) { PopulateRegsFromContext(*this, &sSyncUContext); @@ -39,4 +49,3 @@ +#endif } #endif - diff --git a/srcpkgs/icecat/patches/fix-webrtc-arm.patch b/srcpkgs/icecat/patches/fix-webrtc-arm.patch new file mode 100644 index 00000000000..222be5f9e21 --- /dev/null +++ b/srcpkgs/icecat/patches/fix-webrtc-arm.patch @@ -0,0 +1,11 @@ +--- 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/icecat/patches/ppc-no-static-sizes.patch b/srcpkgs/icecat/patches/ppc-no-static-sizes.patch new file mode 100644 index 00000000000..3f77023bb5f --- /dev/null +++ b/srcpkgs/icecat/patches/ppc-no-static-sizes.patch @@ -0,0 +1,19 @@ +# 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/icecat/patches/remove-rustc-check.patch b/srcpkgs/icecat/patches/remove-rustc-check.patch new file mode 100644 index 00000000000..f6bebc8aab1 --- /dev/null +++ b/srcpkgs/icecat/patches/remove-rustc-check.patch @@ -0,0 +1,32 @@ +Mozilla rustc check does not support crossbuild: let's remove it + +--- 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 @@ + + os.write(in_fd, source) + os.close(in_fd) +- +- cmd = [ +- rustc, +- '--crate-type', 'staticlib', +- target_arg, +- '-o', out_path, +- in_path, +- ] +- +- def failed(): +- die(dedent('''\ +- Cannot compile for {} with {} +- The target may be unsupported, or you may not have +- a rust std library for that target installed. Try: +- +- rustup target add {} +- '''.format(host_or_target.alias, rustc, rustc_target.alias))) +- check_cmd_output(*cmd, onerror=failed) +- if not os.path.exists(out_path) or os.path.getsize(out_path) == 0: +- failed() + finally: + os.remove(in_path) + os.remove(out_path) + diff --git a/srcpkgs/icecat/patches/rust-unitialized-field.patch b/srcpkgs/icecat/patches/rust-unitialized-field.patch new file mode 100644 index 00000000000..67ef3a02ab8 --- /dev/null +++ b/srcpkgs/icecat/patches/rust-unitialized-field.patch @@ -0,0 +1,19 @@ +--- ./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/icecat/patches/save-and-restore-non-volatile-x28-on-arm64.patch b/srcpkgs/icecat/patches/save-and-restore-non-volatile-x28-on-arm64.patch new file mode 100644 index 00000000000..fa303f6d1e9 --- /dev/null +++ b/srcpkgs/icecat/patches/save-and-restore-non-volatile-x28-on-arm64.patch @@ -0,0 +1,64 @@ +# 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/icecat/patches/save-x28-before-clobbering-it-in-the-regex-compiler.patch b/srcpkgs/icecat/patches/save-x28-before-clobbering-it-in-the-regex-compiler.patch new file mode 100644 index 00000000000..ee66bad408c --- /dev/null +++ b/srcpkgs/icecat/patches/save-x28-before-clobbering-it-in-the-regex-compiler.patch @@ -0,0 +1,97 @@ +# 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 ++++ b/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/icecat/patches/sndio.patch b/srcpkgs/icecat/patches/sndio.patch new file mode 100644 index 00000000000..097b313e90b --- /dev/null +++ b/srcpkgs/icecat/patches/sndio.patch @@ -0,0 +1,97 @@ +--- old-configure.in.orig ++++ old-configure.in +@@ -2839,6 +2839,22 @@ + + AC_SUBST(MOZ_ALSA) + ++dnl ================================== ++dnl = Check sndio availability ++dnl ================================== ++ ++MOZ_ARG_ENABLE_BOOL(sndio, ++[ --enable-sndio Enable sndio support], ++ MOZ_SNDIO=1, ++ MOZ_SNDIO=) ++ ++if test -n "$MOZ_SNDIO"; then ++ MOZ_SNDIO_LIBS="-lsndio" ++ AC_SUBST_LIST(MOZ_SNDIO_LIBS) ++fi ++ ++AC_SUBST(MOZ_SNDIO) ++ + dnl ======================================================== + dnl = Disable PulseAudio + dnl ======================================================== +--- toolkit/library/moz.build.orig ++++ toolkit/library/moz.build +@@ -235,10 +235,8 @@ + if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('cocoa', 'uikit'): + OS_LIBS += CONFIG['TK_LIBS'] + +-if CONFIG['OS_ARCH'] == 'OpenBSD': +- OS_LIBS += [ +- 'sndio', +- ] ++if CONFIG['MOZ_SNDIO']: ++ OS_LIBS += CONFIG['MOZ_SNDIO_LIBS'] + + if CONFIG['MOZ_ENABLE_DBUS']: + OS_LIBS += CONFIG['MOZ_DBUS_GLIB_LIBS'] +--- media/libcubeb/src/moz.build.orig ++++ media/libcubeb/src/moz.build +@@ -43,7 +43,7 @@ + ] + DEFINES['USE_JACK'] = True + +-if CONFIG['OS_ARCH'] == 'OpenBSD': ++if CONFIG['MOZ_SNDIO']: + SOURCES += [ + 'cubeb_sndio.c', + ] +--- build/moz.configure/old.configure.orig ++++ build/moz.configure/old.configure +@@ -159,6 +159,7 @@ + '--enable-accessibility', + '--enable-address-sanitizer', + '--enable-alsa', ++ '--enable-sndio', + '--enable-bundled-fonts', + '--enable-clang-plugin', + '--enable-content-sandbox', +--- security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp.orig ++++ security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp +@@ -349,6 +349,21 @@ + } + } + } ++ ++#ifdef MOZ_SNDIO ++ // ~/.aucat_cookie (sndio) ++ rv = homeDir->Clone(getter_AddRefs(confDir)); ++ if (NS_SUCCEEDED(rv)) { ++ rv = confDir->AppendNative(NS_LITERAL_CSTRING(".aucat_cookie")); ++ if (NS_SUCCEEDED(rv)) { ++ nsAutoCString tmpPath; ++ rv = confDir->GetNativePath(tmpPath); ++ if (NS_SUCCEEDED(rv)) { ++ policy->AddPath(rdwrcr, tmpPath.get()); ++ } ++ } ++ } ++#endif + } + + // Firefox binary dir. +--- security/sandbox/linux/moz.build.orig ++++ security/sandbox/linux/moz.build +@@ -81,6 +81,9 @@ + if CONFIG['MOZ_ALSA']: + DEFINES['MOZ_ALSA'] = True + ++if CONFIG['MOZ_SNDIO']: ++ DEFINES['MOZ_SNDIO'] = True ++ + # This copy of SafeSPrintf doesn't need to avoid the Chromium logging + # dependency like the one in libxul does, but this way the behavior is + # consistent. See also the comment in SandboxLogging.h. diff --git a/srcpkgs/icecat/template b/srcpkgs/icecat/template index 3c8224044bc..f0ee0f54dff 100644 --- a/srcpkgs/icecat/template +++ b/srcpkgs/icecat/template @@ -1,29 +1,26 @@ # Template file for 'icecat' pkgname=icecat -version=60.3.0 -revision=4 -short_desc="GNU version of the Firefox browser" -maintainer="Jürgen Buchmüller " -homepage="https://www.gnu.org/software/${pkgname}/" -license="MPL-1.1, GPL-2, LGPL-2.1" -distfiles="${GNU_SITE}/${pkgname}/${version}/${pkgname}-${version}-gnu1.tar.bz2" -checksum=6145327092b4b195a4f63d0e86f4857eeba5607ffeb69b6f3bceb36e89a19645 - -lib32disabled=yes -nocross="rustc error[E0463]: can't find crate for 'std'" - -hostmakedepends="autoconf213 cargo cbindgen clang llvm nodejs perl pkg-config - python unzip yasm zip" +version=60.7.0 +revision=1 +hostmakedepends="autoconf213 unzip zip pkg-config perl python yasm + cargo llvm clang rust cbindgen" makedepends="gtk+-devel hunspell-devel libXt-devel libatomic-devel libevent-devel libnotify-devel libvpx5-devel nss-devel rust-std sqlite-devel $(vopt_if alsa 'alsa-lib-devel') $(vopt_if dbus 'dbus-glib-devel') $(vopt_if gtk3 'gtk+3-devel') $(vopt_if pulseaudio 'pulseaudio-devel') $(vopt_if startup_notification 'startup-notification-devel') - $(vopt_if xscreensaver 'libXScrnSaver-devel')" + $(vopt_if xscreensaver 'libXScrnSaver-devel') $(vopt_if sndio 'sndio-devel')" depends="desktop-file-utils hicolor-icon-theme nss>=3.19" +short_desc="GNU version of the Firefox browser" +maintainer="Jürgen Buchmüller " +license="MPL-1.1, GPL-2.0-or-later, LGPL-2.1-or-later" +homepage="https://www.gnu.org/software/${pkgname}/" +distfiles="${GNU_SITE}/${pkgname}/${version}/${pkgname}-${version}-gnu1.tar.bz2" +checksum=6873d55b13e2d95ede3bf5bb59769179e91b1c4e05d8538d1576f18c9a6bb827 +lib32disabled=yes -build_options="alsa dbus gtk3 pulseaudio startup_notification xscreensaver" -build_options_default="alsa dbus gtk3 pulseaudio startup_notification xscreensaver" +build_options="alsa dbus gtk3 pulseaudio startup_notification sndio xscreensaver" +build_options_default="alsa dbus gtk3 pulseaudio startup_notification sndio xscreensaver" CXXFLAGS="-Wno-class-memaccess -Wno-unused-function" @@ -31,12 +28,15 @@ post_extract() { case "$XBPS_TARGET_MACHINE" in *-musl) cp "${FILESDIR}/stab.h" toolkit/crashreporter/google-breakpad/src/ - patch -Np0 -i ${FILESDIR}/musl-cmsghdr.patch ;; esac # Google API key (see http://www.chromium.org/developers/how-tos/api-keys) # Note: This is for Void Linux use ONLY. echo -n "AIzaSyCIFdBA7eQP43R6kXRwTq7j6Mvj1ITze90" > google-api-key + + # Mozilla API keys (see https://location.services.mozilla.com/api) + # Note: This is for Void Linux use ONLY. + echo -n "cd894504-7a2a-4263-abff-ff73ee89ffca" > mozilla-api-key } do_build() { local triplet @@ -89,8 +89,11 @@ do_build() { export MOZ_MAKE_FLAGS="${makejobs}" cat >>.mozconfig < Date: Tue, 4 Jun 2019 10:12:50 +0200 Subject: [PATCH 262/400] icecat: cross fails; investigating MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/icecat/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/icecat/template b/srcpkgs/icecat/template index f0ee0f54dff..672ddfff712 100644 --- a/srcpkgs/icecat/template +++ b/srcpkgs/icecat/template @@ -18,6 +18,7 @@ homepage="https://www.gnu.org/software/${pkgname}/" distfiles="${GNU_SITE}/${pkgname}/${version}/${pkgname}-${version}-gnu1.tar.bz2" checksum=6873d55b13e2d95ede3bf5bb59769179e91b1c4e05d8538d1576f18c9a6bb827 lib32disabled=yes +nocross=https://build.voidlinux.org/builders/aarch64-musl_builder/builds/20366/steps/shell_3/logs/stdio build_options="alsa dbus gtk3 pulseaudio startup_notification sndio xscreensaver" build_options_default="alsa dbus gtk3 pulseaudio startup_notification sndio xscreensaver" From 9d0b4a8ad3f2f101ca4edd105ddb0723c14ffafa Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Tue, 4 Jun 2019 08:54:32 +0200 Subject: [PATCH 263/400] kore: update to 3.3.1. --- srcpkgs/kore/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kore/template b/srcpkgs/kore/template index b2c2061f8cf..b6486f152be 100644 --- a/srcpkgs/kore/template +++ b/srcpkgs/kore/template @@ -1,6 +1,6 @@ # Template file for 'kore' pkgname=kore -version=3.3.0 +version=3.3.1 revision=1 build_style=gnu-makefile make_use_env=yes @@ -11,7 +11,7 @@ maintainer="Helmut Pozimski " license="ISC" homepage="https://kore.io" distfiles="https://kore.io/releases/kore-${version}.tar.gz" -checksum=d6424d07441c534aee76fbd687c4974985ae7a3f887c4fb89c1bf62d53d73763 +checksum=c80d7a817883e631adf9eb5271b4ffa6ebb06c2e2fca40ce6c3c75638c08b67a post_install() { vlicense LICENSE From 0e9abf0bf85e5bc83d22ab183d4c256f3ce74520 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Tue, 4 Jun 2019 04:54:06 +0000 Subject: [PATCH 264/400] Minder: update to 1.3.1. --- srcpkgs/Minder/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/Minder/template b/srcpkgs/Minder/template index 4cbfd3575c2..7d4be7d6c27 100644 --- a/srcpkgs/Minder/template +++ b/srcpkgs/Minder/template @@ -1,6 +1,6 @@ # Template file for 'Minder' pkgname=Minder -version=1.3.0 +version=1.3.1 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=bb4f73855948d06b7fe79146d28f5ae260877cf495ddec917e163bd6b2179ace +checksum=16d5fba1b2108f0cd4e67502555ac06dfed367344d17a365ce4f91d6f55e44a5 From 7b9eea4f76263f9feadb3b4aee0dbc324c838b50 Mon Sep 17 00:00:00 2001 From: Renato Aguiar Date: Mon, 3 Jun 2019 18:34:21 -0700 Subject: [PATCH 265/400] zoom: update to 2.8.222599.0519 --- srcpkgs/zoom/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template index 7ac816025fa..0893e70c62b 100644 --- a/srcpkgs/zoom/template +++ b/srcpkgs/zoom/template @@ -1,6 +1,6 @@ # Template file for 'zoom' pkgname=zoom -version=2.7.162522.0121 +version=2.8.222599.0519 revision=1 archs="x86_64" wrksrc=zoom @@ -10,7 +10,7 @@ maintainer="Daniel Santana " license="Proprietary" homepage="https://zoom.us/" distfiles="https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz" -checksum=ed6600ece6d02f9f873dee5602ff74a4bb5382afc68794684de1a3647ff03e4d +checksum=6353d5e66fbec2891c352a118bcdd6d5f595b9e4844495f1e30d99afe77a7f12 repository=nonfree restricted=yes nopie=yes From 99b3ca7cff6efb4abfe1e3295307639a2eafeb88 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Mon, 3 Jun 2019 20:17:13 -0500 Subject: [PATCH 266/400] rednotebook: update to 2.11.1 --- srcpkgs/rednotebook/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/rednotebook/template b/srcpkgs/rednotebook/template index 513cf39d74c..ac870a7a992 100644 --- a/srcpkgs/rednotebook/template +++ b/srcpkgs/rednotebook/template @@ -1,6 +1,6 @@ # Template file for 'rednotebook' pkgname=rednotebook -version=2.8 +version=2.11.1 revision=1 archs=noarch build_style=python3-module @@ -14,4 +14,4 @@ license="GPL-2.0-or-later" homepage="https://rednotebook.sourceforge.io" changelog="https://raw.githubusercontent.com/jendrikseipp/rednotebook/master/CHANGELOG" distfiles="https://github.com/jendrikseipp/rednotebook/archive/v${version}.tar.gz" -checksum=3c4a0bc60ecf513b524d0bbcb6f6f16da8cc189ec03d5dfa0206fceb8342cd7d +checksum=43efa862b3b53c96589c5bb3ec134d45acfccf30f92808f7fd7448777dfcc196 From 85953b716d18cfef39b0b6975627ab5a9e983053 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Mon, 3 Jun 2019 19:43:21 -0500 Subject: [PATCH 267/400] klavaro: distfile are no longer missing --- srcpkgs/klavaro/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/klavaro/template b/srcpkgs/klavaro/template index 87f5cdc8102..eb42b31474e 100644 --- a/srcpkgs/klavaro/template +++ b/srcpkgs/klavaro/template @@ -10,8 +10,7 @@ maintainer="newbluemoon " license="GPL-3.0-or-later" homepage="http://klavaro.sourceforge.net/en/" distfiles="${SOURCEFORGE_SITE}/klavaro/klavaro-${version}.tar.bz2" -checksum=a0802c32675b0267e09f41ef8635e9581ec86817218bc1d711f6090ec5b92c32 -broken="distfiles are gone" +checksum=45c51f46afca3e3d948debed13271584ba569b461d15587b0c365f98479ee7ff post_install() { rm ${DESTDIR}/usr/lib/*.{a,so} From d30523c1b370425db5289f1afcbcc79db9466c67 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Mon, 3 Jun 2019 19:22:02 -0500 Subject: [PATCH 268/400] libqb: update to 1.0.5 --- srcpkgs/libqb/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/libqb/template b/srcpkgs/libqb/template index f4fe5247a24..a5c2ed5f735 100644 --- a/srcpkgs/libqb/template +++ b/srcpkgs/libqb/template @@ -1,14 +1,14 @@ # Template file for 'libqb' pkgname=libqb -version=1.0.4 +version=1.0.5 revision=1 build_style=gnu-configure -short_desc="Libqb providing high performance logging, tracing, ipc, poll" +short_desc="High performance logging, tracing, ipc, poll" maintainer="Kevin Klopfenstein " license="LGPL-2.1-or-later" homepage="https://clusterlabs.github.io/libqb/" distfiles="https://github.com/ClusterLabs/libqb/releases/download/v${version}/${pkgname}-${version}.tar.gz" -checksum=988faf64628d0c011c025d845756e4ad5fe66ae7f6e53ccdd1ae33ccc8995702 +checksum=89fe0c743e5be15f2fa25849f107df41cb144928259752d5c797c13644eba6b1 libqb-devel_package() { depends="libqb-${version}_${revision}" From 89b3e5daa1e402ab3e9ef17cf11edc89fcc5123f Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Mon, 3 Jun 2019 18:22:17 -0500 Subject: [PATCH 269/400] rtv: update to 1.27.0 --- srcpkgs/rtv/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/rtv/template b/srcpkgs/rtv/template index aa2a847d9ae..1a089e3e88d 100644 --- a/srcpkgs/rtv/template +++ b/srcpkgs/rtv/template @@ -1,6 +1,6 @@ # Template file for 'rtv' pkgname=rtv -version=1.26.0 +version=1.27.0 revision=1 archs=noarch build_style=python3-module @@ -13,7 +13,7 @@ maintainer="dleeram " license="MIT" homepage="https://github.com/michael-lazar/${pkgname}" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=1e3c20fdbda2a1f1b584194a36895d8e42aba527b2e9fa7be8ff7fd79c8bee85 +checksum=c57a6cbb2525160b6aaa9180aec0293962b6969675f8ac0f2cfacff3cbd00d7c post_install() { vlicense LICENSE From d5cb4870e7c936769e7b61bb740702db1b009c12 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Mon, 3 Jun 2019 18:11:05 -0500 Subject: [PATCH 270/400] freetds: update to 1.1.6 --- srcpkgs/freetds/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/freetds/template b/srcpkgs/freetds/template index 0c0731eda8a..d8a68b55f5f 100644 --- a/srcpkgs/freetds/template +++ b/srcpkgs/freetds/template @@ -1,6 +1,6 @@ # Template file for 'freetds' pkgname=freetds -version=1.1.5 +version=1.1.6 revision=1 build_style=gnu-configure configure_args="--sysconfdir=/etc/freetds" @@ -11,7 +11,7 @@ maintainer="Diogo Leal " license="LGPL-2.0-or-later" homepage="http://www.freetds.org/" distfiles="http://www.freetds.org/files/stable/freetds-${version}.tar.gz" -checksum=f0c1cb91358ada9e50fbfb452e6726ac74e4644b48d73949ab4b7f3950aaed13 +checksum=f3ce8e48bc8fd08777a35c7fc0a26b6c8e7e53748c8c0afec49231df93afcdee conf_files="/etc/freetds/freetds.conf /etc/freetds/locales.conf From 29fde5ab4b971d31f53cac63ea229b24422440dd Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Mon, 3 Jun 2019 18:07:41 -0500 Subject: [PATCH 271/400] yabasic: update to 2.83.0 --- srcpkgs/yabasic/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/yabasic/template b/srcpkgs/yabasic/template index 4b86f95382a..9cf6f30e933 100644 --- a/srcpkgs/yabasic/template +++ b/srcpkgs/yabasic/template @@ -1,7 +1,7 @@ # Template file for 'yabasic' pkgname=yabasic reverts="2.769_1" -version=2.82.1 +version=2.83.0 revision=1 build_style=gnu-configure makedepends="libXt-devel ncurses-devel" @@ -10,7 +10,7 @@ maintainer="Diogo Leal " license="GPL-3.0-or-later" homepage="http://2484.de/yabasic/" distfiles="http://2484.de/yabasic/download/yabasic-${version}.tar.gz" -checksum=d2f76d1db381b13a01e0ed49eb9498ac002dded1803d3f2d2f9a6f45b9a50426 +checksum=24eaca1a520817ec266d132d89b4a657d5adf3e6bad54f13b103991afdca6d40 do_install() { vbin yabasic From cc4cebe7bb8830af9a020fa4d835c749f0dbf2cf Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Sat, 1 Jun 2019 14:23:24 -0500 Subject: [PATCH 272/400] endless-sky: update to 0.9.9 --- srcpkgs/endless-sky/patches/cxx-cross.patch | 11 +++++++++++ srcpkgs/endless-sky/template | 8 ++++---- 2 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/endless-sky/patches/cxx-cross.patch diff --git a/srcpkgs/endless-sky/patches/cxx-cross.patch b/srcpkgs/endless-sky/patches/cxx-cross.patch new file mode 100644 index 00000000000..b8ee12c6b98 --- /dev/null +++ b/srcpkgs/endless-sky/patches/cxx-cross.patch @@ -0,0 +1,11 @@ +--- SConstruct.orig ++++ SConstruct +@@ -2,6 +2,8 @@ + + # Load environment variables, including some that should be renamed. + env = Environment(ENV = os.environ) ++if 'CXX' in os.environ: ++ env.Replace(CXX = os.environ['CXX']) + if 'CXXFLAGS' in os.environ: + env.Append(CCFLAGS = os.environ['CXXFLAGS']) + if 'LDFLAGS' in os.environ: diff --git a/srcpkgs/endless-sky/template b/srcpkgs/endless-sky/template index 4eb72b03315..f3e4da66ece 100644 --- a/srcpkgs/endless-sky/template +++ b/srcpkgs/endless-sky/template @@ -1,17 +1,17 @@ # Template file for 'endless-sky' pkgname=endless-sky -version=0.9.8 -revision=2 +version=0.9.9 +revision=1 build_style=scons makedepends="SDL2-devel glew-devel libjpeg-turbo-devel libmad-devel libopenal-devel libpng-devel" depends="${pkgname}-data" short_desc="Space exploring, trading, and combat game" maintainer="CoolOhm " -homepage="http://endless-sky.github.io/" 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=69078c67656709646deb0c46fd960aa905601c23bb47c1696b0962ae8dff6d1e +checksum=8bb9a17fd28177b2c17cadb282edcf4ef9a8b3de146f177cc4ca37c6f0aed8a5 endless-sky-data_package() { short_desc+=" - data files" From 1e49987684c3deb71ea69dff15b123bfbe2c500a Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Tue, 4 Jun 2019 10:56:09 +0200 Subject: [PATCH 273/400] libapparmor-devel: fix vmove path for include --- srcpkgs/apparmor/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/apparmor/template b/srcpkgs/apparmor/template index d565a425065..a51f79c409d 100644 --- a/srcpkgs/apparmor/template +++ b/srcpkgs/apparmor/template @@ -1,7 +1,7 @@ # Template file for 'apparmor' pkgname=apparmor version=2.13.2 -revision=6 +revision=7 wrksrc="${pkgname}-v${version}" build_wrksrc=libraries/libapparmor build_style=gnu-configure @@ -89,7 +89,7 @@ libapparmor-devel_package() { short_desc+=" - Library development files" depends="lib${sourcepkg}-${version}_${revision}" pkg_install() { - vmove usr/include/ + vmove usr/include vmove "usr/lib/*.a" vmove "usr/lib/*.so" vmove usr/lib/pkgconfig From 470f407384e55b76a609163ee007bf757939c067 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Tue, 4 Jun 2019 11:02:37 +0200 Subject: [PATCH 274/400] libvirt: update to 5.4.0. --- srcpkgs/libvirt/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template index ba5aa25b15c..9b876c9351a 100644 --- a/srcpkgs/libvirt/template +++ b/srcpkgs/libvirt/template @@ -1,6 +1,6 @@ # Template file for 'libvirt' pkgname=libvirt -version=5.3.0 +version=5.4.0 revision=1 build_style=gnu-configure configure_args="--without-hal --with-storage-lvm --with-qemu @@ -13,7 +13,7 @@ license="LGPL-2.1-or-later" homepage="https://libvirt.org" changelog="https://libvirt.org/news.html" distfiles="https://libvirt.org/sources/${pkgname}-${version}.tar.xz" -checksum=8564bdd506817b3957fa67e4f06b217922d30f19e416c4dc620995fd155dc101 +checksum=1cfa802081bee09fd0ddfa97bd491e6554e25fa59f7a7758b41d8aef53458e7b # FIX https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701649 system_accounts="libvirt" From a52e568588c347c69cfc53db1b098e68eb2cb140 Mon Sep 17 00:00:00 2001 From: bra1nwave Date: Tue, 4 Jun 2019 10:54:06 +0200 Subject: [PATCH 275/400] pmbootstrap: update to 1.6.1. --- srcpkgs/pmbootstrap/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/pmbootstrap/template b/srcpkgs/pmbootstrap/template index 23ae9c95bb8..876d04718f8 100644 --- a/srcpkgs/pmbootstrap/template +++ b/srcpkgs/pmbootstrap/template @@ -1,6 +1,6 @@ # Template file for 'pmbootstrap' pkgname=pmbootstrap -version=1.6.0 +version=1.6.1 revision=1 archs=noarch build_style=python3-module @@ -12,8 +12,8 @@ short_desc="PostmarketOS's chroot, build and flash tool" maintainer="maxice8 " license="GPL-3.0-or-later" homepage="https://postmarketos.org" -distfiles="${PYPI_SITE}/p/pmbootstrap/pmbootstrap-${version}.tar.gz" -checksum=772d376dd5160716db1fee2928121c9668657612f9988859a0eaf27ca99ebd8b +distfiles="https://gitlab.com/postmarketOS/pmbootstrap/-/archive/${version}/pmbootstrap-${version}.tar.gz" +checksum=03c77ea8442c11cf09feeb435fb861079961d4658062f94b78a1c65ed8bf21ea do_check() { python3 -m pytest From 1c9aa6911e4c92705cd9a2be26094a8385159c85 Mon Sep 17 00:00:00 2001 From: human Date: Sun, 26 May 2019 19:33:34 +0300 Subject: [PATCH 276/400] xbps-src: fix typo in help text --- xbps-src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xbps-src b/xbps-src index 37c0506fc6f..8e0a5a15575 100755 --- a/xbps-src +++ b/xbps-src @@ -122,7 +122,7 @@ show-repo-updates Prints the list of outdated packages in XBPS repositories. show-sys-updates - Prints the list of oudated packages in your system. + Prints the list of outdated packages in your system. sort-dependencies ... Given a list of packages specified as additional arguments, a sorted dependency From 2a854ad697ecd802163efcc5524be634b54647ff Mon Sep 17 00:00:00 2001 From: human Date: Sun, 26 May 2019 19:36:00 +0300 Subject: [PATCH 277/400] xbps-src: enter chroot before bootstrap-update fixes https://github.com/void-linux/void-packages/issues/11848 --- xbps-src | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xbps-src b/xbps-src index 8e0a5a15575..65269079586 100755 --- a/xbps-src +++ b/xbps-src @@ -696,7 +696,11 @@ case "$XBPS_TARGET" in install_bbootstrap bootstrap ;; bootstrap-update) - bootstrap_update + if [ -n "$CHROOT_READY" -a -z "$IN_CHROOT" ]; then + chroot_handler bootstrap-update + else + bootstrap_update + fi ;; chroot) chroot_handler chroot dummy From 0fd8371a4eda5cb49ba10bd430c183c07dc12bce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Tue, 4 Jun 2019 11:59:40 +0200 Subject: [PATCH 278/400] icecat: import fixes from firefox-esr MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/icecat/template | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/srcpkgs/icecat/template b/srcpkgs/icecat/template index 672ddfff712..a17d674bcec 100644 --- a/srcpkgs/icecat/template +++ b/srcpkgs/icecat/template @@ -18,7 +18,6 @@ homepage="https://www.gnu.org/software/${pkgname}/" distfiles="${GNU_SITE}/${pkgname}/${version}/${pkgname}-${version}-gnu1.tar.bz2" checksum=6873d55b13e2d95ede3bf5bb59769179e91b1c4e05d8538d1576f18c9a6bb827 lib32disabled=yes -nocross=https://build.voidlinux.org/builders/aarch64-musl_builder/builds/20366/steps/shell_3/logs/stdio build_options="alsa dbus gtk3 pulseaudio startup_notification sndio xscreensaver" build_options_default="alsa dbus gtk3 pulseaudio startup_notification sndio xscreensaver" @@ -66,6 +65,14 @@ do_build() { esac if [ "$CROSS_BUILD" ]; then + BINDGEN_INCLUDE_FLAGS=$( $CPP -x c++ -v /dev/null -o /dev/null 2>&1 | \ + sed -n '/#include <...> search starts here:/,/End of search list./p' | \ + sed '1,1d;$d' | sed 's/^ /-I/' | paste -s ) + + export BINDGEN_CFLAGS="--target=$XBPS_CROSS_TRIPLET \ + --sysroot=${XBPS_CROSS_BASE} ${BINDGEN_INCLUDE_FLAGS}" + export HOST_CC="${CC_host}" + export TARGET_CC="${CC}" export HOST_CFLAGS="${XBPS_CFLAGS}" export HOST_CXXFLAGS="${XBPS_CXXFLAGS}" echo "ac_cv_sqlite_secure_delete=yes" >> .mozconfig @@ -75,19 +82,34 @@ do_build() { echo "ac_cv_sqlite_enable_unlock_notify=yes" >> .mozconfig echo "ac_cv_prog_hostcxx_works=1" >> .mozconfig echo "ac_add_options --target=$XBPS_CROSS_TRIPLET" >>.mozconfig + echo "ac_add_options --host=$XBPS_TRIPLET" >>.mozconfig + else + echo "ac_add_options --target=$XBPS_TRIPLET" >>.mozconfig + echo "ac_add_options --host=$XBPS_TRIPLET" >>.mozconfig fi case "$XBPS_TARGET_MACHINE" in i686*) + echo "ac_add_options --disable-debug-symbols" >>.mozconfig 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 export LDFLAGS+=" -Wl,-rpath=/usr/lib/icecat" - export MOZ_BUILD_DATE=$(date --date "@$SOURCE_DATE_EPOCH" "+%Y%m%d%H%M%S") + if [ "$SOURCE_DATE_EPOCH" ]; then + export MOZ_BUILD_DATE=$(date --date "@$SOURCE_DATE_EPOCH" "+%Y%m%d%H%M%S") + fi + export MOZ_MAKE_FLAGS="${makejobs}" + export MOZ_NOSPAM=1 + export MOZ_MAKE_FLAGS="${makejobs}" + export MOZBUILD_STATE_PATH="${wrksrc}/mozbuild" cat >>.mozconfig < Date: Tue, 4 Jun 2019 12:19:41 +0200 Subject: [PATCH 279/400] icecat: cross broken MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Don't block the builders. Cross needs a fix I missed and I find no time now. Signed-off-by: Jürgen Buchmüller --- srcpkgs/icecat/template | 2 ++ 1 file changed, 2 insertions(+) diff --git a/srcpkgs/icecat/template b/srcpkgs/icecat/template index a17d674bcec..b1100f2e258 100644 --- a/srcpkgs/icecat/template +++ b/srcpkgs/icecat/template @@ -18,6 +18,8 @@ homepage="https://www.gnu.org/software/${pkgname}/" distfiles="${GNU_SITE}/${pkgname}/${version}/${pkgname}-${version}-gnu1.tar.bz2" checksum=6873d55b13e2d95ede3bf5bb59769179e91b1c4e05d8538d1576f18c9a6bb827 lib32disabled=yes +# I missed something when peeking at firefox-esr template, sorry. +nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/18002/steps/shell_3/logs/stdio build_options="alsa dbus gtk3 pulseaudio startup_notification sndio xscreensaver" build_options_default="alsa dbus gtk3 pulseaudio startup_notification sndio xscreensaver" From 1ed98ee33c021ba73b1a6abd2a9187f49b0b51e1 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Tue, 4 Jun 2019 12:48:57 +0200 Subject: [PATCH 280/400] syncthing: update to 1.1.4. --- srcpkgs/syncthing/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template index ba24b976cb4..0b9994ee0d8 100644 --- a/srcpkgs/syncthing/template +++ b/srcpkgs/syncthing/template @@ -1,6 +1,6 @@ # Template file for 'syncthing' pkgname=syncthing -version=1.1.3 +version=1.1.4 revision=1 build_style=go go_import_path="github.com/syncthing/syncthing" @@ -14,7 +14,7 @@ license="MPL-2.0" #changelog="https://github.com/syncthing/syncthing/releases" homepage="http://syncthing.net/" distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz" -checksum=8d0817a6ec365da48b4914c89dd31a9304355bf250ce6aef260f587eac38a3f7 +checksum=99f34f6b3f3289ca8526eb18cbe453efdd81f3e48838d85527acb0177a13f48c pre_build() { GOARCH= go run script/genassets.go gui > ./lib/auto/gui.files.go From baa928b247bff1b8ef4e3b32781500b7b8e76489 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 4 Jun 2019 12:09:53 +0200 Subject: [PATCH 281/400] travis/build.sh: use -jX in xbps-src. Do not rely on nproc(1) being available. Signed-off-by: Juan RP --- common/travis/build.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/common/travis/build.sh b/common/travis/build.sh index 32cefdbc739..bd65283d10a 100755 --- a/common/travis/build.sh +++ b/common/travis/build.sh @@ -25,8 +25,13 @@ XBPS_SRCPKGDIR=/hostrepo/srcpkgs XBPS_MASTERDIR=/ chroot_prepare $1 || { PKGS=$(/hostrepo/xbps-src sort-dependencies $(cat /tmp/templates)) +NPROCS=1 +if [ -r /proc/cpuinfo ]; then + NPROCS=$(grep ^proc /proc/cpuinfo|wc -l) +fi + for pkg in ${PKGS}; do - /hostrepo/xbps-src -H "$HOME"/hostdir $arch pkg "$pkg" + /hostrepo/xbps-src -j$NPROCS -H "$HOME"/hostdir $arch pkg "$pkg" [ $? -eq 1 ] && exit 1 done From e52f36732b419abc84b0f373176569c41c5eb35e Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Tue, 4 Jun 2019 15:32:02 +0200 Subject: [PATCH 282/400] icecat: broken on i686* for now --- srcpkgs/icecat/template | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/srcpkgs/icecat/template b/srcpkgs/icecat/template index b1100f2e258..f319d1e7435 100644 --- a/srcpkgs/icecat/template +++ b/srcpkgs/icecat/template @@ -26,6 +26,10 @@ build_options_default="alsa dbus gtk3 pulseaudio startup_notification sndio xscr CXXFLAGS="-Wno-class-memaccess -Wno-unused-function" +case "$XBPS_TARGET_MACHINE" in + i686*) broken="https://build.voidlinux.org/builders/i686_builder/builds/18068/steps/shell_3/logs/stdio" ;; +esac + post_extract() { case "$XBPS_TARGET_MACHINE" in *-musl) From 1c2ed13a90d7b0d0c64a373bb1693f3926076663 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 4 Jun 2019 14:00:41 +0200 Subject: [PATCH 283/400] xkeyboard-config: update to 2.27. Signed-off-by: Juan RP --- .../xkeyboard-config-2.26-pt_backticks.patch | 75 ------------------- srcpkgs/xkeyboard-config/template | 6 +- 2 files changed, 3 insertions(+), 78 deletions(-) delete mode 100644 srcpkgs/xkeyboard-config/patches/xkeyboard-config-2.26-pt_backticks.patch diff --git a/srcpkgs/xkeyboard-config/patches/xkeyboard-config-2.26-pt_backticks.patch b/srcpkgs/xkeyboard-config/patches/xkeyboard-config-2.26-pt_backticks.patch deleted file mode 100644 index 6159b7532aa..00000000000 --- a/srcpkgs/xkeyboard-config/patches/xkeyboard-config-2.26-pt_backticks.patch +++ /dev/null @@ -1,75 +0,0 @@ -Source: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/commit/af6c0f29dbee1cc7b280eed891592797c2e31220 -Upstream: yes, releases are made every 4 months -Reason: backticks broke it - -diff --git symbols/pt symbols/pt -index 73a1b7b7b6dec730704e3efadf03790a80b4b14b..3ec09812c1b859db134efc848995f01ffa775eee 100644 ---- symbols/pt -+++ symbols/pt -@@ -221,35 +221,35 @@ xkb_symbols "colemak" { - - name[Group1]="Portuguese (Colemak)"; - -- key `` { [ q, Q, at, Greek_OMEGA ] }; -- key `` { [ w, W, lstroke, Lstroke ] }; -- key `` { [ f, F, dstroke, ordfeminine ] }; -- key `` { [ p, P, thorn, THORN ] }; -- key `` { [ g, G, eng, ENG ] }; -- key `` { [ j, J, dead_hook, dead_horn ] }; -- key `` { [ l, L, lstroke, Lstroke ] }; -- key `` { [ u, U, downarrow, uparrow ] }; -- key `` { [ y, Y, leftarrow, yen ] }; -- key `` { [ ccedilla, Ccedilla, dead_acute, dead_doubleacute ] }; -- -- key `` { [ a, A, ae, AE ] }; -- key `` { [ r, R, paragraph, registered ] }; -- key `` { [ s, S, ssharp, section ] }; -- key `` { [ t, T, tslash, Tslash ] }; -- key `` { [ d, D, eth, ETH ] }; -- key `` { [ h, H, hstroke, Hstroke ] }; -- key `` { [ n, N, n, N ] }; -- key `` { [ e, E, EuroSign, cent ] }; -- key `` { [ i, I, rightarrow, idotless ] }; -- key `` { [ o, O, oslash, Ooblique ] }; -- -- key `` { [ z, Z, guillemotleft, less ] }; -- key `` { [ x, X, guillemotright, greater ] }; -- key `` { [ c, C, cent, copyright ] }; -- key `` { [ v, V, leftdoublequotemark, leftsinglequotemark ] }; -- key `` { [ b, B, rightdoublequotemark, rightsinglequotemark ] }; -- key `` { [ k, K, kra, ampersand ] }; -- key `` { [ m, M, mu, masculine ] }; -- -- key `` { [ BackSpace, BackSpace, BackSpace, BackSpace ] }; -+ key { [ q, Q, at, Greek_OMEGA ] }; -+ key { [ w, W, lstroke, Lstroke ] }; -+ key { [ f, F, dstroke, ordfeminine ] }; -+ key { [ p, P, thorn, THORN ] }; -+ key { [ g, G, eng, ENG ] }; -+ key { [ j, J, dead_hook, dead_horn ] }; -+ key { [ l, L, lstroke, Lstroke ] }; -+ key { [ u, U, downarrow, uparrow ] }; -+ key { [ y, Y, leftarrow, yen ] }; -+ key { [ ccedilla, Ccedilla, dead_acute, dead_doubleacute ] }; -+ -+ key { [ a, A, ae, AE ] }; -+ key { [ r, R, paragraph, registered ] }; -+ key { [ s, S, ssharp, section ] }; -+ key { [ t, T, tslash, Tslash ] }; -+ key { [ d, D, eth, ETH ] }; -+ key { [ h, H, hstroke, Hstroke ] }; -+ key { [ n, N, n, N ] }; -+ key { [ e, E, EuroSign, cent ] }; -+ key { [ i, I, rightarrow, idotless ] }; -+ key { [ o, O, oslash, Ooblique ] }; -+ -+ key { [ z, Z, guillemotleft, less ] }; -+ key { [ x, X, guillemotright, greater ] }; -+ key { [ c, C, cent, copyright ] }; -+ key { [ v, V, leftdoublequotemark, leftsinglequotemark ] }; -+ key { [ b, B, rightdoublequotemark, rightsinglequotemark ] }; -+ key { [ k, K, kra, ampersand ] }; -+ key { [ m, M, mu, masculine ] }; -+ -+ key { [ BackSpace, BackSpace, BackSpace, BackSpace ] }; - }; diff --git a/srcpkgs/xkeyboard-config/template b/srcpkgs/xkeyboard-config/template index caa4a55bf0f..f060067651e 100644 --- a/srcpkgs/xkeyboard-config/template +++ b/srcpkgs/xkeyboard-config/template @@ -1,7 +1,7 @@ # Template file for 'xkeyboard-config' pkgname=xkeyboard-config -version=2.26 -revision=2 +version=2.27 +revision=1 archs=noarch build_style=gnu-configure configure_args="--with-xkb-rules-symlink=xfree86,xorg --enable-compat-rules" @@ -13,7 +13,7 @@ maintainer="Juan RP " license="MIT" homepage="https://www.freedesktop.org/wiki/Software/XKeyboardConfig" distfiles="${XORG_SITE}/data/${pkgname}/${pkgname}-${version}.tar.bz2" -checksum=393718c7460cd06c4e8cb819d943ca54812ea476f32714c4d8975c77031a038e +checksum=690daec8fea63526c07620c90e6f3f10aae34e94b6db6e30906173480721901f post_install() { vlicense COPYING From 2ee584e2344776e106a31fd6183ec4513a102e95 Mon Sep 17 00:00:00 2001 From: bra1nwave Date: Tue, 4 Jun 2019 11:33:41 +0200 Subject: [PATCH 284/400] hatari: update to 2.2.1. --- srcpkgs/hatari/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/hatari/template b/srcpkgs/hatari/template index e68031c020e..44c1d27a8f9 100644 --- a/srcpkgs/hatari/template +++ b/srcpkgs/hatari/template @@ -1,6 +1,6 @@ # Template file for 'hatari' pkgname=hatari -version=2.1.0 +version=2.2.1 revision=1 build_style=cmake hostmakedepends="pkg-config" @@ -11,4 +11,4 @@ maintainer="Jarbowski " license="GPL-2.0-or-later" homepage="http://hatari.tuxfamily.org/" distfiles="http://download.tuxfamily.org/${pkgname}/${version}/${pkgname}-${version}.tar.bz2" -checksum=eb299460e92db4a8a2983a0725cbbc8c185f1470b8ecd791b3d102815da20924 +checksum=11afef30a274be84696588583d5a1d65c8046934670f718c311c956ef7106f60 From baceb1d3289deb26c7856294e6e216ef29a3f56d Mon Sep 17 00:00:00 2001 From: Thomas Date: Mon, 3 Jun 2019 11:38:52 -0400 Subject: [PATCH 285/400] linux5.1: add some modules for laptops and tablets The tc1100 is only a 32 bit device. --- srcpkgs/linux5.1/files/i386-dotconfig | 8 ++++---- srcpkgs/linux5.1/files/x86_64-dotconfig | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/srcpkgs/linux5.1/files/i386-dotconfig b/srcpkgs/linux5.1/files/i386-dotconfig index f8c9c74a509..7d1b8670867 100644 --- a/srcpkgs/linux5.1/files/i386-dotconfig +++ b/srcpkgs/linux5.1/files/i386-dotconfig @@ -7153,8 +7153,8 @@ CONFIG_DELL_RBU=m CONFIG_FUJITSU_LAPTOP=m CONFIG_FUJITSU_TABLET=m CONFIG_AMILO_RFKILL=m -# CONFIG_GPD_POCKET_FAN is not set -# CONFIG_TC1100_WMI is not set +CONFIG_GPD_POCKET_FAN=m +CONFIG_TC1100_WMI=m CONFIG_HP_ACCEL=m CONFIG_HP_WIRELESS=m CONFIG_HP_WMI=m @@ -7184,11 +7184,11 @@ CONFIG_ACPI_WMI=m CONFIG_WMI_BMOF=m CONFIG_INTEL_WMI_THUNDERBOLT=m CONFIG_MSI_WMI=m -# CONFIG_PEAQ_WMI is not set +CONFIG_PEAQ_WMI=m CONFIG_TOPSTAR_LAPTOP=m CONFIG_ACPI_TOSHIBA=m CONFIG_TOSHIBA_BT_RFKILL=m -# CONFIG_TOSHIBA_HAPS is not set +CONFIG_TOSHIBA_HAPS=m CONFIG_TOSHIBA_WMI=m CONFIG_ACPI_CMPC=m # CONFIG_INTEL_INT0002_VGPIO is not set diff --git a/srcpkgs/linux5.1/files/x86_64-dotconfig b/srcpkgs/linux5.1/files/x86_64-dotconfig index 1b71eb12b6f..547cef1a001 100644 --- a/srcpkgs/linux5.1/files/x86_64-dotconfig +++ b/srcpkgs/linux5.1/files/x86_64-dotconfig @@ -7268,7 +7268,7 @@ CONFIG_DELL_RBU=m CONFIG_FUJITSU_LAPTOP=m CONFIG_FUJITSU_TABLET=m CONFIG_AMILO_RFKILL=m -# CONFIG_GPD_POCKET_FAN is not set +CONFIG_GPD_POCKET_FAN=m CONFIG_HP_ACCEL=m CONFIG_HP_WIRELESS=m CONFIG_HP_WMI=m @@ -7298,11 +7298,11 @@ CONFIG_ACPI_WMI=m CONFIG_WMI_BMOF=m CONFIG_INTEL_WMI_THUNDERBOLT=m CONFIG_MSI_WMI=m -# CONFIG_PEAQ_WMI is not set +CONFIG_PEAQ_WMI=m CONFIG_TOPSTAR_LAPTOP=m CONFIG_ACPI_TOSHIBA=m CONFIG_TOSHIBA_BT_RFKILL=m -# CONFIG_TOSHIBA_HAPS is not set +CONFIG_TOSHIBA_HAPS=m CONFIG_TOSHIBA_WMI=m CONFIG_ACPI_CMPC=m # CONFIG_INTEL_INT0002_VGPIO is not set From 4137b27d81ae88c15a68898c80cbc4747ad4215c Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Tue, 4 Jun 2019 13:13:39 +0200 Subject: [PATCH 286/400] linux5.1: update to 5.1.7. [skip ci] --- srcpkgs/linux5.1/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/linux5.1/template b/srcpkgs/linux5.1/template index a29976287c1..06bdd4ad41e 100644 --- a/srcpkgs/linux5.1/template +++ b/srcpkgs/linux5.1/template @@ -1,6 +1,6 @@ # Template file for 'linux5.1' pkgname=linux5.1 -version=5.1.6 +version=5.1.7 revision=1 wrksrc="linux-${version}" short_desc="Linux kernel and modules (${version%.*} series)" @@ -8,7 +8,7 @@ maintainer="Helmut Pozimski " license="GPL-2.0-only" homepage="https://www.kernel.org" distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz" -checksum=9d68a206b0808d81ce582c861d0bda0d1095bcbd0f181db063665b68fc9cf478 +checksum=0246d04df2b799bd0adbde8f24fcb0daa18819fa5442e9bdd6992979b7adf3a6 patch_args="-Np1" nodebug=yes # -dbg package is generated below manually From c15d85987f1a0617d73f761ace0bd32c5851511a Mon Sep 17 00:00:00 2001 From: yopito Date: Wed, 27 Mar 2019 07:24:38 +0100 Subject: [PATCH 287/400] xbps-src: recompute XBPS_MASTERDIR and XBPS_HOSTDIR in chroot stage --- xbps-src | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xbps-src b/xbps-src index 65269079586..3cb9db24038 100755 --- a/xbps-src +++ b/xbps-src @@ -490,6 +490,9 @@ readonly XBPS_GIT_CMD if [ -n "$IN_CHROOT" ]; then readonly XBPS_CONFIG_FILE=/etc/xbps/xbps-src.conf readonly XBPS_DISTDIR=/void-packages + # needed before call to check_config_vars + readonly XBPS_MASTERDIR=/ + readonly XBPS_HOSTDIR=/host else _distdir="$(readlink -f ${0%/*})" if [ "${_distdir}" = "." ]; then From 7e1ffb6d71bf51890c480790cb032871103ab0b2 Mon Sep 17 00:00:00 2001 From: Peter Bui Date: Wed, 22 May 2019 10:47:58 -0400 Subject: [PATCH 288/400] export XBPS_BINPKG_EXISTS rather than mark it as readonly srcpkg_get_version and srcpkg_get_pkgver require unsetting XBPS_BINPKG_EXISTS to work properly (e.g. without it, some packages have a trailing -). Unfortunately, bash does not allow unsetting readonly variables, which XBPS_BINPKG_EXISTS is exported as in xbps-src. To resolve this problem, simply export XBPS_BINPKG_EXISTS as a normal variable rather than marking it as readonly. This addresses #11740. --- xbps-src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xbps-src b/xbps-src index 3cb9db24038..65c45ada56d 100755 --- a/xbps-src +++ b/xbps-src @@ -435,7 +435,7 @@ while getopts "$XBPS_OPTSTRING" opt; do 1) export XBPS_BUILD_ONLY_ONE_PKG=yes; XBPS_OPTIONS+=" -1";; a) readonly XBPS_CROSS_BUILD="$OPTARG"; XBPS_OPTIONS+=" -a $OPTARG";; C) readonly XBPS_KEEP_ALL=1; XBPS_OPTIONS+=" -C";; - E) readonly XBPS_BINPKG_EXISTS=1; XBPS_OPTIONS+=" -E";; + E) export XBPS_BINPKG_EXISTS=1; XBPS_OPTIONS+=" -E";; f) readonly XBPS_BUILD_FORCEMODE=1; XBPS_OPTIONS+=" -f";; G) readonly XBPS_USE_GIT_REVS=1; XBPS_OPTIONS+=" -G";; g) readonly XBPS_DEBUG_PKGS=1; XBPS_OPTIONS+=" -g";; From 1ba94fd5959b684e300c4f6ceb4758852b5915e8 Mon Sep 17 00:00:00 2001 From: Justin Berthault Date: Mon, 3 Jun 2019 17:32:04 +0200 Subject: [PATCH 289/400] python-dogpile.cach: add python-decorator as dep --- srcpkgs/python-dogpile.cache/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python-dogpile.cache/template b/srcpkgs/python-dogpile.cache/template index 202117a9695..a2e4a436f2f 100644 --- a/srcpkgs/python-dogpile.cache/template +++ b/srcpkgs/python-dogpile.cache/template @@ -1,13 +1,13 @@ # Template file for 'python-dogpile.cache' pkgname=python-dogpile.cache version=0.7.1 -revision=1 +revision=2 archs=noarch wrksrc="dogpile.cache-${version}" build_style=python-module pycompile_module="dogpile" hostmakedepends="python-setuptools python3-setuptools" -depends="python" +depends="python python-decorator" short_desc="A caching front-end based on the Dogpile lock (Python2)" maintainer="Daniel Santana " license="BSD-3-Clause" @@ -22,7 +22,7 @@ post_install() { python3-dogpile.cache_package() { archs=noarch pycompile_module="dogpile" - depends="python3" + depends="python3 python3-decorator" short_desc="${short_desc/Python2/Python3}" alternatives="guessit:guessit:/usr/bin/guessit3" pkg_install() { From 6332abcb7258d5527a8de00a6ad2f41cef6f3fbe Mon Sep 17 00:00:00 2001 From: Thomas Date: Tue, 4 Jun 2019 09:48:09 -0400 Subject: [PATCH 290/400] pluma: update to 1.22.1. Drop enchant patches because they were applied upstream --- srcpkgs/pluma/patches/fix-enchant.patch | 14 -------------- srcpkgs/pluma/template | 5 ++--- 2 files changed, 2 insertions(+), 17 deletions(-) delete mode 100644 srcpkgs/pluma/patches/fix-enchant.patch diff --git a/srcpkgs/pluma/patches/fix-enchant.patch b/srcpkgs/pluma/patches/fix-enchant.patch deleted file mode 100644 index 4e78a3bd378..00000000000 --- a/srcpkgs/pluma/patches/fix-enchant.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/plugins/spell/pluma-spell-checker.c b/plugins/spell/pluma-spell-checker.c -index d33bf92..9f2bde3 100644 ---- plugins/spell/pluma-spell-checker.c -+++ plugins/spell/pluma-spell-checker.c -@@ -433,7 +433,7 @@ pluma_spell_checker_add_word_to_personal (PlumaSpellChecker *spell, - if (len < 0) - len = strlen (word); - -- enchant_dict_add_to_pwl (spell->dict, word, len); -+ enchant_dict_add (spell->dict, word, len); - - g_signal_emit (G_OBJECT (spell), signals[ADD_WORD_TO_PERSONAL], 0, word, len); - - diff --git a/srcpkgs/pluma/template b/srcpkgs/pluma/template index 00c5cff7b95..27facfa8dad 100644 --- a/srcpkgs/pluma/template +++ b/srcpkgs/pluma/template @@ -1,6 +1,6 @@ # Template file for 'pluma' pkgname=pluma -version=1.20.4 +version=1.22.1 revision=1 build_style=gnu-configure pycompile_dirs="usr/lib/pluma/plugins" @@ -14,11 +14,10 @@ maintainer="Juan RP " license="GPL-2.0-or-later" homepage="https://mate-desktop.org" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=fffd1ad0309c058ebd364ea0185d5dbbada2a9cde3d580da528b226c7ca9ab61 +checksum=af8d19927f1571d6b63462b8e51fed9ac851326b6ff800535ea785f15c61a591 nocross="gobject-introspection from libpeas" pre_configure() { - sed -i 's/, enchant/, enchant-2/' configure.ac autoreconf -fi } From b8582df3397a03dcc204586ffe9b30884779c3cf Mon Sep 17 00:00:00 2001 From: newbluemoon Date: Tue, 4 Jun 2019 17:15:50 +0200 Subject: [PATCH 291/400] perl-CGI: update to 4.44 --- srcpkgs/perl-CGI/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/perl-CGI/template b/srcpkgs/perl-CGI/template index f66bef75bb1..77ede0d76d0 100644 --- a/srcpkgs/perl-CGI/template +++ b/srcpkgs/perl-CGI/template @@ -1,6 +1,6 @@ # Template file for 'perl-CGI' pkgname=perl-CGI -version=4.43 +version=4.44 revision=1 archs=noarch wrksrc="${pkgname/perl-/}-${version}" @@ -14,4 +14,4 @@ maintainer="newbluemoon " license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="https://metacpan.org/release/CGI" distfiles="${CPAN_SITE}/CGI/${pkgname/perl-/}-${version}.tar.gz" -checksum=14b94f9df6e48fc26ebc4fa1e01a7b534cbc1611028a49028f9ac9d8ca27b734 +checksum=12435fb7ebd3585c47b6d60ee4f5c7d6a7c114a2827d2b5acf3d62aa9fcf1208 From 1cf23e16def2a610d248db724c97d43a04b03ac1 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Tue, 4 Jun 2019 13:16:28 +0200 Subject: [PATCH 292/400] linux5.0: update to 5.0.21. --- srcpkgs/linux5.0/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/linux5.0/template b/srcpkgs/linux5.0/template index ac0fef6c5f5..81bea48259c 100644 --- a/srcpkgs/linux5.0/template +++ b/srcpkgs/linux5.0/template @@ -1,6 +1,6 @@ # Template file for 'linux5.0' pkgname=linux5.0 -version=5.0.20 +version=5.0.21 revision=1 wrksrc="linux-${version}" short_desc="Linux kernel and modules (${version%.*} series)" @@ -8,7 +8,7 @@ maintainer="Helmut Pozimski " license="GPL-2.0-only" homepage="https://www.kernel.org" distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz" -checksum=3ba720f3189e5a08e7c533da8c12595d662a6c11d3466db6a0ff164ef4e54b68 +checksum=98d307a546c95a215dee675ffa4b63c2a7a29e7af839f0d8dfb96dbb61aac2d7 patch_args="-Np1" nodebug=yes # -dbg package is generated below manually From c213a896c836f8df6e2ef4264cbc9062a6b84813 Mon Sep 17 00:00:00 2001 From: Thomas Date: Tue, 4 Jun 2019 11:45:31 -0400 Subject: [PATCH 293/400] mate-calc: update to 1.22.1. --- srcpkgs/mate-calc/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mate-calc/template b/srcpkgs/mate-calc/template index c4e1930c494..72632bee423 100644 --- a/srcpkgs/mate-calc/template +++ b/srcpkgs/mate-calc/template @@ -1,6 +1,6 @@ # Template file for 'mate-calc' pkgname=mate-calc -version=1.20.3 +version=1.22.1 revision=1 build_style=gnu-configure hostmakedepends="glib-devel intltool itstool pkg-config" @@ -10,4 +10,4 @@ maintainer="Álvaro Castillo " license="GPL-2.0-or-later" homepage="https://mate-desktop.org/" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=aae461f5c30048ea0eabdaada8b0e7ed9b9501076e9f16613363e79198c0605b +checksum=8da209abc2d6f564effcb8963c97bfd2ba34dd1ac2ab9d455877e63f001f367e From 9b7130c286f8082774a3d32d5be22ab555fde318 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 4 Jun 2019 18:59:29 +0200 Subject: [PATCH 294/400] krita: actually enable python plugins resolves #12055 --- srcpkgs/krita/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template index 2b3bc6c0745..df5a593849e 100644 --- a/srcpkgs/krita/template +++ b/srcpkgs/krita/template @@ -1,7 +1,7 @@ # Template file for 'krita' pkgname=krita version=4.2.0 -revision=1 +revision=2 build_style=cmake configure_args="-Wno-dev -DBUILD_TESTING=OFF" hostmakedepends="extra-cmake-modules pkg-config python3" @@ -10,7 +10,8 @@ makedepends="karchive-devel kconfig-devel kwidgetsaddons-devel kcompletion-devel kwindowsystem-devel kio-devel kcrash-devel qt5-svg-devel qt5-multimedia-devel boost-devel gsl-devel tiff-devel libjpeg-turbo-devel libraw-devel fftw-devel opencolorio-devel eigen vc exiv2-devel libXi-devel libopenexr-devel libgomp-devel - poppler-qt5-devel giflib-devel python3-sip-devel python3-PyQt5 quazip-devel" + poppler-qt5-devel giflib-devel python3-devel python3-sip-devel python3-PyQt5 + python-PyQt5-devel quazip-devel" short_desc="Painting and image editing program" maintainer="John " license="GPL-3.0-only" From d1fc517d4be1042bc8d1855db077d1050e425982 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Jan=20G=C3=B3ralczyk?= Date: Tue, 4 Jun 2019 14:34:21 +0100 Subject: [PATCH 295/400] networkmanager-dmenu: use python2 dependencies --- srcpkgs/networkmanager-dmenu/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/networkmanager-dmenu/template b/srcpkgs/networkmanager-dmenu/template index b9a684cccaa..dab3febf077 100644 --- a/srcpkgs/networkmanager-dmenu/template +++ b/srcpkgs/networkmanager-dmenu/template @@ -1,7 +1,7 @@ # Template file for 'networkmanager-dmenu' pkgname=networkmanager-dmenu version=1.1 -revision=1 +revision=2 archs=noarch conf_files="/etc/networkmanager_dmenu-config.ini" depends="NetworkManager python3-gobject" @@ -11,6 +11,7 @@ license="MIT" homepage="https://github.com/firecat53/${pkgname}" distfiles="${homepage}/archive/v${version}.tar.gz" checksum=279695b8833ec790cf0c00ec2eb36be09ca33a39aa9595578e2e3d2f644dd998 +python_version=3 do_install() { vmkdir usr/share/applications From ba5c6b2b038e5562286c4f2bd6403f69ddf6293e Mon Sep 17 00:00:00 2001 From: Paper Mountain Studio Date: Tue, 4 Jun 2019 17:56:34 +0200 Subject: [PATCH 296/400] keepassxc: update to 2.4.2 --- srcpkgs/keepassxc/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/keepassxc/template b/srcpkgs/keepassxc/template index 31752b8dff3..004b3981d21 100644 --- a/srcpkgs/keepassxc/template +++ b/srcpkgs/keepassxc/template @@ -1,7 +1,7 @@ # Template file for 'keepassxc' pkgname=keepassxc -version=2.4.1 -revision=2 +version=2.4.2 +revision=1 build_style=cmake configure_args="-DWITH_TESTS=OFF -DWITH_XC_UPDATECHECK=OFF -DWITH_XC_AUTOTYPE=$(vopt_if autotype ON OFF) @@ -24,9 +24,9 @@ license="GPL-3.0-or-later, BSD-3-Clause, CC0-1.0, LGPL-2.0-only, LGPL-2.1-only, LGPL-3.0-or-later, Nokia-Qt-exception-1.1, MIT BSL-1.0" homepage="https://keepassxc.org/" distfiles="https://github.com/keepassxreboot/keepassxc/releases/download/${version}/keepassxc-${version}-src.tar.xz" -checksum=0da97bd1279d1b9b06a63b9f723b43ab8c078b7f1203d6c13504fdd4735489ab +checksum=15fa6d0a292055864b1979c671f13e5bae5056e19e280c30cc1cf0b96ea56138 -# https://github.com/keepassxreboot/keepassxc/blob/7bafe65d17e98348b0ff5fb46f117bdf05764cc6/CMakeLists.txt#L45 +# https://github.com/keepassxreboot/keepassxc/blob/a775031fe9471310e50232d1861d4991e2803aff/CMakeLists.txt#L46 build_options="browser keeshare network sshagent yubikey" desc_option_autotype="Include auto-type" desc_option_browser="Include browser integration with keepassxc-browser-plugin" From 42228c4e045ccff4ec7bc7b46fdf79c370b57f19 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 4 Jun 2019 18:03:35 +0200 Subject: [PATCH 297/400] turbovnc: update to 2.2.2. Signed-off-by: Juan RP --- srcpkgs/turbovnc/patches/fix-libressl.patch | 18 +++++++----------- srcpkgs/turbovnc/template | 6 +++--- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/srcpkgs/turbovnc/patches/fix-libressl.patch b/srcpkgs/turbovnc/patches/fix-libressl.patch index bdfc3094c20..0584ff6a858 100644 --- a/srcpkgs/turbovnc/patches/fix-libressl.patch +++ b/srcpkgs/turbovnc/patches/fix-libressl.patch @@ -1,17 +1,13 @@ -diff --git a/unix/Xvnc/programs/Xserver/hw/vnc/rfb.h b/unix/Xvnc/programs/Xserver/hw/vnc/rfb.h -index 9b82d2f..8c35061 100644 ---- unix/Xvnc/programs/Xserver/hw/vnc/rfb.h -+++ unix/Xvnc/programs/Xserver/hw/vnc/rfb.h -@@ -81,6 +81,11 @@ - the CPU count */ - #define MAX_ENCODING_THREADS 8 +--- unix/Xvnc/programs/Xserver/hw/vnc/rfb.h.orig 2019-06-04 18:00:21.482107165 +0200 ++++ unix/Xvnc/programs/Xserver/hw/vnc/rfb.h 2019-06-04 18:00:37.826303493 +0200 +@@ -29,6 +29,10 @@ + #ifndef __RFB_H__ + #define __RFB_H__ +/* Fix for libressl */ +#ifndef OPENSSL_INIT_SETTINGS +#define OPENSSL_INIT_SETTINGS void +#endif -+ - extern const char *display; - - + #ifdef HAVE_DIX_CONFIG_H + #include diff --git a/srcpkgs/turbovnc/template b/srcpkgs/turbovnc/template index 07e9326488a..01909c6c917 100644 --- a/srcpkgs/turbovnc/template +++ b/srcpkgs/turbovnc/template @@ -1,6 +1,6 @@ # Template file for 'turbovnc' pkgname=turbovnc -version=2.2.1 +version=2.2.2 revision=1 build_style=cmake configure_args="-DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DTVNC_BUILDJAVA=0 @@ -14,9 +14,9 @@ maintainer="Juan RP " license="GPL-2.0-or-later" homepage="http://virtualgl.org" distfiles="${SOURCEFORGE_SITE}/turbovnc/${pkgname}-${version}.tar.gz" -checksum=d8c710dcf2128c235f8f203ec77b306c56b25d61134b47aeb55acaab4c2d3a61 +checksum=7f1593a3db88dc800d0f82091252ca293b1980a28417b9834ce713eb7e0d09bc -conf_files="/etc/turbovncserver.conf /etc/turbovncserver-security.conf" +conf_files="/etc/*.conf" archs="i686* x86_64* ppc64*" conflicts="tigervnc>=0" From ab1a088520840d559d3979f215edb22505f9970b Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 4 Jun 2019 18:54:56 +0200 Subject: [PATCH 298/400] openmsx: update to 0.15.0. Signed-off-by: Juan RP --- srcpkgs/openmsx/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/openmsx/template b/srcpkgs/openmsx/template index af041c88e54..fc389612b73 100644 --- a/srcpkgs/openmsx/template +++ b/srcpkgs/openmsx/template @@ -1,6 +1,6 @@ # Template file for 'openmsx' pkgname=openmsx -version=0.14.0 +version=0.15.0 revision=1 hostmakedepends="pkg-config python" makedepends="SDL-devel glew-devel libao-devel libtheora-devel libvorbis-devel @@ -8,9 +8,9 @@ makedepends="SDL-devel glew-devel libao-devel libtheora-devel libvorbis-devel short_desc="MSX emulator that aims for perfection" maintainer="Juan RP " license="GPL-2.0-only" -homepage="http://openmsx.sourceforge.net" +homepage="https://openmsx.org" distfiles="https://github.com/openMSX/openMSX/releases/download/RELEASE_${version//\./_}/openmsx-${version}.tar.gz" -checksum=eb9ae4c8420c30b69e9a05edfa8c606762b7a6bf3e55d36bfb457c2400f6a7b9 +checksum=93f209d8fed2e04e62526469bb6bb431b82ea4d07ecdc45dab2b8cc4ca21d62a nocross="can't use CXX prefixed with triplet" do_build() { From f1f8075b3ef51655a2fa49bfbb9489fa2e93a53f Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 4 Jun 2019 19:11:43 +0200 Subject: [PATCH 299/400] perl: update to 5.28.2. Use perl-cross-1.3, which supports perl<=5.30 and -jX. Signed-off-by: Juan RP --- srcpkgs/perl/template | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/srcpkgs/perl/template b/srcpkgs/perl/template index c600c699650..62b0734bc99 100644 --- a/srcpkgs/perl/template +++ b/srcpkgs/perl/template @@ -1,8 +1,8 @@ # Template file for 'perl' pkgname=perl -version=5.28.1 +version=5.28.2 revision=1 -_perl_cross_version=1.2.1 +_perl_cross_version=1.3 build_style=gnu-configure hostmakedepends="less" makedepends="zlib-devel bzip2-devel gdbm-devel db-devel" @@ -13,9 +13,8 @@ license="Artistic-1.0-perl, GPL-1.0-or-later" homepage="https://www.perl.org" distfiles="https://www.cpan.org/src/5.0/perl-${version}.tar.gz https://github.com/arsv/perl-cross/releases/download/${_perl_cross_version}/perl-cross-${_perl_cross_version}.tar.gz" -checksum="3ebf85fe65df2ee165b22596540b7d5d42f84d4b72d84834f74e2e0b8956c347 - 8b706bc688ddf71b62d649bde72f648669f18b37fe0c54ec6201142ca3943498" -disable_parallel_build=yes +checksum="aa95456dddb3eb1cc5475fed4e08f91876bea71fb636fba6399054dfbabed6c7 + 49edea1ea2cd6c5c47386ca71beda8d150c748835781354dbe7f75b1df27e703" # Before updating this package to a new major version, run ${FILESDIR}/provides.pl # against ${wrksrc} to find the list of built in packages. From 741348953f7164671cdaeb9bca9eb47cefb76fc8 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 4 Jun 2019 19:33:05 +0200 Subject: [PATCH 300/400] ngircd: update to 25. Signed-off-by: Juan RP --- srcpkgs/ngircd/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template index 8ad5b767d56..c79e704e20f 100644 --- a/srcpkgs/ngircd/template +++ b/srcpkgs/ngircd/template @@ -1,18 +1,18 @@ -# Template build file for 'ngircd' +# Template file for 'ngircd' pkgname=ngircd -version=24 -revision=4 +version=25 +revision=1 build_style=gnu-configure configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes" hostmakedepends="pkg-config" makedepends="zlib-devel libressl-devel" conf_files="/etc/ngircd.conf" -homepage="http://ngircd.barton.de/" short_desc="Free, portable and lightweight Internet Relay Chat server" maintainer="Juan RP " license="GPL-2" -distfiles="https://github.com/ngircd/ngircd/releases/download/rel-${version}/ngircd-${version}.tar.xz" -checksum=173fa0ea10788a8ba08ef2f7e64ea8951d7c88862e744128c8b87bae424b1008 +homepage="http://ngircd.barton.de/" +distfiles="https://ngircd.barton.de/pub/ngircd/ngircd-${version}.tar.xz" +checksum=c4997cae3e3dd6ff6a605ca274268f2b8c9ba0b1a96792c7402e5594222eee4e post_configure() { echo "#define HAVE_WORKING_GETADDRINFO 1" >>src/config.h From 51cc7ffc35c3d96fb1af4d04469e9b51caabd89a Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 4 Jun 2019 19:22:30 +0200 Subject: [PATCH 301/400] mtd-utils: update to 2.1.0. Signed-off-by: Juan RP --- srcpkgs/mtd-utils/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/mtd-utils/template b/srcpkgs/mtd-utils/template index 19af5e39952..28097080049 100644 --- a/srcpkgs/mtd-utils/template +++ b/srcpkgs/mtd-utils/template @@ -1,13 +1,13 @@ # Template build file for 'mtd-utils'. pkgname=mtd-utils -version=2.0.2 +version=2.1.0 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" -makedepends="acl-devel liblzma-devel libuuid-devel lzo-devel zlib-devel" +makedepends="acl-devel liblzma-devel libuuid-devel lzo-devel zlib-devel libressl-devel" short_desc="Memory Technology Device Utilities" maintainer="Juan RP " license="GPL-2.0-only" homepage="http://www.linux-mtd.infradead.org/" distfiles="ftp://ftp.infradead.org/pub/mtd-utils/$pkgname-$version.tar.bz2" -checksum=fb3de61be8e932abb424e8ea3c30298f553d5f970ad158a737bb303bbf9660b8 +checksum=b4b995b06d93aee4125e8e44c05a1cae6eea545ca5a6e8a377405ee8aa454bd2 From e9115968d845b20512ed216f846d379cb9650f45 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 4 Jun 2019 19:37:27 +0200 Subject: [PATCH 302/400] libsodium: update to 1.0.18. Signed-off-by: Juan RP --- srcpkgs/libsodium/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/libsodium/template b/srcpkgs/libsodium/template index ae5bcd2fe9f..1bd2b223be1 100644 --- a/srcpkgs/libsodium/template +++ b/srcpkgs/libsodium/template @@ -1,15 +1,15 @@ # Template file for 'libsodium' pkgname=libsodium -version=1.0.17 +version=1.0.18 revision=1 build_style=gnu-configure configure_args="lt_cv_prog_compiler_static_works=yes" -short_desc="A modern and easy-to-use crypto library" +short_desc="Modern and easy-to-use crypto library" maintainer="Juan RP " license="ISC" -homepage="https://github.com/jedisct1/libsodium" -distfiles="https://github.com/jedisct1/libsodium/releases/download/${version}/${pkgname}-${version}.tar.gz" -checksum=0cc3dae33e642cc187b5ceb467e0ad0e1b51dcba577de1190e9ffa17766ac2b1 +homepage="https://libsodium.org/" +distfiles="https://download.libsodium.org/libsodium/releases/libsodium-${version}.tar.gz" +checksum=6f504490b342a4f8a4c4a02fc9b866cbef8622d5df4e5452b46be121e46636c1 post_install() { vlicense LICENSE From 51f455afb3fd1238e7c4d13a904ee835e075cf39 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Tue, 4 Jun 2019 13:18:55 +0200 Subject: [PATCH 303/400] linux4.19: update to 4.19.48. [skip ci] --- srcpkgs/linux4.19/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template index 306d9a0e36a..2d841f75975 100644 --- a/srcpkgs/linux4.19/template +++ b/srcpkgs/linux4.19/template @@ -1,6 +1,6 @@ # Template file for 'linux4.19' pkgname=linux4.19 -version=4.19.47 +version=4.19.48 revision=1 wrksrc="linux-${version}" short_desc="Linux kernel and modules (${version%.*} series)" @@ -8,7 +8,7 @@ maintainer="Helmut Pozimski " license="GPL-2.0-only" homepage="https://www.kernel.org" distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz" -checksum=5d08f3890e7ca2b94529675120f170c5b764f795e6dd184a1190c23a40ef5365 +checksum=01d0db4f10cc8e384241a605e29413e32c442aa6853c116877538b07c16893fa patch_args="-Np1" nodebug=yes # -dbg package is generated below manually From ca9d3e365919350ceeb8c8086e76c21aeeda2a46 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 4 Jun 2019 20:27:28 +0200 Subject: [PATCH 304/400] qt5integration: update to 0.3.12. --- srcpkgs/qt5integration/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt5integration/template b/srcpkgs/qt5integration/template index 52154b2d026..10c41bad57a 100644 --- a/srcpkgs/qt5integration/template +++ b/srcpkgs/qt5integration/template @@ -1,6 +1,6 @@ # Template file for 'qt5integration' pkgname=qt5integration -version=0.3.11 +version=0.3.12 revision=1 build_style=qmake hostmakedepends="qt5-qmake pkg-config" @@ -13,7 +13,7 @@ license="GPL-3.0-or-later" homepage="https://github.com/linuxdeepin/qt5integration" changelog="https://github.com/linuxdeepin/qt5integration/blob/${version}/CHANGELOG.md" distfiles="https://github.com/linuxdeepin/qt5integration/archive/${version}.tar.gz" -checksum=76eb19a69ac5682e5e172b12d149937ce5099df6e887acdbefc2cd2326257648 +checksum=99a49dbe67c9ce11e60856f484c383400642f4ab0d0f46af310271c2c43edcfc pre_configure() { _qt5_dep_ver="${depends#*>=}" From 3ba9ec44eefaa04a24502b90979238932992a7c5 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 4 Jun 2019 20:31:47 +0200 Subject: [PATCH 305/400] pstoedit: update to 3.74. --- srcpkgs/pstoedit/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/pstoedit/template b/srcpkgs/pstoedit/template index 7f452074816..6032bbd821c 100644 --- a/srcpkgs/pstoedit/template +++ b/srcpkgs/pstoedit/template @@ -1,17 +1,17 @@ # Template file for 'pstoedit' pkgname=pstoedit -version=3.73 -revision=3 +version=3.74 +revision=1 build_style=gnu-configure hostmakedepends="ghostscript pkg-config" makedepends="libXext-devel libmagick-devel libxml2-devel" short_desc="PostScript and PDF graphics into other vector formats translator" maintainer="John " license="GPL-2.0-or-later" -#changelog="http://www.calvina.de/pstoedit/changelog.htm" homepage="http://www.pstoedit.net/" +changelog="http://www.calvina.de/pstoedit/changelog.htm" distfiles="${SOURCEFORGE_SITE}/pstoedit/pstoedit-${version}.tar.gz" -checksum=ad31d13bf4dd1b9e2590dccdbe9e4abe74727aaa16376be85cd5d854f79bf290 +checksum=353242fa4a3a73c3c856d1122a4d258a12be869707629603807e27137566990c libpstoedit_package() { short_desc+=" - library" From b93aa4d6e745bc901721f8480574e4b912b6b779 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 4 Jun 2019 20:31:57 +0200 Subject: [PATCH 306/400] goxel: update to 0.9.0. --- srcpkgs/goxel/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/goxel/template b/srcpkgs/goxel/template index 4269331402c..312aed4826b 100644 --- a/srcpkgs/goxel/template +++ b/srcpkgs/goxel/template @@ -1,6 +1,6 @@ # Template file for 'goxel' pkgname=goxel -version=0.8.3 +version=0.9.0 revision=1 build_style=scons make_build_args="debug=0 werror=0" @@ -11,7 +11,7 @@ maintainer="John " license="GPL-3.0-or-later" homepage="https://guillaumechereau.github.io/goxel/" distfiles="https://github.com/guillaumechereau/goxel/archive/v${version}.tar.gz" -checksum=a99e92ae4812a57450ef853626c95bcdb9abfe68885ae68f5541c77f4952991c +checksum=950f1f130f54eacb0de4a97b195e8b02dcf3cb3a9f97356005c26055dece4018 case "$XBPS_TARGET_MACHINE" in *-musl) makedepends+=" argp-standalone";; From a4a127d9f2c66c8fb30869b170caa4aa1c45ccc2 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 4 Jun 2019 20:39:38 +0200 Subject: [PATCH 307/400] deepin-image-viewer: update to 1.3.16. --- srcpkgs/deepin-image-viewer/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/deepin-image-viewer/template b/srcpkgs/deepin-image-viewer/template index d6fb0860734..4eac6f4ca31 100644 --- a/srcpkgs/deepin-image-viewer/template +++ b/srcpkgs/deepin-image-viewer/template @@ -1,6 +1,6 @@ # Template file for 'deepin-image-viewer' pkgname=deepin-image-viewer -version=1.3.15 +version=1.3.16 revision=1 build_style=qmake hostmakedepends="qt5-qmake pkg-config" @@ -13,7 +13,7 @@ license="GPL-3.0-or-later" homepage="https://github.com/linuxdeepin/deepin-image-viewer" changelog="https://github.com/linuxdeepin/deepin-image-viewer/blob/${version}/CHANGELOG.md" distfiles="https://github.com/linuxdeepin/deepin-image-viewer/archive/${version}.tar.gz" -checksum=3027504d429f431da68dee25427f3c2b5aa07722cf37077369f7d68e0fd4ef9d +checksum=46af7a5f5e9a1fa91977fd5aad605664329eabd13260a0a8981283a7582b0b3a if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-svg-devel qt5-x11extras-devel" From 7d7219b9626c78bcf1cca06e838bb6219c7ed417 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 4 Jun 2019 20:39:43 +0200 Subject: [PATCH 308/400] deepin-movie-reborn: update to 3.2.23.2. --- srcpkgs/deepin-movie-reborn/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/deepin-movie-reborn/template b/srcpkgs/deepin-movie-reborn/template index 223761b914d..6b27bbe8a97 100644 --- a/srcpkgs/deepin-movie-reborn/template +++ b/srcpkgs/deepin-movie-reborn/template @@ -1,6 +1,6 @@ # Template file for 'deepin-movie-reborn' pkgname=deepin-movie-reborn -version=3.2.23 +version=3.2.23.2 revision=1 build_style=cmake hostmakedepends="pkg-config qt5-host-tools qt5-qmake" @@ -15,7 +15,7 @@ license="GPL-3.0-or-later" homepage="https://github.com/linuxdeepin/deepin-movie-reborn" changelog="https://github.com/linuxdeepin/deepin-movie-reborn/blob/${version}/CHANGELOG.md" distfiles="https://github.com/linuxdeepin/deepin-movie-reborn/archive/${version}.tar.gz" -checksum=9ed60177c4b73d4e8ce32fe008b46f043382af6567f928101f74f61451ddd31c +checksum=c4ee12c77350044ffe6a9f30aa01141376509bf17703c1d62737eab8092ee04e CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libdtk-2.0.6/DWidget" CXXFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/libdtk-2.0.6/DCore" CXXFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/libdtk-2.0.6/DWm" From 9cffd2244248451f64be38a9041514d895ee3110 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 4 Jun 2019 20:39:51 +0200 Subject: [PATCH 309/400] deepin-music: update to 3.1.18. --- srcpkgs/deepin-music/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/deepin-music/template b/srcpkgs/deepin-music/template index 10cd8f8c929..dda5f2c94d0 100644 --- a/srcpkgs/deepin-music/template +++ b/srcpkgs/deepin-music/template @@ -1,6 +1,6 @@ # Template file for 'deepin-music' pkgname=deepin-music -version=3.1.17.1 +version=3.1.18 revision=1 build_style=qmake hostmakedepends="qt5-qmake pkg-config" @@ -13,7 +13,7 @@ license="GPL-3.0-or-later" homepage="https://github.com/linuxdeepin/deepin-music/" changelog="https://github.com/linuxdeepin/deepin-music/blob/${version}/CHANGELOG.md" distfiles="https://github.com/linuxdeepin/deepin-music/archive/${version}.tar.gz" -checksum=1e43b861239206ad6a9cf8fd91b77b5c7e99dfcda101b669e667dc869d4187fe +checksum=aef82664e57e7ac0d576d4f36dbd9c9c34543b34193b1c784801f9e6caff5ea3 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" dtkcore-devel qt5-svg-devel qt5-multimedia-devel qt5-x11extras-devel" From dbb1cee8563051f7c0d8f003cd577ab1240bd58a Mon Sep 17 00:00:00 2001 From: John Date: Tue, 4 Jun 2019 20:39:58 +0200 Subject: [PATCH 310/400] deepin-terminal: update to 3.2.5.1. --- srcpkgs/deepin-terminal/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/deepin-terminal/template b/srcpkgs/deepin-terminal/template index c28d29bdbd3..08ccb75f00b 100644 --- a/srcpkgs/deepin-terminal/template +++ b/srcpkgs/deepin-terminal/template @@ -1,6 +1,6 @@ # Template file for 'deepin-terminal' pkgname=deepin-terminal -version=3.2.4 +version=3.2.5.1 revision=1 build_style=cmake configure_args="-DTEST_BUILD=OFF -DUSE_VENDOR_LIB=OFF" @@ -15,7 +15,7 @@ license="GPL-3.0-or-later" homepage="https://github.com/linuxdeepin/deepin-terminal" changelog="https://github.com/linuxdeepin/deepin-terminal/blob/master/CHANGELOG.md" distfiles="https://github.com/linuxdeepin/deepin-terminal/archive/${version}.tar.gz" -checksum=17f0f82d966bef486b41abe1cd84f8163324330bd26896f07986ee6b260f4e6c +checksum=a30a5ab27c2c74a3e677c24ad6c0f0e1d8b95703b0d001c3aa71b8f62af1e952 nocross=yes case $XBPS_TARGET_MACHINE in From 16c96314ac9904a27fca68ba287b93411dd116bc Mon Sep 17 00:00:00 2001 From: John Date: Tue, 4 Jun 2019 21:12:28 +0200 Subject: [PATCH 311/400] krita: update to 4.2.1. --- srcpkgs/krita/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template index df5a593849e..a86740fa760 100644 --- a/srcpkgs/krita/template +++ b/srcpkgs/krita/template @@ -1,7 +1,7 @@ # Template file for 'krita' pkgname=krita -version=4.2.0 -revision=2 +version=4.2.1 +revision=1 build_style=cmake configure_args="-Wno-dev -DBUILD_TESTING=OFF" hostmakedepends="extra-cmake-modules pkg-config python3" @@ -17,6 +17,6 @@ maintainer="John " license="GPL-3.0-only" homepage="https://krita.org/" distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.gz" -checksum=d5eb5cce8bdb68bc669e8f8f6a41d09821bcc4ef5a4c99de6f7838b1c884abd0 +checksum=35367adde808c9460a9d6e08f80255a64d08470acbef391e56d00acc929ca9ca nocross=yes replaces="calligra-krita>=0" From ba87cbfdcce2fc1901b05a23385464217441ac4b Mon Sep 17 00:00:00 2001 From: John Date: Tue, 4 Jun 2019 21:56:21 +0200 Subject: [PATCH 312/400] calligra: remove calligra-krita from depends --- srcpkgs/calligra/template | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template index 6115b91c178..9fd952e3366 100644 --- a/srcpkgs/calligra/template +++ b/srcpkgs/calligra/template @@ -1,7 +1,7 @@ # Template file for 'calligra' pkgname=calligra version=3.1.0 -revision=19 +revision=20 build_style=cmake configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON -DBUILD_TESTING=OFF" @@ -27,7 +27,9 @@ replaces="calligra-braindump>=0 calligra-flow>=0" subpackages="calligra-filters calligra-libs calligra-plugins calligra-karbon calligra-kexi calligra-stage calligra-krita calligra-sheets calligra-extras calligra-words calligra-handbook calligra-gemini calligra-devtools" -depends="${subpackages/calligra-devtools/} calligra-plan" +depends="calligra-filters calligra-libs calligra-plugins calligra-karbon + calligra-kexi calligra-stage calligra-sheets calligra-extras + calligra-words calligra-handbook calligra-gemini calligra-plan" CXXFLAGS="-DKDE_NO_DEBUG_OUTPUT" From e3d39fc18dadbe19d91186f9ee003fd39991a658 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 4 Jun 2019 22:45:54 +0200 Subject: [PATCH 313/400] Quaternion: update to 0.0.9.4c. --- srcpkgs/Quaternion/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/Quaternion/template b/srcpkgs/Quaternion/template index c38e5cd6752..836b6b7797a 100644 --- a/srcpkgs/Quaternion/template +++ b/srcpkgs/Quaternion/template @@ -1,6 +1,6 @@ # Template file for 'Quaternion' pkgname=Quaternion -version=0.0.9.4a +version=0.0.9.4c revision=1 build_style=cmake hostmakedepends="qt5-qmake qt5-host-tools" @@ -11,9 +11,9 @@ depends="qt5-quickcontrols" short_desc="Qt5-based IM client for the Matrix protocol" maintainer="Julio Galvan " license="GPL-3.0-or-later" -homepage="https://github.com/QMatrixClient/Quaternion" -distfiles="https://github.com/QMatrixClient/Quaternion/archive/${version}.tar.gz" -checksum=7e7278161e76b0bef5a19b487b6d6f5f5e81442e31f1212a155426e38dadd12b +homepage="https://github.com/quotient-im/Quaternion" +distfiles="https://github.com/quotient-im/Quaternion/archive/${version}.tar.gz" +checksum=a865f29a6342fd7cc2a7bbfb0bf215fcb8abebd72320302b9a76a6a5a80a0df0 build_options="qtkeychain" build_options_default="qtkeychain" From cf768bf2f3a53cb362aab7b662a8cdbd2bcb013c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Wed, 5 Jun 2019 05:40:16 +0200 Subject: [PATCH 314/400] google-fonts-ttf: update to 20190605 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: #12153 Signed-off-by: Jürgen Buchmüller --- srcpkgs/google-fonts-ttf/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/google-fonts-ttf/template b/srcpkgs/google-fonts-ttf/template index e089a6cf947..25ac61c5dbe 100644 --- a/srcpkgs/google-fonts-ttf/template +++ b/srcpkgs/google-fonts-ttf/template @@ -1,9 +1,9 @@ # Template file for 'google-fonts-ttf' pkgname=google-fonts-ttf -version=20170727 -revision=2 +version=20190605 +revision=1 archs=noarch -_githash=90ed26b96d60bccb6ab7db5494af1f92959489e8 +_githash=87776223497b72be361b5c08ba16e9c659209f37 wrksrc="fonts-${_githash}" depends="font-util cantarell-fonts noto-fonts-ttf" font_dirs="/usr/share/fonts/TTF" @@ -12,7 +12,7 @@ maintainer="Alessio Sergi " homepage="https://www.google.com/fonts" license="Apache-2.0, OFL-1.1, UFL-1.0" distfiles="https://github.com/google/fonts/archive/${_githash}.tar.gz" -checksum=19234a08b5819de29b68e2995e34a3ac34b5203433e193cf84df43875dcf273b +checksum=84b24d1efa96316f2aab9be9d5352923ab8c2622a15d38bdff22c518c6a1deb1 conflicts="fonts-croscore-ttf>=0 font-fira-ttf>=0 font-sourcecodepro>=0 ttf-ubuntu-font-family>=0 font-vollkorn-ttf>=0" From 8fdb9433f61562fc5945dbf9b5574b64a518ba9c Mon Sep 17 00:00:00 2001 From: Johannes Date: Tue, 4 Jun 2019 16:39:17 +0200 Subject: [PATCH 315/400] icecat: fix cross [ci skip] --- .../icecat/patches/fix-webrtc-glibcisms.patch | 22 ++++++++++++++----- srcpkgs/icecat/template | 19 ++++++++-------- 2 files changed, 25 insertions(+), 16 deletions(-) diff --git a/srcpkgs/icecat/patches/fix-webrtc-glibcisms.patch b/srcpkgs/icecat/patches/fix-webrtc-glibcisms.patch index 0a9304430b2..3ff2570b12b 100644 --- a/srcpkgs/icecat/patches/fix-webrtc-glibcisms.patch +++ b/srcpkgs/icecat/patches/fix-webrtc-glibcisms.patch @@ -1,13 +1,23 @@ ---- media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features_linux.c.orig 2018-05-09 23:48:44.677389171 +0200 -+++ media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features_linux.c 2018-05-09 23:48:56.254373557 +0200 -@@ -11,7 +11,9 @@ +--- 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 -#if __GLIBC_PREREQ(2, 16) -+#if !__GLIBC__ -+#include -+#elif __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 @@ + int architecture = 0; + unsigned long hwcap = 0; + const char* platform = NULL; +-#if __GLIBC_PREREQ(2, 16) ++#if !__GLIBC__ || __GLIBC_PREREQ(2, 16) + hwcap = getauxval(AT_HWCAP); + platform = (const char*)getauxval(AT_PLATFORM); + #else diff --git a/srcpkgs/icecat/template b/srcpkgs/icecat/template index f319d1e7435..7f21c874d77 100644 --- a/srcpkgs/icecat/template +++ b/srcpkgs/icecat/template @@ -2,6 +2,7 @@ pkgname=icecat version=60.7.0 revision=1 +build_helper="rust" hostmakedepends="autoconf213 unzip zip pkg-config perl python yasm cargo llvm clang rust cbindgen" makedepends="gtk+-devel hunspell-devel libXt-devel libatomic-devel @@ -18,12 +19,16 @@ homepage="https://www.gnu.org/software/${pkgname}/" distfiles="${GNU_SITE}/${pkgname}/${version}/${pkgname}-${version}-gnu1.tar.bz2" checksum=6873d55b13e2d95ede3bf5bb59769179e91b1c4e05d8538d1576f18c9a6bb827 lib32disabled=yes -# I missed something when peeking at firefox-esr template, sorry. -nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/18002/steps/shell_3/logs/stdio build_options="alsa dbus gtk3 pulseaudio startup_notification sndio xscreensaver" build_options_default="alsa dbus gtk3 pulseaudio startup_notification sndio xscreensaver" +case $XBPS_TARGET_MACHINE in + armv6*) + broken="required NEON extensions are not supported on armv6" + ;; +esac + CXXFLAGS="-Wno-class-memaccess -Wno-unused-function" case "$XBPS_TARGET_MACHINE" in @@ -48,14 +53,6 @@ do_build() { local triplet cp ${FILESDIR}/mozconfig .mozconfig - if [ "$CROSS_BUILD" ]; then - echo "ac_add_options --host=${XBPS_TRIPLET}" >>.mozconfig - echo "ac_add_options --target=${XBPS_CROSS_TRIPLET}" >>.mozconfig - else - echo "ac_add_options --host=${XBPS_TRIPLET}" >>.mozconfig - echo "ac_add_options --target=${XBPS_TRIPLET}" >>.mozconfig - fi - case "$XBPS_TARGET_MACHINE" in *-musl) echo "ac_add_options --disable-jemalloc" >>.mozconfig @@ -94,6 +91,8 @@ do_build() { echo "ac_add_options --host=$XBPS_TRIPLET" >>.mozconfig fi + mkdir -p third_party/rust/libloading/.deps + case "$XBPS_TARGET_MACHINE" in i686*) echo "ac_add_options --disable-debug-symbols" >>.mozconfig From b493c6e2975ef32e4f697ccb3f634670f9eb9e88 Mon Sep 17 00:00:00 2001 From: Doan Tran Cong Danh Date: Wed, 5 Jun 2019 06:19:10 +0700 Subject: [PATCH 316/400] vim: update to 8.1.1467. Closes: #12154 [via git-merge-pr] --- srcpkgs/vim/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/vim/template b/srcpkgs/vim/template index e8a484307b0..f60f8b3971c 100644 --- a/srcpkgs/vim/template +++ b/srcpkgs/vim/template @@ -1,6 +1,6 @@ # Template file for 'vim' pkgname=vim -version=8.1.1027 +version=8.1.1467 revision=1 hostmakedepends="glib-devel pkg-config" makedepends="acl-devel gtk+-devel libXt-devel lua-devel ncurses-devel @@ -11,7 +11,7 @@ maintainer="Juan RP " license="Vim" homepage="https://www.vim.org" distfiles="https://github.com/vim/vim/archive/v${version}.tar.gz" -checksum=d8d22ac4ed8a2e74a7e559e4a66bd7242dca7e2c9b877805fbf69bd2dc4077d5 +checksum=92f97f005f27c17b0cc15fffa084038361b957c40501c4c0eb263fcd0fc6fd11 subpackages="xxd vim-common vim-x11 gvim" # XXX vim-huge cannot be cross compiled for now. From 6391ce81150f627db8fe75a882dcaca3520a9d99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Wed, 5 Jun 2019 09:04:26 +0200 Subject: [PATCH 317/400] lollypop: update to 1.0.12 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/lollypop/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/lollypop/template b/srcpkgs/lollypop/template index 1d45a256c50..bdb6d41b1b7 100644 --- a/srcpkgs/lollypop/template +++ b/srcpkgs/lollypop/template @@ -1,9 +1,9 @@ # Template file for 'lollypop' pkgname=lollypop -version=1.0.11 +version=1.0.12 revision=1 # Gitlab upload tag hash -_uhash=7127b40865afb12d6a07435c4396f34a +_uhash=011cb4140566625941a0fc645ac6d528 archs=noarch build_style=meson pycompile_module="lollypop" @@ -17,4 +17,4 @@ maintainer="Jürgen Buchmüller " license="GPL-3.0-or-later" homepage="https://wiki.gnome.org/Apps/Lollypop" distfiles="https://gitlab.gnome.org/World/${pkgname}/uploads/${_uhash}/${pkgname}-${version}.tar.xz" -checksum=274e59deeb9cb359eb803cc15788c479f9dc2aaaeb94fc14547eae178ed2d2e2 +checksum=72de08a564e7862888570550078a84a8ad97096f99c3fec8898b2fc29b02c9ab From 9a7bac42aecc1ec65ba2593945c00940fd511ea4 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 5 Jun 2019 13:26:53 +0200 Subject: [PATCH 318/400] gnumeric: update to 1.12.45. --- srcpkgs/gnumeric/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnumeric/template b/srcpkgs/gnumeric/template index 9d0dff93747..ae54b7b997a 100644 --- a/srcpkgs/gnumeric/template +++ b/srcpkgs/gnumeric/template @@ -1,6 +1,6 @@ # Template file for 'gnumeric' pkgname=gnumeric -version=1.12.44 +version=1.12.45 revision=1 build_style=gnu-configure hostmakedepends="bison gdk-pixbuf-devel glib-devel intltool itstool pkg-config " @@ -11,7 +11,7 @@ license="GPL-3.0-or-later" homepage="http://gnumeric.org/" changelog="https://raw.githubusercontent.com/GNOME/gnumeric/master/NEWS" distfiles="${GNOME_SITE}/gnumeric/${version%.*}/gnumeric-${version}.tar.xz" -checksum=60ea794bf3bffe54fe3d56305e487947d30c14b525fd7c8ad46d79c384498704 +checksum=3098ada0a24effbde52b0074968a8dc03b7cf1c522e9e1b1186f48bb67a00d31 # This isn't a direct dependency but when soname bumping perl it will # cause build failures From 94637e58ed1900c0b5d3131681b7c5486b4bd618 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Wed, 5 Jun 2019 06:35:10 -0500 Subject: [PATCH 319/400] master-pdf-editor: update to 5.4.20 --- srcpkgs/master-pdf-editor/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/master-pdf-editor/template b/srcpkgs/master-pdf-editor/template index e2e14e4bcea..1dd8037b365 100644 --- a/srcpkgs/master-pdf-editor/template +++ b/srcpkgs/master-pdf-editor/template @@ -1,6 +1,6 @@ # Template file for 'master-pdf-editor' pkgname=master-pdf-editor -version=5.4.10 +version=5.4.20 revision=1 archs="x86_64" wrksrc="master-pdf-editor-5" @@ -9,8 +9,8 @@ short_desc="Multifunctional PDF Editor" maintainer="Giuseppe Fierro " license="Proprietary" homepage="https://code-industry.net/free-pdf-editor/" -distfiles="https://code-industry.net/public/${pkgname}-${version}_qt5.amd64.tar.gz" -checksum=c7614b99a37c4d70dcb7adfdad5dda1a7d15468611d87063b6aaa727165402a4 +distfiles="https://code-industry.net/public/${pkgname}-${version}-qt5.amd64.tar.gz" +checksum=426da432006a99e2921125543573794e1388161ee85b1d50feea117619293e9f nostrip=yes repository=nonfree From 6ee3c3ccec16770c9030a381f8d3219e90c914b8 Mon Sep 17 00:00:00 2001 From: not-chicken Date: Wed, 5 Jun 2019 06:40:06 +0530 Subject: [PATCH 320/400] foliate: update to 1.1.1 --- srcpkgs/foliate/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/foliate/template b/srcpkgs/foliate/template index c5e42246660..bfee978dca0 100644 --- a/srcpkgs/foliate/template +++ b/srcpkgs/foliate/template @@ -1,13 +1,13 @@ # Template file for 'foliate' pkgname=foliate -version=1.1.0 +version=1.1.1 revision=1 build_style=meson -hostmakedepends="pkg-config gjs glib-devel meson ninja" -depends="webkit2gtk libsoup" +hostmakedepends="pkg-config gjs glib-devel ninja" +depends="webkit2gtk libsoup 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/${pkgname}/archive/${version}.tar.gz" -checksum=adf62b26a64011789a26745dc8b2b095b18f9620a3834b92a5e1a7435a195927 +checksum=8adfb7beb0be197c11376ee5e6d927b7c033d603d6b762ad19f5414c5bf876e7 From a0ce460924f2cdd2a26d72a610154e8ec042ea51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= Date: Wed, 5 Jun 2019 01:11:43 +0200 Subject: [PATCH 321/400] dnscrypt-proxy: update to 2.0.25. --- srcpkgs/dnscrypt-proxy/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/dnscrypt-proxy/template b/srcpkgs/dnscrypt-proxy/template index 8a39b51b663..d2533a5fdce 100644 --- a/srcpkgs/dnscrypt-proxy/template +++ b/srcpkgs/dnscrypt-proxy/template @@ -1,6 +1,6 @@ # Template file for 'dnscrypt-proxy' pkgname=dnscrypt-proxy -version=2.0.23 +version=2.0.25 revision=1 build_style=go go_import_path=github.com/jedisct1/dnscrypt-proxy @@ -11,7 +11,7 @@ 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=d405a562b0d4b0101a11347c1647bb55351945d82d67565b396794babf296905 +checksum=774696004c9e306e1723b4cbbe66a961128a335543d318d0786492ce69b906fa conf_files="/etc/dnscrypt-proxy.toml" system_accounts="dnscrypt_proxy" make_dirs="/var/log/dnscrypt-proxy 0750 dnscrypt_proxy dnscrypt_proxy" From ddf0d5015c885720052641e413b63770d175a0c1 Mon Sep 17 00:00:00 2001 From: Noel Cower Date: Tue, 4 Jun 2019 11:30:18 -0700 Subject: [PATCH 322/400] rebar3: update to 3.11.1. --- srcpkgs/rebar3/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/rebar3/template b/srcpkgs/rebar3/template index 63702394812..5559a9ccf72 100644 --- a/srcpkgs/rebar3/template +++ b/srcpkgs/rebar3/template @@ -1,6 +1,6 @@ # Template file for 'rebar3' pkgname=rebar3 -version=3.11.0 +version=3.11.1 revision=1 archs=noarch hostmakedepends=erlang @@ -10,7 +10,7 @@ maintainer="Noel Cower " license="Apache-2.0" homepage="https://www.rebar3.org/" distfiles="https://github.com/erlang/rebar3/archive/${version}.tar.gz" -checksum=d0f567bf5cfd60e16650b151a7caa24bf8164fb1c31359ce8b0452a683209421 +checksum=a1822db5210b96b5f8ef10e433b22df19c5fc54dfd847bcaab86c65151ce4171 do_build() { ./bootstrap From b3bfbaa2d3ecac3c25fa7eac1f582d515d9a1ad6 Mon Sep 17 00:00:00 2001 From: Noel Cower Date: Tue, 4 Jun 2019 12:47:19 -0700 Subject: [PATCH 323/400] erlang: update to 22.0.2. --- srcpkgs/erlang/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template index b6244e07081..a657dfb19a0 100644 --- a/srcpkgs/erlang/template +++ b/srcpkgs/erlang/template @@ -1,6 +1,6 @@ # Template file for 'erlang' pkgname=erlang -version=22.0.1 +version=22.0.2 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=694f133abfca3c7fb8376b223ea484413bcd16b82354f178fba798f37335f163 +checksum=7a9869f5da85349ef21bd9fbc8feafe1a1f563504a65924ddb542deeb37af7cd build_options="x11" From 15d1f2336909e69b3c5b0ca25ca4fcb35585ed74 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 4 Jun 2019 20:55:42 +0200 Subject: [PATCH 324/400] irqbalance: update to 1.6.0. Signed-off-by: Juan RP --- srcpkgs/irqbalance/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/irqbalance/template b/srcpkgs/irqbalance/template index f06efe564f6..676bfb8378e 100644 --- a/srcpkgs/irqbalance/template +++ b/srcpkgs/irqbalance/template @@ -1,6 +1,6 @@ # Template file for 'irqbalance' pkgname=irqbalance -version=1.5.0 +version=1.6.0 revision=1 build_style=gnu-configure hostmakedepends="automake libtool pkg-config" @@ -10,7 +10,7 @@ maintainer="Juan RP " license="GPL-2.0-only" homepage="https://github.com/Irqbalance/irqbalance" distfiles="https://github.com/Irqbalance/irqbalance/archive/v${version}.tar.gz" -checksum=3318eddc03782cfdad22b20eff18eaf378c498c5de286e8cbaa5521ddf4f810b +checksum=5ace9dd69d5190e24ee34210c3131333e9963e3ba649bf9237eabb4313c300d2 case "$XBPS_TARGET_MACHINE" in i686*|x86_64*|ppc64*) makedepends+=" libnuma-devel";; From 8b60714249ca19402eb4ad7716e0b369abec0b28 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Mon, 3 Jun 2019 19:54:57 -0500 Subject: [PATCH 325/400] projectlibre: update to 1.9.1 --- .../projectlibre/patches/010.no-bashism.patch | 20 +++++++++---------- .../patches/020.fix-projhome.patch | 12 +++++------ srcpkgs/projectlibre/template | 4 ++-- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/srcpkgs/projectlibre/patches/010.no-bashism.patch b/srcpkgs/projectlibre/patches/010.no-bashism.patch index 9da8488dcbf..72d53b65c96 100644 --- a/srcpkgs/projectlibre/patches/010.no-bashism.patch +++ b/srcpkgs/projectlibre/patches/010.no-bashism.patch @@ -1,17 +1,17 @@ ---- projectlibre.sh +--- projectlibre.sh.orig +++ projectlibre.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh - # - #The contents of this file are subject to the Common Public Attribution License - #Version 1.0 (the "License"); you may not use this file except in compliance with -@@ -179,7 +179,7 @@ - OPENPROJ_HOME="$OPENPROJ_HOME0" - #OPENPROJ_HOME can be harmful with multiple versions. disable - JAVA_OK="1" -- run_openproj --silentlyFail true "$@" || if [[ $? -eq 126 || $? -eq 127 || $? -eq 64 ]]; then -+ run_openproj --silentlyFail true "$@" || if [ $? -eq 126 -o $? -eq 127 -o $? -eq 64 ]; then + + #******************************************************************************* + # The contents of this file are subject to the Common Public Attribution License +@@ -199,7 +199,7 @@ + PROJECTLIBRE_HOME="$PROJECTLIBRE_HOME0" + #PROJECTLIBRE_HOME can be harmful with multiple versions. disable + JAVA_OK="1" +- run_projectlibre --silentlyFail true "$@" || if [[ $? -eq 126 || $? -eq 127 || $? -eq 64 ]]; then ++ run_projectlibre --silentlyFail true "$@" || if [ $? -eq 126 -o $? -eq 127 -o $? -eq 64 ]; then #126 command invoked cannot execute #127 command not found #64 bad java version/impl diff --git a/srcpkgs/projectlibre/patches/020.fix-projhome.patch b/srcpkgs/projectlibre/patches/020.fix-projhome.patch index 0b468bc6e22..879c27352a7 100644 --- a/srcpkgs/projectlibre/patches/020.fix-projhome.patch +++ b/srcpkgs/projectlibre/patches/020.fix-projhome.patch @@ -1,12 +1,12 @@ ---- projectlibre.sh +--- projectlibre.sh.orig +++ projectlibre.sh -@@ -63,8 +63,7 @@ +@@ -70,8 +70,7 @@ #Default conf values JAVA_EXE="java" JAVA_OPTS="-Xms128m -Xmx768m" --#OPENPROJ_HOME0="/usr/share/projectlibre" --OPENPROJ_HOME0=`(dirname $0)` -+OPENPROJ_HOME0="/usr/share/projectlibre" - OPENPROJ_HOME="$OPENPROJ_HOME0" +-#PROJECTLIBRE_HOME0="/usr/share/projectlibre" +-PROJECTLIBRE_HOME0=`(dirname $0)` ++PROJECTLIBRE_HOME0="/usr/share/projectlibre" + PROJECTLIBRE_HOME="$PROJECTLIBRE_HOME0" LOG_LEVEL="DEBUG" LOG_FILE="/dev/null" diff --git a/srcpkgs/projectlibre/template b/srcpkgs/projectlibre/template index ee285d678af..219e4522e62 100644 --- a/srcpkgs/projectlibre/template +++ b/srcpkgs/projectlibre/template @@ -1,6 +1,6 @@ # Template file for 'projectlibre' pkgname=projectlibre -version=1.8.0 +version=1.9.1 revision=1 depends="virtual?java-runtime virtual?awk" short_desc="Open source project management (replacement for MS project)" @@ -8,7 +8,7 @@ maintainer="Piraty " license="CPAL-1.0" homepage="http://www.projectlibre.com/" distfiles="${SOURCEFORGE_SITE}/projectlibre/1.8/projectlibre-${version}.tar.gz" -checksum=5341154a14718b8d070d7ea0d35a1686a3c37c78ced2a1ef9a0bed3adfab0bae +checksum=65ca96728eb5a31c3e23eb43181dde367d785a86b82f330ca52bc7b51c74a5bb do_install() { _dest="usr/share/projectlibre" From e29cdc3f7bf77cafa668811e5ad3ed6f187bbb99 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 4 Jun 2019 20:26:07 +0200 Subject: [PATCH 326/400] cogl: update to 1.22.4. Signed-off-by: Juan RP --- srcpkgs/cogl/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/cogl/template b/srcpkgs/cogl/template index ff0246c6375..055c196f37d 100644 --- a/srcpkgs/cogl/template +++ b/srcpkgs/cogl/template @@ -1,7 +1,7 @@ # Template file for 'cogl' pkgname=cogl -version=1.22.2 -revision=4 +version=1.22.4 +revision=1 build_style=gnu-configure build_helper="gir" configure_args="--enable-cairo=yes --enable-cogl-pango=yes @@ -17,7 +17,7 @@ maintainer="Juan RP " license="LGPL-2.1-or-later" homepage="http://www.clutter-project.org" distfiles="${GNOME_SITE}/cogl/${version%.*}/cogl-${version}.tar.xz" -checksum=39a718cdb64ea45225a7e94f88dddec1869ab37a21b339ad058a9d898782c00d +checksum=5217bf94cbca3df63268a3b79d017725382b9e592b891d1e7dc6212590ce0de0 # Package build options build_options="gir" From 9b9cd3a85abae680c28ba301c0bbbbeb78b9fd94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Wed, 5 Jun 2019 14:18:40 +0200 Subject: [PATCH 327/400] icecat-i18n: update to 60.7.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/icecat-i18n/template | 378 +++++++++++++++++------------------ 1 file changed, 189 insertions(+), 189 deletions(-) diff --git a/srcpkgs/icecat-i18n/template b/srcpkgs/icecat-i18n/template index 70fb9ed4ded..6d5f6bd80ea 100644 --- a/srcpkgs/icecat-i18n/template +++ b/srcpkgs/icecat-i18n/template @@ -1,6 +1,6 @@ # Template file for 'icecat-i18n' pkgname=icecat-i18n -version=60.3.0 +version=60.7.0 revision=1 build_style=meta homepage="https://directory.fsf.org/wiki/IceCat" @@ -144,191 +144,191 @@ _pkgtmpl() { } checksum=" - 5d746deac73ddcb603469bb16aad64c4ae6b4493d1732fc870acf0d9a8062111 - ec7ee4e39356ba4ca3824c5eefb029310edd628cd0c38c5c7398744dd7395bff - 84826ef09ff5bea855cf1e783ea918d11c0fd1d0f774aa4c6428d6d1a7352066 - 588ee43fd3adc727046d204c43d53a196914f0aa522dad1ca067a073d9bb7725 - 0e7279e258b80c6d3c888449604ff0d3c7689a23e4177cab37a2edfcb7b2630f - 31c17e2dfe608c2d0d9c96908396754522267f7844ef1db05d209e1ac5bab66c - 7fd94641b81bc363d5c5f8b0b99d4b17744486921304db7683c325834af5e216 - 2016afac7180e5eb0bd67bb0bdf90df639dfd8bedf127cf50dcdfb2af6257660 - 736fce3e73eee8bacea87667f2897a0035825560b066700854b44b62ec01e9ea - 950ee720e703703b5d9e7f63bd04394fc45656ce8035d98e2c9bff9c1f534311 - e303058d64b533cf165d9cc94b69b02d74bb95c30790d5c06900a4e91c17e183 - 7f388186b4e25048558a76a133fb1a0b587673de4b3b585bcd4c4d70b7b6e84f - c496cfd6755b78863cca69c2963672cdb086e0a83784845eef53c8f68da6aeee - c96683b19012212667d2bb135c69a87929a7b39ccd515302e4fd7635a5e3c649 - 7d6c19d98e9042009fdbc5bb4ef3d8aef36228ddeefaa41b39899778f3de63d3 - 9d728b0ebf08f2587087bdc7b911485cda45e0fb120e5161a6427f8006b05424 - 465b60c4746591fcb01833b6ea19b88f00eb847f59f62ed91b9fe2310e204520 - 05afca090da39de8fd0bca8071a3366ea38f9ec73eddeef6233fb419cece368c - 06ab14acc2ebaceb9e5bbe529ea2d14d78e2ff8caa6a64a44ea9ac7a93550fe8 - 7b46ae83333139f7f7b708250d9208befbc917b7adc7c9faa5a9cfb32e51f44d - 6116fae216adaebd0cc4caa1c3fc350553c3068abb8f8e2c28e3d7cfb62fd25e - f43ee23b5f6c031d7ac326e327bea8ee1eb9e26165b08dbd64dc4df6e47550e9 - 119c53e74d2d1fc73ef8ef8f028736696a65b749feaefc730c24258105f620b6 - b3d7dd283d816931eaa793d83704a9fb410e389457497c45cd40ac3a405a9d7e - 7beb337f5f7894e356f81f8b0c0e14e26aea7dc83fe975a35bc14f174dbef14e - dd3a3b9e1980f1742cbcb4f50bc34a28b8c813b34225e542be58509dc3ced4de - c2c8ac9b4804c997b9080ef34d1950d3fdf32a2ac71c0ea488c02ac0dc787b86 - 298331984d1e9e0c0fe51b742ec61acd4096e170ee7768f19cb3854cb7271b8d - 4a962e88635f7c09f6c586f84a0b772a7609dab055a63ddf9a988d7bc8511b8f - 97faf22511911b5f6a73d0c038dd33f8bd4936058b1234e2faf3ea171acd24e7 - de04951a7ccbee2bf5ba8b73607344ceaf04c9c5e408c27f8b09701d3b4481da - 37072b748a04e10066fab08396b10002027502b2a2b9a4b0e0b740ec1df6d787 - c7a72e8d75a10cd159257639d2d86ff00b20c331263563f13156db1261d56e77 - b21fb77247947edbf0c0a6b888de9ba810a496d4a7cb1ba5b8352adff698af0e - eeba3c0d52f0999f73d5d056b2da37ed718f8676347da4d4bccebb5180f7eaf4 - 8f781201865ce4dafcff6deca63a9f60e5cc5b93b43acf8e1797e7714bd86254 - 06f472dfd372ce273af1f15e1a98c43cdf9d36f25653f4521f8d403a97509d30 - c4aeaa912be50872b270499c0e70745fac3ec5568174b7ebbac14bfef3ebb84a - a6869b5dc4e4ebc0a88eefa8f2e2176b9b42cbe6a3ee97833a725806ba350e18 - 8c4bed220a3974327a1ffbb18a180b0fcb6e6cc170afbc61247216f07fb74ac8 - cf664befd58188b20e9e403836799780fed3d6c46666f92669dba9744f2c10fa - 31377120c0b67046aaa728d4a351365432a91e479afacdedbc37dabc39b0bac5 - 31fe21934ebd11d8682e1e52322587d082044c3a0ffdfabb3286529872316f0d - f57c7ca0e2606f109f66d3a1e026505a184fdbfa74f9fe6d216f0e6b04bc593a - 7eb1136fa152fb42e312c5571bf6f67acfd5f564fe3d55e1d4f6801562d9fcaa - f7729c1371a97780fff40918e0647235518e68df0ef7f08e291a88b38debb0c7 - 2e9f95a291ed1a299559b1817057601078dbc485d362982bd6fcc03745f49646 - 57396b015e1f8bb09f67df8f452159086274a188e6028b751a603e04d4ff1f86 - 88372b4a1cbebd593c0b122b9e4c91b93f9b5e5952c19e65499d98337a307d24 - 0afb75c93e18c6bd4583e947fea4d53cd977e80ab4b8cc70dc23d51408dd6a56 - 1e7a702fc8a5cdb0bb4ea87874632adb95d3756ac5b02aacae0665f20b5754f9 - 6654c18dbdb9307a3f786f9dea30b0cf6ebc6887df6c8b88a2a3e7620da80bff - 75b4a7b36fd361ea69a46226e6d820476c72f5cb53958319f256cb1b54503a3b - a828e143f6669972c5670d155e2b74edd442a96e08a46834aec6d9851f7146f7 - 4d627e01aecf009661359e44245d50fdc1a1868b4b7fb16345048667d51755ba - 45130843ed9d4926b051ceb853b7e370812c30365f1224390f885cc903ce43cc - fd3af1c3a871e0c66022651567fac84fd2c37efa8e8850984073583f198724f4 - ecacb243b730132e1757ab2eb6e4ce838da0a82f6bc4d7991beaff2cb82f48d9 - 933e5d4af1f4577e92bc429eb0679451d9b60479c343a736d46cca7ddc74bb13 - 1f14778ace038b7ad1815e150062a7bdcdd7b8869d82b633fee23c3c64e08e1c - 45383535a03addc610b9cd6ca05a7c4d7094486e9c6782e9b7ce6e9e884f0545 - e9327d563fe659e3f48ffaab1b60841951bdf4ba557382c89efb328ec4b301cf - 78a704f151b5633cd1a6713922b72e400e2104c769a8cd64981489e5b9f2af1e - 9da334c5b0a1ff1cc8ac4f9f552c5d894cf5c80d3feefedafa91176710c369aa - c79790329bae8570bc78a083c4824fd6610d232f71dcb54367a80de00744f227 - 2e706514f50d0be2ffdd2062ddccfcd2bd2e64612d07355f95d4119d3eb0100b - 64d7c10bffe3fae9b380f47ae32454b1f8e788b66e6d9263fa744ae67cc1797c - f8dc37e2514349c7c586f2c96c859b78d0edd53829d396d7a41ba167cffd5614 - 547915e72efe380df514429e4b4df39586a085835f1840d3e4daef2746b2581b - ad4520353a8db9073f2e41057f91a9d6cf6ebaadc5c4c8ee02df7c7c3121995c - 1f60e74f35f6e6753dbff4205cf4386adb87972306e15897bf4aad1cd3702411 - bacfe390c308eddf5317ffb98924b74f5b2ba2f7bab7085d998f317a67000582 - 506361556148c820fe35b1b867662d971aea2e1cde494820884807a86d7e6a6b - b0edb5796c82d4485ecee463e49e58318f924c51666eee0638a232c2664696bb - f83d22582f6889c1ebe30a8aa095adf258fac1012c2c0075b6211066f485f064 - baa424b7577df805e112979e3ba42583bee539f1109a2ea9b411f0d87701a65f - b8d39bb1c56400ef5e3717c468b77c265f118c27ff5f02550545b0d4e709b25e - 35e011bf6f6086cc8163e2802885db1ed20f05d1869f0eb90f4b0b261488c115 - bb7a51a3dd9e7a17ddeff7af8f516a80f7edb8384cd909e0b08e3dc32bbed317 - 20973eeed6758528e21e071525088191208b602d092da0b551757e8d6b9114df - 3de8f6433ff044b259dedb19ade41d82a55bbf1efa52e815673ebf81301a92d6 - 9667022556f1b76f490971984ff3e453576598969d12dd8c7ecb9c87826be098 - a59652fd1b7be72f64a01ecf1c0e6f84f4c6a9376bf35a12531e7091f401afbb - 4a345ebca9742f771979d67d6bf4f5e4ae123e68278e0f278de9723ef286ff02 - b6562c273a57deed3330e4c73ac0a21958fc3e4e3de1aecc8242ecea1df7dd68 - bae615d5567e0fd0834ba123f8abf3e9417b6a7f27cad6f11fec31476c7a879a - 1ffa6e7108db514145fa10bc680bc6c45544e0b8a13151c75886838fc910487c - b698705cd7f9afd3aed59de28f55b114192cade44e02e0ecf2e023ef1cb47173 - 8ef8709c73f74fa8e450f56e0943c4075c9d9850645244489eede52a35ffe28b - eba52b3ee235434f50ef4fe5a72328a14ceaae25e073b4935e62d7255764cd6d - 7501448ec2412aed7eba026c0856daf4f83cf38bcf32e09d6e5d632fd8c5198f - 7f94d8f7384ac93c878b943b0f9737b777b5b432541f8377075936ae8616f45f - 47450ad32fc8f397a12cf73aa9393f340cc4ca6473219f376e60498d9be49623 - 21958127ad69fdbd16035e33cb4f03d691dc8456c6dc54b5e136d3cfb0b22210 - ba55ada58e2cf0def7259d3ca10e99e85f84c46163458a691cd45e3f15d84749 - af821a6bb27ae97d3ff84fd1d04560c321249bd36af6c171a88f1735ff4d7508 - 1b476fa510333f6a5d799eeabb5c221dae45b1f4c7b1c41a586743a281de8b94 - d63a96a1e53fb023e7ad289f2d5395790ac1cb5c106cb8a42cf0bb889fef2027 - ddca7ec3235d3fa2df652618405be3a8147d0d8a1b3ba2d8530bd7b67aa69993 - 9f420d342590ce15b10246725411acc39e2d6c9c4b043e5e4665a397296439e3 - 893a968f5aaab04a0fabd8817d53abab4f5dc7469bba6af4ab8512f2f468c0c6 - 24415993bae90c403e9d7b06b9dd5d41a23c6af31b9375c0e29d2b42c126617d - bd1685dc2299d1a657bbe9448aebb2f2f13d6d5ca4aee873717170e420453732 - 4647b3590fd19a3f879a1c2527da8e5017e2b55ff87bbed97a71a31b60a8f1b1 - 083d57c3eba8d2055e84dcb0d6258ae94d5ce636a437aa663145245211e1bb20 - a2208fffefeb09d559893621ac9eabccb60d4f0324eeae85de9a0912d73456f6 - 75f1f88d6777a63ce2f42657af770281cde1d7dff4ae94fb0cc18948dd04adc1 - d1ef92b68cc93b5afcad83294ad170c9a2844325fb4144b0e61274c08e3c1039 - 5345ed8f6ee49f9f0e88f67aba7b7d75054d1235ef0b9e2d8d67d0efdd24b9fa - 27d830165e471179b28718f3ceb52c3abff4fd3b44c4371b8910bca42f349c4c - cf3f7489b49bebf70fd2e8150152873342165986a435088599415bb5d58fd7ae - 0501c17107d9d7bb281508825d6e12acf311ec2ab742efad92a4fa67db84133b - c47f569ef2ca0b949044935df52b23d2bae6fdd74acdf2e47035ed35a44579c4 - 824f64af3e59223d3723a38489c35a48905e92e55a21fbdbebf98c57123d9470 - 2ad931b63bb50f722c106cd20a00263483ee62dd2f7f9b8c06a287843af83ab1 - e395884ef6e7387073aeecd59c8ed1a198e5d994a5e2af05ec829c1eafa894c2 - 7cc23a878cc99281a5c53580655623281e3973378be440bd5836c9118bb442df - cf1cf8321f9c76f6d70a2d9e0f78cd183ef2745b74477731c49d85e9f6300c6f - c58606da1ee34d609d16468c166485374288c14a1ffe467498aed01632f2369b - b3c7582d4f70ae6842d3ccb9f027f8a1d1d5a9fa71107b3d6577a77145cdb0ba - 9aa5072ccf248c8dd57f8e178537ca3a121947718f98f921ad2f8788c9b9466d - 0c18afc77eb671d7d5e1cb28db97d7179ef68a07b59c7bd3ecfd7c313014ee5a - f6410d572172520b48b0fb1fa95b5ba958cddee528dac1e6f2523ad28f3fe71c - 3c620efda7225c79c6accc093505748d131f4acebb90e9c3a359d98657a40be1 - 3d5a68a18be4860babe722754f7a73690404aff2a4bdaa3316bda1ba80faf3a0 - f582d8df584d1583470bdab3973aa3b22e55574dab42766d2e5d2d2c17168fd0 - 2b81873ef0b9be8ea68af0062853d91f90b27d03a2a20d62666957a275fd8507 - d01e64ce1b3089ba870a474562e4bfa63b2453c66a16e9680f4a26461895f575 - bf48d638da661b1401987804e5933bffbcffd6468705e752c58ced52c4c4a9d2 - 5776fa40075a4e7124522f5b1af332318ab2c3663034736dead7ad50e65ca926 - 9db3299277d290821d69629e02163f2b5e5757c5bc6e4000020a377aaf11224a - 89641f3fdbceffb15f255d563f48f9bea4abbfb19288d66a9e943d71e4c8966d - 8eb7d250ac44475e5fd4180bb62dead921efe7c502de440c31733f1f71957a90 - 261bde52efa4e9b14ff25be50370e8c1ef75e0d5e53b2fda78bf64c9289e3287 - 808ce08d82d134b858ba2ce8818fb383fa3f3ec547ef44f869478b1763906a7a - 0fd37994992594158a7d857f23b0145388ba2ea276f1004dd4988c9ce2fb2a32 - c41b287d343a128cf201dc6ce2b73de20f75affd5c727a8256be84d820cd2957 - f83f92980352880ab7600cdca9cc611d2c8450077ee3c99040c2705019e024e9 - 5885f24b1493f0b45a56a24054c924c408dc665d250ab7f8f6fc89b1f85bf9ee - 75929197abd9c70cdb47994da32fe0cd768fcdf9b6fe010b9e934d4df1a01877 - 9076063e673b148ac80e62f18e304e77c85f3fbb6ca814e9a5c9256ea16db059 - 1ebaf0c6625ac2520a83079993874b1dae3a687251a61ef1254d089632f69f50 - af6259cf67d9657cdbf79660550341f7fb520a04b3556b4f8c42e0dc15ed06d7 - 52d0d4fc16a54e8d0361d8d05559ef09d3c04ff5101a96adb368337cf521a1f5 - f23955814bee020e63aebc227c6b2219e32e9a84f7fd94117c435e44d5344c6f - 4795b8ff0560c8765cc2ce2f219e6db901bd77b312de0bcce9b6d9c2e2678788 - 5c5e6d1ed0e201c73cc337a7c9dd9c4c1d4304e537e4f540d216b3c00595828b - 8b140107c3389f2cf9c12d196dddbad9e0d3351243ca4516ff8996cd4185e38d - 533c238c5618d442226ed326e80151e5138f88519a63f37dde2cca36db9603cd - d6686b7c81fcd0c01d2f3d235f86b30d7c98e1916ec110725e421dc2d7e5bd52 - ee294ee5773d83e846e97a66901846b915033363e8e276bbe9b412ba11fe66f0 - 8ea4a620d0ce1f56b43c02db3b826359f65a0f23047c0555dc18dd88446f3b87 - f9d39594e4e84a89d1321743bd5fa3e91aecb46e067a45ce170bb5d33f1b7cb0 - 71f7f172a5a02fc1aea890a5c09e4a6543b40f55d56705b6b24547c488e485e5 - 53b44444ccd1092252a6bf845b2b1e1b19f184bfd0569051b0c3f3331a3e4942 - 0266ab2c81b816a250ce48cf329018a29804004ed7a74b82e2a439b587a89952 - ee60ccae988b82ceace09792846f8e35a449209d014a364698faa75e828b4f93 - 4fed1962742f9c44f09e3ec6b16cf88c254cb2d16c211203997250ceb1151851 - 14a6cee06a9fced9394aa448b83d75c32573d2888c8ea929de1b610ffa31be31 - 831285981d529a0a225f035e90b00ce67407cf49042911b3aed82273f6648e15 - d30d2dffab9e71a60b556c80f751a684f2a4f944f2631204145ba086b0212f29 - 922a352edefbeb630a1ddba7f8ec349ab0b2b6a8ea1cb905618d9f0d7b2291e3 - 43f8841432baa90189a1cd0bf5db887a3790d94dd8f0b8fa5ace4e8b2c24eaa7 - cecf14fc76f65c92bfacc70124f2e74805da17fb4b89066c87fd255cf8171829 - ddbe92a4f2823dbf59b4c5eb65124564e655cda72231e894eead846bc0063e0e - b350dc4cabc84cd40c48500a95b833901f4b70f21434a4120178914c6ce9c3f7 - 0ea7a37183cdd91df4d229fcaf12fda01ab7c1ad9721988c3294ce09c1d26cd5 - 6043db6c6b376a658fb2ff570fa29396470ac285c504b66e6f0965a1156239af - 949e700d8d4bd52501ace564359ce10a9c887a900f1165fe05f2b44dd551c502 - 9c6ca456972017e89317155df48141fb6aebbb02c1460c641d4d60d8ce1b10cf - a09dd4948eea9bf7e11fbc715ee2196394fda2f53a84cccf649183b73a007e62 - 4ed24511720dc64092a0d8b0d4c8b084c31ccc2280772903b2fdd12ac03df4c3 - a1dea3abb6e597a44869f33c7e06877c7fcd80ac18203fcdbbb9fa48ad66f287 - 4dcc4b2df1c283e6cdaf20f37efd2ec461e983bdb33da3f199c7393abfec155f - a2c138ffe9f416371fd0038f08cd557a62c3fdf712b6c814aca9c08c80a0da9e - 550de275bdb7880db4b23795cf10df7bc6226701d046f4592e2b523a4fd044da - 2e217b9e88b4914eb5c24a9cdd6f5b8842147bd2b504fe637a058ce2781821f4 - 7a9da9441a75cea526b07db6fc84dc7a89fe3834d2915d499a31daa090811cc1 - 634009b741c81f38c06be52f185b687d46b4a8694793e2ab14ed37fb19dd3138 - 4a8ae68a88ed29741957c365d6d4f5056bfdf5c136b9892b8efd35ab0c48a699 - 30e85b67507912d15ef3a1ec491088a45280917612163eb5cb051ad4a2dc792b - faaeec1d882fe6ad69c414d487e17cafb610f91a2383e830d11341609e83b333 - cdf3f76f78ca0ff8d8f446e429c5a71d0116b2419910e90a72c1048bc0082f8a - a9029f2e76cea1b0219be466601c8278066461cdede7a805195d47dce161dd9d - 5c2bbf7a6f06cdd34cb3ee832bc32bf07658e1c2e1907bdf62864d70812fba49 - 874bd97a5a3ac60cb14b945b5fcfa60220b0285d82620862d4cabd595bdfddf9 - b5558452ae053db905467e1b3d4da3af3ced87db14a5ecd05158ca4383c903c7 - 357f76111b626b3b2259be3acf77715f0332b20f2618e3a9cf675d708b12c834" + 9a9b6d35fb0a638ea219b8192527a66f8cf66848cd5f8b1331f157178f129be9 + 96320d8bd658155c34f9b2826e61f768eba4f2ea4891d94dba4fe186dd76c77e + 48c11a9bd62752db6f68b524fa4d644b43874701c263c2d36420f96f5764f000 + 661084129a36ddd5cb02409170f0a5cf1a2c7cce3b82e2fefa6018547ef381df + 3af73f794928c97587a4c252c46a4e349d5a7282eb6f3dd438ee95fae5826c36 + 6334916c8d03ad59231b944def3e7d376cab082aa4c59bd68887bb4bdc4361d3 + 74fa9bc3283fb0297032f9ae218338e9ad711052e6e47d8f6427b6b336594132 + a7be00d4c5be7336800616478e3d264d40e300b5dd559d49bbc31bfdc2b9feba + 76949ae7368128082be3d2d1563df86ea73fce9c178f15a6fb3c043ec1d1e010 + e4f7e31324638b125f1513857ce42d2e9bd992ad51744886617354d1840156b1 + cca3ce580abfe10ca609c425967f332321ee240b61b4c8743f86a17d6cfcff46 + 490d962756885075f059a0c1e5d2bb4368dd6e1305dbafb1c2c4aaa5a80f1326 + 021d135144081d9aa600eaf0fdd95e2809a86d55e131c4152da58815a8628de9 + 80512516c6e175fb57e78cf59ce444a98ef89c0f71e961057e102269557dfbbd + 0f24b8393232d4bce775ef5a128289f65812288cfad275797bbd388bccd9080e + d90517684ac80e2cef117ceb62070a7aaea7a902ee8cae4a7c13143065e12b41 + 3083645bc62f03496e3ff0c0ba6bc519dcd1f9484382f0bc2c9e5298ed9ff039 + 04e3aec22d8a6eef845fa3dba11bc5c79187b5c59b1f321ca4b722d7153adb49 + 9b2f3167646827b5b83d012c5416ee20ac725c512699cdefe3659189da492d6d + c346c184ba35dd7e377df13c676ffef78eef6c6ec75fe20cef1938f4eb6abc9c + 0286b4bce1effebd551b1ce59e796f9a19915b0a6af4866099633d19869bdf0a + f8e8b81b9000076f0e8facad7efe91930cf8f9ea10980bb60e2110519b107b91 + 3dde627220a8662a04d0fe221666d3059c7fce7c460c47632a37d13d17faf406 + 7ce1e673ae23d619b5cdda48338fd5cae26b57aa9cef864ed1f81501830b36cd + 31eb8053dfeb4c6a7d4ba58d982636b6fe3285923d6593e6064f6d598ba614a5 + c5124f0e9e252c5de4e1db8da11a82766440b0f91541ee11c53408925d8e20be + a10a36b50ebf8b4599e92bfb333c5f69dca59af2aa456475f3446b22e61a6fdb + 076dc937e5c8cc2278bbfac447da93a3d0302fe47567a3bccacb6cac541cd0f8 + 8cb449d5e2a1624dcd6612a17c0ed9dbd5bf00273758cfe1015f83c0a64542f4 + bd813b4e922cbb98db28f0f4af660855c7d116c62c42ad8b06ab24e507b6951d + 2291bbb9e60cac937d579b4018382f2a441e84e3ae4821cd676360285de6b350 + 711310cff54f40098f34ccd327e785fd68928521ccdf0f75b3ed173224f5c929 + 5d71dce5a6f470c2bcac2b731d76935173f4807ced3d429cdc42fc6fe88a80b8 + 616dba921253b615b580593265b50ebf2097b1b95fc328f6b76bdf0c61647d9a + e596290831efd70ad0b72b527b30eee4fdc63c3fe286a6dbff39cd80efd184e4 + e13b407014abb331002b984a6cd0b4eaf745c72664f073def7e3d7492f9d7fa2 + ea9e6584872df5355e53b6f5e81092cd7a96993596613a950db190137271bcfa + 787d570a9966a184335b72f4c8c9dea215b2806856051361339ecaad22e91a4e + c1230554c01c11fc17456b6cff617ffa822606b2805b942972e9c80a00107d28 + f8b877dfb1441f889e3e6c39aff8eb691b8d8bac38460ab1b000e861ffaa6831 + 898489924471a52c312cd484a79dc6cb1e2c5b502de9259e1a8b1275e846b24c + eafe5dc07b3fa36ceee871f95495cae01d82bc40bbce896c2f895973e29dcc55 + e8aeec5e9582428261165097b3cddfcbfc51dbbb5966dd9c863ef490fc9a3022 + 7443f5d0914aad0a9c519317dafd4e7cb8c2e7b7caa943f4432db565827d4279 + a18d88e58c5d144755753418d2d87bf7733519b5bd8c95c553c1acb3c5ba11ef + fdab168c549bb297c932bd770a30c08fb4e343b1a4b06ffdec419d079577ee5b + 635e4d3ccebc91923d63512fd4caab42ef8064662f982e2ec0acc123ddbe5dd0 + f746f15eb35c750dfde745f434063baa4a71f18172b68d5f64d755e7b217ee51 + 3fe7bf905151d9a1520821aaca563bed3d7efbefbaaa5ab0f90d3d6d03dfdbc2 + 96ed1c3415ba664e42b433cb81e2757fcfe1f59ec174133afe318d4668a8af18 + ffb7f876877e2a9fe9e16e4165c707b44f7eab34200f912221d7a3b5174e1e4b + 92e07de48fa1bc6af3d0d0447666e3ea30a22d1bd9cb96f1324f1b75c33eab73 + 4506b415cb6add080b6ebbdeeff45ce45438a9b9c43c1b5896bc2200ca9a2c48 + efb123e92b2b6a9734e002b83b3232c3450a66efaea1969a3dae772e7cdb55c2 + 80e6962f8c24a618ef6920c2e9435bf94e2c66dc26c169137336f89c27e24fb3 + 0ac883b307c7c8acbcf85871ac923b034eb95607546c37bf60e18e64b1865071 + 42dc6497feaee68bc35ed6bc96dda8a8c0dc2203e7af7f76bac73c6ab789d57b + 1cb6dd80de54445654ad6e90c470c681d5b00796ab6722a8c4fa6c7f1541c03d + d672474bd87025bd231127adc420fedeb861515e9c6c91b61de3d0020abef571 + 78533cfa1304b4f452e43bf5c30d84c918de9dfe975a7e6990de12939b18c497 + b7ec6535b3c1a3d7311f337a3ece5bf12fca98b7706e0eeb7e639f3fdff0917d + 14e3876253385034890f49e2e39ef6c720b7a71c73f7ad29d58d48d7cd3910a7 + 0cc87817c615b4287063fa4cce6aa2fb7f1d8a6f15260484badb4330cd647af9 + ddaafad43cbd949db84ebc3585acce15f33b4a60740f36d9db55355355166f73 + 899eff671b85d9adf3a6e6175dcee8a383d465555a592d0d921df0004040fd50 + 59c2e3a9ca782fd739ec0a847fff0446489f302eff7593221b718fb9628ca2c1 + 3ef016345ae59110a5728f7332b6fc74844e2541a8542a1128a9af1310db41e7 + d42ddb3fd5b2df31ec80950719570137dc82c5ab1efbfc82c4c1345da315f29a + 27f69bef39bcb1a1e52d7b16384dca2be0ce1b98fb3a105454bacf774bff21b7 + edae87d0bf4371103bbf3ee91c138415e818df332af4049f51e9b25740305ca7 + e54f304d2ea5f5a3833dbec222bd463acbaea29a1f56a92fede342893c99da02 + f9743aa288c68274a22a5923daecc8f4282d280b09ece4f1833ef4f9590c394e + d097af5065b52b9d8a90e73a0148a825a49c7b6523c67a222b28362616219ca7 + 3f5b96938c3a6ca2008c8bd32c8600caddfb56fe82a379fa4249dea18b304f59 + 0dc2808a9a87f2b0b583b8f174f9ba3ba3708d869b99f446158d8abbabd923c0 + 4021b8399c9182176169622d1813f680b4e92a29d9ac6a7c0a646770a01b83fe + 91bf7e454626d118ff54df707f9b7ad79535d1a6b041371200f04ecdde1218b3 + a86e9d60714c2df952b05c653300e2039d1f983983352b8e8ad64ce3a34b3f2a + 9ef3b79bb9b8b7d1c6faaa8b4a6437c7cf828f7993b85c95e4b7732b95498dd8 + d154b379ee0f1693ee47bb841828060c041a370c3d0cf7094cb9c9810dbd6bd3 + a89738d6670ef75dc32e09e3f65295ad0a72523f0ce8ca30e798029d06cb2341 + c26f157b64160d05a8e1992384f3a12212149ef7e277dfddd5f19f5a8a7d5f84 + ce00fa857b3f2ca17003a589c03e6308cad52842e0f7b83f1a072e2843f5d525 + 27dcde17fcdd1847e881cddb1a78c3d85261db11dfecd3407d74e2e550bd1be6 + 6783832dcf2991091d3af5579a353e3b9d583d2cdf927a72f6019e7b1d488b85 + 78cdf343b7398282f5474bcf01e8998a95683679265b067b29989d894bad768b + 885a9b2e7bd4ceaca992d954ed1c2bde6ab216eb89551143dd07944c819ee5f7 + 2b64d6c4fc44aa2bdfd2f879428f557d61f31adc8ce51124066a3733209e1a27 + 48bbc1d84b40f3d0abe65ba9e102d822fc2908d213c0cbb3fd3f6aec17da82e4 + 16ecbcd402da5facc5805088146f9ba3c9218ec78c49367b2b30cbe514b8380f + 3d8563fb06d85c1b4bc1cd12e5f32d0e2109db727d0b310e9d8931de64242ad3 + fd6d91237159bf205e1966b881a57645ee1f325f711f5a1d278c1b6cff542319 + 72a24a87ba3f6be9b1bf477ab4ff9a080c4db1eaa46986db79b4cd3569351501 + dd1c6c7d9ba24a9547e8b619c28f75cdad16834329b5ae1da687d75cb00d5a36 + 4b9eb3fb8ef8a217ace829d30342f06ce5cd1ae3657e8e8b3515083f140af1ef + 742ef17f01aba1d923623b000763a14e7983f70da34c9c7fc2df7344088b968f + 76155e496ed81de0832a2df80458a806c4ec7ad9940bc591f18ad37570871ef5 + f8dcd81d9aa612344a6807e565073c80b9fbf551bb776c7981e4dbb03605fc4f + 06564522121b92d9494c24b8613e4277745682295ba3a28bac78b44b390a472f + c512cc5addf7efff8972e098e6e3dcfb832046099625921a39ef3619c4e711f0 + a54f48264fb1557cd5bd3bd33168087b61a7b4232f739a395f133c3178b40c83 + 144152da430ddad24c4e732ce274a703c07af5dfef653c23515a302adbd27e64 + 086ff730ed094ed7b0c3f42ea229813e36b6ded6a600d45f4bc01c2a31e9f7a8 + b299afe2223a0a242e986afba246ea0feecf1e2136940e3c82a37f4cc332f124 + 41d08badfefb329f6c209714ef7dc0ed7105c9093ac0d1a65e514d02c67bf4e4 + 549318962dd51c291835b261b700cb2eee6040b9c4c42c1261b0032c69649adf + 81ded864c7840971a7a54d045f10d4b58d7a80426f26c3d7f8670cc70b349614 + 336f6c512fafa7d35880cb24c7f9a1afed5c23ac5c6fd57a6556594603a669dc + 74b56f680e0ff0c36b58e666bf4ed2357d0803cdd7e70f867e85a6da9984ab5b + a53856e1761d0b1598b2af16ac7fc9b16b549482a09b8b5ce4914392104be3ec + e3658dabb0501518fb7d3bb038bc6200a52d4903642b8197eb9dea473cf14041 + 3691471fae15c28a258df473e507227f5c1e43f74940675bc6f6a5e32d64e21c + fc9334885e944d4e5d51ff3dee0a9ffc7b4f06298667836e6976d7bff5fbbc74 + eadc1bc2ebd11684f90a83f862ca19927ca367de59b97dc7ea90cff805e243e7 + 095b0e88c2cabe83e0b0aad50d86fa73e2b69748a5126dd8c2dd0272fe27a309 + 80cd4d00f68dea6f353b33bb492db2ad2b7bfe2ff69d7dc5342e598757ec27e7 + b0aabde2e7ccbe3e6d5d9504332b06ddf9585e7f1ab002cbf3ac4b4521aafd45 + 5159364178544d97a52fb721eb862257f06d1eb50213d75a0c8cfc816ab5526f + 315472dcacf3899fe7bb416e2ee1ad91e03b2276e4d46cf257fc685def4fb174 + 63342d1dd0f8cb763800d1e46e06afe28a8733111a9664c0a9815924cbf0a575 + 67a13680ed904c137418c69eb9158ac2f0bafa1a6c8df27d015368ec6a5d171e + 8730be441fd652b336cd1e40760c5c132120704aa93b20faae28cb43ead2dea7 + 2dc2a6b3185fb7502dd4e18ff41fb4dc347d4d841d30d0f25e780d3e0d514a2c + 1ebcf9645431f17ef0a4b39bcd74f19b89c8cefd24839f58f58ee3022ac45b73 + 18d438cdee2ae9e6e738b72cfc99df110056f1f96bbf4a7ab6e94e4f128f7810 + 52b145bd23f20e30410e5ad91b0faf7b9d7f47e301ddabe44b07cb8eb55a39a9 + b19177c5d188450447218590fdd8f51beaec029bb451ddb121587dbf55845ae2 + 5fa44ff746d4abd34b1dbaefafa1e4bd54989dde5571c473cc9f4073d38a841e + 75344634f06c5162dc22b286b0757c92db1d939a4019f9361e689b416807fc47 + f6705bee1c75ca9f09fd7a781e70de6b103080b68d0a62f67af7df0c993fee4f + b1944fb9e5f2ac82bdd49ec91dfc0a3d32123999372698f811dd4c1355c9e8ad + b846a90a3c56d4b454e9e40b127a3d47569b2bb11bd9033e86f54c8efe2ef7a9 + a05990781b7dc8d24e0d501faa32522210a7c78f92ee1fbed8ec1e791c5b91f2 + 4557e2b7395c1e89a5dd935ea05a8b5dca326665daf9daa335c28cdb4d9f405f + 2ffddf68c4e9b3f5bcf5ff0f55dce634dd677f300af9b8895d49326e2cf9f4e1 + 69cb4ff5e8a0671812c1fa85e82e4384ae1d9ece402d7939a0c9d304dac04f7a + 6e79034d279f8dd6b968548814bc26479d0929a58904e4105cb095b2b07565ec + f6922a9be8fd36d1a392aee7e9ed228bb48ce31b725d9ed55470a77b8d61b365 + 0518b81c66ccf151fd33ac7ec491a75050ed87f7e144859c25536ffe677201d6 + 448889561dcab17aceb0bf42399913d907c594c3f2ba654cf3c059c345539fba + f40d211bbf9f53100135f7d5d911c1c43e18868c50309b869e9bc5124aed60d5 + 185c2ee204da535a9a7d3370759278fdd943a7f12e8c7dd2a11d38cafca7e9f6 + eef9a32902da5f5edd1bfd5d68627f73586351dae599644326ca72c5346f5546 + 0c2531e263a644c9ef2742eaefed31e9ba5e8be8ffccdef48ebd68f7a01337b6 + f1a4623dabcb691bd71a720af799e89fd14e694eacb5aac3f4e8b5b8b455ab3d + 2a972fae90763b2f583116c4b4f60a0cf6797fa4c32d506cdc2c109a51f706d1 + f9003250d5d68beea2d9cca93d0798f1bba8c783b07a7347157730ae9fe0fdcf + 62d331b77fad4e1832fbae77e3b0f9b7f82202c31e7f3fc028a6e5473711f198 + 04c46ffed03bbc8f2713d502a91b95d1ec08649de3b0d5b0dbc7921e4fc01b2d + 3ecd656701333243ad9eb500c28fdc5955e43c1d9b201c4c649a78cc95ace4d9 + f68967761e8a23ff1f95dc203d3b44f47e782965aefc8a4f200226cca82e3cd4 + 0fbbcfd1fa5c23f0c3979a59d7657230a82bbf7c514b541ae72bec62a01865a1 + 36500af53b77c03a633df02cef3a7cadcfd8f4deea6963c9cb26ac42a3eef462 + 048e35eefabd890430972e3cf8fd3e7b00a47793d5d23ec03d643f135600c2a2 + 331bf7b540162dae755cae6d59ae77aaabffa5ed50b263e776238fba538c1d78 + 3ff1df0b55fda63c91edd1dc357d84ec486683c1ab31417754f155985350bd4d + eee573b6047a531c5cff11a0989ced3e96f3705717e6ae31b7f3ed0319c7387f + 76ad0f21d3e2c78520871e5f91b9851e5bd364cec488b494af89e56404f194d2 + ee42fbd12c901edaefddf639157bf70d67d986a75e5cf4b8457c2052c70947a3 + c887803ee77d90d45808529bd6bbb49b71669feb74f1e8e15cd33214cbe1161b + c2d73fa042603ddf2a26c771ee5220d2361d6569728a15a1643cbb875639101f + 06bb5fb90ef8bc5d70fa48b20e2195af5e1836bfd8d36f27e2b60134b9126373 + 1a8a32b1939afd6d2faa8440cdf01e8906595c953d088bbb5bfd54c7f5a3a17b + 8cae00c49c9ea75805ee89a8d9a607758418a254f3ce68b4fe788d8196153b25 + ac119f500802cba7c8e32368c294798df629685bf2b4088e607dbd080c075027 + 4398e53c8c4c931964fc1d2c54b7179154af971dc15cd30bb9c20a4b3f96e26c + 6a6a0e19c11332547a809babb27ce22d5ac936e80970203aecc2b0ea85922bc1 + 934e58933f84ae14874d1426f0310c4c937e44ef6314cf6f417f73faef3ddf51 + f46e212b79012e403ea69440f54ae73dc01e8c8faddd79c26d946ca310598fa2 + 1394e754b443faf0342eb7e5294baf97995127e50a59f2900b10d54fd6d386ae + 46c14eaae7a7dfe168504cbcc316a1b9390e516a50b5251d6b03632ac4f7c74a + 0d6c3c82e1e0aab4d7bef0034b58a1614ea1e8f0fdc0e956ac8eb328925f9eb4 + 33da1b92b437cd2943697ef07170c191b67fbd110a42855807f91fd4126329d2 + dce3cf37fb47d5f6975268cbb826b08aa5ce4c6d609fa83e62cbed07ea671b0e + 7c7b61f59f5def94e24de32492cccccea36844fa0a6d8646d3b38ce4f4b52073 + 1a05531d10ab08b00e6f07fe2b66e6b1d8d04a9405788307088816b8f750ee15 + 2f1e32bfdd23de0b725468361ed254c4ed043e120d2f3210f9aa10f29a943982 + ad24ff4c4b016a1882bc841bbba4111cf93473c7dc7c66b5c484c6633b4b451b + 9c303e87c3719d9ec5f10117cd690b777918253a1800c2dde3d4bf23c6167a1b + 39322edbd910808f121a826abfe0f37784aff98e9854d1eedab51585d30097ab + 05cdbd4a829a74593ef3f0d32f23e285f0dd393ec29b53a1f29e4ce7fe830b99 + c16b967b737b72823154600fcba4f605c4c5cfe2f7acd1038a0255adb51fa1a7 + 9c9a2e33e0141b9a5d393da747ac45dbf841d916efee880324e7574ffb41661b + 9e4839c6d25228eeab8a5fea26d374adc592729a2ac7f07cee1f82845d8ab93d + 446c97693782c6ddbdf3dbab9b91ce8faeee4770f1beb1780fa6cdf31a34b67d + 83426f4237448c5cafc16376c4b71e9fd833135b91642aa08cde9e233324b4d1 + 268dbe53ea6bb1b577cc064e245d2bc39d48220bfc3a22c528da95908f13995d + 3860d5ba959709f2cf4a6241cd7053612c3eb2c5c50c130493567df4db7601da" From eed19801179f724daba703d63f4cb02841d5d0d5 Mon Sep 17 00:00:00 2001 From: Paper Mountain Studio Date: Wed, 5 Jun 2019 17:06:29 +0200 Subject: [PATCH 328/400] gallery-dl: update to 1.8.5 --- srcpkgs/gallery-dl/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gallery-dl/template b/srcpkgs/gallery-dl/template index 1dbfc728089..a2b734f0753 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.8.4 +version=1.8.5 revision=1 archs=noarch wrksrc="gallery_dl-${version}" @@ -14,4 +14,4 @@ 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}/releases/download/v${version}/gallery_dl-${version}.tar.gz" -checksum=564159a3fac5f6f37a274e68ac72129a696f5cc9f34e067cf722e303af4aae05 +checksum=ee5b14e83080b6390f9bf8d9bbfab03f628aebe863efd16a4b2f8536b149cc4f From 4866ccc7c586d3ea045c7dec6e7a1a4637fcf806 Mon Sep 17 00:00:00 2001 From: Paper Mountain Studio Date: Wed, 5 Jun 2019 17:27:57 +0200 Subject: [PATCH 329/400] highlight: update to 3.51 --- srcpkgs/highlight/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/highlight/template b/srcpkgs/highlight/template index 2e67eb0368c..a6606ab14fb 100644 --- a/srcpkgs/highlight/template +++ b/srcpkgs/highlight/template @@ -1,6 +1,6 @@ # Template file for 'highlight' pkgname=highlight -version=3.49 +version=3.52 revision=1 build_style=gnu-makefile make_cmd="make QMAKE=qmake" @@ -11,7 +11,7 @@ maintainer="Steve Prybylski " license="GPL-3.0-or-later" homepage="http://www.andre-simon.de/doku/highlight/en/highlight.php" distfiles="http://www.andre-simon.de/zip/${pkgname}-${version}.tar.bz2" -checksum=5299774e0d554c83c96001596d942b3c0a4e2884cc61026aed5d5b5730ad90fe +checksum=c169c1dc92d9b8993736273aa6ee69f6bbd25257573af55fba219234f187b26d conf_files="/etc/highlight/filetypes.conf" do_check() { From 59823ce14b0b611173ccb454c86bc67a5f5eef14 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 4 Jun 2019 20:52:02 +0200 Subject: [PATCH 330/400] gettext: update to 0.20.1. Signed-off-by: Juan RP --- common/shlibs | 5 +++-- srcpkgs/gettext/template | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/common/shlibs b/common/shlibs index fe557cc4411..832ea47918a 100644 --- a/common/shlibs +++ b/common/shlibs @@ -187,9 +187,10 @@ 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 libgnuintl.so.8 gettext-libs-0.19.2_1 -libgettextlib-0.19.8.1.so gettext-libs-0.19.8.1_1 -libgettextsrc-0.19.8.1.so gettext-libs-0.19.8.1_1 +libgettextlib-0.20.1.so gettext-libs-0.20.1_1 +libgettextsrc-0.20.1.so gettext-libs-0.20.1_1 libgettextpo.so.0 gettext-libs-0.17_1 +libtextstyle.so.0 gettext-libs-0.20.1_1 libattr.so.1 attr-2.4.43_1 libacl.so.1 acl-2.2.47_1 libpython2.7.so.1.0 python-2.7_1 diff --git a/srcpkgs/gettext/template b/srcpkgs/gettext/template index d396cf4ad12..e365e7ae68e 100644 --- a/srcpkgs/gettext/template +++ b/srcpkgs/gettext/template @@ -1,7 +1,7 @@ # Template file for 'gettext' pkgname=gettext -version=0.19.8.1 -revision=4 +version=0.20.1 +revision=1 bootstrap=yes build_style=gnu-configure configure_args="--disable-java --disable-native-java --disable-csharp @@ -15,7 +15,7 @@ maintainer="Juan RP " license="GPL-3.0-or-later" homepage="http://www.gnu.org/software/gettext/" distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=ff942af0e438ced4a8b0ea4b0b6e0d6d657157c5e2364de57baa279c1c125c43 +checksum=66415634c6e8c3fa8b71362879ec7575e27da43da562c798a8a2f223e6e47f5c case "$XBPS_TARGET_MACHINE" in # force libintl From f3f29d64f4a428e31dda1ca98dd8525bfb21d7b8 Mon Sep 17 00:00:00 2001 From: Thomas Date: Thu, 6 Jun 2019 00:05:02 -0400 Subject: [PATCH 331/400] beets: update to 1.4.9. --- srcpkgs/beets/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/beets/template b/srcpkgs/beets/template index 23bda97fe73..c78163dd224 100644 --- a/srcpkgs/beets/template +++ b/srcpkgs/beets/template @@ -1,19 +1,19 @@ # Template file for 'beets' pkgname=beets -version=1.4.7 +version=1.4.9 revision=1 archs=noarch build_style=python3-module +pycompile_module="beets beetsplug" hostmakedepends="python3-setuptools" depends="python3-setuptools python3-munkres python3-musicbrainzngs python3-Unidecode python3-yaml python3-jellyfish python3-six python3-mutagen" -pycompile_module="beets beetsplug" short_desc="Media library management system for obsessive-compulsive music geeks" maintainer="Juan RP " -homepage="http://beets.radbox.org/" license="MIT" +homepage="http://beets.radbox.org/" distfiles="${PYPI_SITE}/b/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=3a33dba692bbd12fc8b92b0853513147367be06b4d93960c8cc5bda493f96f70 +checksum=d29b432cab0c80947b5229f548762948c4dd4a430e5d02760bfeb95da3cc8054 post_install() { vman man/beet.1 From 230cb659892de99a78d460407398335f360daa23 Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 5 Jun 2019 23:55:22 -0400 Subject: [PATCH 332/400] gnome-sound-recorder: update to 3.32.1. --- srcpkgs/gnome-sound-recorder/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-sound-recorder/template b/srcpkgs/gnome-sound-recorder/template index 705892b4449..56aad4ea926 100644 --- a/srcpkgs/gnome-sound-recorder/template +++ b/srcpkgs/gnome-sound-recorder/template @@ -1,7 +1,7 @@ # Template file for 'gnome-sound-recorder' pkgname=gnome-sound-recorder -version=3.32.0 -revision=2 +version=3.32.1 +revision=1 build_helper="gir" build_style=meson hostmakedepends="glib-devel itstool pkg-config" @@ -12,5 +12,5 @@ maintainer="Rasmus Thomsen " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/SoundRecorder" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=f7eabcc6f38927d01ca54e3a25db7db740b14b649a382607642abd5aaefa9065 +checksum=4b405fa8a783d24657e95221c7fe6ffc6bd517dc1c705691e475b2a59a590361 lib32disabled=yes From aba353f79f8e58480aebcc29f313d253c6dc1db4 Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 5 Jun 2019 23:46:08 -0400 Subject: [PATCH 333/400] grim: update to 1.2.0. --- srcpkgs/grim/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/grim/template b/srcpkgs/grim/template index 9db326676a5..eea53e98200 100644 --- a/srcpkgs/grim/template +++ b/srcpkgs/grim/template @@ -1,6 +1,6 @@ # Template file for 'grim' pkgname=grim -version=1.1 +version=1.2.0 revision=1 build_style=meson configure_args="-Djpeg=enabled" @@ -11,7 +11,7 @@ maintainer="Derriick " license="MIT" homepage="https://wayland.emersion.fr/grim/" distfiles="https://github.com/emersion/$pkgname/archive/v$version.tar.gz" -checksum=2147dee783fee6e989961cef2ac484609f8506634ce0ec10c20ce697cb0db2ff +checksum=b184417220497442eaf2b3a4bc2f1e513e83e41bb5279dc3065209f5f2b611b1 post_install() { vlicense LICENSE From c6e76b6dd277781297c7d21c6755ced1f266a02a Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 5 Jun 2019 21:51:56 -0400 Subject: [PATCH 334/400] mate-backgrounds: update to 1.22.0. --- srcpkgs/mate-backgrounds/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mate-backgrounds/template b/srcpkgs/mate-backgrounds/template index 139c352f4b3..4eb954dd474 100644 --- a/srcpkgs/mate-backgrounds/template +++ b/srcpkgs/mate-backgrounds/template @@ -1,6 +1,6 @@ # Template file for 'mate-backgrounds' pkgname=mate-backgrounds -version=1.20.0 +version=1.22.0 revision=1 archs=noarch build_style=gnu-configure @@ -10,4 +10,4 @@ maintainer="Juan RP " license="GPL-2.0-or-later" homepage="https://mate-desktop.org" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=57b2127cba9233aef1db6fa3ecc85b2c8422e6d26565c797701079003893965d +checksum=496e6cf2817759c06f0bf1ba255c731726958f315ca4b559ab048b8809802cc9 From 0e414b81eefd84f1780b40685770aa1f310a12cd Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 5 Jun 2019 21:39:03 -0400 Subject: [PATCH 335/400] mate-sensors-applet: update to 1.22.1. --- srcpkgs/mate-sensors-applet/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mate-sensors-applet/template b/srcpkgs/mate-sensors-applet/template index 45dd35f5e67..8a198cda743 100644 --- a/srcpkgs/mate-sensors-applet/template +++ b/srcpkgs/mate-sensors-applet/template @@ -1,6 +1,6 @@ # Template file for 'mate-sensors-applet' pkgname=mate-sensors-applet -version=1.20.3 +version=1.22.1 revision=2 build_style=gnu-configure configure_args="--disable-schemas-compile --disable-static" @@ -13,4 +13,4 @@ maintainer="Juan RP " license="GPL-2.0-or-later" homepage="https://mate-desktop.org" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=e609e83c4774caa95866156c95b0ba1a33001aced739dc0bfc29e62987c72869 +checksum=035325ae1a16d26ba2b8341ebd993642752d51aab443cac5e418c7ddbb4c6167 From 3263322788bc2e3c1e547cecf5a4b9a95d5242a2 Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 5 Jun 2019 21:22:20 -0400 Subject: [PATCH 336/400] mate-common: update to 1.22.0. --- srcpkgs/mate-common/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mate-common/template b/srcpkgs/mate-common/template index 06f84dfea0c..c75efa70bbf 100644 --- a/srcpkgs/mate-common/template +++ b/srcpkgs/mate-common/template @@ -1,6 +1,6 @@ # Template file for 'mate-common' pkgname=mate-common -version=1.18.0 +version=1.22.0 revision=1 archs=noarch build_style=gnu-configure @@ -11,4 +11,4 @@ maintainer="Juan RP " license="LGPL-2" homepage="http://mate-desktop.org" distfiles="http://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=d77c44546e748f94cf93707ab3593146109401c9bcde533fc308863f9ca20580 +checksum=3f19973a26ccff12834615c4fcc7414cef542ea648f391125e5cfdd8ec649c86 From 918e046964dd914333092aef74c9e2503c90befa Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 5 Jun 2019 21:03:32 -0400 Subject: [PATCH 337/400] libmateweather: update to 1.22.0. --- srcpkgs/libmateweather/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libmateweather/template b/srcpkgs/libmateweather/template index b71a1c1f217..ea26a629314 100644 --- a/srcpkgs/libmateweather/template +++ b/srcpkgs/libmateweather/template @@ -1,6 +1,6 @@ # Template file for 'libmateweather' pkgname=libmateweather -version=1.20.2 +version=1.22.0 revision=1 build_style=gnu-configure configure_args="--disable-static --disable-python @@ -13,7 +13,7 @@ maintainer="Juan RP " license="GPL-2.0-or-later" homepage="https://mate-desktop.org" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=bb4363c64a81885c0656be71a8965df22d0acff64df46cadd424d5116c0f57cf +checksum=ca5cca359ed53fabef194884d76d93eafbc35eee8bcd951c5b8e5942397b2be6 libmateweather-devel_package() { short_desc+=" - development files" From f87d8ff225746021d1fffad897adf5466cf4aec9 Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 5 Jun 2019 20:53:38 -0400 Subject: [PATCH 338/400] atril: update to 1.22.1. --- srcpkgs/atril/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/atril/template b/srcpkgs/atril/template index e8bdc34e959..7a9a8dd8c60 100644 --- a/srcpkgs/atril/template +++ b/srcpkgs/atril/template @@ -1,6 +1,6 @@ # Template file for 'atril' pkgname=atril -version=1.20.3 +version=1.22.1 revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile --enable-djvu @@ -17,7 +17,7 @@ maintainer="Juan RP " license="GPL-2.0-or-later" homepage="https://mate-desktop.org" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=79dbcdf663a7a40194ece1b1ac3304a35b6828b0a68eed286c0e9c319dc77903 +checksum=208544f6cce4bb5c0bf423a0d618929e35527d1c5ed120a5aa19f2a7a77e5c44 build_options="gir" if [ -z "$CROSS_BUILD" ]; then From 89d7a766e53e9360f82eda4e936e1a1c2381bb58 Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 5 Jun 2019 20:42:15 -0400 Subject: [PATCH 339/400] mate-applets: update to 1.22.1. --- srcpkgs/mate-applets/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mate-applets/template b/srcpkgs/mate-applets/template index 299c5e66abb..7de60a61ab4 100644 --- a/srcpkgs/mate-applets/template +++ b/srcpkgs/mate-applets/template @@ -1,6 +1,6 @@ # Template file for 'mate-applets' pkgname=mate-applets -version=1.20.3 +version=1.22.1 revision=1 build_style=gnu-configure configure_args="--disable-static --enable-ipv6" @@ -15,7 +15,7 @@ maintainer="Juan RP " license="GPL-2.0-or-later" homepage="https://mate-desktop.org" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=aeccbd2100fe0b2cb09096b395e957a7e538f2092961710771fdc6487900a578 +checksum=dd653d5f14772e0d962a096036f0a0576285912815fd4c8c5028478082a852a7 case "$XBPS_TARGET_MACHINE" in i686|x86_64) From 38682010e2178effb50f6217721415c529e64b73 Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 5 Jun 2019 20:22:52 -0400 Subject: [PATCH 340/400] mate-power-manager: update to 1.22.1. --- srcpkgs/mate-power-manager/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mate-power-manager/template b/srcpkgs/mate-power-manager/template index d04ee1bbc07..3b9700bb4ef 100644 --- a/srcpkgs/mate-power-manager/template +++ b/srcpkgs/mate-power-manager/template @@ -1,6 +1,6 @@ # Template file for 'mate-power-manager' pkgname=mate-power-manager -version=1.20.3 +version=1.22.1 revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile" @@ -13,4 +13,4 @@ maintainer="Juan RP " license="GPL-2.0-or-later" homepage="https://mate-desktop.org" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=25435fa01c18e11d7d26c113e59bf0be35fbfa705c8abd86c1baf7d98a3ca49f +checksum=ba6647acea13852ac5bd2423dedbb68033eb056871ba58812c42074a08177a1b From 0f381650f49ef19c4ef6177437d415f210b1944f Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 5 Jun 2019 20:17:32 -0400 Subject: [PATCH 341/400] mate-polkit: update to 1.22.0. --- srcpkgs/mate-polkit/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mate-polkit/template b/srcpkgs/mate-polkit/template index 875ce25eef2..ff529c3ac10 100644 --- a/srcpkgs/mate-polkit/template +++ b/srcpkgs/mate-polkit/template @@ -1,6 +1,6 @@ # Template file for 'mate-polkit' pkgname=mate-polkit -version=1.20.2 +version=1.22.0 revision=1 build_style=gnu-configure configure_args="--disable-static" @@ -11,4 +11,4 @@ maintainer="Juan RP " license="LGPL-2.0-or-later" homepage="https://mate-desktop.org" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=d9ab359517151a1884e59f05a0b24d1eda3b7755ff3c4c6eb53ef6bc958e527d +checksum=c0cb8a2bb01e3afcbd56557563491ecf7fa8dad6e419a7a1e01b52d7c3b1280b From bd3a0ed8f1d2519a7e3ea393983bc9f53a923fd2 Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 5 Jun 2019 19:39:56 -0400 Subject: [PATCH 342/400] mate-icon-theme: update to 1.22.1. --- srcpkgs/mate-icon-theme/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mate-icon-theme/template b/srcpkgs/mate-icon-theme/template index 5feb54f8a86..ca37892f512 100644 --- a/srcpkgs/mate-icon-theme/template +++ b/srcpkgs/mate-icon-theme/template @@ -1,6 +1,6 @@ # Template file for 'mate-icon-theme' pkgname=mate-icon-theme -version=1.20.3 +version=1.22.1 revision=1 archs=noarch build_style=gnu-configure @@ -12,7 +12,7 @@ maintainer="Juan RP " license="CC-BY-SA-3.0" homepage="https://mate-desktop.org" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=64ae1a5a33f90d95cecc344bbefd5ff62cb4c45674f7ac4fbdc928c164458582 +checksum=73448762d46612ebc3317ca50b677d96e6f45180384c6e0b89957092ebeac1de post_install() { rm -f ${DESTDIR}/usr/share/icons/mate/icon-theme.cache From b4d8aee41659a70f12259ae8855e71d40b44e0a4 Mon Sep 17 00:00:00 2001 From: Thomas Date: Tue, 4 Jun 2019 19:20:41 -0400 Subject: [PATCH 343/400] mate-desktop: update to 1.22.1. --- srcpkgs/mate-desktop/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/mate-desktop/template b/srcpkgs/mate-desktop/template index 38facbcd4b6..ba5362c90b9 100644 --- a/srcpkgs/mate-desktop/template +++ b/srcpkgs/mate-desktop/template @@ -1,12 +1,12 @@ # Template file for 'mate-desktop' pkgname=mate-desktop -version=1.20.4 -revision=3 +version=1.22.1 +revision=1 build_style=gnu-configure build_helper="gir" configure_args="--disable-static --enable-mpaste --disable-schemas-compile $(vopt_enable gir introspection)" -hostmakedepends="pkg-config intltool itstool glib-devel" +hostmakedepends="pkg-config intltool itstool glib-devel librsvg-utils" makedepends="gtk+3-devel dconf-devel libXrandr-devel startup-notification-devel" depends="dconf hicolor-icon-theme dejavu-fonts-ttf" short_desc="Library with common API for various MATE modules" @@ -14,7 +14,7 @@ maintainer="Juan RP " license="GPL-2.0-or-later" homepage="https://mate-desktop.org" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=b9bbb086c352764a6bf01a3c792a2858336b3a28a82ffb818b509de290b1701c +checksum=203be6a518a1c0f9afd077a977be939c11afe9f56c5dac58c69a958292c924c3 # Package build options build_options="gir" From 1741fa0975f7c764b67907c14728f431709d4ba1 Mon Sep 17 00:00:00 2001 From: Paper Mountain Studio Date: Wed, 5 Jun 2019 20:39:14 +0200 Subject: [PATCH 344/400] thefuck: update to 3.29 --- srcpkgs/thefuck/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/thefuck/template b/srcpkgs/thefuck/template index 386d0eb5456..714cd7982c7 100644 --- a/srcpkgs/thefuck/template +++ b/srcpkgs/thefuck/template @@ -1,6 +1,6 @@ # Template file for 'thefuck' pkgname=thefuck -version=3.28 +version=3.29 revision=1 archs=noarch build_style=python3-module @@ -15,7 +15,7 @@ maintainer="Benjamin 'Doctors' Hoffmeyer " license="MIT" homepage="https://github.com/nvbn/thefuck" distfiles="https://github.com/nvbn/thefuck/archive/${version}.tar.gz" -checksum=b5c83e380e4af90d49ab01a55a326e608875bedb981bc7dae9b6a4b72cc521c4 +checksum=34a9ec020ff991a96a895dfbe2313b69464bbcc6975b1ad8158b32a2de5803a9 do_check() { # on python3 mock is unittest.mock From c8b354805ee12ba13ad9c8e62139360f8ec983f3 Mon Sep 17 00:00:00 2001 From: Christian Poulwey Date: Tue, 4 Jun 2019 22:25:30 +0200 Subject: [PATCH 345/400] gitlab-runner: update to 11.11.2 --- srcpkgs/gitlab-runner/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gitlab-runner/template b/srcpkgs/gitlab-runner/template index b5f1ebef0cc..e7b8e48142f 100644 --- a/srcpkgs/gitlab-runner/template +++ b/srcpkgs/gitlab-runner/template @@ -1,6 +1,6 @@ # Template file for 'gitlab-runner' pkgname=gitlab-runner -version=11.11.1 +version=11.11.2 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=0c3d1caf44d8d2e5a9c9f0a5e26d03dbbdab851080920458552e5d2f9802012d +checksum=@cb55fc01535316b7f74674bd2558ff4c50077a5fbbb1a8de54051bfe02d32237 post_install() { vsv gitlab-runner From bb03bd06a12dee8ac81d420376e90a72f4de213d Mon Sep 17 00:00:00 2001 From: Dominic Monroe Date: Wed, 5 Jun 2019 21:46:55 +0100 Subject: [PATCH 346/400] New package: libmodule-4.1.0 --- common/shlibs | 1 + srcpkgs/libmodule-devel | 1 + srcpkgs/libmodule/template | 25 +++++++++++++++++++++++++ 3 files changed, 27 insertions(+) create mode 120000 srcpkgs/libmodule-devel create mode 100644 srcpkgs/libmodule/template diff --git a/common/shlibs b/common/shlibs index 832ea47918a..10414eb6259 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3467,3 +3467,4 @@ libFAudio.so.0 FAudio-19.05_1 libqaccessibilityclient-qt5.so.0 libqaccessibilityclient-0.4.0_1 libnitrokey.so.3 libnitrokey-3.4.1_1 libceres.so.1 ceres-solver-1.14.0_1 +libmodule.so.4 libmodule-4.1.0_1 diff --git a/srcpkgs/libmodule-devel b/srcpkgs/libmodule-devel new file mode 120000 index 00000000000..4150d13df41 --- /dev/null +++ b/srcpkgs/libmodule-devel @@ -0,0 +1 @@ +libmodule \ No newline at end of file diff --git a/srcpkgs/libmodule/template b/srcpkgs/libmodule/template new file mode 100644 index 00000000000..e42f9d9e196 --- /dev/null +++ b/srcpkgs/libmodule/template @@ -0,0 +1,25 @@ +# Template file for 'libmodule' +pkgname=libmodule +version=4.1.0 +revision=1 +build_style=cmake +short_desc="C simple and elegant implementation of an actor library" +maintainer="Dominic Monroe " +license="MIT" +homepage="https://github.com/FedeDP/libmodule" +distfiles="https://github.com/FedeDP/libmodule/archive/${version}.tar.gz" +checksum=14294e63e3ff26ddbf80ca359e3d78ea3a1207692fc137a8020ec1fbe0ec47bd + +post_install() { + vlicense LICENSE +} + +libmodule-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/share/pkgconfig + vmove "usr/lib/*.so" + } +} From 9b2789df7a937896e619dffb6da048eb561bd297 Mon Sep 17 00:00:00 2001 From: Dominic Monroe Date: Wed, 5 Jun 2019 21:49:01 +0100 Subject: [PATCH 347/400] New package: Clightd-3.4 --- srcpkgs/Clightd/template | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 srcpkgs/Clightd/template diff --git a/srcpkgs/Clightd/template b/srcpkgs/Clightd/template new file mode 100644 index 00000000000..241cf60cd05 --- /dev/null +++ b/srcpkgs/Clightd/template @@ -0,0 +1,20 @@ +# Template file for 'Clightd' +pkgname=Clightd +version=3.4 +revision=1 +build_style=cmake +cmake_builddir=build +configure_args="-DENABLE_DDC=1 -DENABLE_GAMMA=1 -DENABLE_DPMS=1" +hostmakedepends="pkg-config" +makedepends="eudev-libudev-devel libmodule-devel polkit-devel elogind-devel libXrandr-devel libXext-devel libX11-devel ddcutil" +depends="ddcutil" +short_desc="API to read webcam brightness & alter screen brightness/temperature" +maintainer="Dominic Monroe " +license="GPL-3.0-or-later" +homepage="https://github.com/FedeDP/Clightd" +distfiles="https://github.com/FedeDP/Clightd/archive/${version}.tar.gz" +checksum=30c5176a5e05ca7a771b62f5ab3a36e95012ba637d0643ced8ecc4f4e4d17c47 + +post_install() { + vinstall Scripts/i2c_clightd.conf 644 /usr/lib/modules-load.d/ +} From 227becd1a8881870a0fd8037ea1672bb0ac2b6c9 Mon Sep 17 00:00:00 2001 From: Dominic Monroe Date: Wed, 5 Jun 2019 21:51:28 +0100 Subject: [PATCH 348/400] New package: Clight-3.1 --- srcpkgs/Clight/patches/issue-70.patch | 35 +++++++++++++++++++++++++++ srcpkgs/Clight/template | 14 +++++++++++ 2 files changed, 49 insertions(+) create mode 100644 srcpkgs/Clight/patches/issue-70.patch create mode 100644 srcpkgs/Clight/template diff --git a/srcpkgs/Clight/patches/issue-70.patch b/srcpkgs/Clight/patches/issue-70.patch new file mode 100644 index 00000000000..a71e895de74 --- /dev/null +++ b/srcpkgs/Clight/patches/issue-70.patch @@ -0,0 +1,35 @@ +From 8491e18e940a71a74874885436691e2443b21844 Mon Sep 17 00:00:00 2001 +From: Federico Di Pierro +Date: Mon, 18 Mar 2019 20:24:48 +0100 +Subject: [PATCH] Avoid flaot libsystemd/libelogind version. Fixes #70. + +--- + CMakeLists.txt | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9d6f173..f6e0c3d 100644 +--- CMakeLists.txt ++++ CMakeLists.txt +@@ -34,6 +34,12 @@ set_property(TARGET ${PROJECT_NAME} PROPERTY C_STANDARD 99) + # Required dependencies + pkg_check_modules(REQ_LIBS REQUIRED popt gsl libconfig) + pkg_search_module(LOGIN_LIBS REQUIRED libelogind libsystemd>=221) ++ ++# Avoid float versioning for libsystemd/libelogind ++string(REPLACE "." ";" LOGIN_LIBS_VERSION_LIST ${LOGIN_LIBS_VERSION}) ++list(GET LOGIN_LIBS_VERSION_LIST 0 LOGIN_LIBS_VERSION_MAJOR) ++message(STATUS "Found lib${LOGIN_LIBS_LIBRARIES} version ${LOGIN_LIBS_VERSION_MAJOR}") ++ + target_link_libraries(${PROJECT_NAME} + m + ${REQ_LIBS_LIBRARIES} +@@ -44,7 +50,7 @@ target_include_directories(${PROJECT_NAME} PRIVATE + "${LOGIN_LIBS_INCLUDE_DIRS}" + ) + target_compile_definitions(${PROJECT_NAME} PRIVATE +- -DLIBSYSTEMD_VERSION=${LOGIN_LIBS_VERSION} ++ -DLIBSYSTEMD_VERSION=${LOGIN_LIBS_VERSION_MAJOR} + ) + list(APPEND COMBINED_LDFLAGS ${REQ_LIBS_LDFLAGS}) + list(APPEND COMBINED_LDFLAGS ${LOGIN_LIBS_LDFLAGS}) diff --git a/srcpkgs/Clight/template b/srcpkgs/Clight/template new file mode 100644 index 00000000000..84d98307755 --- /dev/null +++ b/srcpkgs/Clight/template @@ -0,0 +1,14 @@ +# Template file for 'Clight' +pkgname=Clight +version=3.1 +revision=1 +build_style=cmake +hostmakedepends="pkg-config" +makedepends="popt-devel gsl-devel libconfig-devel elogind-devel bash-completion dbus-devel" +depends="Clightd" +short_desc="Use your webcam as a light sensor to adjust screen backlight" +maintainer="Dominic Monroe " +license="GPL-3.0-or-later" +homepage="https://github.com/FedeDP/Clight" +distfiles="https://github.com/FedeDP/Clight/archive/${version}.tar.gz" +checksum=842e639b86f898da225104878543b97d2626a3326e663f84333d075f9e718b89 From b0f5b02b98cc11af268d5ef7fb9785cffb8e9b5b Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 5 Jun 2019 14:07:00 -0400 Subject: [PATCH 349/400] mate-menus: update to 1.22.0. --- srcpkgs/mate-menus/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/mate-menus/template b/srcpkgs/mate-menus/template index 0fb93b4214b..c190d3340f7 100644 --- a/srcpkgs/mate-menus/template +++ b/srcpkgs/mate-menus/template @@ -1,7 +1,7 @@ # Template file for 'mate-menus' pkgname=mate-menus -version=1.20.2 -revision=3 +version=1.22.0 +revision=1 build_style=gnu-configure build_helper="gir" configure_args="--disable-static $(vopt_enable python)" @@ -13,7 +13,7 @@ maintainer="Juan RP " license="GPL-2.0-or-later, LGPL-2.0-or-later" homepage="https://mate-desktop.org" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=e277df3b3072c2177277644a8c7b0191cc5c3779f1b8db99ef183734d4b4c4a3 +checksum=acec93a66154fdbd78404680fca5a99112085cb99d7c43022b010527dc9a6ad2 build_options="gir python" build_options_default="gir python" From d1e5e42c7cdbfa6eaafff2b9bc023a44805f1f55 Mon Sep 17 00:00:00 2001 From: Thomas Date: Tue, 4 Jun 2019 15:29:23 -0400 Subject: [PATCH 350/400] mate-terminal: update to 1.22.1. --- srcpkgs/mate-terminal/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/mate-terminal/template b/srcpkgs/mate-terminal/template index 341335e8a6c..ab1948974c0 100644 --- a/srcpkgs/mate-terminal/template +++ b/srcpkgs/mate-terminal/template @@ -1,14 +1,14 @@ # Template file for 'mate-terminal' pkgname=mate-terminal -version=1.20.2 +version=1.22.1 revision=1 build_style=gnu-configure hostmakedepends="glib-devel intltool itstool pkg-config" makedepends="libSM-devel vte3-devel dconf-devel" depends="dbus mate-desktop" -short_desc="The MATE Terminal Emulator" +short_desc="MATE Terminal Emulator" maintainer="Juan RP " license="GPL-3.0-or-later" homepage="https://mate-desktop.org" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=78dc43f14042ddb002931457aa4f632d3381b53eadfa57a67fa12bf215881e3b +checksum=b68620d9957adadb78ed977480832e16c80b21cb5db58bffd33b665a7c064120 From 66a0301ddf785d24becc8764f2906e2c01a33ec1 Mon Sep 17 00:00:00 2001 From: Thomas Date: Tue, 4 Jun 2019 15:12:22 -0400 Subject: [PATCH 351/400] libmatemixer: update to 1.22.0. --- srcpkgs/libmatemixer/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libmatemixer/template b/srcpkgs/libmatemixer/template index 0c16128a630..7e4e369b5e1 100644 --- a/srcpkgs/libmatemixer/template +++ b/srcpkgs/libmatemixer/template @@ -1,6 +1,6 @@ # Template file for 'libmatemixer' pkgname=libmatemixer -version=1.18.0 +version=1.22.0 revision=1 build_style=gnu-configure configure_args="--disable-static" @@ -11,7 +11,7 @@ maintainer="Juan RP " license="LGPL-3" homepage="http://mate-desktop.org" distfiles="http://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=b99209e310ba614c5b0bd6a97545ba974bc34a74cd29fd50189a5365a9ed7e27 +checksum=09e64d6f3c4ca7c1e5ceb16ad86d147a77056bfe0faefe219295c8574abe0fec pre_configure() { autoreconf -fi From 3d7cd2a56b70adc75bbd9f7bf0b260ac010dabcc Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 4 Jun 2019 21:02:39 +0200 Subject: [PATCH 352/400] lvm2: update to 2.02.185. Signed-off-by: Juan RP --- srcpkgs/lvm2/template | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/srcpkgs/lvm2/template b/srcpkgs/lvm2/template index 863938a1025..824e66ec087 100644 --- a/srcpkgs/lvm2/template +++ b/srcpkgs/lvm2/template @@ -1,6 +1,6 @@ # Template file for 'lvm2' pkgname=lvm2 -version=2.02.184 +version=2.02.185 revision=1 wrksrc="LVM2.${version}" build_style=gnu-configure @@ -19,18 +19,14 @@ license="GPL-2.0-only, LGPL-2.1-only" homepage="https://sourceware.org/lvm2/" changelog="https://abi-laboratory.pro/?view=changelog&l=lvm2&v=${version}" distfiles="https://mirrors.kernel.org/sourceware/lvm2/releases/LVM2.${version}.tgz" -checksum=d12da937ce5c0753d4ea8b5215afaa3b12061ea961268693e24e81b19918f514 -conf_files="/etc/lvm/lvm.conf - /etc/lvm/lvmlocal.conf - /etc/lvm/profile/*" +checksum=070b2e7d34c8069602741c7483be715327f62875f5ce1f5727627fbea2481f4d +conf_files="/etc/lvm/*.conf /etc/lvm/profile/*" make_dirs=" /etc/lvm/archive 0755 root root /etc/lvm/backup 0755 root root" case $XBPS_TARGET_MACHINE in - *-musl) - configure_args+=" --enable-static_link" - ;; + *-musl) configure_args+=" --enable-static_link";; esac do_check() { @@ -66,9 +62,7 @@ device-mapper-devel_package() { vmove usr/lib/liblvm2cmd.so vmove "usr/lib/libdevmapper*.so" case $XBPS_TARGET_MACHINE in - *-musl) - vmove "usr/lib/*.a" - ;; + *-musl) vmove "usr/lib/*.a";; esac } } From e385bc73141aac678c739cfc19a9954eb8619fa9 Mon Sep 17 00:00:00 2001 From: Thomas Date: Tue, 4 Jun 2019 14:47:49 -0400 Subject: [PATCH 353/400] mate-system-monitor: update to 1.22.1. --- srcpkgs/mate-system-monitor/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/mate-system-monitor/template b/srcpkgs/mate-system-monitor/template index d141ba40390..4027b1405a9 100644 --- a/srcpkgs/mate-system-monitor/template +++ b/srcpkgs/mate-system-monitor/template @@ -1,15 +1,15 @@ # Template file for 'mate-system-monitor' pkgname=mate-system-monitor -version=1.20.2 +version=1.22.1 revision=1 build_style=gnu-configure hostmakedepends="glib-devel intltool itstool pkg-config" makedepends="dbus-glib-devel gtkmm-devel libgtop-devel librsvg-devel libwnck-devel" depends="dbus mate-icon-theme" -short_desc="The MATE system monitor" +short_desc="MATE system monitor" maintainer="Juan RP " license="GPL-2.0-or-later" homepage="https://mate-desktop.org" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=1627755fcba3f8707ffea124049d0aaec706d87a67a006b6afacfeae8680da38 +checksum=75b1dd52b1146568a59f187e08639144c5a3835d39510321dbf134ab0bd4017a From 8931ff85f579fbc1d6566eb648440cc6a46aa76e Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 4 Jun 2019 19:38:24 +0200 Subject: [PATCH 354/400] kexec-tools: update to 2.0.19. Signed-off-by: Juan RP --- srcpkgs/kexec-tools/patches/musl.patch | 12 ------------ srcpkgs/kexec-tools/template | 6 ++---- 2 files changed, 2 insertions(+), 16 deletions(-) delete mode 100644 srcpkgs/kexec-tools/patches/musl.patch diff --git a/srcpkgs/kexec-tools/patches/musl.patch b/srcpkgs/kexec-tools/patches/musl.patch deleted file mode 100644 index 54a72346b0e..00000000000 --- a/srcpkgs/kexec-tools/patches/musl.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- vmcore-dmesg/vmcore-dmesg.c.orig 2015-06-26 06:34:07.265191695 +0200 -+++ vmcore-dmesg/vmcore-dmesg.c 2015-06-26 06:34:44.306162445 +0200 -@@ -12,7 +12,9 @@ - #include - #include - #include -+#define _GNU_SOURCE /* loff_t with musl */ - #include -+#undef _GNU_SOURCE - #include - #include - #include diff --git a/srcpkgs/kexec-tools/template b/srcpkgs/kexec-tools/template index 7907849554f..becb6f9fb7d 100644 --- a/srcpkgs/kexec-tools/template +++ b/srcpkgs/kexec-tools/template @@ -1,6 +1,6 @@ # Template file for 'kexec-tools' pkgname=kexec-tools -version=2.0.18 +version=2.0.19 revision=1 build_style=gnu-configure makedepends="liblzma-devel" @@ -9,9 +9,7 @@ maintainer="Juan RP " license="GPL-2.0-only" homepage="http://kernel.org/pub/linux/utils/kernel/kexec/" distfiles="${KERNEL_SITE}/utils/kernel/kexec/${pkgname}-${version}.tar.xz" -checksum=f020f07341977eb512663e301c2de60c6589e141467c16a8efd58243c0b2b238 -nopie=yes -nocross=yes +checksum=ed8001b335ac8f8a9631387d1b91f6e61e8d6f1f45a8e198a78cfb4318895e0e pre_build() { rm ${XBPS_WRAPPERDIR}/strip From 8f429e7e428e55807350bd637fe8bad60c71d24e Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 4 Jun 2019 20:09:19 +0200 Subject: [PATCH 355/400] kexec-tools: unbreak x86 build. Signed-off-by: Juan RP --- srcpkgs/kexec-tools/template | 3 +++ 1 file changed, 3 insertions(+) diff --git a/srcpkgs/kexec-tools/template b/srcpkgs/kexec-tools/template index becb6f9fb7d..cbc315b74ad 100644 --- a/srcpkgs/kexec-tools/template +++ b/srcpkgs/kexec-tools/template @@ -13,4 +13,7 @@ checksum=ed8001b335ac8f8a9631387d1b91f6e61e8d6f1f45a8e198a78cfb4318895e0e pre_build() { rm ${XBPS_WRAPPERDIR}/strip + case "$XBPS_TARGET_MACHINE" in + i686*) vsed -i '/compat_x86_64.S/d' purgatory/arch/i386/Makefile;; + esac } From ae36f64d49f051903cd73d1fbb4935aa89bf2fd9 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 4 Jun 2019 20:14:56 +0200 Subject: [PATCH 356/400] kexec-tools: added zlib support. Signed-off-by: Juan RP --- srcpkgs/kexec-tools/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/kexec-tools/template b/srcpkgs/kexec-tools/template index cbc315b74ad..8e3fbfd7fe0 100644 --- a/srcpkgs/kexec-tools/template +++ b/srcpkgs/kexec-tools/template @@ -3,7 +3,7 @@ pkgname=kexec-tools version=2.0.19 revision=1 build_style=gnu-configure -makedepends="liblzma-devel" +makedepends="zlib-devel liblzma-devel" short_desc="Tools to support fast kexec reboots" maintainer="Juan RP " license="GPL-2.0-only" From d233eba17a36613bc9a92f2eaac2f7d8bb71650b Mon Sep 17 00:00:00 2001 From: amaya Date: Thu, 6 Jun 2019 16:32:04 +0800 Subject: [PATCH 357/400] pulsemixer: update to 1.5.0 --- srcpkgs/pulsemixer/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pulsemixer/template b/srcpkgs/pulsemixer/template index 3db3571fced..b13a59962fa 100644 --- a/srcpkgs/pulsemixer/template +++ b/srcpkgs/pulsemixer/template @@ -1,6 +1,6 @@ # Template file for 'pulsemixer' pkgname=pulsemixer -version=1.4.0 +version=1.5.0 revision=2 archs=noarch depends="python3 libpulseaudio" @@ -9,7 +9,7 @@ maintainer="Dean Thomson " license="MIT" homepage="https://github.com/GeorgeFilipkin/pulsemixer" distfiles="https://github.com/GeorgeFilipkin/pulsemixer/archive/${version}.tar.gz" -checksum=2fcce7fe285b5ece1f3987a7fa848bb9a01d3a5f3a0de71b755d6417416aead2 +checksum=30716666dd2552b3c59c2ed320926bb162c74d2afc385336b7f796e1f0f69af5 do_install() { vbin pulsemixer From 9b4bb272d1be6bb05441494b4c0fe2f6b268e573 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 6 Jun 2019 11:54:05 +0200 Subject: [PATCH 358/400] libGL: update to 19.0.6. Should fix https://github.com/void-linux/void-packages/issues/11907 Signed-off-by: Juan RP --- srcpkgs/libGL/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libGL/template b/srcpkgs/libGL/template index a95765c7e6b..03e07d6c013 100644 --- a/srcpkgs/libGL/template +++ b/srcpkgs/libGL/template @@ -1,6 +1,6 @@ # Template file for 'libGL' pkgname=libGL -version=19.0.5 +version=19.0.6 revision=1 wrksrc="mesa-${version}" build_style=meson @@ -21,7 +21,7 @@ license="MIT, LGPL-2.1-or-later" homepage="https://www.mesa3d.org/" changelog="https://www.mesa3d.org/relnotes/${version}.html" distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" -checksum=6aecb7f67c136768692fb3c33a54196186c6c4fcafab7973516a355e1a54f831 +checksum=2db2f2fcaa4048b16e066fad76b8a93944f7d06d329972b0f5fd5ce692ce3d24 # Set subpackages manually to set proper rdeps in 32bit pkgs. subpackages="libglapi libgbm libEGL libGLES libOSMesa" From abbf67b05c79197d832b27d1a2d6a1bdf9db2e41 Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 5 Jun 2019 18:25:11 -0400 Subject: [PATCH 359/400] mate-screensaver: update to 1.22.0. --- srcpkgs/mate-screensaver/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mate-screensaver/template b/srcpkgs/mate-screensaver/template index ea707307231..db57e0e6e3f 100644 --- a/srcpkgs/mate-screensaver/template +++ b/srcpkgs/mate-screensaver/template @@ -1,6 +1,6 @@ # Template file for 'mate-screensaver' pkgname=mate-screensaver -version=1.20.3 +version=1.22.0 revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool itstool glib-devel" @@ -12,7 +12,7 @@ maintainer="Juan RP " license="GPL-2.0-or-later, LGPL-2.0-or-later" homepage="https://mate-desktop.org" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=f1a093962bce720fb35b1d9896c0b167b1328d7a59fd26000c469ca72f91aa4e +checksum=5e0b043570dfc1904e9892956ec8377261f94ed541b7dafde22010a619f3dd9d post_install() { vinstall ${FILESDIR}/${pkgname}.pam 644 etc/pam.d ${pkgname} From 6be3df3d74d1f1b7c7fbd2beedd13a4001593e3f Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 5 Jun 2019 17:34:09 -0400 Subject: [PATCH 360/400] mate-settings-daemon: update to 1.22.0. --- srcpkgs/mate-settings-daemon/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mate-settings-daemon/template b/srcpkgs/mate-settings-daemon/template index 9c7426b3477..536e1be4680 100644 --- a/srcpkgs/mate-settings-daemon/template +++ b/srcpkgs/mate-settings-daemon/template @@ -1,6 +1,6 @@ # Template file for 'mate-settings-daemon' pkgname=mate-settings-daemon -version=1.20.4 +version=1.22.0 revision=1 build_style=gnu-configure configure_args="--disable-static --disable-schemas-compile --enable-polkit --enable-pulse" @@ -14,7 +14,7 @@ maintainer="Juan RP " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://mate-desktop.org" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=b0eb29292dee07f3992ec14489d2774d162fef9a2464cb8ab5d7bbb39e78b483 +checksum=d53f72d883bcc40d3c7d953aba4b14e8f9e9c80c7c559d840462369896d9257b mate-settings-daemon-devel_package() { depends="${sourcepkg}-${version}_${revision} dbus-glib-devel" From 32c4c1195729b8700952799e956d40c8db2ba84a Mon Sep 17 00:00:00 2001 From: Duncaen Date: Thu, 6 Jun 2019 12:43:00 +0200 Subject: [PATCH 361/400] New package: alttab-1.4.0 --- srcpkgs/alttab/template | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 srcpkgs/alttab/template diff --git a/srcpkgs/alttab/template b/srcpkgs/alttab/template new file mode 100644 index 00000000000..f37db86b0f1 --- /dev/null +++ b/srcpkgs/alttab/template @@ -0,0 +1,21 @@ +# Template file for 'alttab' +pkgname=alttab +version=1.4.0 +revision=1 +build_style=gnu-configure +hostmakedepends="pkg-config" +makedepends="libX11-devel libXft-devel libXmu-devel libXrandr-devel + libXrender-devel libpng-devel uthash" +short_desc="Task switcher for minimalistic window managers" +maintainer="Duncaen " +license="GPL-3.0-or-later" +homepage="https://github.com/sagb/alttab" +distfiles="https://github.com/sagb/alttab/archive/v${version}.tar.gz" +checksum=f0d3e7b92fd1641251f9e8669970ff922d18752663f2456424373f9b2a78aa0a + +case "$XBPS_TARGET_MACHINE" in +*-musl) + makedepends+=" musl-fts-devel" + export LDFLAGS="-lfts" + ;; +esac From eb594eba3e0b53446b09f86536269a26b23b8a63 Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 5 Jun 2019 16:40:47 -0400 Subject: [PATCH 362/400] mozo: update to 1.22.1. --- srcpkgs/mozo/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mozo/template b/srcpkgs/mozo/template index 27fc4aa40fc..19301371b7e 100644 --- a/srcpkgs/mozo/template +++ b/srcpkgs/mozo/template @@ -1,6 +1,6 @@ # Template file for 'mozo' pkgname=mozo -version=1.20.2 +version=1.22.1 revision=1 archs=noarch build_style=gnu-configure @@ -13,5 +13,5 @@ maintainer="Juan RP " license="LGPL-2.1-or-later" homepage="https://mate-desktop.org" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/mozo-${version}.tar.xz" -checksum=0deeda3637cf5428853f633378f5d7006184e928cdf78e94d8aad7f822c490e0 +checksum=105368e49f62afdec2a950795b5519340178aaa73388c98ebbd69b35eeb9ce79 nocross=yes From 9e80698a767f68064ef95fa96a222e6f0fc40b0d Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 6 Jun 2019 12:03:51 +0200 Subject: [PATCH 363/400] curl: update to 7.65.1. Signed-off-by: Juan RP --- srcpkgs/curl/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template index 3f5d0f1d819..224437b524b 100644 --- a/srcpkgs/curl/template +++ b/srcpkgs/curl/template @@ -1,6 +1,6 @@ # Template file for 'curl' pkgname=curl -version=7.65.0 +version=7.65.1 revision=1 build_style=gnu-configure configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6 @@ -20,7 +20,7 @@ license="MIT" homepage="https://curl.haxx.se" changelog="https://curl.haxx.se/changes.html#${version//./_}" distfiles="${homepage}/download/${pkgname}-${version}.tar.bz2" -checksum=ea47c08f630e88e413c85793476e7e5665647330b6db35f5c19d72b3e339df5c +checksum=cbd36df60c49e461011b4f3064cff1184bdc9969a55e9608bf5cadec4686e3f7 build_options="gnutls gssapi ldap rtmp ssh ssl" build_options_default="ssh ssl" vopt_conflict ssl gnutls From 22b09de1a294d29f0dab1ee43938df447114a67d Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 5 Jun 2019 18:43:19 -0400 Subject: [PATCH 364/400] mate-control-center: update to 1.22.1. --- srcpkgs/mate-control-center/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/mate-control-center/template b/srcpkgs/mate-control-center/template index 040f38fb76f..322cab6275c 100644 --- a/srcpkgs/mate-control-center/template +++ b/srcpkgs/mate-control-center/template @@ -1,6 +1,6 @@ # Template file for 'mate-control-center' pkgname=mate-control-center -version=1.20.4 +version=1.22.1 revision=1 build_style=gnu-configure configure_args="--disable-static --disable-schemas-compile --disable-update-mimedb" @@ -10,12 +10,12 @@ makedepends="dbus-glib-devel desktop-file-utils libXScrnSaver-devel libXt-devel libmatekbd-devel librsvg-devel mate-desktop-devel mate-menus-devel mate-settings-daemon-devel" depends="marco mate-icon-theme mate-settings-daemon" -short_desc="The Control Center for MATE" +short_desc="Control Center for MATE" maintainer="Juan RP " license="GPL-2.0-or-later" homepage="https://mate-desktop.org" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=44255adf12802e69b57afe68bbffe412271a86d6ecfb4dad0985033963b35de6 +checksum=4015c830dfd29a454c1124226fc29db460b0ba373d78939aff70e9d9271f3c71 post_install() { rm -f ${DESTDIR}/usr/share/applications/mimeinfo.cache From 21c8249e5312522563e65c0afbdf142f44c88b1e Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 6 Jun 2019 12:00:48 +0200 Subject: [PATCH 365/400] libevdev: update to 1.7.0. Signed-off-by: Juan RP --- srcpkgs/libevdev/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libevdev/template b/srcpkgs/libevdev/template index 504d5b63957..dda3179290e 100644 --- a/srcpkgs/libevdev/template +++ b/srcpkgs/libevdev/template @@ -1,6 +1,6 @@ # Template file for 'libevdev' pkgname=libevdev -version=1.6.0 +version=1.7.0 revision=1 build_style=gnu-configure configure_args="--disable-gcov" @@ -10,7 +10,7 @@ maintainer="Juan RP " license="MIT" homepage="https://www.freedesktop.org/wiki/Software/libevdev/" distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=f5005c865987d980cc1279b9ec6131b06a89fd9892f649f2a68262b8786ef814 +checksum=11dbe1f2b1d03a51f3e9a196757a75c3a999042ce34cf1fdc00a2363e5a2e369 post_install() { vlicense COPYING From acc4809e1212aa161c0f835a5ea1699bc732f130 Mon Sep 17 00:00:00 2001 From: Gangsta Cat Date: Thu, 6 Jun 2019 03:27:03 +0200 Subject: [PATCH 366/400] crystal: update to 0.29.0. --- srcpkgs/crystal/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/crystal/template b/srcpkgs/crystal/template index 0a5ad7c09b4..b0c1e00458c 100644 --- a/srcpkgs/crystal/template +++ b/srcpkgs/crystal/template @@ -1,9 +1,9 @@ # Template file for 'crystal' pkgname=crystal -version=0.28.0 +version=0.29.0 revision=1 _shardsversion=0.8.1 -_bootstrapversion=0.28.0 +_bootstrapversion=0.29.0 _bootstraprevision=1 hostmakedepends="git llvm6.0" makedepends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel @@ -18,7 +18,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="4206f57c6345454504ec4cd8cbd1b9354b9be29fae4cdcdd173f4a28cc13b102 +checksum="c2265b2a904ded282751f59a3bd0367072058eee1cf51ebe0af03a572f8e19b9 75c74ab6acf2d5c59f61a7efd3bbc3c4b1d65217f910340cb818ebf5233207a5" nocross="FIXME: someone needs to sort out the llvm --cxxflags for cross building" _crystalflags="--release --no-debug --progress" @@ -31,11 +31,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+=" 0ae13581b0d30740f232c9a29e444184121fc263b22c01d2c94290660860982e" + checksum+=" cad27db08542947e788e7c06fc00691c05ba678cedf20ecf9baa8cee741233f3" ;; i686) distfiles+=" https://github.com/crystal-lang/crystal/releases/download/${_bootstrapversion}/crystal-${_bootstrapversion}-${_bootstraprevision}-linux-i686.tar.gz" - checksum+=" a6879503badb064c9420d92f126ab08b0441a2b49d84e4fe238a52214a65ac33" + checksum+=" 0296df4824cadddadba0c052bd1fdc4ad1bdfe5758c688e7b1764ca163bca0db" ;; *) broken="cannot be built on $XBPS_MACHINE" From df36b2bed42b0ab56e634f660eb503e4ec9efcd6 Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 5 Jun 2019 20:30:45 -0400 Subject: [PATCH 367/400] mate-panel: update to 1.22.1. --- srcpkgs/mate-panel/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mate-panel/template b/srcpkgs/mate-panel/template index 42a5d349910..d66ca2a40ca 100644 --- a/srcpkgs/mate-panel/template +++ b/srcpkgs/mate-panel/template @@ -1,6 +1,6 @@ # Template file for 'mate-panel' pkgname=mate-panel -version=1.20.5 +version=1.22.1 revision=2 build_style=gnu-configure build_helper="gir" @@ -17,7 +17,7 @@ maintainer="Juan RP " license="GPL-2.0-or-later" homepage="https://mate-desktop.org" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=a76be10bbe9f59393fa1e765084f9995fb6de05863f53c1b2de493886c9b83ca +checksum=aa36130b9ecf4f7527978cfc9a9593bbf521be144d91d7a87ee64aa7df6d695d build_options="gir" build_options_default="gir" From c65684eb377763e1335f9a86eb0b07df891df079 Mon Sep 17 00:00:00 2001 From: Gerardo Di Iorio Date: Thu, 6 Jun 2019 14:28:09 +0200 Subject: [PATCH 368/400] minio: update to 2019.06.04. --- srcpkgs/minio/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/minio/template b/srcpkgs/minio/template index e64dd947177..3f8660e7bc7 100644 --- a/srcpkgs/minio/template +++ b/srcpkgs/minio/template @@ -1,8 +1,8 @@ # Template file for 'minio' pkgname=minio -version=2019.05.23 +version=2019.06.04 revision=1 -_version="${version//./-}T00-29-34Z" +_version="${version//./-}T01-15-58Z" wrksrc=${pkgname}-RELEASE.${_version} build_style=go go_import_path="github.com/minio/minio" @@ -16,7 +16,7 @@ maintainer="Gerardo Di Iorio " license="Apache-2.0" homepage="https://github.com/minio/minio" distfiles="${homepage}/archive/RELEASE.${_version}.tar.gz" -checksum=829cc1ed87ad90f0f92142f0daca8f4a9b5fcad110e7341572f5404d2dee7117 +checksum=91144a1e398f3c4a93c01c9f7503c10f55b031f952a00c80dcd4c9d02a01030a system_accounts="_minio" do_check() { From 459fa7b5a90d959e9325a5189ff589eff9484215 Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 5 Jun 2019 22:02:28 -0400 Subject: [PATCH 369/400] mate-utils: update to 1.22.1. --- srcpkgs/mate-utils/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/mate-utils/template b/srcpkgs/mate-utils/template index 2d7d453300f..e6ebb0ef59a 100644 --- a/srcpkgs/mate-utils/template +++ b/srcpkgs/mate-utils/template @@ -1,11 +1,11 @@ # Template file for 'mate-utils' pkgname=mate-utils -version=1.20.2 +version=1.22.1 revision=1 build_style=gnu-configure configure_args="--disable-static --disable-schemas-compile" hostmakedepends="automake libtool gettext-devel pkg-config - intltool itstool glib-devel mate-common" + intltool itstool glib-devel mate-common librsvg-utils inkscape" makedepends="gtk+3-devel libSM-devel zlib-devel libcanberra-devel libgtop-devel libmate-panel-devel" depends="desktop-file-utils" @@ -14,7 +14,7 @@ maintainer="Juan RP " license="GPL-2.0-or-later" homepage="https://mate-desktop.org" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=0ebbd70142c5966f565f14e6b1b68c5d4cd389aeb2a2a5246a0a7e2952e0f070 +checksum=2f1f51d056f81a9896f2ab35097b913d536235bdbb3a2a7b4b4cd231baf1c81c pre_configure() { NOCONFIGURE=1 ./autogen.sh From bb7924aa33d6ccecc55177014879c6f8ada3d004 Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 5 Jun 2019 21:45:55 -0400 Subject: [PATCH 370/400] mate-session-manager: update to 1.22.1. --- srcpkgs/mate-session-manager/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mate-session-manager/template b/srcpkgs/mate-session-manager/template index 36b832870bf..a1c2bed1df5 100644 --- a/srcpkgs/mate-session-manager/template +++ b/srcpkgs/mate-session-manager/template @@ -1,6 +1,6 @@ # Template file for 'mate-session-manager' pkgname=mate-session-manager -version=1.20.2 +version=1.22.1 revision=1 build_style=gnu-configure configure_args="--disable-static" @@ -11,4 +11,4 @@ maintainer="Juan RP " license="GPL-2.0-or-later" homepage="https://mate-desktop.org" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=be2551ac936da9e3e7d270701bb3e3a1afeba0543c15e2fd370e2353d6011817 +checksum=2f1a68447a2ec30791e07865fd3747e367c3fffe8373d07ea948b0d759bca8c7 From 76ef4169cb51c934a0115f726ad46845268b7b4a Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 5 Jun 2019 21:36:15 -0400 Subject: [PATCH 371/400] mate-netbook: update to 1.22.1. --- srcpkgs/mate-netbook/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mate-netbook/template b/srcpkgs/mate-netbook/template index c0b2016393c..ea742b7974f 100644 --- a/srcpkgs/mate-netbook/template +++ b/srcpkgs/mate-netbook/template @@ -1,6 +1,6 @@ # Template file for 'mate-netbook' pkgname=mate-netbook -version=1.20.1 +version=1.22.1 revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool glib-devel" @@ -10,4 +10,4 @@ maintainer="Juan RP " license="GPL-3.0-or-later" homepage="https://mate-desktop.org" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=58331b140c7b2c38edba9ab200aebd2e3a4655fbc65ff1df4ce748b315059ac6 +checksum=c4d4aa6f4957307dbad6488841e2e3e369ca7f7224703189877dafa99730c102 From b539ab85677a6da4f693560390147df68f974525 Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 5 Jun 2019 21:13:31 -0400 Subject: [PATCH 372/400] mate-user-guide: update to 1.22.1. --- srcpkgs/mate-user-guide/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mate-user-guide/template b/srcpkgs/mate-user-guide/template index fc48c8da049..83eeaaaa0f2 100644 --- a/srcpkgs/mate-user-guide/template +++ b/srcpkgs/mate-user-guide/template @@ -1,6 +1,6 @@ # Template file for 'mate-user-guide' pkgname=mate-user-guide -version=1.20.2 +version=1.22.1 revision=1 archs=noarch build_style=gnu-configure @@ -10,4 +10,4 @@ maintainer="Juan RP " license="GFDL-1.1-or-later" homepage="https://mate-desktop.org" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=d9f0f3203f5fabcd260f866a603509f20b399358bac7d5b78bda9ed68b307131 +checksum=7a7738da71ae531839d4223c82a0f2c883946f0abab8755312adaa9d6173f40b From 6d3cff19e7e7bb5fa3a54b99a2426445896d957c Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 5 Jun 2019 16:52:20 -0400 Subject: [PATCH 373/400] marco: update to 1.22.1. --- srcpkgs/marco/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/marco/template b/srcpkgs/marco/template index 504cbd9fa5c..959f5619b46 100644 --- a/srcpkgs/marco/template +++ b/srcpkgs/marco/template @@ -1,6 +1,6 @@ # Template file for 'marco' pkgname=marco -version=1.20.3 +version=1.22.1 revision=1 build_style=gnu-configure configure_args="--disable-static --enable-startup-notification --disable-schemas-compile" @@ -8,12 +8,12 @@ hostmakedepends="gdk-pixbuf-devel mate-common zenity" makedepends="libXt-devel libcanberra-devel libgtop-devel libnotify-devel mate-desktop-devel" depends="zenity" -short_desc="A window manager for MATE" +short_desc="window manager for MATE" maintainer="Juan RP " license="GPL-2.0-or-later" homepage="https://mate-desktop.org" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=626817d148f93a81d3e0eb11c96cbb4a170536aa4b490aa68e5d47ea49a656a4 +checksum=4e20f5ea006142f3e5c8931e2b354e1838cb9291ba245825ea82fa6611def7c8 pre_configure() { NOCONFIGURE=1 ./autogen.sh From 7aaa55486cbcdeb75d6ae4c180df3495d243dfbd Mon Sep 17 00:00:00 2001 From: Thomas Date: Tue, 4 Jun 2019 13:23:27 -0400 Subject: [PATCH 374/400] engrampa: update to 1.22.1. --- srcpkgs/engrampa/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/engrampa/template b/srcpkgs/engrampa/template index 5c862a517d2..20ba31c1124 100644 --- a/srcpkgs/engrampa/template +++ b/srcpkgs/engrampa/template @@ -1,6 +1,6 @@ # Template file for 'engrampa' pkgname=engrampa -version=1.20.2 +version=1.22.1 revision=1 build_style=gnu-configure configure_args="--enable-magic --disable-schemas-compile --disable-packagekit" @@ -13,4 +13,4 @@ maintainer="Juan RP " license="GPL-2.0-or-later" homepage="https://mate-desktop.org" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=5bb8d1467824a770b2bdfe4e8b3d0a1b0e2e6482859482ebb9863fe5da29493a +checksum=336b05cf891b82c55373454e5c03bed09d5296c39aed977366c595a0dd46e31b From 7f89d868cf96cf60074f489f47360f1428085ee3 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 6 Jun 2019 16:13:44 +0200 Subject: [PATCH 375/400] herbstluftwm: update to 0.7.2. --- srcpkgs/herbstluftwm/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/herbstluftwm/template b/srcpkgs/herbstluftwm/template index 071a98f1881..91a906d30ab 100644 --- a/srcpkgs/herbstluftwm/template +++ b/srcpkgs/herbstluftwm/template @@ -1,6 +1,6 @@ # Template file for 'herbstluftwm' pkgname=herbstluftwm -version=0.7.1 +version=0.7.2 revision=1 hostmakedepends="pkg-config" makedepends="libXinerama-devel libglib-devel" @@ -11,7 +11,7 @@ license="BSD-2-Clause" homepage="http://herbstluftwm.org" changelog="https://raw.githubusercontent.com/herbstluftwm/herbstluftwm/master/NEWS" distfiles="http://herbstluftwm.org/tarballs/${pkgname}-${version}.tar.gz" -checksum=dc0ef362013f4eb68314e120010f8cb426eb615b87f8054d6aa8e1dee5a28734 +checksum=dff613fc6d7883ea2011318ef8a7b15b92f7864eaf63229df9ce0e99a44281cd do_build() { make COLOR=0 CXX="$CXX" CC="$CC" LD="$CC" LDXX="$CXX" \ From 14991022a0427b13731daaebf7f9d616a876aac5 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 6 Jun 2019 16:16:12 +0200 Subject: [PATCH 376/400] libzim: update to 5.0.0. --- common/shlibs | 2 +- srcpkgs/libzim/template | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/shlibs b/common/shlibs index 10414eb6259..aee82e83fa6 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2960,7 +2960,7 @@ 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.4 libzim-4.0.0_1 +libzim.so.5 libzim-5.0.0_1 libkiwix.so.5 kiwix-lib-5.0.0_1 libaria2.so.0 libaria2-1.33.1_3 librpm.so.8 librpm-4.14.1_1 diff --git a/srcpkgs/libzim/template b/srcpkgs/libzim/template index 2dee47e7531..8d39c311236 100644 --- a/srcpkgs/libzim/template +++ b/srcpkgs/libzim/template @@ -1,6 +1,6 @@ # Template file for 'libzim' pkgname=libzim -version=4.0.7 +version=5.0.0 revision=1 build_style=meson hostmakedepends="pkg-config git" @@ -13,7 +13,7 @@ license="GPL-2.0-or-later" homepage="http://www.openzim.org/" changelog="https://github.com/openzim/libzim/blob/${version}/ChangeLog" distfiles="https://github.com/openzim/libzim/archive/${version}.tar.gz" -checksum=ede654ffe4ec63aaeb9404010d72e3e6afe6b1dbf34bb0c706a67e094eba4438 +checksum=dbec0a36155315037a6496a9be5c7ede17171fcde47063c97ce937057b437fdb replaces="libzim-tools>=0" build_options="zlib xapian" From 6b1f6158ecb0648ecb7d88ea93b552d382690ef6 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 6 Jun 2019 16:54:53 +0200 Subject: [PATCH 377/400] kiwix-lib: update to 5.1.0. --- srcpkgs/kiwix-lib/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kiwix-lib/template b/srcpkgs/kiwix-lib/template index 29f50cd08eb..c1f961fa512 100644 --- a/srcpkgs/kiwix-lib/template +++ b/srcpkgs/kiwix-lib/template @@ -1,6 +1,6 @@ # Template file for 'kiwix-lib' pkgname=kiwix-lib -version=5.0.0 +version=5.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=3f174c706db6380cf24252945b55aba0a483f112c9459e366595f19277013318 +checksum=573e1176e351fedc8b49c7746aef10746bf13c9f5a1df18186e0e6589215c546 kiwix-lib-devel_package() { short_desc+=" - development packages" From 322333adb320176497a35c6372099b40f0650e28 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 6 Jun 2019 16:56:09 +0200 Subject: [PATCH 378/400] kiwix-tools: update to 2.0.0. --- srcpkgs/kiwix-tools/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kiwix-tools/template b/srcpkgs/kiwix-tools/template index f4d0f8a19fe..9f3ff380062 100644 --- a/srcpkgs/kiwix-tools/template +++ b/srcpkgs/kiwix-tools/template @@ -1,6 +1,6 @@ # Template file for 'kiwix-tools' pkgname=kiwix-tools -version=1.2.1 +version=2.0.0 revision=1 build_style=meson hostmakedepends="pkg-config" @@ -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=e8a218a7a8aedbcb279820ff6d241bb60e046eb4173f9bc7ae0fd3cbd0b52e8e +checksum=d80b3ac46e37d0ead9fe9e4f2d07d808ad2df2e104180a9e2fc5eeaf33a0d272 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kiwix-lib-devel" From 206006d800b06e1fbd6656354e659471350d3f10 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 6 Jun 2019 16:57:19 +0200 Subject: [PATCH 379/400] zim-tools: update to 1.0.2. --- srcpkgs/zim-tools/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/zim-tools/template b/srcpkgs/zim-tools/template index bf15532740a..d92c7b61989 100644 --- a/srcpkgs/zim-tools/template +++ b/srcpkgs/zim-tools/template @@ -1,6 +1,6 @@ # Template file for 'zim-tools' pkgname=zim-tools -version=1.0.1 +version=1.0.2 revision=1 build_style=meson hostmakedepends="pkg-config" @@ -10,4 +10,4 @@ maintainer="John Zimmermann " license="GPL-3.0-or-later" homepage="http://www.openzim.org" distfiles="https://github.com/openzim/zim-tools/archive/${version}.tar.gz" -checksum=10f0f9a3357ec783cba4bd0c4e139499b3ec62bde19b084c7abb16e58910e8b0 +checksum=c763d56ccfa2de838a9661f2b9da16b331bbd32538b680029cee0bca51fe1021 From 99136ad7f7a52336cd740469b79dcf438ea19d8d Mon Sep 17 00:00:00 2001 From: John Date: Thu, 6 Jun 2019 16:57:28 +0200 Subject: [PATCH 380/400] zimwriterfs: update to 1.3.3. --- srcpkgs/zimwriterfs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/zimwriterfs/template b/srcpkgs/zimwriterfs/template index 0c3807ef446..9616b0e47a7 100644 --- a/srcpkgs/zimwriterfs/template +++ b/srcpkgs/zimwriterfs/template @@ -1,6 +1,6 @@ # Template file for 'zimwriterfs' pkgname=zimwriterfs -version=1.3 +version=1.3.3 revision=1 build_style=meson hostmakedepends="pkg-config" @@ -11,4 +11,4 @@ maintainer="Alexander Mamay " license="GPL-3.0-or-later" homepage="https://github.com/openzim/zimwriterfs" distfiles="https://github.com/openzim/zimwriterfs/archive/${version}.tar.gz" -checksum=c6288a4dc864afd8e881724f8f2d68a49e1ca4e88d9f83ccfd4d5321a87d271e +checksum=3080085bc7bda6587330ffafb2aaa5ef611fae9105997d065e4e011b62d52a73 From f65c7dfd6d8dbfedb043ef793a9415792cc111d5 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 6 Jun 2019 17:23:15 +0200 Subject: [PATCH 381/400] sblg: update to 0.4.26. --- srcpkgs/sblg/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/sblg/template b/srcpkgs/sblg/template index 8650cf9b914..fa7eb56b65c 100644 --- a/srcpkgs/sblg/template +++ b/srcpkgs/sblg/template @@ -1,6 +1,6 @@ # Template file for 'sblg' pkgname=sblg -version=0.4.25 +version=0.4.26 revision=1 build_style=configure configure_args="PREFIX=/usr MANDIR=/usr/share/man" @@ -11,7 +11,7 @@ license="ISC" homepage="https://kristaps.bsd.lv/sblg/" changelog="https://kristaps.bsd.lv/sblg/archive.html" distfiles="https://kristaps.bsd.lv/sblg/snapshots/${pkgname}-${version}.tar.gz" -checksum=5add5ac9cdf3d2b899c37a275d1dbf879f533e9664d5f54ca044e4fcccba6b8b +checksum=e031a54a5d4d8a3bf92d4176a8240c8a1f9c1499d5111c14e9a6ad1b15a159dd pre_configure() { if [ "$CROSS_BUILD" ]; then From defba3437b128837fe62166a9cd6d221cecf257d Mon Sep 17 00:00:00 2001 From: Thomas Date: Thu, 6 Jun 2019 12:05:59 -0400 Subject: [PATCH 382/400] linux5.1: networking fixes --- srcpkgs/linux5.1/files/i386-dotconfig | 10 +++++----- srcpkgs/linux5.1/files/x86_64-dotconfig | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/srcpkgs/linux5.1/files/i386-dotconfig b/srcpkgs/linux5.1/files/i386-dotconfig index 7d1b8670867..505370f13ce 100644 --- a/srcpkgs/linux5.1/files/i386-dotconfig +++ b/srcpkgs/linux5.1/files/i386-dotconfig @@ -2678,9 +2678,9 @@ CONFIG_NET_VENDOR_HUAWEI=y CONFIG_HINIC=m CONFIG_NET_VENDOR_I825XX=y CONFIG_NET_VENDOR_INTEL=y -CONFIG_E100=y -CONFIG_E1000=y -CONFIG_E1000E=y +CONFIG_E100=m +CONFIG_E1000=m +CONFIG_E1000E=m CONFIG_E1000E_HWTS=y CONFIG_IGB=m CONFIG_IGB_HWMON=y @@ -2991,12 +2991,12 @@ CONFIG_ATH9K_COMMON=m CONFIG_ATH9K_BTCOEX_SUPPORT=y CONFIG_ATH9K=m CONFIG_ATH9K_PCI=y -# CONFIG_ATH9K_AHB is not set +CONFIG_ATH9K_AHB=y # CONFIG_ATH9K_DEBUGFS is not set # CONFIG_ATH9K_DYNACK is not set CONFIG_ATH9K_WOW=y CONFIG_ATH9K_RFKILL=y -# CONFIG_ATH9K_CHANNEL_CONTEXT is not set +CONFIG_ATH9K_CHANNEL_CONTEXT=y CONFIG_ATH9K_PCOEM=y CONFIG_ATH9K_HTC=m # CONFIG_ATH9K_HTC_DEBUGFS is not set diff --git a/srcpkgs/linux5.1/files/x86_64-dotconfig b/srcpkgs/linux5.1/files/x86_64-dotconfig index 547cef1a001..75bafffa2d6 100644 --- a/srcpkgs/linux5.1/files/x86_64-dotconfig +++ b/srcpkgs/linux5.1/files/x86_64-dotconfig @@ -2738,9 +2738,9 @@ CONFIG_NET_VENDOR_HUAWEI=y CONFIG_HINIC=m CONFIG_NET_VENDOR_I825XX=y CONFIG_NET_VENDOR_INTEL=y -CONFIG_E100=y -CONFIG_E1000=y -CONFIG_E1000E=y +CONFIG_E100=m +CONFIG_E1000=m +CONFIG_E1000E=m CONFIG_E1000E_HWTS=y CONFIG_IGB=m CONFIG_IGB_HWMON=y @@ -3056,12 +3056,12 @@ CONFIG_ATH9K_COMMON=m CONFIG_ATH9K_BTCOEX_SUPPORT=y CONFIG_ATH9K=m CONFIG_ATH9K_PCI=y -# CONFIG_ATH9K_AHB is not set +CONFIG_ATH9K_AHB=y # CONFIG_ATH9K_DEBUGFS is not set # CONFIG_ATH9K_DYNACK is not set CONFIG_ATH9K_WOW=y CONFIG_ATH9K_RFKILL=y -# CONFIG_ATH9K_CHANNEL_CONTEXT is not set +CONFIG_ATH9K_CHANNEL_CONTEXT=y CONFIG_ATH9K_PCOEM=y CONFIG_ATH9K_HTC=m # CONFIG_ATH9K_HTC_DEBUGFS is not set From 21fdf739891ca9b7485d27c45b016870a9c8ee92 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 6 Jun 2019 13:42:20 +0200 Subject: [PATCH 383/400] srcpkgs: replace all refs from voidlinux.eu to voidlinux.org. Revbumped affected packages. Signed-off-by: Juan RP [ci skip] --- srcpkgs/FeedReader/template | 2 +- srcpkgs/Ice/template | 2 +- srcpkgs/bananapi-base/template | 4 ++-- srcpkgs/base-chroot-musl/template | 4 ++-- srcpkgs/base-chroot/template | 4 ++-- srcpkgs/base-devel/template | 4 ++-- srcpkgs/base-minimal/template | 4 ++-- srcpkgs/base-voidstrap/template | 4 ++-- srcpkgs/bcal/template | 2 +- srcpkgs/beaglebone-base/template | 4 ++-- srcpkgs/bomi/template | 2 +- srcpkgs/calf/template | 2 +- srcpkgs/choqok/template | 2 +- srcpkgs/ci20-base/template | 4 ++-- srcpkgs/cinnamon-screensaver/template | 2 +- srcpkgs/cross-i686-pc-linux-gnu/template | 2 +- srcpkgs/cross-powerpc-linux-gnu/template | 4 ++-- srcpkgs/cross-powerpc-linux-musl/template | 4 ++-- srcpkgs/cubieboard2-base/template | 4 ++-- srcpkgs/cubietruck-base/template | 4 ++-- srcpkgs/czmq/template | 4 ++-- srcpkgs/dockstar-base/template | 2 +- srcpkgs/dot-xsession/template | 4 ++-- srcpkgs/flightgear/template | 2 +- srcpkgs/freshplayerplugin/template | 2 +- srcpkgs/gmic/template | 2 +- srcpkgs/gnubg/template | 2 +- srcpkgs/gnucobol/template | 2 +- srcpkgs/gnuradio/template | 2 +- srcpkgs/godot/template | 2 +- srcpkgs/gource/template | 2 +- srcpkgs/gprolog/template | 2 +- srcpkgs/ion/template | 2 +- srcpkgs/js/template | 2 +- srcpkgs/linux-lts/template | 4 ++-- srcpkgs/linux/template | 4 ++-- srcpkgs/mailx/template | 2 +- srcpkgs/minidlna/template | 4 ++-- srcpkgs/miniupnpd/template | 2 +- srcpkgs/mixxx/template | 2 +- srcpkgs/musl-legacy-compat/template | 4 ++-- srcpkgs/mvwm-git/template | 2 +- srcpkgs/netbsd-rumpkernel/template | 2 +- srcpkgs/odroid-c2-base/template | 4 ++-- srcpkgs/odroid-u2-base/template | 4 ++-- srcpkgs/onedrive-d/template | 2 +- srcpkgs/packer/template | 2 +- srcpkgs/pam-base/template | 4 ++-- srcpkgs/parrot/template | 2 +- srcpkgs/pcsxr/template | 2 +- srcpkgs/perl-Fuse/template | 2 +- srcpkgs/php/template | 2 +- srcpkgs/python-ipython_ipykernel/template | 2 +- srcpkgs/python-iwlib/template | 2 +- srcpkgs/python-numpy/template | 2 +- srcpkgs/python-sphinxcontrib/template | 4 ++-- srcpkgs/qingy/template | 2 +- srcpkgs/qtractor/template | 2 +- srcpkgs/rpi-base/template | 4 ++-- srcpkgs/rpi3-base/template | 4 ++-- srcpkgs/runit-kdump/template | 2 +- srcpkgs/sitecopy/template | 2 +- srcpkgs/spamassassin/template | 2 +- srcpkgs/sv-netmount/template | 4 ++-- srcpkgs/telepathy-salut/template | 2 +- srcpkgs/trousers/template | 4 ++-- srcpkgs/usbarmory-base/template | 4 ++-- srcpkgs/vapoursynth-mvtools/template | 2 +- srcpkgs/vboot-utils/template | 2 +- srcpkgs/virtuoso/template | 2 +- srcpkgs/void-artwork/template | 4 ++-- srcpkgs/void-repo-multilib/template | 4 ++-- srcpkgs/void-repo-nonfree/template | 4 ++-- srcpkgs/vscode/template | 2 +- srcpkgs/wifi-firmware/template | 4 ++-- srcpkgs/xbps-static/template | 4 ++-- srcpkgs/xorg-video-drivers/template | 4 ++-- 77 files changed, 110 insertions(+), 110 deletions(-) diff --git a/srcpkgs/FeedReader/template b/srcpkgs/FeedReader/template index e024370d23e..134f2a39144 100644 --- a/srcpkgs/FeedReader/template +++ b/srcpkgs/FeedReader/template @@ -16,5 +16,5 @@ checksum=40ec53a5bdb745909b486092fb0c91686b2f1a76fce5416514f62c3f3617f612 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 - x86_64-musl) broken="https://build.voidlinux.eu/builders/x86_64-musl_builder/builds/2615/steps/shell_3/logs/stdio";; + x86_64-musl) broken="https://build.voidlinux.org/builders/x86_64-musl_builder/builds/2615/steps/shell_3/logs/stdio";; esac diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template index dec0d18b7a7..b75229a39f4 100644 --- a/srcpkgs/Ice/template +++ b/srcpkgs/Ice/template @@ -13,7 +13,7 @@ distfiles="${homepage}/download/Ice/${version%.*}/${pkgname}-${version}.tar.gz" checksum=989e51194c6adadbd156da3288e37bad847b93b3b876502e83033b70493af392 case "$XBPS_TARGET_MACHINE" in - aarch64*) broken="https://build.voidlinux.eu/builders/aarch64-musl_builder/builds/739/steps/shell_3/logs/stdio";; + aarch64*) broken="https://build.voidlinux.org/builders/aarch64-musl_builder/builds/739/steps/shell_3/logs/stdio";; esac if [ "$CROSS_BUILD" ]; then diff --git a/srcpkgs/bananapi-base/template b/srcpkgs/bananapi-base/template index 2d0b176feb7..4de66002d40 100644 --- a/srcpkgs/bananapi-base/template +++ b/srcpkgs/bananapi-base/template @@ -2,9 +2,9 @@ # Based on odroid-u2-base pkgname=bananapi-base version=2.3 -revision=1 +revision=2 build_style=meta -homepage="http://www.voidlinux.eu" +homepage="http://www.voidlinux.org" short_desc="Void Linux Banana Pi platform package" maintainer="necrophcodr " license="Public Domain" diff --git a/srcpkgs/base-chroot-musl/template b/srcpkgs/base-chroot-musl/template index bc45b6c5e0d..8f982aea05e 100644 --- a/srcpkgs/base-chroot-musl/template +++ b/srcpkgs/base-chroot-musl/template @@ -1,11 +1,11 @@ # Template file for 'base-chroot-musl' pkgname=base-chroot-musl version=0.19 -revision=5 +revision=6 archs="*-musl" bootstrap=yes build_style=meta -homepage="https://www.voidlinux.eu" +homepage="https://www.voidlinux.org" short_desc="Bootstrap packages for xbps-src (musl libc)" maintainer="Juan RP " license="Public domain" diff --git a/srcpkgs/base-chroot/template b/srcpkgs/base-chroot/template index 2662db04084..aaca5f41dec 100644 --- a/srcpkgs/base-chroot/template +++ b/srcpkgs/base-chroot/template @@ -1,11 +1,11 @@ # Template file for 'base-chroot' pkgname=base-chroot version=0.65 -revision=5 +revision=6 archs=noarch bootstrap=yes build_style=meta -homepage="http://www.voidlinux.eu" +homepage="http://www.voidlinux.org" short_desc="Bootstrap packages for xbps-src" maintainer="Juan RP " license="Public domain" diff --git a/srcpkgs/base-devel/template b/srcpkgs/base-devel/template index 1a7c8409e08..cf4d2f27cbe 100644 --- a/srcpkgs/base-devel/template +++ b/srcpkgs/base-devel/template @@ -1,14 +1,14 @@ # Template file for 'base-devel' pkgname=base-devel version=20181003 -revision=1 +revision=2 build_style=meta depends="autoconf automake bc binutils bison ed flex gcc gettext groff libtool m4 make patch pkg-config texinfo unzip xz" short_desc="Void Linux development tools meta package" maintainer="Leah Neukirchen " license="Public Domain" -homepage="http://www.voidlinux.eu/" +homepage="http://www.voidlinux.org/" case "$XBPS_TARGET_MACHINE" in *-musl) depends+=" musl-devel";; diff --git a/srcpkgs/base-minimal/template b/srcpkgs/base-minimal/template index 68d66639c38..11dbfd61e29 100644 --- a/srcpkgs/base-minimal/template +++ b/srcpkgs/base-minimal/template @@ -1,11 +1,11 @@ # Template file for 'base-minimal' pkgname=base-minimal version=0.1 -revision=1 +revision=2 build_style=meta homepage="http://www.voidlinux.org/" short_desc="Void Linux base system meta with minimal tools" -maintainer="Enno Boland " +maintainer="Enno Boland " license="Public domain" depends=" diff --git a/srcpkgs/base-voidstrap/template b/srcpkgs/base-voidstrap/template index 7b1b8aaabc2..edde643afbd 100644 --- a/srcpkgs/base-voidstrap/template +++ b/srcpkgs/base-voidstrap/template @@ -1,9 +1,9 @@ # Template file for 'base-voidstrap' pkgname=base-voidstrap version=0.9 -revision=2 +revision=3 build_style=meta -homepage="http://www.voidlinux.eu/" +homepage="http://www.voidlinux.org/" short_desc="Void Linux base system meta package for containers/chroots" maintainer="Juan RP " license="Public domain" diff --git a/srcpkgs/bcal/template b/srcpkgs/bcal/template index 5d79143bd04..8aedd08e322 100644 --- a/srcpkgs/bcal/template +++ b/srcpkgs/bcal/template @@ -14,5 +14,5 @@ checksum=c0b6cb911a773abdd555e6a9e0eb8a25934ceca038156e6250e117fa451beaa6 nocross=yes case "$XBPS_TARGET_MACHINE" in - i686*) broken="https://build.voidlinux.eu/builders/i686_builder/builds/6760/steps/shell_3/logs/stdio";; + i686*) broken="https://build.voidlinux.org/builders/i686_builder/builds/6760/steps/shell_3/logs/stdio";; esac diff --git a/srcpkgs/beaglebone-base/template b/srcpkgs/beaglebone-base/template index 8d059256484..04ef49455ed 100644 --- a/srcpkgs/beaglebone-base/template +++ b/srcpkgs/beaglebone-base/template @@ -1,11 +1,11 @@ # Template file for 'beaglebone-base' pkgname=beaglebone-base version=2.4 -revision=2 +revision=3 archs="armv7l*" build_style=meta depends="virtual?ntp-daemon beaglebone-uboot beaglebone-kernel linux-firmware-network" short_desc="Void Linux BeagleBone/BeagleBone Black platform package" maintainer="Juan RP " license="Public Domain" -homepage="http://www.voidlinux.eu" +homepage="http://www.voidlinux.org" diff --git a/srcpkgs/bomi/template b/srcpkgs/bomi/template index 3be1bd2881f..4ae0914d198 100644 --- a/srcpkgs/bomi/template +++ b/srcpkgs/bomi/template @@ -19,7 +19,7 @@ homepage="https://bomi-player.github.io/" changelog="https://raw.githubusercontent.com/xylosper/bomi/master/CHANGES.txt" distfiles="https://github.com/xylosper/bomi/archive/v${version}.tar.gz" checksum=c76ac45733cdafa7003bbc178e5a90a683df9aec30cd85f188bb17c7af9e282e -nocross=https://build.voidlinux.eu/builders/armv7l_builder/builds/1382/steps/shell_3/logs/stdio +nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/1382/steps/shell_3/logs/stdio pre_configure() { case "$XBPS_TARGET_MACHINE" in diff --git a/srcpkgs/calf/template b/srcpkgs/calf/template index 54085820368..b1fd625c032 100644 --- a/srcpkgs/calf/template +++ b/srcpkgs/calf/template @@ -16,7 +16,7 @@ homepage="http://calf-studio-gear.org" changelog="https://raw.githubusercontent.com/calf-studio-gear/calf/master/ChangeLog" distfiles="https://github.com/calf-studio-gear/calf/archive/${version}.tar.gz" checksum=43ec4cacbb1cd8b8a04f6cd257a547a18c26892fc4419ae8635b088145f4e34f -nocross="https://build.voidlinux.eu/builders/armv6l_builder/builds/6795/steps/shell_3/logs/stdio" +nocross="https://build.voidlinux.org/builders/armv6l_builder/builds/6795/steps/shell_3/logs/stdio" case "$XBPS_TARGET_MACHINE" in i686*|x86_64*) configure_args+=" --enable-sse";; diff --git a/srcpkgs/choqok/template b/srcpkgs/choqok/template index 638ab67bbc9..d693518f2d2 100644 --- a/srcpkgs/choqok/template +++ b/srcpkgs/choqok/template @@ -12,7 +12,7 @@ license="GPL-2.1" homepage="http://choqok.gnufolks.org/" distfiles="https://download.kde.org/stable/${pkgname}/${version%.*}/src/${pkgname}-${version}.tar.xz" checksum=8a7527067b3694ad16faafac754cfd5f1e5f5fd1547f066d8f14fbcf8327310f -nocross="https://build.voidlinux.eu/builders/armv7l_builder/builds/7706/steps/shell_3/logs/stdio" +nocross="https://build.voidlinux.org/builders/armv7l_builder/builds/7706/steps/shell_3/logs/stdio" if [ -n "$CROSS_BUILD" ]; then hostmakedepends+=" kcoreaddons qt5-host-tools qt5-qmake qca-qt5-devel python" diff --git a/srcpkgs/ci20-base/template b/srcpkgs/ci20-base/template index 591913d47be..1105dfaa918 100644 --- a/srcpkgs/ci20-base/template +++ b/srcpkgs/ci20-base/template @@ -1,8 +1,8 @@ # Template file for 'ci20-base' pkgname=ci20-base version=1.1 -revision=1 -homepage="http://www.voidlinux.eu" +revision=2 +homepage="http://www.voidlinux.org" short_desc="Void Linux MIPS CI20 Creator base files" maintainer="Juan RP " license="Public Domain" diff --git a/srcpkgs/cinnamon-screensaver/template b/srcpkgs/cinnamon-screensaver/template index e8d2360bddb..c677c01ac4d 100644 --- a/srcpkgs/cinnamon-screensaver/template +++ b/srcpkgs/cinnamon-screensaver/template @@ -18,7 +18,7 @@ homepage="https://developer.linuxmint.com/projects/cinnamon-projects.html/" distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz" checksum=0835111cf01b25447076177944a977cebfe995b5ce3dcfe0fba841141ebbdaca -nocross=https://build.voidlinux.eu/builders/armv7l_builder/builds/28904/steps/shell_3/logs/stdio +nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/28904/steps/shell_3/logs/stdio pycompile_version="$py3_ver" pycompile_dirs="/usr/share/cinnamon-screensaver" diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template index 3b17881f2c5..fa6d027ce26 100644 --- a/srcpkgs/cross-i686-pc-linux-gnu/template +++ b/srcpkgs/cross-i686-pc-linux-gnu/template @@ -88,7 +88,7 @@ _gcc_bootstrap() { [ ! -d ../gcc-bootstrap ] && mkdir ../gcc-bootstrap cd ../gcc-bootstrap - # Fix https://build.voidlinux.eu/builders/x86_64_builder/builds/24895/steps/shell_3/logs/stdio + # Fix https://build.voidlinux.org/builders/x86_64_builder/builds/24895/steps/shell_3/logs/stdio export gcc_cv_libc_provides_ssp=yes _args="--prefix=/usr" _args+=" --target=${_triplet}" diff --git a/srcpkgs/cross-powerpc-linux-gnu/template b/srcpkgs/cross-powerpc-linux-gnu/template index cd2ea3f1ce2..9423ecb79d6 100644 --- a/srcpkgs/cross-powerpc-linux-gnu/template +++ b/srcpkgs/cross-powerpc-linux-gnu/template @@ -11,10 +11,10 @@ _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} version=0.30 -revision=2 +revision=3 short_desc="GNU Cross toolchain for the ${_triplet} target (binutils/gcc/glibc)" maintainer="Thomas Batten " -homepage="http://www.voidlinux.eu" +homepage="http://www.voidlinux.org" license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later" distfiles=" ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template index 5c2ed790e8b..cf76b6acd37 100644 --- a/srcpkgs/cross-powerpc-linux-musl/template +++ b/srcpkgs/cross-powerpc-linux-musl/template @@ -12,11 +12,11 @@ _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} version=0.30 -revision=5 +revision=6 short_desc="Cross toolchain for PowerPC (musl)" maintainer="Thomas Batten " -homepage="http://www.voidlinux.eu" +homepage="http://www.voidlinux.org" license="GPL-3.0-or-later, GPL-2.0-only, MIT" distfiles=" ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz diff --git a/srcpkgs/cubieboard2-base/template b/srcpkgs/cubieboard2-base/template index 0648aee3305..f1fbe3b8095 100644 --- a/srcpkgs/cubieboard2-base/template +++ b/srcpkgs/cubieboard2-base/template @@ -1,12 +1,12 @@ # Template file for 'cubieboard2-base' pkgname=cubieboard2-base version=2.5 -revision=2 +revision=3 build_style=meta short_desc="Void Linux Cubieboard2 platform package" maintainer="Juan RP " license="Public Domain" -homepage="http://www.voidlinux.eu" +homepage="http://www.voidlinux.org" archs="armv7l*" depends="virtual?ntp-daemon cubieboard2-uboot sun7i-kernel linux-firmware-network" diff --git a/srcpkgs/cubietruck-base/template b/srcpkgs/cubietruck-base/template index 759f6a84644..fa80bb39bbc 100644 --- a/srcpkgs/cubietruck-base/template +++ b/srcpkgs/cubietruck-base/template @@ -1,9 +1,9 @@ # Template file for 'cubietruck-base' pkgname=cubietruck-base version=2.3 -revision=1 +revision=2 build_style=meta -homepage="http://www.voidlinux.eu" +homepage="http://www.voidlinux.org" short_desc="Void Linux Cubietruck (Cubieboard 3) platform package" maintainer="Jürgen Buchmüller " license="Public Domain" diff --git a/srcpkgs/czmq/template b/srcpkgs/czmq/template index 0b1f866e097..b1754d57685 100644 --- a/srcpkgs/czmq/template +++ b/srcpkgs/czmq/template @@ -1,12 +1,12 @@ # Template file for 'czmq' pkgname=czmq version=4.2.0 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="asciidoc automake libtool pkg-config xmlto" makedepends="libuuid-devel zeromq-devel" short_desc="High-level C binding for ZeroMQ" -maintainer="Toyam Cox " +maintainer="Toyam Cox " license="MPL-2.0" homepage="http://czmq.zeromq.org/" distfiles="https://github.com/zeromq/czmq/archive/v${version}.tar.gz" diff --git a/srcpkgs/dockstar-base/template b/srcpkgs/dockstar-base/template index 1a7118ec001..951abef1926 100644 --- a/srcpkgs/dockstar-base/template +++ b/srcpkgs/dockstar-base/template @@ -3,7 +3,7 @@ pkgname=dockstar-base version=1 revision=1 build_style=meta -homepage="http://www.voidlinux.eu" +homepage="http://www.voidlinux.org" short_desc="Void Linux Dockstar platform package" maintainer="Andrea Brancaleoni " license="Public Domain" diff --git a/srcpkgs/dot-xsession/template b/srcpkgs/dot-xsession/template index 37f62417c63..e5fe04677e9 100644 --- a/srcpkgs/dot-xsession/template +++ b/srcpkgs/dot-xsession/template @@ -1,13 +1,13 @@ # Template file for 'dot-xsession' pkgname=dot-xsession version=0.1 -revision=1 +revision=2 archs=noarch depends="xmessage" short_desc="XSession file to run the users ~/.xsession" maintainer="Florian Wagner " license="Public domain" -homepage="http://www.voidlinux.eu" +homepage="http://www.voidlinux.org" do_install() { vinstall ${FILESDIR}/dot-xsession.desktop 644 usr/share/xsessions diff --git a/srcpkgs/flightgear/template b/srcpkgs/flightgear/template index 534b4614478..99a77c48124 100644 --- a/srcpkgs/flightgear/template +++ b/srcpkgs/flightgear/template @@ -20,7 +20,7 @@ checksum=" 5acbd008a31119877fefbdfae912ae8495f716288731c91add487fc98828fe53 277e817a39edb917976441a808b750ee64be38e077897d0d77c55dfc8eba9640" -nocross=https://build.voidlinux.eu/builders/armv7l-musl_builder/builds/4773/steps/shell_3/logs/stdio +nocross=https://build.voidlinux.org/builders/armv7l-musl_builder/builds/4773/steps/shell_3/logs/stdio build_options="qt" build_options_default="qt" diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template index c0ecd18aaf5..dbb16471ed0 100644 --- a/srcpkgs/freshplayerplugin/template +++ b/srcpkgs/freshplayerplugin/template @@ -14,7 +14,7 @@ changelog="https://raw.githubusercontent.com/i-rinat/freshplayerplugin/master/Ch distfiles="${homepage}/archive/v${version}.tar.gz" checksum=4fa4fe07e812f6e10784ff984e1389b9b444ca44b84101999c6fad8f55db59d9 -nocross=http://build.voidlinux.eu/builders/armv6l-musl_builder/builds/2815/steps/shell_3/logs/stdio +nocross=http://build.voidlinux.org/builders/armv6l-musl_builder/builds/2815/steps/shell_3/logs/stdio do_install() { vinstall build/libfreshwrapper-flashplayer.so 755 usr/lib/mozilla/plugins diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template index 9e2716f809b..99a429e54be 100644 --- a/srcpkgs/gmic/template +++ b/srcpkgs/gmic/template @@ -19,7 +19,7 @@ distfiles="http://gmic.eu/files/source/gmic_${version}.tar.gz checksum="f22783f14cb202dec4a840733f2028f6e2c464fdd2f0166fc38943702cea6bde ce71a7d6acf9acde79de42a660f715e8779933e1689f14d39fb0ceaca7582efd 0bb1683f7ad8f55476ec57e53d73454e05cb79fc55b297eb519b2a24df728b44" -nocross="https://build.voidlinux.eu/builders/armv7l_builder/builds/8869/steps/shell_3/logs/stdio" +nocross="https://build.voidlinux.org/builders/armv7l_builder/builds/8869/steps/shell_3/logs/stdio" CXXFLAGS="-Wno-strict-overflow -Wno-deprecated -fkeep-inline-functions" diff --git a/srcpkgs/gnubg/template b/srcpkgs/gnubg/template index ea7008471e7..4bbe300c6c6 100644 --- a/srcpkgs/gnubg/template +++ b/srcpkgs/gnubg/template @@ -22,7 +22,7 @@ checksum=ce1b0b0c1900717cc598032a14cf8c0ee60faf24d84368b39922c0102983bc87 LDFLAGS="-Wl,--no-as-needed -lm -lreadline" case "$XBPS_TARGET_MACHINE" in - arm*) broken="https://build.voidlinux.eu/builders/armv7l_builder/builds/6536/steps/shell_3/logs/stdio" ;; + arm*) broken="https://build.voidlinux.org/builders/armv7l_builder/builds/6536/steps/shell_3/logs/stdio" ;; esac pre_configure() { diff --git a/srcpkgs/gnucobol/template b/srcpkgs/gnucobol/template index 2e0eaa824fb..979ca353854 100644 --- a/srcpkgs/gnucobol/template +++ b/srcpkgs/gnucobol/template @@ -11,7 +11,7 @@ homepage="https://sourceforge.net/projects/open-cobol/" distfiles="${SOURCEFORGE_SITE}/open-cobol/gnu-cobol/2.2/gnucobol-2.2.tar.xz" checksum=dc18fc45c269debfe86a4bbe20a7250983cba6238ea1917e135df5926cd024a0 depends="gnucobol-libs>=${version}_${revision}" -nocross="https://build.voidlinux.eu/builders/armv7l-musl_builder/builds/7152/steps/shell_3/logs/stdio" +nocross="https://build.voidlinux.org/builders/armv7l-musl_builder/builds/7152/steps/shell_3/logs/stdio" gnucobol-libs_package() { short_desc+=" - runtime libraries" diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template index 2be999387b4..f57751512dc 100644 --- a/srcpkgs/gnuradio/template +++ b/srcpkgs/gnuradio/template @@ -20,7 +20,7 @@ distfiles="https://github.com/gnuradio/gnuradio/archive/v${version}.tar.gz" checksum=9afcd0e4499160bce17c8c5c100f461791ad26b4bcb967d956fb9567e74dd57f if [ "$CROSS_BUILD" ]; then - nocross="https://build.voidlinux.eu/builders/armv7l_builder/builds/7596/steps/shell_3/logs/stdio" + nocross="https://build.voidlinux.org/builders/armv7l_builder/builds/7596/steps/shell_3/logs/stdio" fi post_install() { diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template index 7e21761aa5b..8eb582bfb7c 100644 --- a/srcpkgs/godot/template +++ b/srcpkgs/godot/template @@ -17,7 +17,7 @@ license="MIT" homepage="https://www.godotengine.org/" distfiles="https://github.com/godotengine/${pkgname}/archive/${version}-stable.tar.gz" checksum=cd66354b2397f28193ba3add8d8cc5c3562775f662887b56f16de82974f041e3 -nocross=https://build.voidlinux.eu/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio +nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio CFLAGS+=" -fPIE -fPIC" LDFLAGS+=" -pie" diff --git a/srcpkgs/gource/template b/srcpkgs/gource/template index 5dd7ca50fe3..5e0c4a1d2fe 100644 --- a/srcpkgs/gource/template +++ b/srcpkgs/gource/template @@ -15,4 +15,4 @@ homepage="http://gource.io/" distfiles="https://github.com/acaudwell/Gource/releases/download/gource-${version}/gource-${version}.tar.gz" checksum=a9dd23693861e224322708a8e26c9e3aaa3e4c9ec41264b1ee2d5dcd6e2c0e8a -nocross="https://build.voidlinux.eu/builders/armv6l_builder/builds/5099/steps/shell_3/logs/stdio" +nocross="https://build.voidlinux.org/builders/armv6l_builder/builds/5099/steps/shell_3/logs/stdio" diff --git a/srcpkgs/gprolog/template b/srcpkgs/gprolog/template index be36e2cfc3c..712938d3f73 100644 --- a/srcpkgs/gprolog/template +++ b/srcpkgs/gprolog/template @@ -18,7 +18,7 @@ disable_parallel_build=yes nopie=yes # native asm generated case $XBPS_MACHINE in - i686*) broken="pl2wam segfaults in _dl_fixup, https://build.voidlinux.eu/builders/i686_builder/builds/10260/steps/shell_3/logs/stdio" ;; + i686*) broken="pl2wam segfaults in _dl_fixup, https://build.voidlinux.org/builders/i686_builder/builds/10260/steps/shell_3/logs/stdio" ;; esac post_install() { diff --git a/srcpkgs/ion/template b/srcpkgs/ion/template index 54d8a42700b..8ab0e2d09ce 100644 --- a/srcpkgs/ion/template +++ b/srcpkgs/ion/template @@ -13,7 +13,7 @@ distfiles="${homepage}/archive/${version}/${pkgname}-${version}.tar.gz" checksum=7c7f696060a82669cb9c73cf0ec1d07d4ffefbfd54fc60acad0179ca3f46716d case "$XBPS_TARGET_MACHINE" in - aarch64-musl) broken="https://build.voidlinux.eu/builders/aarch64-musl_builder/builds/14113/steps/shell_3/logs/stdio" + aarch64-musl) broken="https://build.voidlinux.org/builders/aarch64-musl_builder/builds/14113/steps/shell_3/logs/stdio" esac post_install() { diff --git a/srcpkgs/js/template b/srcpkgs/js/template index 7a86c8343dd..9cd8452ea8a 100644 --- a/srcpkgs/js/template +++ b/srcpkgs/js/template @@ -16,7 +16,7 @@ checksum=5d12f7e1f5b4a99436685d97b9b7b75f094d33580227aa998c406bbae6f2a687 case "$XBPS_TARGET_MACHINE" in aarch64*) # ./assembler/jit/ExecutableAllocator.h:395:6: error: #error "The cacheFlush support is missing on this platform." - broken="https://build.voidlinux.eu/builders/aarch64_builder/builds/2509/steps/shell_3/logs/stdio" + broken="https://build.voidlinux.org/builders/aarch64_builder/builds/2509/steps/shell_3/logs/stdio" ;; esac diff --git a/srcpkgs/linux-lts/template b/srcpkgs/linux-lts/template index 4b2956bae03..ce6aace3950 100644 --- a/srcpkgs/linux-lts/template +++ b/srcpkgs/linux-lts/template @@ -1,9 +1,9 @@ # Template file for 'linux-lts' pkgname=linux-lts version=4.14 -revision=1 +revision=2 build_style=meta -homepage="http://www.voidlinux.eu/" +homepage="http://www.voidlinux.org/" short_desc="Linux LTS (Long Term Support) kernel meta package" maintainer="Leah Neukirchen " license="Public domain" diff --git a/srcpkgs/linux/template b/srcpkgs/linux/template index 579571c1944..12edaaed89f 100644 --- a/srcpkgs/linux/template +++ b/srcpkgs/linux/template @@ -1,9 +1,9 @@ # Template file for 'linux' pkgname=linux version=4.19 -revision=1 +revision=2 build_style=meta -homepage="http://www.voidlinux.eu/" +homepage="http://www.voidlinux.org/" short_desc="The Linux kernel meta package" maintainer="Juan RP " license="Public Domain" diff --git a/srcpkgs/mailx/template b/srcpkgs/mailx/template index 18f4505b7b8..06165e0ad95 100644 --- a/srcpkgs/mailx/template +++ b/srcpkgs/mailx/template @@ -12,7 +12,7 @@ homepage="http://heirloom.sourceforge.net/mailx.html" license="BSD" maintainer="Juan RP " # distfiles="http://pkgs.fedoraproject.org/repo/pkgs/mailx/mailx-${version}.tar.xz/836bf1da322d2d1f78b7056c2b3b2304/${pkgname}-${version}.tar.xz" -distfiles="https://sources.voidlinux.eu/mailx-12.5/mailx-12.5.tar.xz" +distfiles="https://sources.voidlinux.org/mailx-12.5/mailx-12.5.tar.xz" checksum=1b8136fb2466adeaf71a5e3c65db9fa1a967f1f6469ff689c2cf06e21f638823 alternatives=" diff --git a/srcpkgs/minidlna/template b/srcpkgs/minidlna/template index 9327ee91304..008a2425d47 100644 --- a/srcpkgs/minidlna/template +++ b/srcpkgs/minidlna/template @@ -1,12 +1,12 @@ # Template file for 'minidlna' pkgname=minidlna version=1.2.1 -revision=3 +revision=4 build_style=gnu-configure configure_args=" --sbindir=/usr/bin --with-db-path=/var/db/minidlna - --with-os-url=http://www.voidlinux.eu" + --with-os-url=http://www.voidlinux.org" system_accounts="minidlna" minidlna_homedir="/var/lib/minidlna" conf_files="/etc/minidlna.conf" diff --git a/srcpkgs/miniupnpd/template b/srcpkgs/miniupnpd/template index 8d46cb7514d..6faebb097f1 100644 --- a/srcpkgs/miniupnpd/template +++ b/srcpkgs/miniupnpd/template @@ -25,7 +25,7 @@ do_configure() { ${make_cmd} CONFIG_OPTIONS="--ipv6 --igd2 --leasefile" config.h sed -i ${wrksrc}/config.h \ - -e 's|^#define OS_URL.*$|#define OS_URL "http://voidlinux.eu/"|g' \ + -e 's|^#define OS_URL.*$|#define OS_URL "http://voidlinux.org/"|g' \ -e 's|^#define OS_NAME.*$|#define OS_NAME "Void"|g' \ -e 's|^#define OS_VERSION.*$|#define OS_VERSION "Void"|g' } diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template index 2b06e030feb..7a36a23885b 100644 --- a/srcpkgs/mixxx/template +++ b/srcpkgs/mixxx/template @@ -19,7 +19,7 @@ distfiles="https://github.com/mixxxdj/mixxx/archive/release-${version}.tar.gz" checksum=03c819a55b1abee778c02d2ad889246c9ead9dd2948572a711b2aa94e4839faf _scons_args="shoutcast=1 faad=1 tuned=0 prefix=/usr qt5=1 qtdir=/usr/include/qt5" -nocross=https://build.voidlinux.eu/builders/armv7l_builder/builds/7882/steps/shell_3/logs/stdio +nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/7882/steps/shell_3/logs/stdio do_build() { case "$XBPS_TARGET_MACHINE" in diff --git a/srcpkgs/musl-legacy-compat/template b/srcpkgs/musl-legacy-compat/template index 6c74c604365..022f97da06f 100644 --- a/srcpkgs/musl-legacy-compat/template +++ b/srcpkgs/musl-legacy-compat/template @@ -1,12 +1,12 @@ # Template file for 'musl-legacy-compat' pkgname=musl-legacy-compat version=0.3 -revision=2 +revision=3 bootstrap=yes short_desc="Legacy compatibility headers for the musl libc" maintainer="Juan RP " license="BSD-2-Clause, BSD-3-Clause" -homepage="http://www.voidlinux.eu" +homepage="http://www.voidlinux.org" case "$XBPS_TARGET_MACHINE" in *-musl) ;; diff --git a/srcpkgs/mvwm-git/template b/srcpkgs/mvwm-git/template index 1ca6d2c73b8..c8022c21942 100644 --- a/srcpkgs/mvwm-git/template +++ b/srcpkgs/mvwm-git/template @@ -21,4 +21,4 @@ distfiles="$homepage/archive/$_commit.tar.gz" checksum=34f6831d3e42b06d7af0ddf88ae43f353cd84f23563f090e7e4f0a13b75d7560 # cannot run test program while cross compiling -nocross="https://build.voidlinux.eu/builders/aarch64_builder/builds/2229/steps/shell_3/logs/stdio" +nocross="https://build.voidlinux.org/builders/aarch64_builder/builds/2229/steps/shell_3/logs/stdio" diff --git a/srcpkgs/netbsd-rumpkernel/template b/srcpkgs/netbsd-rumpkernel/template index c909c102a56..d155877df2e 100644 --- a/srcpkgs/netbsd-rumpkernel/template +++ b/srcpkgs/netbsd-rumpkernel/template @@ -11,7 +11,7 @@ homepage="https://github.com/anttikantee/buildrump.sh" distfiles="https://github.com/rumpkernel/buildrump.sh/archive/v${version}.tar.gz" checksum=c39e587868cd36ff5c6fa778aa47dd21dfcc9529409fad02a7fe33ade24a57a8 -nocross="https://build.voidlinux.eu/builders/armv7l_builder/builds/28268/steps/shell_3/logs/stdio" +nocross="https://build.voidlinux.org/builders/armv7l_builder/builds/28268/steps/shell_3/logs/stdio" do_configure() { ./buildrump.sh checkout diff --git a/srcpkgs/odroid-c2-base/template b/srcpkgs/odroid-c2-base/template index bca00aabf5d..231493db1d2 100644 --- a/srcpkgs/odroid-c2-base/template +++ b/srcpkgs/odroid-c2-base/template @@ -1,9 +1,9 @@ # Template file for 'odroid-c2-base' pkgname=odroid-c2-base version=20160923 -revision=1 +revision=2 build_style=meta -homepage="http://www.voidlinux.eu" +homepage="http://www.voidlinux.org" short_desc="Void Linux Odroid C2 platform package" maintainer="Christian Neukirchen " license="Public Domain" diff --git a/srcpkgs/odroid-u2-base/template b/srcpkgs/odroid-u2-base/template index 4d4914602e1..5f4a2df388e 100644 --- a/srcpkgs/odroid-u2-base/template +++ b/srcpkgs/odroid-u2-base/template @@ -1,9 +1,9 @@ # Template file for 'odroid-u2-base' pkgname=odroid-u2-base version=2.4 -revision=1 +revision=2 build_style=meta -homepage="http://www.voidlinux.eu" +homepage="http://www.voidlinux.org" short_desc="Void Linux Odroid U2 platform package" maintainer="Enno Boland " license="Public Domain" diff --git a/srcpkgs/onedrive-d/template b/srcpkgs/onedrive-d/template index 7361c32a85d..7d744fbf38c 100644 --- a/srcpkgs/onedrive-d/template +++ b/srcpkgs/onedrive-d/template @@ -13,7 +13,7 @@ homepage="https://github.com/skilion/onedrive" changelog="https://raw.githubusercontent.com/skilion/onedrive/master/CHANGELOG.md" distfiles="https://github.com/skilion/onedrive/archive/v${version}.tar.gz" checksum=fb12235a73919b3374b8f27785b834a690fba1c6e70c6e6f1f5da3e51eb471a0 -nocross="https://build.voidlinux.eu/builders/armv7l_builder/builds/3910/steps/shell_3/logs/stdio" +nocross="https://build.voidlinux.org/builders/armv7l_builder/builds/3910/steps/shell_3/logs/stdio" pre_build() { printf 'v%s\n' "$pkgver" > version diff --git a/srcpkgs/packer/template b/srcpkgs/packer/template index b7cf3b0f7c1..b3d9eb7f397 100644 --- a/srcpkgs/packer/template +++ b/srcpkgs/packer/template @@ -13,5 +13,5 @@ checksum=a8ce4472f44bea620cb096cb62f034d9ca4615baead724d3f3a6081ca56ad9e9 replaces="packer-bin>=0" case "$XBPS_TARGET_MACHINE" in - i686*|arm*) broken="https://build.voidlinux.eu/builders/i686_builder/builds/9375/steps/shell_3/logs/stdio";; + i686*|arm*) broken="https://build.voidlinux.org/builders/i686_builder/builds/9375/steps/shell_3/logs/stdio";; esac diff --git a/srcpkgs/pam-base/template b/srcpkgs/pam-base/template index 8e4e9004d9b..25d9645693f 100644 --- a/srcpkgs/pam-base/template +++ b/srcpkgs/pam-base/template @@ -1,12 +1,12 @@ # Template file for 'pam-base' pkgname=pam-base version=0.3 -revision=4 +revision=5 archs=noarch short_desc="PAM base configuration files" maintainer="Juan RP " license="public domain" -homepage="http://www.voidlinux.eu" +homepage="http://www.voidlinux.org" conf_files=" /etc/pam.d/other diff --git a/srcpkgs/parrot/template b/srcpkgs/parrot/template index 13faedf38a8..52f0cf3e6d3 100644 --- a/srcpkgs/parrot/template +++ b/srcpkgs/parrot/template @@ -14,7 +14,7 @@ distfiles="ftp://ftp.parrot.org/pub/parrot/releases/supported/${version}/parrot- checksum=ad5f3723c216675b9ebc2e3d3807d24fd13aa55e1eb3e7ffcad4062e0026f482 nopie=yes -nocross="http://build.voidlinux.eu:8010/builders/armv7l_builder/builds/8546/steps/shell_3/logs/stdio" +nocross="http://build.voidlinux.org:8010/builders/armv7l_builder/builds/8546/steps/shell_3/logs/stdio" parrot-devel_package() { short_desc+=" - development files" diff --git a/srcpkgs/pcsxr/template b/srcpkgs/pcsxr/template index 31a54167d52..17e01b71bae 100644 --- a/srcpkgs/pcsxr/template +++ b/srcpkgs/pcsxr/template @@ -16,7 +16,7 @@ homepage="http://pcsxr.codeplex.com/" distfiles="https://sources.archlinux.org/other/community/pcsxr/pcsxr-${version}.tar.bz2" checksum=4d114bb8cd6a278d28c35020d62b928be4be7d6a1d45d7da3c808e4a4681fd9d -nocross="https://build.voidlinux.eu/builders/aarch64_builder/builds/7365/steps/shell_3/logs/stdio" +nocross="https://build.voidlinux.org/builders/aarch64_builder/builds/7365/steps/shell_3/logs/stdio" pre_configure() { autoreconf -fi diff --git a/srcpkgs/perl-Fuse/template b/srcpkgs/perl-Fuse/template index 47b4d31f32e..bfb1149e97f 100644 --- a/srcpkgs/perl-Fuse/template +++ b/srcpkgs/perl-Fuse/template @@ -15,5 +15,5 @@ distfiles="${CPAN_SITE}/Fuse/Fuse-$version.tar.gz" checksum=30a939fe5816b00ba9cabb6cd811f894e6a74361ce29d786ae1811b0021d7aa1 case "$XBPS_TARGET_MACHINE" in -*-musl) broken="https://build.voidlinux.eu/builders/armv7l-musl_builder/builds/4152/steps/shell_3/logs/stdio" +*-musl) broken="https://build.voidlinux.org/builders/armv7l-musl_builder/builds/4152/steps/shell_3/logs/stdio" esac diff --git a/srcpkgs/php/template b/srcpkgs/php/template index 880b353bfe0..daa542c394a 100644 --- a/srcpkgs/php/template +++ b/srcpkgs/php/template @@ -17,7 +17,7 @@ checksum=fefc8967daa30ebc375b2ab2857f97da94ca81921b722ddac86b29e15c54a164 conf_files="/etc/php/php.ini" # Needs (probably a lot of) work to make it cross compile -nocross=https://build.voidlinux.eu/builders/armv7l-musl_builder/builds/16307/steps/shell_3/logs/stdio +nocross=https://build.voidlinux.org/builders/armv7l-musl_builder/builds/16307/steps/shell_3/logs/stdio lib32disabled=yes replaces="php-mcrypt<7.2.0" diff --git a/srcpkgs/python-ipython_ipykernel/template b/srcpkgs/python-ipython_ipykernel/template index b598c1f7583..5ddc333798a 100644 --- a/srcpkgs/python-ipython_ipykernel/template +++ b/srcpkgs/python-ipython_ipykernel/template @@ -18,7 +18,7 @@ distfiles="${PYPI_SITE}/i/ipykernel/ipykernel-${version}.tar.gz" checksum=699103c8e64886e3ec7053f2a6aa83bb90426063526f63a818732ff385202bad case "$XBPS_TARGET_MACHINE" in -aarch64*) broken="https://build.voidlinux.eu/builders/aarch64-musl_builder/builds/4765/steps/shell_3/logs/stdio" +aarch64*) broken="https://build.voidlinux.org/builders/aarch64-musl_builder/builds/4765/steps/shell_3/logs/stdio" esac post_install() { diff --git a/srcpkgs/python-iwlib/template b/srcpkgs/python-iwlib/template index 8ff392cae89..4498bcf156c 100644 --- a/srcpkgs/python-iwlib/template +++ b/srcpkgs/python-iwlib/template @@ -14,7 +14,7 @@ license="GPL-2.0-only" homepage="https://github.com/nathan-hoad/python-iwlib" distfiles="${PYPI_SITE}/i/iwlib/iwlib-${version}.tar.gz" checksum=fad120e7e36de1c84df6921333035cdaccd28b20e25ba180e9902e810e8dee21 -nocross=https://build.voidlinux.eu/builders/aarch64-musl_builder/builds/11458/steps/shell_3/logs/stdio +nocross=https://build.voidlinux.org/builders/aarch64-musl_builder/builds/11458/steps/shell_3/logs/stdio do_check() { python3 test/test_imports.py diff --git a/srcpkgs/python-numpy/template b/srcpkgs/python-numpy/template index 38a8f8af7fd..c8ec63efa7a 100644 --- a/srcpkgs/python-numpy/template +++ b/srcpkgs/python-numpy/template @@ -16,7 +16,7 @@ distfiles="https://github.com/numpy/numpy/archive/v${version}.tar.gz" checksum=3b1744b96ce41fff1c7e19144ca85cbbfb11e4b4e0e13080ca374df212801dbb alternatives="numpy:f2py:/usr/bin/f2py2" -nocross="https://build.voidlinux.eu/builders/armv7l_builder/builds/1408/steps/shell_3/logs/stdio" +nocross="https://build.voidlinux.org/builders/armv7l_builder/builds/1408/steps/shell_3/logs/stdio" export ATLAS=None LDFLAGS="-shared" diff --git a/srcpkgs/python-sphinxcontrib/template b/srcpkgs/python-sphinxcontrib/template index 6f03af46fc1..ce3befc56d7 100644 --- a/srcpkgs/python-sphinxcontrib/template +++ b/srcpkgs/python-sphinxcontrib/template @@ -1,7 +1,7 @@ # Template file for 'python-sphinxcontrib' pkgname=python-sphinxcontrib version=1.0 -revision=1 +revision=2 archs=noarch create_wrksrc=yes pycompile_module="sphinxcontrib" @@ -9,7 +9,7 @@ hostmakedepends="python-setuptools python3-setuptools" depends="python-setuptools" short_desc="Namespace package declaration for sphinxcontrib (Python2)" maintainer="Alessio Sergi " -homepage="https://www.voidlinux.eu/" +homepage="https://www.voidlinux.org/" license="Public Domain" do_install() { diff --git a/srcpkgs/qingy/template b/srcpkgs/qingy/template index d6440fc86c6..9fa486e09f7 100644 --- a/srcpkgs/qingy/template +++ b/srcpkgs/qingy/template @@ -13,7 +13,7 @@ maintainer="Jens E. Becker " license="GPL-2" homepage="http://qingy.sourceforge.net" #distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2" -distfiles="https://sources.voidlinux.eu/qingy-1.0.0/qingy-1.0.0.tar.bz2" +distfiles="https://sources.voidlinux.org/qingy-1.0.0/qingy-1.0.0.tar.bz2" checksum=de4b4b398d5ba81ab2544729864676a04ddc6ae818b357ee09a8770293740cd3 make_dirs="/var/lib/misc 0755 root root" diff --git a/srcpkgs/qtractor/template b/srcpkgs/qtractor/template index 8d098a1eef6..49435a2311d 100644 --- a/srcpkgs/qtractor/template +++ b/srcpkgs/qtractor/template @@ -19,7 +19,7 @@ distfiles="https://github.com/rncbc/qtractor/archive/qtractor_${version//./_}.ta checksum=a5900fefae330adc52f66502b03cf7fcb56544f1842068f20e840d926a32d8ed # configure fails to find qt5 headers -nocross="https://build.voidlinux.eu/builders/armv7l-musl_builder/builds/3458/steps/shell_3/logs/stdio" +nocross="https://build.voidlinux.org/builders/armv7l-musl_builder/builds/3458/steps/shell_3/logs/stdio" pre_configure() { autoreconf -if diff --git a/srcpkgs/rpi-base/template b/srcpkgs/rpi-base/template index 3f60d7087a0..d2aa67f1111 100644 --- a/srcpkgs/rpi-base/template +++ b/srcpkgs/rpi-base/template @@ -1,8 +1,8 @@ # Template file for 'rpi-base' pkgname=rpi-base version=2.5 -revision=3 -homepage="http://www.voidlinux.eu" +revision=4 +homepage="http://www.voidlinux.org" short_desc="Void Linux RaspberryPi base files" maintainer="Juan RP " license="Public Domain" diff --git a/srcpkgs/rpi3-base/template b/srcpkgs/rpi3-base/template index f803e9b8439..2364b755da5 100644 --- a/srcpkgs/rpi3-base/template +++ b/srcpkgs/rpi3-base/template @@ -1,8 +1,8 @@ # Template file for 'rpi3-base' pkgname=rpi3-base version=0.1 -revision=2 -homepage="http://www.voidlinux.eu" +revision=3 +homepage="http://www.voidlinux.org" short_desc="Void Linux RaspberryPi3 (64 bit) base files" maintainer="Leah Neukirchen " license="Public Domain" diff --git a/srcpkgs/runit-kdump/template b/srcpkgs/runit-kdump/template index eefcd0bf4cf..fb484554532 100644 --- a/srcpkgs/runit-kdump/template +++ b/srcpkgs/runit-kdump/template @@ -8,7 +8,7 @@ depends="runit-void makedumpfile kexec-tools" short_desc="Crashkernel/kdump support for runit to save vmcore to disk" maintainer="Christian Neukirchen " license="Public Domain" -homepage="http://www.voidlinux.eu/" +homepage="http://www.voidlinux.org/" do_install() { vinstall ${FILESDIR}/90-kdump.sh 0644 etc/runit/core-services diff --git a/srcpkgs/sitecopy/template b/srcpkgs/sitecopy/template index 9a15488e892..7ab86f45594 100644 --- a/srcpkgs/sitecopy/template +++ b/srcpkgs/sitecopy/template @@ -10,5 +10,5 @@ short_desc="Program to easily maintain remote web sites" maintainer="Jürgen Buchmüller " license="GPL-2" homepage="http://www.manyfish.co.uk/sitecopy/" -distfiles="https://sources.voidlinux.eu/sitecopy-${version}/sitecopy-${version}.tar.gz" +distfiles="https://sources.voidlinux.org/sitecopy-${version}/sitecopy-${version}.tar.gz" checksum=e06fdda007e54ddc6fae90a4e79768e5bfb7770c1139bcaac2e10d841d7458af diff --git a/srcpkgs/spamassassin/template b/srcpkgs/spamassassin/template index 6357d68cab9..667042bb37d 100644 --- a/srcpkgs/spamassassin/template +++ b/srcpkgs/spamassassin/template @@ -17,7 +17,7 @@ homepage="https://spamassassin.apache.org/" distfiles="http://www.us.apache.org/dist/${pkgname}/source/Mail-SpamAssassin-${version}.tar.gz" checksum=8a1c139ee08f140d3d3fdf13e03d98cf68a5cae27a082c4a614d154565a3c34f wrksrc="Mail-SpamAssassin-${version}" -nocross="https://build.voidlinux.eu/builders/armv6l-musl_builder/builds/9678" +nocross="https://build.voidlinux.org/builders/armv6l-musl_builder/builds/9678" conf_files=" /etc/mail/spamassassin/v312.pre /etc/mail/spamassassin/v330.pre diff --git a/srcpkgs/sv-netmount/template b/srcpkgs/sv-netmount/template index 0a062a5d2e2..3ee020cf237 100644 --- a/srcpkgs/sv-netmount/template +++ b/srcpkgs/sv-netmount/template @@ -1,9 +1,9 @@ # Template file for 'sv-netmount' pkgname=sv-netmount version=0.1 -revision=1 +revision=2 short_desc="Service to mount/umount network filesystems from fstab" -homepage="http://www.voidlinux.eu/" +homepage="http://www.voidlinux.org/" maintainer="Olivier Mauras " license="GPL-2" build_style="meta" diff --git a/srcpkgs/telepathy-salut/template b/srcpkgs/telepathy-salut/template index 573e3a28657..7413c63caf4 100644 --- a/srcpkgs/telepathy-salut/template +++ b/srcpkgs/telepathy-salut/template @@ -17,5 +17,5 @@ license="LGPL-2.1" distfiles="http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$version.tar.gz" checksum=70b9108ac8b511b7688e1b580de4ddb8981603c3cbde01f287ef8f9cb708618e -# http://build.voidlinux.eu/builders/armv7l_builder/builds/16213/steps/shell_3/logs/stdio +# http://build.voidlinux.org/builders/armv7l_builder/builds/16213/steps/shell_3/logs/stdio nocross=yes diff --git a/srcpkgs/trousers/template b/srcpkgs/trousers/template index 7739c1da611..79485fa51a1 100644 --- a/srcpkgs/trousers/template +++ b/srcpkgs/trousers/template @@ -1,7 +1,7 @@ # Template file for 'trousers' pkgname=trousers version=0.3.14 -revision=7 +revision=8 create_wrksrc=yes build_style=gnu-configure conf_files="/etc/tcsd.conf" @@ -9,7 +9,7 @@ makedepends="libressl-devel" system_accounts=tss tss_homedir=/var/lib/tpm short_desc="Trusted Computing Software Stack for the TPM" -maintainer="Toyam Cox " +maintainer="Toyam Cox " license="BSD-3-Clause" homepage="http://trousers.sourceforge.net/" # distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" diff --git a/srcpkgs/usbarmory-base/template b/srcpkgs/usbarmory-base/template index e3c771ca409..7ff74dcf503 100644 --- a/srcpkgs/usbarmory-base/template +++ b/srcpkgs/usbarmory-base/template @@ -1,11 +1,11 @@ # Template file for 'usbarmory-base' pkgname=usbarmory-base version=1.0 -revision=2 +revision=3 short_desc="Void Linux USBarmory base files" maintainer="Enno Boland " license="Public Domain" -homepage="http://www.voidlinux.eu" +homepage="http://www.voidlinux.org" archs="armv7l*" depends="virtual?ntp-daemon usbarmory-u-boot usbarmory-kernel" diff --git a/srcpkgs/vapoursynth-mvtools/template b/srcpkgs/vapoursynth-mvtools/template index 272350daaf3..90ab6cd304c 100644 --- a/srcpkgs/vapoursynth-mvtools/template +++ b/srcpkgs/vapoursynth-mvtools/template @@ -14,7 +14,7 @@ checksum=dc267fce40dd8531a39b5f51075e92dd107f959edb8be567701ca7545ffd35c5 case "$XBPS_TARGET_MACHINE" in arm*) - broken="https://build.voidlinux.eu/builders/armv7l-musl_builder/builds/15031" + broken="https://build.voidlinux.org/builders/armv7l-musl_builder/builds/15031" ;; esac diff --git a/srcpkgs/vboot-utils/template b/srcpkgs/vboot-utils/template index 18e0d22841a..97695ea384c 100644 --- a/srcpkgs/vboot-utils/template +++ b/srcpkgs/vboot-utils/template @@ -12,7 +12,7 @@ homepage="https://chromium.googlesource.com/chromiumos/platform/vboot_reference. CFLAGS='-D_GNU_SOURCE -Wno-error' case "$XBPS_TARGET_MACHINE" in - aarch64*) broken="https://build.voidlinux.eu/builders/aarch64-musl_builder/builds/8508/steps/shell_3/logs/stdio" ;; + aarch64*) broken="https://build.voidlinux.org/builders/aarch64-musl_builder/builds/8508/steps/shell_3/logs/stdio" ;; esac do_fetch() { diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template index 7b4887df4b1..41506d2458e 100644 --- a/srcpkgs/virtuoso/template +++ b/srcpkgs/virtuoso/template @@ -13,7 +13,7 @@ homepage="http://virtuoso.openlinksw.com/wiki/main/Main/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-opensource-${version}.tar.gz" checksum=08d05c6165117de0370e81aa89ddab618e645b5110be301f72e6ffea7044ca50 # cannot execute binary file: Exec format error -nocross="https://build.voidlinux.eu/builders/armv6l_builder/builds/29187/steps/shell_3/logs/stdio" +nocross="https://build.voidlinux.org/builders/armv6l_builder/builds/29187/steps/shell_3/logs/stdio" disable_parallel_build=yes case "$XBPS_TARGET_MACHINE" in diff --git a/srcpkgs/void-artwork/template b/srcpkgs/void-artwork/template index a4940ec005b..bad559e3483 100644 --- a/srcpkgs/void-artwork/template +++ b/srcpkgs/void-artwork/template @@ -1,12 +1,12 @@ # Template file for 'void-artwork' pkgname=void-artwork version=20170517 -revision=1 +revision=2 archs=noarch short_desc="Void Linux artwork" maintainer="Juan RP " license="Public domain" -homepage="http://www.voidlinux.eu" +homepage="http://www.voidlinux.org" do_install() { vinstall ${FILESDIR}/splash.png 644 usr/share/void-artwork diff --git a/srcpkgs/void-repo-multilib/template b/srcpkgs/void-repo-multilib/template index 810236f72ab..9523b6baf59 100644 --- a/srcpkgs/void-repo-multilib/template +++ b/srcpkgs/void-repo-multilib/template @@ -1,13 +1,13 @@ # Template file for 'void-repo-multilib' pkgname=void-repo-multilib version=6 -revision=2 +revision=3 build_style=meta archs="x86_64" short_desc="Void Linux drop-in file for the multilib repository" maintainer="Juan RP " license="Public Domain" -homepage="http://www.voidlinux.eu" +homepage="http://www.voidlinux.org" do_install() { vmkdir usr/share/xbps.d diff --git a/srcpkgs/void-repo-nonfree/template b/srcpkgs/void-repo-nonfree/template index 2686fe49ef1..9e31c1350a1 100644 --- a/srcpkgs/void-repo-nonfree/template +++ b/srcpkgs/void-repo-nonfree/template @@ -1,13 +1,13 @@ # Template file for 'void-repo-nonfree' pkgname=void-repo-nonfree version=9 -revision=3 +revision=4 archs=noarch build_style=meta short_desc="Void Linux drop-in file for the nonfree repository" maintainer="Juan RP " license="Public Domain" -homepage="http://www.voidlinux.eu" +homepage="http://www.voidlinux.org" do_install() { vmkdir usr/share/xbps.d diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template index b97e138856e..24c6c3f02e8 100644 --- a/srcpkgs/vscode/template +++ b/srcpkgs/vscode/template @@ -23,7 +23,7 @@ nostrip_files="code-oss" _mem_limit="--max_old_space_size=4095" case "$XBPS_TARGET_MACHINE" in - i686) broken="https://build.voidlinux.eu/builders/i686_builder/builds/10486/steps/shell_3/logs/stdio" + i686) broken="https://build.voidlinux.org/builders/i686_builder/builds/10486/steps/shell_3/logs/stdio" _ARCH="ia32";; x86_64) _ARCH="x64";; esac diff --git a/srcpkgs/wifi-firmware/template b/srcpkgs/wifi-firmware/template index 1db33dfc176..a6c454c399d 100644 --- a/srcpkgs/wifi-firmware/template +++ b/srcpkgs/wifi-firmware/template @@ -1,11 +1,11 @@ # Template file for 'wifi-firmware' pkgname=wifi-firmware version=1.3 -revision=2 +revision=3 archs=noarch build_style=meta depends="ipw2100-firmware ipw2200-firmware zd1211-firmware" short_desc="WiFi firmware meta-package" maintainer="Juan RP " license="Public Domain" -homepage="http://www.voidlinux.eu" +homepage="http://www.voidlinux.org" diff --git a/srcpkgs/xbps-static/template b/srcpkgs/xbps-static/template index 561f428f260..e86010c6bb2 100644 --- a/srcpkgs/xbps-static/template +++ b/srcpkgs/xbps-static/template @@ -2,7 +2,7 @@ # NOTE: keep this package synchronized with "srcpkgs/xbps". pkgname=xbps-static version=0.53 -revision=1 +revision=2 wrksrc="xbps-${version}" build_style=configure hostmakedepends="pkg-config" @@ -11,7 +11,7 @@ depends="xbps-triggers" short_desc="The XBPS package system utilities - static binaries" maintainer="Juan RP " license="BSD-2-Clause" -homepage="https://www.voidlinux.eu/xbps" +homepage="https://www.voidlinux.org/xbps" distfiles="https://github.com/void-linux/xbps/archive/${version}.tar.gz" checksum=360b3149141fec46dd6da9019605bcee48ee4d29bffe5aa47a9fd5fa68ccd5f4 diff --git a/srcpkgs/xorg-video-drivers/template b/srcpkgs/xorg-video-drivers/template index 9879ac565e5..bc23b50281c 100644 --- a/srcpkgs/xorg-video-drivers/template +++ b/srcpkgs/xorg-video-drivers/template @@ -1,12 +1,12 @@ # Template file for 'xorg-video-drivers' pkgname=xorg-video-drivers version=7.6 -revision=17 +revision=18 build_style=meta depends="xf86-video-vesa xf86-video-dummy" short_desc="X.org video drivers meta-package" maintainer="Juan RP " -homepage="http://www.voidlinux.eu" +homepage="http://www.voidlinux.org" license="Public domain" case "$XBPS_TARGET_MACHINE" in From 6358a47b1f1cf94705d7ae78e0670b4e10a8f12b Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 6 Jun 2019 13:46:21 +0200 Subject: [PATCH 384/400] miniupnpd: revbump due to voidlinux .eu -> .org. --- srcpkgs/miniupnpd/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/miniupnpd/template b/srcpkgs/miniupnpd/template index 6faebb097f1..2f8e3e5c64e 100644 --- a/srcpkgs/miniupnpd/template +++ b/srcpkgs/miniupnpd/template @@ -1,7 +1,7 @@ # Template file for 'miniupnpd' pkgname=miniupnpd version=2.1 -revision=2 +revision=3 build_style=gnu-makefile make_cmd="make -f Makefile.linux" make_install_args="PREFIX= SBININSTALLDIR=/usr/bin" From 7b9b1a7572024412ed209cb20c30c65e926dea6a Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 6 Jun 2019 13:47:43 +0200 Subject: [PATCH 385/400] runit-kdump: revbump due to voidlinux .eu -> .org. Signed-off-by: Juan RP --- srcpkgs/runit-kdump/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/runit-kdump/template b/srcpkgs/runit-kdump/template index fb484554532..4af824f1be4 100644 --- a/srcpkgs/runit-kdump/template +++ b/srcpkgs/runit-kdump/template @@ -1,7 +1,7 @@ # Template file for 'runit-kdump' pkgname=runit-kdump version=20150226 -revision=1 +revision=2 archs=noarch make_dirs="/var/crash 0755 root root" depends="runit-void makedumpfile kexec-tools" From 37f9adc45e0d9759178beac8e1130cd47b6aea73 Mon Sep 17 00:00:00 2001 From: Thomas Date: Thu, 6 Jun 2019 12:28:04 -0400 Subject: [PATCH 386/400] python-hypothesis: update to 4.24.2. --- srcpkgs/python-hypothesis/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python-hypothesis/template b/srcpkgs/python-hypothesis/template index 0bbff4390e9..3b57658f872 100644 --- a/srcpkgs/python-hypothesis/template +++ b/srcpkgs/python-hypothesis/template @@ -1,6 +1,6 @@ # Template file for 'python-hypothesis' pkgname=python-hypothesis -version=4.17.2 +version=4.24.2 revision=1 archs=noarch wrksrc="hypothesis-hypothesis-python-${version}" @@ -17,7 +17,7 @@ license="MPL-2.0" homepage="https://hypothesis.works/" changelog="https://github.com/HypothesisWorks/hypothesis/raw/master/hypothesis-python/docs/changes.rst" distfiles="https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-${version}.tar.gz" -checksum=43ce66fd0850b8149173af50a396dcebbde63d8b02a4149a15559157dc6dd921 +checksum=127f590504b10a7558b51e3e258e5f77c1a97f5708abd1296209132bc6c30e01 do_check() { # In python3 mock is actually unittest.mock From 6a3590df7ef0c08409341d818423067741b13750 Mon Sep 17 00:00:00 2001 From: Thomas Date: Thu, 6 Jun 2019 12:38:56 -0400 Subject: [PATCH 387/400] mate-notification-daemon: update to 1.22.0. --- srcpkgs/mate-notification-daemon/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mate-notification-daemon/template b/srcpkgs/mate-notification-daemon/template index e05c2b71407..cab3a493048 100644 --- a/srcpkgs/mate-notification-daemon/template +++ b/srcpkgs/mate-notification-daemon/template @@ -1,6 +1,6 @@ # Template file for 'mate-notification-daemon' pkgname=mate-notification-daemon -version=1.20.2 +version=1.22.0 revision=1 build_style=gnu-configure configure_args="--disable-static" @@ -12,4 +12,4 @@ maintainer="Juan RP " license="GPL-2.0-or-later" homepage="https://mate-desktop.org" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=d6cbda8a8b25902e3e3f792108860348d0f22531ece1b86d768e6ee98f71c028 +checksum=12bc6b95b517396642f25e060bbe3314db2ce9cf14ad3327f1b1950f3febe31b From b1e2d06fa56e3543201fa460b28be764517e6d9d Mon Sep 17 00:00:00 2001 From: newbluemoon Date: Thu, 6 Jun 2019 19:50:49 +0200 Subject: [PATCH 388/400] rosegarden: update to 19.06 --- srcpkgs/rosegarden/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/rosegarden/template b/srcpkgs/rosegarden/template index 9b8221dd537..87d2dd69329 100644 --- a/srcpkgs/rosegarden/template +++ b/srcpkgs/rosegarden/template @@ -1,7 +1,7 @@ # Template file for 'rosegarden' pkgname=rosegarden -version=18.12 -revision=2 +version=19.06 +revision=1 build_style=cmake hostmakedepends="pkg-config shared-mime-info" makedepends="qt5-devel alsa-lib-devel jack-devel ladspa-sdk liblrdf-devel dssi-devel @@ -12,7 +12,7 @@ maintainer="newbluemoon " license="GPL-2.0-or-later" homepage="http://rosegardenmusic.com/" distfiles="${SOURCEFORGE_SITE}/rosegarden/rosegarden/${version/*.*.*/${version%.*}}/rosegarden-${version}.tar.bz2" -checksum=6b2331ae988f20904807b4f2c687048c03fd8b0c117705d5d37cd8b941752996 +checksum=8c3d605ae14861eed3c048bb9529d6372ab1b04530ce0f53511b69b151593899 if [ -n "${CROSS_BUILD}" ]; then hostmakedepends+=" qt5-devel qt5-host-tools" From 6d0e46522c4f8b4dc3456e1e15374bee4dbd1296 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= Date: Thu, 6 Jun 2019 19:34:14 +0200 Subject: [PATCH 389/400] mpd: update to 0.21.10. --- srcpkgs/mpd/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template index bee29cbaa43..e279c7ef865 100644 --- a/srcpkgs/mpd/template +++ b/srcpkgs/mpd/template @@ -1,7 +1,7 @@ # Template file for 'mpd' pkgname=mpd -version=0.21.9 -revision=2 +version=0.21.10 +revision=1 build_style=meson configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true -Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled @@ -33,7 +33,7 @@ license="GPL-2.0-or-later" homepage="https://www.musicpd.org/" changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v${version}/NEWS" distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz" -checksum=39e25376ac2f4db26c3d074eba2ebeba10879a29c71abab33571019c1e520d3e +checksum=136b5368e38c1efeb9759ea7fa53773cbd1d434485ce234fd0942c5fb1b1a93b LDFLAGS+=" -Wl,-z,stack-size=1048576" system_accounts="mpd" From 75a96aac786b9446f61bf2cdad15f51227479d03 Mon Sep 17 00:00:00 2001 From: Thomas Date: Thu, 6 Jun 2019 16:10:09 -0400 Subject: [PATCH 390/400] geoclue2: update to 2.5.3. --- srcpkgs/geoclue2/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/geoclue2/template b/srcpkgs/geoclue2/template index 18529ce69a6..7ca9fabc050 100644 --- a/srcpkgs/geoclue2/template +++ b/srcpkgs/geoclue2/template @@ -1,7 +1,7 @@ # Template file for 'geoclue2' pkgname=geoclue2 -version=2.5.2 -revision=3 +version=2.5.3 +revision=1 wrksrc="geoclue-${version}" build_style=meson build_helper="gir" @@ -16,7 +16,7 @@ maintainer="Juan RP " license="LGPL-2.1-or-later" homepage="https://gitlab.freedesktop.org/geoclue/geoclue/wikis/home" distfiles="https://gitlab.freedesktop.org/geoclue/geoclue/-/archive/${version}/geoclue-${version}.tar.bz2" -checksum=d0a2f95d8a98ea983466ba9eb2426c7ec1ce3d2063d228d3ad688f8799afddad +checksum=a626f6adaff15d88fd0561344e614e371900e4a64a1fe9ddfcdd40d39712e78b system_accounts="_geoclue2" lib32disabled=yes From db6ab8c91af1b4a70da093e30074472be591a32c Mon Sep 17 00:00:00 2001 From: Thomas Date: Tue, 4 Jun 2019 13:29:32 -0400 Subject: [PATCH 391/400] mate-media: update to 1.22.1. --- srcpkgs/mate-media/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/mate-media/template b/srcpkgs/mate-media/template index fbdce789a33..3657f00bbbe 100644 --- a/srcpkgs/mate-media/template +++ b/srcpkgs/mate-media/template @@ -1,15 +1,15 @@ # Template file for 'mate-media' pkgname=mate-media -version=1.20.2 +version=1.22.1 revision=1 build_style=gnu-configure configure_args="--disable-static" hostmakedepends="pkg-config intltool glib-devel" -makedepends="libcanberra-devel mate-desktop-devel libmatemixer-devel" +makedepends="libcanberra-devel mate-desktop-devel libmatemixer-devel libmate-panel-devel" depends="sound-theme-freedesktop" short_desc="MATE Media Tools" maintainer="Juan RP " license="GPL-2.0-or-later" homepage="https://mate-desktop.org" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=dbd60c7c8beabc8e93842c03da7767bad5694c09bca5df88fcf0e6aa0552d319 +checksum=c27992695f006e83f5d8a9aa69ca59848cb49e1e126b47e8eb3ee4d79ab0e18d From e9b50909aeb2bbe7d5aaf39af182d7374e81c8be Mon Sep 17 00:00:00 2001 From: Thomas Date: Thu, 6 Jun 2019 16:25:56 -0400 Subject: [PATCH 392/400] musescore: update to 3.1. --- srcpkgs/musescore/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/musescore/template b/srcpkgs/musescore/template index 384caa883df..50000db5540 100644 --- a/srcpkgs/musescore/template +++ b/srcpkgs/musescore/template @@ -1,6 +1,6 @@ # Template file for 'musescore' pkgname=musescore -version=3.0.5 +version=3.1 revision=1 wrksrc="MuseScore-${version}" build_style=gnu-makefile @@ -18,7 +18,7 @@ maintainer="Brian Olsen " license="GPL-2.0-or-later" homepage="https://musescore.org/" distfiles="https://github.com/musescore/MuseScore/archive/v${version}.tar.gz" -checksum=f3fba156b3e477dc8a626c2eee67376be1a9cb703501b2f2426f181c1eefa7b6 +checksum=21ec0331af6424e019a713a61da1649d23502591583064be3cfc6ad20c3b05e9 nocross="genManual: cannot execute binary file: Exec format error" From 4014c4340c28615506f04bd221af4714484a137f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= Date: Thu, 6 Jun 2019 22:03:35 +0200 Subject: [PATCH 393/400] font-ionicons-ttf: update to 4.5.8. --- srcpkgs/font-ionicons-ttf/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/font-ionicons-ttf/template b/srcpkgs/font-ionicons-ttf/template index 7c6db628dd9..e7caf14ee57 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.5.6 +version=4.5.8 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=435e96b0e953d00a3bef103acadc15e7c4db2dcb5c0cd26b6fe7de2f1bacbcd2 +checksum=851b81b46f325671c30197a8b84fe3e8fe09ea2e569e4d0a0a927d222575f38b font_dirs="/usr/share/fonts/TTF" From 61eafb80c62b55327ecadd4ed948a1817edcf764 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= Date: Thu, 6 Jun 2019 21:29:54 +0200 Subject: [PATCH 394/400] python-pycryptodome: update to 3.8.2. --- srcpkgs/python-pycryptodome/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python-pycryptodome/template b/srcpkgs/python-pycryptodome/template index 7aac128baa8..0cfabd650a7 100644 --- a/srcpkgs/python-pycryptodome/template +++ b/srcpkgs/python-pycryptodome/template @@ -1,6 +1,6 @@ # Template file for 'python-pycryptodome' pkgname=python-pycryptodome -version=3.8.1 +version=3.8.2 revision=1 wrksrc="pycryptodome-${version}" build_style=python-module @@ -12,7 +12,7 @@ maintainer="Wietse Kuipers " license="Public Domain, BSD-2-Clause" homepage="https://www.pycryptodome.org/" distfiles="${PYPI_SITE}/p/pycryptodome/pycryptodome-${version}.tar.gz" -checksum=68ad0ce4a374577a26bb7f458575abe3c2a342818b5280de6e5738870b7761b3 +checksum=5bc40f8aa7ba8ca7f833ad2477b9d84e1bfd2630b22a46d9bbd221982f8c3ac0 provides="python-crypto-${version}_1" replaces="python-crypto>=0" From a7a16074d57da3f2f7f7bc7aac0d1f1fc7c141ec Mon Sep 17 00:00:00 2001 From: Thomas Date: Thu, 6 Jun 2019 13:43:50 -0400 Subject: [PATCH 395/400] giac: update to 1.5.0.59. --- srcpkgs/giac/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/giac/template b/srcpkgs/giac/template index 5314cc170d7..89cc3848162 100644 --- a/srcpkgs/giac/template +++ b/srcpkgs/giac/template @@ -1,7 +1,7 @@ # Template file for 'giac' pkgname=giac -version=1.5.0.37 -revision=2 +version=1.5.0.59 +revision=1 wrksrc="giac-${version%.*}" build_style=gnu-configure makedepends="fltk-devel gmp-devel gsl-devel lapack-devel @@ -12,7 +12,7 @@ maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://www-fourier.ujf-grenoble.fr/~parisse/giac.html" distfiles="https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_${version%.*}-${version##*.}.tar.gz" -checksum=780f0b19b1788f487551bbb2c6172df5b5bbece1093e598d1dc1abb1b9aed2b0 +checksum=3f97a48e5c170dda28b26e9830a4eed7acade409e1b851dc1dd0a26fbc1e0f5e post_install() { # remove duplicates From 33125e92c4f204daf464d3d6b3eeee7f679adf45 Mon Sep 17 00:00:00 2001 From: Johannes Date: Thu, 6 Jun 2019 23:38:02 +0200 Subject: [PATCH 396/400] firefox: update to 67.0.1. --- srcpkgs/firefox/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template index ac54203af4a..1c963765c59 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=67.0 +version=67.0.1 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=2cb937db00e35162393aa5b65d1f2280be1e62d5ee33d3e9997cccba542d791b +checksum=d4c68b1220e82129ac12520b8020f669a352669dd55c628994b72269418539b2 lib32disabled=yes From 5963829ff427cc278d2c0a5e47518dbfced9ab34 Mon Sep 17 00:00:00 2001 From: Johannes Date: Thu, 6 Jun 2019 23:38:16 +0200 Subject: [PATCH 397/400] firefox-i18n: update to 67.0.1. [ci skip] --- srcpkgs/firefox-i18n/template | 190 +++++++++++++++++----------------- 1 file changed, 95 insertions(+), 95 deletions(-) diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template index 657ba2fa33f..927687e25f3 100644 --- a/srcpkgs/firefox-i18n/template +++ b/srcpkgs/firefox-i18n/template @@ -1,6 +1,6 @@ # Template file for 'firefox-i18n' pkgname=firefox-i18n -version=67.0 +version=67.0.1 revision=1 build_style=meta homepage="https://www.mozilla.org/firefox/" @@ -136,97 +136,97 @@ _pkgtmpl() { } } -checksum="dd990cd84596e64d88433c2d1f8c955f4e8d967614014fb713d6834c11d78946 - bba500f330034d4b1a98bc25bf0252498bf83168b1a764b09731aaafeca24ef0 - debf3dbf85058dd38c48fa373baa807d3bd6b496e2a005a7e3df3663ce0ec932 - 4c7e6e3a0611b39bf8c26a2d0d41e7c008e7bf93ad4d913ea6c979d51fdc7470 - 6e569fe2c0dd94613d603a8cb24c2a25788b49b9d5742191e18daafa682fd3f6 - 79f6e912e61ee9f9c6beaf2d096ac7d3b4d8f719e4d93476d9b6d7251c779983 - 0da34405bbe3b086889ce5352ea205018914dae921af0f7617a35de40813d030 - a1f551a587e7da1855eacd3096c33e1663dd2cfb4d77bf6b4673a590686ecbca - 78c09b42781ab0e9998f64aba169a0509da43aae4b800738a27b83221d92f899 - 3261fd142f03ec6197c988b1dfedd30b4cd4b88339a8fc3f5124d337f921d27a - 8dd9e9b960af589b6460f8674a898956847fbf1f213661a3c4a25b2edb8f910e - 996c4bef91dbfbe1a464d124243926e1703d49cb98c3e3837905cd373a1339d3 - 7cd6ea58673df5b756f42b9c40c3a94570ed6ea8796881c27ca1a191260786d7 - 9ee920b1e3a387e9401ae23a61c616c5eadb5d034d1e43550cb8aa23184fae01 - 75df5b1ff451cfd0c9cea9b0914dd09cbf8b253a7695f148064b8c9a50011faa - 24795b9dee187d789292d17566d2aec727d93745305ceec5f41521f5d22f9a08 - b2756a5b562363e04900b3b603695cbf94dd123e10d485a368d11e405b71b6d4 - 32c1001f12b668edde67e3b525a684c8b85113053c2a92b1a1e426282a62bf11 - 13ea1038bffb401901e60782a8ed3bdd6a432d006eb788e7523e38b17deaac07 - bca3f3777b3bb40810f324aed123b16ea7fd2e2912df6dd0aea8eb4239cc4333 - a04d313b65345f9b1dc3e18f2b45f226b8a28bf71a28b4e785509be309378995 - 8cb13af1428d830d746256cdad2e5edd2521d89c083426a9fab1d646cb9d834f - 464396321956a4580baebe8827e83448be674f252498266615da0d28074af697 - 09dfd24698661fbdaabee2eaeebdc7d3b0332692670f0fcf527fa5337bc0152b - d9cb76ab987d91c76297394c77262391623c7bf6a7aa6d3285733c91781a37b7 - ac6452a9230ec8f98ad14ff1f0ea8d1e09abe261fc4bb8b2d5f23bb9e126049a - 10b4a432d47cc08439923ae728ea6fc69d4dfab1e74a8a8ed26dd05cc2d2bc26 - db5d7c1e2aecb9696b489909e3a212416f868afbb2b8bb6daeb12af87d41fcc5 - ef68c00418ecd5f33ba2a04c04377486d3f41427f17102fd109a261524e82ae2 - 9ebc5226a5df4b59d43f882ac1189fa533ed5f5f969a28c66c309a264b3862ca - 52c747aa446f3eac845307a80156e6b2cf1272f3deca9e660b458edcf0aca061 - 092be0aaa112c014a9265c67f87096c2f7435ceeb65d552c956483150b680b37 - 42e8cc02689e938cfd2af450a4c10252c65ac19ab629a7a8dd352468624c372d - de6473facbcfc9a3546bc3a85e4af0f7de9cbd136ddab50fab3532959ab0bc86 - 163870c128a425251af2ede0d38ef8accd0adfeb5104707abd9c4224d68110f1 - e78462147e49e34a98039edd3b751ac81b0d518c05b882c92593522e3be41090 - ba5d2139f3661faf61e8ea81174154ff3a72a1cedf96e1ef86c4604a1d77dccb - a90a01d2bbb21e2e824d8d11d502ee5686abfe3261d52fe34d026e3df683ec8e - de56f1ffad56e4ac2e8ad41a5b8eb157de0e679ad2769ddb3fa937c5fc3ed346 - fc088a3631385b3af2b2e0dfaead893fc8a5a4e97f1f2624ca67623deca56c61 - 20b9ef31253936a1b66ef665cb3b30de76b5cad3737a038dedc6cc60e0c4b9f2 - 8d6ad31e96e8e8ba6d276ecb9a272bb5fe55fbcd9a2023669f34128b19509781 - 46da213c720672c90d3f3be775f323f262ba9c547550e941d98fccd5c46b0467 - 2b67b45dda21740ff8311c928381731be16fd5ae5202e53c34e04e7012a2fd88 - 616ee83bdc800b0cd1dff9dc38f8fafdddd895361e0566d0647ed410dae19571 - f070c954c9fe55546f26f7413644adf8735a0ac0a8f25aeb03c49a2f7607f99e - b6c157049603e8a3c52861d09709127f697c7eab3f178fd51e63c7feb6d37dda - 7c3eaa77d1d1815fede72a354f392cb9d56040121c5f846fd8c0266be002cf7e - 9ecd26a0d734cb839607b9aad8905dad53cfab1ad8dea955736125356626d3a2 - d029753420d2be27cdd1ed8f9cd2de4ed11599955b1f7c0dc8580192f3e7508b - b1f949e5199bdff0c9a86129acc3109f0468990f0762d95208524b4070f04d84 - 61b9e86d6febbed5ad0cdfd2f8dbaf3d5370f4edb2ac7b7c50711dfe9b3a5358 - efa82fb4ea09a766d338b19edf3bb7135beb47a5184a0e0401430f71b6234208 - ebfb7d01f716526339b7f81cddc1c8c8f6f1482359289fcc856f4644b5a03e1d - 3de49b3f755a26214a89185900ec738ef94d74a8df44e7b4ed1a05025f1ecefb - 9f0f6a348c4b559d8e17a6212973d0640a7de991efb8ca82ac9690321ab94de4 - 173c98c5693713001cc11e8b3c678e88982a46a0ed52d5b57af386065cc13420 - 9054a916a230f37374810c76c16901e20c5b093080ee288fc917ea369bf84d29 - f2f8b399058db692a373f25c3f9ba06eca8d006cef3135d70de86e9f8530718b - ea92a9d90484c4e876719f7ed33537246a30d2072a5972fc524518866ac60955 - 5f3d4b2b08b0de74b68e35785d0b1cc4edd54864be66747a6174796a7cd006c6 - d72ea87b03c7902287c398f261ca037f94f09873ae780535f6365a9953f5f2af - d8eeced7eb1cbc38ec8c42777d83a430c8a248173a823f46c9f728a7ee27b687 - 88138431b6d6a12daa6327fb9e0fa6ffaf7df04eb4c474ae6e0016553a1901a5 - d1216afe7723a93dc40d805207755ebef4f8f20cc0244c5059c8d6caccf09b89 - 76352a3e8a715f312aaec7b445eb7ea25aec078744c85d6dc5766b9bde97b5b4 - 52ec0852a4800f3378adb2d53111345d1ece2312196eaf25d6568dad7f69f713 - f2bfe4ad76d999d04e1a45f57baabe84e66fb631bc17db10ba3e092033293cbb - e3c6c6fae06f269725b26b2da7e91a581a99e76a1d4f3ff588aad48467221791 - f9f9d3dd33e76b88a774ab49cc03b0690397cce5088f3144a393cb977e486c12 - efaae764deeb4f68fb33cf9d94614c6417dd4ce003616d214bee2baf43fba09a - 610a74d5827d18516b9d57c72454fc63e99697c14607312f88a0a632cc1afe2e - 12d616cad38717e8233f22f9648ae5d01bd1a2f032766d7f8165c5df65057388 - 555b87bf983d17d413d7773feb9d229568c4dededac5ae75fb23edb8c35f8200 - 64b0905e5e2f2c13d2a8075625193a0e05632ccc46d7182fa28c91db613beade - 498989d4890785900af1c9841dd57456ebe9ac8f0b6ce49ba5ca45b6294a59c8 - c8b193b437f286d75887003d8999912edca3b1ffa6efab049ab1daa4089a07e4 - a9f82fe7992e289b4bf89f2ea18fba0ee5933355d702f910bcedf0343cd14895 - 4ca15671170e895787514a4aed5eeda4fc8b6e51aeb896535a675ab265c8e71d - 5c83d417aeeca96bc1a6da0c3308df4643e145811961cd17cdb778f1ab67da20 - ea232ec62ef742943dc11f2c511ae18c3d6e4ecfc247b72ae79e55f3c9d1cb29 - 4ce37dda50aa562adf50863b1c5cc47261d43cebe687f1caa6087ba08cd1a1c2 - 7d1ffe2edccbb15dbe1cd9f90fe5c2bd28b3c3572f1ee50ccfab66d4a4a5e96a - 80cdc738440f1dd24485086ad2ee95b1138c7fb7fc321b431e4740249d2f91e0 - 425961f166c4f8c7c44dd1df27bd709ba84b2e54464c1d2c746e55d79d7e198e - e85f2de7c693f207d6b26546a74a67e3bef7a1711bc024d38932beb1cf457877 - e52af4a4a1b91d4835d047244a2e77d86ebe950516de4f9bcea722710149b85f - 3268f702171e52b947bc16f1c2258b67e20cf9933ed24f0b302b8f9abacec2dc - 2b34cd5b84718079c251ed70e456e10dc84d8a4b0f6b1aca37f66e5872043ca4 - bd2eb8eb6b7b3cd9d4355e803396dbb4e69ea846c690141b50371b43e9a1eb3b - 9f5a0abe527cb14269d2003d2a43af55b9fbda5e4db6b53ac2e20573397fbc3d - 88c0448bf4b830184b19e1fb9247f111a10583fe4c59fd8963df1a686bc4a343 - 4e533c2dcdb8f3bc9bea6b874c51d4f92e9ecf27a229f0f0d9f20d46dbdeb328 - 329e53cd9fa83ccf6ffbd134279decd24a4afd8e2ae789a813e570aaaf2b5b79" +checksum="8948b5bc3749cb16505f5be423e08a2193f97367ef8eec3a6d73fa5e16518664 + c5da7f10158619b9a8f6212b215f2d9b9b01a0acebca90c487f9dac9379a48cc + 4ddda9263913981d43d65fb09684db3160e627e0d8db164d65fca5e3860b654a + ece74e90824251c50ddc6d9a4041cce198e7ad38552ba4681f1f3d645f68c1bc + 5a2bfe54ba0538c67a48c986af1414426e043b362e9e25082306d3a5b9c42566 + b8f4603ef99164f143eec439093e3def9c29de3ceabcb1d2301dbd558ec38c61 + 6c9305d900b3b68eacf7d0302484a6f75ab68055673eab77759f67796f00ce3a + 115c0ac30e9eb3d3e8461e3de8e0ace1e28c5a6b3b872ed5257dc4d1b2ad0ada + 967218c9599bccee979cb54f2a550a7efc97fcb31c1112d5db7dcfa784a591cd + 32a2210fb9823eec5cefd190874798ec4ca5f177b28c2381cfcf42867cd0de43 + e9fc7a9e679b00c106e7a2816e379afcf59f8eb43f4a189b55fd6ead3f8903ca + a0ab68bc5f5099bcdb972262e4ba8b76be1f99cd2595df9179e03ffd66c8fc8b + 5bda05ab737524b7236b72085bd7e8d1121987fbdc600fe0df83a6c4b10005ed + d831856e9535a1c2e47c40714e39ecb39a8805ae0401617c9c433637a7d2954b + bdf36ea892f81c65901391a36be5137d4b770fd0a841ae8a7c44eaddd2307d33 + 16a3e4586c2eab446eac2b3a0ce6fac4c9c3c8504a83274a62994001063bdb93 + 12c29e1e66683e9d70d80ec0f78a5b5d2a878541d0f820fd06f7041efe73285c + 13883b08ffb679ed46709d2d5b10e0a1a90544bffeb1e1fbdfabdaeb654d9338 + 3f179c3d21ba247caabbb0765f921f52ca253c0b4fe85ef51b84747813a6ccef + 657e11faa9dd2873ea2e09f269a3cbd43a69d9439a9324314e7b952cea95927b + cf0f32cd8f76c267f4c72f8c1f13f8b87a6bfeda1af34003e3a6e792268afb53 + 023b360ee958af7c76bf16929baf6ffbf8dcde1a8e25ddfa81417b28b7b54648 + f8038d1f6e73d05863794898cb87cd81544b8204a50f421b05ba868f2989f374 + af5e482090a0ce81cb0d5342a0bd9027f8a166c09da8c5b8bae025bda32f0446 + aa73dff723fea84b78fbd18453cb492116ad4471de3ae15c1678030804a2f51f + f2ff03259d3f7ce34967120007f9d9686336eb79a814e03206502e1249294846 + e9a16c6eee2a738cb2afddab8c7facdc5534aa675db2c4ae8779fdfdd96e9cbd + 5a40befde0d6b4fce9aa0ae26b63b940b7018c66326a0fa492e1b84d1975fc6e + c9fe275847c3695e495efa77095b43b9cad38bf86545af8a3acc25b9bac9a3dd + 091f738b6900764fbab2cb28a9febc5c7fc320a9ab834546a678405bdb036a6f + e111308f39402bda964294023a5666f97b2027ab1f4b3e0419f5965bb6971351 + 1144254f869be77b8ce3906c3cb2246447fb9d61a5d7fb5fa42832dc56c0d32c + 359f14dbaec8994c2af2ff0152fe55f66670b08e0b795a3c38cfb59f2fc54124 + fa105030cc81e8fd7320d2cc284200114caaad160715f084bb6a92a1d4986414 + c8d8eee7917685abc8dc4afb43defc30ebc8dd8620b0efe58ea06969869d05ee + c28e0b1359aea6a496ae32cb5a1e0734aa9be9776337286fa50ed942c46603b4 + 7cf22ff237ae3389d9748883e801f520801a0fe27ddaf695b2ca8ba0bb0d0b91 + 5472b9ed9ca64381b2b72ff816a93eb9c4e4a0040eeb18e6cba394241a88aabf + 87bf0650109989fa63d4af784b412e11af2fe21073cdf0063529a08604200d52 + ed31d7fef2541964d81221a156f212c740bfd649fce68871f4cc771594e59bbc + 824132feb064800d8bb01a9b542b55cfa154a4a5c72359f8c2aa9798d09fe66d + d7aa4477c6e5926872bc0a30a4dbb78117d95174a3187ac01e98f834d308e03b + 63536a4530531b1ac3c4402931ba9236c871bdc219753fdcdbdcee1773c4215d + 58b56a4fe74549a1ffb4edb415a71eaabf1bb503636afe63e99b7eea8a6043e5 + 6f91d424437da84936aa8f8f279eb4bcaa0d3085d174060faaa257d3283682c0 + a5934837f90e95436535f9d253b7b036825901cbdea66265c8725101dd4e3959 + 6fd0d0ec55783f9f4c683d1b5540f6528d0f90776f68c9728195011f67595797 + 3df0b210a80c6d0dc5eb29bd27ff03e8f64c58447ca7ab700d38c0fbd1a6253a + f2e0014d26c114ca039f563758d91ffffcbc9bd6e57e91e2f5382695003021d3 + c213da9f406d8e704c924bc3ee09d9a8f5242ca51a64c796ff3acbc7314540a9 + 4c6e1e6f0e268cb101a3bcfa80e46117ed961f80db3eb41ede3cf362dc488ab9 + 0a974f5080f3939bb8cb4a8238f4eb1f3e4dff1ecbfbbf8764b978132b76e9db + 0db314d085837f561632844c2c994168b895ff25f6991129c075e094f51939c0 + e2f3c47d270176ee59261fcc93b6792c564ae9df6032b8ccacd32cc322c4a829 + ea1d66abb92ae1390daa31ef42910fd2b6aa2d36c699c850d0c79b0038b2c600 + 749d67d00535964f9e50f34e4e8bb9898abffeb66296a587a45453f422de228c + d5ac6147bcee7102ebd43bb238b81b9a8158c3cc0e660a300f601999f33b7ed0 + f71ae7eec432df0aaf06421d4198cb64ac0064054260df644dd14f92b784c797 + 5903651f98d9e47015d957d774cd5c55f99af58474265bd8a4719d867f2547e9 + 5d243db8ba57152dfd0afb2eb7358d76adc822c2560986c7007498c30c52d307 + 53258ace000ba00933e4a3265ce6fad2cad2e5bdb4448555197dfa8150d9c61d + c8c97d828fd74c668812c64213136e6550611d3be0f74b556bcbe933324f2b23 + 1cf40df46e2ee312e94d7fa1498f2c0df3f901ec251d10df408cc67d3c518e7a + 5fa5679d85277277ac53f4e69463fb4476b908ff4b26b9d73f22f3e1afcc03e0 + ce55942c55750ba507673baf352d0e54869f6982fcd7754d2cf19f53a51205b6 + 5d859d8529710bacd29af380f3a1b36c733f058b724a01011a12090310024292 + 775e2cd6d0e4cf14689a7e94a4d637f9d613f700b03a55d477c0c13d2f1b82a4 + 66c5271f5532913c668d0b39ced6761583573666b2a1e73365001cce2ff07e86 + 5d735e10354e8881658efdae55008018a87520666a0352cc24febf5ff54980a3 + 901dbd44508d192e433beeecc3d943ff4495e957f0131bfa928ff3aeac95f93e + 81d616b17b511fc2e105040640abfa2a0bb88488c09470ec40d18bc6a97db91e + d9b7986c521106926bb688eb1129af2d3cb78779f01a5c4584062a8b8727acbc + e9d353b4eacd1fb86e2b7bfa69b5a36e4ca64f1d44b79b06406df73f8a2eceb1 + b8acbf7404fd72eb23891c158a2901b558f8d43d639f95c1769f63ece40bc210 + 162d14c7f06d0fdbf611cd3b9e9423959fe5f29377f7f698798a0665623eab00 + 0f8b595b3f4a30fc596aaa7e00975ef7b870c4dc8f311839f6b07b3344a261d7 + 690039f7da16dc5e7c647505be35ecfaad88fe43fec2f70d9e43e78207385a61 + 1cffde102ae06f99b56f50b1ed05a6415396f1c52d65d6b4f95982db1b0e58ec + a7e015769f1a7a2f9bb7483478e60d5e8c50baa643ba8ad3a3438eec8de372a5 + 0643c5a329da995ea06d773b2a967a08aee6ded648f3094100063f895ca25d1b + 913c1a2b7619c1aa8e4d348f0ca2a1435dcbb12098db5ce4afdb3f9150301716 + 14f5433f4877a79189291577a41f679a59a242254e1634ece944806e99450335 + a90d4c64843c48b75bd97f1c0787f44be65561594efa3f48842429d2d0f061f3 + e06222f91c2fb1230d0804be72ebf32c3b8bc370b2d5993a372371dd45003ec9 + 11bb1d9950260b146156a00bfbc838357462e0a0b0db3a77be7520d899f69f06 + 276b5ba03c98e3c60499d640486ba15c482593fe53025f407f177c958851d278 + 5c6478fd1d44b4ff39385551a1fa8c0be151bc784bbb736b33c9bb0f40bca00d + 13cafcf2d7bb8732c38255f653559c92b04a3f51c2ff4171f776be9b3745b40c + d57d101bbbc6f1dd3efdff4cc84eee590c7dba5a825a3b68a773f1d34b4de926 + 971349395cb0e7047e31db3e4dbc7070cc15ed714680e215e5dc5ba30e83f727 + 28e657f20e054372a90d559dc83db0fadaed152a69b16bfa1b3570b8267782c2 + d4145eec7d078f827362b3cc80be386a2b5586fe61f9e5869dd2aa7103fb8a3e + 0da0d311600903648d172d76065ce758475b23c0888c713bd363668e25bcae97 + 193ec4926ecb1dd9a652d97abdef82ee0ad6d1f3091cdfb95df4b2568fdf5ea3" From 0d81a9a16ff810e56783939411da49abcb433097 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Fri, 7 Jun 2019 10:33:16 +0200 Subject: [PATCH 398/400] osmid: update to 0.6.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/osmid/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/osmid/template b/srcpkgs/osmid/template index 6da7cb2b44c..8ec5c1539fd 100644 --- a/srcpkgs/osmid/template +++ b/srcpkgs/osmid/template @@ -1,6 +1,6 @@ # Template file for 'osmid' pkgname=osmid -version=0.6.1 +version=0.6.5 revision=1 build_style=cmake hostmakedepends="pkg-config" @@ -10,7 +10,7 @@ maintainer="Jürgen Buchmüller " license="MIT, GPL-2.0-or-later" homepage="https://github.com/llloret/osmid/" distfiles="https://github.com/llloret/osmid/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=3dd7c62e8a13f37252bd021d3855d7fc07449218c1e9c41315d01de4059a830e +checksum=2d6fe2b67bcb60b700f38be3bcece59003e394cd214e13f78c1f4a872b0d9508 case "$XBPS_TARGET_MACHINE" in *-musl) makedepends+=" libexecinfo-devel" ;; From 492924bdcf6a8fb52a32a7407b4d15f4786075ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Fri, 7 Jun 2019 10:57:32 +0200 Subject: [PATCH 399/400] osmid: fix for big endian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/osmid/patches/big-endian.patch | 65 ++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 srcpkgs/osmid/patches/big-endian.patch diff --git a/srcpkgs/osmid/patches/big-endian.patch b/srcpkgs/osmid/patches/big-endian.patch new file mode 100644 index 00000000000..fdb11eb4a6b --- /dev/null +++ b/srcpkgs/osmid/patches/big-endian.patch @@ -0,0 +1,65 @@ ++++ external_libs/oscpack_1_1_0/osc/OscReceivedElements.cpp 2019-06-06 22:06:36.000000000 +0200 +--- external_libs/oscpack_1_1_0/osc/OscReceivedElements.cpp 2019-06-07 10:54:40.107305153 +0200 +@@ -105,7 +105,7 @@ + + return u.i; + #else +- return *(int32*)p; ++ return *(int32*)p; + #endif + } + +@@ -125,7 +125,7 @@ + + return u.i; + #else +- return *(uint32*)p; ++ return *(uint32*)p; + #endif + } + +@@ -149,7 +149,7 @@ + + return u.i; + #else +- return *(int64*)p; ++ return *(int64*)p; + #endif + } + +@@ -173,7 +173,7 @@ + + return u.i; + #else +- return *(uint64*)p; ++ return *(uint64*)p; + #endif + } + +@@ -249,7 +249,7 @@ + + return u.i; + #else +- return *(int32*)argument_; ++ return *(int32*)argumentPtr_; + #endif + } + +@@ -280,7 +280,7 @@ + + return u.f; + #else +- return *(float*)argument_; ++ return *(float*)argumentPtr_; + #endif + } + +@@ -400,7 +400,7 @@ + + return u.d; + #else +- return *(double*)argument_; ++ return *(double*)argumentPtr_; + #endif + } + From 434989c010024c97643e479e883e024589c6d176 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 7 Jun 2019 09:32:32 +0000 Subject: [PATCH 400/400] libwhich: update to 1.1.0. --- srcpkgs/libwhich/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libwhich/template b/srcpkgs/libwhich/template index 79f9753a326..5c8b71335d3 100644 --- a/srcpkgs/libwhich/template +++ b/srcpkgs/libwhich/template @@ -1,6 +1,6 @@ # Template file for 'libwhich' pkgname=libwhich -version=1.0.0 +version=1.1.0 revision=1 build_style=gnu-makefile short_desc="Which for dynamic libraries" @@ -8,7 +8,7 @@ maintainer="John " license="MIT" homepage="https://github.com/vtjnash/libwhich" distfiles="https://github.com/vtjnash/libwhich/archive/v${version}.tar.gz" -checksum=61d5d643d4cbd4b340b9b48922e1b4fd2a35729b7cfdcc7283aab82a6f742a6c +checksum=f1c30bf7396859ad437a5db74e9e328fb4b4e1379457121e28a3524b1e3a0b3f do_install() { vbin libwhich