From: Paul Bredbury <brebs@sent.com>
To: alpine-aports@lists.alpinelinux.org
Cc: Paul Bredbury <brebs@sent.com>
Subject: [alpine-aports] [PATCH] testing/cherrytree: upgrade to 0.38.8
Date: Wed, 20 Mar 2019 21:23:09 +0000
Message-Id: <20190320212309.5484-1-brebs@sent.com>
Precedence: list
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

Use patch instead of sed, for clarity.
---
 testing/cherrytree/APKBUILD                       | 15 +++++----------
 .../update-desktop-database-removal.patch         | 10 ++++++++++
 2 files changed, 15 insertions(+), 10 deletions(-)
 create mode 100644 testing/cherrytree/update-desktop-database-removal.patch

diff --git a/testing/cherrytree/APKBUILD b/testing/cherrytree/APKBUILD
index 1507efd44c..52f9d7b84b 100644
--- a/testing/cherrytree/APKBUILD
+++ b/testing/cherrytree/APKBUILD
@@ -1,6 +1,6 @@
 # Contributor: Paul Bredbury <brebs@sent.com>
 pkgname=cherrytree
-pkgver=0.38.7
+pkgver=0.38.8
 pkgrel=0
 pkgdesc="Hierarchical note-taking app featuring rich text"
 url="https://www.giuspen.com/cherrytree/"
@@ -9,17 +9,11 @@ license="GPL-3.0-or-later"
 depends="py-dbus py-gtk py-pygtksourceview2"
 makedepends="gettext"
 subpackages="$pkgname-doc $pkgname-lang"
-source="https://www.giuspen.com/software/$pkgname-$pkgver.tar.xz"
+source="https://www.giuspen.com/software/$pkgname-$pkgver.tar.xz
+	update-desktop-database-removal.patch"
 options="!check" # No test suite
 builddir="$srcdir/$pkgname-$pkgver"
 
-prepare() {
-	default_prepare
-
-	# Run by desktop-file-utils.trigger instead
-	sed -e "/subprocess.*update-desktop-database/d" -i setup.py
-}
-
 build() {
 	cd "$builddir"
 	python2 setup.py build
@@ -30,4 +24,5 @@ package() {
 	python2 setup.py install --prefix=/usr --root="$pkgdir"
 }
 
-sha512sums="3b52b0a5f1bc7d2aa5eb7622c31ded85f7cf1c0361f9bfa1842c7a07f8f3fb694b27f8d6fe8486482bf293b0300a383cf02ba2dc79d520a1862ae439a17cc371  cherrytree-0.38.7.tar.xz"
+sha512sums="0ba188c93ce8c3eee73f7c8622872305df95c2c545d1bfd486af744229d6edc166ac6a9e10621d059a245d01b5458ad6dd8efdfdb9265cef0028f2426cfd1f72  cherrytree-0.38.8.tar.xz
+d56dbb037c9205d038892bd4d7fd48ff4406162a1114ab7b9991b76f974fb683e1d3ddc3bfaa37214269c032c2908ec00e5ad17e2c6439a280eff8881e291428  update-desktop-database-removal.patch"
diff --git a/testing/cherrytree/update-desktop-database-removal.patch b/testing/cherrytree/update-desktop-database-removal.patch
new file mode 100644
index 0000000000..80275f2302
--- /dev/null
+++ b/testing/cherrytree/update-desktop-database-removal.patch
@@ -0,0 +1,10 @@
+Run by Alpine's desktop-file-utils.trigger instead
+
+diff -Naur a/setup.py b/setup.py
+--- a/setup.py	2019-01-02 08:01:06.000000000 +0000
++++ b/setup.py	2019-03-20 21:12:53.570596428 +0000
+@@ -205,4 +205,3 @@
+           },
+        distclass=CherryTreeDist
+     )
+-    subprocess.call("update-desktop-database")
-- 
2.21.0



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---