diff --git a/.gitignore b/.gitignore index 63f6491..06f3ef7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /gwenview-4.7.4.tar.bz2 /gwenview-4.8.1.tar.xz +/gwenview-4.8.2.tar.xz diff --git a/gwenview-4.8.1-gvpart_cursor.patch b/gwenview-4.8.1-gvpart_cursor.patch deleted file mode 100644 index 4ebb12e..0000000 --- a/gwenview-4.8.1-gvpart_cursor.patch +++ /dev/null @@ -1,24 +0,0 @@ -commit 2945372b9c20a7041858a861aa11385551dd506b -Author: Aurélien Gâteau -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 deleted file mode 100644 index 566b18e..0000000 --- a/gwenview-4.8.1-gvpart_documentviewcontainter.patch +++ /dev/null @@ -1,28 +0,0 @@ -commit 83f424c9feb291e491920357d4ad6949e767e169 -Author: Aurélien Gâteau -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 82ad250..4d57b02 100644 --- a/gwenview.spec +++ b/gwenview.spec @@ -1,7 +1,7 @@ Name: gwenview Summary: An image viewer -Version: 4.8.1 -Release: 2%{?dist} +Version: 4.8.2 +Release: 1%{?dist} # app: GPLv2+ # lib: IJG and (LGPLv2 or LGPLv3 or LGPLv3+ (KDE e.V.)) and LGPLv2+ and GPLv2+ @@ -16,10 +16,6 @@ URL: https://projects.kde.org/projects/kde/kdegraphics/gwenview 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 @@ -30,7 +26,7 @@ BuildRequires: libjpeg-devel BuildRequires: pkgconfig(exiv2) Requires: %{name}-libs%{?_isa} = %{version}-%{release} -Requires: kdebase-runtime%{?_kde4_version: >= %{_kde4_version}} +Requires: kde-runtime%{?_kde4_version: >= %{_kde4_version}} # when split occurred Conflicts: kdegraphics < 7:4.6.95-10 @@ -50,9 +46,6 @@ Requires: %{name} = %{version}-%{release} %prep %setup -q -%patch100 -p1 -b .gvpart_cursor -%patch101 -p1 -b .gvpart_documentviewcontainer - %build mkdir -p %{_target_platform} @@ -114,6 +107,9 @@ fi %changelog +* Fri Mar 30 2012 Rex Dieter - 4.8.2-1 +- 4.8.2 + * Mon Mar 12 2012 Rex Dieter 4.8.1-2 - gvpart fixes (#784683,kde#292394) diff --git a/sources b/sources index 6c681f5..2298cd4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2b9124dd481aa26132de54349be2ef57 gwenview-4.8.1.tar.xz +c6e6b596a4e501edb744ded1b0dd2969 gwenview-4.8.2.tar.xz