From c491b34ba2dcaac8c05610c159b7fadb388ac3f2 Mon Sep 17 00:00:00 2001 From: user Date: Sat, 21 May 2022 22:39:02 +0300 Subject: [PATCH 1/5] arcan: update to 0.6.1.1 connected pkgs aclip and aloadimage also updated. aclip - arcan clipboard lib aloadimage - arcan image lib xarcan - X11 for arcan --- srcpkgs/arcan/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/arcan/template b/srcpkgs/arcan/template index f33db1fadeb8..8bae843cb289 100644 --- a/srcpkgs/arcan/template +++ b/srcpkgs/arcan/template @@ -1,6 +1,6 @@ # Template file for 'arcan' pkgname=arcan -version=0.6.1 +version=0.6.1.1 revision=1 build_wrksrc=src build_style=cmake @@ -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="ca8a9b82000eef60970901641be1130b19c51a1cc2a17278e2365ca3e3a13551 +checksum="3c36bbc53a276c03776134407b662beb1181e43c5f8d0aabe7c6fae6652cc29e 3a50a87c05b67c466a868cc77f8dc7f9cfc9466aeeafcd823daca0d108c504da" export CMAKE_GENERATOR="Unix Makefiles" From 034d59fb6ecf2cc700fda1c9f3d40b8106f2a2c4 Mon Sep 17 00:00:00 2001 From: user Date: Sat, 21 May 2022 22:40:01 +0300 Subject: [PATCH 2/5] aclip: update to 0.6.1.1 --- srcpkgs/aclip/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/aclip/template b/srcpkgs/aclip/template index f1dd8ee44265..ac58d84bb063 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.1 +version=0.6.1.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=ca8a9b82000eef60970901641be1130b19c51a1cc2a17278e2365ca3e3a13551 +checksum=3c36bbc53a276c03776134407b662beb1181e43c5f8d0aabe7c6fae6652cc29e post_install() { vlicense ../../../COPYING From e5c4c78aa20af3169bae6848dbf22de1a7c7188c Mon Sep 17 00:00:00 2001 From: user Date: Sat, 21 May 2022 22:40:32 +0300 Subject: [PATCH 3/5] aloadimage: update to 0.6.1.1 patch removed cause it already in source --- .../patches/0001-vendored-svgimage-fix.patch | 37 ------------------- 1 file changed, 37 deletions(-) delete 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 deleted file mode 100644 index 2cde878a54c4..000000000000 --- a/srcpkgs/aloadimage/patches/0001-vendored-svgimage-fix.patch +++ /dev/null @@ -1,37 +0,0 @@ -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); From 612263036d63a3486aa740b4db2a1da8bc722289 Mon Sep 17 00:00:00 2001 From: user Date: Sat, 21 May 2022 22:41:37 +0300 Subject: [PATCH 4/5] xarcan: update to 0.6.1_2 --- srcpkgs/xarcan/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/xarcan/template b/srcpkgs/xarcan/template index fbd3d7e6e867..31b16faadc1b 100644 --- a/srcpkgs/xarcan/template +++ b/srcpkgs/xarcan/template @@ -1,7 +1,7 @@ # Template file for 'xarcan' pkgname=xarcan version=0.6.1 -revision=1 +revision=2 build_style=meson configure_args="-Dglamor=true -Dint10=false -Dipv6=true -Dsystemd_logind=false -Ddefault_font_path=/usr/share/fonts/X11" From 0edda3d7606b8890b29e18d0a6b8efdff749129b Mon Sep 17 00:00:00 2001 From: user Date: Sat, 21 May 2022 22:42:17 +0300 Subject: [PATCH 5/5] arcan: update to 0.6.1.1 --- common/shlibs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/common/shlibs b/common/shlibs index 7f3e1458f7a6..0e0f2e9040e4 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3241,11 +3241,12 @@ 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.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 +libarcan_shmif.so.0.15 arcan-0.6.1.1_1 +libarcan_shmif_ext.so.0.15 arcan-0.6.1.1_1 +libarcan_shmif_intext.so.0.15 arcan-0.6.1.1_1 +libarcan_shmif_server.so.0.15 arcan-0.6.1.1_1 +libarcan_tui.so.0.15 arcan-0.6.1.1_1 +libarcan_a12.so.0.1 arcan-0.6.1.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