OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Torsten Homeyer
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   03-Aug-2004 09:58:46
  Branch: HEAD                             Handle: 2004080308584500

  Modified files:
    openpkg-src/kde-libs    kde-libs.patch kde-libs.spec

  Log:
    upgrading package: kde-libs 3.2.1 -> 3.2.3

  Summary:
    Revision    Changes     Path
    1.2         +0  -39     openpkg-src/kde-libs/kde-libs.patch
    1.12        +8  -4      openpkg-src/kde-libs/kde-libs.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/kde-libs/kde-libs.patch
  ============================================================================
  $ cvs diff -u -r1.1 -r1.2 kde-libs.patch
  --- openpkg-src/kde-libs/kde-libs.patch       6 Apr 2004 13:45:42 -0000       1.1
  +++ openpkg-src/kde-libs/kde-libs.patch       3 Aug 2004 07:58:45 -0000       1.2
  @@ -1,31 +1,3 @@
  ---- 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
  @@ -53,14 +25,3 @@
        }
    
      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.11 -r1.12 kde-libs.spec
  --- openpkg-src/kde-libs/kde-libs.spec        6 Apr 2004 13:45:42 -0000       1.11
  +++ openpkg-src/kde-libs/kde-libs.spec        3 Aug 2004 07:58:45 -0000       1.12
  @@ -24,8 +24,8 @@
   ##
   
   #   package version
  -%define       V_kde      3.2.1
  -%define       V_libs     3.2.1
  +%define       V_kde      3.2.3
  +%define       V_libs     3.2.3
   
   #   package information
   Name:         kde-libs
  @@ -38,7 +38,7 @@
   Group:        KDE
   License:      GPL
   Version:      %{V_libs}
  -Release:      20040406
  +Release:      20040803
   
   #   list of sources
   Source0:      
ftp://ftp.kde.org/pub/kde/stable/%{V_kde}/src/kdelibs-%{V_libs}.tar.bz2
  @@ -143,13 +143,17 @@
           --with-extra-includes=%{l_prefix}/include \
           --with-extra-libs=%{l_prefix}/lib \
           --with-ssl-dir=%{l_prefix} \
  -        --enable-pcre \
           --disable-cups \
           --disable-libfam \
           --disable-debug \
  +        --enable-pcre \
           --disable-static \
           --enable-shared
   
  +    #   we will have to delete the reference to the pcre lib to prevent static 
linkage at buildtime
  +    %{l_shtool} subst \
  +        -e '/^LIBPCRE/s; -lpcreposix -lpcre;;' \
  +        `find . -name Makefile -type f -print`
       #   build package
       %{l_make} %{l_mflags -O}
   
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to