[SCM] terminatorx/master: Drop 20_fix_ftbfs_on_kfreebsd.patch, adopted upstream.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Mon Mar 10 11:24:02 UTC 2014


The following commit has been merged in the master branch:
commit 23c23ce293bd7e8089bde64d256ff7c75b922310
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Mar 10 11:21:30 2014 +0000

    Drop 20_fix_ftbfs_on_kfreebsd.patch, adopted upstream.

diff --git a/debian/patches/20_fix_ftbfs_on_kfreebsd.patch b/debian/patches/20_fix_ftbfs_on_kfreebsd.patch
deleted file mode 100644
index 2c1fe5f..0000000
--- a/debian/patches/20_fix_ftbfs_on_kfreebsd.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-Author: Cyril Brulebois <kibi at debian.org>
-Description: Fix FTBFS on GNU/kFreeBSD
-Bug-Debian: http://bugs.debian.org/542531
----
- src/tX_mouse.cc     |    1 +
- src/tX_seqpar.cc    |    1 +
- src/tX_sequencer.cc |    1 +
- src/tX_vtt.cc       |    2 ++
- src/tX_vttfx.cc     |    1 +
- src/tX_vttgui.cc    |    1 +
- 6 files changed, 7 insertions(+)
-
---- terminatorx.orig/src/tX_mouse.cc
-+++ terminatorx/src/tX_mouse.cc
-@@ -48,6 +48,7 @@
- #include "tX_engine.h"
- #include "tX_vtt.h"
- #include <stdlib.h>
-+#include <string.h>
- 
- #define TX_MOUSE_SPEED_NORMAL 0.05
- #define TX_MOUSE_SPEED_WARP 250000
---- terminatorx.orig/src/tX_seqpar.cc
-+++ terminatorx/src/tX_seqpar.cc
-@@ -30,6 +30,7 @@
- #include "tX_extdial.h"
- #include "tX_engine.h"
- #include <malloc.h>
-+#include <string.h>
- 
- #define TX_SEQPAR_DEFAULT_SCALE 0.05
- 
---- terminatorx.orig/src/tX_sequencer.cc
-+++ terminatorx/src/tX_sequencer.cc
-@@ -25,6 +25,7 @@
- #include "tX_sequencer.h"
- #include "tX_mastergui.h"
- #include "tX_global.h"
-+#include <string.h>
- 
- tX_sequencer sequencer;
- 
---- terminatorx.orig/src/tX_vtt.cc
-+++ terminatorx/src/tX_vtt.cc
-@@ -41,6 +41,8 @@
- 
- #include "tX_loaddlg.h"
- 
-+#include <string.h>
-+
- #define USE_PREFETCH 1
- 
- #ifdef USE_PREFETCH
---- terminatorx.orig/src/tX_vttfx.cc
-+++ terminatorx/src/tX_vttfx.cc
-@@ -28,6 +28,7 @@
- #include "tX_vtt.h"
- #define myvtt ((vtt_class *) vtt)
- #include "tX_global.h"
-+#include <string.h>
- 
- float ladspa_dummy_output_port;
- 
---- terminatorx.orig/src/tX_vttgui.cc
-+++ terminatorx/src/tX_vttgui.cc
-@@ -60,6 +60,7 @@
- #include "tX_flash.h"
- #include <stdio.h>
- #include <ctype.h>
-+#include <string.h>
- 
- #define WID_DYN TRUE, TRUE, 0
- #define WID_FIX FALSE, FALSE, 0
diff --git a/debian/patches/series b/debian/patches/series
index 72e60a6..4f44d7e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 15_icon_xpm.patch
 17_cleanup_desktop_file.patch
-20_fix_ftbfs_on_kfreebsd.patch
 22_manual.patch
 23_new_zlib.patch
 24-missing_include.patch

-- 
terminatorx packaging



More information about the pkg-multimedia-commits mailing list