From 05f68626ba897c29e280ed83629d89cd98b04779 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 30 Jul 2007 20:10:08 +0000 Subject: [PATCH] import kdelibs3 --- .cvsignore | 1 + devices.protocol | 18 + kde-3.5-libtool-shlibext.patch | 72 ++ kde.csh | 17 + kde.sh | 15 + kdelibs-3.0.0-ndebug.patch | 11 + kdelibs-3.0.4-ksyscoca.patch | 29 + kdelibs-3.2.3-cups.patch | 7 + kdelibs-3.3.2-ppc.patch | 10 + kdelibs-3.4.0-qtdoc.patch | 11 + kdelibs-3.4.91-buildroot.patch | 26 + kdelibs-3.4.92-inttype.patch | 11 + kdelibs-3.5.0-101956.patch | 32 + kdelibs-3.5.1-xdg-menu.patch | 21 + kdelibs-3.5.2-cupsdconf2-group.patch | 25 + kdelibs-3.5.2-kdebug-kmail-quiet.patch | 11 + kdelibs-3.5.4-kabc-make.patch | 10 + kdelibs-3.5.4-kdeprint-utf8.patch | 11 + kdelibs-3.5.5-kstandarddirs.patch | 14 + kdelibs-3.5.5-lib_loader-1.2.patch | 169 +++ kdelibs-3.5.6-137675.patch | 133 +++ kdelibs-3.5.6-lang.patch | 17 + kdelibs-3.5.6-utempter.patch | 113 ++ kdelibs-3.5.7-cups13.patch | 82 ++ kdelibs-3.5.7-kde#146105.patch | 36 + kdelibs-3.5.7-openssl.patch | 34 + kdelibs3.spec | 1323 ++++++++++++++++++++++++ sources | 1 + 28 files changed, 2260 insertions(+) create mode 100644 devices.protocol create mode 100644 kde-3.5-libtool-shlibext.patch create mode 100755 kde.csh create mode 100755 kde.sh create mode 100644 kdelibs-3.0.0-ndebug.patch create mode 100644 kdelibs-3.0.4-ksyscoca.patch create mode 100644 kdelibs-3.2.3-cups.patch create mode 100644 kdelibs-3.3.2-ppc.patch create mode 100644 kdelibs-3.4.0-qtdoc.patch create mode 100644 kdelibs-3.4.91-buildroot.patch create mode 100644 kdelibs-3.4.92-inttype.patch create mode 100644 kdelibs-3.5.0-101956.patch create mode 100644 kdelibs-3.5.1-xdg-menu.patch create mode 100644 kdelibs-3.5.2-cupsdconf2-group.patch create mode 100644 kdelibs-3.5.2-kdebug-kmail-quiet.patch create mode 100644 kdelibs-3.5.4-kabc-make.patch create mode 100644 kdelibs-3.5.4-kdeprint-utf8.patch create mode 100644 kdelibs-3.5.5-kstandarddirs.patch create mode 100644 kdelibs-3.5.5-lib_loader-1.2.patch create mode 100644 kdelibs-3.5.6-137675.patch create mode 100644 kdelibs-3.5.6-lang.patch create mode 100644 kdelibs-3.5.6-utempter.patch create mode 100644 kdelibs-3.5.7-cups13.patch create mode 100644 kdelibs-3.5.7-kde#146105.patch create mode 100644 kdelibs-3.5.7-openssl.patch create mode 100644 kdelibs3.spec diff --git a/.cvsignore b/.cvsignore index e69de29..f19b5c6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +kdelibs-3.5.7.tar.bz2 diff --git a/devices.protocol b/devices.protocol new file mode 100644 index 0000000..a7055e3 --- /dev/null +++ b/devices.protocol @@ -0,0 +1,18 @@ +[Protocol] +exec=kio_media +protocol=devices +input=none +output=filesystem +listing=Name,Type,Size,Date,AccessDate,Access,Owner,Group,Link +reading=true +writing=true +makedir=true +deleting=true +linking=true +moving=true +Icon=system +maxInstances=4 +#TODO DocPath=kioslave/file.html +Class=:local +deleteRecursive=true +fileNameUsedForCopying=Name diff --git a/kde-3.5-libtool-shlibext.patch b/kde-3.5-libtool-shlibext.patch new file mode 100644 index 0000000..3c482b8 --- /dev/null +++ b/kde-3.5-libtool-shlibext.patch @@ -0,0 +1,72 @@ +Index: arts-1.5.4/acinclude.m4 +=================================================================== +--- arts-1.5.4.orig/acinclude.m4 ++++ arts-1.5.4/acinclude.m4 +@@ -12040,28 +12040,12 @@ fi + ])# AC_LTDL_SYS_DLOPEN_DEPLIBS + + AC_DEFUN([AC_LTDL_SHLIBEXT], +-[AC_REQUIRE([AC_LTDL_SNARF_CONFIG])dnl ++[AC_REQUIRE([AC_LIBTOOL_SYS_DYNAMIC_LINKER])dnl + AC_CACHE_CHECK([which extension is used for shared libraries], + libltdl_cv_shlibext, [dnl +-( +- last= +- case "$host_os" in +- cygwin* | mingw*) +- last=".dll" +- ;; +- *) +- for spec in $library_names_spec; do +- last="$spec" +- done +- ;; +- esac +-changequote(, ) +- echo "$last" | sed 's/\[.*\]//;s/^[^.]*//;s/\$.*$//;s/\.$//' > conftest +-changequote([, ]) +-) +-libltdl_cv_shlibext=`cat conftest` +-rm -f conftest +-]) ++module=yes ++eval libltdl_cv_shlibext=$shrext ++ ]) + if test -n "$libltdl_cv_shlibext"; then + AC_DEFINE_UNQUOTED(LTDL_SHLIB_EXT, "$libltdl_cv_shlibext", + [Define to the extension used for shared libraries, say, ".so". ]) +Index: arts-1.5.4/libltdl/ltdl.m4 +=================================================================== +--- arts-1.5.4.orig/libltdl/ltdl.m4 ++++ arts-1.5.4/libltdl/ltdl.m4 +@@ -118,27 +118,11 @@ fi + ])# AC_LTDL_SYS_DLOPEN_DEPLIBS + + AC_DEFUN([AC_LTDL_SHLIBEXT], +-[AC_REQUIRE([AC_LTDL_SNARF_CONFIG])dnl ++[AC_REQUIRE([AC_LIBTOOL_SYS_DYNAMIC_LINKER])dnl + AC_CACHE_CHECK([which extension is used for shared libraries], + libltdl_cv_shlibext, [dnl +-( +- last= +- case "$host_os" in +- cygwin* | mingw*) +- last=".dll" +- ;; +- *) +- for spec in $library_names_spec; do +- last="$spec" +- done +- ;; +- esac +-changequote(, ) +- echo "$last" | sed 's/\[.*\]//;s/^[^.]*//;s/\$.*$//;s/\.$//' > conftest +-changequote([, ]) +-) +-libltdl_cv_shlibext=`cat conftest` +-rm -f conftest ++module=yes ++eval libltdl_cv_shlibext=$shrext + ]) + if test -n "$libltdl_cv_shlibext"; then + AC_DEFINE_UNQUOTED(LTDL_SHLIB_EXT, "$libltdl_cv_shlibext", diff --git a/kde.csh b/kde.csh new file mode 100755 index 0000000..cf3fe74 --- /dev/null +++ b/kde.csh @@ -0,0 +1,17 @@ +## http://kde.ground.cz/tiki-index.php?page=Environment+Variables +## for possible entries here + +# When/if using prelinking, avoids (some) use of kdeinit +if ( -f /etc/sysconfig/prelink ) then + set PRELINKING = `grep "^PRELINKING=" /etc/sysconfig/prelink | cut -d"=" -f2` + if ( "$PRELINKING" == "yes" ) then + if ( ! $?KDE_IS_PRELINKED ) setenv KDE_IS_PRELINKED 1 + endif +endif + +# if not using IP6, speeds DNS operations +# if ( ! $?KDE_NO_IPV6 ) setenv KDE_NO_IPV6 1 + +# Make sure KDEDIRS is set +if ( ! $?KDEDIRS ) setenv KDEDIRS /usr + diff --git a/kde.sh b/kde.sh new file mode 100755 index 0000000..6a580fb --- /dev/null +++ b/kde.sh @@ -0,0 +1,15 @@ +## http://kde.ground.cz/tiki-index.php?page=Environment+Variables +## for possible entries here + +## When/if using prelinking, avoids (some) use of kdeinit +if [ -f /etc/sysconfig/prelink ]; then + if [ `grep '^PRELINKING=yes' /etc/sysconfig/prelink` ] ; then + [ -z "$KDE_IS_PRELINKED" ] && KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED + fi +fi + +## IPV6 support +#[ -z "$KDE_NO_IPV6" ] && KDE_NO_IPV6=1 && export KDE_NO_IPV6 + +## Make sure KDEDIRS is set +[ -z "$KDEDIRS" ] && KDEDIRS="/usr" && export KDEDIRS diff --git a/kdelibs-3.0.0-ndebug.patch b/kdelibs-3.0.0-ndebug.patch new file mode 100644 index 0000000..683a360 --- /dev/null +++ b/kdelibs-3.0.0-ndebug.patch @@ -0,0 +1,11 @@ +--- kdelibs/kdecore/kdebug.cpp.ndebug Mon Mar 11 16:44:31 2002 ++++ kdelibs/kdecore/kdebug.cpp Mon Mar 11 16:45:19 2002 +@@ -224,7 +224,7 @@ + break; + } + +- short nOutput = kDebug_data->config ? kDebug_data->config->readNumEntry(key, 2) : 2; ++ short nOutput = kDebug_data->config ? kDebug_data->config->readNumEntry(key, 4) : 4; + + // If the application doesn't have a QApplication object it can't use + // a messagebox. diff --git a/kdelibs-3.0.4-ksyscoca.patch b/kdelibs-3.0.4-ksyscoca.patch new file mode 100644 index 0000000..55c5436 --- /dev/null +++ b/kdelibs-3.0.4-ksyscoca.patch @@ -0,0 +1,29 @@ +--- kdelibs-3.0.4/kdecore/ksycoca.cpp.ksyscoca 2002-09-09 20:25:56.000000000 -0400 ++++ kdelibs-3.0.4/kdecore/ksycoca.cpp 2002-10-10 12:16:39.000000000 -0400 +@@ -149,9 +149,15 @@ + } + + static void delete_ksycoca_self() { +- delete KSycoca::_self; ++ if (KSycoca::_checkSelf()) ++ delete KSycoca::_self; ++ + } + ++bool KSycoca::_checkSelf() { ++ return (_self ? true : false); ++} ++ + KSycoca * KSycoca::self() + { + if (!_self) { +--- kdelibs-3.0.4/kdecore/ksycoca.h.ksyscoca 2002-09-09 20:25:56.000000000 -0400 ++++ kdelibs-3.0.4/kdecore/ksycoca.h 2002-10-10 11:54:28.000000000 -0400 +@@ -63,6 +63,7 @@ + * Get or create the only instance of KSycoca (read-only) + */ + static KSycoca *self(); ++ static bool _checkSelf(); + + virtual ~KSycoca(); + diff --git a/kdelibs-3.2.3-cups.patch b/kdelibs-3.2.3-cups.patch new file mode 100644 index 0000000..97491c8 --- /dev/null +++ b/kdelibs-3.2.3-cups.patch @@ -0,0 +1,7 @@ +--- kdelibs-3.2.3/kdeprint/kdeprintrc.orig 2004-07-19 12:45:04.575573066 +0200 ++++ kdelibs-3.2.3/kdeprint/kdeprintrc 2004-07-19 12:45:27.141880905 +0200 +@@ -3,3 +3,4 @@ + ViewType=1 + ViewToolBar=true + ViewPrinterInfos=true ++PrintSystem=cups diff --git a/kdelibs-3.3.2-ppc.patch b/kdelibs-3.3.2-ppc.patch new file mode 100644 index 0000000..90aabe7 --- /dev/null +++ b/kdelibs-3.3.2-ppc.patch @@ -0,0 +1,10 @@ +--- kdelibs-3.3.2/kdefx/kcpuinfo.cpp.orig 2004-12-15 11:17:53.549403872 -0500 ++++ kdelibs-3.3.2/kdefx/kcpuinfo.cpp 2004-12-15 11:18:26.312348696 -0500 +@@ -30,6 +30,7 @@ + #include + #include "kcpuinfo.h" + ++#undef HAVE_PPC_ALTIVEC + + #if defined(__GNUC__) || defined(__INTEL_COMPILER) + # define HAVE_GNU_INLINE_ASM diff --git a/kdelibs-3.4.0-qtdoc.patch b/kdelibs-3.4.0-qtdoc.patch new file mode 100644 index 0000000..97bd765 --- /dev/null +++ b/kdelibs-3.4.0-qtdoc.patch @@ -0,0 +1,11 @@ +--- kdelibs-3.4.0/admin/acinclude.m4.in.orig 2005-04-01 19:01:33.000000000 +0200 ++++ kdelibs-3.4.0/admin/acinclude.m4.in 2005-04-01 19:03:15.000000000 +0200 +@@ -5317,7 +5317,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, [ $kde_qtdir/doc/html $QTDOC/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_MSG_RESULT($QTDOCDIR) + + AC_SUBST(QTDOCDIR) diff --git a/kdelibs-3.4.91-buildroot.patch b/kdelibs-3.4.91-buildroot.patch new file mode 100644 index 0000000..8163b86 --- /dev/null +++ b/kdelibs-3.4.91-buildroot.patch @@ -0,0 +1,26 @@ +--- kdelibs-3.4.91/kdecore/Makefile.am.orig 2005-09-27 17:15:22.000000000 +0200 ++++ kdelibs-3.4.91/kdecore/Makefile.am 2005-09-27 17:14:37.000000000 +0200 +@@ -172,14 +172,6 @@ + kgrantpty_LDFLAGS = $(KDE_USE_PIE) $(KDE_RPATH) $(all_libraries) + kgrantpty_LDADD = ./libkdefakes.la + +-# kgrantpty needs to be installed setuid root +-install-exec-hook: +- @(chown 0 $(DESTDIR)$(bindir)/kgrantpty && chmod 4755 $(DESTDIR)$(bindir)/kgrantpty) || echo "Please make kgrantpty setuid root" >&2 +- @echo "" +- @echo "kgrantpty is by default installed with a set SETUID root bit!" +- @echo "This is needed for konsole, etc. to ensure that they can't be eavesdropped." +- @echo "" +- + DISTCLEANFILES = kde-config.cpp + + DOXYGEN_REFERENCES = dcop kdeui kparts kio +--- kdelibs-3.4.91/kio/misc/kpac/Makefile.am.orig 2005-09-27 17:15:39.000000000 +0200 ++++ kdelibs-3.4.91/kio/misc/kpac/Makefile.am 2005-09-27 17:15:58.000000000 +0200 +@@ -24,6 +24,3 @@ + + proxyscoutdatadir = $(kde_datadir)/proxyscout + proxyscoutdata_DATA = eventsrc +- +-install-exec-local: +- @(chown root $(DESTDIR)$(bindir)/kpac_dhcp_helper && chmod 4755 $(DESTDIR)$(bindir)/kpac_dhcp_helper) || echo "Please make kpac_dhcp_helper setuid root" diff --git a/kdelibs-3.4.92-inttype.patch b/kdelibs-3.4.92-inttype.patch new file mode 100644 index 0000000..95c8796 --- /dev/null +++ b/kdelibs-3.4.92-inttype.patch @@ -0,0 +1,11 @@ +--- kdelibs-3.4.92/kwallet/backend/sha1.cc.orig 2005-10-24 08:01:18.000000000 -0400 ++++ kdelibs-3.4.92/kwallet/backend/sha1.cc 2005-10-24 08:11:28.000000000 -0400 +@@ -27,6 +27,8 @@ + #include /* For uintXX_t on Tru64 */ + #endif + ++#include ++ + #include "sha1.h" + #include + diff --git a/kdelibs-3.5.0-101956.patch b/kdelibs-3.5.0-101956.patch new file mode 100644 index 0000000..bd7f304 --- /dev/null +++ b/kdelibs-3.5.0-101956.patch @@ -0,0 +1,32 @@ +--- kdelibs-3.5.0/kioslave/http/http.cc.101956 2005-11-08 16:39:17.000000000 -0600 ++++ kdelibs-3.5.0/kioslave/http/http.cc 2005-12-01 13:23:39.000000000 -0600 +@@ -2103,6 +2103,8 @@ + return false; + } + ++ bool bCacheOnly = (m_request.cache == KIO::CC_CacheOnly); ++ + m_request.fcache = 0; + m_request.bCachedRead = false; + m_request.bCachedWrite = false; +@@ -2114,7 +2116,6 @@ + { + m_request.fcache = checkCacheEntry( ); + +- bool bCacheOnly = (m_request.cache == KIO::CC_CacheOnly); + bool bOffline = isOffline(m_request.doProxy ? m_proxyURL : m_request.url); + if (bOffline && (m_request.cache != KIO::CC_Reload)) + m_request.cache = KIO::CC_CacheOnly; +@@ -2156,6 +2157,12 @@ + return false; + } + } ++ else if (bCacheOnly) ++ { ++ // Instructed to only check cache, but _not_ to use cache. Oops. ++ error( ERR_DOES_NOT_EXIST, m_request.url.url() ); ++ return false; ++ } + + QString header; + QString davHeader; diff --git a/kdelibs-3.5.1-xdg-menu.patch b/kdelibs-3.5.1-xdg-menu.patch new file mode 100644 index 0000000..804cdbc --- /dev/null +++ b/kdelibs-3.5.1-xdg-menu.patch @@ -0,0 +1,21 @@ +--- kdelibs-3.5.1/kded/applications.menu.orig 2006-02-21 14:30:11.000000000 +0100 ++++ kdelibs-3.5.1/kded/applications.menu 2006-02-21 14:30:16.000000000 +0100 +@@ -31,12 +31,16 @@ + Core + KDE + +- +- X-SuSE-YaST ++ X-Red-Hat-Base + + + + ++ System Settings ++ system-settings.menu ++ ++ ++ + Development + kde-development.directory + diff --git a/kdelibs-3.5.2-cupsdconf2-group.patch b/kdelibs-3.5.2-cupsdconf2-group.patch new file mode 100644 index 0000000..cd3f153 --- /dev/null +++ b/kdelibs-3.5.2-cupsdconf2-group.patch @@ -0,0 +1,25 @@ +--- kdelibs-3.5.2/kdeprint/cups/cupsdconf2/cupsd.conf.template.tn 2006-05-22 14:51:46.000000000 +0200 ++++ kdelibs-3.5.2/kdeprint/cups/cupsdconf2/cupsd.conf.template 2006-05-22 15:27:27.000000000 +0200 +@@ -275,9 +275,9 @@ + # must be sys, however you can configure things for another + # group as needed.

+ #

+-# ex: sys

++# ex: lp

+ $$ +-#Group sys ++#Group lp + @@ + + %%ripcache +--- kdelibs-3.5.2/kdeprint/cups/cupsdconf2/cupsdconf.cpp.tn 2006-05-22 15:26:15.000000000 +0200 ++++ kdelibs-3.5.2/kdeprint/cups/cupsdconf2/cupsdconf.cpp 2006-05-22 15:26:32.000000000 +0200 +@@ -115,7 +115,7 @@ + maxjobsperprinter_ = 0; + maxjobsperuser_ = 0; + user_ = "lp"; +- group_ = "sys"; ++ group_ = "lp"; + ripcache_ = "8m"; + filterlimit_ = 0; + browsing_ = true; diff --git a/kdelibs-3.5.2-kdebug-kmail-quiet.patch b/kdelibs-3.5.2-kdebug-kmail-quiet.patch new file mode 100644 index 0000000..6c60080 --- /dev/null +++ b/kdelibs-3.5.2-kdebug-kmail-quiet.patch @@ -0,0 +1,11 @@ +--- kdelibs-3.5.2/kdecore/kdebugrc.orig 2006-05-03 16:12:27.000000000 +0200 ++++ kdelibs-3.5.2/kdecore/kdebugrc 2006-05-03 16:12:35.000000000 +0200 +@@ -82,7 +82,7 @@ + + # KMail + [5006] +-InfoOutput=2 ++InfoOutput=4 + + # KitchenSync (Syncing Algorithm) + [5250] diff --git a/kdelibs-3.5.4-kabc-make.patch b/kdelibs-3.5.4-kabc-make.patch new file mode 100644 index 0000000..021cd14 --- /dev/null +++ b/kdelibs-3.5.4-kabc-make.patch @@ -0,0 +1,10 @@ +--- kdelibs-3.5.4/kabc/Makefile.am.orig 2006-09-29 12:07:44.000000000 +0200 ++++ kdelibs-3.5.4/kabc/Makefile.am 2006-09-29 12:06:01.000000000 +0200 +@@ -55,6 +55,7 @@ + kab2kabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) + kab2kabc_LDADD = libkabc.la ../kab/libkab.la + kab2kabc_SOURCES = kab2kabc.cpp ++kab2kabc_COMPILE_FIRST = addressee.h + + autostart_DATA = kab2kabc.desktop + autostartdir = $(datadir)/autostart diff --git a/kdelibs-3.5.4-kdeprint-utf8.patch b/kdelibs-3.5.4-kdeprint-utf8.patch new file mode 100644 index 0000000..ea500ca --- /dev/null +++ b/kdelibs-3.5.4-kdeprint-utf8.patch @@ -0,0 +1,11 @@ +--- kdelibs-3.5.4/kdeprint/cups/kmcupsmanager.cpp.orig 2006-10-01 21:55:49.000000000 +0200 ++++ kdelibs-3.5.4/kdeprint/cups/kmcupsmanager.cpp 2006-10-01 21:56:08.000000000 +0200 +@@ -85,7 +85,7 @@ + // change LANG variable so that CUPS is always using + // english language: translation may only come from the PPD + // itself, or from KDE. +- setenv("LANG", "en", 1); ++ setenv("LANG", "en_US.UTF-8", 1); + } + + KMCupsManager::~KMCupsManager() diff --git a/kdelibs-3.5.5-kstandarddirs.patch b/kdelibs-3.5.5-kstandarddirs.patch new file mode 100644 index 0000000..651973e --- /dev/null +++ b/kdelibs-3.5.5-kstandarddirs.patch @@ -0,0 +1,14 @@ +diff -urN kdelibs-3.3.91.orig/kdecore/kstandarddirs.cpp kdelibs-3.3.91/kdecore/kstandarddirs.cpp +--- kdelibs-3.3.91.orig/kdecore/kstandarddirs.cpp 2005-01-14 21:46:57.964666000 -0800 ++++ kdelibs-3.3.91/kdecore/kstandarddirs.cpp 2005-01-14 21:49:53.043136983 -0800 +@@ -833,6 +833,10 @@ + if ((local || testdir.exists()) && !candidates->contains(path)) + candidates->append(path); + } ++ // UGLY HACK - Chris CHeney ++ if (local && (!strcmp("config", type))) ++ candidates->append("/etc/kde/"); ++ // + local = false; + } + } diff --git a/kdelibs-3.5.5-lib_loader-1.2.patch b/kdelibs-3.5.5-lib_loader-1.2.patch new file mode 100644 index 0000000..bb150cd --- /dev/null +++ b/kdelibs-3.5.5-lib_loader-1.2.patch @@ -0,0 +1,169 @@ + + kdecore/Makefile.am | 2 + + kdecore/klibloader.cpp | 86 +++++++++++++++++++++++++++---------------------- + kdecore/klibloader.h | 2 - + kinit/kinit.cpp | 8 +--- + 4 files changed, 55 insertions(+), 43 deletions(-) + +--- kdelibs-3.5.5/kdecore/Makefile.am.orig 2006-10-01 19:33:38.000000000 +0200 ++++ kdelibs-3.5.5/kdecore/Makefile.am 2007-01-05 00:17:27.235678750 +0100 +@@ -115,8 +115,10 @@ + kuser.cpp kconfigskeleton.cpp kconfigdialogmanager.cpp klockfile.cpp \ + kqiodevicegzip_p.cpp ktimezones.cpp + ++CXXFLAGS += -fexceptions + libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined + libkdecore_la_LIBADD = malloc/libklmalloc.la network/libkdecorenetwork.la $(SVGICON_LIB) ../dcop/libDCOP.la ../libltdl/libltdlc.la $(LIB_XEXT) $(LIBRESOLV) $(LIBUTIL) $(LIBART_LIBS) $(LIB_IDN) ../kdefx/libkdefx.la ++libkdecore_la_LIBADD += -lboost_filesystem -lboost_regex + libkdecore_la_NMCHECK = $(srcdir)/libkdecore.nmcheck + libkdecore_la_NMCHECKWEAK = $(srcdir)/libkdecore_weak.nmcheck $(srcdir)/libqt-mt_weak.nmcheck \ + $(top_srcdir)/dcop/libDCOP_weak.nmcheck $(top_srcdir)/kdecore/standard_weak.nmcheck +--- kdelibs-3.5.5/kdecore/klibloader.h.orig 2005-10-10 17:06:03.000000000 +0200 ++++ kdelibs-3.5.5/kdecore/klibloader.h 2007-01-04 23:19:39.868039250 +0100 +@@ -270,7 +270,7 @@ + * wants to open modules. + * @param name of the library. If it is not a path, the function searches in + * the "module" and "lib" resources. If there is no extension, +- * ".la" will be appended. ++ * ".so*" will be appended. + * @param instance a KInstance used to get the standard paths + */ + static QString findLibrary( const char * name, const KInstance * instance = KGlobal::instance() ); +--- kdelibs-3.5.5/kdecore/klibloader.cpp.orig 2006-01-19 17:06:18.000000000 +0000 ++++ kdelibs-3.5.5/kdecore/klibloader.cpp 2007-01-05 00:08:39.215039750 +0000 +@@ -331,43 +331,59 @@ + d = 0L; + } + +-static inline QCString makeLibName( const char* name ) ++#include ++#include ++#include ++#include ++ ++QCString makeSharedLibraryName( char const* name, QString const& dir ) + { +- QCString libname(name); +- // only append ".la" if there is no extension +- // this allows to load non-libtool libraries as well +- // (mhk, 20000228) +- int pos = libname.findRev('/'); +- if (pos < 0) +- pos = 0; +- if (libname.find('.', pos) < 0) +- libname += ".la"; +- return libname; ++ try ++ { ++ boost::filesystem::path d( dir.ascii() ); ++ std::string p = d.string() + "/" + name + ".so"; ++ if ( boost::filesystem::exists( p ) ) ++ return p.c_str(); ++ boost::regex re( p + "\\..+", boost::regex::extended ); ++ for ( boost::filesystem::directory_iterator i( d ); ++ i != boost::filesystem::directory_iterator(); ++i ) ++ { ++ boost::smatch m; ++ if ( boost::regex_match( i->string(), m, re ) ) ++ return m.str().c_str(); ++ } ++ } ++ catch ( boost::filesystem::filesystem_error const& ) ++ { ++ } ++ return QCString(); + } + +-//static + QString KLibLoader::findLibrary( const char * name, const KInstance * instance ) + { +- QCString libname = makeLibName( name ); +- +- // only look up the file if it is not an absolute filename +- // (mhk, 20000228) +- QString libfile; +- if (!QDir::isRelativePath(libname)) +- libfile = QFile::decodeName( libname ); +- else +- { +- libfile = instance->dirs()->findResource( "module", libname ); +- if ( libfile.isEmpty() ) +- { +- libfile = instance->dirs()->findResource( "lib", libname ); +-#ifndef NDEBUG +- if ( !libfile.isEmpty() && libname.left(3) == "lib" ) // don't warn for kdeinit modules +- kdDebug(150) << "library " << libname << " not found under 'module' but under 'lib'" << endl; +-#endif +- } +- } +- return libfile; ++ try ++ { ++ if ( boost::filesystem::exists( name ) ) ++ return name; ++ } ++ catch ( boost::filesystem::filesystem_error const& ) ++ { ++ } ++ QStringList dirs = instance->dirs()->resourceDirs( "module" ); ++ for ( QStringList::ConstIterator i = dirs.begin(); i != dirs.end(); ++i ) ++ { ++ QCString p = makeSharedLibraryName( name, *i ); ++ if ( !p.isNull() ) ++ return p; ++ } ++ dirs = instance->dirs()->resourceDirs( "lib" ); ++ for ( QStringList::ConstIterator i = dirs.begin(); i != dirs.end(); ++i ) ++ { ++ QCString p = makeSharedLibraryName( name, *i ); ++ if ( !p.isNull() ) ++ return p; ++ } ++ return QString::null; + } + + +@@ -418,11 +434,7 @@ + QString libfile = findLibrary( name ); + if ( libfile.isEmpty() ) + { +- const QCString libname = makeLibName( name ); +-#ifndef NDEBUG +- kdDebug(150) << "library=" << name << ": No file named " << libname << " found in paths." << endl; +-#endif +- d->errorMessage = i18n("Library files for \"%1\" not found in paths.").arg(libname); ++ d->errorMessage = i18n("Library files for \"%1\" not found in paths.").arg(name); + return 0; + } + +--- kdelibs-3.5.5/kinit/kinit.cpp.orig 2006-10-01 19:33:32.000000000 +0200 ++++ kdelibs-3.5.5/kinit/kinit.cpp 2007-01-04 23:39:00.780591750 +0100 +@@ -447,7 +447,7 @@ + { + /* Relative name without '.la' */ + name = _name; +- lib = name + ".la"; ++ lib = name; + exec = name; + libpath = QFile::encodeName(KLibLoader::findLibrary( lib, s_instance )); + execpath = execpath_avoid_loops( exec, envc, envs, avoid_loops ); +@@ -458,9 +458,7 @@ + name = _name; + name = name.mid( name.findRev('/') + 1); + exec = _name; +- if (lib.right(3) == ".la") +- libpath = lib; +- else ++ if ( libpath.findRev( ".so" ) == -1 ) + execpath = exec; + } + if (!args) +@@ -1807,7 +1805,7 @@ + #ifndef __CYGWIN__ + if (!d.suicide && !getenv("KDE_IS_PRELINKED")) + { +- QString konq = locate("lib", "libkonq.la", s_instance); ++ QString konq = KLibLoader::findLibrary( "libkonq", s_instance ); + if (!konq.isEmpty()) + (void) lt_dlopen(QFile::encodeName(konq).data()); + } diff --git a/kdelibs-3.5.6-137675.patch b/kdelibs-3.5.6-137675.patch new file mode 100644 index 0000000..7d34f34 --- /dev/null +++ b/kdelibs-3.5.6-137675.patch @@ -0,0 +1,133 @@ +Index: kioslave/metainfo/Makefile.am +=================================================================== +--- kioslave/metainfo/Makefile.am (Revision 606834) ++++ kioslave/metainfo/Makefile.am (Arbeitskopie) +@@ -2,7 +2,7 @@ + ## Makefile.am of kdebase/kioslave/metainfo + + INCLUDES = $(all_includes) +-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) ++AM_LDFLAGS = $(KDE_RPATH) $(all_libraries) + METASOURCES = AUTO + + kde_module_LTLIBRARIES = kio_metainfo.la +Index: kioslave/gzip/Makefile.am +=================================================================== +--- kioslave/gzip/Makefile.am (Revision 606834) ++++ kioslave/gzip/Makefile.am (Arbeitskopie) +@@ -1,5 +1,5 @@ + INCLUDES = -I$(top_srcdir)/kio $(all_includes) +-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) ++AM_LDFLAGS = $(KDE_RPATH) $(all_libraries) + METASOURCES = AUTO + + kde_module_LTLIBRARIES = kgzipfilter.la +Index: kio/tests/Makefile.am +=================================================================== +--- kio/tests/Makefile.am (Revision 606834) ++++ kio/tests/Makefile.am (Arbeitskopie) +@@ -18,7 +18,7 @@ + + INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kio $(all_includes) + LDADD = $(LIB_KIO) +-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) ++AM_LDFLAGS = $(KDE_RPATH) $(all_libraries) + + check_PROGRAMS = ksycocatest getalltest kruntest ktartest kziptest\ + kioslavetest kdirwatchtest kshredtest speed kurifiltertest \ +Index: dcop/tests/Makefile.am +=================================================================== +--- dcop/tests/Makefile.am (Revision 606834) ++++ dcop/tests/Makefile.am (Arbeitskopie) +@@ -3,7 +3,6 @@ + @echo -e "dcop tests not run.\nRun make tests in the tests directory to make them" + + INCLUDES = $(all_includes) +-AM_LDFLAGS = $(all_libraries) + + METASOURCES = AUTO + +@@ -17,7 +16,7 @@ + + driver_SOURCES = driver.cpp test.stub + driver_LDADD = $(LIB_KDECORE) +-driver_LDFLAGS = $(KDE_RPATH) ++driver_LDFLAGS = $(KDE_RPATH) $(all_libraries) + + CLEANFILES = batch.generated definitions.generated driver.generated shell.generated + +Index: dcop/dcopidl2cpp/Makefile.am +=================================================================== +--- dcop/dcopidl2cpp/Makefile.am (Revision 606834) ++++ dcop/dcopidl2cpp/Makefile.am (Arbeitskopie) +@@ -1,6 +1,5 @@ + + INCLUDES = $(all_includes) +-AM_LDFLAGS = $(all_libraries) + + ####### Files + +@@ -10,7 +9,7 @@ + noinst_HEADERS = main.h + + dcopidl2cpp_LDADD = $(LIB_QT) +-dcopidl2cpp_LDFLAGS = $(KDE_RPATH) ++dcopidl2cpp_LDFLAGS = $(all_libraries) $(KDE_RPATH) + + dcopidl_output.kidl: ../dcopidl/dcopidl $(srcdir)/dcopidl_test.h + ../dcopidl/dcopidl $(srcdir)/dcopidl_test.h > dcopidl_output.kidl +Index: dcop/client/Makefile.am +=================================================================== +--- dcop/client/Makefile.am (Revision 606834) ++++ dcop/client/Makefile.am (Arbeitskopie) +@@ -1,6 +1,5 @@ + + INCLUDES = $(all_includes) +-AM_LDFLAGS = $(all_libraries) + DCOP_LIB = ../libDCOP.la + + ####### Files +@@ -9,19 +8,19 @@ + + dcop_SOURCES = dcop.cpp + dcop_LDADD = $(LIB_QT) $(DCOP_LIB) +-dcop_LDFLAGS = $(KDE_RPATH) ++dcop_LDFLAGS = $(KDE_RPATH) $(all_libraries) + + dcopstart_SOURCES = dcopstart.cpp + dcopstart_LDADD = $(LIB_QT) $(DCOP_LIB) +-dcopstart_LDFLAGS = $(KDE_RPATH) ++dcopstart_LDFLAGS = $(KDE_RPATH) $(all_libraries) + + dcopquit_SOURCES = dcopquit.cpp + dcopquit_LDADD = $(LIB_QT) $(DCOP_LIB) +-dcopquit_LDFLAGS = $(KDE_RPATH) ++dcopquit_LDFLAGS = $(KDE_RPATH) $(all_libraries) + + dcopfind_SOURCES = dcopfind.cpp + dcopfind_LDADD = $(LIB_QT) $(DCOP_LIB) +-dcopfind_LDFLAGS = $(KDE_RPATH) ++dcopfind_LDFLAGS = $(KDE_RPATH) $(all_libraries) + + dcopclient_SOURCES = dcopclient.c + dcopobject_SOURCES = dcopobject.c +Index: dcop/dcopidl/Makefile.am +=================================================================== +--- dcop/dcopidl/Makefile.am (Revision 606834) ++++ dcop/dcopidl/Makefile.am (Arbeitskopie) +@@ -1,6 +1,5 @@ + + INCLUDES = $(all_includes) +-AM_LDFLAGS = $(all_libraries) + AM_CPPFLAGS = -DYYDEBUG + + ####### Files +@@ -11,7 +10,7 @@ + noinst_HEADERS = yacc.cc.h + + dcopidl_LDADD = $(LIB_QT) +-dcopidl_LDFLAGS = $(KDE_RPATH) ++dcopidl_LDFLAGS = $(KDE_RPATH) $(all_libraries) + + ####### Build rules + diff --git a/kdelibs-3.5.6-lang.patch b/kdelibs-3.5.6-lang.patch new file mode 100644 index 0000000..3df3408 --- /dev/null +++ b/kdelibs-3.5.6-lang.patch @@ -0,0 +1,17 @@ +--- kdelibs-3.5.6/kdecore/klocale.cpp.orig 2007-05-22 17:49:31.000000000 +0200 ++++ kdelibs-3.5.6/kdecore/klocale.cpp 2007-05-23 20:37:54.000000000 +0200 +@@ -140,9 +140,11 @@ void KLocale::initLanguageList(KConfig * + KConfigGroupSaver saver(config, "Locale"); + + m_country = config->readEntry( "Country" ); +- if ( m_country.isEmpty() ) +- m_country = defaultCountry(); +- ++ if ( m_country.isEmpty() ) { ++ QString ln, ct, chrset; ++ splitLocale(QString(::getenv("LANG")), ln, ct, chrset); ++ m_country = (ct.isEmpty()) ? defaultCountry() : ct.lower(); ++ } + // Reset the list and add the new languages + QStringList languageList; + if ( useEnv ) diff --git a/kdelibs-3.5.6-utempter.patch b/kdelibs-3.5.6-utempter.patch new file mode 100644 index 0000000..8967a9d --- /dev/null +++ b/kdelibs-3.5.6-utempter.patch @@ -0,0 +1,113 @@ +diff -Nur kdelibs-3.5.6.orig/configure.in kdelibs-3.5.6/configure.in +--- kdelibs-3.5.6.orig/configure.in 2007-01-24 09:52:48.000000000 +0100 ++++ kdelibs-3.5.6/configure.in 2007-02-05 23:01:44.000000000 +0100 +@@ -399,7 +399,7 @@ + [], with_utempter=check) + if test "x$with_utempter" != xno; then + kde_have_utempter=yes +- AC_CHECK_LIB(utempter, addToUtmp, [LIBUTEMPTER=-lutempter], kde_have_utempter=no) ++ AC_CHECK_LIB(utempter, utempter_add_record, [LIBUTEMPTER=-lutempter], kde_have_utempter=no) + AC_SUBST(LIBUTEMPTER) + if test "$kde_have_utempter" = "yes"; then + AC_DEFINE_UNQUOTED(HAVE_UTEMPTER, 1, [Define if you have the utempter helper for utmp managment]) +diff -Nur kdelibs-3.5.6.orig/configure.in.in kdelibs-3.5.6/configure.in.in +--- kdelibs-3.5.6.orig/configure.in.in 2006-05-22 20:14:23.000000000 +0200 ++++ kdelibs-3.5.6/configure.in.in 2007-02-05 23:01:44.000000000 +0100 +@@ -395,7 +395,7 @@ + [], with_utempter=check) + if test "x$with_utempter" != xno; then + kde_have_utempter=yes +- AC_CHECK_LIB(utempter, addToUtmp, [LIBUTEMPTER=-lutempter], kde_have_utempter=no) ++ AC_CHECK_LIB(utempter, utempter_add_record, [LIBUTEMPTER=-lutempter], kde_have_utempter=no) + AC_SUBST(LIBUTEMPTER) + if test "$kde_have_utempter" = "yes"; then + AC_DEFINE_UNQUOTED(HAVE_UTEMPTER, 1, [Define if you have the utempter helper for utmp managment]) +diff -Nur kdelibs-3.5.6.orig/kdecore/kpty.cpp kdelibs-3.5.6/kdecore/kpty.cpp +--- kdelibs-3.5.6.orig/kdecore/kpty.cpp 2006-05-22 20:14:21.000000000 +0200 ++++ kdelibs-3.5.6/kdecore/kpty.cpp 2007-02-05 23:01:44.000000000 +0100 +@@ -80,6 +80,10 @@ + # include + #endif + ++#ifdef HAVE_UTEMPTER ++# include ++#endif ++ + #ifdef HAVE_TERMIOS_H + /* for HP-UX (some versions) the extern C is needed, and for other + platforms it doesn't hurt */ +@@ -138,21 +142,6 @@ + // private functions // + /////////////////////// + +-#ifdef HAVE_UTEMPTER +-class KProcess_Utmp : public KProcess +-{ +-public: +- int commSetupDoneC() +- { +- dup2(cmdFd, 0); +- dup2(cmdFd, 1); +- dup2(cmdFd, 3); +- return 1; +- } +- int cmdFd; +-}; +-#endif +- + #define BASE_CHOWN "kgrantpty" + + +@@ -399,12 +388,8 @@ + void KPty::login(const char *user, const char *remotehost) + { + #ifdef HAVE_UTEMPTER +- KProcess_Utmp utmp; +- utmp.cmdFd = d->masterFd; +- utmp << "/usr/sbin/utempter" << "-a" << d->ttyName << ""; +- utmp.start(KProcess::Block); ++ utempter_add_record (d->masterFd, remotehost); + Q_UNUSED(user); +- Q_UNUSED(remotehost); + #elif defined(USE_LOGIN) + const char *str_ptr; + struct utmp l_struct; +@@ -442,10 +427,7 @@ + void KPty::logout() + { + #ifdef HAVE_UTEMPTER +- KProcess_Utmp utmp; +- utmp.cmdFd = d->masterFd; +- utmp << "/usr/sbin/utempter" << "-d" << d->ttyName; +- utmp.start(KProcess::Block); ++ utempter_remove_record (d->masterFd); + #elif defined(USE_LOGIN) + const char *str_ptr = d->ttyName.data(); + if (!memcmp(str_ptr, "/dev/", 5)) +diff -Nur kdelibs-3.5.6.orig/kdecore/Makefile.am kdelibs-3.5.6/kdecore/Makefile.am +--- kdelibs-3.5.6.orig/kdecore/Makefile.am 2006-10-01 19:33:38.000000000 +0200 ++++ kdelibs-3.5.6/kdecore/Makefile.am 2007-02-05 23:01:44.000000000 +0100 +@@ -115,7 +115,7 @@ + kuser.cpp kconfigskeleton.cpp kconfigdialogmanager.cpp klockfile.cpp \ + kqiodevicegzip_p.cpp ktimezones.cpp + +-libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined ++libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(LIBUTEMPTER) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined + libkdecore_la_LIBADD = malloc/libklmalloc.la network/libkdecorenetwork.la $(SVGICON_LIB) ../dcop/libDCOP.la ../libltdl/libltdlc.la $(LIB_XEXT) $(LIBRESOLV) $(LIBUTIL) $(LIBART_LIBS) $(LIB_IDN) ../kdefx/libkdefx.la + libkdecore_la_NMCHECK = $(srcdir)/libkdecore.nmcheck + libkdecore_la_NMCHECKWEAK = $(srcdir)/libkdecore_weak.nmcheck $(srcdir)/libqt-mt_weak.nmcheck \ +diff -Nur kdelibs-3.5.6.orig/kdecore/Makefile.in kdelibs-3.5.6/kdecore/Makefile.in +--- kdelibs-3.5.6.orig/kdecore/Makefile.in 2007-01-24 09:54:07.000000000 +0100 ++++ kdelibs-3.5.6/kdecore/Makefile.in 2007-02-05 23:04:12.000000000 +0100 +@@ -787,9 +787,9 @@ + kuser.cpp kconfigskeleton.cpp kconfigdialogmanager.cpp klockfile.cpp \ + kqiodevicegzip_p.cpp ktimezones.cpp ksycoca_skel.cpp kappdcopiface_skel.cpp kdebugdcopiface_skel.cpp + +-#>- libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined ++#>- libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(LIBUTEMPTER) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined + #>+ 1 +-libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined $(KDE_NO_UNDEFINED) ++libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(LIBUTEMPTER) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined $(KDE_NO_UNDEFINED) + libkdecore_la_LIBADD = malloc/libklmalloc.la network/libkdecorenetwork.la $(SVGICON_LIB) ../dcop/libDCOP.la ../libltdl/libltdlc.la $(LIB_XEXT) $(LIBRESOLV) $(LIBUTIL) $(LIBART_LIBS) $(LIB_IDN) ../kdefx/libkdefx.la + libkdecore_la_NMCHECK = $(srcdir)/libkdecore.nmcheck + libkdecore_la_NMCHECKWEAK = $(srcdir)/libkdecore_weak.nmcheck $(srcdir)/libqt-mt_weak.nmcheck \ diff --git a/kdelibs-3.5.7-cups13.patch b/kdelibs-3.5.7-cups13.patch new file mode 100644 index 0000000..124d799 --- /dev/null +++ b/kdelibs-3.5.7-cups13.patch @@ -0,0 +1,82 @@ +--- kdelibs-3.5.7/kdeprint/cups/cupsdconf2/cups-util.c.cups13 2006-10-01 12:33:43.000000000 -0500 ++++ kdelibs-3.5.7/kdeprint/cups/cupsdconf2/cups-util.c 2007-07-19 15:12:48.000000000 -0500 +@@ -108,7 +108,8 @@ cupsGetConf(void) + * See if we should retry the current digest password... + */ + +- if (strncmp(cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Basic", 5) == 0 || ++ if (strncmp(httpGetField (cups_server, HTTP_FIELD_WWW_AUTHENTICATE), ++ "Basic", 5) == 0 || + digest_tries > 1 || !pwdstring[0]) + { + /* +@@ -116,7 +117,7 @@ cupsGetConf(void) + */ + + snprintf(prompt, sizeof(prompt), "Password for %s on %s? ", cupsUser(), +- cups_server->hostname); ++ cupsServer()); + + if ((password = cupsGetPassword(prompt)) == NULL) + break; +@@ -135,7 +136,8 @@ cupsGetConf(void) + * Got a password; encode it for the server... + */ + +- if (strncmp(cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Basic", 5) == 0) ++ if (strncmp(httpGetField (cups_server, HTTP_FIELD_WWW_AUTHENTICATE), ++ "Basic", 5) == 0) + { + /* + * Basic authentication... +@@ -334,7 +336,8 @@ cupsPutConf(const char *name) /* I - Na + * See if we should retry the current digest password... + */ + +- if (strncmp(cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Basic", 5) == 0 || ++ if (strncmp(httpGetField (cups_server, HTTP_FIELD_WWW_AUTHENTICATE), ++ "Basic", 5) == 0 || + digest_tries > 1 || !pwdstring[0]) + { + /* +@@ -342,7 +345,7 @@ cupsPutConf(const char *name) /* I - Na + */ + + snprintf(prompt, sizeof(prompt), "Password for %s on %s? ", cupsUser(), +- cups_server->hostname); ++ cupsServer()); + + if ((password = cupsGetPassword(prompt)) == NULL) + break; +@@ -361,7 +364,8 @@ cupsPutConf(const char *name) /* I - Na + * Got a password; encode it for the server... + */ + +- if (strncmp(cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Basic", 5) == 0) ++ if (strncmp(httpGetField (cups_server, HTTP_FIELD_WWW_AUTHENTICATE), ++ "Basic", 5) == 0) + { + /* + * Basic authentication... +--- kdelibs-3.5.7/kdeprint/cups/ipprequest.cpp.cups13 2007-01-15 05:34:19.000000000 -0600 ++++ kdelibs-3.5.7/kdeprint/cups/ipprequest.cpp 2007-07-19 15:15:09.000000000 -0500 +@@ -309,7 +309,8 @@ bool IppRequest::doFileRequest(const QSt + return false; + } + +-#ifdef HAVE_CUPS_NO_PWD_CACHE ++#if defined(HAVE_CUPS_NO_PWD_CACHE) && \ ++ CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 3 + strncpy( HTTP->authstring, cups_authstring.data(), HTTP_MAX_VALUE ); + #endif + +@@ -319,7 +320,8 @@ bool IppRequest::doFileRequest(const QSt + } + + request_ = cupsDoFileRequest(HTTP, request_, (res.isEmpty() ? "/" : res.latin1()), (filename.isEmpty() ? NULL : filename.latin1())); +-#ifdef HAVE_CUPS_NO_PWD_CACHE ++#if defined(HAVE_CUPS_NO_PWD_CACHE) && \ ++ CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 3 + cups_authstring = HTTP->authstring; + #endif + httpClose(HTTP); diff --git a/kdelibs-3.5.7-kde#146105.patch b/kdelibs-3.5.7-kde#146105.patch new file mode 100644 index 0000000..94dcbc5 --- /dev/null +++ b/kdelibs-3.5.7-kde#146105.patch @@ -0,0 +1,36 @@ +Index: kdecore/kcmdlineargs.cpp +=================================================================== +--- kdecore/kcmdlineargs.cpp (Revision 669593) ++++ kdecore/kcmdlineargs.cpp (Revision 669594) +@@ -1248,21 +1248,22 @@ + + KURL KCmdLineArgs::makeURL(const char *_urlArg) + { +- QString urlArg = QFile::decodeName(_urlArg); +- if (!QDir::isRelativePath(urlArg)) +- { ++ const QString urlArg = QFile::decodeName(_urlArg); ++ QFileInfo fileInfo(urlArg); ++ if (!fileInfo.isRelative()) { // i.e. starts with '/', on unix + KURL result; + result.setPath(urlArg); + return result; // Absolute path. + } + +- if ( !KURL::isRelativeURL(urlArg) ) +- return KURL(urlArg); // Argument is a URL ++ if ( KURL::isRelativeURL(urlArg) || fileInfo.exists() ) { ++ KURL result; ++ result.setPath( cwd()+'/'+urlArg ); ++ result.cleanPath(); ++ return result; // Relative path ++ } + +- KURL result; +- result.setPath( cwd()+"/"+urlArg ); +- result.cleanPath(); +- return result; // Relative path ++ return KURL(urlArg); // Argument is a URL + } + + void diff --git a/kdelibs-3.5.7-openssl.patch b/kdelibs-3.5.7-openssl.patch new file mode 100644 index 0000000..b5511ce --- /dev/null +++ b/kdelibs-3.5.7-openssl.patch @@ -0,0 +1,34 @@ +--- kdelibs-3.5.7/kio/kssl/kopenssl.cc.openssl 2006-07-22 03:16:39.000000000 -0500 ++++ kdelibs-3.5.7/kio/kssl/kopenssl.cc 2007-06-20 08:58:25.000000000 -0500 +@@ -329,6 +329,15 @@ KConfig *cfg; + #ifdef SHLIB_VERSION_NUMBER + << "libssl.so." SHLIB_VERSION_NUMBER + #endif ++ << "libssl.so.0.9.8b" ++ << "libssl.so.0.9.8a" ++ << "libssl.so.6" ++ << "libssl.so.0.9.7e" ++ << "libssl.so.5" ++ << "libssl.so.0.9.7a" ++ << "libssl.so.4" ++ << "libssl.so.0.9.6b" ++ << "libssl.so.2" + << "libssl.so" + << "libssl.so.0" + #endif +@@ -346,6 +355,15 @@ KConfig *cfg; + #ifdef SHLIB_VERSION_NUMBER + << "libcrypto.so." SHLIB_VERSION_NUMBER + #endif ++ << "libcrypto.so.0.9.8b" ++ << "libcrypto.so.0.9.8a" ++ << "libcrypto.so.6" ++ << "libcrypto.so.0.9.7e" ++ << "libcrypto.so.5" ++ << "libcrypto.so.0.9.7a" ++ << "libcrypto.so.4" ++ << "libcrypto.so.0.9.6b" ++ << "libcrypto.so.2" + << "libcrypto.so" + << "libcrypto.so.0" + #endif diff --git a/kdelibs3.spec b/kdelibs3.spec new file mode 100644 index 0000000..454469c --- /dev/null +++ b/kdelibs3.spec @@ -0,0 +1,1323 @@ + +# kdelibs3 review: http://bugzilla.redhat.com/248899 + +%define distname "Fedora" + +#define debug 1 +%define final 1 +%define kde_settings 1 + +%define arts 1 +%define arts_epoch 8 +%define arts_version 1.5.7 + +%define qt_epoch 1 +%define qt_version 3.3.8 +%global qt_ver %(pkg-config --modversion qt-mt 2>/dev/null || echo %{qt_version}) +%define qtdocdir %{_docdir}/qt-devel-%{qt_ver} + +%define kde_major_version 3 + +%define make_cvs 1 + +%define apidocs 1 + +Version: 3.5.7 +Release: 15%{?dist} + +#if 0%{?fedora} > 7 +%if 1 +Name: kdelibs3 +Provides: kdelibs = 6:%{version}-%{release} +%else +Name: kdelibs +Epoch: 6 +# To help transition to kde4 +Provides: kdelibs3 = %{version}-%{release} +%endif + +Summary: K Desktop Environment - Libraries + +License: LGPL +Url: http://www.kde.org/ +Group: System Environment/Libraries +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdelibs-%{version}.tar.bz2 +Source1: kde.sh +Source2: kde.csh +Source3: devices.protocol + +Patch1: kdelibs-3.5.1-xdg-menu.patch +Patch2: kdelibs-3.0.0-ndebug.patch +Patch4: kdelibs-3.0.4-ksyscoca.patch +Patch5: kdelibs-3.5.7-openssl.patch +Patch15: kdelibs-3.4.91-buildroot.patch +Patch32: kdelibs-3.2.3-cups.patch +Patch33: kdelibs-3.3.2-ppc.patch +Patch34: kdelibs-3.4.0-qtdoc.patch +Patch35: kdelibs-3.4.92-inttype.patch +Patch37: kdelibs-3.5.2-kdebug-kmail-quiet.patch +Patch38: kdelibs-3.5.2-cupsdconf2-group.patch +Patch39: kdelibs-3.5.4-kabc-make.patch +Patch40: kdelibs-3.5.4-kdeprint-utf8.patch +Patch41: kdelibs-3.5.6-utempter.patch +Patch43: kdelibs-3.5.6-lang.patch +Patch44: kdelibs-3.5.7-cups13.patch + +# use /etc/kde in addition to /usr/share/config, borrowed from debian +Patch104: kdelibs-3.5.5-kstandarddirs.patch + +# upstream patches +# kget ignores simultaneous download limit (kde #101956) +Patch502: kdelibs-3.5.0-101956.patch +# automake-1.10, $(all_libraries) is missing from a few LDFLAGS (kde #137675) +Patch503: kdelibs-3.5.6-137675.patch +Patch505: kdelibs-3.5.7-kde#146105.patch +# http://bugs.kde.org/93359, alternative to export libltdl_cv_shlibext=".so" hack. +Patch93359: kde-3.5-libtool-shlibext.patch +## See http://bugs.kde.org/139445, patch needs boost-devel, FIXME, doesn't apply to kde-3.5.7 +Patch139445: kdelibs-3.5.5-lib_loader-1.2.patch +#BuildRequires: boost-devel + +%{?arts:Requires: arts >= %{arts_epoch}:%{arts_version}} +Requires: qt >= %{qt_epoch}:%{qt_ver} +Requires: hicolor-icon-theme +%if %{kde_settings} +Requires: kde-settings >= 3.5 +%endif +Requires: kde-filesystem +Requires: redhat-menus +Requires: shadow-utils +# kdesu/sudo support, http://bugs.kde.org/20914 +BuildRequires: sudo +Requires(hint): sudo + +%if 0%{?fedora} > 4 || 0%{?rhel} > 4 +%define libkdnssd libkdnssd +Requires: %{libkdnssd} +%define BuildRequires: xorg-x11-proto-devel libX11-devel +%define _with_rgbfile --with-rgbfile=%{_datadir}/X11/rgb.txt +Requires: iceauth +%endif + +Requires(pre): coreutils +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig + +BuildRequires: gettext +BuildRequires: pcre-devel +BuildRequires: cups-devel cups +BuildRequires: qt-devel qt-devel-docs +%{?arts:BuildRequires: arts-devel >= %{arts_epoch}:%{arts_version}} +BuildRequires: flex >= 2.5.4a-13 +BuildRequires: doxygen +BuildRequires: libxslt-devel +BuildRequires: sgml-common +BuildRequires: openjade +BuildRequires: jadetex +BuildRequires: docbook-dtd31-sgml +BuildRequires: docbook-style-dsssl +BuildRequires: perl-SGMLSpm +BuildRequires: docbook-utils +BuildRequires: zlib-devel +BuildRequires: libidn-devel +BuildRequires: audiofile-devel +BuildRequires: openssl-devel +BuildRequires: perl +BuildRequires: gawk +BuildRequires: byacc +BuildRequires: libart_lgpl-devel +BuildRequires: bzip2-devel +BuildRequires: libtiff-devel +BuildRequires: libacl-devel libattr-devel +BuildRequires: aspell-devel +BuildRequires: krb5-devel +BuildRequires: openldap-devel +BuildRequires: db4-devel +BuildRequires: alsa-lib-devel +BuildRequires: pkgconfig +BuildRequires: glibc-kernheaders +%if 0%{?fedora} > 5 || 0%{?rhel} > 4 +# See also http://bugzilla.redhat.com/205767 +%define _with_libutempter 1 +BuildRequires: libutempter-devel +%else +BuildRequires: utempter +%endif +BuildRequires: findutils +BuildRequires: jasper-devel +BuildRequires: OpenEXR-devel +%if %{make_cvs} +BuildRequires: automake libtool +%endif + +%if "%{name}" != "kdelibs" && "%{?apidocs}" != "1" +Obsoletes: kdelibs-apidocs < 6:%{version}-%{release} +%endif + +%description +Libraries for the K Desktop Environment: +KDE Libraries included: kdecore (KDE core library), kdeui (user interface), +kfm (file manager), khtmlw (HTML widget), kio (Input/Output, networking), +kspell (spelling checker), jscript (javascript), kab (addressbook), +kimgio (image manipulation). + +%package devel +Group: Development/Libraries +Summary: Header files and documentation for compiling KDE applications. +Conflicts: kdelibs4-devel +%if "%{name}" == "kdelibs" +Obsoletes: kdelibs3-devel < %{version}-%{release} +Provides: kdelibs3-devel = %{version}-%{release} +%else +Obsoletes: kdelibs-devel < 6:%{version}-%{release} +Provides: kdelibs-devel = 6:%{version}-%{release} +%endif +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: qt-devel +%{?arts:Requires: arts-devel} +%{?libkdnssd:Requires: libkdnssd-devel} +Requires: openssl-devel +## those below can/should be omitted from future builds -- Rex +#Requires: libart_lgpl-devel +#Requires: libxslt-devel +#Requires: libjpeg-devel +#Requires: zlib-devel +#Requires: bzip2-devel +#Requires: libtiff-devel +#Requires: libidn-devel +#Requires: libacl-devel +#Requires: pcre-devel +#{?_with_libutempter:Requires: libutempter-devel} +%description devel +This package includes the header files you will need to compile +applications for KDE. + +%package apidocs +Group: Development/Documentation +Summary: KDE API documentation. +Requires: %{name} = %{?epoch:%{epoch}:}:%{version} +%if "%{name}" == "kdelibs" +Provides: kdelibs3-apidocs = %{version}-%{release} +%else +Obsoletes: kdelibs-apidocs < 6:%{version}-%{release} +Provides: kdelibs-apidocs = 6:%{version}-%{release} +%endif +## old, never published outside of rawhide, afaik -- Rex +#Obsoletes: kdelibs-docs < 6:%{version}-%{release} +%description apidocs +This package includes the KDE API documentation in HTML +format for easy browsing + + +%prep +%setup -q -n kdelibs-%{version} + +%patch1 -p1 -b .xdg-menu +%if "%{?debug}" != "1" +%patch2 -p1 -b .debug +%endif +%patch4 -p1 -b .ksyscoca +%patch5 -p1 -b .openssl +%patch15 -p1 -b .buildroot +%patch32 -p1 -b .cups +%patch33 -p1 -b .ppc +%patch34 -p1 -b .qtdoc +%patch35 -p1 -b .inttype +%patch37 -p1 -b .kdebug-kmail-quiet +%patch38 -p1 -b .cupsdconf2-group +%patch39 -p1 -b .kabc-make +%patch40 -p1 -b .kdeprint-utf8 +%{?_with_libutempter:%patch41 -p1 -b .utempter} +# omission recommended by upstream: http://bugs.kde.org/147454#c37 +%patch43 -p1 -b .lang +%patch44 -p1 -b .cups13 + +%patch104 -p1 -b .kstandarddirs + +# upstream patches +%patch503 -p0 -b .kde#137675 +%patch505 -p0 -b .kde#146105 +%patch93359 -p1 -b .libtool-shlibext +#patch139445 -p1 -b .kde#139445 + +sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h + +%if %{make_cvs} + make -f admin/Makefile.common cvs +%endif + + +%build +unset QTDIR && . /etc/profile.d/qt.sh + +export QTDOC=%{qtdocdir} +# use patch93359 instead +#export libltdl_cv_shlibext=".so" + +if [ -x /etc/profile.d/krb5.sh ]; then + . /etc/profile.d/krb5.sh +elif ! echo ${PATH} | grep -q /usr/kerberos/bin ; then + export PATH=/usr/kerberos/bin:${PATH} +fi + +%configure \ + --includedir=%{_includedir}/kde \ + --disable-rpath \ + --enable-new-ldflags \ + --disable-dependency-tracking \ + %{!?debug: --disable-debug --disable-warnings --enable-final} \ + %{?debug:--enable-debug --enable-warnings --disable-final} \ + --disable-fast-malloc \ +%if "%{_lib}" == "lib64" + --enable-libsuffix="64" \ +%endif + --enable-cups \ + --enable-mitshm \ + --enable-pie \ + --enable-sendfile \ + --with-distribution="$(cat /etc/redhat-release 2>/dev/null)" \ + --with-alsa \ + --with-aspell \ + --disable-libfam \ + --enable-dnotify \ + --enable-inotify \ + --with-utempter \ + %{!?arts:--without-arts} \ + %{?_with_rgbfile} \ + --with-jasper \ + --with-openexr \ + --with-xinerama + +make %{?_smp_mflags} + +# FIXME/TODO: build as noarch? -- Rex +%if "%{?apidocs}" == "1" +make %{?_smp_mflags} apidox +%endif + + +%install +rm -rf %{buildroot} + +make DESTDIR=%{buildroot} install + +chmod a+x %{buildroot}%{_libdir}/* +install -p -m 644 %{SOURCE3} %{buildroot}%{_datadir}/services/devices.protocol + +%if "%{?apidocs}" == "1" +pushd %{buildroot}%{_docdir} +ln -sf HTML/en/kdelibs-apidocs %{name}-devel-%{kde_major_version} +popd +%endif + +# Make symlinks relative +pushd %{buildroot}%{_docdir}/HTML/en +for i in *; do + if [ -d $i -a -L $i/common ]; then + rm -f $i/common + ln -sf ../common $i + fi +done +popd + +%if "%{name}" == "kdelibs3" +install -p -m 755 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/kde3.sh +install -p -m 755 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/kde3.csh +%else +install -p -m 755 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/kde.sh +install -p -m 755 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/kde.csh + +## menus +mkdir -p %{buildroot}%{_sysconfdir}/kde/xdg/menus +mv %{buildroot}%{_sysconfdir}/xdg/menus/applications.menu \ + %{buildroot}%{_sysconfdir}/xdg/menus/kde-applications.menu +# compat-symlinks, can go away eventually -- Rex +ln -s %{_sysconfdir}/xdg/menus/kde-applications.menu \ + %{buildroot}%{_sysconfdir}/kde/xdg/menus/kde-applications.menu +ln -s kde-applications.menu \ + %{buildroot}%{_sysconfdir}/kde/xdg/menus/applications.menu +%endif + +echo "OnlyShowIn=KDE;" >> %{buildroot}%{_datadir}/applications/kde/kresources.desktop + +# Use hicolor-icon-theme rpm/pkg instead (#178319) +rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/ + +# ghost'd files +touch $RPM_BUILD_ROOT%{_datadir}/services/ksycoca + +## remove references to extraneous/optional libraries in .la files (#170602) +# fam, libart_lgpl, pcre, libidn, libpng, libjpeg, libdns_sd, libacl/libattr, alsa-lib/asound +find $RPM_BUILD_ROOT%{_libdir} -name "*.la" | xargs \ + sed -i \ + -e "s@-lfam@@g" \ + -e "s@%{_libdir}/libfam.la@@g" \ + -e "s@-lart_lgpl_2@@g" \ + -e "s@%{_libdir}/libpcreposix.la@@g" \ + -e "s@-lpcreposix@@g" \ + -e "s@-lpcre@@g" \ + -e "s@-lidn@@g" \ + -e "s@%{_libdir}/libidn.la@@g" \ + -e "s@-lpng@@g" \ + -e "s@-ljpeg@@g" \ + -e "s@%{_libdir}/libjpeg.la@@g" \ + -e "s@-ldns_sd@@g" \ + -e "s@-lacl@@g" \ + -e "s@%{_libdir}/libacl.la@@g" \ + -e "s@/%{_lib}/libacl.la@@g" \ + -e "s@-lattr@@g" \ + -e "s@%{_libdir}/libattr.la@@g" \ + -e "s@/%{_lib}/libattr.la@@g" \ + -e "s@-lasound@@g" \ + -e "s@-lutempter@@g" + +## unpackaged files +# libkdnssd bits +rm -f %{buildroot}%{_libdir}/libkdnssd.la +%{?libkdnssd:rm -rf %{buildroot}{%{_libdir}/libkdnssd.*,%{_includedir}/kde/dnssd}} +%if "%{name}" != "kdelibs" +# remove conflicts with kdelibs-4 +pushd %{buildroot}%{_bindir} +rm -f checkXML cupsdconf cupsdoprint imagetops kaddprinterwizard kconfig_compiler kconf_update kcookiejar \ + kde-menu kdesu_stub kdontchangethehostname kdostartupconfig kio_http_cache_cleaner kioslave \ + klauncher kpac_dhcp_helper ksendbugmail kstartupconfig ksvgtopng ktradertest kunittestmodrunner \ + make_driver_db_cups make_driver_db_lpr makekdewidgets meinproc preparetips \ + khotnewstuff kinstalltheme kcmshell kfile kioexec +popd +rm -f %{buildroot}%{_datadir}/config/* %{buildroot}%{_datadir}/config/ui/kprintpreviewui.rc || : +rm -rf %{buildroot}%{_datadir}/config/colors %{buildroot}%{_datadir}/apps/k* %{buildroot}%{_datadir}/apps/LICENSES \ + %{buildroot}%{_datadir}/apps/proxyscout %{buildroot}%{_datadir}/locale \ + %{buildroot}%{_datadir}/autostart %{buildroot}/etc/xdg %{buildroot}%{_docdir}/HTML %{buildroot}%{_datadir}/emoticons +%endif + + +%clean +rm -rf %{buildroot} + + +%post +/sbin/ldconfig +touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || : +%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg 2> /dev/null || : +%{_bindir}/update-desktop-database > /dev/null 2>&1 || : + +%postun +/sbin/ldconfig +touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || : +%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg 2> /dev/null || : +%{_bindir}/update-desktop-database > /dev/null 2>&1 || : + + +%files +%defattr(-,root,root,-) +%config(noreplace) %{_sysconfdir}/profile.d/* +%{_bindir}/* +%attr(4755,root,root) %{_bindir}/kgrantpty +%{_libdir}/lib*.so.* +%{_libdir}/libkdeinit_*.so +%{_libdir}/lib*.la +%{_libdir}/kde3/ +%{_datadir}/applications/kde/*.desktop +%{_datadir}/apps/* +%config(noreplace) %{_datadir}/config/* +%{_datadir}/icons/crystalsvg/ +%{_datadir}/icons/default.kde +%{_datadir}/mimelnk/magic +%{_datadir}/mimelnk/*/*.desktop +%{_datadir}/services/* +%{_datadir}/servicetypes/* +%ghost %{_datadir}/services/ksycoca +%if "%{name}" == "kdelibs" +%{_sysconfdir}/kde/xdg/menus/*.menu +%{_sysconfdir}/xdg/menus/*.menu +%attr(4755,root,root) %{_bindir}/kpac_dhcp_helper +%{_datadir}/autostart/* +%{_datadir}/emoticons/* +%{_datadir}/locale/all_languages +%{_docdir}/HTML/en/common +%{_docdir}/HTML/en/kspell +%endif + +%files devel +%defattr(-,root,root,-) +%{_bindir}/dcopidl* +%{_includedir}/kde/ +%{_libdir}/lib*.so +%{_libdir}/lib*.a +%exclude %{_libdir}/libkdeinit_*.so + +%if "%{?apidocs}" == "1" +%files apidocs +%defattr(-,root,root,-) +%{_docdir}/%{name}-devel-%{kde_major_version} +%{_docdir}/HTML/en/kdelibs* +%endif + + +%changelog +* Fri Jul 20 2007 Rex Dieter - 6:3.5.7-15 +- Obsoletes/Provides: kdelibs-apidocs (f8+) + +* Fri Jul 20 2007 Rex Dieter - 6:3.5.7-14 +- toggle kdelibs3 (f8+) + +* Wed Jul 18 2007 Rex Dieter - 6:3.5.7-13 +- build fails against cups-1.3 (#248717) +- incorporate kdelibs3 bits (not enabled... yet) + +* Wed Jul 18 2007 Rex Dieter - 6:3.5.7-10 +- +Requires: kde-filesystem + +* Mon Jul 09 2007 Rex Dieter - 6:3.5.7-9 +- omit ICEauthority patch (kde#147454, rh#243560, rh#247455) + +* Wed Jun 20 2007 Rex Dieter - 6:3.5.7-8 +- rework previously botched openssl patch + +* Wed Jun 20 2007 Rex Dieter - 6:3.5.7-7 +- -devel: Provides: kdelibs3-devel = ... +- openssl patch update (portability) +- drop deprecated ssl-krb5 patch + +* Sat Jun 16 2007 Rex Dieter - 6:3.5.7-6 +- Provides: kdelibs3 = %%version-%%release + +* Sat Jun 16 2007 Rex Dieter - 6:3.5.7-5 +- -devel: +Requires: libutempter-devel + +* Fri Jun 15 2007 Rex Dieter - 6:3.5.7-4 +- omit lib_loader patch (doesn't apply cleanly) + +* Fri Jun 15 2007 Rex Dieter - 6:3.5.7-3 +- include experimental libtool patches + +* Mon Jun 11 2007 Rex Dieter - 6:3.5.7-2 +- kdesu: sudo support (kde bug #20914), Requires(hint): sudo + +* Wed Jun 06 2007 Than Ngo - 6:3.5.7-0.1.fc7 +- 3.5.7 + +* Thu May 24 2007 Than Ngo 6:3.5.6-10.fc7 +- don't change permission .ICEauthority by sudo KDE programs +- apply patch to fix locale issue +- apply upstream patch to fix kde#146105 + +* Thu May 16 2007 Rex Dieter - 6:3.5.6-9 +- make qtdocdir handling robust +- kde_settings=1 +- Req: -desktop-backgrounds-basic + +* Wed May 16 2007 Than Ngo - 3.5.6-8.fc7 +- add correct qt-version to build kde apidocs ,bz#239947 +- disable kde_settings + +* Thu May 14 2007 Rex Dieter - 6:3.5.6-7 +- BR: +keyutils-libs-devel (until krb5 is fixed, bug #240220) + +* Thu May 14 2007 Rex Dieter - 6:3.5.6-6 +- kde.sh: fix typo/thinko + +* Thu May 14 2007 Rex Dieter - 6:3.5.6-5 +- %%changelog: prune pre-kde3 entries +- %%ghost %%{_datadir}/services/ksycoca +- omit extraneous .la file references (#178733) +- BR: jasper-devel OpenEXR-devel +- xdg-menu compat symlinks (to help transition to using XDG_MENU_PREFIX) +- fix kde#126812.patch to be non-empty +- cleanup kde.(sh|csh) +- Requires: +kde-settings -redhat-artwork +- make apidocs build optional (default on) +- use FHS-friendly /etc/kde (#238136) + +* Mon Mar 26 2007 Than Ngo - 6:3.5.6-3.fc7 +- apply upstream patch to fix build issue with qt-3.3.8 +- apply upstream patch to to fix crash on particular 404 url + in embedded HTML viewer + +* Tue Feb 27 2007 Than Ngo - 6:3.5.6-2.fc7 +- cleanup specfile + +* Mon Feb 05 2007 Than Ngo - 6:3.5.6-1.fc7 +- 3.5.6 +- apply patch to fix #225420, CVE-2007-0537 Konqueror improper + HTML comment rendering, thanks to Dirk Müller, KDE security team + +* Tue Nov 14 2006 Than Ngo - 6:3.5.5-1.fc7 +- rebuild + +* Fri Oct 27 2006 Than Ngo 6:3.5.5-0.2 +- add missing api docs + +* Wed Oct 25 2006 Than Ngo 6:3.5.5-0.1 +- update to 3.5.5 + +* Sun Oct 01 2006 Than Ngo 6:3.5.4-10 +- fix utf8 issue in kdeprint +- fix #178320,#198828, follow menu-spec +- upstream patches, + fix #106748, Evaluate scripts in