From 2f987e1c744e46284129310a20f31a7da224b8de Mon Sep 17 00:00:00 2001 From: Peter Bui Date: Sat, 26 Oct 2019 19:27:26 -0400 Subject: [PATCH 001/186] libplacebo: update to 1.21.0. --- srcpkgs/libplacebo/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libplacebo/template b/srcpkgs/libplacebo/template index ae932e0f323..6034694896b 100644 --- a/srcpkgs/libplacebo/template +++ b/srcpkgs/libplacebo/template @@ -1,6 +1,6 @@ # Template file for 'libplacebo' pkgname=libplacebo -version=1.7.0 +version=1.21.0 revision=1 build_style=meson configure_args="-Dvulkan=enabled -Dglslang=enabled -Dshaderc=enabled" @@ -11,7 +11,7 @@ maintainer="Orphaned " license="LGPL-2.1-or-later" homepage="https://github.com/haasn/libplacebo" distfiles="https://github.com/haasn/libplacebo/archive/v${version}.tar.gz" -checksum=5ee618bee614aeae9f8bb526329824468f93c740e8fd37fd46d58114fd7977eb +checksum=09d78911a2c13c38b8913d29cf4d78c424d00aa998a84a8011e5db14477c72f8 libplacebo-devel_package() { depends="libplacebo-${version}_${revision} vulkan-loader lcms2-devel" From fbb71cdd819855a95e9b66cfa690783a148fe668 Mon Sep 17 00:00:00 2001 From: Peter Bui Date: Sat, 26 Oct 2019 21:24:58 -0400 Subject: [PATCH 002/186] vlc: revbump for libplacebo-1.21.0. Needed to patch vlc-3.0.8 to build with new libplaceabo API (changes taken from upstream code). --- srcpkgs/vlc/patches/libplacebo.patch | 74 ++++++++++++++++++++++++++++ srcpkgs/vlc/template | 2 +- 2 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/vlc/patches/libplacebo.patch diff --git a/srcpkgs/vlc/patches/libplacebo.patch b/srcpkgs/vlc/patches/libplacebo.patch new file mode 100644 index 00000000000..59a4403875f --- /dev/null +++ b/srcpkgs/vlc/patches/libplacebo.patch @@ -0,0 +1,74 @@ +--- modules/video_output/opengl/vout_helper.c.orig 2019-10-26 20:43:34.539073815 -0400 ++++ modules/video_output/opengl/vout_helper.c 2019-10-26 20:44:35.160773193 -0400 +@@ -628,8 +628,8 @@ + .log_level = PL_LOG_INFO, + }); + if (tc->pl_ctx) { +-# if PL_API_VER >= 6 +- tc->pl_sh = pl_shader_alloc(tc->pl_ctx, NULL, 0); ++# if PL_API_VER >= 20 ++ tc->pl_sh = pl_shader_alloc(tc->pl_ctx, NULL); + # else + tc->pl_sh = pl_shader_alloc(tc->pl_ctx, NULL, 0); + # endif +--- modules/video_output/opengl/fragment_shaders.c.orig 2019-10-26 20:46:43.382252481 -0400 ++++ modules/video_output/opengl/fragment_shaders.c 2019-10-26 20:51:40.295679834 -0400 +@@ -616,7 +616,13 @@ + color_params.intent = var_InheritInteger(tc->gl, "rendering-intent"); + color_params.tone_mapping_algo = var_InheritInteger(tc->gl, "tone-mapping"); + color_params.tone_mapping_param = var_InheritFloat(tc->gl, "tone-mapping-param"); ++# if PL_API_VER >= 10 ++ color_params.intent = var_InheritInteger(tc->gl, "rendering-intent"); ++ color_params.tone_mapping_algo = var_InheritInteger(tc->gl, "tone-mapping"); ++ color_params.tone_mapping_param = var_InheritFloat(tc->gl, "tone-mapping-param"); ++# else + color_params.tone_mapping_desaturate = var_InheritFloat(tc->gl, "tone-mapping-desat"); ++# endif + color_params.gamut_warning = var_InheritBool(tc->gl, "tone-mapping-warn"); + + struct pl_color_space dst_space = pl_color_space_unknown; +--- modules/video_output/opengl/vout_helper.h.orig 2019-10-26 21:13:30.126142457 -0400 ++++ modules/video_output/opengl/vout_helper.h 2019-10-26 21:11:44.991922998 -0400 +@@ -171,6 +171,30 @@ + #define DEPTH_TEXT "Dither depth override (0 = framebuffer depth)" + #define DEPTH_LONGTEXT "Overrides the detected framebuffer depth. Useful to dither to lower bit depths than otherwise required." + ++#define DESAT_STRENGTH_TEXT "Desaturation strength" ++#define DESAT_STRENGTH_LONGTEXT "How strongly to desaturate bright spectral colors towards white. 0.0 disables this behavior, 1.0 enables full desaturation (hollywood-style)" ++ ++#define DESAT_EXPONENT_TEXT "Desaturation exponent" ++#define DESAT_EXPONENT_LONGTEXT "Controls the steepness of the desaturation curve. If you set this to 0.0, the curve will be flat, i.e. desaturation always enabled (hollywood-style)." ++ ++#define DESAT_BASE_TEXT "Desaturation base" ++#define DESAT_BASE_LONGTEXT "Controls the starting offset of the desaturation curve. Brightness values below this base will always be colorimetrically tone mapped (never desaturated)." ++ ++#if PL_API_VER >= 10 ++#define add_desat_params() \ ++ add_float("desat-strength", pl_color_map_default_params.desaturation_strength, \ ++ DESAT_STRENGTH_TEXT, DESAT_STRENGTH_LONGTEXT, false) \ ++ add_float("desat-exponent", pl_color_map_default_params.desaturation_exponent, \ ++ DESAT_EXPONENT_TEXT, DESAT_EXPONENT_LONGTEXT, false) \ ++ add_float("desat-base", pl_color_map_default_params.desaturation_base, \ ++ DESAT_BASE_TEXT, DESAT_BASE_LONGTEXT, false) \ ++ add_obsolete_string("tone-mapping-desat") ++#else ++#define add_desat_params() \ ++ add_float("tone-mapping-desat", pl_color_map_default_params.tone_mapping_desaturate, \ ++ TONEMAP_DESAT_TEXT, TONEMAP_DESAT_LONGTEXT, false) ++#endif ++ + #define add_glopts_placebo() \ + set_section("Colorspace conversion", NULL) \ + add_integer("rendering-intent", pl_color_map_default_params.intent, \ +@@ -184,10 +208,9 @@ + add_integer("tone-mapping", PL_TONE_MAPPING_HABLE, \ + TONEMAPPING_TEXT, TONEMAPPING_LONGTEXT, false) \ + change_integer_list(tone_values, tone_text) \ ++ add_desat_params() \ + add_float("tone-mapping-param", pl_color_map_default_params.tone_mapping_param, \ + TONEMAP_PARAM_TEXT, TONEMAP_PARAM_LONGTEXT, true) \ +- add_float("tone-mapping-desat", pl_color_map_default_params.tone_mapping_desaturate, \ +- TONEMAP_DESAT_TEXT, TONEMAP_DESAT_LONGTEXT, false) \ + add_bool("tone-mapping-warn", false, TONEMAP_WARN_TEXT, TONEMAP_WARN_LONGTEXT, false) \ + set_section("Dithering", NULL) \ + add_integer("dither-algo", -1, DITHER_TEXT, DITHER_LONGTEXT, false) \ diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template index 7f343d922be..27b6b39f135 100644 --- a/srcpkgs/vlc/template +++ b/srcpkgs/vlc/template @@ -1,7 +1,7 @@ # Template file for 'vlc' pkgname=vlc version=3.0.8 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-gme --disable-libtar --enable-jack --enable-live555 --disable-fluidsynth --enable-dvdread From 66f3873fb26c33b90da4b06c66fbd7bc4047ca95 Mon Sep 17 00:00:00 2001 From: Peter Bui Date: Sat, 26 Oct 2019 21:37:55 -0400 Subject: [PATCH 003/186] mpv: update to 0.30.0. --- srcpkgs/mpv/template | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/srcpkgs/mpv/template b/srcpkgs/mpv/template index 86f58ebfab5..a53c92a782c 100644 --- a/srcpkgs/mpv/template +++ b/srcpkgs/mpv/template @@ -1,29 +1,29 @@ # Template file for 'mpv' pkgname=mpv -version=0.29.1 -revision=7 +version=0.30.0 +revision=1 build_style=waf configure_args="--confdir=/etc/mpv --docdir=/usr/share/examples/mpv - --enable-dvdread --enable-dvdnav --enable-cdda --enable-libmpv-shared + --enable-dvdnav --enable-dvdnav --enable-cdda --enable-libmpv-shared --enable-dvbin --enable-libarchive $(vopt_enable alsa) $(vopt_enable caca) $(vopt_enable jack) $(vopt_enable lua) $(vopt_enable oss oss-audio) $(vopt_enable pulseaudio pulse) $(vopt_enable sdl2) - $(vopt_enable smb libsmbclient) $(vopt_enable sndio) $(vopt_enable v4l2 tv) + $(vopt_enable smb libsmbclient) $(vopt_enable sndio) $(vopt_enable vapoursynth) $(vopt_enable vdpau) $(vopt_enable wayland) $(vopt_enable x11) $(vopt_enable vulkan) $(vopt_enable vulkan shaderc)" hostmakedepends="pkg-config python-docutils perl $(vopt_if wayland wayland-devel)" makedepends="MesaLib-devel ffmpeg-devel harfbuzz-devel lcms2-devel libXv-devel libass-devel libbluray-devel libcdio-paranoia-devel libdvdnav-devel - libdvdread-devel libguess-devel libuuid-devel libva-glx-devel rubberband-devel + libdvdnav-devel libguess-devel libuuid-devel libva-glx-devel rubberband-devel libarchive-devel $(vopt_if alsa alsa-lib-devel) $(vopt_if caca libcaca-devel) $(vopt_if jack jack-devel) $(vopt_if lua lua52-devel) $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if sdl2 SDL2-devel) $(vopt_if smb samba-devel) $(vopt_if sndio sndio-devel) - $(vopt_if v4l2 v4l-utils-devel) $(vopt_if vapoursynth vapoursynth-devel) + $(vopt_if vapoursynth vapoursynth-devel) $(vopt_if vdpau libvdpau-devel) $(vopt_if wayland "wayland-devel wayland-protocols libxkbcommon-devel") $(vopt_if x11 "libXScrnSaver-devel libXinerama-devel libXrandr-devel") - $(vopt_if vulkan 'Vulkan-Headers vulkan-loader shaderc')" + $(vopt_if vulkan 'Vulkan-Headers vulkan-loader shaderc libplacebo-devel')" depends="desktop-file-utils hicolor-icon-theme $(vopt_if vapoursynth vapoursynth-mvtools)" short_desc="Video player based on MPlayer/mplayer2" maintainer="Orphaned " @@ -31,17 +31,17 @@ license="GPL-2.0-or-later" homepage="https://mpv.io" changelog="https://github.com/mpv-player/mpv/releases" distfiles="https://github.com/mpv-player/${pkgname}/archive/v${version}.tar.gz" -checksum=f9f9d461d1990f9728660b4ccb0e8cb5dce29ccaa6af567bec481b79291ca623 +checksum=33a1bcb7e74ff17f070e754c15c52228cf44f2cefbfd8f34886ae81df214ca35 build_options="alsa caca jack lua oss pulseaudio sdl2 smb sndio vapoursynth - vdpau v4l2 wayland x11 vulkan" -build_options_default="alsa jack lua pulseaudio sndio vdpau wayland x11 v4l2 vulkan" + vdpau wayland x11 vulkan" +build_options_default="alsa jack lua pulseaudio sndio vdpau wayland x11 vulkan" desc_option_caca="Enable support for libcaca video output" desc_option_oss="Enable support for OSS audio output" vopt_conflict sdl2 wayland if [ -z "$CROSS_BUILD" ]; then - configure_args+=" --enable-zsh-comp" + configure_args+=" --zshdir=/usr/share/zsh/site-functions" fi pre_configure() { From 3bef12baf4347a53e3f654a64d90ea03c908cb01 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 27 Oct 2019 12:00:07 +0100 Subject: [PATCH 004/186] common/shlibs: update for libplacebo-1.21.0. --- common/shlibs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/shlibs b/common/shlibs index ec36c9ceb01..935bc6c9bbd 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3264,7 +3264,7 @@ libkid3-gui.so.3.8.0 kid3-3.8.0_1 libcfitsio.so.3 cfitsio-3.450_1 libapparmor.so.1 libapparmor-2.12.0_1 libgsettings-qt.so.1 gsettings-qt-0.1+17.10.20170824_1 -libplacebo.so.7 libplacebo-1.7.0_1 +libplacebo.so.21 libplacebo-1.21.0_1 libw2xc.so waifu2x-converter-cpp-5.2_1 libnova-0.15.so.0 libnova-0.15.0_1 libdtkcore.so.2 dtkcore-2.0.6_1 From 0031a72217b250573f73282969510d35629ef39c Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 27 Oct 2019 12:14:24 +0100 Subject: [PATCH 005/186] xbps-src/chroot.sh: initialize XBPS_CONFIG_FILE. Fixes #15208 --- common/xbps-src/shutils/chroot.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh index a946fd1acfb..b880d4151d2 100644 --- a/common/xbps-src/shutils/chroot.sh +++ b/common/xbps-src/shutils/chroot.sh @@ -5,6 +5,7 @@ chroot_init() { mkdir -p $XBPS_MASTERDIR/etc/xbps + : ${XBPS_CONFIG_FILE=/dev/null} cat > $XBPS_MASTERDIR/etc/xbps/xbps-src.conf <<_EOF # Generated configuration file by xbps-src, DO NOT EDIT! $(grep -E '^XBPS_.*' "$XBPS_CONFIG_FILE") From 1cdfc1165908573731af902e9fb182ab695c0781 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 27 Oct 2019 12:15:49 +0100 Subject: [PATCH 006/186] xbps-src/chroot.sh: fix previous correctly --- common/xbps-src/shutils/chroot.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh index b880d4151d2..9c36a173255 100644 --- a/common/xbps-src/shutils/chroot.sh +++ b/common/xbps-src/shutils/chroot.sh @@ -5,7 +5,7 @@ chroot_init() { mkdir -p $XBPS_MASTERDIR/etc/xbps - : ${XBPS_CONFIG_FILE=/dev/null} + : ${XBPS_CONFIG_FILE:=/dev/null} cat > $XBPS_MASTERDIR/etc/xbps/xbps-src.conf <<_EOF # Generated configuration file by xbps-src, DO NOT EDIT! $(grep -E '^XBPS_.*' "$XBPS_CONFIG_FILE") From 23fabb6c522005dd0df736891c2f7a031f9abbb3 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 27 Oct 2019 15:01:42 +0100 Subject: [PATCH 007/186] include-what-you-use: update to 0.13. --- srcpkgs/include-what-you-use/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/include-what-you-use/template b/srcpkgs/include-what-you-use/template index 331c4441fa2..08dff85b77e 100644 --- a/srcpkgs/include-what-you-use/template +++ b/srcpkgs/include-what-you-use/template @@ -1,7 +1,7 @@ # Template file for 'include-what-you-use' pkgname=include-what-you-use -version=0.12 -revision=2 +version=0.13 +revision=1 wrksrc="${pkgname}" build_style=cmake configure_args="-DIWYU_LLVM_ROOT_PATH=${XBPS_CROSS_BASE}/usr " @@ -9,10 +9,10 @@ make_build_args="VERBOSE=1" makedepends="clang clang-tools-extra llvm ncurses-devel zlib-devel" short_desc="Analyze #includes in C and C++ source files" maintainer="Leah Neukirchen " -license="BSD" +license="NCSA" homepage="https://include-what-you-use.org/" distfiles="https://include-what-you-use.org/downloads/${pkgname}-${version}.src.tar.gz" -checksum=a5892fb0abccb820c394e4e245c00ef30fc94e4ae58a048b23f94047c0816025 +checksum=49294270aa64e8c04182369212cd919f3b3e0e47601b1f935f038c761c265bc9 nocross="cross-vpkg-dummy snafu" post_install() { From afecc24e2383884037923316dd2be9f6d44b5a47 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 27 Oct 2019 15:11:07 +0100 Subject: [PATCH 008/186] paps: update to 0.7.1. --- srcpkgs/paps/template | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/srcpkgs/paps/template b/srcpkgs/paps/template index f91e1ac71ce..0f79bfc0fdc 100644 --- a/srcpkgs/paps/template +++ b/srcpkgs/paps/template @@ -1,17 +1,15 @@ # Template file for 'paps' pkgname=paps -version=0.7.0 +version=0.7.1 revision=1 -build_style=gnu-configure -hostmakedepends="automake pkg-config" +build_style=meson +hostmakedepends="pkg-config cmake" makedepends="pango-devel freetype-devel" short_desc="UTF-8 to PostScript converter via Pango" maintainer="Leah Neukirchen " license="LGPL-2.0-or-later" homepage="https://github.com/dov/paps" -distfiles="https://github.com/dov/paps/archive/${version}.tar.gz" -checksum=7a18e8096944a21e0d9fcfb389770d1e7672ba90569180cb5d45984914cedb13 +distfiles="https://github.com/dov/paps/archive/v${version}.tar.gz" +checksum=b8cbd16f8dd5832ecfa9907d31411b35a7f12d81a5ec472a1555d00a8a205e0e -pre_configure() { - autoreconf -fi -} +CFLAGS="-D_XOPEN_SOURCE" From 75fd4b906f4cd88ffd6a9da8325fad8007eef129 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 27 Oct 2019 15:28:01 +0100 Subject: [PATCH 009/186] sbcl: update to 1.5.8. --- srcpkgs/sbcl/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template index 2cecabfdbee..22cf3d26441 100644 --- a/srcpkgs/sbcl/template +++ b/srcpkgs/sbcl/template @@ -1,6 +1,6 @@ # Template file for 'sbcl' pkgname=sbcl -version=1.5.7 +version=1.5.8 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=54742fb5e2f3f350fbafd72bc73662fca21382b5553ed6a146098950d2409485 +checksum=84572f9133d13c982db13d1768d38331421204bc0ca083dacc5364e46796ff4c 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+=" 7f41c480076ce5917c604219ad0e6e28af477dc446b002b3c4d299644097af32" + checksum+=" 63fca9fb30aab7939d1bee0e9b1e995be4d97b0c480670ceeabe8e7363d394d9" ;; i686) distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.4.3-x86-linux-binary.tar.bz2" From b2e39a09784ff8d67f7015b5baacd3b95751a500 Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Sun, 27 Oct 2019 18:20:02 +0100 Subject: [PATCH 010/186] bettercap: update to 2.26.1. --- srcpkgs/bettercap/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/bettercap/template b/srcpkgs/bettercap/template index fa2f192914f..624872b354b 100644 --- a/srcpkgs/bettercap/template +++ b/srcpkgs/bettercap/template @@ -1,6 +1,6 @@ # Template file for 'bettercap' pkgname=bettercap -version=2.26 +version=2.26.1 revision=1 build_style=go go_import_path=github.com/bettercap/bettercap @@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni " license="GPL-3.0-only" homepage="https://github.com/bettercap/bettercap" distfiles="https://github.com/bettercap/bettercap/archive/v${version}.tar.gz" -checksum=efa9d6a6c63d715c05a8898ff84bde8d9ded022296b14245a545a6161cc6f1f6 +checksum=75530015ee27e5ba05faff0295486ca85489ecd9de3161ca398a9b577522c578 case "$XBPS_TARGET_MACHINE" in x86_64-musl) broken="fails to build" ;; From df8a48de3539f986cf826dfbe7e5c3064fb30d22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sun, 27 Oct 2019 19:06:42 +0100 Subject: [PATCH 011/186] lollypop: update to 1.2.2 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 6059b85a232..d290353411c 100644 --- a/srcpkgs/lollypop/template +++ b/srcpkgs/lollypop/template @@ -1,9 +1,9 @@ # Template file for 'lollypop' pkgname=lollypop -version=1.2.1 +version=1.2.2 revision=1 # Gitlab upload tag hash -_uhash=15ebb1f5387e398a2879f2b52d57d8dc +_uhash=aa4fbd92bf338296c28e54710271ccab archs=noarch build_style=meson pycompile_module="lollypop" @@ -16,4 +16,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=1fe8934d13d75a382691e49cfa04dbe109eca03840bb387074f22cb47ba462be +checksum=147b97912b77b8461cf958f7f4b34eb920f57b835cc624e0d92363229475e5f3 From 3b0e7589b94a6650214bdb9420179b2672570d96 Mon Sep 17 00:00:00 2001 From: Noel Cower Date: Thu, 17 Oct 2019 12:11:05 -0700 Subject: [PATCH 012/186] go: update to 1.13.3. --- srcpkgs/go/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/go/template b/srcpkgs/go/template index f74f4c9a0ce..a5c52082580 100644 --- a/srcpkgs/go/template +++ b/srcpkgs/go/template @@ -1,6 +1,6 @@ # Template file for 'go' pkgname=go -version=1.13.1 +version=1.13.3 revision=1 create_wrksrc=yes build_wrksrc=go @@ -10,7 +10,7 @@ maintainer="Michael Aldridge " license="BSD-3-Clause" homepage="http://golang.org/" distfiles="https://golang.org/dl/go${version}.src.tar.gz" -checksum=81f154e69544b9fa92b1475ff5f11e64270260d46e7e36c34aafc8bc96209358 +checksum=4f7123044375d5c404280737fbd2d0b17064b66182a65919ffe20ffe8620e3df nostrip=yes noverifyrdeps=yes From 05383f13f298ecfcef57acc64eb51b6f91dbc046 Mon Sep 17 00:00:00 2001 From: Piraty Date: Sun, 27 Oct 2019 21:55:28 +0100 Subject: [PATCH 013/186] keepassxc: account for new features in 2.5.0 * add build option: FDO secret storage * add readline for interactive CLI sessions * add changelog field --- srcpkgs/keepassxc/template | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/srcpkgs/keepassxc/template b/srcpkgs/keepassxc/template index 47d9a7b5f21..62e7580231d 100644 --- a/srcpkgs/keepassxc/template +++ b/srcpkgs/keepassxc/template @@ -1,11 +1,12 @@ # Template file for 'keepassxc' pkgname=keepassxc version=2.5.0 -revision=1 +revision=2 build_style=cmake configure_args="-DWITH_TESTS=ON -DWITH_XC_UPDATECHECK=OFF -DWITH_XC_AUTOTYPE=$(vopt_if autotype ON OFF) -DWITH_XC_BROWSER=$(vopt_if browser ON OFF) + -DWITH_XC_FDOSECRETS=$(vopt_if fdosecrets ON OFF) -DWITH_XC_KEESHARE=$(vopt_if keeshare ON OFF) -DWITH_XC_KEESHARE_SECURE=$(vopt_if keeshare ON OFF) -DWITH_XC_NETWORKING=$(vopt_if network ON OFF) @@ -13,7 +14,7 @@ configure_args="-DWITH_TESTS=ON -DWITH_XC_UPDATECHECK=OFF -DWITH_XC_YUBIKEY=$(vopt_if yubikey ON OFF)" hostmakedepends="qt5-qmake qt5-host-tools" makedepends="qt5-tools-devel qt5-svg-devel libgcrypt-devel libargon2-devel - qrencode-devel + qrencode-devel readline-devel $(vopt_if autotype 'qt5-x11extras-devel libXtst-devel libXi-devel') $(vopt_if browser libsodium-devel) $(vopt_if keeshare quazip-devel) @@ -23,13 +24,15 @@ maintainer="Piraty " 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/" +changelog="https://github.com/keepassxreboot/keepassxc/blob/${version}/CHANGELOG.md" distfiles="https://github.com/keepassxreboot/keepassxc/releases/download/${version}/keepassxc-${version}-src.tar.xz" checksum=6359ce972b720a8bce1e8ba54000666e9c58f9164f2e9e52bef2e24e46127881 # https://github.com/keepassxreboot/keepassxc/blob/a775031fe9471310e50232d1861d4991e2803aff/CMakeLists.txt#L46 -build_options="autotype browser keeshare network sshagent yubikey" +build_options="autotype browser fdosecrets keeshare network sshagent yubikey" desc_option_autotype="Include auto-type" desc_option_browser="Include browser integration with keepassxc-browser-plugin" +desc_option_fdosecrets="Include Secret Storage Spec server side API" desc_option_keeshare="Include sharing integration with KeeShare" desc_option_network="Include networking code (favicon download)" desc_option_sshagent="Include SSH agent support" From 43aee675b8bdf4ba455c33b44c6fe274ebd69b70 Mon Sep 17 00:00:00 2001 From: bra1nwave Date: Sat, 31 Aug 2019 15:15:40 +0200 Subject: [PATCH 014/186] New package: opentoonz-1.3.0 Closes: #14038 Closes: #14100 [via git-merge-pr] --- .../patches/Fix-Qt-5.13-build-error.patch | 21 +++++++++++ srcpkgs/opentoonz/patches/musl.patch | 22 ++++++++++++ srcpkgs/opentoonz/template | 35 +++++++++++++++++++ 3 files changed, 78 insertions(+) create mode 100644 srcpkgs/opentoonz/patches/Fix-Qt-5.13-build-error.patch create mode 100644 srcpkgs/opentoonz/patches/musl.patch create mode 100644 srcpkgs/opentoonz/template diff --git a/srcpkgs/opentoonz/patches/Fix-Qt-5.13-build-error.patch b/srcpkgs/opentoonz/patches/Fix-Qt-5.13-build-error.patch new file mode 100644 index 00000000000..2149b2c3c01 --- /dev/null +++ b/srcpkgs/opentoonz/patches/Fix-Qt-5.13-build-error.patch @@ -0,0 +1,21 @@ +From adae1528d6f580d56b5499c97b30acfb84af4390 Mon Sep 17 00:00:00 2001 +From: manongjohn +Date: Tue, 9 Jul 2019 23:19:16 -0400 +Subject: [PATCH] Fix Qt 5.13 build error (#2665) + +--- + toonz/sources/include/tfxattributes.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/toonz/sources/include/tfxattributes.h b/toonz/sources/include/tfxattributes.h +index 224a94426..92245cb8d 100644 +--- toonz/sources/include/tfxattributes.h ++++ toonz/sources/include/tfxattributes.h +@@ -5,6 +5,7 @@ + + #include "tgeometry.h" + #include ++#include + + #undef DVAPI + #undef DVVAR diff --git a/srcpkgs/opentoonz/patches/musl.patch b/srcpkgs/opentoonz/patches/musl.patch new file mode 100644 index 00000000000..4ad393812b2 --- /dev/null +++ b/srcpkgs/opentoonz/patches/musl.patch @@ -0,0 +1,22 @@ +--- toonz/sources/common/tcore/tstopwatch.cpp.orig ++++ toonz/sources/common/tcore/tstopwatch.cpp +@@ -11,7 +11,7 @@ + #if defined(__APPLE_CC__) + #include + #else +-#include ++#include + #endif + #include + #include +--- toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp.orig ++++ toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp +@@ -51,7 +51,7 @@ + #endif + + #ifdef LINUX +-#include ++#include + #endif + + // forward declaration diff --git a/srcpkgs/opentoonz/template b/srcpkgs/opentoonz/template new file mode 100644 index 00000000000..d5024f9e205 --- /dev/null +++ b/srcpkgs/opentoonz/template @@ -0,0 +1,35 @@ +# Template file for 'opentoonz' +pkgname=opentoonz +version=1.3.0 +revision=1 +build_wrksrc="toonz/sources" +build_style=cmake +hostmakedepends="qt5-qmake qt5-host-tools pkg-config automake libtool" +makedepends="qt5-devel qt5-svg-devel qt5-script-devel qt5-tools-devel qt5-multimedia-devel + superlu-devel glew-devel libjpeg-turbo-devel liblzma-devel liblz4-devel lzo-devel + libusb-devel SDL2-devel libmypaint-devel boost-devel libfreeglut-devel + openblas-devel" +short_desc="Full-featured 2D animation creation software" +maintainer="bra1nwave " +license="BSD-3-Clause" +homepage="https://opentoonz.github.io/e/" +distfiles="https://github.com/opentoonz/opentoonz/archive/v${version}.tar.gz" +checksum=a5dd0286a58017a086a3533016b9b4f54ada25a230c62de63b995bc04d0cd5a8 + +pre_configure() { + # Upstream uses their own modified version of tiff + if [ "$CROSS_BUILD" ]; then + configure_args="-DTIFF_LIBRARY=${wrksrc}/thirdparty/tiff-4.0.3/libtiff/.libs/libtiff.a + -DTIFF_INCLUDE_DIR=${wrksrc}/thirdparty/tiff-4.0.3/libtiff" + _args="--host=${XBPS_TRIPLET}" + fi + + cd ${wrksrc}/thirdparty/tiff-4.0.3 + autoreconf -fi + ./configure --with-pic --disable-jbig ${_args} + make ${makejobs} +} + +post_install() { + vlicense ${wrksrc}/LICENSE.txt +} From 4f6f952e84944a56d73a22a4b81346ca68f1cf9c Mon Sep 17 00:00:00 2001 From: John Date: Mon, 28 Oct 2019 00:11:15 +0100 Subject: [PATCH 015/186] bind: disable catgets on musl --- srcpkgs/bind/template | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template index d9dbd327368..9e4ec3ebe45 100644 --- a/srcpkgs/bind/template +++ b/srcpkgs/bind/template @@ -2,7 +2,7 @@ pkgname=bind reverts="9.13.6_1" version=9.11.11 -revision=1 +revision=2 _fullver="${version}${_patchver:+-${_patchver}}" wrksrc="${pkgname}-${_fullver}" build_style=gnu-configure @@ -36,6 +36,14 @@ case "$XBPS_TARGET_MACHINE" in x86_64*|i686*) build_options_default+=" seccomp";; esac +pre_configure() { + # various bind-utils segfault with musl-1.1.24 in catgets + # TODO: actually fix instead of disabling it + case "$XBPS_TARGET_MACHINE" in + *-musl) vsed -e 's/#define HAVE_CATGETS 1//g' -i configure + esac +} + do_check() { # requires special network setup : From 88c050e31a235e6ed0f5d22d59ae40ae769f029f Mon Sep 17 00:00:00 2001 From: John Date: Mon, 28 Oct 2019 09:31:09 +0100 Subject: [PATCH 016/186] deja-dup: update to 40.2. --- srcpkgs/deja-dup/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/deja-dup/template b/srcpkgs/deja-dup/template index 4ba8f1d5772..0d495cb19e2 100644 --- a/srcpkgs/deja-dup/template +++ b/srcpkgs/deja-dup/template @@ -1,7 +1,7 @@ # Template file for 'deja-dup' pkgname=deja-dup -version=40.1 -revision=2 +version=40.2 +revision=1 build_style=meson hostmakedepends="appstream-glib dbus glib-devel intltool itstool libgpg-error-devel pkg-config vala desktop-file-utils" @@ -13,4 +13,4 @@ maintainer="John " license="GPL-3.0-or-later" homepage="https://gitlab.gnome.org/World/deja-dup" distfiles="https://gitlab.gnome.org/World/deja-dup/-/archive/${version}/deja-dup-${version}.tar.gz" -checksum=0c068f369ba4e9e68f3e5989eb375ff4b7decfd1f5b02ab42c94d9b3ad995faf +checksum=ebee0016940890c1aed06b9055073a2a5da2a7f7eda70fe273c8fe4019ffb85a From 797a73a0f585c3411a4a54a8e64980f0023f233d Mon Sep 17 00:00:00 2001 From: John Date: Mon, 28 Oct 2019 09:42:55 +0100 Subject: [PATCH 017/186] hwids: update to 20191025. --- srcpkgs/hwids/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/hwids/template b/srcpkgs/hwids/template index a7ee61a427d..786344a54d5 100644 --- a/srcpkgs/hwids/template +++ b/srcpkgs/hwids/template @@ -1,6 +1,6 @@ # Template file for 'hwids' pkgname=hwids -version=20190818 +version=20191025 revision=1 archs=noarch wrksrc="hwids-hwids-${version}" @@ -9,7 +9,7 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://github.com/gentoo/hwids" distfiles="https://github.com/gentoo/hwids/archive/hwids-${version}.tar.gz" -checksum=cee0947dd345fbd3aa2dc008c53d81d05358f7fbebc4eadd626b688a586e83fd +checksum=aa4551217c9d9e980a1229273376a8813ecb34a5f190e8d3c0e6ed8ebd20bfae do_install() { vmkdir usr/share/hwdata From e055f53d4203517638aaf32ccc96a7f6358e9c2d Mon Sep 17 00:00:00 2001 From: ValTimchenko Date: Sat, 26 Oct 2019 17:35:29 +0300 Subject: [PATCH 018/186] par: add unicode patch --- srcpkgs/par/patches/par-i18n.patch | 2858 ++++++++++++++++++++++++++++ srcpkgs/par/template | 4 +- 2 files changed, 2860 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/par/patches/par-i18n.patch diff --git a/srcpkgs/par/patches/par-i18n.patch b/srcpkgs/par/patches/par-i18n.patch new file mode 100644 index 00000000000..2755425f702 --- /dev/null +++ b/srcpkgs/par/patches/par-i18n.patch @@ -0,0 +1,2858 @@ +diff -c ./buffer.c ../Par152-unicode/buffer.c +*** ./buffer.c 2001-03-09 02:51:11.000000000 +0300 +--- ../Par152-unicode/buffer.c 2019-10-26 17:21:08.542050853 +0300 +*************** +*** 1,9 **** +! /*********************/ +! /* buffer.c */ +! /* for Par 1.52 */ +! /* Copyright 2001 by */ +! /* Adam M. Costello */ +! /*********************/ + + /* This is ANSI C code (C89). */ + +--- 1,11 ---- +! /***********************/ +! /* buffer.c */ +! /* for Par 1.52-i18n.4 */ +! /* Copyright 2001 by */ +! /* Adam M. Costello */ +! /* Modified by */ +! /* Jérôme Pouiller */ +! /***********************/ + + /* This is ANSI C code (C89). */ + +*************** +*** 18,23 **** +--- 20,26 ---- + + #include + #include ++ #include + + #undef NULL + #define NULL ((void *) 0) +*************** +*** 60,66 **** + blk = malloc(sizeof (block)); + items = malloc(maxhere * itemsize); + if (!buf || !blk || !items) { +! strcpy(errmsg,outofmem); + goto nberror; + } + +--- 63,69 ---- + blk = malloc(sizeof (block)); + items = malloc(maxhere * itemsize); + if (!buf || !blk || !items) { +! wcscpy(errmsg,outofmem); + goto nberror; + } + +*************** +*** 127,133 **** + new = malloc(sizeof (block)); + items = malloc(maxhere * itemsize); + if (!new || !items) { +! strcpy(errmsg,outofmem); + goto aierror; + } + blk->next = new; +--- 130,136 ---- + new = malloc(sizeof (block)); + items = malloc(maxhere * itemsize); + if (!new || !items) { +! wcscpy(errmsg,outofmem); + goto aierror; + } + blk->next = new; +*************** +*** 174,180 **** + + r = malloc(n * itemsize); + if (!r) { +! strcpy(errmsg,outofmem); + return NULL; + } + +--- 177,183 ---- + + r = malloc(n * itemsize); + if (!r) { +! wcscpy(errmsg,outofmem); + return NULL; + } + +diff -c ./buffer.h ../Par152-unicode/buffer.h +*** ./buffer.h 2001-03-09 02:51:25.000000000 +0300 +--- ../Par152-unicode/buffer.h 2019-10-26 17:21:08.543050853 +0300 +*************** +*** 1,9 **** +! /*********************/ +! /* buffer.h */ +! /* for Par 1.52 */ +! /* Copyright 2001 by */ +! /* Adam M. Costello */ +! /*********************/ + + /* This is ANSI C code (C89). */ + +--- 1,11 ---- +! /***********************/ +! /* buffer.h */ +! /* for Par 1.52-i18n.4 */ +! /* Copyright 2001 by */ +! /* Adam M. Costello */ +! /* Modified by */ +! /* Jérôme Pouiller */ +! /***********************/ + + /* This is ANSI C code (C89). */ + +diff -c ./charset.c ../Par152-unicode/charset.c +*** ./charset.c 2001-04-03 01:51:48.000000000 +0400 +--- ../Par152-unicode/charset.c 2019-10-26 17:21:08.544050853 +0300 +*************** +*** 1,9 **** +! /*********************/ +! /* charset.c */ +! /* for Par 1.52 */ +! /* Copyright 2001 by */ +! /* Adam M. Costello */ +! /*********************/ + + /* This is ANSI C code (C89). */ + +--- 1,11 ---- +! /***********************/ +! /* charset.c */ +! /* for Par 1.52-i18n.4 */ +! /* Copyright 2001 by */ +! /* Adam M. Costello */ +! /* Modified by */ +! /* Jérôme Pouiller */ +! /***********************/ + + /* This is ANSI C code (C89). */ + +*************** +*** 18,25 **** + /* prototypes. Also includes "errmsg.h". */ + #include "buffer.h" /* Also includes . */ + +- #include + #include + #include + #include + +--- 20,28 ---- + /* prototypes. Also includes "errmsg.h". */ + #include "buffer.h" /* Also includes . */ + + #include ++ #include ++ #include + #include + #include + +*************** +*** 39,46 **** + typedef unsigned char csflag_t; + + struct charset { +! char *inlist; /* Characters in inlist are in the set. */ +! char *outlist; /* Characters in outlist are not in the set. */ + /* inlist and outlist must have no common characters. */ + /* inlist and outlist may be NULL, which acts like "". */ + csflag_t flags; /* Characters in neither list are in the set if they */ +--- 42,49 ---- + typedef unsigned char csflag_t; + + struct charset { +! wchar_t *inlist; /* Characters in inlist are in the set. */ +! wchar_t *outlist; /* Characters in outlist are not in the set. */ + /* inlist and outlist must have no common characters. */ + /* inlist and outlist may be NULL, which acts like "". */ + csflag_t flags; /* Characters in neither list are in the set if they */ +*************** +*** 56,80 **** + CS_NUL = 8; /* Includes the NUL character. */ + + +! static int appearsin(char c, const char *str) + + /* Returns 0 if c is '\0' or str is NULL or c */ + /* does not appear in *str. Otherwise returns 1. */ + { +! return c && str && strchr(str,c); + } + + +! static int hexdigtoint(char c) + + /* Returns the value represented by the hexadecimal */ + /* digit c, or -1 if c is not a hexadecimal digit. */ + { +! const char *p, * const hexdigits = "0123456789ABCDEFabcdef"; + int n; + + if (!c) return -1; +! p = strchr(hexdigits, *(unsigned char *)&c); + if (!p) return -1; + n = p - hexdigits; + if (n >= 16) n -= 6; +--- 59,83 ---- + CS_NUL = 8; /* Includes the NUL character. */ + + +! static int appearsin(wchar_t c, const wchar_t *str) + + /* Returns 0 if c is '\0' or str is NULL or c */ + /* does not appear in *str. Otherwise returns 1. */ + { +! return c && str && wcschr(str,c); + } + + +! static int hexdigtoint(wchar_t c) + + /* Returns the value represented by the hexadecimal */ + /* digit c, or -1 if c is not a hexadecimal digit. */ + { +! const wchar_t *p, * const hexdigits = L"0123456789ABCDEFabcdef"; + int n; + + if (!c) return -1; +! p = wcschr(hexdigits, c); + if (!p) return -1; + n = p - hexdigits; + if (n >= 16) n -= 6; +*************** +*** 87,125 **** + } + + +! charset *parsecharset(const char *str, errmsg_t errmsg) + { + charset *cset = NULL; + buffer *cbuf = NULL; +! const char *p, * const singleescapes = "_sbqQx"; + int hex1, hex2; +! char ch; +! + cset = malloc(sizeof (charset)); + if (!cset) { +! strcpy(errmsg,outofmem); + goto pcserror; + } + cset->inlist = cset->outlist = NULL; + cset->flags = 0; + +! cbuf = newbuffer(sizeof (char), errmsg); + if (*errmsg) goto pcserror; + + for (p = str; *p; ++p) +! if (*p == '_') { + ++p; + if (appearsin(*p, singleescapes)) { +! if (*p == '_') ch = '_' ; +! else if (*p == 's') ch = ' ' ; +! else if (*p == 'b') ch = '\\'; +! else if (*p == 'q') ch = '\''; +! else if (*p == 'Q') ch = '\"'; + else /* *p == 'x' */ { + hex1 = hexdigtoint(p[1]); + hex2 = hexdigtoint(p[2]); + if (hex1 < 0 || hex2 < 0) goto pcsbadstr; +! *(unsigned char *)&ch = 16 * hex1 + hex2; + p += 2; + } + if (!ch) +--- 90,129 ---- + } + + +! charset *parsecharset(const wchar_t *str, errmsg_t errmsg) + { + charset *cset = NULL; + buffer *cbuf = NULL; +! const wchar_t *p, * const singleescapes = L"_sbqQx"; + int hex1, hex2; +! wchar_t ch; +! + cset = malloc(sizeof (charset)); + if (!cset) { +! wcscpy(errmsg,outofmem); + goto pcserror; + } + cset->inlist = cset->outlist = NULL; + cset->flags = 0; + +! cbuf = newbuffer(sizeof (wchar_t), errmsg); + if (*errmsg) goto pcserror; + + for (p = str; *p; ++p) +! if (*p == L'_') { + ++p; + if (appearsin(*p, singleescapes)) { +! if (*p == L'_') ch = L'_' ; +! else if (*p == L's') ch = L' ' ; +! else if (*p == L'b') ch = L'\\'; +! else if (*p == L'q') ch = L'\''; +! else if (*p == L'Q') ch = L'\"'; + else /* *p == 'x' */ { ++ /* FIXME _x metacharacter should allow wide characters input.*/ + hex1 = hexdigtoint(p[1]); + hex2 = hexdigtoint(p[2]); + if (hex1 < 0 || hex2 < 0) goto pcsbadstr; +! ch = 16 * hex1 + hex2; + p += 2; + } + if (!ch) +*************** +*** 130,143 **** + } + } + else { +! if (*p == 'A') cset->flags |= CS_UCASE; +! else if (*p == 'a') cset->flags |= CS_LCASE; +! else if (*p == '0') cset->flags |= CS_DIGIT; + else goto pcsbadstr; + } + } + else { +! additem(cbuf,p,errmsg); + if (*errmsg) goto pcserror; + } + ch = '\0'; +--- 134,147 ---- + } + } + else { +! if (*p == L'A') cset->flags |= CS_UCASE; +! else if (*p == L'a') cset->flags |= CS_LCASE; +! else if (*p == L'0') cset->flags |= CS_DIGIT; + else goto pcsbadstr; + } + } + else { +! additem(cbuf, p,errmsg); + if (*errmsg) goto pcserror; + } + ch = '\0'; +*************** +*** 149,159 **** + pcscleanup: + + if (cbuf) freebuffer(cbuf); + return cset; + + pcsbadstr: + +! sprintf(errmsg, "Bad charset syntax: %.*s\n", errmsg_size - 22, str); + + pcserror: + +--- 153,164 ---- + pcscleanup: + + if (cbuf) freebuffer(cbuf); ++ //if (wstr) free(wstr); + return cset; + + pcsbadstr: + +! swprintf(errmsg, errmsg_size, L"Bad charset syntax: %.*s\n", errmsg_size - 22, str); + + pcserror: + +*************** +*** 171,184 **** + } + + +! int csmember(char c, const charset *cset) + { + return + appearsin(c, cset->inlist) || + ( !appearsin(c, cset->outlist) && +! ( (cset->flags & CS_LCASE && islower(*(unsigned char *)&c)) || +! (cset->flags & CS_UCASE && isupper(*(unsigned char *)&c)) || +! (cset->flags & CS_DIGIT && isdigit(*(unsigned char *)&c)) || + (cset->flags & CS_NUL && !c ) ) ); + } + +--- 176,189 ---- + } + + +! int csmember(wchar_t c, const charset *cset) + { + return + appearsin(c, cset->inlist) || + ( !appearsin(c, cset->outlist) && +! ( (cset->flags & CS_LCASE && iswlower(*(wint_t *)&c)) || +! (cset->flags & CS_UCASE && iswupper(*(wint_t *)&c)) || +! (cset->flags & CS_DIGIT && iswdigit(*(wint_t *)&c)) || + (cset->flags & CS_NUL && !c ) ) ); + } + +*************** +*** 191,206 **** + { + charset *csu; + buffer *inbuf = NULL, *outbuf = NULL; +! char *lists[4], **list, *p, nullchar = '\0'; + + csu = malloc(sizeof (charset)); + if (!csu) { +! strcpy(errmsg,outofmem); + goto csuderror; + } +! inbuf = newbuffer(sizeof (char), errmsg); + if (*errmsg) goto csuderror; +! outbuf = newbuffer(sizeof (char), errmsg); + if (*errmsg) goto csuderror; + csu->inlist = csu->outlist = NULL; + csu->flags = u ? cset1->flags | cset2->flags +--- 196,211 ---- + { + charset *csu; + buffer *inbuf = NULL, *outbuf = NULL; +! wchar_t *lists[4], **list, *p, nullchar = L'\0'; + + csu = malloc(sizeof (charset)); + if (!csu) { +! wcscpy(errmsg,outofmem); + goto csuderror; + } +! inbuf = newbuffer(sizeof (wchar_t), errmsg); + if (*errmsg) goto csuderror; +! outbuf = newbuffer(sizeof (wchar_t), errmsg); + if (*errmsg) goto csuderror; + csu->inlist = csu->outlist = NULL; + csu->flags = u ? cset1->flags | cset2->flags +diff -c ./charset.h ../Par152-unicode/charset.h +*** ./charset.h 2001-03-09 03:50:35.000000000 +0300 +--- ../Par152-unicode/charset.h 2019-10-26 17:21:08.544050853 +0300 +*************** +*** 1,9 **** +! /*********************/ +! /* charset.h */ +! /* for Par 1.52 */ +! /* Copyright 2001 by */ +! /* Adam M. Costello */ +! /*********************/ + + /* This is ANSI C code (C89). */ + +--- 1,11 ---- +! /***********************/ +! /* charset.h */ +! /* for Par 1.52-i18n.4 */ +! /* Copyright 2001 by */ +! /* Adam M. Costello */ +! /* Modified by */ +! /* Jérôme Pouiller */ +! /***********************/ + + /* This is ANSI C code (C89). */ + +*************** +*** 11,24 **** + /* Note: Those functions declared here which do not use errmsg */ + /* always succeed, provided that they are passed valid arguments. */ + +! + #include "errmsg.h" + + + typedef struct charset charset; + + +! charset *parsecharset(const char *str, errmsg_t errmsg); + + /* parsecharset(str,errmsg) returns the set of characters defined by */ + /* str using charset syntax (see par.doc). Returns NULL on failure. */ +--- 13,26 ---- + /* Note: Those functions declared here which do not use errmsg */ + /* always succeed, provided that they are passed valid arguments. */ + +! #include + #include "errmsg.h" + + + typedef struct charset charset; + + +! charset *parsecharset(const wchar_t *str, errmsg_t errmsg); + + /* parsecharset(str,errmsg) returns the set of characters defined by */ + /* str using charset syntax (see par.doc). Returns NULL on failure. */ +*************** +*** 30,36 **** + /* *cset. cset may not be used after this call. */ + + +! int csmember(char c, const charset *cset); + + /* csmember(c,cset) returns 1 if c is a member of *cset, 0 otherwise. */ + +--- 32,38 ---- + /* *cset. cset may not be used after this call. */ + + +! int csmember(wchar_t c, const charset *cset); + + /* csmember(c,cset) returns 1 if c is a member of *cset, 0 otherwise. */ + +diff -c ./errmsg.c ../Par152-unicode/errmsg.c +*** ./errmsg.c 2001-03-09 03:50:46.000000000 +0300 +--- ../Par152-unicode/errmsg.c 2019-10-26 17:21:08.545050853 +0300 +*************** +*** 1,9 **** +! /*********************/ +! /* errmsg.c */ +! /* for Par 1.52 */ +! /* Copyright 2001 by */ +! /* Adam M. Costello */ +! /*********************/ + + /* This is ANSI C code (C89). */ + +--- 1,11 ---- +! /***********************/ +! /* errmsg.c */ +! /* for Par 1.52-i18n.4 */ +! /* Copyright 2001 by */ +! /* Adam M. Costello */ +! /* Modified by */ +! /* Jérôme Pouiller */ +! /***********************/ + + /* This is ANSI C code (C89). */ + +*************** +*** 11,18 **** + #include "errmsg.h" /* Makes sure we're consistent with the declarations. */ + + +! const char * const outofmem = +! "Out of memory.\n"; + +! const char * const impossibility = +! "Impossibility #%d has occurred. Please report it.\n"; +--- 13,23 ---- + #include "errmsg.h" /* Makes sure we're consistent with the declarations. */ + + +! const wchar_t * const outofmem = +! L"Out of memory.\n"; + +! const wchar_t * const mbserror = +! L"Error in input multibyte string.\n"; +! +! const wchar_t * const impossibility = +! L"Impossibility #%d has occurred. Please report it.\n"; +diff -c ./errmsg.h ../Par152-unicode/errmsg.h +*** ./errmsg.h 2001-03-09 03:50:56.000000000 +0300 +--- ../Par152-unicode/errmsg.h 2019-10-26 17:21:08.545050853 +0300 +*************** +*** 1,9 **** +! /*********************/ +! /* errmsg.h */ +! /* for Par 1.52 */ +! /* Copyright 2001 by */ +! /* Adam M. Costello */ +! /*********************/ + + /* This is ANSI C code (C89). */ + +--- 1,11 ---- +! /***********************/ +! /* errmsg.h */ +! /* for Par 1.52-i18n.4 */ +! /* Copyright 2001 by */ +! /* Adam M. Costello */ +! /* Modified by */ +! /* Jérôme Pouiller */ +! /***********************/ + + /* This is ANSI C code (C89). */ + +*************** +*** 11,17 **** + #ifndef ERRMSG_H + #define ERRMSG_H + +! + #define errmsg_size 163 + + /* This is the maximum number of characters that will */ +--- 13,19 ---- + #ifndef ERRMSG_H + #define ERRMSG_H + +! #include + #define errmsg_size 163 + + /* This is the maximum number of characters that will */ +*************** +*** 20,26 **** + /* versions of this header file. */ + + +! typedef char errmsg_t[errmsg_size]; + + /* Any function which takes the argument errmsg_t errmsg must, before */ + /* returning, either set errmsg[0] to '\0' (indicating success), or */ +--- 22,28 ---- + /* versions of this header file. */ + + +! typedef wchar_t errmsg_t[errmsg_size]; + + /* Any function which takes the argument errmsg_t errmsg must, before */ + /* returning, either set errmsg[0] to '\0' (indicating success), or */ +*************** +*** 28,37 **** + /* being careful not to overrun the space. */ + + +! extern const char * const outofmem; + /* "Out of memory.\n" */ + +! extern const char * const impossibility; + /* "Impossibility #%d has occurred. Please report it.\n" */ + + +--- 30,42 ---- + /* being careful not to overrun the space. */ + + +! extern const wchar_t * const outofmem; + /* "Out of memory.\n" */ + +! extern const wchar_t * const mbserror; +! /* "Error in input multibyte string.\n" */ +! +! extern const wchar_t * const impossibility; + /* "Impossibility #%d has occurred. Please report it.\n" */ + + +diff -c ./par.1 ../Par152-unicode/par.1 +*** ./par.1 2001-04-30 01:16:22.000000000 +0400 +--- ../Par152-unicode/par.1 2019-10-26 17:21:08.546050853 +0300 +*************** +*** 1,6 **** + .\"********************* + .\"* par.1 * +! .\"* for Par 1.52 * + .\"* Copyright 2001 by * + .\"* Adam M. Costello * + .\"********************* +--- 1,6 ---- + .\"********************* + .\"* par.1 * +! .\"* for Par 1.52 i18n * + .\"* Copyright 2001 by * + .\"* Adam M. Costello * + .\"********************* +diff -c ./par.c ../Par152-unicode/par.c +*** ./par.c 2001-04-02 08:25:57.000000000 +0400 +--- ../Par152-unicode/par.c 2019-10-26 17:21:08.547050853 +0300 +*************** +*** 1,9 **** +! /*********************/ +! /* par.c */ +! /* for Par 1.52 */ +! /* Copyright 2001 by */ +! /* Adam M. Costello */ +! /*********************/ + + /* This is ANSI C code (C89). */ + +--- 1,11 ---- +! /***********************/ +! /* par.c */ +! /* for Par 1.52-i18n.4 */ +! /* Copyright 2001 by */ +! /* Adam M. Costello */ +! /* Modified by */ +! /* Jérôme Pouiller */ +! /***********************/ + + /* This is ANSI C code (C89). */ + +*************** +*** 12,22 **** + #include "buffer.h" /* Also includes . */ + #include "reformat.h" + +! #include + #include + #include + #include + #include + + #undef NULL + #define NULL ((void *) 0) +--- 14,27 ---- + #include "buffer.h" /* Also includes . */ + #include "reformat.h" + +! #include +! #include +! #include + #include + #include + #include + #include ++ #include + + #undef NULL + #define NULL ((void *) 0) +*************** +*** 25,80 **** + #define free(ptr) + #endif + +- +- /*=== +- +- Regarding char and unsigned char: ANSI C is a nightmare in this +- respect. Some functions, like puts(), strchr(), and getenv(), use char +- or char*, so they work well with character constants like 'a', which +- are char, and with argv, which is char**. But several other functions, +- like getchar(), putchar(), and isdigit(), use unsigned char (converted +- to/from int). Therefore innocent-looking code can be wrong, for +- example: +- +- int c = getchar(); +- if (c == 'a') ... +- +- This is wrong because 'a' is char (converted to int) and could be +- negative, but getchar() returns unsigned char (converted to int), so c +- is always nonnegative or EOF. For similar reasons, it is wrong to pass +- a char to a function that expects an unsigned char: +- +- putchar('\n'); +- if (isdigit(argv[1][0])) ... +- +- Inevitably, we need to convert between char and unsigned char. This can +- be done by integral conversion (casting or assigning a char to unsigned +- char or vice versa), or by aliasing (converting a pointer to char to +- a pointer to unsigned char (or vice versa) and then dereferencing +- it). ANSI C requires that integral conversion alters the bits when the +- unsigned value is not representable in the signed type and the signed +- type does not use two's complement representation. Aliasing, on the +- other hand, preserves the bits. Although the C standard is not at all +- clear about which sort of conversion is appropriate for making the +- standard library functions interoperate, I think preserving the bits +- is what is needed. Under that assumption, here are some examples of +- correct code: +- +- int c = getchar(); +- char ch; +- +- if (c != EOF) { +- *(unsigned char *)&ch = c; +- if (ch == 'a') ... +- if (isdigit(c)) ... +- } +- +- char *s = ... +- if (isdigit(*(unsigned char *)s)) ... +- +- ===*/ +- +- + static const char * const usagemsg = + "\n" + "Options for par:\n" +--- 30,35 ---- +*************** +*** 126,132 **** + /* line, or the fallback prelen and suflen */ + /* of the IP containing a non-bodiless line. */ + lflag_t flags; /* Boolean properties (see below). */ +! char rc; /* The repeated character of a bodiless line. */ + } lineprop; + + /* Flags for marking boolean properties: */ +--- 81,87 ---- + /* line, or the fallback prelen and suflen */ + /* of the IP containing a non-bodiless line. */ + lflag_t flags; /* Boolean properties (see below). */ +! wchar_t rc; /* The repeated character of a bodiless line. */ + } lineprop; + + /* Flags for marking boolean properties: */ +*************** +*** 143,156 **** + #define isvacant(prop) (isbodiless(prop) && (prop)->rc == ' ') + + +! static int digtoint(char c) + + /* Returns the value represented by the digit c, or -1 if c is not a digit. */ + { +! const char *p, * const digits = "0123456789"; + + if (!c) return -1; +! p = strchr(digits,c); + return p ? p - digits : -1; + + /* We can't simply return c - '0' because this is ANSI C code, */ +--- 98,111 ---- + #define isvacant(prop) (isbodiless(prop) && (prop)->rc == ' ') + + +! static int digtoint(wchar_t c) + + /* Returns the value represented by the digit c, or -1 if c is not a digit. */ + { +! const wchar_t *p, * const digits = L"0123456789"; + + if (!c) return -1; +! p = wcschr(digits,c); + return p ? p - digits : -1; + + /* We can't simply return c - '0' because this is ANSI C code, */ +*************** +*** 161,167 **** + } + + +! static int strtoudec(const char *s, int *pn) + + /* Converts the longest prefix of string s consisting of decimal */ + /* digits to an integer, which is stored in *pn. Normally returns */ +--- 116,122 ---- + } + + +! static int strtoudec(const wchar_t *s, int *pn) + + /* Converts the longest prefix of string s consisting of decimal */ + /* digits to an integer, which is stored in *pn. Normally returns */ +*************** +*** 187,193 **** + + + static void parsearg( +! const char *arg, int *phelp, int *pversion, charset *bodychars, charset + *protectchars, charset *quotechars, int *phang, int *pprefix, int *prepeat, + int *psuffix, int *pTab, int *pwidth, int *pbody, int *pcap, int *pdiv, int + *pErr, int *pexpel, int *pfit, int *pguess, int *pinvis, int *pjust, int +--- 142,148 ---- + + + static void parsearg( +! const wchar_t *arg, int *phelp, int *pversion, charset *bodychars, charset + *protectchars, charset *quotechars, int *phang, int *pprefix, int *prepeat, + int *psuffix, int *pTab, int *pwidth, int *pbody, int *pcap, int *pdiv, int + *pErr, int *pexpel, int *pfit, int *pguess, int *pinvis, int *pjust, int +*************** +*** 197,274 **** + /* by the other pointers as appropriate. *phelp and *pversion are boolean */ + /* flags indicating whether the help and version options were supplied. */ + { +! const char *savearg = arg; + charset *chars, *change; +! char oc; + int n; + + *errmsg = '\0'; + +! if (*arg == '-') ++arg; +! +! if (!strcmp(arg, "help")) { + *phelp = 1; + return; + } + +! if (!strcmp(arg, "version")) { + *pversion = 1; + return; + } + +! if (*arg == 'B' || *arg == 'P' || *arg == 'Q' ) { +! chars = *arg == 'B' ? bodychars : +! *arg == 'P' ? protectchars : +! /* *arg == 'Q' */ quotechars ; + ++arg; +! if (*arg != '=' && *arg != '+' && *arg != '-') goto badarg; + change = parsecharset(arg + 1, errmsg); + if (change) { +! if (*arg == '=') csswap(chars,change); +! else if (*arg == '+') csadd(chars,change,errmsg); +! else /* *arg == '-' */ csremove(chars,change,errmsg); + freecharset(change); + } + return; + } + +! if (isdigit(*(unsigned char *)arg)) { + if (!strtoudec(arg, &n)) goto badarg; + if (n <= 8) *pprefix = n; + else *pwidth = n; + } + + for (;;) { +! while (isdigit(*(unsigned char *)arg)) ++arg; + oc = *arg; + if (!oc) break; + n = -1; + if (!strtoudec(++arg, &n)) goto badarg; +! if ( oc == 'h' || oc == 'p' || oc == 'r' +! || oc == 's' || oc == 'T' || oc == 'w') { +! if (oc == 'h') *phang = n >= 0 ? n : 1; +! else if (oc == 'p') *pprefix = n; +! else if (oc == 'r') *prepeat = n >= 0 ? n : 3; +! else if (oc == 's') *psuffix = n; +! else if (oc == 'T') *pTab = n >= 0 ? n : 8; +! else /* oc == 'w' */ *pwidth = n >= 0 ? n : 79; + } + else { + if (n < 0) n = 1; + if (n > 1) goto badarg; +! if (oc == 'b') *pbody = n; +! else if (oc == 'c') *pcap = n; +! else if (oc == 'd') *pdiv = n; +! else if (oc == 'E') *pErr = n; +! else if (oc == 'e') *pexpel = n; +! else if (oc == 'f') *pfit = n; +! else if (oc == 'g') *pguess = n; +! else if (oc == 'i') *pinvis = n; +! else if (oc == 'j') *pjust = n; +! else if (oc == 'l') *plast = n; +! else if (oc == 'q') *pquote = n; +! else if (oc == 'R') *pReport = n; +! else if (oc == 't') *ptouch = n; + else goto badarg; + } + } +--- 152,229 ---- + /* by the other pointers as appropriate. *phelp and *pversion are boolean */ + /* flags indicating whether the help and version options were supplied. */ + { +! const wchar_t *savearg = arg; + charset *chars, *change; +! wchar_t oc; + int n; + + *errmsg = '\0'; ++ ++ if (*arg == L'-') ++arg; + +! if (!wcscmp(arg, L"help")) { + *phelp = 1; + return; + } + +! if (!wcscmp(arg, L"version")) { + *pversion = 1; + return; + } + +! if (*arg == L'B' || *arg == L'P' || *arg == L'Q' ) { +! chars = *arg == L'B' ? bodychars : +! *arg == L'P' ? protectchars : +! /* *arg == L'Q' */ quotechars ; + ++arg; +! if (*arg != L'=' && *arg != L'+' && *arg != L'-') goto badarg; + change = parsecharset(arg + 1, errmsg); + if (change) { +! if (*arg == L'=') csswap(chars,change); +! else if (*arg == L'+') csadd(chars,change,errmsg); +! else /* *arg == L'-' */ csremove(chars,change,errmsg); + freecharset(change); + } + return; + } + +! if (iswdigit(*arg)) { + if (!strtoudec(arg, &n)) goto badarg; + if (n <= 8) *pprefix = n; + else *pwidth = n; + } + + for (;;) { +! while (iswdigit(*arg)) ++arg; + oc = *arg; + if (!oc) break; + n = -1; + if (!strtoudec(++arg, &n)) goto badarg; +! if ( oc == L'h' || oc == L'p' || oc == L'r' +! || oc == L's' || oc == L'T' || oc == L'w') { +! if (oc == L'h') *phang = n >= 0 ? n : 1; +! else if (oc == L'p') *pprefix = n; +! else if (oc == L'r') *prepeat = n >= 0 ? n : 3; +! else if (oc == L's') *psuffix = n; +! else if (oc == L'T') *pTab = n >= 0 ? n : 8; +! else /* oc == L'w' */ *pwidth = n >= 0 ? n : 79; + } + else { + if (n < 0) n = 1; + if (n > 1) goto badarg; +! if (oc == L'b') *pbody = n; +! else if (oc == L'c') *pcap = n; +! else if (oc == L'd') *pdiv = n; +! else if (oc == L'E') *pErr = n; +! else if (oc == L'e') *pexpel = n; +! else if (oc == L'f') *pfit = n; +! else if (oc == L'g') *pguess = n; +! else if (oc == L'i') *pinvis = n; +! else if (oc == L'j') *pjust = n; +! else if (oc == L'l') *plast = n; +! else if (oc == L'q') *pquote = n; +! else if (oc == L'R') *pReport = n; +! else if (oc == L't') *ptouch = n; + else goto badarg; + } + } +*************** +*** 277,288 **** + + badarg: + +! sprintf(errmsg, "Bad argument: %.*s\n", errmsg_size - 16, savearg); + *phelp = 1; + } + + +! static char **readlines( + lineprop **pprops, const charset *protectchars, + const charset *quotechars, int Tab, int invis, int quote, errmsg_t errmsg + ) +--- 232,243 ---- + + badarg: + +! swprintf(errmsg, errmsg_size, L"Bad argument: %.*s\n", errmsg_size - 16, savearg); + *phelp = 1; + } + + +! static wchar_t **readlines( + lineprop **pprops, const charset *protectchars, + const charset *quotechars, int Tab, int invis, int quote, errmsg_t errmsg + ) +*************** +*** 302,310 **** + /* it's not NULL. On failure, returns NULL and sets *pprops to NULL. */ + { + buffer *cbuf = NULL, *lbuf = NULL, *lpbuf = NULL; +! int c, empty, blank, firstline, qsonly, oldqsonly = 0, vlnlen, i; +! char ch, *ln = NULL, nullchar = '\0', *nullline = NULL, *qpend, +! *oldln = NULL, *oldqpend = NULL, *p, *op, *vln = NULL, **lines = NULL; + lineprop vprop = { 0, 0, 0, '\0' }, iprop = { 0, 0, 0, '\0' }; + + /* oldqsonly, oldln, and oldquend don't really need to be initialized. */ +--- 257,266 ---- + /* it's not NULL. On failure, returns NULL and sets *pprops to NULL. */ + { + buffer *cbuf = NULL, *lbuf = NULL, *lpbuf = NULL; +! wint_t c; +! int empty, blank, firstline, qsonly, oldqsonly = 0, vlnlen, i; +! wchar_t *ln = NULL, nullchar = L'\0', *nullline = NULL, *qpend, +! *oldln = NULL, *oldqpend = NULL, *p, *op, *vln = NULL, **lines = NULL; + lineprop vprop = { 0, 0, 0, '\0' }, iprop = { 0, 0, 0, '\0' }; + + /* oldqsonly, oldln, and oldquend don't really need to be initialized. */ +*************** +*** 316,335 **** + + *pprops = NULL; + +! cbuf = newbuffer(sizeof (char), errmsg); + if (*errmsg) goto rlcleanup; +! lbuf = newbuffer(sizeof (char *), errmsg); + if (*errmsg) goto rlcleanup; + lpbuf = newbuffer(sizeof (lineprop), errmsg); + if (*errmsg) goto rlcleanup; + + for (empty = blank = firstline = 1; ; ) { +! c = getchar(); +! if (c == EOF) break; +! *(unsigned char *)&ch = c; +! if (ch == '\n') { + if (blank) { +! ungetc(c,stdin); + break; + } + additem(cbuf, &nullchar, errmsg); +--- 272,296 ---- + + *pprops = NULL; + +! cbuf = newbuffer(sizeof (wchar_t), errmsg); + if (*errmsg) goto rlcleanup; +! lbuf = newbuffer(sizeof (wchar_t *), errmsg); + if (*errmsg) goto rlcleanup; + lpbuf = newbuffer(sizeof (lineprop), errmsg); + if (*errmsg) goto rlcleanup; + + for (empty = blank = firstline = 1; ; ) { +! c = getwchar(); +! if (c == WEOF) { +! if (errno == EILSEQ) { +! wcscpy(errmsg, L"Invalid multibyte sequence in input\n"); +! goto rlcleanup; +! } +! break; +! } +! if (c == L'\n') { + if (blank) { +! ungetwc(c,stdin); + break; + } + additem(cbuf, &nullchar, errmsg); +*************** +*** 338,346 **** + if (*errmsg) goto rlcleanup; + if (quote) { + for (qpend = ln; *qpend && csmember(*qpend, quotechars); ++qpend); +! for (p = qpend; *p == ' ' || csmember(*p, quotechars); ++p); +! qsonly = *p == '\0'; +! while (qpend > ln && qpend[-1] == ' ') --qpend; + if (!firstline) { + for (p = ln, op = oldln; + p < qpend && op < oldqpend && *p == *op; +--- 299,307 ---- + if (*errmsg) goto rlcleanup; + if (quote) { + for (qpend = ln; *qpend && csmember(*qpend, quotechars); ++qpend); +! for (p = qpend; *p == L' ' || csmember(*p, quotechars); ++p); +! qsonly = (*p == L'\0'); +! while (qpend > ln && qpend[-1] == L' ') --qpend; + if (!firstline) { + for (p = ln, op = oldln; + p < qpend && op < oldqpend && *p == *op; +*************** +*** 348,370 **** + if (!(p == qpend && op == oldqpend)) { + if (!invis && (oldqsonly || qsonly)) { + if (oldqsonly) { +! *op = '\0'; + oldqpend = op; + } + if (qsonly) { +! *p = '\0'; + qpend = p; + } + } + else { + vlnlen = p - ln; +! vln = malloc((vlnlen + 1) * sizeof (char)); + if (!vln) { +! strcpy(errmsg,outofmem); + goto rlcleanup; + } +! strncpy(vln,ln,vlnlen); +! vln[vlnlen] = '\0'; + additem(lbuf, &vln, errmsg); + if (*errmsg) goto rlcleanup; + additem(lpbuf, invis ? &iprop : &vprop, errmsg); +--- 309,331 ---- + if (!(p == qpend && op == oldqpend)) { + if (!invis && (oldqsonly || qsonly)) { + if (oldqsonly) { +! *op = L'\0'; + oldqpend = op; + } + if (qsonly) { +! *p = L'\0'; + qpend = p; + } + } + else { + vlnlen = p - ln; +! vln = malloc((vlnlen + 1) * sizeof (wchar_t)); + if (!vln) { +! wcscpy(errmsg,outofmem); + goto rlcleanup; + } +! wcsncpy(vln, ln, vlnlen); +! vln[vlnlen] = L'\0'; + additem(lbuf, &vln, errmsg); + if (*errmsg) goto rlcleanup; + additem(lpbuf, invis ? &iprop : &vprop, errmsg); +*************** +*** 388,415 **** + } + else { + if (empty) { +! if (csmember(ch, protectchars)) { +! ungetc(c,stdin); + break; + } + empty = 0; + } +! if (!ch) continue; +! if (ch == '\t') { +! ch = ' '; + for (i = Tab - numitems(cbuf) % Tab; i > 0; --i) { +! additem(cbuf, &ch, errmsg); + if (*errmsg) goto rlcleanup; + } + continue; + } +! if (isspace(c)) ch = ' '; +! else blank = 0; +! additem(cbuf, &ch, errmsg); +! if (*errmsg) goto rlcleanup; + } + } +! + if (!blank) { + additem(cbuf, &nullchar, errmsg); + if (*errmsg) goto rlcleanup; +--- 349,379 ---- + } + else { + if (empty) { +! if (csmember(c, protectchars)) { +! ungetwc(c,stdin); + break; + } + empty = 0; + } +! if (!c) continue; +! if (c == L'\t') { +! c = L' '; + for (i = Tab - numitems(cbuf) % Tab; i > 0; --i) { +! additem(cbuf, &c, errmsg); + if (*errmsg) goto rlcleanup; + } + continue; + } +! if (iswspace(c)) +! c = L' '; +! else +! blank = 0; +! additem(cbuf, &c, errmsg); +! if (*errmsg) +! goto rlcleanup; + } + } +! + if (!blank) { + additem(cbuf, &nullchar, errmsg); + if (*errmsg) goto rlcleanup; +*************** +*** 449,455 **** + + + static void compresuflen( +! const char * const *lines, const char * const *endline, + const charset *bodychars, int body, int pre, int suf, int *ppre, int *psuf + ) + /* lines is an array of strings, up to but not including endline. */ +--- 413,419 ---- + + + static void compresuflen( +! const wchar_t * const *lines, const wchar_t * const *endline, + const charset *bodychars, int body, int pre, int suf, int *ppre, int *psuf + ) + /* lines is an array of strings, up to but not including endline. */ +*************** +*** 457,465 **** + /* lines in lines. Assumes that they have already been determined */ + /* to be at least pre and suf. endline must not equal lines. */ + { +! const char *start, *end, *knownstart, * const *line, *p1, *p2, *knownend, + *knownstart2; +! + start = *lines; + end = knownstart = start + pre; + if (body) +--- 421,429 ---- + /* lines in lines. Assumes that they have already been determined */ + /* to be at least pre and suf. endline must not equal lines. */ + { +! const wchar_t *start, *end, *knownstart, * const *line, *p1, *p2, *knownend, + *knownstart2; +! + start = *lines; + end = knownstart = start + pre; + if (body) +*************** +*** 474,480 **** + } + if (body) + for (p1 = end; p1 > knownstart; ) +! if (*--p1 != ' ') { + if (csmember(*p1, bodychars)) + end = p1; + else +--- 438,444 ---- + } + if (body) + for (p1 = end; p1 > knownstart; ) +! if (*--p1 != L' ') { + if (csmember(*p1, bodychars)) + end = p1; + else +*************** +*** 501,518 **** + } + if (body) { + for (p1 = start; +! start < knownend && (*start == ' ' || csmember(*start, bodychars)); + ++start); +! if (start > p1 && start[-1] == ' ') --start; + } + else +! while (end - start >= 2 && *start == ' ' && start[1] == ' ') ++start; + *psuf = end - start; + } + + + static void delimit( +! const char * const *lines, const char * const *endline, + const charset *bodychars, int repeat, int body, int div, + int pre, int suf, lineprop *props + ) +--- 465,482 ---- + } + if (body) { + for (p1 = start; +! start < knownend && (*start == L' ' || csmember(*start, bodychars)); + ++start); +! if (start > p1 && start[-1] == L' ') --start; + } + else +! while (end - start >= 2 && *start == L' ' && start[1] == L' ') ++start; + *psuf = end - start; + } + + + static void delimit( +! const wchar_t * const *lines, const wchar_t * const *endline, + const charset *bodychars, int repeat, int body, int div, + int pre, int suf, lineprop *props + ) +*************** +*** 523,530 **** + /* and comsuflen of the lines in lines have already been */ + /* determined to be at least pre and suf, respectively. */ + { +! const char * const *line, *end, *p, * const *nextline; +! char rc; + lineprop *prop, *nextprop; + int anybodiless = 0, status; + +--- 487,494 ---- + /* and comsuflen of the lines in lines have already been */ + /* determined to be at least pre and suf, respectively. */ + { +! const wchar_t * const *line, *end, *p, * const *nextline; +! wchar_t rc; + lineprop *prop, *nextprop; + int anybodiless = 0, status; + +*************** +*** 545,552 **** + for (end = *line; *end; ++end); + end -= suf; + p = *line + pre; +! rc = p < end ? *p : ' '; +! if (rc != ' ' && (!repeat || end - p < repeat)) + prop->flags &= ~L_BODILESS; + else + while (p < end) { +--- 509,516 ---- + for (end = *line; *end; ++end); + end -= suf; + p = *line + pre; +! rc = p < end ? *p : L' '; +! if (rc != L' ' && (!repeat || end - p < repeat)) + prop->flags &= ~L_BODILESS; + else + while (p < end) { +*************** +*** 589,597 **** + } + + line = lines, prop = props; +! status = ((*lines)[pre] == ' '); + do { +! if (((*line)[pre] == ' ') == status) + prop->flags |= L_FIRST; + ++line, ++prop; + } while (line < endline); +--- 553,561 ---- + } + + line = lines, prop = props; +! status = ((*lines)[pre] == L' '); + do { +! if (((*line)[pre] == L' ') == status) + prop->flags |= L_FIRST; + ++line, ++prop; + } while (line < endline); +*************** +*** 599,612 **** + + + static void marksuperf( +! const char * const * lines, const char * const * endline, lineprop *props + ) + /* lines points to the first line of a segment, and endline to one */ + /* line beyond the last line in the segment. Sets L_SUPERF bits in */ + /* the flags fields of the props array whenever the corresponding */ + /* line is superfluous. L_BODILESS bits must already be set. */ + { +! const char * const *line, *p; + lineprop *prop, *mprop, dummy; + int inbody, num, mnum; + +--- 563,576 ---- + + + static void marksuperf( +! const wchar_t * const * lines, const wchar_t * const * endline, lineprop *props + ) + /* lines points to the first line of a segment, and endline to one */ + /* line beyond the last line in the segment. Sets L_SUPERF bits in */ + /* the flags fields of the props array whenever the corresponding */ + /* line is superfluous. L_BODILESS bits must already be set. */ + { +! const wchar_t * const *line, *p; + lineprop *prop, *mprop, dummy; + int inbody, num, mnum; + +*************** +*** 619,625 **** + for (line = lines, prop = props; line < endline; ++line, ++prop) + if (isvacant(prop)) { + for (num = 0, p = *line; *p; ++p) +! if (*p != ' ') ++num; + if (inbody || num < mnum) + mnum = num, mprop = prop; + inbody = 0; +--- 583,589 ---- + for (line = lines, prop = props; line < endline; ++line, ++prop) + if (isvacant(prop)) { + for (num = 0, p = *line; *p; ++p) +! if (*p != L' ') ++num; + if (inbody || num < mnum) + mnum = num, mprop = prop; + inbody = 0; +*************** +*** 631,637 **** + + + static void setaffixes( +! const char * const *inlines, const char * const *endline, + const lineprop *props, const charset *bodychars, + const charset *quotechars, int hang, int body, int quote, + int *pafp, int *pfs, int *pprefix, int *psuffix +--- 595,601 ---- + + + static void setaffixes( +! const wchar_t * const *inlines, const wchar_t * const *endline, + const lineprop *props, const charset *bodychars, + const charset *quotechars, int hang, int body, int quote, + int *pafp, int *pfs, int *pprefix, int *psuffix +*************** +*** 644,650 **** + /* default value as specified in "par.doc". */ + { + int numin, pre, suf; +! const char *p; + + numin = endline - inlines; + +--- 608,614 ---- + /* default value as specified in "par.doc". */ + { + int numin, pre, suf; +! const wchar_t *p; + + numin = endline - inlines; + +*************** +*** 666,676 **** + } + + +! static void freelines(char **lines) + /* Frees the elements of lines, and lines itself. */ + /* lines is a NULL-terminated array of strings. */ + { +! char **line; + + for (line = lines; *line; ++line) + free(*line); +--- 630,640 ---- + } + + +! static void freelines(wchar_t **lines) + /* Frees the elements of lines, and lines itself. */ + /* lines is a NULL-terminated array of strings. */ + { +! wchar_t **line; + + for (line = lines; *line; ++line) + free(*line); +*************** +*** 678,745 **** + free(lines); + } + +- + int main(int argc, const char * const *argv) + { + int help = 0, version = 0, hang = 0, prefix = -1, repeat = 0, suffix = -1, + Tab = 1, width = 72, body = 0, cap = 0, div = 0, Err = 0, expel = 0, + fit = 0, guess = 0, invis = 0, just = 0, last = 0, quote = 0, Report = 0, + touch = -1; +! int prefixbak, suffixbak, c, sawnonblank, oweblank, n, i, afp, fs; + charset *bodychars = NULL, *protectchars = NULL, *quotechars = NULL; +! char *parinit = NULL, *arg, **inlines = NULL, **endline, **firstline, *end, +! **nextline, **outlines = NULL, **line, ch; +! const char *env, * const whitechars = " \f\n\r\t\v"; + errmsg_t errmsg = { '\0' }; + lineprop *props = NULL, *firstprop, *nextprop; + FILE *errout; + + /* Set the current locale from the environment: */ + + setlocale(LC_ALL,""); + + /* Process environment variables: */ + + env = getenv("PARBODY"); + if (!env) env = ""; +! bodychars = parsecharset(env,errmsg); + if (*errmsg) { + help = 1; + goto parcleanup; + } + + env = getenv("PARPROTECT"); + if (!env) env = ""; +! protectchars = parsecharset(env,errmsg); + if (*errmsg) { + help = 1; + goto parcleanup; + } + + env = getenv("PARQUOTE"); + if (!env) env = "> "; +! quotechars = parsecharset(env,errmsg); + if (*errmsg) { + help = 1; + goto parcleanup; + } + + env = getenv("PARINIT"); + if (env) { +! parinit = malloc((strlen(env) + 1) * sizeof (char)); + if (!parinit) { +! strcpy(errmsg,outofmem); + goto parcleanup; + } +! strcpy(parinit,env); +! arg = strtok(parinit,whitechars); + while (arg) { + parsearg(arg, &help, &version, bodychars, protectchars, + quotechars, &hang, &prefix, &repeat, &suffix, &Tab, + &width, &body, &cap, &div, &Err, &expel, &fit, &guess, + &invis, &just, &last, "e, &Report, &touch, errmsg ); + if (*errmsg || help || version) goto parcleanup; +! arg = strtok(NULL,whitechars); + } + free(parinit); + parinit = NULL; +--- 642,757 ---- + free(lines); + } + + int main(int argc, const char * const *argv) + { + int help = 0, version = 0, hang = 0, prefix = -1, repeat = 0, suffix = -1, + Tab = 1, width = 72, body = 0, cap = 0, div = 0, Err = 0, expel = 0, + fit = 0, guess = 0, invis = 0, just = 0, last = 0, quote = 0, Report = 0, + touch = -1; +! int prefixbak, suffixbak, sawnonblank, oweblank, n, i, afp, fs; + charset *bodychars = NULL, *protectchars = NULL, *quotechars = NULL; +! wint_t c; +! wchar_t *state; +! wchar_t *parinit = NULL, *arg, **inlines = NULL, **endline, **firstline, *end, +! **nextline, **outlines = NULL, **line; +! const char *env; +! wchar_t *wenv = NULL; +! const wchar_t * const whitechars = L" \f\n\r\t\v"; + errmsg_t errmsg = { '\0' }; + lineprop *props = NULL, *firstprop, *nextprop; + FILE *errout; ++ char *langinfo; + + /* Set the current locale from the environment: */ + + setlocale(LC_ALL,""); ++ langinfo = nl_langinfo(CODESET); ++ if (!strcmp(langinfo, "ANSI_X3.4-1968")) { ++ // We would like to fallback in an 8 bits encoding, but it is not easily possible. ++ //setlocale(LC_CTYPE, "C"); ++ //langinfo = nl_langinfo(CODESET); ++ fwprintf( Err ? stderr : stdout, ++ L"Warning: Locale seems not configured\n"); ++ } + + /* Process environment variables: */ + + env = getenv("PARBODY"); + if (!env) env = ""; +! wenv = malloc((strlen(env) + 1) * sizeof (wchar_t)); +! if (!wenv) { +! wcscpy(errmsg,outofmem); +! goto parcleanup; +! } +! if (0 > mbstowcs(wenv,env, strlen(env) + 1)) { +! wcscpy(errmsg, L"Invalid multibyte sequence in PARBODY\n"); +! goto parcleanup; +! } +! bodychars = parsecharset(wenv,errmsg); + if (*errmsg) { + help = 1; + goto parcleanup; + } ++ free(wenv); ++ wenv = NULL; + + env = getenv("PARPROTECT"); + if (!env) env = ""; +! wenv = malloc((strlen(env) + 1) * sizeof (wchar_t)); +! if (!wenv) { +! wcscpy(errmsg,outofmem); +! goto parcleanup; +! } +! if (0 > mbstowcs(wenv,env, strlen(env) + 1)) { +! wcscpy(errmsg, L"Invalid multibyte sequence in PARPROTECT\n"); +! goto parcleanup; +! } +! protectchars = parsecharset(wenv,errmsg); + if (*errmsg) { + help = 1; + goto parcleanup; + } ++ free(wenv); ++ wenv = NULL; + + env = getenv("PARQUOTE"); + if (!env) env = "> "; +! wenv = malloc((strlen(env) + 1) * sizeof (wchar_t)); +! if (!wenv) { +! wcscpy(errmsg,outofmem); +! goto parcleanup; +! } +! if (0 > mbstowcs(wenv,env, strlen(env) + 1)) { +! wcscpy(errmsg, L"Invalid multibyte sequence in PARQUOTE\n"); +! goto parcleanup; +! } +! quotechars = parsecharset(wenv,errmsg); + if (*errmsg) { + help = 1; + goto parcleanup; + } ++ free(wenv); ++ wenv = NULL; + + env = getenv("PARINIT"); + if (env) { +! parinit = malloc((strlen(env) + 1) * sizeof (wchar_t)); + if (!parinit) { +! wcscpy(errmsg,outofmem); + goto parcleanup; + } +! if (0 > mbstowcs(parinit,env, strlen(env) + 1)) { +! wcscpy(errmsg, L"Invalid multibyte sequence in PARINIT\n"); +! goto parcleanup; +! } +! arg = wcstok(parinit, whitechars, &state); + while (arg) { + parsearg(arg, &help, &version, bodychars, protectchars, + quotechars, &hang, &prefix, &repeat, &suffix, &Tab, + &width, &body, &cap, &div, &Err, &expel, &fit, &guess, + &invis, &just, &last, "e, &Report, &touch, errmsg ); + if (*errmsg || help || version) goto parcleanup; +! arg = wcstok(NULL, whitechars, &state); + } + free(parinit); + parinit = NULL; +*************** +*** 748,804 **** + /* Process command line arguments: */ + + while (*++argv) { +! parsearg(*argv, &help, &version, bodychars, protectchars, + quotechars, &hang, &prefix, &repeat, &suffix, &Tab, + &width, &body, &cap, &div, &Err, &expel, &fit, &guess, + &invis, &just, &last, "e, &Report, &touch, errmsg ); + if (*errmsg || help || version) goto parcleanup; + } + + if (Tab == 0) { +! strcpy(errmsg, " must not be 0.\n"); + goto parcleanup; + } + + if (touch < 0) touch = fit || last; + prefixbak = prefix; + suffixbak = suffix; +! +! /* Main loop: */ +! + for (sawnonblank = oweblank = 0; ; ) { + for (;;) { +! c = getchar(); +! if (c == EOF) break; +! *(unsigned char *)&ch = c; +! if (expel && ch == '\n') { + oweblank = sawnonblank; + continue; + } +! if (csmember(ch, protectchars)) { + sawnonblank = 1; + if (oweblank) { +! puts(""); + oweblank = 0; + } +! while (ch != '\n') { +! putchar(c); +! c = getchar(); +! if (c == EOF) break; +! *(unsigned char *)&ch = c; + } + } +! if (ch != '\n') break; /* subsumes the case that c == EOF */ +! putchar(c); + } +! if (c == EOF) break; +! ungetc(c,stdin); + + inlines = + readlines(&props, protectchars, quotechars, Tab, invis, quote, errmsg); + if (*errmsg) goto parcleanup; +! +! for (endline = inlines; *endline; ++endline); + if (endline == inlines) { + free(inlines); + inlines = NULL; +--- 760,830 ---- + /* Process command line arguments: */ + + while (*++argv) { +! arg = malloc((strlen(*argv) + 1) * sizeof (wchar_t)); +! if (0 > mbstowcs(arg, *argv, strlen(*argv) + 1)) { +! wcscpy(errmsg, L"Invalid multibyte sequence in argument\n"); +! goto parcleanup; +! } +! parsearg(arg, &help, &version, bodychars, protectchars, + quotechars, &hang, &prefix, &repeat, &suffix, &Tab, + &width, &body, &cap, &div, &Err, &expel, &fit, &guess, + &invis, &just, &last, "e, &Report, &touch, errmsg ); ++ free(arg); + if (*errmsg || help || version) goto parcleanup; + } + + if (Tab == 0) { +! wcscpy(errmsg, L" must not be 0.\n"); + goto parcleanup; + } + + if (touch < 0) touch = fit || last; + prefixbak = prefix; + suffixbak = suffix; +! +! /* Main loop: */ + for (sawnonblank = oweblank = 0; ; ) { + for (;;) { +! c = getwchar(); +! if (c == WEOF) { +! if (errno == EILSEQ) { +! wcscpy(errmsg, L"Invalid multibyte sequence in input\n"); +! goto parcleanup; +! } +! break; +! } +! if (expel && c == L'\n') { + oweblank = sawnonblank; + continue; + } +! if (csmember(c, protectchars)) { + sawnonblank = 1; + if (oweblank) { +! fputwc(L'\n', stdout); + oweblank = 0; + } +! while (c != L'\n') { +! putwchar(c); +! c = getwchar(); +! if (c == WEOF) { +! if (errno == EILSEQ) { +! wcscpy(errmsg, L"Invalid multibyte sequence in input\n"); +! goto parcleanup; +! } +! break; +! } + } + } +! if (c != L'\n') break; /* subsumes the case that c == EOF */ +! putwchar(c); + } +! if (c == WEOF) break; +! ungetwc(c,stdin); + + inlines = + readlines(&props, protectchars, quotechars, Tab, invis, quote, errmsg); + if (*errmsg) goto parcleanup; +! for (endline = inlines; *endline; ++endline) ; + if (endline == inlines) { + free(inlines); + inlines = NULL; +*************** +*** 807,844 **** + + sawnonblank = 1; + if (oweblank) { +! puts(""); + oweblank = 0; + } + +! delimit((const char * const *) inlines, +! (const char * const *) endline, + bodychars, repeat, body, div, 0, 0, props); + + if (expel) +! marksuperf((const char * const *) inlines, +! (const char * const *) endline, props); + + firstline = inlines, firstprop = props; + do { + if (isbodiless(firstprop)) { + if (!isinvis(firstprop) && !(expel && issuperf(firstprop))) { + for (end = *firstline; *end; ++end); +! if (!repeat || (firstprop->rc == ' ' && !firstprop->s)) { +! while (end > *firstline && end[-1] == ' ') --end; +! *end = '\0'; +! puts(*firstline); + } + else { + n = width - firstprop->p - firstprop->s; + if (n < 0) { +! sprintf(errmsg,impossibility,5); + goto parcleanup; + } +! printf("%.*s", firstprop->p, *firstline); + for (i = n; i; --i) +! putchar(*(unsigned char *)&firstprop->rc); +! puts(end - firstprop->s); + } + } + ++firstline, ++firstprop; +--- 833,871 ---- + + sawnonblank = 1; + if (oweblank) { +! fputwc(L'\n', stdout); + oweblank = 0; + } + +! delimit((const wchar_t * const *) inlines, +! (const wchar_t * const *) endline, + bodychars, repeat, body, div, 0, 0, props); + + if (expel) +! marksuperf((const wchar_t * const *) inlines, +! (const wchar_t * const *) endline, props); + + firstline = inlines, firstprop = props; ++ + do { + if (isbodiless(firstprop)) { + if (!isinvis(firstprop) && !(expel && issuperf(firstprop))) { + for (end = *firstline; *end; ++end); +! if (!repeat || (firstprop->rc == L' ' && !firstprop->s)) { +! while (end > *firstline && end[-1] == L' ') --end; +! *end = L'\0'; +! fwprintf(stdout, L"%ls\n", *firstline); + } + else { + n = width - firstprop->p - firstprop->s; + if (n < 0) { +! swprintf(errmsg,errmsg_size,impossibility,5); + goto parcleanup; + } +! fwprintf(stdout, L"%.*ls", firstprop->p, *firstline); + for (i = n; i; --i) +! fputwc(firstprop->rc, stdout); +! fwprintf(stdout, L"%ls\n", end - firstprop->s); + } + } + ++firstline, ++firstprop; +*************** +*** 848,875 **** + for (nextline = firstline + 1, nextprop = firstprop + 1; + nextline < endline && !isbodiless(nextprop) && !isfirst(nextprop); + ++nextline, ++nextprop); +! + prefix = prefixbak, suffix = suffixbak; +! setaffixes((const char * const *) firstline, +! (const char * const *) nextline, firstprop, bodychars, + quotechars, hang, body, quote, &afp, &fs, &prefix, &suffix); + if (width <= prefix + suffix) { +! sprintf(errmsg, +! " (%d) <= (%d) + (%d)\n", + width, prefix, suffix); + goto parcleanup; + } + + outlines = +! reformat((const char * const *) firstline, +! (const char * const *) nextline, + afp, fs, hang, prefix, suffix, width, cap, + fit, guess, just, last, Report, touch, errmsg); + if (*errmsg) goto parcleanup; +- + for (line = outlines; *line; ++line) +! puts(*line); +! + freelines(outlines); + outlines = NULL; + +--- 875,900 ---- + for (nextline = firstline + 1, nextprop = firstprop + 1; + nextline < endline && !isbodiless(nextprop) && !isfirst(nextprop); + ++nextline, ++nextprop); +! + prefix = prefixbak, suffix = suffixbak; +! setaffixes((const wchar_t * const *) firstline, +! (const wchar_t * const *) nextline, firstprop, bodychars, + quotechars, hang, body, quote, &afp, &fs, &prefix, &suffix); + if (width <= prefix + suffix) { +! swprintf(errmsg,errmsg_size, +! L" (%d) <= (%d) + (%d)\n", + width, prefix, suffix); + goto parcleanup; + } + + outlines = +! reformat((const wchar_t * const *) firstline, +! (const wchar_t * const *) nextline, + afp, fs, hang, prefix, suffix, width, cap, + fit, guess, just, last, Report, touch, errmsg); + if (*errmsg) goto parcleanup; + for (line = outlines; *line; ++line) +! fwprintf(stdout, L"%ls\n", *line); + freelines(outlines); + outlines = NULL; + +*************** +*** 884,890 **** + } + + parcleanup: +! + if (bodychars) freecharset(bodychars); + if (protectchars) freecharset(protectchars); + if (quotechars) freecharset(quotechars); +--- 909,915 ---- + } + + parcleanup: +! if (wenv) free(wenv); + if (bodychars) freecharset(bodychars); + if (protectchars) freecharset(protectchars); + if (quotechars) freecharset(quotechars); +*************** +*** 894,901 **** + if (outlines) freelines(outlines); + + errout = Err ? stderr : stdout; +! if (*errmsg) fprintf(errout, "par error:\n%.*s", errmsg_size, errmsg); +! if (version) fputs("par 1.52\n",errout); + if (help) fputs(usagemsg,errout); + + return *errmsg ? EXIT_FAILURE : EXIT_SUCCESS; +--- 919,930 ---- + if (outlines) freelines(outlines); + + errout = Err ? stderr : stdout; +! if (*errmsg) fwprintf(errout, L"par error:\n%.*ls", errmsg_size, errmsg); +! #ifdef NOWIDTH +! if (version) fputws(L"par 1.52-i18n.4 (without wcwidth() support)\n",errout); +! #else +! if (version) fputws(L"par 1.52-i18n.4\n",errout); +! #endif + if (help) fputs(usagemsg,errout); + + return *errmsg ? EXIT_FAILURE : EXIT_SUCCESS; +Только в ../Par152-unicode/: par.c.orig +diff -c ./par.doc ../Par152-unicode/par.doc +*** ./par.doc 2001-04-30 01:17:28.000000000 +0400 +--- ../Par152-unicode/par.doc 2019-10-26 17:21:08.548050853 +0300 +*************** +*** 1,6 **** + ********************* + * par.doc * +! * for Par 1.52 * + * Copyright 2001 by * + * Adam M. Costello * + ********************* +--- 1,6 ---- + ********************* + * par.doc * +! * for Par 1.52 i18n * + * Copyright 2001 by * + * Adam M. Costello * + ********************* +diff -c ./protoMakefile ../Par152-unicode/protoMakefile +*** ./protoMakefile 2001-03-09 03:53:25.000000000 +0300 +--- ../Par152-unicode/protoMakefile 2019-10-26 17:21:08.548050853 +0300 +*************** +*** 47,53 **** + # Example (for Solaris 2.x with SPARCompiler C): + # CC = cc -c -O -s -Xc -DDONTFREE + +! CC = cc -c + + # Define LINK1 and LINK2 so that the command + # +--- 47,53 ---- + # Example (for Solaris 2.x with SPARCompiler C): + # CC = cc -c -O -s -Xc -DDONTFREE + +! CC = cc -std=c99 -c + + # Define LINK1 and LINK2 so that the command + # +diff -c ./reformat.c ../Par152-unicode/reformat.c +*** ./reformat.c 2001-03-22 07:17:15.000000000 +0300 +--- ../Par152-unicode/reformat.c 2019-10-26 17:21:08.548050853 +0300 +*************** +*** 1,9 **** +! /*********************/ +! /* reformat.c */ +! /* for Par 1.52 */ +! /* Copyright 2001 by */ +! /* Adam M. Costello */ +! /*********************/ + + /* This is ANSI C code (C89). */ + +--- 1,11 ---- +! /***********************/ +! /* reformat.c */ +! /* for Par 1.52-i18n.4 */ +! /* Copyright 2001 by */ +! /* Adam M. Costello */ +! /* Modified by */ +! /* Jérôme Pouiller */ +! /***********************/ + + /* This is ANSI C code (C89). */ + +*************** +*** 16,21 **** +--- 18,24 ---- + #include + #include + #include ++ #include + + #undef NULL + #define NULL ((void *) 0) +*************** +*** 33,46 **** + typedef unsigned char wflag_t; + + typedef struct word { +! const char *chrs; /* Pointer to the characters in the word */ + /* (NOT terminated by '\0'). */ + struct word *prev, /* Pointer to previous word. */ + *next, /* Pointer to next word. */ + /* Supposing this word were the first... */ + *nextline; /* Pointer to first word in next line. */ + int score, /* Value of the objective function. */ +! length; /* Length of this word. */ + wflag_t flags; /* Notable properties of this word. */ + } word; + +--- 36,50 ---- + typedef unsigned char wflag_t; + + typedef struct word { +! const wchar_t *chrs; /* Pointer to the characters in the word */ + /* (NOT terminated by '\0'). */ + struct word *prev, /* Pointer to previous word. */ + *next, /* Pointer to next word. */ + /* Supposing this word were the first... */ + *nextline; /* Pointer to first word in next line. */ + int score, /* Value of the objective function. */ +! length, /* Length (in widechar) of this word. */ +! width; /* Visual width of this word. */ + wflag_t flags; /* Notable properties of this word. */ + } word; + +*************** +*** 57,73 **** + #define iscurious(w) (((w)->flags & 2) != 0) + #define iscapital(w) (((w)->flags & 4) != 0) + + + static int checkcapital(word *w) + /* Returns 1 if *w is capitalized according to the definition */ + /* in par.doc (assuming is 0), or 0 if not. */ + { +! const char *p, *end; + + for (p = w->chrs, end = p + w->length; +! p < end && !isalnum(*(unsigned char *)p); + ++p); +! return p < end && !islower(*(unsigned char *)p); + } + + +--- 61,99 ---- + #define iscurious(w) (((w)->flags & 2) != 0) + #define iscapital(w) (((w)->flags & 4) != 0) + ++ static int getWidth(const wchar_t *beg, const wchar_t *end) ++ /* Compute (visual) width of a word. This function is aware */ ++ /* about double-width characters used in oriental langages. */ ++ { ++ int ret, tmp; ++ ++ for (ret = 0; beg != end; beg++) { ++ #ifdef NOWIDTH ++ tmp = 1; ++ #else ++ tmp = wcwidth(*beg); ++ #endif ++ // BUG: It is not really easy to handle case of zero width characters. ++ // If we don't do this, size mallloc for q1 will be less than real ++ // size and program will segfault. So I prefer to have a bug than a segfault. ++ if (tmp <= 0) ++ tmp = 1; ++ ret += tmp; ++ } ++ ++ return ret; ++ } + + static int checkcapital(word *w) + /* Returns 1 if *w is capitalized according to the definition */ + /* in par.doc (assuming is 0), or 0 if not. */ + { +! const wchar_t *p, *end; + + for (p = w->chrs, end = p + w->length; +! p < end && !iswalnum(*p); + ++p); +! return p < end && !iswlower(*p); + } + + +*************** +*** 75,93 **** + /* Returns 1 if *w is curious according to */ + /* the definition in par.doc, or 0 if not. */ + { +! const char *start, *p; +! char ch; + + for (start = w->chrs, p = start + w->length; p > start; --p) { + ch = p[-1]; +! if (isalnum(*(unsigned char *)&ch)) return 0; +! if (ch == '.' || ch == '?' || ch == '!' || ch == ':') break; + } + + if (p <= start + 1) return 0; + + --p; +! do if (isalnum(*(unsigned char *)--p)) return 1; + while (p > start); + + return 0; +--- 101,119 ---- + /* Returns 1 if *w is curious according to */ + /* the definition in par.doc, or 0 if not. */ + { +! const wchar_t *start, *p; +! wchar_t ch; + + for (start = w->chrs, p = start + w->length; p > start; --p) { + ch = p[-1]; +! if (iswalnum(*(wchar_t *)&ch)) return 0; +! if (ch == L'.' || ch == L'?' || ch == L'!' || ch == L':') break; + } + + if (p <= start + 1) return 0; + + --p; +! do if (iswalnum(*(wchar_t *)--p)) return 1; + while (p > start); + + return 0; +*************** +*** 95,125 **** + + + static int simplebreaks(word *head, word *tail, int L, int last) +! +! /* Chooses line breaks in a list of words which maximize the length of the */ +! /* shortest line. L is the maximum line length. The last line counts as a */ +! /* line only if last is non-zero. _head must point to a dummy word, and tail */ +! /* must point to the last word, whose next field must be NULL. Returns the */ +! /* length of the shortest line on success, -1 if there is a word of length */ +! /* greater than L, or L if there are no lines. */ + { + word *w1, *w2; + int linelen, score; + + if (!head->next) return L; + +! for (w1 = tail, linelen = w1->length; + w1 != head && linelen <= L; +! linelen += isshifted(w1), w1 = w1->prev, linelen += 1 + w1->length) { + w1->score = last ? linelen : L; + w1->nextline = NULL; + } + + for ( ; w1 != head; w1 = w1->prev) { + w1->score = -1; +! for (linelen = w1->length, w2 = w1->next; + linelen <= L; +! linelen += 1 + isshifted(w2) + w2->length, w2 = w2->next) { + score = w2->score; + if (linelen < score) score = linelen; + if (score >= w1->score) { +--- 121,152 ---- + + + static int simplebreaks(word *head, word *tail, int L, int last) +! /* Chooses line breaks in a list of words which maximize */ +! /* the length of the shortest line. L is the maximum line */ +! /* length. The last line counts as a line only if last is */ +! /* non-zero. _head must point to a dummy word, and tail */ +! /* must point to the last word, whose next field must be */ +! /* NULL. Returns the length of the shortest line on */ +! /* success, -1 if there is a word of length greater than L, */ +! /* or L if there are no lines. */ + { + word *w1, *w2; + int linelen, score; + + if (!head->next) return L; + +! for (w1 = tail, linelen = w1->width; + w1 != head && linelen <= L; +! linelen += isshifted(w1), w1 = w1->prev, linelen += 1 + w1->width) { + w1->score = last ? linelen : L; + w1->nextline = NULL; + } + + for ( ; w1 != head; w1 = w1->prev) { + w1->score = -1; +! for (linelen = w1->width, w2 = w1->next; + linelen <= L; +! linelen += 1 + isshifted(w2) + w2->width, w2 = w2->next) { + score = w2->score; + if (linelen < score) score = linelen; + if (score >= w1->score) { +*************** +*** 168,174 **** + + shortest = simplebreaks(head,tail,target,last); + if (shortest < 0) { +! sprintf(errmsg,impossibility,1); + return; + } + +--- 195,201 ---- + + shortest = simplebreaks(head,tail,target,last); + if (shortest < 0) { +! swprintf(errmsg,errmsg_size,impossibility,1); + return; + } + +*************** +*** 178,186 **** + w1 = tail; + do { + w1->score = -1; +! for (linelen = w1->length, w2 = w1->next; + linelen <= target; +! linelen += 1 + isshifted(w2) + w2->length, w2 = w2->next) { + extra = target - linelen; + minlen = shortest; + if (w2) +--- 205,213 ---- + w1 = tail; + do { + w1->score = -1; +! for (linelen = w1->width, w2 = w1->next; + linelen <= target; +! linelen += 1 + isshifted(w2) + w2->width, w2 = w2->next) { + extra = target - linelen; + minlen = shortest; + if (w2) +*************** +*** 202,208 **** + } while (w1 != head); + + if (head->next->score < 0) +! sprintf(errmsg,impossibility,2); + } + + +--- 229,235 ---- + } while (w1 != head); + + if (head->next->score < 0) +! swprintf(errmsg,errmsg_size,impossibility,2); + } + + +*************** +*** 225,233 **** + w1 = tail; + do { + w1->score = L; +! for (numgaps = 0, extra = L - w1->length, w2 = w1->next; + extra >= 0; +! ++numgaps, extra -= 1 + isshifted(w2) + w2->length, w2 = w2->next) { + gap = numgaps ? (extra + numgaps - 1) / numgaps : L; + if (w2) + score = w2->score; +--- 252,260 ---- + w1 = tail; + do { + w1->score = L; +! for (numgaps = 0, extra = L - w1->width, w2 = w1->next; + extra >= 0; +! ++numgaps, extra -= 1 + isshifted(w2) + w2->width, w2 = w2->next) { + gap = numgaps ? (extra + numgaps - 1) / numgaps : L; + if (w2) + score = w2->score; +*************** +*** 247,253 **** + + maxgap = head->next->score; + if (maxgap >= L) { +! strcpy(errmsg, "Cannot justify.\n"); + return; + } + +--- 274,280 ---- + + maxgap = head->next->score; + if (maxgap >= L) { +! wcscpy(errmsg, L"Cannot justify.\n"); + return; + } + +*************** +*** 257,265 **** + w1 = tail; + do { + w1->score = -1; +! for (numgaps = 0, extra = L - w1->length, w2 = w1->next; + extra >= 0; +! ++numgaps, extra -= 1 + isshifted(w2) + w2->length, w2 = w2->next) { + gap = numgaps ? (extra + numgaps - 1) / numgaps : L; + if (w2) + score = w2->score; +--- 284,292 ---- + w1 = tail; + do { + w1->score = -1; +! for (numgaps = 0, extra = L - w1->width, w2 = w1->next; + extra >= 0; +! ++numgaps, extra -= 1 + isshifted(w2) + w2->width, w2 = w2->next) { + gap = numgaps ? (extra + numgaps - 1) / numgaps : L; + if (w2) + score = w2->score; +*************** +*** 288,327 **** + } while (w1 != head); + + if (head->next->score < 0) +! sprintf(errmsg,impossibility,3); + } + + +! char **reformat( +! const char * const *inlines, const char * const *endline, int afp, int fs, + int hang, int prefix, int suffix, int width, int cap, int fit, int guess, + int just, int last, int Report, int touch, errmsg_t errmsg + ) + { + int numin, affix, L, onfirstword = 1, linelen, numout, numgaps, extra, phase; +! const char * const *line, **suffixes = NULL, **suf, *end, *p1, *p2; +! char *q1, *q2, **outlines = NULL; + word dummy, *head, *tail, *w1, *w2; + buffer *pbuf = NULL; + + /* Initialization: */ +- + *errmsg = '\0'; + dummy.next = dummy.prev = NULL; + dummy.flags = 0; + head = tail = &dummy; + numin = endline - inlines; + if (numin <= 0) { +! sprintf(errmsg,impossibility,4); + goto rfcleanup; + } + numgaps = extra = 0; /* unnecessary, but quiets compiler warnings */ + + /* Allocate space for pointers to the suffixes: */ + +! suffixes = malloc(numin * sizeof (const char *)); + if (!suffixes) { +! strcpy(errmsg,outofmem); + goto rfcleanup; + } + +--- 315,353 ---- + } while (w1 != head); + + if (head->next->score < 0) +! swprintf(errmsg,errmsg_size,impossibility,3); + } + + +! wchar_t **reformat( +! const wchar_t * const *inlines, const wchar_t * const *endline, int afp, int fs, + int hang, int prefix, int suffix, int width, int cap, int fit, int guess, + int just, int last, int Report, int touch, errmsg_t errmsg + ) + { + int numin, affix, L, onfirstword = 1, linelen, numout, numgaps, extra, phase; +! const wchar_t * const *line, **suffixes = NULL, **suf, *end, *p1, *p2; +! wchar_t *q1, *q2, **outlines = NULL; + word dummy, *head, *tail, *w1, *w2; + buffer *pbuf = NULL; + + /* Initialization: */ + *errmsg = '\0'; + dummy.next = dummy.prev = NULL; + dummy.flags = 0; + head = tail = &dummy; + numin = endline - inlines; + if (numin <= 0) { +! swprintf(errmsg,errmsg_size,impossibility,4); + goto rfcleanup; + } + numgaps = extra = 0; /* unnecessary, but quiets compiler warnings */ + + /* Allocate space for pointers to the suffixes: */ + +! suffixes = malloc(numin * sizeof (const wchar_t *)); + if (!suffixes) { +! wcscpy(errmsg,outofmem); + goto rfcleanup; + } + +*************** +*** 334,341 **** + do { + for (end = *line; *end; ++end); + if (end - *line < affix) { +! sprintf(errmsg, +! "Line %d shorter than + = %d + %d = %d\n", + line - inlines + 1, prefix, suffix, affix); + goto rfcleanup; + } +--- 360,367 ---- + do { + for (end = *line; *end; ++end); + if (end - *line < affix) { +! swprintf(errmsg,errmsg_size, +! L"Line %d shorter than + = %d + %d = %d\n", + line - inlines + 1, prefix, suffix, affix); + goto rfcleanup; + } +*************** +*** 343,359 **** + *suf = end; + p1 = *line + prefix; + for (;;) { +! while (p1 < end && *p1 == ' ') ++p1; + if (p1 == end) break; + p2 = p1; + if (onfirstword) { + p1 = *line + prefix; + onfirstword = 0; + } +! while (p2 < end && *p2 != ' ') ++p2; + w1 = malloc(sizeof (word)); + if (!w1) { +! strcpy(errmsg,outofmem); + goto rfcleanup; + } + w1->next = NULL; +--- 369,385 ---- + *suf = end; + p1 = *line + prefix; + for (;;) { +! while (p1 < end && *p1 == L' ') ++p1; + if (p1 == end) break; + p2 = p1; + if (onfirstword) { + p1 = *line + prefix; + onfirstword = 0; + } +! while (p2 < end && *p2 != L' ') ++p2; + w1 = malloc(sizeof (word)); + if (!w1) { +! wcscpy(errmsg,outofmem); + goto rfcleanup; + } + w1->next = NULL; +*************** +*** 361,366 **** +--- 387,393 ---- + tail = tail->next = w1; + w1->chrs = p1; + w1->length = p2 - p1; ++ w1->width = getWidth(p1, p2); + w1->flags = 0; + p1 = p2; + } +*************** +*** 377,382 **** +--- 404,410 ---- + if (iscurious(w1)) { + if (w1->chrs[w1->length] && w1->chrs + w1->length + 1 == w2->chrs) { + w2->length += w1->length + 1; ++ w2->width += w1->width + 1; + w2->chrs = w1->chrs; + w2->prev = w1->prev; + w2->prev->next = w2; +*************** +*** 397,416 **** + + if (Report) + for (w2 = head->next; w2; w2 = w2->next) { +! if (w2->length > L) { +! linelen = w2->length; + if (linelen > errmsg_size - 17) + linelen = errmsg_size - 17; +! sprintf(errmsg, "Word too long: %.*s\n", linelen, w2->chrs); + goto rfcleanup; + } + } + else + for (w2 = head->next; w2; w2 = w2->next) +! while (w2->length > L) { + w1 = malloc(sizeof (word)); + if (!w1) { +! strcpy(errmsg,outofmem); + goto rfcleanup; + } + w1->next = w2; +--- 425,444 ---- + + if (Report) + for (w2 = head->next; w2; w2 = w2->next) { +! if (w2->width > L) { +! linelen = w2->width; + if (linelen > errmsg_size - 17) + linelen = errmsg_size - 17; +! swprintf(errmsg,errmsg_size, L"Word too long: %.*ls\n", linelen, w2->chrs); + goto rfcleanup; + } + } + else + for (w2 = head->next; w2; w2 = w2->next) +! while (w2->width > L) { + w1 = malloc(sizeof (word)); + if (!w1) { +! wcscpy(errmsg,outofmem); + goto rfcleanup; + } + w1->next = w2; +*************** +*** 420,426 **** +--- 448,456 ---- + w1->chrs = w2->chrs; + w2->chrs += L; + w1->length = L; ++ w1->width = getWidth(w1->chrs, w1->chrs + L); + w2->length -= L; ++ w2->width -= w1->width; + w1->flags = 0; + if (iscapital(w2)) { + w1->flags |= W_CAPITAL; +*************** +*** 444,452 **** + L = 0; + w1 = head->next; + while (w1) { +! for (linelen = w1->length, w2 = w1->next; + w2 != w1->nextline; +! linelen += 1 + isshifted(w2) + w2->length, w2 = w2->next); + if (linelen > L) L = linelen; + w1 = w2; + } +--- 474,482 ---- + L = 0; + w1 = head->next; + while (w1) { +! for (linelen = w1->width, w2 = w1->next; + w2 != w1->nextline; +! linelen += 1 + isshifted(w2) + w2->width, w2 = w2->next); + if (linelen > L) L = linelen; + w1 = w2; + } +*************** +*** 454,520 **** + + /* Construct the lines: */ + +! pbuf = newbuffer(sizeof (char *), errmsg); + if (*errmsg) goto rfcleanup; + + numout = 0; + w1 = head->next; + while (numout < hang || w1) { + if (w1) +! for (w2 = w1->next, numgaps = 0, extra = L - w1->length; + w2 != w1->nextline; +! ++numgaps, extra -= 1 + isshifted(w2) + w2->length, w2 = w2->next); + linelen = suffix || (just && (w2 || last)) ? + L + affix : + w1 ? prefix + L - extra : prefix; +! q1 = malloc((linelen + 1) * sizeof (char)); + if (!q1) { +! strcpy(errmsg,outofmem); + goto rfcleanup; + } + additem(pbuf, &q1, errmsg); + if (*errmsg) goto rfcleanup; + ++numout; + q2 = q1 + prefix; +! if (numout <= numin) memcpy(q1, inlines[numout - 1], prefix); +! else if (numin > hang ) memcpy(q1, endline[-1], prefix); + else { + if (afp > prefix) afp = prefix; +! memcpy(q1, endline[-1], afp); + q1 += afp; +! while (q1 < q2) *q1++ = ' '; + } + q1 = q2; + if (w1) { + phase = numgaps / 2; + for (w2 = w1; ; ) { +! memcpy(q1, w2->chrs, w2->length); + q1 += w2->length; + w2 = w2->next; + if (w2 == w1->nextline) break; +! *q1++ = ' '; + if (just && (w1->nextline || last)) { + phase += extra; + while (phase >= numgaps) { +! *q1++ = ' '; + phase -= numgaps; + } + } +! if (isshifted(w2)) *q1++ = ' '; + } + } + q2 += linelen - affix; +! while (q1 < q2) *q1++ = ' '; + q2 = q1 + suffix; +! if (numout <= numin) memcpy(q1, suffixes[numout - 1], suffix); +! else if (numin > hang ) memcpy(q1, suffixes[numin - 1], suffix); + else { + if (fs > suffix) fs = suffix; +! memcpy(q1, suffixes[numin - 1], fs); + q1 += fs; +! while(q1 < q2) *q1++ = ' '; + } +! *q2 = '\0'; + if (w1) w1 = w1->nextline; + } + +--- 484,550 ---- + + /* Construct the lines: */ + +! pbuf = newbuffer(sizeof (wchar_t *), errmsg); + if (*errmsg) goto rfcleanup; + + numout = 0; + w1 = head->next; + while (numout < hang || w1) { + if (w1) +! for (w2 = w1->next, numgaps = 0, extra = L - w1->width; + w2 != w1->nextline; +! ++numgaps, extra -= 1 + isshifted(w2) + w2->width, w2 = w2->next); + linelen = suffix || (just && (w2 || last)) ? + L + affix : + w1 ? prefix + L - extra : prefix; +! q1 = malloc((linelen + 1) * sizeof (wchar_t)); + if (!q1) { +! wcscpy(errmsg,outofmem); + goto rfcleanup; + } + additem(pbuf, &q1, errmsg); + if (*errmsg) goto rfcleanup; + ++numout; + q2 = q1 + prefix; +! if (numout <= numin) memcpy(q1, inlines[numout - 1], prefix * sizeof(wchar_t)); +! else if (numin > hang ) memcpy(q1, endline[-1], prefix * sizeof(wchar_t)); + else { + if (afp > prefix) afp = prefix; +! memcpy(q1, endline[-1], afp * sizeof(wchar_t)); + q1 += afp; +! while (q1 < q2) *q1++ = L' '; + } + q1 = q2; + if (w1) { + phase = numgaps / 2; + for (w2 = w1; ; ) { +! memcpy(q1, w2->chrs, w2->length * sizeof(wchar_t)); + q1 += w2->length; + w2 = w2->next; + if (w2 == w1->nextline) break; +! *q1++ = L' '; + if (just && (w1->nextline || last)) { + phase += extra; + while (phase >= numgaps) { +! *q1++ = L' '; + phase -= numgaps; + } + } +! if (isshifted(w2)) *q1++ = L' '; + } + } + q2 += linelen - affix; +! while (q1 < q2) *q1++ = L' '; + q2 = q1 + suffix; +! if (numout <= numin) memcpy(q1, suffixes[numout - 1], suffix * sizeof(wchar_t)); +! else if (numin > hang ) memcpy(q1, suffixes[numin - 1], suffix * sizeof(wchar_t)); + else { + if (fs > suffix) fs = suffix; +! memcpy(q1, suffixes[numin - 1], fs * sizeof(wchar_t)); + q1 += fs; +! while(q1 < q2) *q1++ = L' '; + } +! *q2 = L'\0'; + if (w1) w1 = w1->nextline; + } + +*************** +*** 543,547 **** +--- 573,578 ---- + freebuffer(pbuf); + } + ++ + return outlines; + } +diff -c ./reformat.h ../Par152-unicode/reformat.h +*** ./reformat.h 2001-03-09 03:53:43.000000000 +0300 +--- ../Par152-unicode/reformat.h 2019-10-26 17:21:08.549050853 +0300 +*************** +*** 1,18 **** +! /*********************/ +! /* reformat.h */ +! /* for Par 1.52 */ +! /* Copyright 2001 by */ +! /* Adam M. Costello */ +! /*********************/ + + /* This is ANSI C code (C89). */ + + + #include "errmsg.h" + +! +! char **reformat( +! const char * const *inlines, const char * const *endline, int afp, int fs, + int hang, int prefix, int suffix, int width, int cap, int fit, int guess, + int just, int last, int Report, int touch, errmsg_t errmsg + ); +--- 1,20 ---- +! /***********************/ +! /* reformat.h */ +! /* for Par 1.52-i18n.4 */ +! /* Copyright 2001 by */ +! /* Adam M. Costello */ +! /* Modified by */ +! /* Jérôme Pouiller */ +! /***********************/ + + /* This is ANSI C code (C89). */ + + + #include "errmsg.h" ++ #include + +! wchar_t **reformat( +! const wchar_t * const *inlines, const wchar_t * const *endline, int afp, int fs, + int hang, int prefix, int suffix, int width, int cap, int fit, int guess, + int just, int last, int Report, int touch, errmsg_t errmsg + ); +diff -c ./releasenotes ../Par152-unicode/releasenotes +*** ./releasenotes 2001-04-30 01:12:05.000000000 +0400 +--- ../Par152-unicode/releasenotes 2019-10-26 17:21:08.549050853 +0300 +*************** +*** 1,12 **** +! ********************* +! * releasenotes * +! * for Par 1.52 * +! * Copyright 2001 by * +! * Adam M. Costello * +! ********************* + + + Each entry below describes changes since the previous version. + + Par 1.52 released 2001-Apr-29 + Fixed a portability problem regarding unsigned char versus char. +--- 1,28 ---- +! *********************** +! * releasenotes * +! * for Par 1.52-i18n.4 * +! * Copyright 2001 by * +! * Adam M. Costello * +! * Modified by * +! * Jérôme Pouiller * +! *********************** + + + Each entry below describes changes since the previous version. ++ Par 1.52-i18n.4 released 2009-May-05 ++ Change nearly all char in wchar_t remove nightmare of unsigned char vs signed char ++ Fix bugs with option 'q' ++ Fix bugs with '\n' ++ ++ Par 1.52-i18n.3 released 2006-Oct-03 ++ Fix bug with option 'g' ++ ++ Par 1.52-i18n.2 released 2006-Aug-03 ++ Fix bug debian #310495. ++ ++ Par 1.52-i18n.1 released 2006-Jun-22 ++ Changed char in wchar_t. Allow support of multibytes characters. ++ Added support for double-width characters. + + Par 1.52 released 2001-Apr-29 + Fixed a portability problem regarding unsigned char versus char. +Общие подкаталоги: ./test и ../Par152-unicode/test diff --git a/srcpkgs/par/template b/srcpkgs/par/template index 585a8887841..54747129b79 100644 --- a/srcpkgs/par/template +++ b/srcpkgs/par/template @@ -1,12 +1,12 @@ # Template file for 'par' pkgname=par version=1.52 -revision=3 +revision=4 wrksrc=Par152 build_style=gnu-configure short_desc="Paragraph reformatter" maintainer="Leah Neukirchen " -license="custom" +license="custom:par" homepage="http://www.nicemice.net/par/" distfiles="http://www.nicemice.net/par/Par152-autoconf.tar.gz http://www.nicemice.net/par/Par152.tar.gz" From 6762ad0280d685e70435040868e2e2c85e12e20e Mon Sep 17 00:00:00 2001 From: Mate GABRI Date: Mon, 28 Oct 2019 12:33:50 +1100 Subject: [PATCH 019/186] saml2aws: update to 2.18.0 --- srcpkgs/saml2aws/template | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/srcpkgs/saml2aws/template b/srcpkgs/saml2aws/template index 2f308b8e3a2..0cf6c974f19 100644 --- a/srcpkgs/saml2aws/template +++ b/srcpkgs/saml2aws/template @@ -1,24 +1,19 @@ # Template file for 'saml2aws' pkgname=saml2aws -version=2.17.0 +version=2.18.0 revision=1 build_style=go go_import_path=github.com/Versent/saml2aws go_package="$go_import_path/cmd/saml2aws" -hostmakedepends="git dep" +go_ldflags="-X main.Version=${version}" +hostmakedepends="git" depends="aws-cli" short_desc="Get AWS temporary credentials from SAML provider" maintainer="Mate GABRI " license="MIT" homepage="https://github.com/Versent/saml2aws" distfiles="https://github.com/Versent/saml2aws/archive/v${version}.tar.gz" -checksum=fd7a1eeff96af1c78b68bcd1473965016cc078b4e50963d39fd69ad4311e7094 - -pre_build() { - cd $GOSRCPATH - dep ensure - cd $wrksrc -} +checksum=cf3b1983ca8a9267b04a0f0a760017749f7e99d7379997ab3623bec70c4a4698 post_install() { vlicense LICENSE.md From c7779fed5b331b25ef6ec709e930c3da3f10aa0c Mon Sep 17 00:00:00 2001 From: mobinmob Date: Sun, 27 Oct 2019 22:55:20 +0200 Subject: [PATCH 020/186] kdeconnect: update to 1.3.5. --- srcpkgs/kdeconnect/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kdeconnect/template b/srcpkgs/kdeconnect/template index 03e39fd5022..8d3723dd859 100644 --- a/srcpkgs/kdeconnect/template +++ b/srcpkgs/kdeconnect/template @@ -1,6 +1,6 @@ # Template file for 'kdeconnect' pkgname=kdeconnect -version=1.3.4 +version=1.3.5 revision=1 wrksrc="kdeconnect-kde-${version}" build_style=cmake @@ -14,4 +14,4 @@ maintainer="Yuxuan Shui " license="GPL-2.0-or-later" homepage="https://github.com/KDE/kdeconnect-kde" distfiles="https://github.com/KDE/kdeconnect-kde/archive/v${version}.tar.gz" -checksum=b2711f4d748db5f1c7cdfb57d35a6dd0d6b5d2ac031a034f33bc6efc25e2e83e +checksum=06b8b18e5d1030c9005937d79f67b4ebc30309dd7afc84ab6450488a00d7adeb From 0cadf88781ebed57ffd779dbff8e0f4e3523b24d Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Sun, 27 Oct 2019 13:34:05 -0700 Subject: [PATCH 021/186] podman: update to 1.6.2. --- srcpkgs/podman/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template index 8423a153b45..e32e2b85629 100644 --- a/srcpkgs/podman/template +++ b/srcpkgs/podman/template @@ -1,6 +1,6 @@ # Template file for 'podman' pkgname=podman -version=1.5.1 +version=1.6.2 revision=1 wrksrc="libpod-${version}" build_style=go @@ -16,7 +16,7 @@ maintainer="Cameron Nemo " license="Apache-2.0" homepage="https://podman.io/" distfiles="https://github.com/containers/libpod/archive/v${version}.tar.gz" -checksum=5651102e8d8f15b3dfddc80702dc93149b94de330502d6de6fafa7afddbbf709 +checksum=be31e3463c7ae271b09a0cca4d6205a055ea53a4bdac3482bd05f823c9a1e602 if [ "$CROSS_BUILD" ]; then go_build_tags+=" containers_image_openpgp exclude_graphdriver_overlay" From a63b979ee1ad540691e242714fff1e81fe88aafc Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Sun, 27 Oct 2019 13:15:40 -0700 Subject: [PATCH 022/186] fuse-overlayfs: update to 0.6.5. --- srcpkgs/fuse-overlayfs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fuse-overlayfs/template b/srcpkgs/fuse-overlayfs/template index d90f41438a5..0b9ab3ad23a 100644 --- a/srcpkgs/fuse-overlayfs/template +++ b/srcpkgs/fuse-overlayfs/template @@ -1,6 +1,6 @@ # Template file for 'fuse-overlayfs' pkgname=fuse-overlayfs -version=0.6.4 +version=0.6.5 revision=1 build_style=gnu-configure hostmakedepends="autoconf automake pkg-config" @@ -10,7 +10,7 @@ maintainer="Cameron Nemo " license="GPL-3.0-or-later" homepage="https://github.com/containers/fuse-overlayfs" distfiles="https://github.com/containers/fuse-overlayfs/archive/v${version}.tar.gz" -checksum=e95590ce77cfff07779b977f4e8445cf82c9927391d21c41d1cc28326ad0133a +checksum=ce2f50da51a76afbfc0561d784038ccfb92f6683d52f52b14d037ca4f4910044 pre_configure() { ./autogen.sh From 5370de669e0cd751dabadb32fffbaa71e863602e Mon Sep 17 00:00:00 2001 From: q66 Date: Sun, 27 Oct 2019 21:00:15 +0100 Subject: [PATCH 023/186] Clp: reenable everywhere and disable AVX2 usage on x86_64 --- srcpkgs/Clp/patches/disable-avx.patch | 46 +++++++++++++++++++++++++++ srcpkgs/Clp/template | 6 +--- 2 files changed, 47 insertions(+), 5 deletions(-) create mode 100644 srcpkgs/Clp/patches/disable-avx.patch diff --git a/srcpkgs/Clp/patches/disable-avx.patch b/srcpkgs/Clp/patches/disable-avx.patch new file mode 100644 index 00000000000..53cd2e0be42 --- /dev/null +++ b/srcpkgs/Clp/patches/disable-avx.patch @@ -0,0 +1,46 @@ +This disables AVX2 usage on x86_64 (by defining NO_AVX_HARDWARE) as well as +removes now-unused includes for AVX2/AVX512 instrinsics (the NEON header +was never used in the first place and the way it's included is completely +wrong anyway). + +We need it disabled on x86_64 because we're generic (and AVX is sandybridge +and newer, but the enabled code was for haswell and newer), and on other +arches it's disabled for obvious reasons. + +--- Clp/src/ClpPackedMatrix.cpp ++++ Clp/src/ClpPackedMatrix.cpp +@@ -6749,11 +6749,6 @@ ClpPackedMatrix3::ClpPackedMatrix3() + } + #ifdef _MSC_VER + #include +-#elif defined(__arm__) +-#include +-#else +-#include +-//#include + #endif + /* Constructor from copy. */ + ClpPackedMatrix3::ClpPackedMatrix3(ClpSimplex *model, const CoinPackedMatrix *columnCopy) +@@ -6777,7 +6772,7 @@ ClpPackedMatrix3::ClpPackedMatrix3(ClpSimplex *model, const CoinPackedMatrix *co + { + //#undef COIN_AVX2 + //#define COIN_AVX2 8 +- //#define NO_AVX_HARDWARE ++#define NO_AVX_HARDWARE + #ifndef COIN_AVX2 + #define COIN_AVX2 4 + #else +--- Clp/src/ClpSimplexDual.cpp ++++ Clp/src/ClpSimplexDual.cpp +@@ -3556,11 +3556,6 @@ void moveAndZero(clpTempInfo *info, int type, void *extra) + #endif + #ifdef _MSC_VER + #include +-#elif defined(__arm__) +-#include +-#else +-#include +-//#include + #endif + int ClpSimplexDual::dualColumn0(const CoinIndexedVector *rowArray, + const CoinIndexedVector *columnArray, diff --git a/srcpkgs/Clp/template b/srcpkgs/Clp/template index ee23f8b3de2..5b2af733ca3 100644 --- a/srcpkgs/Clp/template +++ b/srcpkgs/Clp/template @@ -1,7 +1,7 @@ # Template file for 'Clp' pkgname=Clp version=1.17.3 -revision=1 +revision=2 build_style=gnu-configure depends="libClp>=${version}_${revision}" short_desc="COIN LP Solver" @@ -11,10 +11,6 @@ homepage="http://projects.coin-or.org/Clp" distfiles="https://www.coin-or.org/Tarballs/${pkgname}/${pkgname}-${version}.tgz" checksum=a13bf54291ad503cf76f5f93f2643d2add4faa5d0e60ff2db902ef715c094573 -case "$XBPS_TARGET_MACHINE" in - aarch64*) broken="https://travis-ci.org/void-linux/void-packages/jobs/596999100" -esac - libClp-devel_package() { short_desc+=" - development files" depends="lib${sourcepkg}>=${version}_${revision}" From d62653c4a4b546adbb453d8de188d8dac0d98c8b Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Sun, 27 Oct 2019 12:23:25 -0700 Subject: [PATCH 024/186] slirp4netns: update to 0.4.2. --- srcpkgs/slirp4netns/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/slirp4netns/template b/srcpkgs/slirp4netns/template index 50ac856075a..622e39d7b1f 100644 --- a/srcpkgs/slirp4netns/template +++ b/srcpkgs/slirp4netns/template @@ -1,6 +1,6 @@ # Template file for 'slirp4netns' pkgname=slirp4netns -version=0.4.1 +version=0.4.2 revision=1 build_style=gnu-configure hostmakedepends="autoconf automake pkg-config" @@ -10,7 +10,7 @@ maintainer="Cameron Nemo " license="GPL-2.0-only" homepage="https://github.com/rootless-containers/slirp4netns" distfiles="https://github.com/rootless-containers/slirp4netns/archive/v${version}.tar.gz" -checksum=75d2a7411cc2b3e341d8530228750bb1db06077b349d10fbdddbb582c27f8cfc +checksum=5a238930cc3063815df31a323763099faa0c7ce7c721aff9bbab97597fb7e0a0 pre_configure() { ./autogen.sh From 88204bd68caf81e85efb84394fc0bd776482db45 Mon Sep 17 00:00:00 2001 From: Anthony Iliopoulos Date: Sun, 27 Oct 2019 19:41:17 +0100 Subject: [PATCH 025/186] snapper: update to 0.8.5. --- srcpkgs/snapper/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/snapper/template b/srcpkgs/snapper/template index af9e11584c1..fdbde3c84ad 100644 --- a/srcpkgs/snapper/template +++ b/srcpkgs/snapper/template @@ -1,6 +1,6 @@ # Template file for 'snapper' pkgname=snapper -version=0.8.3 +version=0.8.5 revision=1 build_style=gnu-configure configure_args="--disable-zypp --with-conf=/etc/conf.d" @@ -14,7 +14,7 @@ maintainer="Orphaned " license="GPL-2.0-only" homepage="http://snapper.io" distfiles="https://github.com/openSUSE/snapper/archive/v${version}.tar.gz" -checksum=cf3bdfb5460596a53ece9e9f998f7f2a8759df8e032bc8048331a4267c43ae96 +checksum=f7269eeca6e400609d5fbf6b2bef1594e2483a6a0b09b10174fd582b8b13ead2 lib32disabled=yes case "$XBPS_TARGET_MACHINE" in From b85663ba22d69ac00686e474fa089b37ccc8ca10 Mon Sep 17 00:00:00 2001 From: Anthony Iliopoulos Date: Sun, 27 Oct 2019 19:41:55 +0100 Subject: [PATCH 026/186] mpg123: update to 1.25.13. --- srcpkgs/mpg123/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mpg123/template b/srcpkgs/mpg123/template index 379c8ac191b..e7d25df5687 100644 --- a/srcpkgs/mpg123/template +++ b/srcpkgs/mpg123/template @@ -1,6 +1,6 @@ # Template file for 'mpg123' pkgname=mpg123 -version=1.25.12 +version=1.25.13 revision=1 build_style=gnu-configure configure_args="--with-optimization=0 --with-default-audio=alsa @@ -12,7 +12,7 @@ maintainer="Orphaned " license="LGPL-2.1-only" homepage="https://www.mpg123.org/" distfiles="${SOURCEFORGE_SITE}/mpg123/mpg123-${version}.tar.bz2" -checksum=1ffec7c9683dfb86ea9040d6a53d6ea819ecdda215df347f79def08f1fe731d1 +checksum=90306848359c793fd43b9906e52201df18775742dc3c81c06ab67a806509890a case "$XBPS_TARGET_MACHINE" in # No LFS required with musl From 91e30eca0a8b2878a309b0150c3115dbe72bc3f8 Mon Sep 17 00:00:00 2001 From: Anthony Iliopoulos Date: Sun, 27 Oct 2019 19:42:40 +0100 Subject: [PATCH 027/186] libmicrohttpd: update to 0.9.68. --- srcpkgs/libmicrohttpd/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libmicrohttpd/template b/srcpkgs/libmicrohttpd/template index 02ae936567d..22da2834abb 100644 --- a/srcpkgs/libmicrohttpd/template +++ b/srcpkgs/libmicrohttpd/template @@ -1,6 +1,6 @@ # Template file for 'libmicrohttpd' pkgname=libmicrohttpd -version=0.9.67 +version=0.9.68 revision=1 build_style=gnu-configure makedepends="libgcrypt-devel gnutls-devel libcurl-devel" @@ -9,7 +9,7 @@ maintainer="Orphaned " license="LGPL-2.1-or-later" homepage="https://www.gnu.org/software/libmicrohttpd/" distfiles="${GNU_SITE}/libmicrohttpd/${pkgname}-${version}.tar.gz" -checksum=7e1f852723d099d4827d7ebde4d02dd00fd8da62149526fdb9fae058c5a60495 +checksum=c5716e2a2899abc9e16c8fa7a1a58da88f81aca96a0b7e68a5d4d89e21610b61 LDFLAGS=" -lgnutls" From 81495605ec942de9cc449b09ca0e0735b420a1a4 Mon Sep 17 00:00:00 2001 From: bertronika Date: Sun, 27 Oct 2019 18:33:13 +0100 Subject: [PATCH 028/186] minimodem: changed maintainer address --- srcpkgs/minimodem/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/minimodem/template b/srcpkgs/minimodem/template index 6e0d1b6aee8..7e882ba8f91 100644 --- a/srcpkgs/minimodem/template +++ b/srcpkgs/minimodem/template @@ -6,8 +6,8 @@ build_style=gnu-configure hostmakedepends="pkg-config" makedepends="fftw-devel alsa-lib-devel libsndfile-devel pulseaudio-devel" short_desc="Generate or decode modem tones using various FSK protocols" -maintainer="Nejc Bertoncelj " +maintainer="bertronika " license="GPL-3.0-or-later" homepage="http://www.whence.com/minimodem" -distfiles="http://www.whence.com/minimodem/minimodem-${version}.tar.gz" +distfiles="${homepage}/${pkgname}-${version}.tar.gz" checksum=f8cca4db8e3f284d67f843054d6bb4d88a3db5e77b26192410e41e9a06f4378e From af945c536e0ca758d53462caec0b49506c5bdade Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Sun, 27 Oct 2019 12:50:33 -0500 Subject: [PATCH 029/186] zps: update to 1.2.0. --- srcpkgs/zps/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/zps/template b/srcpkgs/zps/template index 2c6299aa646..e6738913eed 100644 --- a/srcpkgs/zps/template +++ b/srcpkgs/zps/template @@ -1,11 +1,11 @@ # Template file for 'zps' pkgname=zps -version=1.1.0 +version=1.2.0 revision=1 build_style=cmake short_desc="Small utility for listing and reaping zombie processes" -maintainer="Andrew Benson " +maintainer="Andrew Benson " license="GPL-3.0-or-later" homepage="https://github.com/orhun/zps" distfiles="${homepage}/archive/${version}.tar.gz" -checksum=1c79b5495f7624ab8f160beeddf9305e3f61f0e77f99bd9f1a82e530b4e7fa36 +checksum=6347422c883065349a24bafbe39cdb1e8293a92a4402015f3ae1dbd26b817621 From a5c07e279b129bc552de2d9d7d9d013531c14e73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Sun, 27 Oct 2019 12:29:53 +0100 Subject: [PATCH 030/186] topgrade: update to 3.2.0. --- srcpkgs/topgrade/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/topgrade/template b/srcpkgs/topgrade/template index a03c3cff609..6fbe5f81b04 100644 --- a/srcpkgs/topgrade/template +++ b/srcpkgs/topgrade/template @@ -1,6 +1,6 @@ # Template file for 'topgrade' pkgname=topgrade -version=3.1.0 +version=3.2.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=801bec18bf3b9fd3dfa9f8343864e10dd47edae8a1d86a186d9c33a77af2608c +checksum=2e336f3ce56297a2eb7c225bc905a3b1e275d64c7db72e68d80834978a304ebd From d6eae3a8018f57c09ad68c1126d151a6c6fbd18d Mon Sep 17 00:00:00 2001 From: teldra Date: Sun, 27 Oct 2019 09:04:13 +0100 Subject: [PATCH 031/186] portage: update to 2.3.78 --- srcpkgs/portage/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/portage/template b/srcpkgs/portage/template index b0f34731035..2ebed65fb3c 100644 --- a/srcpkgs/portage/template +++ b/srcpkgs/portage/template @@ -1,6 +1,6 @@ # Template file for 'portage' pkgname=portage -version=2.3.77 +version=2.3.78 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=03a8f595bbca31497678810934286bb5a3a71378c124fc935444ca0165f3a6fc +checksum=1fcec07c88d0c7ff187d3e41f697b38fba4a553b650482d0c735f78b4eee4430 conf_files=" /etc/dispatch-conf.conf From 92b0c0c9fee0eb31080c8ec74027a6b4b6afda3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= Date: Sun, 27 Oct 2019 08:35:44 +0100 Subject: [PATCH 032/186] papirus-folders: update to 1.5.0 --- srcpkgs/papirus-folders/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/papirus-folders/template b/srcpkgs/papirus-folders/template index d72435ec100..d2f61a171f8 100644 --- a/srcpkgs/papirus-folders/template +++ b/srcpkgs/papirus-folders/template @@ -1,6 +1,6 @@ # Template file for 'papirus-folders' pkgname=papirus-folders -version=1.4.0 +version=1.5.0 revision=1 archs=noarch build_style=gnu-makefile @@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana " license="MIT" homepage="https://github.com/PapirusDevelopmentTeam/papirus-folders" distfiles="https://github.com/PapirusDevelopmentTeam/papirus-folders/archive/v${version}.tar.gz" -checksum=af4f8d21ca10d2116452d221eddb4c43acd4428e65cb1c421bc8950cc4927108 +checksum=858827dc5d250b6a0950dee07c99b822c43f37eac08790ddfecfc891bf62ad7c post_install() { vlicense LICENSE From cd65495e41e75740b18b6b66339c7d2eec93dbc2 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Mon, 28 Oct 2019 12:32:22 +0100 Subject: [PATCH 033/186] logswan: update to 2.1.0. --- srcpkgs/logswan/patches/seccomp.patch | 21 +++++++++++++++++++++ srcpkgs/logswan/template | 5 +++-- 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/logswan/patches/seccomp.patch diff --git a/srcpkgs/logswan/patches/seccomp.patch b/srcpkgs/logswan/patches/seccomp.patch new file mode 100644 index 00000000000..0a4d7235d8d --- /dev/null +++ b/srcpkgs/logswan/patches/seccomp.patch @@ -0,0 +1,21 @@ +--- src/seccomp.h.orig ++++ src/seccomp.h +@@ -37,11 +37,18 @@ + BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_ALLOW), + BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, SYS_lseek, 0, 1), + BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_ALLOW), ++#ifdef SYS_open + BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, SYS_open, 0, 1), ++#endif + BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_ALLOW), + BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, SYS_openat, 0, 1), + BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_ALLOW), ++#ifdef SYS_mmap + BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, SYS_mmap, 0, 1), ++#endif ++#ifdef SYS_mmap2 ++ BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, SYS_mmap2, 0, 1), ++#endif + BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_ALLOW), + BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, SYS_munmap, 0, 1), + BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_ALLOW), diff --git a/srcpkgs/logswan/template b/srcpkgs/logswan/template index 1ba006a9c3b..d6afaafef48 100644 --- a/srcpkgs/logswan/template +++ b/srcpkgs/logswan/template @@ -1,6 +1,6 @@ # Template file for 'logswan' pkgname=logswan -version=2.0.4 +version=2.1.0 revision=1 build_style=cmake makedepends="jansson-devel libmaxminddb-devel" @@ -8,8 +8,9 @@ short_desc="Fast Web log analyzer using probabilistic data structures" maintainer="Duncaen " license="BSD-2-clause" homepage="https://www.logswan.org/" +changelog="https://github.com/fcambus/logswan/raw/master/ChangeLog" distfiles="https://github.com/fcambus/logswan/archive/${version}.tar.gz" -checksum=cb1eecfd638e5592cabb3ab4d97a1c57a88ca4ef861a6b67388fc87fb6a9af15 +checksum=c1486195614c63cc42385973d4e89ab9c13f77f408b40b8a589be41fda340be3 post_install() { vlicense LICENSE From c42571743b60816f3857756e99509792d21a68d1 Mon Sep 17 00:00:00 2001 From: Anthony Iliopoulos Date: Sun, 27 Oct 2019 19:43:13 +0100 Subject: [PATCH 034/186] eudev: update to 3.2.9. --- srcpkgs/eudev/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/eudev/template b/srcpkgs/eudev/template index 98cb31363e3..42ef6369b06 100644 --- a/srcpkgs/eudev/template +++ b/srcpkgs/eudev/template @@ -1,10 +1,10 @@ # Template file for 'eudev' -_UDEV_VERSION="228" # compatible udev version provided +_UDEV_VERSION="243" # compatible udev version provided pkgname=eudev -version=3.2.8 -revision=2 +version=3.2.9 +revision=1 build_style=gnu-configure configure_args="--enable-hwdb --enable-manpages --disable-introspection" hostmakedepends="automake libtool pkg-config gperf libxslt docbook-xsl" @@ -14,7 +14,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://github.com/gentoo/eudev" distfiles="https://github.com/gentoo/eudev/archive/v${version}.tar.gz" -checksum=5648d44958c82ffdd1a247a7abd602a018de49a7cb0653bb74d93e2f1220aaa6 +checksum=7d281276b480da3935d1acb239748c2c9db01a8043aad7e918ce57a223d8cd24 conf_files="/etc/udev/udev.conf" pre_configure() { From f69403ac79cc09afd8bf2d5a713fb59a5231ac7c Mon Sep 17 00:00:00 2001 From: Clyybber Date: Mon, 28 Oct 2019 12:55:08 +0100 Subject: [PATCH 035/186] qtractor: update to 0.9.10. --- srcpkgs/qtractor/template | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/srcpkgs/qtractor/template b/srcpkgs/qtractor/template index 43dcfe6fdd0..1b7a8fafdf3 100644 --- a/srcpkgs/qtractor/template +++ b/srcpkgs/qtractor/template @@ -1,7 +1,7 @@ # Template file for 'qtractor' pkgname=qtractor -version=0.9.7 -revision=2 +version=0.9.10 +revision=1 wrksrc="qtractor-qtractor_${version//./_}" build_style=gnu-configure configure_args="--enable-debug" @@ -16,7 +16,7 @@ license="GPL-2.0-or-later" homepage="http://qtractor.org" changelog="https://raw.githubusercontent.com/rncbc/qtractor/master/ChangeLog" distfiles="https://github.com/rncbc/qtractor/archive/qtractor_${version//./_}.tar.gz" -checksum=a5900fefae330adc52f66502b03cf7fcb56544f1842068f20e840d926a32d8ed +checksum=b51c2812da25d7d21bc317cf8164200dc967cd72597f734076f672dc59d38dc7 # configure fails to find qt5 headers nocross="https://build.voidlinux.org/builders/armv7l-musl_builder/builds/3458/steps/shell_3/logs/stdio" @@ -24,4 +24,3 @@ nocross="https://build.voidlinux.org/builders/armv7l-musl_builder/builds/3458/st pre_configure() { autoreconf -if } - From 0b4da9d4202f14a70e4dc3c77159ff5866691a0a Mon Sep 17 00:00:00 2001 From: Robert Lowry Date: Mon, 28 Oct 2019 04:57:19 +0000 Subject: [PATCH 036/186] New package: distrobuilder-1.0 --- srcpkgs/distrobuilder/template | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 srcpkgs/distrobuilder/template diff --git a/srcpkgs/distrobuilder/template b/srcpkgs/distrobuilder/template new file mode 100644 index 00000000000..fc7919eab01 --- /dev/null +++ b/srcpkgs/distrobuilder/template @@ -0,0 +1,16 @@ +# Template file for 'distrobuilder' +pkgname=distrobuilder +version=1.0 +revision=1 +wrksrc="distrobuilder-distrobuilder-${version}" +build_style=go +go_import_path="github.com/lxc/distrobuilder" +go_package="github.com/lxc/distrobuilder/distrobuilder" +hostmakedepends="git" +depends="debootstrap gnupg squashfs-tools" +short_desc="System container image builder for LXC and LXD" +maintainer="Robert Lowry " +license="Apache-2.0" +homepage="https://linuxcontainers.org/distrobuilder/introduction/" +distfiles="https://github.com/lxc/distrobuilder/archive/distrobuilder-${version}.tar.gz" +checksum=e8a9bc5d8dd7fd48bdd244407697d4a1265d55bb628ad62b824066bd23999acf From 6faf2bfc4425a27441a0f15650c00d41b0380395 Mon Sep 17 00:00:00 2001 From: AN3223 Date: Sat, 26 Oct 2019 11:58:49 -0500 Subject: [PATCH 037/186] New package: castget-2.0.1 --- srcpkgs/castget/template | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 srcpkgs/castget/template diff --git a/srcpkgs/castget/template b/srcpkgs/castget/template new file mode 100644 index 00000000000..7b48ce324ae --- /dev/null +++ b/srcpkgs/castget/template @@ -0,0 +1,13 @@ +# Template file for 'castget' +pkgname=castget +version=2.0.1 +revision=1 +build_style=gnu-configure +hostmakedepends="pkg-config" +makedepends="glib-devel libxml2-devel libcurl-devel id3lib-devel" +short_desc="Simple command-line RSS enclosure downloader" +maintainer="AN3223 " +license="LGPL-2.1-or-later" +homepage="https://castget.johndal.com/" +distfiles="${NONGNU_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2" +checksum=438b5f7ec7e31a45ed3756630fe447f42015acda53ec09202f48628726b5e875 From 087e9fc19d539e92ffb8ca80698440094d0ac840 Mon Sep 17 00:00:00 2001 From: Anthony Iliopoulos Date: Mon, 28 Oct 2019 14:48:40 +0100 Subject: [PATCH 038/186] libxls: update to 1.5.2. --- srcpkgs/libxls/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/libxls/template b/srcpkgs/libxls/template index c50511b5564..dc22a901fbb 100644 --- a/srcpkgs/libxls/template +++ b/srcpkgs/libxls/template @@ -1,15 +1,15 @@ # Template file for 'libxls' pkgname=libxls -version=1.5.1 +version=1.5.2 revision=1 build_style=gnu-configure configure_args="--program-prefix=lib --enable-static" short_desc="C library which can read Excel (xls) files" maintainer="Leah Neukirchen " -license="BSD-2-clause" +license="BSD-2-Clause" homepage="https://github.com/libxls/libxls" distfiles="https://github.com/libxls/libxls/releases/download/v${version}/libxls-${version}.tar.gz" -checksum=3bc88501529ce3909457fedfc5cc6c8c5a8aaaab17ca5cbbfad317b61e465535 +checksum=8d7e52d96ccc6c498e5de78c1988d9838d914eeeb94ac60208378340bd6e6aaa post_install() { sed '/^$/q' include/xls.h >LICENSE From 8628ecffc62aed6c2c987a7510025b318e293a43 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Mon, 28 Oct 2019 09:24:13 -0500 Subject: [PATCH 039/186] wine: update to 4.18. --- srcpkgs/wine/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template index 1df42b4f481..792589a6646 100644 --- a/srcpkgs/wine/template +++ b/srcpkgs/wine/template @@ -1,6 +1,6 @@ # Template file for 'wine' pkgname=wine -version=4.17 +version=4.18 revision=1 build_style=gnu-configure configure_args="--without-gstreamer" @@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni " license="LGPL-2.1-or-later" homepage="http://www.winehq.org/" distfiles="https://dl.winehq.org/wine/source/${version%%.*}.x/wine-${version}.tar.xz" -checksum=7480a1436687486996ba6cf91fef71b70e6dafffbf2c55ea2430094c1025b2ae +checksum=d10b0550215f789655a1c67db91a8afc0b4284416bae1869396f06e2db360e32 nopie_files="/usr/bin/wine" From 98e0b0502cd652a0d7584bd62aee88d8f3bda8b8 Mon Sep 17 00:00:00 2001 From: Anachron Date: Fri, 11 Oct 2019 11:50:08 +0200 Subject: [PATCH 040/186] hedgewars: update to 1.0.0 --- srcpkgs/hedgewars/template | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/srcpkgs/hedgewars/template b/srcpkgs/hedgewars/template index acf0a0f9141..80d7258552b 100644 --- a/srcpkgs/hedgewars/template +++ b/srcpkgs/hedgewars/template @@ -1,6 +1,6 @@ # Template file for 'hedgewars' pkgname=hedgewars -version=0.9.25 +version=1.0.0 revision=1 wrksrc="${pkgname}-src-${version}" build_style=cmake @@ -15,7 +15,7 @@ maintainer="Jakub Skrzypnik " license="GPL-2.0-only" homepage="https://www.hedgewars.org/" distfiles="https://hedgewars.org/download/releases/hedgewars-src-${version}.tar.bz2" -checksum=07dc527dbc90dddea894f518aadd67aa2eebb19738739a7c1bd7fd1e608e1c6e +checksum=211634e61f2e4beecc3c98c6f749601fcd08321fda1ba969b3b3832a004f155b nopie_files="/usr/bin/hwengine" nocross="Needs investigation: fails to link hwengine" @@ -25,12 +25,23 @@ fi case $XBPS_TARGET_MACHINE in # forces usage of C engine and ghc due to a 32 bit freepascal bug + # https://travis-ci.org/void-linux/void-packages/jobs/596458977#L4316 i686*) - hostmakedepends+=" glew-devel ghc" + hostmakedepends+=" glew-devel ghc libatomic-devel" nopie_files+=" /usr/bin/hedgewars" ;; esac +pre_configure() { + # remove option not supported by clang + case $XBPS_TARGET_MACHINE in + i686*) + CFLAGS=${CFLAGS/-fstack-clash-protection/} + CXXFLAGS=${CXXFLAGS/-fstack-clash-protection/} + ;; + esac +} + post_install() { vinstall ${DESTDIR}/usr/share/hedgewars/Data/misc/hedgewars.desktop 644 usr/share/applications } From 42a828b33ed6b9825cfbdb3456642db85929265b Mon Sep 17 00:00:00 2001 From: mobinmob Date: Mon, 28 Oct 2019 20:07:26 +0200 Subject: [PATCH 041/186] ffsend: update to 0.2.54. --- srcpkgs/ffsend/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ffsend/template b/srcpkgs/ffsend/template index 3b9af5402a2..b4b3e4c0b8b 100644 --- a/srcpkgs/ffsend/template +++ b/srcpkgs/ffsend/template @@ -1,6 +1,6 @@ # Template file for 'ffsend' pkgname=ffsend -version=0.2.52 +version=0.2.54 revision=1 build_style=cargo hostmakedepends="pkg-config" @@ -10,4 +10,4 @@ maintainer="Jasper Chan " license="GPL-3.0-or-later" homepage="https://github.com/timvisee/ffsend" distfiles="https://github.com/timvisee/ffsend/archive/v${version}.tar.gz" -checksum=b5fd937604eeccd85d7b30d8510784d95497c2412da29c586430275db55043ef +checksum=10a89d797612eaadc1fc92d5af73f5f32fc37eb259a9259f1620687340ec4479 From 94d734d93f37e55b1da39e62f4365552b43a3b9f Mon Sep 17 00:00:00 2001 From: q66 Date: Mon, 21 Oct 2019 19:40:11 +0200 Subject: [PATCH 042/186] xbps: update to 0.57.1 --- srcpkgs/xbps/patches/44692f28d8.patch | 22 -------- srcpkgs/xbps/patches/56ae190.patch | 30 ----------- srcpkgs/xbps/patches/7b728f5ac.patch | 22 -------- srcpkgs/xbps/patches/83aa486f6ba049399.patch | 56 -------------------- srcpkgs/xbps/patches/bb96486b127.patch | 33 ------------ srcpkgs/xbps/patches/d72091a20.patch | 18 ------- srcpkgs/xbps/patches/fix-missing-sh.patch | 30 ----------- srcpkgs/xbps/patches/series | 6 --- srcpkgs/xbps/template | 6 +-- 9 files changed, 3 insertions(+), 220 deletions(-) delete mode 100644 srcpkgs/xbps/patches/44692f28d8.patch delete mode 100644 srcpkgs/xbps/patches/56ae190.patch delete mode 100644 srcpkgs/xbps/patches/7b728f5ac.patch delete mode 100644 srcpkgs/xbps/patches/83aa486f6ba049399.patch delete mode 100644 srcpkgs/xbps/patches/bb96486b127.patch delete mode 100644 srcpkgs/xbps/patches/d72091a20.patch delete mode 100644 srcpkgs/xbps/patches/fix-missing-sh.patch delete mode 100644 srcpkgs/xbps/patches/series diff --git a/srcpkgs/xbps/patches/44692f28d8.patch b/srcpkgs/xbps/patches/44692f28d8.patch deleted file mode 100644 index fdfe56ec7d8..00000000000 --- a/srcpkgs/xbps/patches/44692f28d8.patch +++ /dev/null @@ -1,22 +0,0 @@ -commit 44692f28d859728fb919a5d736ada82606196f75 -Author: Johannes Brechtmann -Date: Wed Jun 26 22:51:41 2019 +0200 - - bin/xbps-install: update_pkg return EEXIST if package is up to date - - makes 58509996aabea52ffc40e5e01c9eb00730c6cdcc work for - xbps-install -u - -diff --git a/bin/xbps-install/transaction.c b/bin/xbps-install/transaction.c -index cdcc92d7..fc5538bb 100644 ---- bin/xbps-install/transaction.c -+++ bin/xbps-install/transaction.c -@@ -286,7 +286,7 @@ update_pkg(struct xbps_handle *xhp, const char *pkgname) - rv = xbps_transaction_update_pkg(xhp, pkgname); - if (rv == EEXIST) { - printf("Package '%s' is up to date.\n", pkgname); -- return 0; -+ return EEXIST; - } else if (rv == ENOENT) - fprintf(stderr, "Package '%s' not found in " - "repository pool.\n", pkgname); diff --git a/srcpkgs/xbps/patches/56ae190.patch b/srcpkgs/xbps/patches/56ae190.patch deleted file mode 100644 index 022c7166b04..00000000000 --- a/srcpkgs/xbps/patches/56ae190.patch +++ /dev/null @@ -1,30 +0,0 @@ -commit 56ae1907b9d588910a5e4712fdaa5784c1641f14 -Author: Duncan Overbruck -Date: Tue Aug 13 12:53:01 2019 +0200 - - lib/package_alternatives.c: check if alternative is a symlink before removing it - -diff --git lib/package_alternatives.c lib/package_alternatives.c -index 9b4d0027..5e4f2b36 100644 ---- lib/package_alternatives.c -+++ lib/package_alternatives.c -@@ -111,6 +111,7 @@ static int - remove_symlinks(struct xbps_handle *xhp, xbps_array_t a, const char *grname) - { - unsigned int i, cnt; -+ struct stat st; - - cnt = xbps_array_count(a); - for (i = 0; i < cnt; i++) { -@@ -132,6 +133,11 @@ remove_symlinks(struct xbps_handle *xhp, xbps_array_t a, const char *grname) - } else { - lnk = xbps_xasprintf("%s%s", xhp->rootdir, l); - } -+ if (lstat(lnk, &st) == -1 || !S_ISLNK(st.st_mode)) { -+ free(lnk); -+ free(l); -+ continue; -+ } - xbps_set_cb_state(xhp, XBPS_STATE_ALTGROUP_LINK_REMOVED, 0, NULL, - "Removing '%s' alternatives group symlink: %s", grname, l); - unlink(lnk); diff --git a/srcpkgs/xbps/patches/7b728f5ac.patch b/srcpkgs/xbps/patches/7b728f5ac.patch deleted file mode 100644 index 7310ddd609d..00000000000 --- a/srcpkgs/xbps/patches/7b728f5ac.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 7b728f5ac0adc28f3d7270c26e14ecff73a7f16f Mon Sep 17 00:00:00 2001 -From: Duncaen -Date: Wed, 26 Jun 2019 22:24:47 +0200 -Subject: [PATCH] bin/xbps-remove: fix skipping executing orphans transaction - ---- - bin/xbps-remove/main.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/bin/xbps-remove/main.c b/bin/xbps-remove/main.c -index 1ef328a8..4ff943c0 100644 ---- bin/xbps-remove/main.c -+++ bin/xbps-remove/main.c -@@ -295,7 +295,7 @@ main(int argc, char **argv) - exit(rv); - } - } -- if (missing == argc) { -+ if (!orphans && missing == argc) { - goto out; - } - if (orphans || (argc > optind)) { diff --git a/srcpkgs/xbps/patches/83aa486f6ba049399.patch b/srcpkgs/xbps/patches/83aa486f6ba049399.patch deleted file mode 100644 index 12c9575d8c2..00000000000 --- a/srcpkgs/xbps/patches/83aa486f6ba049399.patch +++ /dev/null @@ -1,56 +0,0 @@ -commit 83aa486f6ba049399e457c34be23a7a435f83ceb -Author: Juan RP -Date: Tue Jun 25 10:32:02 2019 +0200 - - xbps-remove: skip trans if all pkgs were not found. - - Restores behaviour with xbps<0.54. - -diff --git a/bin/xbps-remove/main.c b/bin/xbps-remove/main.c -index 61057029..1ef328a8 100644 ---- bin/xbps-remove/main.c -+++ bin/xbps-remove/main.c -@@ -145,7 +145,7 @@ remove_pkg(struct xbps_handle *xhp, const char *pkgname, bool recursive) - return rv; - } else if (rv == ENOENT) { - printf("Package `%s' is not currently installed.\n", pkgname); -- return 0; -+ return rv; - } else if (rv != 0) { - xbps_error_printf("Failed to queue `%s' for removing: %s\n", - pkgname, strerror(rv)); -@@ -180,7 +180,7 @@ main(int argc, char **argv) - const char *rootdir, *cachedir, *confdir; - int c, flags, rv; - bool yes, drun, recursive, clean_cache, orphans; -- int maxcols; -+ int maxcols, missing; - - rootdir = cachedir = confdir = NULL; - flags = rv = 0; -@@ -284,16 +284,24 @@ main(int argc, char **argv) - } - } - -+ missing = optind; - for (int i = optind; i < argc; i++) { - rv = remove_pkg(&xh, argv[i], recursive); -- if (rv != 0) { -+ if (rv == ENOENT) { -+ missing++; -+ continue; -+ } else if (rv != 0) { - xbps_end(&xh); - exit(rv); - } - } -+ if (missing == argc) { -+ goto out; -+ } - if (orphans || (argc > optind)) { - rv = exec_transaction(&xh, maxcols, yes, drun); - } -+out: - xbps_end(&xh); - exit(rv); - } diff --git a/srcpkgs/xbps/patches/bb96486b127.patch b/srcpkgs/xbps/patches/bb96486b127.patch deleted file mode 100644 index 34f1f5610a6..00000000000 --- a/srcpkgs/xbps/patches/bb96486b127.patch +++ /dev/null @@ -1,33 +0,0 @@ -commit bb96486b127054e7b0e02c467b0f61a20d227161 -Author: Juan RP -Date: Thu Jun 27 08:02:19 2019 +0200 - - xbps-install: make sure to call xbps_end() before exiting. - -diff --git a/bin/xbps-install/main.c b/bin/xbps-install/main.c -index 371f26c8..3622af5a 100644 ---- bin/xbps-install/main.c -+++ bin/xbps-install/main.c -@@ -263,7 +263,7 @@ main(int argc, char **argv) - } - } - if (eexist == argc) -- return 0; -+ goto out; - - rv = exec_transaction(&xh, maxcols, yes, drun); - } else if (!update) { -@@ -280,11 +280,12 @@ main(int argc, char **argv) - } - } - if (eexist == argc) -- return 0; -+ goto out; - - rv = exec_transaction(&xh, maxcols, yes, drun); - } - -+out: - xbps_end(&xh); - exit(rv); - } diff --git a/srcpkgs/xbps/patches/d72091a20.patch b/srcpkgs/xbps/patches/d72091a20.patch deleted file mode 100644 index 25234d95e1c..00000000000 --- a/srcpkgs/xbps/patches/d72091a20.patch +++ /dev/null @@ -1,18 +0,0 @@ -commit d72091a2060817ac10f55fbd8de4e0611d6d6940 -Author: Duncaen -Date: Wed Jun 26 13:07:16 2019 +0200 - - lib/transaction_files.c: fix returning error on hash mismatch - -diff --git lib/transaction_files.c lib/transaction_files.c -index 4dbf4584..9a6ca630 100644 ---- lib/transaction_files.c -+++ lib/transaction_files.c -@@ -331,6 +331,7 @@ collect_obsoletes(struct xbps_handle *xhp) - continue; - case ERANGE: - /* hash mismatch don't delete it */ -+ rv = 0; - continue; - default: - break; diff --git a/srcpkgs/xbps/patches/fix-missing-sh.patch b/srcpkgs/xbps/patches/fix-missing-sh.patch deleted file mode 100644 index a916452c286..00000000000 --- a/srcpkgs/xbps/patches/fix-missing-sh.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git lib/package_script.c lib/package_script.c -index a8c05dcf..919f821b 100644 ---- lib/package_script.c -+++ lib/package_script.c -@@ -40,9 +40,10 @@ xbps_pkg_exec_buffer(struct xbps_handle *xhp, - bool update) - { - ssize_t ret; -- const char *tmpdir, *version; -+ const char *tmpdir, *version, *shell; - char *pkgname, *fpath; - int fd, rv; -+ struct stat st; - - assert(blob); - assert(pkgver); -@@ -100,7 +101,12 @@ xbps_pkg_exec_buffer(struct xbps_handle *xhp, - version = xbps_pkg_version(pkgver); - assert(version); - -- rv = xbps_file_exec(xhp, "/bin/sh", fpath, action, pkgname, version, -+ // Fallback -+ shell = "/bin/sh"; -+ if (stat(shell, &st) < 0) { -+ shell = "/bin/dash"; -+ } -+ rv = xbps_file_exec(xhp, shell, fpath, action, pkgname, version, - update ? "yes" : "no", - "no", xhp->native_arch, NULL); - free(pkgname); diff --git a/srcpkgs/xbps/patches/series b/srcpkgs/xbps/patches/series deleted file mode 100644 index f47146b9d4b..00000000000 --- a/srcpkgs/xbps/patches/series +++ /dev/null @@ -1,6 +0,0 @@ -d72091a20.patch -83aa486f6ba049399.patch -7b728f5ac.patch -44692f28d8.patch -bb96486b127.patch -fix-missing-sh.patch diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template index 8f217f60afa..c56c6dfc3e4 100644 --- a/srcpkgs/xbps/template +++ b/srcpkgs/xbps/template @@ -1,7 +1,7 @@ # Template file for 'xbps' pkgname=xbps -version=0.56 -revision=7 +version=0.57.1 +revision=1 bootstrap=yes build_style=configure short_desc="XBPS package system utilities" @@ -10,7 +10,7 @@ license="BSD-2-Clause" homepage="https://github.com/void-linux/xbps" changelog="https://github.com/void-linux/xbps/blob/master/NEWS" distfiles="https://github.com/void-linux/xbps/archive/${version}.tar.gz" -checksum=e46521513b0c0ff486cc190089277381b18db45e770b04f799dc4eec99ffccd4 +checksum=bccad7c4187c467f322e6905fbe96839c00d2cbdda254c0c99b38eabeedb8678 hostmakedepends="pkg-config" checkdepends="kyua" From 3d70849779ad530f223f5869d07a86abdad2b22d Mon Sep 17 00:00:00 2001 From: q66 Date: Mon, 21 Oct 2019 19:47:59 +0200 Subject: [PATCH 043/186] xbps-static: update to 0.57.1 --- srcpkgs/xbps-static/template | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/srcpkgs/xbps-static/template b/srcpkgs/xbps-static/template index 4f8d4275601..eeaab894993 100644 --- a/srcpkgs/xbps-static/template +++ b/srcpkgs/xbps-static/template @@ -1,8 +1,8 @@ # Template file for 'xbps-static' # NOTE: keep this package synchronized with "srcpkgs/xbps" pkgname=xbps-static -version=0.56 -revision=5 +version=0.57.1 +revision=1 # only musl archs="*-musl" wrksrc="xbps-${version}" @@ -16,7 +16,11 @@ license="BSD-2-Clause" homepage="https://www.voidlinux.org/xbps" changelog="https://github.com/void-linux/xbps/blob/master/NEWS" distfiles="https://github.com/void-linux/xbps/archive/${version}.tar.gz" -checksum=e46521513b0c0ff486cc190089277381b18db45e770b04f799dc4eec99ffccd4 +checksum=bccad7c4187c467f322e6905fbe96839c00d2cbdda254c0c99b38eabeedb8678 + +# LTO objects break static builds, override +CFLAGS="-fno-lto" +LDFLAGS="-fno-lto" do_configure() { ./configure --prefix=/usr --sysconfdir=/etc --enable-static From bde83403751bf70aefb875aa3ae46a1f5906337b Mon Sep 17 00:00:00 2001 From: "Hans-J. Schmid" Date: Mon, 28 Oct 2019 21:25:22 +0100 Subject: [PATCH 044/186] New package: rabbitmq-c-0.9.0 --- common/shlibs | 1 + srcpkgs/rabbitmq-c-devel | 1 + srcpkgs/rabbitmq-c/template | 28 ++++++++++++++++++++++++++++ 3 files changed, 30 insertions(+) create mode 120000 srcpkgs/rabbitmq-c-devel create mode 100644 srcpkgs/rabbitmq-c/template diff --git a/common/shlibs b/common/shlibs index 935bc6c9bbd..a79ef996138 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3519,3 +3519,4 @@ libluv.so.1 libluv-1.30.1.0_1 libarmadillo.so.9 armadillo-9.700.2_1 libvarnishapi.so.2 libvarnishapi-6.3.0_1 libicns.so.1 libicns-0.8.1_1 +librabbitmq.so.4 rabbitmq-c-0.9.0_1 diff --git a/srcpkgs/rabbitmq-c-devel b/srcpkgs/rabbitmq-c-devel new file mode 120000 index 00000000000..5039cc59dce --- /dev/null +++ b/srcpkgs/rabbitmq-c-devel @@ -0,0 +1 @@ +rabbitmq-c \ No newline at end of file diff --git a/srcpkgs/rabbitmq-c/template b/srcpkgs/rabbitmq-c/template new file mode 100644 index 00000000000..2319570d516 --- /dev/null +++ b/srcpkgs/rabbitmq-c/template @@ -0,0 +1,28 @@ +# Template file for 'rabbitmq-c' +pkgname=rabbitmq-c +version=0.9.0 +revision=1 +build_style=cmake +hostmakedepends="popt xmlto doxygen" +makedepends="libressl-devel" +short_desc="RabbitMQ C client" +maintainer="Hans-J. Schmid " +license="MIT" +homepage="https://github.com/alanxz/rabbitmq-c" +distfiles="https://github.com/alanxz/${pkgname}/archive/v${version}.tar.gz" +checksum=316c0d156452b488124806911a62e0c2aa8a546d38fc8324719cd29aaa493024 + +post_install() { + vlicense LICENSE-MIT +} + +rabbitmq-c-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/lib/*.a + vmove usr/lib/*.so + } +} From da2da7b8e2616f5d03cc901f4c13eaeb37753211 Mon Sep 17 00:00:00 2001 From: q66 Date: Mon, 28 Oct 2019 22:07:30 +0100 Subject: [PATCH 045/186] gdb: drop unnecessary musl/ppc patches --- srcpkgs/gdb/patches/ppc-musl.patch | 93 ---------------------------- srcpkgs/gdb/patches/ppc-ptregs.patch | 10 --- 2 files changed, 103 deletions(-) delete mode 100644 srcpkgs/gdb/patches/ppc-musl.patch delete mode 100644 srcpkgs/gdb/patches/ppc-ptregs.patch diff --git a/srcpkgs/gdb/patches/ppc-musl.patch b/srcpkgs/gdb/patches/ppc-musl.patch deleted file mode 100644 index 70cfa18e479..00000000000 --- a/srcpkgs/gdb/patches/ppc-musl.patch +++ /dev/null @@ -1,93 +0,0 @@ ---- a/gdb/nat/ppc-linux.h -+++ b/gdb/nat/ppc-linux.h -@@ -18,7 +18,90 @@ - #ifndef PPC_LINUX_H - #define PPC_LINUX_H 1 - -+#if defined(__GLIBC__) || defined(__UCLIBC__) - #include -+#else // Musl -+// Do not include ptrace.h from Linux headers and since -+// Musl does not define PT_*, define them: -+ -+#define PT_R0 0 -+#define PT_R1 1 -+#define PT_R2 2 -+#define PT_R3 3 -+#define PT_R4 4 -+#define PT_R5 5 -+#define PT_R6 6 -+#define PT_R7 7 -+#define PT_R8 8 -+#define PT_R9 9 -+#define PT_R10 10 -+#define PT_R11 11 -+#define PT_R12 12 -+#define PT_R13 13 -+#define PT_R14 14 -+#define PT_R15 15 -+#define PT_R16 16 -+#define PT_R17 17 -+#define PT_R18 18 -+#define PT_R19 19 -+#define PT_R20 20 -+#define PT_R21 21 -+#define PT_R22 22 -+#define PT_R23 23 -+#define PT_R24 24 -+#define PT_R25 25 -+#define PT_R26 26 -+#define PT_R27 27 -+#define PT_R28 28 -+#define PT_R29 29 -+#define PT_R30 30 -+#define PT_R31 31 -+ -+#define PT_NIP 32 -+#define PT_MSR 33 -+#define PT_ORIG_R3 34 -+#define PT_CTR 35 -+#define PT_LNK 36 -+#define PT_XER 37 -+#define PT_CCR 38 -+#ifndef __powerpc64__ -+#define PT_MQ 39 -+#else -+#define PT_SOFTE 39 -+#endif -+#define PT_TRAP 40 -+#define PT_DAR 41 -+#define PT_DSISR 42 -+#define PT_RESULT 43 -+#define PT_DSCR 44 -+#define PT_REGS_COUNT 44 -+ -+#define PT_FPR0 48 /* each FP reg occupies 2 slots in this space */ -+ -+#ifndef __powerpc64__ -+ -+#define PT_FPR31 (PT_FPR0 + 2*31) -+#define PT_FPSCR (PT_FPR0 + 2*32 + 1) -+ -+#else /* __powerpc64__ */ -+ -+#define PT_FPSCR (PT_FPR0 + 32) /* each FP reg occupies 1 slot in 64-bit space */ -+ -+ -+#define PT_VR0 82 /* each Vector reg occupies 2 slots in 64-bit */ -+#define PT_VSCR (PT_VR0 + 32*2 + 1) -+#define PT_VRSAVE (PT_VR0 + 33*2) -+ -+ -+/* -+ * Only store first 32 VSRs here. The second 32 VSRs in VR0-31 -+ */ -+#define PT_VSR0 150 /* each VSR reg occupies 2 slots in 64-bit */ -+#define PT_VSR31 (PT_VSR0 + 2*31) -+#endif /* __powerpc64__ */ -+ -+#endif // Libc -+ - #include - - /* This sometimes isn't defined. */ diff --git a/srcpkgs/gdb/patches/ppc-ptregs.patch b/srcpkgs/gdb/patches/ppc-ptregs.patch deleted file mode 100644 index 743bd2e6d26..00000000000 --- a/srcpkgs/gdb/patches/ppc-ptregs.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/gdb/gdbserver/linux-ppc-low.c -+++ b/gdb/gdbserver/linux-ppc-low.c -@@ -21,7 +21,6 @@ - #include "linux-low.h" - - #include --#include - - #include "nat/ppc-linux.h" - #include "linux-ppc-tdesc.h" From db4e762ad68c79b2a6fe44ce1ab9e3ea6ba71f1c Mon Sep 17 00:00:00 2001 From: q66 Date: Mon, 28 Oct 2019 22:08:01 +0100 Subject: [PATCH 046/186] strace: drop unnecessary musl/ppc patch --- srcpkgs/strace/patches/ppc-musl.patch | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 srcpkgs/strace/patches/ppc-musl.patch diff --git a/srcpkgs/strace/patches/ppc-musl.patch b/srcpkgs/strace/patches/ppc-musl.patch deleted file mode 100644 index 511153f9293..00000000000 --- a/srcpkgs/strace/patches/ppc-musl.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- regs.h -+++ regs.h -@@ -8,7 +8,13 @@ - #ifndef STRACE_REGS_H - # define STRACE_REGS_H - -+#if !defined(__GLIBC__) && defined(__powerpc__) -+# define pt_regs musl_pt_regs - # include -+# undef pt_regs -+#else -+# include -+#endif - # include "arch_regs.h" - - #endif /* !STRACE_REGS_H */ From e780f3851b639d646fcb4dbec9d17623632695cc Mon Sep 17 00:00:00 2001 From: q66 Date: Mon, 28 Oct 2019 22:12:02 +0100 Subject: [PATCH 047/186] psmisc: drop unnecessary musl/ppc patch --- srcpkgs/psmisc/patches/ppc-musl.patch | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 srcpkgs/psmisc/patches/ppc-musl.patch diff --git a/srcpkgs/psmisc/patches/ppc-musl.patch b/srcpkgs/psmisc/patches/ppc-musl.patch deleted file mode 100644 index bd573f06c1d..00000000000 --- a/srcpkgs/psmisc/patches/ppc-musl.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- src/peekfd.c 2018-08-13 13:24:56.871341954 +0200 -+++ src/peekfd.c 2019-01-12 21:44:15.913496261 +0100 -@@ -30,7 +30,9 @@ - #include - #include - #include -+#if !defined(PPC) || defined(__GLIBC__) - #include -+#endif - #include - #include - #include From 73b8640067e699b2dc5bd08ef82a96ceb0d49c7a Mon Sep 17 00:00:00 2001 From: q66 Date: Mon, 28 Oct 2019 22:17:34 +0100 Subject: [PATCH 048/186] libunwind: drop unnecessary parts of the musl/ppc64 patch --- srcpkgs/libunwind/patches/ppc64-musl.patch | 103 --------------------- 1 file changed, 103 deletions(-) diff --git a/srcpkgs/libunwind/patches/ppc64-musl.patch b/srcpkgs/libunwind/patches/ppc64-musl.patch index d16cb737a83..1ff08338d33 100644 --- a/srcpkgs/libunwind/patches/ppc64-musl.patch +++ b/srcpkgs/libunwind/patches/ppc64-musl.patch @@ -1,106 +1,3 @@ ---- src/ppc64/Ginit.c -+++ src/ppc64/Ginit.c -@@ -51,7 +51,7 @@ uc_addr (ucontext_t *uc, int reg) - addr = &uc->uc_mcontext.gp_regs[reg - UNW_PPC64_R0]; - - else if ((unsigned) (reg - UNW_PPC64_F0) < 32) -- addr = &uc->uc_mcontext.fp_regs[reg - UNW_PPC64_F0]; -+ addr = &(((double *)&uc->uc_mcontext.fp_regs)[reg - UNW_PPC64_F0]); - - else if ((unsigned) (reg - UNW_PPC64_V0) < 32) - addr = (uc->uc_mcontext.v_regs == 0) ? NULL : &uc->uc_mcontext.v_regs->vrregs[reg - UNW_PPC64_V0][0]; ---- src/ppc64/ucontext_i.h -+++ src/ppc64/ucontext_i.h -@@ -99,39 +99,39 @@ static vrregset_t dmy_vrregset; - #define UC_MCONTEXT_GREGS_DSISR ((void *)&dmy_ctxt.uc_mcontext.gp_regs[DSISR_IDX] - (void *)&dmy_ctxt) - #define UC_MCONTEXT_GREGS_RESULT ((void *)&dmy_ctxt.uc_mcontext.gp_regs[RESULT_IDX] - (void *)&dmy_ctxt) - --#define UC_MCONTEXT_FREGS_R0 ((void *)&dmy_ctxt.uc_mcontext.fp_regs[0] - (void *)&dmy_ctxt) --#define UC_MCONTEXT_FREGS_R1 ((void *)&dmy_ctxt.uc_mcontext.fp_regs[1] - (void *)&dmy_ctxt) --#define UC_MCONTEXT_FREGS_R2 ((void *)&dmy_ctxt.uc_mcontext.fp_regs[2] - (void *)&dmy_ctxt) --#define UC_MCONTEXT_FREGS_R3 ((void *)&dmy_ctxt.uc_mcontext.fp_regs[3] - (void *)&dmy_ctxt) --#define UC_MCONTEXT_FREGS_R4 ((void *)&dmy_ctxt.uc_mcontext.fp_regs[4] - (void *)&dmy_ctxt) --#define UC_MCONTEXT_FREGS_R5 ((void *)&dmy_ctxt.uc_mcontext.fp_regs[5] - (void *)&dmy_ctxt) --#define UC_MCONTEXT_FREGS_R6 ((void *)&dmy_ctxt.uc_mcontext.fp_regs[6] - (void *)&dmy_ctxt) --#define UC_MCONTEXT_FREGS_R7 ((void *)&dmy_ctxt.uc_mcontext.fp_regs[7] - (void *)&dmy_ctxt) --#define UC_MCONTEXT_FREGS_R8 ((void *)&dmy_ctxt.uc_mcontext.fp_regs[8] - (void *)&dmy_ctxt) --#define UC_MCONTEXT_FREGS_R9 ((void *)&dmy_ctxt.uc_mcontext.fp_regs[9] - (void *)&dmy_ctxt) --#define UC_MCONTEXT_FREGS_R10 ((void *)&dmy_ctxt.uc_mcontext.fp_regs[10] - (void *)&dmy_ctxt) --#define UC_MCONTEXT_FREGS_R11 ((void *)&dmy_ctxt.uc_mcontext.fp_regs[11] - (void *)&dmy_ctxt) --#define UC_MCONTEXT_FREGS_R12 ((void *)&dmy_ctxt.uc_mcontext.fp_regs[12] - (void *)&dmy_ctxt) --#define UC_MCONTEXT_FREGS_R13 ((void *)&dmy_ctxt.uc_mcontext.fp_regs[13] - (void *)&dmy_ctxt) --#define UC_MCONTEXT_FREGS_R14 ((void *)&dmy_ctxt.uc_mcontext.fp_regs[14] - (void *)&dmy_ctxt) --#define UC_MCONTEXT_FREGS_R15 ((void *)&dmy_ctxt.uc_mcontext.fp_regs[15] - (void *)&dmy_ctxt) --#define UC_MCONTEXT_FREGS_R16 ((void *)&dmy_ctxt.uc_mcontext.fp_regs[16] - (void *)&dmy_ctxt) --#define UC_MCONTEXT_FREGS_R17 ((void *)&dmy_ctxt.uc_mcontext.fp_regs[17] - (void *)&dmy_ctxt) --#define UC_MCONTEXT_FREGS_R18 ((void *)&dmy_ctxt.uc_mcontext.fp_regs[18] - (void *)&dmy_ctxt) --#define UC_MCONTEXT_FREGS_R19 ((void *)&dmy_ctxt.uc_mcontext.fp_regs[19] - (void *)&dmy_ctxt) --#define UC_MCONTEXT_FREGS_R20 ((void *)&dmy_ctxt.uc_mcontext.fp_regs[20] - (void *)&dmy_ctxt) --#define UC_MCONTEXT_FREGS_R21 ((void *)&dmy_ctxt.uc_mcontext.fp_regs[21] - (void *)&dmy_ctxt) --#define UC_MCONTEXT_FREGS_R22 ((void *)&dmy_ctxt.uc_mcontext.fp_regs[22] - (void *)&dmy_ctxt) --#define UC_MCONTEXT_FREGS_R23 ((void *)&dmy_ctxt.uc_mcontext.fp_regs[23] - (void *)&dmy_ctxt) --#define UC_MCONTEXT_FREGS_R24 ((void *)&dmy_ctxt.uc_mcontext.fp_regs[24] - (void *)&dmy_ctxt) --#define UC_MCONTEXT_FREGS_R25 ((void *)&dmy_ctxt.uc_mcontext.fp_regs[25] - (void *)&dmy_ctxt) --#define UC_MCONTEXT_FREGS_R26 ((void *)&dmy_ctxt.uc_mcontext.fp_regs[26] - (void *)&dmy_ctxt) --#define UC_MCONTEXT_FREGS_R27 ((void *)&dmy_ctxt.uc_mcontext.fp_regs[27] - (void *)&dmy_ctxt) --#define UC_MCONTEXT_FREGS_R28 ((void *)&dmy_ctxt.uc_mcontext.fp_regs[28] - (void *)&dmy_ctxt) --#define UC_MCONTEXT_FREGS_R29 ((void *)&dmy_ctxt.uc_mcontext.fp_regs[29] - (void *)&dmy_ctxt) --#define UC_MCONTEXT_FREGS_R30 ((void *)&dmy_ctxt.uc_mcontext.fp_regs[30] - (void *)&dmy_ctxt) --#define UC_MCONTEXT_FREGS_R31 ((void *)&dmy_ctxt.uc_mcontext.fp_regs[31] - (void *)&dmy_ctxt) --#define UC_MCONTEXT_FREGS_FPSCR ((void *)&dmy_ctxt.uc_mcontext.fp_regs[32] - (void *)&dmy_ctxt) -+#define UC_MCONTEXT_FREGS_R0 ((void *)&(((double *)&dmy_ctxt.uc_mcontext.fp_regs)[0]) - (void *)&dmy_ctxt) -+#define UC_MCONTEXT_FREGS_R1 ((void *)&(((double *)&dmy_ctxt.uc_mcontext.fp_regs)[1]) - (void *)&dmy_ctxt) -+#define UC_MCONTEXT_FREGS_R2 ((void *)&(((double *)&dmy_ctxt.uc_mcontext.fp_regs)[2]) - (void *)&dmy_ctxt) -+#define UC_MCONTEXT_FREGS_R3 ((void *)&(((double *)&dmy_ctxt.uc_mcontext.fp_regs)[3]) - (void *)&dmy_ctxt) -+#define UC_MCONTEXT_FREGS_R4 ((void *)&(((double *)&dmy_ctxt.uc_mcontext.fp_regs)[4]) - (void *)&dmy_ctxt) -+#define UC_MCONTEXT_FREGS_R5 ((void *)&(((double *)&dmy_ctxt.uc_mcontext.fp_regs)[5]) - (void *)&dmy_ctxt) -+#define UC_MCONTEXT_FREGS_R6 ((void *)&(((double *)&dmy_ctxt.uc_mcontext.fp_regs)[6]) - (void *)&dmy_ctxt) -+#define UC_MCONTEXT_FREGS_R7 ((void *)&(((double *)&dmy_ctxt.uc_mcontext.fp_regs)[7]) - (void *)&dmy_ctxt) -+#define UC_MCONTEXT_FREGS_R8 ((void *)&(((double *)&dmy_ctxt.uc_mcontext.fp_regs)[8]) - (void *)&dmy_ctxt) -+#define UC_MCONTEXT_FREGS_R9 ((void *)&(((double *)&dmy_ctxt.uc_mcontext.fp_regs)[9]) - (void *)&dmy_ctxt) -+#define UC_MCONTEXT_FREGS_R10 ((void *)&(((double *)&dmy_ctxt.uc_mcontext.fp_regs)[10]) - (void *)&dmy_ctxt) -+#define UC_MCONTEXT_FREGS_R11 ((void *)&(((double *)&dmy_ctxt.uc_mcontext.fp_regs)[11]) - (void *)&dmy_ctxt) -+#define UC_MCONTEXT_FREGS_R12 ((void *)&(((double *)&dmy_ctxt.uc_mcontext.fp_regs)[12]) - (void *)&dmy_ctxt) -+#define UC_MCONTEXT_FREGS_R13 ((void *)&(((double *)&dmy_ctxt.uc_mcontext.fp_regs)[13]) - (void *)&dmy_ctxt) -+#define UC_MCONTEXT_FREGS_R14 ((void *)&(((double *)&dmy_ctxt.uc_mcontext.fp_regs)[14]) - (void *)&dmy_ctxt) -+#define UC_MCONTEXT_FREGS_R15 ((void *)&(((double *)&dmy_ctxt.uc_mcontext.fp_regs)[15]) - (void *)&dmy_ctxt) -+#define UC_MCONTEXT_FREGS_R16 ((void *)&(((double *)&dmy_ctxt.uc_mcontext.fp_regs)[16]) - (void *)&dmy_ctxt) -+#define UC_MCONTEXT_FREGS_R17 ((void *)&(((double *)&dmy_ctxt.uc_mcontext.fp_regs)[17]) - (void *)&dmy_ctxt) -+#define UC_MCONTEXT_FREGS_R18 ((void *)&(((double *)&dmy_ctxt.uc_mcontext.fp_regs)[18]) - (void *)&dmy_ctxt) -+#define UC_MCONTEXT_FREGS_R19 ((void *)&(((double *)&dmy_ctxt.uc_mcontext.fp_regs)[19]) - (void *)&dmy_ctxt) -+#define UC_MCONTEXT_FREGS_R20 ((void *)&(((double *)&dmy_ctxt.uc_mcontext.fp_regs)[20]) - (void *)&dmy_ctxt) -+#define UC_MCONTEXT_FREGS_R21 ((void *)&(((double *)&dmy_ctxt.uc_mcontext.fp_regs)[21]) - (void *)&dmy_ctxt) -+#define UC_MCONTEXT_FREGS_R22 ((void *)&(((double *)&dmy_ctxt.uc_mcontext.fp_regs)[22]) - (void *)&dmy_ctxt) -+#define UC_MCONTEXT_FREGS_R23 ((void *)&(((double *)&dmy_ctxt.uc_mcontext.fp_regs)[23]) - (void *)&dmy_ctxt) -+#define UC_MCONTEXT_FREGS_R24 ((void *)&(((double *)&dmy_ctxt.uc_mcontext.fp_regs)[24]) - (void *)&dmy_ctxt) -+#define UC_MCONTEXT_FREGS_R25 ((void *)&(((double *)&dmy_ctxt.uc_mcontext.fp_regs)[25]) - (void *)&dmy_ctxt) -+#define UC_MCONTEXT_FREGS_R26 ((void *)&(((double *)&dmy_ctxt.uc_mcontext.fp_regs)[26]) - (void *)&dmy_ctxt) -+#define UC_MCONTEXT_FREGS_R27 ((void *)&(((double *)&dmy_ctxt.uc_mcontext.fp_regs)[27]) - (void *)&dmy_ctxt) -+#define UC_MCONTEXT_FREGS_R28 ((void *)&(((double *)&dmy_ctxt.uc_mcontext.fp_regs)[28]) - (void *)&dmy_ctxt) -+#define UC_MCONTEXT_FREGS_R29 ((void *)&(((double *)&dmy_ctxt.uc_mcontext.fp_regs)[29]) - (void *)&dmy_ctxt) -+#define UC_MCONTEXT_FREGS_R30 ((void *)&(((double *)&dmy_ctxt.uc_mcontext.fp_regs)[30]) - (void *)&dmy_ctxt) -+#define UC_MCONTEXT_FREGS_R31 ((void *)&(((double *)&dmy_ctxt.uc_mcontext.fp_regs)[31]) - (void *)&dmy_ctxt) -+#define UC_MCONTEXT_FREGS_FPSCR ((void *)&(((double *)&dmy_ctxt.uc_mcontext.fp_regs)[32]) - (void *)&dmy_ctxt) - - #define UC_MCONTEXT_V_REGS ((void *)&dmy_ctxt.uc_mcontext.v_regs - (void *)&dmy_ctxt) - ---- src/ptrace/_UPT_internal.h -+++ src/ptrace/_UPT_internal.h -@@ -37,7 +37,14 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - #include - #endif - #ifdef HAVE_SYS_PROCFS_H -+#if !defined(__GLIBC__) && defined(__powerpc__) -+/* nasty hack to prevent conflict with asm/ptrace.h */ -+#define pt_regs musl_pt_regs - #include -+#undef pt_regs -+#else -+#include -+#endif - #endif - - #include --- src/ptrace/_UPT_reg_offset.c +++ src/ptrace/_UPT_reg_offset.c @@ -32,6 +32,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ From 09e46d82a9d1781e1af9dc2d71b863fb5ec10f9e Mon Sep 17 00:00:00 2001 From: q66 Date: Mon, 28 Oct 2019 22:51:40 +0100 Subject: [PATCH 049/186] ocaml: drop unnecessary musl/ppc patch [ci skip] --- srcpkgs/ocaml/patches/musl-ppc.patch | 11 +++++++++++ .../ocaml-4.08.0-ppc-sigcontext-musl.patch | 19 ------------------- 2 files changed, 11 insertions(+), 19 deletions(-) create mode 100644 srcpkgs/ocaml/patches/musl-ppc.patch delete mode 100644 srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-sigcontext-musl.patch diff --git a/srcpkgs/ocaml/patches/musl-ppc.patch b/srcpkgs/ocaml/patches/musl-ppc.patch new file mode 100644 index 00000000000..bc2c10fd43a --- /dev/null +++ b/srcpkgs/ocaml/patches/musl-ppc.patch @@ -0,0 +1,11 @@ +--- a/runtime/signals_osdep.h ++++ b/runtime/signals_osdep.h +@@ -309,6 +309,8 @@ + + #elif defined(TARGET_power) && defined(SYS_elf) + ++ #include ++ + #define DECLARE_SIGNAL_HANDLER(name) \ + static void name(int sig, struct sigcontext * context) + diff --git a/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-sigcontext-musl.patch b/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-sigcontext-musl.patch deleted file mode 100644 index a40bc5fd64d..00000000000 --- a/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-sigcontext-musl.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- ocaml-4.04.2/runtime/signals_osdep.h -+++ ocaml-4.04.2/runtime/signals_osdep.h -@@ -297,11 +297,11 @@ - sigact.sa_flags = 0 - - typedef unsigned long context_reg; -- #define CONTEXT_PC (context->regs->nip) -- #define CONTEXT_EXCEPTION_POINTER (context->regs->gpr[29]) -- #define CONTEXT_YOUNG_LIMIT (context->regs->gpr[30]) -- #define CONTEXT_YOUNG_PTR (context->regs->gpr[31]) -- #define CONTEXT_SP (context->regs->gpr[1]) -+ #define CONTEXT_PC (context->gp_regs[32]) -+ #define CONTEXT_EXCEPTION_POINTER (context->gp_regs[29]) -+ #define CONTEXT_YOUNG_LIMIT (context->gp_regs[30]) -+ #define CONTEXT_YOUNG_PTR (context->gp_regs[31]) -+ #define CONTEXT_SP (context->gp_regs[1]) - - /****************** PowerPC, NetBSD */ - From 83a1254d0d383265368e94d624136b3e473f8ea6 Mon Sep 17 00:00:00 2001 From: Renato Aguiar Date: Mon, 28 Oct 2019 13:27:41 -0700 Subject: [PATCH 050/186] rtl8812au-dkms: update to 20190903 --- srcpkgs/rtl8812au-dkms/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/rtl8812au-dkms/template b/srcpkgs/rtl8812au-dkms/template index 4f4b712f888..7809687ec41 100644 --- a/srcpkgs/rtl8812au-dkms/template +++ b/srcpkgs/rtl8812au-dkms/template @@ -1,17 +1,17 @@ # Template file for 'rtl8812au-dkms' pkgname=rtl8812au-dkms -version=20190731 +version=20190903 revision=1 -_gitrev=6faa3eaf8916667cb7f4ab59923b3608e6ab7b18 +_gitrev=30d47a0a3f43ccb19e8fd59fe93d74a955147bf2 archs=noarch wrksrc="rtl8812au-${_gitrev}" depends="dkms" short_desc="Realtek 8812AU/8821AU USB WiFi driver (DKMS)" -maintainer="Orphaned " +maintainer="Renato Aguiar " license="GPL-2.0-only" homepage="http://www.dlink.com" distfiles="https://github.com/gordboy/rtl8812au/archive/${_gitrev}.tar.gz" -checksum=dfe05443cd0c52f86a4457efcefcbf9789d4131eb2957907e85d49ee250d211d +checksum=8893cb02683d253efe6be5a2d1f9ccea778f03b1606043381eaa649e26e8b657 dkms_modules="rtl8812au 5.2.20" do_install() { From 3e51e09985b15e216e1ca451d207b861cffd7554 Mon Sep 17 00:00:00 2001 From: Doan Tran Cong Danh Date: Mon, 28 Oct 2019 12:28:31 +0700 Subject: [PATCH 051/186] firefox: fix build for armv7hf-musl [skip ci] --- .../firefox/patches/musl-rust.configure.patch | 26 +++++++++++++++++++ srcpkgs/firefox/template | 1 - 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/firefox/patches/musl-rust.configure.patch diff --git a/srcpkgs/firefox/patches/musl-rust.configure.patch b/srcpkgs/firefox/patches/musl-rust.configure.patch new file mode 100644 index 00000000000..d8f387136e0 --- /dev/null +++ b/srcpkgs/firefox/patches/musl-rust.configure.patch @@ -0,0 +1,26 @@ +--- build/moz.configure/rust.configure 2019-10-28 12:05:04.930404603 +0700 ++++ build/moz.configure/rust.configure 2019-10-28 12:09:42.742338957 +0700 +@@ -297,11 +297,20 @@ + suffix = 'hf' + else: + suffix = '' ++ ++ narrowed = [] + for p in prefixes: + for c in candidates: +- if c.rust_target.startswith('{}-'.format(p)) and \ +- c.rust_target.endswith(suffix): +- return c.rust_target ++ if c.rust_target.startswith('{}-'.format(p)): ++ narrowed.append(c.rust_target) ++ ++ for target in narrowed: ++ if target.endswith(host_or_target.raw_os): ++ return target ++ ++ for target in narrowed: ++ if target.endswith(suffix): ++ return target + + # See if we can narrow down on the exact alias + narrowed = [c for c in candidates if c.target.alias == host_or_target.alias] diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template index 4b6112bb392..fecce28d997 100644 --- a/srcpkgs/firefox/template +++ b/srcpkgs/firefox/template @@ -32,7 +32,6 @@ build_options="alsa dbus pulseaudio startup_notification xscreensaver sndio wayl build_options_default="alsa dbus pulseaudio startup_notification xscreensaver sndio wayland" case $XBPS_TARGET_MACHINE in - armv7l-musl) broken="https://build.voidlinux.org/builders/armv7l-musl_builder/builds/21533/steps/shell_3/logs/stdio" ;; armv6*) broken="required NEON extensions are not supported on armv6" ;; From 3502bc69af61121e5f5606ce5d7291da826e7c80 Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Mon, 28 Oct 2019 22:25:25 -0500 Subject: [PATCH 052/186] ImageMagick6: update to 6.9.10-69 Includes fixes for CVE-2019-17540 URL:https://security-tracker.debian.org/tracker/CVE-2019-17540 --- srcpkgs/ImageMagick6/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ImageMagick6/template b/srcpkgs/ImageMagick6/template index 75d65b49fb1..5233b3540e6 100644 --- a/srcpkgs/ImageMagick6/template +++ b/srcpkgs/ImageMagick6/template @@ -1,7 +1,7 @@ # Template file for 'ImageMagick6' pkgname=ImageMagick6 _majorver=6.9.10 -_patchver=68 +_patchver=69 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=2caa3d8d1f65e733de30d1f537e57991ff3adb3edb5b60afa9cd0f6e0a20945f +checksum=d5625ed92e593d8dc02cdbe87a8a83a0a5accf4c3f6aad9379c130c27582887b keep_libtool_archives=yes conf_files="/etc/ImageMagick-${_majorver%%.*}/*.xml" From c756d43016f0ef77ba91dc8ea50c772b18ae70be Mon Sep 17 00:00:00 2001 From: Doan Tran Cong Danh Date: Tue, 22 Oct 2019 08:21:59 +0700 Subject: [PATCH 053/186] firefox-esr: update to 68.2.0. --- srcpkgs/firefox-esr/template | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template index c7a4de0221c..76145fa8a86 100644 --- a/srcpkgs/firefox-esr/template +++ b/srcpkgs/firefox-esr/template @@ -3,8 +3,8 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-esr-i18n". # pkgname=firefox-esr -version=68.1.0 -revision=3 +version=68.2.0 +revision=1 wrksrc="firefox-${version}" build_helper="rust" short_desc="Mozilla Firefox web browser - Extended Support Release (ESR)" @@ -12,7 +12,7 @@ maintainer="Eivind Uggedal " license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://www.mozilla.org/firefox/organizations/" distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz" -checksum=f56f5fa5a4744be0b9acf259cb991254d708a50b9a0a12d1d846ffa5a6c409ac +checksum=85f1c2eaf68ebedcbc0b78a342f6d16ef0865dedd426a1bba94b75c85f716f38 lib32disabled=yes hostmakedepends="autoconf213 unzip zip pkg-config perl python yasm @@ -110,10 +110,6 @@ do_build() { mkdir -p third_party/rust/libloading/.deps case "$XBPS_TARGET_MACHINE" in - i686*) - export CFLAGS+=" -D_FILE_OFFSET_BITS=64" - export CXXFLAGS+=" -D_FILE_OFFSET_BITS=64" - ;; armv7*) export CFLAGS+=" -mfpu=neon -Wno-psabi" export CXXFLAGS+=" -mfpu=neon -Wno-psabi" From ba5f75a527303e5b90f069ed35884c13d85e5807 Mon Sep 17 00:00:00 2001 From: Doan Tran Cong Danh Date: Mon, 28 Oct 2019 18:27:23 +0700 Subject: [PATCH 054/186] firefox-esr-i18n: update to 68.2.0. [skip ci] --- srcpkgs/firefox-esr-i18n/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/firefox-esr-i18n/template b/srcpkgs/firefox-esr-i18n/template index b4e17fb16f0..ba52f6c73a6 100644 --- a/srcpkgs/firefox-esr-i18n/template +++ b/srcpkgs/firefox-esr-i18n/template @@ -1,6 +1,6 @@ # Template file for 'firefox-esr-i18n' pkgname=firefox-esr-i18n -version=68.1.0 +version=68.2.0 revision=1 build_style=meta homepage="https://www.mozilla.org/firefox/" From a0b8134ce042403b62b40a98484c21c69c6415be Mon Sep 17 00:00:00 2001 From: Johannes Date: Tue, 29 Oct 2019 06:55:41 +0100 Subject: [PATCH 055/186] firefox-esr: drop rust-cssparser.patch --- .../firefox-esr/patches/rust-cssparser.patch | 90 ------------------- 1 file changed, 90 deletions(-) delete mode 100644 srcpkgs/firefox-esr/patches/rust-cssparser.patch diff --git a/srcpkgs/firefox-esr/patches/rust-cssparser.patch b/srcpkgs/firefox-esr/patches/rust-cssparser.patch deleted file mode 100644 index 1ebef87c014..00000000000 --- a/srcpkgs/firefox-esr/patches/rust-cssparser.patch +++ /dev/null @@ -1,90 +0,0 @@ -backport of: - -From 3c98d22c5de3b696bf1fde2b6c90069812312aa6 Mon Sep 17 00:00:00 2001 -From: Simon Sapin -Date: Tue, 23 Apr 2019 13:47:25 +0200 -Subject: [PATCH] Fix a future-compat warning - -``` -warning[E0506]: cannot assign to `self.input.cached_token` because it is borrowed - --> src/parser.rs:591:17 - | -566 | pub fn next_including_whitespace_and_comments(&mut self) -> Result<&Token<'i>, BasicParseError<'i>> { - | - let's call the lifetime of this reference `'1` -... -579 | Some(ref cached_token) - | ---------------- borrow of `self.input.cached_token` occurs here -... -591 | self.input.cached_token = Some(CachedToken { - | ^^^^^^^^^^^^^^^^^^^^^^^ assignment to borrowed `self.input.cached_token` occurs here -... -603 | Ok(token) - | --------- returning this value requires that `self.input.cached_token.0` is borrowed for `'1` - | - = warning: this error has been downgraded to a warning for backwards compatibility with previous releases - = warning: this represents potential undefined behavior in your code and this warning will become a hard error in the future -``` ---- - src/parser.rs | 50 +++++++++++++++++++++++++++----------------------- - 1 file changed, 27 insertions(+), 23 deletions(-) - -diff --git a/src/parser.rs b/src/parser.rs -index 51f441e4..7cef117c 100644 ---- third_party/rust/cssparser/src/parser.rs -+++ third_party/rust/cssparser/src/parser.rs -@@ -555,28 +555,34 @@ - } - - let token_start_position = self.input.tokenizer.position(); -- let token; -- match self.input.cached_token { -- Some(ref cached_token) -- if cached_token.start_position == token_start_position => { -- self.input.tokenizer.reset(&cached_token.end_state); -- match cached_token.token { -- Token::Function(ref name) => self.input.tokenizer.see_function(name), -- _ => {} -- } -- token = &cached_token.token -+ let using_cached_token = self -+ .input -+ .cached_token -+ .as_ref() -+ .map_or(false, |cached_token| { -+ cached_token.start_position == token_start_position -+ }); -+ let token = if using_cached_token { -+ let cached_token = self.input.cached_token.as_ref().unwrap(); -+ self.input.tokenizer.reset(&cached_token.end_state); -+ match cached_token.token { -+ Token::Function(ref name) => self.input.tokenizer.see_function(name), -+ _ => {} - } -- _ => { -- let new_token = self.input.tokenizer.next() -- .map_err(|()| self.new_basic_error(BasicParseErrorKind::EndOfInput))?; -- self.input.cached_token = Some(CachedToken { -- token: new_token, -- start_position: token_start_position, -- end_state: self.input.tokenizer.state(), -- }); -- token = self.input.cached_token_ref() -- } -- } -+ &cached_token.token -+ } else { -+ let new_token = self -+ .input -+ .tokenizer -+ .next() -+ .map_err(|()| self.new_basic_error(BasicParseErrorKind::EndOfInput))?; -+ self.input.cached_token = Some(CachedToken { -+ token: new_token, -+ start_position: token_start_position, -+ end_state: self.input.tokenizer.state(), -+ }); -+ self.input.cached_token_ref() -+ }; - - if let Some(block_type) = BlockType::opening(token) { - self.at_start_of = Some(block_type); From 07aefb66b02a107e6b1909c62b94ccb06e58c125 Mon Sep 17 00:00:00 2001 From: yopito Date: Thu, 29 Aug 2019 23:45:55 +0200 Subject: [PATCH 056/186] New package: nextcloud-client 2.6.0 --- srcpkgs/nextcloud-client-devel | 1 + srcpkgs/nextcloud-client-dolphin | 1 + srcpkgs/nextcloud-client/INSTALL.msg | 2 + .../patches/libressl-no-rsa_oaep_md.patch | 23 ++++++++ srcpkgs/nextcloud-client/template | 54 +++++++++++++++++++ 5 files changed, 81 insertions(+) create mode 120000 srcpkgs/nextcloud-client-devel create mode 120000 srcpkgs/nextcloud-client-dolphin create mode 100644 srcpkgs/nextcloud-client/INSTALL.msg create mode 100644 srcpkgs/nextcloud-client/patches/libressl-no-rsa_oaep_md.patch create mode 100644 srcpkgs/nextcloud-client/template diff --git a/srcpkgs/nextcloud-client-devel b/srcpkgs/nextcloud-client-devel new file mode 120000 index 00000000000..50c67ada861 --- /dev/null +++ b/srcpkgs/nextcloud-client-devel @@ -0,0 +1 @@ +nextcloud-client \ No newline at end of file diff --git a/srcpkgs/nextcloud-client-dolphin b/srcpkgs/nextcloud-client-dolphin new file mode 120000 index 00000000000..50c67ada861 --- /dev/null +++ b/srcpkgs/nextcloud-client-dolphin @@ -0,0 +1 @@ +nextcloud-client \ No newline at end of file diff --git a/srcpkgs/nextcloud-client/INSTALL.msg b/srcpkgs/nextcloud-client/INSTALL.msg new file mode 100644 index 00000000000..b3e877dc379 --- /dev/null +++ b/srcpkgs/nextcloud-client/INSTALL.msg @@ -0,0 +1,2 @@ +NextCloud client end-to-end encryption (e2e) is currently unavailable +(LibreSSL 2.9.2 does not provide EVP_PKEY_CTX_set_rsa_oaep_md primitive) diff --git a/srcpkgs/nextcloud-client/patches/libressl-no-rsa_oaep_md.patch b/srcpkgs/nextcloud-client/patches/libressl-no-rsa_oaep_md.patch new file mode 100644 index 00000000000..47c54fff778 --- /dev/null +++ b/srcpkgs/nextcloud-client/patches/libressl-no-rsa_oaep_md.patch @@ -0,0 +1,23 @@ +source: https://github.com/nextcloud/desktop/issues/738 + +--- src/libsync/clientsideencryption.cpp.ORIG 2019-07-25 12:20:49.000000000 +0200 ++++ src/libsync/clientsideencryption.cpp 2019-07-28 12:56:18.813514323 +0200 +@@ -35,6 +35,18 @@ + + #include "wordlist.h" + ++/* libessl 2.92 does not provide EVP_PKEY_CTX_set_rsa_oaep_md ++ * So with LibreSSL EVP_PKEY_CTX_ctrl() should explicitly return an error ++ * "operation not supported" when you try to use e2e ++ */ ++#ifndef EVP_PKEY_CTX_set_rsa_oaep_md ++#define EVP_PKEY_CTRL_RSA_OAEP_MD (EVP_PKEY_ALG_CTRL + 9) ++#define EVP_PKEY_CTRL_GET_RSA_OAEP_MD (EVP_PKEY_ALG_CTRL + 11) ++#define EVP_PKEY_CTX_set_rsa_oaep_md(ctx, md) \ ++ EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, EVP_PKEY_OP_TYPE_CRYPT, \ ++ EVP_PKEY_CTRL_RSA_OAEP_MD, 0, (void *)(md)) ++#endif ++ + QDebug operator<<(QDebug out, const std::string& str) + { + out << QString::fromStdString(str); diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template new file mode 100644 index 00000000000..46d0af2b204 --- /dev/null +++ b/srcpkgs/nextcloud-client/template @@ -0,0 +1,54 @@ +# Template file for 'nextcloud-client' +pkgname=nextcloud-client +version=2.6.0 +revision=1 +wrksrc="desktop-${version}" +build_style=cmake +configure_args="-Wno-dev" +hostmakedepends="pkg-config" +makedepends="qt5-tools-devel qt5-webengine-devel qt5-declarative-devel + qt5-webchannel-devel qt5-location-devel qtkeychain-qt5-devel sqlite-devel + qt5-webkit-devel libcloudproviders-devel $(vopt_if dolphin 'extra-cmake-modules kio-devel')" +conf_files="/etc/Nextcloud/sync-exclude.lst" +short_desc="NextCloud Desktop client" +maintainer="yopito " +license="GPL-2.0-or-later" +homepage="https://nextcloud.com/clients/" +distfiles="https://github.com/nextcloud/desktop/archive/v${version}.tar.gz" +checksum=7b3f3c14d2e44826a5183fd59a7412c6dd5ed00296873e35c566f75c14c3a3ea + +build_options="dolphin" +desc_option_dolphin="Build KDE dolphin support" +build_options_default="dolphin" + +case "$XBPS_TARGET_MACHINE" in + armv6*|armv7*) broken="qt5-tools-devel unavailable" ;; +esac + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools" + # provides desktoptojson + hostmakedepends+=" $(vopt_if dolphin 'kcoreaddons')" +fi + +if [ $build_option_dolphin ]; then +nextcloud-client-dolphin_package() { + short_desc+=" - KDE dolphin integration" + depends="nextcloud-client>=${version}_${revision}" + pkg_install() { + vmove usr/lib/libnextclouddolphinpluginhelper.so + vmove usr/lib/qt5 + vmove usr/share/kservices5 + } +} +fi + +nextcloud-client-devel_package() { + depends="nextcloud-client>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/libnextcloudsync.so + vmove "usr/lib/nextcloud/*.so" + } +} From da66a493aca69eb4a9d628298de3fbea398739ed Mon Sep 17 00:00:00 2001 From: yopito Date: Mon, 28 Oct 2019 20:42:15 +0100 Subject: [PATCH 057/186] nextcloud-client: declare optional subpkg via subpackages --- srcpkgs/nextcloud-client/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template index 46d0af2b204..8270966808f 100644 --- a/srcpkgs/nextcloud-client/template +++ b/srcpkgs/nextcloud-client/template @@ -22,7 +22,7 @@ desc_option_dolphin="Build KDE dolphin support" build_options_default="dolphin" case "$XBPS_TARGET_MACHINE" in - armv6*|armv7*) broken="qt5-tools-devel unavailable" ;; + arm*) broken="qt5-webengine-devel unavailable" ;; esac if [ "$CROSS_BUILD" ]; then @@ -30,8 +30,8 @@ if [ "$CROSS_BUILD" ]; then # provides desktoptojson hostmakedepends+=" $(vopt_if dolphin 'kcoreaddons')" fi +subpackages="$(vopt_if dolphin 'nextcloud-client-dolphin') nextcloud-client-devel" -if [ $build_option_dolphin ]; then nextcloud-client-dolphin_package() { short_desc+=" - KDE dolphin integration" depends="nextcloud-client>=${version}_${revision}" @@ -41,7 +41,6 @@ nextcloud-client-dolphin_package() { vmove usr/share/kservices5 } } -fi nextcloud-client-devel_package() { depends="nextcloud-client>=${version}_${revision}" From a2483dc387150d217d99b7dd25c1ea5b3a885dc5 Mon Sep 17 00:00:00 2001 From: mobinmob Date: Thu, 24 Oct 2019 22:06:10 +0300 Subject: [PATCH 058/186] owncloudclient: update to 2.5.4.11654. --- srcpkgs/owncloudclient/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/owncloudclient/template b/srcpkgs/owncloudclient/template index 793e77f0406..406b515b45c 100644 --- a/srcpkgs/owncloudclient/template +++ b/srcpkgs/owncloudclient/template @@ -1,6 +1,6 @@ # Template file for 'owncloudclient' pkgname=owncloudclient -version=2.4.3 +version=2.5.4.11654 revision=1 build_style=cmake configure_args="-Wno-dev -DNO_SHIBBOLETH=TRUE" @@ -15,7 +15,7 @@ maintainer="Samuel Chodur " license="GPL-2.0-or-later" homepage="https://www.owncloud.org" distfiles="https://download.owncloud.com/desktop/stable/${pkgname}-${version}.tar.xz" -checksum=f3b3ff13d06a8a38a40398630d670775eafbfa9fee4fa5b39ea480bac3ebe6bf +checksum=615439c6a224e263cee0d554b8b5f98b57c331dbc18df7ae5d99197480cf563f if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-tools-devel" From 065d2a3fe72cf92725a80cea65bb70c797c75013 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Tue, 29 Oct 2019 09:22:44 +0100 Subject: [PATCH 059/186] firefox-esr-i18n: fix checksums --- srcpkgs/firefox-esr-i18n/template | 186 +++++++++++++++--------------- 1 file changed, 93 insertions(+), 93 deletions(-) diff --git a/srcpkgs/firefox-esr-i18n/template b/srcpkgs/firefox-esr-i18n/template index ba52f6c73a6..392764089c2 100644 --- a/srcpkgs/firefox-esr-i18n/template +++ b/srcpkgs/firefox-esr-i18n/template @@ -135,96 +135,96 @@ _pkgtmpl() { } } -checksum="c3fafda87192d9b98dc9b2b99d62b7109dbd72f73e8d5de1ea2a418ed086317b - 93af0702aae30332eecdc0f407dc29080923660508018fca14fe1307fdf375a1 - a40baf64e7376e4916fa96d7199bad099edc7e897d65b5ecc4a2dc9fdbba2e75 - 1e915f6a0860f2f7f583a70a5668ec5033969fbba177c3d3da4e244d01ba5cb4 - d6c45490cec27609f43fb9af406ba15e25fff544f10d038e650a5b25d2ba5a69 - 2b5d84d3f7800d162b095d0ee77da8264af9eac3a98dfff7e14b26510c92be1e - f317a73af579bbb42bc6635900e5b529f5198daaf54c5a7f51756b7707747444 - 6e65702a500ef4d2841eacbd9e16ca692d25a9aa3fcf38be2603657bfb03a80d - 7b056d739b64407e92a6738c8e3a5f6fe070380196c057d3f832be4015e7957c - 6bdd5ab6efd06bd384e227d78de6cffeac4c828ce6254d152e0137c70eb7b2e9 - b60364c109f3fe94387bfb27258c65c09b7761248e309adb8f92eda0c6c1dddb - 3b91a27432306a6152f6cee7b19d684476c4282743259eb0e5f90db6483216e6 - a17149908edf9a173b9d7ca3eac644cf45cd0e35ba40c565903ea9af9580e41e - b404f670ce1f3cc7fbdb170e9f0286e0a7608d779c5dae83ce5adee911876e6d - b41236a8ce2e96edf02165bd1ad91de967d8605ed7a9c77f079027ea0b13a7cf - 1f444a10561108bdfb98d43531c33d377a2565763d1299c96ef3c1f746b10555 - f15e57588ccdf2a6be3b51fba066dc030e2808071b29957c3da844b272d1dd25 - d51b8bdbc415fcdf5df587e364b8a3edb6296a988c38dbfb0fbec40b5dec856e - bcfbd612f55efff2dc98cdf9ff6ddf3d8e91274ead7d8d8bf1023cb28b815623 - f711d9206635ac98b3eec788791089d1a64316dc55ad4be2f6043acca79317b8 - a48efe9f0a885060fe2844ae056fb9de8932e45cfda399959ff8a4f54c99dc3f - c919c3557a66188ea7ab58210f6fe629f5e111bd73c0f94f298e4635c21b5f05 - edf74a83a03f85dfb2172053cf1816736fdfb4c42fbacdf4626b128186fb15db - 76bc68c806add52aa205f9f6a55dd6c141ecfaa29ce5b63fe06cb8bf1ce0c567 - af3763e63550893a001a651c5d89e4bb529004de98d58f2dc2a49336239171bf - 979725bd9b1b8aade54e0e24efdc2c716381130559615f45c007f0d68a0b0b69 - db96fd8658bc75f4813ddaf457c888e3f0656dc407b12d7799dbdebb7cc1a9ae - ba5e81b435217c15e2d55a42d34e3313e9ad1302b34599a25b48a23846dfc920 - fd3988b0ddcfa721fd702c126dd531f5b77f1f5af8ac61e8b23307c5b84e8e72 - a58a245d30efb8ad6553166dd2469da504d6cf3c773e52da15c3677899f37c4e - 3fd377be34a8786a726a13c88d28b2b73155b1f527b2909e6841474631ce8226 - 790af48c82bf520bcd8f915af77d1e0c8f156ae6c028b1fa0f39c3c991865d1c - 46b8071a1e23d8c5af1ced98cfbdb1a2258f679425434e092fbe1c42dfa26066 - a4eefa1ff84e33059d055c984dbb47283d117cb63ad9e39d7cc4c4e61ea9c11a - 5a91be294ac35aac472c4ba8324221551abb2e8cb66f995806606c191dca0428 - 9a4a582673dc466a684fd2beacbe77a152047e6023b1e247f5eda7b513e5e30d - 039af250c8b2dc6254b2f24975704095406c70090de9d21ecc73975d8d874675 - 3c77fd2a4cfc49ff94994b46a9b80ea24e534299838dd64a11a5dc2ef110f901 - feaeb14a016d732b3ec0be6266bd078fdf220c48c38683a4dd7315e076839b82 - a4756471f45168ff28fdc0e87c65b33288ca1f7fd2eedb7e31a726ee4766fb3c - 4eb62cbed52d1cdad08551a38d1f7656c71ef986df49eee0381e9aec7b11c0ba - 8e967ef8ff1f1a2fc21ea537d629d40a38d6b8789ce344e79d7a3b3b78138968 - e008e241c41900d6df1128d5dd55d41e1ed43d7c60d48329a321716968397b09 - 7011776c661b07bc3fd7d24b62765aeee10ba2a72ea4112862989f759aceb466 - 760c44d1512be5f10264d195785e45d47c46595ef57c24de81c070a81ba65456 - 531ec7550a9ab4e2410e9c69495852eaa0e7df43e022ed7ec0f0c50e148a4506 - c46413f7aa225147712fb634483f64c9368f43d03ba6f66405e4c9dc281421b4 - 42debde9c9341fc910ff382e94fade233b3ad23e4f474d89426648c659a99a12 - 50f1088649f77e0f83dffe3e81dd8ac993d1d8f06d8f231acdf98a69cda9147a - 2a4f6162bfbf5ea44c832c0d5896079b0ce69e590dc377e3bbd37a92f9780e6c - 60aa95eb50d59ddb2bf57d5cfacf860d4cc2c8b86a219f35ceaa30d82fd6e593 - 73a416254d022b051bb38ebf085772c031ecba18ab4896634ba8599fcb396f7b - ae3aa802087754458465af30a4ddafc8baa08e101a4e177b144b4f606a78b941 - 30c7498935e0d4529ccbe3a5c7671aec9505d0132cd6123f97c0680c80cbb917 - 99b76ac0f7cf4c5d5ae8b66ae3e54e3932c6a6f101aba8b156cf8d78a67e3f0b - 1bcb69081c99b27781c81becce86baaf2f1da54ceba009904ad2a5a8614eaa68 - bb3152472d5582b365722a83972b416d78b8bddfc6dbea40d1c778c37eb86623 - 426115a07ce25b7d2ae89024bf81e8b5957df9d8709bd6e5c1da704633af3c85 - 24918b9cd56f5fe12c7e02b0cedcdaf2abeeb7ec3cdb75a4aee3ca2d4aaaa961 - 8497c47c4f151966538836b0dfa312a044d8496ffc4647fcf62c8ed19b2337d9 - e160dd5b88f37562d7cbace3f46b8fd8edc5b9211f4240d8e38aec3dd81d915d - 298ab33911b8c425e6032eba867bc31925ea24b2457298bbf965bd6b194edc3f - 4c53367e4ddcff92733a95139baf9610390bf3eaf78ef5a5d10b4530c359e8eb - f340c62b77eaaa6bde0e61944c508b32785619ad4ca54b7dfbf281fcb986eac0 - 99201be46e35f22312a27da2a2afc54f46043342a1c577fa64696ef365198329 - 41e4d2d255435d2b50a8e0c4c59b13a0a0aafae925cd32e20bf9005cd066d11e - 266141c6c9a6729da904dfa040ae20d80a6b5c39efc31fcf2d039ed65e9c2b28 - 33daee0ac659ec7d1fb1cb101798dae2ed0077653fc9170bcbb5bc554ee3e433 - 23b74270aef1c6a4bff5194103a430e6854fe4c460e5c684769bd7c59d1afa0d - 9405687dbb0a81e8be8f842824f2fe65830b70a0dd0dcde84cc8a21d6637f841 - 40a608e720136044f4b95728474fcb82764e61d649551be438e330b63753635f - 0ef710447a36e81a6c86b17ee28d2cf463242834936af2578074df6e11c2baea - 3f0d0d33abda068465d7747149cdf11a4b1dc819f7da7f1f7a3d9c2a45307231 - 9d2c3438776531077e379e97a449e714882896c53dbb87052de7e7ac77ea3d67 - de9b4ec945265f5539025fb73b713322924da2d1a51b5bd6ad1baba4584c76e1 - 7b66c7d5e1b9eb6959295a76416271220e84ecc43a97a5f5f07ec99986579cb1 - 4404f5fe56868f5c551208d72630b91a88c68f78d7463e8e1d221fd7406c0783 - 3f55ec2730a870951759961c83d6654c7122a3114e136a6e2bce7c05d6062d89 - 873819bc254911aa3a443d0a9db306b472f7f31af8d986d54c535bce67a4b1c0 - 07326e95015601946706f50333c32b0919025376abcdf88dc225dae2c167b19a - bfdd58d9f0f0e809e6b801f65c722c61b4dbb5e6635cecd7390d1403f1dd6f42 - 8c2d716291a28cc64f93078d2bdf8d756a6521e3b0107815788c48452eac95f0 - 9b07735b4d8e8359e38d671ed054b373c4ed50a232013807d09ca4fae31e8223 - 5592ee66611515f8583a48211d70764fdb28c54b1ad4de5b4b87a9d3b101a182 - d36e2c9a894beb94b62855bd07d4b54e41fc96c0736b5e2e702422e75b3cf21e - caf7dd282fb6dc065eb6a0c124cd458716d877a500c094ff650c4d40302dd49e - 80bd3c70433f6b3aacdbd370b70d4fe0eab13547d1f6368b80eb5c28a759141a - 67b359947cbe15b2be1ad2567d74a36cfe5f27665a058b0fab19ed37ddd63a30 - b3347d5cec7f9f6e3aa4b5ccdd49350fd0879c20938bfc22664782c377dd73a6 - 79b512427977c359ec8f93e4880cd5397ccddb013676d2d39837f06433fe4041 - 883d5daa5b041778b0984a7e86ecfc4892af1aed1ec09285ac031e335075524c - bc1981c7cb2e6d5aecec7fb0f370c1da52895f00d238c1afa2b4e31b93580eb6 - 6278e5c054f50d3de62de9d070d21d2842d4d0ff9212d852af8eb672fad7ecea" +checksum="1b2b833b8122d6f1cd6361ee22a06b576db06e984fc8860acf158240451869b2 + a5b0960eb0f03da27da2ac9546d46a124bb5c04b85aedd845c41dbe792a29b54 + ab9ae7cc3267c479e80523ff098bfe04b6545b4562d15828b25dade69531906a + 2819be31c0aa016fda3283e47ba3888160a8624ae98bba1918fc4677dfc0aafd + 7eb6f1899079872fd0137dbcad3db167bb559e8e537cc33a1c9b7b1db4de5b9e + 066e0fb03339768980d9410866f4b6a55658076bef14a8c583e619735fe969b4 + 9623abd417b94066f4983963b642d6acac915b7e0e95a912791116430c35dea8 + d0a81bc8b466cfa57a2c9e06af69db6961d5e14ba8a8f0420c2a2a164075f31a + 1088aabb5cdbf6f332eb1d381add64dd1600c16822a760f3f49effcd0931feb4 + a3ed954d5af9d1755b7fb5b4fd08384cdf53c34b7a79f9ec9999a7c26f83bd67 + f0bff1fcf96944aad0d7cb6f2fd199f87febc8d7d2e50c169ecefad9f5cbfd56 + 82f8e2d2113cabd28d08b129b80269f8aba4abf7352176c6d4c6001ce7b8836a + a006100a5092325c0c3e18b34dc786b6a07c007b8ccc569c9540a173b263be52 + 426e6f04e4d3b3a79451301947c744835c8b2ad350ce8a06403ec4ddcb04e9a9 + 0eb188aca78b03c8e88635bb8955a9e90214e9ec9dede861795a527c33142a5f + c60a7f51b331cc743504159677ad665ef38098082f763c0394e73c0c7bf3f685 + dde7a7faafd6e902f34ffbf5bd1f639da2b5f69c451edd48b708617b70c2f2eb + 3c1ec5c168364bbf1e69c227cf7e15f7a0c96fcfd10924c7017329ba1d3bffe1 + 8dd2a8e17eefbdab6f77a439e2225b5716e6aeda60cb3a91013547d11a85e310 + 5489d84e7e09d5d461ef3db98294dbbf8c62f7fd5f875709efdd9c83bfece928 + 10da2d6eb600b86cf5e994e983c3545ccf9ded04ea8a6f6b24195ee6fe79e4b5 + 5c5a71116913e67b3707c59706e3c12e7a0c7be7ec3b78cce13d9e24abb0f038 + a6489331e5caff34c748a783455058776db94a239d7f6583c8686639762fa251 + 58993cc094340092f578d8cc376f875112fdaf01615f3938db8ad953d891b9ad + 014b303877699aa2c39effbf4ee04134e8001d166f8988c6d58d6c18edb8532a + f311b908e63b8f1e6d852ef29399883191a37b44fe51ca31a487184a97a9dddc + d6684a228c150b19f6765519b3e0caac94497adab919bb1dd516fed4aabae484 + d3deb2c12d0466af161d509d1d2b38f7e85b49f8a520d5df0280cb29fac03049 + f92d1bdf3e25caf91962f0c2002c4cbc46263046657aadeb80fc0160aa6a5df9 + 5c7a146b9feed15e4dabe9e93b840e244ef4867b4a1e90759ba90f8c48f9d77e + 9a6b7fcc3d735bff9fb0038ce10e3e477c631e72b49f050144b24fd4fccad965 + c6b58061ee0153c86cbc4778debcf715e69625011179306f8c2f93316aa4ea53 + 39b179cf01417978366173855f35c4fc4b83715edf043879e00ecbf96af27b0c + ad538b32574e10e485d8f24c68e14ed44c7c5db3e6ae2e19b1b5a091b62a2352 + d5f79b94e0f8386c475d62acdc979b2ca047c343508deabe3754ee1cf61a37ec + 0f15c349c55e6ac3973347e75529960503707479ce65125553d1608d1f0024a2 + 1d4da7a0e374b7679080d6f6590046da63e9582a82e7e74f430b19885f0a5cb1 + 8ca510271a8aeb789f8f91cb9c56f68d2e7784eaae9c5caeecce25529b5dd280 + 060cd79b4e4594a8a24309cea93706f64fa6758f550f7c55f16f340f1d648a99 + 9bf0aa22418c9bf7453f389240b28bc4b6507432a120067423d8a8ed60cbe6fc + b3f7eccd4f37d2d5a65308630b33fba68ec899499031a33e17e5bd25294b1a5d + 1ac6ff156d13e45f9569f8b98dfc4cbbfcb673d2ef509ec60a32972c0613ed8a + cb8a62443db986a21594aa7324e8ba6933f88023f7e8edac3a70ca61be9ad076 + 14cf4ac5edc33809a6a540ad54ea14021c95b673c80bfcc456f68c0b8953455a + 809f67282bd2edf3443572fbbc9c6bd7d0bf6bf011bf1f733a9d7203bae6d3f4 + 8db74a213fe1df6dad87298cfb004a02591830dbd3e4a2d86e0647d6809dcadb + af16ece04e0eb4b2979f51745ded99dda8cc0afb4143e078b3303dedba3deb1d + 0217ea37975248465fd6987705363c570b54b123ca3293d39f23d4fac53bdf8e + 9776c33b255707132bea73e17805b571e8942c9034cc154ebe438b234d45753a + 83e6f4d6bc460bd6a07b645634cdf962a8cd3f479740e48318cc5376d580eb50 + 57cd93d9e7122e13904bb9fd1b62860fa849000dbb1651d1e0f1463542a563c6 + 4502720ed8f5f6aae568d5a6f1911942eb89f6018328464b00b67b75a54fcabb + 3755f9201d40014579e2b9583542ded8621f22111829c5aafa3465b2a861979f + f39d60727a1bf082d6d1f9b6a3ca1b9457091c26253e0ded4bb3b6c2ed207700 + 2feaa565808ad1eb10748cd6d7fb86432721c3aafaeca990bd9217911821590c + 3202de6efc73b18e38500edfba4085e6c8d87ede91c5d7e517865a35e583c75f + 323d2982e88537da5d9ce53366eeaac7d0744cc3d9926266ebcba8fcab9042ef + 87d36187e038efeb25c5fc5f4865432d92d947c394dc9915d063253c68e0c593 + 06fa877cda032ef6433a90bb98d989804056495edc816c846bd5eb4f0e2558c1 + 8fc68f6014151d7fbe2b183ece81357bd0db950169727cacea39b6a54ec2317b + dcb81d5b70c5371a3e05e2595120745aa188877c521c5ebf9825d189c99178bc + cc730257f0c9715be76129153d873fe98ca6cbc1c4905ad974f0a3ecee8712ef + fe0f100525319d0e43655090f2f7f1561ca0b9899d7e903f75f80d3e37775ea1 + e9067f4da7a54866744065cf4efa72f6b81c79496efcce875017231969b4f8b0 + 2b2429a4c5245d0aea3e317a83e3b6d82e24e4b8db2238626503c0abda5aa0da + 1fd9d4983b9e87d164f94708c6c73485806132d52eabab8d9620f24e31ff262e + b5ffa8391594c832eb4cf665b85f580362f805796e9af5b9f5d5342b12b272c7 + e2defd45ceca49d1ff3062e095dc60cee1441a25bac08945b4e6f233dfa0f471 + 6f25fe33fe46a546cfd67c979ef781cd662c84096612190e5705c111d72d6b31 + 20639ee2ee0a1f8188e12307520a5514d9fac70e65bab5d8624254c5ce7e4a32 + 30e7eca6c31114e934919e1eeabce3447fa778fbde35fb58e6c09b9771a2c717 + bee3bf0d01abbaa3ca8cbae7bde8822e7f73394e573992822b43986876646b0e + 93dec63997d31b27271678f1a1765437a69f85695b66d9ee2f6177c89c24a040 + 332b33195a2c37e0d428c424ebc3d16c23e82f03178d923053ba12215775f4f7 + b5b026ed94f0a19db16ecb56308b3d210c3dbbcf1838abdbb459b39bfe40cf00 + 3a9f8a6d9af871a1cabf271b4a88adbcb7005b586ab4a0d28d3fb782d879e054 + 0dd31f2593198a3b2112473e3fc12bd5e1f2b493fbb43d31d27b21a25e085689 + de6a88dd30b445faa88b4bc10d1732eefc4c30ce939fad09382a3e55c1b26f3b + 0d320f2ef36f4655c08b954ce0a8101697fa1354aa4d42931fb8bb20f5522fe9 + 4911500ee8c522988483f97d2a76272b39038699b709d8c7ecaa615df5c02b2b + 20bf12f4d46721110c45db2b03b3949abfe8989da5652c77a6371dd0958c2fef + 2b3a45daaab640affb6da37e7cced3a5bcd3bff51c6b182658f0d4b0efa77aaf + 0aa0917e1755194b3040ae156083a4e38f4b5593717577a87b49bfe35d70b10a + babc10519fd8adc0a6153a1a957af61369f0dab8af2a42a0e897a42f7785581e + 3d947f24177dcf0f45f7ead13c1bc5017f98e83a64486e7bde8d13ba7a8c12ae + 17c5ca51fd380736587fdabd0b016ce1c4198d56ff8f8063fcd37d3021fa9a6c + 981503ec5b272d4f5e1cf25bdc25f429ff2788ff5929afa230c26ddc9dd3171d + a8ec77edfb37507e933e0ab94a684817666ff03e3de7242420495d40cf1340e1 + bd110c4d71626846d9b909560fec23fe25934cd01e5392d297e50cd26d60cd87 + 8d35104cfb4f86ae89ae5048509a0a6a1cfebf3ec8a40a8ddce0de91f3b13eef + 78cfc87da632600a1c4aa22b2a43b2dfd193d2f45f7cdfb874e8b6caa2a6929a + d94c7d96d1c8ec7e2842578f4703ded6b75be53e6934086e6a5b289e4d7aa476 + 9d4185117872a09d989d01dccdd81f3266e0eed3458480f78d810f2d1f20f990" From 3e77613657e2f21718f82d66be249382d5cff626 Mon Sep 17 00:00:00 2001 From: Peter Bui Date: Mon, 28 Oct 2019 23:27:32 -0400 Subject: [PATCH 060/186] dhcpcd: revert to 8.0.6 due to high CPU usage issue This reverts commit ba04e4d1dd1e7d004ba377d2318cbe8e233839e4. --- srcpkgs/dhcpcd/patches/musl-if_ether.patch | 14 -------------- srcpkgs/dhcpcd/template | 7 ++++--- 2 files changed, 4 insertions(+), 17 deletions(-) delete mode 100644 srcpkgs/dhcpcd/patches/musl-if_ether.patch diff --git a/srcpkgs/dhcpcd/patches/musl-if_ether.patch b/srcpkgs/dhcpcd/patches/musl-if_ether.patch deleted file mode 100644 index e8d3682cd7b..00000000000 --- a/srcpkgs/dhcpcd/patches/musl-if_ether.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- src/if-linux.c 2019-10-19 09:28:16.742626805 -0400 -+++ src/if-linux.c 2019-10-19 09:27:47.962304568 -0400 -@@ -46,7 +46,11 @@ - - #include - #include -+#if defined(__GLIBC__) - #include -+#else -+#include -+#endif - #include - #include - #include diff --git a/srcpkgs/dhcpcd/template b/srcpkgs/dhcpcd/template index bd4ae8bf0f8..e76c7a649fd 100644 --- a/srcpkgs/dhcpcd/template +++ b/srcpkgs/dhcpcd/template @@ -1,7 +1,8 @@ # Template file for 'dhcpcd' pkgname=dhcpcd -version=8.1.1 -revision=1 +reverts="8.1.1_1" +version=8.0.6 +revision=2 build_style=configure make_check_target=test configure_args="--prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --rundir=/run" @@ -12,7 +13,7 @@ maintainer="Enno Boland " license="BSD-2-Clause" homepage="https://roy.marples.name/projects/dhcpcd" distfiles="https://roy.marples.name/downloads/dhcpcd/dhcpcd-${version}.tar.xz" -checksum=485d308fe10febd36b6f936e4260e4ab34a146e4f00a9f7a5509c4377ad5ea82 +checksum=66b50199ed83bf502af3fab9ac001b417f0fac7e69c92d97a9c41499cebabd4f lib32disabled=yes conf_files=/etc/dhcpcd.conf From 42eb88738217ba9950575c28eae3c7e5322d31db Mon Sep 17 00:00:00 2001 From: Duncaen Date: Tue, 29 Oct 2019 13:16:35 +0100 Subject: [PATCH 061/186] xbps: add patch to revert strict revision stuff --- srcpkgs/xbps/patches/reverts-strict-rev.patch | 144 ++++++++++++++++++ srcpkgs/xbps/template | 2 +- 2 files changed, 145 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/xbps/patches/reverts-strict-rev.patch diff --git a/srcpkgs/xbps/patches/reverts-strict-rev.patch b/srcpkgs/xbps/patches/reverts-strict-rev.patch new file mode 100644 index 00000000000..541de940604 --- /dev/null +++ b/srcpkgs/xbps/patches/reverts-strict-rev.patch @@ -0,0 +1,144 @@ +commit 87ff41f401cb8b159859b65a04b398ac58a55e2d +Author: Duncan Overbruck +Date: Tue Oct 29 13:13:21 2019 +0100 + + Revert "lib/util.c: verify revision in xbps_pkg_{version,revision,name}" + + This reverts commit 699b2bdd3b98b086ac989af3cf034135a7a6f570. + +diff --git lib/util.c lib/util.c +index 6228d8fc..ee690304 100644 +--- lib/util.c ++++ lib/util.c +@@ -50,16 +50,6 @@ + #pragma clang diagnostic ignored "-Wformat-nonliteral" + #endif + +-static bool is_numeric(const char *str) { +- if (str == NULL || str[0] == '\0'){ +- return false; +- } +- while (isdigit(str[0])) { +- ++str; +- } +- return str[0] == '\0'; +-} +- + /** + * @file lib/util.c + * @brief Utility routines +@@ -127,22 +117,16 @@ xbps_pkg_is_ignored(struct xbps_handle *xhp, const char *pkg) + const char * + xbps_pkg_version(const char *pkg) + { +- const char *p, *r; +- size_t p_len; ++ const char *p; + + if ((p = strrchr(pkg, '-')) == NULL) + return NULL; + +- ++p; /* skip first '-' */ +- p_len = strlen(p); +- for (unsigned int i = 0; i < p_len; i++) { ++ for (unsigned int i = 0; i < strlen(p); i++) { + if (p[i] == '_') + break; +- if (isdigit((unsigned char)p[i]) && (r = strchr(p + i + 1, '_'))) { +- if (!is_numeric(r + 1)) { +- break; +- } +- return p; ++ if (isdigit((unsigned char)p[i]) && strchr(p, '_')) { ++ return p + 1; /* skip first '-' */ + } + } + return NULL; +@@ -224,47 +208,36 @@ xbps_binpkg_arch(const char *pkg) + const char * + xbps_pkg_revision(const char *pkg) + { +- const char *p, *r; +- size_t p_len; ++ const char *p; + +- if ((p = strrchr(pkg, '-')) == NULL) ++ assert(pkg != NULL); ++ ++ /* Get the required revision */ ++ if ((p = strrchr(pkg, '_')) == NULL) + return NULL; + +- ++p; /* skip first '-' */ +- p_len = strlen(p); +- for (unsigned int i = 0; i < p_len; i++) { +- if (p[i] == '_') +- break; +- if (isdigit((unsigned char)p[i]) && (r = strchr(p + i + 1, '_'))) { +- ++r; /* skip first '_' */ +- if (!is_numeric(r)) { +- break; +- } +- return r; +- } +- } +- return NULL; ++ if (!isdigit((unsigned char)p[1])) ++ return NULL; ++ ++ return p + 1; /* skip first '_' */ + } + + char * + xbps_pkg_name(const char *pkg) + { +- const char *p, *r; ++ const char *p; + char *buf; + unsigned int len; +- size_t p_len; + bool valid = false; + + if ((p = strrchr(pkg, '-')) == NULL) + return NULL; + +- p_len = strlen(p); +- /* i = 1 skips first '-' */ +- for (unsigned int i = 1; i < p_len; i++) { ++ for (unsigned int i = 0; i < strlen(p); i++) { + if (p[i] == '_') + break; +- if (isdigit((unsigned char)p[i]) && (r = strchr(p + i + 1, '_'))) { +- valid = is_numeric(r + 1); ++ if (isdigit((unsigned char)p[i]) && strchr(p, '_')) { ++ valid = true; + break; + } + } +diff --git tests/xbps/libxbps/util/main.c tests/xbps/libxbps/util/main.c +index 41aac6ee..9ae88f1c 100644 +--- tests/xbps/libxbps/util/main.c ++++ tests/xbps/libxbps/util/main.c +@@ -43,19 +43,19 @@ ATF_TC_BODY(util_test, tc) + ATF_CHECK_EQ(xbps_pkg_name("python-e_dbus"), NULL); + ATF_CHECK_EQ(xbps_pkg_name("fs-utils-v1"), NULL); + ATF_CHECK_EQ(xbps_pkg_name("fs-utils-v_1"), NULL); +- ATF_CHECK_EQ(xbps_pkg_name("font-adobe-100dpi-1.8_blah"), NULL); + ATF_CHECK_EQ(xbps_pkg_version("font-adobe-100dpi"), NULL); + ATF_CHECK_EQ(xbps_pkg_version("font-adobe-100dpi-7.8"), NULL); + ATF_CHECK_EQ(xbps_pkg_version("python-e_dbus"), NULL); + ATF_CHECK_EQ(xbps_pkg_version("python-e_dbus-1"), NULL); +- ATF_CHECK_EQ(xbps_pkg_version("font-adobe-100dpi-1.8_blah"), NULL); +- ATF_CHECK_EQ(xbps_pkg_revision("systemd-43_1_0"), NULL); + ATF_REQUIRE_STREQ(xbps_pkg_name("font-adobe-100dpi-7.8_2"), "font-adobe-100dpi"); + ATF_REQUIRE_STREQ(xbps_pkg_name("systemd-43_1"), "systemd"); ++ ATF_REQUIRE_STREQ(xbps_pkg_name("font-adobe-100dpi-1.8_blah"), "font-adobe-100dpi"); + ATF_REQUIRE_STREQ(xbps_pkg_name("python-e_dbus-1.0_1"), "python-e_dbus"); + ATF_REQUIRE_STREQ(xbps_pkg_version("font-adobe-100dpi-7.8_2"), "7.8_2"); ++ ATF_REQUIRE_STREQ(xbps_pkg_version("font-adobe-100dpi-1.8_blah"), "1.8_blah"); + ATF_REQUIRE_STREQ(xbps_pkg_version("python-e_dbus-1_1"), "1_1"); + ATF_REQUIRE_STREQ(xbps_pkg_version("fs-utils-v1_1"), "v1_1"); ++ ATF_REQUIRE_STREQ(xbps_pkg_revision("systemd-43_1_0"), "0"); + ATF_REQUIRE_STREQ(xbps_pkg_revision("systemd_21-43_0"), "0"); + ATF_REQUIRE_STREQ(xbps_pkgpattern_name("systemd>=43"), "systemd"); + ATF_REQUIRE_STREQ(xbps_pkgpattern_name("systemd>43"), "systemd"); diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template index c56c6dfc3e4..65e456f2bad 100644 --- a/srcpkgs/xbps/template +++ b/srcpkgs/xbps/template @@ -1,7 +1,7 @@ # Template file for 'xbps' pkgname=xbps version=0.57.1 -revision=1 +revision=2 bootstrap=yes build_style=configure short_desc="XBPS package system utilities" From ab4e67e8050c2a619c945c0a1df3fb7c85ee2ac4 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Tue, 29 Oct 2019 13:16:54 +0100 Subject: [PATCH 062/186] xbps-static: add patch to revert strict revision stuff --- srcpkgs/xbps-static/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/xbps-static/template b/srcpkgs/xbps-static/template index eeaab894993..037fa0fad4e 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.57.1 -revision=1 +revision=2 # only musl archs="*-musl" wrksrc="xbps-${version}" From 1cece3d32a7d2ac3172506ce28d8b7fd2295d913 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Tue, 29 Oct 2019 14:23:30 +0100 Subject: [PATCH 063/186] linux4.19: update to 4.19.81. --- 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 be0ee554735..9913f7d0af9 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.80 +version=4.19.81 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=80a9ba764e088aa7fddfef5a97c0236905e291468a37832243b6f3828d36e7ec +checksum=293ec1ae0f6b3b4be83a217224b51d137f2163cf2d9d294eecf5d0a354e4e29d patch_args="-Np1" nodebug=yes # -dbg package is generated below manually From 2c5f41aedf5632a9f7d0232a4eee1eb013dd5471 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Tue, 29 Oct 2019 14:25:18 +0100 Subject: [PATCH 064/186] linux4.14: update to 4.14.151. --- 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 d87edbbf86f..5b19c71c0f3 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.149 +version=4.14.151 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=e69dabd2368440ce1650cda0cf043e1ba3f3343f940a43b68e761739fcb3f296 +checksum=ff519c428ee9bbb513a84db5ec32a7e3705cd8c23a57104b25b944cb79583fae nodebug=yes # -dbg package is generated below manually nostrip=yes From a08b911a0612b4f26fcde7f6133ef64abca57a8d Mon Sep 17 00:00:00 2001 From: Anthony Iliopoulos Date: Tue, 29 Oct 2019 14:10:28 +0100 Subject: [PATCH 065/186] wmutils-core: update to 1.5. --- srcpkgs/wmutils-core/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/wmutils-core/template b/srcpkgs/wmutils-core/template index eaacc5bbcdd..c383df9eb49 100644 --- a/srcpkgs/wmutils-core/template +++ b/srcpkgs/wmutils-core/template @@ -1,18 +1,18 @@ # Template file for 'wmutils-core' pkgname=wmutils-core -version=1.4 -revision=2 +version=1.5 +revision=1 wrksrc="${pkgname##*-}-${version}" build_style=gnu-makefile make_use_env=yes -conflicts="lsw" -makedepends="libxcb-devel xcb-util-devel" +makedepends="libxcb-devel xcb-util-devel xcb-util-cursor-devel" short_desc="Set of window manipulation tools" maintainer="Orphaned " license="ISC" homepage="https://github.com/wmutils/core" distfiles="https://github.com/${pkgname%-*}/core/archive/v${version}.tar.gz" -checksum=44e16576b7f6e1f126c2cb249449ab7e10fd65289aff774ffaf27d2c15a7b2ba +checksum=72af22ea52bc343bf90a6603ae3e169ed3c15f64635fa42507cc662ab04a6372 +conflicts="lsw" post_extract() { sed -i -e 's,/man,/share/man,' \ From edc874e2eb9d9a7e89838da31504f07e117097df Mon Sep 17 00:00:00 2001 From: Anthony Iliopoulos Date: Tue, 29 Oct 2019 13:59:19 +0100 Subject: [PATCH 066/186] sudo: update to 1.8.29. --- srcpkgs/sudo/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/sudo/template b/srcpkgs/sudo/template index 7119eba3208..5d798e8409e 100644 --- a/srcpkgs/sudo/template +++ b/srcpkgs/sudo/template @@ -1,6 +1,6 @@ # Template file for 'sudo' pkgname=sudo -version=1.8.28p1 +version=1.8.29 revision=1 build_style=gnu-configure configure_args="--with-ignore-dot --with-insults=disabled --with-all-insults --with-env-editor @@ -15,7 +15,7 @@ license="ISC" homepage="https://www.sudo.ws/" changelog="https://www.sudo.ws/repos/sudo/raw-file/tip/NEWS" distfiles="https://www.sudo.ws/dist/sudo-${version}.tar.gz" -checksum=23ba5a84af31e3b5ded58d4be6d3f6939a495a55561fba92c6941b79a6e8b027 +checksum=ce53ffac9604e23321334d8ba8ac59ded2bcf624fdb9dbde097ab2049bf29c7c conf_files="/etc/pam.d/sudo /etc/sudoers" lib32disabled=yes From 5bf9c6a0cc58ea40011c107d777475928058f0b7 Mon Sep 17 00:00:00 2001 From: bra1nwave Date: Tue, 29 Oct 2019 08:25:00 +0100 Subject: [PATCH 067/186] libinput: update to 1.14.3. --- srcpkgs/libinput/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/libinput/template b/srcpkgs/libinput/template index d079fd9575e..9021d3ca4d3 100644 --- a/srcpkgs/libinput/template +++ b/srcpkgs/libinput/template @@ -1,6 +1,6 @@ # Template file for 'libinput' pkgname=libinput -version=1.14.2 +version=1.14.3 revision=1 build_style=meson configure_args="-Ddebug-gui=false -Ddocumentation=false -Dtests=false" @@ -8,11 +8,11 @@ hostmakedepends="pkg-config" makedepends="libevdev-devel libwacom-devel mtdev-devel eudev-libudev-devel" checkdepends="valgrind check-devel" short_desc="Provides handling input devices in Wayland compositors and X" -maintainer="bra1nwave " +maintainer="bra1nwave " license="MIT" homepage="https://www.freedesktop.org/wiki/Software/libinput" distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=6b094669141f26c4df0d62147bbd0f76df1044333e19e6f6dc9413217c51a2c6 +checksum=0feb3a0589709cc1032893bfaf4c49150d5360bd9782bec888f9e4dd9044c5b7 if [ "$XBPS_CHECK_PKGS" ]; then configure_args+=" -Dtests=true" From 4d99ea8da5ae699da33f1181832d3be494774ec0 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Mon, 28 Oct 2019 19:45:57 -0700 Subject: [PATCH 068/186] conmon: update to 2.0.2. --- srcpkgs/conmon/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/conmon/template b/srcpkgs/conmon/template index 1b88fb61e50..801189388e5 100644 --- a/srcpkgs/conmon/template +++ b/srcpkgs/conmon/template @@ -1,6 +1,6 @@ # Template file for 'conmon' pkgname=conmon -version=2.0.1 +version=2.0.2 revision=1 build_style=gnu-makefile hostmakedepends="pkg-config" @@ -10,7 +10,7 @@ maintainer="Cameron Nemo " license="Apache-2.0" homepage="https://github.com/containers/conmon" distfiles="https://github.com/containers/conmon/archive/v${version}.tar.gz" -checksum=809508bd6f76599516f5a5a8f509e1257c2bdbcdc623c11b49e99287bba3d293 +checksum=addb8bf418cc81991e2564a6c264b02d596a0678960f54cfb0e233d837922b2a do_install() { vbin bin/conmon From 7fbb6c8405aade859ac2db71da08dd3aeb04c134 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Mon, 28 Oct 2019 19:18:16 -0700 Subject: [PATCH 069/186] buildah: update to 1.11.4. --- srcpkgs/buildah/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/buildah/template b/srcpkgs/buildah/template index 2145d41023d..5eb1a22d89e 100644 --- a/srcpkgs/buildah/template +++ b/srcpkgs/buildah/template @@ -1,6 +1,6 @@ # Template file for 'buildah' pkgname=buildah -version=1.11.3 +version=1.11.4 revision=1 build_style=go go_import_path=github.com/containers/buildah @@ -15,7 +15,7 @@ maintainer="Cameron Nemo " license="Apache-2.0" homepage="https://github.com/containers/buildah" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=a3df3f87aa06e322f8fb5f61337cffa2c57ad4fca6b49ed9431b3275b52131a5 +checksum=53700397ae3989706ac1c42d793429bcb063b544356ad4768c9bbbade9d2cfca post_build() { make -C docs GOMD2MAN=go-md2man From 085518cf0b6e04aa9a51831595b50c408822948e Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Tue, 29 Oct 2019 01:41:24 +0000 Subject: [PATCH 070/186] file: add patch for CVE-2019-18218 CVE: https://nvd.nist.gov/vuln/detail/CVE-2019-18218 Patch: https://github.com/file/file/commit/46a8443f76cec4b41ec736eca396984c74664f84 --- ...-of-elements-in-a-vector-found-by-os.patch | 59 +++++++++++++++++++ srcpkgs/file/template | 2 +- 2 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/file/patches/0001-Limit-the-number-of-elements-in-a-vector-found-by-os.patch diff --git a/srcpkgs/file/patches/0001-Limit-the-number-of-elements-in-a-vector-found-by-os.patch b/srcpkgs/file/patches/0001-Limit-the-number-of-elements-in-a-vector-found-by-os.patch new file mode 100644 index 00000000000..0507f75f81f --- /dev/null +++ b/srcpkgs/file/patches/0001-Limit-the-number-of-elements-in-a-vector-found-by-os.patch @@ -0,0 +1,59 @@ +From ba28c7f45bc1fd8cf882ad21ce619655c2736d7b Mon Sep 17 00:00:00 2001 +From: Christos Zoulas +Date: Mon, 26 Aug 2019 14:31:39 +0000 +Subject: [PATCH] Limit the number of elements in a vector (found by oss-fuzz) + +--- + src/cdf.c | 9 ++++----- + src/cdf.h | 1 + + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/cdf.c b/src/cdf.c +index 556a3ff8..e4835fef 100644 +--- src/cdf.c ++++ src/cdf.c +@@ -35,7 +35,7 @@ + #include "file.h" + + #ifndef lint +-FILE_RCSID("@(#)$File: cdf.c,v 1.114 2019/02/20 02:35:27 christos Exp $") ++FILE_RCSID("@(#)$File: cdf.c,v 1.116 2019/08/26 14:31:39 christos Exp $") + #endif + + #include +@@ -1013,8 +1013,9 @@ cdf_read_property_info(const cdf_stream_t *sst, const cdf_header_t *h, + goto out; + } + nelements = CDF_GETUINT32(q, 1); +- if (nelements == 0) { +- DPRINTF(("CDF_VECTOR with nelements == 0\n")); ++ if (nelements > CDF_ELEMENT_LIMIT || nelements == 0) { ++ DPRINTF(("CDF_VECTOR with nelements == %" ++ SIZE_T_FORMAT "u\n", nelements)); + goto out; + } + slen = 2; +@@ -1056,8 +1057,6 @@ cdf_read_property_info(const cdf_stream_t *sst, const cdf_header_t *h, + goto out; + inp += nelem; + } +- DPRINTF(("nelements = %" SIZE_T_FORMAT "u\n", +- nelements)); + for (j = 0; j < nelements && i < sh.sh_properties; + j++, i++) + { +diff --git a/src/cdf.h b/src/cdf.h +index 2f7e554b..05056668 100644 +--- src/cdf.h ++++ src/cdf.h +@@ -48,6 +48,7 @@ + typedef int32_t cdf_secid_t; + + #define CDF_LOOP_LIMIT 10000 ++#define CDF_ELEMENT_LIMIT 100000 + + #define CDF_SECID_NULL 0 + #define CDF_SECID_FREE -1 +-- +2.23.0 + diff --git a/srcpkgs/file/template b/srcpkgs/file/template index f12b0233e16..03aaa501cfb 100644 --- a/srcpkgs/file/template +++ b/srcpkgs/file/template @@ -1,7 +1,7 @@ # Template file for 'file' pkgname=file version=5.37 -revision=1 +revision=2 bootstrap=yes build_style=gnu-configure configure_args="--enable-static" From 2f14ab8ef586768edd65bb1b0d4cc5aa498a7707 Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Tue, 29 Oct 2019 00:52:47 +0000 Subject: [PATCH 071/186] unoconv: add CVE-2019-17400 patch --- ...pdateDocMode-behavior-and-add-new-op.patch | 117 ++++++++++++++++++ srcpkgs/unoconv/template | 4 +- 2 files changed, 119 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/unoconv/patches/0001-change-default-updateDocMode-behavior-and-add-new-op.patch diff --git a/srcpkgs/unoconv/patches/0001-change-default-updateDocMode-behavior-and-add-new-op.patch b/srcpkgs/unoconv/patches/0001-change-default-updateDocMode-behavior-and-add-new-op.patch new file mode 100644 index 00000000000..d10cba7b96f --- /dev/null +++ b/srcpkgs/unoconv/patches/0001-change-default-updateDocMode-behavior-and-add-new-op.patch @@ -0,0 +1,117 @@ +From 3351c5e5eef88690ed860bfee99d905202518a22 Mon Sep 17 00:00:00 2001 +From: Samuel Erb +Date: Tue, 17 Sep 2019 12:22:12 -0400 +Subject: [PATCH] change default updateDocMode behavior and add new option to + keep old behavior (#510) + +--- + unoconv | 51 ++++++++++++++++++++++++++++++--------------------- + 1 file changed, 30 insertions(+), 21 deletions(-) + +diff --git a/unoconv b/unoconv +index f844d0f..762dc85 100755 +--- unoconv ++++ unoconv +@@ -543,6 +543,8 @@ class Options: + self.template = None + self.timeout = 6 + self.verbose = 0 ++ self.userProfile = None ++ self.updateDocMode = NO_UPDATE + + self.setprinter = False + self.paperformat = None +@@ -555,8 +557,8 @@ class Options: + ['connection=', 'debug', 'doctype=', 'export=', 'field=', 'format=', + 'help', 'import=', 'import-filter-name=', 'listener', 'meta=', 'no-launch', + 'output=', 'outputpath', 'password=', 'pipe=', 'port=', 'preserve', +- 'server=', 'timeout=', 'show', 'stdin', 'stdout', 'template', 'printer=', +- 'verbose', 'version'] ) ++ 'server=', 'timeout=', 'user-profile=', 'show', 'stdin', ++ 'stdout', 'template', 'printer=', 'unsafe-quiet-update', 'verbose', 'version'] ) + except getopt.error as exc: + print('unoconv: %s, try unoconv -h for a list of all the options' % str(exc)) + sys.exit(255) +@@ -646,6 +648,10 @@ class Options: + self.template = arg + elif opt in ['-T', '--timeout']: + self.timeout = int(arg) ++ elif opt in ['--unsafe-quiet-update']: ++ # ref https://www.openoffice.org/api/docs/common/ref/com/sun/star/document/UpdateDocMode.html ++ print('Warning: Do not use the option --unsafe-quiet-update with untrusted input.') ++ self.updateDocMode = QUIET_UPDATE + elif opt in ['-v', '--verbose']: + self.verbose = self.verbose + 1 + elif opt in ['-V', '--version']: +@@ -760,6 +766,7 @@ unoconv options: + --stdout write output to stdout + -t, --template=file import the styles from template (.ott) + -T, --timeout=secs timeout after secs if connection to listener fails ++ --unsafe-quiet-update allow rendered document to fetch external resources (Warning: this is unsafe with untrusted input) + -v, --verbose be more and more verbose (-vvv for debugging) + --version display version number of unoconv, OOo/LO and platform details + -P, --printer printer options +@@ -930,7 +937,7 @@ class Convertor: + phase = "import" + + ### Load inputfile +- inputprops = UnoProps(Hidden=True, ReadOnly=True, UpdateDocMode=QUIET_UPDATE) ++ inputprops = UnoProps(Hidden=True, ReadOnly=True, UpdateDocMode=op.updateDocMode) + + if op.password: + inputprops += UnoProps(Password=op.password) +@@ -983,23 +990,25 @@ class Convertor: + # except AttributeError: + # pass + +- ### Update document links +- phase = "update-links" +- try: +- document.updateLinks() +- # Found that when converting HTML files with external images, OO would only load five or six of +- # the images in the file. In the resulting document, the rest of the images did not appear. Cycling +- # through all the image references in the document seems to force OO to actually load them. Found +- # some helpful guidance in this thread: +- # https://forum.openoffice.org/en/forum/viewtopic.php?f=30&t=23909 +- # Ideally we would like to have the option to embed the images into the document, but I have not been +- # able to figure out how to do this yet. +- graphObjs = document.GraphicObjects +- for i in range(0, graphObjs.getCount()): +- graphObj = graphObjs.getByIndex(i) +- except AttributeError: +- # the document doesn't implement the XLinkUpdate interface +- pass ++ ### Update document links if appropriate ++ if op.updateDocMode != NO_UPDATE: ++ phase = "update-links" ++ try: ++ document.updateLinks() ++ # Found that when converting HTML files with external images, OO would only load five or six of ++ # the images in the file. In the resulting document, the rest of the images did not appear. Cycling ++ # through all the image references in the document seems to force OO to actually load them. Found ++ # some helpful guidance in this thread: ++ # https://forum.openoffice.org/en/forum/viewtopic.php?f=30&t=23909 ++ # Ideally we would like to have the option to embed the images into the document, but I have not been ++ # able to figure out how to do this yet. ++ if op.updatehtmllinks: ++ graphObjs = document.GraphicObjects ++ for i in range(0, graphObjs.getCount()): ++ graphObj = graphObjs.getByIndex(i) ++ except AttributeError: ++ # the document doesn't implement the XLinkUpdate interface ++ pass + + ### Add/Replace variables + phase = "replace-fields" +@@ -1347,7 +1356,7 @@ if __name__ == '__main__': + ### Now that we have found a working pyuno library, let's import some classes + from com.sun.star.beans import PropertyValue + from com.sun.star.connection import NoConnectException +- from com.sun.star.document.UpdateDocMode import QUIET_UPDATE ++ from com.sun.star.document.UpdateDocMode import NO_UPDATE, QUIET_UPDATE + from com.sun.star.lang import DisposedException, IllegalArgumentException + from com.sun.star.io import IOException, XOutputStream + from com.sun.star.script import CannotConvertException +-- +2.23.0 + diff --git a/srcpkgs/unoconv/template b/srcpkgs/unoconv/template index b1bc08c4275..7f4dcb4853a 100644 --- a/srcpkgs/unoconv/template +++ b/srcpkgs/unoconv/template @@ -1,14 +1,14 @@ # Template file for 'unoconv' pkgname=unoconv version=0.8.2 -revision=1 +revision=2 archs=noarch build_style=gnu-makefile hostmakedepends="asciidoc git" depends="python" short_desc="Convert between document formats supported by LibreOffice/OpenOffice" maintainer="Antonio Malcolm " -license="GPL-2" +license="GPL-2.0-only" homepage="https://github.com/dagwieers/unoconv" distfiles="${homepage}/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz" checksum=5381c0338d50e9b05cd30f8724b796e3bf426e9dde3d51169b3511de22de14a6 From 1a71a4b205a73282d13f7f10f1f17c09fc730048 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= Date: Tue, 29 Oct 2019 00:50:51 +0100 Subject: [PATCH 072/186] youtube-dl: update to 2019.10.29. --- 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 40b7681c85c..933fd4a57d6 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.10.22 +version=2019.10.29 revision=1 archs=noarch wrksrc=youtube-dl @@ -14,7 +14,7 @@ license="Unlicense" homepage="https://ytdl-org.github.io/youtube-dl/" changelog="https://raw.githubusercontent.com/ytdl-org/youtube-dl/master/ChangeLog" distfiles="https://yt-dl.org/downloads/${version}/youtube-dl-${version}.tar.gz" -checksum=8b678129fe221cda70ac4a4ccd13372b65e9b4faa7c12cbbe4ca01ec2f378f1b +checksum=e4eea3ff5aad9804f8d76b0be02ad16a6b530d16a47b227418e880be24f306d3 post_install() { rm -rf ${DESTDIR}/usr/etc From 576aad8865eb85150cbf2467172b946edcf7625d Mon Sep 17 00:00:00 2001 From: Renato Aguiar Date: Mon, 28 Oct 2019 13:35:13 -0700 Subject: [PATCH 073/186] borgmatic: update to 1.4.0 --- srcpkgs/borgmatic/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/borgmatic/template b/srcpkgs/borgmatic/template index fded19aaaea..25b3956dada 100644 --- a/srcpkgs/borgmatic/template +++ b/srcpkgs/borgmatic/template @@ -1,6 +1,6 @@ # Template file for 'borgmatic' pkgname=borgmatic -version=1.3.26 +version=1.4.0 revision=1 archs=noarch build_style=python3-module @@ -15,7 +15,7 @@ maintainer="Renato Aguiar " license="GPL-3.0-only" homepage="https://torsion.org/borgmatic/" distfiles="${PYPI_SITE}/b/borgmatic/borgmatic-${version}.tar.gz" -checksum=1663d4a4b7393fa1a848a052daf4a7f6f125fd67058c4bdffce885a089b235e6 +checksum=861467e5d7c1588e9e356966e6a9b8fca108e6bd17700d9a20afc8d00ee39116 do_check() { # The tests use the NEWS file to get version and checks against From 36096b8f0137b7e368d30c2e441e5ab4a42728a0 Mon Sep 17 00:00:00 2001 From: q66 Date: Mon, 28 Oct 2019 20:00:45 +0100 Subject: [PATCH 074/186] a2jmidid: fix build on musl/ppc (and also a correction on glibc) [ci skip] --- srcpkgs/a2jmidid/patches/musl-ppc.patch | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 srcpkgs/a2jmidid/patches/musl-ppc.patch diff --git a/srcpkgs/a2jmidid/patches/musl-ppc.patch b/srcpkgs/a2jmidid/patches/musl-ppc.patch new file mode 100644 index 00000000000..c16523512ef --- /dev/null +++ b/srcpkgs/a2jmidid/patches/musl-ppc.patch @@ -0,0 +1,18 @@ +This fixes build on ppc32/musl but also fixes incorrect usage of uc_regs +on glibc (uc_regs is an mcontext_t pointer, you can't index it directly) + +--- sigsegv.c ++++ sigsegv.c +@@ -97,7 +97,11 @@ static void signal_segv(int signum, siginfo_t* info, void*ptr) { + for(i = 0; i < NGREG; i++) + a2j_error("reg[%02d] = 0x" REGFORMAT, i, + #if defined(__powerpc__) && !defined(__powerpc64__) +- ucontext->uc_mcontext.uc_regs[i] ++#if defined(__GLIBC__) ++ ucontext->uc_mcontext.uc_regs->gregs[i] ++#else ++ ucontext->uc_mcontext.gregs[i] ++#endif + #elif defined(__powerpc64__) + ucontext->uc_mcontext.gp_regs[i] + #elif defined(__sparc__) && defined(__arch64__) From d651b2f98bbe82777805ac8cd6b77d665f462841 Mon Sep 17 00:00:00 2001 From: mobinmob Date: Mon, 28 Oct 2019 20:11:06 +0200 Subject: [PATCH 075/186] spdx-licenses-list: update to 3.7. --- srcpkgs/spdx-licenses-list/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/spdx-licenses-list/template b/srcpkgs/spdx-licenses-list/template index 948cd4f767b..f17de17026e 100644 --- a/srcpkgs/spdx-licenses-list/template +++ b/srcpkgs/spdx-licenses-list/template @@ -1,15 +1,15 @@ # Template file for 'spdx-licenses-list' pkgname=spdx-licenses-list -version=3.6 +version=3.7 revision=1 archs=noarch wrksrc="license-list-data-${version}" short_desc="SPDX License List" -maintainer="Orphaned " +maintainer="mobinmob " license="GPL-3.0-or-later" homepage="https://spdx.org" distfiles="https://github.com/spdx/license-list-data/archive/v${version}.tar.gz" -checksum=601e63613a7b0a3a353f1871970d33742fad6b8d040e54c70d6d24b2bc0a9d26 +checksum=3f3a121ad331261d0997b3c6526d0db030d8b1468afce862921eaea22099f909 do_install() { vmkdir usr/share/spdx From 1ac699c497b8d2749108ac9647ca08299fe1ce26 Mon Sep 17 00:00:00 2001 From: mobinmob Date: Mon, 28 Oct 2019 19:05:22 +0200 Subject: [PATCH 076/186] bleachbit: update to 3.0. --- srcpkgs/bleachbit/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/bleachbit/template b/srcpkgs/bleachbit/template index b8f9eb00089..a2282f524e7 100644 --- a/srcpkgs/bleachbit/template +++ b/srcpkgs/bleachbit/template @@ -1,16 +1,16 @@ # Template file for 'bleachbit' pkgname=bleachbit -version=2.2 +version=3.0 revision=1 archs=noarch build_style=gnu-makefile pycompile_dirs="usr/share/bleachbit" make_install_args="prefix=/usr" hostmakedepends="python" -depends="pygtk>=2 desktop-file-utils hicolor-icon-theme" +depends="python-gobject gtk+3 desktop-file-utils hicolor-icon-theme" short_desc="Deletes unneeded files to free disk space and maintain privacy" maintainer="graysky " license="GPL-3.0-or-later" homepage="https://www.bleachbit.org/" -distfiles="https://github.com/bleachbit/bleachbit/archive/v${version}.tar.gz" -checksum=5abdf59df4157880347590c8463a2b1bff94467e2cfd988569a90f5cb447292a +distfiles="https://github.com/bleachbit/bleachbit/archive/${version}.tar.gz" +checksum=d992b9e11f0fc3612a2609bf6f77faeca2e39bb53556ee3259dc3ee210802a73 From 07f8418c62e915f754a3a75be3edb39e87b94770 Mon Sep 17 00:00:00 2001 From: q66 Date: Mon, 28 Oct 2019 18:15:42 +0100 Subject: [PATCH 077/186] opentoonz: add big endian patch [ci skip] --- srcpkgs/opentoonz/patches/big-endian.patch | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 srcpkgs/opentoonz/patches/big-endian.patch diff --git a/srcpkgs/opentoonz/patches/big-endian.patch b/srcpkgs/opentoonz/patches/big-endian.patch new file mode 100644 index 00000000000..fe4573ec08d --- /dev/null +++ b/srcpkgs/opentoonz/patches/big-endian.patch @@ -0,0 +1,38 @@ +Fix up some big endian paths that did not survive refactoring. + +--- toonz/sources/image/tzl/tiio_tzl.cpp ++++ toonz/sources/image/tzl/tiio_tzl.cpp +@@ -945,7 +945,7 @@ void TLevelWriterTzl::saveImage(const TImageP &img, const TFrameId &_fid, + Header *header = (Header *)buff; + + TRasterP ras; +- m_codec->decompress(buff, buffSize, ras); ++ m_codec->decompress(buff, buffSize, ras, false); + delete[] buff; + assert((TRasterCM32P)ras); + assert(ras->getLx() == header->m_lx); +--- toonz/sources/sound/wav/tsio_wav.cpp ++++ toonz/sources/sound/wav/tsio_wav.cpp +@@ -373,17 +373,17 @@ bool TSoundTrackWriterWav::save(const TSoundTrackP &sndtrack) { + #if (!TNZ_LITTLE_ENDIAN) + { + if (fmtChunk.m_bitPerSample == 8) +- memcpy((void *)waveData, (void *)sndtrack->getRawData(), soundDataLength); ++ memcpy((void *)waveData.get(), (void *)sndtrack->getRawData(), soundDataLength); + else if (fmtChunk.m_bitPerSample == 16) { +- swapAndCopySamples((short *)sndtrack->getRawData(), (short *)waveData, ++ swapAndCopySamples((short *)sndtrack->getRawData(), (short *)waveData.get(), + sndtrack->getSampleCount() * fmtChunk.m_chans); + } else if (fmtChunk.m_bitPerSample == 24) { // swap e togliere quarto byte + UCHAR *begin = (UCHAR *)sndtrack->getRawData(); + for (int i = 0; i < (int)sndtrack->getSampleCount() * fmtChunk.m_chans; + ++i) { +- *(waveData + 3 * i) = *(begin + 4 * i + 3); +- *(waveData + 3 * i + 1) = *(begin + 4 * i + 2); +- *(waveData + 3 * i + 2) = *(begin + 4 * i + 1); ++ *(waveData.get() + 3 * i) = *(begin + 4 * i + 3); ++ *(waveData.get() + 3 * i + 1) = *(begin + 4 * i + 2); ++ *(waveData.get() + 3 * i + 2) = *(begin + 4 * i + 1); + } + } + } From 8426cb7716c0a08a4563476f7243483d32500270 Mon Sep 17 00:00:00 2001 From: Anthony Iliopoulos Date: Mon, 28 Oct 2019 14:46:46 +0100 Subject: [PATCH 078/186] xorriso: update to 1.5.2. --- srcpkgs/xorriso/patches/musl.patch | 10 ---------- srcpkgs/xorriso/template | 8 ++++---- 2 files changed, 4 insertions(+), 14 deletions(-) delete mode 100644 srcpkgs/xorriso/patches/musl.patch diff --git a/srcpkgs/xorriso/patches/musl.patch b/srcpkgs/xorriso/patches/musl.patch deleted file mode 100644 index ddb6a5a3278..00000000000 --- a/srcpkgs/xorriso/patches/musl.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- libisofs/aaip_0_2.h.orig 2015-11-30 09:43:49.164367780 +0100 -+++ libisofs/aaip_0_2.h 2015-11-30 09:44:11.411563960 +0100 -@@ -16,6 +16,7 @@ - #ifndef Aaip_h_is_includeD - #define Aaip_h_is_includeD yes - -+#include /* ssize_t */ - - /* --------------------------------- Encoder ---------------------------- */ - diff --git a/srcpkgs/xorriso/template b/srcpkgs/xorriso/template index 13bda5a2353..771f0640502 100644 --- a/srcpkgs/xorriso/template +++ b/srcpkgs/xorriso/template @@ -1,12 +1,12 @@ # Template file for 'xorriso' pkgname=xorriso -version=1.5.1 -revision=2 +version=1.5.2 +revision=1 build_style=gnu-configure makedepends="zlib-devel bzip2-devel readline-devel acl-devel" short_desc="ISO 9660 Rock Ridge Filesystem Manipulator" -maintainer="Orphaned " +maintainer="Anthony Iliopoulos " license="GPL-3.0-or-later" homepage="https://www.gnu.org/software/xorriso" distfiles="https://www.gnu.org/software/xorriso/xorriso-${version}.tar.gz" -checksum=0f8a28dee607f8365f8242cb8e87e9eec29714b809c05a215735172e8a18fca8 +checksum=3b69f5c93ae7c40c5bbe4a847fa3963f5efc9c565551622f77121c5792fc17e7 From 4e80be5b78715d9a318b219d3b68e647afe226db Mon Sep 17 00:00:00 2001 From: Anthony Iliopoulos Date: Mon, 28 Oct 2019 14:50:28 +0100 Subject: [PATCH 079/186] libedit: update to 20191025.3.1. --- srcpkgs/libedit/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libedit/template b/srcpkgs/libedit/template index d69e847f979..09073c6e5c2 100644 --- a/srcpkgs/libedit/template +++ b/srcpkgs/libedit/template @@ -1,6 +1,6 @@ # Template file for 'libedit' pkgname=libedit -_datever=20190324 +_datever=20191025 _distver=3.1 version="${_datever}.${_distver}" revision=1 @@ -12,7 +12,7 @@ maintainer="Orphaned " license="BSD-3-Clause" homepage="http://www.thrysoee.dk/editline/" distfiles="http://www.thrysoee.dk/editline/libedit-${_datever}-${_distver}.tar.gz" -checksum=ac8f0f51c1cf65492e4d1e3ed2be360bda41e54633444666422fbf393bba1bae +checksum=6dff036660d478bfaa14e407fc5de26d22da1087118c897b1a3ad2e90cb7bf39 post_install() { vlicense COPYING From d1c91964887ada3ae529f7720f0585e646cfb696 Mon Sep 17 00:00:00 2001 From: Karl Nilsson Date: Tue, 29 Oct 2019 03:40:43 -0400 Subject: [PATCH 080/186] keybase: update to 4.7.2. --- srcpkgs/keybase/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/keybase/template b/srcpkgs/keybase/template index b40ae1591f7..d1bcaf1c6fc 100644 --- a/srcpkgs/keybase/template +++ b/srcpkgs/keybase/template @@ -1,6 +1,6 @@ # Template file for 'keybase' pkgname=keybase -version=4.7.1 +version=4.7.2 revision=1 wrksrc="client-${version}" build_style=go @@ -17,7 +17,7 @@ maintainer="Toyam Cox " license="BSD-3-Clause" homepage="https://keybase.io/" distfiles="https://github.com/keybase/client/archive/v${version}.tar.gz" -checksum=deff60fe1237b8c33eea8854dd90602d748450a550a1a0aeb7c2e2997f131f1b +checksum=d6cf2ac1f13bd95c713a534ec504fe20556bd8da93bb5cfe1cdcb6287ed1fc4d post_install() { vlicense LICENSE From efdc2a1fcf781d0ede5e7c95fbebbed10e8fbb77 Mon Sep 17 00:00:00 2001 From: Karl Nilsson Date: Tue, 29 Oct 2019 03:41:03 -0400 Subject: [PATCH 081/186] keybase-desktop: update to 4.7.2. --- srcpkgs/keybase-desktop/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/keybase-desktop/template b/srcpkgs/keybase-desktop/template index b5f8c790d74..50a828ac237 100644 --- a/srcpkgs/keybase-desktop/template +++ b/srcpkgs/keybase-desktop/template @@ -1,6 +1,6 @@ # Template file for 'keybase-desktop' pkgname=keybase-desktop -version=4.7.1 +version=4.7.2 revision=1 wrksrc="client-${version}" hostmakedepends="git nodejs-lts yarn unzip" @@ -10,7 +10,7 @@ maintainer="Dominic Monroe " license="BSD-3-Clause" homepage="https://keybase.io" distfiles="https://github.com/keybase/client/archive/v${version}.tar.gz" -checksum=deff60fe1237b8c33eea8854dd90602d748450a550a1a0aeb7c2e2997f131f1b +checksum=d6cf2ac1f13bd95c713a534ec504fe20556bd8da93bb5cfe1cdcb6287ed1fc4d nostrip_files="Keybase" case "${XBPS_TARGET_MACHINE}" in From 81dcfc365afbb993973c8d29ffa1f3788e0cd67b Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 29 Oct 2019 14:46:16 +0100 Subject: [PATCH 082/186] perl-WWW-Mechanize: update to 1.95. --- srcpkgs/perl-WWW-Mechanize/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/perl-WWW-Mechanize/template b/srcpkgs/perl-WWW-Mechanize/template index 9bc6d3eea8d..169016d5fd1 100644 --- a/srcpkgs/perl-WWW-Mechanize/template +++ b/srcpkgs/perl-WWW-Mechanize/template @@ -1,6 +1,6 @@ # Template file for 'perl-WWW-Mechanize' pkgname=perl-WWW-Mechanize -version=1.94 +version=1.95 revision=1 archs=noarch wrksrc="${pkgname/perl-/}-${version}" @@ -17,7 +17,7 @@ maintainer="Leah Neukirchen " license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="https://metacpan.org/release/WWW-Mechanize" distfiles="${CPAN_SITE}/WWW/${pkgname/perl-/}-${version}.tar.gz" -checksum=c850571551276aad468a5ea2b3857310107671d943fc1c0b7cae3adf552c1002 +checksum=3ab36267bcbfe245ca4578caff475558dab171f756319b92a92b58dd410f22f0 pre_configure() { unset configure_args From 9067b4beea6ecf5497dc2113f4fffd17ec14a75b Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 29 Oct 2019 14:46:18 +0100 Subject: [PATCH 083/186] erlang: update to 22.1.5. --- srcpkgs/erlang/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template index 67cd2896abf..64870913ecb 100644 --- a/srcpkgs/erlang/template +++ b/srcpkgs/erlang/template @@ -1,6 +1,6 @@ # Template file for 'erlang' pkgname=erlang -version=22.1.4 +version=22.1.5 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=982e940c8c3313b1af27938655b4e90991d54bd6720b238c25438c16bc51699f +checksum=b00622ef0ac433bae912cf11cbf06467a057ea710fbda6317ba5d0b10cc2e4b1 build_options="x11" From e7ee8f598cc9b39b7f3ab6badcd56b9e5d75ed2d Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Tue, 29 Oct 2019 20:58:11 +0100 Subject: [PATCH 084/186] linux4.9: update to 4.9.198. --- 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 5fbd7f49484..1ef3ad4c439 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.196 +version=4.9.198 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=e0ab12b04a975630ece2142a1ac15cfe45140b8c3359226b035c15ca7c92c6ef +checksum=9572ebfa6ba0efcf9f1ec7b62c7b89baa36a621ab9fd4c5ad025196c549605ac nodebug=yes # -dbg package is generated below manually nostrip=yes From 9aa82a3337b8024609661e82fed39b370d29c5d0 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Tue, 29 Oct 2019 21:00:11 +0100 Subject: [PATCH 085/186] linux4.4: update to 4.4.198. --- srcpkgs/linux4.4/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/linux4.4/template b/srcpkgs/linux4.4/template index a0adea6b297..e1380afdc49 100644 --- a/srcpkgs/linux4.4/template +++ b/srcpkgs/linux4.4/template @@ -1,6 +1,6 @@ # Template file for 'linux4.4' pkgname=linux4.4 -version=4.4.196 +version=4.4.198 revision=1 wrksrc="linux-${version}" maintainer="Orphaned " @@ -8,7 +8,7 @@ homepage="https://www.kernel.org" license="GPL-2.0-only" short_desc="The Linux kernel and modules (${version%.*} series)" distfiles="${KERNEL_SITE}/kernel/v4.x/linux-${version}.tar.xz" -checksum=169e3f07701336138905bdedd22a0089b45e2e53b9aa6d2ed6c44f215476a76d +checksum=ecf808d88d04086da25bf44288d63a7110dd99948c17bc1162e5301abccff312 nocross=yes nodebug=yes From f99c9b112fec3aeeb796b8b5f38d09b04a4a1643 Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Tue, 29 Oct 2019 10:17:15 -0500 Subject: [PATCH 086/186] gmsh: update to 4.4.1 --- srcpkgs/gmsh/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gmsh/template b/srcpkgs/gmsh/template index 63914f8fa6b..ac717bcc761 100644 --- a/srcpkgs/gmsh/template +++ b/srcpkgs/gmsh/template @@ -1,6 +1,6 @@ # Template file for 'gmsh' pkgname=gmsh -version=4.3.0 +version=4.4.1 revision=1 wrksrc="${pkgname}-${version}-source" build_style=cmake @@ -16,7 +16,7 @@ license="GPL-2.0-or-later" homepage="https://gmsh.info" changelog="http://gmsh.info/CHANGELOG.txt" distfiles="https://gmsh.info/src/gmsh-${version}-source.tgz" -checksum=54a236f5708bc105d5b60ddb2b95ea7062537ccd2720860377994c1a9bb86429 +checksum=853c6438fc4e4b765206e66a514b09182c56377bb4b73f1d0d26eda7eb8af0dc build_options="hxt mesh numpy zipper" # HXT and MESH only available on x86 From 6c66be783890af9754fe9116261d74ca2f664e4e Mon Sep 17 00:00:00 2001 From: Imran Khan Date: Tue, 29 Oct 2019 16:33:08 +0000 Subject: [PATCH 087/186] txr: update to 227. --- srcpkgs/txr/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/txr/template b/srcpkgs/txr/template index 141593d986e..f7143bbb3f3 100644 --- a/srcpkgs/txr/template +++ b/srcpkgs/txr/template @@ -1,6 +1,6 @@ # Template file for 'txr' pkgname=txr -version=225 +version=227 revision=1 build_style=configure make_check_target=tests @@ -10,7 +10,7 @@ maintainer="Oliver Kiddle " license="BSD-2-Clause" homepage="http://www.nongnu.org/txr/" distfiles="http://www.kylheku.com/cgit/txr/snapshot/${pkgname}-${version}.tar.bz2" -checksum=d277c77369637afce7f43f9ff05a22a8896bafb8f70e5a428e5a64b96b06701f +checksum=fae7eb3ed6611e0a31cc5adc32a6e03e182e7412bdc99de2bcef4bb71c7913ee if [ "$CROSS_BUILD" ]; then hostmakedepends+=" txr" From c043851bf8945d01c41e9ca2ba2662722841bd4d Mon Sep 17 00:00:00 2001 From: k4leg Date: Tue, 29 Oct 2019 19:10:09 +0300 Subject: [PATCH 088/186] qbittorrent: update to 4.1.9. --- srcpkgs/qbittorrent/template | 54 +++++++++++++++++------------------- 1 file changed, 26 insertions(+), 28 deletions(-) diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template index 3dbf7b34ee9..f45191c9d2e 100644 --- a/srcpkgs/qbittorrent/template +++ b/srcpkgs/qbittorrent/template @@ -1,10 +1,10 @@ # Template file for 'qbittorrent' pkgname=qbittorrent -version=4.1.8 +version=4.1.9 revision=1 create_wrksrc=yes build_style=qmake -hostmakedepends="automake libtool pkg-config qt5-host-tools qt5-qmake qt5-tools" +hostmakedepends="automake autoconf libtool pkg-config qt5-host-tools qt5-qmake qt5-tools" makedepends="libtorrent-rasterbar-devel qt5-declarative-devel qt5-svg-devel" depends="qt5-svg" short_desc="Free software alternative to µtorrent" @@ -12,7 +12,7 @@ maintainer="Jürgen Buchmüller " license="GPL-2.0-or-later" homepage="http://www.qbittorrent.org/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=3feea2ea401d933c492630e4406141658f17b5dc0c8cf9267f849ff2078fb0bb +checksum=3ad08ab441f85b60715d8ed5369cf21f5c94c7ef07474abc247d09ce93a78ee7 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-svg-devel" @@ -41,31 +41,29 @@ do_configure() { cd ${wrksrc}/${build} ./bootstrap.sh ./configure ${opts} - cat > qt.conf <<_EOF -[Paths] -Sysroot=${XBPS_CROSS_BASE} -Prefix=${XBPS_CROSS_BASE}/usr -ArchData=${XBPS_CROSS_BASE}/usr/lib/qt5 -Data=${XBPS_CROSS_BASE}/usr/share/qt5 -Documentation=${XBPS_CROSS_BASE}/usr/share/doc/qt5 -Headers=${XBPS_CROSS_BASE}/usr/include/qt5 -Libraries=${XBPS_CROSS_BASE}/usr/lib -LibraryExecutables=/usr/lib/qt5/libexec -Binaries=/usr/lib/qt5/bin -Tests=${XBPS_CROSS_BASE}/usr/tests -Plugins=/usr/lib/qt5/plugins -Imports=${XBPS_CROSS_BASE}/usr/lib/qt5/imports -Qml2Imports=${XBPS_CROSS_BASE}/usr/lib/qt5/qml -Translations=${XBPS_CROSS_BASE}/usr/share/qt5/translations -Settings=${XBPS_CROSS_BASE}/etc/xdg -Examples=${XBPS_CROSS_BASE}/usr/share/qt5/examples -HostPrefix=/usr -HostData=/usr/lib/qt5 -HostBinaries=/usr/lib/qt5/bin -HostLibraries=/usr/lib -Spec=linux-g++ -TargetSpec=linux-g++ -_EOF + echo "[Paths]" > qt.conf + echo "Sysroot=${XBPS_CROSS_BASE}" >> qt.conf + echo "Prefix=${XBPS_CROSS_BASE}/usr" >> qt.conf + echo "ArchData=${XBPS_CROSS_BASE}/usr/lib/qt5" >> qt.conf + echo "Data=${XBPS_CROSS_BASE}/usr/share/qt5" >> qt.conf + echo "Documentation=${XBPS_CROSS_BASE}/usr/share/doc/qt5" >> qt.conf + echo "Headers=${XBPS_CROSS_BASE}/usr/include/qt5" >> qt.conf + echo "Libraries=${XBPS_CROSS_BASE}/usr/lib" >> qt.conf + echo "LibraryExecutables=/usr/lib/qt5/libexec" >> qt.conf + echo "Binaries=/usr/lib/qt5/bin" >> qt.conf + echo "Tests=${XBPS_CROSS_BASE}/usr/tests" >> qt.conf + echo "Plugins=/usr/lib/qt5/plugins" >> qt.conf + echo "Imports=${XBPS_CROSS_BASE}/usr/lib/qt5/imports" >> qt.conf + echo "Qml2Imports=${XBPS_CROSS_BASE}/usr/lib/qt5/qml" >> qt.conf + echo "Translations=${XBPS_CROSS_BASE}/usr/share/qt5/translations" >> qt.conf + echo "Settings=${XBPS_CROSS_BASE}/etc/xdg" >> qt.conf + echo "Examples=${XBPS_CROSS_BASE}/usr/share/qt5/examples" >> qt.conf + echo "HostPrefix=/usr" >> qt.conf + echo "HostData=/usr/lib/qt5" >> qt.conf + echo "HostBinaries=/usr/lib/qt5/bin" >> qt.conf + echo "HostLibraries=/usr/lib" >> qt.conf + echo "Spec=linux-g++" >> qt.conf + echo "TargetSpec=linux-g++" >> qt.conf qmake-qt5 \ PREFIX=/usr \ LIB=/usr/lib \ From 0c3056bdb7d4f6047c431eae665b774361c14ec8 Mon Sep 17 00:00:00 2001 From: newbluemoon Date: Sat, 26 Oct 2019 08:12:42 +0200 Subject: [PATCH 089/186] sonic-visualiser: update to 4.0 --- srcpkgs/sonic-visualiser/template | 51 +++++++++++++++++++++++++++---- 1 file changed, 45 insertions(+), 6 deletions(-) diff --git a/srcpkgs/sonic-visualiser/template b/srcpkgs/sonic-visualiser/template index 8ad6346646e..30b859e38f9 100644 --- a/srcpkgs/sonic-visualiser/template +++ b/srcpkgs/sonic-visualiser/template @@ -1,6 +1,6 @@ # Template file for 'sonic-visualiser' pkgname=sonic-visualiser -version=3.3 +version=4.0 revision=1 build_style=gnu-configure hostmakedepends="pkg-config capnproto-devel" @@ -13,30 +13,69 @@ maintainer="newbluemoon " license="GPL-2.0-or-later" homepage="https://www.sonicvisualiser.org/" changelog="https://code.soundsoftware.ac.uk/projects/sonic-visualiser/repository/entry/CHANGELOG" -distfiles="https://code.soundsoftware.ac.uk/attachments/download/2491/${pkgname}-${version}.tar.gz" -checksum=18fa86824146c6338057d9a07377fb8068bab4279b1c77c59191b700048c0f93 +distfiles="https://code.soundsoftware.ac.uk/attachments/download/2580/${pkgname}-${version}.tar.gz" +checksum=355ee125e7b837fdbd008352c96e25b0271ff8234981375266a88bcdf0b43965 + +case "$XBPS_TARGET_MACHINE" in + armv6*) makedepends+=" libatomic-devel" ;; +esac if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-qmake qt5-svg-devel" fi post_extract() { - # don’t run target-built testing-binaries when cross building if [ "$CROSS_BUILD" ]; then + # don’t run target-built testing-binaries when cross building sed -i -e '/QMAKE_POST_LINK/d' \ test-svcore-base.pro \ test-svcore-data-fileio.pro \ test-svcore-data-model.pro \ test-svcore-system.pro + + # It’s a mixed build-style: gnu-configure calls qmake: + # create the cross-qt.conf file from the qmake build-style + # and make qmake use it + cat > "${wrksrc}/qt.conf" <<_EOF +[Paths] +Sysroot=${XBPS_CROSS_BASE} +Prefix=${XBPS_CROSS_BASE}/usr +ArchData=${XBPS_CROSS_BASE}/usr/lib/qt5 +Data=${XBPS_CROSS_BASE}/usr/share/qt5 +Documentation=${XBPS_CROSS_BASE}/usr/share/doc/qt5 +Headers=${XBPS_CROSS_BASE}/usr/include/qt5 +Libraries=${XBPS_CROSS_BASE}/usr/lib +LibraryExecutables=/usr/lib/qt5/libexec +Binaries=/usr/lib/qt5/bin +Tests=${XBPS_CROSS_BASE}/usr/tests +Plugins=/usr/lib/qt5/plugins +Imports=${XBPS_CROSS_BASE}/usr/lib/qt5/imports +Qml2Imports=${XBPS_CROSS_BASE}/usr/lib/qt5/qml +Translations=${XBPS_CROSS_BASE}/usr/share/qt5/translations +Settings=${XBPS_CROSS_BASE}/etc/xdg +Examples=${XBPS_CROSS_BASE}/usr/share/qt5/examples +HostPrefix=/usr +HostData=/usr/lib/qt5 +HostBinaries=/usr/lib/qt5/bin +HostLibraries=/usr/lib +Spec=linux-g++ +TargetSpec=linux-g++ +_EOF + + sed -i -e "s;\(\$QMAKE -r\) \(sonic-visualiser.pro\);\1 -qtconf ${wrksrc}/qt.conf \2;" \ + configure fi + + case "$XBPS_TARGET_MACHINE" in + armv6*) sed -i -e "s/^linux\*:LIBS +=.*/& -latomic/" config.pri.in ;; + esac } do_install() { vbin sonic-visualiser vbin piper-vamp-simple-server vbin vamp-plugin-load-checker - vlicense COPYING - vlicense deploy/linux/doc/sonic-visualiser/copyright + vdoc deploy/linux/doc/sonic-visualiser/copyright vdoc README.md vdoc README.OSC vdoc CITATION From 35c9632d9ac705b329b125453a227d94b63f5e0b Mon Sep 17 00:00:00 2001 From: John Date: Tue, 29 Oct 2019 19:03:49 +0100 Subject: [PATCH 090/186] amdvlk: update to 2019.Q4.1. --- srcpkgs/amdvlk/patches/deprected-copy.patch | 26 +++++++++++-------- srcpkgs/amdvlk/patches/musl.patch | 14 +++-------- srcpkgs/amdvlk/template | 28 ++++++++++----------- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/srcpkgs/amdvlk/patches/deprected-copy.patch b/srcpkgs/amdvlk/patches/deprected-copy.patch index 4d833e4798f..a42a385c13b 100644 --- a/srcpkgs/amdvlk/patches/deprected-copy.patch +++ b/srcpkgs/amdvlk/patches/deprected-copy.patch @@ -1,12 +1,18 @@ ---- pal/shared/gpuopen/cmake/AMD.cmake 2019-06-30 09:35:25.000000000 +0200 -+++ - 2019-07-02 11:07:06.366534309 +0200 -@@ -46,7 +46,8 @@ - target_compile_options(${name} PRIVATE - -Wall # Enable warnings about questionable language constructs. - -Wextra # Enable extra warnings that are not enabled by -Wall. -- -Werror) # Turn warnings into errors. -+ -Werror # Turn warnings into errors. -+ -Wno-error=deprecated-copy) +--- pal/shared/gpuopen/cmake/AMD.cmake 2019-10-18 11:06:42.000000000 +0200 ++++ - 2019-10-29 19:06:00.059615384 +0100 +@@ -89,6 +89,7 @@ + -fno-exceptions # Disable exception handling support. + -fno-rtti # Disable run-time type information support. + -fno-math-errno # Single instruction math operations do not set ERRNO. ++ -Wno-error=deprecated-copy + ) - endfunction() + elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") +@@ -119,6 +120,7 @@ + -Wall # Enable warnings about questionable language constructs. + -Wextra # Enable extra warnings that are not enabled by -Wall. + -Werror # Turn warnings into errors. ++ -Wno-error=deprecated-copy + ) + elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") diff --git a/srcpkgs/amdvlk/patches/musl.patch b/srcpkgs/amdvlk/patches/musl.patch index 5e4e1e9f18d..266bde5a804 100644 --- a/srcpkgs/amdvlk/patches/musl.patch +++ b/srcpkgs/amdvlk/patches/musl.patch @@ -1,17 +1,11 @@ ---- pal/shared/gpuopen/src/posix/ddPosixSocket.cpp 2019-03-01 15:31:04.000000000 +0100 -+++ - 2019-03-04 15:42:00.789284605 +0100 -@@ -34,12 +34,12 @@ +--- pal/shared/gpuopen/src/posix/ddPosixSocket.cpp 2019-10-18 11:06:42.000000000 +0200 ++++ - 2019-10-29 20:15:35.614608453 +0100 +@@ -34,7 +34,7 @@ #include #include #include -#include ++#include #include #include #include - #include - -+#include - #include - #include - #include - diff --git a/srcpkgs/amdvlk/template b/srcpkgs/amdvlk/template index ef74969d1a3..bb41aafd176 100644 --- a/srcpkgs/amdvlk/template +++ b/srcpkgs/amdvlk/template @@ -1,12 +1,12 @@ # Template file for 'amdvlk' pkgname=amdvlk -version=2019.Q3.6 +version=2019.Q4.1 revision=1 -_llpc_commit=4fa48ef1cf0f81eafdb56df91c2f2180d4865101 -_xgl_commit=331558e93794068a786bf699d3fe23bb11bac021 -_pal_commit=68b57dba33a4d922e8f1ef1b3781c2f659ffbd1c -_llvm_commit=9bc5dd4450a6361faf5c5661056a7ee494fad830 -_spvgen_commit=2f31d1170e8a12a66168b23235638c4bbc43ecdc +_llpc_commit=3f15347d38da804814fdd9e24e2875ee0b2b9245 +_xgl_commit=19a031d9f73b95101fd4d3d594aca27c00feb180 +_pal_commit=39abe2297ca58a2b84dcd9bc5e238fbc399bd6e0 +_llvm_project_commit=40fbaf4c5446a361269c241d9112fff26575b5d0 +_spvgen_commit=f1bc2ba988273c3724afffe72fe9cd933a022ce7 _MetroHash_commit=2b6fee002db6cc92345b02aeee963ebaaf4c0e2f _CWPack_commit=b601c88aeca7a7b08becb3d32709de383c8ee428 archs="i686* x86_64*" @@ -27,16 +27,16 @@ distfiles="https://github.com/GPUOpen-Drivers/AMDVLK/archive/v-${version}.tar.gz https://github.com/GPUOpen-Drivers/llpc/archive/${_llpc_commit}.tar.gz https://github.com/GPUOpen-Drivers/xgl/archive/${_xgl_commit}.tar.gz https://github.com/GPUOpen-Drivers/pal/archive/${_pal_commit}.tar.gz - https://github.com/GPUOpen-Drivers/llvm/archive/${_llvm_commit}.tar.gz + https://github.com/GPUOpen-Drivers/llvm-project/archive/${_llvm_project_commit}.tar.gz https://github.com/GPUOpen-Drivers/spvgen/archive/${_spvgen_commit}.tar.gz https://github.com/GPUOpen-Drivers/MetroHash/archive/${_MetroHash_commit}.tar.gz https://github.com/GPUOpen-Drivers/CWPack/archive/${_CWPack_commit}.tar.gz" -checksum="9afb90b56c3c1213c97ef3364b1d31d0e85a81469c861b43dc389af5672c6331 - abe541ef6cd4fa3ca1eaab52412caa29e2adedec0fab40894aef88d33deee584 - 939a2cf69d840e01da8b3e69f5ffe1f852f9d2919cdbc8aa4ade7cff7ac56906 - 7648ca7761b588b6025f8fe16fcf4216bf7e1fe53c6568377f5cca98feca9627 - efbde2752044ec74d522c160899491105dbc77bb8a08ff64c274d2b94a6916d1 - cc946ad2835e502aca904c5f87802a2004eaed4729cb5c1dc29a5258d1c1e401 +checksum="2265bd0be973d4511cd47da29052b368369e5ac4133f3b08ab8c89c51d759986 + d1957eb1aaaab89aab78f3d375cea93c4b91e47f602627b048f0fb71d8e7eb3d + 47fdcb4ed0c9b2e1f61abe761bab912ca228dfd6103c2070c94244c6a2f13b5e + 3def3a94e20dbb67cb4effdacc4c180ebf5bf30a4ae27ad6849cd32aa0628463 + 6f469cac7c2deaff595cd689a83067da6cfbee0f97362f6fa9f6c50b5bb23b56 + 77a4cad8691960b825e86b624bb5433f5098b8a49cb0d758e17c6d59e25a9361 e8ecf026584dd953e39c3abba2eb04d28b28ed4577482ee70265f0d421fef398 58ca397f33d62bcfecaecd89eb4ad466a6c33e1c619e5cf742822074f1f7d664" nocross=yes @@ -47,7 +47,7 @@ post_extract() { mv ${wrksrc}/xgl-${_xgl_commit} ${wrksrc}/xgl mv ${wrksrc}/pal-${_pal_commit} ${wrksrc}/pal mv ${wrksrc}/llpc-${_llpc_commit} ${wrksrc}/llpc - mv ${wrksrc}/llvm-${_llvm_commit} ${wrksrc}/llvm + mv ${wrksrc}/llvm-project-${_llvm_project_commit} ${wrksrc}/llvm-project mv ${wrksrc}/spvgen-${_spvgen_commit} ${wrksrc}/spvgen mv ${wrksrc}/MetroHash-${_MetroHash_commit} ${wrksrc}/metrohash mv ${wrksrc}/CWPack-${_CWPack_commit} ${wrksrc}/cwpack From db5ce1246fa739c33ab90e1ce4678d9c896b40d6 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 29 Oct 2019 23:02:25 +0100 Subject: [PATCH 091/186] Mustache: update to 4.0. --- ...001-Fix-compiling-of-tests-on-gcc8.2.patch | 33 ------------------- srcpkgs/Mustache/template | 4 +-- 2 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 srcpkgs/Mustache/patches/0001-Fix-compiling-of-tests-on-gcc8.2.patch diff --git a/srcpkgs/Mustache/patches/0001-Fix-compiling-of-tests-on-gcc8.2.patch b/srcpkgs/Mustache/patches/0001-Fix-compiling-of-tests-on-gcc8.2.patch deleted file mode 100644 index f446978682e..00000000000 --- a/srcpkgs/Mustache/patches/0001-Fix-compiling-of-tests-on-gcc8.2.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 33c8f46a28fb80144cf6d5a01352de0ef8474880 Mon Sep 17 00:00:00 2001 -From: John Zimmermann -Date: Tue, 29 Jan 2019 13:59:16 +0100 -Subject: [PATCH] Fix compiling of tests on gcc8.2 - -``` -In file included from tests.cpp:32: -tests.cpp: In function 'void ____C_A_T_C_H____T_E_S_T____114()': -tests.cpp:1094:48: error: catching polymorphic type 'class std::bad_function_call' by value [-Werror=catch-value=] - CHECK_THROWS_AS(tmpl.render(dat), std::bad_function_call); - ^~~~~~~~~~~~~~~~~ -cc1plus: all warnings being treated as error -``` ---- - tests.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git tests.cpp tests.cpp -index a9176b7..276f0b3 100644 ---- tests.cpp -+++ tests.cpp -@@ -1091,7 +1091,7 @@ TEST_CASE("custom_escape") { - mustache::escape_handler esc; - tmpl.set_custom_escape(esc); - object dat({ {"what", "\"friend\""} }); -- CHECK_THROWS_AS(tmpl.render(dat), std::bad_function_call); -+ CHECK_THROWS_AS(tmpl.render(dat), std::bad_function_call&); - } - - } --- -2.20.1 - diff --git a/srcpkgs/Mustache/template b/srcpkgs/Mustache/template index 503ba54d372..ce023d04e80 100644 --- a/srcpkgs/Mustache/template +++ b/srcpkgs/Mustache/template @@ -1,13 +1,13 @@ # Template file for 'Mustache' pkgname=Mustache -version=3.2.1 +version=4.0 revision=1 short_desc="Mustache text templates for modern C++" maintainer="John " license="BSL-1.0" homepage="https://github.com/kainjow/Mustache" distfiles="https://github.com/kainjow/Mustache/archive/v${version}.tar.gz" -checksum=0d17298a81c08f12ebc446cdee387268a395d34bb724050fe67d5ce8c4e98b7a +checksum=17129681ee207404409d71bdc649f08d47029e3dea0ef68e5cd47868de1be23c do_check() { make From c8e8c7fc52a8cbc6b95161437319ce8865cc5cc3 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 29 Oct 2019 23:08:45 +0100 Subject: [PATCH 092/186] bluedevil: update to 5.17.2 [ci skip] --- srcpkgs/bluedevil/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/bluedevil/template b/srcpkgs/bluedevil/template index e646992cbb6..d36140e694d 100644 --- a/srcpkgs/bluedevil/template +++ b/srcpkgs/bluedevil/template @@ -1,6 +1,6 @@ # Template file for 'bluedevil' pkgname=bluedevil -version=5.17.1 +version=5.17.2 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -11,7 +11,7 @@ maintainer="John " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://projects.kde.org/projects/plasma/bluedevil" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=3baebc20877469f1205bb3c6368740acd0f76e70e45879a8c3764b7bd0f1259e +checksum=05e22ff2e719ddafd1a18e0dd1766743f0879aab8d7ba3f366a6cc407e00c697 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel" From b5ec91748419a5e44af885dc3b8aebbca9893b5a Mon Sep 17 00:00:00 2001 From: John Date: Tue, 29 Oct 2019 23:08:47 +0100 Subject: [PATCH 093/186] breeze-gtk: update to 5.17.2 [ci skip] --- srcpkgs/breeze-gtk/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/breeze-gtk/template b/srcpkgs/breeze-gtk/template index 4d88106a283..5bb432519ab 100644 --- a/srcpkgs/breeze-gtk/template +++ b/srcpkgs/breeze-gtk/template @@ -1,6 +1,6 @@ # Template file for 'breeze-gtk' pkgname=breeze-gtk -version=5.17.1 +version=5.17.2 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules sassc python3 python3-cairo" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://projects.kde.org/projects/plasma/breeze-gtk" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=95f2173920bf7d36b408912c624d2a1ef64b7a10798cf3a4fdc2bd8f1e5def4d +checksum=d89fd00df51d8631d14b99138393a9daf679599ade1d1b299407dc96c1640c02 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-devel" From 34a62e7a0af2aeb88769130f5dc3ae038ca2d147 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 29 Oct 2019 23:08:50 +0100 Subject: [PATCH 094/186] breeze: update to 5.17.2 [ci skip] --- srcpkgs/breeze/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/breeze/template b/srcpkgs/breeze/template index dc265bd1c29..0f409e108ef 100644 --- a/srcpkgs/breeze/template +++ b/srcpkgs/breeze/template @@ -1,6 +1,6 @@ # Template file for 'breeze' pkgname=breeze -version=5.17.1 +version=5.17.2 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -14,7 +14,7 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://projects.kde.org/projects/plasma/breeze" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=79c717f34ccaad10e68c5de8b5363f0bee73986de3e06a4cd8b7902159761ce6 +checksum=042d41c0b12afa47a0fe6fe72cb23eb2261312955307ab905ba55201d814b095 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework" From 9e1b34261fc2911d4fb47b5bdeb7ace2a2bccd49 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 29 Oct 2019 23:08:52 +0100 Subject: [PATCH 095/186] kactivitymanagerd: update to 5.17.2 [ci skip] --- srcpkgs/kactivitymanagerd/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template index 014b1916bff..2e67511d889 100644 --- a/srcpkgs/kactivitymanagerd/template +++ b/srcpkgs/kactivitymanagerd/template @@ -1,6 +1,6 @@ # Template file for 'kactivitymanagerd' pkgname=kactivitymanagerd -version=5.17.1 +version=5.17.2 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -12,7 +12,7 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://projects.kde.org/projects/plasma/kactivitymanagerd" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=2eac1a41622e6632c3a569f1b8d5043f6414611c4dbeba2521eabebebd8e50b3 +checksum=74dd669315cf41fbd79ec5bd209bdef9955263c63ec4c55c5ab7402a35e49340 if [ "$CROSS_BUILD" ]; then configure_args+=" -DRUN_RESULT_VAR=0" From 17bd362c960b946b035607aed9ee86d8f5cce6c3 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 29 Oct 2019 23:08:54 +0100 Subject: [PATCH 096/186] kde-cli-tools: update to 5.17.2 [ci skip] --- srcpkgs/kde-cli-tools/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kde-cli-tools/template b/srcpkgs/kde-cli-tools/template index 31a2eb9fb21..98bfbd78df9 100644 --- a/srcpkgs/kde-cli-tools/template +++ b/srcpkgs/kde-cli-tools/template @@ -1,6 +1,6 @@ # Template file for 'kde-cli-tools' pkgname=kde-cli-tools -version=5.17.1 +version=5.17.2 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-2.1-or-later, GPL-2.0-or-later" homepage="https://cgit.kde.org/kde-cli-tools.git" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=e24c91347b57f97b489cf444d79b3bb8703a9879c05f656b312f83b1291f67ae +checksum=fb8a0600b06d6f1c663403d26f5f395b94984bb912078062b426f8924880083c if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kdoctools kcoreaddons python qt5-host-tools qt5-qmake" From ea8cc519a0ce0db80949debd8965101c8a8a76df Mon Sep 17 00:00:00 2001 From: John Date: Tue, 29 Oct 2019 23:08:56 +0100 Subject: [PATCH 097/186] kde-gtk-config5: update to 5.17.2 [ci skip] --- srcpkgs/kde-gtk-config5/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kde-gtk-config5/template b/srcpkgs/kde-gtk-config5/template index 78e98ae4843..f4b21f0e349 100644 --- a/srcpkgs/kde-gtk-config5/template +++ b/srcpkgs/kde-gtk-config5/template @@ -1,6 +1,6 @@ # Template file for 'kde-gtk-config5' pkgname=kde-gtk-config5 -version=5.17.1 +version=5.17.2 revision=1 wrksrc="${pkgname%5}-${version}" build_style=cmake @@ -14,7 +14,7 @@ maintainer="John " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://projects.kde.org/projects/plasma/kde-gtk-config" distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz" -checksum=1502cbd17d9bda1b956f6ce930cb6a5c3ae98c4f84e833f8f48db4155f83c8b0 +checksum=81f678af545be51212160ce9b824b282bb9f7626679a4b540b935bf4d606a1ba if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kcoreaddons" From 37f46d0ab38be9974f70aaf87b24c2990c9c6699 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 29 Oct 2019 23:08:58 +0100 Subject: [PATCH 098/186] kdecoration: update to 5.17.2 [ci skip] --- srcpkgs/kdecoration/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kdecoration/template b/srcpkgs/kdecoration/template index bda7971d7c7..9ff6e33550c 100644 --- a/srcpkgs/kdecoration/template +++ b/srcpkgs/kdecoration/template @@ -1,6 +1,6 @@ # Template file for 'kdecoration' pkgname=kdecoration -version=5.17.1 +version=5.17.2 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://projects.kde.org/projects/plasma/kdecoration" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=4f8f7d851b19e141e91eadb4ddbf2fef2d6496839a929349a1568d618bb0be39 +checksum=80842366805d38557aac93c747e3a20bcc778dfd41b7fd2fecc96159cb906c11 kdecoration-devel_package() { short_desc+=" - development" From 3151a311b876caef795848a0e3d901b9a125f3e2 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 29 Oct 2019 23:09:00 +0100 Subject: [PATCH 099/186] kdeplasma-addons5: update to 5.17.2 [ci skip] --- srcpkgs/kdeplasma-addons5/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kdeplasma-addons5/template b/srcpkgs/kdeplasma-addons5/template index edf56c09e9d..2f10e123745 100644 --- a/srcpkgs/kdeplasma-addons5/template +++ b/srcpkgs/kdeplasma-addons5/template @@ -1,6 +1,6 @@ # Template file for 'kdeplasma-addons5' pkgname=kdeplasma-addons5 -version=5.17.1 +version=5.17.2 revision=1 wrksrc="${pkgname%5}-${version}" build_style=cmake @@ -13,7 +13,7 @@ maintainer="John " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://projects.kde.org/projects/plasma/kdeplasma-addons" distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz" -checksum=f1e7685c3efa5625d8f3e05477bb25f5c2c25fc1f045a4fbafcd04851e94b7f0 +checksum=05946299e2a58d923eb0667fcdb0c19ecd45ed4a242b364ac1f040bb770b5a9b if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework" From d7273e4a3ae1caab5c9eb0d5471e659fdd50407d Mon Sep 17 00:00:00 2001 From: John Date: Tue, 29 Oct 2019 23:09:02 +0100 Subject: [PATCH 100/186] kgamma5: update to 5.17.2 [ci skip] --- srcpkgs/kgamma5/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kgamma5/template b/srcpkgs/kgamma5/template index 56b5c970f67..66a48584f3f 100644 --- a/srcpkgs/kgamma5/template +++ b/srcpkgs/kgamma5/template @@ -1,6 +1,6 @@ # Template file for 'kgamma5' pkgname=kgamma5 -version=5.17.1 +version=5.17.2 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -11,7 +11,7 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://projects.kde.org/projects/plasma/kgamma5" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=42c70927d3ff0d224a13ba6f1e4b7ae47b9863fa9372e18a02dd653868de3ba8 +checksum=fca731f2abc82566ec5f15d697171de00efe74c0b44a414787724246bd5adf5c if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-devel kdoctools" From e0efb5e11559337fbc8f3ea3fa5c0e365cd49239 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 29 Oct 2019 23:09:04 +0100 Subject: [PATCH 101/186] khotkeys: update to 5.17.2 [ci skip] --- srcpkgs/khotkeys/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/khotkeys/template b/srcpkgs/khotkeys/template index 9467612d11e..68860d2f6f5 100644 --- a/srcpkgs/khotkeys/template +++ b/srcpkgs/khotkeys/template @@ -1,6 +1,6 @@ # Template file for 'khotkeys' pkgname=khotkeys -version=5.17.1 +version=5.17.2 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -12,7 +12,7 @@ maintainer="John " license="GPL-2.0-only, LGPL-2.0-or-later" homepage="https://projects.kde.org/projects/plasma/khotkeys" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=1d7bf7af83f9d33122de3fe33d831d0db5be30de2cab3a7ca3f8f086098b9f72 +checksum=ecd01c235e9895d1e7b8cbff8baa6ff53a99ae2d8bc2c4c10ef06ac15e47b582 if [ "$CROSS_BUILD" ]; then configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson" From 07f7717b4bf9eee93e4d7852af5f6cf66d1418a6 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 29 Oct 2019 23:09:06 +0100 Subject: [PATCH 102/186] kinfocenter: update to 5.17.2 [ci skip] --- srcpkgs/kinfocenter/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template index 1ae00d8a4e5..79e270f071d 100644 --- a/srcpkgs/kinfocenter/template +++ b/srcpkgs/kinfocenter/template @@ -1,6 +1,6 @@ # Template file for 'kinfocenter' pkgname=kinfocenter -version=5.17.1 +version=5.17.2 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -13,7 +13,7 @@ maintainer="John " license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2" homepage="https://projects.kde.org/projects/plasma/kinfocenter" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=2bab780dfc5ef242e2b5decd3a213294323db5830d7afad09a5db011ce470a8e +checksum=1691df791a609572fcf09f952b98baff0a51d950088e25e212710aaff9dc4e7e if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel kdoctools-devel" From a4228b4d41a37059dfc7c1273fca3f6f90d0793d Mon Sep 17 00:00:00 2001 From: John Date: Tue, 29 Oct 2019 23:09:09 +0100 Subject: [PATCH 103/186] kmenuedit: update to 5.17.2 [ci skip] --- srcpkgs/kmenuedit/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template index 1e3a2d97c7d..0f21b23af55 100644 --- a/srcpkgs/kmenuedit/template +++ b/srcpkgs/kmenuedit/template @@ -1,6 +1,6 @@ # Template file for 'kmenuedit' pkgname=kmenuedit -version=5.17.1 +version=5.17.2 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -13,4 +13,4 @@ maintainer="John " license="GPL-2" homepage="https://projects.kde.org/projects/plasma/kmenuedit" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=90bd4c403ee3ce21616f5016401a1851d8e7375a1e9cd6b04f0213ccce15eb76 +checksum=a99e4985ce2591d8d7f6b444f323ca709f68caa3bee334fd8e5ca6afafc7503f From 130078b41f8ae2f6587192413a9feb8601b955a0 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 29 Oct 2019 23:09:11 +0100 Subject: [PATCH 104/186] kscreen: update to 5.17.2 [ci skip] --- srcpkgs/kscreen/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template index 02827b3ff60..9ed4fad071d 100644 --- a/srcpkgs/kscreen/template +++ b/srcpkgs/kscreen/template @@ -1,6 +1,6 @@ # Template file for 'kscreen' pkgname=kscreen -version=5.17.1 +version=5.17.2 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -14,7 +14,7 @@ maintainer="John " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://projects.kde.org/projects/plasma/kscreen" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=859dbdd7e6ff8d1a68f2cc004ac2c9ac647cb0a2c71af8a56abeb260fb8a60ca +checksum=0c7ad59ebf89cbf74a748aac6c7d08007b48170d1c18affbf2b230809e487957 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework" From ba3e2979827a084e516dfb7883fb430e43a336b6 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 29 Oct 2019 23:09:13 +0100 Subject: [PATCH 105/186] kscreenlocker: update to 5.17.2 [ci skip] --- srcpkgs/kscreenlocker/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template index b853ae793e4..78d91f6ed29 100644 --- a/srcpkgs/kscreenlocker/template +++ b/srcpkgs/kscreenlocker/template @@ -1,6 +1,6 @@ # Template file for 'kscreenlocker' pkgname=kscreenlocker -version=5.17.1 +version=5.17.2 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -13,7 +13,7 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://projects.kde.org/projects/plasma/kscreenlocker" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=56a0ed3284c3ce087d3230789bac5b02505e7ed9795fa37ce9934bc5090673e4 +checksum=a116794a29ce44cd17855b271a988d9a70138fda286906a161cb4dde4fb9e357 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" wayland-devel" From 494c76cb52c80c3e59797a8e48056cb17b8c8388 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 29 Oct 2019 23:09:15 +0100 Subject: [PATCH 106/186] ksshaskpass: update to 5.17.2 [ci skip] --- srcpkgs/ksshaskpass/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ksshaskpass/template b/srcpkgs/ksshaskpass/template index 250135ef712..3d22566f60a 100644 --- a/srcpkgs/ksshaskpass/template +++ b/srcpkgs/ksshaskpass/template @@ -1,6 +1,6 @@ # Template file for 'ksshaskpass' pkgname=ksshaskpass -version=5.17.1 +version=5.17.2 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -11,4 +11,4 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://projects.kde.org/projects/plasma/ksshaskpass" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=ce003264a9a756924bf6c360fd20bf0f5f212f5469fc5d291de2269d10764f24 +checksum=a20aac7ba5c1df6c72fa9cfc9573698c9c54e8f8f6b4727f3a50ac5f0faf4093 From 20f724b8fea380a16752e0ef4bc9da51b65d7cdd Mon Sep 17 00:00:00 2001 From: John Date: Tue, 29 Oct 2019 23:09:17 +0100 Subject: [PATCH 107/186] ksysguard: update to 5.17.2 [ci skip] --- srcpkgs/ksysguard/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ksysguard/template b/srcpkgs/ksysguard/template index 7406e53f75e..0c00397c4d7 100644 --- a/srcpkgs/ksysguard/template +++ b/srcpkgs/ksysguard/template @@ -1,6 +1,6 @@ # Template file for 'ksysguard' pkgname=ksysguard -version=5.17.1 +version=5.17.2 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -13,4 +13,4 @@ maintainer="John " license="GPL-2.0-or-later, GFDL-1.2" homepage="https://projects.kde.org/projects/plasma/ksysguard" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=44bd28b6bdddd9208392334ed6bba4b17b42f70c65dfe7668aecab7c67111c9e +checksum=8dab9531d13ec4a00c3a65b08771433ced0b5ed636beab2f9830b372d9f4fc12 From 01d98226f50bfbbeb7b0fbb18f597229962216a0 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 29 Oct 2019 23:09:19 +0100 Subject: [PATCH 108/186] kwallet-pam: update to 5.17.2 [ci skip] --- srcpkgs/kwallet-pam/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kwallet-pam/template b/srcpkgs/kwallet-pam/template index 64bb63dbf24..acc972e33ce 100644 --- a/srcpkgs/kwallet-pam/template +++ b/srcpkgs/kwallet-pam/template @@ -1,6 +1,6 @@ # Template file for 'kwallet-pam' pkgname=kwallet-pam -version=5.17.1 +version=5.17.2 revision=1 build_style=cmake hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules" @@ -11,4 +11,4 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://projects.kde.org/projects/plasma/kwallet-pam" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=f4a713e5b03d979678904476b0c5759f7c30dc8bf1d883bd8044e2755985c49f +checksum=92d94286e3c4316851f1a43010ce4dc813b6e8f74eb990849f0fa392340fdf7a From 5b3fc6a727c6bb5c07994903911809f5dd26475f Mon Sep 17 00:00:00 2001 From: John Date: Tue, 29 Oct 2019 23:09:21 +0100 Subject: [PATCH 109/186] kwayland-integration: update to 5.17.2 [ci skip] --- srcpkgs/kwayland-integration/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kwayland-integration/template b/srcpkgs/kwayland-integration/template index e38af86a0a4..48db2cfb74e 100644 --- a/srcpkgs/kwayland-integration/template +++ b/srcpkgs/kwayland-integration/template @@ -1,6 +1,6 @@ # Template file for 'kwayland-integration' pkgname=kwayland-integration -version=5.17.1 +version=5.17.2 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -11,4 +11,4 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://projects.kde.org/projects/plasma/kwayland-integration" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=39aad4ef15bf960626a11be52b0056cbd945f53409275e668665ea6369f8ab90 +checksum=27740c241d7b14ce4ac9d7b999d8ed75011a68fdfc8f2a3df662d6078ed123a7 From fff44f1b5c0f7faa8c3516bc55b474d899c786bb Mon Sep 17 00:00:00 2001 From: John Date: Tue, 29 Oct 2019 23:09:24 +0100 Subject: [PATCH 110/186] kwin: update to 5.17.2 [ci skip] --- srcpkgs/kwin/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template index 69f134fb94d..4b1fb76f9e9 100644 --- a/srcpkgs/kwin/template +++ b/srcpkgs/kwin/template @@ -1,6 +1,6 @@ # Template file for 'kwin' pkgname=kwin -version=5.17.1 +version=5.17.2 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -15,7 +15,7 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://projects.kde.org/projects/plasma/kwin" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=9be622116d4a39b699f43e147a31872d1d8a80eda5b5426d7e4272d8cfacdcd5 +checksum=987a6035b85497193996d3917421012ac16451d4c935e0d1fef014d8cfd57db8 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-qmake qt5-host-tools kcoreaddons kconfig" From c152a31855c250dcc266c7f67a8bc223275c7268 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 29 Oct 2019 23:09:26 +0100 Subject: [PATCH 111/186] kwrited: update to 5.17.2 [ci skip] --- srcpkgs/kwrited/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kwrited/template b/srcpkgs/kwrited/template index 99d911efa84..67ac3df10b0 100644 --- a/srcpkgs/kwrited/template +++ b/srcpkgs/kwrited/template @@ -1,6 +1,6 @@ # Template file for 'kwrited' pkgname=kwrited -version=5.17.1 +version=5.17.2 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -11,4 +11,4 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://projects.kde.org/projects/plasma/kwrited" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=7434553cd7b60380c5960d0f6e8bf363f544d45ef7e1aed1b9b3c98bceeb1bf2 +checksum=d57525305db38cb202cf87eca19b0893a0397fb6c19bf9736591d522731d1582 From 6ec5f5a3a21137c89e816a4efccaebf7ae116c2c Mon Sep 17 00:00:00 2001 From: John Date: Tue, 29 Oct 2019 23:09:28 +0100 Subject: [PATCH 112/186] libkscreen: update to 5.17.2 [ci skip] --- srcpkgs/libkscreen/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template index c302b652379..4608bd8c405 100644 --- a/srcpkgs/libkscreen/template +++ b/srcpkgs/libkscreen/template @@ -1,6 +1,6 @@ # Template file for 'libkscreen' pkgname=libkscreen -version=5.17.1 +version=5.17.2 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://projects.kde.org/projects/extragear/libs/libkscreen" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=299e8e2d8be71674666002d850383ec01bfc794fcb180811c2e2cd70a5574078 +checksum=7dbd01b18b8e8e7f84799cb4ee558cf82db840a716bd209b53ae32d018ffd4f1 libkscreen-devel_package() { short_desc+=" - development" From 84fc7eed165fd1b409475402bdbdbb210d15d1f2 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 29 Oct 2019 23:09:30 +0100 Subject: [PATCH 113/186] libksysguard: update to 5.17.2 [ci skip] --- srcpkgs/libksysguard/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template index f2bc583c887..f4b8142b0f9 100644 --- a/srcpkgs/libksysguard/template +++ b/srcpkgs/libksysguard/template @@ -1,6 +1,6 @@ # Template file for 'libksysguard' pkgname=libksysguard -version=5.17.1 +version=5.17.2 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://projects.kde.org/projects/plasma/libksysguard" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=b0f9e057d4b1424c56958e0f2d1af9cd88081277d8785e616df6a55f19539f81 +checksum=7d4fa8ca098586d48e96e15a35183df9cd1060f2a0ec49f66423600e53355478 libksysguard-devel_package() { short_desc+=" - development" From a12203e8c9265ee89d94a39eb26f341052eeae23 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 29 Oct 2019 23:09:32 +0100 Subject: [PATCH 114/186] milou: update to 5.17.2 [ci skip] --- srcpkgs/milou/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/milou/template b/srcpkgs/milou/template index 9531d89996a..dd3fed58b3f 100644 --- a/srcpkgs/milou/template +++ b/srcpkgs/milou/template @@ -1,6 +1,6 @@ # Template file for 'milou' pkgname=milou -version=5.17.1 +version=5.17.2 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -12,7 +12,7 @@ maintainer="John " license="GPL-2.0-or-later, LPGL-2.1-or-later" homepage="https://projects.kde.org/projects/plasma/milou" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=131b1b5e5718415018db0dff193343bd8cd3732dce941b2780f1bd3544fbde6a +checksum=94fb7cb59c4aef514ec004f83ea05d90439098d75b43e525b7035b4f61c3d0c3 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework" From a5d1e6ebc62c80e7860ee65e2a0a02cb2a5187f2 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 29 Oct 2019 23:09:34 +0100 Subject: [PATCH 115/186] oxygen: update to 5.17.2 [ci skip] --- srcpkgs/oxygen/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/oxygen/template b/srcpkgs/oxygen/template index 82f8078f5b7..e042e1d0321 100644 --- a/srcpkgs/oxygen/template +++ b/srcpkgs/oxygen/template @@ -1,6 +1,6 @@ # Template file for 'oxygen' pkgname=oxygen -version=5.17.1 +version=5.17.2 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -13,4 +13,4 @@ maintainer="John " license="LGPL-2.1-or-later, GPL-2.0-or-later" homepage="https://projects.kde.org/projects/plasma/oxygen" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=5271d6ccf0d876ac32bfb6928cf5d4d3c72b42e0973ef484a2fab379d3264ad0 +checksum=ca7f57ad8bd14b452041e55aa05770d6eff9b1230a5e48e5d6e624762f8645f1 From 0f4a2ebdfce944785932792d4dd1f4090ae97188 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 29 Oct 2019 23:09:36 +0100 Subject: [PATCH 116/186] plasma-browser-integration: update to 5.17.2 [ci skip] --- srcpkgs/plasma-browser-integration/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plasma-browser-integration/template b/srcpkgs/plasma-browser-integration/template index bf259af6340..aff4c8833f9 100644 --- a/srcpkgs/plasma-browser-integration/template +++ b/srcpkgs/plasma-browser-integration/template @@ -1,6 +1,6 @@ # Template file for 'plasma-browser-integration' pkgname=plasma-browser-integration -version=5.17.1 +version=5.17.2 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -13,7 +13,7 @@ maintainer="1is7ac3 " license="GPL-3.0-or-later" homepage="https://projects.kde.org/projects/plasma/plasma-browser-integration" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=b44949dab234b3377ae9bc6a8fc8e77577a7859186343f89bd796f1bf07bc827 +checksum=e95fcc00f27628119d196ad681f48b882379aa38e3f897dc003909a16aad69a1 if [ "${CROSS_BUILD}" ]; then configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson" From 08a2dbc8d742b4538b06573ba5a8e55bb8908a20 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 29 Oct 2019 23:09:40 +0100 Subject: [PATCH 117/186] plasma-desktop: update to 5.17.2 [ci skip] --- srcpkgs/plasma-desktop/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plasma-desktop/template b/srcpkgs/plasma-desktop/template index d2835999a6b..3e62d6f7927 100644 --- a/srcpkgs/plasma-desktop/template +++ b/srcpkgs/plasma-desktop/template @@ -1,6 +1,6 @@ # Template file for 'plasma-desktop' pkgname=plasma-desktop -version=5.17.1 +version=5.17.2 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -15,7 +15,7 @@ maintainer="John " license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2" homepage="https://projects.kde.org/projects/plasma/plasma-desktop" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=0bc6622f1d359f748b0d29e3ec69fed99f313258243b25344a729383abda6f8a +checksum=9ab540c31240f97495500a50f3ecc052a894ea7607e125204e85d75a52d6d4d3 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kconfig-devel kcoreaddons-devel kded From 9a09f4903f6c511e14fd0f88134aff7840f4bc5f Mon Sep 17 00:00:00 2001 From: John Date: Tue, 29 Oct 2019 23:09:42 +0100 Subject: [PATCH 118/186] plasma-integration: update to 5.17.2 [ci skip] --- srcpkgs/plasma-integration/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plasma-integration/template b/srcpkgs/plasma-integration/template index 3924ab8af86..fc42fbaaaa8 100644 --- a/srcpkgs/plasma-integration/template +++ b/srcpkgs/plasma-integration/template @@ -1,6 +1,6 @@ # Template file for 'plasma-integration' pkgname=plasma-integration -version=5.17.1 +version=5.17.2 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -13,4 +13,4 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://projects.kde.org/projects/plasma/plasma-integration" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=05a1d8c3fd46caf9ffaa2195eb59ffe7586bc8294f33d8afcc7a3b6288fe6fbe +checksum=3a03ca65098dee856b5e2a75da63d07872da9e72b0148746109c108e4917e993 From d1589d1417718eac4b0b8dc6543582eec54a2bdf Mon Sep 17 00:00:00 2001 From: John Date: Tue, 29 Oct 2019 23:09:44 +0100 Subject: [PATCH 119/186] plasma-nm: update to 5.17.2 [ci skip] --- srcpkgs/plasma-nm/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plasma-nm/template b/srcpkgs/plasma-nm/template index e52e1cfacff..e84f96a07c5 100644 --- a/srcpkgs/plasma-nm/template +++ b/srcpkgs/plasma-nm/template @@ -1,6 +1,6 @@ # Template file for 'plasma-nm' pkgname=plasma-nm -version=5.17.1 +version=5.17.2 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -15,7 +15,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://projects.kde.org/projects/plasma/plasma-nm" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=32b5de845924636ba103dc2641be8ce8cbb7709f186ebae2d33df8f2017820ef +checksum=d477db02b2db43ef2b43b73f8f8857388533188ee08ae10a48cbe7c214d4bf70 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework" From 2c175c8adbff5882cd0d87b16179d68383691759 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 29 Oct 2019 23:09:46 +0100 Subject: [PATCH 120/186] plasma-pa: update to 5.17.2 [ci skip] --- srcpkgs/plasma-pa/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plasma-pa/template b/srcpkgs/plasma-pa/template index 443a9d03192..2d71b56da70 100644 --- a/srcpkgs/plasma-pa/template +++ b/srcpkgs/plasma-pa/template @@ -1,6 +1,6 @@ # Template file for 'plasma-pa' pkgname=plasma-pa -version=5.17.1 +version=5.17.2 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://projects.kde.org/projects/plasma/plasma-pa" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=f9f4544bee4a2e2bd4197b019b5c6ffb969bbdd27afe3e1ef02b681e9a0ed769 +checksum=6c78e852c3eb665000fdfac7901fb568d565552aaace4219c4a051d29b6e8d8b if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel" From f609a902b20e0ba37c8d9ede3ea0ba0d0d1e24ef Mon Sep 17 00:00:00 2001 From: John Date: Tue, 29 Oct 2019 23:09:48 +0100 Subject: [PATCH 121/186] plasma-sdk: update to 5.17.2 [ci skip] --- srcpkgs/plasma-sdk/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plasma-sdk/template b/srcpkgs/plasma-sdk/template index 5d2e512d752..33133b22f1b 100644 --- a/srcpkgs/plasma-sdk/template +++ b/srcpkgs/plasma-sdk/template @@ -1,6 +1,6 @@ # Template file for 'plasma-sdk' pkgname=plasma-sdk -version=5.17.1 +version=5.17.2 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -12,7 +12,7 @@ maintainer="John " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://projects.kde.org/projects/plasma/plasma-sdk" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=28f2ecd9cc495d466cb0e027793df8aab63a84b979646115bcd257d66075acbb +checksum=59f8351567242e05c8f435af57621fe12d3e60628b4b0347e138fc9a60bd10b3 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework" From e1debea577950c6dc73e25cd79291f1c3515a348 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 29 Oct 2019 23:09:50 +0100 Subject: [PATCH 122/186] plasma-thunderbolt: update to 5.17.2 [ci skip] --- srcpkgs/plasma-thunderbolt/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plasma-thunderbolt/template b/srcpkgs/plasma-thunderbolt/template index 7a2982396b6..6f7ebb76209 100644 --- a/srcpkgs/plasma-thunderbolt/template +++ b/srcpkgs/plasma-thunderbolt/template @@ -1,6 +1,6 @@ # Template file for 'plasma-thunderbolt' pkgname=plasma-thunderbolt -version=5.17.1 +version=5.17.2 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules kcoreaddons kcmutils @@ -12,7 +12,7 @@ maintainer="John " license="GPL-3.0-or-later" homepage="https://cgit.kde.org/plasma-thunderbolt.git" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=ba28a14b0ac17e15e41484431054929d3aa237b78f66b3c8383219bb6e9a9e17 +checksum=0fd2dc9220cfcb9ec46faf6423a694caac24a5ec98f1fe34172c47f0db093255 do_check() { : # Requires running dbus and bolt services From b08533542908068b017b295653f90a80192ebdda Mon Sep 17 00:00:00 2001 From: John Date: Tue, 29 Oct 2019 23:09:52 +0100 Subject: [PATCH 123/186] plasma-vault: update to 5.17.2 [ci skip] --- srcpkgs/plasma-vault/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plasma-vault/template b/srcpkgs/plasma-vault/template index aeb4f49248a..57490a6edf2 100644 --- a/srcpkgs/plasma-vault/template +++ b/srcpkgs/plasma-vault/template @@ -1,6 +1,6 @@ # Template file for 'plasma-vault' pkgname=plasma-vault -version=5.17.1 +version=5.17.2 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools" @@ -10,7 +10,7 @@ maintainer="Giuseppe Fierro " license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://github.com/KDE/plasma-vault" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=a71ef24566ae6a0d61e21dfb65aac11381ffaa340c16b47d2db887c4690ea71b +checksum=38c6d6c6c3ea40ff81b5529c50fdc6da30111ab287f04163891032ca86beb87f if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework" From 25d1ff4f3ad5ade12a7b407d75f62ed6cb055952 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 29 Oct 2019 23:09:59 +0100 Subject: [PATCH 124/186] plasma-workspace-wallpapers: update to 5.17.2 [ci skip] --- srcpkgs/plasma-workspace-wallpapers/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plasma-workspace-wallpapers/template b/srcpkgs/plasma-workspace-wallpapers/template index 81de5592008..c3b6d3a4de2 100644 --- a/srcpkgs/plasma-workspace-wallpapers/template +++ b/srcpkgs/plasma-workspace-wallpapers/template @@ -1,6 +1,6 @@ # Template file for 'plasma-workspace-wallpapers' pkgname=plasma-workspace-wallpapers -version=5.17.1 +version=5.17.2 revision=1 archs=noarch build_style=cmake @@ -11,4 +11,4 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://projects.kde.org/projects/plasma/plasma-workspace-wallpapers" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=a44582a816998b41de4800b52cd461ce09ef2c7ca5a9b65b02d489e78a241eab +checksum=fd35ccae41085091d8898b5d119004ab96a799cee9cf8faa838d8baa7df0333e From ddad86d52b4e836ac913ffa1588b0e170d3facbf Mon Sep 17 00:00:00 2001 From: John Date: Tue, 29 Oct 2019 23:10:01 +0100 Subject: [PATCH 125/186] plasma-workspace: update to 5.17.2 [ci skip] --- srcpkgs/plasma-workspace/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template index 5ada52c94e3..02c229a8e00 100644 --- a/srcpkgs/plasma-workspace/template +++ b/srcpkgs/plasma-workspace/template @@ -1,6 +1,6 @@ # Template file for 'plasma-workspace' pkgname=plasma-workspace -version=5.17.1 +version=5.17.2 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -17,7 +17,7 @@ maintainer="John " license="GPL-2.0-or-later,GFDL-2.1, LGPL-2.1-or-later" homepage="https://projects.kde.org/projects/plasma/plasma-workspace" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=21c69bca0b358073fb0b945e79727d65f104dda54c6cfd643719fdd603831616 +checksum=02a56bcd2c771b359bf9fdd216094f1aa74b95221ff87960776aae18012a0d6d if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework" From 9df10ebf5ffc1afb9a526e85d61de3f3e2b7a678 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 29 Oct 2019 23:10:03 +0100 Subject: [PATCH 126/186] polkit-kde-agent: update to 5.17.2 [ci skip] --- srcpkgs/polkit-kde-agent/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/polkit-kde-agent/template b/srcpkgs/polkit-kde-agent/template index c93f1a3d473..0f8e43c100e 100644 --- a/srcpkgs/polkit-kde-agent/template +++ b/srcpkgs/polkit-kde-agent/template @@ -1,6 +1,6 @@ # Template file for 'polkit-kde-agent' pkgname=polkit-kde-agent -version=5.17.1 +version=5.17.2 revision=1 wrksrc="${pkgname}-1-${version}" build_style=cmake @@ -13,4 +13,4 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://projects.kde.org/projects/plasma/polkit-kde-agent" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-1-${version}.tar.xz" -checksum=629bf387adb01dca1701eab641ac81b217ad8d1f07af687c3cd2bdb007e1888c +checksum=bae0cb8c6281774fb78602d950ef242cfd578472c60e5c5ca062900afdff75a2 From 3b18884ec35f2fd2a881985878704a9656671350 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 29 Oct 2019 23:10:05 +0100 Subject: [PATCH 127/186] powerdevil: update to 5.17.2 [ci skip] --- srcpkgs/powerdevil/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template index 6526c55afe2..965d6189769 100644 --- a/srcpkgs/powerdevil/template +++ b/srcpkgs/powerdevil/template @@ -1,6 +1,6 @@ # Template file for 'powerdevil' pkgname=powerdevil -version=5.17.1 +version=5.17.2 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -13,4 +13,4 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://projects.kde.org/projects/plasma/powerdevil" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=8939331967e4df70aadf3d411deec3ab1ea0c820192fd893a72d8590ce98b3d7 +checksum=303386cc438407200da22cbc14a53e04174b6f0bae933bc43f0d69ac3bdf7623 From ade0ef17f7db543c7f03d5c08339bbe580babb18 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 29 Oct 2019 23:10:07 +0100 Subject: [PATCH 128/186] sddm-kcm: update to 5.17.2 [ci skip] --- srcpkgs/sddm-kcm/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/sddm-kcm/template b/srcpkgs/sddm-kcm/template index c92ba466bd1..79037f15f6c 100644 --- a/srcpkgs/sddm-kcm/template +++ b/srcpkgs/sddm-kcm/template @@ -1,6 +1,6 @@ # Template file for 'sddm-kcm' pkgname=sddm-kcm -version=5.17.1 +version=5.17.2 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -14,4 +14,4 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://projects.kde.org/projects/plasma/sddm-kcm" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=9151adc1111fe327078c80af64f0fef3145bed8b9721f9adc53815ab968f97fe +checksum=29afa561cdd157761d662f3e52226e7b6d8ab6c5fd67bbde073c226ac396e9c1 From 936bfb83dc7e680afd58148c83a438bb18c0a043 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 29 Oct 2019 23:10:09 +0100 Subject: [PATCH 129/186] systemsettings: update to 5.17.2 [ci skip] --- srcpkgs/systemsettings/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/systemsettings/template b/srcpkgs/systemsettings/template index 1dd8f69640c..51d8f8aca9e 100644 --- a/srcpkgs/systemsettings/template +++ b/srcpkgs/systemsettings/template @@ -1,6 +1,6 @@ # Template file for 'systemsettings' pkgname=systemsettings -version=5.17.1 +version=5.17.2 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -13,7 +13,7 @@ maintainer="John " license="GPL-2.0-or-later, GFDL-1.2" homepage="https://projects.kde.org/projects/plasma/systemsettings" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=849ea4f09b0baae8987a082512d34c507a7c70ddbb706be762dced9a868e08bd +checksum=9a195e8132df84b3ea7da3f864feee81cfe175fddd0bbd4822ca8cd9a5c2979e if [ "$CROSS_BUILD" ]; then hostmakedepends+=" python qt5-qmake qt5-host-tools kconfig From 10946be42e996139759d2cc52e440cb0b8c74b4d Mon Sep 17 00:00:00 2001 From: John Date: Tue, 29 Oct 2019 23:10:11 +0100 Subject: [PATCH 130/186] user-manager: update to 5.17.2 [ci skip] --- srcpkgs/user-manager/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/user-manager/template b/srcpkgs/user-manager/template index b6e13baceb4..3451886eea2 100644 --- a/srcpkgs/user-manager/template +++ b/srcpkgs/user-manager/template @@ -1,6 +1,6 @@ # Template file for 'user-manager' pkgname=user-manager -version=5.17.1 +version=5.17.2 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -14,4 +14,4 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://projects.kde.org/projects/plasma/user-manager" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=80948463723365292b1c9a5442cde734172b75f9b918429da7f783a2c619e87a +checksum=a930810ca3f75d6aad22d0071da20236c638e2791b017d0e594b2a687952c271 From bf952902f0b85e43c0086a8bb1cdeecc7c99a193 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 29 Oct 2019 23:10:13 +0100 Subject: [PATCH 131/186] xdg-desktop-portal-kde: update to 5.17.2 [ci skip] --- srcpkgs/xdg-desktop-portal-kde/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xdg-desktop-portal-kde/template b/srcpkgs/xdg-desktop-portal-kde/template index ca6b5818a7d..0620b108759 100644 --- a/srcpkgs/xdg-desktop-portal-kde/template +++ b/srcpkgs/xdg-desktop-portal-kde/template @@ -1,6 +1,6 @@ # Template file for 'xdg-desktop-portal-kde' pkgname=xdg-desktop-portal-kde -version=5.17.1 +version=5.17.2 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kcoreaddons" @@ -10,4 +10,4 @@ maintainer="John " license="GPL-3.0-or-later" homepage="https://phabricator.kde.org/source/xdg-desktop-portal-kde" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=330358409c8efc964ecdd8e8a9fea8ce6bd70a1a0e81d228bcc2808331722608 +checksum=dccbf1022c09380fa8081fb218f970db6e0fc6c437c17af176715b825b5211ee From 96623efb2d4ca386e31cb745027c4c1e17122bd1 Mon Sep 17 00:00:00 2001 From: lemmi Date: Wed, 30 Oct 2019 04:09:47 +0100 Subject: [PATCH 132/186] wireguard-go: remove --- srcpkgs/wireguard-go/INSTALL.msg | 3 +++ srcpkgs/wireguard-go/template | 18 +++++------------- srcpkgs/wireguard-go/update | 2 -- 3 files changed, 8 insertions(+), 15 deletions(-) create mode 100644 srcpkgs/wireguard-go/INSTALL.msg delete mode 100644 srcpkgs/wireguard-go/update diff --git a/srcpkgs/wireguard-go/INSTALL.msg b/srcpkgs/wireguard-go/INSTALL.msg new file mode 100644 index 00000000000..31fb05feaed --- /dev/null +++ b/srcpkgs/wireguard-go/INSTALL.msg @@ -0,0 +1,3 @@ +wireguard-go is no longer provided by Void Linux, and will be fully removed from the repos on 2020-02-01. + +Use boringtun as an alternative userspace implementation for Wireguard. diff --git a/srcpkgs/wireguard-go/template b/srcpkgs/wireguard-go/template index e52d31feee3..434e43ada8d 100644 --- a/srcpkgs/wireguard-go/template +++ b/srcpkgs/wireguard-go/template @@ -1,18 +1,10 @@ # Template file for 'wireguard-go' pkgname=wireguard-go version=0.0.20181222 -revision=1 -build_style=go -go_import_path="git.zx2c4.com/wireguard-go" -hostmakedepends="git" -depends="wireguard-tools" -short_desc="Implementation of WireGuard in Go" +revision=2 +archs=noarch +build_style=meta +short_desc="Implementation of WireGuard in Go (removed package)" maintainer="lemmi " -license="GPL-2" +license="BSD-2-Clause" # Suppress xlint warning: vlicense homepage="https://git.zx2c4.com/wireguard-go/about/" -distfiles="https://git.zx2c4.com/wireguard-go/snapshot/wireguard-go-${version}.tar.xz" -checksum=53dc611524c40cddd242c972a9559f9793e128a0ce772483f12a2704c9f48c54 - -pre_build() { - rm donotuseon_linux.go -} diff --git a/srcpkgs/wireguard-go/update b/srcpkgs/wireguard-go/update deleted file mode 100644 index 70ee5e56716..00000000000 --- a/srcpkgs/wireguard-go/update +++ /dev/null @@ -1,2 +0,0 @@ -site='https://git.zx2c4.com/wireguard-go/' -pattern='wireguard-go-\K[\d.]*\d' From 65c2d2d4de46ec2be5d9e4ca0a2ef726253f5114 Mon Sep 17 00:00:00 2001 From: lemmi Date: Wed, 30 Oct 2019 03:57:53 +0100 Subject: [PATCH 133/186] dispcalGUI: update to 3.8.7.1. --- srcpkgs/dispcalGUI/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/dispcalGUI/template b/srcpkgs/dispcalGUI/template index 42960daa3d8..59081d0b4eb 100644 --- a/srcpkgs/dispcalGUI/template +++ b/srcpkgs/dispcalGUI/template @@ -1,6 +1,6 @@ # Template file for 'dispcalGUI' pkgname=dispcalGUI -version=3.8.6.0 +version=3.8.7.1 revision=1 _name="DisplayCAL" wrksrc="${_name}-${version}" @@ -14,7 +14,7 @@ maintainer="lemmi " license="GPL-3.0-or-later" homepage="https://displaycal.net/" distfiles="${SOURCEFORGE_SITE}/dispcalgui/${_name}-${version}.tar.gz" -checksum=7be913f4a13f4461f5cdcea57395ba99ad4efaa6206e891ed1c69c78626305fb +checksum=cf6fbe5f7d9f636b12486be1488f4a338a114cdaf31a6cd3a18d2c84fdda6d68 pre_configure() { sed -i 's|MimeType=model/vrml;x-world/x-vrml;|MimeType=model/vrml;|' misc/displaycal-vrml-to-x3d-converter.desktop From 50ab95addcef8c524ea57f9e87324c1ec4bf6283 Mon Sep 17 00:00:00 2001 From: lemmi Date: Wed, 30 Oct 2019 03:58:24 +0100 Subject: [PATCH 134/186] s6-networking: update to 2.3.1.1. --- srcpkgs/s6-networking/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template index 6841e25170a..7fedc8b0ebd 100644 --- a/srcpkgs/s6-networking/template +++ b/srcpkgs/s6-networking/template @@ -1,19 +1,19 @@ # Template file for 's6-networking' pkgname=s6-networking -version=2.3.1.0 +version=2.3.1.1 revision=1 build_style=configure -makedepends="execline-devel libressl-devel skalibs-devel s6-devel s6-dns-devel" configure_args="--libdir=/usr/lib --enable-ssl=libressl --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps --with-lib=${XBPS_CROSS_BASE}/usr/lib --bindir=/usr/bin" +makedepends="execline-devel libressl-devel skalibs-devel s6-devel s6-dns-devel" short_desc="Suite of small network utilities for Unix systems" maintainer="lemmi " license="ISC" homepage="https://skarnet.org/software/${pkgname}/" changelog="https://skarnet.org/software/s6-networking/upgrade.html" distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=814fa3b70718d2423c742e920d31f64088272f7987c2cf7bebc86a63a75596b8 +checksum=9d411b5f742529be8e14da0a21635fcc304a4d7ac05fe0e45cf2355e5e3cf188 case "$XBPS_TARGET_MACHINE" in *-musl) makedepends+=" nsss-devel" configure_args+=" --enable-nsss" ;; From 41b58aaaf2cb9377f374a2deb40dabd90973de19 Mon Sep 17 00:00:00 2001 From: lemmi Date: Wed, 30 Oct 2019 03:58:37 +0100 Subject: [PATCH 135/186] s6-dns: update to 2.3.1.1. --- srcpkgs/s6-dns/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/s6-dns/template b/srcpkgs/s6-dns/template index 6b778516cc6..34c8a05edf6 100644 --- a/srcpkgs/s6-dns/template +++ b/srcpkgs/s6-dns/template @@ -1,6 +1,6 @@ # Template file for 's6-dns' pkgname=s6-dns -version=2.3.1.0 +version=2.3.1.1 revision=1 build_style=configure configure_args="--prefix=/usr --libdir=/usr/lib @@ -12,7 +12,7 @@ maintainer="lemmi " license="ISC" homepage="https://skarnet.org/software/${pkgname}/" distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=b11ce255668b683d785a1ef8ba89551a9586481b8888bc1a66d4b997e68892ca +checksum=415e3e8a8baaa39b3eac57eef8b3023d63bcdb33d9f9b03bcb298fd940589132 post_install() { vlicense COPYING From e15c1e1721ac9b1d99af61396dfabf1a7e38dbe3 Mon Sep 17 00:00:00 2001 From: lemmi Date: Wed, 30 Oct 2019 04:01:49 +0100 Subject: [PATCH 136/186] libmysofa: update to 0.8. --- srcpkgs/libmysofa/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libmysofa/template b/srcpkgs/libmysofa/template index 72b273c0a29..c12c5738c15 100644 --- a/srcpkgs/libmysofa/template +++ b/srcpkgs/libmysofa/template @@ -1,6 +1,6 @@ # Template file for 'libmysofa' pkgname=libmysofa -version=0.7 +version=0.8 revision=1 build_style=cmake configure_args="-DBUILD_TESTS=OFF" @@ -11,7 +11,7 @@ maintainer="lemmi " license="BSD-3-Clause" homepage="https://github.com/hoene/libmysofa" distfiles="https://github.com/hoene/libmysofa/archive/v${version}.tar.gz" -checksum=c1e6a0a91fee89625a60befec674bf2b4bf17055676933727f106785e0ea42a3 +checksum=0e0abb6ec6f5f09266325741d6ef218532187129f65d0bc6b21e155760dfb2ad post_install() { vlicense LICENSE From 21de860a9cc4b282a72492d80087582d58ab9c1b Mon Sep 17 00:00:00 2001 From: lemmi Date: Wed, 30 Oct 2019 04:01:22 +0100 Subject: [PATCH 137/186] obs: update to 24.0.3. --- srcpkgs/obs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template index 3ed426b1583..bec2ad776d8 100644 --- a/srcpkgs/obs/template +++ b/srcpkgs/obs/template @@ -1,6 +1,6 @@ # Template file for 'obs' pkgname=obs -version=24.0.1 +version=24.0.3 revision=1 _commit_hash_obs_browser="693498b518cf893876f454ef581e13106e8370ec" _commit_hash_obs_vst="fde438f7a8afdf41a7ab386a0aa1a61175fc8427" @@ -23,7 +23,7 @@ distfiles="https://github.com/obsproject/obs-studio/archive/${version}.tar.gz https://github.com/obsproject/obs-browser/archive/${_commit_hash_obs_browser}.tar.gz>obs_browser.tgz https://github.com/obsproject/obs-vst/archive/${_commit_hash_obs_vst}.tar.gz>obs_vst.tgz https://github.com/Mixer/ftl-sdk/archive/${_commit_hash_ftl_sdk}.tar.gz>ftl_sdk.tgz" -checksum="5c298328fd5e8f372091fd605ad7196da73fe981668ddb7add0a930857bbb6e9 +checksum="19f59b5a58e2158a93fe425e236c2d535afcbfd6b1d4c881cd1d8023a7e3c474 354c5775bba5f43c2d94ed3ca1777dbb7b686f7f7a943683996dbb3aac1037ac 0e450202e6a90f56132de0415a3d4615e9807b799a3d1955e45b33df68535cec 00bb0d9dfe9cccd865eea4ebbe77e3a1f4a138b4a18ab4efb25ec3cddb6d1fd1" From 1a7c9819ffac9ac1e68c1691ed6b348bb3679778 Mon Sep 17 00:00:00 2001 From: lemmi Date: Wed, 30 Oct 2019 03:49:40 +0100 Subject: [PATCH 138/186] darktable: update to 2.6.3. --- srcpkgs/darktable/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template index 6f70b3487c4..61cac064a3a 100644 --- a/srcpkgs/darktable/template +++ b/srcpkgs/darktable/template @@ -1,6 +1,6 @@ # Template file for 'darktable' pkgname=darktable -version=2.6.2 +version=2.6.3 revision=1 # upstream only supports these archs: archs="i686* x86_64* aarch64* ppc64le*" @@ -18,11 +18,11 @@ makedepends="gtk+3-devel glib-devel exiv2-devel libglade-devel libxslt-devel depends="adwaita-icon-theme" short_desc="Virtual lighttable and darkroom for photographers" maintainer="lemmi " -license="GPL-3" +license="GPL-3.0-or-later" homepage="http://www.darktable.org/" changelog="https://github.com/darktable-org/darktable/releases" distfiles="https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz" -checksum=9cb9efbb09a40375ff05cef89343235a621c58339539e44985470a029a7ffb45 +checksum=a518999c8458472edfc04577026ce5047d74553052af0f52d10ba8ce601b78f0 case "$XBPS_TARGET_MACHINE" in ppc64le*) configure_args+=" -DUSE_OPENCL=OFF" From 6babc2c0823ddbfc35e3f9badac8f488870a1bd4 Mon Sep 17 00:00:00 2001 From: Kyle Nusbaum Date: Tue, 29 Oct 2019 12:33:17 -0500 Subject: [PATCH 139/186] New package: make-ca-1.5 --- srcpkgs/make-ca/template | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 srcpkgs/make-ca/template diff --git a/srcpkgs/make-ca/template b/srcpkgs/make-ca/template new file mode 100644 index 00000000000..bcc41f8119d --- /dev/null +++ b/srcpkgs/make-ca/template @@ -0,0 +1,16 @@ +# Template file for 'make-ca' +pkgname=make-ca +version=1.5 +revision=1 +wrksrc="make-ca-${version}" +build_style=gnu-makefile +make_install_args="SBINDIR=/usr/bin" +hostmakedepends="help2man" +depends="p11-kit" +short_desc="PKI setup script for LFS (and others)" +maintainer="Kyle Nusbaum " +license="GPL-3.0-or-later" +homepage="https://github.com/djlucas/make-ca/" +distfiles="https://github.com/djlucas/make-ca/releases/download/v${version}/make-ca-${version}.tar.xz" +checksum=e75771dd73eb97189339379626fb42241ee579058c6ea2900ec850e7d96179f7 +archs=noarch From 71764835481fb0802230669bc988a19b1601c5ea Mon Sep 17 00:00:00 2001 From: Kyle Nusbaum Date: Tue, 29 Oct 2019 12:33:58 -0500 Subject: [PATCH 140/186] New package: openjdk11-bin-11+28 --- srcpkgs/openjdk11-bin/template | 73 ++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 srcpkgs/openjdk11-bin/template diff --git a/srcpkgs/openjdk11-bin/template b/srcpkgs/openjdk11-bin/template new file mode 100644 index 00000000000..b2da83d21eb --- /dev/null +++ b/srcpkgs/openjdk11-bin/template @@ -0,0 +1,73 @@ +# Template file for 'openjdk11-bin' +pkgname=openjdk11-bin +version=11+28 +revision=1 +archs="x86_64" +wrksrc=jdk-11 +short_desc="Official Reference Implementation for Java SE 11" +maintainer="Kyle Nusbaum " +license="GPL-2.0-or-later" +homepage="https://jdk.java.net/java-se-ri/11" +distfiles="https://download.java.net/openjdk/jdk11/ri/openjdk-${version}_linux-x64_bin.tar.gz" +checksum=3784cfc4670f0d4c5482604c7c513beb1a92b005f569df9bf100e8bef6610f2e +nopie=true + +alternatives=" + java:/usr/bin/java:/usr/lib/jvm/openjdk11-bin/bin/java + java:/usr/bin/javaws:/usr/lib/jvm/openjdk11-bin/bin/javaws + java:/usr/bin/jcontrol:/usr/lib/jvm/openjdk11-bin/bin/jcontrol + java:/usr/bin/jjs:/usr/lib/jvm/openjdk11-bin/bin/jjs + java:/usr/bin/keytool:/usr/lib/jvm/openjdk11-bin/bin/keytool + java:/usr/bin/orbd:/usr/lib/jvm/openjdk11-bin/bin/orbd + java:/usr/bin/pack200:/usr/lib/jvm/openjdk11-bin/bin/pack200 + java:/usr/bin/policytool:/usr/lib/jvm/openjdk11-bin/bin/policytool + java:/usr/bin/rmid:/usr/lib/jvm/openjdk11-bin/bin/rmid + java:/usr/bin/rmiregistry:/usr/lib/jvm/openjdk11-bin/bin/rmiregistry + java:/usr/bin/servertool:/usr/lib/jvm/openjdk11-bin/bin/servertool + java:/usr/bin/tnameserv:/usr/lib/jvm/openjdk11-bin/bin/tnameserv + java:/usr/bin/unpack200:/usr/lib/jvm/openjdk11-bin/bin/unpack200 + + jdk:/usr/bin/ControlPanel:/usr/lib/jvm/openjdk11-bin/bin/ControlPanel + jdk:/usr/bin/appletviewer:/usr/lib/jvm/openjdk11-bin/bin/appletviewer + jdk:/usr/bin/extcheck:/usr/lib/jvm/openjdk11-bin/bin/extcheck + jdk:/usr/bin/idlj:/usr/lib/jvm/openjdk11-bin/bin/idlj + jdk:/usr/bin/jar:/usr/lib/jvm/openjdk11-bin/bin/jar + jdk:/usr/bin/jarsigner:/usr/lib/jvm/openjdk11-bin/bin/jarsigner + jdk:/usr/bin/java-rmi.cgi:/usr/lib/jvm/openjdk11-bin/bin/java-rmi.cgi + jdk:/usr/bin/javac:/usr/lib/jvm/openjdk11-bin/bin/javac + jdk:/usr/bin/javadoc:/usr/lib/jvm/openjdk11-bin/bin/javadoc + jdk:/usr/bin/javafxpackager:/usr/lib/jvm/openjdk11-bin/bin/javafxpackager + jdk:/usr/bin/javah:/usr/lib/jvm/openjdk11-bin/bin/javah + jdk:/usr/bin/javap:/usr/lib/jvm/openjdk11-bin/bin/javap + jdk:/usr/bin/javapackager:/usr/lib/jvm/openjdk11-bin/bin/javapackager + jdk:/usr/bin/jcmd:/usr/lib/jvm/openjdk11-bin/bin/jcmd + jdk:/usr/bin/jconsole:/usr/lib/jvm/openjdk11-bin/bin/jconsole + jdk:/usr/bin/jdb:/usr/lib/jvm/openjdk11-bin/bin/jdb + jdk:/usr/bin/jdeps:/usr/lib/jvm/openjdk11-bin/bin/jdeps + jdk:/usr/bin/jhat:/usr/lib/jvm/openjdk11-bin/bin/jhat + jdk:/usr/bin/jinfo:/usr/lib/jvm/openjdk11-bin/bin/jinfo + jdk:/usr/bin/jmap:/usr/lib/jvm/openjdk11-bin/bin/jmap + jdk:/usr/bin/jmc:/usr/lib/jvm/openjdk11-bin/bin/jmc + jdk:/usr/bin/jmc.ini:/usr/lib/jvm/openjdk11-bin/bin/jmc.ini + jdk:/usr/bin/jps:/usr/lib/jvm/openjdk11-bin/bin/jps + jdk:/usr/bin/jrunscript:/usr/lib/jvm/openjdk11-bin/bin/jrunscript + jdk:/usr/bin/jsadebugd:/usr/lib/jvm/openjdk11-bin/bin/jsadebugd + jdk:/usr/bin/jstack:/usr/lib/jvm/openjdk11-bin/bin/jstack + jdk:/usr/bin/jstat:/usr/lib/jvm/openjdk11-bin/bin/jstat + jdk:/usr/bin/jstatd:/usr/lib/jvm/openjdk11-bin/bin/jstatd + jdk:/usr/bin/jvisualvm:/usr/lib/jvm/openjdk11-bin/bin/jvisualvm + jdk:/usr/bin/native2ascii:/usr/lib/jvm/openjdk11-bin/bin/native2ascii + jdk:/usr/bin/rmic:/usr/lib/jvm/openjdk11-bin/bin/rmic + jdk:/usr/bin/schemagen:/usr/lib/jvm/openjdk11-bin/bin/schemagen + jdk:/usr/bin/serialver:/usr/lib/jvm/openjdk11-bin/bin/serialver + jdk:/usr/bin/wsgen:/usr/lib/jvm/openjdk11-bin/bin/wsgen + jdk:/usr/bin/wsimport:/usr/lib/jvm/openjdk11-bin/bin/wsimport + jdk:/usr/bin/xjc:/usr/lib/jvm/openjdk11-bin/bin/xjc + + java-plugin:/usr/lib/mozilla/plugins/libnpjp2.so:/usr/lib/jvm/openjdk11-bin/jre/lib/$_arch/libnpjp2.so +" + +do_install() { + vmkdir /usr/lib/jvm/openjdk11-bin + cp -R ./* ${DESTDIR}/usr/lib/jvm/openjdk11-bin +} From 9504af5546804ed2268df9b80390e9515f2d91d6 Mon Sep 17 00:00:00 2001 From: Kyle Nusbaum Date: Tue, 29 Oct 2019 12:36:00 -0500 Subject: [PATCH 141/186] New package: openjdk11-11.0.5+10 --- common/shlibs | 6 + srcpkgs/openjdk11-doc | 1 + srcpkgs/openjdk11-src | 1 + .../files/musl_patches/aarch64.patch | 11 + .../openjdk11/files/musl_patches/arm.patch | 30 + .../openjdk11/files/musl_patches/build.patch | 537 ++++++++++++++++++ .../files/musl_patches/ppc64le.patch | 221 +++++++ .../openjdk11/files/musl_patches/x86.patch | 130 +++++ srcpkgs/openjdk11/template | 183 ++++++ 9 files changed, 1120 insertions(+) create mode 120000 srcpkgs/openjdk11-doc create mode 120000 srcpkgs/openjdk11-src create mode 100644 srcpkgs/openjdk11/files/musl_patches/aarch64.patch create mode 100644 srcpkgs/openjdk11/files/musl_patches/arm.patch create mode 100644 srcpkgs/openjdk11/files/musl_patches/build.patch create mode 100644 srcpkgs/openjdk11/files/musl_patches/ppc64le.patch create mode 100644 srcpkgs/openjdk11/files/musl_patches/x86.patch create mode 100644 srcpkgs/openjdk11/template diff --git a/common/shlibs b/common/shlibs index a79ef996138..41e609a31db 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1781,6 +1781,12 @@ libawt_xawt.so openjdk-jre-8u20_1 libjava.so openjdk-jre-8u20_1 libjli.so openjdk-jre-8u20_1 libjvm.so openjdk-jre-8u20_1 +libjawt.so openjdk11-11.0.5+10_1 +libawt.so openjdk11-11.0.5+10_1 +libawt_xawt.so openjdk11-11.0.5+10_1 +libjava.so openjdk11-11.0.5+10_1 +libjli.so openjdk11-11.0.5+10_1 +libjvm.so openjdk11-11.0.5+10_1 libucl.so.5 libucl-0.8.1_1 libhandle.so.1 xfsprogs-3.2.1_1 libnfnetlink.so.0 libnfnetlink-1.0.1_1 diff --git a/srcpkgs/openjdk11-doc b/srcpkgs/openjdk11-doc new file mode 120000 index 00000000000..8213494c49e --- /dev/null +++ b/srcpkgs/openjdk11-doc @@ -0,0 +1 @@ +openjdk11 \ No newline at end of file diff --git a/srcpkgs/openjdk11-src b/srcpkgs/openjdk11-src new file mode 120000 index 00000000000..8213494c49e --- /dev/null +++ b/srcpkgs/openjdk11-src @@ -0,0 +1 @@ +openjdk11 \ No newline at end of file diff --git a/srcpkgs/openjdk11/files/musl_patches/aarch64.patch b/srcpkgs/openjdk11/files/musl_patches/aarch64.patch new file mode 100644 index 00000000000..b95f455e926 --- /dev/null +++ b/srcpkgs/openjdk11/files/musl_patches/aarch64.patch @@ -0,0 +1,11 @@ +Patches for musl taken from Alpine linux: https://git.alpinelinux.org/aports/commit/?id=8a1ae17d4a9af54285c7891a680620e7e24c6280 +--- old/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.cpp ++++ new/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.cpp +@@ -77,7 +77,6 @@ + # include + # include + # include +-# include + + #ifdef BUILTIN_SIM + #define REG_SP REG_RSP diff --git a/srcpkgs/openjdk11/files/musl_patches/arm.patch b/srcpkgs/openjdk11/files/musl_patches/arm.patch new file mode 100644 index 00000000000..12d0022c149 --- /dev/null +++ b/srcpkgs/openjdk11/files/musl_patches/arm.patch @@ -0,0 +1,30 @@ +Patches for musl taken from Alpine linux: https://git.alpinelinux.org/aports/commit/?id=8a1ae17d4a9af54285c7891a680620e7e24c6280 +--- old/src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp ++++ new/src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp +@@ -71,7 +71,6 @@ + # include + # include + # include +-# include + # include + + #define SPELL_REG_SP "sp" +@@ -104,6 +103,18 @@ + #define ARM_REGS_IN_CONTEXT 31 + + #else ++ ++// Stupid hack as the origin if below doesnt compile with gcc 8.2.0: ++// ++// os_linux_arm.cpp:114:5: error: missing binary operator before token "(" ++// #if NGREG == 16 ++// ^~~~~ ++// ++// The NGREG is 18, so force it to that value. ++#ifdef NGREG ++# undef NGREG ++#endif ++#define NGREG 18 + + #if NGREG == 16 + // These definitions are based on the observation that until diff --git a/srcpkgs/openjdk11/files/musl_patches/build.patch b/srcpkgs/openjdk11/files/musl_patches/build.patch new file mode 100644 index 00000000000..81ed0f53b1d --- /dev/null +++ b/srcpkgs/openjdk11/files/musl_patches/build.patch @@ -0,0 +1,537 @@ +Patches for musl taken from Alpine linux: https://git.alpinelinux.org/aports/commit/?id=8a1ae17d4a9af54285c7891a680620e7e24c6280 +--- old/make/ReleaseFile.gmk ++++ new/make/ReleaseFile.gmk +@@ -53,6 +53,7 @@ + $(call info-file-item, "JAVA_VERSION_DATE", "$(VERSION_DATE)") + $(call info-file-item, "OS_NAME", "$(RELEASE_FILE_OS_NAME)") + $(call info-file-item, "OS_ARCH", "$(RELEASE_FILE_OS_ARCH)") ++ $(call info-file-item, "LIBC", "musl") + endef + + # Param 1 - The file containing the MODULES list +--- old/make/autoconf/build-aux/config.guess ++++ new/make/autoconf/build-aux/config.guess +@@ -30,6 +30,17 @@ + DIR=`dirname $0` + OUT=`. $DIR/autoconf-config.guess` + ++# config.guess doesn't identify systems running the musl C library, and will ++# instead return a string with a -gnu suffix. This block detects musl and ++# modifies the string to have a -musl suffix instead. ++echo $OUT | grep -- -linux- > /dev/null 2> /dev/null ++if test $? = 0; then ++ ldd_version=`ldd --version 2>&1 | head -1 | cut -f1 -d' '` ++ if [ x"${ldd_version}" = x"musl" ]; then ++ OUT=`echo $OUT | sed 's/-gnu/-musl/'` ++ fi ++fi ++ + # Test and fix solaris on x86_64 + echo $OUT | grep i386-pc-solaris > /dev/null 2> /dev/null + if test $? = 0; then +--- old/make/hotspot/lib/CompileJvm.gmk ++++ new/make/hotspot/lib/CompileJvm.gmk +@@ -77,6 +77,7 @@ + -DHOTSPOT_BUILD_USER='"$(USERNAME)"' \ + -DHOTSPOT_VM_DISTRO='"$(HOTSPOT_VM_DISTRO)"' \ + -DCPU='"$(OPENJDK_TARGET_CPU_VM_VERSION)"' \ ++ -DLIBC='"musl"' \ + # + + ################################################################################ +--- old/make/lib/CoreLibraries.gmk ++++ new/make/lib/CoreLibraries.gmk +@@ -241,6 +241,7 @@ + endif + + LIBJLI_CFLAGS += $(LIBZ_CFLAGS) ++LIBJLI_CFLAGS += -DLIBC=\"musl\" + + ifneq ($(USE_EXTERNAL_LIBZ), true) + LIBJLI_EXTRA_FILES += \ +--- old/src/hotspot/os/linux/os_linux.cpp ++++ new/src/hotspot/os/linux/os_linux.cpp +@@ -99,7 +99,6 @@ + # include + # include + # include +-# include + # include + # include + # include +@@ -511,6 +510,11 @@ + // detecting pthread library + + void os::Linux::libpthread_init() { ++#if !defined(__GLIBC__) && !defined(__UCLIBC__) ++ // Hard code Alpine Linux supported musl compatible settings ++ os::Linux::set_glibc_version("glibc 2.9"); ++ os::Linux::set_libpthread_version("NPTL"); ++#else + // Save glibc and pthread version strings. + #if !defined(_CS_GNU_LIBC_VERSION) || \ + !defined(_CS_GNU_LIBPTHREAD_VERSION) +@@ -528,6 +532,7 @@ + str = (char *)malloc(n, mtInternal); + confstr(_CS_GNU_LIBPTHREAD_VERSION, str, n); + os::Linux::set_libpthread_version(str); ++#endif + } + + ///////////////////////////////////////////////////////////////////////////// +@@ -2916,20 +2921,36 @@ + extern "C" JNIEXPORT void numa_warn(int number, char *where, ...) { } + extern "C" JNIEXPORT void numa_error(char *where) { } + ++static void* dlvsym_if_available(void* handle, const char* name, const char* version) { ++ typedef void* (*dlvsym_func_type)(void* handle, const char* name, const char* version); ++ static dlvsym_func_type dlvsym_func; ++ static bool initialized = false; ++ ++ if (!initialized) { ++ dlvsym_func = (dlvsym_func_type)dlsym(RTLD_NEXT, "dlvsym"); ++ initialized = true; ++ } ++ ++ if (dlvsym_func != NULL) { ++ void *f = dlvsym_func(handle, name, version); ++ if (f != NULL) { ++ return f; ++ } ++ } ++ ++ return dlsym(handle, name); ++} ++ + // Handle request to load libnuma symbol version 1.1 (API v1). If it fails + // load symbol from base version instead. + void* os::Linux::libnuma_dlsym(void* handle, const char *name) { +- void *f = dlvsym(handle, name, "libnuma_1.1"); +- if (f == NULL) { +- f = dlsym(handle, name); +- } +- return f; ++ return dlvsym_if_available(handle, name, "libnuma_1.1"); + } + + // Handle request to load libnuma symbol version 1.2 (API v2) only. + // Return NULL if the symbol is not defined in this particular version. + void* os::Linux::libnuma_v2_dlsym(void* handle, const char* name) { +- return dlvsym(handle, name, "libnuma_1.2"); ++ return dlvsym_if_available(handle, name, "libnuma_1.2"); + } + + bool os::Linux::libnuma_init() { +--- old/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp ++++ new/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp +@@ -75,9 +75,6 @@ + # include + # include + # include +-#ifndef AMD64 +-# include +-#endif + + #ifdef AMD64 + #define REG_SP REG_RSP +--- old/src/hotspot/share/gc/shared/genCollectedHeap.cpp ++++ new/src/hotspot/share/gc/shared/genCollectedHeap.cpp +@@ -1147,7 +1147,7 @@ + static ScratchBlock *removeSmallestScratch(ScratchBlock **prev_ptr) { + bool first = true; + size_t min_size = 0; // "first" makes this conceptually infinite. +- ScratchBlock **smallest_ptr, *smallest; ++ ScratchBlock **smallest_ptr = NULL, *smallest; + ScratchBlock *cur = *prev_ptr; + while (cur) { + assert(*prev_ptr == cur, "just checking"); +--- old/src/hotspot/share/runtime/vm_version.cpp ++++ new/src/hotspot/share/runtime/vm_version.cpp +@@ -272,7 +272,7 @@ + #endif + + #define INTERNAL_VERSION_SUFFIX VM_RELEASE ")" \ +- " for " OS "-" CPU FLOAT_ARCH_STR \ ++ " for " OS "-" CPU FLOAT_ARCH_STR LIBC \ + " JRE (" VERSION_STRING "), built on " __DATE__ " " __TIME__ \ + " by " XSTR(HOTSPOT_BUILD_USER) " with " HOTSPOT_BUILD_COMPILER + +--- old/src/hotspot/share/utilities/globalDefinitions_gcc.hpp ++++ new/src/hotspot/share/utilities/globalDefinitions_gcc.hpp +@@ -204,7 +204,7 @@ + #elif defined(__APPLE__) + inline int g_isnan(double f) { return isnan(f); } + #elif defined(LINUX) || defined(_ALLBSD_SOURCE) +-inline int g_isnan(float f) { return isnanf(f); } ++inline int g_isnan(float f) { return isnan(f); } + inline int g_isnan(double f) { return isnan(f); } + #else + #error "missing platform-specific definition here" +--- old/src/java.base/linux/native/libnet/linux_close.c ++++ new/src/java.base/linux/native/libnet/linux_close.c +@@ -60,7 +60,7 @@ + /* + * Signal to unblock thread + */ +-static int sigWakeup = (__SIGRTMAX - 2); ++static int sigWakeup; + + /* + * fdTable holds one entry per file descriptor, up to a certain +@@ -149,6 +149,7 @@ + /* + * Setup the signal handler + */ ++ sigWakeup = SIGRTMAX - 2; + sa.sa_handler = sig_wakeup; + sa.sa_flags = 0; + sigemptyset(&sa.sa_mask); +--- old/src/java.base/unix/native/libjava/childproc.c ++++ new/src/java.base/unix/native/libjava/childproc.c +@@ -237,7 +237,13 @@ + { + if (envp == NULL || (char **) envp == environ) { + execvp(file, (char **) argv); +- return; ++ // ENOEXEC indicates that the file header was not recognized. The musl C ++ // library does not implement the fallback to /bin/sh for that case, so fall ++ // through to the code below which implements that fallback using ++ // execve_with_shell_fallback. ++ if (errno != ENOEXEC) { ++ return; ++ } + } + + if (*file == '\0') { +--- old/src/java.base/unix/native/libjava/jdk_util_md.h ++++ new/src/java.base/unix/native/libjava/jdk_util_md.h +@@ -37,7 +37,7 @@ + #define ISNAND(d) isnan(d) + #elif defined(__linux__) || defined(_ALLBSD_SOURCE) + #include +-#define ISNANF(f) isnanf(f) ++#define ISNANF(f) isnan(f) + #define ISNAND(d) isnan(d) + #elif defined(_AIX) + #include +--- old/src/java.base/unix/native/libjli/java_md_solinux.c ++++ new/src/java.base/unix/native/libjli/java_md_solinux.c +@@ -235,6 +235,39 @@ + char *dmllp = NULL; + char *p; /* a utility pointer */ + ++#ifdef __linux ++#ifndef LIBC ++#error "LIBC not set" ++#endif ++ ++ if (strcmp(LIBC, "musl") == 0) { ++ /* ++ * The musl library loader requires LD_LIBRARY_PATH to be set in ++ * order to correctly resolve the dependency libjava.so has on libjvm.so. ++ * ++ * Specifically, it differs from glibc in the sense that even if ++ * libjvm.so has already been loaded it will not be considered a ++ * candidate for resolving the dependency unless the *full* path ++ * of the already loaded library matches the dependency being loaded. ++ * ++ * libjvm.so is being loaded by the launcher using a long path to ++ * dlopen, not just the basename of the library. Typically this ++ * is something like "../lib/server/libjvm.so". However, if/when ++ * libjvm.so later tries to dlopen libjava.so (which it does in ++ * order to get access to a few functions implemented in ++ * libjava.so) the musl loader will, as part of loading ++ * dependent libraries, try to load libjvm.so using only its ++ * basename "libjvm.so". Since this does not match the longer ++ * path path it was first loaded with, the already loaded ++ * library is not considered a candidate, and the loader will ++ * instead look for libjvm.so elsewhere. If it's not in ++ * LD_LIBRARY_PATH the dependency load will fail, and libjava.so ++ * will therefore fail as well. ++ */ ++ return JNI_TRUE; ++ } ++#endif ++ + #ifdef AIX + /* We always have to set the LIBPATH on AIX because ld doesn't support $ORIGIN. */ + return JNI_TRUE; +--- old/src/java.base/unix/native/libnio/ch/NativeThread.c ++++ new/src/java.base/unix/native/libnio/ch/NativeThread.c +@@ -36,7 +36,7 @@ + #ifdef __linux__ + #include + /* Also defined in net/linux_close.c */ +- #define INTERRUPT_SIGNAL (__SIGRTMAX - 2) ++ #define INTERRUPT_SIGNAL (SIGRTMAX - 2) + #elif _AIX + #include + /* Also defined in net/aix_close.c */ +--- old/src/java.desktop/unix/native/libawt_xawt/xawt/XToolkit.c ++++ new/src/java.desktop/unix/native/libawt_xawt/xawt/XToolkit.c +@@ -27,9 +27,6 @@ + #include + #include + #include +-#ifdef __linux__ +-#include +-#endif + + #include + #include +@@ -786,26 +783,6 @@ + } + return ret; + } +- +-#ifdef __linux__ +-void print_stack(void) +-{ +- void *array[10]; +- size_t size; +- char **strings; +- size_t i; +- +- size = backtrace (array, 10); +- strings = backtrace_symbols (array, size); +- +- fprintf (stderr, "Obtained %zd stack frames.\n", size); +- +- for (i = 0; i < size; i++) +- fprintf (stderr, "%s\n", strings[i]); +- +- free (strings); +-} +-#endif + + Window get_xawt_root_shell(JNIEnv *env) { + static jclass classXRootWindow = NULL; +--- old/src/jdk.jdwp.agent/share/native/libjdwp/util.h ++++ new/src/jdk.jdwp.agent/share/native/libjdwp/util.h +@@ -35,15 +35,15 @@ + #ifdef DEBUG + /* Just to make sure these interfaces are not used here. */ + #undef free +- #define free(p) Do not use this interface. ++ #define free do_not_use_this_interface_free + #undef malloc +- #define malloc(p) Do not use this interface. ++ #define malloc do_not_use_this_interface_malloc + #undef calloc +- #define calloc(p) Do not use this interface. ++ #define calloc do_not_use_this_interface_calloc + #undef realloc +- #define realloc(p) Do not use this interface. ++ #define realloc do_not_use_this_interface_realloc + #undef strdup +- #define strdup(p) Do not use this interface. ++ #define strdup do_not_use_this_interface_strdup + #endif + + #include "log_messages.h" +--- old/test/hotspot/jtreg/runtime/StackGuardPages/exeinvoke.c ++++ new/test/hotspot/jtreg/runtime/StackGuardPages/exeinvoke.c +@@ -33,6 +33,7 @@ + + #include + #include ++#include + #include + #include + #include +@@ -91,6 +92,20 @@ + } + } + ++int get_java_stacksize () { ++ size_t stacksize; ++ pthread_attr_t attr; ++ JDK1_1InitArgs jdk_args; ++ ++ jdk_args.version = JNI_VERSION_1_1; ++ JNI_GetDefaultJavaVMInitArgs(&jdk_args); ++ if (jdk_args.javaStackSize <= 0) { ++ fprintf(stderr, "Test ERROR. Can't get a valid value for the default stacksize.\n"); ++ exit(7); ++ } ++ return jdk_args.javaStackSize; ++} ++ + void *run_java_overflow (void *p) { + JNIEnv *env; + jclass class_id; +@@ -254,13 +269,19 @@ + exit(7); + } + ++ int stack_size = get_java_stacksize(); + pthread_t thr; ++ pthread_attr_t thread_attr; + ++ pthread_attr_init(&thread_attr); ++ pthread_attr_setstacksize(&thread_attr, stack_size); ++ + if (argc > 1 && strcmp(argv[1], "test_java_overflow") == 0) { + printf("\nTesting JAVA_OVERFLOW\n"); + + printf("Testing stack guard page behaviour for other thread\n"); +- pthread_create (&thr, NULL, run_java_overflow, NULL); ++ ++ pthread_create (&thr, &thread_attr, run_java_overflow, NULL); + pthread_join (thr, NULL); + + printf("Testing stack guard page behaviour for initial thread\n"); +@@ -273,7 +294,7 @@ + printf("\nTesting NATIVE_OVERFLOW\n"); + + printf("Testing stack guard page behaviour for other thread\n"); +- pthread_create (&thr, NULL, run_native_overflow, NULL); ++ pthread_create (&thr, &thread_attr, run_native_overflow, NULL); + pthread_join (thr, NULL); + + printf("Testing stack guard page behaviour for initial thread\n"); +--- old/test/jdk/java/lang/ProcessBuilder/Basic.java ++++ new/test/jdk/java/lang/ProcessBuilder/Basic.java +@@ -389,8 +389,8 @@ + if (failed != 0) throw new Error("null PATH"); + } else if (action.equals("PATH search algorithm")) { + equal(System.getenv("PATH"), "dir1:dir2:"); +- check(new File("/bin/true").exists()); +- check(new File("/bin/false").exists()); ++ check(new File(TrueExe.path()).exists()); ++ check(new File(FalseExe.path()).exists()); + String[] cmd = {"prog"}; + ProcessBuilder pb1 = new ProcessBuilder(cmd); + ProcessBuilder pb2 = new ProcessBuilder(cmd); +@@ -431,13 +431,13 @@ + checkPermissionDenied(pb); + + // continue searching if EACCES +- copy("/bin/true", "dir2/prog"); ++ copy(TrueExe.path(), "dir2/prog"); + equal(run(pb).exitValue(), True.exitValue()); + new File("dir1/prog").delete(); + new File("dir2/prog").delete(); + + new File("dir2/prog").mkdirs(); +- copy("/bin/true", "dir1/prog"); ++ copy(TrueExe.path(), "dir1/prog"); + equal(run(pb).exitValue(), True.exitValue()); + + // Check empty PATH component means current directory. +@@ -453,10 +453,10 @@ + pb.command(command); + File prog = new File("./prog"); + // "Normal" binaries +- copy("/bin/true", "./prog"); ++ copy(TrueExe.path(), "./prog"); + equal(run(pb).exitValue(), + True.exitValue()); +- copy("/bin/false", "./prog"); ++ copy(FalseExe.path(), "./prog"); + equal(run(pb).exitValue(), + False.exitValue()); + prog.delete(); +@@ -511,12 +511,12 @@ + new File("dir2/prog").delete(); + new File("prog").delete(); + new File("dir3").mkdirs(); +- copy("/bin/true", "dir1/prog"); +- copy("/bin/false", "dir3/prog"); ++ copy(TrueExe.path(), "dir1/prog"); ++ copy(FalseExe.path(), "dir3/prog"); + pb.environment().put("PATH","dir3"); + equal(run(pb).exitValue(), True.exitValue()); +- copy("/bin/true", "dir3/prog"); +- copy("/bin/false", "dir1/prog"); ++ copy(TrueExe.path(), "dir3/prog"); ++ copy(FalseExe.path(), "dir1/prog"); + equal(run(pb).exitValue(), False.exitValue()); + + } finally { +@@ -613,6 +613,13 @@ + new File("/bin/false").exists()); + } + ++ static class BusyBox { ++ public static boolean is() { return is; } ++ private static final boolean is = ++ (! Windows.is() && ++ new File("/bin/busybox").exists()); ++ } ++ + static class UnicodeOS { + public static boolean is() { return is; } + private static final String osName = System.getProperty("os.name"); +@@ -651,6 +658,45 @@ + } + } + ++ // On alpine linux, /bin/true and /bin/false are just links to /bin/busybox. ++ // Some tests copy /bin/true and /bin/false to files with a different filename. ++ // However, copying the busbox executable into a file with a different name ++ // won't result in the expected return codes. As workaround, we create ++ // executable files that can be copied and produce the exepected return ++ // values. We use this workaround, if we find the busybox executable. ++ ++ private static class TrueExe { ++ public static String path() { return path; } ++ private static final String path = path0(); ++ private static String path0(){ ++ if (!BusyBox.is()) { ++ return "/bin/true"; ++ } ++ else { ++ File trueExe = new File("true"); ++ setFileContents(trueExe, "#!/bin/true\n"); ++ trueExe.setExecutable(true); ++ return trueExe.getAbsolutePath(); ++ } ++ } ++ } ++ ++ private static class FalseExe { ++ public static String path() { return path; } ++ private static final String path = path0(); ++ private static String path0(){ ++ if (!BusyBox.is()) { ++ return "/bin/false"; ++ } ++ else { ++ File falseExe = new File("false"); ++ setFileContents(falseExe, "#!/bin/false\n"); ++ falseExe.setExecutable(true); ++ return falseExe.getAbsolutePath(); ++ } ++ } ++ } ++ + static class EnglishUnix { + private static final Boolean is = + (! Windows.is() && isEnglish("LANG") && isEnglish("LC_ALL")); +@@ -1954,7 +2000,7 @@ + //---------------------------------------------------------------- + try { + new File("suBdiR").mkdirs(); +- copy("/bin/true", "suBdiR/unliKely"); ++ copy(TrueExe.path(), "suBdiR/unliKely"); + final ProcessBuilder pb = + new ProcessBuilder(new String[]{"unliKely"}); + pb.environment().put("PATH", "suBdiR"); +--- old/test/jdk/java/lang/ProcessHandle/InfoTest.java ++++ new/test/jdk/java/lang/ProcessHandle/InfoTest.java +@@ -298,6 +298,13 @@ + } + if (info.command().isPresent()) { + String command = info.command().get(); +- String expected = Platform.isWindows() ? "sleep.exe" : "sleep"; ++ String expected = "sleep"; ++ if (Platform.isWindows()) { ++ expected = "sleep.exe"; ++ } else if (new File("/bin/busybox").exists()) { ++ // With busybox sleep is just a sym link to busybox. ++ // The busbox executable is seen as ProcessHandle.Info command. ++ expected = "busybox"; ++ } + Assert.assertTrue(command.endsWith(expected), "Command: expected: \'" + + expected + "\', actual: " + command); diff --git a/srcpkgs/openjdk11/files/musl_patches/ppc64le.patch b/srcpkgs/openjdk11/files/musl_patches/ppc64le.patch new file mode 100644 index 00000000000..67f6642142c --- /dev/null +++ b/srcpkgs/openjdk11/files/musl_patches/ppc64le.patch @@ -0,0 +1,221 @@ +Patches for musl taken from Alpine linux: https://git.alpinelinux.org/aports/commit/?id=8a1ae17d4a9af54285c7891a680620e7e24c6280 +--- old/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp ++++ new/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp +@@ -1290,7 +1290,11 @@ + // the safepoing polling page. + ucontext_t* uc = (ucontext_t*) ucontext; + // Set polling address. ++#if defined(__GLIBC__) || defined(__UCLIBC__) + address addr = (address)uc->uc_mcontext.regs->gpr[ra] + (ssize_t)ds; ++#else // Musl ++ address addr = (address)uc->uc_mcontext.gp_regs[ra] + (ssize_t) ds; ++#endif + if (polling_address_ptr != NULL) { + *polling_address_ptr = addr; + } +@@ -1311,15 +1315,24 @@ + int rb = inv_rb_field(instruction); + + // look up content of ra and rb in ucontext ++#if defined(__GLIBC__) || defined(__UCLIBC__) + address ra_val=(address)uc->uc_mcontext.regs->gpr[ra]; + long rb_val=(long)uc->uc_mcontext.regs->gpr[rb]; ++#else // Musl ++ address ra_val=(address)uc->uc_mcontext.gp_regs[ra]; ++ long rb_val=(long)uc->uc_mcontext.gp_regs[rb]; ++#endif + return os::is_memory_serialize_page(thread, ra_val+rb_val); + } else if (is_stw(instruction) || is_stwu(instruction)) { + int ra = inv_ra_field(instruction); + int d1 = inv_d1_field(instruction); + + // look up content of ra in ucontext ++#if defined(__GLIBC__) || defined(__UCLIBC__) + address ra_val=(address)uc->uc_mcontext.regs->gpr[ra]; ++#else // Musl ++ address ra_val=(address)uc->uc_mcontext.gp_regs[ra]; ++#endif + return os::is_memory_serialize_page(thread, ra_val+d1); + } else { + return false; +@@ -1382,11 +1395,20 @@ + || (is_stdu(instruction) && rs == 1)) { + int ds = inv_ds_field(instruction); + // return banged address ++#if defined(__GLIBC__) || defined(__UCLIBC__) + return ds+(address)uc->uc_mcontext.regs->gpr[ra]; ++#else // Musl ++ return ds+(address)uc->uc_mcontext.gp_regs[ra]; ++#endif + } else if (is_stdux(instruction) && rs == 1) { + int rb = inv_rb_field(instruction); ++#if defined(__GLIBC__) || defined(__UCLIBC__) + address sp = (address)uc->uc_mcontext.regs->gpr[1]; + long rb_val = (long)uc->uc_mcontext.regs->gpr[rb]; ++#else // Musl ++ address sp = (address)uc->uc_mcontext.gp_regs[1]; ++ long rb_val = (long)uc->uc_mcontext.gp_regs[rb]; ++#endif + return ra != 1 || rb_val >= 0 ? NULL // not a stack bang + : sp + rb_val; // banged address + } +--- old/src/hotspot/cpu/ppc/vm_version_ppc.cpp ++++ new/src/hotspot/cpu/ppc/vm_version_ppc.cpp +@@ -768,7 +768,7 @@ + unsigned long auxv = getauxval(AT_HWCAP2); + + if (auxv & PPC_FEATURE2_HTM_NOSC) { +- if (auxv & PPC_FEATURE2_HAS_HTM) { ++ if (auxv & PPC_FEATURE2_HTM) { + // TM on POWER8 and POWER9 in compat mode (VM) is supported by the JVM. + // TM on POWER9 DD2.1 NV (baremetal) is not supported by the JVM (TM on + // POWER9 DD2.1 NV has a few issues that need a couple of firmware +--- old/src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp ++++ new/src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp +@@ -108,24 +108,42 @@ + // - if uc was filled by getcontext(), it is undefined - getcontext() does not fill + // it because the volatile registers are not needed to make setcontext() work. + // Hopefully it was zero'd out beforehand. ++#if defined(__GLIBC__) || defined(__UCLIBC__) + guarantee(uc->uc_mcontext.regs != NULL, "only use ucontext_get_pc in sigaction context"); + return (address)uc->uc_mcontext.regs->nip; ++#else // Musl ++ guarantee(uc->uc_mcontext.gp_regs != NULL, "only use ucontext_get_pc in sigaction context"); ++ return (address)uc->uc_mcontext.gp_regs[32]; ++#endif + } + + // modify PC in ucontext. + // Note: Only use this for an ucontext handed down to a signal handler. See comment + // in ucontext_get_pc. + void os::Linux::ucontext_set_pc(ucontext_t * uc, address pc) { ++#if defined(__GLIBC__) || defined(__UCLIBC__) + guarantee(uc->uc_mcontext.regs != NULL, "only use ucontext_set_pc in sigaction context"); + uc->uc_mcontext.regs->nip = (unsigned long)pc; ++#else // Musl ++ guarantee(uc->uc_mcontext.gp_regs != NULL, "only use ucontext_set_pc in sigaction context"); ++ uc->uc_mcontext.gp_regs[32] = (unsigned long)pc; ++#endif + } + + static address ucontext_get_lr(const ucontext_t * uc) { ++#if defined(__GLIBC__) || defined(__UCLIBC__) + return (address)uc->uc_mcontext.regs->link; ++#else // Musl ++ return (address)uc->uc_mcontext.gp_regs[36]; ++#endif + } + + intptr_t* os::Linux::ucontext_get_sp(const ucontext_t * uc) { ++#if defined(__GLIBC__) || defined(__UCLIBC__) + return (intptr_t*)uc->uc_mcontext.regs->gpr[1/*REG_SP*/]; ++#else // Musl ++ return (intptr_t*)uc->uc_mcontext.gp_regs[1/*REG_SP*/]; ++#endif + } + + intptr_t* os::Linux::ucontext_get_fp(const ucontext_t * uc) { +@@ -133,7 +151,11 @@ + } + + static unsigned long ucontext_get_trap(const ucontext_t * uc) { ++#if defined(__GLIBC__) || defined(__UCLIBC__) + return uc->uc_mcontext.regs->trap; ++#else // Musl ++ return uc->uc_mcontext.gp_regs[40]; ++#endif + } + + ExtendedPC os::fetch_frame_from_context(const void* ucVoid, +@@ -259,7 +281,13 @@ + // 3.2.1 "Machine State Register"), however note that ISA notation for bit + // numbering is MSB 0, so for normal bit numbering (LSB 0) they come to be + // bits 33 and 34. It's not related to endianness, just a notation matter. ++#if defined(__GLIBC__) || defined(__UCLIBC__) + if (second_uc->uc_mcontext.regs->msr & 0x600000000) { ++#else // Musl ++ // why 33? ++ // see comment for glibc NGREG: "r0-r31, nip, msr, lr, etc." ++ if (second_uc->uc_mcontext.gp_regs[33] & 0x600000000) { ++#endif + if (TraceTraps) { + tty->print_cr("caught signal in transaction, " + "ignoring to jump to abort handler"); +@@ -586,6 +614,7 @@ + const ucontext_t* uc = (const ucontext_t*)context; + + st->print_cr("Registers:"); ++#if defined(__GLIBC__) || defined(__UCLIBC__) + st->print("pc =" INTPTR_FORMAT " ", uc->uc_mcontext.regs->nip); + st->print("lr =" INTPTR_FORMAT " ", uc->uc_mcontext.regs->link); + st->print("ctr=" INTPTR_FORMAT " ", uc->uc_mcontext.regs->ctr); +@@ -594,8 +623,18 @@ + st->print("r%-2d=" INTPTR_FORMAT " ", i, uc->uc_mcontext.regs->gpr[i]); + if (i % 3 == 2) st->cr(); + } ++#else // Musl ++ st->print("pc =" INTPTR_FORMAT " ", uc->uc_mcontext.gp_regs[32]); ++ st->print("lr =" INTPTR_FORMAT " ", uc->uc_mcontext.gp_regs[36]); ++ st->print("ctr=" INTPTR_FORMAT " ", uc->uc_mcontext.gp_regs[35]); + st->cr(); ++ for (int i = 0; i < 32; i++) { ++ st->print("r%-2d=" INTPTR_FORMAT " ", i, uc->uc_mcontext.gp_regs[i]); ++ if (i % 3 == 2) st->cr(); ++ } ++#endif + st->cr(); ++ st->cr(); + + intptr_t *sp = (intptr_t *)os::Linux::ucontext_get_sp(uc); + st->print_cr("Top of Stack: (sp=" PTR_FORMAT ")", p2i(sp)); +@@ -618,12 +657,22 @@ + st->print_cr("Register to memory mapping:"); + st->cr(); + ++#if defined(__GLIBC__) || defined(__UCLIBC__) + st->print("pc ="); print_location(st, (intptr_t)uc->uc_mcontext.regs->nip); + st->print("lr ="); print_location(st, (intptr_t)uc->uc_mcontext.regs->link); + st->print("ctr ="); print_location(st, (intptr_t)uc->uc_mcontext.regs->ctr); ++#else // Musl ++ st->print("pc ="); print_location(st, (intptr_t)uc->uc_mcontext.gp_regs[32]); ++ st->print("lr ="); print_location(st, (intptr_t)uc->uc_mcontext.gp_regs[36]); ++ st->print("ctr ="); print_location(st, (intptr_t)uc->uc_mcontext.gp_regs[35]); ++#endif + for (int i = 0; i < 32; i++) { + st->print("r%-2d=", i); ++#if defined(__GLIBC__) || defined(__UCLIBC__) + print_location(st, uc->uc_mcontext.regs->gpr[i]); ++#else // Musl ++ print_location(st, uc->uc_mcontext.gp_regs[i]); ++#endif + } + st->cr(); + } +--- old/src/hotspot/os_cpu/linux_ppc/thread_linux_ppc.cpp ++++ new/src/hotspot/os_cpu/linux_ppc/thread_linux_ppc.cpp +@@ -56,8 +56,13 @@ + // if we were running Java code when SIGPROF came in. + if (isInJava) { + ucontext_t* uc = (ucontext_t*) ucontext; ++#if defined(__GLIBC__) || defined(__UCLIBC__) + frame ret_frame((intptr_t*)uc->uc_mcontext.regs->gpr[1/*REG_SP*/], + (address)uc->uc_mcontext.regs->nip); ++#else // Musl ++ frame ret_frame((intptr_t*)uc->uc_mcontext.gp_regs[1/*REG_SP*/], ++ (address)uc->uc_mcontext.gp_regs[32]); ++#endif + + if (ret_frame.pc() == NULL) { + // ucontext wasn't useful +@@ -69,7 +74,11 @@ + if (!((Method*)(istate->method))->is_metaspace_object()) { + return false; + } ++#if defined(__GLIBC__) || defined(__UCLIBC__) + uint64_t reg_bcp = uc->uc_mcontext.regs->gpr[14/*R14_bcp*/]; ++#else // Musl ++ uint64_t reg_bcp = uc->uc_mcontext.gp_regs[14/*R14_bcp*/]; ++#endif + uint64_t istate_bcp = istate->bcp; + uint64_t code_start = (uint64_t)(((Method*)(istate->method))->code_base()); + uint64_t code_end = (uint64_t)(((Method*)istate->method)->code_base() + ((Method*)istate->method)->code_size()); diff --git a/srcpkgs/openjdk11/files/musl_patches/x86.patch b/srcpkgs/openjdk11/files/musl_patches/x86.patch new file mode 100644 index 00000000000..9c64c189036 --- /dev/null +++ b/srcpkgs/openjdk11/files/musl_patches/x86.patch @@ -0,0 +1,130 @@ +Patches for musl taken from Alpine linux: https://git.alpinelinux.org/aports/commit/?id=8a1ae17d4a9af54285c7891a680620e7e24c6280 +--- old/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp ++++ new/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp +@@ -90,6 +90,126 @@ + #define SPELL_REG_FP "ebp" + #endif // AMD64 + ++// ============================================================================== ++// Taken from glibc 2.28 ++// source: https://sourceware.org/git/?p=glibc.git;a=blob;f=sysdeps/x86/fpu_control.h;h=4cb98c5679b2897ff4e5826d228cba6be589e24d;hb=3c03baca37fdcb52c3881e653ca392bba7a99c2b ++// ============================================================================== ++#ifndef AMD64 ++/* FPU control word bits. x86 version. ++ Copyright (C) 1993-2018 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ Contributed by Olaf Flebbe. ++ ++ 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 _FPU_CONTROL_H ++#define _FPU_CONTROL_H 1 ++ ++/* Note that this file sets on x86-64 only the x87 FPU, it does not ++ touch the SSE unit. */ ++ ++/* Here is the dirty part. Set up your 387 through the control word ++ * (cw) register. ++ * ++ * 15-13 12 11-10 9-8 7-6 5 4 3 2 1 0 ++ * | reserved | IC | RC | PC | reserved | PM | UM | OM | ZM | DM | IM ++ * ++ * IM: Invalid operation mask ++ * DM: Denormalized operand mask ++ * ZM: Zero-divide mask ++ * OM: Overflow mask ++ * UM: Underflow mask ++ * PM: Precision (inexact result) mask ++ * ++ * Mask bit is 1 means no interrupt. ++ * ++ * PC: Precision control ++ * 11 - round to extended precision ++ * 10 - round to double precision ++ * 00 - round to single precision ++ * ++ * RC: Rounding control ++ * 00 - rounding to nearest ++ * 01 - rounding down (toward - infinity) ++ * 10 - rounding up (toward + infinity) ++ * 11 - rounding toward zero ++ * ++ * IC: Infinity control ++ * That is for 8087 and 80287 only. ++ * ++ * The hardware default is 0x037f which we use. ++ */ ++ ++#include ++ ++/* masking of interrupts */ ++#define _FPU_MASK_IM 0x01 ++#define _FPU_MASK_DM 0x02 ++#define _FPU_MASK_ZM 0x04 ++#define _FPU_MASK_OM 0x08 ++#define _FPU_MASK_UM 0x10 ++#define _FPU_MASK_PM 0x20 ++ ++/* precision control */ ++#define _FPU_EXTENDED 0x300 /* libm requires double extended precision. */ ++#define _FPU_DOUBLE 0x200 ++#define _FPU_SINGLE 0x0 ++ ++/* rounding control */ ++#define _FPU_RC_NEAREST 0x0 /* RECOMMENDED */ ++#define _FPU_RC_DOWN 0x400 ++#define _FPU_RC_UP 0x800 ++#define _FPU_RC_ZERO 0xC00 ++ ++#define _FPU_RESERVED 0xF0C0 /* Reserved bits in cw */ ++ ++ ++/* The fdlibm code requires strict IEEE double precision arithmetic, ++ and no interrupts for exceptions, rounding to nearest. */ ++ ++#define _FPU_DEFAULT 0x037f ++ ++/* IEEE: same as above. */ ++#define _FPU_IEEE 0x037f ++ ++/* Type of the control word. */ ++typedef unsigned int fpu_control_t __attribute__ ((__mode__ (__HI__))); ++ ++/* Macros for accessing the hardware control word. "*&" is used to ++ work around a bug in older versions of GCC. __volatile__ is used ++ to support combination of writing the control register and reading ++ it back. Without __volatile__, the old value may be used for reading ++ back under compiler optimization. ++ ++ Note that the use of these macros is not sufficient anymore with ++ recent hardware nor on x86-64. Some floating point operations are ++ executed in the SSE/SSE2 engines which have their own control and ++ status register. */ ++#define _FPU_GETCW(cw) __asm__ __volatile__ ("fnstcw %0" : "=m" (*&cw)) ++#define _FPU_SETCW(cw) __asm__ __volatile__ ("fldcw %0" : : "m" (*&cw)) ++ ++/* Default control word set at startup. */ ++extern fpu_control_t __fpu_control; ++ ++#endif /* fpu_control.h */ ++ ++#endif // AMD64 ++// ============================================================================== ++// ============================================================================== ++// ============================================================================== ++ + address os::current_stack_pointer() { + #ifdef SPARC_WORKS + register void *esp; diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template new file mode 100644 index 00000000000..b4d4c64b61d --- /dev/null +++ b/srcpkgs/openjdk11/template @@ -0,0 +1,183 @@ +# Template file for 'openjdk11' +_java_ver=11 +_java_min_ver=0 +_java_sec_ver=5 +_jdk_update=10 +_openjdk_version="openjdk-${_java_ver}" + + +pkgname=openjdk11 +version="${_java_ver}.${_java_min_ver}.${_java_sec_ver}+${_jdk_update}" +revision=1 +wrksrc="jdk${_java_ver}u-jdk-${version}" +build_style=gnu-configure +configure_args=" + --disable-warnings-as-errors + --prefix=${XBPS_DESTDIR}/${XBPS_CROSS_TRIPLET}/${pkgname}-${version}/usr/lib + --enable-unlimited-crypto + --with-zlib=system + --with-libjpeg=system + --with-giflib=system + --with-libpng=system + --with-lcms=system + --with-jtreg=no + --with-version-build=${version} + --with-vendor-name="Void" + --with-vendor-url="https://voidlinux.org/" + --with-vendor-bug-url="https://github.com/void-linux/void-packages/issues" + --with-vendor-vm-bug-url="https://github.com/void-linux/void-packages/issues" + --with-boot-jdk=/usr/lib/jvm/openjdk11-bin" + +make_build_args="images $(vopt_if docs docs)" +make_check_target="test-hotspot-gtest" +hostmakedepends="pkg-config automake autoconf cpio unzip zip ca-certificates + libressl zlib-devel make-ca" +makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel + giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel + fontconfig-devel zlib-devel lcms2-devel" +provides="java-environment-${version}_1 java-runtime-${version}_1" +short_desc="OpenJDK Java Development Kit" +maintainer="Kyle Nusbaum " +license="GPL-2.0-or-later" +homepage="http://openjdk.java.net/" +distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz" +checksum=a3bc19d278f68660f02610cbe1ce6c110a39a1aa53aeb90c6133a1cebf948462 +shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so" + +# Build is still parallel, but don't use -jN. +disable_parallel_build=yes +build_options="docs" + +case "$XBPS_TARGET_LIBC" in + glibc) build_options_default+=" docs";; +esac + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" openjdk11" + configure_args+=" --with-boot-jdk=/usr/lib/jvm/openjdk11" +else + hostmakedepends+=" openjdk11-bin" + configure_args+=" --with-boot-jdk=/usr/lib/jvm/openjdk11-bin" +fi + +alternatives=" + java:/usr/bin/java:/usr/lib/jvm/openjdk11/bin/java + java:/usr/bin/jjs:/usr/lib/jvm/openjdk11/bin/jjs + java:/usr/bin/keytool:/usr/lib/jvm/openjdk11/bin/keytool + java:/usr/bin/orbd:/usr/lib/jvm/openjdk11/bin/orbd + java:/usr/bin/pack200:/usr/lib/jvm/openjdk11/bin/pack200 + java:/usr/bin/policytool:/usr/lib/jvm/openjdk11/bin/policytool + java:/usr/bin/rmid:/usr/lib/jvm/openjdk11/bin/rmid + java:/usr/bin/rmiregistry:/usr/lib/jvm/openjdk11/bin/rmiregistry + java:/usr/bin/servertool:/usr/lib/jvm/openjdk11/bin/servertool + java:/usr/bin/tnameserv:/usr/lib/jvm/openjdk11/bin/tnameserv + java:/usr/bin/unpack200:/usr/lib/jvm/openjdk11/bin/unpack200 + + jdk:/usr/bin/appletviewer:/usr/lib/jvm/openjdk11/bin/appletviewer + jdk:/usr/bin/extcheck:/usr/lib/jvm/openjdk11/bin/extcheck + jdk:/usr/bin/idlj:/usr/lib/jvm/openjdk11/bin/idlj + jdk:/usr/bin/jar:/usr/lib/jvm/openjdk11/bin/jar + jdk:/usr/bin/jarsigner:/usr/lib/jvm/openjdk11/bin/jarsigner + jdk:/usr/bin/java:/usr/lib/jvm/openjdk11/bin/java + jdk:/usr/bin/java-rmi.cgi:/usr/lib/jvm/openjdk11/bin/java-rmi.cgi + jdk:/usr/bin/javac:/usr/lib/jvm/openjdk11/bin/javac + jdk:/usr/bin/javadoc:/usr/lib/jvm/openjdk11/bin/javadoc + jdk:/usr/bin/javah:/usr/lib/jvm/openjdk11/bin/javah + jdk:/usr/bin/javap:/usr/lib/jvm/openjdk11/bin/javap + jdk:/usr/bin/jcmd:/usr/lib/jvm/openjdk11/bin/jcmd + jdk:/usr/bin/jconsole:/usr/lib/jvm/openjdk11/bin/jconsole + jdk:/usr/bin/jdb:/usr/lib/jvm/openjdk11/bin/jdb + jdk:/usr/bin/jdeps:/usr/lib/jvm/openjdk11/bin/jdeps + jdk:/usr/bin/jhat:/usr/lib/jvm/openjdk11/bin/jhat + jdk:/usr/bin/jinfo:/usr/lib/jvm/openjdk11/bin/jinfo + jdk:/usr/bin/jjs:/usr/lib/jvm/openjdk11/bin/jjs + jdk:/usr/bin/jmap:/usr/lib/jvm/openjdk11/bin/jmap + jdk:/usr/bin/jps:/usr/lib/jvm/openjdk11/bin/jps + jdk:/usr/bin/jrunscript:/usr/lib/jvm/openjdk11/bin/jrunscript + jdk:/usr/bin/jsadebugd:/usr/lib/jvm/openjdk11/bin/jsadebugd + jdk:/usr/bin/jstack:/usr/lib/jvm/openjdk11/bin/jstack + jdk:/usr/bin/jstat:/usr/lib/jvm/openjdk11/bin/jstat + jdk:/usr/bin/jstatd:/usr/lib/jvm/openjdk11/bin/jstatd + jdk:/usr/bin/keytool:/usr/lib/jvm/openjdk11/bin/keytool + jdk:/usr/bin/native2ascii:/usr/lib/jvm/openjdk11/bin/native2ascii + jdk:/usr/bin/orbd:/usr/lib/jvm/openjdk11/bin/orbd + jdk:/usr/bin/pack200:/usr/lib/jvm/openjdk11/bin/pack200 + jdk:/usr/bin/policytool:/usr/lib/jvm/openjdk11/bin/policytool + jdk:/usr/bin/rmic:/usr/lib/jvm/openjdk11/bin/rmic + jdk:/usr/bin/rmid:/usr/lib/jvm/openjdk11/bin/rmid + jdk:/usr/bin/rmiregistry:/usr/lib/jvm/openjdk11/bin/rmiregistry + jdk:/usr/bin/schemagen:/usr/lib/jvm/openjdk11/bin/schemagen + jdk:/usr/bin/serialver:/usr/lib/jvm/openjdk11/bin/serialver + jdk:/usr/bin/servertool:/usr/lib/jvm/openjdk11/bin/servertool + jdk:/usr/bin/tnameserv:/usr/lib/jvm/openjdk11/bin/tnameserv + jdk:/usr/bin/unpack200:/usr/lib/jvm/openjdk11/bin/unpack200 + jdk:/usr/bin/wsgen:/usr/lib/jvm/openjdk11/bin/wsgen + jdk:/usr/bin/wsimport:/usr/lib/jvm/openjdk11/bin/wsimport + jdk:/usr/bin/xjc:/usr/lib/jvm/openjdk11/bin/xjc +" + +post_extract() { + chmod +x configure + if [ "$XBPS_TARGET_LIBC" = "musl" ]; then + rm -r src/jdk.hotspot.agent + fi +} + +post_patch() { + if [ "$XBPS_TARGET_LIBC" = "musl" ]; then + for f in "${FILESDIR}"/musl_patches/*.patch; do + echo "Applying $f" + patch -Np1 -i "$f" + done + fi +} + +do_configure() { + CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/} + CXXFLAGS=${CXXFLAGS/-D_FORTIFY_SOURCE=2/} + configure_args=${configure_args/--with-libtool-sysroot=\/usr\/[a-z0-9]*-linux-[a-z]*/} + if [ "$XBPS_CCACHE" ] && [ -z "$CROSS_BUILD" ]; then + configure_args+=" --enable-ccache" + CC="/usr/bin/cc" + CXX="/usr/bin/c++" + fi + ./configure ${configure_args} --with-extra-cflags="$CFLAGS" --with-extra-cxxflags="$CXXFLAGS" --with-extra-ldflags="$LDFLAGS" +} + +post_install() { + vmkdir /usr/lib/jvm + mv ${DESTDIR}/usr/lib/jvm/openjdk-${_java_ver}.${_java_min_ver}.${_java_sec_ver}-internal ${DESTDIR}/usr/lib/jvm/openjdk${_java_ver} + rm -rf ${DESTDIR}/usr/lib/bin + vmkdir usr/lib/jvm/$_openjdk_version/lib/security + make-ca -g -f --destdir "${PWD}/ca" -k "${DESTDIR}/usr/lib/jvm/$_openjdk_version/bin/keytool" + mv ./ca/etc/pki/tls/java/cacerts ${DESTDIR}/usr/lib/jvm/$_openjdk_version/lib/security/ + chmod -R ugo+rw ./ca + rm -Rf ./ca + vlicense ASSEMBLY_EXCEPTION + vlicense LICENSE +} + +openjdk11-doc_package() { + nostrip=yes + noverifyrdeps=yes + noshlibprovides=yes + short_desc+=" -- documentation" + pkg_install() { + cd ${wrksrc} + if [ "$build_option_docs" ]; then + vmkdir usr/share/doc/openjdk11 + cp -a build/linux-*/images/docs/* ${PKGDESTDIR}/usr/share/doc/openjdk11 + fi + vmove usr/lib/jvm/openjdk11/man/man1/ + } +} + +openjdk11-src_package() { + nostrip=yes + noverifyrdeps=yes + noshlibprovides=yes + short_desc+=" -- sources" + pkg_install() { + vmove "usr/lib/jvm/openjdk11/lib/src.zip" + } +} From 5b942093147492091c51f70b7c23418a2281c2c9 Mon Sep 17 00:00:00 2001 From: Frank Steinborn Date: Tue, 29 Oct 2019 23:26:28 +0100 Subject: [PATCH 142/186] linux5.3: update to 5.3.8. [skip ci] --- srcpkgs/linux5.3/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/linux5.3/template b/srcpkgs/linux5.3/template index 895134128df..c7115b74234 100644 --- a/srcpkgs/linux5.3/template +++ b/srcpkgs/linux5.3/template @@ -1,6 +1,6 @@ # Template file for 'linux5.3' pkgname=linux5.3 -version=5.3.7 +version=5.3.8 revision=1 wrksrc="linux-${version}" short_desc="Linux kernel and modules (${version%.*} series)" @@ -8,7 +8,7 @@ maintainer="Foxlet " 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=c6c9714e21531c825c306b107bc6f6c7bfa2d5270a14bad170f8de5a73d34802 +checksum=78f3cfc6c20b10ff21c0bb22d7d257cab03781c44d8c5aae289f749f94f76649 patch_args="-Np1" nodebug=yes # -dbg package is generated below manually From a4df326ca2eeb2647b64fb664ebd331bd9c7938a Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Mon, 28 Oct 2019 09:48:36 +0100 Subject: [PATCH 143/186] smplayer: update to 19.10.0. --- srcpkgs/smplayer/template | 44 +++++++++++++++++++++++++++++++++++---- 1 file changed, 40 insertions(+), 4 deletions(-) diff --git a/srcpkgs/smplayer/template b/srcpkgs/smplayer/template index ed348e05a89..6c771bb5896 100644 --- a/srcpkgs/smplayer/template +++ b/srcpkgs/smplayer/template @@ -1,6 +1,6 @@ # Template file for 'smplayer' pkgname=smplayer -version=19.5.0 +version=19.10.0 revision=1 build_style=gnu-makefile hostmakedepends="qt5-host-tools qt5-tools qt5-script-devel" @@ -11,11 +11,47 @@ maintainer="Helmut Pozimski " license="GPL-2.0-or-later" homepage="https://www.smplayer.info" distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2" -checksum=b5cb2b37fc9a225bb7287bf26a0a499f7b46bff688161b8e5eae0d96d74daaf5 +checksum=54f751c62977899307c838936d05018b0a4884ee95e0e0415ceb92054286076b + +# upstream bug report https://sourceforge.net/p/smplayer/bugs/935/ +if [ "$XBPS_TARGET_WORDSIZE" == "32" ]; +then + broken="embedded web server does not compile on 32 bit architectures" +fi pre_build() { - export QMAKE_OPTS="QMAKE_CC=$CC QMAKE_CXX=$CXX QMAKE_LINK=$CXX QMAKE_CFLAGS=\"${CFLAGS}\" \ - QMAKE_CXXFLAGS=\"${CXXFLAGS}\" QMAKE_LFLAGS=\"${LDFLAGS}\"" + if [ "$CROSS_BUILD" ]; then + cat > "${wrksrc}/qt.conf" <<_EOF +[Paths] +Sysroot=${XBPS_CROSS_BASE} +Prefix=${XBPS_CROSS_BASE}/usr +ArchData=${XBPS_CROSS_BASE}/usr/lib/qt5 +Data=${XBPS_CROSS_BASE}/usr/share/qt5 +Documentation=${XBPS_CROSS_BASE}/usr/share/doc/qt5 +Headers=${XBPS_CROSS_BASE}/usr/include/qt5 +Libraries=${XBPS_CROSS_BASE}/usr/lib +LibraryExecutables=/usr/lib/qt5/libexec +Binaries=/usr/lib/qt5/bin +Tests=${XBPS_CROSS_BASE}/usr/tests +Plugins=/usr/lib/qt5/plugins +Imports=${XBPS_CROSS_BASE}/usr/lib/qt5/imports +Qml2Imports=${XBPS_CROSS_BASE}/usr/lib/qt5/qml +Translations=${XBPS_CROSS_BASE}/usr/share/qt5/translations +Settings=${XBPS_CROSS_BASE}/etc/xdg +Examples=${XBPS_CROSS_BASE}/usr/share/qt5/examples +HostPrefix=/usr +HostData=/usr/lib/qt5 +HostBinaries=/usr/lib/qt5/bin +HostLibraries=/usr/lib +Spec=linux-g++ +TargetSpec=linux-g++ +_EOF + export QMAKE_OPTS="QMAKE_CC=$CC QMAKE_CXX=$CXX QMAKE_LINK=$CXX QMAKE_CFLAGS=\"${CFLAGS}\" \ + QMAKE_CXXFLAGS=\"${CXXFLAGS}\" QMAKE_LFLAGS=\"${LDFLAGS}\" -qtconf ${wrksrc}/qt.conf" + else + export QMAKE_OPTS="QMAKE_CC=$CC QMAKE_CXX=$CXX QMAKE_LINK=$CXX QMAKE_CFLAGS=\"${CFLAGS}\" \ + QMAKE_CXXFLAGS=\"${CXXFLAGS}\" QMAKE_LFLAGS=\"${LDFLAGS}\"" + fi sed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro sed -i 's|PREFIX=/usr/local|PREFIX=/usr|' Makefile sed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer|' Makefile From 6007f3007335b58807d4a90ffc4c8ec88f77ce3c Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Oct 2019 11:15:43 +0100 Subject: [PATCH 144/186] darktable: set broken on aarch64 --- srcpkgs/darktable/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template index 61cac064a3a..a411cab62c9 100644 --- a/srcpkgs/darktable/template +++ b/srcpkgs/darktable/template @@ -25,5 +25,6 @@ distfiles="https://github.com/darktable-org/darktable/releases/download/release- checksum=a518999c8458472edfc04577026ce5047d74553052af0f52d10ba8ce601b78f0 case "$XBPS_TARGET_MACHINE" in - ppc64le*) configure_args+=" -DUSE_OPENCL=OFF" + ppc64le*) configure_args+=" -DUSE_OPENCL=OFF" ;; + aarch64*) broken="https://build.voidlinux.org/builders/aarch64_builder/builds/22479/steps/shell_3/logs/stdio" ;; esac From 77f38a8af7e74e62ec634d3fd6d2b6611190048f Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 30 Oct 2019 13:00:50 +0100 Subject: [PATCH 145/186] harfbuzz: update to 2.6.4. --- srcpkgs/harfbuzz/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template index 87c29a2baf9..ae37175f9a2 100644 --- a/srcpkgs/harfbuzz/template +++ b/srcpkgs/harfbuzz/template @@ -1,6 +1,6 @@ # Template file for 'harfbuzz' pkgname=harfbuzz -version=2.6.2 +version=2.6.4 revision=1 build_style=gnu-configure configure_args="--with-glib --with-freetype --with-cairo --with-icu --with-graphite2" @@ -12,7 +12,7 @@ license="MIT" homepage="http://www.freedesktop.org/wiki/Software/HarfBuzz/" changelog="https://raw.githubusercontent.com/harfbuzz/harfbuzz/master/NEWS" distfiles="${FREEDESKTOP_SITE}/harfbuzz/release/${pkgname}-${version}.tar.xz" -checksum=3b4c6a72f7f2b05d54f6c3112b3ebee5131c199fe4de4cf9bbbf71a56666f624 +checksum=9413b8d96132d699687ef914ebb8c50440efc87b3f775d25856d7ec347c03c12 pre_configure() { autoreconf -fi From c2c4cae061a7804736ee590a9bacee5450b8b29c Mon Sep 17 00:00:00 2001 From: mustaqim Date: Wed, 30 Oct 2019 05:57:24 +0200 Subject: [PATCH 146/186] dav1d: update to 0.5.1 --- ...8f47f0eebcdfebb1753a786e3e1654b51ea4.patch | 38 ------------------- srcpkgs/dav1d/template | 4 +- 2 files changed, 2 insertions(+), 40 deletions(-) delete mode 100644 srcpkgs/dav1d/patches/a6228f47f0eebcdfebb1753a786e3e1654b51ea4.patch diff --git a/srcpkgs/dav1d/patches/a6228f47f0eebcdfebb1753a786e3e1654b51ea4.patch b/srcpkgs/dav1d/patches/a6228f47f0eebcdfebb1753a786e3e1654b51ea4.patch deleted file mode 100644 index e5fc394e638..00000000000 --- a/srcpkgs/dav1d/patches/a6228f47f0eebcdfebb1753a786e3e1654b51ea4.patch +++ /dev/null @@ -1,38 +0,0 @@ -From a6228f47f0eebcdfebb1753a786e3e1654b51ea4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Martin=20Storsj=C3=B6?= -Date: Fri, 11 Oct 2019 13:17:36 +0300 -Subject: [PATCH] arm64: ipred: Make sure all symbols are aligned - -If building with debug information enabled, binutils error out with -"unaligned opcodes detected in executable segment", if there are -symbols (even local ones that don't end up in the symbol table) -that point to unaligned addresses in the text section. - -This fixes issue #300. ---- - src/arm/64/ipred.S | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/arm/64/ipred.S b/src/arm/64/ipred.S -index 41b3c1cb..9513212b 100644 ---- src/arm/64/ipred.S -+++ src/arm/64/ipred.S -@@ -2244,6 +2244,7 @@ L(ipred_cfl_ac_420_tbl): - .hword L(ipred_cfl_ac_420_tbl) - L(ipred_cfl_ac_420_w16) - .hword L(ipred_cfl_ac_420_tbl) - L(ipred_cfl_ac_420_w8) - .hword L(ipred_cfl_ac_420_tbl) - L(ipred_cfl_ac_420_w4) -+ .hword 0 - - L(ipred_cfl_ac_420_w16_tbl): - .hword L(ipred_cfl_ac_420_w16_tbl) - L(ipred_cfl_ac_420_w16_wpad0) -@@ -2432,6 +2433,7 @@ L(ipred_cfl_ac_422_tbl): - .hword L(ipred_cfl_ac_422_tbl) - L(ipred_cfl_ac_422_w16) - .hword L(ipred_cfl_ac_422_tbl) - L(ipred_cfl_ac_422_w8) - .hword L(ipred_cfl_ac_422_tbl) - L(ipred_cfl_ac_422_w4) -+ .hword 0 - - L(ipred_cfl_ac_422_w16_tbl): - .hword L(ipred_cfl_ac_422_w16_tbl) - L(ipred_cfl_ac_422_w16_wpad0) --- -2.22.0 - diff --git a/srcpkgs/dav1d/template b/srcpkgs/dav1d/template index 10a0c949fba..f1cf49194af 100644 --- a/srcpkgs/dav1d/template +++ b/srcpkgs/dav1d/template @@ -1,6 +1,6 @@ # Template file for 'dav1d' pkgname=dav1d -version=0.5.0 +version=0.5.1 revision=1 build_style=meson configure_args="-Dbuild_tests=false -Dbuild_asm=true -Dbuild_tools=true @@ -12,7 +12,7 @@ license="BSD-2-Clause" homepage="https://code.videolan.org/videolan/dav1d" changelog="https://code.videolan.org/videolan/dav1d/raw/master/NEWS" distfiles="https://code.videolan.org/videolan/dav1d/-/archive//${version}/dav1d-${version}.tar.bz2" -checksum=b29c159bf7c56e8b6ae81bb24704599819fa89399ec3d6db3dbc052d7bc5baf8 +checksum=0214d201a338e8418f805b68f9ad277e33d79c18594dee6eaf6dcd74db2674a9 libdav1d3_package() { short_desc+=" - runtime library" From 704ecf0ed2cc22cfe538b0a48e64a2c945ee6004 Mon Sep 17 00:00:00 2001 From: Auri Date: Wed, 30 Oct 2019 13:27:18 +0200 Subject: [PATCH 147/186] dub: update to 1.17.0 --- srcpkgs/dub/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/dub/template b/srcpkgs/dub/template index 5caeeef9740..ec05d29c5f8 100644 --- a/srcpkgs/dub/template +++ b/srcpkgs/dub/template @@ -1,6 +1,6 @@ # Template file for 'dub' pkgname=dub -version=1.13.0 +version=1.17.0 revision=1 hostmakedepends="dmd" makedepends="libcurl-devel" @@ -10,7 +10,7 @@ maintainer="Follpvosten " license="MIT" homepage="https://github.com/dlang/dub" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=8c7ffdae0b49bd1a246f48e865610fc5b6f6bdf58057858f3ba7e9dae8368ee7 +checksum=1b5d5331223faf1320d33c0fbca48811f48893f5dcb57d5a5df8cf2ae3d845e7 nocross="requires dmd" do_build() { From 2073d6d0407dcefbb7724eb45cd7c2a482493d32 Mon Sep 17 00:00:00 2001 From: Auri Date: Wed, 30 Oct 2019 12:51:41 +0200 Subject: [PATCH 148/186] notmuch: update to 0.29.2 --- srcpkgs/notmuch/patches/cross.patch | 2 +- srcpkgs/notmuch/template | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/notmuch/patches/cross.patch b/srcpkgs/notmuch/patches/cross.patch index 682e7b2a209..1ceaebafc56 100644 --- a/srcpkgs/notmuch/patches/cross.patch +++ b/srcpkgs/notmuch/patches/cross.patch @@ -72,7 +72,7 @@ index 8b80f0e0..8e5fd4ce 100755 - return 0; -} -EOF -- if ! TEMP_GPG=$(mktemp -d); then +- if ! TEMP_GPG=$(mktemp -d "${TMPDIR:-/tmp}/notmuch.XXXXXX"); then - printf 'No.\nCould not make tempdir for testing session-key support.\n' - errors=$((errors + 1)) - elif ${CC} ${CFLAGS} ${gmime_cflags} _check_session_keys.c ${gmime_ldflags} -o _check_session_keys \ diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template index ced670a59d4..6bb8578fa1e 100644 --- a/srcpkgs/notmuch/template +++ b/srcpkgs/notmuch/template @@ -1,6 +1,6 @@ # Template file for 'notmuch' pkgname=notmuch -version=0.29.1 +version=0.29.2 revision=1 hostmakedepends="perl pkg-config python-devel python3-Sphinx python3-devel" makedepends="bash-completion gmime3-devel talloc-devel xapian-core-devel" @@ -9,7 +9,7 @@ maintainer="Jan S. " license="GPL-3.0-or-later" homepage="https://notmuchmail.org" distfiles="https://notmuchmail.org/releases/notmuch-${version}.tar.xz" -checksum=9846fc8e32d415cee41f6644581a4de7b0d2e6bc98e1ba86db918f061fcfe365 +checksum=1bda6149b2fb0840f4d146391cab89e541d30a778f1f6e6fa95b456097cd55de subpackages="libnotmuch libnotmuch-devel notmuch-mutt notmuch-python notmuch-python3" patch_args=-Np1 From afac9a630a99a0b01417a66832e3ffd9e6140e93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Wed, 30 Oct 2019 13:30:26 +0100 Subject: [PATCH 149/186] mame: update to 0.215 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/mame/patches/ppc64-fixes.patch | 35 -------------------------- srcpkgs/mame/template | 4 +-- 2 files changed, 2 insertions(+), 37 deletions(-) delete mode 100644 srcpkgs/mame/patches/ppc64-fixes.patch diff --git a/srcpkgs/mame/patches/ppc64-fixes.patch b/srcpkgs/mame/patches/ppc64-fixes.patch deleted file mode 100644 index 6c847f09b81..00000000000 --- a/srcpkgs/mame/patches/ppc64-fixes.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- 3rdparty/bx/include/bx/platform.h -+++ 3rdparty/bx/include/bx/platform.h -@@ -133,8 +133,14 @@ - #endif // - - #if BX_CPU_PPC --# undef BX_CPU_ENDIAN_BIG --# define BX_CPU_ENDIAN_BIG 1 -+// _LITTLE_ENDIAN exists on ppc64le. -+# if _LITTLE_ENDIAN -+# undef BX_CPU_ENDIAN_LITTLE -+# define BX_CPU_ENDIAN_LITTLE 1 -+# else -+# undef BX_CPU_ENDIAN_BIG -+# define BX_CPU_ENDIAN_BIG 1 -+# endif - #else - # undef BX_CPU_ENDIAN_LITTLE - # define BX_CPU_ENDIAN_LITTLE 1 - ---- makefile -+++ makefile -@@ -394,6 +394,12 @@ BIGENDIAN := 1 - endif - endif # BIGENDIAN - -+# Work around an issue with long doubles on ppc64 (#3157) -+ifneq (,$(findstring ppc64,$(UNAME))) -+ARCHOPTS_C += -mlong-double-64 -+ARCHOPTS_CXX += -mlong-double-64 -+endif -+ - ifndef PYTHON_EXECUTABLE - PYTHON := python - else diff --git a/srcpkgs/mame/template b/srcpkgs/mame/template index 14e9374500c..116cc665e2f 100644 --- a/srcpkgs/mame/template +++ b/srcpkgs/mame/template @@ -1,6 +1,6 @@ # Template file for 'mame' pkgname=mame -version=0214 +version=0215 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=8ae24e3b1de33df33957c5f642bd98828842305bcb31da130b759ba7e88b36d2 +checksum=c1b5fb0b91829df5f3dbe54ff13a7ccfa3a9f8aafa51a61c9a2f3158560ed609 hostmakedepends="perl pkg-config python" makedepends="SDL2_ttf-devel glm libgomp-devel libjpeg-turbo-devel From d8b4d749b32ff57371093ff8b344a22b7bd0377d Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Tue, 29 Oct 2019 21:56:06 -0500 Subject: [PATCH 150/186] geeqie: update to 1.5.1 --- .../patches/geeqie-1.4-exiv2-0.27.patch | 84 ------------------- srcpkgs/geeqie/template | 13 +-- 2 files changed, 8 insertions(+), 89 deletions(-) delete mode 100644 srcpkgs/geeqie/patches/geeqie-1.4-exiv2-0.27.patch diff --git a/srcpkgs/geeqie/patches/geeqie-1.4-exiv2-0.27.patch b/srcpkgs/geeqie/patches/geeqie-1.4-exiv2-0.27.patch deleted file mode 100644 index 2ce96733d8d..00000000000 --- a/srcpkgs/geeqie/patches/geeqie-1.4-exiv2-0.27.patch +++ /dev/null @@ -1,84 +0,0 @@ -Source: https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/geeqie/files/geeqie-1.4-exiv2-0.27.patch -Upstream: Yes -Reason: FTBFS - -From 13859e2ec3a1afc74f109cfffdf0de39030cde86 Mon Sep 17 00:00:00 2001 -From: Rasmus Thomsen -Date: Wed, 2 Jan 2019 01:04:45 +0100 -Subject: [PATCH] fix build against exiv2-0.27.x - -fixes #654 ---- - src/exiv2.cc | 16 +++++++++++++--- - 1 file changed, 13 insertions(+), 3 deletions(-) - -diff --git a/src/exiv2.cc b/src/exiv2.cc -index b3c80657..f40b725e 100644 ---- a/src/exiv2.cc -+++ b/src/exiv2.cc -@@ -22,17 +22,27 @@ - - #ifdef HAVE_EXIV2 - -+// Don't include the file directly -+// Early Exiv2 versions didn't have version.hpp and the macros. -+#include - #include - #include - #include - #include - - // EXIV2_TEST_VERSION is defined in Exiv2 0.15 and newer. -+#ifdef EXIV2_VERSION - #ifndef EXIV2_TEST_VERSION --# define EXIV2_TEST_VERSION(major,minor,patch) \ -+#define EXIV2_TEST_VERSION(major,minor,patch) \ - ( EXIV2_VERSION >= EXIV2_MAKE_VERSION(major,minor,patch) ) - #endif -+#else -+#define EXIV2_TEST_VERSION(major,minor,patch) (false) -+#endif - -+#if EXIV2_TEST_VERSION(0,27,0) -+#define HAVE_EXIV2_ERROR_CODE -+#endif - - #include - #include -@@ -40,6 +50,10 @@ - #include - #include - -+#if EXIV2_TEST_VERSION(0,27,0) -+#define EXV_PACKAGE "exiv2" -+#endif -+ - #if !EXIV2_TEST_VERSION(0,17,90) - #include - #include -@@ -374,7 +388,11 @@ - #endif - Exiv2::Image *image = imageData_->image(); - -- if (!image) Exiv2::Error(21); -+#ifdef HAVE_EXIV2_ERROR_CODE -+ if (!image) throw Exiv2::Error(Exiv2::ErrorCode::kerInputDataReadFailed); -+#else -+ if (!image) throw Exiv2::Error(21); -+#endif - image->setExifData(exifData_); - image->setIptcData(iptcData_); - #if EXIV2_TEST_VERSION(0,16,0) -@@ -394,8 +412,12 @@ - sidecar->setXmpData(xmpData_); - sidecar->writeMetadata(); - #else -+#ifdef HAVE_EXIV2_ERROR_CODE -+ throw Exiv2::Error(Exiv2::ErrorCode::kerNotAnImage, "xmp"); -+#else - throw Exiv2::Error(3, "xmp"); - #endif -+#endif - } - } - diff --git a/srcpkgs/geeqie/template b/srcpkgs/geeqie/template index afa19001f46..8d136c84ad0 100644 --- a/srcpkgs/geeqie/template +++ b/srcpkgs/geeqie/template @@ -1,6 +1,6 @@ # Template file for 'geeqie' pkgname=geeqie -version=1.4 +version=1.5.1 revision=1 build_style=gnu-configure configure_args="--enable-gtk3" @@ -13,17 +13,20 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="http://www.geeqie.org/" distfiles="http://www.geeqie.org/geeqie-${version}.tar.xz" -checksum=5c583a165573ec37874c278f9dc57e73df356b30e09a9ccac3179dd5d97e3e32 +checksum=4854d5d323c31f8f4068fd73ab2c454ff91e826c4ca4d37b22c246ad14dea10a patch_args="-Np1" post_extract() { # Missing from release tarball, and requires git tree to generate sed -e "/readme_DATA/s/ChangeLog\(.html\)\?//g" -i Makefile.am - - # Remove -Werror (gcc changes may add new warnings) - sed -e '/CFLAGS/s/-Werror //g' -i configure.in } pre_configure() { NOCONFIGURE=1 ./autogen.sh } +# musl gives many warnings and stops compiling after many warnings +if [ "$XBPS_TARGET_LIBC" = "musl" ]; then +do_build() { + make CFLAGS="$CFLAGS -Wno-error" +} +fi From 25b5f7195e69b8431a476e266ed20fd5eaa766ab Mon Sep 17 00:00:00 2001 From: yopito Date: Tue, 29 Oct 2019 20:16:25 +0100 Subject: [PATCH 151/186] freecad: update to 0.18.4 [ci skip] --- srcpkgs/freecad/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template index 9e9375c4444..70caa0f5793 100644 --- a/srcpkgs/freecad/template +++ b/srcpkgs/freecad/template @@ -1,7 +1,7 @@ # Template file for 'freecad' pkgname=freecad -version=0.18.3 -revision=2 +version=0.18.4 +revision=1 wrksrc="FreeCAD-${version}" build_style=cmake @@ -38,7 +38,7 @@ maintainer="yopito " license="LGPL-2.0-or-later" homepage="https://freecadweb.org/" distfiles="https://github.com/FreeCAD/FreeCAD/archive/${version}.tar.gz" -checksum=7f86b9b31f3b5bdf64e0c3978f71916f7a427c09776a6f3143adb268df57471e +checksum=4e0cce447b31b8989a00cf68c49ae012ce8e5546a56c6e0874fbd8f7ddedffd2 post_extract() { # Report exact minor version From 243a3c46acc528b25e7231a6fb7fe8f71a2ebcb7 Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Tue, 29 Oct 2019 21:19:44 -0500 Subject: [PATCH 152/186] fakeroot:update to 1.24 --- srcpkgs/fakeroot/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/fakeroot/template b/srcpkgs/fakeroot/template index 7d45334f556..053cbc1babf 100644 --- a/srcpkgs/fakeroot/template +++ b/srcpkgs/fakeroot/template @@ -1,6 +1,6 @@ # Template file for 'fakeroot' pkgname=fakeroot -version=1.23 +version=1.24 revision=1 build_style=gnu-configure configure_args="--disable-static" @@ -10,8 +10,8 @@ short_desc="Gives a fake root environment" maintainer="Orphaned " license="GPL-3.0-or-later" homepage="http://packages.debian.org/fakeroot" -distfiles="${DEBIAN_SITE}/main/f/fakeroot/${pkgname}_${version}.orig.tar.xz" -checksum=009cd6696a931562cf1c212bb57ca441a4a2d45cd32c3190a35c7ae98506f4f6 +distfiles="${DEBIAN_SITE}/main/f/fakeroot/${pkgname}_${version}.orig.tar.gz" +checksum=2e045b3160370b8ab4d44d1f8d267e5d1d555f1bb522d650e7167b09477266ed lib32disabled=yes From 3ab66d3890038fa536d7aa986e5611b07fcd9330 Mon Sep 17 00:00:00 2001 From: travankor Date: Tue, 29 Oct 2019 23:54:38 -0700 Subject: [PATCH 153/186] mtm: update to 1.2.0. Correctly install terminfo into subpackage. --- srcpkgs/mtm-terminfo | 1 + srcpkgs/mtm/mtm-terminfo.INSTALL | 5 +++++ srcpkgs/mtm/mtm-terminfo.REMOVE | 7 +++++++ srcpkgs/mtm/template | 16 ++++++++++++---- 4 files changed, 25 insertions(+), 4 deletions(-) create mode 120000 srcpkgs/mtm-terminfo create mode 100644 srcpkgs/mtm/mtm-terminfo.INSTALL create mode 100644 srcpkgs/mtm/mtm-terminfo.REMOVE diff --git a/srcpkgs/mtm-terminfo b/srcpkgs/mtm-terminfo new file mode 120000 index 00000000000..867a0ab39fe --- /dev/null +++ b/srcpkgs/mtm-terminfo @@ -0,0 +1 @@ +mtm/ \ No newline at end of file diff --git a/srcpkgs/mtm/mtm-terminfo.INSTALL b/srcpkgs/mtm/mtm-terminfo.INSTALL new file mode 100644 index 00000000000..4c2d03b145c --- /dev/null +++ b/srcpkgs/mtm/mtm-terminfo.INSTALL @@ -0,0 +1,5 @@ +case "${ACTION}" in +post) + tic -sx usr/share/terminfo/m/mtm.ti + ;; +esac diff --git a/srcpkgs/mtm/mtm-terminfo.REMOVE b/srcpkgs/mtm/mtm-terminfo.REMOVE new file mode 100644 index 00000000000..767b67b2bee --- /dev/null +++ b/srcpkgs/mtm/mtm-terminfo.REMOVE @@ -0,0 +1,7 @@ +case "${ACTION}" in +pre) + rm usr/share/terminfo/m/mtm + rm usr/share/terminfo/m/mtm-256color + rm usr/share/terminfo/m/mtm-noutf + ;; +esac diff --git a/srcpkgs/mtm/template b/srcpkgs/mtm/template index 66dfe25bb22..ed69349285b 100644 --- a/srcpkgs/mtm/template +++ b/srcpkgs/mtm/template @@ -1,23 +1,31 @@ # Template file for 'mtm' pkgname=mtm -version=1.1.0 +version=1.2.0 revision=1 build_style=gnu-makefile -hostmakedepends="ncurses" makedepends="ncurses-devel ncurses-libs" +depends="ncurses" short_desc="Micro Terminal Multiplexer" maintainer="travankor " license="GPL-3.0-or-later" homepage="https://github.com/deadpixi/mtm" distfiles="https://github.com/deadpixi/mtm/archive/${version}.tar.gz" -checksum=3f3e723466f3bb88afb7a49b66a790f3aaf6786654e8f1f056edc09fa99abd85 +checksum=68f753f743fcd3d87f269011d4bbd3fed59cfcad710d7c7db98844e3e675c196 do_build() { make HEADERS='-DNCURSESW_INCLUDE_H=""' } do_install() { - make install-terminfo vbin mtm + vinstall mtm.ti 644 usr/share/terminfo/m vman mtm.1 } + +mtm-terminfo_package() { + short_desc+=" - terminfo data" + archs=noarch + pkg_install() { + vmove usr/share/terminfo + } +} From 35e94760ce7886cbd678ce0367c43d44cee9eff9 Mon Sep 17 00:00:00 2001 From: travankor Date: Thu, 3 Oct 2019 06:22:07 -0700 Subject: [PATCH 154/186] clipman: update to 1.2.0. --- srcpkgs/clipman/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/clipman/template b/srcpkgs/clipman/template index 87303fff362..6d7a873d42b 100644 --- a/srcpkgs/clipman/template +++ b/srcpkgs/clipman/template @@ -1,6 +1,6 @@ # Template file for 'clipman' pkgname=clipman -version=1.0.2 +version=1.2.0 revision=1 build_style=go go_import_path=github.com/yory8/clipman @@ -11,4 +11,4 @@ maintainer="travankor " license="GPL-3.0-or-later" homepage="https://github.com/yory8/clipman" distfiles="https://github.com/yory8/clipman/archive/v${version}.tar.gz" -checksum=9ee2a03891d06594323777fad2e34b3787f41c5168f2354c52776bc8ad2868d3 +checksum=6862487b7acbb08228663a7f9b33673519efb4147ec27601eac4f8c0e980973a From 70261b152e90ff066ba577752f8a6b6bab6d8214 Mon Sep 17 00:00:00 2001 From: travankor Date: Wed, 30 Oct 2019 01:10:53 -0700 Subject: [PATCH 155/186] dnscrypt-proxy: update to 2.0.29. --- 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 1ff59848058..8a458e70e61 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.27 +version=2.0.29 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=a501f44af39cb43e00489ef9e6678aa8adba2bc98f9042dd61ce60e9ad074d5a +checksum=5c18f0c9d6a89b64d532c98e2bd976f98211a715399c7a1ee81a22c5485673b9 conf_files="/etc/dnscrypt-proxy.toml" system_accounts="dnscrypt_proxy" make_dirs="/var/log/dnscrypt-proxy 0750 dnscrypt_proxy dnscrypt_proxy" From 83ccaeb2ebc5d9ad516eb547c2c53ab042a04e93 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Wed, 30 Oct 2019 15:41:34 +0100 Subject: [PATCH 156/186] font-symbola: revbump to trigger build fixes #15955 --- srcpkgs/font-symbola/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/font-symbola/template b/srcpkgs/font-symbola/template index ff2b567dc49..4a52261d80d 100644 --- a/srcpkgs/font-symbola/template +++ b/srcpkgs/font-symbola/template @@ -1,7 +1,7 @@ # Template file for 'font-symbola' pkgname=font-symbola version=12.00 -revision=1 +revision=2 archs=noarch create_wrksrc=yes hostmakedepends="unzip" From cfa0063de08a8c51c4c7f1236e0c8f886b18aede Mon Sep 17 00:00:00 2001 From: Caio Alonso Date: Wed, 30 Oct 2019 11:29:57 -0300 Subject: [PATCH 157/186] Updates wee-slack dependency to python3 --- srcpkgs/wee-slack/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/wee-slack/template b/srcpkgs/wee-slack/template index 1a86e25afe8..544818732e1 100644 --- a/srcpkgs/wee-slack/template +++ b/srcpkgs/wee-slack/template @@ -1,9 +1,9 @@ # Template file for 'wee-slack' pkgname=wee-slack version=2.3.0 -revision=1 +revision=2 archs=noarch -depends="weechat weechat-python python-websocket-client" +depends="weechat weechat-python python3-websocket-client" short_desc="WeeChat plugin for Slack.com" maintainer="Renato Aguiar " license="MIT" From a53cc103532efe63a09d091de208eebee1737f23 Mon Sep 17 00:00:00 2001 From: Frank Steinborn Date: Wed, 30 Oct 2019 14:04:23 +0100 Subject: [PATCH 158/186] skopeo: update to 0.1.40. --- srcpkgs/skopeo/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/skopeo/template b/srcpkgs/skopeo/template index 524fcd9a9dd..932c1876f60 100644 --- a/srcpkgs/skopeo/template +++ b/srcpkgs/skopeo/template @@ -1,6 +1,6 @@ # Template file for 'skopeo' pkgname=skopeo -version=0.1.39 +version=0.1.40 revision=1 build_style=go go_import_path="github.com/containers/${pkgname}" @@ -14,7 +14,7 @@ maintainer="Frank Steinborn " license="Apache-2.0" homepage="https://github.com/containers/skopeo" distfiles="https://github.com/containers/${pkgname}/archive/v${version}.tar.gz" -checksum=e9d70f7f7b891675a816f06a22df0490285ad20eefbd91f5da69ca12f56c29f2 +checksum=ee1e33245938fcb622f5864fac860e2d8bfa2fa907af4b5ffc3704ed0db46bbf make_dirs="/var/lib/atomic/sigstore 0755 root root" post_build() { From 0e6a1dda38f0264c10125445e2e32e111fa7c486 Mon Sep 17 00:00:00 2001 From: Peter Bui Date: Wed, 30 Oct 2019 09:06:38 -0400 Subject: [PATCH 159/186] ell: update to 0.26. --- srcpkgs/ell/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ell/template b/srcpkgs/ell/template index ace014248d3..6b0279c4c8d 100644 --- a/srcpkgs/ell/template +++ b/srcpkgs/ell/template @@ -1,6 +1,6 @@ # Template file for 'ell' pkgname=ell -version=0.25 +version=0.26 revision=1 build_style=gnu-configure configure_args="--enable-glib" @@ -11,7 +11,7 @@ maintainer="Peter Bui " license="GPL-2.0-only" homepage="https://01.org/ell" distfiles="https://mirrors.edge.kernel.org/pub/linux/libs/ell/ell-${version}.tar.xz" -checksum=7f2be568219d991d566ca50c58a56e69df9a248619fed758dcd9a4b04e655e5b +checksum=7855b4b8f271ba6ee67d87d0965b975a9a8dbeaa616665ca2248afa3b5fcbc77 ell-devel_package() { depends="ell-${version}_${revision}" From fac8364642b96a1f74d80b36522c47089d82405f Mon Sep 17 00:00:00 2001 From: Peter Bui Date: Wed, 30 Oct 2019 09:22:53 -0400 Subject: [PATCH 160/186] iwd: update to 1.0. --- srcpkgs/iwd/patches/fix-name-request.patch | 24 ++++++++++------------ srcpkgs/iwd/template | 7 +++---- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/srcpkgs/iwd/patches/fix-name-request.patch b/srcpkgs/iwd/patches/fix-name-request.patch index e97efbc224a..3bad1201894 100644 --- a/srcpkgs/iwd/patches/fix-name-request.patch +++ b/srcpkgs/iwd/patches/fix-name-request.patch @@ -1,8 +1,6 @@ -diff --git Makefile.am Makefile.am -index 6135524..5efb6f6 100644 ---- Makefile.am -+++ Makefile.am -@@ -136,15 +136,15 @@ noinst_PROGRAMS = +--- Makefile.am 2019-10-30 06:50:34.000000000 -0400 ++++ Makefile.am 2019-10-30 09:10:08.542128891 -0400 +@@ -139,15 +139,15 @@ if DBUS_POLICY dbus_datadir = @DBUS_DATADIR@/dbus-1/system.d dist_dbus_data_DATA = @@ -18,10 +16,10 @@ index 6135524..5efb6f6 100644 -dbus_busdir = @DBUS_BUSDIR@ -dbus_bus_DATA = - - systemd_modloaddir = @SYSTEMD_MODLOADDIR@ - systemd_modload_DATA = src/pkcs8.conf - endif -@@ -218,13 +218,13 @@ endif + systemd_networkdir = @SYSTEMD_NETWORKDIR@ + systemd_network_DATA = + +@@ -244,13 +244,13 @@ if DBUS_POLICY dist_dbus_data_DATA += src/iwd-dbus.conf @@ -33,10 +31,10 @@ index 6135524..5efb6f6 100644 systemd_unit_DATA += src/iwd.service -dbus_bus_DATA += src/net.connman.iwd.service - endif - endif -@@ -277,13 +277,13 @@ wired_ead_DEPENDENCIES = $(ell_dependencies) + systemd_network_DATA += src/80-iwd.link + endif +@@ -320,13 +320,13 @@ if DBUS_POLICY dist_dbus_data_DATA += wired/ead-dbus.conf @@ -49,8 +47,8 @@ index 6135524..5efb6f6 100644 systemd_unit_DATA += wired/ead.service -dbus_bus_DATA += wired/net.connman.ead.service endif - endif + if MANUAL_PAGES diff --git configure.ac configure.ac index ec0619e..13d6de4 100644 --- configure.ac diff --git a/srcpkgs/iwd/template b/srcpkgs/iwd/template index c7e9ba102ec..60c60c5498d 100644 --- a/srcpkgs/iwd/template +++ b/srcpkgs/iwd/template @@ -1,20 +1,20 @@ # Template file for 'iwd' pkgname=iwd -version=0.23 +version=1.0 revision=1 build_style=gnu-configure configure_args="--disable-systemd-service --enable-pie --enable-external-ell --enable-dbus-policy --enable-wired" hostmakedepends="python3-docutils pkg-config automake libtool" makedepends="readline-devel dbus-devel ell-devel" -depends="dbus ell>=0.25" +depends="dbus ell>=0.26" checkdepends="python3" short_desc="Internet Wireless Daemon by Intel that aims to replace wpa_supplicant" maintainer="Peter Bui " license="LGPL-2.1-or-later" homepage="https://iwd.wiki.kernel.org/" distfiles="${KERNEL_SITE}/network/wireless/iwd-${version}.tar.xz" -checksum=e113b908c60537357b48c389317625e02cd1daa1b6e500bb356f7978a2a61280 +checksum=7296812b3012b0689a8af879c6028fa9efa5b43b27ecf037355b38f7af1aa167 make_dirs="/var/lib/iwd 0600 root root /etc/iwd 755 root root" @@ -23,6 +23,5 @@ pre_configure() { } post_install() { - vsconf doc/main.conf vsv iwd } From 861798dbaa1a45bd2bdb195f06297fb96096dafe Mon Sep 17 00:00:00 2001 From: mustaqim Date: Wed, 30 Oct 2019 14:21:49 +0200 Subject: [PATCH 161/186] latte-dock: update to 0.9.4 --- srcpkgs/latte-dock/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/latte-dock/template b/srcpkgs/latte-dock/template index c33a4d86976..2f1b3319f10 100644 --- a/srcpkgs/latte-dock/template +++ b/srcpkgs/latte-dock/template @@ -1,6 +1,6 @@ # Template file for 'latte-dock' pkgname=latte-dock -version=0.9.3 +version=0.9.4 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF -DENABLE_MAKE_UNIQUE=OFF" @@ -12,7 +12,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://phabricator.kde.org/source/latte-dock/" changelog="https://phabricator.kde.org/source/latte-dock/browse/master/CHANGELOG.md" distfiles="${KDE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=30232ce9b0fe8f5338c924a4f2d1661c8c3f3b221ccfcaf69d09160f31599447 +checksum=a1e706b25ced6a68148a4db92d568c6a0a0494aba34525b1fea183c0830e34ee if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kconfig-devel kcoreaddons-devel kpackage-devel" From 21f9d7c9ea19cabaffd1b8695dd5142fda98d2f6 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Wed, 30 Oct 2019 15:48:43 +0100 Subject: [PATCH 162/186] linux5.3: update dotconfig for arm64 --- srcpkgs/linux5.3/files/arm64-dotconfig | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/linux5.3/files/arm64-dotconfig b/srcpkgs/linux5.3/files/arm64-dotconfig index 1ebc514bfc4..b247712c80d 100644 --- a/srcpkgs/linux5.3/files/arm64-dotconfig +++ b/srcpkgs/linux5.3/files/arm64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.3.0 Kernel Configuration +# Linux/arm64 5.3.8 Kernel Configuration # # @@ -329,6 +329,7 @@ CONFIG_CAVIUM_ERRATUM_22375=y CONFIG_CAVIUM_ERRATUM_23154=y CONFIG_CAVIUM_ERRATUM_27456=y CONFIG_CAVIUM_ERRATUM_30115=y +CONFIG_CAVIUM_TX2_ERRATUM_219=y CONFIG_QCOM_FALKOR_ERRATUM_1003=y CONFIG_ARM64_WORKAROUND_REPEAT_TLBI=y CONFIG_QCOM_FALKOR_ERRATUM_1009=y @@ -6828,7 +6829,6 @@ CONFIG_USB_EMI62=m CONFIG_USB_EMI26=m CONFIG_USB_ADUTUX=m CONFIG_USB_SEVSEG=m -# CONFIG_USB_RIO500 is not set CONFIG_USB_LEGOTOWER=m CONFIG_USB_LCD=m # CONFIG_USB_CYPRESS_CY7C63 is not set @@ -7186,7 +7186,6 @@ CONFIG_RTC_DRV_PCF8563=m CONFIG_RTC_DRV_PCF8583=m CONFIG_RTC_DRV_M41T80=m CONFIG_RTC_DRV_M41T80_WDT=y -# CONFIG_RTC_DRV_BD70528 is not set CONFIG_RTC_DRV_BQ32K=m # CONFIG_RTC_DRV_S35390A is not set CONFIG_RTC_DRV_FM3130=m From 7e9ea33190155f1eadb3aff84b8b3cf4da46130a Mon Sep 17 00:00:00 2001 From: Auri Date: Wed, 30 Oct 2019 12:02:15 +0200 Subject: [PATCH 163/186] dtools: update to 2.088.1 --- srcpkgs/dtools/template | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/srcpkgs/dtools/template b/srcpkgs/dtools/template index 8bf6db8a61a..d4e6cea7bb5 100644 --- a/srcpkgs/dtools/template +++ b/srcpkgs/dtools/template @@ -1,9 +1,8 @@ # Template file for 'dtools' pkgname=dtools -reverts="2.084.1_1" # keep this synchronized with libphobos and dmd -version=2.081.1 -revision=2 +version=2.088.1 +revision=1 wrksrc="tools-${version}" hostmakedepends="dmd" makedepends="libcurl-devel" @@ -13,7 +12,7 @@ maintainer="Auri " license="BSL-1.0" homepage="http://www.digitalmars.com/d/2.0/" distfiles="https://github.com/dlang/tools/archive/v${version}.tar.gz" -checksum=71fa249dbfd278eec2b95ce577af32e623e44caf0d993905ddc189e3beec21d0 +checksum=e2eb1afe24985096554c971059916bfad1573b85786529c0394009c8db967139 do_build() { # rdmd can't be built normally, is used to build others From 59330cdf1d664f4357391d08b42afe3d2dd07e3b Mon Sep 17 00:00:00 2001 From: travankor Date: Wed, 30 Oct 2019 01:30:29 -0700 Subject: [PATCH 164/186] wpgtk: update to 6.0.11. --- srcpkgs/wpgtk/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/wpgtk/template b/srcpkgs/wpgtk/template index 7e9d52b4f81..ed931079816 100644 --- a/srcpkgs/wpgtk/template +++ b/srcpkgs/wpgtk/template @@ -1,6 +1,6 @@ # Template file for 'wpgtk' pkgname=wpgtk -version=6.0.9 +version=6.0.11 revision=1 archs=noarch build_style=python3-module @@ -12,4 +12,4 @@ maintainer="travankor " license="GPL-2.0-only" homepage="https://github.com/deviantfero/wpgtk/" distfiles="https://github.com/deviantfero/wpgtk/archive/${version}.tar.gz" -checksum=3a84ef7ca414b43b75177ca2f6aa9da5a769653b1c35c1b4a9e5e6eae92121b0 +checksum=dcf0a915cfa0be5667f188f15b59120ce7e157f88f7aaba40fa0ba6e3f302976 From be5390a58497ab39397b2f8382426886a815a2c9 Mon Sep 17 00:00:00 2001 From: travankor Date: Wed, 30 Oct 2019 01:28:59 -0700 Subject: [PATCH 165/186] man-db: update to 2.9.0. --- srcpkgs/man-db/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/man-db/template b/srcpkgs/man-db/template index b6cf1489eca..dfc483c3ea8 100644 --- a/srcpkgs/man-db/template +++ b/srcpkgs/man-db/template @@ -1,7 +1,7 @@ # Template file for 'man-db' pkgname=man-db -version=2.8.7 -revision=2 +version=2.9.0 +revision=1 build_style=gnu-configure configure_args="--with-db=db --with-pager=less --with-gzip=/usr/bin/gzip --with-bzip2=/usr/bin/bzip2 --disable-rpath --enable-threads=posix @@ -18,7 +18,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://www.nongnu.org/man-db/" distfiles="${NONGNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=b9cd5bb996305d08bfe9e1114edc30b4c97be807093b88af8033ed1cf9beb326 +checksum=5d4aacd9e8876d6a3203a889860c3524c293c38f04111a3350deab8a6cd3e261 provides="man-0_1" lib32disabled=yes From 20209ec188fc1830f6c2b19bd33e2f6a404ed6eb Mon Sep 17 00:00:00 2001 From: Doan Tran Cong Danh Date: Wed, 30 Oct 2019 16:30:20 +0700 Subject: [PATCH 166/186] git: correct utf-16 and utf-32 conversion on musl musl's iconv treats utf-{16,32} encoding as utf-{16,32}be, without BOM, correctly according to POSIX. However, most tools out there think differently. Change the build flag for the musl system to fix it. Together with my patch here: https://github.com/git/git/commit/840c40cea11290d40fd455cc3b23d5793056f4d4 git's test: t0028 should be fine now. --- srcpkgs/git/template | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/srcpkgs/git/template b/srcpkgs/git/template index 7081d7d4bfc..4287e24962a 100644 --- a/srcpkgs/git/template +++ b/srcpkgs/git/template @@ -1,7 +1,7 @@ # Template file for 'git' pkgname=git version=2.23.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-curl --with-expat --with-tcltk --with-libpcre2 ac_cv_snprintf_returns_bogus=no" @@ -13,7 +13,7 @@ makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel" # Required by https:// depends="ca-certificates perl-Authen-SASL perl-MIME-tools perl-Net-SMTP-SSL" short_desc="Git Tree History Storage Tool" -maintainer="Orphaned " +maintainer="Doan Tran Cong Danh " license="GPL-2.0-only" homepage="https://git-scm.com/" changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt" @@ -25,7 +25,10 @@ register_shell=/usr/bin/git-shell subpackages="git-cvs git-svn gitk git-gui git-all git-libsecret" case "$XBPS_TARGET_MACHINE" in - *-musl) configure_args+=" ac_cv_fread_reads_directories=yes" ;; + *-musl) + configure_args+=" ac_cv_fread_reads_directories=yes" + make_build_args+=" ICONV_OMITS_BOM=Yes" + ;; *) configure_args+=" ac_cv_fread_reads_directories=no" ;; esac From 15ef90cfbda9820f37beb21bc230002548b911e8 Mon Sep 17 00:00:00 2001 From: Doan Tran Cong Danh Date: Wed, 30 Oct 2019 16:38:01 +0700 Subject: [PATCH 167/186] chroot-git: correct iconv usage on musl --- srcpkgs/chroot-git/template | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template index a733b2e8124..578609243c5 100644 --- a/srcpkgs/chroot-git/template +++ b/srcpkgs/chroot-git/template @@ -1,7 +1,7 @@ # Template file for 'chroot-git' pkgname=chroot-git version=2.23.0 -revision=1 +revision=2 bootstrap=yes wrksrc="git-${version}" build_style=gnu-configure @@ -26,7 +26,10 @@ else fi case "$XBPS_TARGET_MACHINE" in - *-musl) configure_args+=" ac_cv_fread_reads_directories=yes" ;; + *-musl) + configure_args+=" ac_cv_fread_reads_directories=yes" + make_build_args+=" ICONV_OMITS_BOM=Yes" + ;; *) configure_args+=" ac_cv_fread_reads_directories=no" ;; esac From d4020db77862cd0689cd070129ce83634090aedc Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Wed, 30 Oct 2019 07:15:18 -0500 Subject: [PATCH 168/186] spotify-tui: update to 0.8.0. --- srcpkgs/spotify-tui/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/spotify-tui/template b/srcpkgs/spotify-tui/template index c29d7d2ddf3..24a2bd66cfd 100644 --- a/srcpkgs/spotify-tui/template +++ b/srcpkgs/spotify-tui/template @@ -1,6 +1,6 @@ # Template file for 'spotify-tui' pkgname=spotify-tui -version=0.7.5 +version=0.8.0 revision=1 build_style=cargo hostmakedepends="pkg-config" @@ -10,7 +10,7 @@ maintainer="Andrew Benson " license="MIT" homepage="https://github.com/Rigellute/spotify-tui" distfiles="https://github.com/Rigellute/spotify-tui/archive/v${version}.tar.gz" -checksum=2f0d3c21363e693dd548685d9da217a942fb4475b16875c0479d3bd0b2574a07 +checksum=0839d688e40d9c2ad435924785a375b976f51d44a101e71b3a8c49dc7d4c8bbc post_install() { vlicense LICENSE From 32c57e6a55fee399dca15bf228bc00d4233fac7f Mon Sep 17 00:00:00 2001 From: travankor Date: Wed, 30 Oct 2019 00:14:40 -0700 Subject: [PATCH 169/186] qimgv: update to 0.8.6. --- srcpkgs/qimgv/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qimgv/template b/srcpkgs/qimgv/template index 3ead6dbdc2b..1e74e84f6fb 100644 --- a/srcpkgs/qimgv/template +++ b/srcpkgs/qimgv/template @@ -1,6 +1,6 @@ # Template file for 'qimgv' pkgname=qimgv -version=0.8.5 +version=0.8.6 revision=1 build_style=cmake configure_args="$(vopt_if video -DVIDEO_SUPPORT=ON)" @@ -11,7 +11,7 @@ maintainer="travankor " license="GPL-3.0-or-later" homepage="https://github.com/easymodo/qimgv" distfiles="https://github.com/easymodo/qimgv/archive/v${version}.tar.gz" -checksum=857919b6f0432965fa26e5c72fa293299d797f0253848e18b86218c1b387d562 +checksum=a0f43b226a3bb17bf287a45017a21f239db3d8dda8124197529923f700981bc5 build_options="video" build_options_default="video" From 0ca44997751e3561d317facde4079a5d25ef170f Mon Sep 17 00:00:00 2001 From: travankor Date: Fri, 18 Oct 2019 23:46:32 -0700 Subject: [PATCH 170/186] chrony: fix wrong option in the default config. The option rtcfile in the default config conflicts with runit's stage 3. Chronyd in RTC mode takes control of /dev/rtc to measure RTC drift. Stage 3 calls hwclock -w, which messes up chrony's drift calculation. Furthermore the current chronyd runit service needs the -s option to effectively use the RTC feature. See for more info: https://chrony.tuxfamily.org/faq.html#_i_want_to_use_code_chronyd_code_s_rtc_support_must_i_disable_code_hwclock_code Switch rtcfile to the rtcsync option, to be consistent with stage 3. Example config file 1 sets the right options that work out of the box. So use that example file instead of editing the annotated one. Example config file 3 will instead be installed to /usr/share/examples. --- srcpkgs/chrony/template | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/srcpkgs/chrony/template b/srcpkgs/chrony/template index 6d629a9260c..75142b66101 100644 --- a/srcpkgs/chrony/template +++ b/srcpkgs/chrony/template @@ -2,7 +2,7 @@ # When Updating: Please confirm the upstream config still refers to make_dirs pkgname=chrony version=3.5 -revision=1 +revision=2 build_style=gnu-configure configure_args="--without-nss --enable-scfilter --with-sendmail=/usr/bin/sendmail" @@ -29,12 +29,8 @@ alternatives=" ntpd:ntpd:/etc/sv/chronyd" post_install() { - vconf examples/chrony.conf.example3 chrony.conf - # Modify default configuration so it works out-of-the-box - vsed -e 's,! pool pool.ntp.org iburst,pool pool.ntp.org iburst,' -i ${DESTDIR}/etc/chrony.conf - vsed -e 's,! rtcfile /var/lib/chrony/rtc,rtcfile /var/lib/chrony/rtc,' -i ${DESTDIR}/etc/chrony.conf - vsed -e 's,! makestep 1.0 3,makestep 1.0 3,' -i ${DESTDIR}/etc/chrony.conf - vsconf examples/chrony.conf.example1 + vconf examples/chrony.conf.example1 chrony.conf vsconf examples/chrony.conf.example2 + vsconf examples/chrony.conf.example3 vsv chronyd } From 4228068fd385e4d192458146e15bb5234601d1da Mon Sep 17 00:00:00 2001 From: obunden <56209614+obunden@users.noreply.github.com> Date: Wed, 30 Oct 2019 04:46:19 +0100 Subject: [PATCH 171/186] retroarch: update to 1.8.0 --- srcpkgs/retroarch/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template index 3de7f2286f6..94ba0b12e4b 100644 --- a/srcpkgs/retroarch/template +++ b/srcpkgs/retroarch/template @@ -1,6 +1,6 @@ # Template file for 'retroarch' pkgname=retroarch -version=1.7.9.2 +version=1.8.0 revision=1 wrksrc="RetroArch-$version" build_style=configure @@ -23,7 +23,7 @@ maintainer="Orphaned " license="GPL-3.0-or-later" homepage="http://www.libretro.com/" distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz" -checksum=1cb88c3e2e8a04a21e2e6a14b7b7a7eb2748d18e629e5e2063ca7a1a9a7dabb5 +checksum=1cb0f04bdbfd517cbdd11b20b0b22ad472fb9e3e54df9a4e7813ed638509dfe7 build_options="ffmpeg opengl jack pulseaudio sdl2 x11 vulkan qt5" build_options_default="ffmpeg" From 8a28625ea509c0b43f2ca377161ea7f1363b6c57 Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Tue, 29 Oct 2019 22:19:38 -0500 Subject: [PATCH 172/186] geoclue2: update to 2.5.5 --- srcpkgs/geoclue2/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/geoclue2/template b/srcpkgs/geoclue2/template index 64eaddc13d7..eede3addbb4 100644 --- a/srcpkgs/geoclue2/template +++ b/srcpkgs/geoclue2/template @@ -1,6 +1,6 @@ # Template file for 'geoclue2' pkgname=geoclue2 -version=2.5.3 +version=2.5.5 revision=1 wrksrc="geoclue-${version}" build_style=meson @@ -16,7 +16,7 @@ maintainer="Orphaned " 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=a626f6adaff15d88fd0561344e614e371900e4a64a1fe9ddfcdd40d39712e78b +checksum=51e9d1b52d7e5a35e7ce44afb8d3ba19562668136b4324bbecf5746275c6f2ac system_accounts="_geoclue2" lib32disabled=yes From f1ebe745d23da5dd0c147bb1f39d72e86b82a849 Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Tue, 29 Oct 2019 21:57:08 -0500 Subject: [PATCH 173/186] gcr: update to 3.34.0 --- srcpkgs/gcr/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gcr/template b/srcpkgs/gcr/template index d7fc2b151bb..735f9d35511 100644 --- a/srcpkgs/gcr/template +++ b/srcpkgs/gcr/template @@ -1,7 +1,7 @@ # Template file for 'gcr' pkgname=gcr -version=3.28.1 -revision=3 +version=3.34.0 +revision=1 build_style=gnu-configure build_helper="gir" configure_args="$(vopt_enable gir introspection) --disable-update-mime @@ -16,7 +16,7 @@ maintainer="Orphaned " license="LGPL-2.0-or-later, LGPL-2.1-or-later, GPL-2.0-or-later" homepage="http://www.gnome.org" distfiles="${GNOME_SITE}/gcr/${version%.*}/gcr-${version}.tar.xz" -checksum=95204aa2111c301778ebfbe60975ce3ed698c958430ffcc2a785ac5e593d168b +checksum=29df50974a90987af694c0fb8926a6b366e68cacd8abd813817cfe1eb5d54524 # Package build options build_options="gir vala" From ea2bacbe1412821f3dffb6d564a5fd8bf7edcb84 Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Tue, 29 Oct 2019 21:25:55 -0500 Subject: [PATCH 174/186] fstrm: update to 0.6.0 --- srcpkgs/fstrm/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/fstrm/template b/srcpkgs/fstrm/template index a6c21d27a5b..2c735f29df7 100644 --- a/srcpkgs/fstrm/template +++ b/srcpkgs/fstrm/template @@ -1,7 +1,7 @@ # Template file for 'fstrm' pkgname=fstrm -version=0.5.0 -revision=2 +version=0.6.0 +revision=1 build_style=gnu-configure hostmakedepends="automake libtool pkg-config" makedepends="libevent-devel" @@ -11,7 +11,7 @@ license="MIT" homepage="https://github.com/farsightsec/fstrm" #changelog="https://raw.githubusercontent.com/farsightsec/fstrm/master/ChangeLog" distfiles="https://github.com/farsightsec/fstrm/archive/v${version}.tar.gz" -checksum=ca762fb260176f35af639376cc65c3f13a5f63d1cca42eb5ce87caca8d57c450 +checksum=82851b2424ae3e94b4fba310b60629b33d6757fbeb15662566b1857cd5c31517 pre_configure() { autoreconf -fi From 1c3af8d7d4203d1bbeb2d234f6633ba5bcd877ae Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Tue, 29 Oct 2019 20:45:49 -0500 Subject: [PATCH 175/186] duplicity: update to 0.8.05 Added missing runtime dependency --- .../patches/0001-remove-failing-test.patch | 58 +++++++++++++++++++ .../patches/remove-failing-test.patch | 34 ----------- srcpkgs/duplicity/template | 6 +- 3 files changed, 61 insertions(+), 37 deletions(-) create mode 100644 srcpkgs/duplicity/patches/0001-remove-failing-test.patch delete mode 100644 srcpkgs/duplicity/patches/remove-failing-test.patch diff --git a/srcpkgs/duplicity/patches/0001-remove-failing-test.patch b/srcpkgs/duplicity/patches/0001-remove-failing-test.patch new file mode 100644 index 00000000000..aec35423f19 --- /dev/null +++ b/srcpkgs/duplicity/patches/0001-remove-failing-test.patch @@ -0,0 +1,58 @@ +From 10064eaff70e58c1cb7d12c04bdb9f915817fc66 Mon Sep 17 00:00:00 2001 +From: Nathan Owens +Date: Tue, 29 Oct 2019 20:37:42 -0500 +Subject: [PATCH] remove failing test + +--- + testing/unit/test_statistics.py | 35 --------------------------------- + 1 file changed, 35 deletions(-) + +diff --git a/testing/unit/test_statistics.py b/testing/unit/test_statistics.py +index 3ac0627..9ad206a 100644 +--- testing/unit/test_statistics.py ++++ testing/unit/test_statistics.py +@@ -53,41 +53,6 @@ class StatsObjTest(UnitTestCase): + s.StartTime = 13 + s.EndTime = 14 + +- def test_get_stats(self): +- u"""Test reading and writing stat objects""" +- s = StatsObj() +- assert s.get_stat(u'SourceFiles') is None +- self.set_obj(s) +- assert s.get_stat(u'SourceFiles') == 1 +- +- s1 = StatsDeltaProcess() +- assert s1.get_stat(u'SourceFiles') == 0 +- +- def test_get_stats_string(self): +- u"""Test conversion of stat object into string""" +- s = StatsObj() +- stats_string = s.get_stats_string() +- assert stats_string == u"", stats_string +- +- self.set_obj(s) +- stats_string = s.get_stats_string() +- assert stats_string == u"""\ +-StartTime 13.00 (Wed Dec 31 18:00:13 1969) +-EndTime 14.00 (Wed Dec 31 18:00:14 1969) +-ElapsedTime 1.00 (1 second) +-SourceFiles 1 +-SourceFileSize 2 (2 bytes) +-NewFiles 3 +-NewFileSize 4 (4 bytes) +-DeletedFiles 5 +-ChangedFiles 7 +-ChangedFileSize 8 (8 bytes) +-ChangedDeltaSize 9 (9 bytes) +-DeltaEntries 10 +-RawDeltaSize 11 (11 bytes) +-TotalDestinationSizeChange 12 (12 bytes) +-""", u"'%s'" % stats_string +- + def test_line_string(self): + u"""Test conversion to a single line""" + s = StatsObj() +-- +2.23.0 + diff --git a/srcpkgs/duplicity/patches/remove-failing-test.patch b/srcpkgs/duplicity/patches/remove-failing-test.patch deleted file mode 100644 index cc9f3ec8f1b..00000000000 --- a/srcpkgs/duplicity/patches/remove-failing-test.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- testing/unit/test_statistics.py -+++ testing/unit/test_statistics.py -@@ -59,31 +59,6 @@ class StatsObjTest(UnitTestCase): - s1 = StatsDeltaProcess() - assert s1.get_stat('SourceFiles') == 0 - -- def test_get_stats_string(self): -- """Test conversion of stat object into string""" -- s = StatsObj() -- stats_string = s.get_stats_string() -- assert stats_string == "", stats_string -- -- self.set_obj(s) -- stats_string = s.get_stats_string() -- assert stats_string == """\ --StartTime 13.00 (Wed Dec 31 18:00:13 1969) --EndTime 14.00 (Wed Dec 31 18:00:14 1969) --ElapsedTime 1.00 (1 second) --SourceFiles 1 --SourceFileSize 2 (2 bytes) --NewFiles 3 --NewFileSize 4 (4 bytes) --DeletedFiles 5 --ChangedFiles 7 --ChangedFileSize 8 (8 bytes) --ChangedDeltaSize 9 (9 bytes) --DeltaEntries 10 --RawDeltaSize 11 (11 bytes) --TotalDestinationSizeChange 12 (12 bytes) --""", "'%s'" % stats_string -- - def test_line_string(self): - """Test conversion to a single line""" - s = StatsObj() diff --git a/srcpkgs/duplicity/template b/srcpkgs/duplicity/template index c5b03faa53c..44d95ce7866 100644 --- a/srcpkgs/duplicity/template +++ b/srcpkgs/duplicity/template @@ -1,12 +1,12 @@ # Template file for 'duplicity' pkgname=duplicity -version=0.7.19 +version=0.8.05 revision=1 build_style=python2-module pycompile_module="duplicity" hostmakedepends="python-setuptools" makedepends="python-devel librsync-devel" -depends="python-fasteners gnupg" +depends="python-fasteners gnupg python-future" checkdepends="python-pexpect python-mock python-fasteners gnupg par2cmdline" short_desc="Encrypted bandwidth-efficient backup using the rsync algorithm" maintainer="Orphaned " @@ -14,7 +14,7 @@ license="GPL-2.0-or-later" homepage="http://duplicity.nongnu.org/" changelog="http://duplicity.nongnu.org/CHANGELOG" distfiles="http://code.launchpad.net/duplicity/${version%.*}-series/${version}/+download/duplicity-${version}.tar.gz" -checksum=a6aa905a63df5101193d3e8fd4ffdf35acb9307b184ac7a9d68a76aaed6ce929 +checksum=064672cf492003ff05f2d7ca8493d12af86de06aa1c60d77ac8dd74b2da3111d post_extract() { chmod 0644 bin/*.1 From ac091ecd65967690c4884dff4dd943a8bb681515 Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Tue, 29 Oct 2019 20:24:08 -0500 Subject: [PATCH 176/186] cups-filter: update to 1.25.11 --- srcpkgs/cups-filters/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/cups-filters/template b/srcpkgs/cups-filters/template index df7daba3a5e..3dddc46b62f 100644 --- a/srcpkgs/cups-filters/template +++ b/srcpkgs/cups-filters/template @@ -1,7 +1,7 @@ # Template file for 'cups-filters' pkgname=cups-filters -version=1.25.10 -revision=2 +version=1.25.11 +revision=1 build_style=gnu-configure configure_args="--disable-static --with-rcdir=no --enable-avahi --with-browseremoteprotocols=DNSSD,CUPS @@ -18,7 +18,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later, LGPL-2.1-or-later, MIT" homepage="https://wiki.linuxfoundation.org/openprinting/cups-filters" distfiles="http://openprinting.org/download/cups-filters/${pkgname}-${version}.tar.xz" -checksum=4338dc314558f796ab5169a99440cc4fc4d65df33878dddc1525f7fe5683a45b +checksum=b03b1041eae3b91c98c53102d9b7bcfa05d2580024d91de918a8b84c729e285a lib32disabled=yes From 2635c2b618a2773e82cb4578607b78fff95e67d5 Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Tue, 29 Oct 2019 21:16:42 -0500 Subject: [PATCH 177/186] facter: update to 3.14.5 --- srcpkgs/facter/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/facter/template b/srcpkgs/facter/template index 9dc9dbfb4db..9e1f122bf97 100644 --- a/srcpkgs/facter/template +++ b/srcpkgs/facter/template @@ -1,6 +1,6 @@ # Template file for 'facter' pkgname=facter -version=3.14.2 +version=3.14.5 revision=1 build_style=cmake configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include @@ -14,7 +14,7 @@ maintainer="Orphaned " license="Apache-2.0" homepage="https://puppetlabs.com/facter" distfiles="https://downloads.puppetlabs.com/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=d43cc988389ebfcfe24e5c5ddce709b84dbaa540a6714262e9445e61d8c1c7c0 +checksum=cb8906fe711f2bc2a797d71667b24e220340f36e598a79a57953d548ea189b5c pre_configure() { case "$XBPS_TARGET_MACHINE" in From 8aa0ed4ab13b963a36880783e57b77179076b51f Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Tue, 29 Oct 2019 18:17:52 -0500 Subject: [PATCH 178/186] cgdb: update to 0.7.1 Removed patch, is now part of this release --- srcpkgs/cgdb/patches/fix-memory-leak.patch | 18 ------------------ srcpkgs/cgdb/template | 10 ++++------ 2 files changed, 4 insertions(+), 24 deletions(-) delete mode 100644 srcpkgs/cgdb/patches/fix-memory-leak.patch diff --git a/srcpkgs/cgdb/patches/fix-memory-leak.patch b/srcpkgs/cgdb/patches/fix-memory-leak.patch deleted file mode 100644 index 77a3be08922..00000000000 --- a/srcpkgs/cgdb/patches/fix-memory-leak.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- lib/tgdb/tgdb.cpp.orig 2018-12-30 13:23:23.260656690 -0600 -+++ lib/tgdb/tgdb.cpp 2018-12-30 13:24:33.484655276 -0600 -@@ -1039,11 +1039,14 @@ - request->choice.debugger_command.c); - break; - case TGDB_REQUEST_MODIFY_BREAKPOINT: -- command = tgdb_client_modify_breakpoint_call(tgdb, -+ str = tgdb_client_modify_breakpoint_call(tgdb, - request->choice.modify_breakpoint.file, - request->choice.modify_breakpoint.line, - request->choice.modify_breakpoint.addr, - request->choice.modify_breakpoint.b); -+ command = str; -+ free(str); -+ str = NULL; - break; - case TGDB_REQUEST_COMPLETE: - str = sys_aprintf("server interpreter-exec mi" diff --git a/srcpkgs/cgdb/template b/srcpkgs/cgdb/template index 8843f6d8f75..dcdd7a97a3e 100644 --- a/srcpkgs/cgdb/template +++ b/srcpkgs/cgdb/template @@ -1,7 +1,7 @@ # Template file for 'cgdb' pkgname=cgdb -version=0.7.0 -revision=3 +version=0.7.1 +revision=1 build_style=gnu-configure configure_args="ac_cv_rl_version=6.3 ac_cv_file__proc_self_status=yes" @@ -10,9 +10,7 @@ makedepends="ncurses-devel readline-devel" depends="gdb" short_desc="Curses-based interface to the GNU Debugger" maintainer="Orphaned " -license="GPL-2" +license="GPL-2.0-only" homepage="http://cgdb.sourceforge.net" distfiles="http://cgdb.me/files/cgdb-${version}.tar.gz" -checksum=bf7a9264668db3f9342591b08b2cc3bbb08e235ba2372877b4650b70c6fb5423 - -nocross="checking Checking attribute printf support... cannot run test program while cross compiling" +checksum=bb723be58ec68cb59a598b8e24a31d10ef31e0e9c277a4de07b2f457fe7de198 From 6448a586f732c70f0b90b4dae5c3c35d54a63e85 Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Tue, 29 Oct 2019 17:13:04 -0500 Subject: [PATCH 179/186] yarn: update to 1.19.1 --- srcpkgs/yarn/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/yarn/template b/srcpkgs/yarn/template index 695d7d34eb9..19fec95822f 100644 --- a/srcpkgs/yarn/template +++ b/srcpkgs/yarn/template @@ -1,6 +1,6 @@ # Template file for 'yarn' pkgname=yarn -version=1.17.3 +version=1.19.1 revision=1 hostmakedepends="yarn-bin nodejs" depends="virtual?nodejs-runtime" @@ -9,7 +9,7 @@ maintainer="Michael Aldridge " license="BSD-2-Clause" homepage="https://yarnpkg.com/" distfiles="https://github.com/yarnpkg/${pkgname}/archive/v${version}.tar.gz" -checksum=2bba1a63d4348fe4432f4cee6dc3911b98a4fef15ac7f227b91b139137ac03af +checksum=49f8ca1ee041af255fb999b02b3f8f7ad975212d55629fbab948771a8dd548f4 conflicts="yarn-bin>=0" From 3065045ae28d4cca49615fccb1102cfca27eed5e Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Tue, 29 Oct 2019 15:32:04 -0500 Subject: [PATCH 180/186] cgrep: update to 6.6.30 --- srcpkgs/cgrep/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/cgrep/template b/srcpkgs/cgrep/template index 471aa51246e..729c6167f31 100644 --- a/srcpkgs/cgrep/template +++ b/srcpkgs/cgrep/template @@ -1,8 +1,7 @@ # Template file for 'cgrep' pkgname=cgrep -version=6.6.28 +version=6.6.30 revision=1 -nocross=yes build_style=haskell-stack stackage="lts-13.30" makedepends="pcre-devel" @@ -11,6 +10,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://awgn.github.io/cgrep/" distfiles="https://github.com/awgn/cgrep/archive/v${version}.tar.gz" -checksum=02ef2018d73c98608340146701a7e8c84e629732487fc9dab172d770d426e350 +checksum=b7aefe2d5b0abc1fb8143fe1e6faed636e2b4eb5198ad1d1f7f6db5121a37da3 +nocross=yes nopie_files="/usr/bin/cgrep" conflicts="codesearch" From 7f7dc76d9268bb40019b789e963dd39d482c3047 Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Tue, 29 Oct 2019 15:51:59 -0500 Subject: [PATCH 181/186] turbovnc: update to 2.2.3 Includes fix for CVE-2019-15683 --- srcpkgs/turbovnc/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/turbovnc/template b/srcpkgs/turbovnc/template index abbe3b82a94..d8e2fe6a5f7 100644 --- a/srcpkgs/turbovnc/template +++ b/srcpkgs/turbovnc/template @@ -1,6 +1,6 @@ # Template file for 'turbovnc' pkgname=turbovnc -version=2.2.2 +version=2.2.3 revision=1 build_style=cmake configure_args="-DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DTVNC_BUILDJAVA=0 @@ -14,7 +14,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="http://virtualgl.org" distfiles="${SOURCEFORGE_SITE}/turbovnc/${pkgname}-${version}.tar.gz" -checksum=7f1593a3db88dc800d0f82091252ca293b1980a28417b9834ce713eb7e0d09bc +checksum=1c3de5abc66b3a2c45fb7ec6c75ddf54241153e5770f7d05ffd2dfef5d086981 conf_files="/etc/*.conf" archs="i686* x86_64* ppc64*" From 3c9dd9c7c4e7f0f8f140674a25d424459b34cd91 Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Tue, 29 Oct 2019 15:38:56 -0500 Subject: [PATCH 182/186] croc: update to 6.2.0 --- srcpkgs/croc/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template index b5e5787fa8c..f662d629439 100644 --- a/srcpkgs/croc/template +++ b/srcpkgs/croc/template @@ -1,6 +1,6 @@ # Template file for 'croc' pkgname=croc -version=6.1.5 +version=6.2.0 revision=1 build_style=go go_import_path=github.com/schollz/croc/v6 @@ -10,7 +10,7 @@ maintainer="Orphaned " license="MIT" homepage="https://github.com/schollz/croc" distfiles="https://github.com/schollz/croc/archive/v${version}.tar.gz" -checksum=2167fd66d30235f1c51660daba48f60984d4436ce051e7a5157c971d34871264 +checksum=c322ed1be8cd66fc69a6cccea15ba4f8790e93ae6d9f3f3c9884a1cf8dc855ab post_install() { vlicense LICENSE From 3c74c86231e84a9f6e479201f459ba898f521c8a Mon Sep 17 00:00:00 2001 From: Anthony Iliopoulos Date: Tue, 29 Oct 2019 21:18:33 +0100 Subject: [PATCH 183/186] lttng-modules-dkms: update to 2.11.0. --- srcpkgs/lttng-modules-dkms/template | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/srcpkgs/lttng-modules-dkms/template b/srcpkgs/lttng-modules-dkms/template index 36256bebb80..6df6941f500 100644 --- a/srcpkgs/lttng-modules-dkms/template +++ b/srcpkgs/lttng-modules-dkms/template @@ -1,6 +1,6 @@ # Template file for 'lttng-modules-dkms' pkgname=lttng-modules-dkms -version=2.10.11 +version=2.11.0 revision=1 wrksrc="lttng-modules-${version}" depends="dkms" @@ -9,7 +9,7 @@ maintainer="Alexander Egorenkov " license="LGPL-2.1-only, GPL-2.0-only, MIT" homepage="https://lttng.org" distfiles="${homepage}/files/lttng-modules/lttng-modules-${version}.tar.bz2" -checksum=7f91e39b2e8e46d8bbba2b4c8c1614f1fb380611cd1a1fccc1d1859be26112f1 +checksum=98af92d8c2e00f4eb63bc637a6967103cf6997434493f36e7a535a491e4fad5f dkms_modules="lttng-modules ${version}" @@ -17,6 +17,5 @@ do_install() { vmkdir usr/src/lttng-modules-${version} vcopy "*" usr/src/lttng-modules-${version} vcopy ${FILESDIR}/dkms.conf usr/src/lttng-modules-${version} - - vlicense mit-license.txt + vlicense LICENSE } From 62f248d630918409e193e667a81e45160c224b14 Mon Sep 17 00:00:00 2001 From: Anthony Iliopoulos Date: Tue, 29 Oct 2019 21:17:23 +0100 Subject: [PATCH 184/186] lttng-tools: update to 2.11.0. --- srcpkgs/lttng-tools/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/lttng-tools/template b/srcpkgs/lttng-tools/template index 8aa64f9a51f..24414c0e961 100644 --- a/srcpkgs/lttng-tools/template +++ b/srcpkgs/lttng-tools/template @@ -1,6 +1,6 @@ # Template file for 'lttng-tools' pkgname=lttng-tools -version=2.10.8 +version=2.11.0 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" @@ -11,7 +11,7 @@ maintainer="Alexander Egorenkov " license="LGPL-2.1-only, GPL-2.0-only" homepage="https://lttng.org" distfiles="${homepage}/files/${pkgname}/${pkgname}-${version}.tar.bz2" -checksum=664a1145f9fd7a574da18aa3dfbbe97983985a471ca2992d6b272f1cebe6b30d +checksum=dce493c82db673c96049b5fad155a760fa449fab3d92467a69fcb0ddaf3f0fbc system_groups="tracing" lttng-tools-devel_package() { From e061e14b8734005f1e7aea54063ec3b31e5ab616 Mon Sep 17 00:00:00 2001 From: Anthony Iliopoulos Date: Tue, 29 Oct 2019 21:16:50 +0100 Subject: [PATCH 185/186] lttng-ust: update to 2.11.0. --- srcpkgs/lttng-ust/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/lttng-ust/template b/srcpkgs/lttng-ust/template index 87c4ef5592e..5e6339343ac 100644 --- a/srcpkgs/lttng-ust/template +++ b/srcpkgs/lttng-ust/template @@ -1,16 +1,17 @@ # Template file for 'lttng-ust' pkgname=lttng-ust -version=2.10.5 +version=2.11.0 revision=1 build_style=gnu-configure -makedepends="liburcu-devel" +makedepends="liburcu-devel libnuma-devel" +depends="libnuma" short_desc="Low-overhead tracing capabilities for userspace" maintainer="Simon Thoby " license="LGPL-2.1-only" homepage="http://lttng.org" changelog="https://github.com/lttng/lttng-ust/raw/master/ChangeLog" distfiles="${homepage}/files/${pkgname}/${pkgname}-${version}.tar.bz2" -checksum=06f9ed9b2198855b1c7fcbf15fe57297ee259409ffa1b3bad87321412d98bc35 +checksum=683280cfe5e12021e64c32cef9eeb0128f1f23dec32ba28adb5a2074be37c4d8 lttng-ust-devel_package() { depends="${sourcepkg}>=${version}_${revision} liburcu-devel" From f17a3b2aae0a5880b938b17d2869baa0a55431ec Mon Sep 17 00:00:00 2001 From: Anthony Iliopoulos Date: Tue, 29 Oct 2019 13:59:40 +0100 Subject: [PATCH 186/186] ndctl: update to 67. --- srcpkgs/ndctl/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ndctl/template b/srcpkgs/ndctl/template index be7895d78e3..49d16799470 100644 --- a/srcpkgs/ndctl/template +++ b/srcpkgs/ndctl/template @@ -1,6 +1,6 @@ # Template file for 'ndctl' pkgname=ndctl -version=66 +version=67 revision=1 build_style=gnu-configure configure_args="--disable-docs --without-systemd" @@ -12,7 +12,7 @@ maintainer="Anthony Iliopoulos " license="LGPL-2.1-only, GPL-2.0-only" homepage="https://github.com/pmem/ndctl" distfiles="https://github.com/pmem/ndctl/archive/v${version}.tar.gz" -checksum=b2b0cd5468de235d3ae8bb3de737ab2e18e854eee57c3618c648c6d7abd02e63 +checksum=32b498e333570c34040418478619316c1e2a51339dde5fc00a3864453b6e2d82 conf_files="/etc/ndctl/monitor.conf" case "$XBPS_TARGET_MACHINE" in