[SCM] ladish/master: Drop unnecessary patches:
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Sat Dec 31 10:19:49 UTC 2011
The following commit has been merged in the master branch:
commit 7d9e49e300bde6f299d12f7cdba269949617960d
Author: Alessio Treglia <alessio at debian.org>
Date: Sat Dec 31 11:19:15 2011 +0100
Drop unnecessary patches:
- 0001-disable_stacktrace.patch
- 0002-desktop_file.patch
- 0003-save_as_dialog_avoid_multiplied_emits.patch
- 0004-dont_activate_disabled_widgets.patch
- 1004-in_terminal_execution.patch
- 1005-kfreebsd.patch
- 1006-gladish_dependencies.patch
diff --git a/debian/patches/0001-disable_stacktrace.patch b/debian/patches/0001-disable_stacktrace.patch
deleted file mode 100644
index da8e9ce..0000000
--- a/debian/patches/0001-disable_stacktrace.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Description: Don't print the stacktrace on segfaults.
- Fixes FTBFS on alpha,armel,ia64,kfreebsd-*,powerpc,sh4.
-Origin: Ubuntu, https://launchpad.net/bugs/647091
-Bug-Ubuntu: https://launchpad.net/bugs/647091
-Bug-Debian: http://bugs.debian.org/620315
-Applied-Upstream: commit:5c1bde8066251b1e7cb6da1e5235180dc20d117f
-Last-Update: 2011-04-19
-Reviewed-by: Alessio Treglia <alessio at debian.org>
----
- daemon/sigsegv.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
---- ladish.orig/daemon/sigsegv.c
-+++ ladish/daemon/sigsegv.c
-@@ -101,6 +101,9 @@ static void signal_segv(int signum, sigi
- log_error("info.si_errno = %d", info->si_errno);
- log_error("info.si_code = %d (%s)", info->si_code, si_codes[info->si_code]);
- log_error("info.si_addr = %p", info->si_addr);
-+#if defined(__arm__) || defined(__powerpc__) || defined (__ia64__) || defined (__alpha__) || defined (__FreeBSD_kernel__) || defined (__sh__)
-+ log_error("No stack trace");
-+#else
- for(i = 0; i < NGREG; i++)
- log_error("reg[%02d] = 0x" REGFORMAT, i, ucontext->uc_mcontext.gregs[i]);
-
-@@ -154,6 +157,7 @@ static void signal_segv(int signum, sigi
- log_error("%s", strings[i]);
- #endif
- log_error("End of stack trace");
-+#endif
- exit (-1);
- }
-
diff --git a/debian/patches/0002-desktop_file.patch b/debian/patches/0002-desktop_file.patch
deleted file mode 100644
index 208529c..0000000
--- a/debian/patches/0002-desktop_file.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Fix desktop file according to Freedesktop.org's specification.
-Author: Alessio Treglia <alessio at debian.org>
-Forwarded: http://ladish.org/ticket/168
-Applied-Upstream: commit:9a90f3367c99cd1c1af2601cbb0b1c0fa08238a1
----
- gui/gladish.desktop | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
---- ladish-0.3.orig/gui/gladish.desktop
-+++ ladish-0.3/gui/gladish.desktop
-@@ -1,5 +1,4 @@
- [Desktop Entry]
--Encoding=UTF-8
- Name=gladish
- Comment=LADI Session Handler
- Comment[fr]=Gestionnaire de session LADI
-@@ -15,4 +14,4 @@ Type=Application
- Terminal=false
- Exec=gladish
- Icon=gladish
--Categories=Application;AudioVideo;Audio;GNOME;
-+Categories=AudioVideo;Audio;GNOME;
diff --git a/debian/patches/0003-save_as_dialog_avoid_multiplied_emits.patch b/debian/patches/0003-save_as_dialog_avoid_multiplied_emits.patch
deleted file mode 100644
index 2751517..0000000
--- a/debian/patches/0003-save_as_dialog_avoid_multiplied_emits.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Description: Don't add signal connection for path button each time
- when it is opened to avoid multiplied emits.
-Origin: http://ladish.org/changeset/df56cfc246a91e447197735fd1ef58fe18e1eac6/
-Applied-Upstream: yes
----
- gui/dialogs.c | 2 ++
- gui/save_project_dialog.c | 9 +++++++--
- gui/save_project_dialog.h | 1 +
- 3 files changed, 10 insertions(+), 2 deletions(-)
-
---- ladish.orig/gui/dialogs.c
-+++ ladish/gui/dialogs.c
-@@ -26,6 +26,7 @@
-
- #include "graph_view.h"
- #include "gtk_builder.h"
-+#include "save_project_dialog.h"
-
- static GtkWidget * g_name_dialog;
- GtkWidget * g_app_dialog = NULL;
-@@ -151,4 +152,5 @@ void init_dialogs(void)
- {
- g_name_dialog = get_gtk_builder_widget("name_dialog");
- g_app_dialog = get_gtk_builder_widget("app_dialog");
-+ ladish_init_save_project_dialog();
- }
---- ladish.orig/gui/save_project_dialog.c
-+++ ladish/gui/save_project_dialog.c
-@@ -48,6 +48,13 @@ static void on_path_button_clicked(void)
- }
- }
-
-+void ladish_init_save_project_dialog(void)
-+{
-+ GtkWidget * path_button = NULL;
-+ path_button = get_gtk_builder_widget("project_save_as_path_button");
-+ g_signal_connect( G_OBJECT(path_button), "clicked", G_CALLBACK(on_path_button_clicked), NULL);
-+}
-+
- void ladish_run_save_project_dialog(ladish_room_proxy_handle room)
- {
- GtkWidget * dialog = NULL;
-@@ -63,8 +70,6 @@ void ladish_run_save_project_dialog(ladi
- path = GTK_ENTRY(get_gtk_builder_widget("project_save_as_path_entry"));
- name = GTK_ENTRY(get_gtk_builder_widget("project_save_as_name_entry"));
-
-- g_signal_connect( G_OBJECT(path_button), "clicked", G_CALLBACK(on_path_button_clicked), NULL);
--
- ladish_room_proxy_get_project_properties(room, &project_dir, &project_name, NULL, NULL);
-
- gtk_entry_set_text(path, project_dir);
---- ladish.orig/gui/save_project_dialog.h
-+++ ladish/gui/save_project_dialog.h
-@@ -29,6 +29,7 @@
-
- #include "../proxies/room_proxy.h"
-
-+void ladish_init_save_project_dialog(void);
- void ladish_run_save_project_dialog(ladish_room_proxy_handle room);
-
- #endif /* #ifndef SAVE_PROJECT_DIALOG_H__7C9FB1FB_8582_451E_8959_1CD688E50A20__INCLUDED */
diff --git a/debian/patches/0004-dont_activate_disabled_widgets.patch b/debian/patches/0004-dont_activate_disabled_widgets.patch
deleted file mode 100644
index ca039c7..0000000
--- a/debian/patches/0004-dont_activate_disabled_widgets.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Author: Nedko Arnaudov <nedko at arnaudov.name>
-Description: libappmenu seems to activate disabled menu items
- The implemented fix ignores such activations.
-Applied-Upstream: http://repo.or.cz/w/ladish.git/commitdiff_plain/e2b94615
-Bug: http://ladish.org/ticket/173
-Bug-Ubuntu: https://launchpad.net/bugs/835166
----
- gui/dynmenu.c | 7 ++++++-
- gui/gladish.ui | 1 +
- 2 files changed, 7 insertions(+), 1 deletion(-)
-
---- ladish.orig/gui/dynmenu.c
-+++ ladish/gui/dynmenu.c
-@@ -2,7 +2,7 @@
- /*
- * LADI Session Handler (ladish)
- *
-- * Copyright (C) 2010 Nedko Arnaudov <nedko at arnaudov.name>
-+ * Copyright (C) 2010, 2011 Nedko Arnaudov <nedko at arnaudov.name>
- *
- **************************************************************************
- * This file contains dynamic menu related code
-@@ -162,6 +162,11 @@ static void populate_dynmenu_menu(GtkMen
- const char * prefix;
- char * text;
-
-+ if (!gtk_widget_get_sensitive(GTK_WIDGET(menu_item)))
-+ {
-+ return;
-+ }
-+
- menu_dynmenu_clear(dynmenu_ptr);
- dynmenu_ptr->add_sensitive = true;
- if (!dynmenu_ptr->fill_callback(ladish_dynmenu_add_entry, dynmenu_ptr))
---- ladish.orig/gui/gladish.ui
-+++ ladish/gui/gladish.ui
-@@ -184,6 +184,7 @@
- <property name="label" translatable="yes">_Project</property>
- <property name="use_underline">True</property>
- <property name="visible">True</property>
-+ <property name="sensitive">False</property>
- <child type="submenu">
- <object class="GtkMenu" id="project_menu">
- <property name="visible">True</property>
diff --git a/debian/patches/1004-in_terminal_execution.patch b/debian/patches/1004-in_terminal_execution.patch
deleted file mode 100644
index 78d0a3d..0000000
--- a/debian/patches/1004-in_terminal_execution.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Author: Dan A. Muresan <danmbox at gmail.com>
-Description: Fix in-terminal execution for non-xterm.
- May break things on Ubuntu Lucid.
-Bug: http://ladish.org/ticket/179
-Bug-Debian: http://bugs.debian.org/626481
----
- daemon/loader.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- ladish.orig/daemon/loader.c
-+++ ladish/daemon/loader.c
-@@ -317,7 +317,7 @@ loader_exec_program(
- argv[i++] = "-e";
- }
-
-- if (!run_in_terminal || strchr(commandline, '$') != NULL)
-+ if (!run_in_terminal || 1) /* -e expects an executable not a shell command */
- {
- if (!conf_get(LADISH_CONF_KEY_DAEMON_SHELL, argv + i))
- {
diff --git a/debian/patches/1005-kfreebsd.patch b/debian/patches/1005-kfreebsd.patch
deleted file mode 100644
index a89f42e..0000000
--- a/debian/patches/1005-kfreebsd.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: Include <linux/limits.h> only on Linux architectures.
-Author: Alessio Treglia <alessio at debian.org>
-Forwarded: no
----
- alsapid/helper.c | 2 +-
- alsapid/lib.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
---- ladish.orig/alsapid/helper.c
-+++ ladish/alsapid/helper.c
-@@ -31,7 +31,7 @@
- #include <stdlib.h> /* atoll */
- #include <unistd.h>
- #include <sys/types.h>
--#include <linux/limits.h>
-+#include <limits.h>
-
- #include "alsapid.h"
-
---- ladish.orig/alsapid/lib.c
-+++ ladish/alsapid/lib.c
-@@ -28,7 +28,7 @@
-
- #include <alsa/asoundlib.h>
- #include <dlfcn.h>
--#include <linux/limits.h>
-+#include <limits.h>
- #include <stdio.h>
-
- #include "alsapid.h"
diff --git a/debian/patches/1006-gladish_dependencies.patch b/debian/patches/1006-gladish_dependencies.patch
deleted file mode 100644
index 7a7b752..0000000
--- a/debian/patches/1006-gladish_dependencies.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Append gtk+-2.0 to gladish's dependencies list to prevent FTBFS.
-Author: Alessio Treglia <alessio at debian.org>
-Forwarded: no
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=639054
-Bug-Ubuntu: https://launchpad.net/bugs/831248
----
- wscript | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- ladish.orig/wscript
-+++ ladish/wscript
-@@ -496,7 +496,7 @@ def build(bld):
- gladish = bld.program(source = [], features = 'c cxx cxxprogram', includes = [bld.path.get_bld()])
- gladish.target = 'gladish'
- gladish.defines = ['LOG_OUTPUT_STDOUT']
-- gladish.uselib = 'DBUS-1 DBUS-GLIB-1 FLOWCANVAS'
-+ gladish.uselib = 'DBUS-1 DBUS-GLIB-1 FLOWCANVAS GTK+-2.0'
-
- gladish.source = []
-
diff --git a/debian/patches/series b/debian/patches/series
index 4b0004a..2383e47 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1 @@
-0001-disable_stacktrace.patch
-0002-desktop_file.patch
-0003-save_as_dialog_avoid_multiplied_emits.patch
-0004-dont_activate_disabled_widgets.patch
-1004-in_terminal_execution.patch
-1005-kfreebsd.patch
-1006-gladish_dependencies.patch
2001-xterminal_emulator_instead_of_xterm.patch
--
ladish packaging
More information about the pkg-multimedia-commits
mailing list