package/gnome1/gnome-libs14/db_185.patch

   1 # --- T2-COPYRIGHT-NOTE-BEGIN ---
   2 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
   3 #
   4 # T2 SDE: package/.../gnome-libs14/db_185.patch
   5 # Copyright (C) 2004 - 2005 The T2 SDE Project
   6 # Copyright (C) 1998 - 2003 ROCK Linux Project
   7 #
   8 # More information can be found in the files COPYING and README.
   9 #
  10 # This patch file is dual-licensed. It is available under the license the
  11 # patched project is licensed under, as long as it is an OpenSource license
  12 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  13 # of the GNU General Public License as published by the Free Software
  14 # Foundation; either version 2 of the License, or (at your option) any later
  15 # version.
  16 # --- T2-COPYRIGHT-NOTE-END ---
  17
  18 diff -Naur gnome-libs-1.4.17.orig/libgnome/gnome-dump.c gnome-libs-1.4.1.7/libgnome/gnome-dump.c
  19 --- gnome-libs-1.4.1.7.orig/libgnome/gnome-dump.c       2002-01-07 00:12:05.000000000 +0100
  20 +++ gnome-libs-1.4.1.7/libgnome/gnome-dump.c    2003-05-05 13:25:11.000000000 +0200
  21 @@ -25,30 +25,7 @@
  22  #endif
  23  #include <sys/types.h>
  24
  25 -#ifdef PREFER_DB1
  26 -#ifdef HAVE_DB1_DB_H
  27 -# include <db1/db.h>
  28 -#else
  29 -# ifdef HAVE_DB_185_H
  30 -#  include <db_185.h>
  31 -# else
  32 -#  include <db.h>
  33 -# endif
  34 -#endif
  35 -
  36 -#else
  37 -
  38 -#ifdef HAVE_DB_185_H
  39 -# include <db_185.h>
  40 -#else
  41 -# ifdef HAVE_DB1_DB_H
  42 -#  include <db1/db.h>
  43 -# else
  44 -#  include <db.h>
  45 -# endif
  46 -#endif
  47 -
  48 -#endif
  49 +#include <db3/db_185.h>
  50
  51  #include <string.h>
  52  #include <unistd.h>
  53 diff -Naur gnome-libs-1.4.17.orig/libgnome/gnome-metadata.c gnome-libs-1.4.1.7/libgnome/gnome-metadata.c
  54 --- gnome-libs-1.4.1.7.orig/libgnome/gnome-metadata.c   2002-01-07 00:12:05.000000000 +0100
  55 +++ gnome-libs-1.4.1.7/libgnome/gnome-metadata.c        2003-05-05 13:05:40.000000000 +0200
  56 @@ -52,27 +52,7 @@
  57  #include <ctype.h>
  58  #include <errno.h>
  59
  60 -#ifdef PREFER_DB1
  61 -#ifdef HAVE_DB1_DB_H
  62 -# include <db1/db.h>
  63 -#else
  64 -# ifdef HAVE_DB_185_H
  65 -#  include <db_185.h>
  66 -# else
  67 -#  include <db.h>
  68 -# endif
  69 -#endif
  70 -#else
  71 -#ifdef HAVE_DB_185_H
  72 -# include <db_185.h>
  73 -#else
  74 -# ifdef HAVE_DB1_DB_H
  75 -#  include <db1/db.h>
  76 -# else
  77 -#  include <db.h>
  78 -# endif
  79 -#endif
  80 -#endif
  81 +#include <db3/db_185.h>
  82
  83  #include "libgnomeP.h"
  84  #include "gnome-mime.h"