[SCM] gsequencer/master: removed patch because further fixes available

[jkraehemann-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 1e772449ba045c183fcf2f7ae061f449a7d6604f
Author: Joël Krähemann <jkraehemann-guest at users.alioth.debian.org>
Date:   Sun Feb 5 15:37:54 2017 +0100

    removed patch because further fixes available

diff --git a/debian/patches/fix-gsequencer-main.patch b/debian/patches/fix-gsequencer-main.patch
deleted file mode 100644
index 64404be..0000000
--- a/debian/patches/fix-gsequencer-main.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-Description: This patch fixes not excluded timer code by macro. Certain
- platforms don't support the SIGRTMIN signal and thus don't compile the
- code. It is safe to use this patch because timers are disabled by default.
-Author: Joël Krähmann <jkraehemann at gmail.com>
-Applied-Upstream: 0.7.122.x, http://git.savannah.gnu.org/cgit/gsequencer.git
-Last-Update: 2017-02-03
---- a/ags/gsequencer_main.c
-+++ b/ags/gsequencer_main.c
-@@ -121,6 +121,7 @@
- 
- extern volatile gboolean ags_show_start_animation;
- 
-+#ifndef AGS_USE_TIMER
- void
- ags_signal_handler(int signr)
- {
-@@ -136,7 +137,9 @@
-     //    }
-   }
- }
-+#endif
- 
-+#ifdef AGS_USE_TIMER
- void
- ags_signal_handler_timer(int sig, siginfo_t *si, void *uc)
- {
-@@ -152,6 +155,7 @@
-     pthread_mutex_unlock(AGS_THREAD(ags_application_context->main_loop)->timer_mutex);
-   //  signal(sig, SIG_IGN);
- }
-+#endif
- 
- static void
- ags_signal_cleanup()
-@@ -267,6 +271,7 @@
- 		 ags_start_animation_thread, window);
- }
- 
-+#ifndef AGS_USE_TIMER
- void
- ags_setup(int argc, char **argv)
- {
-@@ -424,6 +429,8 @@
-   ags_application_context->argc = argc;
-   ags_application_context->argv = argv;
- 
-+  ags_application_context_register_types(ags_application_context);
-+
-   /* fix cross-references in managers */
-   lv2_worker_manager->thread_pool = ((AgsXorgApplicationContext *) ags_application_context)->thread_pool;
-   
-@@ -437,7 +444,9 @@
-   g_atomic_int_set(&(ags_show_start_animation),
- 		   FALSE);
- }
-+#endif
- 
-+#ifndef AGS_USE_TIMER
- void
- ags_launch(gboolean single_thread)
- {
-@@ -578,7 +587,9 @@
-     ags_thread_start((AgsThread *) single_thread);
-   }
- }
-+#endif
- 
-+#ifndef AGS_USE_TIMER
- void
- ags_launch_filename(gchar *filename,
- 		    gboolean single_thread)
-@@ -747,7 +758,9 @@
-     		 NULL);
-   }
- }
-+#endif
- 
-+#ifdef AGS_USE_TIMER
- timer_t*
- ags_timer_setup()
- {
-@@ -782,11 +795,13 @@
-   if(timer_create(CLOCK_MONOTONIC, &ags_sev_timer, timer_id) == -1){
-     perror("timer_create\0");
-     exit(EXIT_FAILURE);
--  }
-+  }  
- 
-   return(timer_id);
- }
-+#endif
- 
-+#ifdef AGS_USE_TIMER
- void
- ags_timer_start(timer_t *timer_id)
- {
-@@ -807,9 +822,11 @@
-   if(sigprocmask(SIG_UNBLOCK, &ags_timer_mask, NULL) == -1){
-     perror("sigprocmask\0");
-     exit(EXIT_FAILURE);
--  }
-+  }  
- }
-+#endif
- 
-+#ifdef AGS_USE_TIMER
- void
- ags_timer_launch(timer_t *timer_id,
- 		 gboolean single_thread)
-@@ -954,7 +971,9 @@
-     ags_thread_start((AgsThread *) single_thread);
-   }
- }
-+#endif
- 
-+#ifdef AGS_USE_TIMER
- void
- ags_timer_launch_filename(timer_t *timer_id, gchar *filename,
- 			  gboolean single_thread)
-@@ -1128,6 +1147,7 @@
- 		 NULL);
-   }
- }
-+#endif
- 
- void
- ags_show_file_error(gchar *filename,
diff --git a/debian/patches/fix-souncard-editor-callbacks.patch b/debian/patches/fix-souncard-editor-callbacks.patch
new file mode 100644
index 0000000..f10ee21
--- /dev/null
+++ b/debian/patches/fix-souncard-editor-callbacks.patch
@@ -0,0 +1,5 @@
+Description: This patch is considered critical since it fixes wrong soundcard
+ passed to the AgsSetBufferSize and AgsSetSamplerate tasks.
+Author: Joël Krähmann <jkraehemann at gmail.com>
+Applied-Upstream: 0.7.122.x, http://git.savannah.gnu.org/cgit/gsequencer.git
+Last-Update: 2017-02-05
diff --git a/debian/patches/series b/debian/patches/series
index c1d1ecc..aab5e6e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+fix-souncard-editor-callbacks.patch
 fix-set-buffer-size.patch
 fix-set-samplerate.patch
 fix-record-midi-audio-run.patch
@@ -6,7 +7,6 @@ fix-main-loop-c.patch
 fix-main-loop-h.patch
 wish-line-c.patch
 wish-effect-line-c.patch
-fix-gsequencer-main.patch
 wish-indicator.patch
 wish-recall-channel.patch
 wish-recall-audio.patch

-- 
gsequencer packaging