Bug#1114097: elektroid: diff for NMU version 3.2.3-1.1
Control: tags 1114097 + patch
Control: tags 1114097 + pending
Dear maintainer,
I've prepared an NMU for elektroid (versioned as 3.2.3-1.1) and uploaded
it to DELAYED/14. Please feel free to tell me if I should cancel it.
cu
Adrian
diffstat for elektroid-3.2.3 elektroid-3.2.3
changelog | 7
patches/0001-Fix-declarations-of-fs_get_exts.patch | 150 +++++++++++++++++++++
patches/0002-Fix-declarations-of-fs_get_exts.patch | 74 ++++++++++
patches/series | 2
4 files changed, 233 insertions(+)
diff -Nru elektroid-3.2.3/debian/changelog elektroid-3.2.3/debian/changelog
--- elektroid-3.2.3/debian/changelog 2025-04-25 21:49:25.000000000 +0300
+++ elektroid-3.2.3/debian/changelog 2025-10-04 22:23:49.000000000 +0300
@@ -1,3 +1,10 @@
+elektroid (3.2.3-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Backport upstream fix for FTBFS with GCC 15. (Closes: #1114097)
+
+ -- Adrian Bunk <bunk@debian.org> Sat, 04 Oct 2025 22:23:49 +0300
+
elektroid (3.2.3-1) unstable; urgency=medium
* New upstream version 3.2.3
diff -Nru elektroid-3.2.3/debian/patches/0001-Fix-declarations-of-fs_get_exts.patch elektroid-3.2.3/debian/patches/0001-Fix-declarations-of-fs_get_exts.patch
--- elektroid-3.2.3/debian/patches/0001-Fix-declarations-of-fs_get_exts.patch 1970-01-01 02:00:00.000000000 +0200
+++ elektroid-3.2.3/debian/patches/0001-Fix-declarations-of-fs_get_exts.patch 2025-10-04 22:23:02.000000000 +0300
@@ -0,0 +1,150 @@
+From b39c7aed4728caec45ade1f107d2521f41180cbe Mon Sep 17 00:00:00 2001
+From: dagargo <dagargo@gmail.com>
+Date: Sun, 15 Jun 2025 21:07:20 +0200
+Subject: Fix declarations of fs_get_exts
+
+With more strict typing, compilation was failing.
+---
+ src/connectors/common.c | 6 ++++--
+ src/connectors/microbrute.c | 3 ++-
+ src/connectors/microfreak.c | 12 ++++++++----
+ src/connectors/phatty.c | 3 ++-
+ src/connectors/summit.c | 3 ++-
+ src/sample.c | 6 +++++-
+ 6 files changed, 23 insertions(+), 10 deletions(-)
+
+diff --git a/src/connectors/common.c b/src/connectors/common.c
+index 1cdf2fb..c0dbd5e 100644
+--- a/src/connectors/common.c
++++ b/src/connectors/common.c
+@@ -47,13 +47,15 @@ common_to_os_sanitized_name (gchar *name)
+ }
+
+ const gchar **
+-common_sysex_get_extensions ()
++common_sysex_get_extensions (struct backend *backend,
++ const struct fs_operations *ops)
+ {
+ return SYSEX_EXTS;
+ }
+
+ const gchar **
+-common_get_all_extensions ()
++common_get_all_extensions (struct backend *backend,
++ const struct fs_operations *ops)
+ {
+ return NULL;
+ }
+diff --git a/src/connectors/microbrute.c b/src/connectors/microbrute.c
+index b09b7c6..e7d0e0c 100644
+--- a/src/connectors/microbrute.c
++++ b/src/connectors/microbrute.c
+@@ -460,7 +460,8 @@ end:
+ }
+
+ static const gchar **
+-microbrute_get_extensions ()
++microbrute_get_extensions (struct backend *backend,
++ const struct fs_operations *ops)
+ {
+ return MICROBRUTE_EXTS;
+ }
+diff --git a/src/connectors/microfreak.c b/src/connectors/microfreak.c
+index 4179ea6..bb2c81c 100644
+--- a/src/connectors/microfreak.c
++++ b/src/connectors/microfreak.c
+@@ -664,7 +664,8 @@ microfreak_preset_rename (struct backend *backend, const gchar *src,
+ }
+
+ static const gchar **
+-microfreak_ppreset_get_extensions ()
++microfreak_ppreset_get_extensions (struct backend *backend,
++ const struct fs_operations *ops)
+ {
+ return MICROFREAK_PPRESET_EXTS;
+ }
+@@ -695,7 +696,8 @@ microfreak_zpreset_save (const gchar *path, struct idata *zpreset,
+ }
+
+ static const gchar **
+-microfreak_zpreset_get_extensions ()
++microfreak_zpreset_get_extensions (struct backend *backend,
++ const struct fs_operations *ops)
+ {
+ return MICROFREAK_ZPRESET_EXTS;
+ }
+@@ -1923,7 +1925,8 @@ microfreak_get_wavetable_id_as_slot (struct item *item,
+ }
+
+ static const gchar **
+-microfreak_pwavetable_get_extensions ()
++microfreak_pwavetable_get_extensions (struct backend *backend,
++ const struct fs_operations *ops)
+ {
+ return MICROFREAK_PWAVETABLE_EXTS;
+ }
+@@ -1948,7 +1951,8 @@ static const struct fs_operations FS_MICROFREAK_PWAVETABLE_OPERATIONS = {
+ };
+
+ static const gchar **
+-microfreak_zwavetable_get_extensions ()
++microfreak_zwavetable_get_extensions (struct backend *backend,
++ const struct fs_operations *ops)
+ {
+ return MICROFREAK_ZWAVETABLE_EXTS;
+ }
+diff --git a/src/connectors/phatty.c b/src/connectors/phatty.c
+index 54e6b9f..0fc9611 100644
+--- a/src/connectors/phatty.c
++++ b/src/connectors/phatty.c
+@@ -473,7 +473,8 @@ phatty_scale_upload (struct backend *backend, const gchar *path,
+ }
+
+ static const gchar **
+-phatty_scale_get_extensions ()
++phatty_scale_get_extensions (struct backend *backend,
++ const struct fs_operations *ops)
+ {
+ return PHATTY_SCALE_EXTS;
+ }
+diff --git a/src/connectors/summit.c b/src/connectors/summit.c
+index 0089fc6..68e3a6f 100644
+--- a/src/connectors/summit.c
++++ b/src/connectors/summit.c
+@@ -676,7 +676,8 @@ summit_tuning_load (const gchar *path, struct idata *tuning,
+ }
+
+ static const gchar **
+-summit_tuning_get_extensions ()
++summit_tuning_get_extensions (struct backend *backend,
++ const struct fs_operations *ops)
+ {
+ return SUMMIT_TUNING_EXTS;
+ }
+diff --git a/src/sample.c b/src/sample.c
+index fab305c..b216227 100644
+--- a/src/sample.c
++++ b/src/sample.c
+@@ -76,6 +76,9 @@ static const guint8 JUNK_CHUNK_DATA[] = {
+ 0, 0, 0, 0
+ };
+
++struct backend;
++struct fs_operations;
++
+ static sf_count_t
+ get_filelen_byte_array_io (void *user_data)
+ {
+@@ -1065,7 +1068,8 @@ sample_load_from_file (const gchar *path, struct idata *sample,
+ }
+
+ const gchar **
+-sample_get_sample_extensions ()
++sample_get_sample_extensions (struct backend *backend,
++ const struct fs_operations *ops)
+ {
+ return ELEKTROID_AUDIO_LOCAL_EXTS;
+ }
+--
+2.30.2
+
diff -Nru elektroid-3.2.3/debian/patches/0002-Fix-declarations-of-fs_get_exts.patch elektroid-3.2.3/debian/patches/0002-Fix-declarations-of-fs_get_exts.patch
--- elektroid-3.2.3/debian/patches/0002-Fix-declarations-of-fs_get_exts.patch 1970-01-01 02:00:00.000000000 +0200
+++ elektroid-3.2.3/debian/patches/0002-Fix-declarations-of-fs_get_exts.patch 2025-10-04 22:23:02.000000000 +0300
@@ -0,0 +1,74 @@
+From 0b083c33e12efad9b19f85215b0d1a10315f5c31 Mon Sep 17 00:00:00 2001
+From: dagargo <dagargo@gmail.com>
+Date: Sun, 15 Jun 2025 22:26:39 +0200
+Subject: Fix declarations of fs_get_exts
+
+With more strict typing, compilation was failing. This is due to the `-std=gnu23`
+being used by default.
+
+This is a continuation of the previous commit as headers were not fixed.
+---
+ src/connectors/common.h | 6 ++++--
+ src/sample.c | 3 ---
+ src/sample.h | 6 +++++-
+ 3 files changed, 9 insertions(+), 6 deletions(-)
+
+diff --git a/src/connectors/common.h b/src/connectors/common.h
+index e4c50ef..30bf58a 100644
+--- a/src/connectors/common.h
++++ b/src/connectors/common.h
+@@ -32,9 +32,11 @@ struct common_simple_read_dir_data
+ guint32 last;
+ };
+
+-const gchar **common_sysex_get_extensions ();
++const gchar **common_sysex_get_extensions (struct backend *backend,
++ const struct fs_operations *ops);
+
+-const gchar **common_get_all_extensions ();
++const gchar **common_get_all_extensions (struct backend *backend,
++ const struct fs_operations *ops);
+
+ gchar *common_slot_get_upload_path (struct backend *backend,
+ const struct fs_operations *ops,
+diff --git a/src/sample.c b/src/sample.c
+index b216227..486b706 100644
+--- a/src/sample.c
++++ b/src/sample.c
+@@ -76,9 +76,6 @@ static const guint8 JUNK_CHUNK_DATA[] = {
+ 0, 0, 0, 0
+ };
+
+-struct backend;
+-struct fs_operations;
+-
+ static sf_count_t
+ get_filelen_byte_array_io (void *user_data)
+ {
+diff --git a/src/sample.h b/src/sample.h
+index 8e72da7..45cdd76 100644
+--- a/src/sample.h
++++ b/src/sample.h
+@@ -34,6 +34,9 @@
+
+ #define SAMPLE_GET_FILE_FORMAT(sample_info, sample_format) (((sample_info)->format & SF_FORMAT_TYPEMASK) | sample_format)
+
++struct backend;
++struct fs_operations;
++
+ typedef void (*sample_load_cb) (struct job_control * control,
+ gdouble progress, gpointer data);
+
+@@ -67,7 +70,8 @@ gint sample_load_from_file_full (const gchar * path, struct idata *sample,
+ gint sample_load_sample_info (const gchar * path,
+ struct sample_info *sample_info);
+
+-const gchar **sample_get_sample_extensions ();
++const gchar **sample_get_sample_extensions (struct backend *backend,
++ const struct fs_operations *ops);
+
+ void sample_check_and_fix_loop_points (struct sample_info *sample_info);
+
+--
+2.30.2
+
diff -Nru elektroid-3.2.3/debian/patches/series elektroid-3.2.3/debian/patches/series
--- elektroid-3.2.3/debian/patches/series 1970-01-01 02:00:00.000000000 +0200
+++ elektroid-3.2.3/debian/patches/series 2025-10-04 22:23:47.000000000 +0300
@@ -0,0 +1,2 @@
+0001-Fix-declarations-of-fs_get_exts.patch
+0002-Fix-declarations-of-fs_get_exts.patch
Reply to: