From 46f7f2407e4bfdca0e80b6e0e370686d8a012310fdc456b424fbb8e5c0e3b18e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Tue, 28 Sep 2021 15:02:28 +0000 Subject: [PATCH 1/2] Accepting request 922018 from GNOME:Next Update to 2.46.1 - build succeeds in GNOME:Factory (fails with new pango in :Next) OBS-URL: https://build.opensuse.org/request/show/922018 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/pangomm1_4?expand=0&rev=14 --- pangomm-2.46.0.tar.xz | 3 --- pangomm-2.46.1.tar.xz | 3 +++ pangomm1_4.changes | 11 ++++++++++- pangomm1_4.spec | 3 ++- 4 files changed, 15 insertions(+), 5 deletions(-) delete mode 100644 pangomm-2.46.0.tar.xz create mode 100644 pangomm-2.46.1.tar.xz diff --git a/pangomm-2.46.0.tar.xz b/pangomm-2.46.0.tar.xz deleted file mode 100644 index 38a662a..0000000 --- a/pangomm-2.46.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d3787d04d6198b606f3efa357b3b452a7140e2a7dee56f9f9ce516d7d5fcec1b -size 672008 diff --git a/pangomm-2.46.1.tar.xz b/pangomm-2.46.1.tar.xz new file mode 100644 index 0000000..a79c3fd --- /dev/null +++ b/pangomm-2.46.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c885013fe61a4c5117fda395770d507563411c63e49f4a3aced4c9efe34d9975 +size 672952 diff --git a/pangomm1_4.changes b/pangomm1_4.changes index 68adf1c..051f3db 100644 --- a/pangomm1_4.changes +++ b/pangomm1_4.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Sep 28 14:22:14 UTC 2021 - Dominique Leuenberger + +- Update to version 2.46.1: + + Meson build: + - Make it possible to use pangomm as a subproject. + - No implicit_include_directories. + - Use relative paths to untracked/. + + pangommconfig.h.*: Don't dllimport on MinGW. + ------------------------------------------------------------------- Wed Jan 27 13:58:48 UTC 2021 - Bjørn Lie @@ -28,7 +38,6 @@ Fri Dec 18 19:00:24 UTC 2020 - Bjørn Lie - Meson build: Set default value of the 'warnings' option to 'min' - Improve NMake support - - - Improve Visual Studio support - docs/reference/: Update for Doxygen >= 1.8.16 - Meson build: Fix versioning on macOS diff --git a/pangomm1_4.spec b/pangomm1_4.spec index 93acef5..56793c7 100644 --- a/pangomm1_4.spec +++ b/pangomm1_4.spec @@ -21,7 +21,7 @@ %define _name pangomm Name: pangomm1_4 -Version: 2.46.0 +Version: 2.46.1 Release: 0 Summary: C++ interface for pango License: GPL-2.0-or-later AND LGPL-2.0-or-later @@ -68,6 +68,7 @@ pangomm provides a C++ interface to the pango library. %prep %autosetup -p1 -n %{_name}-%{version} +chmod -x NEWS %build %meson \ From 96371723efc578b7bc5891b0af8ebde9bef9a2ec19b0ff6d3a4ee3eebdf5dcde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Tue, 28 Sep 2021 15:36:39 +0000 Subject: [PATCH 2/2] Accepting request 922030 from GNOME:Next - Add pangomm1_4-docs-without-timestamp.patch: do not add timestampt to generated doc files. OBS-URL: https://build.opensuse.org/request/show/922030 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/pangomm1_4?expand=0&rev=15 --- pangomm1_4-docs-without-timestamp.patch | 13 +++++++++++++ pangomm1_4.changes | 6 ++++++ pangomm1_4.spec | 3 ++- 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 pangomm1_4-docs-without-timestamp.patch diff --git a/pangomm1_4-docs-without-timestamp.patch b/pangomm1_4-docs-without-timestamp.patch new file mode 100644 index 0000000..ae56b41 --- /dev/null +++ b/pangomm1_4-docs-without-timestamp.patch @@ -0,0 +1,13 @@ +Index: pangomm-2.46.1/docs/reference/Doxyfile.in +=================================================================== +--- pangomm-2.46.1.orig/docs/reference/Doxyfile.in ++++ pangomm-2.46.1/docs/reference/Doxyfile.in +@@ -164,7 +164,7 @@ HTML_EXTRA_FILES = + 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/pangomm1_4.changes b/pangomm1_4.changes index 051f3db..269f944 100644 --- a/pangomm1_4.changes +++ b/pangomm1_4.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Sep 28 15:33:55 UTC 2021 - Dominique Leuenberger + +- Add pangomm1_4-docs-without-timestamp.patch: do not add + timestampt to generated doc files. + ------------------------------------------------------------------- Tue Sep 28 14:22:14 UTC 2021 - Dominique Leuenberger diff --git a/pangomm1_4.spec b/pangomm1_4.spec index 56793c7..b2debcb 100644 --- a/pangomm1_4.spec +++ b/pangomm1_4.spec @@ -29,7 +29,8 @@ Group: Development/Libraries/C and C++ URL: http://www.gtkmm.org Source0: https://download.gnome.org/sources/pangomm/2.46/%{_name}-%{version}.tar.xz Source99: baselibs.conf - +# PATCH-FIX-OPENSUSE pangomm1_4-docs-without-timestamp.patch dimstar@opensuse.org -- Do not add timestamps to generated doc files +Patch0: pangomm1_4-docs-without-timestamp.patch BuildRequires: c++_compiler BuildRequires: doxygen BuildRequires: fdupes