1 |
commit: ff970431bb0db3643e8c66a492fdcea8e0a217cc |
2 |
Author: Jonathan Callen <abcd <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Oct 29 19:58:46 2011 +0000 |
4 |
Commit: Jonathan Callen <abcd <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 29 19:59:03 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=ff970431 |
7 |
|
8 |
[kde-base/kdebase-startkde] Upstream changed a variable |
9 |
|
10 |
--- |
11 |
.../kdebase-startkde_do_not_set_MALLOC_CHECK.patch | 21 -------------------- |
12 |
.../kdebase-startkde/kdebase-startkde-9999.ebuild | 2 +- |
13 |
2 files changed, 1 insertions(+), 22 deletions(-) |
14 |
|
15 |
diff --git a/kde-base/kdebase-startkde/files/kdebase-startkde_do_not_set_MALLOC_CHECK.patch b/kde-base/kdebase-startkde/files/kdebase-startkde_do_not_set_MALLOC_CHECK.patch |
16 |
deleted file mode 100644 |
17 |
index 8c62f8c..0000000 |
18 |
--- a/kde-base/kdebase-startkde/files/kdebase-startkde_do_not_set_MALLOC_CHECK.patch |
19 |
+++ /dev/null |
20 |
@@ -1,21 +0,0 @@ |
21 |
---- a/startkde.cmake |
22 |
-+++ b/startkde.cmake |
23 |
-@@ -36,18 +36,6 @@ fi |
24 |
- # we have to unset this for Darwin since it will screw up KDE's dynamic-loading |
25 |
- unset DYLD_FORCE_FLAT_NAMESPACE |
26 |
- |
27 |
--# Enable lightweight memory corruption checker if not already set |
28 |
--# -- this is for trunk only, we remove it for releases |
29 |
--if [ "x$MALLOC_CHECK_" = "x" ] && [ -x /lib/libc.so.6 ]; then |
30 |
-- # Extract the first two components of the version from the output. |
31 |
-- glibc_version=$(LC_ALL=C /lib/libc.so.6 | sed -e 's/[^0-9]*\([0-9]\.[0-9]\+\).*/\1/;s/\.\([0-9]\)$/.0\1/;q') |
32 |
-- |
33 |
-- MALLOC_CHECK_=2 # Default to 2 unless glibc 2.9 or higher. |
34 |
-- test $glibc_version \> 2.08 && MALLOC_CHECK_=3 |
35 |
-- |
36 |
-- export MALLOC_CHECK_ |
37 |
--fi |
38 |
-- |
39 |
- # in case we have been started with full pathname spec without being in PATH |
40 |
- bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'` |
41 |
- if [ -n "$bindir" ]; then |
42 |
|
43 |
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild |
44 |
index 7df5355..7e9525c 100644 |
45 |
--- a/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild |
46 |
+++ b/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild |
47 |
@@ -71,7 +71,7 @@ src_install() { |
48 |
doexe "${T}/KDE-4" |
49 |
|
50 |
# freedesktop compliant session script |
51 |
- sed -e "s:\${KDE4_BIN_INSTALL_DIR}:${EPREFIX}/usr/bin:g" \ |
52 |
+ sed -e "s:\${BIN_INSTALL_DIR}:${EPREFIX}/usr/bin:g" \ |
53 |
"${S}/kdm/kfrontend/sessions/kde-plasma.desktop.cmake" > "${T}/KDE-4.desktop" |
54 |
insinto /usr/share/xsessions |
55 |
doins "${T}/KDE-4.desktop" |