diff --git a/gtk-doc-1.33.2.tar.xz b/gtk-doc-1.33.2.tar.xz deleted file mode 100644 index ecfa85cdb3647cd414b4b3e62bb0db2e658731c4..0000000000000000000000000000000000000000 Binary files a/gtk-doc-1.33.2.tar.xz and /dev/null differ diff --git a/gtk-doc-1.34.0-simulate-meson-gnome.gtkdoc.patch b/gtk-doc-1.34.0-simulate-meson-gnome.gtkdoc.patch new file mode 100644 index 0000000000000000000000000000000000000000..a54f6dfadf10bbe6f2f5fe8bfccb05670d4836c7 --- /dev/null +++ b/gtk-doc-1.34.0-simulate-meson-gnome.gtkdoc.patch @@ -0,0 +1,71 @@ +From f966eb750f245e70f8f6debd0e0aa49ff0e2cff7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ahmed=20Ba=C3=AFzid?= +Date: Tue, 9 Jul 2024 18:12:27 +0100 +Subject: [PATCH] Tests: Simulate Meson's gnome.gtkdoc() content_files argument + +Closes #150 +--- + meson.build | 3 ++- + tests/gobject/docs/meson.build | 5 ----- + tests/gobject/docs/xml/meson.build | 2 ++ + tests/gobject/src/gobject.c | 4 +++- + 3 files changed, 5 insertions(+), 6 deletions(-) + +diff --git a/meson.build b/meson.build +index 94eca1a6..b35213f8 100644 +@@ -1,9 +1,10 @@ + project('gtk-doc', 'c', + version: '1.34.0', + license: 'GPL2+', +- meson_version: '>= 0.55', ++ meson_version: '>= 0.64.0', + ) + ++fs = import('fs') + gnome = import('gnome') + python = import('python') + +diff --git a/tests/gobject/docs/meson.build b/tests/gobject/docs/meson.build +index 6b7e04b5..3442725c 100644 +--- a/tests/gobject/docs/meson.build ++++ b/tests/gobject/docs/meson.build +@@ -112,11 +112,6 @@ test( + '@0@'.format('tester'), + '@0@'.format(join_paths('..', 'tester-docs.xml')), + '--uninstalled', +- '--path=@0@'.format(':'.join([ +- gobject_test_docs_dir, +- srcdir, +- ]) +- ), + ], + ) + +diff --git a/tests/gobject/docs/xml/meson.build b/tests/gobject/docs/xml/meson.build +index 94eca1a6..b35213f8 100644 +--- a/tests/gobject/docs/xml/meson.build ++++ b/tests/gobject/docs/xml/meson.build +@@ -3,3 +3,5 @@ configure_file( + output: 'gtkdocentities.ent', + configuration: binary_in, + ) ++ ++fs.copyfile(join_paths(srcdir, 'tests', 'gobject', 'examples', 'gobject.c')) +diff --git a/tests/gobject/src/gobject.c b/tests/gobject/src/gobject.c +index b23628da..51e6b0d8 100644 +--- a/tests/gobject/src/gobject.c ++++ b/tests/gobject/src/gobject.c +@@ -50,7 +50,9 @@ + * + * You can also change parameters: + * +- * ++ * ++ * ++ * + * + * + * This example serves two main purposes: +-- +GitLab + diff --git a/gtk-doc-1.34.0.tar.xz b/gtk-doc-1.34.0.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..5304c6ad9fc0f8e75e6f1f13bb381504abc213b6 Binary files /dev/null and b/gtk-doc-1.34.0.tar.xz differ diff --git a/gtk-doc-install-cmake-config-files-into-datadir.patch b/gtk-doc-install-cmake-config-files-into-datadir.patch new file mode 100644 index 0000000000000000000000000000000000000000..6f9cf7b3cc0ec657ed1e44e23b03f36f68afd23d --- /dev/null +++ b/gtk-doc-install-cmake-config-files-into-datadir.patch @@ -0,0 +1,19 @@ +diff -Nrup a/buildsystems/cmake/meson.build b/buildsystems/cmake/meson.build +--- a/buildsystems/cmake/meson.build 2024-03-05 19:09:52.000000000 +0100 ++++ b/buildsystems/cmake/meson.build 2024-03-18 19:08:08.946146642 +0100 +@@ -6,7 +6,7 @@ configure_file( + output: 'GtkDocConfigVersion.cmake', + configuration: cmake_in, + install: true, +- install_dir: get_option('libdir') / 'cmake' / 'GtkDoc', ++ install_dir: get_option('datadir') / 'cmake' / 'GtkDoc', + ) + + gtkdoc_cmake_data = [ +@@ -16,5 +16,5 @@ gtkdoc_cmake_data = [ + + install_data( + gtkdoc_cmake_data, +- install_dir: get_option('libdir') / 'cmake' / 'GtkDoc', ++ install_dir: get_option('datadir') / 'cmake' / 'GtkDoc', + ) diff --git a/gtk-doc.spec b/gtk-doc.spec index 665f4252c64474c19384144eea6b810b0dcb97c7..46757e5206f94e806ef31536b43c52d133c56d90 100644 --- a/gtk-doc.spec +++ b/gtk-doc.spec @@ -1,17 +1,16 @@ -%global debug_package %{nil} -%global __python %{__python3} - Name: gtk-doc -Version: 1.33.2 -Release: 6 +Version: 1.34.0 +Release: 1 Summary: Generate API documentation from comments that can be added to C code -License: Verbatim and GPLv2+ +License: GPL-2.0-or-later AND GFDL-1.1-no-invariants-or-later URL: https://www.gtk.org/gtk-doc/ -Source0: https://download.gnome.org/sources/gtk-doc/1.33/%{name}-%{version}.tar.xz +Source0: https://download.gnome.org/sources/gtk-doc/1.34/%{name}-%{version}.tar.xz Patch0: fix-fixxref-not-found-file.patch Patch1: fix-mkdb-not-found-file.patch Patch2: fix-gtkdoc-rebase-NoneType-object-has-no-attribute-group.patch - +Patch3: gtk-doc-1.34.0-simulate-meson-gnome.gtkdoc.patch +Patch4: gtk-doc-install-cmake-config-files-into-datadir.patch +BuildArch: noarch BuildRequires: docbook-utils libxslt gettext BuildRequires: itstool yelp-tools docbook-style-xsl gcc BuildRequires: meson glib2-devel @@ -35,7 +34,6 @@ sed -i 's/@DBLATEX@/\/usr\/bin\/dblatex/g' gtkdoc/config_data.py.in mv doc/README doc/README.1 %build -export PYTHON=%{__python3} %meson %meson_build @@ -46,16 +44,20 @@ export PYTHON=%{__python3} %meson_test %files -%doc README doc/* examples -%license COPYING COPYING-DOCS AUTHORS +%doc README doc/* examples AUTHORS +%license COPYING COPYING-DOCS %{_bindir}/* -%{_libdir}/cmake/ -%{_datadir}/aclocal/ -%{_datadir}/%{name}/ -%{_datadir}/*/*.pc +%{_datadir}/cmake/GtkDoc +%{_datadir}/aclocal/* +%{_datadir}/%{name} +%{_datadir}/pkgconfig/*.pc %{_datadir}/help/*/%{name}-manual/ %changelog +* Tue Aug 13 2024 Funda Wang - 1.34.0-1 +- update to 1.34.0 +- install cmake files into datadir so that gtk-doc becomes noarch package + * Sat Feb 19 2022 Liu Zixian - 1.33.2-6 - Remove useless BuildRequires python3-devel