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

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   03-Dec-2006 22:22:03
  Branch: HEAD                             Handle: 2006120321220300

  Modified files:
    openpkg-src/gmime       gmime.patch gmime.spec

  Log:
    try to resolve namespace conflict with libmysqlclient (affects dbmail
    and similar applications which link against both libgmime and
    libmysqlclient)

  Summary:
    Revision    Changes     Path
    1.4         +19 -0      openpkg-src/gmime/gmime.patch
    1.63        +1  -1      openpkg-src/gmime/gmime.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/gmime/gmime.patch
  ============================================================================
  $ cvs diff -u -r1.3 -r1.4 gmime.patch
  --- openpkg-src/gmime/gmime.patch     3 Aug 2006 07:48:05 -0000       1.3
  +++ openpkg-src/gmime/gmime.patch     3 Dec 2006 21:22:03 -0000       1.4
  @@ -86,3 +86,22 @@
    #include <sys/ioctl.h>
    #include <sys/stat.h>
    #include <sys/wait.h>
  +Index: util/list.h
  +--- util/list.h.orig 2006-06-21 22:07:53 +0200
  ++++ util/list.h      2006-12-03 22:18:58 +0100
  +@@ -25,6 +25,15 @@
  + 
  + #include <string.h>
  + 
  ++#define list_init         gmime_list_init
  ++#define list_is_empty     gmime_list_is_empty
  ++#define list_length       gmime_list_length
  ++#define list_unlink_head  gmime_list_unlink_head
  ++#define list_unlink_tail  gmime_list_unlink_tail
  ++#define list_prepend_node gmime_list_prepend_node
  ++#define list_append_node  gmime_list_append_node
  ++#define list_node_unlink  gmime_list_node_unlink
  ++
  + G_BEGIN_DECLS
  + 
  + typedef struct _ListNode {
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/gmime/gmime.spec
  ============================================================================
  $ cvs diff -u -r1.62 -r1.63 gmime.spec
  --- openpkg-src/gmime/gmime.spec      13 Oct 2006 17:28:27 -0000      1.62
  +++ openpkg-src/gmime/gmime.spec      3 Dec 2006 21:22:03 -0000       1.63
  @@ -38,7 +38,7 @@
   Group:        Libraries
   License:      GPL
   Version:      %{V_major}.%{V_minor}
  -Release:      20061013
  +Release:      20061203
   
   #   package options
   %option       with_perl  no
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [email protected]

Reply via email to