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 openpkg-web          Date:   28-Nov-2003 20:20:58
  Branch: HEAD                             Handle: 2003112819205701

  Modified files:
    openpkg-src/libxml      libxml.patch libxml.spec
    openpkg-web             news.txt

  Log:
    make sure one can include <libxml/hash.h> without problems

  Summary:
    Revision    Changes     Path
    1.5         +33 -2      openpkg-src/libxml/libxml.patch
    1.71        +1  -1      openpkg-src/libxml/libxml.spec
    1.7603      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/libxml/libxml.patch
  ============================================================================
  $ cvs diff -u -r1.4 -r1.5 libxml.patch
  --- openpkg-src/libxml/libxml.patch   22 Oct 2003 19:14:50 -0000      1.4
  +++ openpkg-src/libxml/libxml.patch   28 Nov 2003 19:20:58 -0000      1.5
  @@ -1,6 +1,37 @@
  +Index: include/libxml/hash.h
  +--- include/libxml/hash.h.orig       2003-09-09 22:18:00.000000000 +0200
  ++++ include/libxml/hash.h    2003-11-28 20:19:02.000000000 +0100
  +@@ -18,9 +18,6 @@
  + #ifndef __XML_HASH_H__
  + #define __XML_HASH_H__
  + 
  +-#include <libxml/xmlversion.h>
  +-#include <libxml/parser.h>
  +-
  + #ifdef __cplusplus
  + extern "C" {
  + #endif
  +@@ -31,6 +28,17 @@
  + typedef struct _xmlHashTable xmlHashTable;
  + typedef xmlHashTable *xmlHashTablePtr;
  + 
  ++#ifdef __cplusplus
  ++}
  ++#endif
  ++
  ++#include <libxml/xmlversion.h>
  ++#include <libxml/parser.h>
  ++
  ++#ifdef __cplusplus
  ++extern "C" {
  ++#endif
  ++
  + /*
  +  * function types:
  +  */
   Index: nanoftp.c
  ---- nanoftp.c.orig   2003-10-10 17:49:38.000000000 +0200
  -+++ nanoftp.c        2003-10-22 20:55:34.000000000 +0200
  +--- nanoftp.c.orig   2003-10-29 14:27:37.000000000 +0100
  ++++ nanoftp.c        2003-11-28 20:18:23.000000000 +0100
   @@ -1553,7 +1553,7 @@
    
        memset (&dataAddr, 0, sizeof(dataAddr));
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/libxml/libxml.spec
  ============================================================================
  $ cvs diff -u -r1.70 -r1.71 libxml.spec
  --- openpkg-src/libxml/libxml.spec    4 Nov 2003 18:34:52 -0000       1.70
  +++ openpkg-src/libxml/libxml.spec    28 Nov 2003 19:20:58 -0000      1.71
  @@ -33,7 +33,7 @@
   Group:        SGML
   License:      LGPL
   Version:      2.6.2
  -Release:      20031104
  +Release:      20031128
   
   #   list of sources
   Source0:      ftp://xmlsoft.org/libxml2-%{version}.tar.gz
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.7602 -r1.7603 news.txt
  --- openpkg-web/news.txt      28 Nov 2003 19:10:42 -0000      1.7602
  +++ openpkg-web/news.txt      28 Nov 2003 19:20:57 -0000      1.7603
  @@ -1,3 +1,4 @@
  +28-Nov-2003: Upgraded package: P<libxml-2.6.2-20031128>
   28-Nov-2003: Upgraded package: P<libgdome-0.8.1-20031128>
   28-Nov-2003: Upgraded package: P<perl-crypto-20031128-20031128>
   28-Nov-2003: Upgraded package: P<perl-dbi-20031128-20031128>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to