Hello community,
here is the log from the commit of package kdegraphics4 for openSUSE:Factory
checked in at Wed Mar 9 17:41:14 CET 2011.
--------
--- KDE/kdegraphics4/kdegraphics4.changes 2011-02-15 21:34:32.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdegraphics4/kdegraphics4.changes 2011-03-09 12:29:20.000000000 +0100
@@ -1,0 +2,15 @@
+Wed Mar 9 11:28:20 UTC 2011 - tittiatcoke@gmail.com
+
+- Added patch to correctly identify the version of libjpeg62.
+ Only valid for Factory as that due to a recent update the version
+ is now in the file /usr/include/jconfig.h
+
+-------------------------------------------------------------------
+Tue Mar 8 14:08:59 CET 2011 - dmueller@suse.de
+
+- update to 4.6.1
+ * Bugfixes over KDE 4.6.0
+ * see http://kde.org/announcements/changelogs/changelog4_6_0to4_6_1.php for details
+- remove upstreamed patches
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
fix_scan_dialog_bnc670968.diff
kdegraphics-4.6.0.tar.bz2
New:
----
correct_libjpeg_version.patch
kdegraphics-4.6.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdegraphics4.spec ++++++
--- /var/tmp/diff_new_pack.AxQZMN/_old 2011-03-09 17:40:52.000000000 +0100
+++ /var/tmp/diff_new_pack.AxQZMN/_new 2011-03-09 17:40:52.000000000 +0100
@@ -38,12 +38,14 @@
Group: Productivity/Graphics/Other
Summary: Base package for kdegraphics apps
Url: http://www.kde.org
-Version: 4.6.0
-Release: 8
+Version: 4.6.1
+Release: 1
Source0: kdegraphics-%version.tar.bz2
Patch0: 4_6_BRANCH.diff
-Patch1: fix_scan_dialog_bnc670968.diff
Patch2: gwenview_mimetypes_bnc671581.diff
+%if %suse_version > 1140
+Patch3: correct_libjpeg_version.patch
+%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%kde4_runtime_requires
Suggests: libksane0
@@ -67,8 +69,10 @@
%prep
%setup -q -n kdegraphics-%version
%patch0
-%patch1
%patch2
+%if %suse_version > 1140
+%patch3 -p0
+%endif
%build
%cmake_kde4 -d build
++++++ correct_libjpeg_version.patch ++++++
--- gwenview/lib/CMakeLists.txt 2011-01-18 22:25:18.000000000 +0100
+++ gwenview/lib/CMakeLists.txt 2011-03-09 12:26:08.372005832 +0100
@@ -2,7 +2,7 @@
# Extract version of libjpeg so that we can use the appropriate dir
# See bug #227313
-file(READ "${JPEG_INCLUDE_DIR}/jpeglib.h" jpeglib_h_content)
+file(READ "${JPEG_INCLUDE_DIR}/jconfig.h" jpeglib_h_content)
string(REGEX REPLACE ".*#define +JPEG_LIB_VERSION +([0-9]+).*" "\\1" jpeglib_version "${jpeglib_h_content}")
message(STATUS "libjpeg version: ${jpeglib_version}")
++++++ kdegraphics-4.6.0.tar.bz2 -> kdegraphics-4.6.1.tar.bz2 ++++++
Files old/kdegraphics-4.6.0/doc/gwenview/index.cache.bz2 and new/kdegraphics-4.6.1/doc/gwenview/index.cache.bz2 differ
Files old/kdegraphics-4.6.0/doc/kcontrol/kamera/index.cache.bz2 and new/kdegraphics-4.6.1/doc/kcontrol/kamera/index.cache.bz2 differ
Files old/kdegraphics-4.6.0/doc/kcontrol/kgamma/index.cache.bz2 and new/kdegraphics-4.6.1/doc/kcontrol/kgamma/index.cache.bz2 differ
Files old/kdegraphics-4.6.0/doc/kolourpaint/index.cache.bz2 and new/kdegraphics-4.6.1/doc/kolourpaint/index.cache.bz2 differ
Files old/kdegraphics-4.6.0/doc/kruler/index.cache.bz2 and new/kdegraphics-4.6.1/doc/kruler/index.cache.bz2 differ
Files old/kdegraphics-4.6.0/doc/ksnapshot/index.cache.bz2 and new/kdegraphics-4.6.1/doc/ksnapshot/index.cache.bz2 differ
Files old/kdegraphics-4.6.0/doc/okular/index.cache.bz2 and new/kdegraphics-4.6.1/doc/okular/index.cache.bz2 differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.6.0/gwenview/app/gvcore.cpp new/kdegraphics-4.6.1/gwenview/app/gvcore.cpp
--- old/kdegraphics-4.6.0/gwenview/app/gvcore.cpp 2011-01-18 22:25:15.000000000 +0100
+++ new/kdegraphics-4.6.1/gwenview/app/gvcore.cpp 2011-02-25 22:47:07.000000000 +0100
@@ -217,7 +217,14 @@
// Start save
Document::Ptr doc = DocumentFactory::instance()->load(url);
KJob* job = doc->save(saveAsUrl, format.data());
- connect(job, SIGNAL(result(KJob*)), SLOT(slotSaveResult(KJob*)));
+ if (!job) {
+ const QString name = saveAsUrl.fileName().isEmpty() ? saveAsUrl.pathOrUrl() : saveAsUrl.fileName();
+ const QString msg = i18nc("@info", "<b>Saving <filename>%1</filename> failed:</b><br>%2",
+ name, doc->errorString());
+ KMessageBox::sorry(QApplication::activeWindow(), msg);
+ } else {
+ connect(job, SIGNAL(result(KJob*)), SLOT(slotSaveResult(KJob*)));
+ }
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.6.0/gwenview/app/kipiinterface.cpp new/kdegraphics-4.6.1/gwenview/app/kipiinterface.cpp
--- old/kdegraphics-4.6.0/gwenview/app/kipiinterface.cpp 2011-01-18 22:25:15.000000000 +0100
+++ new/kdegraphics-4.6.1/gwenview/app/kipiinterface.cpp 2011-02-25 22:47:07.000000000 +0100
@@ -197,6 +197,13 @@
}
+static bool actionLessThan(QAction* a1, QAction* a2) {
+ QString a1Text = a1->text().replace("&", "");
+ QString a2Text = a2->text().replace("&", "");
+ return QString::compare(a1Text, a2Text, Qt::CaseInsensitive) < 0;
+}
+
+
void KIPIInterface::loadPlugins() {
// Already done
if (d->mPluginLoader) {
@@ -247,9 +254,15 @@
kWarning() << "No plugin menu found!";
return;
}
- Q_FOREACH(const MenuInfo& info, d->mMenuInfoMap) {
+
+ MenuInfoMap::Iterator
+ it = d->mMenuInfoMap.begin(),
+ end = d->mMenuInfoMap.end();
+ for (; it != end; ++it) {
+ MenuInfo& info = it.value();
if (!info.mActions.isEmpty()) {
QMenu* menu = pluginMenu->addMenu(info.mName);
+ qSort(info.mActions.begin(), info.mActions.end(), actionLessThan);
Q_FOREACH(QAction* action, info.mActions) {
menu->addAction(action);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.6.0/gwenview/app/savebar.cpp new/kdegraphics-4.6.1/gwenview/app/savebar.cpp
--- old/kdegraphics-4.6.0/gwenview/app/savebar.cpp 2011-01-18 22:25:15.000000000 +0100
+++ new/kdegraphics-4.6.1/gwenview/app/savebar.cpp 2011-02-25 22:47:07.000000000 +0100
@@ -153,8 +153,8 @@
void updateTooManyChangesFrame(const QList<KUrl>& list) {
qreal maxPercentageOfMemoryUsage = GwenviewConfig::percentageOfMemoryUsageWarning();
- int maxMemoryUsage = MemoryUtils::getTotalMemory() * maxPercentageOfMemoryUsage;
- int memoryUsage = 0;
+ qulonglong maxMemoryUsage = MemoryUtils::getTotalMemory() * maxPercentageOfMemoryUsage;
+ qulonglong memoryUsage = 0;
Q_FOREACH(const KUrl& url, list) {
Document::Ptr doc = DocumentFactory::instance()->load(url);
memoryUsage += doc->memoryUsage();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.6.0/gwenview/lib/crop/cropimageoperation.cpp new/kdegraphics-4.6.1/gwenview/lib/crop/cropimageoperation.cpp
--- old/kdegraphics-4.6.0/gwenview/lib/crop/cropimageoperation.cpp 2011-01-18 22:25:17.000000000 +0100
+++ new/kdegraphics-4.6.1/gwenview/lib/crop/cropimageoperation.cpp 2011-02-25 22:47:07.000000000 +0100
@@ -23,7 +23,6 @@
// Qt
#include <QImage>
-#include <QPainter>
// KDE
#include
@@ -46,12 +45,8 @@
if (!checkDocumentEditor()) {
return;
}
- QImage src = document()->image();
- QImage dst(mRect.size(), src.format());
- QPainter painter(&dst);
- painter.setCompositionMode(QPainter::CompositionMode_Source);
- painter.drawImage(QPoint(0, 0), src, mRect);
- painter.end();
+ const QImage src = document()->image();
+ const QImage dst = src.copy(mRect);
document()->editor()->setImage(dst);
setError(NoError);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.6.0/gwenview/lib/document/document.cpp new/kdegraphics-4.6.1/gwenview/lib/document/document.cpp
--- old/kdegraphics-4.6.0/gwenview/lib/document/document.cpp 2011-01-18 22:25:18.000000000 +0100
+++ new/kdegraphics-4.6.1/gwenview/lib/document/document.cpp 2011-02-25 22:47:07.000000000 +0100
@@ -28,6 +28,7 @@
// KDE
#include
#include
+#include
#include
// Local
@@ -224,12 +225,14 @@
DocumentJob* Document::save(const KUrl& url, const QByteArray& format) {
waitUntilLoaded();
DocumentJob* job = d->mImpl->save(url, format);
- job->setProperty("oldUrl", d->mUrl);
- job->setProperty("newUrl", url);
if (!job) {
kWarning() << "Implementation does not support saving!";
+ //NOTE uses a QString here as the strings are already frozen, yet the user should get some feedback
+ setErrorString(QString("Gwenview cannot save this kind of documents."));
return false;
}
+ job->setProperty("oldUrl", d->mUrl);
+ job->setProperty("newUrl", url);
connect(job, SIGNAL(result(KJob*)), SLOT(slotSaveResult(KJob*)));
enqueueJob(job);
return job;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.6.0/kruler/kruler.notifyrc new/kdegraphics-4.6.1/kruler/kruler.notifyrc
--- old/kdegraphics-4.6.0/kruler/kruler.notifyrc 2011-01-18 22:25:33.000000000 +0100
+++ new/kdegraphics-4.6.1/kruler/kruler.notifyrc 2011-02-25 22:47:07.000000000 +0100
@@ -11,6 +11,7 @@
Comment[es]=Regla para la pantalla
Comment[et]=Ekraani joonlaud
Comment[eu]=Pantailaren erregela
+Comment[fi]=Näyttöviivain
Comment[fr]=Règle d'écran
Comment[ga]=Rialóir Scáileáin
Comment[hr]=Ravnalo na zaslonu
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.6.0/ksaneplugin/sanedialog.cpp new/kdegraphics-4.6.1/ksaneplugin/sanedialog.cpp
--- old/kdegraphics-4.6.0/ksaneplugin/sanedialog.cpp 2011-01-18 22:25:08.000000000 +0100
+++ new/kdegraphics-4.6.1/ksaneplugin/sanedialog.cpp 2011-02-25 22:47:07.000000000 +0100
@@ -29,6 +29,7 @@
#include <KDebug>
#include <KPluginLoader>
#include <KMessageBox>
+#include <KSharedConfig>
K_PLUGIN_FACTORY(SaneDialogFactory, registerPlugin<SaneDialog>();)
K_EXPORT_PLUGIN(SaneDialogFactory("ksaneplugin"))
@@ -71,12 +72,35 @@
openDev = QString();
return false;
}
+
+ // restore scan dialog size and all options for the selected device if available
+ KSharedConfigPtr configPtr = KSharedConfig::openConfig("scannersettings");
+ restoreDialogSize(KConfigGroup(configPtr, "ScanDialog"));
+ QString groupName = openDev;
+ if (configPtr->hasGroup(groupName)) {
+ KConfigGroup group(configPtr, groupName);
+ QStringList keys = group.keyList();
+ for (int i = 0; i < keys.count(); i++)
+ ksanew->setOptVal(keys[i], group.readEntry(keys[i]));
+ }
+
return true;
}
-
SaneDialog::~SaneDialog()
{
+ if (ksanew && !openDev.isEmpty()) {
+ // save scan dialog size and all options for the selected device if available
+ KSharedConfigPtr configPtr = KSharedConfig::openConfig("scannersettings");
+ KConfigGroup group(configPtr, "ScanDialog");
+ saveDialogSize(group, KConfigGroup::Persistent);
+ group = configPtr->group(openDev);
+ QMap opts;
+ ksanew->getOptVals(opts);
+ QMap::const_iterator i = opts.constBegin();
+ for (; i != opts.constEnd(); ++i)
+ group.writeEntry(i.key(), i.value(), KConfigGroup::Persistent);
+ }
}
void SaneDialog::imageReady(QByteArray &data, int w, int h, int bpl, int f)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.6.0/libs/libkexiv2/libkexiv2/kexiv2xmp.cpp new/kdegraphics-4.6.1/libs/libkexiv2/libkexiv2/kexiv2xmp.cpp
--- old/kdegraphics-4.6.0/libs/libkexiv2/libkexiv2/kexiv2xmp.cpp 2011-01-18 22:25:10.000000000 +0100
+++ new/kdegraphics-4.6.1/libs/libkexiv2/libkexiv2/kexiv2xmp.cpp 2011-02-25 22:47:07.000000000 +0100
@@ -632,8 +632,8 @@
xmpTxtSeq->read(txt);
}
d->xmpMetadata()[xmpTagName].setValue(xmpTxtSeq.get());
- return true;
}
+ return true;
}
catch( Exiv2::Error& e )
{
@@ -723,8 +723,8 @@
xmpTxtBag->read(txt);
}
d->xmpMetadata()[xmpTagName].setValue(xmpTxtBag.get());
- return true;
}
+ return true;
}
catch( Exiv2::Error& e )
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.6.0/libs/libksane/libksane/ksane_viewer.cpp new/kdegraphics-4.6.1/libs/libksane/libksane/ksane_viewer.cpp
--- old/kdegraphics-4.6.0/libs/libksane/libksane/ksane_viewer.cpp 2011-01-18 22:25:13.000000000 +0100
+++ new/kdegraphics-4.6.1/libs/libksane/libksane/ksane_viewer.cpp 2011-02-25 22:47:07.000000000 +0100
@@ -934,6 +934,11 @@
}
}
+QSize KSaneViewer::sizeHint() const
+{
+ return QSize(250, 300); // a sensible size for a scan preview
+}
+
void KSaneViewer::refineSelections(int pixelMargin)
{
// The end result
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.6.0/libs/libksane/libksane/ksane_viewer.h new/kdegraphics-4.6.1/libs/libksane/libksane/ksane_viewer.h
--- old/kdegraphics-4.6.0/libs/libksane/libksane/ksane_viewer.h 2011-01-18 22:25:13.000000000 +0100
+++ new/kdegraphics-4.6.1/libs/libksane/libksane/ksane_viewer.h 2011-02-25 22:47:07.000000000 +0100
@@ -46,6 +46,8 @@
/** Find selections in the picture
* \param area this parameter determine the area of the reduced sized image. */
void findSelections(float area = 10000.0);
+
+ virtual QSize sizeHint() const;
public Q_SLOTS:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.6.0/okular/VERSION new/kdegraphics-4.6.1/okular/VERSION
--- old/kdegraphics-4.6.0/okular/VERSION 2011-01-18 22:25:33.000000000 +0100
+++ new/kdegraphics-4.6.1/okular/VERSION 2011-02-25 22:47:07.000000000 +0100
@@ -1 +1 @@
-okular v0.12
+okular v0.12.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.6.0/okular/core/document.cpp new/kdegraphics-4.6.1/okular/core/document.cpp
--- old/kdegraphics-4.6.0/okular/core/document.cpp 2011-01-18 22:25:21.000000000 +0100
+++ new/kdegraphics-4.6.1/okular/core/document.cpp 2011-02-25 22:47:07.000000000 +0100
@@ -1979,7 +1979,7 @@
if ( tmp )
*info = *tmp;
- info->set( DocumentInfo::FilePath, currentDocument().url() );
+ info->set( DocumentInfo::FilePath, currentDocument().prettyUrl() );
const QString pagesSize = d->pagesSizeString();
if ( d->m_docSize != -1 )
{
@@ -2440,6 +2440,11 @@
kDebug(OkularDebug) << "invalid viewport:" << viewport.toString();
return;
}
+ if ( viewport.pageNumber >= int(d->m_pagesVector.count()) )
+ {
+ //kDebug(OkularDebug) << "viewport out of document:" << viewport.toString();
+ return;
+ }
// if already broadcasted, don't redo it
DocumentViewport & oldViewport = *d->m_viewportIterator;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.6.0/okular/core/version.h new/kdegraphics-4.6.1/okular/core/version.h
--- old/kdegraphics-4.6.0/okular/core/version.h 2011-01-18 22:25:21.000000000 +0100
+++ new/kdegraphics-4.6.1/okular/core/version.h 2011-02-25 22:47:07.000000000 +0100
@@ -10,10 +10,10 @@
#ifndef _OKULAR_VERSION_H_
#define _OKULAR_VERSION_H_
-#define OKULAR_VERSION_STRING "0.12"
+#define OKULAR_VERSION_STRING "0.12.1"
#define OKULAR_VERSION_MAJOR 0
#define OKULAR_VERSION_MINOR 12
-#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 \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.6.0/okular/shell/main.cpp new/kdegraphics-4.6.1/okular/shell/main.cpp
--- old/kdegraphics-4.6.0/okular/shell/main.cpp 2011-01-18 22:25:22.000000000 +0100
+++ new/kdegraphics-4.6.1/okular/shell/main.cpp 2011-02-25 22:47:07.000000000 +0100
@@ -29,7 +29,10 @@
if (!iface.isValid())
return false;
- iface.call("openDocument", ShellUtils::urlFromArg(args->arg(0), ShellUtils::qfileExistFunc()).url());
+ if (args->isSet("page"))
+ iface.call("openDocument", ShellUtils::urlFromArg(args->arg(0), ShellUtils::qfileExistFunc(), args->getOption("page")).url());
+ else
+ iface.call("openDocument", ShellUtils::urlFromArg(args->arg(0), ShellUtils::qfileExistFunc()).url());
return true;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.6.0/okular/ui/pageview.cpp new/kdegraphics-4.6.1/okular/ui/pageview.cpp
--- old/kdegraphics-4.6.0/okular/ui/pageview.cpp 2011-01-18 22:25:33.000000000 +0100
+++ new/kdegraphics-4.6.1/okular/ui/pageview.cpp 2011-02-25 22:47:07.000000000 +0100
@@ -1804,9 +1804,12 @@
updateCursor( eventPos );
PageViewItem * pageItem = pickItemOnPoint( eventPos.x(), eventPos.y() );
+ const QPoint pressPos = contentAreaPoint( mapFromGlobal( d->mousePressPos ) );
+ const PageViewItem * pageItemPressPos = pickItemOnPoint( pressPos.x(), pressPos.y() );
// if the mouse has not moved since the press, that's a -click-
- if ( leftButton && pageItem && d->mousePressPos == e->globalPos())
+ if ( leftButton && pageItem && pageItem == pageItemPressPos &&
+ ( (d->mousePressPos - e->globalPos()).manhattanLength() < QApplication::startDragDistance() ) )
{
double nX = pageItem->absToPageX(eventPos.x());
double nY = pageItem->absToPageY(eventPos.y());
@@ -1869,7 +1872,8 @@
}
else if ( rightButton )
{
- if ( pageItem && d->mousePressPos == e->globalPos() )
+ if ( pageItem && pageItem == pageItemPressPos &&
+ ( (d->mousePressPos - e->globalPos()).manhattanLength() < QApplication::startDragDistance() ) )
{
double nX = pageItem->absToPageX(eventPos.x());
double nY = pageItem->absToPageY(eventPos.y());
@@ -2408,6 +2412,8 @@
void PageView::drawDocumentOnPainter( const QRect & contentsRect, QPainter * p )
{
+ QColor backColor = viewport()->palette().color( QPalette::Dark );
+
// when checking if an Item is contained in contentsRect, instead of
// growing PageViewItems rects (for keeping outline into account), we
// grow the contentsRect
@@ -2445,15 +2451,15 @@
p->drawRect( -1, -1, itemWidth + 1, itemHeight + 1 );
// draw bottom/right gradient
static int levels = 2;
- int r = QColor(Qt::gray).red() / (levels + 2),
- g = QColor(Qt::gray).green() / (levels + 2),
- b = QColor(Qt::gray).blue() / (levels + 2);
+ int r = backColor.red() / (levels + 2) + 6,
+ g = backColor.green() / (levels + 2) + 6,
+ b = backColor.blue() / (levels + 2) + 6;
for ( int i = 0; i < levels; i++ )
{
p->setPen( QColor( r * (i+2), g * (i+2), b * (i+2) ) );
p->drawLine( i, i + itemHeight + 1, i + itemWidth + 1, i + itemHeight + 1 );
p->drawLine( i + itemWidth + 1, i, i + itemWidth + 1, i + itemHeight );
- p->setPen( Qt::gray );
+ p->setPen( backColor );
p->drawLine( -1, i + itemHeight + 1, i - 1, i + itemHeight + 1 );
p->drawLine( i + itemWidth + 1, -1, i + itemWidth + 1, i - 1 );
}
@@ -2477,8 +2483,6 @@
// fill with background color the unpainted area
const QVector<QRect> &backRects = remainingArea.rects();
int backRectsNumber = backRects.count();
- // the previous color here was Qt::gray
- QColor backColor = viewport()->palette().color( QPalette::Dark );
for ( int jr = 0; jr < backRectsNumber; jr++ )
p->fillRect( backRects[ jr ], backColor );
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.6.0/okular/ui/tocmodel.cpp new/kdegraphics-4.6.1/okular/ui/tocmodel.cpp
--- old/kdegraphics-4.6.0/okular/ui/tocmodel.cpp 2011-01-18 22:25:33.000000000 +0100
+++ new/kdegraphics-4.6.1/okular/ui/tocmodel.cpp 2011-02-25 22:47:07.000000000 +0100
@@ -193,7 +193,7 @@
return item->viewport.pageNumber + 1;
break;
case PageItemDelegate::PageLabelRole:
- if ( item->viewport.isValid() )
+ if ( item->viewport.isValid() && item->viewport.pageNumber < int(d->document->pages()) )
return d->document->page( item->viewport.pageNumber )->label();
break;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.6.0/thumbnailers/mobi/mobithumbnail.desktop new/kdegraphics-4.6.1/thumbnailers/mobi/mobithumbnail.desktop
--- old/kdegraphics-4.6.0/thumbnailers/mobi/mobithumbnail.desktop 2011-01-18 22:25:19.000000000 +0100
+++ new/kdegraphics-4.6.1/thumbnailers/mobi/mobithumbnail.desktop 2011-02-25 22:47:07.000000000 +0100
@@ -11,6 +11,8 @@
Name[es]=Archivos Mobipocket
Name[et]=Mobipocketi failid
Name[eu]=Mobipocket fitxategiak
+Name[fi]=Mobipocket-tiedostot
+Name[ga]=Comhaid Mobipocket
Name[hr]=Mobipocket datoteke
Name[hu]=Mobipocket-féjlok
Name[it]=File Mobipocket
@@ -31,6 +33,7 @@
Name[sr@ijekavianlatin]=Mobipocketovi fajlovi
Name[sr@latin]=Mobipocketovi fajlovi
Name[sv]=Mobipocket-filer
+Name[tr]=Mobipocket Dosyaları
Name[uk]=Файли Mobipocket
Name[x-test]=xxMobipocket Filesxx
Name[zh_CN]=Mobipocket 文件
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.6.0/thumbnailers/raw/rawthumbnail.desktop new/kdegraphics-4.6.1/thumbnailers/raw/rawthumbnail.desktop
--- old/kdegraphics-4.6.0/thumbnailers/raw/rawthumbnail.desktop 2011-01-18 22:25:19.000000000 +0100
+++ new/kdegraphics-4.6.1/thumbnailers/raw/rawthumbnail.desktop 2011-02-25 22:47:07.000000000 +0100
@@ -11,6 +11,8 @@
Name[es]=Archivos RAW de cámara fotográfica
Name[et]=Kaamera toorfailid
Name[eu]=RAW argazki kamera-fitxategiak
+Name[fi]=RAW-kuvakameratiedostot
+Name[ga]=Comhaid Cheamara RAW
Name[hu]=RAW-fájlok
Name[it]=File grezzi fotocamera
Name[kk]=Камераның RAW ('шикі') файлдары
@@ -30,6 +32,7 @@
Name[sr@ijekavianlatin]=Sirovi fajlovi s kamere
Name[sr@latin]=Sirovi fajlovi s kamere
Name[sv]=Obehandlade kamerafotofiler
+Name[tr]=HAM Fotoğraf Makinesi Dosyaları
Name[uk]=Файли цифрових негативів
Name[x-test]=xxRAW Photo Camera Filesxx
Name[zh_CN]=RAW 照片相机文件
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org