- drop obsolete files
[packages/akode.git] / kde-common-PLD.patch
CommitLineData
251e5330
AM
1--- kdelibs-3.5.3.or/admin/acinclude.m4.in 2006-05-23 13:02:06.000000000 +0000
2+++ kdelibs-3.5.3/admin/acinclude.m4.in 2006-07-01 14:55:49.345359250 +0000
34f22e5d 3@@ -428,7 +428,7 @@
3083e66b 4 if test "$1" = "default"; then
5
6 if test -z "$kde_htmldir"; then
7- kde_htmldir='\${datadir}/doc/HTML'
8+ kde_htmldir='/usr/share/doc/kde/HTML'
9 fi
10 if test -z "$kde_appsdir"; then
11 kde_appsdir='\${datadir}/applnk'
251e5330 12@@ -2977,41 +2977,6 @@
7c50ea40
AM
13
14 AC_DEFUN([KDE_CHECK_FOR_BAD_COMPILER],
15 [
16- AC_MSG_CHECKING([whether $CC is blacklisted])
17-
18- dnl In theory we have tu run this test against $CC and $CXX
19- dnl in C and in C++ mode, because its perfectly legal for
20- dnl the user to mix compiler versions, since C has a defined
21- dnl ABI.
22- dnl
23- dnl For now, we assume the user is not on crack.
24-
25- AC_TRY_COMPILE([
26-#ifdef __GNUC__
27-#if __GNUC__ == 4 && __GNUC_MINOR__ == 0 && __GNUC_PATCHLEVEL__ == 0
28-choke me
29-#endif
30-#endif
31-], ,
32- kde_bad_compiler=no,
33- kde_bad_compiler=yes
34-)
35-
36- AC_MSG_RESULT($kde_bad_compiler)
37-
38-if test "$kde_bad_compiler" = "yes"; then
39- AC_MSG_ERROR([
40-
41-This particular compiler version is blacklisted because it
42-is known to miscompile KDE. Please use a newer version, or
43-if that is not yet available, choose an older version.
44-
45-Please do not report a bug or bother us reporting this
46-configure error. We know about it, and we introduced
47-it by intention to avoid untraceable bugs or crashes in KDE.
48-
49-])
50-fi
51
52 ])
53
251e5330 54@@ -3153,8 +3118,6 @@
7c50ea40
AM
55
56 AC_PROG_CXX
57
58- KDE_CHECK_FOR_BAD_COMPILER
59-
60 if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
61 if test "$kde_use_debug_code" != "no"; then
62 if test "$CXX" = "KCC"; then
251e5330 63@@ -4579,9 +4542,9 @@
34f22e5d 64 LIBPYTHON=-lpython$version
65 fi
66
67-AC_FIND_FILE(python$version/copy.py, $python_libdirs, python_moddir)
68+AC_FIND_FILE(python$version/copy.pyc, "/usr/share" , python_moddir)
69 python_moddir=$python_moddir/python$version
70-if test ! -r $python_moddir/copy.py; then
71+if test ! -r $python_moddir/copy.pyc; then
72 python_moddir=no
73 fi
74
251e5330 75@@ -4728,32 +4691,11 @@
3083e66b 76 [
77 AC_MSG_CHECKING([for utmp file])
78
79- AC_CACHE_VAL(kde_cv_utmp_file,
80- [
81- kde_cv_utmp_file=no
7c50ea40
AM
82+ AC_CACHE_VAL(kde_cv_utmp_file, [kde_cv_utmp_file=/var/run/utmpx])
83
3083e66b 84- for ac_file in \
85- \
86- /var/run/utmp \
87- /var/adm/utmp \
88- /etc/utmp \
89- ; \
90- do
91- if test -r "$ac_file"; then
92- kde_cv_utmp_file=$ac_file
93- break
94- fi
95- done
96- ])
7c50ea40 97-
3083e66b 98- if test "$kde_cv_utmp_file" != "no"; then
99- AC_DEFINE_UNQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries])
100- $1
101- AC_MSG_RESULT($kde_cv_utmp_file)
102- else
103- $2
104- AC_MSG_RESULT([non found])
105- fi
106+ AC_DEFINE_UNQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries])
107+ $1
108+ AC_MSG_RESULT(We are using $kde_cv_utmp_file in PLD instead.)
109 ])
110
111
251e5330 112@@ -5536,7 +5478,7 @@
3083e66b 113 kde_qtdir="$with_qt_dir"
114 fi
115
116-AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $QTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ], QTDOCDIR)
117+AC_FIND_FILE(qsql.html, [ /usr/share/doc/qt-doc/html ], QTDOCDIR)
118 AC_MSG_RESULT($QTDOCDIR)
119
120 AC_SUBST(QTDOCDIR)
95416ace
ER
121--- gwenview-1.4.0/admin/am_edit 2006-09-25 00:04:55.213036950 +0300
122+++ kdelibs-3.5.5/admin/am_edit 2006-10-03 11:40:08.052152886 +0300
123@@ -499,6 +499,15 @@
7e4269a4
ER
124 }
125 }
126
95416ace 127+ $lookup = '(CXXLINK = \$\(LIBTOOL\).*--mode=link.*) \$\(CXXLD\)';
7e4269a4
ER
128+ if ($MakefileData =~ m/$lookup/) {
129+ substituteLine($lookup, "$1 \"\$\(CXXLD\)\"");
130+ }
95416ace
ER
131+ $lookup = '(LINK = \$\(LIBTOOL\).*--mode=link.*) \$\(CCLD\)';
132+ if ($MakefileData =~ m/$lookup/) {
133+ substituteLine($lookup, "$1 \"\$\(CCLD\)\"");
134+ }
7e4269a4
ER
135+
136 $MakefileData =~ s/\$\(KCXXFLAGS\)/\$\(CXXFLAGS\)/g;
137
138 $lookup = '(.*)cp -pr \$\$/\$\$file \$\(distdir\)/\$\$file(.*)';
95416ace 139@@ -578,6 +587,14 @@
13764517
ER
140 local @kde_options = split(/[\034\s]+/, $kde_options_str);
141 if (grep(/^foreign$/, @kde_options)) {
142 push(@foreignfiles, $makefileDir . "/");
143+
144+ # always do this. don't care if it's foreign file. we *need* CXXLD quoted for libtool argument.
145+ $lookup = '(CXXLINK = \$\(LIBTOOL\).*--mode=link) \$\(CXXLD\)';
146+ if ($MakefileData =~ m/$lookup/) {
147+ substituteLine($lookup, "$1 \"\$\(CXXLD\)\"");
148+ updateMakefile ();
149+ }
150+
151 return 0; # don't touch me
152 }
153 for $opt (@kde_options) {
2a126ce0
AM
154
155--- x/admin/acinclude.m4.in.orig 2008-10-08 10:18:48.844247699 +0200
156+++ x/admin/acinclude.m4.in 2008-10-08 10:21:26.884232831 +0200
157@@ -4612,7 +4612,8 @@
158
159 AC_DEFUN([KDE_CHECK_PYTHON],
160 [
161- KDE_CHECK_PYTHON_INTERN("2.5",
162+ KDE_CHECK_PYTHON_INTERN("2.6",
163+ [KDE_CHECK_PYTHON_INTERN("2.5",
164 [KDE_CHECK_PYTHON_INTERN("2.4",
165 [KDE_CHECK_PYTHON_INTERN("2.3",
166 [KDE_CHECK_PYTHON_INTERN("2.2",
167@@ -4624,6 +4625,7 @@
168 ])
169 ])
170 ])
171+ ])
172 ])
173
174 AC_DEFUN([KDE_CHECK_STL],
This page took 0.064545 seconds and 4 git commands to generate.