Merge pull request #10668 from Rmys/master

gtk-doc ver. bump

desktop/toolkit/gtk/gtk-doc/actions.py

@@ -2,18 +2,18 @@
 # -*- coding: utf-8 -*-
 #
 # Licensed under the GNU General Public License, version 3.
-# See the file http://www.gnu.org/licences/old-licenses/gpl-2.0.txt
+# See the file http://www.gnu.org/licenses/gpl.txt
 
-from pisi.actionsapi import autotools
+from pisi.actionsapi import mesontools
 from pisi.actionsapi import pisitools
 
 def setup():
-    autotools.configure("--disable-static --disable-scrollkeeper")
+    mesontools.configure()
 
 def build():
-    autotools.make()
+    mesontools.build()
 
 def install():
-    autotools.install()
+    mesontools.install()
 
     pisitools.dodoc("AUTHORS", "MAINTAINERS", "ChangeLog", "README", "NEWS", "TODO")

desktop/toolkit/gtk/gtk-doc/files/0001-Partially-revert-a-gtk-doc-1.31-change-that-broke-e-.patch

@@ -0,0 +1,29 @@
+From 0535ffb16de159c42f413f4d1b4e9f2f77395986 Mon Sep 17 00:00:00 2001
+From: Kalev Lember <klember@redhat.com>
+Date: Thu, 28 Nov 2019 14:38:59 +0100
+Subject: [PATCH] Partially revert a gtk-doc 1.31 change that broke e-d-s and
+ NM builds
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1775560
+---
+ gtkdoc/scan.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gtkdoc/scan.py b/gtkdoc/scan.py
+index d04d4d4..2103d02 100644
+--- a/gtkdoc/scan.py
++++ b/gtkdoc/scan.py
+@@ -961,8 +961,8 @@ def ScanHeaderContent(input_lines, decl_list, get_types, options):
+                 logging.info('struct/union level : %d', level)
+ 
+     # here we want in_declaration=='', otherwise we have a partial declaration
+-    if in_declaration != '':
+-        raise RuntimeError('partial declaration (%s) : %s ' % (in_declaration, decl))
++    #if in_declaration != '':
++    #    raise RuntimeError('partial declaration (%s) : %s ' % (in_declaration, decl))
+ 
+     # print remaining forward declarations
+     for symbol in sorted(forward_decls.keys()):
+-- 
+2.23.0
+

desktop/toolkit/gtk/gtk-doc/pspec.xml

@@ -13,9 +13,10 @@
         <IsA>app:console</IsA>
         <Summary>GTK+ API documentation generator</Summary>
         <Description>Gtk-Doc is typically used to document the public API of GTK+ and GNOME libraries, but it can also be used to document application code.</Description>
-        <Archive sha1sum="36eb741d2f2e7791da37aa34dafea6d0506c9c45" type="tarxz">mirrors://gnome/gtk-doc/1.32/gtk-doc-1.32.tar.xz</Archive>
+        <Archive sha1sum="d48fc5e2ca19eef9420732625cfd53e40b331baf" type="tarxz">mirrors://gnome/gtk-doc/1.33/gtk-doc-1.33.2.tar.xz</Archive>
         <BuildDependencies>
             <!--<Dependency>rarian</Dependency>-->
+            <Dependency>meson</Dependency>
             <Dependency>itstool</Dependency>
 			<Dependency>python3-devel</Dependency>
 <!--             <Dependency>openjade</Dependency> -->
@@ -24,6 +25,9 @@
             <Dependency>docbook-xsl</Dependency>
             <Dependency>libxslt-devel</Dependency>
         </BuildDependencies>
+        <Patches>
+            <Patch level="1">0001-Partially-revert-a-gtk-doc-1.31-change-that-broke-e-.patch</Patch>
+        </Patches>
     </Source>
 
     <Package>
@@ -48,6 +52,13 @@
     </Package>
 
     <History>
+        <Update release="7">
+            <Date>2022-09-13</Date>
+            <Version>1.33.2</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
 	<Update release="6">
             <Date>2021-01-24</Date>
             <Version>1.32</Version>