diff options
Diffstat (limited to 'app-cdr/k3b/files')
-rw-r--r-- | app-cdr/k3b/files/k3b-2.0.3-fixuifiles.patch | 41 | ||||
-rw-r--r-- | app-cdr/k3b/files/k3b-2.0.3-no-webkit.patch | 62 |
2 files changed, 103 insertions, 0 deletions
diff --git a/app-cdr/k3b/files/k3b-2.0.3-fixuifiles.patch b/app-cdr/k3b/files/k3b-2.0.3-fixuifiles.patch new file mode 100644 index 000000000000..d9784372e3c9 --- /dev/null +++ b/app-cdr/k3b/files/k3b-2.0.3-fixuifiles.patch @@ -0,0 +1,41 @@ +From a0a527c450a49d031ceb0e7a832523b4717ba96c Mon Sep 17 00:00:00 2001 +From: Pino Toscano <pino@debian.org> +Date: Sun, 15 Feb 2015 20:29:13 +0100 +Subject: fixuifiles + +--- + src/projects/base_k3baudiocdtextwidget.ui | 3 --- + src/projects/base_k3baudiotrackwidget.ui | 3 --- + 2 files changed, 6 deletions(-) + +diff --git a/src/projects/base_k3baudiocdtextwidget.ui b/src/projects/base_k3baudiocdtextwidget.ui +index 611f4c7..5798d57 100644 +--- a/src/projects/base_k3baudiocdtextwidget.ui ++++ b/src/projects/base_k3baudiocdtextwidget.ui +@@ -4,9 +4,6 @@ + <exportmacro></exportmacro> + <class>base_K3bAudioCdTextWidget</class> + <widget class="QWidget" name="K3bAudioCDTextWidget" > +- <property name="windowTitle" > +- <string>K3bAudioCDTextWidget</string> +- </property> + <layout class="QVBoxLayout" > + <item> + <widget class="QGroupBox" name="m_groupCdText" > +diff --git a/src/projects/base_k3baudiotrackwidget.ui b/src/projects/base_k3baudiotrackwidget.ui +index 6024213..1c96281 100644 +--- a/src/projects/base_k3baudiotrackwidget.ui ++++ b/src/projects/base_k3baudiotrackwidget.ui +@@ -4,9 +4,6 @@ + <exportmacro></exportmacro> + <class>base_K3bAudioTrackWidget</class> + <widget class="QWidget" name="K3bAudioTrackWidget" > +- <property name="windowTitle" > +- <string>K3bAudioTrackWidget</string> +- </property> + <layout class="QHBoxLayout" > + <property name="margin" > + <number>0</number> +-- +cgit v0.11.2 + diff --git a/app-cdr/k3b/files/k3b-2.0.3-no-webkit.patch b/app-cdr/k3b/files/k3b-2.0.3-no-webkit.patch new file mode 100644 index 000000000000..8fae16813165 --- /dev/null +++ b/app-cdr/k3b/files/k3b-2.0.3-no-webkit.patch @@ -0,0 +1,62 @@ +commit 54f92d12cccac60c378d114869762d1a3ad75435 +Author: Radek Novacek <rnovacek at redhat.com> +Date: Fri May 4 13:04:48 2012 +0200 + + Don't use webkit on RHEL + + k3b-2.0.2-no-webkit.patch | 53 +++++++++++++++++++++++++++++++++++++++++++++ + k3b.spec | 11 +++++++- + 2 files changed, 62 insertions(+), 2 deletions(-) +--- +diff -up a/src/CMakeLists.txt b/src/CMakeLists.txt +--- a/src/CMakeLists.txt 2012-05-04 12:30:46.634241618 +0200 ++++ b/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 a/src/k3bdiskinfoview.cpp b/src/k3bdiskinfoview.cpp +--- a/src/k3bdiskinfoview.cpp 2012-05-04 12:29:13.994781781 +0200 ++++ b/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 a/src/k3bdiskinfoview.h b/src/k3bdiskinfoview.h +--- a/src/k3bdiskinfoview.h 2012-05-04 12:50:25.753604831 +0200 ++++ b/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; + }; + } + |