rpms/digikam/devel digikam-1.2.0-kde232628.patch, NONE, 1.1 digikam.spec, 1.112, 1.113
Rex Dieter
rdieter at fedoraproject.org
Tue Mar 30 18:21:23 UTC 2010
Author: rdieter
Update of /cvs/pkgs/rpms/digikam/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv15544
Modified Files:
digikam.spec
Added Files:
digikam-1.2.0-kde232628.patch
Log Message:
* Tue Mar 30 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.2.0-2
- crash on startup in RatingWidget (kde#232628)
digikam-1.2.0-kde232628.patch:
ratingwidget.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE digikam-1.2.0-kde232628.patch ---
--- trunk/extragear/graphics/digikam/digikam/ratingwidget.cpp 2010/03/30 18:15:12 1109176
+++ trunk/extragear/graphics/digikam/digikam/ratingwidget.cpp 2010/03/30 18:15:25 1109177
@@ -165,7 +165,7 @@
void RatingWidget::setFadingValue(int value)
{
d->fadingValue = value;
- if (d->fadingValue >= 255)
+ if (d->fadingValue >= 255 && d->fadingTimeLine)
{
d->fadingTimeLine->stop();
}
Index: digikam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -p -r1.112 -r1.113
--- digikam.spec 29 Mar 2010 17:18:58 -0000 1.112
+++ digikam.spec 30 Mar 2010 18:21:23 -0000 1.113
@@ -1,7 +1,7 @@
Name: digikam
Version: 1.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A digital camera accessing & photo management application
Group: Applications/Multimedia
@@ -14,7 +14,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version
# TODO: upstream me
Source1: digikam-import.desktop
-BuildRequires: cmake
+## upstream patches
+# http://bugs.kde.org/232628
+Patch100: digikam-1.2.0-kde232628.patch
+
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: glib2-devel
@@ -80,6 +83,8 @@ needed to develop applications using %{n
%prep
%setup -q -n %{name}-%{version}%{?pre:-%{pre}}
+%patch100 -p4 -b .kde232628
+
%build
@@ -161,6 +166,9 @@ rm -rf %{buildroot}
%changelog
+* Tue Mar 30 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.2.0-2
+- crash on startup in RatingWidget (kde#232628)
+
* Mon Mar 29 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.2.0-1
- digikam-1.2.0
More information about the scm-commits
mailing list