Compare commits
29 Commits
Author | SHA1 | Date |
---|---|---|
|
83cdce4c16 | |
|
5b93b5b3f8 | |
|
97bbd6afc3 | |
|
93e678d3a1 | |
|
b3813c0c8b | |
|
71e43b2162 | |
|
857420b255 | |
|
a2a39d3ea1 | |
|
a5cd558d8c | |
|
04094a4f76 | |
|
029762f087 | |
|
c88b2220c0 | |
|
7d7836e372 | |
|
5a400af466 | |
|
4e2d3b224a | |
|
f0e68b0f60 | |
|
043751324b | |
|
6e38d32b3d | |
|
604318f685 | |
|
6d27ea8a88 | |
|
4a04a2ef86 | |
|
6327a46df0 | |
|
2e2ea29309 | |
|
0c2087d67c | |
|
6c2301e7c4 | |
|
a112368311 | |
|
a4a4af5db6 | |
|
2fc8ea0977 | |
|
077bc82ff3 |
15
.cvsignore
15
.cvsignore
|
@ -1,15 +0,0 @@
|
||||||
kdelibs-3.3.0.tar.bz2
|
|
||||||
kdelibs-3.3.1.tar.bz2
|
|
||||||
kdelibs-3.3.2.tar.bz2
|
|
||||||
kdelibs-3.4.0-rc1.tar.bz2
|
|
||||||
kdelibs-3.4.0.tar.bz2
|
|
||||||
kdelibs-3.4.1.tar.bz2
|
|
||||||
kdelibs-3.4.2.tar.bz2
|
|
||||||
kdelibs-3.4.91.tar.bz2
|
|
||||||
kdelibs-3.4.92.tar.bz2
|
|
||||||
kdelibs-3.5.0.tar.bz2
|
|
||||||
kdelibs-3.5.1.tar.bz2
|
|
||||||
kdelibs-3.5.2.tar.bz2
|
|
||||||
kdelibs-3.5.3.tar.bz2
|
|
||||||
kdelibs-3.5.4.tar.bz2
|
|
||||||
kdelibs-3.5.6.tar.bz2
|
|
|
@ -0,0 +1 @@
|
||||||
|
kdelibs-3.5.9.tar.bz2
|
|
@ -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",
|
12
kde.csh
12
kde.csh
|
@ -1,17 +1,17 @@
|
||||||
## http://kde.ground.cz/tiki-index.php?page=Environment+Variables
|
## http://kde.ground.cz/tiki-index.php?page=Environment+Variables
|
||||||
## for possible entries here
|
## for possible entries here
|
||||||
|
|
||||||
# When/if using prelinking, avoids (some) use of kdeinit
|
## Make sure KDEDIRS is set
|
||||||
|
if ( ! $?KDEDIRS ) setenv KDEDIRS /usr
|
||||||
|
|
||||||
|
## When/if using prelinking, avoids (some) use of kdeinit
|
||||||
if ( -f /etc/sysconfig/prelink ) then
|
if ( -f /etc/sysconfig/prelink ) then
|
||||||
set PRELINKING = `grep "^PRELINKING=" /etc/sysconfig/prelink | cut -d"=" -f2`
|
set PRELINKING = `grep "^PRELINKING=" /etc/sysconfig/prelink | cut -d"=" -f2`
|
||||||
if ( "$PRELINKING" == "yes" ) then
|
if ( "$PRELINKING" == "yes" ) then
|
||||||
if ( ! $?KDE_IS_PRELINKED ) setenv KDE_IS_PRELINKED 1
|
if ( ! $?KDE_IS_PRELINKED ) setenv KDE_IS_PRELINKED 1
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# if not using IP6, speeds DNS operations
|
## if not using IPv6, speeds DNS operations
|
||||||
# if ( ! $?KDE_NO_IPV6 ) setenv KDE_NO_IPV6 1
|
# if ( ! $?KDE_NO_IPV6 ) setenv KDE_NO_IPV6 1
|
||||||
|
|
||||||
# Make sure KDEDIRS is set
|
|
||||||
if ( ! $?KDEDIRS ) setenv KDEDIRS /usr
|
|
||||||
|
|
||||||
|
|
9
kde.sh
9
kde.sh
|
@ -1,15 +1,12 @@
|
||||||
## http://kde.ground.cz/tiki-index.php?page=Environment+Variables
|
## http://kde.ground.cz/tiki-index.php?page=Environment+Variables
|
||||||
## for possible entries here
|
## for possible entries here
|
||||||
|
|
||||||
|
## Make sure KDEDIRS is set
|
||||||
|
[ -z "$KDEDIRS" ] && KDEDIRS="/usr" && export KDEDIRS
|
||||||
|
|
||||||
## When/if using prelinking, avoids (some) use of kdeinit
|
## When/if using prelinking, avoids (some) use of kdeinit
|
||||||
if [ -f /etc/sysconfig/prelink ]; then
|
if [ -f /etc/sysconfig/prelink ]; then
|
||||||
if [ `grep '^PRELINKING=yes' /etc/sysconfig/prelink` ] ; then
|
if [ `grep '^PRELINKING=yes' /etc/sysconfig/prelink` ] ; then
|
||||||
[ -z "$KDE_IS_PRELINKED" ] && KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
|
[ -z "$KDE_IS_PRELINKED" ] && KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
|
||||||
fi
|
fi
|
||||||
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
|
|
||||||
|
|
|
@ -1,11 +0,0 @@
|
||||||
--- kdelibs-3.1/admin/acinclude.m4.in.ORIG 2003-01-10 09:32:45.000000000 -0500
|
|
||||||
+++ kdelibs-3.1/admin/acinclude.m4.in 2003-01-10 09:33:00.000000000 -0500
|
|
||||||
@@ -5090,7 +5090,7 @@
|
|
||||||
ssl_incdirs="/usr/include /usr/local/include /usr/ssl/include /usr/local/ssl/include $prefix/include $kde_extra_includes"
|
|
||||||
ssl_incdirs="$ac_ssl_includes $ssl_incdirs"
|
|
||||||
AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir)
|
|
||||||
- ac_ssl_includes="$ssl_incdir"
|
|
||||||
+ ac_ssl_includes="$ssl_incdir -I/usr/kerberos/include"
|
|
||||||
|
|
||||||
ssl_libdirs="/usr/lib /usr/local/lib /usr/ssl/lib /usr/local/ssl/lib $prefix/lib $exec_prefix/lib $kde_extra_libs"
|
|
||||||
if test ! "$ac_ssl_libraries" = "NO"; then
|
|
|
@ -1,20 +0,0 @@
|
||||||
--- kdelibs-3.3.0/kio/kssl/kopenssl.cc.orig 2004-09-20 10:24:52.699651631 +0200
|
|
||||||
+++ kdelibs-3.3.0/kio/kssl/kopenssl.cc 2004-09-20 10:40:49.264160762 +0200
|
|
||||||
@@ -311,6 +311,8 @@
|
|
||||||
#ifdef SHLIB_VERSION_NUMBER
|
|
||||||
<< "libssl.so." SHLIB_VERSION_NUMBER
|
|
||||||
#endif
|
|
||||||
+ << "libssl.so.0.9.8a"
|
|
||||||
+ << "libssl.so.6"
|
|
||||||
<< "libssl.so"
|
|
||||||
<< "libssl.so.0"
|
|
||||||
#endif
|
|
||||||
@@ -328,6 +330,8 @@
|
|
||||||
#ifdef SHLIB_VERSION_NUMBER
|
|
||||||
<< "libcrypto.so." SHLIB_VERSION_NUMBER
|
|
||||||
#endif
|
|
||||||
+ << "libcrypto.so.0.9.8a"
|
|
||||||
+ << "libcrypto.so.6"
|
|
||||||
<< "libcrypto.so"
|
|
||||||
<< "libcrypto.so.0"
|
|
||||||
#endif
|
|
|
@ -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 <boost/filesystem/exception.hpp>
|
||||||
|
+#include <boost/filesystem/operations.hpp>
|
||||||
|
+#include <boost/filesystem/path.hpp>
|
||||||
|
+#include <boost/regex.hpp>
|
||||||
|
+
|
||||||
|
+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());
|
||||||
|
}
|
|
@ -1,22 +0,0 @@
|
||||||
Index: khtml/html/htmltokenizer.cpp
|
|
||||||
===================================================================
|
|
||||||
--- khtml/html/htmltokenizer.cpp (Revision 626790)
|
|
||||||
+++ khtml/html/htmltokenizer.cpp (Revision 626791)
|
|
||||||
@@ -316,7 +316,7 @@
|
|
||||||
while ( !src.isEmpty() ) {
|
|
||||||
checkScriptBuffer();
|
|
||||||
unsigned char ch = src->latin1();
|
|
||||||
- if ( !scriptCodeResync && !brokenComments && !textarea && !xmp && !title && ch == '-' && scriptCodeSize >= 3 && !src.escaped() && QConstString( scriptCode+scriptCodeSize-3, 3 ).string() == "<!-" ) {
|
|
||||||
+ if ( !scriptCodeResync && !brokenComments && !textarea && !xmp && ch == '-' && scriptCodeSize >= 3 && !src.escaped() && QConstString( scriptCode+scriptCodeSize-3, 3 ).string() == "<!-" ) {
|
|
||||||
comment = true;
|
|
||||||
scriptCode[ scriptCodeSize++ ] = ch;
|
|
||||||
++src;
|
|
||||||
@@ -495,7 +495,7 @@
|
|
||||||
|
|
||||||
if (canClose || handleBrokenComments || scriptEnd ){
|
|
||||||
++src;
|
|
||||||
- if ( !( script || xmp || textarea || style) ) {
|
|
||||||
+ if ( !( title || script || xmp || textarea || style) ) {
|
|
||||||
#ifdef COMMENTS_IN_DOM
|
|
||||||
checkScriptBuffer();
|
|
||||||
scriptCode[ scriptCodeSize ] = 0;
|
|
|
@ -1,11 +0,0 @@
|
||||||
--- kdelibs-3.5.6/khtml/khtml_part.cpp.kde#126812 2007-01-15 05:34:06.000000000 -0600
|
|
||||||
+++ kdelibs-3.5.6/khtml/khtml_part.cpp 2007-05-14 15:20:50.000000000 -0500
|
|
||||||
@@ -1843,7 +1843,7 @@
|
|
||||||
}
|
|
||||||
KIO::TransferJob *tjob = ::qt_cast<KIO::TransferJob*>(job);
|
|
||||||
if (tjob && tjob->isErrorPage()) {
|
|
||||||
- khtml::RenderPart *renderPart = d->m_frame->m_frame;
|
|
||||||
+ khtml::RenderPart *renderPart = d->m_frame ? d->m_frame->m_frame : 0L;
|
|
||||||
if (renderPart) {
|
|
||||||
HTMLObjectElementImpl* elt = static_cast<HTMLObjectElementImpl *>(renderPart->element());
|
|
||||||
if (!elt)
|
|
|
@ -1,11 +0,0 @@
|
||||||
--- kdelibs-3.5.6/khtml/html/html_documentimpl.cpp.kde#140768 2007-01-15 05:34:00.000000000 -0600
|
|
||||||
+++ kdelibs-3.5.6/khtml/html/html_documentimpl.cpp 2007-02-16 09:38:24.000000000 -0600
|
|
||||||
@@ -222,7 +222,7 @@
|
|
||||||
|
|
||||||
void HTMLDocumentImpl::slotHistoryChanged()
|
|
||||||
{
|
|
||||||
- if ( !m_render )
|
|
||||||
+ if ( true || !m_render )
|
|
||||||
return;
|
|
||||||
|
|
||||||
recalcStyle( Force );
|
|
|
@ -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 )
|
|
@ -1,17 +0,0 @@
|
||||||
Index: khtml/test_regression_fontoverload.cpp
|
|
||||||
===================================================================
|
|
||||||
--- khtml/test_regression_fontoverload.cpp (Revision 628131)
|
|
||||||
+++ khtml/test_regression_fontoverload.cpp (Revision 628132)
|
|
||||||
@@ -244,7 +244,11 @@
|
|
||||||
|
|
||||||
// fe->setScale( scale );
|
|
||||||
|
|
||||||
- QFontCache::Key key( request, script, fp->screen );
|
|
||||||
+ QFontCache::Key key( request, script, fp->screen
|
|
||||||
+#if QT_VERSION >= 0x030308
|
|
||||||
+ , fp->paintdevice
|
|
||||||
+#endif
|
|
||||||
+ );
|
|
||||||
QFontCache::instance->insertEngine( key, fe );
|
|
||||||
return fe;
|
|
||||||
}
|
|
|
@ -1,15 +1,3 @@
|
||||||
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
|
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.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
|
+++ kdelibs-3.5.6/configure.in.in 2007-02-05 23:01:44.000000000 +0100
|
||||||
|
@ -96,18 +84,3 @@ diff -Nur kdelibs-3.5.6.orig/kdecore/Makefile.am kdelibs-3.5.6/kdecore/Makefile.
|
||||||
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 = 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_NMCHECK = $(srcdir)/libkdecore.nmcheck
|
||||||
libkdecore_la_NMCHECKWEAK = $(srcdir)/libkdecore_weak.nmcheck $(srcdir)/libqt-mt_weak.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 \
|
|
||||||
|
|
|
@ -0,0 +1,15 @@
|
||||||
|
--- kdelibs-3.5.7/kinit/autostart.cpp.orig 2007-09-25 11:32:07.000000000 +0200
|
||||||
|
+++ kdelibs-3.5.7/kinit/autostart.cpp 2007-09-25 14:14:29.000000000 +0200
|
||||||
|
@@ -48,6 +48,12 @@ AutoStart::AutoStart( bool new_startup )
|
||||||
|
m_startList = new AutoStartList;
|
||||||
|
m_startList->setAutoDelete(true);
|
||||||
|
KGlobal::dirs()->addResourceType("autostart", "share/autostart");
|
||||||
|
+ QString xdgconf_dirs = KGlobal::dirs()->kfsstnd_xdg_conf_prefixes();
|
||||||
|
+ if (xdgconf_dirs.isEmpty())
|
||||||
|
+ xdgconf_dirs = "/etc/xdg";
|
||||||
|
+ QStringList xdgconf_dirslist = QStringList::split( ':', xdgconf_dirs );
|
||||||
|
+ for ( QStringList::Iterator d = xdgconf_dirslist.begin(); d != xdgconf_dirslist.end(); ++d )
|
||||||
|
+ KGlobal::dirs()->addResourceDir("autostart", (*d) + "/autostart");
|
||||||
|
}
|
||||||
|
|
||||||
|
AutoStart::~AutoStart()
|
|
@ -0,0 +1,39 @@
|
||||||
|
diff -up kdelibs-3.5.8/kio/kssl/kopenssl.cc.openssl kdelibs-3.5.8/kio/kssl/kopenssl.cc
|
||||||
|
--- kdelibs-3.5.8/kio/kssl/kopenssl.cc.openssl 2006-07-22 03:16:39.000000000 -0500
|
||||||
|
+++ kdelibs-3.5.8/kio/kssl/kopenssl.cc 2007-12-04 08:13:44.000000000 -0600
|
||||||
|
@@ -329,6 +329,17 @@ KConfig *cfg;
|
||||||
|
#ifdef SHLIB_VERSION_NUMBER
|
||||||
|
<< "libssl.so." SHLIB_VERSION_NUMBER
|
||||||
|
#endif
|
||||||
|
+ << "libssl.so.0.9.8g"
|
||||||
|
+ << "libssl.so.7"
|
||||||
|
+ << "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 +357,17 @@ KConfig *cfg;
|
||||||
|
#ifdef SHLIB_VERSION_NUMBER
|
||||||
|
<< "libcrypto.so." SHLIB_VERSION_NUMBER
|
||||||
|
#endif
|
||||||
|
+ << "libcrypto.so.0.9.8g"
|
||||||
|
+ << "libcrypto.so.7"
|
||||||
|
+ << "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
|
|
@ -0,0 +1,10 @@
|
||||||
|
--- kdelibs-3.5.8/kate/data/vhdl.xml.orig 2007-10-18 19:34:32.000000000 +0200
|
||||||
|
+++ kdelibs-3.5.8/kate/data/vhdl.xml 2007-10-18 19:33:04.000000000 +0200
|
||||||
|
@@ -1,6 +1,6 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!DOCTYPE language SYSTEM "language.dtd">
|
||||||
|
-<language name="VHDL" version="1.04" kateversion="2.1" section="Hardware" extensions="*.vhdl;*.vhd" mimetype="text/x-vhdl">
|
||||||
|
+<language name="VHDL" version="1.04" kateversion="2.1" section="Hardware" extensions="*.vhdl;*.vhd;*.vst;*.vbe" mimetype="text/x-vhdl">
|
||||||
|
<highlighting>
|
||||||
|
<list name="keywords">
|
||||||
|
<item> access </item>
|
|
@ -0,0 +1,303 @@
|
||||||
|
diff -ur kdelibs-3.5.8/kdeui/ksconfig.cpp kdelibs-3.5.8-kspell-hunspell/kdeui/ksconfig.cpp
|
||||||
|
--- kdelibs-3.5.8/kdeui/ksconfig.cpp 2007-10-08 11:52:12.000000000 +0200
|
||||||
|
+++ kdelibs-3.5.8-kspell-hunspell/kdeui/ksconfig.cpp 2007-12-22 01:45:47.000000000 +0100
|
||||||
|
@@ -1,6 +1,7 @@
|
||||||
|
/* This file is part of the KDE libraries
|
||||||
|
Copyright (C) 1997 David Sweet <dsweet@kde.org>
|
||||||
|
Copyright (C) 2000-2001 Wolfram Diestel <wolfram@steloj.de>
|
||||||
|
+ Copyright (C) 2007 Kevin Kofler <Kevin@tigcc.ticalc.org>
|
||||||
|
|
||||||
|
This library is free software; you can redistribute it and/or
|
||||||
|
modify it under the terms of the GNU Library General Public
|
||||||
|
@@ -149,6 +150,7 @@
|
||||||
|
clientcombo->insertItem( i18n("Aspell") );
|
||||||
|
clientcombo->insertItem( i18n("Hspell") );
|
||||||
|
clientcombo->insertItem( i18n("Zemberek") );
|
||||||
|
+ clientcombo->insertItem( i18n("Hunspell") );
|
||||||
|
connect( clientcombo, SIGNAL (activated(int)), this,
|
||||||
|
SLOT (sChangeClient(int)) );
|
||||||
|
glay->addMultiCellWidget( clientcombo, 4, 4, 1, 2 );
|
||||||
|
@@ -240,8 +242,10 @@
|
||||||
|
dictcombo->insertItem( i18n("Turkish") );
|
||||||
|
sChangeEncoding( KS_E_UTF8 );
|
||||||
|
}
|
||||||
|
- else
|
||||||
|
+ else if ( iclient == KS_CLIENT_ASPELL )
|
||||||
|
getAvailDictsAspell();
|
||||||
|
+ else
|
||||||
|
+ getAvailDictsHunspell();
|
||||||
|
}
|
||||||
|
emit configChanged();
|
||||||
|
}
|
||||||
|
@@ -399,8 +403,10 @@
|
||||||
|
langfnames.append("");
|
||||||
|
dictcombo->insertItem( i18n("Turkish") );
|
||||||
|
}
|
||||||
|
- else
|
||||||
|
+ else if ( iclient == KS_CLIENT_ASPELL )
|
||||||
|
getAvailDictsAspell();
|
||||||
|
+ else
|
||||||
|
+ getAvailDictsHunspell();
|
||||||
|
|
||||||
|
// select the used dictionary in the list
|
||||||
|
int whichelement=-1;
|
||||||
|
@@ -583,6 +589,62 @@
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+void KSpellConfig::getAvailDictsHunspell () {
|
||||||
|
+
|
||||||
|
+ langfnames.clear();
|
||||||
|
+ dictcombo->clear();
|
||||||
|
+ langfnames.append(""); // Default
|
||||||
|
+ dictcombo->insertItem( i18n("Hunspell Default") );
|
||||||
|
+
|
||||||
|
+ // dictionary path
|
||||||
|
+ QFileInfo dir ("/usr/share/myspell");
|
||||||
|
+ if (!dir.exists() || !dir.isDir())
|
||||||
|
+ dir.setFile ("/usr/share/hunspell");
|
||||||
|
+ if (!dir.exists() || !dir.isDir()) return;
|
||||||
|
+
|
||||||
|
+ kdDebug(750) << "KSpellConfig::getAvailDictsHunspell "
|
||||||
|
+ << dir.filePath() << " " << dir.dirPath() << endl;
|
||||||
|
+
|
||||||
|
+ const QDir thedir (dir.filePath(),"*.dic");
|
||||||
|
+ const QStringList entryList = thedir.entryList();
|
||||||
|
+
|
||||||
|
+ kdDebug(750) << "KSpellConfig" << thedir.path() << "\n" << endl;
|
||||||
|
+ kdDebug(750) << "entryList().count()="
|
||||||
|
+ << entryList.count() << endl;
|
||||||
|
+
|
||||||
|
+ QStringList::const_iterator entryListItr = entryList.constBegin();
|
||||||
|
+ const QStringList::const_iterator entryListEnd = entryList.constEnd();
|
||||||
|
+
|
||||||
|
+ for ( ; entryListItr != entryListEnd; ++entryListItr)
|
||||||
|
+ {
|
||||||
|
+ QString fname, lname, hname;
|
||||||
|
+ fname = *entryListItr;
|
||||||
|
+
|
||||||
|
+ // remove .dic
|
||||||
|
+ if (fname.endsWith(".dic")) fname.remove (fname.length()-4,4);
|
||||||
|
+
|
||||||
|
+ if (interpret (fname, lname, hname) && langfnames.first().isEmpty())
|
||||||
|
+ { // This one is the KDE default language
|
||||||
|
+ // so place it first in the lists (overwrite "Default")
|
||||||
|
+
|
||||||
|
+ langfnames.remove ( langfnames.begin() );
|
||||||
|
+ langfnames.prepend ( fname );
|
||||||
|
+
|
||||||
|
+ hname=i18n("default spelling dictionary"
|
||||||
|
+ ,"Default - %1 [%2]").arg(hname).arg(fname);
|
||||||
|
+
|
||||||
|
+ dictcombo->changeItem (hname,0);
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ {
|
||||||
|
+ langfnames.append (fname);
|
||||||
|
+ hname=hname+" ["+fname+"]";
|
||||||
|
+
|
||||||
|
+ dictcombo->insertItem (hname);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
void
|
||||||
|
KSpellConfig::fillDicts( QComboBox* box, QStringList* dictionaries )
|
||||||
|
{
|
||||||
|
@@ -661,8 +723,7 @@
|
||||||
|
box->insertItem( i18n("Turkish") );
|
||||||
|
langfnames.append("");
|
||||||
|
sChangeEncoding( KS_E_UTF8 );
|
||||||
|
- }
|
||||||
|
- else {
|
||||||
|
+ } else if ( iclient == KS_CLIENT_ASPELL ) {
|
||||||
|
box->clear();
|
||||||
|
langfnames.append(""); // Default
|
||||||
|
box->insertItem (i18n("ASpell Default"));
|
||||||
|
@@ -741,6 +802,58 @@
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
+ } else {
|
||||||
|
+ box->clear();
|
||||||
|
+ langfnames.append(""); // Default
|
||||||
|
+ box->insertItem( i18n("Hunspell Default") );
|
||||||
|
+
|
||||||
|
+ // dictionary path
|
||||||
|
+ QFileInfo dir ("/usr/share/myspell");
|
||||||
|
+ if (!dir.exists() || !dir.isDir())
|
||||||
|
+ dir.setFile ("/usr/share/hunspell");
|
||||||
|
+ if (!dir.exists() || !dir.isDir()) return;
|
||||||
|
+
|
||||||
|
+ kdDebug(750) << "KSpellConfig::getAvailDictsHunspell "
|
||||||
|
+ << dir.filePath() << " " << dir.dirPath() << endl;
|
||||||
|
+
|
||||||
|
+ const QDir thedir (dir.filePath(),"*.dic");
|
||||||
|
+ const QStringList entryList = thedir.entryList();
|
||||||
|
+
|
||||||
|
+ kdDebug(750) << "KSpellConfig" << thedir.path() << "\n" << endl;
|
||||||
|
+ kdDebug(750) << "entryList().count()="
|
||||||
|
+ << entryList.count() << endl;
|
||||||
|
+
|
||||||
|
+ QStringList::const_iterator entryListItr = entryList.constBegin();
|
||||||
|
+ const QStringList::const_iterator entryListEnd = entryList.constEnd();
|
||||||
|
+
|
||||||
|
+ for ( ; entryListItr != entryListEnd; ++entryListItr)
|
||||||
|
+ {
|
||||||
|
+ QString fname, lname, hname;
|
||||||
|
+ fname = *entryListItr;
|
||||||
|
+
|
||||||
|
+ // remove .dic
|
||||||
|
+ if (fname.endsWith(".dic")) fname.remove (fname.length()-4,4);
|
||||||
|
+
|
||||||
|
+ if (interpret (fname, lname, hname) && langfnames.first().isEmpty())
|
||||||
|
+ { // This one is the KDE default language
|
||||||
|
+ // so place it first in the lists (overwrite "Default")
|
||||||
|
+
|
||||||
|
+ langfnames.remove ( langfnames.begin() );
|
||||||
|
+ langfnames.prepend ( fname );
|
||||||
|
+
|
||||||
|
+ hname=i18n("default spelling dictionary"
|
||||||
|
+ ,"Default - %1 [%2]").arg(hname).arg(fname);
|
||||||
|
+
|
||||||
|
+ box->changeItem (hname,0);
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ {
|
||||||
|
+ langfnames.append (fname);
|
||||||
|
+ hname=hname+" ["+fname+"]";
|
||||||
|
+
|
||||||
|
+ box->insertItem (hname);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
int whichelement = langfnames.findIndex(qsdict);
|
||||||
|
if ( whichelement >= 0 ) {
|
||||||
|
diff -ur kdelibs-3.5.8/kdeui/ksconfig.h kdelibs-3.5.8-kspell-hunspell/kdeui/ksconfig.h
|
||||||
|
--- kdelibs-3.5.8/kdeui/ksconfig.h 2005-10-10 17:06:38.000000000 +0200
|
||||||
|
+++ kdelibs-3.5.8-kspell-hunspell/kdeui/ksconfig.h 2007-12-22 01:35:25.000000000 +0100
|
||||||
|
@@ -1,5 +1,6 @@
|
||||||
|
/* This file is part of the KDE libraries
|
||||||
|
Copyright (C) 1997 David Sweet <dsweet@kde.org>
|
||||||
|
+ Copyright (C) 2007 Kevin Kofler <Kevin@tigcc.ticalc.org>
|
||||||
|
|
||||||
|
This library is free software; you can redistribute it and/or
|
||||||
|
modify it under the terms of the GNU Library General Public
|
||||||
|
@@ -61,7 +62,8 @@
|
||||||
|
KS_CLIENT_ISPELL=0,
|
||||||
|
KS_CLIENT_ASPELL=1,
|
||||||
|
KS_CLIENT_HSPELL=2,
|
||||||
|
- KS_CLIENT_ZEMBEREK=3
|
||||||
|
+ KS_CLIENT_ZEMBEREK=3,
|
||||||
|
+ KS_CLIENT_HUNSPELL=4
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
@@ -283,6 +285,7 @@
|
||||||
|
KSpellConfigPrivate *d;
|
||||||
|
void getAvailDictsIspell();
|
||||||
|
void getAvailDictsAspell();
|
||||||
|
+ void getAvailDictsHunspell();
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // KDELIBS_KSCONFIG_H
|
||||||
|
diff -ur kdelibs-3.5.8/kdeui/kspell.cpp kdelibs-3.5.8-kspell-hunspell/kdeui/kspell.cpp
|
||||||
|
--- kdelibs-3.5.8/kdeui/kspell.cpp 2005-10-10 17:06:38.000000000 +0200
|
||||||
|
+++ kdelibs-3.5.8-kspell-hunspell/kdeui/kspell.cpp 2007-12-22 02:26:29.000000000 +0100
|
||||||
|
@@ -2,6 +2,7 @@
|
||||||
|
Copyright (C) 1997 David Sweet <dsweet@kde.org>
|
||||||
|
Copyright (C) 2000-2001 Wolfram Diestel <wolfram@steloj.de>
|
||||||
|
Copyright (C) 2003 Zack Rusin <zack@kde.org>
|
||||||
|
+ Copyright (C) 2007 Kevin Kofler <Kevin@tigcc.ticalc.org>
|
||||||
|
|
||||||
|
This library is free software; you can redistribute it and/or
|
||||||
|
modify it under the terms of the GNU Library General Public
|
||||||
|
@@ -181,9 +182,14 @@
|
||||||
|
*proc << "zpspell";
|
||||||
|
kdDebug(750) << "Using zemberek(zpspell)" << endl;
|
||||||
|
break;
|
||||||
|
+ case KS_CLIENT_HUNSPELL:
|
||||||
|
+ *proc << "hunspell";
|
||||||
|
+ kdDebug(750) << "Using hunspell" << endl;
|
||||||
|
+ break;
|
||||||
|
}
|
||||||
|
|
||||||
|
- if ( ksconfig->client() == KS_CLIENT_ISPELL || ksconfig->client() == KS_CLIENT_ASPELL )
|
||||||
|
+ // Hunspell doesn't need all of these options, but it'll ignore those it doesn't understand.
|
||||||
|
+ if ( ksconfig->client() == KS_CLIENT_ISPELL || ksconfig->client() == KS_CLIENT_ASPELL || ksconfig->client() == KS_CLIENT_HUNSPELL )
|
||||||
|
{
|
||||||
|
*proc << "-a" << "-S";
|
||||||
|
|
||||||
|
@@ -201,8 +207,8 @@
|
||||||
|
*proc << "-t";
|
||||||
|
break;
|
||||||
|
case Nroff:
|
||||||
|
- //only ispell supports
|
||||||
|
- if ( ksconfig->client() == KS_CLIENT_ISPELL )
|
||||||
|
+ //only ispell and hunspell support
|
||||||
|
+ if ( ksconfig->client() == KS_CLIENT_ISPELL || ksconfig->client() == KS_CLIENT_HUNSPELL )
|
||||||
|
*proc << "-n";
|
||||||
|
break;
|
||||||
|
case Text:
|
||||||
|
@@ -239,7 +245,60 @@
|
||||||
|
// option, so kspell tries again without it. That's why as 'ps -ax'
|
||||||
|
// shows "ispell -a -S ..." withou the "-Tlatin2" option.
|
||||||
|
|
||||||
|
- if ( trystart<1 ) {
|
||||||
|
+ if ( ksconfig->client() == KS_CLIENT_HUNSPELL && trystart<1 ) {
|
||||||
|
+ // Note: This sets I/O encoding. Hunspell correctly handles dictionary encoding != I/O encoding.
|
||||||
|
+ // It will be faster if the I/O encoding matches the dictionary encoding, but using UTF-8 is always safe.
|
||||||
|
+ switch ( ksconfig->encoding() )
|
||||||
|
+ {
|
||||||
|
+ case KS_E_LATIN1:
|
||||||
|
+ *proc << "-i" << "ISO-8859-1";
|
||||||
|
+ break;
|
||||||
|
+ case KS_E_LATIN2:
|
||||||
|
+ *proc << "-i" << "ISO-8859-2";
|
||||||
|
+ break;
|
||||||
|
+ case KS_E_LATIN3:
|
||||||
|
+ *proc << "-i" << "ISO-8859-3";
|
||||||
|
+ break;
|
||||||
|
+ case KS_E_LATIN4:
|
||||||
|
+ *proc << "-i" << "ISO-8859-4";
|
||||||
|
+ break;
|
||||||
|
+ case KS_E_LATIN5:
|
||||||
|
+ *proc << "-i" << "ISO-8859-5";
|
||||||
|
+ break;
|
||||||
|
+ case KS_E_LATIN7:
|
||||||
|
+ *proc << "-i" << "ISO-8859-7";
|
||||||
|
+ break;
|
||||||
|
+ case KS_E_LATIN8:
|
||||||
|
+ *proc << "-i" << "ISO-8859-8";
|
||||||
|
+ break;
|
||||||
|
+ case KS_E_LATIN9:
|
||||||
|
+ *proc << "-i" << "ISO-8859-9";
|
||||||
|
+ break;
|
||||||
|
+ case KS_E_LATIN13:
|
||||||
|
+ *proc << "-i" << "ISO-8859-13";
|
||||||
|
+ break;
|
||||||
|
+ case KS_E_LATIN15:
|
||||||
|
+ *proc << "-i" << "ISO-8859-15";
|
||||||
|
+ break;
|
||||||
|
+ case KS_E_UTF8:
|
||||||
|
+ *proc << "-i" << "UTF-8";
|
||||||
|
+ break;
|
||||||
|
+ case KS_E_KOI8R:
|
||||||
|
+ *proc << "-i" << "KOI8-R";
|
||||||
|
+ break;
|
||||||
|
+ case KS_E_KOI8U:
|
||||||
|
+ *proc << "-i" << "KOI8-U";
|
||||||
|
+ break;
|
||||||
|
+ case KS_E_CP1251:
|
||||||
|
+ *proc << "-i" << "CP1251";
|
||||||
|
+ break;
|
||||||
|
+ case KS_E_CP1255:
|
||||||
|
+ *proc << "-i" << "CP1255";
|
||||||
|
+ break;
|
||||||
|
+ default:
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+ } else if ( trystart<1 ) {
|
||||||
|
switch ( ksconfig->encoding() )
|
||||||
|
{
|
||||||
|
case KS_E_LATIN1:
|
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,21 @@
|
||||||
|
diff -ur kdelibs-3.5.8-kspell2-enchant/kspell2/plugins/Makefile.am kdelibs-3.5.8-kspell2-no-ispell/kspell2/plugins/Makefile.am
|
||||||
|
--- kdelibs-3.5.8-kspell2-enchant/kspell2/plugins/Makefile.am 2007-12-21 20:39:46.000000000 +0100
|
||||||
|
+++ kdelibs-3.5.8-kspell2-no-ispell/kspell2/plugins/Makefile.am 2007-12-22 21:34:10.000000000 +0100
|
||||||
|
@@ -6,4 +6,4 @@
|
||||||
|
LIBHSPELLPLUGIN = hspell
|
||||||
|
endif
|
||||||
|
|
||||||
|
-SUBDIRS = enchant $(LIBASPELLPLUGIN) $(LIBHSPELLPLUGIN) ispell
|
||||||
|
+SUBDIRS = enchant $(LIBASPELLPLUGIN) $(LIBHSPELLPLUGIN)
|
||||||
|
diff -ur kdelibs-3.5.8-kspell2-enchant/kspell2/plugins/Makefile.in kdelibs-3.5.8-kspell2-no-ispell/kspell2/plugins/Makefile.in
|
||||||
|
--- kdelibs-3.5.8-kspell2-enchant/kspell2/plugins/Makefile.in 2007-12-21 20:40:22.000000000 +0100
|
||||||
|
+++ kdelibs-3.5.8-kspell2-no-ispell/kspell2/plugins/Makefile.in 2007-12-22 21:35:39.000000000 +0100
|
||||||
|
@@ -377,7 +377,7 @@
|
||||||
|
xdg_menudir = @xdg_menudir@
|
||||||
|
@include_aspell_plugin_TRUE@LIBASPELLPLUGIN = aspell
|
||||||
|
@include_hspell_plugin_TRUE@LIBHSPELLPLUGIN = hspell
|
||||||
|
-SUBDIRS = enchant $(LIBASPELLPLUGIN) $(LIBHSPELLPLUGIN) ispell
|
||||||
|
+SUBDIRS = enchant $(LIBASPELLPLUGIN) $(LIBHSPELLPLUGIN)
|
||||||
|
#>- all: all-recursive
|
||||||
|
#>+ 1
|
||||||
|
all: docs-am all-recursive
|
|
@ -0,0 +1,18 @@
|
||||||
|
diff -ur kdelibs-orig/kdeprint/cups/cupsdconf2/cupsdconf.cpp kdelibs-3.5.9/kdeprint/cups/cupsdconf2/cupsdconf.cpp
|
||||||
|
--- kdelibs-orig/kdeprint/cups/cupsdconf2/cupsdconf.cpp 2005-10-10 17:06:30.000000000 +0200
|
||||||
|
+++ kdelibs-3.5.9/kdeprint/cups/cupsdconf2/cupsdconf.cpp 2008-02-26 15:03:47.000000000 +0100
|
||||||
|
@@ -71,10 +71,10 @@
|
||||||
|
//fontpath_ << (datadir_+"/fonts");
|
||||||
|
requestdir_ = findDir(QStringList("/var/spool/cups")
|
||||||
|
<< "/var/cups");
|
||||||
|
- serverbin_ = findDir(QStringList("/usr/lib" KDELIBSUFF "/cups")
|
||||||
|
- << "/usr/local/lib" KDELIBSUFF "/cups"
|
||||||
|
- << "/opt/lib" KDELIBSUFF "/cups"
|
||||||
|
- << "/opt/local/lib" KDELIBSUFF "/cups");
|
||||||
|
+ serverbin_ = findDir(QStringList("/usr/lib/cups")
|
||||||
|
+ << "/usr/local/lib/cups"
|
||||||
|
+ << "/opt/lib/cups"
|
||||||
|
+ << "/opt/local/lib/cups");
|
||||||
|
serverfiles_ = findDir(QStringList("/etc/cups")
|
||||||
|
<< "/usr/local/etc/cups");
|
||||||
|
tmpfiles_ = requestdir_+"/tmp";
|
|
@ -0,0 +1,11 @@
|
||||||
|
--- kdelibs/kate/part/katesupercursor.cpp 2008/02/08 14:17:43 772352
|
||||||
|
+++ kdelibs/kate/part/katesupercursor.cpp 2008/02/20 11:02:18 777286
|
||||||
|
@@ -186,7 +186,7 @@
|
||||||
|
{
|
||||||
|
if (newLine)
|
||||||
|
{
|
||||||
|
- if (m_line > int(line) || (m_line == int(line) && m_col > int(col)))
|
||||||
|
+ if (m_line > int(line) || (m_line == int(line) && m_col >= int(col)))
|
||||||
|
{
|
||||||
|
if(m_line == int(line))
|
||||||
|
m_col -= col;
|
569
kdelibs.spec
569
kdelibs.spec
|
@ -1,36 +1,48 @@
|
||||||
|
# kdelibs3 review: http://bugzilla.redhat.com/248899
|
||||||
|
|
||||||
%define distname "Fedora"
|
%define distname "Fedora"
|
||||||
|
|
||||||
#define debug 1
|
|
||||||
%define final 1
|
|
||||||
%define kde_settings 1
|
%define kde_settings 1
|
||||||
%define apidocs 1
|
|
||||||
|
%define arts 1
|
||||||
|
%define arts_epoch 8
|
||||||
|
%define arts_version 1.5.9
|
||||||
|
|
||||||
%define qt_epoch 1
|
%define qt_epoch 1
|
||||||
%define arts_epoch 8
|
%define qt_version 3.3.8b
|
||||||
%define cups_epoch 1
|
# unfortunately, this doesn't work for 3.3.8b which still identifies as 3.3.8
|
||||||
|
#global qt_ver %(pkg-config --modversion qt-mt 2>/dev/null || echo %{qt_version})
|
||||||
%define qt_version 3.3.8
|
%define qt_ver %{qt_version}
|
||||||
%define arts_version 1.5.6
|
|
||||||
%define kde_major_version 3
|
|
||||||
|
|
||||||
%global qt_ver %(pkg-config --modversion qt-mt 2>/dev/null || echo %{qt_version})
|
|
||||||
%define qtdocdir %{_docdir}/qt-devel-%{qt_ver}
|
%define qtdocdir %{_docdir}/qt-devel-%{qt_ver}
|
||||||
|
|
||||||
|
%define kde_major_version 3
|
||||||
|
|
||||||
%define make_cvs 1
|
%define make_cvs 1
|
||||||
%define arts 1
|
|
||||||
|
|
||||||
Name: kdelibs
|
%define apidocs 1
|
||||||
Summary: K Desktop Environment - Libraries
|
|
||||||
Epoch: 6
|
|
||||||
Version: 3.5.6
|
|
||||||
Release: 9%{?dist}
|
|
||||||
|
|
||||||
License: LGPL
|
Summary: K Desktop Environment 3 - Libraries
|
||||||
|
Version: 3.5.9
|
||||||
|
Release: 5%{?dist}
|
||||||
|
|
||||||
|
%if 0%{?fedora} > 8
|
||||||
|
Name: kdelibs3
|
||||||
|
Obsoletes: kdelibs < 6:%{version}-%{release}
|
||||||
|
Provides: kdelibs = 6:%{version}-%{release}
|
||||||
|
%else
|
||||||
|
Name: kdelibs
|
||||||
|
Epoch: 6
|
||||||
|
Obsoletes: kdelibs3 < %{version}-%{release}
|
||||||
|
Provides: kdelibs3 = %{version}-%{release}
|
||||||
|
%define include_crystalsvg 1
|
||||||
|
%endif
|
||||||
|
|
||||||
|
License: LGPLv2
|
||||||
Url: http://www.kde.org/
|
Url: http://www.kde.org/
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
|
|
||||||
|
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdelibs-%{version}.tar.bz2
|
||||||
Source1: kde.sh
|
Source1: kde.sh
|
||||||
Source2: kde.csh
|
Source2: kde.csh
|
||||||
Source3: devices.protocol
|
Source3: devices.protocol
|
||||||
|
@ -38,9 +50,8 @@ Source3: devices.protocol
|
||||||
Patch1: kdelibs-3.5.1-xdg-menu.patch
|
Patch1: kdelibs-3.5.1-xdg-menu.patch
|
||||||
Patch2: kdelibs-3.0.0-ndebug.patch
|
Patch2: kdelibs-3.0.0-ndebug.patch
|
||||||
Patch4: kdelibs-3.0.4-ksyscoca.patch
|
Patch4: kdelibs-3.0.4-ksyscoca.patch
|
||||||
Patch5: kdelibs-3.5.0-openssl0.9.8a.patch
|
Patch5: kdelibs-3.5.7-openssl.patch
|
||||||
Patch15: kdelibs-3.4.91-buildroot.patch
|
Patch15: kdelibs-3.4.91-buildroot.patch
|
||||||
Patch16: kdelibs-3.1-ssl-krb5.patch
|
|
||||||
Patch32: kdelibs-3.2.3-cups.patch
|
Patch32: kdelibs-3.2.3-cups.patch
|
||||||
Patch33: kdelibs-3.3.2-ppc.patch
|
Patch33: kdelibs-3.3.2-ppc.patch
|
||||||
Patch34: kdelibs-3.4.0-qtdoc.patch
|
Patch34: kdelibs-3.4.0-qtdoc.patch
|
||||||
|
@ -50,39 +61,48 @@ Patch38: kdelibs-3.5.2-cupsdconf2-group.patch
|
||||||
Patch39: kdelibs-3.5.4-kabc-make.patch
|
Patch39: kdelibs-3.5.4-kabc-make.patch
|
||||||
Patch40: kdelibs-3.5.4-kdeprint-utf8.patch
|
Patch40: kdelibs-3.5.4-kdeprint-utf8.patch
|
||||||
Patch41: kdelibs-3.5.6-utempter.patch
|
Patch41: kdelibs-3.5.6-utempter.patch
|
||||||
|
Patch43: kdelibs-3.5.6-lang.patch
|
||||||
|
Patch45: kdelibs-3.5.7-autostart.patch
|
||||||
|
Patch46: kdelibs-3.5.8-kate-vhdl.patch
|
||||||
|
Patch48: kdelibs-3.5.8-kspell-hunspell.patch
|
||||||
|
Patch49: kdelibs-3.5.8-kspell2-enchant.patch
|
||||||
|
Patch50: kdelibs-3.5.8-kspell2-no-ispell.patch
|
||||||
|
Patch51: kdelibs-3.5.9-cupsserverbin.patch
|
||||||
|
|
||||||
# use /etc/kde in addition to /usr/share/config, borrowed from debian
|
# use /etc/kde in addition to /usr/share/config, borrowed from debian
|
||||||
Patch104: kdelibs-3.5.5-kstandarddirs.patch
|
Patch100: kdelibs-3.5.5-kstandarddirs.patch
|
||||||
|
# http://bugs.kde.org/93359, alternative to export libltdl_cv_shlibext=".so" hack.
|
||||||
# upstream patches
|
Patch101: kde-3.5-libtool-shlibext.patch
|
||||||
Patch500: kdelibs-3.5.6-qt3.3.8.patch
|
|
||||||
Patch501: kdelibs-3.5.6-kde#126812.patch
|
|
||||||
# kget ignores simultaneous download limit (kde #101956)
|
|
||||||
Patch101956: kdelibs-3.5.0-101956.patch
|
|
||||||
# automake-1.10, $(all_libraries) is missing from a few LDFLAGS (kde #137675)
|
# automake-1.10, $(all_libraries) is missing from a few LDFLAGS (kde #137675)
|
||||||
Patch137675: kdelibs-3.5.6-137675.patch
|
Patch102: kdelibs-3.5.6-137675.patch
|
||||||
## http://bugs.kde.org/140768
|
# kget ignores simultaneous download limit (kde #101956)
|
||||||
Patch140768: kdelibs-3.5.6-kde#140768.patch
|
Patch103: kdelibs-3.5.0-101956.patch
|
||||||
|
|
||||||
# security issue
|
## upstream patches
|
||||||
# CVE-2007-0537
|
Patch200: kdelibs-3.5.9-kate-regression.patch
|
||||||
Patch1000: kdelibs-3.5.6-bz#225420-CVE-2007-0537.patch
|
|
||||||
|
|
||||||
Requires: arts >= %{arts_epoch}:%{arts_version}
|
%{?arts:Requires: arts >= %{arts_epoch}:%{arts_version}}
|
||||||
Requires: qt >= %{qt_epoch}:%{qt_ver}
|
Requires: qt >= %{qt_epoch}:%{qt_ver}
|
||||||
Requires: cups-libs >= %{cups_epoch}:1.1.12
|
|
||||||
Requires: hicolor-icon-theme
|
Requires: hicolor-icon-theme
|
||||||
Requires: iceauth
|
|
||||||
%if %{kde_settings}
|
%if %{kde_settings}
|
||||||
Requires: kde-settings >= 3.5
|
Requires: kde-settings >= 3.5
|
||||||
%endif
|
%endif
|
||||||
Requires: libkdnssd
|
Requires: kde-filesystem
|
||||||
## don't think these are *strictly* required anymore, and if so,
|
%if "%{name}" != "kdelibs"
|
||||||
## should prolly be in kdebase -- Rex
|
Requires: kdelibs-common
|
||||||
#Requires: redhat-artwork >= 0.239-2
|
%endif
|
||||||
#Requires: desktop-backgrounds-basic
|
Requires: redhat-menus
|
||||||
Requires: redhat-menus >= 5.0.4
|
|
||||||
Requires: shadow-utils
|
Requires: shadow-utils
|
||||||
|
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(pre): coreutils
|
||||||
Requires(post): /sbin/ldconfig
|
Requires(post): /sbin/ldconfig
|
||||||
|
@ -90,12 +110,12 @@ Requires(postun): /sbin/ldconfig
|
||||||
|
|
||||||
BuildRequires: gettext
|
BuildRequires: gettext
|
||||||
BuildRequires: pcre-devel
|
BuildRequires: pcre-devel
|
||||||
BuildRequires: cups-devel >= %{cups_epoch}:1.1.20, cups
|
BuildRequires: cups-devel cups
|
||||||
BuildRequires: qt-devel >= %{qt_epoch}:%{qt_version}, qt-devel-docs
|
BuildRequires: qt-devel qt-devel-docs
|
||||||
BuildRequires: arts-devel >= %{arts_epoch}:%{arts_version}
|
%{?arts:BuildRequires: arts-devel >= %{arts_epoch}:%{arts_version}}
|
||||||
BuildRequires: flex >= 2.5.4a-13
|
BuildRequires: flex >= 2.5.4a-13
|
||||||
BuildRequires: doxygen
|
BuildRequires: doxygen
|
||||||
BuildRequires: libxslt-devel >= 1.1.15
|
BuildRequires: libxslt-devel
|
||||||
BuildRequires: sgml-common
|
BuildRequires: sgml-common
|
||||||
BuildRequires: openjade
|
BuildRequires: openjade
|
||||||
BuildRequires: jadetex
|
BuildRequires: jadetex
|
||||||
|
@ -114,15 +134,24 @@ BuildRequires: libart_lgpl-devel
|
||||||
BuildRequires: bzip2-devel
|
BuildRequires: bzip2-devel
|
||||||
BuildRequires: libtiff-devel
|
BuildRequires: libtiff-devel
|
||||||
BuildRequires: libacl-devel libattr-devel
|
BuildRequires: libacl-devel libattr-devel
|
||||||
|
%if 0%{?fedora} >= 9
|
||||||
|
BuildRequires: enchant-devel
|
||||||
|
Requires: hunspell
|
||||||
|
%else
|
||||||
BuildRequires: aspell-devel
|
BuildRequires: aspell-devel
|
||||||
# +keyutils-libs-devel until krb5-devel's Req's are fixed
|
%endif
|
||||||
BuildRequires: krb5-devel keyutils-libs-devel
|
BuildRequires: krb5-devel
|
||||||
BuildRequires: openldap-devel
|
BuildRequires: openldap-devel
|
||||||
BuildRequires: db4-devel
|
BuildRequires: db4-devel
|
||||||
BuildRequires: alsa-lib-devel
|
BuildRequires: alsa-lib-devel
|
||||||
BuildRequires: pkgconfig
|
BuildRequires: pkgconfig
|
||||||
BuildRequires: glibc-kernheaders
|
BuildRequires: glibc-kernheaders
|
||||||
|
%if 0%{?fedora} > 5 || 0%{?rhel} > 4
|
||||||
|
%define _with_libutempter 1
|
||||||
BuildRequires: libutempter-devel
|
BuildRequires: libutempter-devel
|
||||||
|
%else
|
||||||
|
BuildRequires: utempter
|
||||||
|
%endif
|
||||||
BuildRequires: findutils
|
BuildRequires: findutils
|
||||||
BuildRequires: jasper-devel
|
BuildRequires: jasper-devel
|
||||||
BuildRequires: OpenEXR-devel
|
BuildRequires: OpenEXR-devel
|
||||||
|
@ -130,8 +159,20 @@ BuildRequires: OpenEXR-devel
|
||||||
BuildRequires: automake libtool
|
BuildRequires: automake libtool
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%if "%{name}" != "kdelibs" && "%{?apidocs}" != "1"
|
||||||
|
Obsoletes: kdelibs-apidocs < 6:%{version}-%{release}
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if 0%{?include_crystalsvg}
|
||||||
|
Provides: crystalsvg-icon-theme = %{version}-%{release}
|
||||||
|
%else
|
||||||
|
# this Requires could be made unconditional -- Rex
|
||||||
|
Requires: crystalsvg-icon-theme
|
||||||
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Libraries for the K Desktop Environment:
|
Libraries for the K Desktop Environment 3:
|
||||||
KDE Libraries included: kdecore (KDE core library), kdeui (user interface),
|
KDE Libraries included: kdecore (KDE core library), kdeui (user interface),
|
||||||
kfm (file manager), khtmlw (HTML widget), kio (Input/Output, networking),
|
kfm (file manager), khtmlw (HTML widget), kio (Input/Output, networking),
|
||||||
kspell (spelling checker), jscript (javascript), kab (addressbook),
|
kspell (spelling checker), jscript (javascript), kab (addressbook),
|
||||||
|
@ -139,47 +180,47 @@ kimgio (image manipulation).
|
||||||
|
|
||||||
%package devel
|
%package devel
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
Summary: Header files and documentation for compiling KDE applications.
|
Summary: Header files and documentation for compiling KDE 3 applications.
|
||||||
Requires: %{name} = %{epoch}:%{version}-%{release}
|
%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
|
Requires: qt-devel
|
||||||
Requires: arts-devel
|
|
||||||
Requires: libkdnssd-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: openssl-devel
|
Requires: openssl-devel
|
||||||
Requires: bzip2-devel
|
%{?arts:Requires: arts-devel}
|
||||||
Requires: libtiff-devel
|
%{?libkdnssd:Requires: libkdnssd-devel}
|
||||||
Requires: libidn-devel
|
|
||||||
Requires: libacl-devel
|
|
||||||
Requires: pcre-devel
|
|
||||||
Requires: libutempter-devel
|
|
||||||
%description devel
|
%description devel
|
||||||
This package includes the header files you will need to compile
|
This package includes the header files you will need to compile
|
||||||
applications for KDE.
|
applications for KDE 3.
|
||||||
|
|
||||||
%package apidocs
|
%package apidocs
|
||||||
Group: Development/Documentation
|
Group: Development/Documentation
|
||||||
Summary: KDE API documentation.
|
Summary: KDE 3 API documentation.
|
||||||
Requires: %{name} = %{epoch}:%{version}
|
Requires: %{name} = %{?epoch:%{epoch}:}%{version}
|
||||||
Obsoletes: kdelibs-docs < %{epoch}:%{version}-%{release}
|
%if "%{name}" == "kdelibs"
|
||||||
|
Provides: kdelibs3-apidocs = %{version}-%{release}
|
||||||
|
%else
|
||||||
|
Obsoletes: kdelibs-apidocs < 6:%{version}-%{release}
|
||||||
|
Provides: kdelibs-apidocs = 6:%{version}-%{release}
|
||||||
|
%endif
|
||||||
|
|
||||||
%description apidocs
|
%description apidocs
|
||||||
This package includes the KDE API documentation in HTML
|
This package includes the KDE 3 API documentation in HTML
|
||||||
format for easy browsing
|
format for easy browsing
|
||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q -n kdelibs-%{version}
|
||||||
|
|
||||||
%patch1 -p1 -b .xdg-menu
|
%patch1 -p1 -b .xdg-menu
|
||||||
%if "%{?debug}" != "1"
|
|
||||||
%patch2 -p1 -b .debug
|
%patch2 -p1 -b .debug
|
||||||
%endif
|
|
||||||
%patch4 -p1 -b .ksyscoca
|
%patch4 -p1 -b .ksyscoca
|
||||||
%patch5 -p1 -b .openssl
|
%patch5 -p1 -b .openssl
|
||||||
%patch15 -p1 -b .buildroot
|
%patch15 -p1 -b .buildroot
|
||||||
%patch16 -p1 -b .ssl-krb5
|
|
||||||
%patch32 -p1 -b .cups
|
%patch32 -p1 -b .cups
|
||||||
%patch33 -p1 -b .ppc
|
%patch33 -p1 -b .ppc
|
||||||
%patch34 -p1 -b .qtdoc
|
%patch34 -p1 -b .qtdoc
|
||||||
|
@ -188,18 +229,23 @@ format for easy browsing
|
||||||
%patch38 -p1 -b .cupsdconf2-group
|
%patch38 -p1 -b .cupsdconf2-group
|
||||||
%patch39 -p1 -b .kabc-make
|
%patch39 -p1 -b .kabc-make
|
||||||
%patch40 -p1 -b .kdeprint-utf8
|
%patch40 -p1 -b .kdeprint-utf8
|
||||||
%patch41 -p1 -b .utempter
|
%{?_with_libutempter:%patch41 -p1 -b .utempter}
|
||||||
|
%patch43 -p1 -b .lang
|
||||||
|
%patch45 -p1 -b .xdg-autostart
|
||||||
|
%patch46 -p1 -b .kate-vhdl
|
||||||
|
%if 0%{?fedora} >= 9
|
||||||
|
%patch48 -p1 -b .kspell
|
||||||
|
%patch49 -p1 -b .kspell2
|
||||||
|
%patch50 -p1 -b .no-ispell
|
||||||
|
%endif
|
||||||
|
%patch51 -p1 -b .cupsserverbin
|
||||||
|
|
||||||
%patch104 -p1 -b .kstandarddirs
|
%patch100 -p1 -b .kstandarddirs
|
||||||
|
%patch101 -p1 -b .libtool-shlibext
|
||||||
|
%patch102 -p0 -b .kde#137675
|
||||||
|
|
||||||
# upstream patches
|
# upstream patches
|
||||||
%patch500 -p0 -b .qt3.3.8
|
%patch200 -p1 -b .kate-regression
|
||||||
%patch501 -p1 -b .kde#126812
|
|
||||||
%patch137675 -p0 -b .kde#137675
|
|
||||||
%patch140768 -p1 -b .kde#140768
|
|
||||||
|
|
||||||
# security
|
|
||||||
%patch1000 -p0 -b .bz#225420-CVE-2007-0537
|
|
||||||
|
|
||||||
sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
|
sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
|
||||||
|
|
||||||
|
@ -212,7 +258,6 @@ sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{versi
|
||||||
unset QTDIR && . /etc/profile.d/qt.sh
|
unset QTDIR && . /etc/profile.d/qt.sh
|
||||||
|
|
||||||
export QTDOC=%{qtdocdir}
|
export QTDOC=%{qtdocdir}
|
||||||
export libltdl_cv_shlibext=".so"
|
|
||||||
|
|
||||||
if [ -x /etc/profile.d/krb5.sh ]; then
|
if [ -x /etc/profile.d/krb5.sh ]; then
|
||||||
. /etc/profile.d/krb5.sh
|
. /etc/profile.d/krb5.sh
|
||||||
|
@ -237,20 +282,26 @@ fi
|
||||||
--enable-sendfile \
|
--enable-sendfile \
|
||||||
--with-distribution="$(cat /etc/redhat-release 2>/dev/null)" \
|
--with-distribution="$(cat /etc/redhat-release 2>/dev/null)" \
|
||||||
--with-alsa \
|
--with-alsa \
|
||||||
|
%if 0%{?fedora} >= 9
|
||||||
|
--without-aspell \
|
||||||
|
%else
|
||||||
--with-aspell \
|
--with-aspell \
|
||||||
|
%endif
|
||||||
|
--without-hspell \
|
||||||
--disable-libfam \
|
--disable-libfam \
|
||||||
--enable-dnotify \
|
--enable-dnotify \
|
||||||
--enable-inotify \
|
--enable-inotify \
|
||||||
--with-utempter \
|
--with-utempter \
|
||||||
%{!?arts:--without-arts} \
|
%{!?arts:--without-arts} \
|
||||||
--with-rgbfile=%{_datadir}/X11/rgb.txt \
|
%{?_with_rgbfile} \
|
||||||
--with-jasper \
|
--with-jasper \
|
||||||
--with-openexr \
|
--with-openexr \
|
||||||
--with-xinerama
|
--with-xinerama
|
||||||
|
|
||||||
make %{?_smp_mflags}
|
make %{?_smp_mflags}
|
||||||
%if %{apidocs}
|
|
||||||
make %{?_smp_mflags} apidox
|
%if "%{?apidocs}" == "1"
|
||||||
|
make %{?_smp_mflags} apidox
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
||||||
|
@ -262,12 +313,11 @@ make DESTDIR=%{buildroot} install
|
||||||
chmod a+x %{buildroot}%{_libdir}/*
|
chmod a+x %{buildroot}%{_libdir}/*
|
||||||
install -p -m 644 %{SOURCE3} %{buildroot}%{_datadir}/services/devices.protocol
|
install -p -m 644 %{SOURCE3} %{buildroot}%{_datadir}/services/devices.protocol
|
||||||
|
|
||||||
|
%if "%{?apidocs}" == "1"
|
||||||
pushd %{buildroot}%{_docdir}
|
pushd %{buildroot}%{_docdir}
|
||||||
ln -sf HTML/en/kdelibs-apidocs %{name}-devel-%{kde_major_version}
|
ln -sf HTML/en/kdelibs-apidocs %{name}-devel-%{kde_major_version}
|
||||||
popd
|
popd
|
||||||
|
%endif
|
||||||
mkdir -p %{buildroot}%{_sysconfdir}/profile.d
|
|
||||||
install -p -m 755 %{SOURCE1} %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/
|
|
||||||
|
|
||||||
# Make symlinks relative
|
# Make symlinks relative
|
||||||
pushd %{buildroot}%{_docdir}/HTML/en
|
pushd %{buildroot}%{_docdir}/HTML/en
|
||||||
|
@ -279,17 +329,15 @@ for i in *; do
|
||||||
done
|
done
|
||||||
popd
|
popd
|
||||||
|
|
||||||
## menus
|
install -p -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/kde.sh
|
||||||
|
install -p -m 644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/kde.csh
|
||||||
|
|
||||||
|
%if "%{name}" == "kdelibs"
|
||||||
|
# menus
|
||||||
mkdir -p %{buildroot}%{_sysconfdir}/kde/xdg/menus
|
mkdir -p %{buildroot}%{_sysconfdir}/kde/xdg/menus
|
||||||
mv %{buildroot}%{_sysconfdir}/xdg/menus/applications.menu \
|
mv %{buildroot}%{_sysconfdir}/xdg/menus/applications.menu \
|
||||||
%{buildroot}%{_sysconfdir}/xdg/menus/kde-applications.menu
|
%{buildroot}%{_sysconfdir}/xdg/menus/kde-applications.menu
|
||||||
# compat-symlinks, can go away eventually -- Rex
|
%endif
|
||||||
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
|
|
||||||
|
|
||||||
echo "OnlyShowIn=KDE;" >> %{buildroot}%{_datadir}/applications/kde/kresources.desktop
|
|
||||||
|
|
||||||
# Use hicolor-icon-theme rpm/pkg instead (#178319)
|
# Use hicolor-icon-theme rpm/pkg instead (#178319)
|
||||||
rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/
|
rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/
|
||||||
|
@ -297,7 +345,7 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/
|
||||||
# ghost'd files
|
# ghost'd files
|
||||||
touch $RPM_BUILD_ROOT%{_datadir}/services/ksycoca
|
touch $RPM_BUILD_ROOT%{_datadir}/services/ksycoca
|
||||||
|
|
||||||
## remove references to extraneous/optional libraries in .la files (#170602)
|
# remove references to extraneous/optional libraries in .la files (#170602)
|
||||||
# fam, libart_lgpl, pcre, libidn, libpng, libjpeg, libdns_sd, libacl/libattr, alsa-lib/asound
|
# fam, libart_lgpl, pcre, libidn, libpng, libjpeg, libdns_sd, libacl/libattr, alsa-lib/asound
|
||||||
find $RPM_BUILD_ROOT%{_libdir} -name "*.la" | xargs \
|
find $RPM_BUILD_ROOT%{_libdir} -name "*.la" | xargs \
|
||||||
sed -i \
|
sed -i \
|
||||||
|
@ -319,50 +367,98 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" | xargs \
|
||||||
-e "s@-lattr@@g" \
|
-e "s@-lattr@@g" \
|
||||||
-e "s@%{_libdir}/libattr.la@@g" \
|
-e "s@%{_libdir}/libattr.la@@g" \
|
||||||
-e "s@/%{_lib}/libattr.la@@g" \
|
-e "s@/%{_lib}/libattr.la@@g" \
|
||||||
-e "s@-lasound@@g"
|
-e "s@-lasound@@g" \
|
||||||
|
-e "s@-lutempter@@g"
|
||||||
|
|
||||||
## unpackaged files
|
|
||||||
# libkdnssd bits
|
# libkdnssd bits
|
||||||
rm -f %{buildroot}%{_libdir}/libkdnssd.*
|
rm -f %{buildroot}%{_libdir}/libkdnssd.la
|
||||||
rm -rf %{buildroot}%{_includedir}/kde/dnssd
|
%{?libkdnssd:rm -rf %{buildroot}{%{_libdir}/libkdnssd.*,%{_includedir}/kde/dnssd}}
|
||||||
|
|
||||||
|
%if "%{name}" != "kdelibs"
|
||||||
|
# remove conflicts with kdelibs-4
|
||||||
|
rm -f %{buildroot}%{_bindir}/checkXML
|
||||||
|
rm -f %{buildroot}%{_bindir}/ksvgtopng
|
||||||
|
rm -f %{buildroot}%{_bindir}/kunittestmodrunner
|
||||||
|
rm -f %{buildroot}%{_datadir}/config/kdebug.areas
|
||||||
|
rm -f %{buildroot}%{_datadir}/config/kdebugrc
|
||||||
|
rm -f %{buildroot}%{_datadir}/config/ui/ui_standards.rc
|
||||||
|
rm -f %{buildroot}%{_docdir}/HTML/en/common/1.png
|
||||||
|
rm -f %{buildroot}%{_docdir}/HTML/en/common/10.png
|
||||||
|
rm -f %{buildroot}%{_docdir}/HTML/en/common/2.png
|
||||||
|
rm -f %{buildroot}%{_docdir}/HTML/en/common/3.png
|
||||||
|
rm -f %{buildroot}%{_docdir}/HTML/en/common/4.png
|
||||||
|
rm -f %{buildroot}%{_docdir}/HTML/en/common/5.png
|
||||||
|
rm -f %{buildroot}%{_docdir}/HTML/en/common/6.png
|
||||||
|
rm -f %{buildroot}%{_docdir}/HTML/en/common/7.png
|
||||||
|
rm -f %{buildroot}%{_docdir}/HTML/en/common/8.png
|
||||||
|
rm -f %{buildroot}%{_docdir}/HTML/en/common/9.png
|
||||||
|
rm -f %{buildroot}%{_docdir}/HTML/en/common/artistic-license.html
|
||||||
|
rm -f %{buildroot}%{_docdir}/HTML/en/common/bottom-left.png
|
||||||
|
rm -f %{buildroot}%{_docdir}/HTML/en/common/bottom-middle.png
|
||||||
|
rm -f %{buildroot}%{_docdir}/HTML/en/common/bottom-right.png
|
||||||
|
rm -f %{buildroot}%{_docdir}/HTML/en/common/bsd-license.html
|
||||||
|
rm -f %{buildroot}%{_docdir}/HTML/en/common/doxygen.css
|
||||||
|
rm -f %{buildroot}%{_docdir}/HTML/en/common/favicon.ico
|
||||||
|
rm -f %{buildroot}%{_docdir}/HTML/en/common/fdl-license
|
||||||
|
rm -f %{buildroot}%{_docdir}/HTML/en/common/fdl-license.html
|
||||||
|
rm -f %{buildroot}%{_docdir}/HTML/en/common/fdl-notice.html
|
||||||
|
rm -f %{buildroot}%{_docdir}/HTML/en/common/footer.html
|
||||||
|
rm -f %{buildroot}%{_docdir}/HTML/en/common/gpl-license
|
||||||
|
rm -f %{buildroot}%{_docdir}/HTML/en/common/gpl-license.html
|
||||||
|
rm -f %{buildroot}%{_docdir}/HTML/en/common/header.html
|
||||||
|
rm -f %{buildroot}%{_docdir}/HTML/en/common/kde-default.css
|
||||||
|
rm -f %{buildroot}%{_docdir}/HTML/en/common/kde_logo_bg.png
|
||||||
|
rm -f %{buildroot}%{_docdir}/HTML/en/common/lgpl-license
|
||||||
|
rm -f %{buildroot}%{_docdir}/HTML/en/common/lgpl-license.html
|
||||||
|
rm -f %{buildroot}%{_docdir}/HTML/en/common/mainfooter.html
|
||||||
|
rm -f %{buildroot}%{_docdir}/HTML/en/common/mainheader.html
|
||||||
|
rm -f %{buildroot}%{_docdir}/HTML/en/common/qpl-license.html
|
||||||
|
rm -f %{buildroot}%{_docdir}/HTML/en/common/top-left.png
|
||||||
|
rm -f %{buildroot}%{_docdir}/HTML/en/common/top-middle.png
|
||||||
|
rm -f %{buildroot}%{_docdir}/HTML/en/common/top-right-konqueror.png
|
||||||
|
rm -f %{buildroot}%{_docdir}/HTML/en/common/top-right.jpg
|
||||||
|
rm -f %{buildroot}%{_docdir}/HTML/en/common/x11-license.html
|
||||||
|
rm -f %{buildroot}%{_docdir}/HTML/en/common/xml.dcl
|
||||||
|
rm -rf %{buildroot}%{_datadir}/locale/all_languages
|
||||||
|
rm -rf %{buildroot}%{_sysconfdir}/xdg/menus/
|
||||||
|
rm -rf %{buildroot}%{_datadir}/autostart/
|
||||||
|
# make kresources hidden
|
||||||
|
echo "Hidden=true;" >> %{buildroot}%{_datadir}/applications/kde/kresources.desktop
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if 0%{?include_crystalsvg} == 0
|
||||||
|
# remove all crystalsvg icons for now
|
||||||
|
rm -rf %{buildroot}%{_datadir}/icons/crystalsvg/
|
||||||
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%clean
|
%clean
|
||||||
rm -rf %{buildroot}
|
rm -rf %{buildroot}
|
||||||
|
|
||||||
|
|
||||||
# Not sure if this is really needed anymore, but doesn't look harmful either -- Rex
|
|
||||||
%pre
|
|
||||||
if [ -d /etc/skel/Desktop/Autostart ]; then
|
|
||||||
mv -f /etc/skel/Desktop/Autostart /etc/skel/Desktop/Autostart-OLD..KDE
|
|
||||||
elif [ -d /etc/skel/Desktop/Autostart.rpmsave ]; then
|
|
||||||
mv -f /etc/skel/Desktop/Autostart.rpmsave /etc/skel/Desktop/Autostart-OLD..KDE
|
|
||||||
fi
|
|
||||||
exit 0
|
|
||||||
|
|
||||||
%post
|
%post
|
||||||
/sbin/ldconfig
|
/sbin/ldconfig
|
||||||
|
%if 0%{?include_crystalsvg}
|
||||||
touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
||||||
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
||||||
|
%endif
|
||||||
%{_bindir}/update-desktop-database > /dev/null 2>&1 || :
|
%{_bindir}/update-desktop-database > /dev/null 2>&1 || :
|
||||||
|
|
||||||
%postun
|
%postun
|
||||||
/sbin/ldconfig
|
/sbin/ldconfig
|
||||||
|
%if 0%{?include_crystalsvg}
|
||||||
touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
||||||
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
||||||
|
%endif
|
||||||
%{_bindir}/update-desktop-database > /dev/null 2>&1 || :
|
%{_bindir}/update-desktop-database > /dev/null 2>&1 || :
|
||||||
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
|
%doc README
|
||||||
|
%doc COPYING.LIB
|
||||||
%config(noreplace) %{_sysconfdir}/profile.d/*
|
%config(noreplace) %{_sysconfdir}/profile.d/*
|
||||||
%dir %{_sysconfdir}/kde
|
|
||||||
%dir %{_sysconfdir}/kde/xdg
|
|
||||||
%dir %{_sysconfdir}/kde/xdg/menus
|
|
||||||
%{_sysconfdir}/kde/xdg/menus/*.menu
|
|
||||||
%{_sysconfdir}/xdg/menus/*.menu
|
|
||||||
%{_bindir}/artsmessage
|
%{_bindir}/artsmessage
|
||||||
%{_bindir}/checkXML
|
|
||||||
%{_bindir}/cupsdconf
|
%{_bindir}/cupsdconf
|
||||||
%{_bindir}/cupsdoprint
|
%{_bindir}/cupsdoprint
|
||||||
%{_bindir}/dcop
|
%{_bindir}/dcop
|
||||||
|
@ -382,7 +478,6 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
||||||
%{_bindir}/kbuildsycoca
|
%{_bindir}/kbuildsycoca
|
||||||
%{_bindir}/kcmshell
|
%{_bindir}/kcmshell
|
||||||
%{_bindir}/kconf_update
|
%{_bindir}/kconf_update
|
||||||
%{_bindir}/kconfig_compiler
|
|
||||||
%{_bindir}/kcookiejar
|
%{_bindir}/kcookiejar
|
||||||
%{_bindir}/kde-config
|
%{_bindir}/kde-config
|
||||||
%{_bindir}/kde-menu
|
%{_bindir}/kde-menu
|
||||||
|
@ -403,62 +498,256 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
||||||
%{_bindir}/kioslave
|
%{_bindir}/kioslave
|
||||||
%{_bindir}/klauncher
|
%{_bindir}/klauncher
|
||||||
%{_bindir}/kmailservice
|
%{_bindir}/kmailservice
|
||||||
|
%attr(4755,root,root) %{_bindir}/kpac_dhcp_helper
|
||||||
%{_bindir}/ksendbugmail
|
%{_bindir}/ksendbugmail
|
||||||
%{_bindir}/kshell
|
%{_bindir}/kshell
|
||||||
%{_bindir}/kstartupconfig
|
%{_bindir}/kstartupconfig
|
||||||
%{_bindir}/ksvgtopng
|
|
||||||
%{_bindir}/ktelnetservice
|
%{_bindir}/ktelnetservice
|
||||||
%{_bindir}/ktradertest
|
%{_bindir}/ktradertest
|
||||||
%{_bindir}/kunittestmodrunner
|
|
||||||
%{_bindir}/kwrapper
|
%{_bindir}/kwrapper
|
||||||
%{_bindir}/lnusertemp
|
%{_bindir}/lnusertemp
|
||||||
%{_bindir}/make_driver_db_cups
|
%{_bindir}/make_driver_db_cups
|
||||||
%{_bindir}/make_driver_db_lpr
|
%{_bindir}/make_driver_db_lpr
|
||||||
%{_bindir}/makekdewidgets
|
|
||||||
%{_bindir}/meinproc
|
%{_bindir}/meinproc
|
||||||
%{_bindir}/preparetips
|
%{_bindir}/preparetips
|
||||||
%attr(4755,root,root) %{_bindir}/kpac_dhcp_helper
|
|
||||||
%attr(4755,root,root) %{_bindir}/kgrantpty
|
|
||||||
%{_bindir}/start_kdeinit
|
%{_bindir}/start_kdeinit
|
||||||
|
%{_bindir}/start_kdeinit_wrapper
|
||||||
|
%attr(4755,root,root) %{_bindir}/kgrantpty
|
||||||
%{_libdir}/lib*.so.*
|
%{_libdir}/lib*.so.*
|
||||||
%{_libdir}/libkdeinit_*.so
|
%{_libdir}/libkdeinit_*.so
|
||||||
%{_libdir}/lib*.la
|
%{_libdir}/lib*.la
|
||||||
%{_libdir}/kde3/
|
%{_libdir}/kde3/
|
||||||
%{_datadir}/applications/
|
%{_datadir}/applications/kde/*.desktop
|
||||||
%{_datadir}/apps/
|
%{_datadir}/apps/*
|
||||||
%{_datadir}/locale/all_languages
|
%exclude %{_datadir}/apps/ksgmltools2/
|
||||||
%dir %{_datadir}/config
|
%exclude %{_datadir}/apps/kdewidgets/
|
||||||
|
%exclude %{_libdir}/kde3/plugins/designer/kdewidgets.*
|
||||||
%config(noreplace) %{_datadir}/config/*
|
%config(noreplace) %{_datadir}/config/*
|
||||||
%{_datadir}/emoticons
|
%{_datadir}/emoticons/*
|
||||||
%{_datadir}/icons/crystalsvg/
|
|
||||||
%{_datadir}/icons/default.kde
|
%{_datadir}/icons/default.kde
|
||||||
%{_datadir}/mimelnk/
|
%{_datadir}/mimelnk/magic
|
||||||
%{_datadir}/autostart/
|
%{_datadir}/mimelnk/*/*.desktop
|
||||||
%{_datadir}/services/
|
%{_datadir}/services/*
|
||||||
|
%{_datadir}/servicetypes/*
|
||||||
%ghost %{_datadir}/services/ksycoca
|
%ghost %{_datadir}/services/ksycoca
|
||||||
%{_datadir}/servicetypes/
|
|
||||||
%dir %{_docdir}/HTML
|
|
||||||
%dir %{_docdir}/HTML/en
|
|
||||||
%{_docdir}/HTML/en/common
|
|
||||||
%{_docdir}/HTML/en/kspell
|
%{_docdir}/HTML/en/kspell
|
||||||
|
%if "%{name}" == "kdelibs"
|
||||||
|
%{_sysconfdir}/xdg/menus/*.menu
|
||||||
|
%{_datadir}/autostart/*
|
||||||
|
# include also the conflicting file in kdelibs fedora < 9
|
||||||
|
%{_docdir}/HTML/en/common
|
||||||
|
%{_datadir}/locale/all_languages
|
||||||
|
%else
|
||||||
|
%{_docdir}/HTML/en/common/*
|
||||||
|
%endif
|
||||||
|
%if 0%{?include_crystalsvg}
|
||||||
|
%{_datadir}/icons/crystalsvg/
|
||||||
|
%endif
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root,-)
|
||||||
|
# include also the conflicting file in kdelibs-devel fedora < 9
|
||||||
|
%if "%{name}" == "kdelibs"
|
||||||
|
%{_bindir}/checkXML
|
||||||
|
%{_bindir}/ksvgtopng
|
||||||
|
%{_bindir}/kunittestmodrunner
|
||||||
|
%endif
|
||||||
%{_bindir}/dcopidl*
|
%{_bindir}/dcopidl*
|
||||||
|
%{_bindir}/kconfig_compiler
|
||||||
|
%{_bindir}/makekdewidgets
|
||||||
|
%{_datadir}/apps/kdewidgets/
|
||||||
|
%dir %{_libdir}/kde3/plugins/designer
|
||||||
|
%{_libdir}/kde3/plugins/designer/kdewidgets.*
|
||||||
|
%{_datadir}/apps/ksgmltools2/
|
||||||
%{_includedir}/kde/
|
%{_includedir}/kde/
|
||||||
%{_libdir}/lib*.so
|
%{_libdir}/lib*.so
|
||||||
%{_libdir}/lib*.a
|
%{_libdir}/lib*.a
|
||||||
%exclude %{_libdir}/libkdeinit_*.so
|
%exclude %{_libdir}/libkdeinit_*.so
|
||||||
|
|
||||||
%if %{apidocs}
|
%if "%{?apidocs}" == "1"
|
||||||
%files apidocs
|
%files apidocs
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root,-)
|
||||||
%{_docdir}/%{name}-devel-%{kde_major_version}
|
%{_docdir}/%{name}-devel-%{kde_major_version}
|
||||||
%{_docdir}/HTML/en/kdelibs*
|
%{_docdir}/HTML/en/kdelibs*
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Mar 10 2008 Than Ngo <than@redhat.com> 3.5.9-5
|
||||||
|
- apply upstream patch to fix regression in kate (bz#436384)
|
||||||
|
|
||||||
|
* Tue Mar 04 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> - 3.5.9-4
|
||||||
|
- hardcode qt_ver again because 3.3.8b reports itself as 3.3.8 (fixes apidocs)
|
||||||
|
|
||||||
|
* Tue Feb 26 2008 Lukáš Tinkl <ltinkl@redhat.com> - 3.5.9-3
|
||||||
|
- #230979: Writes ServerBin into cupsd.conf
|
||||||
|
- #416101: unable to print after configuring printing in KDE
|
||||||
|
|
||||||
|
* Sat Feb 16 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> - 3.5.9-2
|
||||||
|
- F9+: include %%{_docdir}/HTML/en/common files which are not in kdelibs-common
|
||||||
|
|
||||||
|
* Thu Feb 14 2008 Rex Dieter <rdieter@fedoraproject.org> 3.5.9-1
|
||||||
|
- kde-3.5.9
|
||||||
|
|
||||||
|
* Mon Feb 11 2008 Than Ngo <than@redhat.com> 3.5.8-24
|
||||||
|
- make kresources hidden on f9+
|
||||||
|
|
||||||
|
* Sat Feb 09 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> - 3.5.8-23
|
||||||
|
- rebuild for GCC 4.3
|
||||||
|
|
||||||
|
* Sat Dec 22 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.5.8-22
|
||||||
|
- BR enchant-devel instead of aspell-devel on F9+ (FeatureDictionary)
|
||||||
|
- Requires: hunspell on F9+ (FeatureDictionary)
|
||||||
|
- patch KSpell for hunspell support on F9+ (FeatureDictionary)
|
||||||
|
- add and build enchant backend for KSpell2 (backported from Sonnet) on F9+
|
||||||
|
(FeatureDictionary)
|
||||||
|
- don't build aspell and ispell backends for KSpell2 on F9+ (FeatureDictionary)
|
||||||
|
|
||||||
|
* Fri Dec 21 2007 Lukáš Tinkl <ltinkl@redhat.com> - 3.5.8-21
|
||||||
|
- updated Flash patch
|
||||||
|
|
||||||
|
* Mon Dec 17 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.5.8-20
|
||||||
|
- Requires: kdelibs-common (F9+) (#417251)
|
||||||
|
|
||||||
|
* Thu Dec 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.8-19
|
||||||
|
- flash fix (#410651, kde#132138, kde#146784)
|
||||||
|
- simplify crystalsvg-icon-theme handling
|
||||||
|
|
||||||
|
* Tue Dec 11 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> - 3.5.8-18
|
||||||
|
- set include_crystalsvg to 0 on F9+ (it comes from kdeartwork now)
|
||||||
|
|
||||||
|
* Tue Dec 04 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.8-17
|
||||||
|
- update openssl patch
|
||||||
|
|
||||||
|
* Sat Dec 01 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> - 3.5.8-16
|
||||||
|
- install profile scripts as 644 instead of 755 (Ville Skyttä, #407521)
|
||||||
|
- don't rename profile scripts to kde3.(c)sh (not worth the breakage)
|
||||||
|
|
||||||
|
* Sat Dec 01 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> - 3.5.8-15
|
||||||
|
- separate include_crystalsvg conditional, set to 1 until we have kdeartwork 4
|
||||||
|
- don't run icon %%post/%%postun snippets for crystalsvg if we don't ship it
|
||||||
|
- add "3" in all summaries and descriptions
|
||||||
|
|
||||||
|
* Sat Dec 01 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> - 3.5.8-14
|
||||||
|
- fix inverted logic for Requires: crystalsvg-icon-theme
|
||||||
|
|
||||||
|
* Sat Dec 01 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> - 3.5.8-13
|
||||||
|
- don't hardcode %%fedora
|
||||||
|
|
||||||
|
* Wed Nov 21 2007 Sebastian Vahl <fedora@deadbabylon.de> 3.5.8-12
|
||||||
|
- renew the list of file conflicts and removals
|
||||||
|
|
||||||
|
* Tue Nov 20 2007 Sebastian Vahl <fedora@deadbabylon.de> 3.5.8-11
|
||||||
|
- preserve makekdewidgets and kconf_compiler for fedora > 9
|
||||||
|
- add Requires: crystalsvg-icon-theme (for kdelibs3)
|
||||||
|
|
||||||
|
* Sun Nov 18 2007 Sebastian Vahl <fedora@deadbabylon.de> 3.5.8-10
|
||||||
|
- only include and provide crystalsvg-icon-theme for fedora < 9
|
||||||
|
|
||||||
|
* Sun Nov 18 2007 Sebastian Vahl <fedora@deadbabylon.de> 3.5.8-9
|
||||||
|
- add switch to force rpmbuild behavior for testing
|
||||||
|
- prepare %%files for non-conflicting kdelibs3
|
||||||
|
|
||||||
|
* Tue Oct 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.8-8
|
||||||
|
- Provides: crystalsvg-icon-theme
|
||||||
|
|
||||||
|
* Thu Oct 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.8-7
|
||||||
|
- fix application of custom zoom patch (rh#335461)
|
||||||
|
|
||||||
|
* Tue Oct 23 2007 Than Ngo <than@redhat.com> - 3.5.8-6
|
||||||
|
- Resolves: rh#335461, kpdf and kview lost custom zoom
|
||||||
|
|
||||||
|
* Thu Oct 18 2007 Than Ngo <than@redhat.com> - 3.5.8-5
|
||||||
|
- bz273681, add vhdl syntax for kate, thanks to Chitlesh GOORAH
|
||||||
|
|
||||||
|
* Wed Oct 17 2007 Than Ngo <than@redhat.com> 3.5.8-4
|
||||||
|
- apply upstream patch to fix http-regression
|
||||||
|
|
||||||
|
* Mon Oct 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.8-3
|
||||||
|
- respin (for openexr-1.6.0)
|
||||||
|
|
||||||
|
* Fri Oct 12 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.8-2
|
||||||
|
- kde-3.5.8
|
||||||
|
|
||||||
|
* Tue Sep 25 2007 Than Ngo <than@redhat.com> - 6:3.5.7-23
|
||||||
|
- fix rh#243611, autostart from XDG_CONFIG_DIRS
|
||||||
|
|
||||||
|
* Sat Sep 09 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> 6:3.5.7-22
|
||||||
|
- Remove Conflicts: kdelibs4-devel, let kdelibs4 decide whether we conflict
|
||||||
|
(allows using the old /opt/kde4 versions for now)
|
||||||
|
|
||||||
|
* Wed Aug 22 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.7-21
|
||||||
|
- vcard30 patch (kde#115219,rh#253496)
|
||||||
|
- -devel: restore awol Requires (< f8 only) (#253801)
|
||||||
|
- License: LGPLv2
|
||||||
|
|
||||||
|
* Wed Aug 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.7-20
|
||||||
|
- CVE-2007-3820, CVE-2007-4224, CVE-2007-4225
|
||||||
|
- clarify licensing
|
||||||
|
|
||||||
|
* Tue Aug 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.7-19
|
||||||
|
- ConsoleKit-related patch (#244065)
|
||||||
|
|
||||||
|
* Sun Aug 12 2007 Florian La Roche <laroche@redhat.com> 6:3.5.7-18
|
||||||
|
- fix apidocs subpackage requires
|
||||||
|
|
||||||
|
* Mon Aug 06 2007 Than Ngo <than@redhat.com> - 6:3.5.7-17
|
||||||
|
- cleanup
|
||||||
|
|
||||||
|
* Fri Aug 03 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-16
|
||||||
|
- undo kdelibs3 rename (for now, anyway)
|
||||||
|
- move to -devel: checkXML, kconfig_compiler, (make)kdewidgets, ksgmltools2,
|
||||||
|
ksvgtopng, kunittestmodrunner
|
||||||
|
- set KDE_IS_PRELINKED unconditionally (#244065)
|
||||||
|
- License: LGPLv2+
|
||||||
|
|
||||||
|
* Fri Jul 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-15
|
||||||
|
- Obsoletes/Provides: kdelibs-apidocs (kdelibs3)
|
||||||
|
|
||||||
|
* Fri Jul 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-14
|
||||||
|
- toggle kdelibs3 (f8+)
|
||||||
|
|
||||||
|
* Wed Jul 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-13
|
||||||
|
- build fails against cups-1.3 (#248717)
|
||||||
|
- incorporate kdelibs3 bits (not enabled... yet)
|
||||||
|
|
||||||
|
* Wed Jul 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-10
|
||||||
|
- +Requires: kde-filesystem
|
||||||
|
|
||||||
|
* Mon Jul 09 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-9
|
||||||
|
- omit ICEauthority patch (kde#147454, rh#243560, rh#247455)
|
||||||
|
|
||||||
|
* Wed Jun 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-8
|
||||||
|
- rework previously botched openssl patch
|
||||||
|
|
||||||
|
* Wed Jun 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-7
|
||||||
|
- -devel: Provides: kdelibs3-devel = ...
|
||||||
|
- openssl patch update (portability)
|
||||||
|
- drop deprecated ssl-krb5 patch
|
||||||
|
|
||||||
|
* Sat Jun 16 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-6
|
||||||
|
- Provides: kdelibs3 = %%version-%%release
|
||||||
|
|
||||||
|
* Sat Jun 16 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-5
|
||||||
|
- -devel: +Requires: libutempter-devel
|
||||||
|
|
||||||
|
* Fri Jun 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-4
|
||||||
|
- omit lib_loader patch (doesn't apply cleanly)
|
||||||
|
|
||||||
|
* Fri Jun 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-3
|
||||||
|
- include experimental libtool patches
|
||||||
|
|
||||||
|
* Mon Jun 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-2
|
||||||
|
- kdesu: sudo support (kde bug #20914), Requires(hint): sudo
|
||||||
|
|
||||||
|
* Wed Jun 06 2007 Than Ngo <than@redhat.com> - 6:3.5.7-0.1.fc7
|
||||||
|
- 3.5.7
|
||||||
|
|
||||||
|
* Thu May 24 2007 Than Ngo <than@redhat.com> 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 <rdieter[AT]fedorproject.org> - 6:3.5.6-9
|
* Thu May 16 2007 Rex Dieter <rdieter[AT]fedorproject.org> - 6:3.5.6-9
|
||||||
- make qtdocdir handling robust
|
- make qtdocdir handling robust
|
||||||
- kde_settings=1
|
- kde_settings=1
|
||||||
|
|
Loading…
Reference in New Issue