[SCM] dvbcut/master: Drop fix-ftbfs-gcc4.6 patch as it has been integrated upstream

fabricesp-guest at users.alioth.debian.org fabricesp-guest at users.alioth.debian.org
Sun Jan 15 16:39:47 UTC 2012


The following commit has been merged in the master branch:
commit bf83998663d81031998b72d8050944023a5134ca
Author: Fabrice Coutadeur <coutadeurf at gmail.com>
Date:   Sun Jan 15 08:05:34 2012 +0100

    Drop fix-ftbfs-gcc4.6 patch as it has been integrated upstream

diff --git a/debian/patches/fix-ftbfs-gcc4.6.patch b/debian/patches/fix-ftbfs-gcc4.6.patch
deleted file mode 100644
index 1352329..0000000
--- a/debian/patches/fix-ftbfs-gcc4.6.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-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 ac70e1e..3519ebc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-fix-ftbfs-gcc4.6.patch
 port-to-qt4.patch
 fix-ftbfs-libav0.7.patch

-- 
dvbcut packaging



More information about the pkg-multimedia-commits mailing list