Gentoo Archives: gentoo-commits

From: "Johannes Huber (johu)" <johu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in kde-base/kdelibs/files: kdelibs-4.8.1-norpath.patch kdelibs-4.8.2-calculator_key.patch
Date: Thu, 05 Apr 2012 00:11:21
Message-Id: 20120404235915.AEDCC2004F@flycatcher.gentoo.org
1 johu 12/04/04 23:59:15
2
3 Added: kdelibs-4.8.1-norpath.patch
4 kdelibs-4.8.2-calculator_key.patch
5 Log:
6 Version bump KDE SC 4.8.2
7
8 (Portage version: 2.2.0_alpha98/cvs/Linux i686)
9
10 Revision Changes Path
11 1.1 kde-base/kdelibs/files/kdelibs-4.8.1-norpath.patch
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/files/kdelibs-4.8.1-norpath.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/files/kdelibs-4.8.1-norpath.patch?rev=1.1&content-type=text/plain
15
16 Index: kdelibs-4.8.1-norpath.patch
17 ===================================================================
18 diff -ruN kdelibs-4.8.1.orig/cmake/modules/FindKDE4Internal.cmake kdelibs-4.8.1/cmake/modules/FindKDE4Internal.cmake
19 --- kdelibs-4.8.1.orig/cmake/modules/FindKDE4Internal.cmake 2012-02-29 22:55:52.000000000 +0100
20 +++ kdelibs-4.8.1/cmake/modules/FindKDE4Internal.cmake 2012-03-24 17:18:59.452942648 +0100
21 @@ -1045,7 +1045,13 @@
22
23 set(CMAKE_SKIP_BUILD_RPATH FALSE)
24 set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
25 - set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
26 +
27 + # the RPATH to be used when installing
28 + SET(CMAKE_INSTALL_RPATH "")
29 +
30 + # don't add the automatically determined parts of the RPATH
31 + # which point to directories outside the build tree to the install RPATH
32 + SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
33 endif (APPLE)
34 endif (UNIX)
35
36
37
38
39 1.1 kde-base/kdelibs/files/kdelibs-4.8.2-calculator_key.patch
40
41 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/files/kdelibs-4.8.2-calculator_key.patch?rev=1.1&view=markup
42 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/files/kdelibs-4.8.2-calculator_key.patch?rev=1.1&content-type=text/plain
43
44 Index: kdelibs-4.8.2-calculator_key.patch
45 ===================================================================
46 --- kdeui/util/kkeyserver_x11.cpp 2012-02-25 18:53:49.480771132 -0200
47 +++ kdeui/util/kkeyserver_x11.cpp 2012-02-25 18:20:38.912403430 -0200
48 @@ -355,7 +355,7 @@
49 { Qt::Key_MediaRecord, XF86XK_AudioRecord },
50 { Qt::Key_LaunchMail, XF86XK_Mail },
51 { Qt::Key_Launch0, XF86XK_MyComputer },
52 - { Qt::Key_Calculator, XF86XK_Calculator },
53 + { Qt::Key_Launch1, XF86XK_Calculator },
54 { Qt::Key_Memo, XF86XK_Memo },
55 { Qt::Key_ToDoList, XF86XK_ToDoList },
56 { Qt::Key_Calendar, XF86XK_Calendar },