fix kaffeine

kaffeine/CMakeLists.txt

@@ -6,8 +6,15 @@ find_package(KDE4 REQUIRED)
 find_package(X11 REQUIRED)
 find_package(VLC 1.2 REQUIRED)
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${VLC_INCLUDE_DIRS}
+include(KDE4Defaults)
-                    ${X11_Xscreensaver_INCLUDE_PATH})
+
+include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}/include
+    ${CMAKE_BINARY_DIR}
+    ${KDE4_INCLUDES}
+    ${VLC_INCLUDE_DIRS}
+    ${X11_Xscreensaver_INCLUDE_PATH}
+)
 add_definitions(${KDE4_DEFINITIONS})
 
 if(STRICT_BUILD)

kaffeine/Changelog

@@ -1,72 +0,0 @@
-------------------
-Kaffeine Changelog
-------------------
-
-Version (unreleased):
-
-Version 1.2 (2011-04-04):
-  - add search function to epg
-  - implement ATSC support for epg
-  - fix gnome screen saver inhibition
-  - other fixes and improvements ...
-
-Version 1.1 (2010-09-01):
-  - adapt to new shared-mime-info (so that .m2t is assigned to kaffeine again)
-  - workaround issue that video isn't shown without changing tabs when using QT 4.7
-  - recording schedule: fix sorting, improve column and dialog sizes,
-      show a warning about active and pending recordings when closing kaffeine
-  - program guide: remove the "Refresh" button (not necessary anymore)
-  - channel editor: allow sorting by drag and drop
-
-Version 1.0 (2010-05-31):
-  - new dependency: libXss
-  - scheduled programs are shown in the program guide
-  - the begin and end margins for recordings are configurable
-  - CICAM is supported
-  - all audio pids are recorded during timeshift
-  - subtitle support (also autoloading)
-  - other fixes and improvements ...
-
-Version 1.0-pre3 (2010-01-31):
-  - new dependencies: Qt SQLite plugin, xine-lib, libX11
-    (Phonon is no longer needed)
-  - added configurable daily or weekly repetition of recording schedule entries
-  - added support for dynamic audio / subtitles streams
-  - reworked playlist support
-  - added DBUS interface and partial MPRIS support
-  - added dvd menu button and deinterlace option
-  - added system tray icon and minimal mode option
-  - other fixes and improvements ...
-
-Version 1.0-pre2 (2009-08-09):
-  - added screen saver inhibition (using DBUS; org.freedesktop.ScreenSaver)
-  - added basic playlist features: .m3u, .pls, .xspf (+ old kaffeine format),
-    drag and drop, repeat mode and shuffle
-  - added OSD: various notifications, now and next epg
-  - added DVB-S2 support using S2 API (old API still supported for non-S2 usage)
-  - improved epg: save and restore events, possibility to schedule programs
-  - other fixes and improvements ...
-
-Version 1.0-pre1 (2009-04-26):
-  - initial KDE4 release based on KDE4, QT4, Phonon and Solid
-    much of the code base was rewritten;
-    as a consequence not all features from old kaffeine are present yet
-  - supports:
-    - KDE integration
-    - DVB-C, DVB-S, DVB-T and ATSC devices
-    - multiple devices and device hot plug
-    - scanning inclusive region-based DVB-T Autoscan
-    - audio stream and subtitle selection
-    - recordings inclusive instant record
-    - time shifting
-    - EPG (incomplete)
-    - audio CDs, video CDs and DVDs
-  - stuff you might miss: (working hard on them of course ;-)
-    - localization (see below), full EPG support, CICAM, playlist handling,
-      OSD, S2API, broadcast, DBUS interface
-  - note: there will be a follow-up release in 1 - 1.5 months fixing important
-          shortcomings and also giving time for translations
-  - note: KDE 4.2, Phonon 4.3 and QT 4.4 are required to build / run Kaffeine
-  - note: Kaffeine currently depends on phonon-xine for digital TV playback
-          (due to the used phonon API)
-  - note: you have to reconfigure / rescan if you were using snapshots before

kaffeine/src/dvb/dvbchannel.cpp

@@ -22,6 +22,7 @@
 
 #include <QFile>
 #include <QVariant>
+#include <QStringList>
 #include <KStandardDirs>
 #include "../ensurenopendingoperation.h"
 #include "../log.h"