[gwenview] gvpart fixes (#784683,kde#292394)

[Rex Dieter]

commit d402e1b0ac417bbdab3e22d63001f5ebf6c86c7f
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Mar 12 08:01:49 2012 -0500

    gvpart fixes (#784683,kde#292394)

 gwenview-4.8.1-gvpart_cursor.patch                 |   24 +++++++++++++++++
 gwenview-4.8.1-gvpart_documentviewcontainter.patch |   28 ++++++++++++++++++++
 gwenview.spec                                      |   14 +++++++++-
 3 files changed, 65 insertions(+), 1 deletions(-)
---
diff --git a/gwenview-4.8.1-gvpart_cursor.patch b/gwenview-4.8.1-gvpart_cursor.patch
new file mode 100644
index 0000000..4ebb12e
--- /dev/null
+++ b/gwenview-4.8.1-gvpart_cursor.patch
@@ -0,0 +1,24 @@
+commit 2945372b9c20a7041858a861aa11385551dd506b
+Author: Aurélien Gâteau <agateau at kde.org>
+Date:   Sun Mar 11 23:20:39 2012 +0100
+
+    Fix failure to load cursor in KPart
+    
+    CCBUG: 292394
+    FIXED-IN: 2.8.2
+
+diff --git a/lib/documentview/abstractimageview.cpp b/lib/documentview/abstractimageview.cpp
+index b859430..6cd7fd2 100644
+--- a/lib/documentview/abstractimageview.cpp
++++ b/lib/documentview/abstractimageview.cpp
+@@ -100,7 +100,9 @@ struct AbstractImageViewPrivate
+ 
+     void setupZoomCursor()
+     {
+-        QString path = KStandardDirs::locate("appdata", "cursors/zoom.png");
++        // We do not use "appdata" here because that does not work when this
++        // code is called from a KPart.
++        QString path = KStandardDirs::locate("data", "gwenview/cursors/zoom.png");
+         QPixmap cursorPixmap = QPixmap(path);
+         mZoomCursor = QCursor(cursorPixmap, 11, 11);
+     }
diff --git a/gwenview-4.8.1-gvpart_documentviewcontainter.patch b/gwenview-4.8.1-gvpart_documentviewcontainter.patch
new file mode 100644
index 0000000..566b18e
--- /dev/null
+++ b/gwenview-4.8.1-gvpart_documentviewcontainter.patch
@@ -0,0 +1,28 @@
+commit 83f424c9feb291e491920357d4ad6949e767e169
+Author: Aurélien Gâteau <agateau at kde.org>
+Date:   Sun Mar 11 23:16:43 2012 +0100
+
+    Correctly set DocumentViewContainer parent
+    
+    Fix GVPart usage in Ark
+    BUG: 292394
+    FIXED-IN: 2.8.2
+
+diff --git a/part/gvpart.cpp b/part/gvpart.cpp
+index d50879d..67de8c5 100644
+--- a/part/gvpart.cpp
++++ b/part/gvpart.cpp
+@@ -56,11 +56,11 @@ K_EXPORT_PLUGIN(GVPartFactory)
+ namespace Gwenview
+ {
+ 
+-GVPart::GVPart(QWidget* /*parentWidget*/, QObject* parent, const QVariantList& /*args*/)
++GVPart::GVPart(QWidget* parentWidget, QObject* parent, const QVariantList& /*args*/)
+ : KParts::ReadOnlyPart(parent)
+ {
+     KGlobal::locale()->insertCatalog("gwenview");
+-    DocumentViewContainer* container = new DocumentViewContainer;
++    DocumentViewContainer* container = new DocumentViewContainer(parentWidget);
+     setWidget(container);
+     mDocumentView = container->createView();
+ 
diff --git a/gwenview.spec b/gwenview.spec
index 34454c1..82ad250 100644
--- a/gwenview.spec
+++ b/gwenview.spec
@@ -1,7 +1,7 @@
 Name:    gwenview 
 Summary: An image viewer
 Version: 4.8.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # app: GPLv2+
 # lib:  IJG and (LGPLv2 or LGPLv3 or LGPLv3+ (KDE e.V.)) and LGPLv2+ and GPLv2+
@@ -15,6 +15,12 @@ URL:     https://projects.kde.org/projects/kde/kdegraphics/gwenview
 %endif 
 Source0: ftp://ftp.kde.org/pub/kde/%{stable}/%{version}/src/%{name}-%{version}.tar.xz
 
+## upstream patches
+# https://projects.kde.org/projects/kde/kdegraphics/gwenview/repository/revisions/2945372b9c20a7041858a861aa11385551dd506b
+Patch100: gwenview-4.8.1-gvpart_cursor.patch
+# https://projects.kde.org/projects/kde/kdegraphics/gwenview/repository/revisions/83f424c9feb291e491920357d4ad6949e767e169
+Patch101: gwenview-4.8.1-gvpart_documentviewcontainter.patch
+
 BuildRequires: desktop-file-utils
 # libkonq
 BuildRequires: kdebase4-devel >= %{version}
@@ -44,6 +50,9 @@ Requires: %{name} = %{version}-%{release}
 %prep
 %setup -q
 
+%patch100 -p1 -b .gvpart_cursor
+%patch101 -p1 -b .gvpart_documentviewcontainer
+
 
 %build
 mkdir -p %{_target_platform}
@@ -105,6 +114,9 @@ fi
 
 
 %changelog
+* Mon Mar 12 2012 Rex Dieter <rdieter at fedoraproject.org> 4.8.1-2
+- gvpart fixes (#784683,kde#292394)
+
 * Mon Mar 05 2012 Jaroslav Reznik <jreznik at redhat.com> - 4.8.1-1
 - 4.8.1