Merge ~vpa1977/ubuntu/+source/gimp-plugin-registry:ubuntu/devel into ubuntu/+source/gimp-plugin-registry:ubuntu/devel

Proposed by Vladimir Petko
Status: Work in progress
Proposed branch: ~vpa1977/ubuntu/+source/gimp-plugin-registry:ubuntu/devel
Merge into: ubuntu/+source/gimp-plugin-registry:ubuntu/devel
Diff against target: 87 lines (+50/-1)
4 files modified
debian/changelog (+8/-0)
debian/control.in (+1/-1)
debian/patches/separate+/missing-declaration.patch (+40/-0)
debian/patches/series (+1/-0)
Reviewer Review Type Date Requested Status
git-ubuntu import Pending
Review via email: mp+463634@code.launchpad.net

Description of the change

wip

To post a comment you must log in.
f88e728... by Vladimir Petko

add bug debian

Unmerged commits

f88e728... by Vladimir Petko

add bug debian

5dfd8c8... by Vladimir Petko

changelog

8235c05... by Vladimir Petko

  * d/p/separate+/missing-declaration.patch: fix missing function
    declarations (LP: #2058813).

15e66e9... by Vladimir Petko

  * d/control.in: fix typo in debhelper-compat.

f44b057... by Steve Langasek

9.20200928build3 (patches unapplied)

Imported using git-ubuntu import.

b6d19a7... by Steve Langasek

9.20200928build2 (patches unapplied)

Imported using git-ubuntu import.

f99ed49... by Steve Langasek

9.20200928build1 (patches unapplied)

Imported using git-ubuntu import.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index bbd68d1..eb7e182 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,11 @@
6+gimp-plugin-registry (9.20200928ubuntu1) noble; urgency=medium
7+
8+ * d/control.in: fix typo in debhelper-compat.
9+ * d/p/separate+/missing-declaration.patch: fix missing function
10+ declarations (LP: #2058813).
11+
12+ -- Vladimir Petko <vladimir.petko@canonical.com> Thu, 04 Apr 2024 10:36:12 +1300
13+
14 gimp-plugin-registry (9.20200928build3) noble; urgency=medium
15
16 * No-change rebuild for CVE-2024-3094
17diff --git a/debian/control.in b/debian/control.in
18index 3f37e76..765e4cb 100644
19--- a/debian/control.in
20+++ b/debian/control.in
21@@ -6,7 +6,7 @@ XSBC-Original-Maintainer: Ying-Chun Liu (PaulLiu) <paulliu@debian.org>
22 Uploaders: #AUTO_UPDATE_Uploaders#
23 Build-Depends: quilt, libgimp2.0-dev, intltool,
24 automake, autoconf,
25- #AUTO_UPDATE_Build-Depends#, debhelper-comat (= 10), libglib2.0-dev,
26+ #AUTO_UPDATE_Build-Depends#, debhelper-compat (= 10), libglib2.0-dev,
27 python3, python3-debian, dh-python
28 Standards-Version: 3.9.5
29 Vcs-Git: https://salsa.debian.org/debian/gimp-plugin-registry.git
30diff --git a/debian/patches/separate+/missing-declaration.patch b/debian/patches/separate+/missing-declaration.patch
31new file mode 100644
32index 0000000..27c9936
33--- /dev/null
34+++ b/debian/patches/separate+/missing-declaration.patch
35@@ -0,0 +1,40 @@
36+Description: add missing function declarations
37+ The package fails to build due to -Werror=implicit-function-declaration.
38+ Add missing headers and definitions.
39+Author: Vladimir Petko <vladimir.petko@canonical.com>
40+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gimp-plugin-registry/+bug/2058813
41+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1066291
42+Last-Update: 2024-04-04
43+
44+--- a/separate+/separate+/iccbutton.h
45++++ b/separate+/separate+/iccbutton.h
46+@@ -125,6 +125,8 @@
47+ gint n);
48+ gint icc_button_get_max_entries (IccButton *button);
49+ gboolean icc_button_get_enable_empty (IccButton *button);
50++void icc_button_set_enable_empty (IccButton *button,
51++ gboolean enabled);
52+ gboolean icc_button_is_empty (IccButton *button);
53+ void icc_button_dialog_set_show_detail
54+ (IccButton *button,
55+--- a/separate+/src/separate-export.c
56++++ b/separate+/src/separate-export.c
57+@@ -37,6 +37,7 @@
58+ #include "psd.h"
59+ #include "jpeg.h"
60+
61++#include "util.h"
62+
63+ gchar *file_extention_table[] =
64+ {
65+--- a/lqr/src/src/preview.c
66++++ b/lqr/src/src/preview.c
67+@@ -18,6 +18,9 @@
68+
69+ #include "config.h"
70+
71++#undef GDK_DISABLE_DEPRECATED
72++#include <gdk/gdk.h>
73++
74+ #include <libgimp/gimp.h>
75+ #include <libgimp/gimpui.h>
76diff --git a/debian/patches/series b/debian/patches/series
77index 05c545a..e2b3313 100644
78--- a/debian/patches/series
79+++ b/debian/patches/series
80@@ -3,6 +3,7 @@ diana-holga2/menu
81 contact-sheet/menu
82 separate+/missing_linker_flags
83 separate+/tile_size.patch
84+separate+/missing-declaration.patch
85 bw-simulation/color-mixer-fix
86 DBP/menu
87 DBP/gcc4.3-fixes

Subscribers

People subscribed via source and target branches