[arch-commits] Commit in yelp/trunk (PKGBUILD no-gtk-doc.diff)

[Jan Steffens]

    Date: Saturday, April 2, 2022 @ 13:23:22
  Author: heftig
Revision: 441243

42.1-1

Added:
  yelp/trunk/no-gtk-doc.diff
Modified:
  yelp/trunk/PKGBUILD

-----------------+
 PKGBUILD        |   28 +++++++++++++++++-----------
 no-gtk-doc.diff |   37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-04-02 13:18:34 UTC (rev 441242)
+++ PKGBUILD	2022-04-02 13:23:22 UTC (rev 441243)
@@ -2,38 +2,44 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 
 pkgname=yelp
-pkgver=41.2
+pkgver=42.1
 pkgrel=1
 pkgdesc="Get help with GNOME"
 url="https://wiki.gnome.org/Apps/Yelp"
 license=(GPL)
 arch=(x86_64)
-depends=(webkit2gtk-4.1 yelp-xsl libxslt xz bzip2)
-makedepends=(gtk-doc itstool autoconf-archive git appstream-glib)
+depends=(webkit2gtk-4.1 yelp-xsl libxslt xz bzip2 libhandy)
+makedepends=(itstool autoconf-archive git appstream-glib)
 groups=(gnome)
-_commit=72d73437a3d444739d722e580153f2dd8ee50f1d  # tags/41.2^0
-source=("git+https://gitlab.gnome.org/GNOME/yelp.git#commit=$_commit")
-sha256sums=('SKIP')
+_commit=d16114cb46e4de07e6d1c0511ef8d6e1921e023e  # tags/42.1^0
+source=("git+https://gitlab.gnome.org/GNOME/yelp.git#commit=$_commit"
+        no-gtk-doc.diff)
+sha256sums=('SKIP'
+            'adbc49d20ee3055cd38f2ec739b2de7b1710e306cfae09eafc5fe57e63d84e40')
 
 pkgver() {
-  cd $pkgname
+  cd yelp
   git describe --tags | sed 's/-/+/g'
 }
 
 prepare() {
-  cd $pkgname
+  cd yelp
+
+  # Remove vestiges of docs build to allow building without gtk-doc
+  git apply -3 ../no-gtk-doc.diff
+
   NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
-  cd $pkgname
+  cd yelp
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-static --enable-gtk-doc --enable-compile-warnings=minimum
+    --disable-static --enable-compile-warnings=minimum
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }
 
 package() {
-  cd $pkgname
+  cd yelp
   make DESTDIR="$pkgdir" install
 }

Added: no-gtk-doc.diff
===================================================================
--- no-gtk-doc.diff	                        (rev 0)
+++ no-gtk-doc.diff	2022-04-02 13:23:22 UTC (rev 441243)
@@ -0,0 +1,37 @@
+diff --git i/configure.ac w/configure.ac
+index 908369d1..dff4911c 100644
+--- i/configure.ac
++++ w/configure.ac
+@@ -163,32 +163,28 @@ GLIB_GENMARSHAL="`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`"
+ AC_SUBST(GLIB_GENMARSHAL)
+ 
+ 
+-AX_REQUIRE_DEFINED([GTK_DOC_CHECK])
+-GTK_DOC_CHECK([1.13],[--flavour no-tmpl])
+-
+ AC_CONFIG_FILES([
+ Makefile
+ data/dtd/catalog
+ data/xslt/db2html.xsl
+ data/xslt/info2html.xsl
+ data/xslt/links2html.xsl
+ data/xslt/mal2html.xsl
+ data/xslt/man2html.xsl
+ data/xslt/yelp-common.xsl
+ po/Makefile.in
+ ])
+ 
+ AC_OUTPUT
+ 
+ dnl ==========================================================================
+ echo "
+ yelp-$VERSION:
+ 
+ 	prefix:                   ${prefix}
+ 	source code location:	  ${srcdir}
+ 	compiler:		  ${CC}
+ 
+-	Documentation:            ${enable_gtk_doc}
+ 	Debug enabled:            ${enable_debug}
+ 	Enable BZ2:               ${enable_bz2}
+ 	Enable LZMA:              ${enable_lzma}