[SCM] gsequencer/master: remove patches since changes applied upstream

jkraehemann-guest at users.alioth.debian.org jkraehemann-guest at users.alioth.debian.org
Sun Jun 11 14:13:30 UTC 2017


The following commit has been merged in the master branch:
commit 2d637a115866fab41a74b68f49a071de85c03f34
Author: Joël Krähemann <jkraehemann-guest at users.alioth.debian.org>
Date:   Sun Jun 11 16:03:04 2017 +0200

    remove patches since changes applied upstream

diff --git a/debian/patches/disable-functional-tests.patch b/debian/patches/disable-functional-tests.patch
index 886666f..9589f85 100644
--- a/debian/patches/disable-functional-tests.patch
+++ b/debian/patches/disable-functional-tests.patch
@@ -11,7 +11,7 @@ Last-Update: 2017-04-30
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -253,7 +253,7 @@
+@@ -275,7 +275,7 @@
  check_PROGRAMS = 
  
  include $(top_srcdir)/unit-tests.mk
diff --git a/debian/patches/fix-gtk-doc-symlinks.patch b/debian/patches/fix-gtk-doc-symlinks.patch
deleted file mode 100644
index fc4975d..0000000
--- a/debian/patches/fix-gtk-doc-symlinks.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Description: fix gtk-doc symlinks
- Do symlinks to /usr/share/gtk-doc/html from /usr/share/doc instead vice-versa.
-Author: Joël Krähemann <jkraehemann-guest at users.alioth.debian.org>
-Origin: upstream
-Forwarded: not-needed
-Applied-Upstream: http://git.savannah.nongnu.org/cgit/gsequencer.git/commit/?h=0.8.x&id=860e97b5af9b3c5e990ddf5b63fd664db7c2c858
-Last-Update: 2017-05-01
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1670,19 +1670,23 @@
- 	install -c -p -m 644 $(top_builddir)/html/developer-docs/* $(DESTDIR)/$(datadir)/doc/libags-audio-doc/html/
- 
- install-ags-docs: ags-docs
--	mkdir -p $(DESTDIR)/$(datadir)/gtk-doc/html
- 	mkdir -p $(DESTDIR)/$(datadir)/doc/libags-doc/api
- 	mkdir -p $(DESTDIR)/$(datadir)/doc/libags-audio-doc/api
- 	mkdir -p $(DESTDIR)/$(datadir)/doc/libags-gui-doc/api
- 	mkdir -p $(DESTDIR)/$(datadir)/doc/libgsequencer-doc/api
--	install -c -p -m 644 $(top_srcdir)/docs/reference/libags/html/* $(DESTDIR)/$(datadir)/doc/libags-doc/api
--	install -c -p -m 644 $(top_srcdir)/docs/reference/libags-audio/html/* $(DESTDIR)/$(datadir)/doc/libags-audio-doc/api
--	install -c -p -m 644 $(top_srcdir)/docs/reference/libags-gui/html/* $(DESTDIR)/$(datadir)/doc/libags-gui-doc/api
--	install -c -p -m 644 $(top_srcdir)/docs/reference/libgsequencer/html/* $(DESTDIR)/$(datadir)/doc/libgsequencer-doc/api
--	ln -s ../../doc/libags-doc/api $(DESTDIR)/$(datadir)/gtk-doc/html/libags
--	ln -s ../../doc/libags-audio-doc/api $(DESTDIR)/$(datadir)/gtk-doc/html/libags-audio
--	ln -s ../../doc/libags-gui-doc/api $(DESTDIR)/$(datadir)/gtk-doc/html/libags-gui
--	ln -s ../../doc/libgsequencer-doc/api $(DESTDIR)/$(datadir)/gtk-doc/html/libgsequencer
-+	mkdir -p $(DESTDIR)/$(datadir)/gtk-doc/html
-+	mkdir -p $(DESTDIR)/$(datadir)/gtk-doc/html/libags
-+	mkdir -p $(DESTDIR)/$(datadir)/gtk-doc/html/libags_audio
-+	mkdir -p $(DESTDIR)/$(datadir)/gtk-doc/html/libags_gui
-+	mkdir -p $(DESTDIR)/$(datadir)/gtk-doc/html/libgsequencer
-+	install -c -p -m 644 $(top_srcdir)/docs/reference/libags/html/* $(DESTDIR)/$(datadir)/gtk-doc/html/libags
-+	install -c -p -m 644 $(top_srcdir)/docs/reference/libags-audio/html/* $(DESTDIR)/$(datadir)/gtk-doc/html/libags_audio
-+	install -c -p -m 644 $(top_srcdir)/docs/reference/libags-gui/html/* $(DESTDIR)/$(datadir)/gtk-doc/html/libags_gui
-+	install -c -p -m 644 $(top_srcdir)/docs/reference/libgsequencer/html/* $(DESTDIR)/$(datadir)/gtk-doc/html/libgsequencer
-+	ln -s ../../gtk-doc/html/libags $(DESTDIR)/$(datadir)/doc/libags-doc/api
-+	ln -s ../../gtk-doc/html/libags_audio $(DESTDIR)/$(datadir)/doc/libags-audio-doc/api
-+	ln -s ../../gtk-doc/html/libags_gui $(DESTDIR)/$(datadir)/doc/libags-gui-doc/api
-+	ln -s ../../gtk-doc/html/libgsequencer $(DESTDIR)/$(datadir)/doc/libgsequencer-doc/api
- 
- uninstall-hook:
- 	rm -rf $(DESTDIR)/$(datadir)/gsequencer
-@@ -1692,9 +1696,9 @@
- 	rm -rf $(DESTDIR)/$(datadir)/doc/libags-audio-doc
- 	rm -rf $(DESTDIR)/$(datadir)/doc/libags-gui-doc
- 	rm -f $(DESTDIR)/$(datadir)/doc-base/gsequencer-documentation
--	rm -f $(DESTDIR)/$(datadir)/gtk-doc/html/libags
--	rm -f $(DESTDIR)/$(datadir)/gtk-doc/html/libags-audio
--	rm -f $(DESTDIR)/$(datadir)/gtk-doc/html/libags-gui
-+	rm -rf $(DESTDIR)/$(datadir)/gtk-doc/html/libags
-+	rm -rf $(DESTDIR)/$(datadir)/gtk-doc/html/libags_audio
-+	rm -rf $(DESTDIR)/$(datadir)/gtk-doc/html/libags_gui
- 	rm -f $(DESTDIR)/$(pkgconfigdir)/libags.pc
- 	rm -f $(DESTDIR)/$(pkgconfigdir)/libags_audio.pc
- 	rm -f $(DESTDIR)/$(pkgconfigdir)/libags_gui.pc
diff --git a/debian/patches/fix-midi-buffer-util-unit-test.patch b/debian/patches/fix-midi-buffer-util-unit-test.patch
deleted file mode 100644
index ad45ef8..0000000
--- a/debian/patches/fix-midi-buffer-util-unit-test.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Description: fix midi buffer util unit test
- ags_midi_buffer_util_test.c unit test does excess buffer limits. This patch fixes
- the issues it has. Fixes bug #861908.
-Author: Joël Krähemann <jkraehemann-guest at users.alioth.debian.org>
-Origin: upstream
-Forwarded: not-needed
-Applied-Upstream: http://git.savannah.nongnu.org/cgit/gsequencer.git/commit/?h=0.8.x&id=78e7b1877add068e59b18b13e2e3b4e245e0b3d3
-Last-Update: 2017-05-22
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/ags/test/audio/midi/ags_midi_buffer_util_test.c
-+++ b/ags/test/audio/midi/ags_midi_buffer_util_test.c
-@@ -1034,7 +1034,7 @@
- 					    0);
- 
-     if(memcmp(buffer, varlength_buffer[i], varlength[i][2]) ||
--       memcmp(buffer + varlength[i][2], change_program, 3)){
-+       memcmp(buffer + varlength[i][2], change_program, 2)){
-       success = FALSE;
- 
-       break;
-@@ -1058,7 +1058,7 @@
- 
-   /* invoke without return location */
-   memcpy(buffer, varlength_buffer[0], varlength[0][2]);
--  memcpy(buffer + varlength[0][2], change_program, 3);
-+  memcpy(buffer + varlength[0][2], change_program, 2);
-   
-   ags_midi_buffer_util_get_change_program(buffer,
- 					  NULL,
-@@ -1070,7 +1070,7 @@
- 
-   for(i = 0; i < 12; i++){
-     memcpy(buffer, varlength_buffer[i], varlength[i][2]);
--    memcpy(buffer + varlength[i][2], change_program, 3);
-+    memcpy(buffer + varlength[i][2], change_program, 2);
-     
-     ags_midi_buffer_util_get_change_program(buffer,
- 					    &delta_time,
-@@ -1110,7 +1110,7 @@
- 					    127);
- 
-     if(memcmp(buffer, varlength_buffer[i], varlength[i][2]) ||
--       memcmp(buffer + varlength[i][2], change_pressure, 3)){
-+       memcmp(buffer + varlength[i][2], change_pressure, 2)){
-       success = FALSE;
- 
-       break;
-@@ -1134,7 +1134,7 @@
- 
-   /* invoke without return location */
-   memcpy(buffer, varlength_buffer[0], varlength[0][2]);
--  memcpy(buffer + varlength[0][2], change_pressure, 3);
-+  memcpy(buffer + varlength[0][2], change_pressure, 2);
-   
-   ags_midi_buffer_util_get_change_pressure(buffer,
- 					  NULL,
-@@ -1146,7 +1146,7 @@
- 
-   for(i = 0; i < 12; i++){
-     memcpy(buffer, varlength_buffer[i], varlength[i][2]);
--    memcpy(buffer + varlength[i][2], change_pressure, 3);
-+    memcpy(buffer + varlength[i][2], change_pressure, 2);
-     
-     ags_midi_buffer_util_get_change_pressure(buffer,
- 					    &delta_time,
-@@ -1828,7 +1828,7 @@
-   glong delta_time, song_position;
-   gboolean success;
- 
--  buffer = (unsigned char *) malloc(6 * sizeof(unsigned char));
-+  buffer = (unsigned char *) malloc(12 * sizeof(unsigned char));
- 
-   /* invoke without return location */
-   memcpy(buffer, varlength_buffer[0], varlength[0][2]);
diff --git a/debian/patches/fix-uninitialized-pointer.patch b/debian/patches/fix-uninitialized-pointer.patch
deleted file mode 100644
index 19a1554..0000000
--- a/debian/patches/fix-uninitialized-pointer.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: fix uninitialized pointer access
- AgsMachineSeletor may be passes an unintialized pointer to gtk_widget_show_all().
- It might cause program failure or SIGSEGV.
-Author: Joël Krähemann <jkraehemann-guest at users.alioth.debian.org>
-Origin: upstream
-Bug: #861908
-Forwarded: not-needed
-Applied-Upstream: http://git.savannah.nongnu.org/cgit/gsequencer.git/commit/?h=0.8.x&id=0cd780a52585d648412075c7500eb4b301e82ae0
-Last-Update: 2017-05-05
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/ags/X/editor/ags_machine_selector.c
-+++ b/ags/X/editor/ags_machine_selector.c
-@@ -566,7 +566,10 @@
-   }
-   
-   /* show */
--  gtk_widget_show_all((GtkWidget *) keys);
-+  if((AGS_MACHINE_SELECTOR_SHOW_SHIFT_PIANO & (machine_selector->flags)) != 0){
-+    gtk_widget_show_all((GtkWidget *) keys);
-+  }
-+  
-   gtk_widget_show_all((GtkWidget *) popup);
- 
-   return(popup);
diff --git a/debian/patches/series b/debian/patches/series
index 0bca575..2e8c595 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1 @@
 disable-functional-tests.patch
-fix-gtk-doc-symlinks.patch
-fix-uninitialized-pointer.patch
-fix-midi-buffer-util-unit-test.patch

-- 
gsequencer packaging



More information about the pkg-multimedia-commits mailing list