Hello community, here is the log from the commit of package gwenview5 for openSUSE:Factory checked in at 2016-01-10 13:07:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gwenview5 (Old) and /work/SRC/openSUSE:Factory/.gwenview5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gwenview5" Changes: -------- --- /work/SRC/openSUSE:Factory/gwenview5/gwenview5.changes 2015-11-15 12:29:39.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gwenview5.new/gwenview5.changes 2016-01-10 13:09:19.000000000 +0100 @@ -1,0 +2,9 @@ +Sun Dec 13 13:02:06 UTC 2015 - [email protected] + +- Update to KDE Applications 15.12.0 + * KDE Applications 15.12.0 + * https://www.kde.org/announcements/announce-applications-15.12.0.php + * boo#958887 + + +------------------------------------------------------------------- Old: ---- gwenview-15.08.3.tar.xz New: ---- gwenview-15.12.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gwenview5.spec ++++++ --- /var/tmp/diff_new_pack.HadSJJ/_old 2016-01-10 13:09:20.000000000 +0100 +++ /var/tmp/diff_new_pack.HadSJJ/_new 2016-01-10 13:09:20.000000000 +0100 @@ -18,7 +18,7 @@ %define rname gwenview Name: gwenview5 -Version: 15.08.3 +Version: 15.12.0 Release: 0 Summary: Simple Image Viewer for KDE License: GPL-2.0+ @@ -44,9 +44,8 @@ BuildRequires: pkgconfig(Qt5Test) >= 5.2.0 BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0 BuildRequires: pkgconfig(Qt5X11Extras) >= 5.2.0 -# Not released yet -# BuildRequires: libkipi-kf5-devel -# BuildRequires: libkdcraw-kf5-devel +BuildRequires: libkipi-devel +BuildRequires: libkdcraw-devel Conflicts: gwenview BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -64,9 +63,6 @@ %install %kf5_makeinstall -C build - - mv %{buildroot}%{_kf5_sharedir}/appdata/gwenview.appdata.xml %{buildroot}%{_kf5_sharedir}/appdata/org.kde.gwenview.appdata.xml - %suse_update_desktop_file -r org.kde.gwenview Graphics RasterGraphics Viewer KDE %post -p /sbin/ldconfig ++++++ gwenview-15.08.3.tar.xz -> gwenview-15.12.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-15.08.3/CMakeLists.txt new/gwenview-15.12.0/CMakeLists.txt --- old/gwenview-15.08.3/CMakeLists.txt 2015-11-05 14:40:24.000000000 +0100 +++ new/gwenview-15.12.0/CMakeLists.txt 2015-12-08 16:52:20.000000000 +0100 @@ -2,8 +2,8 @@ # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "15") -set (KDE_APPLICATIONS_VERSION_MINOR "08") -set (KDE_APPLICATIONS_VERSION_MICRO "3") +set (KDE_APPLICATIONS_VERSION_MINOR "12") +set (KDE_APPLICATIONS_VERSION_MICRO "0") set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-15.08.3/app/CMakeLists.txt new/gwenview-15.12.0/app/CMakeLists.txt --- old/gwenview-15.08.3/app/CMakeLists.txt 2015-11-05 14:40:24.000000000 +0100 +++ new/gwenview-15.12.0/app/CMakeLists.txt 2015-12-08 16:52:20.000000000 +0100 @@ -94,6 +94,7 @@ install(PROGRAMS org.kde.gwenview.desktop DESTINATION ${KDE_INSTALL_APPDIR}) install(FILES gwenview.appdata.xml - DESTINATION ${KDE_INSTALL_DATAROOTDIR}/appdata) + DESTINATION ${KDE_INSTALL_DATAROOTDIR}/appdata + RENAME org.kde.gwenview.appdata.xml) install(FILES slideshow.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/ServiceMenus) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-15.08.3/app/kipiinterface.cpp new/gwenview-15.12.0/app/kipiinterface.cpp --- old/gwenview-15.08.3/app/kipiinterface.cpp 2015-11-05 14:40:24.000000000 +0100 +++ new/gwenview-15.12.0/app/kipiinterface.cpp 2015-12-08 16:52:20.000000000 +0100 @@ -457,4 +457,22 @@ emit currentAlbumChanged(true); } +#ifdef GWENVIEW_KIPI_WITH_CREATE_METHODS +KIPI::FileReadWriteLock* KIPIInterface::createReadWriteLock(const QUrl& url) const +{ + return NULL; +} + +KIPI::MetadataProcessor* KIPIInterface::createMetadataProcessor() const +{ + return NULL; +} + +KIPI::RawProcessor* KIPIInterface::createRawProcessor() const +{ + return NULL; +} +#endif + + } //namespace diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-15.08.3/app/kipiinterface.h new/gwenview-15.12.0/app/kipiinterface.h --- old/gwenview-15.08.3/app/kipiinterface.h 2015-11-05 14:40:24.000000000 +0100 +++ new/gwenview-15.12.0/app/kipiinterface.h 2015-12-08 16:52:20.000000000 +0100 @@ -26,9 +26,17 @@ #include <kipi/interface.h> #include <kipi/imagecollectionshared.h> #include <kipi/plugin.h> +#include <libkipi_version.h> class QAction; +#ifndef KIPI_VERSION_MAJOR +#error KIPI_VERSION_MAJOR should be provided. +#endif +#if KIPI_VERSION_MAJOR >= 5 +#define GWENVIEW_KIPI_WITH_CREATE_METHODS +#endif + namespace Gwenview { @@ -60,6 +68,12 @@ bool isLoadingFinished() const; +#ifdef GWENVIEW_KIPI_WITH_CREATE_METHODS + virtual KIPI::FileReadWriteLock* createReadWriteLock(const QUrl& url) const; + virtual KIPI::MetadataProcessor* createMetadataProcessor() const; + virtual KIPI::RawProcessor* createRawProcessor() const; +#endif + Q_SIGNALS: void loadingFinished(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-15.08.3/app/org.kde.gwenview.desktop new/gwenview-15.12.0/app/org.kde.gwenview.desktop --- old/gwenview-15.08.3/app/org.kde.gwenview.desktop 2015-11-05 14:40:24.000000000 +0100 +++ new/gwenview-15.12.0/app/org.kde.gwenview.desktop 2015-12-08 16:52:20.000000000 +0100 @@ -183,7 +183,7 @@ Icon=gwenview Type=Application Categories=Qt;KDE;Graphics;Viewer;Photography; -MimeType=inode/directory;image/gif;image/jpeg;image/png;image/bmp;image/x-eps;image/x-ico;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-xbitmap;image/x-xpixmap;image/tiff;image/x-psd;image/x-webp; +MimeType=inode/directory;image/gif;image/jpeg;image/png;image/bmp;image/x-eps;image/x-ico;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-xbitmap;image/x-xpixmap;image/tiff;image/x-psd;image/x-webp;image/webp; X-DocPath=gwenview/index.html # InitialPreference should be greater than Okular so that Gwenview is the # primary application associated with images, but less than Konqueror or Dolphin Files old/gwenview-15.08.3/doc/browse_mode.png and new/gwenview-15.12.0/doc/browse_mode.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-15.08.3/doc/index.docbook new/gwenview-15.12.0/doc/index.docbook --- old/gwenview-15.08.3/doc/index.docbook 2015-11-05 14:40:24.000000000 +0100 +++ new/gwenview-15.12.0/doc/index.docbook 2015-12-08 16:52:20.000000000 +0100 @@ -2,7 +2,6 @@ <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ <!ENTITY kappname "<application>Gwenview</application>"> - <!ENTITY package "kdegraphics"> <!ENTITY % addindex "IGNORE"> <!ENTITY % English "INCLUDE"><!-- change language only here --> ]> @@ -38,10 +37,10 @@ </copyright> <legalnotice>&FDLNotice;</legalnotice> -<date>2014-08-09</date> -<releaseinfo>4.14 (&kde; 4.14)</releaseinfo> +<date>2015-08-04</date> +<releaseinfo>Applications 15.08</releaseinfo> <abstract> -<para>&kappname; is an image viewer for &kde;.</para> +<para>&kappname; is an image and video viewer.</para> </abstract> <keywordset> <keyword>KDE</keyword> @@ -61,7 +60,7 @@ <title>What is &kappname;</title> <para> -&kappname; is a fast and easy to use image and video viewer for KDE. +&kappname; is a fast and easy to use image and video viewer. </para> <para> @@ -452,7 +451,7 @@ </sect1> </chapter> - +<!--FIXME no importer in kf5 <chapter id="importer"> <title>&kappname; Importer</title> @@ -515,7 +514,7 @@ </sect1> </chapter> - +--> <chapter id="tips"> <title>Tips</title> <sect1 id='mouse'><title>Using the mouse</title> @@ -621,7 +620,7 @@ <listitem><para><keycombo action="simul">&Ctrl;<keycap>Y</keycap></keycombo>: When multiple images are displayed in View Mode, this synchronizes their views. </para></listitem> - +<!--FIXME not in kf5 <listitem><para><keycombo action="simul">	</keycombo>: When multiple images are displayed in View Mode, this switched to the image to the right of the currently selected image.</para></listitem> @@ -629,7 +628,7 @@ <listitem><para><keycombo action="simul">&Shift;	</keycombo>: When multiple images are displayed in View Mode, this switched to the image to the left of the currently selected image.</para></listitem> - +--> <listitem><para><keycombo action="simul">&Ctrl;<keycap>S</keycap></keycombo>: Save any changes made to the image.</para></listitem> @@ -660,8 +659,7 @@ action="simul">&Ctrl;<keycap>T</keycap></keycombo>: Edit tags.</para></listitem> -<listitem><para><keycombo -action="simul">&Ctrl;<keycap>F2</keycap></keycombo>: +<listitem><para><keycap>F2</keycap>: Rename an image inline.</para></listitem> <listitem><para><keycap>Del</keycap>: Files old/gwenview-15.08.3/doc/modified-bar.png and new/gwenview-15.12.0/doc/modified-bar.png differ Files old/gwenview-15.08.3/doc/start-page.png and new/gwenview-15.12.0/doc/start-page.png differ Files old/gwenview-15.08.3/doc/view_mode.png and new/gwenview-15.12.0/doc/view_mode.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-15.08.3/lib/cms/cmsprofile.cpp new/gwenview-15.12.0/lib/cms/cmsprofile.cpp --- old/gwenview-15.08.3/lib/cms/cmsprofile.cpp 2015-11-05 14:40:24.000000000 +0100 +++ new/gwenview-15.12.0/lib/cms/cmsprofile.cpp 2015-12-08 16:52:20.000000000 +0100 @@ -212,32 +212,33 @@ // Get the profile from you config file if the user has set it. // if the user allows override through the atom, do this: #ifdef HAVE_X11 + if (QX11Info::isPlatformX11()) { + // get the current screen... + int screen = -1; - // get the current screen... - int screen = -1; + Atom type; + int format; + unsigned long nitems; + unsigned long bytes_after; + quint8 *str; - Atom type; - int format; - unsigned long nitems; - unsigned long bytes_after; - quint8 *str; + static Atom icc_atom = XInternAtom(QX11Info::display(), "_ICC_PROFILE", True); - static Atom icc_atom = XInternAtom(QX11Info::display(), "_ICC_PROFILE", True); - - if (XGetWindowProperty(QX11Info::display(), - QX11Info::appRootWindow(screen), - icc_atom, - 0, - INT_MAX, - False, - XA_CARDINAL, - &type, - &format, - &nitems, - &bytes_after, - (unsigned char **) &str) == Success - ) { - hProfile = cmsOpenProfileFromMem((void*)str, nitems); + if (XGetWindowProperty(QX11Info::display(), + QX11Info::appRootWindow(screen), + icc_atom, + 0, + INT_MAX, + False, + XA_CARDINAL, + &type, + &format, + &nitems, + &bytes_after, + (unsigned char **) &str) == Success + ) { + hProfile = cmsOpenProfileFromMem((void*)str, nitems); + } } #endif if (!hProfile) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-15.08.3/part/gvpart.desktop new/gwenview-15.12.0/part/gvpart.desktop --- old/gwenview-15.08.3/part/gvpart.desktop 2015-11-05 14:40:24.000000000 +0100 +++ new/gwenview-15.12.0/part/gvpart.desktop 2015-12-08 16:52:20.000000000 +0100 @@ -65,7 +65,7 @@ Name[zh_CN]=Gwenview 图像查看器 Name[zh_TW]=Gwenview 影像檢視程式 # TODO: what is image/x-krl? Please register this mimetype at freedesktop.org if you need it -MimeType=image/gif;image/jpeg;image/jp2;image/png;image/bmp;image/x-eps;image/x-ico;image/x-portable-bitmap;image/x-portable-pixmap;image/x-xbitmap;image/x-xpixmap;image/x-webp; +MimeType=image/gif;image/jpeg;image/jp2;image/png;image/bmp;image/x-eps;image/x-ico;image/x-portable-bitmap;image/x-portable-pixmap;image/x-xbitmap;image/x-xpixmap;image/x-webp;image/webp; X-KDE-ServiceTypes=KParts/ReadOnlyPart X-KDE-Library=gvpart InitialPreference=12
