From eed1765699d369c3e4d0e13d0ad30da1ab5d0bbb Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Tue, 23 Nov 2010 15:07:57 +0100 Subject: [PATCH] - fix build failure triggered by "build fix" (patch by Jonathan Riddell) --- kdelibs-4.5.80-fix-build.patch | 12 ++++++++++++ kdelibs.spec | 4 ++++ 2 files changed, 16 insertions(+) create mode 100644 kdelibs-4.5.80-fix-build.patch diff --git a/kdelibs-4.5.80-fix-build.patch b/kdelibs-4.5.80-fix-build.patch new file mode 100644 index 0000000..b9f3beb --- /dev/null +++ b/kdelibs-4.5.80-fix-build.patch @@ -0,0 +1,12 @@ +diff -ur kdelibs-4.5.80/knewstuff/knewstuff3/ui/itemsgridviewdelegate.cpp kdelibs-4.5.80-fixed/knewstuff/knewstuff3/ui/itemsgridviewdelegate.cpp +--- kdelibs-4.5.80/knewstuff/knewstuff3/ui/itemsgridviewdelegate.cpp 2010-11-22 20:29:30.000000000 +0000 ++++ kdelibs-4.5.80-fixed/knewstuff/knewstuff3/ui/itemsgridviewdelegate.cpp 2010-11-23 10:37:12.596926002 +0000 +@@ -94,7 +94,7 @@ + int elementYPos = PreviewHeight + ItemMargin + FrameThickness*2; + + //setup rating widget +- KRatingWidget * rating = qobject_cast(widgets.at(DelegateRatingWidget)); ++ KRatingWidget * rating = qobject_cast(widgets.at(DelegateGridRatingWidget)); + if (rating) { + if (entry.rating() > 0) { + rating->setToolTip(i18n("Rating: %1%", entry.rating())); diff --git a/kdelibs.spec b/kdelibs.spec index 7d276a5..c3a4249 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -90,6 +90,8 @@ Patch27: kdelibs-4.5.80-no_rpath.patch # reverting to our past gnupg2-only setup. # TODO: try to use either gpg or gpg2, whichever is available Patch50: kdelibs-4.5.1-knewstuff_gpg2.patch +# fix build failure triggered by "build fix" (patch by Jonathan Riddell) +Patch51: kdelibs-4.5.80-fix-build.patch ## 4.6 upstream ## trunk upstream @@ -264,6 +266,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage # upstreamable patches %patch50 -p1 -b .knewstuff_gpg2 +%patch51 -p1 -b .fix-build # upstream patches @@ -519,6 +522,7 @@ rm -rf %{buildroot} %changelog * Tue Nov 23 2010 Kevin Kofler - 4.5.80-4 - respun tarball +- fix build failure triggered by "build fix" (patch by Jonathan Riddell) * Mon Nov 22 2010 Lukas Tinkl - 4.5.80-3 - don't build Solid HAL backend, rely on udisks/upower/udev only