[arch-commits] Commit in glibmm/repos/extra-x86_64 (3 files)

[Jan Steffens]

    Date: Wednesday, May 4, 2022 @ 12:48:00
  Author: heftig
Revision: 444608

archrelease: copy trunk to extra-x86_64

Added:
  glibmm/repos/extra-x86_64/PKGBUILD
    (from rev 444607, glibmm/trunk/PKGBUILD)
Deleted:
  glibmm/repos/extra-x86_64/0001-Revert-part-of-commit-94ab1e5359f3bd9eb8204aadea88e0.patch
  glibmm/repos/extra-x86_64/PKGBUILD

-----------------------------------------------------------------+
 0001-Revert-part-of-commit-94ab1e5359f3bd9eb8204aadea88e0.patch |   47 ---
 PKGBUILD                                                        |  118 ++++------
 2 files changed, 56 insertions(+), 109 deletions(-)

Deleted: 0001-Revert-part-of-commit-94ab1e5359f3bd9eb8204aadea88e0.patch
===================================================================
--- 0001-Revert-part-of-commit-94ab1e5359f3bd9eb8204aadea88e0.patch	2022-05-04 12:47:47 UTC (rev 444607)
+++ 0001-Revert-part-of-commit-94ab1e5359f3bd9eb8204aadea88e0.patch	2022-05-04 12:48:00 UTC (rev 444608)
@@ -1,47 +0,0 @@
-From 4bd41b51ff2a8dec070cb061df3c94083ceea891 Mon Sep 17 00:00:00 2001
-From: Kjell Ahlstedt <kjellahlstedt at gmail.com>
-Date: Tue, 3 May 2022 16:01:19 +0200
-Subject: [PATCH] Revert part of commit
- 94ab1e5359f3bd9eb8204aadea88e08f52a291d8
-
-See glibmm#98
----
- glib/glibmm/ustring.h | 15 +++++++--------
- 1 file changed, 7 insertions(+), 8 deletions(-)
-
-diff --git a/glib/glibmm/ustring.h b/glib/glibmm/ustring.h
-index 8746ca6e..22d8abca 100644
---- a/glib/glibmm/ustring.h
-+++ b/glib/glibmm/ustring.h
-@@ -199,14 +199,7 @@ public:
-   using pointer = void;
- 
-   inline ustring_Iterator();
--  // A std::string::iterator can be copied to a std::string::const_iterator.
--  template <typename T2, typename = typename std::enable_if<
--    std::is_same<std::string::const_iterator, T>::value &&
--    std::is_same<std::string::iterator, T2>::value, T2>::type>
--  inline ustring_Iterator(const ustring_Iterator<T2>& other)
--  : pos_(other.base())
--  { }
--  ustring_Iterator(const ustring_Iterator& other) = default;
-+  inline ustring_Iterator(const ustring_Iterator<std::string::iterator>& other);
-   ustring_Iterator& operator=(const ustring_Iterator& other) = default;
- 
-   inline value_type operator*() const;
-@@ -1169,6 +1162,12 @@ inline ustring_Iterator<T>::ustring_Iterator() : pos_()
- {
- }
- 
-+template <class T>
-+inline ustring_Iterator<T>::ustring_Iterator(const ustring_Iterator<std::string::iterator>& other)
-+: pos_(other.base())
-+{
-+}
-+
- template <class T>
- inline typename ustring_Iterator<T>::value_type ustring_Iterator<T>::operator*() const
- {
--- 
-2.34.1
-

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-05-04 12:47:47 UTC (rev 444607)
+++ PKGBUILD	2022-05-04 12:48:00 UTC (rev 444608)
@@ -1,62 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
-# Contributor: Jan de Groot <jgc at archlinux.org>
-# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
-
-pkgbase=glibmm
-pkgname=(glibmm glibmm-docs)
-pkgver=2.66.3
-pkgrel=3
-pkgdesc="C++ bindings for GLib"
-url="https://www.gtkmm.org/"
-arch=(x86_64)
-license=(LGPL)
-depends=(glib2 libsigc++)
-makedepends=(git meson mm-common perl-xml-parser clang)
-checkdepends=(glib-networking)
-options=(!emptydirs debug)
-_commit=ccf78e04ac9d72d7f5c6b09a17204b2dfcbfd0df  # tags/2.66.3^0
-source=("git+https://gitlab.gnome.org/GNOME/glibmm.git#commit=$_commit"
-        0001-Revert-part-of-commit-94ab1e5359f3bd9eb8204aadea88e0.patch)
-sha256sums=('SKIP'
-            '654a7e25ff5d8d220c09ea5faa5725e26703c111870337106643799309879e91')
-
-pkgver() {
-  cd glibmm
-  git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
-}
-
-prepare() {
-  cd glibmm
-
-  # Unbreak Inkscape
-  # https://gitlab.gnome.org/GNOME/glibmm/-/issues/98
-  git apply -3 ../0001-Revert-part-of-commit-94ab1e5359f3bd9eb8204aadea88e0.patch
-}
-
-build() {
-  arch-meson glibmm build -D maintainer-mode=true
-  meson compile -C build
-}
-
-check() {
-  meson test -C build --print-errorlogs
-}
-
-package_glibmm() {
-  depends+=(libsigc-2.0.so)
-  provides=(libglibmm-2.4.so)
-
-  meson install -C build --destdir "$pkgdir"
-
-  # Split -docs
-  mkdir -p docs/usr/share
-  mv -t docs/usr/share "$pkgdir"/usr/share/{devhelp,doc}
-}
-
-package_glibmm-docs() {
-  pkgdesc+=" (documentation)"
-  depends=()
-  options=(!strip)
-
-  mv -t "$pkgdir" docs/*
-}

Copied: glibmm/repos/extra-x86_64/PKGBUILD (from rev 444607, glibmm/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-05-04 12:48:00 UTC (rev 444608)
@@ -0,0 +1,56 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+
+pkgbase=glibmm
+pkgname=(glibmm glibmm-docs)
+pkgver=2.66.4
+pkgrel=1
+pkgdesc="C++ bindings for GLib"
+url="https://www.gtkmm.org/"
+arch=(x86_64)
+license=(LGPL)
+depends=(glib2 libsigc++)
+makedepends=(git meson mm-common perl-xml-parser clang)
+checkdepends=(glib-networking)
+options=(!emptydirs debug)
+_commit=646ca2c15dd03f804b92e3d547f22aa999a21677  # tags/2.66.4^0
+source=("git+https://gitlab.gnome.org/GNOME/glibmm.git#commit=$_commit")
+sha256sums=('SKIP')
+
+pkgver() {
+  cd glibmm
+  git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
+}
+
+prepare() {
+  cd glibmm
+}
+
+build() {
+  arch-meson glibmm build -D maintainer-mode=true
+  meson compile -C build
+}
+
+check() {
+  meson test -C build --print-errorlogs
+}
+
+package_glibmm() {
+  depends+=(libsigc-2.0.so)
+  provides=(libglibmm-2.4.so)
+
+  meson install -C build --destdir "$pkgdir"
+
+  # Split -docs
+  mkdir -p docs/usr/share
+  mv -t docs/usr/share "$pkgdir"/usr/share/{devhelp,doc}
+}
+
+package_glibmm-docs() {
+  pkgdesc+=" (documentation)"
+  depends=()
+  options=(!strip)
+
+  mv -t "$pkgdir" docs/*
+}