[med-svn] [Git][med-team/amide][master] 3 commits: More patch corrections
Bastian Germann (@bage)
gitlab at salsa.debian.org
Fri Feb 13 00:09:41 GMT 2026
Bastian Germann pushed to branch master at Debian Med / amide
Commits:
9f9fe21b by Bastian Germann at 2026-02-13T00:55:00+01:00
More patch corrections
- - - - -
42db866c by Bastian Germann at 2026-02-13T01:06:15+01:00
Add missing Build-Depends (Closes: #1127789)
- - - - -
1d3692c6 by Bastian Germann at 2026-02-13T01:08:29+01:00
Upload to unstable
- - - - -
8 changed files:
- debian/changelog
- debian/control
- debian/patches/gtk3+goocanvas.patch → debian/patches/gtk3.patch
- + debian/patches/memleak.patch
- − debian/patches/no-gnome-vfs.patch
- debian/patches/resizable-window.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+amide (1.0.6-8.2) unstable; urgency=medium
+
+ * Non-maintainer upload
+ * Patch corrections
+ * Add missing Build-Depends (Closes: #1127789)
+
+ -- Bastian Germann <bage at debian.org> Fri, 13 Feb 2026 01:06:43 +0100
+
amide (1.0.6-8.1) experimental; urgency=medium
* Non-maintainer upload
=====================================
debian/control
=====================================
@@ -20,6 +20,7 @@ Build-Depends: libtool,
libavcodec-dev,
libavformat-dev,
libavutil-dev,
+ libtiff-dev,
yelp-tools
Standards-Version: 4.7.2
Vcs-Browser: https://salsa.debian.org/med-team/amide
=====================================
debian/patches/gtk3+goocanvas.patch → debian/patches/gtk3.patch
=====================================
=====================================
debian/patches/memleak.patch
=====================================
@@ -0,0 +1,16 @@
+Description: fix a memory leak
+Author: Yavor Doganov <yavor at gnu.org>
+Forwarded: not-needed
+Last-Update: 2026-02-13
+---
+
+--- amide.orig/amide-current/src/amide_gnome.c
++++ amide/amide-current/src/amide_gnome.c
+@@ -342,6 +45,7 @@
+ if (link_id) {
+ uri = g_strconcat ("yelp help:amide/", link_id, NULL);
+ success = g_spawn_command_line_async (uri, error);
++ g_free (uri);
+ } else {
+ success = g_spawn_command_line_async ("yelp help:amide", error);
+ }
=====================================
debian/patches/no-gnome-vfs.patch deleted
=====================================
@@ -1,348 +0,0 @@
-Description: Remove GnomeVFS support (also fix a memory leak).
-Author: Yavor Doganov <yavor at gnu.org>
-Forwarded: no
-Last-Update: 2024-02-22
----
-
---- amide.orig/amide-current/configure.ac
-+++ amide/amide-current/configure.ac
-@@ -376,25 +376,6 @@
-
- GLIB_GSETTINGS
-
--## add in gnome-vfs if not on win32 or gtk-osx
--## gnome-vfs is only used by amide_gnome.c and only on unix
--if (test $native_win32 = no) && (test $enable_native_gtk_osx = no); then
-- AC_ARG_ENABLE(gnome-vfs,
-- [ --enable-gnome-vfs Compile with gnome-vfs support [default=yes]],
-- enable_gnome_vfs="$enableval",
-- enable_gnome_vfs=yes)
-- if test "x$enable_gnome_vfs" = "xyes"; then
-- PKG_CHECK_MODULES(AMIDE_GTK_EXTRA_GVFS,[
-- gnome-vfs-2.0 >= 2.16.0
-- ], [AC_DEFINE(AMIDE_USE_GNOME_VFS, 1, Use gnome-vfs for spawning help process)
-- AMIDE_GTK_LIBS="$AMIDE_GTK_LIBS $AMIDE_GTK_EXTRA_GVFS_LIBS"
-- AMIDE_GTK_CFLAGS="$AMIDE_GTK_CFLAGS $AMIDE_GTK_EXTRA_GVFS_CFLAGS"
-- ])
-- else
-- echo "Don't use gnome-vfs"
-- fi
--fi
--
- AC_SUBST(AMIDE_GTK_LIBS)
- AC_SUBST(AMIDE_GTK_CFLAGS)
-
---- amide.orig/amide-current/src/amide_gnome.c
-+++ amide/amide-current/src/amide_gnome.c
-@@ -36,303 +36,6 @@
- #include "amitk_common.h"
- #include "amide_gnome.h"
-
--#if !defined(G_OS_WIN32) && !defined(AMIDE_NATIVE_GTK_OSX) && defined(AMIDE_USE_GNOME_VFS)
--#include <libgnomevfs/gnome-vfs-utils.h>
--#include <libgnomevfs/gnome-vfs-uri.h>
--//#else
--//#include <windows.h>
--#endif
--
--typedef enum {
-- AMIDE_GNOME_URL_ERROR_PARSE,
-- AMIDE_GNOME_URL_ERROR_LAUNCH,
-- AMIDE_GNOME_URL_ERROR_URL,
-- AMIDE_GNOME_URL_ERROR_NO_DEFAULT,
-- AMIDE_GNOME_URL_ERROR_NOT_SUPPORTED,
-- AMIDE_GNOME_URL_ERROR_VFS,
-- AMIDE_GNOME_URL_ERROR_CANCELLED
--} AmideGnomeURLError;
--
--#define AMIDE_GNOME_URL_ERROR (amide_gnome_url_error_quark ())
--
--GQuark amide_gnome_url_error_quark (void) {
-- static GQuark error_quark = 0;
--
-- if (error_quark == 0)
-- error_quark = g_quark_from_static_string ("amide-gnome-url-error-quark");
--
-- return error_quark;
--}
--
--
--static gboolean amide_gnome_url_show_with_env (const char *url, char **envp, GError **error) {
--#if !defined(G_OS_WIN32) && !defined(AMIDE_NATIVE_GTK_OSX) && defined(AMIDE_USE_GNOME_VFS)
-- GnomeVFSResult result;
-- GnomeVFSURI *vfs_uri;
--
-- g_return_val_if_fail (url != NULL, FALSE);
--
-- result = gnome_vfs_url_show_with_env (url, envp);
--
-- switch (result) {
-- case GNOME_VFS_OK:
-- return TRUE;
--
-- case GNOME_VFS_ERROR_INTERNAL:
-- g_set_error (error,
-- AMIDE_GNOME_URL_ERROR,
-- AMIDE_GNOME_URL_ERROR_VFS,
-- _("Unknown internal error while displaying this location."));
-- break;
--
-- case GNOME_VFS_ERROR_BAD_PARAMETERS:
-- g_set_error (error,
-- AMIDE_GNOME_URL_ERROR,
-- AMIDE_GNOME_URL_ERROR_URL,
-- _("The specified location is invalid."));
-- break;
--
-- case GNOME_VFS_ERROR_PARSE:
-- g_set_error (error,
-- AMIDE_GNOME_URL_ERROR,
-- AMIDE_GNOME_URL_ERROR_PARSE,
-- _("There was an error parsing the default action command associated "
-- "with this location."));
-- break;
--
-- case GNOME_VFS_ERROR_LAUNCH:
-- g_set_error (error,
-- AMIDE_GNOME_URL_ERROR,
-- AMIDE_GNOME_URL_ERROR_LAUNCH,
-- _("There was an error launching the default action command associated "
-- "with this location."));
-- break;
--
-- case GNOME_VFS_ERROR_NO_DEFAULT:
-- g_set_error (error,
-- AMIDE_GNOME_URL_ERROR,
-- AMIDE_GNOME_URL_ERROR_NO_DEFAULT,
-- _("There is no default action associated with this location."));
-- break;
--
-- case GNOME_VFS_ERROR_NOT_SUPPORTED:
-- g_set_error (error,
-- AMIDE_GNOME_URL_ERROR,
-- AMIDE_GNOME_URL_ERROR_NOT_SUPPORTED,
-- _("The default action does not support this protocol."));
-- break;
--
-- case GNOME_VFS_ERROR_CANCELLED:
-- g_set_error (error,
-- AMIDE_GNOME_URL_ERROR,
-- AMIDE_GNOME_URL_ERROR_CANCELLED,
-- _("The request was cancelled."));
-- break;
--
-- case GNOME_VFS_ERROR_HOST_NOT_FOUND:
-- {
-- vfs_uri = gnome_vfs_uri_new (url);
-- if (gnome_vfs_uri_get_host_name (vfs_uri) != NULL) {
-- g_set_error (error,
-- AMIDE_GNOME_URL_ERROR,
-- AMIDE_GNOME_URL_ERROR_VFS,
-- _("The host \"%s\" could not be found."),
-- gnome_vfs_uri_get_host_name (vfs_uri));
-- } else {
-- g_set_error (error,
-- AMIDE_GNOME_URL_ERROR,
-- AMIDE_GNOME_URL_ERROR_VFS,
-- _("The host could not be found."));
-- }
-- gnome_vfs_uri_unref (vfs_uri);
-- }
-- break;
--
-- case GNOME_VFS_ERROR_INVALID_URI:
-- case GNOME_VFS_ERROR_NOT_FOUND:
-- g_set_error (error,
-- AMIDE_GNOME_URL_ERROR,
-- AMIDE_GNOME_URL_ERROR_VFS,
-- _("The location or file could not be found."));
-- break;
--
-- case GNOME_VFS_ERROR_LOGIN_FAILED:
-- g_set_error (error,
-- AMIDE_GNOME_URL_ERROR,
-- AMIDE_GNOME_URL_ERROR_VFS,
-- _("The login has failed."));
-- break;
-- default:
-- g_set_error (error,
-- AMIDE_GNOME_URL_ERROR,
-- AMIDE_GNOME_URL_ERROR_VFS,
-- "%s", gnome_vfs_result_to_string (result));
-- }
--
-- return FALSE;
--#else
-- char *argv[] = { NULL, NULL, NULL };
--
-- /* TODO : handle translations when we generate them */
-- argv[0] = (char *)"hh";
-- argv[1] = url;
-- g_spawn_async (NULL, argv, NULL, G_SPAWN_SEARCH_PATH,
-- NULL, NULL, NULL, error);
--
-- return TRUE;
--#endif
--}
--
--static gboolean amide_gnome_help_display_uri_with_env (const char *help_uri, char **envp, GError **error) {
-- GError *real_error;
-- gboolean retval;
--
-- real_error = NULL;
-- retval = amide_gnome_url_show_with_env (help_uri, envp, &real_error);
--
-- if (real_error != NULL) g_propagate_error (error, real_error);
--
-- return retval;
--}
--
--
--
--static char * locate_help_file (const char *path, const char *doc_name) {
-- int i, j;
-- char *exts[] = { "", ".xml", ".docbook", ".sgml", ".html", NULL };
-- const char * const * lang_list = g_get_language_names ();
--
-- for (j = 0;lang_list[j] != NULL; j++) {
-- const char *lang = lang_list[j];
--
-- /* This has to be a valid language AND a language with
-- * no encoding postfix. The language will come up without
-- * encoding next */
-- if (lang == NULL ||
-- strchr (lang, '.') != NULL)
-- continue;
--
-- for (i = 0; exts[i] != NULL; i++) {
-- char *name;
-- char *full;
--
-- name = g_strconcat (doc_name, exts[i], NULL);
-- full = g_build_filename (path, lang, name, NULL);
-- g_free (name);
--
-- if (g_file_test (full, G_FILE_TEST_EXISTS))
-- return full;
--
-- g_free (full);
-- }
-- }
--
-- return NULL;
--}
--
--/* returns an array of strings (strings can be potentially null) - array and strings need to be free'd */
--static gchar ** amide_gnome_program_locate_help_file (const gchar *file_name, gboolean only_if_exists) {
--
-- gchar *buf;
-- gchar ** retvals;
-- gchar ** dirs;
-- const gchar * const * global_dirs;
-- gint i;
-- gint j;
-- gint count=0;
-- gint slots;
--
-- g_return_val_if_fail (file_name != NULL, NULL);
--
-- global_dirs = g_get_system_data_dirs();
-- while (global_dirs[count] != NULL) count++; /* count */
--
-- /* allocate the array of strings - extra spot for AMIDE_DATADIR,
-- plus an extra spot if on win32,
-- plus one at end for NULL termination */
--#if defined (G_PLATFORM_WIN32)
-- slots = count+3;
--#else
-- slots = count+2;
--#endif
--
-- dirs = g_try_new0(gchar *,slots);
-- retvals = g_try_new0(gchar *,slots);
-- g_return_val_if_fail((dirs != NULL) && (retvals != NULL), NULL);
--
-- j=0;
-- /* copy over the directories */
-- dirs[j] = g_strdup(AMIDE_DATADIR); /* first entry */
-- j++;
--
-- /* FIXME, below function is now deprecated
--#if defined (G_PLATFORM_WIN32)
-- dirs[j] = g_win32_get_package_installation_subdirectory(NULL, NULL,"share");
-- j++;
--#endif
-- */
--
-- i=0;
-- while (global_dirs[i] != NULL) { /* rest of the entries */
-- dirs[j] = g_strdup(global_dirs[i]);
-- i++;
-- j++;
-- }
--
--
-- /* Potentially add an absolute path */
-- if (g_path_is_absolute (file_name))
-- if (!only_if_exists || g_file_test (file_name, G_FILE_TEST_EXISTS)) {
-- retvals[0] = g_strdup(file_name);
-- return retvals; /* we're already done */
-- }
--
-- /* use the prefix */
-- if (AMIDE_DATADIR == NULL) {
-- g_warning (G_STRLOC ": Directory properties not set correctly. "
-- "Cannot locate application specific files.");
-- return retvals;
-- }
--
-- i=0;
-- j=0;
-- while (dirs[i] != NULL) {
-- buf = g_strdup_printf ("%s%s%s%s%s", dirs[i], G_DIR_SEPARATOR_S, "help", G_DIR_SEPARATOR_S,file_name);
--
-- if (!only_if_exists || g_file_test (buf, G_FILE_TEST_EXISTS)) {
-- retvals[j] = buf;
-- j++;
-- } else
-- g_free(buf);
-- i++;
-- }
--
-- i=0;
-- while (dirs[i] != NULL) {
-- g_free(dirs[i]);
-- i++;
-- }
-- g_free(dirs);
--
-- return retvals;
--}
--
--
--typedef enum {
-- AMIDE_GNOME_HELP_ERROR_INTERNAL,
-- AMIDE_GNOME_HELP_ERROR_NOT_FOUND
--} AmideGnomeHelpError;
--
--#define AMIDE_GNOME_HELP_ERROR (amide_gnome_help_error_quark ())
--GQuark amide_gnome_help_error_quark (void) {
-- static GQuark error_quark = 0;
--
-- if (error_quark == 0)
-- error_quark = g_quark_from_static_string ("amide-gnome-help-error-quark");
--
-- return error_quark;
--}
--
-
- gboolean amide_gnome_help_display (const char *file_name, const char *link_id, GError **error) {
-
-@@ -342,6 +45,7 @@
- if (link_id) {
- uri = g_strconcat ("yelp help:amide/", link_id, NULL);
- success = g_spawn_command_line_async (uri, error);
-+ g_free (uri);
- } else {
- success = g_spawn_command_line_async ("yelp help:amide", error);
- }
=====================================
debian/patches/resizable-window.patch
=====================================
@@ -9,7 +9,7 @@ Description: Make the main (study) window resizable.
Bug-Debian: https://bugs.debian.org/901677
Bug: https://github.com/ferdymercury/amide/issues/26
Author: Yavor Doganov <yavor at gnu.org>
-Forwarded: no
+Forwarded: https://github.com/ferdymercury/amide/pull/37
Last-Update: 2024-02-24
---
=====================================
debian/patches/series
=====================================
@@ -7,8 +7,8 @@ debian-djdecode.patch
ffmpeg-5.patch
typos.patch
gsettings.patch
-gtk3+goocanvas.patch
-no-gnome-vfs.patch
+gtk3.patch
+memleak.patch
compiler-warnings.patch
resizable-window.patch
ffmpeg8.patch
=====================================
debian/rules
=====================================
@@ -11,6 +11,7 @@ override_dh_auto_configure:
cp -v amide-current/help/C/amide.xml amide-current/help/C/index.docbook
dh_auto_configure --sourcedirectory=amide-current/ -- \
--disable-amide-debug \
+ --disable-gnome-vfs \
--config-cache \
--disable-dependency-tracking \
--prefix=/usr \
View it on GitLab: https://salsa.debian.org/med-team/amide/-/compare/68b2959231b8eaba82b2e5d6482b151adea9df1a...1d3692c658bf26e17be387782058f08a37279232
--
View it on GitLab: https://salsa.debian.org/med-team/amide/-/compare/68b2959231b8eaba82b2e5d6482b151adea9df1a...1d3692c658bf26e17be387782058f08a37279232
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20260213/20ccd4da/attachment-0001.htm>
More information about the debian-med-commit
mailing list