------------------------------------------------------------
revno: 1923
committer: Rene Engelhard <[email protected]>
branch nick: unstable
timestamp: Wed 2010-04-07 22:30:01 +0200
message:
add patch from upstream to handle relative symlinks
added:
patches/nsplugin-path-handle-relative-symlinks.diff
modified:
changelog
patches/series
=== modified file 'changelog'
--- a/changelog 2010-04-07 19:23:33 +0000
+++ b/changelog 2010-04-07 20:30:01 +0000
@@ -2,6 +2,9 @@
* debian/patches/es-fix-buleano.diff: fix spanish "boolean value" translation
(closes: #576842)
+ * debian/patches/nsplugin-path-handle-relative-symlinks.diff: add patch
+ from upstream to handle relative symlinks (closes: #570452)
+
* debian/rules, debian/shlibs.*: fix shlib-dependencies to not depend
on the kdelibs5 transitional package anymore when built with KDE 4.4
=== added file 'patches/nsplugin-path-handle-relative-symlinks.diff'
--- a/patches/nsplugin-path-handle-relative-symlinks.diff 1970-01-01
00:00:00 +0000
+++ b/patches/nsplugin-path-handle-relative-symlinks.diff 2010-04-07
20:30:01 +0000
@@ -0,0 +1,38 @@
+diff --git a/patches/dev300/nsplugin-path.diff
b/patches/dev300/nsplugin-path.diff
+index da1d95b..3818604 100644
+--- openoffice.org-3.2.0/ooo-build-3-2-0-9/patches/dev300/nsplugin-path.diff
++++ openoffice.org-3.2.0/ooo-build-3-2-0-9/patches/dev300/nsplugin-path.diff
+@@ -8,7 +8,7 @@
+ #include <stdarg.h>
+ // For vsnprintf()
+ #define NSP_vsnprintf vsnprintf
+-@@ -122,6 +123,96 @@ restoreUTF8(char *pPath)
++@@ -122,6 +123,114 @@ restoreUTF8(char *pPath)
+ return 0;
+ }
+
+@@ -94,6 +94,24 @@
+ + *clobber = '\0';
+ + strcpy (realFileName, libFileName);
+ + }
+++
+++ fprintf (stderr, "OpenOffice path before fixup is '%s'\n",
realFileName);
+++
+++ if (realFileName[0] != '/') {
+++ /* a relative sym-link and we need to get an absolute path */
+++ char scratch[NPP_PATH_MAX] = {0};
+++ if (strlen (realFileName) + strlen (libFileName) + 2 >=
NPP_PATH_MAX - 1)
+++ {
+++ fprintf (stderr, "Paths too long to fix up.\n");
+++ return 1;
+++ }
+++ strcpy (scratch, libFileName);
+++ if (strrchr (scratch, '/')) /* remove the last element */
+++ *(strrchr (scratch, '/') + 1) = '\0';
+++ strcat (scratch, realFileName);
+++ strcpy (realFileName, scratch);
+++ }
+++
+ + *aResult = realFileName;
+ +
+ + fprintf (stderr, "OpenOffice path is '%s'\n", realFileName);
=== modified file 'patches/series'
--- a/patches/series 2010-04-07 19:23:33 +0000
+++ b/patches/series 2010-04-07 20:30:01 +0000
@@ -4,3 +4,4 @@
cws-linuxaxp01.diff
fix-system-redland.diff
system-mysqlcpp.diff
+nsplugin-path-handle-relative-symlinks.diff
