[gentoo-commits] repo/gentoo:master commit in: media-video/kaffeine/, media-video/kaffeine/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: media-video/kaffeine/, media-video/kaffeine/files/
@ 2015-11-30 17:33 Michael Palimaka
  0 siblings, 0 replies; 11+ messages in thread
From: Michael Palimaka @ 2015-11-30 17:33 UTC (permalink / raw
  To: gentoo-commits

commit:     ef72b5e8048ce1041fc836f30fca368061664455
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 30 17:31:25 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Nov 30 17:33:17 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef72b5e8

media-video/kaffeine: backport patch from upstream solving build failure with >=dev-util/cmake-3.4.0

Gentoo-bug: 567112

Package-Manager: portage-2.2.26

 .../kaffeine/files/kaffeine-1.3.1-cmake34.patch    | 26 ++++++++++++++++++++++
 media-video/kaffeine/kaffeine-1.2.2-r1.ebuild      |  5 ++++-
 media-video/kaffeine/kaffeine-1.3.1.ebuild         |  2 +-
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/media-video/kaffeine/files/kaffeine-1.3.1-cmake34.patch b/media-video/kaffeine/files/kaffeine-1.3.1-cmake34.patch
new file mode 100644
index 0000000..a8c31f1
--- /dev/null
+++ b/media-video/kaffeine/files/kaffeine-1.3.1-cmake34.patch
@@ -0,0 +1,26 @@
+From 4a1a90ee1b2b4d13302046f043adf1c2a1de758d Mon Sep 17 00:00:00 2001
+From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
+Date: Thu, 26 Nov 2015 15:36:26 +0100
+Subject: [PATCH] Explicitly include CheckIncludeFiles.
+
+This fixes the build with CMake 3.4.0. We were calling check_include_files()
+and implicitly relying on CheckIncludeFiles being included.
+---
+ CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d9be8db..b74b44d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -21,6 +21,7 @@ if(STRICT_BUILD)
+                   -DQT_NO_URL_CAST_FROM_STRING -DQT_STRICT_ITERATORS)
+ endif(STRICT_BUILD)
+ 
++include(CheckIncludeFiles)
+ check_include_files(${CMAKE_CURRENT_SOURCE_DIR}/include/frontend.h HAVE_DVB)
+ 
+ if(NOT HAVE_DVB)
+-- 
+2.4.10
+

diff --git a/media-video/kaffeine/kaffeine-1.2.2-r1.ebuild b/media-video/kaffeine/kaffeine-1.2.2-r1.ebuild
index 4abb844..ac31d8c 100644
--- a/media-video/kaffeine/kaffeine-1.2.2-r1.ebuild
+++ b/media-video/kaffeine/kaffeine-1.2.2-r1.ebuild
@@ -28,7 +28,10 @@ RDEPEND="${DEPEND}"
 
 DOCS=( Changelog NOTES )
 
-PATCHES=( "${FILESDIR}/${PN}-1.2.2-gcc4.7.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-1.2.2-gcc4.7.patch"
+	"${FILESDIR}/${PN}-1.3.1-cmake34.patch"
+)
 
 src_configure() {
 	local mycmakeargs=(

diff --git a/media-video/kaffeine/kaffeine-1.3.1.ebuild b/media-video/kaffeine/kaffeine-1.3.1.ebuild
index f08f140..20278dc 100644
--- a/media-video/kaffeine/kaffeine-1.3.1.ebuild
+++ b/media-video/kaffeine/kaffeine-1.3.1.ebuild
@@ -29,7 +29,7 @@ RDEPEND="${DEPEND}"
 
 DOCS=( Changelog NOTES )
 
-PATCHES=( )
+PATCHES=( "${FILESDIR}/${P}-cmake34.patch" )
 
 src_configure() {
 	local mycmakeargs=(


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/kaffeine/, media-video/kaffeine/files/
@ 2017-03-11 19:40 Johannes Huber
  0 siblings, 0 replies; 11+ messages in thread
From: Johannes Huber @ 2017-03-11 19:40 UTC (permalink / raw
  To: gentoo-commits

commit:     12a0caf6fca3d9b816ac56155679bd2fa47390a1
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 11 19:39:18 2017 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Mar 11 19:40:41 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12a0caf6

media-video/kaffeine: Remove 2.0.8

Package-Manager: Portage-2.3.4, Repoman-2.3.2

 media-video/kaffeine/Manifest                      |  1 -
 .../kaffeine/files/kaffeine-2.0.8-build.patch      | 38 ------------
 media-video/kaffeine/kaffeine-2.0.8.ebuild         | 68 ----------------------
 3 files changed, 107 deletions(-)

diff --git a/media-video/kaffeine/Manifest b/media-video/kaffeine/Manifest
index 4bf1a978a85..7df3d500ff6 100644
--- a/media-video/kaffeine/Manifest
+++ b/media-video/kaffeine/Manifest
@@ -1,3 +1,2 @@
 DIST kaffeine-2.0.6.tar.xz 2295280 SHA256 70cd8423a23717edc7c8f127bd41e5e98aa93cc5866615ed25a8da3e148464e6 SHA512 ca2f036b629e750703536054dd6e28bc9b8191c3851a745f07548b756799243b3739cba9c7ec031be6eab64c18aa5f2eb96d37bcd0b11456e65eb67b016d1bc2 WHIRLPOOL 0d67538dc45f50cced9ab2c0b1adf1bf2367d823270118bf268ed2126c7bb1a653333b09fabb51e2b60400fcf073de6fe917a4887d54edc3c13204433538d146
-DIST kaffeine-2.0.8.tar.xz 4400524 SHA256 0277e5d3f55e4ac002788fc6954d4ab5c6aa994f63d7c6b9136d3227818facbd SHA512 9ee7b156d5195caef61cdbdf12deaa2493c6acc31724e839e1773dc5d7ee06f0d87cd7f21df74cf67dcb32fa5a347b72f5953f4568eb8476cb337a59121c609f WHIRLPOOL 4ae48e7e2f615428730f02d0b6b08406f6b3e805518da3fad9cb041ec5f1f9623541f521b3c065e94ed75f3f076d6651d5acc9d2fd306bc545527b05d550c01e
 DIST kaffeine-2.0.9.tar.xz 4398832 SHA256 ac53b697bba4fa97350706698c777908c21c464f7c567fe1a4ce9352e955754f SHA512 5adf86185aaafce4eadda4cfe40af2e0c867477f51b74a464bf813c018ecf035f9e13f47fffd21c0cd547289825441d2d80298ec7035e260f3cc0414c5fdd0d7 WHIRLPOOL 948eecec4957046c6ddee872747959661725f4d9f8408c735803d0dcc82c38dfcc7df6e9e92c46e8fda58e2f53a41ab6cf8c33da4b88f7d89542aa427a486223

diff --git a/media-video/kaffeine/files/kaffeine-2.0.8-build.patch b/media-video/kaffeine/files/kaffeine-2.0.8-build.patch
deleted file mode 100644
index 1507f46da21..00000000000
--- a/media-video/kaffeine/files/kaffeine-2.0.8-build.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-commit 2dbc752d644440f963bad172cf3ec83dc681ec7f
-Author: Mauro Carvalho Chehab <mchehab@s-opensource.com>
-Date:   Tue Mar 7 06:54:39 2017 -0300
-
-    CMakeLists.txt: fix it to allow building from tarball
-    
-    Kaffeine has a script at tools/update_l10n.sh that allows one to
-    download and test all translations locally, with is useful during
-    Kaffeine development. Such script creates a file at po/CMakeLists.txt.
-    
-    However, normal users will use the Kaffeine tarball, downloaded from
-    kde.org.
-    
-    The translations at the po/ directory on the tarballs don't
-    have a CMakeLists.txt, as this file is created only if the
-    tools/update_l10n.sh is called.
-    
-    So, change the main CMakeLists.txt to cope with both ways.
-    
-    Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3215e94..d24e848 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -93,7 +93,11 @@ add_subdirectory(icons)
- add_subdirectory(profiles)
- add_subdirectory(src)
- if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
--  add_subdirectory(po)
-+  if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/po/CMakeLists.txt" )
-+    add_subdirectory(po)
-+  else()
-+    ki18n_install(po)
-+  endif()
- endif()
- 
- if(KF5DocTools_VERSION)

diff --git a/media-video/kaffeine/kaffeine-2.0.8.ebuild b/media-video/kaffeine/kaffeine-2.0.8.ebuild
deleted file mode 100644
index 202f5a50eca..00000000000
--- a/media-video/kaffeine/kaffeine-2.0.8.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-inherit kde5
-
-DESCRIPTION="Media player with digital TV support by KDE"
-HOMEPAGE="https://kaffeine.kde.org/"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.3 )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsql 'sqlite')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
-	media-libs/libv4l
-	media-video/vlc[X]
-	x11-libs/libXScrnSaver
-"
-DEPEND="${CDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-RDEPEND="${CDEPEND}
-	!media-video/kaffeine:4
-"
-
-DOCS=( Changelog NOTES README.md )
-
-PATCHES=( "${FILESDIR}/${P}-build.patch" )
-
-src_prepare() {
-	kde5_src_prepare
-
-	# unused dependencies incorrectly added during the release process
-	# they do not appear in upstream git
-	sed -i \
-		-e "/find_package(KF5DocTools CONFIG REQUIRED)/d" \
-		-e "/kdoctools_install(po)/d" \
-		CMakeLists.txt || die
-}
-
-src_configure() {
-	# tools working on $HOME directory for a local git checkout
-	local mycmakeargs=(
-		-DBUILD_TOOLS=OFF
-	)
-
-	kde5_src_configure
-}


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/kaffeine/, media-video/kaffeine/files/
@ 2017-05-17 18:46 Andreas Sturmlechner
  0 siblings, 0 replies; 11+ messages in thread
From: Andreas Sturmlechner @ 2017-05-17 18:46 UTC (permalink / raw
  To: gentoo-commits

commit:     e335eb7a0ad985e43cc740ec33d5abc0c0c85add
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed May 17 18:20:07 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed May 17 18:46:29 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e335eb7a

media-video/kaffeine: Fix configure with >=KF-5.34

Reported-by: Geoff Madden <mgmadden <AT> internode.on.net>
Gentoo-bug: 615616

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 .../kaffeine/files/kaffeine-2.0.9-kf5.34.patch     | 22 ++++++++++++++++++++++
 media-video/kaffeine/kaffeine-2.0.9.ebuild         |  2 ++
 2 files changed, 24 insertions(+)

diff --git a/media-video/kaffeine/files/kaffeine-2.0.9-kf5.34.patch b/media-video/kaffeine/files/kaffeine-2.0.9-kf5.34.patch
new file mode 100644
index 00000000000..3fba1d22ba9
--- /dev/null
+++ b/media-video/kaffeine/files/kaffeine-2.0.9-kf5.34.patch
@@ -0,0 +1,22 @@
+commit 657c11d76271f66fc3f40b60c5ba782061e8d895
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date:   Wed May 17 20:15:43 2017 +0200
+
+    Remove duplicate call of ki18n_install
+    
+    Release script is adding this as well to tarball CMakeLists.txt.
+    That has worked in the past, but is fatal in KDE Frameworks 5.34.
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9a88958..3c4601d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -95,8 +95,6 @@ add_subdirectory(src)
+ if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
+   if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/po/CMakeLists.txt" )
+     add_subdirectory(po)
+-  else()
+-    ki18n_install(po)
+   endif()
+ endif()
+ 

diff --git a/media-video/kaffeine/kaffeine-2.0.9.ebuild b/media-video/kaffeine/kaffeine-2.0.9.ebuild
index 8d37f639db5..31cb79ae2e7 100644
--- a/media-video/kaffeine/kaffeine-2.0.9.ebuild
+++ b/media-video/kaffeine/kaffeine-2.0.9.ebuild
@@ -45,6 +45,8 @@ RDEPEND="${CDEPEND}
 
 DOCS=( Changelog NOTES README.md )
 
+PATCHES=( "${FILESDIR}/${P}-kf5.34.patch" )
+
 src_prepare() {
 	kde5_src_prepare
 


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/kaffeine/, media-video/kaffeine/files/
@ 2017-07-10 18:00 Andreas Sturmlechner
  0 siblings, 0 replies; 11+ messages in thread
From: Andreas Sturmlechner @ 2017-07-10 18:00 UTC (permalink / raw
  To: gentoo-commits

commit:     dd0afbae63384a5748eb5a1d999707ae4cd99bfc
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 10 17:59:28 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jul 10 18:00:31 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd0afbae

media-video/kaffeine: 2.0.10 version bump

Reported-by: Manfred Knick <Manfred.Knick <AT> T-Online.de>
Gentoo-bug: 624452

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 media-video/kaffeine/Manifest                      |  1 +
 .../kaffeine/files/kaffeine-2.0.10-debug.patch     | 27 +++++++++
 media-video/kaffeine/kaffeine-2.0.10.ebuild        | 69 ++++++++++++++++++++++
 3 files changed, 97 insertions(+)

diff --git a/media-video/kaffeine/Manifest b/media-video/kaffeine/Manifest
index 48f1cd84763..e15f520a3c1 100644
--- a/media-video/kaffeine/Manifest
+++ b/media-video/kaffeine/Manifest
@@ -1 +1,2 @@
+DIST kaffeine-2.0.10.tar.xz 4405388 SHA256 cc8c0a8a6e360d3a45a1e3ea5b98fa730cad164451b5ed54620d0b91b0f614c3 SHA512 b06d6c271ad6a7de3798c02d576f520eb8ebaf3b0ab64a84a17441f5555ce059e947c0413963bb5813a92d56a3c4df5a1765cabab8a912ab0e43f154d562b4d6 WHIRLPOOL e03d41cc24cf97e3af6cf511685aae8e3aa804e06d5b1a9d9d4085f8856d46545a54160dd625469a9fcb3f31f0f50088704d2f618febf2ded2a8382468325b9d
 DIST kaffeine-2.0.9.tar.xz 4398832 SHA256 ac53b697bba4fa97350706698c777908c21c464f7c567fe1a4ce9352e955754f SHA512 5adf86185aaafce4eadda4cfe40af2e0c867477f51b74a464bf813c018ecf035f9e13f47fffd21c0cd547289825441d2d80298ec7035e260f3cc0414c5fdd0d7 WHIRLPOOL 948eecec4957046c6ddee872747959661725f4d9f8408c735803d0dcc82c38dfcc7df6e9e92c46e8fda58e2f53a41ab6cf8c33da4b88f7d89542aa427a486223

diff --git a/media-video/kaffeine/files/kaffeine-2.0.10-debug.patch b/media-video/kaffeine/files/kaffeine-2.0.10-debug.patch
new file mode 100644
index 00000000000..97103b8e08e
--- /dev/null
+++ b/media-video/kaffeine/files/kaffeine-2.0.10-debug.patch
@@ -0,0 +1,27 @@
+From 4200dec1afc04b1618b2e7ea916891103473a913 Mon Sep 17 00:00:00 2001
+From: Mauro Carvalho Chehab <mchehab@s-opensource.com>
+Date: Sun, 9 Jul 2017 11:59:21 -0300
+Subject: mainwindow: disable debug messages by default
+
+By default, debug messages shouldn't be displayed.
+
+Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
+---
+ src/mainwindow.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
+index c5ec7ac..7a18459 100644
+--- a/src/mainwindow.cpp
++++ b/src/mainwindow.cpp
+@@ -190,6 +190,8 @@ void MainWindow::run()
+ 	if (parser->isSet("debug")) {
+ 		QLoggingCategory::defaultCategory()->setEnabled(QtDebugMsg, true);
+ 		QLoggingCategory::setFilterRules(QStringLiteral(FILTER_RULE));
++	} else {
++		QLoggingCategory::setFilterRules(QStringLiteral("kaffeine.*.debug=false"));
+ 	}
+ 
+ 	readSettings();
+-- 
+cgit v0.11.2

diff --git a/media-video/kaffeine/kaffeine-2.0.10.ebuild b/media-video/kaffeine/kaffeine-2.0.10.ebuild
new file mode 100644
index 00000000000..27b32f7051e
--- /dev/null
+++ b/media-video/kaffeine/kaffeine-2.0.10.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+inherit kde5
+
+DESCRIPTION="Media player with digital TV support by KDE"
+HOMEPAGE="https://kaffeine.kde.org/"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.3 )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtsql 'sqlite')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	$(add_qt_dep qtxml)
+	media-libs/libv4l
+	media-video/vlc[X]
+	x11-libs/libXScrnSaver
+"
+DEPEND="${CDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+RDEPEND="${CDEPEND}
+	!media-video/kaffeine:4
+"
+
+DOCS=( Changelog NOTES README.md )
+
+PATCHES=( "${FILESDIR}/${P}-debug.patch" )
+
+src_prepare() {
+	kde5_src_prepare
+
+	# unused dependencies incorrectly added during the release process
+	# they do not appear in upstream git
+	sed -i \
+		-e "/find_package(KF5DocTools CONFIG REQUIRED)/d" \
+		-e "/kdoctools_install(po)/d" \
+		CMakeLists.txt || die
+}
+
+src_configure() {
+	# tools working on $HOME directory for a local git checkout
+	local mycmakeargs=(
+		-DBUILD_TOOLS=OFF
+	)
+
+	kde5_src_configure
+}


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/kaffeine/, media-video/kaffeine/files/
@ 2017-07-19 16:33 Andreas Sturmlechner
  0 siblings, 0 replies; 11+ messages in thread
From: Andreas Sturmlechner @ 2017-07-19 16:33 UTC (permalink / raw
  To: gentoo-commits

commit:     a5f5d698cd3e0b449b81004b38d97cd1f635b68e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 19 16:32:51 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jul 19 16:33:28 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5f5d698

media-video/kaffeine: Drop old

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 media-video/kaffeine/Manifest                      |  1 -
 .../kaffeine/files/kaffeine-2.0.10-debug.patch     | 27 ---------
 media-video/kaffeine/kaffeine-2.0.10.ebuild        | 69 ----------------------
 3 files changed, 97 deletions(-)

diff --git a/media-video/kaffeine/Manifest b/media-video/kaffeine/Manifest
index f1bde62a7fc..46a5fe12af9 100644
--- a/media-video/kaffeine/Manifest
+++ b/media-video/kaffeine/Manifest
@@ -1,3 +1,2 @@
-DIST kaffeine-2.0.10.tar.xz 4405388 SHA256 cc8c0a8a6e360d3a45a1e3ea5b98fa730cad164451b5ed54620d0b91b0f614c3 SHA512 b06d6c271ad6a7de3798c02d576f520eb8ebaf3b0ab64a84a17441f5555ce059e947c0413963bb5813a92d56a3c4df5a1765cabab8a912ab0e43f154d562b4d6 WHIRLPOOL e03d41cc24cf97e3af6cf511685aae8e3aa804e06d5b1a9d9d4085f8856d46545a54160dd625469a9fcb3f31f0f50088704d2f618febf2ded2a8382468325b9d
 DIST kaffeine-2.0.12.tar.xz 4371652 SHA256 a19eb8262f1f35b013c3ea5aa66fd7cd99d624643db718d2e9d36d9dd7a796ca SHA512 e53206095e6c06a7caca3f81ab198dadb68fecf8ac5f762b39d55b22d1fe33dab558617226ea06f740a3ad8bf1693809a2a0b3e2618600a9a33a17273b6aed86 WHIRLPOOL 1dc51bcb9f1fc0621adce7e805944c336429583f98980b545b4e8050f37d4bcf253715eaa876921f16d56e70b3adba088bf6cdd584e2b0a8d50013c74cb560e7
 DIST kaffeine-2.0.9.tar.xz 4398832 SHA256 ac53b697bba4fa97350706698c777908c21c464f7c567fe1a4ce9352e955754f SHA512 5adf86185aaafce4eadda4cfe40af2e0c867477f51b74a464bf813c018ecf035f9e13f47fffd21c0cd547289825441d2d80298ec7035e260f3cc0414c5fdd0d7 WHIRLPOOL 948eecec4957046c6ddee872747959661725f4d9f8408c735803d0dcc82c38dfcc7df6e9e92c46e8fda58e2f53a41ab6cf8c33da4b88f7d89542aa427a486223

diff --git a/media-video/kaffeine/files/kaffeine-2.0.10-debug.patch b/media-video/kaffeine/files/kaffeine-2.0.10-debug.patch
deleted file mode 100644
index 97103b8e08e..00000000000
--- a/media-video/kaffeine/files/kaffeine-2.0.10-debug.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 4200dec1afc04b1618b2e7ea916891103473a913 Mon Sep 17 00:00:00 2001
-From: Mauro Carvalho Chehab <mchehab@s-opensource.com>
-Date: Sun, 9 Jul 2017 11:59:21 -0300
-Subject: mainwindow: disable debug messages by default
-
-By default, debug messages shouldn't be displayed.
-
-Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
----
- src/mainwindow.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
-index c5ec7ac..7a18459 100644
---- a/src/mainwindow.cpp
-+++ b/src/mainwindow.cpp
-@@ -190,6 +190,8 @@ void MainWindow::run()
- 	if (parser->isSet("debug")) {
- 		QLoggingCategory::defaultCategory()->setEnabled(QtDebugMsg, true);
- 		QLoggingCategory::setFilterRules(QStringLiteral(FILTER_RULE));
-+	} else {
-+		QLoggingCategory::setFilterRules(QStringLiteral("kaffeine.*.debug=false"));
- 	}
- 
- 	readSettings();
--- 
-cgit v0.11.2

diff --git a/media-video/kaffeine/kaffeine-2.0.10.ebuild b/media-video/kaffeine/kaffeine-2.0.10.ebuild
deleted file mode 100644
index 27b32f7051e..00000000000
--- a/media-video/kaffeine/kaffeine-2.0.10.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-inherit kde5
-
-DESCRIPTION="Media player with digital TV support by KDE"
-HOMEPAGE="https://kaffeine.kde.org/"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.3 )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsql 'sqlite')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
-	media-libs/libv4l
-	media-video/vlc[X]
-	x11-libs/libXScrnSaver
-"
-DEPEND="${CDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-RDEPEND="${CDEPEND}
-	!media-video/kaffeine:4
-"
-
-DOCS=( Changelog NOTES README.md )
-
-PATCHES=( "${FILESDIR}/${P}-debug.patch" )
-
-src_prepare() {
-	kde5_src_prepare
-
-	# unused dependencies incorrectly added during the release process
-	# they do not appear in upstream git
-	sed -i \
-		-e "/find_package(KF5DocTools CONFIG REQUIRED)/d" \
-		-e "/kdoctools_install(po)/d" \
-		CMakeLists.txt || die
-}
-
-src_configure() {
-	# tools working on $HOME directory for a local git checkout
-	local mycmakeargs=(
-		-DBUILD_TOOLS=OFF
-	)
-
-	kde5_src_configure
-}


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/kaffeine/, media-video/kaffeine/files/
@ 2017-12-02 18:33 Andreas Sturmlechner
  0 siblings, 0 replies; 11+ messages in thread
From: Andreas Sturmlechner @ 2017-12-02 18:33 UTC (permalink / raw
  To: gentoo-commits

commit:     504ea2277422233c81902672298cab17b9b2333c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  2 13:52:52 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec  2 18:33:31 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=504ea227

media-video/kaffeine: Drop old

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 media-video/kaffeine/Manifest                      |  1 -
 .../kaffeine/files/kaffeine-2.0.9-kf5.34.patch     | 22 -------
 media-video/kaffeine/kaffeine-2.0.9.ebuild         | 68 ----------------------
 3 files changed, 91 deletions(-)

diff --git a/media-video/kaffeine/Manifest b/media-video/kaffeine/Manifest
index f669893c53e..c73d4725052 100644
--- a/media-video/kaffeine/Manifest
+++ b/media-video/kaffeine/Manifest
@@ -1,2 +1 @@
 DIST kaffeine-2.0.13.tar.xz 4374124 SHA256 1ac52ac811a9c9e88fcd466a7df13860fcd749cd125e7d533f589e6a6ee176fd SHA512 710d6c5b35f2b2f82094004e8d09edd33ec95c8e0afb64f6dcf2bc14f3e6619ae87712e2a5bd3cde23e886d1e9300510fb0b0c355c33386d4dd238aada2760f5 WHIRLPOOL 3748a8a01289b14a466d3d6651ade04c712350a78ae539811d01ce681b2b2afb96f0882503eccf3e4195ac474429394f874f08560300841f73bc9b9a6860273f
-DIST kaffeine-2.0.9.tar.xz 4398832 SHA256 ac53b697bba4fa97350706698c777908c21c464f7c567fe1a4ce9352e955754f SHA512 5adf86185aaafce4eadda4cfe40af2e0c867477f51b74a464bf813c018ecf035f9e13f47fffd21c0cd547289825441d2d80298ec7035e260f3cc0414c5fdd0d7 WHIRLPOOL 948eecec4957046c6ddee872747959661725f4d9f8408c735803d0dcc82c38dfcc7df6e9e92c46e8fda58e2f53a41ab6cf8c33da4b88f7d89542aa427a486223

diff --git a/media-video/kaffeine/files/kaffeine-2.0.9-kf5.34.patch b/media-video/kaffeine/files/kaffeine-2.0.9-kf5.34.patch
deleted file mode 100644
index 3fba1d22ba9..00000000000
--- a/media-video/kaffeine/files/kaffeine-2.0.9-kf5.34.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit 657c11d76271f66fc3f40b60c5ba782061e8d895
-Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date:   Wed May 17 20:15:43 2017 +0200
-
-    Remove duplicate call of ki18n_install
-    
-    Release script is adding this as well to tarball CMakeLists.txt.
-    That has worked in the past, but is fatal in KDE Frameworks 5.34.
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9a88958..3c4601d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -95,8 +95,6 @@ add_subdirectory(src)
- if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
-   if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/po/CMakeLists.txt" )
-     add_subdirectory(po)
--  else()
--    ki18n_install(po)
-   endif()
- endif()
- 

diff --git a/media-video/kaffeine/kaffeine-2.0.9.ebuild b/media-video/kaffeine/kaffeine-2.0.9.ebuild
deleted file mode 100644
index 31cb79ae2e7..00000000000
--- a/media-video/kaffeine/kaffeine-2.0.9.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-inherit kde5
-
-DESCRIPTION="Media player with digital TV support by KDE"
-HOMEPAGE="https://kaffeine.kde.org/"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.3 )"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-CDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsql 'sqlite')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
-	media-libs/libv4l
-	media-video/vlc[X]
-	x11-libs/libXScrnSaver
-"
-DEPEND="${CDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-RDEPEND="${CDEPEND}
-	!media-video/kaffeine:4
-"
-
-DOCS=( Changelog NOTES README.md )
-
-PATCHES=( "${FILESDIR}/${P}-kf5.34.patch" )
-
-src_prepare() {
-	kde5_src_prepare
-
-	# unused dependencies incorrectly added during the release process
-	# they do not appear in upstream git
-	sed -i \
-		-e "/find_package(KF5DocTools CONFIG REQUIRED)/d" \
-		-e "/kdoctools_install(po)/d" \
-		CMakeLists.txt || die
-}
-
-src_configure() {
-	# tools working on $HOME directory for a local git checkout
-	local mycmakeargs=(
-		-DBUILD_TOOLS=OFF
-	)
-
-	kde5_src_configure
-}


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/kaffeine/, media-video/kaffeine/files/
@ 2018-05-16 16:05 Andreas Sturmlechner
  0 siblings, 0 replies; 11+ messages in thread
From: Andreas Sturmlechner @ 2018-05-16 16:05 UTC (permalink / raw
  To: gentoo-commits

commit:     8e9be30e4a081b67be0797e66a44e9f98531f704
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed May 16 16:04:34 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed May 16 16:04:57 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e9be30e

media-video/kaffeine: Fix build with Qt 5.11

Package-Manager: Portage-2.3.36, Repoman-2.3.9

 .../kaffeine/files/kaffeine-2.0.15-qt-5.11.patch   | 989 +++++++++++++++++++++
 media-video/kaffeine/kaffeine-2.0.15.ebuild        |   2 +
 2 files changed, 991 insertions(+)

diff --git a/media-video/kaffeine/files/kaffeine-2.0.15-qt-5.11.patch b/media-video/kaffeine/files/kaffeine-2.0.15-qt-5.11.patch
new file mode 100644
index 00000000000..65981526348
--- /dev/null
+++ b/media-video/kaffeine/files/kaffeine-2.0.15-qt-5.11.patch
@@ -0,0 +1,989 @@
+From cef89684e41b90c644f369edbca2bf079b8b0454 Mon Sep 17 00:00:00 2001
+From: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
+Date: Wed, 16 May 2018 12:34:10 -0300
+Subject: [PATCH] don't use qPrintable() anymore
+
+As commented on: https://bugreports.qt.io/browse/QTBUG-68307,
+qt5 is explicitly breaking qPrintable().
+
+So, let's define our own version of it.
+
+Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
+
+diff --git a/src/backend-vlc/vlcmediawidget.cpp b/src/backend-vlc/vlcmediawidget.cpp
+index 2421dd69e285..c03b7dd732c6 100644
+--- a/src/backend-vlc/vlcmediawidget.cpp
++++ b/src/backend-vlc/vlcmediawidget.cpp
+@@ -55,7 +55,7 @@ bool VlcMediaWidget::init()
+ 
+ 	vlcInstance = libvlc_new(argc, argv);
+ 	if (!vlcInstance) {
+-		qCWarning(logMediaWidget, "libVLC: failed to use extra args: %s", qPrintable(args));
++		qCWarning(logMediaWidget, "libVLC: failed to use extra args: %s", toPrintable(args));
+ 		argc = 0;
+ 		vlcInstance = libvlc_new(0, NULL);
+ 		if (vlcInstance)
+@@ -63,7 +63,7 @@ bool VlcMediaWidget::init()
+ 	}
+ 
+ 	if (vlcInstance == NULL) {
+-		qFatal("Cannot create vlc instance %s", qPrintable(libvlc_errmsg()));
++		qFatal("Cannot create vlc instance %s", toPrintable(libvlc_errmsg()));
+ 		delete argv;
+ 		return false;
+ 	}
+@@ -73,14 +73,14 @@ bool VlcMediaWidget::init()
+ 		for (int i = 0; i < argc; i++)
+ 			log += " " + QLatin1String(argv[i]);
+ 
+-		qCDebug(logVlc, "%s", qPrintable(log));
++		qCDebug(logVlc, "%s", toPrintable(log));
+ 	}
+ 	delete argv;
+ 
+ 	vlcMediaPlayer = libvlc_media_player_new(vlcInstance);
+ 
+ 	if (vlcMediaPlayer == NULL) {
+-		qFatal("Cannot create vlc media player %s", qPrintable(libvlc_errmsg()));
++		qFatal("Cannot create vlc media player %s", toPrintable(libvlc_errmsg()));
+ 		return false;
+ 	}
+ 
+@@ -95,7 +95,7 @@ bool VlcMediaWidget::init()
+ 
+ 	for (uint i = 0; i < (sizeof(eventTypes) / sizeof(eventTypes[0])); ++i) {
+ 		if (libvlc_event_attach(eventManager, eventTypes[i], vlcEventHandler, this) != 0) {
+-			qCCritical(logMediaWidget, "Cannot attach event handler %s", qPrintable(eventTypes[i]));
++			qCCritical(logMediaWidget, "Cannot attach event handler %s", toPrintable(eventTypes[i]));
+ 			return false;
+ 		}
+ 	}
+@@ -167,7 +167,7 @@ void VlcMediaWidget::setAudioDevice(QString device)
+ 	for (i = vlcAudioOutput; i != NULL; i = i->p_next) {
+ 		if (device.compare(QString::fromUtf8(i->psz_description)))
+ 			continue;
+-		qCDebug(logVlc, "Setting audio output to: %s", qPrintable(i->psz_device));
++		qCDebug(logVlc, "Setting audio output to: %s", toPrintable(i->psz_device));
+ 
+ 		libvlc_audio_output_device_set(vlcMediaPlayer, NULL, i->psz_device);
+ 	}
+@@ -319,7 +319,7 @@ void VlcMediaWidget::play(const MediaSource &source)
+ 
+ 	if (vlcMedia == NULL) {
+ 		libvlc_media_player_stop(vlcMediaPlayer);
+-		qCWarning(logMediaWidget, "Cannot create media %s", qPrintable(source.getUrl().toDisplayString()));
++		qCWarning(logMediaWidget, "Cannot create media %s", toPrintable(source.getUrl().toDisplayString()));
+ 		return;
+ 	}
+ 
+@@ -328,7 +328,7 @@ void VlcMediaWidget::play(const MediaSource &source)
+ 
+ 	for (uint i = 0; i < (sizeof(eventTypes) / sizeof(eventTypes[0])); ++i) {
+ 		if (libvlc_event_attach(eventManager, eventTypes[i], vlcEventHandler, this) != 0) {
+-			qCWarning(logMediaWidget, "Cannot attach event handler %s", qPrintable(eventTypes[i]));
++			qCWarning(logMediaWidget, "Cannot attach event handler %s", toPrintable(eventTypes[i]));
+ 		}
+ 	}
+ 
+@@ -340,7 +340,7 @@ void VlcMediaWidget::play(const MediaSource &source)
+ //		setExternalSubtitle(source.subtitleUrl);
+ 
+ 	if (libvlc_media_player_play(vlcMediaPlayer) != 0) {
+-		qCWarning(logMediaWidget, "Cannot play media %s", qPrintable(source.getUrl().toDisplayString()));
++		qCWarning(logMediaWidget, "Cannot play media %s", toPrintable(source.getUrl().toDisplayString()));
+ 	}
+ 
+ 	setCursor(Qt::BlankCursor);
+@@ -408,7 +408,7 @@ void VlcMediaWidget::setCurrentSubtitle(int currentSubtitle)
+ 		}
+ 
+ 		if (track->i_id == requestedSubtitle)
+-			qCDebug(logVlc, "Subtitle set to id %d: %s", track->i_id, qPrintable(subtitle));
++			qCDebug(logVlc, "Subtitle set to id %d: %s", track->i_id, toPrintable(subtitle));
+ 		track = track->p_next;
+ 	}
+ 	libvlc_track_description_list_release(track);
+@@ -424,11 +424,11 @@ void VlcMediaWidget::setExternalSubtitle(const QUrl &url)
+ 					  libvlc_media_slave_type_subtitle,
+ 					  url.toEncoded().constData(),
+ 					  true) == 0)
+-		qCWarning(logMediaWidget, "Cannot set subtitle file %s", qPrintable(fname));
++		qCWarning(logMediaWidget, "Cannot set subtitle file %s", toPrintable(fname));
+ #else
+ 	if (libvlc_video_set_subtitle_file(vlcMediaPlayer,
+-					   qPrintable(fname)) == 0)
+-		qCWarning(logMediaWidget, "Cannot set subtitle file %s", qPrintable(fname));
++					   toPrintable(fname)) == 0)
++		qCWarning(logMediaWidget, "Cannot set subtitle file %s", toPrintable(fname));
+ #endif
+ }
+ 
+@@ -625,7 +625,7 @@ void VlcMediaWidget::updateSubtitles()
+ 		// currentSubtitle
+ 		subtitleId[track->i_id] = ++i;
+ 		subtitles.append(subtitle);
+-		qCDebug(logVlc, "Got subtitle id#%d: %s", track->i_id, qPrintable(subtitle));
++		qCDebug(logVlc, "Got subtitle id#%d: %s", track->i_id, toPrintable(subtitle));
+ 		track = track->p_next;
+ 	}
+ 	libvlc_track_description_list_release(track);
+diff --git a/src/dvb/dvbcam_linux.cpp b/src/dvb/dvbcam_linux.cpp
+index 7e1c483ac674..5ef445a34c6a 100644
+--- a/src/dvb/dvbcam_linux.cpp
++++ b/src/dvb/dvbcam_linux.cpp
+@@ -66,7 +66,7 @@ void DvbLinuxCam::startCa(const QString &path)
+ 	caFd = open(QFile::encodeName(path).constData(), O_RDWR | O_NONBLOCK);
+ 
+ 	if (caFd < 0) {
+-		qCWarning(logCam, "Cannot open CA device node %s", qPrintable(path));
++		qCWarning(logCam, "Cannot open CA device node %s", toPrintable(path));
+ 		return;
+ 	}
+ 
+diff --git a/src/dvb/dvbchannel.cpp b/src/dvb/dvbchannel.cpp
+index 8395f6fa52fa..1c3aa973e327 100644
+--- a/src/dvb/dvbchannel.cpp
++++ b/src/dvb/dvbchannel.cpp
+@@ -146,7 +146,7 @@ DvbChannelModel *DvbChannelModel::createSqlModel(QObject *parent)
+ 	}
+ 
+ 	if (!file.open(QIODevice::ReadOnly)) {
+-		qCWarning(logDvb, "Cannot open %s", qPrintable(file.fileName()));
++		qCWarning(logDvb, "Cannot open %s", toPrintable(file.fileName()));
+ 		return channelModel;
+ 	}
+ 
+@@ -212,7 +212,7 @@ DvbChannelModel *DvbChannelModel::createSqlModel(QObject *parent)
+ 		channel.isScrambled = (flags & 0x1) != 0;
+ 
+ 		if (stream.status() != QDataStream::Ok) {
+-			qCWarning(logDvb, "Invalid channels in file %s", qPrintable(file.fileName()));
++			qCWarning(logDvb, "Invalid channels in file %s", toPrintable(file.fileName()));
+ 			break;
+ 		}
+ 
+@@ -223,7 +223,7 @@ DvbChannelModel *DvbChannelModel::createSqlModel(QObject *parent)
+ 	channelModel->channelFlush();
+ 
+ 	if (!file.remove()) {
+-		qCWarning(logDvb, "Cannot remove '%s' from DB", qPrintable(file.fileName()));
++		qCWarning(logDvb, "Cannot remove '%s' from DB", toPrintable(file.fileName()));
+ 	}
+ 
+ 	return channelModel;
+diff --git a/src/dvb/dvbconfigdialog.cpp b/src/dvb/dvbconfigdialog.cpp
+index fc444595cd34..d0a7bf0c82fe 100644
+--- a/src/dvb/dvbconfigdialog.cpp
++++ b/src/dvb/dvbconfigdialog.cpp
+@@ -546,7 +546,7 @@ void DvbConfigDialog::accept()
+ 	foreach (RegexInputLine *regexInputLine, regexInputList)
+ 	{
+ 		manager->addRecordingRegex(regexInputLine->lineEdit->text());
+-		qCDebug(logDvb, "saved regex: %s", qPrintable(regexInputLine->lineEdit->text()));
++		qCDebug(logDvb, "saved regex: %s", toPrintable(regexInputLine->lineEdit->text()));
+ 		manager->addRecordingRegexPriority(regexInputLine->spinBox->value());
+ 		qCDebug(logDvb, "saved priority: %i", regexInputLine->spinBox->value());
+ 	}
+@@ -1539,7 +1539,7 @@ void DvbSLnbConfigObject::configure()
+ 
+ 	for (i = 0; i < size; i++) {
+ 		struct lnbSat lnb = device->getLnbSatModels().at(i);
+-		QRadioButton *radioButton = new QRadioButton(i18nd("libdvbv5", qPrintable(lnb.name)), mainWidget);
++		QRadioButton *radioButton = new QRadioButton(i18nd("libdvbv5", toPrintable(lnb.name)), mainWidget);
+ 		mainLayout->addWidget(radioButton);
+ 		lnbSelectionGroup->addButton(radioButton, i + 1);
+ 		gridLayout->addWidget(radioButton, i % ((size + 1) / 2), i / ((size + 1) / 2));
+diff --git a/src/dvb/dvbdevice.cpp b/src/dvb/dvbdevice.cpp
+index d4c7150e39e6..27a304931477 100644
+--- a/src/dvb/dvbdevice.cpp
++++ b/src/dvb/dvbdevice.cpp
+@@ -226,7 +226,7 @@ DvbDataDumper::DvbDataDumper()
+ 		QLatin1String(".bin"));
+ 
+ 	if (!open(QIODevice::WriteOnly | QIODevice::Truncate)) {
+-		qCWarning(logDev, "Can't open %s", qPrintable(fileName()));
++		qCWarning(logDev, "Can't open %s", toPrintable(fileName()));
+ 	}
+ }
+ 
+@@ -343,7 +343,7 @@ void DvbDevice::tune(const DvbTransponder &transponder)
+ 		}
+ 
+ 		if (!ok)
+-			qCWarning(logDev, "Can't extract orbital position from %s", qPrintable(config->scanSource));
++			qCWarning(logDev, "Can't extract orbital position from %s", toPrintable(config->scanSource));
+ 
+ 		double radius = 6378;
+ 		double semiMajorAxis = 42164;
+diff --git a/src/dvb/dvbdevice_linux.cpp b/src/dvb/dvbdevice_linux.cpp
+index 1f6c4ad4e1b2..82b29305700a 100644
+--- a/src/dvb/dvbdevice_linux.cpp
++++ b/src/dvb/dvbdevice_linux.cpp
+@@ -95,7 +95,7 @@ void DvbLinuxDevice::startDevice(const QString &deviceId_)
+ 	struct dvb_v5_fe_parms *parms = dvb_fe_open2(adapter, index, verbose, 0, dvbv5_log);
+ 
+ 	if (!parms) {
+-		qCWarning(logDev, "Cannot open frontend %s", qPrintable(frontendPath));
++		qCWarning(logDev, "Cannot open frontend %s", toPrintable(frontendPath));
+ 		return;
+ 	}
+ 
+@@ -184,7 +184,7 @@ void DvbLinuxDevice::startDevice(const QString &deviceId_)
+ 
+ 	ready = true;
+ 
+-	qCInfo(logDev, "Found dvb device %s: %s", qPrintable(deviceId), qPrintable(frontendName));
++	qCInfo(logDev, "Found dvb device %s: %s", toPrintable(deviceId), toPrintable(frontendName));
+ }
+ 
+ void DvbLinuxDevice::startCa()
+@@ -264,14 +264,14 @@ bool DvbLinuxDevice::acquire()
+ 	dvbv5_parms = dvb_fe_open2(adapter, index, verbose, 0, dvbv5_log);
+ 
+ 	if (!dvbv5_parms) {
+-		qCWarning(logDev, "Cannot open frontend %s", qPrintable(frontendPath));
++		qCWarning(logDev, "Cannot open frontend %s", toPrintable(frontendPath));
+ 		return false;
+ 	}
+ 
+ 	dvrFd = open(QFile::encodeName(dvrPath).constData(), O_RDONLY | O_NONBLOCK | O_CLOEXEC);
+ 
+ 	if (dvrFd < 0) {
+-		qCWarning(logDev, "Cannot open dvr %s", qPrintable(dvrPath));
++		qCWarning(logDev, "Cannot open dvr %s", toPrintable(dvrPath));
+ 		dvb_fe_close(dvbv5_parms);
+ 		dvbv5_parms = NULL;
+ 		return false;
+@@ -298,7 +298,7 @@ bool DvbLinuxDevice::sendMessage(const char *message, int length)
+ 	Q_ASSERT(dvbv5_parms && (length >= 0) && (length <= 6));
+ 
+ 	if (dvb_fe_diseqc_cmd(dvbv5_parms, length, (const unsigned char *)message) != 0) {
+-		qCWarning(logDev, "ioctl FE_DISEQC_SEND_MASTER_CMD failed for frontend %s", qPrintable(frontendPath));
++		qCWarning(logDev, "ioctl FE_DISEQC_SEND_MASTER_CMD failed for frontend %s", toPrintable(frontendPath));
+ 		return false;
+ 	}
+ 
+@@ -310,7 +310,7 @@ bool DvbLinuxDevice::sendBurst(SecBurst burst)
+ 	Q_ASSERT(dvbv5_parms);
+ 
+ 	if (dvb_fe_diseqc_burst(dvbv5_parms, burst == BurstMiniB) != 0) {
+-		qCWarning(logDev, "ioctl FE_DISEQC_SEND_BURST failed for frontend %s", qPrintable(frontendPath));
++		qCWarning(logDev, "ioctl FE_DISEQC_SEND_BURST failed for frontend %s", toPrintable(frontendPath));
+ 		return false;
+ 	}
+ 
+@@ -885,11 +885,11 @@ bool DvbLinuxDevice::satSetup(QString lnbModel, int satNumber, int bpf)
+ 	int lnb = dvb_sat_search_lnb(lnbModel.toUtf8());
+ 	dvbv5_parms->lnb = dvb_sat_get_lnb(lnb);
+ 	if (!dvbv5_parms->lnb) {
+-		qCCritical(logDev, "Cannot set LNBf type to %s", qPrintable(lnbModel));
++		qCCritical(logDev, "Cannot set LNBf type to %s", toPrintable(lnbModel));
+ 		return false;
+ 	}
+ 
+-	qCDebug(logDev, "Using LNBf type %s", qPrintable(lnbModel));
++	qCDebug(logDev, "Using LNBf type %s", toPrintable(lnbModel));
+ 
+ 	dvbv5_parms->sat_number = satNumber;
+ 	dvbv5_parms->freq_bpf = bpf;
+@@ -903,7 +903,7 @@ bool DvbLinuxDevice::tune(const DvbTransponder &transponder)
+ 	stopDvr();
+ 	fe_delivery_system_t delsys;
+ 
+-	qCDebug(logDev, "tune to: %s", qPrintable(transponder.toString()));
++	qCDebug(logDev, "tune to: %s", toPrintable(transponder.toString()));
+ 
+ 	// FIXME: add support for LNA on/off
+ 
+@@ -1067,7 +1067,7 @@ bool DvbLinuxDevice::tune(const DvbTransponder &transponder)
+ 	}
+ 
+ 	if (dvb_fe_set_parms(dvbv5_parms) != 0) {
+-		qCWarning(logDev, "ioctl FE_SET_PROPERTY failed for frontend %s", qPrintable(frontendPath));
++		qCWarning(logDev, "ioctl FE_SET_PROPERTY failed for frontend %s", toPrintable(frontendPath));
+ 		return false;
+ 	}
+ 
+@@ -1245,7 +1245,7 @@ bool DvbLinuxDevice::getProps(DvbTransponder &transponder)
+ 		qCWarning(logDev, "Invalid transmission type");
+ 		return false;
+ 	default:
+-		qCWarning(logDev, "Unknown transmission type %s", qPrintable(transponder.getTransmissionType()));
++		qCWarning(logDev, "Unknown transmission type %s", toPrintable(transponder.getTransmissionType()));
+ 		return false;
+ 	}
+ 	return true;
+@@ -1270,12 +1270,12 @@ bool DvbLinuxDevice::isTuned()
+ 	uint32_t status = 0;
+ 
+ 	if (dvb_fe_get_stats(dvbv5_parms) != 0) {
+-		qCWarning(logDev, "ioctl FE_READ_STATUS failed for frontend %s", qPrintable(frontendPath));
++		qCWarning(logDev, "ioctl FE_READ_STATUS failed for frontend %s", toPrintable(frontendPath));
+ 		return false;
+ 	}
+ 
+ 	if (dvb_fe_retrieve_stats(dvbv5_parms, DTV_STATUS, &status) != 0) {
+-		qCWarning(logDev, "ioctl FE_READ_STATUS failed for frontend %s", qPrintable(frontendPath));
++		qCWarning(logDev, "ioctl FE_READ_STATUS failed for frontend %s", toPrintable(frontendPath));
+ 		return false;
+ 	}
+ 
+@@ -1291,7 +1291,7 @@ float DvbLinuxDevice::getSignal(Scale &scale)
+ 	scale = DvbBackendDevice::NotSupported;
+ 
+ 	if (dvb_fe_get_stats(dvbv5_parms) != 0) {
+-		qCWarning(logDev, "ioctl FE_READ_STATUS failed for frontend %s", qPrintable(frontendPath));
++		qCWarning(logDev, "ioctl FE_READ_STATUS failed for frontend %s", toPrintable(frontendPath));
+ 		return false;
+ 	}
+ 
+@@ -1334,7 +1334,7 @@ float DvbLinuxDevice::getSnr(Scale &scale)
+ 
+ 	scale = DvbBackendDevice::NotSupported;
+ 	if (dvb_fe_get_stats(dvbv5_parms) != 0) {
+-		qCWarning(logDev, "ioctl FE_READ_STATUS failed for frontend %s", qPrintable(frontendPath));
++		qCWarning(logDev, "ioctl FE_READ_STATUS failed for frontend %s", toPrintable(frontendPath));
+ 		return false;
+ 	}
+ 
+@@ -1380,7 +1380,7 @@ bool DvbLinuxDevice::addPidFilter(int pid)
+ 	int dmxFd = open(QFile::encodeName(demuxPath).constData(), O_RDONLY | O_NONBLOCK | O_CLOEXEC);
+ 
+ 	if (dmxFd < 0) {
+-		qCWarning(logDev, "Cannot open demux %s", qPrintable(demuxPath));
++		qCWarning(logDev, "Cannot open demux %s", toPrintable(demuxPath));
+ 		return false;
+ 	}
+ 
+@@ -1393,7 +1393,7 @@ bool DvbLinuxDevice::addPidFilter(int pid)
+ 	pes_filter.flags = DMX_IMMEDIATE_START;
+ 
+ 	if (ioctl(dmxFd, DMX_SET_PES_FILTER, &pes_filter) != 0) {
+-		qCWarning(logDev, "Cannot set up PID filter for demux %s", qPrintable(demuxPath));
++		qCWarning(logDev, "Cannot set up PID filter for demux %s", toPrintable(demuxPath));
+ 		close(dmxFd);
+ 		return false;
+ 	}
+@@ -1505,7 +1505,7 @@ void DvbLinuxDevice::startDvr()
+ 					continue;
+ 				}
+ 
+-				qCWarning(logDev, "Cannot read from dvr %s: error: %d", qPrintable(dvrPath), errno);
++				qCWarning(logDev, "Cannot read from dvr %s: error: %d", toPrintable(dvrPath), errno);
+ 				return;
+ 			}
+ 		}
+@@ -1573,7 +1573,7 @@ void DvbLinuxDevice::run()
+ 					continue;
+ 				}
+ 
+-				qCWarning(logDev, "Cannot read from dvr %s: error %d", qPrintable(dvrPath), errno);
++				qCWarning(logDev, "Cannot read from dvr %s: error %d", toPrintable(dvrPath), errno);
+ 				dataSize = int(read(dvrFd, dvrBuffer.data, bufferSize));
+ 
+ 				if (dataSize < 0) {
+@@ -1585,7 +1585,7 @@ void DvbLinuxDevice::run()
+ 						continue;
+ 					}
+ 
+-					qCWarning(logDev, "Cannot read from dvr %s: error %d", qPrintable(dvrPath), errno);
++					qCWarning(logDev, "Cannot read from dvr %s: error %d", toPrintable(dvrPath), errno);
+ 					return;
+ 				}
+ 			}
+@@ -1643,16 +1643,16 @@ void DvbLinuxDeviceManager::componentAdded(const QString &udi)
+ 	QString devicePath = QString(QLatin1String("/dev/dvb/adapter%1/%2%3")).arg(adapter).arg(type).arg(index);
+ 
+ 	if ((adapter < 0) || (adapter > 0x7fff) || (index < 0) || (index > 0x7fff)) {
+-		qCWarning(logDev, "Cannot determine adapter or index for device %s", qPrintable(udi));
++		qCWarning(logDev, "Cannot determine adapter or index for device %s", toPrintable(udi));
+ 		return;
+ 	}
+ 
+ 	if (devicePath.isEmpty()) {
+-		qCWarning(logDev, "Cannot determine path for device %s", qPrintable(udi));
++		qCWarning(logDev, "Cannot determine path for device %s", toPrintable(udi));
+ 		return;
+ 	}
+ 
+-	qCDebug(logDev, "New device detected: %s", qPrintable(udi));
++	qCDebug(logDev, "New device detected: %s", toPrintable(udi));
+ 
+ 	int deviceIndex = ((adapter << 16) | index);
+ 	DvbLinuxDevice *device = devices.value(deviceIndex);
+@@ -1800,7 +1800,7 @@ void DvbLinuxDeviceManager::componentRemoved(const QString &udi)
+ 	bool removeDevice = false;
+ 
+ 	if (device->isReady())
+-		qCInfo(logDev, "Digital TV device removed %s: %s", qPrintable(device->getDeviceId()), qPrintable(device->getFrontendName()));
++		qCInfo(logDev, "Digital TV device removed %s: %s", toPrintable(device->getDeviceId()), toPrintable(device->getFrontendName()));
+ 
+ 	if (udi == device->caUdi) {
+ 		device->caPath.clear();
+diff --git a/src/dvb/dvbepg.cpp b/src/dvb/dvbepg.cpp
+index 46746c85acee..ff3890d09547 100644
+--- a/src/dvb/dvbepg.cpp
++++ b/src/dvb/dvbepg.cpp
+@@ -76,7 +76,7 @@ DvbEpgModel::DvbEpgModel(DvbManager *manager_, QObject *parent) : QObject(parent
+ 	QFile file(QStandardPaths::writableLocation(QStandardPaths::DataLocation) + QLatin1String("/epgdata.dvb"));
+ 
+ 	if (!file.open(QIODevice::ReadOnly)) {
+-		qCWarning(logEpg, "Cannot open %s", qPrintable(file.fileName()));
++		qCWarning(logEpg, "Cannot open %s", toPrintable(file.fileName()));
+ 		return;
+ 	}
+ 
+@@ -94,7 +94,7 @@ DvbEpgModel::DvbEpgModel(DvbManager *manager_, QObject *parent) : QObject(parent
+ 	} else if (version == 0x140c37b5) {
+ 		hasMultilang = false;
+ 	} else if (version != 0x20171112) {
+-		qCWarning(logEpg, "Wrong DB version for: %s", qPrintable(file.fileName()));
++		qCWarning(logEpg, "Wrong DB version for: %s", toPrintable(file.fileName()));
+ 		return;
+ 	}
+ 
+@@ -161,7 +161,7 @@ DvbEpgModel::DvbEpgModel(DvbManager *manager_, QObject *parent) : QObject(parent
+ 		}
+ 
+ 		if (stream.status() != QDataStream::Ok) {
+-			qCWarning(logEpg, "Corrupt data %s", qPrintable(file.fileName()));
++			qCWarning(logEpg, "Corrupt data %s", toPrintable(file.fileName()));
+ 			break;
+ 		}
+ 
+@@ -182,7 +182,7 @@ DvbEpgModel::~DvbEpgModel()
+ 	QFile file(QStandardPaths::writableLocation(QStandardPaths::DataLocation) + QLatin1String("/epgdata.dvb"));
+ 
+ 	if (!file.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
+-		qCWarning(logEpg, "Cannot open %s", qPrintable(file.fileName()));
++		qCWarning(logEpg, "Cannot open %s", toPrintable(file.fileName()));
+ 		return;
+ 	}
+ 
+@@ -277,8 +277,8 @@ void DvbEpgModel::Debug(QString text, const DvbSharedEpgEntry &entry)
+ 	QTime end = entry->begin.addSecs(QTime(0, 0, 0).secsTo(entry->duration)).toLocalTime().time();
+ 
+ 	qCDebug(logEpg, "event %s: type %d, from %s to %s: %s: %s: %s : %s",
+-		qPrintable(text), entry->type, qPrintable(QLocale().toString(begin, QLocale::ShortFormat)), qPrintable(QLocale().toString(end)),
+-		qPrintable(entry->title()), qPrintable(entry->subheading()), qPrintable(entry->details()), qPrintable(entry->content));
++		toPrintable(text), entry->type, toPrintable(QLocale().toString(begin, QLocale::ShortFormat)), toPrintable(QLocale().toString(end)),
++		toPrintable(entry->title()), toPrintable(entry->subheading()), toPrintable(entry->details()), toPrintable(entry->content));
+ }
+ 
+ DvbSharedEpgEntry DvbEpgModel::addEntry(const DvbEpgEntry &entry)
+diff --git a/src/dvb/dvbliveview.cpp b/src/dvb/dvbliveview.cpp
+index b47ba9968413..05ff52ede4a3 100644
+--- a/src/dvb/dvbliveview.cpp
++++ b/src/dvb/dvbliveview.cpp
+@@ -448,14 +448,14 @@ void DvbLiveView::playbackStatusChanged(MediaWidget::PlaybackStatus playbackStat
+ 
+ 		if (internal->timeShiftFile.exists() ||
+ 		    !internal->timeShiftFile.open(QIODevice::WriteOnly)) {
+-			qCWarning(logDvb, "Cannot open file %s", qPrintable(internal->timeShiftFile.fileName()));
++			qCWarning(logDvb, "Cannot open file %s", toPrintable(internal->timeShiftFile.fileName()));
+ 			internal->timeShiftFile.setFileName(QDir::homePath() + QLatin1String("/TimeShift-") +
+ 				QDateTime::currentDateTime().toString(QLatin1String("yyyyMMddThhmmss")) +
+ 				QLatin1String(".m2t"));
+ 
+ 			if (internal->timeShiftFile.exists() ||
+ 			    !internal->timeShiftFile.open(QIODevice::WriteOnly)) {
+-				qCWarning(logDvb, "Cannot open file %s", qPrintable(internal->timeShiftFile.fileName()));
++				qCWarning(logDvb, "Cannot open file %s", toPrintable(internal->timeShiftFile.fileName()));
+ 				mediaWidget->stop();
+ 				break;
+ 			}
+diff --git a/src/dvb/dvbmanager.cpp b/src/dvb/dvbmanager.cpp
+index 467eeb5f27b7..3134ddec61f4 100644
+--- a/src/dvb/dvbmanager.cpp
++++ b/src/dvb/dvbmanager.cpp
+@@ -326,7 +326,7 @@ bool DvbManager::updateScanData(const QByteArray &data)
+ 	QFile file(QStandardPaths::writableLocation(QStandardPaths::DataLocation) + QLatin1String("/scanfile.dvb"));
+ 
+ 	if (!file.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
+-		qCWarning(logDvb, "Cannot open %s", qPrintable(file.fileName()));
++		qCWarning(logDvb, "Cannot open %s", toPrintable(file.fileName()));
+ 		return false;
+ 	}
+ 
+@@ -579,11 +579,11 @@ void DvbManager::loadDeviceManager()
+ 		QObject *deviceManager = QPluginLoader(path).instance();
+ 
+ 		if (deviceManager == NULL) {
+-			qCWarning(logDvb, "Cannot load dvb device manager %s", qPrintable(path));
++			qCWarning(logDvb, "Cannot load dvb device manager %s", toPrintable(path));
+ 			break;
+ 		}
+ 
+-		qCInfo(logDvb, "Using dvb device manager %s", qPrintable(path));
++		qCInfo(logDvb, "Using dvb device manager %s", toPrintable(path));
+ 		deviceManager->setParent(this);
+ 		connect(deviceManager, SIGNAL(requestBuiltinDeviceManager(QObject*&)),
+ 			this, SLOT(requestBuiltinDeviceManager(QObject*&)));
+@@ -610,7 +610,7 @@ void DvbManager::readDeviceConfigs()
+ 	const char *errMsg;
+ 
+ 	if (!file.open(QIODevice::ReadOnly)) {
+-		qCWarning(logDvb, "Cannot open %s", qPrintable(file.fileName()));
++		qCWarning(logDvb, "Cannot open %s", toPrintable(file.fileName()));
+ 		return;
+ 	}
+ 
+@@ -680,7 +680,7 @@ void DvbManager::readDeviceConfigs()
+ 	}
+ 
+ 	if (!reader.isValid())
+-		qCWarning(logDvb, "Found some problems at %s: %s", qPrintable(file.fileName()), errMsg);
++		qCWarning(logDvb, "Found some problems at %s: %s", toPrintable(file.fileName()), errMsg);
+ }
+ 
+ void DvbManager::writeDeviceConfigs()
+@@ -688,7 +688,7 @@ void DvbManager::writeDeviceConfigs()
+ 	QFile file(QStandardPaths::writableLocation(QStandardPaths::DataLocation) + QLatin1String("/config.dvb"));
+ 
+ 	if (!file.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
+-		qCWarning(logDvb, "Cannot open %s", qPrintable(file.fileName()));
++		qCWarning(logDvb, "Cannot open %s", toPrintable(file.fileName()));
+ 		return;
+ 	}
+ 
+@@ -769,12 +769,12 @@ void DvbManager::readScanData()
+ 		globalDate = DvbScanData(globalFile.read(1024)).readDate();
+ 
+ 		if (globalDate.isNull()) {
+-			qCWarning(logDvb, "Cannot parse %s", qPrintable(globalFile.fileName()));
++			qCWarning(logDvb, "Cannot parse %s", toPrintable(globalFile.fileName()));
+ 		}
+ 
+ 		globalFile.close();
+ 	} else {
+-		qCWarning(logDvb, "Cannot open global scanfile %s", qPrintable(globalFile.fileName()));
++		qCWarning(logDvb, "Cannot open global scanfile %s", toPrintable(globalFile.fileName()));
+ 	}
+ 
+ 	QFile localFile(QStandardPaths::writableLocation(QStandardPaths::DataLocation) + QLatin1String("/scanfile.dvb"));
+@@ -786,7 +786,7 @@ void DvbManager::readScanData()
+ 		localDate = DvbScanData(localData).readDate();
+ 
+ 		if (localDate.isNull()) {
+-			qCWarning(logDvb, "Cannot parse %s", qPrintable(localFile.fileName()));
++			qCWarning(logDvb, "Cannot parse %s", toPrintable(localFile.fileName()));
+ 		}
+ 
+ 		localFile.close();
+@@ -796,18 +796,18 @@ void DvbManager::readScanData()
+ 		localData.clear();
+ 
+ 		if (localFile.exists() && !localFile.remove()) {
+-			qCWarning(logDvb, "Cannot remove %s", qPrintable(localFile.fileName()));
++			qCWarning(logDvb, "Cannot remove %s", toPrintable(localFile.fileName()));
+ 		}
+ 
+ 		if (!globalFile.copy(localFile.fileName())) {
+-			qCWarning(logDvb, "Cannot copy %s to %s", qPrintable(globalFile.fileName()), qPrintable(localFile.fileName()));
++			qCWarning(logDvb, "Cannot copy %s to %s", toPrintable(globalFile.fileName()), toPrintable(localFile.fileName()));
+ 		}
+ 
+ 		if (localFile.open(QIODevice::ReadOnly)) {
+ 			localData = localFile.readAll();
+ 			localFile.close();
+ 		} else {
+-			qCWarning(logDvb, "Cannot open %s", qPrintable(localFile.fileName()));
++			qCWarning(logDvb, "Cannot open %s", toPrintable(localFile.fileName()));
+ 			scanDataDate = QDate(1900, 1, 1);
+ 			return;
+ 		}
+@@ -817,7 +817,7 @@ void DvbManager::readScanData()
+ 	scanDataDate = data.readDate();
+ 
+ 	if (!scanDataDate.isValid()) {
+-		qCWarning(logDvb, "Cannot parse %s", qPrintable(localFile.fileName()));
++		qCWarning(logDvb, "Cannot parse %s", toPrintable(localFile.fileName()));
+ 		scanDataDate = QDate(1900, 1, 1);
+ 		return;
+ 	}
+@@ -857,7 +857,7 @@ void DvbManager::readScanData()
+ 		else if (!typeStr.compare("isdb-t", Qt::CaseInsensitive))
+ 			type = IsdbT;
+ 		else {
+-			qCWarning(logDvb, "Transmission type '%s' unknown", qPrintable(typeStr));
++			qCWarning(logDvb, "Transmission type '%s' unknown", toPrintable(typeStr));
+ 			continue;
+ 		}
+ 
+@@ -882,7 +882,7 @@ void DvbManager::readScanData()
+ 				DvbTransponder::fromString(QString::fromLatin1(line));
+ 
+ 			if (!transponder.isValid()) {
+-				qCWarning(logDvb, "Error parsing line : '%s'", qPrintable(line));
++				qCWarning(logDvb, "Error parsing line : '%s'", toPrintable(line));
+ 			} else {
+ 				transponders.append(transponder);
+ 
+diff --git a/src/dvb/dvbrecording.cpp b/src/dvb/dvbrecording.cpp
+index 101845572469..92685cb0d608 100644
+--- a/src/dvb/dvbrecording.cpp
++++ b/src/dvb/dvbrecording.cpp
+@@ -77,7 +77,7 @@ DvbRecordingModel::DvbRecordingModel(DvbManager *manager_, QObject *parent) : QO
+ 	}
+ 
+ 	if (!file.open(QIODevice::ReadOnly)) {
+-		qCWarning(logDvb, "Cannot open file %s", qPrintable(file.fileName()));
++		qCWarning(logDvb, "Cannot open file %s", toPrintable(file.fileName()));
+ 		return;
+ 	}
+ 
+@@ -115,7 +115,7 @@ DvbRecordingModel::DvbRecordingModel(DvbManager *manager_, QObject *parent) : QO
+ 		stream >> recording.details;
+ 
+ 		if (stream.status() != QDataStream::Ok) {
+-			qCWarning(logDvb, "Invalid recordings in file %s", qPrintable(file.fileName()));
++			qCWarning(logDvb, "Invalid recordings in file %s", toPrintable(file.fileName()));
+ 			break;
+ 		}
+ 
+@@ -123,7 +123,7 @@ DvbRecordingModel::DvbRecordingModel(DvbManager *manager_, QObject *parent) : QO
+ 	}
+ 
+ 	if (!file.remove()) {
+-		qCWarning(logDvb, "Cannot remove file %s", qPrintable(file.fileName()));
++		qCWarning(logDvb, "Cannot remove file %s", toPrintable(file.fileName()));
+ 	}
+ }
+ 
+@@ -262,19 +262,19 @@ void DvbRecordingModel::disableLessImportant(DvbSharedRecording &recording1, Dvb
+ 	if (recording1->priority < recording2->priority) {
+ 		DvbRecording rec1 = *(recording1.constData());
+ 		rec1.disabled = true;
+-		qCWarning(logDvb, "Disabled %s because %s has more priority", qPrintable(recording1->name), qPrintable(recording2->name));
++		qCWarning(logDvb, "Disabled %s because %s has more priority", toPrintable(recording1->name), toPrintable(recording2->name));
+ 	}
+ 	if (recording2->priority < recording1->priority) {
+ 		DvbRecording rec2 = *(recording1.constData());
+ 		rec2.disabled = true;
+-		qCWarning(logDvb, "Disabled %s because %s has more priority", qPrintable(recording2->name), qPrintable(recording1->name));
++		qCWarning(logDvb, "Disabled %s because %s has more priority", toPrintable(recording2->name), toPrintable(recording1->name));
+ 	}
+ }
+ 
+ void DvbRecordingModel::addToUnwantedRecordings(DvbSharedRecording recording)
+ {
+ 	unwantedRecordings.append(recording);
+-	qCDebug(logDvb, "executed %s", qPrintable(recording->name));
++	qCDebug(logDvb, "executed %s", toPrintable(recording->name));
+ }
+ 
+ void DvbRecordingModel::executeActionAfterRecording(DvbRecording recording)
+@@ -321,7 +321,7 @@ void DvbRecordingModel::removeDuplicates()
+ 					&& loopEntry1.name == loopEntry2.name) {
+ 					recordings.remove(recordings.key(rec1));
+ 					recordingMap.remove(rec1);
+-					qCDebug(logDvb, "Removed. %s", qPrintable(loopEntry1.name));
++					qCDebug(logDvb, "Removed. %s", toPrintable(loopEntry1.name));
+ 				}
+ 			}
+ 			j = j + 1;
+@@ -375,7 +375,7 @@ bool DvbRecordingModel::existsSimilarRecording(DvbEpgEntry recording)
+ 				&& QString::compare(entry.channel->name, loopEntry.channel->name) == 0
+ 				&& QString::compare((entry.duration).toString(),
+ 						loopEntry.duration.addSecs(- manager->getBeginMargin() - manager->getEndMargin()).toString()) == 0) {
+-			qCDebug(logDvb, "Found from unwanteds %s", qPrintable(loopEntry.name));
++			qCDebug(logDvb, "Found from unwanteds %s", toPrintable(loopEntry.name));
+ 			found = true;
+ 			break;
+ 		}
+@@ -409,7 +409,7 @@ void DvbRecordingModel::disableConflicts()
+ 		{
+ 			if (isInConflictWithAll(rec2, conflictList)) {
+ 				conflictList.append(rec2);
+-				qCDebug(logDvb, "conflict: '%s' '%s' and '%s' '%s'", qPrintable(rec1->name), qPrintable(rec1->begin.toString()), qPrintable(rec2->name), qPrintable(rec2->begin.toString()));
++				qCDebug(logDvb, "conflict: '%s' '%s' and '%s' '%s'", toPrintable(rec1->name), toPrintable(rec1->begin.toString()), toPrintable(rec2->name), toPrintable(rec2->begin.toString()));
+ 
+ 			}
+ 
+@@ -473,13 +473,13 @@ DvbSharedRecording DvbRecordingModel::getLeastImportant(QList<DvbSharedRecording
+ 	DvbSharedRecording leastImportant = recList.value(0);
+ 	foreach(DvbSharedRecording listRec, recList)
+ 	{
+-		qCDebug(logDvb, "name and priority %s %s", qPrintable(listRec->name), qPrintable(listRec->priority));
++		qCDebug(logDvb, "name and priority %s %s", toPrintable(listRec->name), toPrintable(listRec->priority));
+ 		if (listRec->priority < leastImportant->priority) {
+ 			leastImportant = listRec;
+ 		}
+ 	}
+ 
+-	qCDebug(logDvb, "least important: %s", qPrintable(leastImportant->name));
++	qCDebug(logDvb, "least important: %s", toPrintable(leastImportant->name));
+ 	return leastImportant;
+ }
+ 
+@@ -496,7 +496,7 @@ void DvbRecordingModel::disableLeastImportants(QList<DvbSharedRecording> recList
+ 			if (listRecShared->priority == leastImportance) {
+ 				listRec.disabled = true;
+ 				updateRecording(listRecShared, listRec);
+-				qCDebug(logDvb, "disabled: %s %s", qPrintable(listRec.name), qPrintable(listRec.begin.toString()));
++				qCDebug(logDvb, "disabled: %s %s", toPrintable(listRec.name), toPrintable(listRec.begin.toString()));
+ 			}
+ 		}
+ 	}
+@@ -528,7 +528,7 @@ void DvbRecordingModel::findNewRecordings()
+ 					int priority = manager->getRecordingRegexPriorityList().value(i);
+ 					epgModel->scheduleProgram(epgMap.value(key), manager->getBeginMargin(),
+ 							manager->getEndMargin(), false, priority);
+-					qCDebug(logDvb, "scheduled %s", qPrintable(title));
++					qCDebug(logDvb, "scheduled %s", toPrintable(title));
+ 					}
+ 				}
+ 			}
+@@ -628,7 +628,7 @@ int DvbRecordingModel::getSecondsUntilNextRecording() const
+ 		}
+ 		if (end > QDateTime::currentDateTime().toUTC() && rec.begin <= QDateTime::currentDateTime().toUTC()) {
+ 			timeUntil = 0;
+-			qCDebug(logDvb, "Rec ongoing %s", qPrintable(rec.name));
++			qCDebug(logDvb, "Rec ongoing %s", toPrintable(rec.name));
+ 			break;
+ 		}
+ 		if (rec.begin > QDateTime::currentDateTime().toUTC()) {
+@@ -688,7 +688,7 @@ void DvbRecordingModel::scanChannels()
+ 			}
+ 			if (channel.isValid()) {
+ 				// TODO update tab
+-				qCDebug(logDvb, "Executed %s", qPrintable(channel->name));
++				qCDebug(logDvb, "Executed %s", toPrintable(channel->name));
+ 				manager->getLiveView()->playChannel(channel);
+ 				delay(5);
+ 			}
+@@ -814,7 +814,7 @@ bool DvbRecordingFile::start(DvbRecording &recording)
+ 			if (file.open(QIODevice::WriteOnly)) {
+ 				break;
+ 			} else {
+-				qCWarning(logDvb, "Cannot open file %s. Error: %d", qPrintable(file.fileName()), errno);
++				qCWarning(logDvb, "Cannot open file %s. Error: %d", toPrintable(file.fileName()), errno);
+ 			}
+ 
+ 			if ((attempt == 0) && !QDir(folder).exists()) {
+@@ -822,7 +822,7 @@ bool DvbRecordingFile::start(DvbRecording &recording)
+ 					attempt = -1;
+ 					continue;
+ 				} else {
+-					qCWarning(logDvb, "Cannot create folder %s", qPrintable(folder));
++					qCWarning(logDvb, "Cannot create folder %s", toPrintable(folder));
+ 				}
+ 			}
+ 
+@@ -855,7 +855,7 @@ bool DvbRecordingFile::start(DvbRecording &recording)
+ 		}
+ 
+ 		if (!file.isOpen()) {
+-			qCWarning(logDvb, "Cannot open file %s", qPrintable(file.fileName()));
++			qCWarning(logDvb, "Cannot open file %s", toPrintable(file.fileName()));
+ 			return false;
+ 		}
+ 	}
+diff --git a/src/dvb/dvbscan.cpp b/src/dvb/dvbscan.cpp
+index 8c8c9ec5aba0..6558272d1fa5 100644
+--- a/src/dvb/dvbscan.cpp
++++ b/src/dvb/dvbscan.cpp
+@@ -773,7 +773,7 @@ void DvbScan::updateState()
+ 						       arg(channel.transportStreamId).
+ 						       arg(channel.serviceId);
+ 				}
+-				qCDebug(logDvb, "Found channel %s", qPrintable(channel.name));
++				qCDebug(logDvb, "Found channel %s", toPrintable(channel.name));
+ 			}
+ 
+ 			if (!channels.isEmpty()) {
+@@ -918,7 +918,7 @@ void DvbScan::processSdt(const DvbSdtSection &section)
+ 			sdtEntry.name = serviceDescriptor.serviceName();
+ 			sdtEntry.provider = serviceDescriptor.providerName();
+ 
+-			qCDebug(logDvb, "New SDT entry: service ID 0x%04x, name '%s', provider '%s'", entry.serviceId(), qPrintable(sdtEntry.name), qPrintable(sdtEntry.provider));
++			qCDebug(logDvb, "New SDT entry: service ID 0x%04x, name '%s', provider '%s'", entry.serviceId(), toPrintable(sdtEntry.name), toPrintable(sdtEntry.provider));
+ 			sdtEntries.append(sdtEntry);
+ 		}
+ 	}
+@@ -966,7 +966,7 @@ void DvbScan::processVct(const AtscVctSection &section)
+ 			sdtEntry.name = majorminor + QString(shortName, nameLength);
+ 		}
+ 
+-		qCDebug(logDvb, "New SDT entry: name %s", qPrintable(sdtEntry.name));
++		qCDebug(logDvb, "New SDT entry: name %s", toPrintable(sdtEntry.name));
+ 		sdtEntries.append(sdtEntry);
+ 
+ 		if (i < entryCount - 1)
+diff --git a/src/iso-codes.cpp b/src/iso-codes.cpp
+index fe1d7bbed20a..1d352edde54e 100644
+--- a/src/iso-codes.cpp
++++ b/src/iso-codes.cpp
+@@ -37,7 +37,7 @@ namespace IsoCodes
+ 		if (fileName.isEmpty()) {
+ 			qCInfo(logConfig,
+ 			       "Could not locate %s (is iso-codes installed?)",
+-			       qPrintable(file));
++			       toPrintable(file));
+ 			return;
+ 		}
+ 
+@@ -45,8 +45,8 @@ namespace IsoCodes
+ 		if (!f.open(QIODevice::ReadOnly)) {
+ 			qCWarning(logConfig,
+ 			          "Could not open %s (%s)",
+-			          qPrintable(fileName),
+-				  qPrintable(f.errorString()));
++			          toPrintable(fileName),
++				  toPrintable(f.errorString()));
+ 			return;
+ 		}
+ 
+@@ -88,7 +88,7 @@ namespace IsoCodes
+ 		if (hash.isEmpty())
+ 			qCWarning(logConfig,
+ 			          "Error parsing %s: no entries found.",
+-			          qPrintable(fileName));
++			          toPrintable(fileName));
+ 	}
+ 
+ 	/*
+diff --git a/src/log.h b/src/log.h
+index cf23a7797905..61f7dc224d8c 100644
+--- a/src/log.h
++++ b/src/log.h
+@@ -40,3 +40,5 @@ Q_DECLARE_LOGGING_CATEGORY(logMediaWidget)
+ Q_DECLARE_LOGGING_CATEGORY(logPlaylist)
+ Q_DECLARE_LOGGING_CATEGORY(logSql)
+ Q_DECLARE_LOGGING_CATEGORY(logVlc)
++
++#define toPrintable(string) QString(string).toLocal8Bit().constData()
+diff --git a/src/playlist/playlistmodel.cpp b/src/playlist/playlistmodel.cpp
+index 4327fe38235b..1b8e2815377e 100644
+--- a/src/playlist/playlistmodel.cpp
++++ b/src/playlist/playlistmodel.cpp
+@@ -45,7 +45,7 @@ bool Playlist::load(const QUrl &url_, Format format)
+ 	QFile file(localFile);
+ 
+ 	if (!file.open(QIODevice::ReadOnly)) {
+-		qCWarning(logPlaylist, "Cannot open file %s", qPrintable(file.fileName()));
++		qCWarning(logPlaylist, "Cannot open file %s", toPrintable(file.fileName()));
+ 		return false;
+ 	}
+ 
+@@ -78,7 +78,7 @@ bool Playlist::save(Format format) const
+ 	QFile file(localFile);
+ 
+ 	if (!file.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
+-		qCWarning(logPlaylist, "Cannot open file %s", qPrintable(file.fileName()));
++		qCWarning(logPlaylist, "Cannot open file %s", toPrintable(file.fileName()));
+ 		return false;
+ 	}
+ 
+diff --git a/src/playlist/playlisttab.cpp b/src/playlist/playlisttab.cpp
+index 01f1290f2167..34cc8d5cbf69 100644
+--- a/src/playlist/playlisttab.cpp
++++ b/src/playlist/playlisttab.cpp
+@@ -48,7 +48,7 @@ PlaylistBrowserModel::PlaylistBrowserModel(PlaylistModel *playlistModel_,
+ 		file.setFileName(QStandardPaths::writableLocation(QStandardPaths::DataLocation) + QLatin1String("/playlists"));
+ 
+ 		if (!file.open(QIODevice::ReadOnly)) {
+-			qCWarning(logPlaylist, "Cannot open file %s", qPrintable(file.fileName()));
++			qCWarning(logPlaylist, "Cannot open file %s", toPrintable(file.fileName()));
+ 			return;
+ 		}
+ 	}
+@@ -69,7 +69,7 @@ PlaylistBrowserModel::PlaylistBrowserModel(PlaylistModel *playlistModel_,
+ 		// compatibility code
+ 		hasSubtitles = false;
+ 	} else if (version != 0x361c4a3c) {
+-		qCWarning(logPlaylist, "Cannot read file %s", qPrintable(file.fileName()));
++		qCWarning(logPlaylist, "Cannot read file %s", toPrintable(file.fileName()));
+ 		return;
+ 	}
+ 
+@@ -112,7 +112,7 @@ PlaylistBrowserModel::PlaylistBrowserModel(PlaylistModel *playlistModel_,
+ 		}
+ 
+ 		if (stream.status() != QDataStream::Ok) {
+-			qCWarning(logPlaylist, "Cannot read file %s", qPrintable(file.fileName()));
++			qCWarning(logPlaylist, "Cannot read file %s", toPrintable(file.fileName()));
+ 			delete playlist;
+ 			break;
+ 		}
+@@ -126,7 +126,7 @@ PlaylistBrowserModel::~PlaylistBrowserModel()
+ 	QFile file(QStandardPaths::writableLocation(QStandardPaths::DataLocation) + QLatin1String("/playlistsK4"));
+ 
+ 	if (!file.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
+-		qCWarning(logPlaylist, "Cannot open file %s", qPrintable(file.fileName()));
++		qCWarning(logPlaylist, "Cannot open file %s", toPrintable(file.fileName()));
+ 		return;
+ 	}
+ 
+diff --git a/src/sqlhelper.cpp b/src/sqlhelper.cpp
+index 089b6970aec2..c48762371ab6 100644
+--- a/src/sqlhelper.cpp
++++ b/src/sqlhelper.cpp
+@@ -80,7 +80,7 @@ QSqlQuery SqlHelper::prepare(const QString &statement)
+ 	query.setForwardOnly(true);
+ 
+ 	if (!query.prepare(statement)) {
+-		qCWarning(logSql, "Error while preparing statement '%s'", qPrintable(query.lastError().text()));
++		qCWarning(logSql, "Error while preparing statement '%s'", toPrintable(query.lastError().text()));
+ 	}
+ 
+ 	return query;
+@@ -92,7 +92,7 @@ QSqlQuery SqlHelper::exec(const QString &statement)
+ 	query.setForwardOnly(true);
+ 
+ 	if (!query.exec(statement)) {
+-		qCWarning(logSql, "Error while executing statement '%s'", qPrintable(query.lastError().text()));
++		qCWarning(logSql, "Error while executing statement '%s'", toPrintable(query.lastError().text()));
+ 	}
+ 
+ 	return query;
+@@ -101,7 +101,7 @@ QSqlQuery SqlHelper::exec(const QString &statement)
+ void SqlHelper::exec(QSqlQuery &query)
+ {
+ 	if (!query.exec()) {
+-		qCWarning(logSql, "Error while executing statement '%s'", qPrintable(query.lastError().text()));
++		qCWarning(logSql, "Error while executing statement '%s'", toPrintable(query.lastError().text()));
+ 	}
+ }
+ 
+diff --git a/src/sqlinterface.cpp b/src/sqlinterface.cpp
+index 8cc3bbd239c5..40886f67fddd 100644
+--- a/src/sqlinterface.cpp
++++ b/src/sqlinterface.cpp
+@@ -135,7 +135,7 @@ void SqlInterface::sqlInsert(SqlKey key)
+ 		break;
+ 	}
+ 
+-	qCWarning(logSql, "Invalid pending statement '%s'", qPrintable(pendingStatement));
++	qCWarning(logSql, "Invalid pending statement '%s'", toPrintable(pendingStatement));
+ }
+ 
+ void SqlInterface::sqlUpdate(SqlKey key)
+@@ -155,7 +155,7 @@ void SqlInterface::sqlUpdate(SqlKey key)
+ 		break;
+ 	}
+ 
+-	qCWarning(logSql, "Invalid pending statement '%s'", qPrintable(pendingStatement));
++	qCWarning(logSql, "Invalid pending statement '%s'", toPrintable(pendingStatement));
+ }
+ 
+ void SqlInterface::sqlRemove(SqlKey key)
+@@ -176,7 +176,7 @@ void SqlInterface::sqlRemove(SqlKey key)
+ 		break;
+ 	}
+ 
+-	qCWarning(logSql, "Invalid pending statement %s", qPrintable(pendingStatement));
++	qCWarning(logSql, "Invalid pending statement %s", toPrintable(pendingStatement));
+ }
+ 
+ void SqlInterface::requestSubmission()
+@@ -226,7 +226,7 @@ void SqlInterface::sqlSubmit()
+ 			continue;
+ 		}
+ 
+-		qCWarning(logSql, "Invalid pending statement %s", qPrintable(pendingStatement));
++		qCWarning(logSql, "Invalid pending statement %s", toPrintable(pendingStatement));
+ 	}
+ 
+ 	pendingStatements.clear();
+

diff --git a/media-video/kaffeine/kaffeine-2.0.15.ebuild b/media-video/kaffeine/kaffeine-2.0.15.ebuild
index 7ae8acd549b..ab018a232e4 100644
--- a/media-video/kaffeine/kaffeine-2.0.15.ebuild
+++ b/media-video/kaffeine/kaffeine-2.0.15.ebuild
@@ -48,6 +48,8 @@ RDEPEND="${CDEPEND}
 
 DOCS=( Changelog NOTES README.md )
 
+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
+
 src_configure() {
 	# tools working on $HOME directory for a local git checkout
 	local mycmakeargs=(


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/kaffeine/, media-video/kaffeine/files/
@ 2019-02-22 13:06 Andreas Sturmlechner
  0 siblings, 0 replies; 11+ messages in thread
From: Andreas Sturmlechner @ 2019-02-22 13:06 UTC (permalink / raw
  To: gentoo-commits

commit:     20da942b35c4a9e9a8635a6fa915dc54a76e15e9
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 22 13:00:12 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Feb 22 13:00:12 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20da942b

media-video/kaffeine: Drop 2.0.15

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 media-video/kaffeine/Manifest                      |   1 -
 .../kaffeine/files/kaffeine-2.0.15-qt-5.11.patch   | 989 ---------------------
 media-video/kaffeine/kaffeine-2.0.15.ebuild        |  61 --
 3 files changed, 1051 deletions(-)

diff --git a/media-video/kaffeine/Manifest b/media-video/kaffeine/Manifest
index 1cdb472d353..d80536f6fa4 100644
--- a/media-video/kaffeine/Manifest
+++ b/media-video/kaffeine/Manifest
@@ -1,2 +1 @@
-DIST kaffeine-2.0.15.tar.xz 5988584 BLAKE2B a9361b321a0af13013596c2d06e53053a889a0697fcf5c644195d6bd7e43fb3c108d2c03cf3250c6cb8b14383e10735e883e5ebb17be1b5f9fe5ca81f012dd28 SHA512 d2b21df76710eb79395a0d4e762ecdde4610945de3d1105002a44a56725aea3f10003f4ebefe4cd67f58f561e79aa3f5561639ad5c3afba488146dcb9360f53d
 DIST kaffeine-2.0.16-2.tar.xz 5995824 BLAKE2B a472be60d10be077fd7ab3828e6958b0c3a2a8fef66318d33c0972e08cf3f5f19ce9d99cf42c21fed0aba67e296b639624e78d0e5567a9dc291a342c0ccf9249 SHA512 1b39bf59127c777b34f3076a237c53973af827191d2a279d40e7f14891dcd3d7bba1444b0b456d0e614807bf6bff494568aed958632dfba54515de8de5b06f21

diff --git a/media-video/kaffeine/files/kaffeine-2.0.15-qt-5.11.patch b/media-video/kaffeine/files/kaffeine-2.0.15-qt-5.11.patch
deleted file mode 100644
index 65981526348..00000000000
--- a/media-video/kaffeine/files/kaffeine-2.0.15-qt-5.11.patch
+++ /dev/null
@@ -1,989 +0,0 @@
-From cef89684e41b90c644f369edbca2bf079b8b0454 Mon Sep 17 00:00:00 2001
-From: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
-Date: Wed, 16 May 2018 12:34:10 -0300
-Subject: [PATCH] don't use qPrintable() anymore
-
-As commented on: https://bugreports.qt.io/browse/QTBUG-68307,
-qt5 is explicitly breaking qPrintable().
-
-So, let's define our own version of it.
-
-Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
-
-diff --git a/src/backend-vlc/vlcmediawidget.cpp b/src/backend-vlc/vlcmediawidget.cpp
-index 2421dd69e285..c03b7dd732c6 100644
---- a/src/backend-vlc/vlcmediawidget.cpp
-+++ b/src/backend-vlc/vlcmediawidget.cpp
-@@ -55,7 +55,7 @@ bool VlcMediaWidget::init()
- 
- 	vlcInstance = libvlc_new(argc, argv);
- 	if (!vlcInstance) {
--		qCWarning(logMediaWidget, "libVLC: failed to use extra args: %s", qPrintable(args));
-+		qCWarning(logMediaWidget, "libVLC: failed to use extra args: %s", toPrintable(args));
- 		argc = 0;
- 		vlcInstance = libvlc_new(0, NULL);
- 		if (vlcInstance)
-@@ -63,7 +63,7 @@ bool VlcMediaWidget::init()
- 	}
- 
- 	if (vlcInstance == NULL) {
--		qFatal("Cannot create vlc instance %s", qPrintable(libvlc_errmsg()));
-+		qFatal("Cannot create vlc instance %s", toPrintable(libvlc_errmsg()));
- 		delete argv;
- 		return false;
- 	}
-@@ -73,14 +73,14 @@ bool VlcMediaWidget::init()
- 		for (int i = 0; i < argc; i++)
- 			log += " " + QLatin1String(argv[i]);
- 
--		qCDebug(logVlc, "%s", qPrintable(log));
-+		qCDebug(logVlc, "%s", toPrintable(log));
- 	}
- 	delete argv;
- 
- 	vlcMediaPlayer = libvlc_media_player_new(vlcInstance);
- 
- 	if (vlcMediaPlayer == NULL) {
--		qFatal("Cannot create vlc media player %s", qPrintable(libvlc_errmsg()));
-+		qFatal("Cannot create vlc media player %s", toPrintable(libvlc_errmsg()));
- 		return false;
- 	}
- 
-@@ -95,7 +95,7 @@ bool VlcMediaWidget::init()
- 
- 	for (uint i = 0; i < (sizeof(eventTypes) / sizeof(eventTypes[0])); ++i) {
- 		if (libvlc_event_attach(eventManager, eventTypes[i], vlcEventHandler, this) != 0) {
--			qCCritical(logMediaWidget, "Cannot attach event handler %s", qPrintable(eventTypes[i]));
-+			qCCritical(logMediaWidget, "Cannot attach event handler %s", toPrintable(eventTypes[i]));
- 			return false;
- 		}
- 	}
-@@ -167,7 +167,7 @@ void VlcMediaWidget::setAudioDevice(QString device)
- 	for (i = vlcAudioOutput; i != NULL; i = i->p_next) {
- 		if (device.compare(QString::fromUtf8(i->psz_description)))
- 			continue;
--		qCDebug(logVlc, "Setting audio output to: %s", qPrintable(i->psz_device));
-+		qCDebug(logVlc, "Setting audio output to: %s", toPrintable(i->psz_device));
- 
- 		libvlc_audio_output_device_set(vlcMediaPlayer, NULL, i->psz_device);
- 	}
-@@ -319,7 +319,7 @@ void VlcMediaWidget::play(const MediaSource &source)
- 
- 	if (vlcMedia == NULL) {
- 		libvlc_media_player_stop(vlcMediaPlayer);
--		qCWarning(logMediaWidget, "Cannot create media %s", qPrintable(source.getUrl().toDisplayString()));
-+		qCWarning(logMediaWidget, "Cannot create media %s", toPrintable(source.getUrl().toDisplayString()));
- 		return;
- 	}
- 
-@@ -328,7 +328,7 @@ void VlcMediaWidget::play(const MediaSource &source)
- 
- 	for (uint i = 0; i < (sizeof(eventTypes) / sizeof(eventTypes[0])); ++i) {
- 		if (libvlc_event_attach(eventManager, eventTypes[i], vlcEventHandler, this) != 0) {
--			qCWarning(logMediaWidget, "Cannot attach event handler %s", qPrintable(eventTypes[i]));
-+			qCWarning(logMediaWidget, "Cannot attach event handler %s", toPrintable(eventTypes[i]));
- 		}
- 	}
- 
-@@ -340,7 +340,7 @@ void VlcMediaWidget::play(const MediaSource &source)
- //		setExternalSubtitle(source.subtitleUrl);
- 
- 	if (libvlc_media_player_play(vlcMediaPlayer) != 0) {
--		qCWarning(logMediaWidget, "Cannot play media %s", qPrintable(source.getUrl().toDisplayString()));
-+		qCWarning(logMediaWidget, "Cannot play media %s", toPrintable(source.getUrl().toDisplayString()));
- 	}
- 
- 	setCursor(Qt::BlankCursor);
-@@ -408,7 +408,7 @@ void VlcMediaWidget::setCurrentSubtitle(int currentSubtitle)
- 		}
- 
- 		if (track->i_id == requestedSubtitle)
--			qCDebug(logVlc, "Subtitle set to id %d: %s", track->i_id, qPrintable(subtitle));
-+			qCDebug(logVlc, "Subtitle set to id %d: %s", track->i_id, toPrintable(subtitle));
- 		track = track->p_next;
- 	}
- 	libvlc_track_description_list_release(track);
-@@ -424,11 +424,11 @@ void VlcMediaWidget::setExternalSubtitle(const QUrl &url)
- 					  libvlc_media_slave_type_subtitle,
- 					  url.toEncoded().constData(),
- 					  true) == 0)
--		qCWarning(logMediaWidget, "Cannot set subtitle file %s", qPrintable(fname));
-+		qCWarning(logMediaWidget, "Cannot set subtitle file %s", toPrintable(fname));
- #else
- 	if (libvlc_video_set_subtitle_file(vlcMediaPlayer,
--					   qPrintable(fname)) == 0)
--		qCWarning(logMediaWidget, "Cannot set subtitle file %s", qPrintable(fname));
-+					   toPrintable(fname)) == 0)
-+		qCWarning(logMediaWidget, "Cannot set subtitle file %s", toPrintable(fname));
- #endif
- }
- 
-@@ -625,7 +625,7 @@ void VlcMediaWidget::updateSubtitles()
- 		// currentSubtitle
- 		subtitleId[track->i_id] = ++i;
- 		subtitles.append(subtitle);
--		qCDebug(logVlc, "Got subtitle id#%d: %s", track->i_id, qPrintable(subtitle));
-+		qCDebug(logVlc, "Got subtitle id#%d: %s", track->i_id, toPrintable(subtitle));
- 		track = track->p_next;
- 	}
- 	libvlc_track_description_list_release(track);
-diff --git a/src/dvb/dvbcam_linux.cpp b/src/dvb/dvbcam_linux.cpp
-index 7e1c483ac674..5ef445a34c6a 100644
---- a/src/dvb/dvbcam_linux.cpp
-+++ b/src/dvb/dvbcam_linux.cpp
-@@ -66,7 +66,7 @@ void DvbLinuxCam::startCa(const QString &path)
- 	caFd = open(QFile::encodeName(path).constData(), O_RDWR | O_NONBLOCK);
- 
- 	if (caFd < 0) {
--		qCWarning(logCam, "Cannot open CA device node %s", qPrintable(path));
-+		qCWarning(logCam, "Cannot open CA device node %s", toPrintable(path));
- 		return;
- 	}
- 
-diff --git a/src/dvb/dvbchannel.cpp b/src/dvb/dvbchannel.cpp
-index 8395f6fa52fa..1c3aa973e327 100644
---- a/src/dvb/dvbchannel.cpp
-+++ b/src/dvb/dvbchannel.cpp
-@@ -146,7 +146,7 @@ DvbChannelModel *DvbChannelModel::createSqlModel(QObject *parent)
- 	}
- 
- 	if (!file.open(QIODevice::ReadOnly)) {
--		qCWarning(logDvb, "Cannot open %s", qPrintable(file.fileName()));
-+		qCWarning(logDvb, "Cannot open %s", toPrintable(file.fileName()));
- 		return channelModel;
- 	}
- 
-@@ -212,7 +212,7 @@ DvbChannelModel *DvbChannelModel::createSqlModel(QObject *parent)
- 		channel.isScrambled = (flags & 0x1) != 0;
- 
- 		if (stream.status() != QDataStream::Ok) {
--			qCWarning(logDvb, "Invalid channels in file %s", qPrintable(file.fileName()));
-+			qCWarning(logDvb, "Invalid channels in file %s", toPrintable(file.fileName()));
- 			break;
- 		}
- 
-@@ -223,7 +223,7 @@ DvbChannelModel *DvbChannelModel::createSqlModel(QObject *parent)
- 	channelModel->channelFlush();
- 
- 	if (!file.remove()) {
--		qCWarning(logDvb, "Cannot remove '%s' from DB", qPrintable(file.fileName()));
-+		qCWarning(logDvb, "Cannot remove '%s' from DB", toPrintable(file.fileName()));
- 	}
- 
- 	return channelModel;
-diff --git a/src/dvb/dvbconfigdialog.cpp b/src/dvb/dvbconfigdialog.cpp
-index fc444595cd34..d0a7bf0c82fe 100644
---- a/src/dvb/dvbconfigdialog.cpp
-+++ b/src/dvb/dvbconfigdialog.cpp
-@@ -546,7 +546,7 @@ void DvbConfigDialog::accept()
- 	foreach (RegexInputLine *regexInputLine, regexInputList)
- 	{
- 		manager->addRecordingRegex(regexInputLine->lineEdit->text());
--		qCDebug(logDvb, "saved regex: %s", qPrintable(regexInputLine->lineEdit->text()));
-+		qCDebug(logDvb, "saved regex: %s", toPrintable(regexInputLine->lineEdit->text()));
- 		manager->addRecordingRegexPriority(regexInputLine->spinBox->value());
- 		qCDebug(logDvb, "saved priority: %i", regexInputLine->spinBox->value());
- 	}
-@@ -1539,7 +1539,7 @@ void DvbSLnbConfigObject::configure()
- 
- 	for (i = 0; i < size; i++) {
- 		struct lnbSat lnb = device->getLnbSatModels().at(i);
--		QRadioButton *radioButton = new QRadioButton(i18nd("libdvbv5", qPrintable(lnb.name)), mainWidget);
-+		QRadioButton *radioButton = new QRadioButton(i18nd("libdvbv5", toPrintable(lnb.name)), mainWidget);
- 		mainLayout->addWidget(radioButton);
- 		lnbSelectionGroup->addButton(radioButton, i + 1);
- 		gridLayout->addWidget(radioButton, i % ((size + 1) / 2), i / ((size + 1) / 2));
-diff --git a/src/dvb/dvbdevice.cpp b/src/dvb/dvbdevice.cpp
-index d4c7150e39e6..27a304931477 100644
---- a/src/dvb/dvbdevice.cpp
-+++ b/src/dvb/dvbdevice.cpp
-@@ -226,7 +226,7 @@ DvbDataDumper::DvbDataDumper()
- 		QLatin1String(".bin"));
- 
- 	if (!open(QIODevice::WriteOnly | QIODevice::Truncate)) {
--		qCWarning(logDev, "Can't open %s", qPrintable(fileName()));
-+		qCWarning(logDev, "Can't open %s", toPrintable(fileName()));
- 	}
- }
- 
-@@ -343,7 +343,7 @@ void DvbDevice::tune(const DvbTransponder &transponder)
- 		}
- 
- 		if (!ok)
--			qCWarning(logDev, "Can't extract orbital position from %s", qPrintable(config->scanSource));
-+			qCWarning(logDev, "Can't extract orbital position from %s", toPrintable(config->scanSource));
- 
- 		double radius = 6378;
- 		double semiMajorAxis = 42164;
-diff --git a/src/dvb/dvbdevice_linux.cpp b/src/dvb/dvbdevice_linux.cpp
-index 1f6c4ad4e1b2..82b29305700a 100644
---- a/src/dvb/dvbdevice_linux.cpp
-+++ b/src/dvb/dvbdevice_linux.cpp
-@@ -95,7 +95,7 @@ void DvbLinuxDevice::startDevice(const QString &deviceId_)
- 	struct dvb_v5_fe_parms *parms = dvb_fe_open2(adapter, index, verbose, 0, dvbv5_log);
- 
- 	if (!parms) {
--		qCWarning(logDev, "Cannot open frontend %s", qPrintable(frontendPath));
-+		qCWarning(logDev, "Cannot open frontend %s", toPrintable(frontendPath));
- 		return;
- 	}
- 
-@@ -184,7 +184,7 @@ void DvbLinuxDevice::startDevice(const QString &deviceId_)
- 
- 	ready = true;
- 
--	qCInfo(logDev, "Found dvb device %s: %s", qPrintable(deviceId), qPrintable(frontendName));
-+	qCInfo(logDev, "Found dvb device %s: %s", toPrintable(deviceId), toPrintable(frontendName));
- }
- 
- void DvbLinuxDevice::startCa()
-@@ -264,14 +264,14 @@ bool DvbLinuxDevice::acquire()
- 	dvbv5_parms = dvb_fe_open2(adapter, index, verbose, 0, dvbv5_log);
- 
- 	if (!dvbv5_parms) {
--		qCWarning(logDev, "Cannot open frontend %s", qPrintable(frontendPath));
-+		qCWarning(logDev, "Cannot open frontend %s", toPrintable(frontendPath));
- 		return false;
- 	}
- 
- 	dvrFd = open(QFile::encodeName(dvrPath).constData(), O_RDONLY | O_NONBLOCK | O_CLOEXEC);
- 
- 	if (dvrFd < 0) {
--		qCWarning(logDev, "Cannot open dvr %s", qPrintable(dvrPath));
-+		qCWarning(logDev, "Cannot open dvr %s", toPrintable(dvrPath));
- 		dvb_fe_close(dvbv5_parms);
- 		dvbv5_parms = NULL;
- 		return false;
-@@ -298,7 +298,7 @@ bool DvbLinuxDevice::sendMessage(const char *message, int length)
- 	Q_ASSERT(dvbv5_parms && (length >= 0) && (length <= 6));
- 
- 	if (dvb_fe_diseqc_cmd(dvbv5_parms, length, (const unsigned char *)message) != 0) {
--		qCWarning(logDev, "ioctl FE_DISEQC_SEND_MASTER_CMD failed for frontend %s", qPrintable(frontendPath));
-+		qCWarning(logDev, "ioctl FE_DISEQC_SEND_MASTER_CMD failed for frontend %s", toPrintable(frontendPath));
- 		return false;
- 	}
- 
-@@ -310,7 +310,7 @@ bool DvbLinuxDevice::sendBurst(SecBurst burst)
- 	Q_ASSERT(dvbv5_parms);
- 
- 	if (dvb_fe_diseqc_burst(dvbv5_parms, burst == BurstMiniB) != 0) {
--		qCWarning(logDev, "ioctl FE_DISEQC_SEND_BURST failed for frontend %s", qPrintable(frontendPath));
-+		qCWarning(logDev, "ioctl FE_DISEQC_SEND_BURST failed for frontend %s", toPrintable(frontendPath));
- 		return false;
- 	}
- 
-@@ -885,11 +885,11 @@ bool DvbLinuxDevice::satSetup(QString lnbModel, int satNumber, int bpf)
- 	int lnb = dvb_sat_search_lnb(lnbModel.toUtf8());
- 	dvbv5_parms->lnb = dvb_sat_get_lnb(lnb);
- 	if (!dvbv5_parms->lnb) {
--		qCCritical(logDev, "Cannot set LNBf type to %s", qPrintable(lnbModel));
-+		qCCritical(logDev, "Cannot set LNBf type to %s", toPrintable(lnbModel));
- 		return false;
- 	}
- 
--	qCDebug(logDev, "Using LNBf type %s", qPrintable(lnbModel));
-+	qCDebug(logDev, "Using LNBf type %s", toPrintable(lnbModel));
- 
- 	dvbv5_parms->sat_number = satNumber;
- 	dvbv5_parms->freq_bpf = bpf;
-@@ -903,7 +903,7 @@ bool DvbLinuxDevice::tune(const DvbTransponder &transponder)
- 	stopDvr();
- 	fe_delivery_system_t delsys;
- 
--	qCDebug(logDev, "tune to: %s", qPrintable(transponder.toString()));
-+	qCDebug(logDev, "tune to: %s", toPrintable(transponder.toString()));
- 
- 	// FIXME: add support for LNA on/off
- 
-@@ -1067,7 +1067,7 @@ bool DvbLinuxDevice::tune(const DvbTransponder &transponder)
- 	}
- 
- 	if (dvb_fe_set_parms(dvbv5_parms) != 0) {
--		qCWarning(logDev, "ioctl FE_SET_PROPERTY failed for frontend %s", qPrintable(frontendPath));
-+		qCWarning(logDev, "ioctl FE_SET_PROPERTY failed for frontend %s", toPrintable(frontendPath));
- 		return false;
- 	}
- 
-@@ -1245,7 +1245,7 @@ bool DvbLinuxDevice::getProps(DvbTransponder &transponder)
- 		qCWarning(logDev, "Invalid transmission type");
- 		return false;
- 	default:
--		qCWarning(logDev, "Unknown transmission type %s", qPrintable(transponder.getTransmissionType()));
-+		qCWarning(logDev, "Unknown transmission type %s", toPrintable(transponder.getTransmissionType()));
- 		return false;
- 	}
- 	return true;
-@@ -1270,12 +1270,12 @@ bool DvbLinuxDevice::isTuned()
- 	uint32_t status = 0;
- 
- 	if (dvb_fe_get_stats(dvbv5_parms) != 0) {
--		qCWarning(logDev, "ioctl FE_READ_STATUS failed for frontend %s", qPrintable(frontendPath));
-+		qCWarning(logDev, "ioctl FE_READ_STATUS failed for frontend %s", toPrintable(frontendPath));
- 		return false;
- 	}
- 
- 	if (dvb_fe_retrieve_stats(dvbv5_parms, DTV_STATUS, &status) != 0) {
--		qCWarning(logDev, "ioctl FE_READ_STATUS failed for frontend %s", qPrintable(frontendPath));
-+		qCWarning(logDev, "ioctl FE_READ_STATUS failed for frontend %s", toPrintable(frontendPath));
- 		return false;
- 	}
- 
-@@ -1291,7 +1291,7 @@ float DvbLinuxDevice::getSignal(Scale &scale)
- 	scale = DvbBackendDevice::NotSupported;
- 
- 	if (dvb_fe_get_stats(dvbv5_parms) != 0) {
--		qCWarning(logDev, "ioctl FE_READ_STATUS failed for frontend %s", qPrintable(frontendPath));
-+		qCWarning(logDev, "ioctl FE_READ_STATUS failed for frontend %s", toPrintable(frontendPath));
- 		return false;
- 	}
- 
-@@ -1334,7 +1334,7 @@ float DvbLinuxDevice::getSnr(Scale &scale)
- 
- 	scale = DvbBackendDevice::NotSupported;
- 	if (dvb_fe_get_stats(dvbv5_parms) != 0) {
--		qCWarning(logDev, "ioctl FE_READ_STATUS failed for frontend %s", qPrintable(frontendPath));
-+		qCWarning(logDev, "ioctl FE_READ_STATUS failed for frontend %s", toPrintable(frontendPath));
- 		return false;
- 	}
- 
-@@ -1380,7 +1380,7 @@ bool DvbLinuxDevice::addPidFilter(int pid)
- 	int dmxFd = open(QFile::encodeName(demuxPath).constData(), O_RDONLY | O_NONBLOCK | O_CLOEXEC);
- 
- 	if (dmxFd < 0) {
--		qCWarning(logDev, "Cannot open demux %s", qPrintable(demuxPath));
-+		qCWarning(logDev, "Cannot open demux %s", toPrintable(demuxPath));
- 		return false;
- 	}
- 
-@@ -1393,7 +1393,7 @@ bool DvbLinuxDevice::addPidFilter(int pid)
- 	pes_filter.flags = DMX_IMMEDIATE_START;
- 
- 	if (ioctl(dmxFd, DMX_SET_PES_FILTER, &pes_filter) != 0) {
--		qCWarning(logDev, "Cannot set up PID filter for demux %s", qPrintable(demuxPath));
-+		qCWarning(logDev, "Cannot set up PID filter for demux %s", toPrintable(demuxPath));
- 		close(dmxFd);
- 		return false;
- 	}
-@@ -1505,7 +1505,7 @@ void DvbLinuxDevice::startDvr()
- 					continue;
- 				}
- 
--				qCWarning(logDev, "Cannot read from dvr %s: error: %d", qPrintable(dvrPath), errno);
-+				qCWarning(logDev, "Cannot read from dvr %s: error: %d", toPrintable(dvrPath), errno);
- 				return;
- 			}
- 		}
-@@ -1573,7 +1573,7 @@ void DvbLinuxDevice::run()
- 					continue;
- 				}
- 
--				qCWarning(logDev, "Cannot read from dvr %s: error %d", qPrintable(dvrPath), errno);
-+				qCWarning(logDev, "Cannot read from dvr %s: error %d", toPrintable(dvrPath), errno);
- 				dataSize = int(read(dvrFd, dvrBuffer.data, bufferSize));
- 
- 				if (dataSize < 0) {
-@@ -1585,7 +1585,7 @@ void DvbLinuxDevice::run()
- 						continue;
- 					}
- 
--					qCWarning(logDev, "Cannot read from dvr %s: error %d", qPrintable(dvrPath), errno);
-+					qCWarning(logDev, "Cannot read from dvr %s: error %d", toPrintable(dvrPath), errno);
- 					return;
- 				}
- 			}
-@@ -1643,16 +1643,16 @@ void DvbLinuxDeviceManager::componentAdded(const QString &udi)
- 	QString devicePath = QString(QLatin1String("/dev/dvb/adapter%1/%2%3")).arg(adapter).arg(type).arg(index);
- 
- 	if ((adapter < 0) || (adapter > 0x7fff) || (index < 0) || (index > 0x7fff)) {
--		qCWarning(logDev, "Cannot determine adapter or index for device %s", qPrintable(udi));
-+		qCWarning(logDev, "Cannot determine adapter or index for device %s", toPrintable(udi));
- 		return;
- 	}
- 
- 	if (devicePath.isEmpty()) {
--		qCWarning(logDev, "Cannot determine path for device %s", qPrintable(udi));
-+		qCWarning(logDev, "Cannot determine path for device %s", toPrintable(udi));
- 		return;
- 	}
- 
--	qCDebug(logDev, "New device detected: %s", qPrintable(udi));
-+	qCDebug(logDev, "New device detected: %s", toPrintable(udi));
- 
- 	int deviceIndex = ((adapter << 16) | index);
- 	DvbLinuxDevice *device = devices.value(deviceIndex);
-@@ -1800,7 +1800,7 @@ void DvbLinuxDeviceManager::componentRemoved(const QString &udi)
- 	bool removeDevice = false;
- 
- 	if (device->isReady())
--		qCInfo(logDev, "Digital TV device removed %s: %s", qPrintable(device->getDeviceId()), qPrintable(device->getFrontendName()));
-+		qCInfo(logDev, "Digital TV device removed %s: %s", toPrintable(device->getDeviceId()), toPrintable(device->getFrontendName()));
- 
- 	if (udi == device->caUdi) {
- 		device->caPath.clear();
-diff --git a/src/dvb/dvbepg.cpp b/src/dvb/dvbepg.cpp
-index 46746c85acee..ff3890d09547 100644
---- a/src/dvb/dvbepg.cpp
-+++ b/src/dvb/dvbepg.cpp
-@@ -76,7 +76,7 @@ DvbEpgModel::DvbEpgModel(DvbManager *manager_, QObject *parent) : QObject(parent
- 	QFile file(QStandardPaths::writableLocation(QStandardPaths::DataLocation) + QLatin1String("/epgdata.dvb"));
- 
- 	if (!file.open(QIODevice::ReadOnly)) {
--		qCWarning(logEpg, "Cannot open %s", qPrintable(file.fileName()));
-+		qCWarning(logEpg, "Cannot open %s", toPrintable(file.fileName()));
- 		return;
- 	}
- 
-@@ -94,7 +94,7 @@ DvbEpgModel::DvbEpgModel(DvbManager *manager_, QObject *parent) : QObject(parent
- 	} else if (version == 0x140c37b5) {
- 		hasMultilang = false;
- 	} else if (version != 0x20171112) {
--		qCWarning(logEpg, "Wrong DB version for: %s", qPrintable(file.fileName()));
-+		qCWarning(logEpg, "Wrong DB version for: %s", toPrintable(file.fileName()));
- 		return;
- 	}
- 
-@@ -161,7 +161,7 @@ DvbEpgModel::DvbEpgModel(DvbManager *manager_, QObject *parent) : QObject(parent
- 		}
- 
- 		if (stream.status() != QDataStream::Ok) {
--			qCWarning(logEpg, "Corrupt data %s", qPrintable(file.fileName()));
-+			qCWarning(logEpg, "Corrupt data %s", toPrintable(file.fileName()));
- 			break;
- 		}
- 
-@@ -182,7 +182,7 @@ DvbEpgModel::~DvbEpgModel()
- 	QFile file(QStandardPaths::writableLocation(QStandardPaths::DataLocation) + QLatin1String("/epgdata.dvb"));
- 
- 	if (!file.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
--		qCWarning(logEpg, "Cannot open %s", qPrintable(file.fileName()));
-+		qCWarning(logEpg, "Cannot open %s", toPrintable(file.fileName()));
- 		return;
- 	}
- 
-@@ -277,8 +277,8 @@ void DvbEpgModel::Debug(QString text, const DvbSharedEpgEntry &entry)
- 	QTime end = entry->begin.addSecs(QTime(0, 0, 0).secsTo(entry->duration)).toLocalTime().time();
- 
- 	qCDebug(logEpg, "event %s: type %d, from %s to %s: %s: %s: %s : %s",
--		qPrintable(text), entry->type, qPrintable(QLocale().toString(begin, QLocale::ShortFormat)), qPrintable(QLocale().toString(end)),
--		qPrintable(entry->title()), qPrintable(entry->subheading()), qPrintable(entry->details()), qPrintable(entry->content));
-+		toPrintable(text), entry->type, toPrintable(QLocale().toString(begin, QLocale::ShortFormat)), toPrintable(QLocale().toString(end)),
-+		toPrintable(entry->title()), toPrintable(entry->subheading()), toPrintable(entry->details()), toPrintable(entry->content));
- }
- 
- DvbSharedEpgEntry DvbEpgModel::addEntry(const DvbEpgEntry &entry)
-diff --git a/src/dvb/dvbliveview.cpp b/src/dvb/dvbliveview.cpp
-index b47ba9968413..05ff52ede4a3 100644
---- a/src/dvb/dvbliveview.cpp
-+++ b/src/dvb/dvbliveview.cpp
-@@ -448,14 +448,14 @@ void DvbLiveView::playbackStatusChanged(MediaWidget::PlaybackStatus playbackStat
- 
- 		if (internal->timeShiftFile.exists() ||
- 		    !internal->timeShiftFile.open(QIODevice::WriteOnly)) {
--			qCWarning(logDvb, "Cannot open file %s", qPrintable(internal->timeShiftFile.fileName()));
-+			qCWarning(logDvb, "Cannot open file %s", toPrintable(internal->timeShiftFile.fileName()));
- 			internal->timeShiftFile.setFileName(QDir::homePath() + QLatin1String("/TimeShift-") +
- 				QDateTime::currentDateTime().toString(QLatin1String("yyyyMMddThhmmss")) +
- 				QLatin1String(".m2t"));
- 
- 			if (internal->timeShiftFile.exists() ||
- 			    !internal->timeShiftFile.open(QIODevice::WriteOnly)) {
--				qCWarning(logDvb, "Cannot open file %s", qPrintable(internal->timeShiftFile.fileName()));
-+				qCWarning(logDvb, "Cannot open file %s", toPrintable(internal->timeShiftFile.fileName()));
- 				mediaWidget->stop();
- 				break;
- 			}
-diff --git a/src/dvb/dvbmanager.cpp b/src/dvb/dvbmanager.cpp
-index 467eeb5f27b7..3134ddec61f4 100644
---- a/src/dvb/dvbmanager.cpp
-+++ b/src/dvb/dvbmanager.cpp
-@@ -326,7 +326,7 @@ bool DvbManager::updateScanData(const QByteArray &data)
- 	QFile file(QStandardPaths::writableLocation(QStandardPaths::DataLocation) + QLatin1String("/scanfile.dvb"));
- 
- 	if (!file.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
--		qCWarning(logDvb, "Cannot open %s", qPrintable(file.fileName()));
-+		qCWarning(logDvb, "Cannot open %s", toPrintable(file.fileName()));
- 		return false;
- 	}
- 
-@@ -579,11 +579,11 @@ void DvbManager::loadDeviceManager()
- 		QObject *deviceManager = QPluginLoader(path).instance();
- 
- 		if (deviceManager == NULL) {
--			qCWarning(logDvb, "Cannot load dvb device manager %s", qPrintable(path));
-+			qCWarning(logDvb, "Cannot load dvb device manager %s", toPrintable(path));
- 			break;
- 		}
- 
--		qCInfo(logDvb, "Using dvb device manager %s", qPrintable(path));
-+		qCInfo(logDvb, "Using dvb device manager %s", toPrintable(path));
- 		deviceManager->setParent(this);
- 		connect(deviceManager, SIGNAL(requestBuiltinDeviceManager(QObject*&)),
- 			this, SLOT(requestBuiltinDeviceManager(QObject*&)));
-@@ -610,7 +610,7 @@ void DvbManager::readDeviceConfigs()
- 	const char *errMsg;
- 
- 	if (!file.open(QIODevice::ReadOnly)) {
--		qCWarning(logDvb, "Cannot open %s", qPrintable(file.fileName()));
-+		qCWarning(logDvb, "Cannot open %s", toPrintable(file.fileName()));
- 		return;
- 	}
- 
-@@ -680,7 +680,7 @@ void DvbManager::readDeviceConfigs()
- 	}
- 
- 	if (!reader.isValid())
--		qCWarning(logDvb, "Found some problems at %s: %s", qPrintable(file.fileName()), errMsg);
-+		qCWarning(logDvb, "Found some problems at %s: %s", toPrintable(file.fileName()), errMsg);
- }
- 
- void DvbManager::writeDeviceConfigs()
-@@ -688,7 +688,7 @@ void DvbManager::writeDeviceConfigs()
- 	QFile file(QStandardPaths::writableLocation(QStandardPaths::DataLocation) + QLatin1String("/config.dvb"));
- 
- 	if (!file.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
--		qCWarning(logDvb, "Cannot open %s", qPrintable(file.fileName()));
-+		qCWarning(logDvb, "Cannot open %s", toPrintable(file.fileName()));
- 		return;
- 	}
- 
-@@ -769,12 +769,12 @@ void DvbManager::readScanData()
- 		globalDate = DvbScanData(globalFile.read(1024)).readDate();
- 
- 		if (globalDate.isNull()) {
--			qCWarning(logDvb, "Cannot parse %s", qPrintable(globalFile.fileName()));
-+			qCWarning(logDvb, "Cannot parse %s", toPrintable(globalFile.fileName()));
- 		}
- 
- 		globalFile.close();
- 	} else {
--		qCWarning(logDvb, "Cannot open global scanfile %s", qPrintable(globalFile.fileName()));
-+		qCWarning(logDvb, "Cannot open global scanfile %s", toPrintable(globalFile.fileName()));
- 	}
- 
- 	QFile localFile(QStandardPaths::writableLocation(QStandardPaths::DataLocation) + QLatin1String("/scanfile.dvb"));
-@@ -786,7 +786,7 @@ void DvbManager::readScanData()
- 		localDate = DvbScanData(localData).readDate();
- 
- 		if (localDate.isNull()) {
--			qCWarning(logDvb, "Cannot parse %s", qPrintable(localFile.fileName()));
-+			qCWarning(logDvb, "Cannot parse %s", toPrintable(localFile.fileName()));
- 		}
- 
- 		localFile.close();
-@@ -796,18 +796,18 @@ void DvbManager::readScanData()
- 		localData.clear();
- 
- 		if (localFile.exists() && !localFile.remove()) {
--			qCWarning(logDvb, "Cannot remove %s", qPrintable(localFile.fileName()));
-+			qCWarning(logDvb, "Cannot remove %s", toPrintable(localFile.fileName()));
- 		}
- 
- 		if (!globalFile.copy(localFile.fileName())) {
--			qCWarning(logDvb, "Cannot copy %s to %s", qPrintable(globalFile.fileName()), qPrintable(localFile.fileName()));
-+			qCWarning(logDvb, "Cannot copy %s to %s", toPrintable(globalFile.fileName()), toPrintable(localFile.fileName()));
- 		}
- 
- 		if (localFile.open(QIODevice::ReadOnly)) {
- 			localData = localFile.readAll();
- 			localFile.close();
- 		} else {
--			qCWarning(logDvb, "Cannot open %s", qPrintable(localFile.fileName()));
-+			qCWarning(logDvb, "Cannot open %s", toPrintable(localFile.fileName()));
- 			scanDataDate = QDate(1900, 1, 1);
- 			return;
- 		}
-@@ -817,7 +817,7 @@ void DvbManager::readScanData()
- 	scanDataDate = data.readDate();
- 
- 	if (!scanDataDate.isValid()) {
--		qCWarning(logDvb, "Cannot parse %s", qPrintable(localFile.fileName()));
-+		qCWarning(logDvb, "Cannot parse %s", toPrintable(localFile.fileName()));
- 		scanDataDate = QDate(1900, 1, 1);
- 		return;
- 	}
-@@ -857,7 +857,7 @@ void DvbManager::readScanData()
- 		else if (!typeStr.compare("isdb-t", Qt::CaseInsensitive))
- 			type = IsdbT;
- 		else {
--			qCWarning(logDvb, "Transmission type '%s' unknown", qPrintable(typeStr));
-+			qCWarning(logDvb, "Transmission type '%s' unknown", toPrintable(typeStr));
- 			continue;
- 		}
- 
-@@ -882,7 +882,7 @@ void DvbManager::readScanData()
- 				DvbTransponder::fromString(QString::fromLatin1(line));
- 
- 			if (!transponder.isValid()) {
--				qCWarning(logDvb, "Error parsing line : '%s'", qPrintable(line));
-+				qCWarning(logDvb, "Error parsing line : '%s'", toPrintable(line));
- 			} else {
- 				transponders.append(transponder);
- 
-diff --git a/src/dvb/dvbrecording.cpp b/src/dvb/dvbrecording.cpp
-index 101845572469..92685cb0d608 100644
---- a/src/dvb/dvbrecording.cpp
-+++ b/src/dvb/dvbrecording.cpp
-@@ -77,7 +77,7 @@ DvbRecordingModel::DvbRecordingModel(DvbManager *manager_, QObject *parent) : QO
- 	}
- 
- 	if (!file.open(QIODevice::ReadOnly)) {
--		qCWarning(logDvb, "Cannot open file %s", qPrintable(file.fileName()));
-+		qCWarning(logDvb, "Cannot open file %s", toPrintable(file.fileName()));
- 		return;
- 	}
- 
-@@ -115,7 +115,7 @@ DvbRecordingModel::DvbRecordingModel(DvbManager *manager_, QObject *parent) : QO
- 		stream >> recording.details;
- 
- 		if (stream.status() != QDataStream::Ok) {
--			qCWarning(logDvb, "Invalid recordings in file %s", qPrintable(file.fileName()));
-+			qCWarning(logDvb, "Invalid recordings in file %s", toPrintable(file.fileName()));
- 			break;
- 		}
- 
-@@ -123,7 +123,7 @@ DvbRecordingModel::DvbRecordingModel(DvbManager *manager_, QObject *parent) : QO
- 	}
- 
- 	if (!file.remove()) {
--		qCWarning(logDvb, "Cannot remove file %s", qPrintable(file.fileName()));
-+		qCWarning(logDvb, "Cannot remove file %s", toPrintable(file.fileName()));
- 	}
- }
- 
-@@ -262,19 +262,19 @@ void DvbRecordingModel::disableLessImportant(DvbSharedRecording &recording1, Dvb
- 	if (recording1->priority < recording2->priority) {
- 		DvbRecording rec1 = *(recording1.constData());
- 		rec1.disabled = true;
--		qCWarning(logDvb, "Disabled %s because %s has more priority", qPrintable(recording1->name), qPrintable(recording2->name));
-+		qCWarning(logDvb, "Disabled %s because %s has more priority", toPrintable(recording1->name), toPrintable(recording2->name));
- 	}
- 	if (recording2->priority < recording1->priority) {
- 		DvbRecording rec2 = *(recording1.constData());
- 		rec2.disabled = true;
--		qCWarning(logDvb, "Disabled %s because %s has more priority", qPrintable(recording2->name), qPrintable(recording1->name));
-+		qCWarning(logDvb, "Disabled %s because %s has more priority", toPrintable(recording2->name), toPrintable(recording1->name));
- 	}
- }
- 
- void DvbRecordingModel::addToUnwantedRecordings(DvbSharedRecording recording)
- {
- 	unwantedRecordings.append(recording);
--	qCDebug(logDvb, "executed %s", qPrintable(recording->name));
-+	qCDebug(logDvb, "executed %s", toPrintable(recording->name));
- }
- 
- void DvbRecordingModel::executeActionAfterRecording(DvbRecording recording)
-@@ -321,7 +321,7 @@ void DvbRecordingModel::removeDuplicates()
- 					&& loopEntry1.name == loopEntry2.name) {
- 					recordings.remove(recordings.key(rec1));
- 					recordingMap.remove(rec1);
--					qCDebug(logDvb, "Removed. %s", qPrintable(loopEntry1.name));
-+					qCDebug(logDvb, "Removed. %s", toPrintable(loopEntry1.name));
- 				}
- 			}
- 			j = j + 1;
-@@ -375,7 +375,7 @@ bool DvbRecordingModel::existsSimilarRecording(DvbEpgEntry recording)
- 				&& QString::compare(entry.channel->name, loopEntry.channel->name) == 0
- 				&& QString::compare((entry.duration).toString(),
- 						loopEntry.duration.addSecs(- manager->getBeginMargin() - manager->getEndMargin()).toString()) == 0) {
--			qCDebug(logDvb, "Found from unwanteds %s", qPrintable(loopEntry.name));
-+			qCDebug(logDvb, "Found from unwanteds %s", toPrintable(loopEntry.name));
- 			found = true;
- 			break;
- 		}
-@@ -409,7 +409,7 @@ void DvbRecordingModel::disableConflicts()
- 		{
- 			if (isInConflictWithAll(rec2, conflictList)) {
- 				conflictList.append(rec2);
--				qCDebug(logDvb, "conflict: '%s' '%s' and '%s' '%s'", qPrintable(rec1->name), qPrintable(rec1->begin.toString()), qPrintable(rec2->name), qPrintable(rec2->begin.toString()));
-+				qCDebug(logDvb, "conflict: '%s' '%s' and '%s' '%s'", toPrintable(rec1->name), toPrintable(rec1->begin.toString()), toPrintable(rec2->name), toPrintable(rec2->begin.toString()));
- 
- 			}
- 
-@@ -473,13 +473,13 @@ DvbSharedRecording DvbRecordingModel::getLeastImportant(QList<DvbSharedRecording
- 	DvbSharedRecording leastImportant = recList.value(0);
- 	foreach(DvbSharedRecording listRec, recList)
- 	{
--		qCDebug(logDvb, "name and priority %s %s", qPrintable(listRec->name), qPrintable(listRec->priority));
-+		qCDebug(logDvb, "name and priority %s %s", toPrintable(listRec->name), toPrintable(listRec->priority));
- 		if (listRec->priority < leastImportant->priority) {
- 			leastImportant = listRec;
- 		}
- 	}
- 
--	qCDebug(logDvb, "least important: %s", qPrintable(leastImportant->name));
-+	qCDebug(logDvb, "least important: %s", toPrintable(leastImportant->name));
- 	return leastImportant;
- }
- 
-@@ -496,7 +496,7 @@ void DvbRecordingModel::disableLeastImportants(QList<DvbSharedRecording> recList
- 			if (listRecShared->priority == leastImportance) {
- 				listRec.disabled = true;
- 				updateRecording(listRecShared, listRec);
--				qCDebug(logDvb, "disabled: %s %s", qPrintable(listRec.name), qPrintable(listRec.begin.toString()));
-+				qCDebug(logDvb, "disabled: %s %s", toPrintable(listRec.name), toPrintable(listRec.begin.toString()));
- 			}
- 		}
- 	}
-@@ -528,7 +528,7 @@ void DvbRecordingModel::findNewRecordings()
- 					int priority = manager->getRecordingRegexPriorityList().value(i);
- 					epgModel->scheduleProgram(epgMap.value(key), manager->getBeginMargin(),
- 							manager->getEndMargin(), false, priority);
--					qCDebug(logDvb, "scheduled %s", qPrintable(title));
-+					qCDebug(logDvb, "scheduled %s", toPrintable(title));
- 					}
- 				}
- 			}
-@@ -628,7 +628,7 @@ int DvbRecordingModel::getSecondsUntilNextRecording() const
- 		}
- 		if (end > QDateTime::currentDateTime().toUTC() && rec.begin <= QDateTime::currentDateTime().toUTC()) {
- 			timeUntil = 0;
--			qCDebug(logDvb, "Rec ongoing %s", qPrintable(rec.name));
-+			qCDebug(logDvb, "Rec ongoing %s", toPrintable(rec.name));
- 			break;
- 		}
- 		if (rec.begin > QDateTime::currentDateTime().toUTC()) {
-@@ -688,7 +688,7 @@ void DvbRecordingModel::scanChannels()
- 			}
- 			if (channel.isValid()) {
- 				// TODO update tab
--				qCDebug(logDvb, "Executed %s", qPrintable(channel->name));
-+				qCDebug(logDvb, "Executed %s", toPrintable(channel->name));
- 				manager->getLiveView()->playChannel(channel);
- 				delay(5);
- 			}
-@@ -814,7 +814,7 @@ bool DvbRecordingFile::start(DvbRecording &recording)
- 			if (file.open(QIODevice::WriteOnly)) {
- 				break;
- 			} else {
--				qCWarning(logDvb, "Cannot open file %s. Error: %d", qPrintable(file.fileName()), errno);
-+				qCWarning(logDvb, "Cannot open file %s. Error: %d", toPrintable(file.fileName()), errno);
- 			}
- 
- 			if ((attempt == 0) && !QDir(folder).exists()) {
-@@ -822,7 +822,7 @@ bool DvbRecordingFile::start(DvbRecording &recording)
- 					attempt = -1;
- 					continue;
- 				} else {
--					qCWarning(logDvb, "Cannot create folder %s", qPrintable(folder));
-+					qCWarning(logDvb, "Cannot create folder %s", toPrintable(folder));
- 				}
- 			}
- 
-@@ -855,7 +855,7 @@ bool DvbRecordingFile::start(DvbRecording &recording)
- 		}
- 
- 		if (!file.isOpen()) {
--			qCWarning(logDvb, "Cannot open file %s", qPrintable(file.fileName()));
-+			qCWarning(logDvb, "Cannot open file %s", toPrintable(file.fileName()));
- 			return false;
- 		}
- 	}
-diff --git a/src/dvb/dvbscan.cpp b/src/dvb/dvbscan.cpp
-index 8c8c9ec5aba0..6558272d1fa5 100644
---- a/src/dvb/dvbscan.cpp
-+++ b/src/dvb/dvbscan.cpp
-@@ -773,7 +773,7 @@ void DvbScan::updateState()
- 						       arg(channel.transportStreamId).
- 						       arg(channel.serviceId);
- 				}
--				qCDebug(logDvb, "Found channel %s", qPrintable(channel.name));
-+				qCDebug(logDvb, "Found channel %s", toPrintable(channel.name));
- 			}
- 
- 			if (!channels.isEmpty()) {
-@@ -918,7 +918,7 @@ void DvbScan::processSdt(const DvbSdtSection &section)
- 			sdtEntry.name = serviceDescriptor.serviceName();
- 			sdtEntry.provider = serviceDescriptor.providerName();
- 
--			qCDebug(logDvb, "New SDT entry: service ID 0x%04x, name '%s', provider '%s'", entry.serviceId(), qPrintable(sdtEntry.name), qPrintable(sdtEntry.provider));
-+			qCDebug(logDvb, "New SDT entry: service ID 0x%04x, name '%s', provider '%s'", entry.serviceId(), toPrintable(sdtEntry.name), toPrintable(sdtEntry.provider));
- 			sdtEntries.append(sdtEntry);
- 		}
- 	}
-@@ -966,7 +966,7 @@ void DvbScan::processVct(const AtscVctSection &section)
- 			sdtEntry.name = majorminor + QString(shortName, nameLength);
- 		}
- 
--		qCDebug(logDvb, "New SDT entry: name %s", qPrintable(sdtEntry.name));
-+		qCDebug(logDvb, "New SDT entry: name %s", toPrintable(sdtEntry.name));
- 		sdtEntries.append(sdtEntry);
- 
- 		if (i < entryCount - 1)
-diff --git a/src/iso-codes.cpp b/src/iso-codes.cpp
-index fe1d7bbed20a..1d352edde54e 100644
---- a/src/iso-codes.cpp
-+++ b/src/iso-codes.cpp
-@@ -37,7 +37,7 @@ namespace IsoCodes
- 		if (fileName.isEmpty()) {
- 			qCInfo(logConfig,
- 			       "Could not locate %s (is iso-codes installed?)",
--			       qPrintable(file));
-+			       toPrintable(file));
- 			return;
- 		}
- 
-@@ -45,8 +45,8 @@ namespace IsoCodes
- 		if (!f.open(QIODevice::ReadOnly)) {
- 			qCWarning(logConfig,
- 			          "Could not open %s (%s)",
--			          qPrintable(fileName),
--				  qPrintable(f.errorString()));
-+			          toPrintable(fileName),
-+				  toPrintable(f.errorString()));
- 			return;
- 		}
- 
-@@ -88,7 +88,7 @@ namespace IsoCodes
- 		if (hash.isEmpty())
- 			qCWarning(logConfig,
- 			          "Error parsing %s: no entries found.",
--			          qPrintable(fileName));
-+			          toPrintable(fileName));
- 	}
- 
- 	/*
-diff --git a/src/log.h b/src/log.h
-index cf23a7797905..61f7dc224d8c 100644
---- a/src/log.h
-+++ b/src/log.h
-@@ -40,3 +40,5 @@ Q_DECLARE_LOGGING_CATEGORY(logMediaWidget)
- Q_DECLARE_LOGGING_CATEGORY(logPlaylist)
- Q_DECLARE_LOGGING_CATEGORY(logSql)
- Q_DECLARE_LOGGING_CATEGORY(logVlc)
-+
-+#define toPrintable(string) QString(string).toLocal8Bit().constData()
-diff --git a/src/playlist/playlistmodel.cpp b/src/playlist/playlistmodel.cpp
-index 4327fe38235b..1b8e2815377e 100644
---- a/src/playlist/playlistmodel.cpp
-+++ b/src/playlist/playlistmodel.cpp
-@@ -45,7 +45,7 @@ bool Playlist::load(const QUrl &url_, Format format)
- 	QFile file(localFile);
- 
- 	if (!file.open(QIODevice::ReadOnly)) {
--		qCWarning(logPlaylist, "Cannot open file %s", qPrintable(file.fileName()));
-+		qCWarning(logPlaylist, "Cannot open file %s", toPrintable(file.fileName()));
- 		return false;
- 	}
- 
-@@ -78,7 +78,7 @@ bool Playlist::save(Format format) const
- 	QFile file(localFile);
- 
- 	if (!file.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
--		qCWarning(logPlaylist, "Cannot open file %s", qPrintable(file.fileName()));
-+		qCWarning(logPlaylist, "Cannot open file %s", toPrintable(file.fileName()));
- 		return false;
- 	}
- 
-diff --git a/src/playlist/playlisttab.cpp b/src/playlist/playlisttab.cpp
-index 01f1290f2167..34cc8d5cbf69 100644
---- a/src/playlist/playlisttab.cpp
-+++ b/src/playlist/playlisttab.cpp
-@@ -48,7 +48,7 @@ PlaylistBrowserModel::PlaylistBrowserModel(PlaylistModel *playlistModel_,
- 		file.setFileName(QStandardPaths::writableLocation(QStandardPaths::DataLocation) + QLatin1String("/playlists"));
- 
- 		if (!file.open(QIODevice::ReadOnly)) {
--			qCWarning(logPlaylist, "Cannot open file %s", qPrintable(file.fileName()));
-+			qCWarning(logPlaylist, "Cannot open file %s", toPrintable(file.fileName()));
- 			return;
- 		}
- 	}
-@@ -69,7 +69,7 @@ PlaylistBrowserModel::PlaylistBrowserModel(PlaylistModel *playlistModel_,
- 		// compatibility code
- 		hasSubtitles = false;
- 	} else if (version != 0x361c4a3c) {
--		qCWarning(logPlaylist, "Cannot read file %s", qPrintable(file.fileName()));
-+		qCWarning(logPlaylist, "Cannot read file %s", toPrintable(file.fileName()));
- 		return;
- 	}
- 
-@@ -112,7 +112,7 @@ PlaylistBrowserModel::PlaylistBrowserModel(PlaylistModel *playlistModel_,
- 		}
- 
- 		if (stream.status() != QDataStream::Ok) {
--			qCWarning(logPlaylist, "Cannot read file %s", qPrintable(file.fileName()));
-+			qCWarning(logPlaylist, "Cannot read file %s", toPrintable(file.fileName()));
- 			delete playlist;
- 			break;
- 		}
-@@ -126,7 +126,7 @@ PlaylistBrowserModel::~PlaylistBrowserModel()
- 	QFile file(QStandardPaths::writableLocation(QStandardPaths::DataLocation) + QLatin1String("/playlistsK4"));
- 
- 	if (!file.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
--		qCWarning(logPlaylist, "Cannot open file %s", qPrintable(file.fileName()));
-+		qCWarning(logPlaylist, "Cannot open file %s", toPrintable(file.fileName()));
- 		return;
- 	}
- 
-diff --git a/src/sqlhelper.cpp b/src/sqlhelper.cpp
-index 089b6970aec2..c48762371ab6 100644
---- a/src/sqlhelper.cpp
-+++ b/src/sqlhelper.cpp
-@@ -80,7 +80,7 @@ QSqlQuery SqlHelper::prepare(const QString &statement)
- 	query.setForwardOnly(true);
- 
- 	if (!query.prepare(statement)) {
--		qCWarning(logSql, "Error while preparing statement '%s'", qPrintable(query.lastError().text()));
-+		qCWarning(logSql, "Error while preparing statement '%s'", toPrintable(query.lastError().text()));
- 	}
- 
- 	return query;
-@@ -92,7 +92,7 @@ QSqlQuery SqlHelper::exec(const QString &statement)
- 	query.setForwardOnly(true);
- 
- 	if (!query.exec(statement)) {
--		qCWarning(logSql, "Error while executing statement '%s'", qPrintable(query.lastError().text()));
-+		qCWarning(logSql, "Error while executing statement '%s'", toPrintable(query.lastError().text()));
- 	}
- 
- 	return query;
-@@ -101,7 +101,7 @@ QSqlQuery SqlHelper::exec(const QString &statement)
- void SqlHelper::exec(QSqlQuery &query)
- {
- 	if (!query.exec()) {
--		qCWarning(logSql, "Error while executing statement '%s'", qPrintable(query.lastError().text()));
-+		qCWarning(logSql, "Error while executing statement '%s'", toPrintable(query.lastError().text()));
- 	}
- }
- 
-diff --git a/src/sqlinterface.cpp b/src/sqlinterface.cpp
-index 8cc3bbd239c5..40886f67fddd 100644
---- a/src/sqlinterface.cpp
-+++ b/src/sqlinterface.cpp
-@@ -135,7 +135,7 @@ void SqlInterface::sqlInsert(SqlKey key)
- 		break;
- 	}
- 
--	qCWarning(logSql, "Invalid pending statement '%s'", qPrintable(pendingStatement));
-+	qCWarning(logSql, "Invalid pending statement '%s'", toPrintable(pendingStatement));
- }
- 
- void SqlInterface::sqlUpdate(SqlKey key)
-@@ -155,7 +155,7 @@ void SqlInterface::sqlUpdate(SqlKey key)
- 		break;
- 	}
- 
--	qCWarning(logSql, "Invalid pending statement '%s'", qPrintable(pendingStatement));
-+	qCWarning(logSql, "Invalid pending statement '%s'", toPrintable(pendingStatement));
- }
- 
- void SqlInterface::sqlRemove(SqlKey key)
-@@ -176,7 +176,7 @@ void SqlInterface::sqlRemove(SqlKey key)
- 		break;
- 	}
- 
--	qCWarning(logSql, "Invalid pending statement %s", qPrintable(pendingStatement));
-+	qCWarning(logSql, "Invalid pending statement %s", toPrintable(pendingStatement));
- }
- 
- void SqlInterface::requestSubmission()
-@@ -226,7 +226,7 @@ void SqlInterface::sqlSubmit()
- 			continue;
- 		}
- 
--		qCWarning(logSql, "Invalid pending statement %s", qPrintable(pendingStatement));
-+		qCWarning(logSql, "Invalid pending statement %s", toPrintable(pendingStatement));
- 	}
- 
- 	pendingStatements.clear();
-

diff --git a/media-video/kaffeine/kaffeine-2.0.15.ebuild b/media-video/kaffeine/kaffeine-2.0.15.ebuild
deleted file mode 100644
index 56f1d1f4177..00000000000
--- a/media-video/kaffeine/kaffeine-2.0.15.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-inherit kde5
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="amd64 x86"
-	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-fi
-
-DESCRIPTION="Media player with digital TV support by KDE"
-HOMEPAGE="https://kaffeine.kde.org/"
-LICENSE="GPL-2+ handbook? ( FDL-1.3 )"
-IUSE="dvb"
-
-CDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsql 'sqlite')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
-	media-video/vlc[X]
-	x11-libs/libXScrnSaver
-	dvb? ( media-libs/libv4l )
-"
-DEPEND="${CDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-RDEPEND="${CDEPEND}
-	!media-video/kaffeine:4
-"
-
-DOCS=( Changelog NOTES README.md )
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
-
-src_configure() {
-	# tools working on $HOME directory for a local git checkout
-	local mycmakeargs=(
-		-DBUILD_TOOLS=OFF
-		$(cmake-utils_use_find_package dvb Libdvbv5)
-	)
-
-	kde5_src_configure
-}


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/kaffeine/, media-video/kaffeine/files/
@ 2022-09-15 19:41 Andreas Sturmlechner
  0 siblings, 0 replies; 11+ messages in thread
From: Andreas Sturmlechner @ 2022-09-15 19:41 UTC (permalink / raw
  To: gentoo-commits

commit:     9cb2804875a6a3d32a4248c331289f46826906a2
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 15 19:37:14 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Sep 15 19:41:36 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cb28048

media-video/kaffeine: EAPI-8 bump, update scantable.dvb, wayland fix

Fix activating existing window backporting upstream commit
389c812c3afffc5184492039a80bee24a8104815.
Fix HOMEPAGE.

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-video/kaffeine/Manifest                      |  1 +
 ...kaffeine-2.0.18-wayland-window-activation.patch | 35 +++++++++++
 media-video/kaffeine/kaffeine-2.0.18-r2.ebuild     | 69 ++++++++++++++++++++++
 3 files changed, 105 insertions(+)

diff --git a/media-video/kaffeine/Manifest b/media-video/kaffeine/Manifest
index 730b942b88a1..5a15bb12779a 100644
--- a/media-video/kaffeine/Manifest
+++ b/media-video/kaffeine/Manifest
@@ -1 +1,2 @@
+DIST kaffeine-2.0.18-scantable.dvb 1880456 BLAKE2B e435309f0a11cb6ecb9671c0948c6afdf4c946bc0914c0809945002e353383bb539e1c5594a0a52f2968393623c56914b360b37e5b24a0c17a8f3a60b100ad6a SHA512 2d00987eb261e6f52df490dd44b43567f7d4e3bdcfd0eb2f62e064604d91661e9754cf9e5462b491009fcb35bdca681f4be2a9f06b6b6d47a5b44f5819dbf4fe
 DIST kaffeine-2.0.18.tar.xz 6033112 BLAKE2B c9a0fbd58f7ee4ed8ad44cbed59d95cde7df8ba9c2f5f341df74e6a771293756434e38adb7706baf224a684b56453601099fcac9bf27fd7ec935073a0c30ec19 SHA512 60854251f25e7de94928686f647e6e0f07ca40188e8dfd8140985f1dfbb53bb4d92ff42c29e216431500839d7eb83b81f386bac3a8a86dd8c986a611ec0db3a4

diff --git a/media-video/kaffeine/files/kaffeine-2.0.18-wayland-window-activation.patch b/media-video/kaffeine/files/kaffeine-2.0.18-wayland-window-activation.patch
new file mode 100644
index 000000000000..2c4cc7a6f862
--- /dev/null
+++ b/media-video/kaffeine/files/kaffeine-2.0.18-wayland-window-activation.patch
@@ -0,0 +1,35 @@
+From 389c812c3afffc5184492039a80bee24a8104815 Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Sun, 15 May 2022 18:38:07 +0200
+Subject: [PATCH] Fix activating existing window
+
+Also raise window when no arguments were passed
+
+Use KWindowSystem API that also works on Wayland
+---
+ src/main.cpp | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/src/main.cpp b/src/main.cpp
+index 68677fd..b5a07dc 100644
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -178,12 +178,11 @@ KaffeineApplication::KaffeineApplication(int &argc, char **argv) : QApplication(
+ void KaffeineApplication::activateRequested(const QStringList &arguments,
+ 					    const QString &workingDirectory)
+ {
+-	if (arguments.isEmpty())
+-		return;
+-
+ 	parser.parse(arguments);
++
++	KWindowSystem::updateStartupId(mainWindow->windowHandle());
++	KWindowSystem::activateWindow(mainWindow->windowHandle());
+-	KStartupInfo::setNewStartupId(mainWindow, KStartupInfo::startupId());
+ 	KWindowSystem::forceActiveWindow(mainWindow->winId());
+ 	mainWindow->parseArgs(workingDirectory);
+ }
+ 
+-- 
+GitLab
+

diff --git a/media-video/kaffeine/kaffeine-2.0.18-r2.ebuild b/media-video/kaffeine/kaffeine-2.0.18-r2.ebuild
new file mode 100644
index 000000000000..f95af9a8b83a
--- /dev/null
+++ b/media-video/kaffeine/kaffeine-2.0.18-r2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+KFMIN=5.92.0
+QTMIN=5.15.5
+inherit ecm kde.org
+
+if [[ ${KDE_BUILD_TYPE} == release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz
+	https://linuxtv.org/downloads/dtv-scan-tables/${PN}/scantable.dvb -> ${P}-scantable.dvb"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Media player with digital TV support by KDE"
+HOMEPAGE="https://apps.kde.org/kaffeine/ https://userbase.kde.org/Kaffeine"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.3 )"
+SLOT="5"
+IUSE="dvb"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5[sqlite]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	media-video/vlc[X]
+	x11-libs/libXScrnSaver
+	dvb? ( media-libs/libv4l[dvb] )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+DOCS=( Changelog NOTES README.md )
+
+PATCHES=( "${FILESDIR}/${P}-wayland-window-activation.patch" )
+
+src_prepare() {
+	ecm_src_prepare
+	cp -av "${DISTDIR}"/kaffeine-2.0.18-scantable.dvb src/scantable.dvb || die
+}
+
+src_configure() {
+	# tools working on $HOME directory for a local git checkout
+	local mycmakeargs=(
+		-DBUILD_TOOLS=OFF
+		$(cmake_use_find_package dvb Libdvbv5)
+	)
+
+	ecm_src_configure
+}


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/kaffeine/, media-video/kaffeine/files/
@ 2022-10-05 20:47 Andreas Sturmlechner
  0 siblings, 0 replies; 11+ messages in thread
From: Andreas Sturmlechner @ 2022-10-05 20:47 UTC (permalink / raw
  To: gentoo-commits

commit:     a86b767bfcb2a9f6fb99e1bb85623a3d09875419
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Oct  5 19:33:17 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Oct  5 20:46:18 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a86b767b

media-video/kaffeine: drop 2.0.18-r1

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/kaffeine-2.0.18-kwindowsystem-5.82.patch | 28 ----------
 media-video/kaffeine/kaffeine-2.0.18-r1.ebuild     | 63 ----------------------
 2 files changed, 91 deletions(-)

diff --git a/media-video/kaffeine/files/kaffeine-2.0.18-kwindowsystem-5.82.patch b/media-video/kaffeine/files/kaffeine-2.0.18-kwindowsystem-5.82.patch
deleted file mode 100644
index 97d8ecdec057..000000000000
--- a/media-video/kaffeine/files/kaffeine-2.0.18-kwindowsystem-5.82.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 4280d21a96c4ffd162eca52815aa84ddb679f60b Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sat, 8 May 2021 23:45:53 +0200
-Subject: [PATCH] Port away from API deprecated in >KF-5.62
-
-BUG: 436798
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- src/main.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/main.cpp b/src/main.cpp
-index 01e3b80..cee5102 100644
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -180,7 +180,7 @@ void KaffeineApplication::activateRequested(const QStringList &arguments,
- 		return;
- 
- 	parser.parse(arguments);
--	KStartupInfo::setNewStartupId(mainWindow, KStartupInfo::startupId());
-+	KStartupInfo::setNewStartupId(mainWindow->window()->windowHandle(), KStartupInfo::startupId());
- 	KWindowSystem::forceActiveWindow(mainWindow->winId());
- 	mainWindow->parseArgs(workingDirectory);
- }
--- 
-2.31.1
-

diff --git a/media-video/kaffeine/kaffeine-2.0.18-r1.ebuild b/media-video/kaffeine/kaffeine-2.0.18-r1.ebuild
deleted file mode 100644
index 0be321a4b6ff..000000000000
--- a/media-video/kaffeine/kaffeine-2.0.18-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-KFMIN=5.82.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Media player with digital TV support by KDE"
-HOMEPAGE="https://userbase.kde.org/Kaffeine"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.3 )"
-SLOT="5"
-IUSE="dvb"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5[sqlite]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	media-video/vlc[X]
-	x11-libs/libXScrnSaver
-	dvb? ( media-libs/libv4l[dvb] )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-DOCS=( Changelog NOTES README.md )
-
-PATCHES=( "${FILESDIR}/${P}-kwindowsystem-5.82.patch" ) # KDE-bug 436798
-
-src_configure() {
-	# tools working on $HOME directory for a local git checkout
-	local mycmakeargs=(
-		-DBUILD_TOOLS=OFF
-		$(cmake_use_find_package dvb Libdvbv5)
-	)
-
-	ecm_src_configure
-}


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/kaffeine/, media-video/kaffeine/files/
@ 2024-09-23 20:16 Andreas Sturmlechner
  0 siblings, 0 replies; 11+ messages in thread
From: Andreas Sturmlechner @ 2024-09-23 20:16 UTC (permalink / raw
  To: gentoo-commits

commit:     05e74dc5960298b9729c161c2537138520203116
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 23 09:47:42 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Sep 23 20:16:26 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05e74dc5

media-video/kaffeine: drop 2.0.18-r2

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-video/kaffeine/Manifest                      |  1 -
 ...kaffeine-2.0.18-wayland-window-activation.patch | 35 -----------
 media-video/kaffeine/kaffeine-2.0.18-r2.ebuild     | 69 ----------------------
 3 files changed, 105 deletions(-)

diff --git a/media-video/kaffeine/Manifest b/media-video/kaffeine/Manifest
index 2a7daee2655a..c15a50861660 100644
--- a/media-video/kaffeine/Manifest
+++ b/media-video/kaffeine/Manifest
@@ -1,4 +1,3 @@
 DIST kaffeine-2.0.18-patchset.tar.xz 29600 BLAKE2B b7e4fa7c367ded01ddbdc258d2b6cac904fefe44b34668e64f7c4d9d2933abe42aeaee64c4889cee050d131ac6aac8bb58b6685523d0e6bdb019430fdd2a269d SHA512 66d9a2f1820fd284b601245c6b7d5eac927e8e1c22e86ef2d84177c0e3f23f2bf6dacfe51f6512dfcaed3d7c59aad522ee9e3555ec2940179fe6b2b3a4fb7f98
 DIST kaffeine-2.0.18-r3-scantable.dvb 1980400 BLAKE2B dcc43fcd04cc155ae99e35a32de15f9823007f68041a4b3fc6fce143d2b66e3c209d945a24e9aea968b195b782d8ffb5d21533cba21fb48ffedb77d82f28d5f2 SHA512 de93c5dbecdb7549b03a1809891a33ee216a1592a140fcce81649e4355ac9e51898ca6a2d7b0d302e3e92191800fbd50033902a06fc6672ca3590eb4d7be2f98
-DIST kaffeine-2.0.18-scantable.dvb 1880456 BLAKE2B e435309f0a11cb6ecb9671c0948c6afdf4c946bc0914c0809945002e353383bb539e1c5594a0a52f2968393623c56914b360b37e5b24a0c17a8f3a60b100ad6a SHA512 2d00987eb261e6f52df490dd44b43567f7d4e3bdcfd0eb2f62e064604d91661e9754cf9e5462b491009fcb35bdca681f4be2a9f06b6b6d47a5b44f5819dbf4fe
 DIST kaffeine-2.0.18.tar.xz 6033112 BLAKE2B c9a0fbd58f7ee4ed8ad44cbed59d95cde7df8ba9c2f5f341df74e6a771293756434e38adb7706baf224a684b56453601099fcac9bf27fd7ec935073a0c30ec19 SHA512 60854251f25e7de94928686f647e6e0f07ca40188e8dfd8140985f1dfbb53bb4d92ff42c29e216431500839d7eb83b81f386bac3a8a86dd8c986a611ec0db3a4

diff --git a/media-video/kaffeine/files/kaffeine-2.0.18-wayland-window-activation.patch b/media-video/kaffeine/files/kaffeine-2.0.18-wayland-window-activation.patch
deleted file mode 100644
index 2c4cc7a6f862..000000000000
--- a/media-video/kaffeine/files/kaffeine-2.0.18-wayland-window-activation.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 389c812c3afffc5184492039a80bee24a8104815 Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Sun, 15 May 2022 18:38:07 +0200
-Subject: [PATCH] Fix activating existing window
-
-Also raise window when no arguments were passed
-
-Use KWindowSystem API that also works on Wayland
----
- src/main.cpp | 11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/src/main.cpp b/src/main.cpp
-index 68677fd..b5a07dc 100644
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -178,12 +178,11 @@ KaffeineApplication::KaffeineApplication(int &argc, char **argv) : QApplication(
- void KaffeineApplication::activateRequested(const QStringList &arguments,
- 					    const QString &workingDirectory)
- {
--	if (arguments.isEmpty())
--		return;
--
- 	parser.parse(arguments);
-+
-+	KWindowSystem::updateStartupId(mainWindow->windowHandle());
-+	KWindowSystem::activateWindow(mainWindow->windowHandle());
--	KStartupInfo::setNewStartupId(mainWindow, KStartupInfo::startupId());
- 	KWindowSystem::forceActiveWindow(mainWindow->winId());
- 	mainWindow->parseArgs(workingDirectory);
- }
- 
--- 
-GitLab
-

diff --git a/media-video/kaffeine/kaffeine-2.0.18-r2.ebuild b/media-video/kaffeine/kaffeine-2.0.18-r2.ebuild
deleted file mode 100644
index f988700d6e1d..000000000000
--- a/media-video/kaffeine/kaffeine-2.0.18-r2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-KFMIN=5.92.0
-QTMIN=5.15.5
-inherit ecm kde.org
-
-if [[ ${KDE_BUILD_TYPE} == release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz
-	https://linuxtv.org/downloads/dtv-scan-tables/${PN}/scantable.dvb -> ${P}-scantable.dvb"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Media player with digital TV support by KDE"
-HOMEPAGE="https://apps.kde.org/kaffeine/ https://userbase.kde.org/Kaffeine"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.3 )"
-SLOT="5"
-IUSE="dvb"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5[sqlite]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	media-video/vlc[X]
-	x11-libs/libXScrnSaver
-	dvb? ( media-libs/libv4l[dvb] )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-DOCS=( Changelog NOTES README.md )
-
-PATCHES=( "${FILESDIR}/${P}-wayland-window-activation.patch" )
-
-src_prepare() {
-	ecm_src_prepare
-	cp -av "${DISTDIR}"/kaffeine-2.0.18-scantable.dvb src/scantable.dvb || die
-}
-
-src_configure() {
-	# tools working on $HOME directory for a local git checkout
-	local mycmakeargs=(
-		-DBUILD_TOOLS=OFF
-		$(cmake_use_find_package dvb Libdvbv5)
-	)
-
-	ecm_src_configure
-}


^ permalink raw reply related	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2024-09-23 20:16 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-30 17:33 [gentoo-commits] repo/gentoo:master commit in: media-video/kaffeine/, media-video/kaffeine/files/ Michael Palimaka
  -- strict thread matches above, loose matches on Subject: below --
2017-03-11 19:40 Johannes Huber
2017-05-17 18:46 Andreas Sturmlechner
2017-07-10 18:00 Andreas Sturmlechner
2017-07-19 16:33 Andreas Sturmlechner
2017-12-02 18:33 Andreas Sturmlechner
2018-05-16 16:05 Andreas Sturmlechner
2019-02-22 13:06 Andreas Sturmlechner
2022-09-15 19:41 Andreas Sturmlechner
2022-10-05 20:47 Andreas Sturmlechner
2024-09-23 20:16 Andreas Sturmlechner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox