Hello community, here is the log from the commit of package okular for openSUSE:Factory checked in at Wed Sep 7 17:56:43 CEST 2011.
-------- --- okular/okular.changes 2011-08-08 11:51:12.000000000 +0200 +++ /mounts/work_src_done/STABLE/okular/okular.changes 2011-09-07 14:51:04.000000000 +0200 @@ -1,0 +2,13 @@ +Mon Sep 5 04:34:20 UTC 2011 - [email protected] + +- add %fdupes for files duplicated(fix for RPMLINT warnings) +- clean up the specfile format + +------------------------------------------------------------------- +Thu Sep 1 23:30:36 CEST 2011 - [email protected] + +- update to 4.7.1 + * Bugfixes over KDE 4.7.0 + * see http://kde.org/announcements/changelogs/changelog4_7_0to4_7_1.php for details + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- okular-4.7.0.tar.bz2 New: ---- okular-4.7.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ okular.spec ++++++ --- /var/tmp/diff_new_pack.lLnlTZ/_old 2011-09-07 17:56:37.000000000 +0200 +++ /var/tmp/diff_new_pack.lLnlTZ/_new 2011-09-07 17:56:37.000000000 +0200 @@ -18,26 +18,37 @@ Name: okular -BuildRequires: OpenEXR-devel fribidi-devel libkde4-devel net-snmp-devel -BuildRequires: chmlib-devel libgphoto2-devel libqimageblitz-devel oxygen-icon-theme-large +Version: 4.7.1 +Release: 1 +License: GPLv2+ +Summary: Document Viewer +Url: http://www.kde.org +Group: Productivity/Office/Other +Source0: okular-%{version}.tar.bz2 +BuildRequires: fdupes +BuildRequires: OpenEXR-devel +BuildRequires: chmlib-devel +BuildRequires: fribidi-devel BuildRequires: libdjvulibre-devel +BuildRequires: libgphoto2-devel +BuildRequires: libkde4-devel +BuildRequires: libqimageblitz-devel BuildRequires: libspectre-devel +BuildRequires: net-snmp-devel +BuildRequires: oxygen-icon-theme-large +BuildRequires: libepub-devel +BuildRequires: libpoppler-qt4-devel +BuildRequires: libqca2-devel +BuildRequires: libsoprano-devel +BuildRequires: soprano-backend-redland %if 0%{?suse_version} > 1130 BuildRequires: sane-backends-devel %else BuildRequires: sane-backends %endif -BuildRequires: libepub-devel libpoppler-qt4-devel libqca2-devel libsoprano-devel soprano-backend-redland -License: GPLv2+ -Group: Productivity/Office/Other -Summary: Document Viewer -%requires_ge libpoppler-qt4-3 -Url: http://www.kde.org -Version: 4.7.0 -Release: 3 -Source0: okular-%version.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-build Obsoletes: kdegraphics4 < %{version} +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%requires_ge libpoppler-qt4-3 %kde4_runtime_requires %description @@ -45,7 +56,7 @@ many other formats. %prep -%setup -q -n okular-%version +%setup -q -n okular-%{version} %build %cmake_kde4 -d build @@ -53,16 +64,17 @@ %install cd build - %makeinstall - mkdir -p $RPM_BUILD_ROOT/usr/share/icons/hicolor/{16x16,22x22,32x32,48x48,64x64,128x128}/apps - cp /usr/share/icons/oxygen/128x128/apps/graphics-viewer-document.png $RPM_BUILD_ROOT/usr/share/icons/hicolor/128x128/apps/ - cp /usr/share/icons/oxygen/16x16/apps/graphics-viewer-document.png $RPM_BUILD_ROOT/usr/share/icons/hicolor/16x16/apps/ - cp /usr/share/icons/oxygen/22x22/apps/graphics-viewer-document.png $RPM_BUILD_ROOT/usr/share/icons/hicolor/22x22/apps/ - cp /usr/share/icons/oxygen/32x32/apps/graphics-viewer-document.png $RPM_BUILD_ROOT/usr/share/icons/hicolor/32x32/apps/ - cp /usr/share/icons/oxygen/48x48/apps/graphics-viewer-document.png $RPM_BUILD_ROOT/usr/share/icons/hicolor/48x48/apps/ - cp /usr/share/icons/oxygen/64x64/apps/graphics-viewer-document.png $RPM_BUILD_ROOT/usr/share/icons/hicolor/64x64/apps/ + %make_install + mkdir -p %{buildroot}%{_datadir}/icons/hicolor/{16x16,22x22,32x32,48x48,64x64,128x128}/apps + cp /usr/share/icons/oxygen/128x128/apps/graphics-viewer-document.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/ + cp /usr/share/icons/oxygen/16x16/apps/graphics-viewer-document.png %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/ + cp /usr/share/icons/oxygen/22x22/apps/graphics-viewer-document.png %{buildroot}%{_datadir}/icons/hicolor/22x22/apps/ + cp /usr/share/icons/oxygen/32x32/apps/graphics-viewer-document.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/ + cp /usr/share/icons/oxygen/48x48/apps/graphics-viewer-document.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/ + cp /usr/share/icons/oxygen/64x64/apps/graphics-viewer-document.png %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/ cd .. %suse_update_desktop_file -r okular Office Viewer + %fdupes -s %{buildroot}%{_datadir} %kde_post_install %post -p /sbin/ldconfig @@ -70,7 +82,7 @@ %postun -p /sbin/ldconfig %clean - rm -rf $RPM_BUILD_ROOT + rm -rf %{buildroot} %files %defattr(-,root,root) @@ -89,13 +101,13 @@ %package devel License: GPLv2+ -Group: Development/Libraries/KDE Summary: Document Viewer - Development Files -%kde4_runtime_requires +Group: Development/Libraries/KDE +Requires: libkde4-devel +Requires: okular = %{version} Provides: kde4-okular-devel = 4.3.0 Obsoletes: kde4-okular-devel < 4.3.0 -Requires: okular = %{version} -Requires: libkde4-devel +%kde4_runtime_requires %description devel Document viewing program; supports document in various formats ++++++ okular-4.7.0.tar.bz2 -> okular-4.7.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.7.0/VERSION new/okular-4.7.1/VERSION --- old/okular-4.7.0/VERSION 2011-07-22 14:48:16.000000000 +0200 +++ new/okular-4.7.1/VERSION 2011-09-01 22:48:33.000000000 +0200 @@ -1 +1 @@ -okular v0.13 +okular v0.13.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.7.0/core/fileprinter.cpp new/okular-4.7.1/core/fileprinter.cpp --- old/okular-4.7.0/core/fileprinter.cpp 2011-06-22 16:15:08.000000000 +0200 +++ new/okular-4.7.1/core/fileprinter.cpp 2011-08-22 15:25:43.000000000 +0200 @@ -96,12 +96,12 @@ ret = -5; } } - } else if ( inputFileInfo.suffix() == "ps" && outputFileInfo.suffix() == "pdf" && ps2pdfAvailable() ) { + } else if ( inputFileInfo.suffix() == "ps" && printer.outputFormat() == QPrinter::PdfFormat && ps2pdfAvailable() ) { exe = "ps2pdf"; argList << fileList[0] << printer.outputFileName(); kDebug(OkularDebug) << "Executing" << exe << "with arguments" << argList; ret = KProcess::execute( exe, argList ); - } else if ( inputFileInfo.suffix() == "pdf" && outputFileInfo.suffix() == "ps" && pdf2psAvailable() ) { + } else if ( inputFileInfo.suffix() == "pdf" && printer.outputFormat() == QPrinter::PostScriptFormat && pdf2psAvailable() ) { exe = "pdf2ps"; argList << fileList[0] << printer.outputFileName(); kDebug(OkularDebug) << "Executing" << exe << "with arguments" << argList; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.7.0/core/version.h new/okular-4.7.1/core/version.h --- old/okular-4.7.0/core/version.h 2011-07-22 14:48:16.000000000 +0200 +++ new/okular-4.7.1/core/version.h 2011-09-01 22:48:33.000000000 +0200 @@ -10,10 +10,10 @@ #ifndef _OKULAR_VERSION_H_ #define _OKULAR_VERSION_H_ -#define OKULAR_VERSION_STRING "0.13" +#define OKULAR_VERSION_STRING "0.13.1" #define OKULAR_VERSION_MAJOR 0 #define OKULAR_VERSION_MINOR 13 -#define OKULAR_VERSION_RELEASE 0 +#define OKULAR_VERSION_RELEASE 1 #define OKULAR_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c)) #define OKULAR_VERSION \ Files old/okular-4.7.0/doc/index.cache.bz2 and new/okular-4.7.1/doc/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.7.0/generators/chm/okularApplication_chm.desktop new/okular-4.7.1/generators/chm/okularApplication_chm.desktop --- old/okular-4.7.0/generators/chm/okularApplication_chm.desktop 2011-06-22 16:15:08.000000000 +0200 +++ new/okular-4.7.1/generators/chm/okularApplication_chm.desktop 2011-08-22 15:25:43.000000000 +0200 @@ -54,6 +54,7 @@ Name[sv]=Okular Name[th]=โอกูลาร์ Name[tr]=Okular +Name[ug]=Okular Name[uk]=Okular Name[x-test]=xxOkularxx Name[zh_CN]=Okular diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.7.0/generators/chm/okularChm.desktop new/okular-4.7.1/generators/chm/okularChm.desktop --- old/okular-4.7.0/generators/chm/okularChm.desktop 2011-06-22 16:15:08.000000000 +0200 +++ new/okular-4.7.1/generators/chm/okularChm.desktop 2011-08-22 15:25:43.000000000 +0200 @@ -53,6 +53,7 @@ Name[sv]=Okular Name[th]=โอกูลาร์ Name[tr]=Okular +Name[ug]=Okular Name[uk]=Okular Name[x-test]=xxOkularxx Name[zh_CN]=Okular diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.7.0/generators/comicbook/generator_comicbook.cpp new/okular-4.7.1/generators/comicbook/generator_comicbook.cpp --- old/okular-4.7.0/generators/comicbook/generator_comicbook.cpp 2011-07-22 14:48:16.000000000 +0200 +++ new/okular-4.7.1/generators/comicbook/generator_comicbook.cpp 2011-09-01 22:48:33.000000000 +0200 @@ -25,7 +25,7 @@ "okular_comicbook", "okular_comicbook", ki18n( "ComicBook Backend" ), - "0.3", + "0.3.1", ki18n( "A renderer for various comic book formats" ), KAboutData::License_GPL, ki18n( "© 2007-2008 Tobias Koenig" ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.7.0/generators/comicbook/okularApplication_comicbook.desktop new/okular-4.7.1/generators/comicbook/okularApplication_comicbook.desktop --- old/okular-4.7.0/generators/comicbook/okularApplication_comicbook.desktop 2011-06-22 16:15:08.000000000 +0200 +++ new/okular-4.7.1/generators/comicbook/okularApplication_comicbook.desktop 2011-08-22 15:25:43.000000000 +0200 @@ -54,6 +54,7 @@ Name[sv]=Okular Name[th]=โอกูลาร์ Name[tr]=Okular +Name[ug]=Okular Name[uk]=Okular Name[x-test]=xxOkularxx Name[zh_CN]=Okular diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.7.0/generators/comicbook/okularComicbook.desktop new/okular-4.7.1/generators/comicbook/okularComicbook.desktop --- old/okular-4.7.0/generators/comicbook/okularComicbook.desktop 2011-06-22 16:15:08.000000000 +0200 +++ new/okular-4.7.1/generators/comicbook/okularComicbook.desktop 2011-08-22 15:25:43.000000000 +0200 @@ -53,6 +53,7 @@ Name[sv]=Okular Name[th]=โอกูลาร์ Name[tr]=Okular +Name[ug]=Okular Name[uk]=Okular Name[x-test]=xxOkularxx Name[zh_CN]=Okular diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.7.0/generators/comicbook/qnatsort.cpp new/okular-4.7.1/generators/comicbook/qnatsort.cpp --- old/okular-4.7.0/generators/comicbook/qnatsort.cpp 2011-06-22 16:15:08.000000000 +0200 +++ new/okular-4.7.1/generators/comicbook/qnatsort.cpp 2011-08-22 15:25:43.000000000 +0200 @@ -32,7 +32,13 @@ * remember it in BIAS. */ for ( ;; left++, right++ ) { - if ( !leftStr[ left ].isDigit() && !rightStr[ right ].isDigit() ) + if ( left >= leftStr.length() && right < rightStr.length() ) + return -1; + else if ( right >= rightStr.length() && left < leftStr.length() ) + return +1; + else if ( right >= rightStr.length() && left >= leftStr.length() ) + return bias; + else if ( !leftStr[ left ].isDigit() && !rightStr[ right ].isDigit() ) return bias; else if ( !leftStr[ left ].isDigit() ) return -1; @@ -58,7 +64,13 @@ * different value wins. */ for ( ;; left++, right++ ) { - if ( !leftStr[ left ].isDigit() && !rightStr[ right ].isDigit() ) + if ( left >= leftStr.length() && right < rightStr.length() ) + return -1; + else if ( right >= rightStr.length() && left < leftStr.length() ) + return +1; + else if ( right >= rightStr.length() && left >= leftStr.length() ) + return 0; + else if ( !leftStr[ left ].isDigit() && !rightStr[ right ].isDigit() ) return 0; else if ( !leftStr[ left ].isDigit() ) return -1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.7.0/generators/djvu/okularApplication_djvu.desktop new/okular-4.7.1/generators/djvu/okularApplication_djvu.desktop --- old/okular-4.7.0/generators/djvu/okularApplication_djvu.desktop 2011-06-22 16:15:08.000000000 +0200 +++ new/okular-4.7.1/generators/djvu/okularApplication_djvu.desktop 2011-08-22 15:25:43.000000000 +0200 @@ -54,6 +54,7 @@ Name[sv]=Okular Name[th]=โอกูลาร์ Name[tr]=Okular +Name[ug]=Okular Name[uk]=Okular Name[x-test]=xxOkularxx Name[zh_CN]=Okular diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.7.0/generators/djvu/okularDjvu.desktop new/okular-4.7.1/generators/djvu/okularDjvu.desktop --- old/okular-4.7.0/generators/djvu/okularDjvu.desktop 2011-06-22 16:15:08.000000000 +0200 +++ new/okular-4.7.1/generators/djvu/okularDjvu.desktop 2011-08-22 15:25:43.000000000 +0200 @@ -53,6 +53,7 @@ Name[sv]=Okular Name[th]=โอกูลาร์ Name[tr]=Okular +Name[ug]=Okular Name[uk]=Okular Name[x-test]=xxOkularxx Name[zh_CN]=Okular diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.7.0/generators/dvi/okularApplication_dvi.desktop new/okular-4.7.1/generators/dvi/okularApplication_dvi.desktop --- old/okular-4.7.0/generators/dvi/okularApplication_dvi.desktop 2011-06-22 16:15:08.000000000 +0200 +++ new/okular-4.7.1/generators/dvi/okularApplication_dvi.desktop 2011-08-22 15:25:43.000000000 +0200 @@ -54,6 +54,7 @@ Name[sv]=Okular Name[th]=โอกูลาร์ Name[tr]=Okular +Name[ug]=Okular Name[uk]=Okular Name[x-test]=xxOkularxx Name[zh_CN]=Okular diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.7.0/generators/dvi/okularDvi.desktop new/okular-4.7.1/generators/dvi/okularDvi.desktop --- old/okular-4.7.0/generators/dvi/okularDvi.desktop 2011-06-22 16:15:08.000000000 +0200 +++ new/okular-4.7.1/generators/dvi/okularDvi.desktop 2011-08-22 15:25:43.000000000 +0200 @@ -53,6 +53,7 @@ Name[sv]=Okular Name[th]=โอกูลาร์ Name[tr]=Okular +Name[ug]=Okular Name[uk]=Okular Name[x-test]=xxOkularxx Name[zh_CN]=Okular diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.7.0/generators/epub/okularApplication_epub.desktop new/okular-4.7.1/generators/epub/okularApplication_epub.desktop --- old/okular-4.7.0/generators/epub/okularApplication_epub.desktop 2011-06-22 16:15:08.000000000 +0200 +++ new/okular-4.7.1/generators/epub/okularApplication_epub.desktop 2011-08-22 15:25:43.000000000 +0200 @@ -54,6 +54,7 @@ Name[sv]=Okular Name[th]=โอกูลาร์ Name[tr]=Okular +Name[ug]=Okular Name[uk]=Okular Name[x-test]=xxOkularxx Name[zh_CN]=Okular diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.7.0/generators/epub/okularEPub.desktop new/okular-4.7.1/generators/epub/okularEPub.desktop --- old/okular-4.7.0/generators/epub/okularEPub.desktop 2011-06-22 16:15:08.000000000 +0200 +++ new/okular-4.7.1/generators/epub/okularEPub.desktop 2011-08-22 15:25:43.000000000 +0200 @@ -53,6 +53,7 @@ Name[sv]=Okular Name[th]=โอกูลาร์ Name[tr]=Okular +Name[ug]=Okular Name[uk]=Okular Name[x-test]=xxOkularxx Name[zh_CN]=Okular diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.7.0/generators/fax/okularApplication_fax.desktop new/okular-4.7.1/generators/fax/okularApplication_fax.desktop --- old/okular-4.7.0/generators/fax/okularApplication_fax.desktop 2011-06-22 16:15:08.000000000 +0200 +++ new/okular-4.7.1/generators/fax/okularApplication_fax.desktop 2011-08-22 15:25:43.000000000 +0200 @@ -54,6 +54,7 @@ Name[sv]=Okular Name[th]=โอกูลาร์ Name[tr]=Okular +Name[ug]=Okular Name[uk]=Okular Name[x-test]=xxOkularxx Name[zh_CN]=Okular diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.7.0/generators/fax/okularFax.desktop new/okular-4.7.1/generators/fax/okularFax.desktop --- old/okular-4.7.0/generators/fax/okularFax.desktop 2011-06-22 16:15:08.000000000 +0200 +++ new/okular-4.7.1/generators/fax/okularFax.desktop 2011-08-22 15:25:43.000000000 +0200 @@ -53,6 +53,7 @@ Name[sv]=Okular Name[th]=โอกูลาร์ Name[tr]=Okular +Name[ug]=Okular Name[uk]=Okular Name[x-test]=xxOkularxx Name[zh_CN]=Okular diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.7.0/generators/fictionbook/okularApplication_fb.desktop new/okular-4.7.1/generators/fictionbook/okularApplication_fb.desktop --- old/okular-4.7.0/generators/fictionbook/okularApplication_fb.desktop 2011-06-22 16:15:08.000000000 +0200 +++ new/okular-4.7.1/generators/fictionbook/okularApplication_fb.desktop 2011-08-22 15:25:43.000000000 +0200 @@ -54,6 +54,7 @@ Name[sv]=Okular Name[th]=โอกูลาร์ Name[tr]=Okular +Name[ug]=Okular Name[uk]=Okular Name[x-test]=xxOkularxx Name[zh_CN]=Okular diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.7.0/generators/fictionbook/okularFb.desktop new/okular-4.7.1/generators/fictionbook/okularFb.desktop --- old/okular-4.7.0/generators/fictionbook/okularFb.desktop 2011-06-22 16:15:08.000000000 +0200 +++ new/okular-4.7.1/generators/fictionbook/okularFb.desktop 2011-08-22 15:25:43.000000000 +0200 @@ -53,6 +53,7 @@ Name[sv]=Okular Name[th]=โอกูลาร์ Name[tr]=Okular +Name[ug]=Okular Name[uk]=Okular Name[x-test]=xxOkularxx Name[zh_CN]=Okular diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.7.0/generators/kimgio/okularApplication_kimgio.desktop new/okular-4.7.1/generators/kimgio/okularApplication_kimgio.desktop --- old/okular-4.7.0/generators/kimgio/okularApplication_kimgio.desktop 2011-06-22 16:15:08.000000000 +0200 +++ new/okular-4.7.1/generators/kimgio/okularApplication_kimgio.desktop 2011-08-22 15:25:43.000000000 +0200 @@ -54,6 +54,7 @@ Name[sv]=Okular Name[th]=โอกูลาร์ Name[tr]=Okular +Name[ug]=Okular Name[uk]=Okular Name[x-test]=xxOkularxx Name[zh_CN]=Okular diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.7.0/generators/kimgio/okularKimgio.desktop new/okular-4.7.1/generators/kimgio/okularKimgio.desktop --- old/okular-4.7.0/generators/kimgio/okularKimgio.desktop 2011-06-22 16:15:08.000000000 +0200 +++ new/okular-4.7.1/generators/kimgio/okularKimgio.desktop 2011-08-22 15:25:43.000000000 +0200 @@ -53,6 +53,7 @@ Name[sv]=Okular Name[th]=โอกูลาร์ Name[tr]=Okular +Name[ug]=Okular Name[uk]=Okular Name[x-test]=xxOkularxx Name[zh_CN]=Okular diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.7.0/generators/ooo/okularApplication_ooo.desktop new/okular-4.7.1/generators/ooo/okularApplication_ooo.desktop --- old/okular-4.7.0/generators/ooo/okularApplication_ooo.desktop 2011-06-22 16:15:08.000000000 +0200 +++ new/okular-4.7.1/generators/ooo/okularApplication_ooo.desktop 2011-08-22 15:25:43.000000000 +0200 @@ -54,6 +54,7 @@ Name[sv]=Okular Name[th]=โอกูลาร์ Name[tr]=Okular +Name[ug]=Okular Name[uk]=Okular Name[x-test]=xxOkularxx Name[zh_CN]=Okular diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.7.0/generators/ooo/okularOoo.desktop new/okular-4.7.1/generators/ooo/okularOoo.desktop --- old/okular-4.7.0/generators/ooo/okularOoo.desktop 2011-06-22 16:15:08.000000000 +0200 +++ new/okular-4.7.1/generators/ooo/okularOoo.desktop 2011-08-22 15:25:43.000000000 +0200 @@ -53,6 +53,7 @@ Name[sv]=Okular Name[th]=โอกูลาร์ Name[tr]=Okular +Name[ug]=Okular Name[uk]=Okular Name[x-test]=xxOkularxx Name[zh_CN]=Okular diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.7.0/generators/plucker/okularApplication_plucker.desktop new/okular-4.7.1/generators/plucker/okularApplication_plucker.desktop --- old/okular-4.7.0/generators/plucker/okularApplication_plucker.desktop 2011-06-22 16:15:08.000000000 +0200 +++ new/okular-4.7.1/generators/plucker/okularApplication_plucker.desktop 2011-08-22 15:25:43.000000000 +0200 @@ -54,6 +54,7 @@ Name[sv]=Okular Name[th]=โอกูลาร์ Name[tr]=Okular +Name[ug]=Okular Name[uk]=Okular Name[x-test]=xxOkularxx Name[zh_CN]=Okular diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.7.0/generators/plucker/okularPlucker.desktop new/okular-4.7.1/generators/plucker/okularPlucker.desktop --- old/okular-4.7.0/generators/plucker/okularPlucker.desktop 2011-06-22 16:15:08.000000000 +0200 +++ new/okular-4.7.1/generators/plucker/okularPlucker.desktop 2011-08-22 15:25:43.000000000 +0200 @@ -53,6 +53,7 @@ Name[sv]=Okular Name[th]=โอกูลาร์ Name[tr]=Okular +Name[ug]=Okular Name[uk]=Okular Name[x-test]=xxOkularxx Name[zh_CN]=Okular diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.7.0/generators/poppler/generator_pdf.cpp new/okular-4.7.1/generators/poppler/generator_pdf.cpp --- old/okular-4.7.0/generators/poppler/generator_pdf.cpp 2011-06-22 16:15:08.000000000 +0200 +++ new/okular-4.7.1/generators/poppler/generator_pdf.cpp 2011-09-01 22:48:33.000000000 +0200 @@ -21,6 +21,7 @@ #include <qstack.h> #include <qtextstream.h> #include <QtGui/QPrinter> +#include <QtGui/QPainter> #include <kaboutdata.h> #include <klocale.h> @@ -305,7 +306,11 @@ { setFeature( TextExtraction ); setFeature( FontInfo ); +#ifdef Q_OS_WIN32 + setFeature( PrintNative ); +#else setFeature( PrintPostscript ); +#endif if ( Okular::FilePrinter::ps2pdfAvailable() ) setFeature( PrintToFile ); setFeature( ReadRawData ); @@ -909,6 +914,33 @@ #define DUMMY_QPRINTER_COPY bool PDFGenerator::print( QPrinter& printer ) { +#ifdef Q_WS_WIN + QPainter painter; + painter.begin(&printer); + + QList<int> pageList = Okular::FilePrinter::pageList( printer, pdfdoc->numPages(), + document()->currentPage() + 1, + document()->bookmarkedPageList() ); + for ( int i = 0; i < pageList.count(); ++i ) + { + if ( i != 0 ) + printer.newPage(); + + const int page = pageList.at( i ) - 1; + userMutex()->lock(); + Poppler::Page *pp = pdfdoc->page( page ); + if (pp) + { + QImage img = pp->renderToImage( printer.physicalDpiX(), printer.physicalDpiY() ); + painter.drawImage( painter.window(), img, QRectF(0, 0, img.width(), img.height()) ); + delete pp; + } + userMutex()->unlock(); + } + painter.end(); + return true; + +#else #ifdef DUMMY_QPRINTER_COPY // Get the real page size to pass to the ps generator QPrinter dummy( QPrinter::PrinterResolution ); @@ -922,7 +954,6 @@ int width = printer.width(); int height = printer.height(); #endif - // Create the tempfile to send to FilePrinter, which will manage the deletion KTemporaryFile tf; tf.setSuffix( ".ps" ); @@ -994,6 +1025,7 @@ tf.close(); return false; +#endif } QVariant PDFGenerator::metaData( const QString & key, const QVariant & option ) const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.7.0/generators/poppler/okularApplication_pdf.desktop new/okular-4.7.1/generators/poppler/okularApplication_pdf.desktop --- old/okular-4.7.0/generators/poppler/okularApplication_pdf.desktop 2011-06-22 16:15:08.000000000 +0200 +++ new/okular-4.7.1/generators/poppler/okularApplication_pdf.desktop 2011-08-22 15:25:43.000000000 +0200 @@ -54,6 +54,7 @@ Name[sv]=Okular Name[th]=โอกูลาร์ Name[tr]=Okular +Name[ug]=Okular Name[uk]=Okular Name[x-test]=xxOkularxx Name[zh_CN]=Okular diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.7.0/generators/poppler/okularPoppler.desktop new/okular-4.7.1/generators/poppler/okularPoppler.desktop --- old/okular-4.7.0/generators/poppler/okularPoppler.desktop 2011-06-22 16:15:08.000000000 +0200 +++ new/okular-4.7.1/generators/poppler/okularPoppler.desktop 2011-08-22 15:25:43.000000000 +0200 @@ -53,6 +53,7 @@ Name[sv]=Okular Name[th]=โอกูลาร์ Name[tr]=Okular +Name[ug]=Okular Name[uk]=Okular Name[x-test]=xxOkularxx Name[zh_CN]=Okular diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.7.0/generators/spectre/libokularGenerator_ghostview.desktop new/okular-4.7.1/generators/spectre/libokularGenerator_ghostview.desktop --- old/okular-4.7.0/generators/spectre/libokularGenerator_ghostview.desktop 2011-06-22 16:15:08.000000000 +0200 +++ new/okular-4.7.1/generators/spectre/libokularGenerator_ghostview.desktop 2011-08-22 15:25:43.000000000 +0200 @@ -54,6 +54,7 @@ Name[sv]=Ghostscript Name[th]=เอกสาร Ghostscript Name[tr]=Ghostscript +Name[ug]=Ghostscript Name[uk]=Ghostscript Name[vi]=Ghostscript Name[x-test]=xxGhostscriptxx diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.7.0/generators/spectre/okularApplication_ghostview.desktop new/okular-4.7.1/generators/spectre/okularApplication_ghostview.desktop --- old/okular-4.7.0/generators/spectre/okularApplication_ghostview.desktop 2011-06-22 16:15:08.000000000 +0200 +++ new/okular-4.7.1/generators/spectre/okularApplication_ghostview.desktop 2011-08-22 15:25:43.000000000 +0200 @@ -54,6 +54,7 @@ Name[sv]=Okular Name[th]=โอกูลาร์ Name[tr]=Okular +Name[ug]=Okular Name[uk]=Okular Name[x-test]=xxOkularxx Name[zh_CN]=Okular diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.7.0/generators/spectre/okularGhostview.desktop new/okular-4.7.1/generators/spectre/okularGhostview.desktop --- old/okular-4.7.0/generators/spectre/okularGhostview.desktop 2011-06-22 16:15:08.000000000 +0200 +++ new/okular-4.7.1/generators/spectre/okularGhostview.desktop 2011-08-22 15:25:43.000000000 +0200 @@ -53,6 +53,7 @@ Name[sv]=Okular Name[th]=โอกูลาร์ Name[tr]=Okular +Name[ug]=Okular Name[uk]=Okular Name[x-test]=xxOkularxx Name[zh_CN]=Okular diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.7.0/generators/tiff/okularApplication_tiff.desktop new/okular-4.7.1/generators/tiff/okularApplication_tiff.desktop --- old/okular-4.7.0/generators/tiff/okularApplication_tiff.desktop 2011-06-22 16:15:08.000000000 +0200 +++ new/okular-4.7.1/generators/tiff/okularApplication_tiff.desktop 2011-08-22 15:25:43.000000000 +0200 @@ -54,6 +54,7 @@ Name[sv]=Okular Name[th]=โอกูลาร์ Name[tr]=Okular +Name[ug]=Okular Name[uk]=Okular Name[x-test]=xxOkularxx Name[zh_CN]=Okular diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.7.0/generators/tiff/okularTiff.desktop new/okular-4.7.1/generators/tiff/okularTiff.desktop --- old/okular-4.7.0/generators/tiff/okularTiff.desktop 2011-06-22 16:15:08.000000000 +0200 +++ new/okular-4.7.1/generators/tiff/okularTiff.desktop 2011-08-22 15:25:43.000000000 +0200 @@ -53,6 +53,7 @@ Name[sv]=Okular Name[th]=โอกูลาร์ Name[tr]=Okular +Name[ug]=Okular Name[uk]=Okular Name[x-test]=xxOkularxx Name[zh_CN]=Okular diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.7.0/generators/xps/okularApplication_xps.desktop new/okular-4.7.1/generators/xps/okularApplication_xps.desktop --- old/okular-4.7.0/generators/xps/okularApplication_xps.desktop 2011-06-22 16:15:08.000000000 +0200 +++ new/okular-4.7.1/generators/xps/okularApplication_xps.desktop 2011-08-22 15:25:43.000000000 +0200 @@ -54,6 +54,7 @@ Name[sv]=Okular Name[th]=โอกูลาร์ Name[tr]=Okular +Name[ug]=Okular Name[uk]=Okular Name[x-test]=xxOkularxx Name[zh_CN]=Okular diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.7.0/generators/xps/okularXps.desktop new/okular-4.7.1/generators/xps/okularXps.desktop --- old/okular-4.7.0/generators/xps/okularXps.desktop 2011-06-22 16:15:08.000000000 +0200 +++ new/okular-4.7.1/generators/xps/okularXps.desktop 2011-08-22 15:25:43.000000000 +0200 @@ -53,6 +53,7 @@ Name[sv]=Okular Name[th]=โอกูลาร์ Name[tr]=Okular +Name[ug]=Okular Name[uk]=Okular Name[x-test]=xxOkularxx Name[zh_CN]=Okular diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.7.0/okular_part.desktop new/okular-4.7.1/okular_part.desktop --- old/okular-4.7.0/okular_part.desktop 2011-06-22 16:15:08.000000000 +0200 +++ new/okular-4.7.1/okular_part.desktop 2011-08-22 15:25:43.000000000 +0200 @@ -53,6 +53,7 @@ Name[sv]=Okular Name[th]=โอกูลาร์ Name[tr]=Okular +Name[ug]=Okular Name[uk]=Okular Name[x-test]=xxOkularxx Name[zh_CN]=Okular diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.7.0/part.cpp new/okular-4.7.1/part.cpp --- old/okular-4.7.0/part.cpp 2011-07-07 16:06:33.000000000 +0200 +++ new/okular-4.7.1/part.cpp 2011-09-01 22:48:33.000000000 +0200 @@ -2015,7 +2015,11 @@ { if (m_document->pages() == 0) return; +#ifdef Q_WS_WIN + QPrinter printer(QPrinter::HighResolution); +#else QPrinter printer; +#endif QPrintDialog *printDialog = 0; QWidget *printConfigWidget = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.7.0/shell/okular.desktop new/okular-4.7.1/shell/okular.desktop --- old/okular-4.7.0/shell/okular.desktop 2011-06-22 16:15:08.000000000 +0200 +++ new/okular-4.7.1/shell/okular.desktop 2011-08-22 15:25:43.000000000 +0200 @@ -53,6 +53,7 @@ Name[sv]=Okular Name[th]=โอกูลาร์ Name[tr]=Okular +Name[ug]=Okular Name[uk]=Okular Name[x-test]=xxOkularxx Name[zh_CN]=Okular ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
