Hello community,
here is the log from the commit of package kdegraphics4
checked in at Wed Oct 22 18:06:41 CEST 2008.
--------
--- KDE/kdegraphics4/kdegraphics4.changes 2008-10-01 10:09:06.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdegraphics4/kdegraphics4.changes 2008-10-21 10:40:19.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Oct 21 10:37:33 CEST 2008 - stbinner@suse.de
+
+- branch diff update: gwenview and okular bug fix backports
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdegraphics4.spec ++++++
--- /var/tmp/diff_new_pack.M11146/_old 2008-10-22 18:06:24.000000000 +0200
+++ /var/tmp/diff_new_pack.M11146/_new 2008-10-22 18:06:24.000000000 +0200
@@ -34,7 +34,7 @@
Summary: kdegraphics base package
Url: http://www.kde.org
Version: 4.1.2
-Release: 2
+Release: 3
Source0: kdegraphics-%version.tar.bz2
Source1: _upstream
Patch0: 4_1_BRANCH.diff
@@ -527,6 +527,8 @@
/usr/bin/xf86gammacfg
%changelog
+* Tue Oct 21 2008 stbinner@suse.de
+- branch diff update: gwenview and okular bug fix backports
* Wed Oct 01 2008 dmueller@suse.de
- replace tarball, add libkdcraw upgrade patch to get the same
code state like before
++++++ 4_1_BRANCH.diff ++++++
--- /var/tmp/diff_new_pack.M11146/_old 2008-10-22 18:06:24.000000000 +0200
+++ /var/tmp/diff_new_pack.M11146/_new 2008-10-22 18:06:24.000000000 +0200
@@ -3,13 +3,481 @@
--- BRANCH_STATUS
+++ BRANCH_STATUS
@@ -0,0 +1,2 @@
-+current HEAD:
++current HEAD: 874289
+svn di between //tags/KDE/4.1.2/kdegraphics and //branches/KDE/4.1/kdegraphics
+--- gwenview/app/main.cpp
++++ gwenview/app/main.cpp
+@@ -36,7 +36,7 @@
+ "gwenview", /* appname */
+ 0, /* catalogName */
+ ki18n("Gwenview"), /* programName */
+- "2.1.2"); /* version */
++ "2.1.3"); /* version */
+ aboutData.setShortDescription(ki18n("An Image Viewer"));
+ aboutData.setLicense(KAboutData::License_GPL);
+ aboutData.setCopyrightStatement(ki18n("Copyright 2000-2008 Aurélien Gâteau"));
+--- gwenview/app/slideshow.desktop
++++ gwenview/app/slideshow.desktop
+@@ -28,6 +28,7 @@
+ Name[pl]=Uruchom pokaz slajdów
+ Name[pt]=Iniciar uma Apresentação
+ Name[pt_BR]=Iniciar uma apresentação
++Name[ru]=Запустить слайд-шоу
+ Name[sl]=Začni predstavitev
+ Name[sv]=Starta ett bildspel
+ Name[th]=เริ่มการนำเสนอ
+--- gwenview/lib/croptool.cpp
++++ gwenview/lib/croptool.cpp
+@@ -189,8 +189,6 @@
+
+
+ void CropTool::mousePressEvent(QMouseEvent* event) {
+- Q_ASSERT(d->mMovingHandle == CH_None);
+-
+ if (d->mRect.x() == UNINITIALIZED_X) {
+ // Nothing selected, user is creating the crop rect
+ QPoint pos = imageView()->mapToImage(event->pos());
+--- gwenview/lib/thumbnailview/thumbnailview.cpp
++++ gwenview/lib/thumbnailview/thumbnailview.cpp
+@@ -221,6 +221,7 @@
+ void ThumbnailView::rowsAboutToBeRemoved(const QModelIndex& parent, int start, int end) {
+ QListView::rowsAboutToBeRemoved(parent, start, end);
+
++ // Remove references to removed items
+ KFileItemList itemList;
+ for (int pos=start; pos<=end; ++pos) {
+ QModelIndex index = model()->index(pos, 0, parent);
+@@ -244,6 +245,18 @@
+ if (d->mThumbnailLoadJob) {
+ d->mThumbnailLoadJob->removeItems(itemList);
+ }
++
++ // Update current index if it is among the deleted rows
++ const int row = currentIndex().row();
++ if (start <= row && row <= end) {
++ QModelIndex index;
++ if (end < model()->rowCount() - 1) {
++ index = model()->index(end + 1, 0);
++ } else if (start > 0) {
++ index = model()->index(start - 1, 0);
++ }
++ setCurrentIndex(index);
++ }
+ }
+
+
+--- gwenview/lib/jpegcontent.cpp
++++ gwenview/lib/jpegcontent.cpp
+@@ -500,10 +500,12 @@
+
+ QImage JpegContent::thumbnail() const {
+ QImage image;
++#ifndef Q_OS_WIN32
+ if (!d->mExifData.empty()) {
+ Exiv2::DataBuf thumbnail = d->mExifData.copyThumbnail();
+ image.loadFromData(thumbnail.pData_, thumbnail.size_);
+ }
++#endif
+ return image;
+ }
+
+@@ -521,8 +523,9 @@
+ kError() << "Could not write thumbnail\n";
+ return;
+ }
+-
++#ifndef Q_OS_WIN32
+ d->mExifData.setJpegThumbnail((unsigned char*)array.data(), array.size());
++#endif
+ }
+
+
+--- gwenview/lib/CMakeLists.txt
++++ gwenview/lib/CMakeLists.txt
+@@ -101,6 +101,10 @@
+
+ kde4_add_library(gwenviewlib SHARED ${gwenviewlib_SRCS})
+ set_target_properties(gwenviewlib PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
++if( WIN32 )
++set_target_properties(gwenviewlib PROPERTIES COMPILE_FLAGS -DJPEG_STATIC )
++endif( WIN32 )
++
+ target_link_libraries(gwenviewlib
+ ${KDE4_KPARTS_LIBS}
+ ${KDE4_KFILE_LIBS}
+--- gwenview/lib/document/loadingdocumentimpl.cpp
++++ gwenview/lib/document/loadingdocumentimpl.cpp
+@@ -21,6 +21,9 @@
+ // Self
+ #include "loadingdocumentimpl.moc"
+
++// STL
++#include <memory>
++
+ // Qt
+ #include <QBuffer>
+ #include <QByteArray>
+@@ -78,7 +81,7 @@
+ QByteArray mFormat;
+ QSize mImageSize;
+ Exiv2::Image::AutoPtr mExiv2Image;
+- JpegContent* mJpegContent;
++ std::auto_ptr<JpegContent> mJpegContent;
+ QImage mImage;
+
+ void startLoading() {
+@@ -112,7 +115,7 @@
+ }
+
+ if (mFormat == "jpeg" && mExiv2Image.get()) {
+- mJpegContent = new JpegContent();
++ mJpegContent.reset(new JpegContent());
+ if (!mJpegContent->loadFromData(mData, mExiv2Image.get())) {
+ return false;
+ }
+@@ -151,7 +154,7 @@
+ return;
+ }
+
+- if (mJpegContent) {
++ if (mJpegContent.get()) {
+ Gwenview::Orientation orientation = mJpegContent->orientation();
+ QMatrix matrix = ImageUtils::transformMatrix(orientation);
+ mImage = mImage.transformed(matrix);
+@@ -165,7 +168,6 @@
+ , d(new LoadingDocumentImplPrivate) {
+ d->mImpl = this;
+ d->mMetaDataLoaded = false;
+- d->mJpegContent = 0;
+ d->mImageDataInvertedZoom = 0;
+
+ connect(&d->mMetaDataFutureWatcher, SIGNAL(finished()),
+@@ -305,10 +307,10 @@
+ imageRectUpdated(d->mImage.rect());
+ emit loaded();
+ DocumentLoadedImpl* impl;
+- if (d->mJpegContent) {
++ if (d->mJpegContent.get()) {
+ impl = new JpegDocumentLoadedImpl(
+ document(),
+- d->mJpegContent);
++ d->mJpegContent.release());
+ } else {
+ impl = new DocumentLoadedImpl(
+ document(),
+--- gwenview/part/gvpart.cpp
++++ gwenview/part/gvpart.cpp
+@@ -290,6 +290,9 @@
+ mStatusBarWidgetContainer->show();
+ }
+ mDocument = DocumentFactory::instance()->load(url);
++ if (arguments().reload()) {
++ mDocument->reload();
++ }
+ if (!mGwenviewHost && !UrlUtils::urlIsFastLocalFile(url)) {
+ // Keep raw data of remote files to avoid downloading them again in
+ // saveAs()
+--- kgamma/kcmkgamma/kgamma.desktop
++++ kgamma/kcmkgamma/kgamma.desktop
+@@ -19,7 +19,7 @@
+ Comment[hi]=मॉनीटर केलिब्रेशन औज़ार
+ Comment[hr]=Alat za kalibriranje monitora
+ Comment[hu]=Monitorbeállító program
+-Comment[is]=Tól til að stilla skjáinn
++Comment[is]=Áhald til að stilla skjáinn
+ Comment[it]=Calibrazione del monitor
+ Comment[ja]=モニタ測定ツール
+ Comment[kk]=Мониторды калибрлеу құралы
+--- okular/core/document_p.h
++++ okular/core/document_p.h
+@@ -71,6 +71,7 @@
+ m_tempFile( 0 ),
+ m_docSize( -1 ),
+ m_allocatedPixmapsTotalMemory( 0 ),
++ m_maxAllocatedTextPages( 0 ),
+ m_warnedOutOfMemory( false ),
+ m_rotation( Rotation0 ),
+ m_exportCached( false ),
+--- okular/core/textpage.cpp
++++ okular/core/textpage.cpp
+@@ -381,7 +381,6 @@
+ int j=0, len=0, queryLeft=query.length();
+ int offset = 0;
+ bool haveMatch=false;
+- bool dontIncrement=false;
+ bool offsetMoved = false;
+ TextList::ConstIterator it = start;
+ TextList::ConstIterator it_begin;
+@@ -397,22 +396,7 @@
+ }
+ offsetMoved = true;
+ }
+- if ( query.at(j).isSpace() )
+ {
+- // lets match newline as a space
+-#ifdef DEBUG_TEXTPAGE
+- kDebug(OkularDebug) << "newline or space";
+-#endif
+- j++;
+- queryLeft--;
+- // since we do not really need to increment this after this
+- // run of the loop finishes because we are not comparing it
+- // to any entity, rather we are deducing a situation in a document
+- dontIncrement=true;
+- }
+- else
+- {
+- dontIncrement=false;
+ len=str.length();
+ int min=qMin(queryLeft,len);
+ #ifdef DEBUG_TEXTPAGE
+--- okular/core/document.cpp
++++ okular/core/document.cpp
+@@ -227,7 +227,7 @@
+ QString entry = readStream.readLine();
+ if ( entry.isNull() ) break;
+ if ( entry.startsWith( "MemTotal:" ) )
+- return (cachedValue = (1024 * entry.section( ' ', -2, -2 ).toInt()));
++ return (cachedValue = (Q_UINT64_C(1024) * entry.section( ' ', -2, -2 ).toULongLong()));
+ }
+ #elif defined(Q_OS_WIN)
+ MEMORYSTATUSEX stat;
+@@ -266,15 +266,15 @@
+ entry.startsWith( "Buffers:" ) ||
+ entry.startsWith( "Cached:" ) ||
+ entry.startsWith( "SwapFree:" ) )
+- memoryFree += entry.section( ' ', -2, -2 ).toInt();
++ memoryFree += entry.section( ' ', -2, -2 ).toULongLong();
+ if ( entry.startsWith( "SwapTotal:" ) )
+- memoryFree -= entry.section( ' ', -2, -2 ).toInt();
++ memoryFree -= entry.section( ' ', -2, -2 ).toULongLong();
+ }
+ memFile.close();
+
+ lastUpdate = QTime::currentTime();
+
+- return ( cachedValue = (1024 * memoryFree) );
++ return ( cachedValue = (Q_UINT64_C(1024) * memoryFree) );
+ #elif defined(Q_OS_WIN)
+ MEMORYSTATUSEX stat;
+
+--- okular/shell/shell.cpp
++++ okular/shell/shell.cpp
+@@ -24,7 +24,6 @@
+ #include