[Lunar-commits] <moonbase-other> Merge pull request #3 from Ratler/moved-plugins
Auke Kok
sofar+github at foo-projects.org
Tue Jul 10 21:25:01 CEST 2012
commit c69758f57dc04df93cdd115a58b2533c761be66d
Author: Auke Kok <sofar+github at foo-projects.org>
Date: Tue, 10 Jul 2012 12:25:01 -0700
URL: https://github.com/lunar-linux/moonbase-other/commit/c69758f57dc04df93cdd115a58b2533c761be66d
Merge pull request #3 from Ratler/moved-plugins
Updated all modules to have /usr/lib/lunar/plugins as their plugin dir
---
compilers/sun-jdk/BUILD +4/-4
compilers/sun-jdk/DETAILS +5/-4
compilers/sun-jre/BUILD +4/-4
compilers/sun-jre/DETAILS +5/-4
web/chromium/BUILD +2/-2
web/chromium/DETAILS +1/-1
web/firefox/DETAILS +1/-1
web/firefox/POST_INSTALL +1/-1
web/flash-plugin-11/BUILD +1/-6
web/flash-plugin-11/DETAILS +1/-1
web/flash-plugin-11/DETAILS.x86_64 +1/-1
web/opera/BUILD +1/-1
web/opera/DETAILS +1/-1
zbeta/chrome-linux/BUILD +1/-1
zbeta/chrome-linux/DETAILS +3/-2
15 files changed, 0 insertions (+), 0 deletions (-)
--- a/compilers/sun-jdk/BUILD
+++ b/compilers/sun-jdk/BUILD
@@ -33,18 +33,18 @@
fi
done &&
- mkdir -p /opt/lunar/plugins &&
- rm -f /opt/lunar/plugins/{libjavaplugin_oji.so,libnpjp2.so} &&
+ mkdir -p /usr/lib/lunar/plugins &&
+ rm -f /usr/lib/lunar/plugins/{libjavaplugin_oji.so,libnpjp2.so} &&
# Always use new plugin.
# Firefox 3, Seamonkey 2, Google chrome/inium use it
# KDE3/4 Konqueror and Opera always uses Java directly so do not use any plugin
if [ -d /usr/java/latest/jre/lib/amd64 ]; then
ln -sf /usr/java/latest/jre/lib/amd64/server/libjvm.so /usr/lib/
- ln -sf /usr/java/latest/jre/lib/amd64/libnpjp2.so /opt/lunar/plugins/
+ ln -sf /usr/java/latest/jre/lib/amd64/libnpjp2.so /usr/lib/lunar/plugins/
else
ln -sf /usr/java/latest/jre/lib/i386/server/libjvm.so /usr/lib/
- ln -sf /usr/java/latest/jre/lib/i386/libnpjp2.so /opt/lunar/plugins/
+ ln -sf /usr/java/latest/jre/lib/i386/libnpjp2.so /usr/lib/lunar/plugins/
fi &&
cd /usr/java/jdk${DVERSION}/jre/lib/security &&
--- a/compilers/sun-jdk/DETAILS
+++ b/compilers/sun-jdk/DETAILS
@@ -6,11 +6,12 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/jdk$DVERSION
WEB_SITE=http://www.oracle.com/technetwork/java/javase/downloads/index.html
LICENSE="proprietary"
ENTERED=20070210
- UPDATED=20120505
- FUZZY=off
- LDD_CHECK=off
- ARCHIVE=off
+ UPDATED=20120710
SHORT="SUN java runtime environment"
+FUZZY=off
+LDD_CHECK=off
+ARCHIVE=off
+
cat << EOF
sun-jdk is a full features Java SDK including a Java runtime environment.
EOF
--- a/compilers/sun-jre/BUILD
+++ b/compilers/sun-jre/BUILD
@@ -33,18 +33,18 @@
fi
done &&
- mkdir -p /opt/lunar/plugins &&
- rm -f /opt/lunar/plugins/{libjavaplugin_oji.so,libnpjp2.so} &&
+ mkdir -p /usr/lib/lunar/plugins &&
+ rm -f /usr/lib/lunar/plugins/{libjavaplugin_oji.so,libnpjp2.so} &&
# Always use new plugin.
# Firefox 3, Seamonkey 2, Google chrome/inium use it
# KDE3/4 Konqueror and Opera always uses Java directly so do not use any plugin
if [ -d /usr/java/latest/lib/amd64 ]; then
ln -sf /usr/java/latest/lib/amd64/server/libjvm.so /usr/lib/
- ln -sf /usr/java/latest/lib/amd64/libnpjp2.so /opt/lunar/plugins/
+ ln -sf /usr/java/latest/lib/amd64/libnpjp2.so /usr/lib/lunar/plugins/
else
ln -sf /usr/java/latest/lib/i386/server/libjvm.so /usr/lib/
- ln -sf /usr/java/latest/lib/i386/libnpjp2.so /opt/lunar/plugins/
+ ln -sf /usr/java/latest/lib/i386/libnpjp2.so /usr/lib/lunar/plugins/
fi &&
cd /usr/java/jre${DVERSION}/lib/security &&
--- a/compilers/sun-jre/DETAILS
+++ b/compilers/sun-jre/DETAILS
@@ -8,11 +8,12 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/jre$DVERSION
WEB_SITE=http://www.oracle.com/technetwork/java/javase/downloads/index.html
LICENSE="proprietary"
ENTERED=20061113
- UPDATED=20120616
- FUZZY=off
- LDD_CHECK=off
- ARCHIVE=off
+ UPDATED=20120710
SHORT="SUN java runtime environment"
+FUZZY=off
+LDD_CHECK=off
+ARCHIVE=off
+
cat << EOF
sun-jre is only the run time environment, should be sufficient for
most users.
--- a/web/chromium/BUILD
+++ b/web/chromium/BUILD
@@ -90,8 +90,8 @@ EOF
ln -sf /usr/lib/libavutil.so.50 ${CHROMIUM_HOME}/libavutil.so.50
fi &&
- # symlink to lunar location for browser plugins, should be /opt/lunar/plugins
- ln -sf /opt/lunar/plugins ${CHROMIUM_HOME}/plugins &&
+ # symlink to lunar location for browser plugins, should be /usr/lib/lunar/plugins
+ ln -sf /usr/lib/lunar/plugins ${CHROMIUM_HOME}/plugins &&
# icon installation
mkdir -p /usr/share/pixmaps &&
--- a/web/chromium/DETAILS
+++ b/web/chromium/DETAILS
@@ -8,7 +8,7 @@
SOURCE2_VFY=sha1:99a61908c84fca43766c64835f345eff05fee5b1
WEB_SITE=http://www.chromium.org/Home
ENTERED=20100104
- UPDATED=20120524
+ UPDATED=20120710
SHORT="Open-source version of Google Chrome web browser"
cat << EOF
--- a/web/firefox/DETAILS
+++ b/web/firefox/DETAILS
@@ -8,7 +8,7 @@
SOURCE_DIRECTORY=$BUILD_DIRECTORY/mozilla-release
WEB_SITE=http://www.mozilla.org/projects/firefox
ENTERED=20110814
- UPDATED=20120617
+ UPDATED=20120710
SHORT="A speedy, full-featured web browser"
cat << EOF
--- a/web/firefox/POST_INSTALL
+++ b/web/firefox/POST_INSTALL
@@ -24,5 +24,5 @@ rm -rf /usr/share/idl/firefox-[02-9]*
export LD_LIBRARY_PATH="$FIREFOX_HOME/lib/$FFOX_LIBDIR:$FIREFOX_HOME/lib/$FFOX_LIBDIR/plugins:$FIREFOX_HOME/lib/$FFOX_LIBDIR/components"
export MOZILLA_FIVE_HOME="$FIREFOX_HOME/lib/$FFOX_LIBDIR"
# Add plugins
-ln -snf /opt/lunar/plugins "$MOZILLA_FIVE_HOME/plugins"
+ln -snf /usr/lib/lunar/plugins "$MOZILLA_FIVE_HOME/plugins"
ldconfig
--- a/web/flash-plugin-11/BUILD
+++ b/web/flash-plugin-11/BUILD
@@ -1,12 +1,7 @@
(
- # This only applies if you do not have kdelibs4/Qt4 installed.
- if ! module_installed kdelibs ; then
- rm -rf usr/lib* usr/share/kde4
- fi &&
-
prepare_install &&
- install -Dm755 libflashplayer.so /opt/lunar/plugins/libflashplayer.so &&
+ install -Dm755 libflashplayer.so /usr/lib/lunar/plugins/libflashplayer.so &&
install -m755 usr/bin/flash-player-properties /usr/bin &&
install -Dm755 usr/share/pixmaps/flash-player-properties.png /usr/share/pixmaps/flash-player-properties.png &&
install -m755 usr/share/applications/flash-player-properties.desktop /usr/share/applications/ &&
--- a/web/flash-plugin-11/DETAILS
+++ b/web/flash-plugin-11/DETAILS
@@ -5,7 +5,7 @@
SOURCE_VFY=sha1:3f8ecfa1b9990ee4c8d47a83a6a6011283eaaa62
WEB_SITE=http://www.adobe.com/products/flashplayer.html
ENTERED=20110305
- UPDATED=20120609
+ UPDATED=20120710
SHORT="Version 11.2 of the Adobe Flash plugin for web browsers"
cat << EOF
--- a/web/flash-plugin-11/DETAILS.x86_64
+++ b/web/flash-plugin-11/DETAILS.x86_64
@@ -5,7 +5,7 @@
SOURCE_VFY=sha1:94760b74505ed07e8c9089590fb0fb345b23de36
WEB_SITE=http://www.adobe.com/products/flashplayer.html
ENTERED=20110305
- UPDATED=20120609
+ UPDATED=20120710
SHORT="Version 11.2 of the Adobe Flash plugin for web browsers"
cat << EOF
--- a/web/opera/BUILD
+++ b/web/opera/BUILD
@@ -10,7 +10,7 @@
cat >> /usr/share/opera/defaults/pluginpath.ini << EOF
; Lunar plugin directory
-/opt/lunar/plugins=1
+/usr/lib/lunar/plugins=1
EOF
) > $C_FIFO 2>&1
--- a/web/opera/DETAILS
+++ b/web/opera/DETAILS
@@ -10,7 +10,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION-$SUBVERSION.i386.linux
MAINTAINER=ratler at lunar-linux.org
LICENSE="proprietary"
ENTERED=20051002
- UPDATED=20120615
+ UPDATED=20120710
SHORT="The fastest browser on Earth is even faster"
GARBAGE=off
ARCHIVE=off
--- a/zbeta/chrome-linux/BUILD
+++ b/zbeta/chrome-linux/BUILD
@@ -10,7 +10,7 @@
chmod go+x /usr/lib/chrome-linux/{chrome,chrome_sandbox,chrome-wrapper,libffmpegsumo.so,xdg-settings} &&
chmod 4711 /usr/lib/chrome-linux/nacl_helper_bootstrap &&
- ln -sf /opt/lunar/plugins /usr/lib/${MODULE}/plugins &&
+ ln -sf /usr/lib/lunar/plugins /usr/lib/${MODULE}/plugins &&
if [ ! -h /usr/bin/chrome-linux ]; then
ln -snf /usr/lib/chrome-linux/chrome-wrapper /usr/bin/chrome-linux
fi
--- a/zbeta/chrome-linux/DETAILS
+++ b/zbeta/chrome-linux/DETAILS
@@ -5,9 +5,10 @@
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
WEB_SITE=http://build.chromium.org/buildbot/waterfall/console
ENTERED=20100105
- UPDATED=20100225
- ARCHIVE=off
+ UPDATED=20120710
SHORT="Alpha snapshot of Google Chrome web browser, binary"
+ARCHIVE=off
+
cat << EOF
Chromium is an open-source browser project that aims to build a safer, faster,
and more stable way for all users to experience the web.
More information about the Lunar-commits
mailing list