- fix build failure triggered by "build fix" (patch by Jonathan Riddell)
This commit is contained in:
parent
56ed7a981d
commit
eed1765699
12
kdelibs-4.5.80-fix-build.patch
Normal file
12
kdelibs-4.5.80-fix-build.patch
Normal file
@ -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<KRatingWidget*>(widgets.at(DelegateRatingWidget));
|
||||||
|
+ KRatingWidget * rating = qobject_cast<KRatingWidget*>(widgets.at(DelegateGridRatingWidget));
|
||||||
|
if (rating) {
|
||||||
|
if (entry.rating() > 0) {
|
||||||
|
rating->setToolTip(i18n("Rating: %1%", entry.rating()));
|
@ -90,6 +90,8 @@ Patch27: kdelibs-4.5.80-no_rpath.patch
|
|||||||
# reverting to our past gnupg2-only setup.
|
# reverting to our past gnupg2-only setup.
|
||||||
# TODO: try to use either gpg or gpg2, whichever is available
|
# TODO: try to use either gpg or gpg2, whichever is available
|
||||||
Patch50: kdelibs-4.5.1-knewstuff_gpg2.patch
|
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
|
## 4.6 upstream
|
||||||
## trunk upstream
|
## trunk upstream
|
||||||
@ -264,6 +266,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
|
|||||||
|
|
||||||
# upstreamable patches
|
# upstreamable patches
|
||||||
%patch50 -p1 -b .knewstuff_gpg2
|
%patch50 -p1 -b .knewstuff_gpg2
|
||||||
|
%patch51 -p1 -b .fix-build
|
||||||
|
|
||||||
# upstream patches
|
# upstream patches
|
||||||
|
|
||||||
@ -519,6 +522,7 @@ rm -rf %{buildroot}
|
|||||||
%changelog
|
%changelog
|
||||||
* Tue Nov 23 2010 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.5.80-4
|
* Tue Nov 23 2010 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.5.80-4
|
||||||
- respun tarball
|
- respun tarball
|
||||||
|
- fix build failure triggered by "build fix" (patch by Jonathan Riddell)
|
||||||
|
|
||||||
* Mon Nov 22 2010 Lukas Tinkl <ltinkl@redhat.com> - 4.5.80-3
|
* Mon Nov 22 2010 Lukas Tinkl <ltinkl@redhat.com> - 4.5.80-3
|
||||||
- don't build Solid HAL backend, rely on udisks/upower/udev only
|
- don't build Solid HAL backend, rely on udisks/upower/udev only
|
||||||
|
Loading…
Reference in New Issue
Block a user