60 lines
2.8 KiB
Diff
60 lines
2.8 KiB
Diff
--- kaffeine/src/kaffeine.desktop
|
|
+++ kaffeine/src/kaffeine.desktop 2005/09/06 09:01:52
|
|
@@ -19,3 +19,4 @@
|
|
Terminal=false
|
|
Type=Application
|
|
X-KDE-HasTempFileOption=true
|
|
+InitialPreference=4
|
|
--- kaffeine/src/player-parts/xine-part/kxinewidget.cpp 2007/04/14 05:59:48 1.1
|
|
+++ kaffeine/src/player-parts/xine-part/kxinewidget.cpp 2007/04/14 06:01:37
|
|
@@ -1080,7 +1080,8 @@
|
|
/**** INIT XINE DISPLAY ****/
|
|
|
|
#ifndef HAVE_XCB
|
|
- XInitThreads();
|
|
+ // too late, it will crash for sure
|
|
+ // XInitThreads();
|
|
|
|
connection = XOpenDisplay(NULL);
|
|
#else
|
|
--- kaffeine/src/instwizard.cpp
|
|
+++ kaffeine/src/instwizard.cpp 2005/09/06 09:01:52
|
|
@@ -106,8 +106,7 @@
|
|
if (entries.count())
|
|
info << "<font color=\"DarkGreen\">" << i18n("Ok.") << "</font>";
|
|
else
|
|
- info << "<font color=\"DarkRed\">" << i18n("No WIN32 codecs found in /usr/lib/win32. You're not able to play Windows Media 9 files, newer Real Media files and some less common formats. Download the codecs here:")
|
|
- << " <a href=\"http://www1.mplayerhq.hu/homepage/design7/codecs.html\">http://www.mplayerhq.hu</a>.</font>";
|
|
+ info << "<font color=\"DarkRed\">" << i18n("No WIN32 codecs found in /usr/lib/win32. You're not able to play Windows Media 9 files, newer Real Media files and some less common formats.");
|
|
|
|
//LIBDVDCSS
|
|
info << "<br><hr><b>" << "libdvdcss" << "...</b><br>";
|
|
@@ -131,8 +130,7 @@
|
|
}
|
|
}
|
|
if (!dvdcss)
|
|
- info << "<font color=\"DarkRed\">" << i18n("libdvdcss not found. You're not able to play encrypted (most commercial) DVD's. You can get the library here (but using it may violate copyright regulations of your country!):")
|
|
- << " <a href=\"http://developers.videolan.org/libdvdcss/\">http://developers.videolan.org/libdvdcss</a>.</font>";
|
|
+ info << "<font color=\"DarkRed\">" << i18n("libdvdcss not found. You're not able to play encrypted (most commercial) DVD's.");
|
|
else
|
|
info << "<font color=\"DarkGreen\">" << i18n("Ok.") << "</font>";
|
|
|
|
@@ -172,8 +170,7 @@
|
|
file.open(IO_ReadOnly);
|
|
QTextStream stream(&file);
|
|
info << "<font color=\"DarkBlue\">" << i18n("Found") << ": " << stream.readLine() << ". </font>"
|
|
- << i18n("The xine-lib shipped by SuSE \"may lack certain features because of legal requirements (potential patent violation)\". You should use the packages from here:")
|
|
- << " <a href=\"http://packman.links2linux.de/?action=124\">http://packman.links2linux.de</a>.";
|
|
+ << i18n("The xine-lib shipped by SuSE \"may lack certain features because of legal requirements (potential patent violation)\".");
|
|
file.close();
|
|
}
|
|
else
|
|
--- configure.in.in.orig 2006-11-25 13:52:25.000000000 +0100
|
|
+++ configure.in.in 2006-11-25 13:52:42.000000000 +0100
|
|
@@ -1,4 +1,5 @@
|
|
#MIN_CONFIG(3.3)
|
|
+AM_INIT_AUTOMAKE(kaffeine, "0.8.2")
|
|
CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"
|
|
|
|
if test "$build_arts" = "yes"; then
|