diff options
Diffstat (limited to 'mozplugger/SOURCES/sugar-pdf-plugin.patch')
| -rw-r--r-- | mozplugger/SOURCES/sugar-pdf-plugin.patch | 80 |
1 files changed, 80 insertions, 0 deletions
diff --git a/mozplugger/SOURCES/sugar-pdf-plugin.patch b/mozplugger/SOURCES/sugar-pdf-plugin.patch new file mode 100644 index 0000000..01a07a6 --- /dev/null +++ b/mozplugger/SOURCES/sugar-pdf-plugin.patch @@ -0,0 +1,80 @@ +diff -uNr mozplugger-1.14.2/Makefile mozplugger-1.14.2-olpc/Makefile +--- mozplugger-1.14.2/Makefile 2010-09-18 05:51:05.000000000 -0300 ++++ mozplugger-1.14.2-olpc/Makefile 2011-06-02 16:07:15.085910995 -0300 +@@ -9,10 +9,6 @@ + # For installing + prefix=/usr + +-# On 64 bit arch change libprefix to lib64 +-libprefix=/lib +-#libprefix=/lib64 +- + # + # + RPMDIR=/usr/src/RPM +@@ -129,7 +125,7 @@ + NORM_LDFLAGS= + XCFLAGS=-shared + XLDFLAGS=-shared +-XLIBDIR = $(X11)$(libprefix) ++XLIBDIR = $(X11)$(lib) + XLIBS=-lX11 -L$(XLIBDIR) + EXTRA_LIBS= + +@@ -202,13 +198,13 @@ + + install: + -@mkdir -p $(root)$(prefix)/bin +- -@mkdir -p $(root)$(prefix)$(libprefix)/mozilla/plugins ++ -@mkdir -p $(root)$(prefix)$(lib)/mozilla/plugins + -@mkdir -p $(root)$(prefix)/share/man/man7 + -@mkdir -p $(root)/etc + cp mozplugger-helper $(root)$(prefix)/bin/ + cp mozplugger-controller $(root)$(prefix)/bin/ + cp mozplugger-linker $(root)$(prefix)/bin/ +- cp mozplugger.so $(root)$(prefix)$(libprefix)/mozilla/plugins/ ++ cp mozplugger.so $(root)$(prefix)$(lib)/mozilla/plugins/ + cp mozpluggerrc $(root)/etc/ + cp mozplugger.7 $(root)$(prefix)/share/man/man7/ + +diff -uNr mozplugger-1.14.2/mozplugger.c mozplugger-1.14.2-olpc/mozplugger.c +--- mozplugger-1.14.2/mozplugger.c 2010-09-18 05:51:05.000000000 -0300 ++++ mozplugger-1.14.2-olpc/mozplugger.c 2011-06-02 16:00:01.547911001 -0300 +@@ -64,7 +64,6 @@ + typedef struct data + { + Display *display; +- char *displayname; + NPWindow windata; + pid_t pid; + int commsPipeFd; +@@ -268,8 +267,6 @@ + + my_putenv(buffer, &offset, "winname", THIS->winname); + +- my_putenv(buffer, &offset, "DISPLAY", THIS->displayname); +- + for (i = 0; i < THIS->num_arguments; i++) + { + my_putenv(buffer, &offset, THIS->args[i].name, THIS->args[i].value); +@@ -302,11 +299,10 @@ + _exit(EX_UNAVAILABLE); /* Child exit, that's OK */ + } + +- D("Executing helper: %s %s %s %s %s %s\n", ++ D("Executing helper: %s %s %s %s %s\n", + launcher, + buffer, + file, +- THIS->displayname, + THIS->command, + THIS->mimetype); + +@@ -3004,7 +3000,6 @@ + THIS = instance->pdata; + + THIS->display = ((NPSetWindowCallbackStruct *)window->ws_info)->display; +- THIS->displayname = XDisplayName(DisplayString(THIS->display)); + THIS->windata = *window; + + if ((THIS->url) && (THIS->browserCantHandleIt)) |