diff options
-rw-r--r-- | kde-common-PLD.patch | 174 |
1 files changed, 0 insertions, 174 deletions
diff --git a/kde-common-PLD.patch b/kde-common-PLD.patch deleted file mode 100644 index 21a7c91..0000000 --- a/kde-common-PLD.patch +++ /dev/null @@ -1,174 +0,0 @@ ---- kdelibs-3.5.3.or/admin/acinclude.m4.in 2006-05-23 13:02:06.000000000 +0000 -+++ kdelibs-3.5.3/admin/acinclude.m4.in 2006-07-01 14:55:49.345359250 +0000 -@@ -428,7 +428,7 @@ - if test "$1" = "default"; then - - if test -z "$kde_htmldir"; then -- kde_htmldir='\${datadir}/doc/HTML' -+ kde_htmldir='/usr/share/doc/kde/HTML' - fi - if test -z "$kde_appsdir"; then - kde_appsdir='\${datadir}/applnk' -@@ -2977,41 +2977,6 @@ - - AC_DEFUN([KDE_CHECK_FOR_BAD_COMPILER], - [ -- AC_MSG_CHECKING([whether $CC is blacklisted]) -- -- dnl In theory we have tu run this test against $CC and $CXX -- dnl in C and in C++ mode, because its perfectly legal for -- dnl the user to mix compiler versions, since C has a defined -- dnl ABI. -- dnl -- dnl For now, we assume the user is not on crack. -- -- AC_TRY_COMPILE([ --#ifdef __GNUC__ --#if __GNUC__ == 4 && __GNUC_MINOR__ == 0 && __GNUC_PATCHLEVEL__ == 0 --choke me --#endif --#endif --], , -- kde_bad_compiler=no, -- kde_bad_compiler=yes --) -- -- AC_MSG_RESULT($kde_bad_compiler) -- --if test "$kde_bad_compiler" = "yes"; then -- AC_MSG_ERROR([ -- --This particular compiler version is blacklisted because it --is known to miscompile KDE. Please use a newer version, or --if that is not yet available, choose an older version. -- --Please do not report a bug or bother us reporting this --configure error. We know about it, and we introduced --it by intention to avoid untraceable bugs or crashes in KDE. -- --]) --fi - - ]) - -@@ -3153,8 +3118,6 @@ - - AC_PROG_CXX - -- KDE_CHECK_FOR_BAD_COMPILER -- - if test "$GXX" = "yes" || test "$CXX" = "KCC"; then - if test "$kde_use_debug_code" != "no"; then - if test "$CXX" = "KCC"; then -@@ -4579,9 +4542,9 @@ - LIBPYTHON=-lpython$version - fi - --AC_FIND_FILE(python$version/copy.py, $python_libdirs, python_moddir) -+AC_FIND_FILE(python$version/copy.pyc, "/usr/share" , python_moddir) - python_moddir=$python_moddir/python$version --if test ! -r $python_moddir/copy.py; then -+if test ! -r $python_moddir/copy.pyc; then - python_moddir=no - fi - -@@ -4728,32 +4691,11 @@ - [ - AC_MSG_CHECKING([for utmp file]) - -- AC_CACHE_VAL(kde_cv_utmp_file, -- [ -- kde_cv_utmp_file=no -+ AC_CACHE_VAL(kde_cv_utmp_file, [kde_cv_utmp_file=/var/run/utmpx]) - -- for ac_file in \ -- \ -- /var/run/utmp \ -- /var/adm/utmp \ -- /etc/utmp \ -- ; \ -- do -- if test -r "$ac_file"; then -- kde_cv_utmp_file=$ac_file -- break -- fi -- done -- ]) -- -- if test "$kde_cv_utmp_file" != "no"; then -- AC_DEFINE_UNQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries]) -- $1 -- AC_MSG_RESULT($kde_cv_utmp_file) -- else -- $2 -- AC_MSG_RESULT([non found]) -- fi -+ AC_DEFINE_UNQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries]) -+ $1 -+ AC_MSG_RESULT(We are using $kde_cv_utmp_file in PLD instead.) - ]) - - -@@ -5536,7 +5478,7 @@ - kde_qtdir="$with_qt_dir" - fi - --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) -+AC_FIND_FILE(qsql.html, [ /usr/share/doc/qt-doc/html ], QTDOCDIR) - AC_MSG_RESULT($QTDOCDIR) - - AC_SUBST(QTDOCDIR) ---- gwenview-1.4.0/admin/am_edit 2006-09-25 00:04:55.213036950 +0300 -+++ kdelibs-3.5.5/admin/am_edit 2006-10-03 11:40:08.052152886 +0300 -@@ -499,6 +499,15 @@ - } - } - -+ $lookup = '(CXXLINK = \$\(LIBTOOL\).*--mode=link.*) \$\(CXXLD\)'; -+ if ($MakefileData =~ m/$lookup/) { -+ substituteLine($lookup, "$1 \"\$\(CXXLD\)\""); -+ } -+ $lookup = '(LINK = \$\(LIBTOOL\).*--mode=link.*) \$\(CCLD\)'; -+ if ($MakefileData =~ m/$lookup/) { -+ substituteLine($lookup, "$1 \"\$\(CCLD\)\""); -+ } -+ - $MakefileData =~ s/\$\(KCXXFLAGS\)/\$\(CXXFLAGS\)/g; - - $lookup = '(.*)cp -pr \$\$/\$\$file \$\(distdir\)/\$\$file(.*)'; -@@ -578,6 +587,14 @@ - local @kde_options = split(/[\034\s]+/, $kde_options_str); - if (grep(/^foreign$/, @kde_options)) { - push(@foreignfiles, $makefileDir . "/"); -+ -+ # always do this. don't care if it's foreign file. we *need* CXXLD quoted for libtool argument. -+ $lookup = '(CXXLINK = \$\(LIBTOOL\).*--mode=link) \$\(CXXLD\)'; -+ if ($MakefileData =~ m/$lookup/) { -+ substituteLine($lookup, "$1 \"\$\(CXXLD\)\""); -+ updateMakefile (); -+ } -+ - return 0; # don't touch me - } - for $opt (@kde_options) { - ---- x/admin/acinclude.m4.in.orig 2008-10-08 10:18:48.844247699 +0200 -+++ x/admin/acinclude.m4.in 2008-10-08 10:21:26.884232831 +0200 -@@ -4612,7 +4612,8 @@ - - AC_DEFUN([KDE_CHECK_PYTHON], - [ -- KDE_CHECK_PYTHON_INTERN("2.5", -+ KDE_CHECK_PYTHON_INTERN("2.6", -+ [KDE_CHECK_PYTHON_INTERN("2.5", - [KDE_CHECK_PYTHON_INTERN("2.4", - [KDE_CHECK_PYTHON_INTERN("2.3", - [KDE_CHECK_PYTHON_INTERN("2.2", -@@ -4624,6 +4625,7 @@ - ]) - ]) - ]) -+ ]) - ]) - - AC_DEFUN([KDE_CHECK_STL], |