Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] chatterino2: update to 2.3.4.
@ 2022-03-16 12:15 tibequadorian
  2022-03-16 12:56 ` [PR PATCH] [Updated] " tibequadorian
                   ` (13 more replies)
  0 siblings, 14 replies; 17+ messages in thread
From: tibequadorian @ 2022-03-16 12:15 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1251 bytes --]

There is a new pull request by tibequadorian against master on the void-packages repository

https://github.com/tibequadorian/void-packages chatterino2
https://github.com/void-linux/void-packages/pull/36170

chatterino2: update to 2.3.4.
supersedes #32199

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/36170.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chatterino2-36170.patch --]
[-- Type: text/x-diff, Size: 10382 bytes --]

From 912dd17c491c36242281dc3a89d65e850aa87b30 Mon Sep 17 00:00:00 2001
From: Marko <goncarmarko@gmail.com>
Date: Sun, 25 Jul 2021 23:07:26 +0300
Subject: [PATCH] chatterino2: update to 2.3.4.

---
 .../patches/0001-fix-desktop-icon-name.patch  | 13 +++
 .../patches/0001-use-system-deps.patch        | 58 -------------
 srcpkgs/chatterino2/patches/cmake.patch       | 36 ++++++++
 srcpkgs/chatterino2/template                  | 82 +++++++++----------
 4 files changed, 86 insertions(+), 103 deletions(-)
 create mode 100644 srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
 delete mode 100644 srcpkgs/chatterino2/patches/0001-use-system-deps.patch
 create mode 100644 srcpkgs/chatterino2/patches/cmake.patch

diff --git a/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch b/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
new file mode 100644
index 000000000000..1b0a6d6140e4
--- /dev/null
+++ b/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
@@ -0,0 +1,13 @@
+diff --git a/resources/com.chatterino.chatterino.desktop b/resources/com.chatterino.chatterino.desktop
+index 6ee45354..ece81f5c 100644
+--- 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
+ Exec=chatterino
+-Icon=chatterino
++Icon=com.chatterino.chatterino
+ Terminal=false
+ Categories=Network;InstantMessaging;
+ StartupWMClass=chatterino
diff --git a/srcpkgs/chatterino2/patches/0001-use-system-deps.patch b/srcpkgs/chatterino2/patches/0001-use-system-deps.patch
deleted file mode 100644
index 383c5ea23f43..000000000000
--- a/srcpkgs/chatterino2/patches/0001-use-system-deps.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git chatterino.pro chatterino.pro
-index d8b14bbe..f7657f06 100644
---- a/chatterino.pro
-+++ b/chatterino.pro
-@@ -12,10 +12,17 @@
- #  - BOOST_DIRECTORY (C:\local\boost\ by default) (Windows only)
-
- QT                += widgets core gui network multimedia svg concurrent
--CONFIG            += communi
--COMMUNI           += core model util
-
- INCLUDEPATH       += src/
-+# libcommuni
-+INCLUDEPATH       += /usr/include/qt5/Communi/IrcCore
-+INCLUDEPATH       += /usr/include/qt5/Communi/IrcModel
-+INCLUDEPATH       += /usr/include/qt5/Communi/IrcUtil
-+DEFINES           += IRC_SHARED
-+LIBS              += -lIrcCore -lIrcModel -lIrcUtil
-+# qtkeychain
-+INCLUDEPATH       += /usr/include/qt5keychain
-+LIBS              += -lqt5keychain
- TARGET             = chatterino
- TEMPLATE           = app
- PRECOMPILED_HEADER = src/PrecompiledHeader.hpp
-@@ -78,7 +85,6 @@ CONFIG(debug, debug|release) {
- include(lib/warnings.pri)
- include(lib/fmt.pri)
- include(lib/humanize.pri)
--include(lib/libcommuni.pri)
- include(lib/websocketpp.pri)
- include(lib/wintoast.pri)
- include(lib/signals.pri)
-@@ -86,7 +92,6 @@ include(lib/settings.pri)
- include(lib/serialize.pri)
- include(lib/winsdk.pri)
- include(lib/rapidjson.pri)
--include(lib/qtkeychain.pri)
-
- exists( $$OUT_PWD/conanbuildinfo.pri ) {
-     message("Using conan packages")
-diff --git src/common/Credentials.cpp src/common/Credentials.cpp
-index 87abecb9..5de78130 100644
---- a/src/common/Credentials.cpp
-+++ b/src/common/Credentials.cpp
-@@ -1,12 +1,12 @@
- #include "Credentials.hpp"
- 
- #include "debug/AssertInGuiThread.hpp"
--#include "keychain.h"
- #include "singletons/Paths.hpp"
- #include "singletons/Settings.hpp"
- #include "util/CombinePath.hpp"
- #include "util/Overloaded.hpp"
- 
-+#include <qt5keychain/keychain.h>
- #include <QSaveFile>
- #include <boost/variant.hpp>
- 
diff --git a/srcpkgs/chatterino2/patches/cmake.patch b/srcpkgs/chatterino2/patches/cmake.patch
new file mode 100644
index 000000000000..8a5643566957
--- /dev/null
+++ b/srcpkgs/chatterino2/patches/cmake.patch
@@ -0,0 +1,36 @@
+diff --git a/cmake/FindLRUCache.cmake b/cmake/FindLRUCache.cmake
+index 82905436..b0b89a4e 100644
+--- a/cmake/FindLRUCache.cmake
++++ b/cmake/FindLRUCache.cmake
+@@ -1,6 +1,6 @@
+ include(FindPackageHandleStandardArgs)
+ 
+-find_path(LRUCache_INCLUDE_DIR lrucache/lrucache.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/lrucache)
++find_path(LRUCache_INCLUDE_DIR lrucache/lrucache.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/lrucache NO_CMAKE_FIND_ROOT_PATH)
+ 
+ find_package_handle_standard_args(LRUCache DEFAULT_MSG LRUCache_INCLUDE_DIR)
+ 
+diff --git a/cmake/FindPajladaSerialize.cmake b/cmake/FindPajladaSerialize.cmake
+index 4671874c..119284c2 100644
+--- a/cmake/FindPajladaSerialize.cmake
++++ b/cmake/FindPajladaSerialize.cmake
+@@ -1,6 +1,6 @@
+ include(FindPackageHandleStandardArgs)
+ 
+-find_path(PajladaSerialize_INCLUDE_DIR pajlada/serialize.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/serialize/include)
++find_path(PajladaSerialize_INCLUDE_DIR pajlada/serialize.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/serialize/include NO_CMAKE_FIND_ROOT_PATH)
+ 
+ find_package_handle_standard_args(PajladaSerialize DEFAULT_MSG PajladaSerialize_INCLUDE_DIR)
+ 
+diff --git a/cmake/FindPajladaSignals.cmake b/cmake/FindPajladaSignals.cmake
+index f4c964ec..75efba20 100644
+--- a/cmake/FindPajladaSignals.cmake
++++ b/cmake/FindPajladaSignals.cmake
+@@ -1,6 +1,6 @@
+ include(FindPackageHandleStandardArgs)
+ 
+-find_path(PajladaSignals_INCLUDE_DIR pajlada/signals/signal.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/signals/include)
++find_path(PajladaSignals_INCLUDE_DIR pajlada/signals/signal.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/signals/include NO_CMAKE_FIND_ROOT_PATH)
+ 
+ find_package_handle_standard_args(PajladaSignals DEFAULT_MSG PajladaSignals_INCLUDE_DIR)
+ 
diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index f69730b3a9fe..22600d0c7d6e 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -1,55 +1,47 @@
 # Template file for 'chatterino2'
 pkgname=chatterino2
-version=2.2.2
-revision=2
-_signals_commit=6665ccad90461c01b7fe704a98a835953d644156
-_settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450
-_humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be
-_serialize_commit=130ffc3ec722284ca454a1e70c5478a75f380144
-build_style=qmake
-configure_args="INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcCore
- INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcModel
- INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcUtil"
-hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
-makedepends="qt5-svg-devel qt5-multimedia-devel
- boost-devel rapidjson libcommuni-devel websocketpp
- qtkeychain-qt5-devel"
-short_desc="Qt-based twitch chat client"
-maintainer="Franc[e]sco <lolisamurai@tfwno.gf>"
-license="MIT"
+version=2.3.4
+revision=1
+_libcommuni_commit="c613600e6a52e6d3166247a05205cf1c755d4868"
+_serialize_commit="7d37cbfd5ac3bfbe046118e1cec3d32ba4696469"
+_settings_commit="7cf8431d644332107a51a46c1e3de70e64692f0c"
+_signals_commit="baf5bb04bd13b090e405e0447c89a811f7e23ddc"
+_qtkeychain_commit="de954627363b0b4bff9a2616f1a409b7e14d5df9"
+_sanitizers_cmake_commit="99e159ec9bc8dd362b08d18436bd40ff0648417b"
+build_style=cmake
+hostmakedepends="qt5-qmake qt5-host-tools"
+makedepends="qt5-tools-devel qt5-multimedia-devel qt5-svg-devel
+ boost-devel openssl-devel rapidjson websocketpp"
+depends="qt5-imageformats qt5-svg"
+short_desc="Chat client for twitch.tv"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license=MIT
 homepage="https://chatterino.com"
 changelog="https://chatterino.com/changelog"
-distfiles="https://github.com/fourtf/chatterino2/archive/v${version}.tar.gz
- https://github.com/pajlada/signals/archive/${_signals_commit}.tar.gz
+distfiles="https://github.com/Chatterino/chatterino2/archive/refs/tags/v${version}.tar.gz
+ https://github.com/Chatterino/libcommuni/archive/${_libcommuni_commit}.tar.gz
+ https://github.com/pajlada/serialize/archive/${_serialize_commit}.tar.gz
  https://github.com/pajlada/settings/archive/${_settings_commit}.tar.gz
- https://github.com/pajlada/humanize/archive/${_humanize_commit}.tar.gz
- https://github.com/pajlada/serialize/archive/${_serialize_commit}.tar.gz"
-checksum="6e3d64f319728ccf9fd09613df754108157e7d3b4148ee2da1a3209bf369be70
-e8755e68ff6fc39b4338d424ee9aed2ed5a8eab6eb37af69de2ff21b8dc94e66
-f387cc7eaf27dec462bc85a212619f8086167cf0b47e11825b8580d35a740dfe
-5a5cd8338fcb0a14a4bbe0840f83505d0444a9000956145e85e5550feeb744b0
-eb492b89e67f4ec632bd43f2701d53e355f1d1afbec3cd3af5891c1a6aaaa454"
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+=" libatomic-devel"
-	configure_args+=" LIBS+=-latomic"
-fi
+ https://github.com/pajlada/signals/archive/${_signals_commit}.tar.gz
+ https://github.com/Chatterino/qtkeychain/archive/${_qtkeychain_commit}.tar.gz
+ https://github.com/arsenm/sanitizers-cmake/archive/${_sanitizers_cmake_commit}.tar.gz"
+checksum="27d42138d48d807340fe4194b4cdada6183b0ff2127f24d39032b3ad1f66594c
+ ba2179eb43638366ca65214137a850a127fb93a36fcc54658649c34e8d6f7dc4
+ d0da2cebd5dfd7b20f7247f1e4fb6b8a866434db49316a067b6c798ec8217c63
+ 0b35eb297f0949f27b3c54bc66d8b0c9293102fb52838d12371a5fcc80c590e5
+ 7ffd43dbd05704af5bef64b0eae8c12174013d4c7105472019ef381ff82c0a46
+ 4fdd7fd8bbae4fd7a505c917facc6e6b838850cd4f016c30fae45535dbaab4b7
+ f9cf386638f455c5d2e7a835b95941201387d2531b8682942d59827663b58341"
 
 post_extract() {
-	rmdir lib/signals
-	rmdir lib/settings
-	rmdir lib/humanize
-	rmdir lib/serialize
-	mv "${XBPS_BUILDDIR}/signals-${_signals_commit}/" lib/signals/
-	mv "${XBPS_BUILDDIR}/settings-${_settings_commit}/" lib/settings/
-	mv "${XBPS_BUILDDIR}/humanize-${_humanize_commit}/" lib/humanize/
-	mv "${XBPS_BUILDDIR}/serialize-${_serialize_commit}/" lib/serialize/
-}
-
-pre_configure() {
-	# it wraps libcommuni in a namespace but void's binaries don't
-	find \( -name '*.cpp' -o -name '*.hpp' \) \
-		-exec sed -i "{}" -e 's/Communi::/::/g' \;
+	rmdir lib/libcommuni lib/serialize lib/settings lib/signals lib/rapidjson \
+	      lib/websocketpp lib/qtkeychain cmake/sanitizers-cmake
+	mv "${XBPS_BUILDDIR}/libcommuni-${_libcommuni_commit}" "lib/libcommuni"
+	mv "${XBPS_BUILDDIR}/serialize-${_serialize_commit}" "lib/serialize"
+	mv "${XBPS_BUILDDIR}/settings-${_settings_commit}" "lib/settings"
+	mv "${XBPS_BUILDDIR}/signals-${_signals_commit}" "lib/signals"
+	mv "${XBPS_BUILDDIR}/qtkeychain-${_qtkeychain_commit}" "lib/qtkeychain"
+	mv "${XBPS_BUILDDIR}/sanitizers-cmake-${_sanitizers_cmake_commit}" "cmake/sanitizers-cmake"
 }
 
 post_install() {

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR PATCH] [Updated] chatterino2: update to 2.3.4.
  2022-03-16 12:15 [PR PATCH] chatterino2: update to 2.3.4 tibequadorian
@ 2022-03-16 12:56 ` tibequadorian
  2022-03-16 12:57 ` tibequadorian
                   ` (12 subsequent siblings)
  13 siblings, 0 replies; 17+ messages in thread
From: tibequadorian @ 2022-03-16 12:56 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1256 bytes --]

There is an updated pull request by tibequadorian against master on the void-packages repository

https://github.com/tibequadorian/void-packages chatterino2
https://github.com/void-linux/void-packages/pull/36170

chatterino2: update to 2.3.4.
supersedes #32199

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/36170.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chatterino2-36170.patch --]
[-- Type: text/x-diff, Size: 10406 bytes --]

From 236d5fd0ae3b1ff2d216002a34ef44401a7b5da5 Mon Sep 17 00:00:00 2001
From: Marko <goncarmarko@gmail.com>
Date: Sun, 25 Jul 2021 23:07:26 +0300
Subject: [PATCH] chatterino2: update to 2.3.4.

---
 .../patches/0001-fix-desktop-icon-name.patch  | 13 +++
 .../patches/0001-use-system-deps.patch        | 58 --------------
 srcpkgs/chatterino2/patches/cmake.patch       | 36 +++++++++
 srcpkgs/chatterino2/template                  | 79 +++++++++----------
 4 files changed, 87 insertions(+), 99 deletions(-)
 create mode 100644 srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
 delete mode 100644 srcpkgs/chatterino2/patches/0001-use-system-deps.patch
 create mode 100644 srcpkgs/chatterino2/patches/cmake.patch

diff --git a/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch b/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
new file mode 100644
index 000000000000..1b0a6d6140e4
--- /dev/null
+++ b/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
@@ -0,0 +1,13 @@
+diff --git a/resources/com.chatterino.chatterino.desktop b/resources/com.chatterino.chatterino.desktop
+index 6ee45354..ece81f5c 100644
+--- 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
+ Exec=chatterino
+-Icon=chatterino
++Icon=com.chatterino.chatterino
+ Terminal=false
+ Categories=Network;InstantMessaging;
+ StartupWMClass=chatterino
diff --git a/srcpkgs/chatterino2/patches/0001-use-system-deps.patch b/srcpkgs/chatterino2/patches/0001-use-system-deps.patch
deleted file mode 100644
index 383c5ea23f43..000000000000
--- a/srcpkgs/chatterino2/patches/0001-use-system-deps.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git chatterino.pro chatterino.pro
-index d8b14bbe..f7657f06 100644
---- a/chatterino.pro
-+++ b/chatterino.pro
-@@ -12,10 +12,17 @@
- #  - BOOST_DIRECTORY (C:\local\boost\ by default) (Windows only)
-
- QT                += widgets core gui network multimedia svg concurrent
--CONFIG            += communi
--COMMUNI           += core model util
-
- INCLUDEPATH       += src/
-+# libcommuni
-+INCLUDEPATH       += /usr/include/qt5/Communi/IrcCore
-+INCLUDEPATH       += /usr/include/qt5/Communi/IrcModel
-+INCLUDEPATH       += /usr/include/qt5/Communi/IrcUtil
-+DEFINES           += IRC_SHARED
-+LIBS              += -lIrcCore -lIrcModel -lIrcUtil
-+# qtkeychain
-+INCLUDEPATH       += /usr/include/qt5keychain
-+LIBS              += -lqt5keychain
- TARGET             = chatterino
- TEMPLATE           = app
- PRECOMPILED_HEADER = src/PrecompiledHeader.hpp
-@@ -78,7 +85,6 @@ CONFIG(debug, debug|release) {
- include(lib/warnings.pri)
- include(lib/fmt.pri)
- include(lib/humanize.pri)
--include(lib/libcommuni.pri)
- include(lib/websocketpp.pri)
- include(lib/wintoast.pri)
- include(lib/signals.pri)
-@@ -86,7 +92,6 @@ include(lib/settings.pri)
- include(lib/serialize.pri)
- include(lib/winsdk.pri)
- include(lib/rapidjson.pri)
--include(lib/qtkeychain.pri)
-
- exists( $$OUT_PWD/conanbuildinfo.pri ) {
-     message("Using conan packages")
-diff --git src/common/Credentials.cpp src/common/Credentials.cpp
-index 87abecb9..5de78130 100644
---- a/src/common/Credentials.cpp
-+++ b/src/common/Credentials.cpp
-@@ -1,12 +1,12 @@
- #include "Credentials.hpp"
- 
- #include "debug/AssertInGuiThread.hpp"
--#include "keychain.h"
- #include "singletons/Paths.hpp"
- #include "singletons/Settings.hpp"
- #include "util/CombinePath.hpp"
- #include "util/Overloaded.hpp"
- 
-+#include <qt5keychain/keychain.h>
- #include <QSaveFile>
- #include <boost/variant.hpp>
- 
diff --git a/srcpkgs/chatterino2/patches/cmake.patch b/srcpkgs/chatterino2/patches/cmake.patch
new file mode 100644
index 000000000000..8a5643566957
--- /dev/null
+++ b/srcpkgs/chatterino2/patches/cmake.patch
@@ -0,0 +1,36 @@
+diff --git a/cmake/FindLRUCache.cmake b/cmake/FindLRUCache.cmake
+index 82905436..b0b89a4e 100644
+--- a/cmake/FindLRUCache.cmake
++++ b/cmake/FindLRUCache.cmake
+@@ -1,6 +1,6 @@
+ include(FindPackageHandleStandardArgs)
+ 
+-find_path(LRUCache_INCLUDE_DIR lrucache/lrucache.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/lrucache)
++find_path(LRUCache_INCLUDE_DIR lrucache/lrucache.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/lrucache NO_CMAKE_FIND_ROOT_PATH)
+ 
+ find_package_handle_standard_args(LRUCache DEFAULT_MSG LRUCache_INCLUDE_DIR)
+ 
+diff --git a/cmake/FindPajladaSerialize.cmake b/cmake/FindPajladaSerialize.cmake
+index 4671874c..119284c2 100644
+--- a/cmake/FindPajladaSerialize.cmake
++++ b/cmake/FindPajladaSerialize.cmake
+@@ -1,6 +1,6 @@
+ include(FindPackageHandleStandardArgs)
+ 
+-find_path(PajladaSerialize_INCLUDE_DIR pajlada/serialize.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/serialize/include)
++find_path(PajladaSerialize_INCLUDE_DIR pajlada/serialize.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/serialize/include NO_CMAKE_FIND_ROOT_PATH)
+ 
+ find_package_handle_standard_args(PajladaSerialize DEFAULT_MSG PajladaSerialize_INCLUDE_DIR)
+ 
+diff --git a/cmake/FindPajladaSignals.cmake b/cmake/FindPajladaSignals.cmake
+index f4c964ec..75efba20 100644
+--- a/cmake/FindPajladaSignals.cmake
++++ b/cmake/FindPajladaSignals.cmake
+@@ -1,6 +1,6 @@
+ include(FindPackageHandleStandardArgs)
+ 
+-find_path(PajladaSignals_INCLUDE_DIR pajlada/signals/signal.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/signals/include)
++find_path(PajladaSignals_INCLUDE_DIR pajlada/signals/signal.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/signals/include NO_CMAKE_FIND_ROOT_PATH)
+ 
+ find_package_handle_standard_args(PajladaSignals DEFAULT_MSG PajladaSignals_INCLUDE_DIR)
+ 
diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index f69730b3a9fe..06c4c92cb8ca 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -1,55 +1,52 @@
 # Template file for 'chatterino2'
 pkgname=chatterino2
-version=2.2.2
-revision=2
-_signals_commit=6665ccad90461c01b7fe704a98a835953d644156
-_settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450
-_humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be
-_serialize_commit=130ffc3ec722284ca454a1e70c5478a75f380144
-build_style=qmake
-configure_args="INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcCore
- INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcModel
- INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcUtil"
-hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
-makedepends="qt5-svg-devel qt5-multimedia-devel
- boost-devel rapidjson libcommuni-devel websocketpp
- qtkeychain-qt5-devel"
-short_desc="Qt-based twitch chat client"
-maintainer="Franc[e]sco <lolisamurai@tfwno.gf>"
-license="MIT"
+version=2.3.4
+revision=1
+_libcommuni_commit="c613600e6a52e6d3166247a05205cf1c755d4868"
+_serialize_commit="7d37cbfd5ac3bfbe046118e1cec3d32ba4696469"
+_settings_commit="7cf8431d644332107a51a46c1e3de70e64692f0c"
+_signals_commit="baf5bb04bd13b090e405e0447c89a811f7e23ddc"
+_qtkeychain_commit="de954627363b0b4bff9a2616f1a409b7e14d5df9"
+_sanitizers_cmake_commit="99e159ec9bc8dd362b08d18436bd40ff0648417b"
+build_style=cmake
+hostmakedepends="qt5-qmake qt5-host-tools"
+makedepends="qt5-tools-devel qt5-multimedia-devel qt5-svg-devel
+ boost-devel openssl-devel rapidjson websocketpp"
+depends="qt5-imageformats qt5-svg"
+short_desc="Chat client for twitch.tv"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license=MIT
 homepage="https://chatterino.com"
 changelog="https://chatterino.com/changelog"
-distfiles="https://github.com/fourtf/chatterino2/archive/v${version}.tar.gz
- https://github.com/pajlada/signals/archive/${_signals_commit}.tar.gz
+distfiles="https://github.com/Chatterino/chatterino2/archive/refs/tags/v${version}.tar.gz
+ https://github.com/Chatterino/libcommuni/archive/${_libcommuni_commit}.tar.gz
+ https://github.com/pajlada/serialize/archive/${_serialize_commit}.tar.gz
  https://github.com/pajlada/settings/archive/${_settings_commit}.tar.gz
- https://github.com/pajlada/humanize/archive/${_humanize_commit}.tar.gz
- https://github.com/pajlada/serialize/archive/${_serialize_commit}.tar.gz"
-checksum="6e3d64f319728ccf9fd09613df754108157e7d3b4148ee2da1a3209bf369be70
-e8755e68ff6fc39b4338d424ee9aed2ed5a8eab6eb37af69de2ff21b8dc94e66
-f387cc7eaf27dec462bc85a212619f8086167cf0b47e11825b8580d35a740dfe
-5a5cd8338fcb0a14a4bbe0840f83505d0444a9000956145e85e5550feeb744b0
-eb492b89e67f4ec632bd43f2701d53e355f1d1afbec3cd3af5891c1a6aaaa454"
+ https://github.com/pajlada/signals/archive/${_signals_commit}.tar.gz
+ https://github.com/Chatterino/qtkeychain/archive/${_qtkeychain_commit}.tar.gz
+ https://github.com/arsenm/sanitizers-cmake/archive/${_sanitizers_cmake_commit}.tar.gz"
+checksum="27d42138d48d807340fe4194b4cdada6183b0ff2127f24d39032b3ad1f66594c
+ ba2179eb43638366ca65214137a850a127fb93a36fcc54658649c34e8d6f7dc4
+ d0da2cebd5dfd7b20f7247f1e4fb6b8a866434db49316a067b6c798ec8217c63
+ 0b35eb297f0949f27b3c54bc66d8b0c9293102fb52838d12371a5fcc80c590e5
+ 7ffd43dbd05704af5bef64b0eae8c12174013d4c7105472019ef381ff82c0a46
+ 4fdd7fd8bbae4fd7a505c917facc6e6b838850cd4f016c30fae45535dbaab4b7
+ f9cf386638f455c5d2e7a835b95941201387d2531b8682942d59827663b58341"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
-	configure_args+=" LIBS+=-latomic"
+	LDFLAGS+=" -latomic"
 fi
 
 post_extract() {
-	rmdir lib/signals
-	rmdir lib/settings
-	rmdir lib/humanize
-	rmdir lib/serialize
-	mv "${XBPS_BUILDDIR}/signals-${_signals_commit}/" lib/signals/
-	mv "${XBPS_BUILDDIR}/settings-${_settings_commit}/" lib/settings/
-	mv "${XBPS_BUILDDIR}/humanize-${_humanize_commit}/" lib/humanize/
-	mv "${XBPS_BUILDDIR}/serialize-${_serialize_commit}/" lib/serialize/
-}
-
-pre_configure() {
-	# it wraps libcommuni in a namespace but void's binaries don't
-	find \( -name '*.cpp' -o -name '*.hpp' \) \
-		-exec sed -i "{}" -e 's/Communi::/::/g' \;
+	rmdir lib/libcommuni lib/serialize lib/settings lib/signals lib/rapidjson \
+	      lib/websocketpp lib/qtkeychain cmake/sanitizers-cmake
+	mv "${XBPS_BUILDDIR}/libcommuni-${_libcommuni_commit}" "lib/libcommuni"
+	mv "${XBPS_BUILDDIR}/serialize-${_serialize_commit}" "lib/serialize"
+	mv "${XBPS_BUILDDIR}/settings-${_settings_commit}" "lib/settings"
+	mv "${XBPS_BUILDDIR}/signals-${_signals_commit}" "lib/signals"
+	mv "${XBPS_BUILDDIR}/qtkeychain-${_qtkeychain_commit}" "lib/qtkeychain"
+	mv "${XBPS_BUILDDIR}/sanitizers-cmake-${_sanitizers_cmake_commit}" "cmake/sanitizers-cmake"
 }
 
 post_install() {

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR PATCH] [Updated] chatterino2: update to 2.3.4.
  2022-03-16 12:15 [PR PATCH] chatterino2: update to 2.3.4 tibequadorian
  2022-03-16 12:56 ` [PR PATCH] [Updated] " tibequadorian
@ 2022-03-16 12:57 ` tibequadorian
  2022-03-16 12:58 ` tibequadorian
                   ` (11 subsequent siblings)
  13 siblings, 0 replies; 17+ messages in thread
From: tibequadorian @ 2022-03-16 12:57 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1256 bytes --]

There is an updated pull request by tibequadorian against master on the void-packages repository

https://github.com/tibequadorian/void-packages chatterino2
https://github.com/void-linux/void-packages/pull/36170

chatterino2: update to 2.3.4.
supersedes #32199

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/36170.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chatterino2-36170.patch --]
[-- Type: text/x-diff, Size: 10384 bytes --]

From ea08c8d1fed59ac1112b1c2e421c887fd5359b18 Mon Sep 17 00:00:00 2001
From: Marko <goncarmarko@gmail.com>
Date: Sun, 25 Jul 2021 23:07:26 +0300
Subject: [PATCH] chatterino2: update to 2.3.4.

---
 .../patches/0001-fix-desktop-icon-name.patch  | 13 ++++
 .../patches/0001-use-system-deps.patch        | 58 --------------
 srcpkgs/chatterino2/patches/cmake.patch       | 36 +++++++++
 srcpkgs/chatterino2/template                  | 78 +++++++++----------
 4 files changed, 86 insertions(+), 99 deletions(-)
 create mode 100644 srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
 delete mode 100644 srcpkgs/chatterino2/patches/0001-use-system-deps.patch
 create mode 100644 srcpkgs/chatterino2/patches/cmake.patch

diff --git a/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch b/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
new file mode 100644
index 000000000000..1b0a6d6140e4
--- /dev/null
+++ b/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
@@ -0,0 +1,13 @@
+diff --git a/resources/com.chatterino.chatterino.desktop b/resources/com.chatterino.chatterino.desktop
+index 6ee45354..ece81f5c 100644
+--- 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
+ Exec=chatterino
+-Icon=chatterino
++Icon=com.chatterino.chatterino
+ Terminal=false
+ Categories=Network;InstantMessaging;
+ StartupWMClass=chatterino
diff --git a/srcpkgs/chatterino2/patches/0001-use-system-deps.patch b/srcpkgs/chatterino2/patches/0001-use-system-deps.patch
deleted file mode 100644
index 383c5ea23f43..000000000000
--- a/srcpkgs/chatterino2/patches/0001-use-system-deps.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git chatterino.pro chatterino.pro
-index d8b14bbe..f7657f06 100644
---- a/chatterino.pro
-+++ b/chatterino.pro
-@@ -12,10 +12,17 @@
- #  - BOOST_DIRECTORY (C:\local\boost\ by default) (Windows only)
-
- QT                += widgets core gui network multimedia svg concurrent
--CONFIG            += communi
--COMMUNI           += core model util
-
- INCLUDEPATH       += src/
-+# libcommuni
-+INCLUDEPATH       += /usr/include/qt5/Communi/IrcCore
-+INCLUDEPATH       += /usr/include/qt5/Communi/IrcModel
-+INCLUDEPATH       += /usr/include/qt5/Communi/IrcUtil
-+DEFINES           += IRC_SHARED
-+LIBS              += -lIrcCore -lIrcModel -lIrcUtil
-+# qtkeychain
-+INCLUDEPATH       += /usr/include/qt5keychain
-+LIBS              += -lqt5keychain
- TARGET             = chatterino
- TEMPLATE           = app
- PRECOMPILED_HEADER = src/PrecompiledHeader.hpp
-@@ -78,7 +85,6 @@ CONFIG(debug, debug|release) {
- include(lib/warnings.pri)
- include(lib/fmt.pri)
- include(lib/humanize.pri)
--include(lib/libcommuni.pri)
- include(lib/websocketpp.pri)
- include(lib/wintoast.pri)
- include(lib/signals.pri)
-@@ -86,7 +92,6 @@ include(lib/settings.pri)
- include(lib/serialize.pri)
- include(lib/winsdk.pri)
- include(lib/rapidjson.pri)
--include(lib/qtkeychain.pri)
-
- exists( $$OUT_PWD/conanbuildinfo.pri ) {
-     message("Using conan packages")
-diff --git src/common/Credentials.cpp src/common/Credentials.cpp
-index 87abecb9..5de78130 100644
---- a/src/common/Credentials.cpp
-+++ b/src/common/Credentials.cpp
-@@ -1,12 +1,12 @@
- #include "Credentials.hpp"
- 
- #include "debug/AssertInGuiThread.hpp"
--#include "keychain.h"
- #include "singletons/Paths.hpp"
- #include "singletons/Settings.hpp"
- #include "util/CombinePath.hpp"
- #include "util/Overloaded.hpp"
- 
-+#include <qt5keychain/keychain.h>
- #include <QSaveFile>
- #include <boost/variant.hpp>
- 
diff --git a/srcpkgs/chatterino2/patches/cmake.patch b/srcpkgs/chatterino2/patches/cmake.patch
new file mode 100644
index 000000000000..8a5643566957
--- /dev/null
+++ b/srcpkgs/chatterino2/patches/cmake.patch
@@ -0,0 +1,36 @@
+diff --git a/cmake/FindLRUCache.cmake b/cmake/FindLRUCache.cmake
+index 82905436..b0b89a4e 100644
+--- a/cmake/FindLRUCache.cmake
++++ b/cmake/FindLRUCache.cmake
+@@ -1,6 +1,6 @@
+ include(FindPackageHandleStandardArgs)
+ 
+-find_path(LRUCache_INCLUDE_DIR lrucache/lrucache.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/lrucache)
++find_path(LRUCache_INCLUDE_DIR lrucache/lrucache.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/lrucache NO_CMAKE_FIND_ROOT_PATH)
+ 
+ find_package_handle_standard_args(LRUCache DEFAULT_MSG LRUCache_INCLUDE_DIR)
+ 
+diff --git a/cmake/FindPajladaSerialize.cmake b/cmake/FindPajladaSerialize.cmake
+index 4671874c..119284c2 100644
+--- a/cmake/FindPajladaSerialize.cmake
++++ b/cmake/FindPajladaSerialize.cmake
+@@ -1,6 +1,6 @@
+ include(FindPackageHandleStandardArgs)
+ 
+-find_path(PajladaSerialize_INCLUDE_DIR pajlada/serialize.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/serialize/include)
++find_path(PajladaSerialize_INCLUDE_DIR pajlada/serialize.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/serialize/include NO_CMAKE_FIND_ROOT_PATH)
+ 
+ find_package_handle_standard_args(PajladaSerialize DEFAULT_MSG PajladaSerialize_INCLUDE_DIR)
+ 
+diff --git a/cmake/FindPajladaSignals.cmake b/cmake/FindPajladaSignals.cmake
+index f4c964ec..75efba20 100644
+--- a/cmake/FindPajladaSignals.cmake
++++ b/cmake/FindPajladaSignals.cmake
+@@ -1,6 +1,6 @@
+ include(FindPackageHandleStandardArgs)
+ 
+-find_path(PajladaSignals_INCLUDE_DIR pajlada/signals/signal.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/signals/include)
++find_path(PajladaSignals_INCLUDE_DIR pajlada/signals/signal.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/signals/include NO_CMAKE_FIND_ROOT_PATH)
+ 
+ find_package_handle_standard_args(PajladaSignals DEFAULT_MSG PajladaSignals_INCLUDE_DIR)
+ 
diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index f69730b3a9fe..d0fa55dfea97 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -1,55 +1,51 @@
 # Template file for 'chatterino2'
 pkgname=chatterino2
-version=2.2.2
-revision=2
-_signals_commit=6665ccad90461c01b7fe704a98a835953d644156
-_settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450
-_humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be
-_serialize_commit=130ffc3ec722284ca454a1e70c5478a75f380144
-build_style=qmake
-configure_args="INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcCore
- INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcModel
- INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcUtil"
-hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
-makedepends="qt5-svg-devel qt5-multimedia-devel
- boost-devel rapidjson libcommuni-devel websocketpp
- qtkeychain-qt5-devel"
-short_desc="Qt-based twitch chat client"
-maintainer="Franc[e]sco <lolisamurai@tfwno.gf>"
-license="MIT"
+version=2.3.4
+revision=1
+_libcommuni_commit="c613600e6a52e6d3166247a05205cf1c755d4868"
+_serialize_commit="7d37cbfd5ac3bfbe046118e1cec3d32ba4696469"
+_settings_commit="7cf8431d644332107a51a46c1e3de70e64692f0c"
+_signals_commit="baf5bb04bd13b090e405e0447c89a811f7e23ddc"
+_qtkeychain_commit="de954627363b0b4bff9a2616f1a409b7e14d5df9"
+_sanitizers_cmake_commit="99e159ec9bc8dd362b08d18436bd40ff0648417b"
+build_style=cmake
+hostmakedepends="qt5-qmake qt5-host-tools"
+makedepends="qt5-tools-devel qt5-multimedia-devel qt5-svg-devel
+ boost-devel openssl-devel rapidjson websocketpp"
+depends="qt5-imageformats qt5-svg"
+short_desc="Chat client for twitch.tv"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license=MIT
 homepage="https://chatterino.com"
 changelog="https://chatterino.com/changelog"
-distfiles="https://github.com/fourtf/chatterino2/archive/v${version}.tar.gz
- https://github.com/pajlada/signals/archive/${_signals_commit}.tar.gz
+distfiles="https://github.com/Chatterino/chatterino2/archive/refs/tags/v${version}.tar.gz
+ https://github.com/Chatterino/libcommuni/archive/${_libcommuni_commit}.tar.gz
+ https://github.com/pajlada/serialize/archive/${_serialize_commit}.tar.gz
  https://github.com/pajlada/settings/archive/${_settings_commit}.tar.gz
- https://github.com/pajlada/humanize/archive/${_humanize_commit}.tar.gz
- https://github.com/pajlada/serialize/archive/${_serialize_commit}.tar.gz"
-checksum="6e3d64f319728ccf9fd09613df754108157e7d3b4148ee2da1a3209bf369be70
-e8755e68ff6fc39b4338d424ee9aed2ed5a8eab6eb37af69de2ff21b8dc94e66
-f387cc7eaf27dec462bc85a212619f8086167cf0b47e11825b8580d35a740dfe
-5a5cd8338fcb0a14a4bbe0840f83505d0444a9000956145e85e5550feeb744b0
-eb492b89e67f4ec632bd43f2701d53e355f1d1afbec3cd3af5891c1a6aaaa454"
+ https://github.com/pajlada/signals/archive/${_signals_commit}.tar.gz
+ https://github.com/Chatterino/qtkeychain/archive/${_qtkeychain_commit}.tar.gz
+ https://github.com/arsenm/sanitizers-cmake/archive/${_sanitizers_cmake_commit}.tar.gz"
+checksum="27d42138d48d807340fe4194b4cdada6183b0ff2127f24d39032b3ad1f66594c
+ ba2179eb43638366ca65214137a850a127fb93a36fcc54658649c34e8d6f7dc4
+ d0da2cebd5dfd7b20f7247f1e4fb6b8a866434db49316a067b6c798ec8217c63
+ 0b35eb297f0949f27b3c54bc66d8b0c9293102fb52838d12371a5fcc80c590e5
+ 7ffd43dbd05704af5bef64b0eae8c12174013d4c7105472019ef381ff82c0a46
+ 4fdd7fd8bbae4fd7a505c917facc6e6b838850cd4f016c30fae45535dbaab4b7
+ f9cf386638f455c5d2e7a835b95941201387d2531b8682942d59827663b58341"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
-	configure_args+=" LIBS+=-latomic"
 fi
 
 post_extract() {
-	rmdir lib/signals
-	rmdir lib/settings
-	rmdir lib/humanize
-	rmdir lib/serialize
-	mv "${XBPS_BUILDDIR}/signals-${_signals_commit}/" lib/signals/
-	mv "${XBPS_BUILDDIR}/settings-${_settings_commit}/" lib/settings/
-	mv "${XBPS_BUILDDIR}/humanize-${_humanize_commit}/" lib/humanize/
-	mv "${XBPS_BUILDDIR}/serialize-${_serialize_commit}/" lib/serialize/
-}
-
-pre_configure() {
-	# it wraps libcommuni in a namespace but void's binaries don't
-	find \( -name '*.cpp' -o -name '*.hpp' \) \
-		-exec sed -i "{}" -e 's/Communi::/::/g' \;
+	rmdir lib/libcommuni lib/serialize lib/settings lib/signals lib/rapidjson \
+	      lib/websocketpp lib/qtkeychain cmake/sanitizers-cmake
+	mv "${XBPS_BUILDDIR}/libcommuni-${_libcommuni_commit}" "lib/libcommuni"
+	mv "${XBPS_BUILDDIR}/serialize-${_serialize_commit}" "lib/serialize"
+	mv "${XBPS_BUILDDIR}/settings-${_settings_commit}" "lib/settings"
+	mv "${XBPS_BUILDDIR}/signals-${_signals_commit}" "lib/signals"
+	mv "${XBPS_BUILDDIR}/qtkeychain-${_qtkeychain_commit}" "lib/qtkeychain"
+	mv "${XBPS_BUILDDIR}/sanitizers-cmake-${_sanitizers_cmake_commit}" "cmake/sanitizers-cmake"
 }
 
 post_install() {

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR PATCH] [Updated] chatterino2: update to 2.3.4.
  2022-03-16 12:15 [PR PATCH] chatterino2: update to 2.3.4 tibequadorian
  2022-03-16 12:56 ` [PR PATCH] [Updated] " tibequadorian
  2022-03-16 12:57 ` tibequadorian
@ 2022-03-16 12:58 ` tibequadorian
  2022-03-16 13:19 ` tibequadorian
                   ` (10 subsequent siblings)
  13 siblings, 0 replies; 17+ messages in thread
From: tibequadorian @ 2022-03-16 12:58 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1256 bytes --]

There is an updated pull request by tibequadorian against master on the void-packages repository

https://github.com/tibequadorian/void-packages chatterino2
https://github.com/void-linux/void-packages/pull/36170

chatterino2: update to 2.3.4.
supersedes #32199

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/36170.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chatterino2-36170.patch --]
[-- Type: text/x-diff, Size: 10407 bytes --]

From 07cd31208ca7b2191e6f6d148b1d8eb4b9a11d48 Mon Sep 17 00:00:00 2001
From: Marko <goncarmarko@gmail.com>
Date: Sun, 25 Jul 2021 23:07:26 +0300
Subject: [PATCH] chatterino2: update to 2.3.4.

---
 .../patches/0001-fix-desktop-icon-name.patch  | 13 ++++
 .../patches/0001-use-system-deps.patch        | 58 --------------
 srcpkgs/chatterino2/patches/cmake.patch       | 36 +++++++++
 srcpkgs/chatterino2/template                  | 77 +++++++++----------
 4 files changed, 86 insertions(+), 98 deletions(-)
 create mode 100644 srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
 delete mode 100644 srcpkgs/chatterino2/patches/0001-use-system-deps.patch
 create mode 100644 srcpkgs/chatterino2/patches/cmake.patch

diff --git a/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch b/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
new file mode 100644
index 000000000000..1b0a6d6140e4
--- /dev/null
+++ b/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
@@ -0,0 +1,13 @@
+diff --git a/resources/com.chatterino.chatterino.desktop b/resources/com.chatterino.chatterino.desktop
+index 6ee45354..ece81f5c 100644
+--- 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
+ Exec=chatterino
+-Icon=chatterino
++Icon=com.chatterino.chatterino
+ Terminal=false
+ Categories=Network;InstantMessaging;
+ StartupWMClass=chatterino
diff --git a/srcpkgs/chatterino2/patches/0001-use-system-deps.patch b/srcpkgs/chatterino2/patches/0001-use-system-deps.patch
deleted file mode 100644
index 383c5ea23f43..000000000000
--- a/srcpkgs/chatterino2/patches/0001-use-system-deps.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git chatterino.pro chatterino.pro
-index d8b14bbe..f7657f06 100644
---- a/chatterino.pro
-+++ b/chatterino.pro
-@@ -12,10 +12,17 @@
- #  - BOOST_DIRECTORY (C:\local\boost\ by default) (Windows only)
-
- QT                += widgets core gui network multimedia svg concurrent
--CONFIG            += communi
--COMMUNI           += core model util
-
- INCLUDEPATH       += src/
-+# libcommuni
-+INCLUDEPATH       += /usr/include/qt5/Communi/IrcCore
-+INCLUDEPATH       += /usr/include/qt5/Communi/IrcModel
-+INCLUDEPATH       += /usr/include/qt5/Communi/IrcUtil
-+DEFINES           += IRC_SHARED
-+LIBS              += -lIrcCore -lIrcModel -lIrcUtil
-+# qtkeychain
-+INCLUDEPATH       += /usr/include/qt5keychain
-+LIBS              += -lqt5keychain
- TARGET             = chatterino
- TEMPLATE           = app
- PRECOMPILED_HEADER = src/PrecompiledHeader.hpp
-@@ -78,7 +85,6 @@ CONFIG(debug, debug|release) {
- include(lib/warnings.pri)
- include(lib/fmt.pri)
- include(lib/humanize.pri)
--include(lib/libcommuni.pri)
- include(lib/websocketpp.pri)
- include(lib/wintoast.pri)
- include(lib/signals.pri)
-@@ -86,7 +92,6 @@ include(lib/settings.pri)
- include(lib/serialize.pri)
- include(lib/winsdk.pri)
- include(lib/rapidjson.pri)
--include(lib/qtkeychain.pri)
-
- exists( $$OUT_PWD/conanbuildinfo.pri ) {
-     message("Using conan packages")
-diff --git src/common/Credentials.cpp src/common/Credentials.cpp
-index 87abecb9..5de78130 100644
---- a/src/common/Credentials.cpp
-+++ b/src/common/Credentials.cpp
-@@ -1,12 +1,12 @@
- #include "Credentials.hpp"
- 
- #include "debug/AssertInGuiThread.hpp"
--#include "keychain.h"
- #include "singletons/Paths.hpp"
- #include "singletons/Settings.hpp"
- #include "util/CombinePath.hpp"
- #include "util/Overloaded.hpp"
- 
-+#include <qt5keychain/keychain.h>
- #include <QSaveFile>
- #include <boost/variant.hpp>
- 
diff --git a/srcpkgs/chatterino2/patches/cmake.patch b/srcpkgs/chatterino2/patches/cmake.patch
new file mode 100644
index 000000000000..8a5643566957
--- /dev/null
+++ b/srcpkgs/chatterino2/patches/cmake.patch
@@ -0,0 +1,36 @@
+diff --git a/cmake/FindLRUCache.cmake b/cmake/FindLRUCache.cmake
+index 82905436..b0b89a4e 100644
+--- a/cmake/FindLRUCache.cmake
++++ b/cmake/FindLRUCache.cmake
+@@ -1,6 +1,6 @@
+ include(FindPackageHandleStandardArgs)
+ 
+-find_path(LRUCache_INCLUDE_DIR lrucache/lrucache.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/lrucache)
++find_path(LRUCache_INCLUDE_DIR lrucache/lrucache.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/lrucache NO_CMAKE_FIND_ROOT_PATH)
+ 
+ find_package_handle_standard_args(LRUCache DEFAULT_MSG LRUCache_INCLUDE_DIR)
+ 
+diff --git a/cmake/FindPajladaSerialize.cmake b/cmake/FindPajladaSerialize.cmake
+index 4671874c..119284c2 100644
+--- a/cmake/FindPajladaSerialize.cmake
++++ b/cmake/FindPajladaSerialize.cmake
+@@ -1,6 +1,6 @@
+ include(FindPackageHandleStandardArgs)
+ 
+-find_path(PajladaSerialize_INCLUDE_DIR pajlada/serialize.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/serialize/include)
++find_path(PajladaSerialize_INCLUDE_DIR pajlada/serialize.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/serialize/include NO_CMAKE_FIND_ROOT_PATH)
+ 
+ find_package_handle_standard_args(PajladaSerialize DEFAULT_MSG PajladaSerialize_INCLUDE_DIR)
+ 
+diff --git a/cmake/FindPajladaSignals.cmake b/cmake/FindPajladaSignals.cmake
+index f4c964ec..75efba20 100644
+--- a/cmake/FindPajladaSignals.cmake
++++ b/cmake/FindPajladaSignals.cmake
+@@ -1,6 +1,6 @@
+ include(FindPackageHandleStandardArgs)
+ 
+-find_path(PajladaSignals_INCLUDE_DIR pajlada/signals/signal.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/signals/include)
++find_path(PajladaSignals_INCLUDE_DIR pajlada/signals/signal.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/signals/include NO_CMAKE_FIND_ROOT_PATH)
+ 
+ find_package_handle_standard_args(PajladaSignals DEFAULT_MSG PajladaSignals_INCLUDE_DIR)
+ 
diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index f69730b3a9fe..c8e59734f3b0 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -1,34 +1,37 @@
 # Template file for 'chatterino2'
 pkgname=chatterino2
-version=2.2.2
-revision=2
-_signals_commit=6665ccad90461c01b7fe704a98a835953d644156
-_settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450
-_humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be
-_serialize_commit=130ffc3ec722284ca454a1e70c5478a75f380144
-build_style=qmake
-configure_args="INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcCore
- INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcModel
- INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcUtil"
-hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
-makedepends="qt5-svg-devel qt5-multimedia-devel
- boost-devel rapidjson libcommuni-devel websocketpp
- qtkeychain-qt5-devel"
-short_desc="Qt-based twitch chat client"
-maintainer="Franc[e]sco <lolisamurai@tfwno.gf>"
-license="MIT"
+version=2.3.4
+revision=1
+_libcommuni_commit="c613600e6a52e6d3166247a05205cf1c755d4868"
+_serialize_commit="7d37cbfd5ac3bfbe046118e1cec3d32ba4696469"
+_settings_commit="7cf8431d644332107a51a46c1e3de70e64692f0c"
+_signals_commit="baf5bb04bd13b090e405e0447c89a811f7e23ddc"
+_qtkeychain_commit="de954627363b0b4bff9a2616f1a409b7e14d5df9"
+_sanitizers_cmake_commit="99e159ec9bc8dd362b08d18436bd40ff0648417b"
+build_style=cmake
+hostmakedepends="qt5-qmake qt5-host-tools"
+makedepends="qt5-tools-devel qt5-multimedia-devel qt5-svg-devel
+ boost-devel openssl-devel rapidjson websocketpp"
+depends="qt5-imageformats qt5-svg"
+short_desc="Chat client for twitch.tv"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license=MIT
 homepage="https://chatterino.com"
 changelog="https://chatterino.com/changelog"
-distfiles="https://github.com/fourtf/chatterino2/archive/v${version}.tar.gz
- https://github.com/pajlada/signals/archive/${_signals_commit}.tar.gz
+distfiles="https://github.com/Chatterino/chatterino2/archive/refs/tags/v${version}.tar.gz
+ https://github.com/Chatterino/libcommuni/archive/${_libcommuni_commit}.tar.gz
+ https://github.com/pajlada/serialize/archive/${_serialize_commit}.tar.gz
  https://github.com/pajlada/settings/archive/${_settings_commit}.tar.gz
- https://github.com/pajlada/humanize/archive/${_humanize_commit}.tar.gz
- https://github.com/pajlada/serialize/archive/${_serialize_commit}.tar.gz"
-checksum="6e3d64f319728ccf9fd09613df754108157e7d3b4148ee2da1a3209bf369be70
-e8755e68ff6fc39b4338d424ee9aed2ed5a8eab6eb37af69de2ff21b8dc94e66
-f387cc7eaf27dec462bc85a212619f8086167cf0b47e11825b8580d35a740dfe
-5a5cd8338fcb0a14a4bbe0840f83505d0444a9000956145e85e5550feeb744b0
-eb492b89e67f4ec632bd43f2701d53e355f1d1afbec3cd3af5891c1a6aaaa454"
+ https://github.com/pajlada/signals/archive/${_signals_commit}.tar.gz
+ https://github.com/Chatterino/qtkeychain/archive/${_qtkeychain_commit}.tar.gz
+ https://github.com/arsenm/sanitizers-cmake/archive/${_sanitizers_cmake_commit}.tar.gz"
+checksum="27d42138d48d807340fe4194b4cdada6183b0ff2127f24d39032b3ad1f66594c
+ ba2179eb43638366ca65214137a850a127fb93a36fcc54658649c34e8d6f7dc4
+ d0da2cebd5dfd7b20f7247f1e4fb6b8a866434db49316a067b6c798ec8217c63
+ 0b35eb297f0949f27b3c54bc66d8b0c9293102fb52838d12371a5fcc80c590e5
+ 7ffd43dbd05704af5bef64b0eae8c12174013d4c7105472019ef381ff82c0a46
+ 4fdd7fd8bbae4fd7a505c917facc6e6b838850cd4f016c30fae45535dbaab4b7
+ f9cf386638f455c5d2e7a835b95941201387d2531b8682942d59827663b58341"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
@@ -36,20 +39,14 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 fi
 
 post_extract() {
-	rmdir lib/signals
-	rmdir lib/settings
-	rmdir lib/humanize
-	rmdir lib/serialize
-	mv "${XBPS_BUILDDIR}/signals-${_signals_commit}/" lib/signals/
-	mv "${XBPS_BUILDDIR}/settings-${_settings_commit}/" lib/settings/
-	mv "${XBPS_BUILDDIR}/humanize-${_humanize_commit}/" lib/humanize/
-	mv "${XBPS_BUILDDIR}/serialize-${_serialize_commit}/" lib/serialize/
-}
-
-pre_configure() {
-	# it wraps libcommuni in a namespace but void's binaries don't
-	find \( -name '*.cpp' -o -name '*.hpp' \) \
-		-exec sed -i "{}" -e 's/Communi::/::/g' \;
+	rmdir lib/libcommuni lib/serialize lib/settings lib/signals lib/rapidjson \
+	      lib/websocketpp lib/qtkeychain cmake/sanitizers-cmake
+	mv "${XBPS_BUILDDIR}/libcommuni-${_libcommuni_commit}" "lib/libcommuni"
+	mv "${XBPS_BUILDDIR}/serialize-${_serialize_commit}" "lib/serialize"
+	mv "${XBPS_BUILDDIR}/settings-${_settings_commit}" "lib/settings"
+	mv "${XBPS_BUILDDIR}/signals-${_signals_commit}" "lib/signals"
+	mv "${XBPS_BUILDDIR}/qtkeychain-${_qtkeychain_commit}" "lib/qtkeychain"
+	mv "${XBPS_BUILDDIR}/sanitizers-cmake-${_sanitizers_cmake_commit}" "cmake/sanitizers-cmake"
 }
 
 post_install() {

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR PATCH] [Updated] chatterino2: update to 2.3.4.
  2022-03-16 12:15 [PR PATCH] chatterino2: update to 2.3.4 tibequadorian
                   ` (2 preceding siblings ...)
  2022-03-16 12:58 ` tibequadorian
@ 2022-03-16 13:19 ` tibequadorian
  2022-03-20 22:44 ` [PR REVIEW] " paper42
                   ` (9 subsequent siblings)
  13 siblings, 0 replies; 17+ messages in thread
From: tibequadorian @ 2022-03-16 13:19 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1256 bytes --]

There is an updated pull request by tibequadorian against master on the void-packages repository

https://github.com/tibequadorian/void-packages chatterino2
https://github.com/void-linux/void-packages/pull/36170

chatterino2: update to 2.3.4.
supersedes #32199

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/36170.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chatterino2-36170.patch --]
[-- Type: text/x-diff, Size: 10401 bytes --]

From 4ea829f03e00770fd362283e4f1688c1a475bd93 Mon Sep 17 00:00:00 2001
From: Marko <goncarmarko@gmail.com>
Date: Sun, 25 Jul 2021 23:07:26 +0300
Subject: [PATCH] chatterino2: update to 2.3.4.

---
 .../patches/0001-fix-desktop-icon-name.patch  | 13 +++
 .../patches/0001-use-system-deps.patch        | 58 --------------
 srcpkgs/chatterino2/patches/cmake.patch       | 36 +++++++++
 srcpkgs/chatterino2/template                  | 79 +++++++++----------
 4 files changed, 87 insertions(+), 99 deletions(-)
 create mode 100644 srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
 delete mode 100644 srcpkgs/chatterino2/patches/0001-use-system-deps.patch
 create mode 100644 srcpkgs/chatterino2/patches/cmake.patch

diff --git a/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch b/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
new file mode 100644
index 000000000000..1b0a6d6140e4
--- /dev/null
+++ b/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
@@ -0,0 +1,13 @@
+diff --git a/resources/com.chatterino.chatterino.desktop b/resources/com.chatterino.chatterino.desktop
+index 6ee45354..ece81f5c 100644
+--- 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
+ Exec=chatterino
+-Icon=chatterino
++Icon=com.chatterino.chatterino
+ Terminal=false
+ Categories=Network;InstantMessaging;
+ StartupWMClass=chatterino
diff --git a/srcpkgs/chatterino2/patches/0001-use-system-deps.patch b/srcpkgs/chatterino2/patches/0001-use-system-deps.patch
deleted file mode 100644
index 383c5ea23f43..000000000000
--- a/srcpkgs/chatterino2/patches/0001-use-system-deps.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git chatterino.pro chatterino.pro
-index d8b14bbe..f7657f06 100644
---- a/chatterino.pro
-+++ b/chatterino.pro
-@@ -12,10 +12,17 @@
- #  - BOOST_DIRECTORY (C:\local\boost\ by default) (Windows only)
-
- QT                += widgets core gui network multimedia svg concurrent
--CONFIG            += communi
--COMMUNI           += core model util
-
- INCLUDEPATH       += src/
-+# libcommuni
-+INCLUDEPATH       += /usr/include/qt5/Communi/IrcCore
-+INCLUDEPATH       += /usr/include/qt5/Communi/IrcModel
-+INCLUDEPATH       += /usr/include/qt5/Communi/IrcUtil
-+DEFINES           += IRC_SHARED
-+LIBS              += -lIrcCore -lIrcModel -lIrcUtil
-+# qtkeychain
-+INCLUDEPATH       += /usr/include/qt5keychain
-+LIBS              += -lqt5keychain
- TARGET             = chatterino
- TEMPLATE           = app
- PRECOMPILED_HEADER = src/PrecompiledHeader.hpp
-@@ -78,7 +85,6 @@ CONFIG(debug, debug|release) {
- include(lib/warnings.pri)
- include(lib/fmt.pri)
- include(lib/humanize.pri)
--include(lib/libcommuni.pri)
- include(lib/websocketpp.pri)
- include(lib/wintoast.pri)
- include(lib/signals.pri)
-@@ -86,7 +92,6 @@ include(lib/settings.pri)
- include(lib/serialize.pri)
- include(lib/winsdk.pri)
- include(lib/rapidjson.pri)
--include(lib/qtkeychain.pri)
-
- exists( $$OUT_PWD/conanbuildinfo.pri ) {
-     message("Using conan packages")
-diff --git src/common/Credentials.cpp src/common/Credentials.cpp
-index 87abecb9..5de78130 100644
---- a/src/common/Credentials.cpp
-+++ b/src/common/Credentials.cpp
-@@ -1,12 +1,12 @@
- #include "Credentials.hpp"
- 
- #include "debug/AssertInGuiThread.hpp"
--#include "keychain.h"
- #include "singletons/Paths.hpp"
- #include "singletons/Settings.hpp"
- #include "util/CombinePath.hpp"
- #include "util/Overloaded.hpp"
- 
-+#include <qt5keychain/keychain.h>
- #include <QSaveFile>
- #include <boost/variant.hpp>
- 
diff --git a/srcpkgs/chatterino2/patches/cmake.patch b/srcpkgs/chatterino2/patches/cmake.patch
new file mode 100644
index 000000000000..8a5643566957
--- /dev/null
+++ b/srcpkgs/chatterino2/patches/cmake.patch
@@ -0,0 +1,36 @@
+diff --git a/cmake/FindLRUCache.cmake b/cmake/FindLRUCache.cmake
+index 82905436..b0b89a4e 100644
+--- a/cmake/FindLRUCache.cmake
++++ b/cmake/FindLRUCache.cmake
+@@ -1,6 +1,6 @@
+ include(FindPackageHandleStandardArgs)
+ 
+-find_path(LRUCache_INCLUDE_DIR lrucache/lrucache.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/lrucache)
++find_path(LRUCache_INCLUDE_DIR lrucache/lrucache.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/lrucache NO_CMAKE_FIND_ROOT_PATH)
+ 
+ find_package_handle_standard_args(LRUCache DEFAULT_MSG LRUCache_INCLUDE_DIR)
+ 
+diff --git a/cmake/FindPajladaSerialize.cmake b/cmake/FindPajladaSerialize.cmake
+index 4671874c..119284c2 100644
+--- a/cmake/FindPajladaSerialize.cmake
++++ b/cmake/FindPajladaSerialize.cmake
+@@ -1,6 +1,6 @@
+ include(FindPackageHandleStandardArgs)
+ 
+-find_path(PajladaSerialize_INCLUDE_DIR pajlada/serialize.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/serialize/include)
++find_path(PajladaSerialize_INCLUDE_DIR pajlada/serialize.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/serialize/include NO_CMAKE_FIND_ROOT_PATH)
+ 
+ find_package_handle_standard_args(PajladaSerialize DEFAULT_MSG PajladaSerialize_INCLUDE_DIR)
+ 
+diff --git a/cmake/FindPajladaSignals.cmake b/cmake/FindPajladaSignals.cmake
+index f4c964ec..75efba20 100644
+--- a/cmake/FindPajladaSignals.cmake
++++ b/cmake/FindPajladaSignals.cmake
+@@ -1,6 +1,6 @@
+ include(FindPackageHandleStandardArgs)
+ 
+-find_path(PajladaSignals_INCLUDE_DIR pajlada/signals/signal.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/signals/include)
++find_path(PajladaSignals_INCLUDE_DIR pajlada/signals/signal.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/signals/include NO_CMAKE_FIND_ROOT_PATH)
+ 
+ find_package_handle_standard_args(PajladaSignals DEFAULT_MSG PajladaSignals_INCLUDE_DIR)
+ 
diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index f69730b3a9fe..17241739f183 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -1,55 +1,52 @@
 # Template file for 'chatterino2'
 pkgname=chatterino2
-version=2.2.2
-revision=2
-_signals_commit=6665ccad90461c01b7fe704a98a835953d644156
-_settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450
-_humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be
-_serialize_commit=130ffc3ec722284ca454a1e70c5478a75f380144
-build_style=qmake
-configure_args="INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcCore
- INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcModel
- INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcUtil"
-hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
-makedepends="qt5-svg-devel qt5-multimedia-devel
- boost-devel rapidjson libcommuni-devel websocketpp
- qtkeychain-qt5-devel"
-short_desc="Qt-based twitch chat client"
-maintainer="Franc[e]sco <lolisamurai@tfwno.gf>"
-license="MIT"
+version=2.3.4
+revision=1
+_libcommuni_commit="c613600e6a52e6d3166247a05205cf1c755d4868"
+_serialize_commit="7d37cbfd5ac3bfbe046118e1cec3d32ba4696469"
+_settings_commit="7cf8431d644332107a51a46c1e3de70e64692f0c"
+_signals_commit="baf5bb04bd13b090e405e0447c89a811f7e23ddc"
+_qtkeychain_commit="de954627363b0b4bff9a2616f1a409b7e14d5df9"
+_sanitizers_cmake_commit="99e159ec9bc8dd362b08d18436bd40ff0648417b"
+build_style=cmake
+hostmakedepends="qt5-qmake qt5-host-tools"
+makedepends="qt5-tools-devel qt5-multimedia-devel qt5-svg-devel
+ boost-devel openssl-devel rapidjson websocketpp"
+depends="qt5-imageformats qt5-svg"
+short_desc="Chat client for twitch.tv"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license=MIT
 homepage="https://chatterino.com"
 changelog="https://chatterino.com/changelog"
-distfiles="https://github.com/fourtf/chatterino2/archive/v${version}.tar.gz
- https://github.com/pajlada/signals/archive/${_signals_commit}.tar.gz
+distfiles="https://github.com/Chatterino/chatterino2/archive/refs/tags/v${version}.tar.gz
+ https://github.com/Chatterino/libcommuni/archive/${_libcommuni_commit}.tar.gz
+ https://github.com/pajlada/serialize/archive/${_serialize_commit}.tar.gz
  https://github.com/pajlada/settings/archive/${_settings_commit}.tar.gz
- https://github.com/pajlada/humanize/archive/${_humanize_commit}.tar.gz
- https://github.com/pajlada/serialize/archive/${_serialize_commit}.tar.gz"
-checksum="6e3d64f319728ccf9fd09613df754108157e7d3b4148ee2da1a3209bf369be70
-e8755e68ff6fc39b4338d424ee9aed2ed5a8eab6eb37af69de2ff21b8dc94e66
-f387cc7eaf27dec462bc85a212619f8086167cf0b47e11825b8580d35a740dfe
-5a5cd8338fcb0a14a4bbe0840f83505d0444a9000956145e85e5550feeb744b0
-eb492b89e67f4ec632bd43f2701d53e355f1d1afbec3cd3af5891c1a6aaaa454"
+ https://github.com/pajlada/signals/archive/${_signals_commit}.tar.gz
+ https://github.com/Chatterino/qtkeychain/archive/${_qtkeychain_commit}.tar.gz
+ https://github.com/arsenm/sanitizers-cmake/archive/${_sanitizers_cmake_commit}.tar.gz"
+checksum="27d42138d48d807340fe4194b4cdada6183b0ff2127f24d39032b3ad1f66594c
+ ba2179eb43638366ca65214137a850a127fb93a36fcc54658649c34e8d6f7dc4
+ d0da2cebd5dfd7b20f7247f1e4fb6b8a866434db49316a067b6c798ec8217c63
+ 0b35eb297f0949f27b3c54bc66d8b0c9293102fb52838d12371a5fcc80c590e5
+ 7ffd43dbd05704af5bef64b0eae8c12174013d4c7105472019ef381ff82c0a46
+ 4fdd7fd8bbae4fd7a505c917facc6e6b838850cd4f016c30fae45535dbaab4b7
+ f9cf386638f455c5d2e7a835b95941201387d2531b8682942d59827663b58341"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
-	configure_args+=" LIBS+=-latomic"
+	LIBS="-latomic"
 fi
 
 post_extract() {
-	rmdir lib/signals
-	rmdir lib/settings
-	rmdir lib/humanize
-	rmdir lib/serialize
-	mv "${XBPS_BUILDDIR}/signals-${_signals_commit}/" lib/signals/
-	mv "${XBPS_BUILDDIR}/settings-${_settings_commit}/" lib/settings/
-	mv "${XBPS_BUILDDIR}/humanize-${_humanize_commit}/" lib/humanize/
-	mv "${XBPS_BUILDDIR}/serialize-${_serialize_commit}/" lib/serialize/
-}
-
-pre_configure() {
-	# it wraps libcommuni in a namespace but void's binaries don't
-	find \( -name '*.cpp' -o -name '*.hpp' \) \
-		-exec sed -i "{}" -e 's/Communi::/::/g' \;
+	rmdir lib/libcommuni lib/serialize lib/settings lib/signals lib/rapidjson \
+	      lib/websocketpp lib/qtkeychain cmake/sanitizers-cmake
+	mv "${XBPS_BUILDDIR}/libcommuni-${_libcommuni_commit}" "lib/libcommuni"
+	mv "${XBPS_BUILDDIR}/serialize-${_serialize_commit}" "lib/serialize"
+	mv "${XBPS_BUILDDIR}/settings-${_settings_commit}" "lib/settings"
+	mv "${XBPS_BUILDDIR}/signals-${_signals_commit}" "lib/signals"
+	mv "${XBPS_BUILDDIR}/qtkeychain-${_qtkeychain_commit}" "lib/qtkeychain"
+	mv "${XBPS_BUILDDIR}/sanitizers-cmake-${_sanitizers_cmake_commit}" "cmake/sanitizers-cmake"
 }
 
 post_install() {

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR REVIEW] chatterino2: update to 2.3.4.
  2022-03-16 12:15 [PR PATCH] chatterino2: update to 2.3.4 tibequadorian
                   ` (3 preceding siblings ...)
  2022-03-16 13:19 ` tibequadorian
@ 2022-03-20 22:44 ` paper42
  2022-03-28 17:28 ` [PR PATCH] [Updated] " tibequadorian
                   ` (8 subsequent siblings)
  13 siblings, 0 replies; 17+ messages in thread
From: paper42 @ 2022-03-20 22:44 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 257 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/36170#discussion_r830684805

Comment:
Can we use create_wrksrc to have this all contained in one directory that will be cleaned with xbps-src clean?

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR PATCH] [Updated] chatterino2: update to 2.3.4.
  2022-03-16 12:15 [PR PATCH] chatterino2: update to 2.3.4 tibequadorian
                   ` (4 preceding siblings ...)
  2022-03-20 22:44 ` [PR REVIEW] " paper42
@ 2022-03-28 17:28 ` tibequadorian
  2022-03-28 17:35 ` [PR REVIEW] " tibequadorian
                   ` (7 subsequent siblings)
  13 siblings, 0 replies; 17+ messages in thread
From: tibequadorian @ 2022-03-28 17:28 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1256 bytes --]

There is an updated pull request by tibequadorian against master on the void-packages repository

https://github.com/tibequadorian/void-packages chatterino2
https://github.com/void-linux/void-packages/pull/36170

chatterino2: update to 2.3.4.
supersedes #32199

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/36170.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chatterino2-36170.patch --]
[-- Type: text/x-diff, Size: 10608 bytes --]

From 1e6e2175cbccd578e68988fca9c560accedb98b9 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 28 Mar 2022 19:28:16 +0200
Subject: [PATCH] chatterino2: update to 2.3.4.

---
 .../patches/0001-fix-desktop-icon-name.patch  | 13 +++
 .../patches/0001-use-system-deps.patch        | 58 -------------
 srcpkgs/chatterino2/patches/cmake.patch       | 36 ++++++++
 srcpkgs/chatterino2/template                  | 83 ++++++++++---------
 4 files changed, 91 insertions(+), 99 deletions(-)
 create mode 100644 srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
 delete mode 100644 srcpkgs/chatterino2/patches/0001-use-system-deps.patch
 create mode 100644 srcpkgs/chatterino2/patches/cmake.patch

diff --git a/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch b/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
new file mode 100644
index 000000000000..1b0a6d6140e4
--- /dev/null
+++ b/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
@@ -0,0 +1,13 @@
+diff --git a/resources/com.chatterino.chatterino.desktop b/resources/com.chatterino.chatterino.desktop
+index 6ee45354..ece81f5c 100644
+--- 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
+ Exec=chatterino
+-Icon=chatterino
++Icon=com.chatterino.chatterino
+ Terminal=false
+ Categories=Network;InstantMessaging;
+ StartupWMClass=chatterino
diff --git a/srcpkgs/chatterino2/patches/0001-use-system-deps.patch b/srcpkgs/chatterino2/patches/0001-use-system-deps.patch
deleted file mode 100644
index 383c5ea23f43..000000000000
--- a/srcpkgs/chatterino2/patches/0001-use-system-deps.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git chatterino.pro chatterino.pro
-index d8b14bbe..f7657f06 100644
---- a/chatterino.pro
-+++ b/chatterino.pro
-@@ -12,10 +12,17 @@
- #  - BOOST_DIRECTORY (C:\local\boost\ by default) (Windows only)
-
- QT                += widgets core gui network multimedia svg concurrent
--CONFIG            += communi
--COMMUNI           += core model util
-
- INCLUDEPATH       += src/
-+# libcommuni
-+INCLUDEPATH       += /usr/include/qt5/Communi/IrcCore
-+INCLUDEPATH       += /usr/include/qt5/Communi/IrcModel
-+INCLUDEPATH       += /usr/include/qt5/Communi/IrcUtil
-+DEFINES           += IRC_SHARED
-+LIBS              += -lIrcCore -lIrcModel -lIrcUtil
-+# qtkeychain
-+INCLUDEPATH       += /usr/include/qt5keychain
-+LIBS              += -lqt5keychain
- TARGET             = chatterino
- TEMPLATE           = app
- PRECOMPILED_HEADER = src/PrecompiledHeader.hpp
-@@ -78,7 +85,6 @@ CONFIG(debug, debug|release) {
- include(lib/warnings.pri)
- include(lib/fmt.pri)
- include(lib/humanize.pri)
--include(lib/libcommuni.pri)
- include(lib/websocketpp.pri)
- include(lib/wintoast.pri)
- include(lib/signals.pri)
-@@ -86,7 +92,6 @@ include(lib/settings.pri)
- include(lib/serialize.pri)
- include(lib/winsdk.pri)
- include(lib/rapidjson.pri)
--include(lib/qtkeychain.pri)
-
- exists( $$OUT_PWD/conanbuildinfo.pri ) {
-     message("Using conan packages")
-diff --git src/common/Credentials.cpp src/common/Credentials.cpp
-index 87abecb9..5de78130 100644
---- a/src/common/Credentials.cpp
-+++ b/src/common/Credentials.cpp
-@@ -1,12 +1,12 @@
- #include "Credentials.hpp"
- 
- #include "debug/AssertInGuiThread.hpp"
--#include "keychain.h"
- #include "singletons/Paths.hpp"
- #include "singletons/Settings.hpp"
- #include "util/CombinePath.hpp"
- #include "util/Overloaded.hpp"
- 
-+#include <qt5keychain/keychain.h>
- #include <QSaveFile>
- #include <boost/variant.hpp>
- 
diff --git a/srcpkgs/chatterino2/patches/cmake.patch b/srcpkgs/chatterino2/patches/cmake.patch
new file mode 100644
index 000000000000..8a5643566957
--- /dev/null
+++ b/srcpkgs/chatterino2/patches/cmake.patch
@@ -0,0 +1,36 @@
+diff --git a/cmake/FindLRUCache.cmake b/cmake/FindLRUCache.cmake
+index 82905436..b0b89a4e 100644
+--- a/cmake/FindLRUCache.cmake
++++ b/cmake/FindLRUCache.cmake
+@@ -1,6 +1,6 @@
+ include(FindPackageHandleStandardArgs)
+ 
+-find_path(LRUCache_INCLUDE_DIR lrucache/lrucache.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/lrucache)
++find_path(LRUCache_INCLUDE_DIR lrucache/lrucache.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/lrucache NO_CMAKE_FIND_ROOT_PATH)
+ 
+ find_package_handle_standard_args(LRUCache DEFAULT_MSG LRUCache_INCLUDE_DIR)
+ 
+diff --git a/cmake/FindPajladaSerialize.cmake b/cmake/FindPajladaSerialize.cmake
+index 4671874c..119284c2 100644
+--- a/cmake/FindPajladaSerialize.cmake
++++ b/cmake/FindPajladaSerialize.cmake
+@@ -1,6 +1,6 @@
+ include(FindPackageHandleStandardArgs)
+ 
+-find_path(PajladaSerialize_INCLUDE_DIR pajlada/serialize.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/serialize/include)
++find_path(PajladaSerialize_INCLUDE_DIR pajlada/serialize.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/serialize/include NO_CMAKE_FIND_ROOT_PATH)
+ 
+ find_package_handle_standard_args(PajladaSerialize DEFAULT_MSG PajladaSerialize_INCLUDE_DIR)
+ 
+diff --git a/cmake/FindPajladaSignals.cmake b/cmake/FindPajladaSignals.cmake
+index f4c964ec..75efba20 100644
+--- a/cmake/FindPajladaSignals.cmake
++++ b/cmake/FindPajladaSignals.cmake
+@@ -1,6 +1,6 @@
+ include(FindPackageHandleStandardArgs)
+ 
+-find_path(PajladaSignals_INCLUDE_DIR pajlada/signals/signal.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/signals/include)
++find_path(PajladaSignals_INCLUDE_DIR pajlada/signals/signal.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/signals/include NO_CMAKE_FIND_ROOT_PATH)
+ 
+ find_package_handle_standard_args(PajladaSignals DEFAULT_MSG PajladaSignals_INCLUDE_DIR)
+ 
diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index f69730b3a9fe..70da6be7984d 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -1,55 +1,56 @@
 # Template file for 'chatterino2'
 pkgname=chatterino2
-version=2.2.2
-revision=2
-_signals_commit=6665ccad90461c01b7fe704a98a835953d644156
-_settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450
-_humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be
-_serialize_commit=130ffc3ec722284ca454a1e70c5478a75f380144
-build_style=qmake
-configure_args="INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcCore
- INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcModel
- INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcUtil"
-hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
-makedepends="qt5-svg-devel qt5-multimedia-devel
- boost-devel rapidjson libcommuni-devel websocketpp
- qtkeychain-qt5-devel"
-short_desc="Qt-based twitch chat client"
-maintainer="Franc[e]sco <lolisamurai@tfwno.gf>"
-license="MIT"
+version=2.3.4
+revision=1
+_libcommuni_commit="c613600e6a52e6d3166247a05205cf1c755d4868"
+_serialize_commit="7d37cbfd5ac3bfbe046118e1cec3d32ba4696469"
+_settings_commit="7cf8431d644332107a51a46c1e3de70e64692f0c"
+_signals_commit="baf5bb04bd13b090e405e0447c89a811f7e23ddc"
+_qtkeychain_commit="de954627363b0b4bff9a2616f1a409b7e14d5df9"
+_sanitizers_cmake_commit="99e159ec9bc8dd362b08d18436bd40ff0648417b"
+create_wrksrc=yes
+build_wrksrc="${pkgname}-${version}"
+build_style=cmake
+hostmakedepends="qt5-qmake qt5-host-tools"
+makedepends="qt5-tools-devel qt5-multimedia-devel qt5-svg-devel
+ boost-devel openssl-devel rapidjson websocketpp"
+depends="qt5-imageformats qt5-svg"
+short_desc="Chat client for twitch.tv"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license=MIT
 homepage="https://chatterino.com"
 changelog="https://chatterino.com/changelog"
-distfiles="https://github.com/fourtf/chatterino2/archive/v${version}.tar.gz
- https://github.com/pajlada/signals/archive/${_signals_commit}.tar.gz
+distfiles="https://github.com/Chatterino/chatterino2/archive/refs/tags/v${version}.tar.gz
+ https://github.com/Chatterino/libcommuni/archive/${_libcommuni_commit}.tar.gz
+ https://github.com/pajlada/serialize/archive/${_serialize_commit}.tar.gz
  https://github.com/pajlada/settings/archive/${_settings_commit}.tar.gz
- https://github.com/pajlada/humanize/archive/${_humanize_commit}.tar.gz
- https://github.com/pajlada/serialize/archive/${_serialize_commit}.tar.gz"
-checksum="6e3d64f319728ccf9fd09613df754108157e7d3b4148ee2da1a3209bf369be70
-e8755e68ff6fc39b4338d424ee9aed2ed5a8eab6eb37af69de2ff21b8dc94e66
-f387cc7eaf27dec462bc85a212619f8086167cf0b47e11825b8580d35a740dfe
-5a5cd8338fcb0a14a4bbe0840f83505d0444a9000956145e85e5550feeb744b0
-eb492b89e67f4ec632bd43f2701d53e355f1d1afbec3cd3af5891c1a6aaaa454"
+ https://github.com/pajlada/signals/archive/${_signals_commit}.tar.gz
+ https://github.com/Chatterino/qtkeychain/archive/${_qtkeychain_commit}.tar.gz
+ https://github.com/arsenm/sanitizers-cmake/archive/${_sanitizers_cmake_commit}.tar.gz"
+checksum="27d42138d48d807340fe4194b4cdada6183b0ff2127f24d39032b3ad1f66594c
+ ba2179eb43638366ca65214137a850a127fb93a36fcc54658649c34e8d6f7dc4
+ d0da2cebd5dfd7b20f7247f1e4fb6b8a866434db49316a067b6c798ec8217c63
+ 0b35eb297f0949f27b3c54bc66d8b0c9293102fb52838d12371a5fcc80c590e5
+ 7ffd43dbd05704af5bef64b0eae8c12174013d4c7105472019ef381ff82c0a46
+ 4fdd7fd8bbae4fd7a505c917facc6e6b838850cd4f016c30fae45535dbaab4b7
+ f9cf386638f455c5d2e7a835b95941201387d2531b8682942d59827663b58341"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
-	configure_args+=" LIBS+=-latomic"
+	LIBS="-latomic"
 fi
 
 post_extract() {
-	rmdir lib/signals
-	rmdir lib/settings
-	rmdir lib/humanize
-	rmdir lib/serialize
-	mv "${XBPS_BUILDDIR}/signals-${_signals_commit}/" lib/signals/
-	mv "${XBPS_BUILDDIR}/settings-${_settings_commit}/" lib/settings/
-	mv "${XBPS_BUILDDIR}/humanize-${_humanize_commit}/" lib/humanize/
-	mv "${XBPS_BUILDDIR}/serialize-${_serialize_commit}/" lib/serialize/
-}
-
-pre_configure() {
-	# it wraps libcommuni in a namespace but void's binaries don't
-	find \( -name '*.cpp' -o -name '*.hpp' \) \
-		-exec sed -i "{}" -e 's/Communi::/::/g' \;
+	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 \
+	      ${build_wrksrc}/lib/qtkeychain ${build_wrksrc}/cmake/sanitizers-cmake
+	mv "libcommuni-${_libcommuni_commit}" "${build_wrksrc}/lib/libcommuni"
+	mv "serialize-${_serialize_commit}" "${build_wrksrc}/lib/serialize"
+	mv "settings-${_settings_commit}" "${build_wrksrc}/lib/settings"
+	mv "signals-${_signals_commit}" "${build_wrksrc}/lib/signals"
+	mv "qtkeychain-${_qtkeychain_commit}" "${build_wrksrc}/lib/qtkeychain"
+	mv "sanitizers-cmake-${_sanitizers_cmake_commit}" "${build_wrksrc}/cmake/sanitizers-cmake"
 }
 
 post_install() {

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR REVIEW] chatterino2: update to 2.3.4.
  2022-03-16 12:15 [PR PATCH] chatterino2: update to 2.3.4 tibequadorian
                   ` (5 preceding siblings ...)
  2022-03-28 17:28 ` [PR PATCH] [Updated] " tibequadorian
@ 2022-03-28 17:35 ` tibequadorian
  2022-03-28 17:51 ` tibequadorian
                   ` (6 subsequent siblings)
  13 siblings, 0 replies; 17+ messages in thread
From: tibequadorian @ 2022-03-28 17:35 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 308 bytes --]

New review comment by tibequadorian on void-packages repository

https://github.com/void-linux/void-packages/pull/36170#discussion_r836680605

Comment:
That would require us to modify the patches accordingly to $build_wrksrc on every update :/ I would leave it as it is for now. Or do you know a better way?

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR REVIEW] chatterino2: update to 2.3.4.
  2022-03-16 12:15 [PR PATCH] chatterino2: update to 2.3.4 tibequadorian
                   ` (6 preceding siblings ...)
  2022-03-28 17:35 ` [PR REVIEW] " tibequadorian
@ 2022-03-28 17:51 ` tibequadorian
  2022-03-28 17:51 ` tibequadorian
                   ` (5 subsequent siblings)
  13 siblings, 0 replies; 17+ messages in thread
From: tibequadorian @ 2022-03-28 17:51 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 275 bytes --]

New review comment by tibequadorian on void-packages repository

https://github.com/void-linux/void-packages/pull/36170#discussion_r836696619

Comment:
I also could set `build-wrksrc=chatterino2` and `mv "$pkgname-$version chatterino2`. Does that sound like a good solution?

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR REVIEW] chatterino2: update to 2.3.4.
  2022-03-16 12:15 [PR PATCH] chatterino2: update to 2.3.4 tibequadorian
                   ` (7 preceding siblings ...)
  2022-03-28 17:51 ` tibequadorian
@ 2022-03-28 17:51 ` tibequadorian
  2022-03-28 18:02 ` [PR PATCH] [Updated] " tibequadorian
                   ` (4 subsequent siblings)
  13 siblings, 0 replies; 17+ messages in thread
From: tibequadorian @ 2022-03-28 17:51 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 276 bytes --]

New review comment by tibequadorian on void-packages repository

https://github.com/void-linux/void-packages/pull/36170#discussion_r836696619

Comment:
I also could set `build-wrksrc=chatterino2` and `mv "$pkgname-$version" chatterino2`. Does that sound like a good solution?

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR PATCH] [Updated] chatterino2: update to 2.3.4.
  2022-03-16 12:15 [PR PATCH] chatterino2: update to 2.3.4 tibequadorian
                   ` (8 preceding siblings ...)
  2022-03-28 17:51 ` tibequadorian
@ 2022-03-28 18:02 ` tibequadorian
  2022-03-28 18:05 ` [PR REVIEW] " tibequadorian
                   ` (3 subsequent siblings)
  13 siblings, 0 replies; 17+ messages in thread
From: tibequadorian @ 2022-03-28 18:02 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1256 bytes --]

There is an updated pull request by tibequadorian against master on the void-packages repository

https://github.com/tibequadorian/void-packages chatterino2
https://github.com/void-linux/void-packages/pull/36170

chatterino2: update to 2.3.4.
supersedes #32199

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/36170.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chatterino2-36170.patch --]
[-- Type: text/x-diff, Size: 10742 bytes --]

From 24d1f14d219b291b72383b56d6ce05b2734fd4e7 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 28 Mar 2022 19:28:16 +0200
Subject: [PATCH] chatterino2: update to 2.3.4.

---
 .../patches/0001-fix-desktop-icon-name.patch  | 13 +++
 .../patches/0001-use-system-deps.patch        | 58 -------------
 srcpkgs/chatterino2/patches/cmake.patch       | 36 ++++++++
 srcpkgs/chatterino2/template                  | 84 ++++++++++---------
 4 files changed, 92 insertions(+), 99 deletions(-)
 create mode 100644 srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
 delete mode 100644 srcpkgs/chatterino2/patches/0001-use-system-deps.patch
 create mode 100644 srcpkgs/chatterino2/patches/cmake.patch

diff --git a/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch b/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
new file mode 100644
index 000000000000..9f41d03190b7
--- /dev/null
+++ b/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
@@ -0,0 +1,13 @@
+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
+@@ -4,7 +4,7 @@ Version=1.0
+ Name=Chatterino
+ Comment=Chat client for Twitch
+ Exec=chatterino
+-Icon=chatterino
++Icon=com.chatterino.chatterino
+ Terminal=false
+ Categories=Network;InstantMessaging;
+ StartupWMClass=chatterino
diff --git a/srcpkgs/chatterino2/patches/0001-use-system-deps.patch b/srcpkgs/chatterino2/patches/0001-use-system-deps.patch
deleted file mode 100644
index 383c5ea23f43..000000000000
--- a/srcpkgs/chatterino2/patches/0001-use-system-deps.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git chatterino.pro chatterino.pro
-index d8b14bbe..f7657f06 100644
---- a/chatterino.pro
-+++ b/chatterino.pro
-@@ -12,10 +12,17 @@
- #  - BOOST_DIRECTORY (C:\local\boost\ by default) (Windows only)
-
- QT                += widgets core gui network multimedia svg concurrent
--CONFIG            += communi
--COMMUNI           += core model util
-
- INCLUDEPATH       += src/
-+# libcommuni
-+INCLUDEPATH       += /usr/include/qt5/Communi/IrcCore
-+INCLUDEPATH       += /usr/include/qt5/Communi/IrcModel
-+INCLUDEPATH       += /usr/include/qt5/Communi/IrcUtil
-+DEFINES           += IRC_SHARED
-+LIBS              += -lIrcCore -lIrcModel -lIrcUtil
-+# qtkeychain
-+INCLUDEPATH       += /usr/include/qt5keychain
-+LIBS              += -lqt5keychain
- TARGET             = chatterino
- TEMPLATE           = app
- PRECOMPILED_HEADER = src/PrecompiledHeader.hpp
-@@ -78,7 +85,6 @@ CONFIG(debug, debug|release) {
- include(lib/warnings.pri)
- include(lib/fmt.pri)
- include(lib/humanize.pri)
--include(lib/libcommuni.pri)
- include(lib/websocketpp.pri)
- include(lib/wintoast.pri)
- include(lib/signals.pri)
-@@ -86,7 +92,6 @@ include(lib/settings.pri)
- include(lib/serialize.pri)
- include(lib/winsdk.pri)
- include(lib/rapidjson.pri)
--include(lib/qtkeychain.pri)
-
- exists( $$OUT_PWD/conanbuildinfo.pri ) {
-     message("Using conan packages")
-diff --git src/common/Credentials.cpp src/common/Credentials.cpp
-index 87abecb9..5de78130 100644
---- a/src/common/Credentials.cpp
-+++ b/src/common/Credentials.cpp
-@@ -1,12 +1,12 @@
- #include "Credentials.hpp"
- 
- #include "debug/AssertInGuiThread.hpp"
--#include "keychain.h"
- #include "singletons/Paths.hpp"
- #include "singletons/Settings.hpp"
- #include "util/CombinePath.hpp"
- #include "util/Overloaded.hpp"
- 
-+#include <qt5keychain/keychain.h>
- #include <QSaveFile>
- #include <boost/variant.hpp>
- 
diff --git a/srcpkgs/chatterino2/patches/cmake.patch b/srcpkgs/chatterino2/patches/cmake.patch
new file mode 100644
index 000000000000..a59d0a4eb9f0
--- /dev/null
+++ b/srcpkgs/chatterino2/patches/cmake.patch
@@ -0,0 +1,36 @@
+diff --git a/cmake/FindLRUCache.cmake b/cmake/FindLRUCache.cmake
+index 82905436..b0b89a4e 100644
+--- a/chatterino2/cmake/FindLRUCache.cmake
++++ b/chatterino2/cmake/FindLRUCache.cmake
+@@ -1,6 +1,6 @@
+ include(FindPackageHandleStandardArgs)
+ 
+-find_path(LRUCache_INCLUDE_DIR lrucache/lrucache.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/lrucache)
++find_path(LRUCache_INCLUDE_DIR lrucache/lrucache.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/lrucache NO_CMAKE_FIND_ROOT_PATH)
+ 
+ find_package_handle_standard_args(LRUCache DEFAULT_MSG LRUCache_INCLUDE_DIR)
+ 
+diff --git a/cmake/FindPajladaSerialize.cmake b/cmake/FindPajladaSerialize.cmake
+index 4671874c..119284c2 100644
+--- a/chatterino2/cmake/FindPajladaSerialize.cmake
++++ b/chatterino2/cmake/FindPajladaSerialize.cmake
+@@ -1,6 +1,6 @@
+ include(FindPackageHandleStandardArgs)
+ 
+-find_path(PajladaSerialize_INCLUDE_DIR pajlada/serialize.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/serialize/include)
++find_path(PajladaSerialize_INCLUDE_DIR pajlada/serialize.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/serialize/include NO_CMAKE_FIND_ROOT_PATH)
+ 
+ find_package_handle_standard_args(PajladaSerialize DEFAULT_MSG PajladaSerialize_INCLUDE_DIR)
+ 
+diff --git a/cmake/FindPajladaSignals.cmake b/cmake/FindPajladaSignals.cmake
+index f4c964ec..75efba20 100644
+--- a/chatterino2/cmake/FindPajladaSignals.cmake
++++ b/chatterino2/cmake/FindPajladaSignals.cmake
+@@ -1,6 +1,6 @@
+ include(FindPackageHandleStandardArgs)
+ 
+-find_path(PajladaSignals_INCLUDE_DIR pajlada/signals/signal.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/signals/include)
++find_path(PajladaSignals_INCLUDE_DIR pajlada/signals/signal.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/signals/include NO_CMAKE_FIND_ROOT_PATH)
+ 
+ find_package_handle_standard_args(PajladaSignals DEFAULT_MSG PajladaSignals_INCLUDE_DIR)
+ 
diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index f69730b3a9fe..e1f99ac9e9fc 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -1,55 +1,57 @@
 # Template file for 'chatterino2'
 pkgname=chatterino2
-version=2.2.2
-revision=2
-_signals_commit=6665ccad90461c01b7fe704a98a835953d644156
-_settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450
-_humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be
-_serialize_commit=130ffc3ec722284ca454a1e70c5478a75f380144
-build_style=qmake
-configure_args="INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcCore
- INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcModel
- INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcUtil"
-hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
-makedepends="qt5-svg-devel qt5-multimedia-devel
- boost-devel rapidjson libcommuni-devel websocketpp
- qtkeychain-qt5-devel"
-short_desc="Qt-based twitch chat client"
-maintainer="Franc[e]sco <lolisamurai@tfwno.gf>"
-license="MIT"
+version=2.3.4
+revision=1
+_libcommuni_commit="c613600e6a52e6d3166247a05205cf1c755d4868"
+_serialize_commit="7d37cbfd5ac3bfbe046118e1cec3d32ba4696469"
+_settings_commit="7cf8431d644332107a51a46c1e3de70e64692f0c"
+_signals_commit="baf5bb04bd13b090e405e0447c89a811f7e23ddc"
+_qtkeychain_commit="de954627363b0b4bff9a2616f1a409b7e14d5df9"
+_sanitizers_cmake_commit="99e159ec9bc8dd362b08d18436bd40ff0648417b"
+create_wrksrc=yes
+build_wrksrc="chatterino2"
+build_style=cmake
+hostmakedepends="qt5-qmake qt5-host-tools"
+makedepends="qt5-tools-devel qt5-multimedia-devel qt5-svg-devel
+ boost-devel openssl-devel rapidjson websocketpp"
+depends="qt5-imageformats qt5-svg"
+short_desc="Chat client for twitch.tv"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license=MIT
 homepage="https://chatterino.com"
 changelog="https://chatterino.com/changelog"
-distfiles="https://github.com/fourtf/chatterino2/archive/v${version}.tar.gz
- https://github.com/pajlada/signals/archive/${_signals_commit}.tar.gz
+distfiles="https://github.com/Chatterino/chatterino2/archive/refs/tags/v${version}.tar.gz
+ https://github.com/Chatterino/libcommuni/archive/${_libcommuni_commit}.tar.gz
+ https://github.com/pajlada/serialize/archive/${_serialize_commit}.tar.gz
  https://github.com/pajlada/settings/archive/${_settings_commit}.tar.gz
- https://github.com/pajlada/humanize/archive/${_humanize_commit}.tar.gz
- https://github.com/pajlada/serialize/archive/${_serialize_commit}.tar.gz"
-checksum="6e3d64f319728ccf9fd09613df754108157e7d3b4148ee2da1a3209bf369be70
-e8755e68ff6fc39b4338d424ee9aed2ed5a8eab6eb37af69de2ff21b8dc94e66
-f387cc7eaf27dec462bc85a212619f8086167cf0b47e11825b8580d35a740dfe
-5a5cd8338fcb0a14a4bbe0840f83505d0444a9000956145e85e5550feeb744b0
-eb492b89e67f4ec632bd43f2701d53e355f1d1afbec3cd3af5891c1a6aaaa454"
+ https://github.com/pajlada/signals/archive/${_signals_commit}.tar.gz
+ https://github.com/Chatterino/qtkeychain/archive/${_qtkeychain_commit}.tar.gz
+ https://github.com/arsenm/sanitizers-cmake/archive/${_sanitizers_cmake_commit}.tar.gz"
+checksum="27d42138d48d807340fe4194b4cdada6183b0ff2127f24d39032b3ad1f66594c
+ ba2179eb43638366ca65214137a850a127fb93a36fcc54658649c34e8d6f7dc4
+ d0da2cebd5dfd7b20f7247f1e4fb6b8a866434db49316a067b6c798ec8217c63
+ 0b35eb297f0949f27b3c54bc66d8b0c9293102fb52838d12371a5fcc80c590e5
+ 7ffd43dbd05704af5bef64b0eae8c12174013d4c7105472019ef381ff82c0a46
+ 4fdd7fd8bbae4fd7a505c917facc6e6b838850cd4f016c30fae45535dbaab4b7
+ f9cf386638f455c5d2e7a835b95941201387d2531b8682942d59827663b58341"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
-	configure_args+=" LIBS+=-latomic"
+	LIBS="-latomic"
 fi
 
 post_extract() {
-	rmdir lib/signals
-	rmdir lib/settings
-	rmdir lib/humanize
-	rmdir lib/serialize
-	mv "${XBPS_BUILDDIR}/signals-${_signals_commit}/" lib/signals/
-	mv "${XBPS_BUILDDIR}/settings-${_settings_commit}/" lib/settings/
-	mv "${XBPS_BUILDDIR}/humanize-${_humanize_commit}/" lib/humanize/
-	mv "${XBPS_BUILDDIR}/serialize-${_serialize_commit}/" lib/serialize/
-}
-
-pre_configure() {
-	# it wraps libcommuni in a namespace but void's binaries don't
-	find \( -name '*.cpp' -o -name '*.hpp' \) \
-		-exec sed -i "{}" -e 's/Communi::/::/g' \;
+	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 \
+	      ${build_wrksrc}/lib/qtkeychain ${build_wrksrc}/cmake/sanitizers-cmake
+	mv "libcommuni-${_libcommuni_commit}" "${build_wrksrc}/lib/libcommuni"
+	mv "serialize-${_serialize_commit}" "${build_wrksrc}/lib/serialize"
+	mv "settings-${_settings_commit}" "${build_wrksrc}/lib/settings"
+	mv "signals-${_signals_commit}" "${build_wrksrc}/lib/signals"
+	mv "qtkeychain-${_qtkeychain_commit}" "${build_wrksrc}/lib/qtkeychain"
+	mv "sanitizers-cmake-${_sanitizers_cmake_commit}" "${build_wrksrc}/cmake/sanitizers-cmake"
 }
 
 post_install() {

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR REVIEW] chatterino2: update to 2.3.4.
  2022-03-16 12:15 [PR PATCH] chatterino2: update to 2.3.4 tibequadorian
                   ` (9 preceding siblings ...)
  2022-03-28 18:02 ` [PR PATCH] [Updated] " tibequadorian
@ 2022-03-28 18:05 ` tibequadorian
  2022-03-28 18:05 ` tibequadorian
                   ` (2 subsequent siblings)
  13 siblings, 0 replies; 17+ messages in thread
From: tibequadorian @ 2022-03-28 18:05 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 279 bytes --]

New review comment by tibequadorian on void-packages repository

https://github.com/void-linux/void-packages/pull/36170#discussion_r836696619

Comment:
I also could set `build-wrksrc=chatterino2` and `mv "chatterino2-$version" chatterino2`. Does that sound like a good solution?

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR REVIEW] chatterino2: update to 2.3.4.
  2022-03-16 12:15 [PR PATCH] chatterino2: update to 2.3.4 tibequadorian
                   ` (10 preceding siblings ...)
  2022-03-28 18:05 ` [PR REVIEW] " tibequadorian
@ 2022-03-28 18:05 ` tibequadorian
  2022-04-02 21:38 ` [PR PATCH] [Merged]: " paper42
  2022-04-02 21:59 ` tibequadorian
  13 siblings, 0 replies; 17+ messages in thread
From: tibequadorian @ 2022-03-28 18:05 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 283 bytes --]

New review comment by tibequadorian on void-packages repository

https://github.com/void-linux/void-packages/pull/36170#discussion_r836696619

Comment:
I also could set `build-wrksrc=chatterino2` and `mv "chatterino2-$version" "$build_wrksrc"`. Does that sound like a good solution?

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR PATCH] [Merged]: chatterino2: update to 2.3.4.
  2022-03-16 12:15 [PR PATCH] chatterino2: update to 2.3.4 tibequadorian
                   ` (11 preceding siblings ...)
  2022-03-28 18:05 ` tibequadorian
@ 2022-04-02 21:38 ` paper42
  2022-04-02 21:59 ` tibequadorian
  13 siblings, 0 replies; 17+ messages in thread
From: paper42 @ 2022-04-02 21:38 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1084 bytes --]

There's a merged pull request on the void-packages repository

chatterino2: update to 2.3.4.
https://github.com/void-linux/void-packages/pull/36170

Description:
supersedes #32199

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: chatterino2: update to 2.3.4.
  2022-03-16 12:15 [PR PATCH] chatterino2: update to 2.3.4 tibequadorian
                   ` (12 preceding siblings ...)
  2022-04-02 21:38 ` [PR PATCH] [Merged]: " paper42
@ 2022-04-02 21:59 ` tibequadorian
  13 siblings, 0 replies; 17+ messages in thread
From: tibequadorian @ 2022-04-02 21:59 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 333 bytes --]

New comment by tibequadorian on void-packages repository

https://github.com/void-linux/void-packages/pull/36170#issuecomment-1086731336

Comment:
Thanks for merging @paper42. At the end I wasn't satisfied with either solution so I decided to just leave it as it is. It works for now and can still be improved once #36409 is merged.

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR PATCH] [Updated] chatterino2: update to 2.3.4.
  2021-07-25 20:31 [PR PATCH] chatterino2: update to 2.3.3 33kk
  2021-08-05 18:36 ` [PR PATCH] [Updated] chatterino2: update to 2.3.4 33kk
@ 2021-08-06 19:45 ` 33kk
  1 sibling, 0 replies; 17+ messages in thread
From: 33kk @ 2021-08-06 19:45 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1594 bytes --]

There is an updated pull request by 33kk against master on the void-packages repository

https://github.com/33kk/void-packages chatterino2
https://github.com/void-linux/void-packages/pull/32199

chatterino2: update to 2.3.4.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/32199.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chatterino2-32199.patch --]
[-- Type: text/x-diff, Size: 8882 bytes --]

From bbe1092c4c493e49a214dc58560eeef57d292ac6 Mon Sep 17 00:00:00 2001
From: Marko <goncarmarko@gmail.com>
Date: Sun, 25 Jul 2021 23:07:26 +0300
Subject: [PATCH] chatterino2: update to 2.3.4.

---
 .../patches/0001-fix-desktop-icon-name.patch  | 13 +++
 .../patches/0001-use-system-deps.patch        | 58 ------------
 srcpkgs/chatterino2/template                  | 91 ++++++++++---------
 3 files changed, 59 insertions(+), 103 deletions(-)
 create mode 100644 srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
 delete mode 100644 srcpkgs/chatterino2/patches/0001-use-system-deps.patch

diff --git a/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch b/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
new file mode 100644
index 000000000000..1b0a6d6140e4
--- /dev/null
+++ b/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
@@ -0,0 +1,13 @@
+diff --git a/resources/com.chatterino.chatterino.desktop b/resources/com.chatterino.chatterino.desktop
+index 6ee45354..ece81f5c 100644
+--- 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
+ Exec=chatterino
+-Icon=chatterino
++Icon=com.chatterino.chatterino
+ Terminal=false
+ Categories=Network;InstantMessaging;
+ StartupWMClass=chatterino
diff --git a/srcpkgs/chatterino2/patches/0001-use-system-deps.patch b/srcpkgs/chatterino2/patches/0001-use-system-deps.patch
deleted file mode 100644
index 383c5ea23f43..000000000000
--- a/srcpkgs/chatterino2/patches/0001-use-system-deps.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git chatterino.pro chatterino.pro
-index d8b14bbe..f7657f06 100644
---- a/chatterino.pro
-+++ b/chatterino.pro
-@@ -12,10 +12,17 @@
- #  - BOOST_DIRECTORY (C:\local\boost\ by default) (Windows only)
-
- QT                += widgets core gui network multimedia svg concurrent
--CONFIG            += communi
--COMMUNI           += core model util
-
- INCLUDEPATH       += src/
-+# libcommuni
-+INCLUDEPATH       += /usr/include/qt5/Communi/IrcCore
-+INCLUDEPATH       += /usr/include/qt5/Communi/IrcModel
-+INCLUDEPATH       += /usr/include/qt5/Communi/IrcUtil
-+DEFINES           += IRC_SHARED
-+LIBS              += -lIrcCore -lIrcModel -lIrcUtil
-+# qtkeychain
-+INCLUDEPATH       += /usr/include/qt5keychain
-+LIBS              += -lqt5keychain
- TARGET             = chatterino
- TEMPLATE           = app
- PRECOMPILED_HEADER = src/PrecompiledHeader.hpp
-@@ -78,7 +85,6 @@ CONFIG(debug, debug|release) {
- include(lib/warnings.pri)
- include(lib/fmt.pri)
- include(lib/humanize.pri)
--include(lib/libcommuni.pri)
- include(lib/websocketpp.pri)
- include(lib/wintoast.pri)
- include(lib/signals.pri)
-@@ -86,7 +92,6 @@ include(lib/settings.pri)
- include(lib/serialize.pri)
- include(lib/winsdk.pri)
- include(lib/rapidjson.pri)
--include(lib/qtkeychain.pri)
-
- exists( $$OUT_PWD/conanbuildinfo.pri ) {
-     message("Using conan packages")
-diff --git src/common/Credentials.cpp src/common/Credentials.cpp
-index 87abecb9..5de78130 100644
---- a/src/common/Credentials.cpp
-+++ b/src/common/Credentials.cpp
-@@ -1,12 +1,12 @@
- #include "Credentials.hpp"
- 
- #include "debug/AssertInGuiThread.hpp"
--#include "keychain.h"
- #include "singletons/Paths.hpp"
- #include "singletons/Settings.hpp"
- #include "util/CombinePath.hpp"
- #include "util/Overloaded.hpp"
- 
-+#include <qt5keychain/keychain.h>
- #include <QSaveFile>
- #include <boost/variant.hpp>
- 
diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index f69730b3a9fe..2691c2bfb702 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -1,55 +1,56 @@
 # Template file for 'chatterino2'
 pkgname=chatterino2
-version=2.2.2
-revision=2
-_signals_commit=6665ccad90461c01b7fe704a98a835953d644156
-_settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450
-_humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be
-_serialize_commit=130ffc3ec722284ca454a1e70c5478a75f380144
-build_style=qmake
-configure_args="INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcCore
- INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcModel
- INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcUtil"
-hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
-makedepends="qt5-svg-devel qt5-multimedia-devel
- boost-devel rapidjson libcommuni-devel websocketpp
- qtkeychain-qt5-devel"
-short_desc="Qt-based twitch chat client"
-maintainer="Franc[e]sco <lolisamurai@tfwno.gf>"
-license="MIT"
+version=2.3.4
+revision=1
+_WinToast_commit="ce441336ef057576dfb377be754bc5357a04ff85"
+_libcommuni_commit="c613600e6a52e6d3166247a05205cf1c755d4868"
+_qBreakpad_commit="a4626c12e9ae6f02fc1ca7a4e399bd8307424103"
+_serialize_commit="7d37cbfd5ac3bfbe046118e1cec3d32ba4696469"
+_settings_commit="7cf8431d644332107a51a46c1e3de70e64692f0c"
+_signals_commit="baf5bb04bd13b090e405e0447c89a811f7e23ddc"
+_qtkeychain_commit="de954627363b0b4bff9a2616f1a409b7e14d5df9"
+_sanitizers_cmake_commit="99e159ec9bc8dd362b08d18436bd40ff0648417b"
+build_style=cmake
+hostmakedepends="qt5-qmake qt5-host-tools"
+makedepends="qt5-tools-devel qt5-multimedia-devel qt5-svg-devel
+ boost-devel openssl-devel rapidjson websocketpp"
+depends="qt5-imageformats qt5-svg"
+short_desc="Chat client for twitch.tv"
+maintainer="33KK <g33kk@pm.me>"
+license=MIT
 homepage="https://chatterino.com"
 changelog="https://chatterino.com/changelog"
-distfiles="https://github.com/fourtf/chatterino2/archive/v${version}.tar.gz
- https://github.com/pajlada/signals/archive/${_signals_commit}.tar.gz
+distfiles="https://github.com/Chatterino/chatterino2/archive/refs/tags/v${version}.tar.gz
+ https://github.com/mohabouje/WinToast/archive/${_WinToast_commit}.tar.gz
+ https://github.com/Chatterino/libcommuni/archive/${_libcommuni_commit}.tar.gz
+ https://github.com/jiakuan/qBreakpad/archive/${_qBreakpad_commit}.tar.gz
+ https://github.com/pajlada/serialize/archive/${_serialize_commit}.tar.gz
  https://github.com/pajlada/settings/archive/${_settings_commit}.tar.gz
- https://github.com/pajlada/humanize/archive/${_humanize_commit}.tar.gz
- https://github.com/pajlada/serialize/archive/${_serialize_commit}.tar.gz"
-checksum="6e3d64f319728ccf9fd09613df754108157e7d3b4148ee2da1a3209bf369be70
-e8755e68ff6fc39b4338d424ee9aed2ed5a8eab6eb37af69de2ff21b8dc94e66
-f387cc7eaf27dec462bc85a212619f8086167cf0b47e11825b8580d35a740dfe
-5a5cd8338fcb0a14a4bbe0840f83505d0444a9000956145e85e5550feeb744b0
-eb492b89e67f4ec632bd43f2701d53e355f1d1afbec3cd3af5891c1a6aaaa454"
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+=" libatomic-devel"
-	configure_args+=" LIBS+=-latomic"
-fi
+ https://github.com/pajlada/signals/archive/${_signals_commit}.tar.gz
+ https://github.com/Chatterino/qtkeychain/archive/${_qtkeychain_commit}.tar.gz
+ https://github.com/arsenm/sanitizers-cmake/archive/${_sanitizers_cmake_commit}.tar.gz"
+checksum="27d42138d48d807340fe4194b4cdada6183b0ff2127f24d39032b3ad1f66594c
+ 992bf522752261eda3167ef85901f41f0dd090ee40edcdf782b56a049715139f
+ ba2179eb43638366ca65214137a850a127fb93a36fcc54658649c34e8d6f7dc4
+ 6b7a725b77deb9be2357ef9bdfed872b48f295aa1bb41ab6aa9e3aa09cc67f84
+ d0da2cebd5dfd7b20f7247f1e4fb6b8a866434db49316a067b6c798ec8217c63
+ 0b35eb297f0949f27b3c54bc66d8b0c9293102fb52838d12371a5fcc80c590e5
+ 7ffd43dbd05704af5bef64b0eae8c12174013d4c7105472019ef381ff82c0a46
+ 4fdd7fd8bbae4fd7a505c917facc6e6b838850cd4f016c30fae45535dbaab4b7
+ f9cf386638f455c5d2e7a835b95941201387d2531b8682942d59827663b58341"
 
 post_extract() {
-	rmdir lib/signals
-	rmdir lib/settings
-	rmdir lib/humanize
-	rmdir lib/serialize
-	mv "${XBPS_BUILDDIR}/signals-${_signals_commit}/" lib/signals/
-	mv "${XBPS_BUILDDIR}/settings-${_settings_commit}/" lib/settings/
-	mv "${XBPS_BUILDDIR}/humanize-${_humanize_commit}/" lib/humanize/
-	mv "${XBPS_BUILDDIR}/serialize-${_serialize_commit}/" lib/serialize/
-}
-
-pre_configure() {
-	# it wraps libcommuni in a namespace but void's binaries don't
-	find \( -name '*.cpp' -o -name '*.hpp' \) \
-		-exec sed -i "{}" -e 's/Communi::/::/g' \;
+	rmdir lib/WinToast lib/libcommuni lib/qBreakpad lib/serialize \
+	      lib/settings lib/signals lib/rapidjson lib/websocketpp  \
+	      lib/qtkeychain cmake/sanitizers-cmake
+	mv "${XBPS_BUILDDIR}/WinToast-${_WinToast_commit}" "lib/WinToast"
+	mv "${XBPS_BUILDDIR}/libcommuni-${_libcommuni_commit}" "lib/libcommuni"
+	mv "${XBPS_BUILDDIR}/qBreakpad-${_qBreakpad_commit}" "lib/qBreakpad"
+	mv "${XBPS_BUILDDIR}/serialize-${_serialize_commit}" "lib/serialize"
+	mv "${XBPS_BUILDDIR}/settings-${_settings_commit}" "lib/settings"
+	mv "${XBPS_BUILDDIR}/signals-${_signals_commit}" "lib/signals"
+	mv "${XBPS_BUILDDIR}/qtkeychain-${_qtkeychain_commit}" "lib/qtkeychain"
+	mv "${XBPS_BUILDDIR}/sanitizers-cmake-${_sanitizers_cmake_commit}" "cmake/sanitizers-cmake"
 }
 
 post_install() {

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR PATCH] [Updated] chatterino2: update to 2.3.4.
  2021-07-25 20:31 [PR PATCH] chatterino2: update to 2.3.3 33kk
@ 2021-08-05 18:36 ` 33kk
  2021-08-06 19:45 ` 33kk
  1 sibling, 0 replies; 17+ messages in thread
From: 33kk @ 2021-08-05 18:36 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1594 bytes --]

There is an updated pull request by 33kk against master on the void-packages repository

https://github.com/33kk/void-packages chatterino2
https://github.com/void-linux/void-packages/pull/32199

chatterino2: update to 2.3.4.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/32199.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chatterino2-32199.patch --]
[-- Type: text/x-diff, Size: 8872 bytes --]

From 67aaec547b50f033fa7887cae9f909fa6599f4d0 Mon Sep 17 00:00:00 2001
From: Marko <goncarmarko@gmail.com>
Date: Sun, 25 Jul 2021 23:07:26 +0300
Subject: [PATCH] chatterino2: update to 2.3.4.

---
 .../patches/0001-fix-desktop-icon-name.patch  | 13 +++
 .../patches/0001-use-system-deps.patch        | 58 ------------
 srcpkgs/chatterino2/template                  | 91 ++++++++++---------
 3 files changed, 59 insertions(+), 103 deletions(-)
 create mode 100644 srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
 delete mode 100644 srcpkgs/chatterino2/patches/0001-use-system-deps.patch

diff --git a/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch b/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
new file mode 100644
index 000000000000..1b0a6d6140e4
--- /dev/null
+++ b/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
@@ -0,0 +1,13 @@
+diff --git a/resources/com.chatterino.chatterino.desktop b/resources/com.chatterino.chatterino.desktop
+index 6ee45354..ece81f5c 100644
+--- 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
+ Exec=chatterino
+-Icon=chatterino
++Icon=com.chatterino.chatterino
+ Terminal=false
+ Categories=Network;InstantMessaging;
+ StartupWMClass=chatterino
diff --git a/srcpkgs/chatterino2/patches/0001-use-system-deps.patch b/srcpkgs/chatterino2/patches/0001-use-system-deps.patch
deleted file mode 100644
index 383c5ea23f43..000000000000
--- a/srcpkgs/chatterino2/patches/0001-use-system-deps.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git chatterino.pro chatterino.pro
-index d8b14bbe..f7657f06 100644
---- a/chatterino.pro
-+++ b/chatterino.pro
-@@ -12,10 +12,17 @@
- #  - BOOST_DIRECTORY (C:\local\boost\ by default) (Windows only)
-
- QT                += widgets core gui network multimedia svg concurrent
--CONFIG            += communi
--COMMUNI           += core model util
-
- INCLUDEPATH       += src/
-+# libcommuni
-+INCLUDEPATH       += /usr/include/qt5/Communi/IrcCore
-+INCLUDEPATH       += /usr/include/qt5/Communi/IrcModel
-+INCLUDEPATH       += /usr/include/qt5/Communi/IrcUtil
-+DEFINES           += IRC_SHARED
-+LIBS              += -lIrcCore -lIrcModel -lIrcUtil
-+# qtkeychain
-+INCLUDEPATH       += /usr/include/qt5keychain
-+LIBS              += -lqt5keychain
- TARGET             = chatterino
- TEMPLATE           = app
- PRECOMPILED_HEADER = src/PrecompiledHeader.hpp
-@@ -78,7 +85,6 @@ CONFIG(debug, debug|release) {
- include(lib/warnings.pri)
- include(lib/fmt.pri)
- include(lib/humanize.pri)
--include(lib/libcommuni.pri)
- include(lib/websocketpp.pri)
- include(lib/wintoast.pri)
- include(lib/signals.pri)
-@@ -86,7 +92,6 @@ include(lib/settings.pri)
- include(lib/serialize.pri)
- include(lib/winsdk.pri)
- include(lib/rapidjson.pri)
--include(lib/qtkeychain.pri)
-
- exists( $$OUT_PWD/conanbuildinfo.pri ) {
-     message("Using conan packages")
-diff --git src/common/Credentials.cpp src/common/Credentials.cpp
-index 87abecb9..5de78130 100644
---- a/src/common/Credentials.cpp
-+++ b/src/common/Credentials.cpp
-@@ -1,12 +1,12 @@
- #include "Credentials.hpp"
- 
- #include "debug/AssertInGuiThread.hpp"
--#include "keychain.h"
- #include "singletons/Paths.hpp"
- #include "singletons/Settings.hpp"
- #include "util/CombinePath.hpp"
- #include "util/Overloaded.hpp"
- 
-+#include <qt5keychain/keychain.h>
- #include <QSaveFile>
- #include <boost/variant.hpp>
- 
diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index f69730b3a9fe..0b38189a9c29 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -1,55 +1,56 @@
 # Template file for 'chatterino2'
 pkgname=chatterino2
-version=2.2.2
-revision=2
-_signals_commit=6665ccad90461c01b7fe704a98a835953d644156
-_settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450
-_humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be
-_serialize_commit=130ffc3ec722284ca454a1e70c5478a75f380144
-build_style=qmake
-configure_args="INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcCore
- INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcModel
- INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcUtil"
-hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
-makedepends="qt5-svg-devel qt5-multimedia-devel
- boost-devel rapidjson libcommuni-devel websocketpp
- qtkeychain-qt5-devel"
-short_desc="Qt-based twitch chat client"
-maintainer="Franc[e]sco <lolisamurai@tfwno.gf>"
-license="MIT"
+version=2.3.4
+revision=1
+_WinToast_commit="ce441336ef057576dfb377be754bc5357a04ff85"
+_libcommuni_commit="c613600e6a52e6d3166247a05205cf1c755d4868"
+_qBreakpad_commit="a4626c12e9ae6f02fc1ca7a4e399bd8307424103"
+_serialize_commit="7d37cbfd5ac3bfbe046118e1cec3d32ba4696469"
+_settings_commit="7cf8431d644332107a51a46c1e3de70e64692f0c"
+_signals_commit="baf5bb04bd13b090e405e0447c89a811f7e23ddc"
+_qtkeychain_commit="de954627363b0b4bff9a2616f1a409b7e14d5df9"
+_sanitizers_cmake_commit="99e159ec9bc8dd362b08d18436bd40ff0648417b"
+build_style=cmake
+hostmakedepends="qt5-host-tools"
+makedepends="qt5-tools-devel qt5-multimedia-devel qt5-svg-devel
+ boost-devel openssl-devel rapidjson websocketpp"
+depends="qt5-imageformats qt5-svg"
+short_desc="Chat client for twitch.tv"
+maintainer="33KK <g33kk@pm.me>"
+license=MIT
 homepage="https://chatterino.com"
 changelog="https://chatterino.com/changelog"
-distfiles="https://github.com/fourtf/chatterino2/archive/v${version}.tar.gz
- https://github.com/pajlada/signals/archive/${_signals_commit}.tar.gz
+distfiles="https://github.com/Chatterino/chatterino2/archive/refs/tags/v${version}.tar.gz
+ https://github.com/mohabouje/WinToast/archive/${_WinToast_commit}.tar.gz
+ https://github.com/Chatterino/libcommuni/archive/${_libcommuni_commit}.tar.gz
+ https://github.com/jiakuan/qBreakpad/archive/${_qBreakpad_commit}.tar.gz
+ https://github.com/pajlada/serialize/archive/${_serialize_commit}.tar.gz
  https://github.com/pajlada/settings/archive/${_settings_commit}.tar.gz
- https://github.com/pajlada/humanize/archive/${_humanize_commit}.tar.gz
- https://github.com/pajlada/serialize/archive/${_serialize_commit}.tar.gz"
-checksum="6e3d64f319728ccf9fd09613df754108157e7d3b4148ee2da1a3209bf369be70
-e8755e68ff6fc39b4338d424ee9aed2ed5a8eab6eb37af69de2ff21b8dc94e66
-f387cc7eaf27dec462bc85a212619f8086167cf0b47e11825b8580d35a740dfe
-5a5cd8338fcb0a14a4bbe0840f83505d0444a9000956145e85e5550feeb744b0
-eb492b89e67f4ec632bd43f2701d53e355f1d1afbec3cd3af5891c1a6aaaa454"
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+=" libatomic-devel"
-	configure_args+=" LIBS+=-latomic"
-fi
+ https://github.com/pajlada/signals/archive/${_signals_commit}.tar.gz
+ https://github.com/Chatterino/qtkeychain/archive/${_qtkeychain_commit}.tar.gz
+ https://github.com/arsenm/sanitizers-cmake/archive/${_sanitizers_cmake_commit}.tar.gz"
+checksum="27d42138d48d807340fe4194b4cdada6183b0ff2127f24d39032b3ad1f66594c
+ 992bf522752261eda3167ef85901f41f0dd090ee40edcdf782b56a049715139f
+ ba2179eb43638366ca65214137a850a127fb93a36fcc54658649c34e8d6f7dc4
+ 6b7a725b77deb9be2357ef9bdfed872b48f295aa1bb41ab6aa9e3aa09cc67f84
+ d0da2cebd5dfd7b20f7247f1e4fb6b8a866434db49316a067b6c798ec8217c63
+ 0b35eb297f0949f27b3c54bc66d8b0c9293102fb52838d12371a5fcc80c590e5
+ 7ffd43dbd05704af5bef64b0eae8c12174013d4c7105472019ef381ff82c0a46
+ 4fdd7fd8bbae4fd7a505c917facc6e6b838850cd4f016c30fae45535dbaab4b7
+ f9cf386638f455c5d2e7a835b95941201387d2531b8682942d59827663b58341"
 
 post_extract() {
-	rmdir lib/signals
-	rmdir lib/settings
-	rmdir lib/humanize
-	rmdir lib/serialize
-	mv "${XBPS_BUILDDIR}/signals-${_signals_commit}/" lib/signals/
-	mv "${XBPS_BUILDDIR}/settings-${_settings_commit}/" lib/settings/
-	mv "${XBPS_BUILDDIR}/humanize-${_humanize_commit}/" lib/humanize/
-	mv "${XBPS_BUILDDIR}/serialize-${_serialize_commit}/" lib/serialize/
-}
-
-pre_configure() {
-	# it wraps libcommuni in a namespace but void's binaries don't
-	find \( -name '*.cpp' -o -name '*.hpp' \) \
-		-exec sed -i "{}" -e 's/Communi::/::/g' \;
+	rmdir lib/WinToast lib/libcommuni lib/qBreakpad lib/serialize \
+	      lib/settings lib/signals lib/rapidjson lib/websocketpp  \
+	      lib/qtkeychain cmake/sanitizers-cmake
+	mv "${XBPS_BUILDDIR}/WinToast-${_WinToast_commit}" "lib/WinToast"
+	mv "${XBPS_BUILDDIR}/libcommuni-${_libcommuni_commit}" "lib/libcommuni"
+	mv "${XBPS_BUILDDIR}/qBreakpad-${_qBreakpad_commit}" "lib/qBreakpad"
+	mv "${XBPS_BUILDDIR}/serialize-${_serialize_commit}" "lib/serialize"
+	mv "${XBPS_BUILDDIR}/settings-${_settings_commit}" "lib/settings"
+	mv "${XBPS_BUILDDIR}/signals-${_signals_commit}" "lib/signals"
+	mv "${XBPS_BUILDDIR}/qtkeychain-${_qtkeychain_commit}" "lib/qtkeychain"
+	mv "${XBPS_BUILDDIR}/sanitizers-cmake-${_sanitizers_cmake_commit}" "cmake/sanitizers-cmake"
 }
 
 post_install() {

^ permalink raw reply	[flat|nested] 17+ messages in thread

end of thread, other threads:[~2022-04-02 21:59 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-16 12:15 [PR PATCH] chatterino2: update to 2.3.4 tibequadorian
2022-03-16 12:56 ` [PR PATCH] [Updated] " tibequadorian
2022-03-16 12:57 ` tibequadorian
2022-03-16 12:58 ` tibequadorian
2022-03-16 13:19 ` tibequadorian
2022-03-20 22:44 ` [PR REVIEW] " paper42
2022-03-28 17:28 ` [PR PATCH] [Updated] " tibequadorian
2022-03-28 17:35 ` [PR REVIEW] " tibequadorian
2022-03-28 17:51 ` tibequadorian
2022-03-28 17:51 ` tibequadorian
2022-03-28 18:02 ` [PR PATCH] [Updated] " tibequadorian
2022-03-28 18:05 ` [PR REVIEW] " tibequadorian
2022-03-28 18:05 ` tibequadorian
2022-04-02 21:38 ` [PR PATCH] [Merged]: " paper42
2022-04-02 21:59 ` tibequadorian
  -- strict thread matches above, loose matches on Subject: below --
2021-07-25 20:31 [PR PATCH] chatterino2: update to 2.3.3 33kk
2021-08-05 18:36 ` [PR PATCH] [Updated] chatterino2: update to 2.3.4 33kk
2021-08-06 19:45 ` 33kk

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).