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
diff --git a/debian/changelog b/debian/changelog
index bbd68d1..eb7e182 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
1gimp-plugin-registry (9.20200928ubuntu1) noble; urgency=medium
2
3 * d/control.in: fix typo in debhelper-compat.
4 * d/p/separate+/missing-declaration.patch: fix missing function
5 declarations (LP: #2058813).
6
7 -- Vladimir Petko <vladimir.petko@canonical.com> Thu, 04 Apr 2024 10:36:12 +1300
8
1gimp-plugin-registry (9.20200928build3) noble; urgency=medium9gimp-plugin-registry (9.20200928build3) noble; urgency=medium
210
3 * No-change rebuild for CVE-2024-309411 * No-change rebuild for CVE-2024-3094
diff --git a/debian/control.in b/debian/control.in
index 3f37e76..765e4cb 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -6,7 +6,7 @@ XSBC-Original-Maintainer: Ying-Chun Liu (PaulLiu) <paulliu@debian.org>
6Uploaders: #AUTO_UPDATE_Uploaders#6Uploaders: #AUTO_UPDATE_Uploaders#
7Build-Depends: quilt, libgimp2.0-dev, intltool,7Build-Depends: quilt, libgimp2.0-dev, intltool,
8 automake, autoconf,8 automake, autoconf,
9 #AUTO_UPDATE_Build-Depends#, debhelper-comat (= 10), libglib2.0-dev,9 #AUTO_UPDATE_Build-Depends#, debhelper-compat (= 10), libglib2.0-dev,
10 python3, python3-debian, dh-python10 python3, python3-debian, dh-python
11Standards-Version: 3.9.511Standards-Version: 3.9.5
12Vcs-Git: https://salsa.debian.org/debian/gimp-plugin-registry.git12Vcs-Git: https://salsa.debian.org/debian/gimp-plugin-registry.git
diff --git a/debian/patches/separate+/missing-declaration.patch b/debian/patches/separate+/missing-declaration.patch
13new file mode 10064413new file mode 100644
index 0000000..27c9936
--- /dev/null
+++ b/debian/patches/separate+/missing-declaration.patch
@@ -0,0 +1,40 @@
1Description: add missing function declarations
2 The package fails to build due to -Werror=implicit-function-declaration.
3 Add missing headers and definitions.
4Author: Vladimir Petko <vladimir.petko@canonical.com>
5Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gimp-plugin-registry/+bug/2058813
6Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1066291
7Last-Update: 2024-04-04
8
9--- a/separate+/separate+/iccbutton.h
10+++ b/separate+/separate+/iccbutton.h
11@@ -125,6 +125,8 @@
12 gint n);
13 gint icc_button_get_max_entries (IccButton *button);
14 gboolean icc_button_get_enable_empty (IccButton *button);
15+void icc_button_set_enable_empty (IccButton *button,
16+ gboolean enabled);
17 gboolean icc_button_is_empty (IccButton *button);
18 void icc_button_dialog_set_show_detail
19 (IccButton *button,
20--- a/separate+/src/separate-export.c
21+++ b/separate+/src/separate-export.c
22@@ -37,6 +37,7 @@
23 #include "psd.h"
24 #include "jpeg.h"
25
26+#include "util.h"
27
28 gchar *file_extention_table[] =
29 {
30--- a/lqr/src/src/preview.c
31+++ b/lqr/src/src/preview.c
32@@ -18,6 +18,9 @@
33
34 #include "config.h"
35
36+#undef GDK_DISABLE_DEPRECATED
37+#include <gdk/gdk.h>
38+
39 #include <libgimp/gimp.h>
40 #include <libgimp/gimpui.h>
diff --git a/debian/patches/series b/debian/patches/series
index 05c545a..e2b3313 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,6 +3,7 @@ diana-holga2/menu
3contact-sheet/menu3contact-sheet/menu
4separate+/missing_linker_flags4separate+/missing_linker_flags
5separate+/tile_size.patch5separate+/tile_size.patch
6separate+/missing-declaration.patch
6bw-simulation/color-mixer-fix7bw-simulation/color-mixer-fix
7DBP/menu8DBP/menu
8DBP/gcc4.3-fixes9DBP/gcc4.3-fixes

Subscribers

People subscribed via source and target branches