From 8961c1aefbfc7fefc6fa0ea13afa0be3ef099374 Mon Sep 17 00:00:00 2001 From: bjornstahl Date: Mon, 22 Nov 2021 20:18:57 +0000 Subject: [PATCH 1/4] arcan: update to 0.6.1. --- common/shlibs | 10 +++++----- srcpkgs/arcan/patches/cmake-espeak-ng.patch | 12 ------------ srcpkgs/arcan/template | 6 +++--- 3 files changed, 8 insertions(+), 20 deletions(-) delete mode 100644 srcpkgs/arcan/patches/cmake-espeak-ng.patch diff --git a/common/shlibs b/common/shlibs index 6ccb302132d5..ca59891a0bf2 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3229,11 +3229,11 @@ libaacs.so.0 libaacs-0.9.0_1 libttfautohint.so.1 ttfautohint-1.8.1_1 libcob.so.4 gnucobol-libs-2.2_1 libkrfbprivate.so.5.0 krfb-17.08.1_1 -libarcan_shmif.so.0.13 arcan-0.6.0_1 -libarcan_shmif_ext.so.0.13 arcan-0.6.0_1 -libarcan_shmif_server.so.0.13 arcan-0.6.0_1 -libarcan_tui.so.0.13 arcan-0.6.0_1 -libarcan_a12.so.0.1 arcan-0.6.0_1 +libarcan_shmif.so.0.14 arcan-0.6.1_1 +libarcan_shmif_ext.so.0.14 arcan-0.6.1_1 +libarcan_shmif_server.so.0.14 arcan-0.6.1_1 +libarcan_tui.so.0.14 arcan-0.6.1_1 +libarcan_a12.so.0.1 arcan-0.6.1_1 liblwipv6.so.2 lwipv6-1.5a_1 libpipewire-0.2.so.1 libpipewire0.2-0.2.7_1 libpipewire-0.3.so.0 libpipewire-0.3.6_1 diff --git a/srcpkgs/arcan/patches/cmake-espeak-ng.patch b/srcpkgs/arcan/patches/cmake-espeak-ng.patch deleted file mode 100644 index c2ef22fd9d29..000000000000 --- a/srcpkgs/arcan/patches/cmake-espeak-ng.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/platform/cmake/modules/FindEspeak.cmake b/src/platform/cmake/modules/FindEspeak.cmake -index 6815e874..a548a232 100644 ---- a/src/platform/cmake/modules/FindEspeak.cmake -+++ b/src/platform/cmake/modules/FindEspeak.cmake -@@ -1,5 +1,5 @@ --FIND_PATH( ESPEAK_INCLUDE_DIR espeak/speak_lib.h ) --FIND_LIBRARY(ESPEAK_LIBRARIES NAMES espeak ) -+FIND_PATH( ESPEAK_INCLUDE_DIR espeak/speak_lib.h) -+FIND_LIBRARY(ESPEAK_LIBRARIES NAMES espeak espeak-ng) - - IF( ESPEAK_LIBRARIES ) - SET( ESPEAK_FOUND TRUE ) diff --git a/srcpkgs/arcan/template b/srcpkgs/arcan/template index 31bf6e62eec5..2fcf11346b94 100644 --- a/srcpkgs/arcan/template +++ b/srcpkgs/arcan/template @@ -1,7 +1,7 @@ # Template file for 'arcan' pkgname=arcan -version=0.6.0.1 -revision=2 +version=0.6.1 +revision=1 build_wrksrc=src build_style=cmake make_cmd=make @@ -25,7 +25,7 @@ homepage="https://arcan-fe.com/" _versionOpenal=0.5.4 distfiles="https://github.com/letoram/${pkgname}/archive/${version}.tar.gz https://github.com/letoram/openal/archive/${_versionOpenal}.tar.gz>openal_arcan.${_versionOpenal}.tar.gz" -checksum="7ae00a9dee79f9b58ac2bacbf532ff0631280297cfde30e8996382a3f42a52ed +checksum="ca8a9b82000eef60970901641be1130b19c51a1cc2a17278e2365ca3e3a13551 3a50a87c05b67c466a868cc77f8dc7f9cfc9466aeeafcd823daca0d108c504da" export CMAKE_GENERATOR="Unix Makefiles" From 83b7b5e8e3872d49932dd2e375f60f55578672b7 Mon Sep 17 00:00:00 2001 From: bjornstahl Date: Mon, 22 Nov 2021 20:19:20 +0000 Subject: [PATCH 2/4] xarcan: bump revision to 0.6.0-3 match shlib version bump from arcan-0.6.1 --- srcpkgs/xarcan/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/xarcan/template b/srcpkgs/xarcan/template index 64f74efd209d..fef279d8e4ba 100644 --- a/srcpkgs/xarcan/template +++ b/srcpkgs/xarcan/template @@ -1,7 +1,7 @@ # Template file for 'xarcan' pkgname=xarcan version=0.6.0 -revision=2 +revision=3 build_style=meson configure_args="-Dglamor=true -Dint10=false -Dipv6=true -Dsystemd_logind=false -Ddefault_font_path=/usr/share/fonts/X11" From 9aadffd55ca0b989684c0343c838277d71a268e7 Mon Sep 17 00:00:00 2001 From: bjornstahl Date: Mon, 22 Nov 2021 20:20:34 +0000 Subject: [PATCH 3/4] Aclip: update to 0.6.1 --- srcpkgs/aclip/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/aclip/template b/srcpkgs/aclip/template index 9f899495b3f8..f1dd8ee44265 100644 --- a/srcpkgs/aclip/template +++ b/srcpkgs/aclip/template @@ -1,7 +1,7 @@ # Template file for 'aclip' # !! keep synced with arcan pkgname=aclip -version=0.6.0.1 +version=0.6.1 revision=1 wrksrc=arcan-${version} build_wrksrc=src/tools/aclip @@ -12,7 +12,7 @@ maintainer="Piraty " license="BSD-3-Clause" homepage="https://arcan-fe.com/" distfiles="https://github.com/letoram/arcan/archive/${version}.tar.gz" -checksum=7ae00a9dee79f9b58ac2bacbf532ff0631280297cfde30e8996382a3f42a52ed +checksum=ca8a9b82000eef60970901641be1130b19c51a1cc2a17278e2365ca3e3a13551 post_install() { vlicense ../../../COPYING From d5b8e2c846f8b4542dbf4844044b14e0ec3ba305 Mon Sep 17 00:00:00 2001 From: bjornstahl Date: Mon, 22 Nov 2021 20:20:57 +0000 Subject: [PATCH 4/4] aloadimage: update to 0.6.1 --- .../patches/0001-vendored-svgimage-fix.patch | 37 +++++++++++++++++++ srcpkgs/aloadimage/template | 4 +- 2 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/aloadimage/patches/0001-vendored-svgimage-fix.patch diff --git a/srcpkgs/aloadimage/patches/0001-vendored-svgimage-fix.patch b/srcpkgs/aloadimage/patches/0001-vendored-svgimage-fix.patch new file mode 100644 index 000000000000..2cde878a54c4 --- /dev/null +++ b/srcpkgs/aloadimage/patches/0001-vendored-svgimage-fix.patch @@ -0,0 +1,37 @@ +diff --git a/src/tools/aloadimage/nanosvg.h b/src/tools/aloadimage/nanosvg.h +index f5058b17..716adea5 100644 +--- a/src/tools/aloadimage/nanosvg.h ++++ b/src/tools/aloadimage/nanosvg.h +@@ -163,7 +163,7 @@ typedef struct NSVGimage + } NSVGimage; + + // Parses SVG file from a file, returns SVG image as paths. +-NSVGimage* nsvgParseFromFile(const char* filename, const char* units, float dpi); ++NSVGimage* nsvgParseFromFile(FILE* fp, const char* units, float dpi); + + // Parses SVG file from a null terminated string, returns SVG image as paths. + // Important note: changes the string. +@@ -200,7 +200,6 @@ void nsvgDelete(NSVGimage* image); + #define NSVG_ALIGN_SLICE 2 + + #define NSVG_NOTUSED(v) do { (void)(1 ? (void)0 : ( (void)(v) ) ); } while(0) +-#define NSVG_RGB(r, g, b) (((unsigned int)r) | ((unsigned int)g << 8) | ((unsigned int)b << 16)) + + #ifdef _MSC_VER + #pragma warning (disable: 4996) // Switch off security warnings +@@ -2930,14 +2929,12 @@ NSVGimage* nsvgParse(char* input, const char* units, float dpi) + return ret; + } + +-NSVGimage* nsvgParseFromFile(const char* filename, const char* units, float dpi) ++NSVGimage* nsvgParseFromFile(FILE* fp, const char* units, float dpi) + { +- FILE* fp = NULL; + size_t size; + char* data = NULL; + NSVGimage* image = NULL; + +- fp = fopen(filename, "rb"); + if (!fp) goto error; + fseek(fp, 0, SEEK_END); + size = ftell(fp); diff --git a/srcpkgs/aloadimage/template b/srcpkgs/aloadimage/template index 23c0367a5491..7e1dcbd97192 100644 --- a/srcpkgs/aloadimage/template +++ b/srcpkgs/aloadimage/template @@ -1,7 +1,7 @@ # Template file for 'aloadimage' # !! keep synced with arcan pkgname=aloadimage -version=0.6.0.1 +version=0.6.1 revision=1 wrksrc="arcan-${version}" build_wrksrc=src/tools/aloadimage @@ -13,7 +13,7 @@ maintainer="Piraty " license="BSD-3-Clause" homepage="https://arcan-fe.com/" distfiles="https://github.com/letoram/arcan/archive/${version}.tar.gz" -checksum=7ae00a9dee79f9b58ac2bacbf532ff0631280297cfde30e8996382a3f42a52ed +checksum=ca8a9b82000eef60970901641be1130b19c51a1cc2a17278e2365ca3e3a13551 post_install() { vlicense ../../../COPYING