From 7c26b26fb288690183a1f396db59b7c334b348c6 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 9 Apr 2022 13:38:04 +0200 Subject: [PATCH] chatterino2: patch into $build_wrksrc --- .../patches/0001-fix-desktop-icon-name.patch | 4 ++-- srcpkgs/chatterino2/patches/cmake.patch | 12 ++++++------ srcpkgs/chatterino2/template | 5 +++-- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch b/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch index 9f41d03190b..1b0a6d6140e 100644 --- a/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch +++ b/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch @@ -1,7 +1,7 @@ diff --git a/resources/com.chatterino.chatterino.desktop b/resources/com.chatterino.chatterino.desktop index 6ee45354..ece81f5c 100644 ---- a/chatterino2/resources/com.chatterino.chatterino.desktop -+++ b/chatterino2/resources/com.chatterino.chatterino.desktop +--- a/resources/com.chatterino.chatterino.desktop ++++ b/resources/com.chatterino.chatterino.desktop @@ -4,7 +4,7 @@ Version=1.0 Name=Chatterino Comment=Chat client for Twitch diff --git a/srcpkgs/chatterino2/patches/cmake.patch b/srcpkgs/chatterino2/patches/cmake.patch index a59d0a4eb9f..8a564356695 100644 --- a/srcpkgs/chatterino2/patches/cmake.patch +++ b/srcpkgs/chatterino2/patches/cmake.patch @@ -1,7 +1,7 @@ diff --git a/cmake/FindLRUCache.cmake b/cmake/FindLRUCache.cmake index 82905436..b0b89a4e 100644 ---- a/chatterino2/cmake/FindLRUCache.cmake -+++ b/chatterino2/cmake/FindLRUCache.cmake +--- a/cmake/FindLRUCache.cmake ++++ b/cmake/FindLRUCache.cmake @@ -1,6 +1,6 @@ include(FindPackageHandleStandardArgs) @@ -12,8 +12,8 @@ index 82905436..b0b89a4e 100644 diff --git a/cmake/FindPajladaSerialize.cmake b/cmake/FindPajladaSerialize.cmake index 4671874c..119284c2 100644 ---- a/chatterino2/cmake/FindPajladaSerialize.cmake -+++ b/chatterino2/cmake/FindPajladaSerialize.cmake +--- a/cmake/FindPajladaSerialize.cmake ++++ b/cmake/FindPajladaSerialize.cmake @@ -1,6 +1,6 @@ include(FindPackageHandleStandardArgs) @@ -24,8 +24,8 @@ index 4671874c..119284c2 100644 diff --git a/cmake/FindPajladaSignals.cmake b/cmake/FindPajladaSignals.cmake index f4c964ec..75efba20 100644 ---- a/chatterino2/cmake/FindPajladaSignals.cmake -+++ b/chatterino2/cmake/FindPajladaSignals.cmake +--- a/cmake/FindPajladaSignals.cmake ++++ b/cmake/FindPajladaSignals.cmake @@ -1,6 +1,6 @@ include(FindPackageHandleStandardArgs) diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template index e1f99ac9e9f..7bf7d6a37d0 100644 --- a/srcpkgs/chatterino2/template +++ b/srcpkgs/chatterino2/template @@ -9,7 +9,7 @@ _signals_commit="baf5bb04bd13b090e405e0447c89a811f7e23ddc" _qtkeychain_commit="de954627363b0b4bff9a2616f1a409b7e14d5df9" _sanitizers_cmake_commit="99e159ec9bc8dd362b08d18436bd40ff0648417b" create_wrksrc=yes -build_wrksrc="chatterino2" +build_wrksrc="chatterino2-${version}" build_style=cmake hostmakedepends="qt5-qmake qt5-host-tools" makedepends="qt5-tools-devel qt5-multimedia-devel qt5-svg-devel @@ -40,8 +40,9 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then LIBS="-latomic" fi +patch_args="-Np1 --directory=${build_wrksrc}" + post_extract() { - mv "chatterino2-${version}" "${build_wrksrc}" rmdir ${build_wrksrc}/lib/libcommuni ${build_wrksrc}/lib/serialize \ ${build_wrksrc}/lib/settings ${build_wrksrc}/lib/signals \ ${build_wrksrc}/lib/rapidjson ${build_wrksrc}/lib/websocketpp \