You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
 
 
 
 
 
 

84 lines
2.1 KiB

# --- T2-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# T2 SDE: package/.../gnome-libs14/db_185.patch
# Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- T2-COPYRIGHT-NOTE-END ---
diff -Naur gnome-libs-1.4.17.orig/libgnome/gnome-dump.c gnome-libs-1.4.1.7/libgnome/gnome-dump.c
--- gnome-libs-1.4.1.7.orig/libgnome/gnome-dump.c 2002-01-07 00:12:05.000000000 +0100
+++ gnome-libs-1.4.1.7/libgnome/gnome-dump.c 2003-05-05 13:25:11.000000000 +0200
@@ -25,30 +25,7 @@
#endif
#include <sys/types.h>
-#ifdef PREFER_DB1
-#ifdef HAVE_DB1_DB_H
-# include <db1/db.h>
-#else
-# ifdef HAVE_DB_185_H
-# include <db_185.h>
-# else
-# include <db.h>
-# endif
-#endif
-
-#else
-
-#ifdef HAVE_DB_185_H
-# include <db_185.h>
-#else
-# ifdef HAVE_DB1_DB_H
-# include <db1/db.h>
-# else
-# include <db.h>
-# endif
-#endif
-
-#endif
+#include <db3/db_185.h>
#include <string.h>
#include <unistd.h>
diff -Naur gnome-libs-1.4.17.orig/libgnome/gnome-metadata.c gnome-libs-1.4.1.7/libgnome/gnome-metadata.c
--- gnome-libs-1.4.1.7.orig/libgnome/gnome-metadata.c 2002-01-07 00:12:05.000000000 +0100
+++ gnome-libs-1.4.1.7/libgnome/gnome-metadata.c 2003-05-05 13:05:40.000000000 +0200
@@ -52,27 +52,7 @@
#include <ctype.h>
#include <errno.h>
-#ifdef PREFER_DB1
-#ifdef HAVE_DB1_DB_H
-# include <db1/db.h>
-#else
-# ifdef HAVE_DB_185_H
-# include <db_185.h>
-# else
-# include <db.h>
-# endif
-#endif
-#else
-#ifdef HAVE_DB_185_H
-# include <db_185.h>
-#else
-# ifdef HAVE_DB1_DB_H
-# include <db1/db.h>
-# else
-# include <db.h>
-# endif
-#endif
-#endif
+#include <db3/db_185.h>
#include "libgnomeP.h"
#include "gnome-mime.h"