rpms
/
kdelibs
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Mon Jan 26 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.2.0-2 

- plasma-on-screensaver-security patch
- (Build)Req: automoc4 >= 0.9.88, phonon(-devel) >= 4.3.0
- Requires: strigi-libs >= 0.6.3
- use %{?_isa} to avoid potential multilib heartbreak
This commit is contained in:
Rex Dieter 2009-01-26 17:08:28 +00:00
parent e2b0edbaff
commit 030e70255b
4 changed files with 41 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
kdelibs-4.0.5-fedora-buildtype.patch
View File

@ -1,17 +0,0 @@
diff -ur kdelibs-4.0.3/cmake/modules/FindKDE4Internal.cmake kdelibs-4.0.3-fedora-buildtype/cmake/modules/FindKDE4Internal.cmake
--- kdelibs-4.0.3/cmake/modules/FindKDE4Internal.cmake 2008-03-27 21:33:23.000000000 +0100
+++ kdelibs-4.0.3-fedora-buildtype/cmake/modules/FindKDE4Internal.cmake 2008-03-31 17:34:40.000000000 +0200
@@ -882,11 +882,13 @@
set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline")
set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline")
set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
+ set(CMAKE_CXX_FLAGS_FEDORA "-DNDEBUG -DQT_NO_DEBUG")
set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g")
set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG -DQT_NO_DEBUG")
set(CMAKE_C_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline")
set(CMAKE_C_FLAGS_DEBUGFULL "-g3 -fno-inline")
set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
+ set(CMAKE_C_FLAGS_FEDORA "-DNDEBUG -DQT_NO_DEBUG")
if (CMAKE_SYSTEM_NAME MATCHES Linux)
set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")

42
kdelibs-4.1.96-crash.patch
View File

@ -1,42 +0,0 @@
--- kdelibs-4.1.96/plasma/framesvg.cpp.orig 2009/01/06 17:13:38 906699
+++ kdelibs-4.1.96/plasma/framesvg.cpp 2009/01/11 17:31:47 909478
@@ -583,7 +583,8 @@
}
}
} else {
- if (frame->enabledBorders & FrameSvg::LeftBorder && q->hasElement(prefix + "left")) {
+ if (frame->enabledBorders & FrameSvg::LeftBorder && q->hasElement(prefix + "left")
+ && leftHeight > 0 && frame->leftWidth > 0) {
QPixmap left(frame->leftWidth, leftHeight);
left.fill(Qt::transparent);
@@ -594,7 +595,8 @@
p.drawTiledPixmap(QRect(leftOffset, contentTop, frame->leftWidth, contentHeight), left);
}
- if (frame->enabledBorders & FrameSvg::RightBorder && q->hasElement(prefix + "right")) {
+ if (frame->enabledBorders & FrameSvg::RightBorder && q->hasElement(prefix + "right") &&
+ leftHeight > 0 && frame->rightWidth > 0) {
QPixmap right(frame->rightWidth, leftHeight);
right.fill(Qt::transparent);
@@ -605,7 +607,8 @@
p.drawTiledPixmap(QRect(rightOffset, contentTop, frame->rightWidth, contentHeight), right);
}
- if (frame->enabledBorders & FrameSvg::TopBorder && q->hasElement(prefix + "top")) {
+ if (frame->enabledBorders & FrameSvg::TopBorder && q->hasElement(prefix + "top")
+ && topWidth > 0 && frame->topHeight > 0) {
QPixmap top(topWidth, frame->topHeight);
top.fill(Qt::transparent);
@@ -616,7 +619,8 @@
p.drawTiledPixmap(QRect(contentLeft, topOffset, contentWidth, frame->topHeight), top);
}
- if (frame->enabledBorders & FrameSvg::BottomBorder && q->hasElement(prefix + "bottom")) {
+ if (frame->enabledBorders & FrameSvg::BottomBorder && q->hasElement(prefix + "bottom")
+ && topWidth > 0 && frame->bottomHeight > 0) {
QPixmap bottom(topWidth, frame->bottomHeight);
bottom.fill(Qt::transparent);

29
kdelibs.spec
View File

@ -1,6 +1,6 @@
Summary: K Desktop Environment 4 - Libraries
Version: 4.2.0
Release: 1%{?dist}
Release: 2%{?dist}
%if 0%{?fedora} > 8
Name: kdelibs
@ -44,8 +44,9 @@ Requires: kdelibs-common
%if 0%{?fedora} >= 9
Requires: hunspell
%endif
Requires: phonon >= 4.2.96
Requires: soprano >= 2.1.64
Requires: phonon%{?_isa} >= 4.3.0
Requires: soprano%{?_isa} >= 2.1.64
Requires: strigi-libs%{?_isa} >= 0.6.3
Source1: kde4.sh
Source2: kde4.csh
@ -79,11 +80,12 @@ Patch20: kdelibs-4.1.70-cmake.patch
Patch22: kdelibs-4.1.96-cmake.patch
# upstream
Patch100: plasma-on-screensaver-security-fix.diff
# 4.3 branch
Patch101: kdelibs-4.1.96-AllowExternalPaths.patch
BuildRequires: qt4-devel >= 4.4.0
Requires: qt4 >= %{_qt4_version}
Requires: qt4%{?_isa} >= %{_qt4_version}
Requires: xdg-utils
Requires(post): /sbin/ldconfig xdg-utils
Requires(postun): /sbin/ldconfig xdg-utils
@ -93,7 +95,7 @@ BuildRequires: alsa-lib-devel
# we don't want a hard dependency on aspell on F9+, use enchant only
BuildRequires: aspell-devel
%endif
BuildRequires: automoc
BuildRequires: automoc4 >= 0.9.88
BuildRequires: avahi-devel
BuildRequires: bzip2-devel
BuildRequires: cmake >= 2.6.2-3
@ -114,7 +116,7 @@ BuildRequires: libxslt-devel libxml2-devel
BuildRequires: OpenEXR-devel
BuildRequires: openssl-devel
BuildRequires: pcre-devel
BuildRequires: phonon-devel >= 4.2.96
BuildRequires: phonon-devel >= 4.3.0
BuildRequires: shared-mime-info
BuildRequires: soprano-devel >= 2.1.64
BuildRequires: strigi-devel >= 0.6.3
@ -153,11 +155,11 @@ Obsoletes: kdelibs4-devel < %{version}-%{release}
Provides: kdelibs4-devel = %{version}-%{release}
%endif
Requires: cmake >= 2.6.2-3
Requires: automoc
Requires: automoc4 >= 0.9.88
Requires: qt4-devel
Requires: openssl-devel
Requires: phonon-devel >= 4.2.96
Requires: strigi-devel >= 0.6.3
Requires: phonon-devel
Requires: strigi-devel
Requires: bzip2-devel gamin-devel libacl-devel zlib-devel libutempter-devel
%{?x_deps:Requires: %{x_deps}}
%description devel
@ -207,6 +209,9 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
%patch22 -p1 -b .kdepimlibs-cmake
# upstream patches
pushd plasma
%patch100 -p0 -b .plasma-on-screensaver-security-fix
popd
%patch101 -p1 -b .AllowExternalPaths
%build
@ -369,6 +374,12 @@ rm -rf %{buildroot}
%changelog
* Mon Jan 26 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.2.0-2
- plasma-on-screensaver-security patch
- (Build)Req: automoc4 >= 0.9.88, phonon(-devel) >= 4.3.0
- Requires: strigi-libs >= 0.6.3
- use %%{?_isa} to avoid potential multilib heartbreak
* Thu Jan 22 2009 Than Ngo <than@redhat.com> - 4.2.0-1
- 4.2.0

21
plasma-on-screensaver-security-fix.diff Normal file
View File

@ -0,0 +1,21 @@
Index: containment.cpp
===================================================================
--- containment.cpp (revision 916284)
+++ containment.cpp (working copy)
@@ -1602,12 +1602,10 @@
}
bool canConfig = unlocked || KAuthorized::authorize("PlasmaAllowConfigureWhenLocked");
- if (canConfig) {
- action = actions().action("activity settings");
- if (action) {
- action->setVisible(canConfig);
- action->setEnabled(canConfig);
- }
+ action = actions().action("activity settings");
+ if (action) {
+ action->setVisible(canConfig);
+ action->setEnabled(canConfig);
}
// tell the applets too