From a85de3a63b5e48f7a6d86c591c39765113b78b48 Mon Sep 17 00:00:00 2001 From: Piraty Date: Tue, 21 Apr 2020 01:59:55 +0200 Subject: [PATCH] treesheets: update to 1.0.2. upstream switched to cmake --- .../patches/fix-musl-glob-tilde.patch | 8 +-- srcpkgs/treesheets/template | 52 ++++++++++--------- 2 files changed, 32 insertions(+), 28 deletions(-) diff --git a/srcpkgs/treesheets/patches/fix-musl-glob-tilde.patch b/srcpkgs/treesheets/patches/fix-musl-glob-tilde.patch index 2401b2dc228..8aad847c138 100644 --- a/srcpkgs/treesheets/patches/fix-musl-glob-tilde.patch +++ b/srcpkgs/treesheets/patches/fix-musl-glob-tilde.patch @@ -4,7 +4,7 @@ diff --git a/lobster/src/platform.cpp b/lobster/src/platform.cpp index ceaec49..68e2443 100644 --- lobster/src/platform.cpp +++ lobster/src/platform.cpp -@@ -46,6 +46,10 @@ +@@ -50,6 +50,10 @@ #include "sdlincludes.h" // FIXME #endif @@ -12,7 +12,7 @@ index ceaec49..68e2443 100644 +#define GLOB_TILDE 0 +#endif + - // Main dir to load files relative to, on windows this is where lobster.exe resides, on apple - // platforms it's the Resource folder in the bundle. - string datadir; + // Dirs to load files relative to, they typically contain, and will be searched in this order: + // - The project specific files. This is where the bytecode file you're running or the main + // .lobster file you're compiling reside. diff --git a/srcpkgs/treesheets/template b/srcpkgs/treesheets/template index b912a3c5fe9..104b01f411c 100644 --- a/srcpkgs/treesheets/template +++ b/srcpkgs/treesheets/template @@ -1,37 +1,41 @@ # Template file for 'treesheets' pkgname=treesheets -version=1.0.1 +version=1.0.2 revision=1 -build_style=gnu-makefile -make_build_args="WX_CONFIG=wx-config-gtk3" +build_style=cmake makedepends="wxWidgets-gtk3-devel" short_desc="Free Form Data Organizer" maintainer="Piraty " license="Zlib" homepage="http://strlen.com/treesheets/" distfiles="https://github.com/aardappel/treesheets/archive/v${version}.tar.gz" -checksum=cacf0593e12c484f68adf4d462147efed202b1c2d09e58e90c9fb98cb3e7b874 +checksum=84eb82f122bc7be3ded399d2511536128911477a4a69c51b26b856de2160405f -build_wrksrc="src" -make_use_env=1 +# tell FindwxWidgets.cmake to use wx-config-gtk3 +export WX_CONFIG=wx-config-gtk3 do_install() { - sed \ - -e "s|%PKGNAME%|${pkgname}|" \ - -e "s|%EXENAME%|${pkgname}|" \ - ${FILESDIR}/treesheets.sh.in > ${wrksrc}/treesheets.sh - vbin ${wrksrc}/treesheets.sh treesheets - vlicense ${wrksrc}/ZLIB_LICENSE.txt - vmkdir usr/lib/${pkgname} 755 - vcopy ${wrksrc}/TS/docs usr/lib/${pkgname} - vinstall ${wrksrc}/TS/readme.html 644 usr/lib/${pkgname} - vcopy ${wrksrc}/TS/examples usr/lib/${pkgname} - vcopy ${wrksrc}/TS/images usr/lib/${pkgname} - vinstall ${wrksrc}/src/treesheets 755 usr/lib/${pkgname} - vinstall ${wrksrc}/TS/treesheets.desktop 644 usr/share/applications - vinstall ${wrksrc}/TS/images/icon32.png 644 usr/share/pixmaps treesheets.png - vinstall ${wrksrc}/TS/images/icon16.png 644 usr/share/pixmaps treesheets-16x16.png - vinstall ${wrksrc}/TS/images/treesheets.svg 644 usr/share/pixmaps treesheets.svg - sed -i "s|Icon=images/treesheets.svg|Icon=treesheets.png|" ${DESTDIR}/usr/share/applications/treesheets.desktop - vdoc ${wrksrc}/TODO.txt + vmkdir usr/lib/${pkgname} + + vinstall build/TS/treesheets 755 usr/lib/${pkgname} + printf '#!/bin/sh\nexec /usr/lib/treesheets/treesheets "$@"' > treesheets.sh + vbin treesheets.sh treesheets + + vlicense ZLIB_LICENSE.txt + + vdoc TS/readme.html + vcopy "TS/docs/*" usr/share/doc/${pkgname} + + vcopy TS/examples usr/lib/${pkgname} + vcopy TS/images usr/lib/${pkgname} + vcopy TS/scripts usr/lib/${pkgname} + vcopy TS/translations usr/lib/${pkgname} + + vinstall TS/images/icon32.png 644 usr/share/pixmaps treesheets.png + vinstall TS/images/icon16.png 644 usr/share/pixmaps treesheets-16x16.png + vinstall TS/images/treesheets.svg 644 usr/share/pixmaps treesheets.svg + + vmkdir usr/share/applications/ + vsed -i "s|Icon=images/treesheets.svg|Icon=treesheets.png|" TS/treesheets.desktop + vinstall TS/treesheets.desktop 644 usr/share/applications }