glibmm-2.68: update to 2.70.0

Remove upstream glibmm-2.66.1-no-export-deleted-methods.patch file.
This commit is contained in:
Biswapriyo Nath
2021-12-14 21:34:28 +05:30
parent 638f93117c
commit 4bd98087f5
2 changed files with 4 additions and 22 deletions

View File

@@ -3,8 +3,8 @@
_realname=glibmm
pkgbase=mingw-w64-${_realname}-2.68
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-2.68"
pkgver=2.68.1
pkgrel=2
pkgver=2.70.0
pkgrel=1
provides=("${MINGW_PACKAGE_PREFIX}-${_realname}268")
conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}268")
replaces=("${MINGW_PACKAGE_PREFIX}-${_realname}268")
@@ -18,17 +18,12 @@ depends=("${MINGW_PACKAGE_PREFIX}-glib2"
makedepends=("${MINGW_PACKAGE_PREFIX}-meson"
"${MINGW_PACKAGE_PREFIX}-pkg-config")
options=('strip' '!debug' 'staticlibs')
source=("https://download.gnome.org/sources/glibmm/${pkgver%.*}/${_realname}-${pkgver}.tar.xz"
"glibmm-2.66.1-no-export-deleted-methods.patch")
sha256sums=('6664e27c9a9cca81c29e35687f49f2e0d173a2fc9e98c3428311f707db532f8c'
'a4ff330529d457b5be05eeab31d0cba5bc073b35b8c05ac5ab1dffb3a79d3751')
source=("https://download.gnome.org/sources/glibmm/${pkgver%.*}/${_realname}-${pkgver}.tar.xz")
sha256sums=('8008fd8aeddcc867a3f97f113de625f6e96ef98cf7860379813a9c0feffdb520')
prepare() {
cd "${srcdir}/glibmm-${pkgver}"
# work around error building under clang
# https://gitlab.gnome.org/GNOME/glibmm/-/issues/92
patch -Np1 -i "${srcdir}/glibmm-2.66.1-no-export-deleted-methods.patch"
}
build() {

View File

@@ -1,13 +0,0 @@
--- glibmm-2.66.1/glib/glibmm/ustring.h.orig 2021-05-30 14:58:12.510847400 -0700
+++ glibmm-2.66.1/glib/glibmm/ustring.h 2021-05-30 14:58:43.260848700 -0700
@@ -1076,8 +1076,8 @@
{
public:
// noncopyable
- GLIBMM_API FormatStream(const ustring::FormatStream&) = delete;
- GLIBMM_API FormatStream& operator=(const ustring::FormatStream&) = delete;
+ FormatStream(const ustring::FormatStream&) = delete;
+ FormatStream& operator=(const ustring::FormatStream&) = delete;
private:
#ifdef GLIBMM_HAVE_WIDE_STREAM