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

KDE 4.4.1

This commit is contained in:
Lukas Tinkl 2010-03-02 14:12:52 +00:00
parent 3ba941973f
commit 6ac872d787
3 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
kdelibs-4.3.3-khtml_svg_no_var_tracking_assignments.patch
View File

@ -1,11 +0,0 @@
diff -up kdelibs-4.3.3/khtml/CMakeLists.txt.SVGNames kdelibs-4.3.3/khtml/CMakeLists.txt
--- kdelibs-4.3.3/khtml/CMakeLists.txt.SVGNames 2009-08-27 03:19:09.000000000 -0500
+++ kdelibs-4.3.3/khtml/CMakeLists.txt 2009-11-13 17:43:07.618002091 -0600
@@ -194,6 +194,7 @@ set(khtmldom_STAT_SRCS
)
#set_source_files_properties(${khtmldom_STAT_SRCS} PROPERTIES COMPILE_FLAGS ${KDE4_ENABLE_EXCEPTIONS})
+set_source_files_properties(${khtmlsvg_STAT_SRCS} PROPERTIES COMPILE_FLAGS -fno-var-tracking-assignments )
# khtml/misc/Makefile.am: khtmlmisc

21
kdelibs-4.4.1-no_rpath.patch Normal file
View File

@ -0,0 +1,21 @@
diff -up kdelibs-4.4.1/cmake/modules/FindKDE4Internal.cmake.no_rpath kdelibs-4.4.1/cmake/modules/FindKDE4Internal.cmake
--- kdelibs-4.4.1/cmake/modules/FindKDE4Internal.cmake.no_rpath 2010-02-28 11:08:56.164016085 -0600
+++ kdelibs-4.4.1/cmake/modules/FindKDE4Internal.cmake 2010-02-28 11:10:20.126766912 -0600
@@ -947,7 +947,16 @@ if (UNIX)
set(CMAKE_INSTALL_NAME_DIR ${LIB_INSTALL_DIR})
else (APPLE)
# add our LIB_INSTALL_DIR to the RPATH and use the RPATH figured out by cmake when compiling
- set(CMAKE_INSTALL_RPATH ${LIB_INSTALL_DIR} )
+ # set(CMAKE_INSTALL_RPATH ${LIB_INSTALL_DIR} )
+ message(STATUS "CMAKE_SYSTEM_LIBRARY_PATH: ${CMAKE_SYSTEM_LIBRARY_PATH}")
+ message(STATUS "LIB_INSTALL_DIR: ${LIB_INSTALL_DIR}")
+ list(FIND CMAKE_SYSTEM_LIBRARY_PATH ${LIB_INSTALL_DIR} _LIB_INSTALL_DIR_INDEX_IN_CMAKE_SYSTEM_LIBRARY_PATH)
+ message(STATUS "_LIB_INSTALL_DIR_INDEX_IN_CMAKE_SYSTEM_LIBRARY_PATH: ${_LIB_INSTALL_DIR_INDEX_IN_CMAKE_SYSTEM_LIBRARY_PATH}")
+ if(${_LIB_INSTALL_DIR_INDEX_IN_CMAKE_SYSTEM_LIBRARY_PATH} EQUAL -1)
+ message(STATUS "appending to CMAKE_INSTALL_RPATH: ${LIB_INSTALL_DIR}")
+ list(APPEND CMAKE_INSTALL_RPATH ${LIB_INSTALL_DIR})
+ endif(${_LIB_INSTALL_DIR_INDEX_IN_CMAKE_SYSTEM_LIBRARY_PATH} EQUAL -1)
+
set(CMAKE_SKIP_BUILD_RPATH FALSE)
set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)

17
kdelibs.spec
View File

@ -8,7 +8,7 @@
Summary: KDE Libraries
Version: 4.4.1
Release: 1%{?dist}
Release: 3%{?dist}
Name: kdelibs
Epoch: 6
@ -77,10 +77,6 @@ Patch18: kdelibs-4.1.72-kstandarddirs.patch
Patch20: kdelibs-4.1.70-cmake.patch
# disable drkonqi by default, RHEL prefers/wants abrt
Patch24: kdelibs-4.3.1-drkonq.patch
# use -fno-var-tracking-assignments on khtml/svg bits, use in a pinch on f12+
# workaound for low-mem systems (ppc64), tracking here (for now),
# https://bugzilla.redhat.com/show_bug.cgi?id=539697
Patch26: kdelibs-4.3.3-khtml_svg_no_var_tracking_assignments.patch
# die rpath die, since we're using standard paths, we can avoid
# this extra hassle (even though cmake is *supposed* to not add standard
# paths (like /usr/lib64) already! With this, we can drop
@ -233,9 +229,6 @@ format for easy browsing.
%if 0%{?rhel} > 5
%patch24 -p1 -b .drkonq
%endif
#if 0%{?fedora} > 11
#patch26 -p1 -b .khtml_svg_no_var_tracking_assignments
#endif
%patch27 -p1 -b .no_rpath
# upstreamable patches
@ -432,6 +425,14 @@ rm -rf %{buildroot}
%changelog
* Sun Feb 28 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.1-3
- put back CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE to avoid
%%_libdir/kde/devel rpaths (#568495)
* Sun Feb 28 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.1-2
- update no_rpath patch, revert back to
CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE (#568495)
* Sat Feb 27 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.1-1
- 4.4.1