[arch-commits] Commit in bless/trunk (PKGBUILD scrollkeeper.patch)

[Balló György]

    Date: Wednesday, July 22, 2020 @ 12:28:18
  Author: bgyorgy
Revision: 664830

upgpkg: bless 0.6.2-4: Remove unneeded rarian makedependency

Added:
  bless/trunk/scrollkeeper.patch
Modified:
  bless/trunk/PKGBUILD

--------------------+
 PKGBUILD           |   13 ++++++++-----
 scrollkeeper.patch |   30 ++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-22 12:07:47 UTC (rev 664829)
+++ PKGBUILD	2020-07-22 12:28:18 UTC (rev 664830)
@@ -6,23 +6,26 @@
 
 pkgname=bless
 pkgver=0.6.2
-pkgrel=3
+pkgrel=4
 pkgdesc="High-quality, full-featured hex editor"
 arch=('any')
 url="https://github.com/afrantzis/bless"
 license=('GPL')
 depends=('gtk-sharp-2')
-makedepends=('rarian' 'automake' 'patch')
 source=(${pkgname}-${pkgver}.tar.gz::"https://github.com/afrantzis/bless/archive/v${pkgver}.tar.gz"
-        "fix-20.patch")
+        "fix-20.patch"
+        "scrollkeeper.patch")
 sha256sums=('1a9a38ec8d29e4cd3991413087a11a935577419ae9d5469edafc18cba157f827'
-            'e6cc5ae6a63d185721e1273e0336a52ec5130f1dbc238672a2a697fc84498c45')
+            'e6cc5ae6a63d185721e1273e0336a52ec5130f1dbc238672a2a697fc84498c45'
+            '14458361070617befc1f540b426fcfcf13a6d015c7ac1c9965b8565429f2ab74')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
+  patch -Np1 -i "${srcdir}/fix-20.patch"
+  patch -Np1 -i "${srcdir}/scrollkeeper.patch"
+
   ./autogen.sh
-  patch -Np1 -i "${srcdir}/fix-20.patch"
 }
 
 build() {

Added: scrollkeeper.patch
===================================================================
--- scrollkeeper.patch	                        (rev 0)
+++ scrollkeeper.patch	2020-07-22 12:28:18 UTC (rev 664830)
@@ -0,0 +1,30 @@
+From e6d923235d6f22e8270df41e168227647ddfdce8 Mon Sep 17 00:00:00 2001
+From: BEN ENGLISCH <EMAILBEN145 at gmail.com>
+Date: Mon, 29 Apr 2019 22:27:51 -0500
+Subject: [PATCH] Fix scrollkeeper check
+
+---
+ doc/user/Makefile.am | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/doc/user/Makefile.am b/doc/user/Makefile.am
+index 729b295..3477fa0 100644
+--- a/doc/user/Makefile.am
++++ b/doc/user/Makefile.am
+@@ -9,11 +9,11 @@ noinst_SCRIPTS=$(OMF)
+ 
+ 
+ $(OMF): $(OMF).in
+-	if [ -x `which scrollkeeper-preinstall` ]; then \
+-	    scrollkeeper-preinstall file:$(datadir)/doc/$(PACKAGE_NAME)/user/bless-manual.xml $(OMF).in $(OMF); \
+-	else \
+-	    cp $(OMF).in $(OMF); \
+-	fi
++if WITH_SCROLLKEEPER
++	scrollkeeper-preinstall file:$(datadir)/doc/$(PACKAGE_NAME)/user/bless-manual.xml $(OMF).in $(OMF)
++else
++	cp $(OMF).in $(OMF)
++endif
+ 
+ doc:
+ 	xsltproc /usr/share/xml/docbook/stylesheet/nwalsh/html/chunk.xsl bless-manual.xml