mirror of the now-defunct rocklinux.org
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.

89 lines
2.4 KiB

  1. # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
  2. #
  3. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  4. # Please add additional copyright information _after_ the line containing
  5. # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
  6. # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
  7. #
  8. # ROCK Linux: rock-src/package/gnome14/gnome-libs14/db_185.patch
  9. # ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
  10. #
  11. # This program is free software; you can redistribute it and/or modify
  12. # it under the terms of the GNU General Public License as published by
  13. # the Free Software Foundation; either version 2 of the License, or
  14. # (at your option) any later version. A copy of the GNU General Public
  15. # License can be found at Documentation/COPYING.
  16. #
  17. # Many people helped and are helping developing ROCK Linux. Please
  18. # have a look at http://www.rocklinux.org/ and the Documentation/TEAM
  19. # file for details.
  20. #
  21. # --- ROCK-COPYRIGHT-NOTE-END ---
  22. diff -Naur gnome-libs-1.4.17.orig/libgnome/gnome-dump.c gnome-libs-1.4.1.7/libgnome/gnome-dump.c
  23. --- gnome-libs-1.4.1.7.orig/libgnome/gnome-dump.c 2002-01-07 00:12:05.000000000 +0100
  24. +++ gnome-libs-1.4.1.7/libgnome/gnome-dump.c 2003-05-05 13:25:11.000000000 +0200
  25. @@ -25,30 +25,7 @@
  26. #endif
  27. #include <sys/types.h>
  28. -#ifdef PREFER_DB1
  29. -#ifdef HAVE_DB1_DB_H
  30. -# include <db1/db.h>
  31. -#else
  32. -# ifdef HAVE_DB_185_H
  33. -# include <db_185.h>
  34. -# else
  35. -# include <db.h>
  36. -# endif
  37. -#endif
  38. -
  39. -#else
  40. -
  41. -#ifdef HAVE_DB_185_H
  42. -# include <db_185.h>
  43. -#else
  44. -# ifdef HAVE_DB1_DB_H
  45. -# include <db1/db.h>
  46. -# else
  47. -# include <db.h>
  48. -# endif
  49. -#endif
  50. -
  51. -#endif
  52. +#include <db33/db_185.h>
  53. #include <string.h>
  54. #include <unistd.h>
  55. diff -Naur gnome-libs-1.4.17.orig/libgnome/gnome-metadata.c gnome-libs-1.4.1.7/libgnome/gnome-metadata.c
  56. --- gnome-libs-1.4.1.7.orig/libgnome/gnome-metadata.c 2002-01-07 00:12:05.000000000 +0100
  57. +++ gnome-libs-1.4.1.7/libgnome/gnome-metadata.c 2003-05-05 13:05:40.000000000 +0200
  58. @@ -52,27 +52,7 @@
  59. #include <ctype.h>
  60. #include <errno.h>
  61. -#ifdef PREFER_DB1
  62. -#ifdef HAVE_DB1_DB_H
  63. -# include <db1/db.h>
  64. -#else
  65. -# ifdef HAVE_DB_185_H
  66. -# include <db_185.h>
  67. -# else
  68. -# include <db.h>
  69. -# endif
  70. -#endif
  71. -#else
  72. -#ifdef HAVE_DB_185_H
  73. -# include <db_185.h>
  74. -#else
  75. -# ifdef HAVE_DB1_DB_H
  76. -# include <db1/db.h>
  77. -# else
  78. -# include <db.h>
  79. -# endif
  80. -#endif
  81. -#endif
  82. +#include <db33/db_185.h>
  83. #include "libgnomeP.h"
  84. #include "gnome-mime.h"