From 5f2adc5d510f2e922de0de34e3fdcba7bbca891a Mon Sep 17 00:00:00 2001
From: Dudemanguy <dudemanguy@artixlinux.org>
Date: Fri, 9 Jul 2021 20:40:57 -0500
Subject: [PATCH] [trunk] -> [community-testing] 'cherrytree-0.99.38-1' add

---
 cherrytree/trunk/PKGBUILD                    | 14 ++++--
 cherrytree/x86_64/community-testing/PKGBUILD | 52 ++++++++++++++++++++
 2 files changed, 62 insertions(+), 4 deletions(-)
 create mode 100644 cherrytree/x86_64/community-testing/PKGBUILD

diff --git a/cherrytree/trunk/PKGBUILD b/cherrytree/trunk/PKGBUILD
index a19db1b..f0095db 100644
--- a/cherrytree/trunk/PKGBUILD
+++ b/cherrytree/trunk/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Morgenstern <charles [at] charlesbwise [dot] com>
 
 pkgname=cherrytree
-pkgver=0.99.37
+pkgver=0.99.38
 pkgrel=1
 pkgdesc="Hierarchical note-taking application"
 arch=('x86_64')
@@ -13,11 +13,17 @@ depends=('fmt' 'gspell' 'gtksourceviewmm' 'libxml++2.6' 'uchardet')
 
 makedepends=('cmake' 'python' 'spdlog')
 source=("${pkgname}-${pkgver}.tar.xz::https://www.giuspen.com/software/${pkgname}_${pkgver}.tar.xz"
-        "${pkgname}-${pkgver}.tar.xz.asc::https://www.giuspen.com/software/${pkgname}_${pkgver}.tar.xz.asc")
-sha512sums=('b455729b72a67ee63351807cd83aa06605d90f2c9ba1c89c75c150e7d06f57d8f321dd5c19a48f2c02ad8d4db03eb00a551ab9c74b5983ed46fba9be13f2d7a1'
-            'SKIP')
+        "${pkgname}-${pkgver}.tar.xz.asc::https://www.giuspen.com/software/${pkgname}_${pkgver}.tar.xz.asc"
+         cherrytree-fmt8.patch::https://github.com/giuspen/cherrytree/commit/674dc6d6.patch)
+sha512sums=('794e42a88c171fcc4b15129e3a12802d1516e257ef7d37734956b074e1ec4a086c2665a81d9ad266670c723fc40460861e66b19bc54bd8a94ce4cfc7c0944185'
+            'SKIP'
+            '3fed2caabcc0de7f64bdb354968cf7006093143507c5df8ecf5c7a386135129c6029104d24a5d006e247efd010914cd755af4b38e8e26fb637b140740d7e6902')
 validpgpkeys=('C7BF38CE0BD442C2369AA984049128A20CE0648D') # Giuseppe Penone <giuspen [at] gmail [dot] com>
 
+prepare() {
+  patch -d ${pkgname}_${pkgver} -p1 < cherrytree-fmt8.patch # Fix build with fmt 8
+}
+
 build() {
   cmake \
 	-B "${pkgname}_${pkgver}/build" \
diff --git a/cherrytree/x86_64/community-testing/PKGBUILD b/cherrytree/x86_64/community-testing/PKGBUILD
new file mode 100644
index 0000000..f0095db
--- /dev/null
+++ b/cherrytree/x86_64/community-testing/PKGBUILD
@@ -0,0 +1,52 @@
+# Maintainer: NicoHood <archlinux {cat} nicohood {dog} de>
+# PGP ID: 97312D5EB9D7AE7D0BD4307351DAE9B7C1AE9161
+# Contributor: Morgenstern <charles [at] charlesbwise [dot] com>
+
+pkgname=cherrytree
+pkgver=0.99.38
+pkgrel=1
+pkgdesc="Hierarchical note-taking application"
+arch=('x86_64')
+url="https://www.giuspen.com/cherrytree/"
+license=('GPL3')
+depends=('fmt' 'gspell' 'gtksourceviewmm' 'libxml++2.6' 'uchardet')
+
+makedepends=('cmake' 'python' 'spdlog')
+source=("${pkgname}-${pkgver}.tar.xz::https://www.giuspen.com/software/${pkgname}_${pkgver}.tar.xz"
+        "${pkgname}-${pkgver}.tar.xz.asc::https://www.giuspen.com/software/${pkgname}_${pkgver}.tar.xz.asc"
+         cherrytree-fmt8.patch::https://github.com/giuspen/cherrytree/commit/674dc6d6.patch)
+sha512sums=('794e42a88c171fcc4b15129e3a12802d1516e257ef7d37734956b074e1ec4a086c2665a81d9ad266670c723fc40460861e66b19bc54bd8a94ce4cfc7c0944185'
+            'SKIP'
+            '3fed2caabcc0de7f64bdb354968cf7006093143507c5df8ecf5c7a386135129c6029104d24a5d006e247efd010914cd755af4b38e8e26fb637b140740d7e6902')
+validpgpkeys=('C7BF38CE0BD442C2369AA984049128A20CE0648D') # Giuseppe Penone <giuspen [at] gmail [dot] com>
+
+prepare() {
+  patch -d ${pkgname}_${pkgver} -p1 < cherrytree-fmt8.patch # Fix build with fmt 8
+}
+
+build() {
+  cmake \
+	-B "${pkgname}_${pkgver}/build" \
+	-S "${pkgname}_${pkgver}" \
+  -DINSTALL_GTEST:BOOL='OFF' \
+	-DAUTO_RUN_TESTING:BOOL='OFF' \
+	-Wno-dev
+  make -C "${pkgname}_${pkgver}/build"
+}
+
+# NOTE: In order to run tests that depend on the X server in a clean chroot,
+# you must allow the chroot access your X server:
+# xhost +local:
+# https://wiki.archlinux.org/index.php/chroot#Run_graphical_applications_from_chroot
+
+# Skip these tests due to the chroot thing.
+#check() {
+#  export DISPLAY=:0
+#  cd "${pkgname}_${pkgver}"
+#  ./"${_pkgname}/build/run_tests_with_x_1"
+#  ./"${_pkgname}/build/run_tests_with_x_2"
+#}
+
+package() {
+  make -C "${pkgname}_${pkgver}/build" DESTDIR="${pkgdir}" install
+}