summaryrefslogtreecommitdiff
path: root/editors/openoffice-3-devel/files/patch-i65514
diff options
context:
space:
mode:
Diffstat (limited to 'editors/openoffice-3-devel/files/patch-i65514')
-rw-r--r--editors/openoffice-3-devel/files/patch-i6551432
1 files changed, 13 insertions, 19 deletions
diff --git a/editors/openoffice-3-devel/files/patch-i65514 b/editors/openoffice-3-devel/files/patch-i65514
index fa21fa13c3b3..59b7cd68b7ce 100644
--- a/editors/openoffice-3-devel/files/patch-i65514
+++ b/editors/openoffice-3-devel/files/patch-i65514
@@ -1,11 +1,6 @@
-Index: berkeleydb/db-4.2.52.patch
-===================================================================
-RCS file: /cvs/external/berkeleydb/db-4.2.52.patch,v
-retrieving revision 1.18
-diff -u -r1.18 db-4.2.52.patch
---- berkeleydb/db-4.2.52.patch 25 Jan 2007 12:11:26 -0000 1.18
-+++ berkeleydb/db-4.2.52.patch 1 Feb 2007 01:37:17 -0000
-@@ -499,6 +499,20 @@
+--- berkeleydb/db-4.2.52.patch Fri Apr 27 17:14:50 2007
++++ berkeleydb/db-4.2.52.patch Fri Apr 27 17:14:15 2007
+@@ -221,6 +221,20 @@
! $(SLO)$/dbreg_util.obj
!
! .INCLUDE : target.mk
@@ -23,13 +18,13 @@ diff -u -r1.18 db-4.2.52.patch
+ /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
+ #undef HAVE_NDIR_H
+
- *** misc/db-4.2.52.NC/dist/Makefile.in Fri Nov 28 19:50:06 2003
- --- misc/build/db-4.2.52.NC/dist/Makefile.in Tue Jul 25 09:32:28 2006
+ *** misc/db-4.2.52.NC/dist/configure 2003-12-03 22:10:02.000000000 +0100
+ --- misc/build/db-4.2.52.NC/dist/configure 2007-02-19 16:12:12.000000000 +0100
***************
-@@ -554,6 +568,77 @@
- fi
-
- # Commands to make compiler produce verbose output that lists
+@@ -327,6 +341,76 @@
+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+ export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+ whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+***************
+*** 28556,28561 ****
+--- 28556,28606 ----
@@ -98,13 +93,12 @@ diff -u -r1.18 db-4.2.52.patch
++ cat >>confdefs.h <<\_ACEOF
++ #define HAVE_MUTEX_X86_64_GCC_ASSEMBLY 1
+ _ACEOF
-+
-+
+
- *** misc/db-4.2.52.NC/dist/ltmain.sh Sat Apr 26 19:45:37 2003
- --- misc/build/db-4.2.52.NC/dist/ltmain.sh Tue Jul 25 09:05:20 2006
++
+ *** misc/db-4.2.52.NC/dist/ltmain.sh 2003-04-26 19:45:37.000000000 +0200
+ --- misc/build/db-4.2.52.NC/dist/ltmain.sh 2007-02-19 16:12:12.000000000 +0100
***************
-@@ -1010,3 +1095,39 @@
+@@ -1080,3 +1164,39 @@
! $(SLO)$/xa_map.obj
!
! .INCLUDE : target.mk