From c6114cf8c62afb6a2f37474a3f6e26cbb740cc990d385100b92ff651d04acc17 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 29 Sep 2021 07:18:45 +0000 Subject: [PATCH] Accepting request 922072 from GNOME:Next New stable rel OBS-URL: https://build.opensuse.org/request/show/922072 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glibmm2_4?expand=0&rev=32 --- glibmm-2.66.0.tar.xz | 3 --- glibmm-2.66.1.tar.xz | 3 +++ glibmm2_4-docs-without-timestamp.patch | 11 +++++++++++ glibmm2_4.changes | 27 ++++++++++++++++++++++++++ glibmm2_4.spec | 6 +++++- 5 files changed, 46 insertions(+), 4 deletions(-) delete mode 100644 glibmm-2.66.0.tar.xz create mode 100644 glibmm-2.66.1.tar.xz create mode 100644 glibmm2_4-docs-without-timestamp.patch diff --git a/glibmm-2.66.0.tar.xz b/glibmm-2.66.0.tar.xz deleted file mode 100644 index 005e8e5..0000000 --- a/glibmm-2.66.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9e1db7d43d2e2d4dfa2771354e21a69a6beec7c446b711619cf8c779e13a581e -size 7507608 diff --git a/glibmm-2.66.1.tar.xz b/glibmm-2.66.1.tar.xz new file mode 100644 index 0000000..05eecc3 --- /dev/null +++ b/glibmm-2.66.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:69bd6b5327716ca2f511ab580a969fd7bf0cd2c24ce15e1d0e530592d3ff209c +size 7509820 diff --git a/glibmm2_4-docs-without-timestamp.patch b/glibmm2_4-docs-without-timestamp.patch new file mode 100644 index 0000000..85905ae --- /dev/null +++ b/glibmm2_4-docs-without-timestamp.patch @@ -0,0 +1,11 @@ +--- orig-glibmm-2.66.1/docs/reference/Doxyfile.in 2021-05-20 18:31:25.319179000 +0200 ++++ glibmm-2.66.1/docs/reference/Doxyfile.in 2021-09-28 23:11:08.324798586 +0200 +@@ -174,7 +174,7 @@ + HTML_COLORSTYLE_HUE = 220 + HTML_COLORSTYLE_SAT = 100 + HTML_COLORSTYLE_GAMMA = 80 +-HTML_TIMESTAMP = YES ++HTML_TIMESTAMP = NO + HTML_DYNAMIC_SECTIONS = NO + HTML_INDEX_NUM_ENTRIES = 100 + GENERATE_DOCSET = NO diff --git a/glibmm2_4.changes b/glibmm2_4.changes index fad4053..45c3e9f 100644 --- a/glibmm2_4.changes +++ b/glibmm2_4.changes @@ -1,3 +1,30 @@ +------------------------------------------------------------------- +Tue Sep 28 20:56:41 UTC 2021 - Bjørn Lie + +- Update to version 2.66.1: + + Glib: Variant: Fix template constructors so they work with + C++20. + + Build: + - Meson build: + . Use relative paths to untracked/ + . examples and tests: Add dependency('threads') + . Make it possible to use glibmm as a subproject + . No implicit_include_directories + . Make quiet installations possible + - MSVC build: + . Export Glib::manage() + . Avoid exporting classes with std::string members + - [gio|glib]mmconfig.h.*: Don't dllimport on MinGW +- Add glibmm2_4-docs-without-timestamp.patch: Do not add timestamps + to generated doc files. + +------------------------------------------------------------------- +Tue Sep 28 16:57:08 UTC 2021 - Dominique Leuenberger + +- Add m4 BuildRequires: the generated gmmproc actually stores the + path to m4, as detected during build. Subsequent builds of other + *mm modules from git need a working setup for this. + ------------------------------------------------------------------- Wed Jan 27 14:20:13 UTC 2021 - Bjørn Lie diff --git a/glibmm2_4.spec b/glibmm2_4.spec index 6037db8..f5123ff 100644 --- a/glibmm2_4.spec +++ b/glibmm2_4.spec @@ -20,7 +20,7 @@ %define so_ver -2_4-1 %define _name glibmm Name: glibmm2_4 -Version: 2.66.0 +Version: 2.66.1 Release: 0 Summary: C++ Interface for Glib License: LGPL-2.1-or-later @@ -28,11 +28,14 @@ Group: Development/Libraries/C and C++ URL: http://www.gtkmm.org/ Source0: https://download.gnome.org/sources/glibmm/2.66/%{_name}-%{version}.tar.xz Source99: baselibs.conf +# PATCH-FIX-UPSTREAM glibmm2_4-docs-without-timestamp.patch -- Do not add timestamps to generated doc files +Patch0: glibmm2_4-docs-without-timestamp.patch BuildRequires: doxygen BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: graphviz-devel +BuildRequires: m4 BuildRequires: meson BuildRequires: pkgconfig BuildRequires: xsltproc @@ -89,6 +92,7 @@ C++ and makes it possible for gtkmm to wrap GObject-based APIs. %prep %autosetup -p1 -n %{_name}-%{version} +chmod -x NEWS %build %meson \