Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master z-rejected grimoire by Eric Sandall (33c276bccfc4d3c3ae62e884c4c962fffddacda4)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master z-rejected grimoire by Eric Sandall (33c276bccfc4d3c3ae62e884c4c962fffddacda4)
  • Date: Tue, 17 Feb 2009 19:13:16 -0600

GIT changes to master z-rejected grimoire by Eric Sandall
<sandalle AT sourcemage.org>:

z-java/jdk6-bin/HISTORY | 6 ++++++
z-java/jdk6-bin/INSTALL | 26 +++++++++++++++++++++-----
z-java/jre6-bin/HISTORY | 7 +++++++
z-java/jre6-bin/INSTALL | 26 ++++++++++++++++++++------
4 files changed, 54 insertions(+), 11 deletions(-)

New commits:
commit 33c276bccfc4d3c3ae62e884c4c962fffddacda4
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

jdk6-bin: Added plugin support for firefox-bin (/opt/firefox/plugins)

commit 65596f10e196734effeb7905b43b48844c26ab79
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

jre6-bin: Added x86_64 support for firefox-bin (/opt/firefox/plugins)

commit 4645197f213cf9a473e72326a48dc7137524f741
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

jdk6-bin: Install plugins to xulrunner instead of firefox
Firefox picks up it's plugins from xulrunner now:
/usr/lib/firefox/plugins -> /usr/lib/xulrunner/plugins

commit 45d48bdb227e40abfb8a8af32dd04ca0ea74a9c1
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

jre6-bin: Do not install plugins to /usr/lib/firefox/plugins as this is
just a symlink to /usr/lib/xulrunner/plugins and would have the
plugins installed twice and recorded by two different packages

commit 60568005ed9074f607111b5b1a405d805939f078
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

jre6-bin: Add x86_64 support (amd64/libpjp2.so)

diff --git a/z-java/jdk6-bin/HISTORY b/z-java/jdk6-bin/HISTORY
index 2f59a32..19e587f 100644
--- a/z-java/jdk6-bin/HISTORY
+++ b/z-java/jdk6-bin/HISTORY
@@ -1,3 +1,9 @@
+2009-02-17 Eric Sandall <sandalle AT sourcemage.org>
+ * INSTALL: Install plugins to xulrunner instead of firefox
+ Firefox picks up it's plugins from xulrunner now:
+ /usr/lib/firefox/plugins -> /usr/lib/xulrunner/plugins
+ Added plugin support for firefox-bin (/opt/firefox/plugins)
+
2009-02-15 David Kowis <dkowis AT shlrm.org>
* PRE_BUILD: changed extraction method to use the one sun provides
This also builds a few more jars than it used to.
diff --git a/z-java/jdk6-bin/INSTALL b/z-java/jdk6-bin/INSTALL
index d97af4b..3f0f7cb 100755
--- a/z-java/jdk6-bin/INSTALL
+++ b/z-java/jdk6-bin/INSTALL
@@ -15,13 +15,22 @@ then

${INSTALL_ROOT}/usr/lib/mozilla/plugins/libnpjp2.so
fi &&

- if [ -d ${INSTALL_ROOT}/usr/lib/firefox/plugins ]
+ if [ -d ${INSTALL_ROOT}/usr/lib/xulrunner/plugins ]
then
ln -sf
${INSTALL_ROOT}/usr/lib/jdk$VER/jre/plugin/i386/ns7/libjavaplugin_oji.so \
-
${INSTALL_ROOT}/usr/lib/firefox/plugins/libjavaplugin_oji.so &&
+
${INSTALL_ROOT}/usr/lib/xulrunner/plugins/libjavaplugin_oji.so &&
ln -sf
${INSTALL_ROOT}/usr/lib/jdk$VER/jre/lib/i386/libnpjp2.so \
-
${INSTALL_ROOT}/usr/lib/firefox/plugins/libnpjp2.so
+
${INSTALL_ROOT}/usr/lib/xulrunner/plugins/libnpjp2.so
fi
+
+ if [ -d ${INSTALL_ROOT}/opt/firefox/plugins ]
+ then
+ ln -sf
${INSTALL_ROOT}/usr/lib/jdk$VER/jre/plugin/i386/ns7/libjavaplugin_oji.so \
+
${INSTALL_ROOT}/opt/firefox/plugins/libjavaplugin_oji.so &&
+ ln -sf
${INSTALL_ROOT}/usr/lib/jdk$VER/jre/lib/i386/libnpjp2.so \
+ ${INSTALL_ROOT}/opt/firefox/plugins/libnpjp2.so
+ fi
+
elif [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]; then
if [ -d ${INSTALL_ROOT}/usr/lib/mozilla/plugins ]
then
@@ -29,11 +38,18 @@ elif [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]; then

${INSTALL_ROOT}/usr/lib/mozilla/plugins/libnpjp2.so
fi &&

- if [ -d ${INSTALL_ROOT}/usr/lib/firefox/plugins ]
+ if [ -d ${INSTALL_ROOT}/usr/lib/xulrunner/plugins ]
then
ln -sf
${INSTALL_ROOT}/usr/lib/jdk$VER/jre/lib/amd64/libnpjp2.so \
-
${INSTALL_ROOT}/usr/lib/firefox/plugins/libnpjp2.so
+
${INSTALL_ROOT}/usr/lib/xulrunner/plugins/libnpjp2.so
fi
+
+ if [ -d ${INSTALL_ROOT}/opt/firefox/plugins ]
+ then
+ message "${MESSAGE_COLOR}Installing plugin for
firefox-bin${DEFAULT_COLOR}" &&
+ ln -sf ${INSTALL_ROOT}/usr/lib/jre$VER/lib/amd64/libnpjp2.so
\
+ ${INSTALL_ROOT}/opt/firefox/plugins/libnpjp2.so
+ fi
fi &&

mkdir -p ${INSTALL_ROOT}/etc/profile.d/ &&
diff --git a/z-java/jre6-bin/HISTORY b/z-java/jre6-bin/HISTORY
index 300e006..68e22b7 100644
--- a/z-java/jre6-bin/HISTORY
+++ b/z-java/jre6-bin/HISTORY
@@ -1,3 +1,10 @@
+2009-02-17 Eric Sandall <sandalle AT sourcemage.org>
+ * INSTALL: Add x86_64 support (amd64/libpjp2.so)
+ Do not install plugins to /usr/lib/firefox/plugins as this is just
+ a symlink to /usr/lib/xulrunner/plugins and would have the plugins
+ installed twice and recorded by two different packages
+ Added x86_64 support for firefox-bin (/opt/firefox/plugins)
+
2009-02-08 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated version to 6u12

diff --git a/z-java/jre6-bin/INSTALL b/z-java/jre6-bin/INSTALL
index a3fe891..829de69 100755
--- a/z-java/jre6-bin/INSTALL
+++ b/z-java/jre6-bin/INSTALL
@@ -17,12 +17,6 @@ message "${MESSAGE_COLOR}Determine which browser plugins
to install${DEFAULT_COL

${INSTALL_ROOT}/usr/lib/mozilla/plugins/libjavaplugin_oji.so
fi

- if [ -d ${INSTALL_ROOT}/usr/lib/firefox/plugins ]
- then
- message "${MESSAGE_COLOR}Installing plugin for
firefox${DEFAULT_COLOR}" &&
- ln -sf
${INSTALL_ROOT}/usr/lib/jre$VER/plugin/i386/ns7/libjavaplugin_oji.so \
-
${INSTALL_ROOT}/usr/lib/firefox/plugins/libjavaplugin_oji.so
- fi
if [ -d ${INSTALL_ROOT}/usr/lib/xulrunner/plugins ]
then
message "${MESSAGE_COLOR}Installing plugin for
xulrunner${DEFAULT_COLOR}" &&
@@ -50,6 +44,26 @@ message "${MESSAGE_COLOR}Determine which browser plugins
to install${DEFAULT_COL
ln -sf
${INSTALL_ROOT}/usr/lib/jre$VER/plugin/i386/ns7/libjavaplugin_oji.so \

${INSTALL_ROOT}/usr/lib/opera/plugins/libjavaplugin_oji.so
fi
+elif [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]; then
+ if [ -d ${INSTALL_ROOT}/usr/lib/mozilla/plugins ]
+ then
+ ln -sf ${INSTALL_ROOT}/usr/lib/jre$VER/lib/amd64/libnpjp2.so
\
+ ${INSTALL_ROOT}/usr/lib/mozilla/plugins/libnpjp2.so
+ fi &&
+
+ if [ -d ${INSTALL_ROOT}/usr/lib/xulrunner/plugins ]
+ then
+ message "${MESSAGE_COLOR}Installing plugin for
xulrunner${DEFAULT_COLOR}"
+ ln -sf ${INSTALL_ROOT}/usr/lib/jre$VER/lib/amd64/libnpjp2.so
\
+ ${INSTALL_ROOT}/usr/lib/xulrunner/plugins/libnpjp2.so
+ fi
+
+ if [ -d ${INSTALL_ROOT}/opt/firefox/plugins ]
+ then
+ message "${MESSAGE_COLOR}Installing plugin for
firefox-bin${DEFAULT_COLOR}" &&
+ ln -sf ${INSTALL_ROOT}/usr/lib/jre$VER/lib/amd64/libnpjp2.so
\
+ ${INSTALL_ROOT}/opt/firefox/plugins/libnpjp2.so
+ fi
fi &&

mkdir -p ${INSTALL_ROOT}/etc/profile.d/ &&



  • [SM-Commit] GIT changes to master z-rejected grimoire by Eric Sandall (33c276bccfc4d3c3ae62e884c4c962fffddacda4), Eric Sandall, 02/17/2009

Archive powered by MHonArc 2.6.24.

Top of Page