From af429c65b7c18d771037cc0d886837f56834f97d80465df7f5d15dc36d8553b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Tue, 7 Dec 2021 10:20:37 +0000 Subject: [PATCH 1/2] Accepting request 935834 from GNOME:Next - Update to version 2.46.2: * Move to stable released tag, no code changes. - Update to version 2.46.1+7: * NMake Makefiles: Fix header installation * NMake Makefiles: Correct VS2019 toolset number * build: Support Visual Studio 2022 builds * docs/reference/Doxyfile.in: Remove obsolete entry * Don't include individual pango headers, part 2 * Don't include individual pango headers * Use pango from the main branch * 2.46.1 * Documentation: Let links point to pangomm-1.4 versions * Add dependencies to Doxygen tag files in subprojects - Switch to using a gitcheckout via source service. Pass maintainer-mode=true to meson and add m4, mm-common and perl(XML::Parser) BuildRequires, as this is needed with a git-checkout. OBS-URL: https://build.opensuse.org/request/show/935834 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/pangomm1_4?expand=0&rev=17 --- _service | 18 ++++++++++++++++++ _servicedata | 4 ++++ pangomm-2.46.1.tar.xz | 3 --- pangomm-2.46.2.obscpio | 3 +++ pangomm.obsinfo | 5 +++++ pangomm1_4.changes | 25 +++++++++++++++++++++++++ pangomm1_4.spec | 11 +++++++++-- 7 files changed, 64 insertions(+), 5 deletions(-) create mode 100644 _service create mode 100644 _servicedata delete mode 100644 pangomm-2.46.1.tar.xz create mode 100644 pangomm-2.46.2.obscpio create mode 100644 pangomm.obsinfo diff --git a/_service b/_service new file mode 100644 index 0000000..9d5ca9c --- /dev/null +++ b/_service @@ -0,0 +1,18 @@ + + + + git + https://gitlab.gnome.org/GNOME/pangomm.git + 2.46.2 + @PARENT_TAG@+@TAG_OFFSET@ + (.*)\+0 + \1 + enable + + + + *.tar + xz + + + diff --git a/_servicedata b/_servicedata new file mode 100644 index 0000000..7714afe --- /dev/null +++ b/_servicedata @@ -0,0 +1,4 @@ + + + https://gitlab.gnome.org/GNOME/pangomm.git + c531ef7cf5351ec14014da2480b2fd3e474eac00 \ No newline at end of file diff --git a/pangomm-2.46.1.tar.xz b/pangomm-2.46.1.tar.xz deleted file mode 100644 index a79c3fd..0000000 --- a/pangomm-2.46.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c885013fe61a4c5117fda395770d507563411c63e49f4a3aced4c9efe34d9975 -size 672952 diff --git a/pangomm-2.46.2.obscpio b/pangomm-2.46.2.obscpio new file mode 100644 index 0000000..53a4eb6 --- /dev/null +++ b/pangomm-2.46.2.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d9e89ef6f8ae044e2708f4c1b9cd11e09dd31af7aa47a89e1ab9a7524b15b0e0 +size 996876 diff --git a/pangomm.obsinfo b/pangomm.obsinfo new file mode 100644 index 0000000..658999b --- /dev/null +++ b/pangomm.obsinfo @@ -0,0 +1,5 @@ +name: pangomm +version: 2.46.2 +mtime: 1638718986 +commit: c531ef7cf5351ec14014da2480b2fd3e474eac00 + diff --git a/pangomm1_4.changes b/pangomm1_4.changes index a014ab3..acc5666 100644 --- a/pangomm1_4.changes +++ b/pangomm1_4.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Sun Dec 05 17:38:13 UTC 2021 - bjorn.lie@gmail.com + +- Update to version 2.46.2: + * Move to stable released tag, no code changes. + +------------------------------------------------------------------- +Wed Dec 01 12:10:37 UTC 2021 - bjorn.lie@gmail.com + +- Update to version 2.46.1+7: + * NMake Makefiles: Fix header installation + * NMake Makefiles: Correct VS2019 toolset number + * build: Support Visual Studio 2022 builds + * docs/reference/Doxyfile.in: Remove obsolete entry + * Don't include individual pango headers, part 2 + * Don't include individual pango headers + * Use pango from the main branch + * 2.46.1 + * Documentation: Let links point to pangomm-1.4 versions + * Add dependencies to Doxygen tag files in subprojects +- Switch to using a gitcheckout via source service. Pass + maintainer-mode=true to meson and add m4, mm-common and + perl(XML::Parser) BuildRequires, as this is needed with a + git-checkout. + ------------------------------------------------------------------- Thu Oct 7 11:29:35 UTC 2021 - pgajdos@suse.com diff --git a/pangomm1_4.spec b/pangomm1_4.spec index fd0bca4..2d5e185 100644 --- a/pangomm1_4.spec +++ b/pangomm1_4.spec @@ -21,13 +21,15 @@ %define _name pangomm Name: pangomm1_4 -Version: 2.46.1 +Version: 2.46.2 Release: 0 Summary: C++ interface for pango License: GPL-2.0-or-later AND LGPL-2.0-or-later Group: Development/Libraries/C and C++ URL: http://www.gtkmm.org -Source0: https://download.gnome.org/sources/pangomm/2.46/%{_name}-%{version}.tar.xz +# Source0 disabled, we are using source service +#Source0: https://download.gnome.org/sources/pangomm/2.46/%%{_name}-%%{version}.tar.xz +Source0: %{_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 @@ -36,8 +38,12 @@ BuildRequires: doxygen BuildRequires: fdupes BuildRequires: graphviz BuildRequires: meson +# m4, mm-common and perl(XML::Parser) only needed due to git-checkout +BuildRequires: m4 +BuildRequires: mm-common BuildRequires: pkgconfig BuildRequires: xsltproc +BuildRequires: perl(XML::Parser) BuildRequires: pkgconfig(cairomm-1.0) >= 1.2.2 BuildRequires: pkgconfig(glibmm-2.4) >= 2.48.0 BuildRequires: pkgconfig(pangocairo) >= 1.45.1 @@ -66,6 +72,7 @@ chmod -x NEWS %build %meson \ + -Dmaintainer-mode=true \ -Dbuild-documentation=false \ %{nil} %meson_build From 3acc0ba112cf17c94eeb31e5da0af8a41a76f8f4e41380b653dd1cc3e9bc2c55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Mon, 13 Dec 2021 16:26:04 +0000 Subject: [PATCH 2/2] Accepting request 940284 from GNOME:Next - Switch back to released tarballs: Stop passing maintainer-mode=true to meson and remove m4, mm-common and perl(XML::Parser) BuildRequires, as this was all only needed to build a git-checkout. OBS-URL: https://build.opensuse.org/request/show/940284 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/pangomm1_4?expand=0&rev=18 --- _service | 18 ------------------ _servicedata | 4 ---- pangomm-2.46.2.obscpio | 3 --- pangomm-2.46.2.tar.xz | 3 +++ pangomm.obsinfo | 5 ----- pangomm1_4.changes | 8 ++++++++ pangomm1_4.spec | 9 +-------- 7 files changed, 12 insertions(+), 38 deletions(-) delete mode 100644 _service delete mode 100644 _servicedata delete mode 100644 pangomm-2.46.2.obscpio create mode 100644 pangomm-2.46.2.tar.xz delete mode 100644 pangomm.obsinfo diff --git a/_service b/_service deleted file mode 100644 index 9d5ca9c..0000000 --- a/_service +++ /dev/null @@ -1,18 +0,0 @@ - - - - git - https://gitlab.gnome.org/GNOME/pangomm.git - 2.46.2 - @PARENT_TAG@+@TAG_OFFSET@ - (.*)\+0 - \1 - enable - - - - *.tar - xz - - - diff --git a/_servicedata b/_servicedata deleted file mode 100644 index 7714afe..0000000 --- a/_servicedata +++ /dev/null @@ -1,4 +0,0 @@ - - - https://gitlab.gnome.org/GNOME/pangomm.git - c531ef7cf5351ec14014da2480b2fd3e474eac00 \ No newline at end of file diff --git a/pangomm-2.46.2.obscpio b/pangomm-2.46.2.obscpio deleted file mode 100644 index 53a4eb6..0000000 --- a/pangomm-2.46.2.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d9e89ef6f8ae044e2708f4c1b9cd11e09dd31af7aa47a89e1ab9a7524b15b0e0 -size 996876 diff --git a/pangomm-2.46.2.tar.xz b/pangomm-2.46.2.tar.xz new file mode 100644 index 0000000..871d9bf --- /dev/null +++ b/pangomm-2.46.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:57442ab4dc043877bfe3839915731ab2d693fc6634a71614422fb530c9eaa6f4 +size 674892 diff --git a/pangomm.obsinfo b/pangomm.obsinfo deleted file mode 100644 index 658999b..0000000 --- a/pangomm.obsinfo +++ /dev/null @@ -1,5 +0,0 @@ -name: pangomm -version: 2.46.2 -mtime: 1638718986 -commit: c531ef7cf5351ec14014da2480b2fd3e474eac00 - diff --git a/pangomm1_4.changes b/pangomm1_4.changes index acc5666..4a3eac0 100644 --- a/pangomm1_4.changes +++ b/pangomm1_4.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Dec 13 15:43:10 UTC 2021 - Dominique Leuenberger + +- Switch back to released tarballs: Stop passing + maintainer-mode=true to meson and remove m4, mm-common and + perl(XML::Parser) BuildRequires, as this was all only needed to + build a git-checkout. + ------------------------------------------------------------------- Sun Dec 05 17:38:13 UTC 2021 - bjorn.lie@gmail.com diff --git a/pangomm1_4.spec b/pangomm1_4.spec index 2d5e185..9d32c36 100644 --- a/pangomm1_4.spec +++ b/pangomm1_4.spec @@ -27,9 +27,7 @@ Summary: C++ interface for pango License: GPL-2.0-or-later AND LGPL-2.0-or-later Group: Development/Libraries/C and C++ URL: http://www.gtkmm.org -# Source0 disabled, we are using source service -#Source0: https://download.gnome.org/sources/pangomm/2.46/%%{_name}-%%{version}.tar.xz -Source0: %{_name}-%{version}.tar.xz +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 @@ -38,12 +36,8 @@ BuildRequires: doxygen BuildRequires: fdupes BuildRequires: graphviz BuildRequires: meson -# m4, mm-common and perl(XML::Parser) only needed due to git-checkout -BuildRequires: m4 -BuildRequires: mm-common BuildRequires: pkgconfig BuildRequires: xsltproc -BuildRequires: perl(XML::Parser) BuildRequires: pkgconfig(cairomm-1.0) >= 1.2.2 BuildRequires: pkgconfig(glibmm-2.4) >= 2.48.0 BuildRequires: pkgconfig(pangocairo) >= 1.45.1 @@ -72,7 +66,6 @@ chmod -x NEWS %build %meson \ - -Dmaintainer-mode=true \ -Dbuild-documentation=false \ %{nil} %meson_build