[okular/f16] Okular crashes when annotation author name in the sidebar listing is clicked (#773365, kde#291278)

[Rex Dieter]

commit 029c5747c93a5d871c85d84433877569810e3a6b
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Jan 16 21:07:05 2012 -0600

    Okular crashes when annotation author name in the sidebar listing is clicked (#773365, kde#291278)

 okular-4.7.4-kdebug291278.patch |   23 +++++++++++++++++++++++
 okular.spec                     |   12 +++++++++++-
 2 files changed, 34 insertions(+), 1 deletions(-)
---
diff --git a/okular-4.7.4-kdebug291278.patch b/okular-4.7.4-kdebug291278.patch
new file mode 100644
index 0000000..54e48f8
--- /dev/null
+++ b/okular-4.7.4-kdebug291278.patch
@@ -0,0 +1,23 @@
+commit 2c9122192d2995371d1a72700be5e95c41018941
+Author: Albert Astals Cid <tsdgeos at terra.es>
+Date:   Mon Jan 16 21:04:15 2012 +0100
+
+    Qt decided to start passing invalid indexes to mapFromSource, do not crash on them
+    
+    BUGS: 291278
+    FIXED-IN: 4.8.0
+
+diff --git a/ui/annotationproxymodels.cpp b/ui/annotationproxymodels.cpp
+index 1f097ab..78a66fe 100644
+--- a/ui/annotationproxymodels.cpp
++++ b/ui/annotationproxymodels.cpp
+@@ -405,6 +405,9 @@ QModelIndex AuthorGroupProxyModel::parent( const QModelIndex &index ) const
+ 
+ QModelIndex AuthorGroupProxyModel::mapFromSource( const QModelIndex &sourceIndex ) const
+ {
++    if ( !sourceIndex.isValid() )
++        return QModelIndex();
++
+     const AuthorGroupItem *item = d->mRoot->findIndex( sourceIndex );
+     if ( !item )
+         return QModelIndex();
diff --git a/okular.spec b/okular.spec
index c9bf963..bdf3fc6 100644
--- a/okular.spec
+++ b/okular.spec
@@ -1,7 +1,7 @@
 Name:    okular 
 Summary: A document viewer
 Version: 4.7.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 URL:     https://projects.kde.org/projects/kde/kdegraphics/okular
@@ -18,6 +18,12 @@ Patch51: kdegraphics-4.5.80-OkularConfig-dont-hardcode-paths.patch
 # https://git.reviewboard.kde.org/r/101513/
 Patch54: kdegraphics-4.6.90-okular-landscape.patch
 
+## upstream patches
+# Okular crashes when annotation author name in the sidebar listing is clicked 
+# https://bugzilla.redhat.com/show_bug.cgi?id=773365
+# http://bugs.kde.org/show_bug.cgi?id=291278
+Patch100: okular-4.7.4-kdebug291278.patch
+
 BuildRequires: chmlib-devel
 BuildRequires: desktop-file-utils
 BuildRequires: ebook-tools-devel
@@ -68,6 +74,7 @@ Summary: A kioslave for displaying WinHelp files
 %patch50 -p2 -b .okular_dt
 %patch51 -p2 -b .OkularConfig
 %patch54 -p2 -b .okular-landscape
+%patch100 -p1 -b .kdebug291278
 
 
 %build
@@ -137,6 +144,9 @@ fi
 
 
 %changelog
+* Mon Jan 16 2012 Rex Dieter <rdieter at fedoraproject.org> 4.7.4-2
+- Okular crashes when annotation author name in the sidebar listing is clicked (#773365, kde#291278)
+
 * Fri Dec 02 2011 Rex Dieter <rdieter at fedoraproject.org> 4.7.4-1
 - 4.7.4