[arch-commits] Commit in glibmm/repos/extra-x86_64 (PKGBUILD PKGBUILD header.diff)

[Jan Steffens]

    Date: Wednesday, March 18, 2020 @ 17:57:58
  Author: heftig
Revision: 377870

archrelease: copy trunk to extra-x86_64

Added:
  glibmm/repos/extra-x86_64/PKGBUILD
    (from rev 377869, glibmm/trunk/PKGBUILD)
  glibmm/repos/extra-x86_64/header.diff
    (from rev 377869, glibmm/trunk/header.diff)
Deleted:
  glibmm/repos/extra-x86_64/PKGBUILD

-------------+
 PKGBUILD    |  106 ++++++++++++++++++++++++++++++++--------------------------
 header.diff |   13 +++++++
 2 files changed, 72 insertions(+), 47 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-18 17:56:46 UTC (rev 377869)
+++ PKGBUILD	2020-03-18 17:57:58 UTC (rev 377870)
@@ -1,47 +0,0 @@
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
-
-pkgbase=glibmm
-pkgname=(glibmm glibmm-docs)
-pkgver=2.62.0
-pkgrel=1
-pkgdesc="C++ bindings for GLib"
-url="https://www.gtkmm.org/"
-arch=(x86_64)
-license=(LGPL)
-depends=(glib2 libsigc++)
-makedepends=(git mm-common perl-xml-parser clang)
-_commit=ceff460bbfbca3acf60e6d35cf01961ff988177c  # tags/2.62.0^0
-source=("git+https://gitlab.gnome.org/GNOME/glibmm.git#commit=$_commit")
-sha256sums=('SKIP')
-
-pkgver() {
-  cd $pkgbase
-  git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
-  cd $pkgbase
-  NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
-  cd $pkgbase
-  ./configure --prefix=/usr --enable-maintainer-mode
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  make
-}
-
-package_glibmm() {
-  cd $pkgbase
-  sed -i -e '/^doc_subdirs/s/^/#/' Makefile
-  make DESTDIR="$pkgdir" install
-}
-
-package_glibmm-docs() {
-  pkgdesc+=" (documentation)"
-  depends=()
-
-  cd $pkgbase
-  make -C docs DESTDIR="$pkgdir" install
-}

Copied: glibmm/repos/extra-x86_64/PKGBUILD (from rev 377869, glibmm/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-03-18 17:57:58 UTC (rev 377870)
@@ -0,0 +1,59 @@
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+
+pkgbase=glibmm
+pkgname=(glibmm glibmm-docs)
+pkgver=2.64.0
+pkgrel=1
+pkgdesc="C++ bindings for GLib"
+url="https://www.gtkmm.org/"
+arch=(x86_64)
+license=(LGPL)
+depends=(glib2 libsigc++)
+makedepends=(git mm-common perl-xml-parser clang meson)
+checkdepends=(glib-networking)
+options=(!emptydirs)
+_commit=5e4b8f37de7110f4905ca11961dfe372151df095  # tags/2.64.0^0
+source=("git+https://gitlab.gnome.org/GNOME/glibmm.git#commit=$_commit"
+        header.diff)
+sha256sums=('SKIP'
+            'dd735cb3509bbb3400c150ab64f4791385df5393df3de964f0fcf548dd7d626c')
+
+pkgver() {
+  cd $pkgbase
+  git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+  cd $pkgbase
+
+  # Missing includes
+  git cherry-pick -n c6e078c3e7d457a9db39073af30af0c65b5145c1
+
+  # Missing header
+  git apply -3 ../header.diff
+}
+
+build() {
+  arch-meson $pkgbase build -D maintainer-mode=true
+  ninja -C build
+}
+
+check() {
+  meson test -C build --print-errorlogs
+}
+
+package_glibmm() {
+  DESTDIR="$pkgdir" meson install -C build
+
+  mkdir -p docs/usr/share
+  mv "$pkgdir"/usr/share/{devhelp,doc} docs/usr/share
+}
+
+package_glibmm-docs() {
+  pkgdesc+=" (documentation)"
+  depends=()
+  options=(!strip)
+
+  mv docs/* "$pkgdir"
+}

Copied: glibmm/repos/extra-x86_64/header.diff (from rev 377869, glibmm/trunk/header.diff)
===================================================================
--- header.diff	                        (rev 0)
+++ header.diff	2020-03-18 17:57:58 UTC (rev 377870)
@@ -0,0 +1,13 @@
+diff --git i/tools/extra_defs_gen/meson.build w/tools/extra_defs_gen/meson.build
+index 900943c9..239a543a 100644
+--- i/tools/extra_defs_gen/meson.build
++++ w/tools/extra_defs_gen/meson.build
+@@ -13,6 +13,8 @@ glibmm_generate_extra_defs_library = library(
+   install: true,
+ )
+ 
++install_headers('generate_extra_defs.h', subdir: glibmm_pcname / 'glibmm_generate_extra_defs')
++
+ executable('generate_defs_glib', 'generate_defs_glib.cc',
+   dependencies: glibmm_build_dep,
+   link_with: glibmm_generate_extra_defs_library,