[arch-commits] Commit in yelp/repos/gnome-unstable-x86_64 (4 files)

[Jan Steffens]

    Date: Saturday, April 2, 2022 @ 23:31:41
  Author: heftig
Revision: 441367

archrelease: copy trunk to gnome-unstable-x86_64

Added:
  yelp/repos/gnome-unstable-x86_64/PKGBUILD
    (from rev 441365, yelp/trunk/PKGBUILD)
  yelp/repos/gnome-unstable-x86_64/no-gtk-doc.diff
    (from rev 441365, yelp/trunk/no-gtk-doc.diff)
Deleted:
  yelp/repos/gnome-unstable-x86_64/PKGBUILD
  yelp/repos/gnome-unstable-x86_64/no-gtk-doc.diff

-----------------+
 PKGBUILD        |   91 +++++++++++++++++++++++++++---------------------------
 no-gtk-doc.diff |   74 +++++++++++++++++++++----------------------
 2 files changed, 83 insertions(+), 82 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-04-02 23:31:40 UTC (rev 441366)
+++ PKGBUILD	2022-04-02 23:31:41 UTC (rev 441367)
@@ -1,45 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
-# Contributor: Jan de Groot <jgc at archlinux.org>
-
-pkgname=yelp
-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 libhandy)
-makedepends=(itstool autoconf-archive git appstream-glib)
-groups=(gnome)
-_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 yelp
-  git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
-  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 yelp
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-static --enable-compile-warnings=minimum
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  make
-}
-
-package() {
-  cd yelp
-  make DESTDIR="$pkgdir" install
-}

Copied: yelp/repos/gnome-unstable-x86_64/PKGBUILD (from rev 441365, yelp/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-04-02 23:31:41 UTC (rev 441367)
@@ -0,0 +1,46 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+
+pkgname=yelp
+pkgver=42.1
+pkgrel=2
+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 libhandy)
+makedepends=(itstool autoconf-archive git appstream-glib)
+groups=(gnome)
+options=(debug)
+_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 yelp
+  git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
+}
+
+prepare() {
+  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 yelp
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+    --disable-static --enable-compile-warnings=minimum
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+  make
+}
+
+package() {
+  cd yelp
+  make DESTDIR="$pkgdir" install
+}

Deleted: no-gtk-doc.diff
===================================================================
--- no-gtk-doc.diff	2022-04-02 23:31:40 UTC (rev 441366)
+++ no-gtk-doc.diff	2022-04-02 23:31:41 UTC (rev 441367)
@@ -1,37 +0,0 @@
-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}

Copied: yelp/repos/gnome-unstable-x86_64/no-gtk-doc.diff (from rev 441365, yelp/trunk/no-gtk-doc.diff)
===================================================================
--- no-gtk-doc.diff	                        (rev 0)
+++ no-gtk-doc.diff	2022-04-02 23:31:41 UTC (rev 441367)
@@ -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}