rev 9804 - in kde-extras/digikam/trunk/debian: . patches
Achim Bohnet
ach-guest at alioth.debian.org
Mon Mar 17 22:21:25 UTC 2008
Author: ach-guest
Date: 2008-03-17 22:21:25 +0000 (Mon, 17 Mar 2008)
New Revision: 9804
Added:
kde-extras/digikam/trunk/debian/patches/40_kdesvn783161_fix_wrong_file-exits_check.diff
kde-extras/digikam/trunk/debian/patches/40_kdesvn786622_honour_scrollbar.diff
Modified:
kde-extras/digikam/trunk/debian/changelog
kde-extras/digikam/trunk/debian/patches/series
Log:
digikam:
* Cherry pick fixes from KDEs SVN:
40_kdesvn783161_fix_wrong_file-exits_check.diff
40_kdesvn786622_honour_scrollbar.diff
* Thx Gilles for pointing me to them
Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog 2008-03-17 20:29:51 UTC (rev 9803)
+++ kde-extras/digikam/trunk/debian/changelog 2008-03-17 22:21:25 UTC (rev 9804)
@@ -2,6 +2,10 @@
[ Achim Bohnet]
+ * Cherry pick fixes from KDEs SVN:
+ 40_kdesvn783161_fix_wrong_file-exits_check.diff
+ 40_kdesvn786622_honour_scrollbar.diff
+
* Remove build-deps:
+ automake1.9: We take care that no rebuilding is necessary.
+ libexif-dev: replaced by libexiv2 upstream.
Added: kde-extras/digikam/trunk/debian/patches/40_kdesvn783161_fix_wrong_file-exits_check.diff
===================================================================
--- kde-extras/digikam/trunk/debian/patches/40_kdesvn783161_fix_wrong_file-exits_check.diff (rev 0)
+++ kde-extras/digikam/trunk/debian/patches/40_kdesvn783161_fix_wrong_file-exits_check.diff 2008-03-17 22:21:25 UTC (rev 9804)
@@ -0,0 +1,10 @@
+--- digikam-0.9.3.orig/digikam/utilities/cameragui/cameracontroller.cpp.orig 2008-03-17 19:06:18.000000000 +0100
++++ digikam-0.9.3/digikam/utilities/cameragui/cameracontroller.cpp 2008-03-17 19:08:10.000000000 +0100
+@@ -931,6 +931,7 @@
+
+ int result = dlg.exec();
+ dest = dlg.newDestURL().path();
++ info = QFileInfo(dest);
+
+ switch (result)
+ {
Added: kde-extras/digikam/trunk/debian/patches/40_kdesvn786622_honour_scrollbar.diff
===================================================================
--- kde-extras/digikam/trunk/debian/patches/40_kdesvn786622_honour_scrollbar.diff (rev 0)
+++ kde-extras/digikam/trunk/debian/patches/40_kdesvn786622_honour_scrollbar.diff 2008-03-17 22:21:25 UTC (rev 9804)
@@ -0,0 +1,14 @@
+--- digikam-0.9.3/digikam/libs/thumbbar/thumbbar.cpp.orig 2008-03-17 18:47:49.000000000 +0100
++++ digikam-0.9.3/digikam/libs/thumbbar/thumbbar.cpp 2008-03-17 19:03:38.000000000 +0100
+@@ -687,9 +687,9 @@
+ }
+
+ if (d->orientation == Vertical)
+- resizeContents(width(), d->count*(d->tileSize+2*d->margin));
++ resizeContents(visibleWidth(), d->count*(d->tileSize+2*d->margin));
+ else
+- resizeContents(d->count*(d->tileSize+2*d->margin), height());
++ resizeContents(d->count*(d->tileSize+2*d->margin), visibleHeight());
+
+ if (!urlList.isEmpty())
+ {
Modified: kde-extras/digikam/trunk/debian/patches/series
===================================================================
--- kde-extras/digikam/trunk/debian/patches/series 2008-03-17 20:29:51 UTC (rev 9803)
+++ kde-extras/digikam/trunk/debian/patches/series 2008-03-17 22:21:25 UTC (rev 9804)
@@ -1,3 +1,5 @@
10_lp201053_fix_download_rename_race.diff
20_fix_ftbfs_with_libkdcraw3.diff
30_respect_umask.diff
+40_kdesvn783161_fix_wrong_file-exits_check.diff
+40_kdesvn786622_honour_scrollbar.diff
More information about the pkg-kde-commits
mailing list