summaryrefslogtreecommitdiff
path: root/editors/openoffice.org-2-devel/files/patch-i65514
diff options
context:
space:
mode:
Diffstat (limited to 'editors/openoffice.org-2-devel/files/patch-i65514')
-rw-r--r--editors/openoffice.org-2-devel/files/patch-i6551436
1 files changed, 19 insertions, 17 deletions
diff --git a/editors/openoffice.org-2-devel/files/patch-i65514 b/editors/openoffice.org-2-devel/files/patch-i65514
index 8589161a0290..d0cf3aafbd19 100644
--- a/editors/openoffice.org-2-devel/files/patch-i65514
+++ b/editors/openoffice.org-2-devel/files/patch-i65514
@@ -1,14 +1,15 @@
Index: berkeleydb/db-4.2.52.patch
===================================================================
RCS file: /cvs/external/berkeleydb/db-4.2.52.patch,v
-retrieving revision 1.13
-diff -u -r1.13 db-4.2.52.patch
---- berkeleydb/db-4.2.52.patch 25 Jul 2006 10:23:22 -0000 1.13
-+++ berkeleydb/db-4.2.52.patch 29 Jul 2006 11:01:12 -0000
-@@ -518,6 +518,20 @@
- emode= 555
- fmode= 444
-
+retrieving revision 1.15
+diff -u -r1.15 db-4.2.52.patch
+--- berkeleydb/db-4.2.52.patch 22 Nov 2006 10:35:13 -0000 1.15
++++ berkeleydb/db-4.2.52.patch 6 Dec 2006 00:28:05 -0000
+@@ -205,6 +205,21 @@
+ ! $(SLO)$/dbreg_util.obj
+ !
+ ! .INCLUDE : target.mk
++
+*** misc/db-4.2.52.NC/dist/config.hin Wed Dec 3 16:10:00 2003
+--- misc/build/db-4.2.52.NC/dist/config.hin Fri May 19 17:37:41 2006
+***************
@@ -23,13 +24,13 @@ diff -u -r1.13 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/configure Wed Dec 3 22:10:02 2003
- --- misc/build/db-4.2.52.NC/dist/configure Tue Jul 25 09:05:20 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 2006-05-02 17:06:13.000000000 +0200
***************
-@@ -554,6 +568,76 @@
- fi
-
- # Commands to make compiler produce verbose output that lists
+@@ -273,6 +288,77 @@
+ 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 ----
@@ -100,10 +101,11 @@ diff -u -r1.13 db-4.2.52.patch
+ _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 2006-05-02 16:55:53.000000000 +0200
***************
-@@ -1010,3 +1094,39 @@
+@@ -975,3 +1061,39 @@
! $(SLO)$/xa_map.obj
!
! .INCLUDE : target.mk