Fix building devel docs

[skip changelog]

Signed-off-by: Nils Philippsen <nils@tiptoe.de>
This commit is contained in:
Nils Philippsen 2024-08-19 16:26:38 +02:00
parent 563eb21a29
commit b6e1175a28
2 changed files with 55 additions and 0 deletions

View File

@ -0,0 +1,48 @@
From c7e1b11bed0d001323471e774564f065bcfd62f6 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@tiptoe.de>
Date: Mon, 19 Aug 2024 16:16:31 +0200
Subject: [PATCH] libgimp: Use namespaced doc reference
Otherwise, building the devel docs errors out like this:
```
FAILED: devel-docs/reference/gimp/libgimp-3.0
...
WARNING: Unknown namespace ExportReturn
[enum@ExportReturn.EXPORT].
^~~~~~~~~~~~~~~~~~~~~~~~~~
```
Signed-off-by: Nils Philippsen <nils@tiptoe.de>
---
libgimp/gimpexportoptions.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libgimp/gimpexportoptions.c b/libgimp/gimpexportoptions.c
index 22fca36c2d..5ffae2a1b1 100644
--- a/libgimp/gimpexportoptions.c
+++ b/libgimp/gimpexportoptions.c
@@ -537,17 +537,17 @@ export_action_perform (const ExportAction *action,
*
* If necessary, a copy is created, converted and modified, @image
* changed to point to the new image and the procedure returns
- * [enum@ExportReturn.EXPORT].
+ * [enum@Gimp.ExportReturn.EXPORT].
* In this case, you must take care of deleting the created image using
* [method@Image.delete] once the image has been exported, unless you
* were planning to display it with [ctor@Display.new], or you will leak
* memory.
*
- * If [enum@ExportReturn.IGNORE] is returned, then @image is still the
+ * If [enum@Gimp.ExportReturn.IGNORE] is returned, then @image is still the
* original image. You should neither modify it, nor should you delete
* it in the end. If you wish to temporarily modify the image before
* export anyway, call [method@Image.duplicate] when
- * [enum@ExportReturn.IGNORE] was returned.
+ * [enum@Gimp.ExportReturn.IGNORE] was returned.
*
* Returns: An enum of #GimpExportReturn.
*
--
2.46.0

View File

@ -234,6 +234,12 @@ Patch3: gimp-2.99.19-external-help-browser.patch
# Dont require an unreleased gegl version
Patch4: 0001-Don-t-require-unreleased-gegl-version.patch
# Submitted upstream:
# libgimp: Use namespaced doc reference
# https://gitlab.gnome.org/GNOME/gimp/-/merge_requests/1789
Patch5: 0001-libgimp-Use-namespaced-doc-reference.patch
%description
GIMP (GNU Image Manipulation Program) is a powerful image composition and
editing program, which can be extremely useful for creating logos and other
@ -297,6 +303,7 @@ EOF
%patch 2 -p1 -b .no-phone-home-default
%patch 3 -p1 -b .external-help-browser
%patch 4 -p1 -b .don-t-require-unreleased-gegl-version
%patch 5 -p1 -b .namespace-docs-refs
# Verify the splash file source hasnt changed
sha256sum -c %{SOURCE2}