[kdelibs/f20] add the arm's check in kdelibs
Than Ngo
than at fedoraproject.org
Mon Dec 2 17:02:00 UTC 2013
commit cf152dc1fcec80efe2d292afe7b79463c917c9ea
Author: Than Ngo <than at redhat.com>
Date: Mon Dec 2 17:58:22 2013 +0100
add the arm's check in kdelibs
kdelibs-4.11.3-arm.patch | 10 ++++++----
kdelibs.spec | 7 ++++---
2 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/kdelibs-4.11.3-arm.patch b/kdelibs-4.11.3-arm.patch
index e6d2368..b812e55 100644
--- a/kdelibs-4.11.3-arm.patch
+++ b/kdelibs-4.11.3-arm.patch
@@ -1,13 +1,15 @@
diff -up kdelibs-4.11.3/plasma/corona.cpp.than kdelibs-4.11.3/plasma/corona.cpp
--- kdelibs-4.11.3/plasma/corona.cpp.than 2013-12-02 16:46:19.542820822 +0100
-+++ kdelibs-4.11.3/plasma/corona.cpp 2013-12-02 16:48:02.943821082 +0100
-@@ -388,7 +388,8 @@ void Corona::addOffscreenWidget(QGraphic
++++ kdelibs-4.11.3/plasma/corona.cpp 2013-12-02 17:53:04.919830893 +0100
+@@ -388,7 +388,11 @@ void Corona::addOffscreenWidget(QGraphic
}
d->offscreenWidgets[i] = widget;
-- widget->setPos((-i - 1) * QWIDGETSIZE_MAX, -QWIDGETSIZE_MAX);
-+
++#if defined(arm) || defined(__arm__)
+ widget->setPos((-i - 1) * 2000, -2000);
++#else
+ widget->setPos((-i - 1) * QWIDGETSIZE_MAX, -QWIDGETSIZE_MAX);
++#endif
QGraphicsWidget *pw = widget->parentWidget();
widget->setParentItem(0);
diff --git a/kdelibs.spec b/kdelibs.spec
index b143d1b..41696c5 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -37,7 +37,7 @@
Summary: KDE Libraries
Version: 4.11.3
-Release: 2%{?dist}
+Release: 3%{?dist}
Name: kdelibs
Epoch: 6
@@ -353,9 +353,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
%patch54 -p1 -b .kjs-locale
%patch59 -p1 -b .filter
%patch61 -p1 -b .dot
-%ifarch %{arm}
%patch62 -p1 -b .arm-plasma
-%endif
# upstream patches
%patch090 -p1 -R -b .return-not-break.-copy-paste-error
@@ -611,6 +609,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
%changelog
+* Mon Dec 02 2013 Than Ngo <than at redhat.com> - 6:4.11.3-3
+- add the arm's check in kdelibs
+
* Mon Dec 02 2013 Than Ngo <than at redhat.com> - 6:4.11.3-2
- add workaround for bz#969524
More information about the scm-commits
mailing list