[SCM] dvbcut/master: Take patch from upstream's SVN trunk to prevent build failures with GCC4.6.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Thu May 5 12:30:39 UTC 2011


The following commit has been merged in the master branch:
commit 272fa1c6b28565ab9fd15bffb97e51c947da74e0
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu May 5 14:25:43 2011 +0200

    Take patch from upstream's SVN trunk to prevent build failures with GCC4.6.

diff --git a/debian/patches/fix-ftbfs-gcc4.6.patch b/debian/patches/fix-ftbfs-gcc4.6.patch
new file mode 100644
index 0000000..1352329
--- /dev/null
+++ b/debian/patches/fix-ftbfs-gcc4.6.patch
@@ -0,0 +1,18 @@
+Description: Remove 'const' to prevent build failures with GCC4.6.
+Origin: http://dvbcut.svn.sourceforge.net/viewvc/dvbcut/trunk/src/dvbcut.cpp?r1=173&r2=172&pathrev=173
+Applied-Upstream: yes 
+---
+ src/dvbcut.cpp |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- dvbcut.orig/src/dvbcut.cpp
++++ dvbcut/src/dvbcut.cpp
+@@ -1325,7 +1325,7 @@ void dvbcut::eventlistcontextmenu(QListB
+   if (lbi->rtti()!=EventListItem::RTTI())
+     return;
+   // is it a problem to have no "const EventListItem &eli=..."? Needed for seteventtype()...! 
+-  EventListItem &eli=*static_cast<const EventListItem*>(lbi);
++  EventListItem &eli=*static_cast<EventListItem*>(lbi);
+ 
+   QPopupMenu popup(eventlist);
+   popup.insertItem("Go to",1);
diff --git a/debian/patches/series b/debian/patches/series
index 63cac1a..cbe589f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 remove-ffmpeg-from-distfiles.patch
 fix-ftbfs-gcc4.4.patch
 fix-ftbfs-gcc4.5.patch
+fix-ftbfs-gcc4.6.patch

-- 
dvbcut packaging



More information about the pkg-multimedia-commits mailing list