summaryrefslogtreecommitdiff
path: root/www/linuxpluginwrapper/files
diff options
context:
space:
mode:
Diffstat (limited to 'www/linuxpluginwrapper/files')
-rw-r--r--www/linuxpluginwrapper/files/patch-compat_glibc-linux_dynamic.c96
-rw-r--r--www/linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD4.x65
-rw-r--r--www/linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD5-current47
-rw-r--r--www/linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD5-stable51
-rw-r--r--www/linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD654
5 files changed, 0 insertions, 313 deletions
diff --git a/www/linuxpluginwrapper/files/patch-compat_glibc-linux_dynamic.c b/www/linuxpluginwrapper/files/patch-compat_glibc-linux_dynamic.c
deleted file mode 100644
index e5befc19283d..000000000000
--- a/www/linuxpluginwrapper/files/patch-compat_glibc-linux_dynamic.c
+++ /dev/null
@@ -1,96 +0,0 @@
---- compat_glibc/linux_dynamic.c.orig Sun Oct 17 12:45:23 2004
-+++ compat_glibc/linux_dynamic.c Sun Jan 28 22:09:17 2007
-@@ -1,5 +1,5 @@
- /*-
-- * Copyright (c) 2004 Norikatsu Shigemura
-+ * Copyright (c) 2006 Sean Farley
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
-@@ -23,38 +23,68 @@
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
-- * $Id: linux_dynamic.c,v 1.1 2004/10/17 03:45:23 nork Exp $
-+ * $Id$
- */
-
- #include "pluginwrapper.h"
- #include "linux.h"
--#include <stddef.h>
- #include <dlfcn.h>
--#include <string.h>
-+#include <err.h>
-+#include <stdlib.h>
-+
-+static const char LibGtk[] = "libgtk-x11-2.0.so.0";
-+
-+static void *libGtkHandle;
-+
-+/*
-+ * Initialize handle to libgtk-x11-2.0.
-+ */
-+static void __attribute__((constructor)) init_lib(void)
-+{
-+ libGtkHandle = dlopen(LibGtk, RTLD_LAZY | RTLD_LOCAL);
-+ if (libGtkHandle == NULL) {
-+ errx(EXIT_FAILURE, "dlopen(\"%s\"): %s", LibGtk, dlerror());
-+ }
-+
-+ return;
-+}
-
--extern unsigned int gtk_major_version;
-
- /*
-- * dlsym(3)
-+ * Deinitialize handle to libgtk-x11-2.0.
- */
--void *_dlsym(void *, const char *);
-+static void __attribute__((constructor)) deinit_lib(void)
-+{
-+ if (libGtkHandle != NULL && dlclose(libGtkHandle) != 0) {
-+ errx(EXIT_FAILURE, "dlclose(%p): %s", libGtkHandle, dlerror());
-+ }
-+
-+ return;
-+}
-+
-
-+/*
-+ * dlsym(3) using dlfunc(3) to avoid difficulty of locating original dlsym().
-+ */
- void *
- dlsym(void *handle, const char *symbol)
- {
-- void *ret;
--
-- if( handle == NULL && strcmp(symbol, "gtk_major_version") == 0 ) {
-- ret = &gtk_major_version;
-- dprintf("gtk_major_version = %d", gtk_major_version);
-- } else {
-- ret = _dlsym(handle, symbol);
-- }
-+ void *sym;
-
-- dprintf("dlsym(handle='%s', symbol='%s') = %p", handle, symbol, ret);
-- if( ret == NULL ) {
-- dprintf("dlerror=%s", dlerror());
-+ /* Find desired symbol. */
-+ sym = dlfunc(handle, symbol);
-+ if (sym == NULL) {
-+ dprintf("dlfunc(%p, %s): %s", handle, symbol, dlerror());
-+
-+ /* Attempt another search using libgtk-x11-2.0. */
-+ if (handle == NULL) {
-+ sym = dlfunc(libGtkHandle, symbol);
-+ if (sym == NULL)
-+ dprintf("dlfunc(%p, %s): %s", handle, symbol,
-+ dlerror());
-+ }
- }
-+ dprintf("dlsym(%p, %s) = %p", handle, symbol, sym);
-
-- return ret;
-+ return (sym);
- }
diff --git a/www/linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD4.x b/www/linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD4.x
deleted file mode 100644
index f006d3d97497..000000000000
--- a/www/linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD4.x
+++ /dev/null
@@ -1,65 +0,0 @@
---- misc/libmap.conf-FreeBSD4.x.orig Thu Sep 15 00:44:51 2005
-+++ misc/libmap.conf-FreeBSD4.x Sat Sep 23 22:35:19 2006
-@@ -2,14 +2,22 @@
- # $Id: libmap.conf-FreeBSD4.x,v 1.18 2005/09/14 15:44:51 nork Exp $
-
- #######################################################
--# Flash6 with Opera
--[/usr/X11R6/lib/browser_plugins/libflashplayer.so]
--libpthread.so.0 libc_r.so.4
--libdl.so.2 pluginwrapper/flash6.so
-+# Flash7 with Mozilla
-+[/usr/local/lib/npapi/linux-flashplugin/libflashplayer.so]
-+libpthread.so.0 pluginwrapper/flash7.so
-+libdl.so.2 pluginwrapper/flash7.so
- libz.so.1 libz.so.2
--libstdc++-libc6.2-2.so.3 libstdc++.so.3
- libm.so.6 libm.so.2
--libc.so.6 pluginwrapper/flash6.so
-+libc.so.6 pluginwrapper/flash7.so
-+
-+#######################################################
-+# Flash7 with Opera
-+[/usr/local/lib/npapi/linux-flashplugin/libflashplayer.so]
-+libpthread.so.0 pluginwrapper/flash7.so
-+libdl.so.2 pluginwrapper/flash7.so
-+libz.so.1 libz.so.2
-+libm.so.6 libm.so.2
-+libc.so.6 pluginwrapper/flash7.so
- [/usr/X11R6/share/opera/plugins/operamotifwrapper]
- libXm.so.1 libXm.so.3
- [/usr/X11R6/share/opera/plugins/operamotifwrapper-1]
-@@ -17,23 +25,10 @@
- [/usr/X11R6/share/opera/plugins/operamotifwrapper-2]
- libXm.so.2 libXm.so.3
-
--# Flash6 with Konqueror
--# SEE ALSO: http://freebsd.kde.org/howtos/konqueror-flash.php
--# This configuration was integrated to following one.
--
--# Flash6 with Mozilla/Firebird/Galeon/Epiphany/Konqueror/Kazehakase
--[/usr/X11R6/lib/linux-flashplugin6/libflashplayer.so]
--libpthread.so.0 pluginwrapper/flash6.so
--libdl.so.2 pluginwrapper/flash6.so
--libz.so.1 libz.so.2
--libstdc++-libc6.2-2.so.3 libstdc++.so.3
--libm.so.6 libm.so.2
--libc.so.6 pluginwrapper/flash6.so
--
-
- #######################################################
- # Acrobat7 with Mozilla/Firebird/Galeon/Epiphany/Konqueror/Kazehakase
--[/usr/compat/linux/usr/local/Adobe/Acrobat7.0/Browser/intellinux/nppdf.so]
-+[/usr/X11R6/Adobe/Acrobat7.0/ENU/Browser/intellinux/nppdf.so]
- libc.so.6 pluginwrapper/acrobat.so
-
- # Japanese Acrobat7 with Mozilla/Firebird/Galeon/Epiphany/Konqueror/Kazehakase
-@@ -46,6 +41,8 @@
- [/usr/X11R6/lib/linux-mozilla/plugins/nphelix.so]
- libstdc++.so.5 libstdc++.so.3
- libc.so.6 pluginwrapper/realplayer.so
-+libm.so.6 libm.so.2
-+libgcc_s.so.1 pluginwrapper/realplayer.so
-
-
- #######################################################
diff --git a/www/linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD5-current b/www/linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD5-current
deleted file mode 100644
index 2c7a9aa71d2a..000000000000
--- a/www/linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD5-current
+++ /dev/null
@@ -1,47 +0,0 @@
---- misc/libmap.conf-FreeBSD5-current.orig Thu Sep 15 00:44:51 2005
-+++ misc/libmap.conf-FreeBSD5-current Sat Sep 23 22:32:45 2006
-@@ -1,29 +1,20 @@
- # /etc/libmap.conf for FreeBSD 5-current(5.0 to 5.3-BETA6)
- # $Id: libmap.conf-FreeBSD5-current,v 1.20 2005/09/14 15:44:51 nork Exp $
-
--
- #######################################################
--# Flash6 with Opera is not available.
--
--# Flash6 with Konqueror
--# SEE ALSO: http://freebsd.kde.org/howtos/konqueror-flash.php
--# This configuration was integrated to following one.
--
--# Flash6 with Mozilla/Firebird/Galeon/Epiphany/Konqueror/Kazehakase
--[/usr/X11R6/lib/linux-flashplugin6/libflashplayer.so]
--libpthread.so.0 pluginwrapper/flash6.so
--libdl.so.2 pluginwrapper/flash6.so
-+# Flash7 with Mozilla
-+[/usr/local/lib/npapi/linux-flashplugin/libflashplayer.so]
-+libpthread.so.0 libpthread.so.2
-+libdl.so.2 pluginwrapper/flash7.so
- libz.so.1 libz.so.2
--libstdc++-libc6.2-2.so.3 libstdc++.so.4
- libm.so.6 libm.so.2
--libc.so.6 pluginwrapper/flash6.so
--
-+libc.so.6 pluginwrapper/flash7.so
-
- #######################################################
- # Acrobat with Opera is not available.
-
- # Acrobat7 with Mozilla/Firebird/Galeon/Epiphany/Konqueror/Kazehakase
--[/usr/compat/linux/usr/local/Adobe/Acrobat7.0/Browser/intellinux/nppdf.so]
-+[/usr/X11R6/Adobe/Acrobat7.0/ENU/Browser/intellinux/nppdf.so]
- libc.so.6 pluginwrapper/acrobat.so
-
- # Japanese Acrobat7 with Mozilla/Firebird/Galeon/Epiphany/Konqueror/Kazehakase
-@@ -36,6 +27,8 @@
- [/usr/X11R6/lib/linux-mozilla/plugins/nphelix.so]
- libstdc++.so.5 libstdc++.so.4
- libc.so.6 pluginwrapper/realplayer.so
-+libm.so.6 libm.so.2
-+libgcc_s.so.1 pluginwrapper/realplayer.so
-
-
- #######################################################
diff --git a/www/linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD5-stable b/www/linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD5-stable
deleted file mode 100644
index 694ab46db12b..000000000000
--- a/www/linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD5-stable
+++ /dev/null
@@ -1,51 +0,0 @@
---- misc/libmap.conf-FreeBSD5-stable.orig Sun Nov 13 10:46:14 2005
-+++ misc/libmap.conf-FreeBSD5-stable Sat Sep 23 22:31:48 2006
-@@ -3,31 +3,19 @@
- # $Id: libmap.conf-FreeBSD5-stable,v 1.22 2005/11/13 01:46:14 nork Exp $
-
- #######################################################
--# Flash6 with Opera is not available.
--
--# Flash6 with Konqueror
--# SEE ALSO: http://freebsd.kde.org/howtos/konqueror-flash.php
--# This configuration was integrated to following one.
--
--# Flash6 with Mozilla/Firebird/Galeon/Epiphany/Konqueror/Kazehakase
--[/usr/X11R6/lib/linux-flashplugin6/libflashplayer.so]
--libpthread.so.0 pluginwrapper/flash6.so
--libdl.so.2 pluginwrapper/flash6.so
--libz.so.1 libz.so.2
--libstdc++-libc6.2-2.so.3 libstdc++.so.4
--libm.so.6 libm.so.3
--libc.so.6 pluginwrapper/flash6.so
--
-+# Flash7 with Mozilla
-+[/usr/local/lib/npapi/linux-flashplugin/libflashplayer.so]
-+libpthread.so.0 libpthread.so.2
-+libdl.so.2 pluginwrapper/flash7.so
-+libz.so.1 libz.so.2
-+libm.so.6 libm.so.3
-+libc.so.6 pluginwrapper/flash7.so
-
- #######################################################
- # Acrobat with Opera is not available.
-
--# Acrobat5 with Mozilla/Firebird/Galeon/Epiphany/Konqueror/Kazehakase
--#[/usr/local/Acrobat5/Browsers/intellinux/nppdf.so]
--#libc.so.6 pluginwrapper/acrobat.so
--
- # Acrobat7 with Mozilla/Firebird/Galeon/Epiphany/Konqueror/Kazehakase
--[/usr/compat/linux/usr/local/Adobe/Acrobat7.0/Browser/intellinux/nppdf.so]
-+[/usr/X11R6/Adobe/Acrobat7.0/ENU/Browser/intellinux/nppdf.so]
- libc.so.6 pluginwrapper/acrobat.so
-
- # Japanese Acrobat7 with Mozilla/Firebird/Galeon/Epiphany/Konqueror/Kazehakase
-@@ -40,6 +28,8 @@
- [/usr/X11R6/lib/linux-mozilla/plugins/nphelix.so]
- libstdc++.so.5 libstdc++.so.4
- libc.so.6 pluginwrapper/realplayer.so
-+libm.so.6 libm.so.3
-+libgcc_s.so.1 pluginwrapper/realplayer.so
-
-
- #######################################################
diff --git a/www/linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD6 b/www/linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD6
deleted file mode 100644
index 0f88ed428035..000000000000
--- a/www/linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD6
+++ /dev/null
@@ -1,54 +0,0 @@
---- misc/libmap.conf-FreeBSD6.orig Sun Nov 13 10:46:14 2005
-+++ misc/libmap.conf-FreeBSD6 Sat Sep 23 22:27:48 2006
-@@ -2,39 +2,17 @@
- # $Id: libmap.conf-FreeBSD6,v 1.23 2005/11/13 01:46:14 nork Exp $
-
- #######################################################
--# [ALPHA SUPPORT] Flash7 with Mozilla
--[/usr/X11R6/lib/linux-flashplugin7/libflashplayer.so]
-+# Flash7 with Mozilla
-+[/usr/local/lib/npapi/linux-flashplugin/libflashplayer.so]
- libpthread.so.0 libpthread.so.2
- libdl.so.2 pluginwrapper/flash7.so
- libz.so.1 libz.so.3
- libm.so.6 libm.so.4
- libc.so.6 pluginwrapper/flash7.so
-
--
- #######################################################
--# Flash6 with Opera is not avilable.
--
--# Flash6 with Konqueror
--# SEE ALSO: http://freebsd.kde.org/howtos/konqueror-flash.php
--# This configuration was integrated to following one.
--
--# Flash6 with Mozilla/Firebird/Galeon/Epiphany/Konqueror/Kazehakase
--[/usr/X11R6/lib/linux-flashplugin6/libflashplayer.so]
--libpthread.so.0 pluginwrapper/flash6.so
--libdl.so.2 pluginwrapper/flash6.so
--libz.so.1 libz.so.3
--libstdc++-libc6.2-2.so.3 libstdc++.so.5
--libm.so.6 libm.so.4
--libc.so.6 pluginwrapper/flash6.so
--
--
--#######################################################
--# Acrobat5 with Mozilla/Firebird/Galeon/Epiphany/Konqueror/Kazehakase
--[/usr/X11R6/Acrobat5/Browsers/intellinux/nppdf.so]
--libc.so.6 pluginwrapper/acrobat.so
--
- # Acrobat7 with Mozilla/Firebird/Galeon/Epiphany/Konqueror/Kazehakase
--[/usr/compat/linux/usr/local/Adobe/Acrobat7.0/Browser/intellinux/nppdf.so]
-+[/usr/X11R6/Adobe/Acrobat7.0/ENU/Browser/intellinux/nppdf.so]
- libc.so.6 pluginwrapper/acrobat.so
-
- # Japanese Acrobat7 with Mozilla/Firebird/Galeon/Epiphany/Konqueror/Kazehakase
-@@ -47,6 +25,8 @@
- [/usr/X11R6/lib/linux-mozilla/plugins/nphelix.so]
- libstdc++.so.5 libstdc++.so.5
- libc.so.6 pluginwrapper/realplayer.so
-+libm.so.6 libm.so.4
-+libgcc_s.so.1 pluginwrapper/realplayer.so
-
-
- #######################################################