Fixed compile issues with patches submitted by ms@venturemedia.de, Bug #196198.

(Portage version: 2.1.3.14)

4 files changed, 79 insertions, 0 deletions

diff --git a/media-tv/kvdr/files/digest-kvdr-0.64-r2 b/media-tv/kvdr/files/digest-kvdr-0.64-r2
new file mode 100644
index 000000000000..fb8fb0a032c9
--- /dev/null
+++ b/media-tv/kvdr/files/digest-kvdr-0.64-r2
@@ -0,0 +1,3 @@
+MD5 ec3eb79c712d7d71f0a5de6e5df5e588 kvdr-0.64-gentoo.tar.gz 714071
+RMD160 68b420c3459b4b6bfbe690f24ab1200032f8c44f kvdr-0.64-gentoo.tar.gz 714071
+SHA256 4b1a264478251ebb7108d6188e86bcc2bcbadfbce47c250d422f15ef94a49e2c kvdr-0.64-gentoo.tar.gz 714071
diff --git a/media-tv/kvdr/files/kvdr-0.64-desktop-file.patch b/media-tv/kvdr/files/kvdr-0.64-desktop-file.patch
new file mode 100644
index 000000000000..9321fb8860a6
--- /dev/null
+++ b/media-tv/kvdr/files/kvdr-0.64-desktop-file.patch
@@ -0,0 +1,16 @@
+diff -ru kvdr-0.64-gentoo/kvdr/kvdr.desktop kvdr-0.64-gentoo-desktop-file/kvdr/kvdr.desktop
+--- kvdr-0.64-gentoo/kvdr/kvdr.desktop	2001-11-03 17:06:56.000000000 +0100
++++ kvdr-0.64-gentoo-desktop-file/kvdr/kvdr.desktop	2007-10-16 21:57:14.000000000 +0200
+@@ -1,9 +1,10 @@
+ # KDE Config File
+ [KDE Desktop Entry]
++Categories=Qt;KDE;Application;AudioVideo;Player;
+ Type=Application
+ Exec=kvdr
+-Icon=kvdr.png
+-MiniIcon=mini-kvdr.png
++Icon=kvdr
++MiniIcon=mini-kvdr
+ DocPath=kvdr/index.html
+ Comment=Digital TV viewer and recorder
+ Comment[de]=Digital-TV Viewer and Recorder
diff --git a/media-tv/kvdr/files/kvdr-0.64-remove-ansi-cflag.patch b/media-tv/kvdr/files/kvdr-0.64-remove-ansi-cflag.patch
new file mode 100644
index 000000000000..20bc237f5237
--- /dev/null
+++ b/media-tv/kvdr/files/kvdr-0.64-remove-ansi-cflag.patch
@@ -0,0 +1,48 @@
+diff -ru kvdr-0.64-gentoo/acinclude.m4 kvdr-0.64-gentoo-no-ansi/acinclude.m4
+--- kvdr-0.64-gentoo/acinclude.m4	2006-07-28 21:29:53.000000000 +0200
++++ kvdr-0.64-gentoo-no-ansi/acinclude.m4	2007-10-16 21:47:04.000000000 +0200
+@@ -3198,7 +3198,7 @@
+         case $host in
+           *-*-linux-gnu)	
+             CFLAGS="-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
+-            CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts $CXXFLAGS"
++            CXXFLAGS="-D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts $CXXFLAGS"
+             KDE_CHECK_COMPILER_FLAG(Wmissing-format-attribute, [CXXFLAGS="$CXXFLAGS -Wformat-security -Wmissing-format-attribute"])
+             KDE_CHECK_C_COMPILER_FLAG(Wmissing-format-attribute, [CFLAGS="$CFLAGS -Wformat-security -Wmissing-format-attribute"])
+           ;;
+diff -ru kvdr-0.64-gentoo/aclocal.m4 kvdr-0.64-gentoo-no-ansi/aclocal.m4
+--- kvdr-0.64-gentoo/aclocal.m4	2006-07-28 21:32:42.000000000 +0200
++++ kvdr-0.64-gentoo-no-ansi/aclocal.m4	2007-10-16 21:47:12.000000000 +0200
+@@ -3210,7 +3210,7 @@
+         case $host in
+           *-*-linux-gnu)	
+             CFLAGS="-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
+-            CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts $CXXFLAGS"
++            CXXFLAGS="-D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts $CXXFLAGS"
+             KDE_CHECK_COMPILER_FLAG(Wmissing-format-attribute, [CXXFLAGS="$CXXFLAGS -Wformat-security -Wmissing-format-attribute"])
+             KDE_CHECK_C_COMPILER_FLAG(Wmissing-format-attribute, [CFLAGS="$CFLAGS -Wformat-security -Wmissing-format-attribute"])
+           ;;
+diff -ru kvdr-0.64-gentoo/admin/acinclude.m4.in kvdr-0.64-gentoo-no-ansi/admin/acinclude.m4.in
+--- kvdr-0.64-gentoo/admin/acinclude.m4.in	2006-07-28 21:25:46.000000000 +0200
++++ kvdr-0.64-gentoo-no-ansi/admin/acinclude.m4.in	2007-10-16 21:47:21.000000000 +0200
+@@ -3198,7 +3198,7 @@
+         case $host in
+           *-*-linux-gnu)	
+             CFLAGS="-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
+-            CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts $CXXFLAGS"
++            CXXFLAGS="-D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts $CXXFLAGS"
+             KDE_CHECK_COMPILER_FLAG(Wmissing-format-attribute, [CXXFLAGS="$CXXFLAGS -Wformat-security -Wmissing-format-attribute"])
+             KDE_CHECK_C_COMPILER_FLAG(Wmissing-format-attribute, [CFLAGS="$CFLAGS -Wformat-security -Wmissing-format-attribute"])
+           ;;
+diff -ru kvdr-0.64-gentoo/configure kvdr-0.64-gentoo-no-ansi/configure
+--- kvdr-0.64-gentoo/configure	2006-07-28 21:32:49.000000000 +0200
++++ kvdr-0.64-gentoo-no-ansi/configure	2007-10-16 21:47:38.000000000 +0200
+@@ -5319,7 +5319,7 @@
+         case $host in
+           *-*-linux-gnu)
+             CFLAGS="-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
+-            CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts $CXXFLAGS"
++            CXXFLAGS="-D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts $CXXFLAGS"
+ 
+ { echo "$as_me:$LINENO: checking whether $CXX supports -Wmissing-format-attribute" >&5
+ echo $ECHO_N "checking whether $CXX supports -Wmissing-format-attribute... $ECHO_C" >&6; }
diff --git a/media-tv/kvdr/files/kvdr-0.64-unsigned-int-casting.patch b/media-tv/kvdr/files/kvdr-0.64-unsigned-int-casting.patch
new file mode 100644
index 000000000000..bb8da23be09e
--- /dev/null
+++ b/media-tv/kvdr/files/kvdr-0.64-unsigned-int-casting.patch
@@ -0,0 +1,12 @@
+diff -ru kvdr-0.64-gentoo/kvdr/kvdr.cpp kvdr-0.64-gentoo-int-casting/kvdr/kvdr.cpp
+--- kvdr-0.64-gentoo/kvdr/kvdr.cpp	2007-10-15 23:57:44.000000000 +0200
++++ kvdr-0.64-gentoo-int-casting/kvdr/kvdr.cpp	2007-10-15 23:57:33.000000000 +0200
+@@ -101,7 +101,7 @@
+   /* guess physical screen format */
+   int width, bank, ram;
+   base = NULL;
+-  if(!XF86DGAGetVideoLL(disp,screen,(int*)&base,&width,&bank,&ram))
++  if(!XF86DGAGetVideoLL(disp,screen,(unsigned int*)&base,&width,&bank,&ram))
+   {
+     base=NULL;
+   }