[arch-commits] Commit in k3b/trunk (PKGBUILD k3b-no-webkit.patch)
Antonio Rojas
arojas at archlinux.org
Wed Feb 8 07:54:11 UTC 2017
Date: Wednesday, February 8, 2017 @ 07:54:11
Author: arojas
Revision: 288230
Drop qtwebkit usage
Added:
k3b/trunk/k3b-no-webkit.patch
Modified:
k3b/trunk/PKGBUILD
---------------------+
PKGBUILD | 9 +++++---
k3b-no-webkit.patch | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 58 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-02-08 07:25:52 UTC (rev 288229)
+++ PKGBUILD 2017-02-08 07:54:11 UTC (rev 288230)
@@ -3,7 +3,7 @@
pkgname=k3b
pkgver=2.0.3a
-pkgrel=7
+pkgrel=8
epoch=1
pkgdesc="Feature-rich and easy to handle CD burning application"
arch=('i686' 'x86_64')
@@ -18,10 +18,11 @@
'emovix: for bootable multimedia cd/dvd support'
'cdrdao: for disk-at-once (DAO) mode support'
'cdparanoia: for cd ripping support')
-source=(http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.xz k3b-ffmpeg3.patch k3b-gcc6.patch)
+source=(http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.xz k3b-ffmpeg3.patch k3b-gcc6.patch k3b-no-webkit.patch)
sha1sums=('f1001db3b5b32ef6bdb827742f1ca357c82b216f'
'8ee47b04e92499d484c49e33dd33dabdf53025c9'
- '83693cc2a3ef7b67e4254c151dfb4bef421b8761')
+ '83693cc2a3ef7b67e4254c151dfb4bef421b8761'
+ '21a4446673ad48b326aaa010fdab539faaefcc51')
prepare() {
cd $pkgname-2.0.3
@@ -31,6 +32,8 @@
patch -p1 -i ../k3b-ffmpeg3.patch
# Fix build with GCC6 (rpmfusion)
patch -p1 -i ../k3b-gcc6.patch
+# Remove qtwebkit usage (Fedora)
+ patch -p1 -i ../k3b-no-webkit.patch
}
build() {
Added: k3b-no-webkit.patch
===================================================================
--- k3b-no-webkit.patch (rev 0)
+++ k3b-no-webkit.patch 2017-02-08 07:54:11 UTC (rev 288230)
@@ -0,0 +1,52 @@
+diff -up k3b-2.0.2/src/CMakeLists.txt.no-webkit k3b-2.0.2/src/CMakeLists.txt
+--- k3b-2.0.2/src/CMakeLists.txt.no-webkit 2012-05-04 12:30:46.634241618 +0200
++++ k3b-2.0.2/src/CMakeLists.txt 2012-05-04 12:30:56.980516383 +0200
+@@ -287,7 +287,6 @@ target_link_libraries(k3b_bin
+ ${KDE4_KUTILS_LIBS}
+ ${KDE4_KDE3SUPPORT_LIBS}
+ ${KDE4_SOLID_LIBS}
+- ${QT_QTWEBKIT_LIBRARY}
+ ${X11_LIBRARIES}
+ )
+
+diff -up k3b-2.0.2/src/k3bdiskinfoview.cpp.no-webkit k3b-2.0.2/src/k3bdiskinfoview.cpp
+--- k3b-2.0.2/src/k3bdiskinfoview.cpp.no-webkit 2012-05-04 12:29:13.994781781 +0200
++++ k3b-2.0.2/src/k3bdiskinfoview.cpp 2012-05-04 13:10:07.748401670 +0200
+@@ -34,7 +34,6 @@
+ #include <qpalette.h>
+ #include <qpixmap.h>
+ #include <QtGui/QTextBrowser>
+-#include <QtWebKit/QWebView>
+
+ #include <klocale.h>
+ #include <kstandarddirs.h>
+@@ -61,7 +60,7 @@ K3b::DiskInfoView::DiskInfoView( QWidget
+ Device::STATE_ALL|Device::STATE_NO_MEDIA|Device::STATE_UNKNOWN,
+ parent )
+ {
+- m_infoView = new QWebView( this );
++ m_infoView = new QTextBrowser( this );
+ setMainWidget( m_infoView );
+ }
+
+diff -up k3b-2.0.2/src/k3bdiskinfoview.h.no-webkit k3b-2.0.2/src/k3bdiskinfoview.h
+--- k3b-2.0.2/src/k3bdiskinfoview.h.no-webkit 2012-05-04 12:50:25.753604831 +0200
++++ k3b-2.0.2/src/k3bdiskinfoview.h 2012-05-04 13:09:15.232985545 +0200
+@@ -19,7 +19,7 @@
+
+ #include "k3bmediacontentsview.h"
+
+-class QWebView;
++class QTextBrowser;
+
+ namespace K3b {
+ class DiskInfoView : public MediaContentsView
+@@ -38,7 +38,7 @@ private:
+ QString createIso9660InfoItems( const Iso9660SimplePrimaryDescriptor& iso );
+ QString createTrackItems( const Medium& medium );
+
+- QWebView* m_infoView;
++ QTextBrowser* m_infoView;
+ };
+ }
+
More information about the arch-commits
mailing list