Accepting request 976110 from GNOME:Next

Update to version 1.33.2

Required meson version is now in Factory

OBS-URL: https://build.opensuse.org/request/show/976110
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk-doc?expand=0&rev=77

gtk-doc-1.32.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:de0ef034fb17cb21ab0c635ec730d19746bce52984a6706e7bbec6fb5e0b907c
-size 762000

gtk-doc.changes

@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Sat Apr 23 01:04:42 UTC 2022 - Ferdinand Thiessen <rpm@fthiessen.de>
+
+- Update to version 1.33.2
+  + Stop using anytree
+  + Python3 fixes for depscan
+- Update to version 1.33.1
+  + Build GObject scanner with asan
+  + Ignore deprecations in the GObject scanner
+  + Translation updates
+- Update to version 1.33.0
+  + Support documenting GTK actions
+  + Recognize GDK_DECLARE_ macros
+  + Better table styling in html output
+  + Use plain C types for basic types
+  + Translation updates
+- Build package using meson instead of autotools
+- Build -manual subpackage as noarch
+
 -------------------------------------------------------------------
 Sat Jan 25 14:14:11 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
 

gtk-doc.spec

@@ -1,7 +1,7 @@
 #
-# spec file for package gtk-doc
+# spec file
 #
-# Copyright (c) 2019 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -25,7 +25,7 @@
 %endif
 
 Name:           gtk-doc%{?psuffix}
-Version:        1.32
+Version:        1.33.2
 Release:        0
 %if "%{flavor}" == ""
 Summary:        GTK+ Documentation Generator
@@ -37,18 +37,20 @@ License:        GFDL-1.1-or-later
 Group:          Documentation/HTML
 %endif
 URL:            http://www.gtk.org/gtk-doc/
-# When updating this package, please don't forget to update the gtk-doc.m4 Source in glib2.
+Source0:        https://gitlab.gnome.org/GNOME/gtk-doc/-/archive/%{version}/gtk-doc-%{version}.tar.bz2
-Source0:        https://download.gnome.org/sources/gtk-doc/1.32/gtk-doc-%{version}.tar.xz
 
 BuildRequires:  docbook-xsl-stylesheets
-BuildRequires:  libtool
 BuildRequires:  libxml2-tools
+BuildRequires:  meson >= 0.62
 BuildRequires:  pkgconfig
 BuildRequires:  python3-base
+BuildRequires:  python3-pygments
 BuildRequires:  sgml-skel
 %if %{with doc}
 BuildRequires:  fdupes
 BuildRequires:  yelp-tools
+BuildRequires:  pkgconfig(glib-2.0)
+BuildArch:      noarch
 # gtk-doc-manual was split from the main package
 Provides:       gtk-doc:%{_datadir}/help/C/gtk-doc-manual/index.docbook
 Conflicts:      gtk-doc < %{version}-%{release}
@@ -64,7 +66,7 @@ Requires:       xsltproc
 Recommends:     gtk-doc-manual
 # Old for <= 10.2 & CODE10
 Provides:       gtkdoc = %{version}
-Obsoletes:      gtkdoc
+Obsoletes:      gtkdoc < %{version}
 %endif
 
 %if "%{flavor}" == ""
@@ -76,13 +78,14 @@ Java-doc.  It is used to generate the documentation for GLib,
 Gtk+, and GNOME.
 
 %else
+
 %description
 User manual for Gtkdoc
 %endif
 
 %package mkpdf
 Summary:        Gtkdoc PDF Generator
-Supplements:    packageand(gtk-doc:dblatex)
+Supplements:    (gtk-doc and dblatex)
 Requires:       %{name} = %{version}
 Requires:       dblatex
 
@@ -95,19 +98,23 @@ PDF generator for Gtkdoc.
 %autosetup -p1 -n gtk-doc-%{version}
 
 %build
-autoreconf
+%meson \
-%configure PYTHON=%{_bindir}/python3 \
+%if %{with doc}
-  DBLATEX=%{_bindir}/dblatex
+  -Dyelp_manual=true \
-make %{?_smp_mflags}
+  -Dcmake_support=false
+%else
+  -Dyelp_manual=false \
+  -Dtests=false
+%endif
+%meson_build
 
 %install
+%meson_install \
 %if "%{flavor}" == ""
-%make_install
+  %{nil}
 mkdir -p %{buildroot}%{_datadir}/gtk-doc/html
-%endif
+%else
-
+  --tags doc
-%if %{with doc}
-%make_install -C help
 %fdupes %{buildroot}%{_datadir}/help/[a-z]*
 %find_lang gtk-doc-manual %{?no_lang_C}
 %endif
@@ -124,11 +131,8 @@ mkdir -p %{buildroot}%{_datadir}/gtk-doc/html
 %{_datadir}/gtk-doc/
 %exclude %{_datadir}/gtk-doc/python/gtkdoc/mkpdf*
 %{_datadir}/pkgconfig/gtk-doc.pc
-%dir %{_datadir}/cmake
+%dir %{_libdir}/cmake
-%dir %{_datadir}/cmake/GtkDoc
+%{_libdir}/cmake/GtkDoc
-%{_datadir}/cmake/GtkDoc/GtkDocConfig.cmake
-%{_datadir}/cmake/GtkDoc/GtkDocConfigVersion.cmake
-%{_datadir}/cmake/GtkDoc/GtkDocScanGObjWrapper.cmake
 
 %files mkpdf
 %{_bindir}/gtkdoc-mkpdf