OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 06-Apr-2004 15:45:42
Branch: HEAD Handle: 2004040614454200
Added files:
openpkg-src/kde-libs kde-libs.patch
Modified files:
openpkg-src/kde-libs kde-libs.spec
Log:
upgrading package: kde-libs 3.1.4 -> 3.2.1
Summary:
Revision Changes Path
1.1 +66 -0 openpkg-src/kde-libs/kde-libs.patch
1.11 +9 -7 openpkg-src/kde-libs/kde-libs.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/kde-libs/kde-libs.patch
============================================================================
$ cvs diff -u -r0 -r1.1 kde-libs.patch
--- /dev/null 2004-04-06 15:45:42.000000000 +0200
+++ kde-libs.patch 2004-04-06 15:45:42.000000000 +0200
@@ -0,0 +1,66 @@
+--- kdecore/kcharsets.cpp 2003/09/06 19:06:29 1.144
++++ kdecore/kcharsets.cpp 2004/03/12 09:18:03 1.144.2.1
+@@ -497,19 +497,19 @@ QString KCharsets::languageForEncoding(
+
+ QString KCharsets::encodingForName( const QString &descriptiveName )
+ {
+- const int left = descriptiveName.find( '(' );
++ const int left = descriptiveName.findRev( '(' );
+
+ if (left<0) // No parenthesis, so assume it is a normal encoding name
+- return descriptiveName;
++ return descriptiveName.stripWhiteSpace();
+
+- QString name(descriptiveName.mid(left+2));
++ QString name(descriptiveName.mid(left+1));
+
+- const int right = name.find( ')' );
++ const int right = name.findRev( ')' );
+
+ if (right<0)
+ return name;
+-
+- return name.left(right-1);
++
++ return name.left(right).stripWhiteSpace();
+ }
+
+ QStringList KCharsets::descriptiveEncodingNames()
+--- kdecore/kextsock.cpp 11 Dec 2003 22:54:36 -0000 1.67
++++ kdecore/kextsock.cpp 22 Jan 2004 19:59:13 -0000
+@@ -1892,7 +1892,11 @@ int KExtendedSocket::doLookup(const QStr
+ err = kde_getaddrinfo(_host, _serv, &hint, res);
+
+ #ifdef HAVE_RES_INIT
+- if (err == EAI_NONAME || err == EAI_NODATA || err == EAI_AGAIN)
++ if (err == EAI_NONAME ||
++#ifdef EAI_NODATA
++ err == EAI_NODATA ||
++#endif
++ err == EAI_AGAIN)
+ {
+ // A loookup error occurred and nothing was resolved
+ // However, since the user could have just dialed up to the ISP
+@@ -2274,7 +2278,11 @@ void KExtendedSocket::dnsResultsReady()
+ else
+ {
+ d->status = nothing;
++#ifdef EAI_NODATA
+ setError(IO_LookupError, EAI_NODATA);
++#else
++ setError(IO_LookupError, EAI_NONAME);
++#endif
+ }
+
+ emit lookupFinished(n);
+--- khtml/khtml_part.cpp.orig Mon Mar 1 09:25:09 2004
++++ khtml/khtml_part.cpp Sat Mar 13 20:48:58 2004
+@@ -5395,7 +5395,7 @@
+ pix = KMimeType::pixmapForURL(u, 0, KIcon::Desktop, KIcon::SizeMedium);
+ }
+
+- KURLDrag* urlDrag = new KURLDrag( u, 0 );
++ KURLDrag* urlDrag = new KURLDrag( u, img ? 0 : d->m_view->viewport() );
+ if ( !d->m_referrer.isEmpty() )
+ urlDrag->metaData()["referrer"] = d->m_referrer;
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/kde-libs/kde-libs.spec
============================================================================
$ cvs diff -u -r1.10 -r1.11 kde-libs.spec
--- openpkg-src/kde-libs/kde-libs.spec 7 Feb 2004 17:55:55 -0000 1.10
+++ openpkg-src/kde-libs/kde-libs.spec 6 Apr 2004 13:45:42 -0000 1.11
@@ -24,8 +24,8 @@
##
# package version
-%define V_kde 3.1.4
-%define V_libs 3.1.4
+%define V_kde 3.2.1
+%define V_libs 3.2.1
# package information
Name: kde-libs
@@ -38,18 +38,19 @@
Group: KDE
License: GPL
Version: %{V_libs}
-Release: 20040207
+Release: 20040406
# list of sources
Source0:
ftp://ftp.kde.org/pub/kde/stable/%{V_kde}/src/kdelibs-%{V_libs}.tar.bz2
+Patch0: kde-libs.patch
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130, gcc, make, pkgconfig
PreReq: OpenPKG, openpkg >= 20040130
-BuildPreReq: X11, kde-qt, kde-arts, pcre, openssl, libxml, libxslt, gettext
-PreReq: X11, kde-qt, kde-arts, pcre, openssl, libxml, libxslt, gettext
+BuildPreReq: X11, kde-qt >= 3.2.3-20040406, kde-arts >= 1.2.1, pcre, openssl,
libxml, libxslt, gettext
+PreReq: X11, kde-qt >= 3.2.3-20040406, kde-arts >= 1.2.1, pcre, openssl,
libxml, libxslt, gettext
AutoReq: no
AutoReqProv: no
@@ -72,6 +73,7 @@
%prep
%setup -q -n kdelibs-%{V_libs}
+ %patch -p0
# GCC 3.3 with -pedantic is too restrictive for most vendor system headers.
%{l_shtool} subst \
@@ -96,7 +98,7 @@
export CXXFLAGS="`%{l_prefix}/bin/pkg-config --cflags-only-other kde-qt`
%{l_cxxflags -O}"
export CPPFLAGS="`%{l_prefix}/bin/pkg-config --cflags-only-I kde-qt`
%{l_cppflags}"
export LDFLAGS="`%{l_prefix}/bin/pkg-config --libs-only-L kde-qt` %{l_ldflags}"
- export LIBS="`%{l_prefix}/bin/pkg-config --libs-only-l --libs-only-other
kde-qt`"
+ # export LIBS="`%{l_prefix}/bin/pkg-config --libs-only-l --libs-only-other
kde-qt`"
export PATH="%{l_prefix}/libexec/kde:`%{l_prefix}/etc/rc --query
x11_bindir`:$PATH"
export LD_LIBRARY_PATH="%{l_prefix}/lib/kde:${LD_LIBRARY_PATH-/usr/lib}"
export MOC="%{l_prefix}/libexec/kde/moc"
@@ -141,7 +143,7 @@
--with-extra-includes=%{l_prefix}/include \
--with-extra-libs=%{l_prefix}/lib \
--with-ssl-dir=%{l_prefix} \
- --disable-pcre \
+ --enable-pcre \
--disable-cups \
--disable-libfam \
--disable-debug \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
