[Pkg-kde-commits] rev 535 - branches/kde-3.4.0/packages/kdelibs/debian/patches
Adeodato Simó
dato-guest@costa.debian.org
Sun, 27 Feb 2005 22:50:31 +0100
Author: dato-guest
Date: 2005-02-27 22:50:30 +0100 (Sun, 27 Feb 2005)
New Revision: 535
Added:
branches/kde-3.4.0/packages/kdelibs/debian/patches/01_kdelibs_branch_2005-02-27.diff
Log:
Branch pull for kdelibs. Includes the kspell2 soname fix.
Added: branches/kde-3.4.0/packages/kdelibs/debian/patches/01_kdelibs_branch_2005-02-27.diff
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/patches/01_kdelibs_branch_2005-02-27.diff 2005-02-27 21:26:41 UTC (rev 534)
+++ branches/kde-3.4.0/packages/kdelibs/debian/patches/01_kdelibs_branch_2005-02-27.diff 2005-02-27 21:50:30 UTC (rev 535)
@@ -0,0 +1,354 @@
+diff -u -Nrua -x CVS kdelibs_3_4_0_RELEASE/admin/am_edit kdelibs_3_4_BRANCH/admin/am_edit
+--- kdelibs_3_4_0_RELEASE/admin/am_edit 2005-02-27 22:38:56.013288723 +0100
++++ kdelibs_3_4_BRANCH/admin/am_edit 2005-02-27 20:03:52.000000000 +0100
+@@ -2276,7 +2276,7 @@
+ "\t echo \"\$\$i\"; \\\n" .
+ "\t if ! ";
+ $t .= $cxxsuffix eq "KKK" ?
+- "\$(CXX) \$(DEFS) -I. -I\$(srcdir) -I\$(top_builddir) \$(INCLUDES) \$(AM_CPPFLAGS) \$(CPPFLAGS) \$(KDE_CXXFLAGS) " :
++ "\$(CXX) \$(DEFS) -I. -I\$(srcdir) -I\$(top_builddir) \$(INCLUDES) \$(AM_CPPFLAGS) \$(CPPFLAGS) \$(CXXFLAGS) \$(KDE_CXXFLAGS) " :
+ "\$(CXXCOMPILE) ";
+ $t .= " --dump-class-hierarchy -c \$\$i.bchecktest.cc; then \\\n" .
+ "\t rm -f \$\$i.bchecktest.cc; exit 1; \\\n" .
+@@ -2352,7 +2352,7 @@
+ $MakefileData =~ s/\034/\\\n/g; # Restore continuation lines
+ # Append our $progId line, _below_ the "generated by automake" line
+ # because automake-1.6 relies on the first line to be his own.
+- my $progIdLine = "\# $progId - " . '$Revision: 1.412 $ '."\n";
++ my $progIdLine = "\# $progId - " . '$Revision: 1.412.6.1 $ '."\n";
+ if ( !( $MakefileData =~ s/^(.*generated .*by automake.*\n)/$1$progIdLine/ ) ) {
+ warn "automake line not found in $makefile\n";
+ # Fallback: first line
+diff -u -Nrua -x CVS kdelibs_3_4_0_RELEASE/kdecore/kaccel.cpp kdelibs_3_4_BRANCH/kdecore/kaccel.cpp
+--- kdelibs_3_4_0_RELEASE/kdecore/kaccel.cpp 2005-02-27 22:38:57.360057344 +0100
++++ kdelibs_3_4_BRANCH/kdecore/kaccel.cpp 2005-02-25 23:00:16.000000000 +0100
+@@ -106,6 +106,7 @@
+ bool KAccelEventHandler::g_bAccelActivated = false;
+
+ KAccelEventHandler::KAccelEventHandler()
++ : QWidget( 0, "KAccelEventHandler" )
+ {
+ # ifdef Q_WS_X11
+ if ( kapp )
+diff -u -Nrua -x CVS kdelibs_3_4_0_RELEASE/kdecore/network/kiobuffer.h kdelibs_3_4_BRANCH/kdecore/network/kiobuffer.h
+--- kdelibs_3_4_0_RELEASE/kdecore/network/kiobuffer.h 2005-02-27 22:38:57.959954280 +0100
++++ kdelibs_3_4_BRANCH/kdecore/network/kiobuffer.h 2005-02-27 17:50:34.000000000 +0100
+@@ -25,7 +25,7 @@
+ #ifndef KIOBUFFER_H
+ #define KIOBUFFER_H
+
+-#include <qglobal.h>
++#include <qcstring.h>
+
+ #include <kdelibs_export.h>
+
+diff -u -Nrua -x CVS kdelibs_3_4_0_RELEASE/kdeui/klanguagebutton.h kdelibs_3_4_BRANCH/kdeui/klanguagebutton.h
+--- kdelibs_3_4_0_RELEASE/kdeui/klanguagebutton.h 2005-02-27 22:38:58.863798997 +0100
++++ kdelibs_3_4_BRANCH/kdeui/klanguagebutton.h 2005-02-27 17:50:02.000000000 +0100
+@@ -32,6 +32,8 @@
+ #include <kdelibs_export.h>
+
+ class KLanguageButtonPrivate;
++class QIconSet;
++class QPopupMenu;
+
+ /**
+ * KLanguageButton provides a combobox with a 2-D dataset. It also supports icons.
+diff -u -Nrua -x CVS kdelibs_3_4_0_RELEASE/kdoctools/customization/pt-BR/lang.entities kdelibs_3_4_BRANCH/kdoctools/customization/pt-BR/lang.entities
+--- kdelibs_3_4_0_RELEASE/kdoctools/customization/pt-BR/lang.entities 2005-02-27 22:38:59.652663468 +0100
++++ kdelibs_3_4_BRANCH/kdoctools/customization/pt-BR/lang.entities 2005-02-26 18:42:01.000000000 +0100
+@@ -1,3 +1,5 @@
++<!-- Do NOT change this file: it provides important defaults -->
++
+ <!ENTITY language "pt-BR">
+
+ <!-- These entities should be translated, should therefore be stored
+diff -u -Nrua -x CVS kdelibs_3_4_0_RELEASE/kdoctools/customization/pt-BR/user.entities kdelibs_3_4_BRANCH/kdoctools/customization/pt-BR/user.entities
+--- kdelibs_3_4_0_RELEASE/kdoctools/customization/pt-BR/user.entities 2005-02-27 22:38:59.654663124 +0100
++++ kdelibs_3_4_BRANCH/kdoctools/customization/pt-BR/user.entities 2005-02-26 18:42:01.000000000 +0100
+@@ -7,7 +7,6 @@
+ -->
+
+ <!ENTITY Alt "<keycap>Alt</keycap>">
+-<!ENTITY artsbuilder "construtor arts">
+ <!ENTITY Backspace "<keycap>Esc</keycap>">
+ <!ENTITY cdrom "<hardware>CD-ROM</hardware>">
+ <!ENTITY Ctrl "<keycap>Ctrl</keycap>">
+@@ -16,9 +15,7 @@
+ <!ENTITY Enter "<keycap>Enter</keycap>">
+ <!ENTITY Esc "<keycap>Esc</keycap>">
+ <!ENTITY etc "<abbrev>etc</abbrev>">
+-<!ENTITY ex "<abbrev>por exemplo</abbrev>">
+ <!ENTITY FAQ "Perguntas Mais Freqüentes (do inglês <acronym>FAQ</acronym>)">
+-<!ENTITY HTML '<acronym>HTML</acronym>'>
+ <!ENTITY ie "isto é">
+ <!ENTITY infocenter "<application>Centro de Informações</application>">
+ <!ENTITY kcontrolcenter "<application>Centro de Controle do &kde;</application>">
+diff -u -Nrua -x CVS kdelibs_3_4_0_RELEASE/khtml/ChangeLog kdelibs_3_4_BRANCH/khtml/ChangeLog
+--- kdelibs_3_4_0_RELEASE/khtml/ChangeLog 2005-02-27 22:39:02.442184220 +0100
++++ kdelibs_3_4_BRANCH/khtml/ChangeLog 2005-02-27 03:17:48.000000000 +0100
+@@ -1,3 +1,10 @@
++2005-02-27 Harri Porten <porten@kde.org>
++
++ * xml/dom2_eventsimpl.cpp: returning meaningful keyCode() values
++ for "special" keys
++
++ * dom/dom2_events.cpp: make which() equivalent to keyCode()
++
+ 2005-02-20 Germain Garand <germain@ebooksfrance.org>
+
+ * html/html_formimpl.cpp (FocusHandleWidget::focusNextPrev): TextEdit
+diff -u -Nrua -x CVS kdelibs_3_4_0_RELEASE/khtml/dom/dom2_events.cpp kdelibs_3_4_BRANCH/khtml/dom/dom2_events.cpp
+--- kdelibs_3_4_0_RELEASE/khtml/dom/dom2_events.cpp 2005-02-27 22:39:02.660146773 +0100
++++ kdelibs_3_4_BRANCH/khtml/dom/dom2_events.cpp 2005-02-27 03:17:48.000000000 +0100
+@@ -317,7 +317,7 @@
+ if( impl->isMouseEvent() )
+ return static_cast<MouseEventImpl*>( impl )->button() + 1;
+ else if( impl->isTextEvent() )
+- return static_cast<TextEventImpl*>( impl )->keyVal();
++ return static_cast<TextEventImpl*>( impl )->keyCode();
+
+ return 0;
+ }
+diff -u -Nrua -x CVS kdelibs_3_4_0_RELEASE/khtml/xml/dom2_eventsimpl.cpp kdelibs_3_4_BRANCH/khtml/xml/dom2_eventsimpl.cpp
+--- kdelibs_3_4_0_RELEASE/khtml/xml/dom2_eventsimpl.cpp 2005-02-27 22:39:03.371024643 +0100
++++ kdelibs_3_4_BRANCH/khtml/xml/dom2_eventsimpl.cpp 2005-02-27 02:55:49.000000000 +0100
+@@ -730,16 +730,10 @@
+ if (!m_keyEvent)
+ return 0;
+
+- switch(m_virtKeyVal) {
+- // ### probably true for all DOM_VK_* codes
+- case DOM_VK_LEFT:
+- case DOM_VK_RIGHT:
+- case DOM_VK_UP:
+- case DOM_VK_DOWN:
+- return m_virtKeyVal;
+- default:
+- return QChar( charCode() ).upper().unicode();
+- }
++ if (m_virtKeyVal != DOM_VK_UNDEFINED)
++ return m_virtKeyVal;
++ else
++ return QChar( charCode() ).upper().unicode();
+ }
+
+ int TextEventImpl::charCode() const
+diff -u -Nrua -x CVS kdelibs_3_4_0_RELEASE/kio/kio/jobclasses.h kdelibs_3_4_BRANCH/kio/kio/jobclasses.h
+--- kdelibs_3_4_0_RELEASE/kio/kio/jobclasses.h 2005-02-27 22:39:03.967922094 +0100
++++ kdelibs_3_4_BRANCH/kio/kio/jobclasses.h 2005-02-27 20:12:48.000000000 +0100
+@@ -402,7 +402,7 @@
+ * @param emitResultIfLast if this was the last subjob, emit result,
+ * i.e. terminate this job.
+ */
+- virtual void removeSubjob( Job *job, bool mergeMetaData, bool emitResultIfLast ); // KDE4: merge with above, with =true to both
++ void removeSubjob( Job *job, bool mergeMetaData, bool emitResultIfLast ); // KDE4: merge with above, with =true to both
+
+ /**
+ * Utility function for inherited jobs.
+diff -u -Nrua -x CVS kdelibs_3_4_0_RELEASE/kio/kio/kfileitem.cpp kdelibs_3_4_BRANCH/kio/kio/kfileitem.cpp
+--- kdelibs_3_4_0_RELEASE/kio/kio/kfileitem.cpp 2005-02-27 22:39:04.047908352 +0100
++++ kdelibs_3_4_BRANCH/kio/kio/kfileitem.cpp 2005-02-25 16:38:10.000000000 +0100
+@@ -17,7 +17,7 @@
+ the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+ */
+-// $Id: kfileitem.cpp,v 1.176 2005/02/15 17:05:37 ervin Exp $
++// $Id: kfileitem.cpp,v 1.176.2.1 2005/02/25 15:38:10 faure Exp $
+
+ #include <sys/time.h>
+ #include <pwd.h>
+@@ -773,6 +773,8 @@
+
+ void KFileItem::assign( const KFileItem & item )
+ {
++ if ( this == &item )
++ return;
+ m_entry = item.m_entry;
+ m_url = item.m_url;
+ m_bIsLocalURL = item.m_bIsLocalURL;
+@@ -795,6 +797,7 @@
+ // note: m_extra is NOT copied, as we'd have no control over who is
+ // deleting the data or not.
+
++ delete d; d = 0;
+ // We had a mimetype previously (probably), so we need to re-determine it
+ determineMimeType();
+ if (item.d) {
+diff -u -Nrua -x CVS kdelibs_3_4_0_RELEASE/kio/kssl/ksslpemcallback.h kdelibs_3_4_BRANCH/kio/kssl/ksslpemcallback.h
+--- kdelibs_3_4_0_RELEASE/kio/kssl/ksslpemcallback.h 2005-02-27 22:39:04.356855274 +0100
++++ kdelibs_3_4_BRANCH/kio/kssl/ksslpemcallback.h 2005-02-27 19:44:41.000000000 +0100
+@@ -21,6 +21,8 @@
+ #ifndef _kde_ksslpemcallback_h
+ #define _kde_ksslpemcallback_h
+
++#include <kdelibs_export.h>
++
+ int KIO_EXPORT KSSLPemCallback(char *buf, int size, int rwflag, void *userdata);
+
+ #endif
+diff -u -Nrua -x CVS kdelibs_3_4_0_RELEASE/kio/misc/kntlm/kntlm.h kdelibs_3_4_BRANCH/kio/misc/kntlm/kntlm.h
+--- kdelibs_3_4_0_RELEASE/kio/misc/kntlm/kntlm.h 2005-02-27 22:39:04.545822809 +0100
++++ kdelibs_3_4_BRANCH/kio/misc/kntlm/kntlm.h 2005-02-27 19:47:35.000000000 +0100
+@@ -24,6 +24,8 @@
+ #include <qcstring.h>
+ #include <qstring.h>
+
++#include <kdelibs_export.h>
++
+ /**
+ * @short KNTLM class implements the NTLM authentication protocol.
+ *
+diff -u -Nrua -x CVS kdelibs_3_4_0_RELEASE/kioslave/http/http.cc kdelibs_3_4_BRANCH/kioslave/http/http.cc
+--- kdelibs_3_4_0_RELEASE/kioslave/http/http.cc 2005-02-27 22:39:04.734790344 +0100
++++ kdelibs_3_4_BRANCH/kioslave/http/http.cc 2005-02-25 16:48:22.000000000 +0100
+@@ -2079,6 +2079,7 @@
+ {
+ 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;
+@@ -2109,7 +2110,12 @@
+ // Conditional cache hit. (Validate)
+ }
+
+- if ((m_request.cache == CC_CacheOnly) || bOffline)
++ if (bCacheOnly)
++ {
++ error( ERR_DOES_NOT_EXIST, m_request.url.url() );
++ return false;
++ }
++ if (bOffline)
+ {
+ error( ERR_COULD_NOT_CONNECT, m_request.url.url() );
+ return false;
+diff -u -Nrua -x CVS kdelibs_3_4_0_RELEASE/kjs/ChangeLog kdelibs_3_4_BRANCH/kjs/ChangeLog
+--- kdelibs_3_4_0_RELEASE/kjs/ChangeLog 2005-02-27 22:39:04.872766639 +0100
++++ kdelibs_3_4_BRANCH/kjs/ChangeLog 2005-02-27 06:52:50.000000000 +0100
+@@ -1,3 +1,7 @@
++2005-02-27 Harri Porten <porten@kde.org>
++
++ * regexp_object.cpp: fixed RegExp(/regexp/) constructor
++
+ 2004-11-07 Harri Porten <porten@kde.org>
+
+ * date_object.cpp: fix conversion of Date(value) argument, fixed
+diff -u -Nrua -x CVS kdelibs_3_4_0_RELEASE/kjs/Makefile.am kdelibs_3_4_BRANCH/kjs/Makefile.am
+--- kdelibs_3_4_0_RELEASE/kjs/Makefile.am 2005-02-27 22:39:04.874766295 +0100
++++ kdelibs_3_4_BRANCH/kjs/Makefile.am 2005-02-27 06:54:07.000000000 +0100
+@@ -43,7 +43,7 @@
+ grammar.h regexp.cpp function_object.h string_object.h \
+ bool_object.h number_object.h date_object.h array_object.h \
+ math_object.h object_object.h regexp_object.h error_object.h \
+- debugger.h array_instance.h context.h dtoa.h
++ debugger.h array_instance.h context.h dtoa.h regexp.h
+
+ if include_VERSION_SCRIPT
+ VSCRIPT = -Wl,--version-script=$(srcdir)/libkjs.map
+diff -u -Nrua -x CVS kdelibs_3_4_0_RELEASE/kjs/regexp.cpp kdelibs_3_4_BRANCH/kjs/regexp.cpp
+--- kdelibs_3_4_0_RELEASE/kjs/regexp.cpp 2005-02-27 22:39:04.965750664 +0100
++++ kdelibs_3_4_BRANCH/kjs/regexp.cpp 2005-02-27 06:52:50.000000000 +0100
+@@ -29,7 +29,7 @@
+ using namespace KJS;
+
+ RegExp::RegExp(const UString &p, int f)
+- : pattern(p), flgs(f), m_notEmpty(false)
++ : pat(p), flgs(f), m_notEmpty(false)
+ {
+ // JS regexps can contain Unicode escape sequences (\uxxxx) which
+ // are rather uncommon elsewhere. As our regexp libs don't understand
+diff -u -Nrua -x CVS kdelibs_3_4_0_RELEASE/kjs/regexp.h kdelibs_3_4_BRANCH/kjs/regexp.h
+--- kdelibs_3_4_0_RELEASE/kjs/regexp.h 2005-02-27 22:39:04.966750492 +0100
++++ kdelibs_3_4_BRANCH/kjs/regexp.h 2005-02-27 06:52:50.000000000 +0100
+@@ -44,13 +44,14 @@
+ RegExp(const UString &p, int f = None);
+ ~RegExp();
+ int flags() const { return flgs; }
++ UString pattern() const { return pat; }
+ UString match(const UString &s, int i, int *pos = 0, int **ovector = 0);
+ // test is unused. The JS spec says that RegExp.test should use
+ // RegExp.exec, so it has to store $1 etc.
+ // bool test(const UString &s, int i = -1);
+ unsigned int subPatterns() const { return nrSubPatterns; }
+ private:
+- const UString &pattern;
++ const UString pat;
+ int flgs;
+ bool m_notEmpty;
+
+diff -u -Nrua -x CVS kdelibs_3_4_0_RELEASE/kjs/regexp_object.cpp kdelibs_3_4_BRANCH/kjs/regexp_object.cpp
+--- kdelibs_3_4_0_RELEASE/kjs/regexp_object.cpp 2005-02-27 22:39:04.968750149 +0100
++++ kdelibs_3_4_BRANCH/kjs/regexp_object.cpp 2005-02-27 06:52:50.000000000 +0100
+@@ -240,8 +240,11 @@
+ exec->setException(err);
+ return err;
+ }
++ RegExpImp *rimp = static_cast<RegExpImp*>(Object::dynamicCast(a0).imp());
++ p = rimp->regExp()->pattern();
++ } else {
++ p = a0.toString(exec);
+ }
+- p = a0.toString(exec);
+ }
+
+ RegExpPrototypeImp *proto = static_cast<RegExpPrototypeImp*>(exec->interpreter()->builtinRegExpPrototype().imp());
+diff -u -Nrua -x CVS kdelibs_3_4_0_RELEASE/kjs/regexp_object.h kdelibs_3_4_BRANCH/kjs/regexp_object.h
+--- kdelibs_3_4_0_RELEASE/kjs/regexp_object.h 2005-02-27 22:39:04.969749977 +0100
++++ kdelibs_3_4_BRANCH/kjs/regexp_object.h 2005-02-27 06:54:07.000000000 +0100
+@@ -53,7 +53,7 @@
+ RegExpImp(RegExpPrototypeImp *regexpProto);
+ ~RegExpImp();
+ void setRegExp(RegExp *r) { reg = r; }
+- RegExp* regExp() const { return reg; }
++ RegExp* regExp() { return reg; }
+
+ virtual const ClassInfo *classInfo() const { return &info; }
+ static const ClassInfo info;
+diff -u -Nrua -x CVS kdelibs_3_4_0_RELEASE/kmdi/kmdilistiterator.h kdelibs_3_4_BRANCH/kmdi/kmdilistiterator.h
+--- kdelibs_3_4_0_RELEASE/kmdi/kmdilistiterator.h 2005-02-27 22:39:05.083730395 +0100
++++ kdelibs_3_4_BRANCH/kmdi/kmdilistiterator.h 2005-02-27 19:55:09.000000000 +0100
+@@ -47,7 +47,7 @@
+ virtual void last() { m_iterator->toLast(); }
+ virtual void next() { ++( *m_iterator ); }
+ virtual void prev() { --( *m_iterator ); }
+- virtual bool isDone() const { return m_iterator->current() == NULL; }
++ virtual bool isDone() const { return m_iterator->current() == 0; }
+ virtual Item* currentItem() const { return m_iterator->current(); }
+
+ virtual ~KMdiListIterator() { delete m_iterator; }
+diff -u -Nrua -x CVS kdelibs_3_4_0_RELEASE/kresources/managerimpl.h kdelibs_3_4_BRANCH/kresources/managerimpl.h
+--- kdelibs_3_4_0_RELEASE/kresources/managerimpl.h 2005-02-27 22:39:05.418672851 +0100
++++ kdelibs_3_4_BRANCH/kresources/managerimpl.h 2005-02-27 17:50:56.000000000 +0100
+@@ -28,7 +28,7 @@
+ #include <qdict.h>
+
+ #include "manageriface.h"
+-#include <kresources/manager.h>
++#include <kresources/resource.h>
+
+ class KConfig;
+
+diff -u -Nrua -x CVS kdelibs_3_4_0_RELEASE/kspell2/ui/Makefile.am kdelibs_3_4_BRANCH/kspell2/ui/Makefile.am
+--- kdelibs_3_4_0_RELEASE/kspell2/ui/Makefile.am 2005-02-27 22:39:05.508657391 +0100
++++ kdelibs_3_4_BRANCH/kspell2/ui/Makefile.am 2005-02-27 12:55:19.000000000 +0100
+@@ -13,5 +13,5 @@
+ highlighter.cpp configui.ui configdialog.cpp \
+ configwidget.cpp
+
+-libkspell2_la_LDFLAGS = -no-undefined $(all_libraries)
++libkspell2_la_LDFLAGS = -no-undefined -version-info 1:0:0 $(all_libraries)
+ libkspell2_la_LIBADD = ../libkspell2base.la
+diff -u -Nrua -x CVS kdelibs_3_4_0_RELEASE/libkmid/libkmid.h kdelibs_3_4_BRANCH/libkmid/libkmid.h
+--- kdelibs_3_4_0_RELEASE/libkmid/libkmid.h 2005-02-27 22:39:09.586956727 +0100
++++ kdelibs_3_4_BRANCH/libkmid/libkmid.h 2005-02-26 13:05:19.000000000 +0100
+@@ -183,6 +183,8 @@
+
+ extern "C" {
+
++#else
++#define KMID_EXPORT
+ #endif
+
+