sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master z-rejected grimoire by Remko van der Vossen (f6e7b85cf8e06d3ffc6439aa9bd2da12073bd3fc)
- From: Remko van der Vossen <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master z-rejected grimoire by Remko van der Vossen (f6e7b85cf8e06d3ffc6439aa9bd2da12073bd3fc)
- Date: Sat, 3 Jul 2010 06:37:19 -0500
GIT changes to master z-rejected grimoire by Remko van der Vossen
<wich AT sourcemage.org>:
dev/null |binary
z-http/opera/CONFIGURE | 8 +
z-http/opera/DEPENDS | 32 +++--
z-http/opera/DETAILS | 63
+----------
z-http/opera/HISTORY | 4
z-http/opera/INSTALL | 11 +
z-http/opera/PREPARE | 11 -
z-http/opera/opera-10.11.gcc4-bundled-qt4.i386.tar.bz2.sig | 0
z-http/opera/opera-10.11.gcc4-bundled-qt4.x86_64.tar.bz2.sig | 0
z-http/opera/opera-10.11.gcc4-qt4.i386.tar.bz2.sig | 0
z-http/opera/opera-10.11.gcc4-qt4.x86_64.tar.bz2.sig | 0
z-http/opera/opera-10.11.gcc4-shared-qt3.i386.tar.bz2.sig | 0
z-http/opera/opera-10.11.gcc4-shared-qt3.x86_64.tar.bz2.sig | 0
z-http/opera/opera-10.60-6386.i386.linux.tar.bz2.sig |binary
z-http/opera/opera-10.60-6386.x86_64.linux.tar.bz2.sig |binary
15 files changed, 49 insertions(+), 80 deletions(-)
New commits:
commit f6e7b85cf8e06d3ffc6439aa9bd2da12073bd3fc
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>
opera: version 10.60
diff --git a/z-http/opera/CONFIGURE b/z-http/opera/CONFIGURE
index 49b9e31..775b990 100755
--- a/z-http/opera/CONFIGURE
+++ b/z-http/opera/CONFIGURE
@@ -1,3 +1,9 @@
# Standard rejected warnings.
#
-source $GRIMOIRE/REJECTED_MSG
+source $GRIMOIRE/REJECTED_MSG &&
+
+config_query_list OPERA_TOOLKIT \
+ "What graphics toolkit do you wish to use?" \
+ "none" \
+ "gtk+2" \
+ "kde4"
diff --git a/z-http/opera/DEPENDS b/z-http/opera/DEPENDS
index 41ca448..1c82751 100755
--- a/z-http/opera/DEPENDS
+++ b/z-http/opera/DEPENDS
@@ -1,23 +1,27 @@
+# Main opera binary dependencies
depends libx11 &&
depends libxext &&
-depends libice &&
depends libsm &&
+depends libice &&
+depends libxft &&
+depends freetype2 &&
depends zlib &&
+depends fontconfig &&
+depends libxrender &&
-if [[ "${OPERA_RELEASE}" == "10 qt4, shared" ]]; then
+# Additional plugin wrapper dependencies
+depends libxt &&
+
+# Additional graphical toolkit dependencies
+if [[ $OPERA_TOOLKIT == "gtk+2" ]]; then
+ depends gtk+2 &&
+ depends atk &&
+ depends pango &&
+ depends cairo &&
+ depends glib2
+elif [[ $OPERA_TOOLKIT == "kde4" ]]; then
+ depends kdelibs4 &&
depends qt4
-elif [[ "${OPERA_RELEASE}" == "10 qt4, bundled" ]]; then
- depends glib2 &&
- depends nas &&
- depends libpng &&
- depends libxi &&
- depends libxrender &&
- depends libxrandr &&
- depends freetype2 &&
- depends fontconfig
-elif [[ "${OPERA_RELEASE}" == "10 qt3, shared" ]]; then
- depends qt-x11
fi &&
optional_depends JAVA "" "" "for Java Runtime Environment"
-
diff --git a/z-http/opera/DETAILS b/z-http/opera/DETAILS
index c3ad501..56b00fe 100755
--- a/z-http/opera/DETAILS
+++ b/z-http/opera/DETAILS
@@ -1,68 +1,23 @@
SPELL=opera
-
- VERSION=10.11
- RELEASE=final
- LANGUAGE=en
- COMPILER=gcc4
- COMPRESSION=bz2
- BUILD=4791
-
- if [[ "${OPERA_RELEASE}" = "10 qt4, bundled" ]]; then
-
- QT=bundled-qt4
+ VERSION=10.60
+ BUILD=6386
if [[ ${SMGL_COMPAT_ARCHS[1]} == "x86_64" ]]; then
PLATFORM=x86_64
else
PLATFORM=i386
fi
-
SOURCE=${SPELL}-${VERSION}.${COMPILER}-${QT}.${PLATFORM}.tar.${COMPRESSION}
-
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}-${BUILD}.${COMPILER}-${QT}.${PLATFORM}
- DIST_PATH=${VERSION/./}/${RELEASE}/${LANGUAGE}/${PLATFORM}/${SOURCE}
-
- elif [[ "${OPERA_RELEASE}" = "10 qt3, shared" ]]; then
-
- LINKED=shared
- QT=qt3
- if [[ ${SMGL_COMPAT_ARCHS[1]} == "x86_64" ]]; then
- PLATFORM=x86_64
- else
- PLATFORM=i386
- fi
-
SOURCE=${SPELL}-${VERSION}.${COMPILER}-${LINKED}-${QT}.${PLATFORM}.tar.${COMPRESSION}
-
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}-${BUILD}.${COMPILER}-${LINKED}-${QT}.${PLATFORM}
- if [[ ${SMGL_COMPAT_ARCHS[1]} == "x86_64" ]]; then
- DIST_PATH=${VERSION/./}/${RELEASE}/${LANGUAGE}/${PLATFORM}/${SOURCE}
- else
-
DIST_PATH=${VERSION/./}/${RELEASE}/${LANGUAGE}/${PLATFORM}/${LINKED}/${SOURCE}
- fi
-
- else
-
- QT=qt4
- if [[ ${SMGL_COMPAT_ARCHS[1]} == "x86_64" ]]; then
- PLATFORM=x86_64
- else
- PLATFORM=i386
- fi
-
SOURCE=${SPELL}-${VERSION}.${COMPILER}-${QT}.${PLATFORM}.tar.${COMPRESSION}
-
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}-${BUILD}.${COMPILER}-${QT}.${PLATFORM}
- DIST_PATH=${VERSION/./}/${RELEASE}/${LANGUAGE}/${PLATFORM}/${SOURCE}
-
- fi
-
- SOURCE_URL[0]=ftp://ftp.tiscali.nl/pub/mirror/opera/linux/${DIST_PATH}
- SOURCE_URL[1]=ftp://ftp.scarlet.be/pub/opera/linux/${DIST_PATH}
- SOURCE_URL[2]=ftp://ftp.opera.com/pub/opera/linux/${DIST_PATH}
+ SOURCE=${SPELL}-${VERSION}-${BUILD}.${PLATFORM}.linux.tar.bz2
+
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}-${BUILD}.${PLATFORM}.linux
+
SOURCE_URL[0]=ftp://ftp.tiscali.nl/pub/mirror/opera/linux/${VERSION/./}/$SOURCE
+ SOURCE_URL[1]=ftp://ftp.scarlet.be/pub/opera/linux/${VERSION/./}/$SOURCE
+ SOURCE_URL[2]=ftp://ftp.opera.com/pub/opera/linux/${VERSION/./}/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
LICENCE[0]=UNKNOWN
WEB_SITE=http://www.opera.com/
ENTERED=20020530
REJECT="is non-source"
- SHORT="Opera is a small quick qt based browser"
+ SHORT="Opera is a fast full featured web browser."
cat << EOF
Opera is a fast full featured web browser. It supports plugins and is
-very customizable. It now uses the qt4 widget set.
-
-The shared version is now included here because the current grimoire
-uses qt4.
+very customizable.
EOF
diff --git a/z-http/opera/HISTORY b/z-http/opera/HISTORY
index ddc6e22..11b0906 100644
--- a/z-http/opera/HISTORY
+++ b/z-http/opera/HISTORY
@@ -1,3 +1,7 @@
+2010-07-03 Remko van der Vossen <wich AT sourcemage.org>
+ * DETAILS: version 10.60
+ * CONFIGURE, DEPENDS, INSTALL, PREPARE: updated for new release method
+
2010-06-23 Remko van der Vossen <wich AT sourcemage.org>
* DETAILS: version 10.11
diff --git a/z-http/opera/INSTALL b/z-http/opera/INSTALL
index de7506b..f67470c 100755
--- a/z-http/opera/INSTALL
+++ b/z-http/opera/INSTALL
@@ -1,4 +1,9 @@
cd $SOURCE_DIRECTORY &&
-echo y | ./install.sh -s &&
-ln -sf $TRACK_ROOT/usr/lib/libXm.so.2 /usr/lib/opera/plugins/libXm.so.1 &&
-ln -sf $TRACK_ROOT/usr/lib/libXm.so.2 /usr/lib/opera/plugins/libXm.so.3
+sed -i -e "s,/usr/local,$INSTALL_ROOT/usr," install &&
+./install --system --unattended &&
+if [[ $OPERA_TOOLKIT != "gtk+2" ]]; then
+ rm -f $INSTALL_ROOT/usr/lib/opera/liboperagtk.so
+fi &&
+if [[ $OPERA_TOOLKIT != "kde4" ]]; then
+ rm -f $INSTALL_ROOT/usr/lib/opera/liboperakde4.so
+fi
diff --git a/z-http/opera/PREPARE b/z-http/opera/PREPARE
index b905930..94640d6 100755
--- a/z-http/opera/PREPARE
+++ b/z-http/opera/PREPARE
@@ -1,12 +1,7 @@
persistent_load &&
-if [[ ${SMGL_COMPAT_ARCHS[1]} == "x86_64"
- || ${SMGL_COMPAT_ARCHS[1]} == "ia32" ]]; then
- if [[ ${OPERA_RELEASE:0:1} == "8"
- || ${OPERA_RELEASE:0:1} == "9" ]]; then
- persistent_remove OPERA_RELEASE
- fi
- config_query_list OPERA_RELEASE "Which release would you like to cast?"
"10 qt4, shared" "10 qt4, bundled" "10 qt3, shared"
-else
+persistent_remove OPERA_RELEASE &&
+if [[ ${SMGL_COMPAT_ARCHS[1]} != "x86_64"
+ && ${SMGL_COMPAT_ARCHS[1]} != "ia32" ]]; then
message "${PROBLEM_COLOR}Opera is not available for platform
${SMGL_COMPAT_ARCHS[1]}${DEFAUL_COLOR}"
false
fi
diff --git a/z-http/opera/opera-10.11.gcc4-bundled-qt4.i386.tar.bz2.sig
b/z-http/opera/opera-10.11.gcc4-bundled-qt4.i386.tar.bz2.sig
deleted file mode 100644
index 1a1e010..0000000
Binary files a/z-http/opera/opera-10.11.gcc4-bundled-qt4.i386.tar.bz2.sig and
/dev/null differ
diff --git a/z-http/opera/opera-10.11.gcc4-bundled-qt4.x86_64.tar.bz2.sig
b/z-http/opera/opera-10.11.gcc4-bundled-qt4.x86_64.tar.bz2.sig
deleted file mode 100644
index 1f536a2..0000000
Binary files a/z-http/opera/opera-10.11.gcc4-bundled-qt4.x86_64.tar.bz2.sig
and /dev/null differ
diff --git a/z-http/opera/opera-10.11.gcc4-qt4.i386.tar.bz2.sig
b/z-http/opera/opera-10.11.gcc4-qt4.i386.tar.bz2.sig
deleted file mode 100644
index bc797c9..0000000
Binary files a/z-http/opera/opera-10.11.gcc4-qt4.i386.tar.bz2.sig and
/dev/null differ
diff --git a/z-http/opera/opera-10.11.gcc4-qt4.x86_64.tar.bz2.sig
b/z-http/opera/opera-10.11.gcc4-qt4.x86_64.tar.bz2.sig
deleted file mode 100644
index dd16f45..0000000
Binary files a/z-http/opera/opera-10.11.gcc4-qt4.x86_64.tar.bz2.sig and
/dev/null differ
diff --git a/z-http/opera/opera-10.11.gcc4-shared-qt3.i386.tar.bz2.sig
b/z-http/opera/opera-10.11.gcc4-shared-qt3.i386.tar.bz2.sig
deleted file mode 100644
index ab2235a..0000000
Binary files a/z-http/opera/opera-10.11.gcc4-shared-qt3.i386.tar.bz2.sig and
/dev/null differ
diff --git a/z-http/opera/opera-10.11.gcc4-shared-qt3.x86_64.tar.bz2.sig
b/z-http/opera/opera-10.11.gcc4-shared-qt3.x86_64.tar.bz2.sig
deleted file mode 100644
index 40b2059..0000000
Binary files a/z-http/opera/opera-10.11.gcc4-shared-qt3.x86_64.tar.bz2.sig
and /dev/null differ
diff --git a/z-http/opera/opera-10.60-6386.i386.linux.tar.bz2.sig
b/z-http/opera/opera-10.60-6386.i386.linux.tar.bz2.sig
new file mode 100644
index 0000000..88e713f
Binary files /dev/null and
b/z-http/opera/opera-10.60-6386.i386.linux.tar.bz2.sig differ
diff --git a/z-http/opera/opera-10.60-6386.x86_64.linux.tar.bz2.sig
b/z-http/opera/opera-10.60-6386.x86_64.linux.tar.bz2.sig
new file mode 100644
index 0000000..4cb7faa
Binary files /dev/null and
b/z-http/opera/opera-10.60-6386.x86_64.linux.tar.bz2.sig differ
- [SM-Commit] GIT changes to master z-rejected grimoire by Remko van der Vossen (f6e7b85cf8e06d3ffc6439aa9bd2da12073bd3fc), Remko van der Vossen, 07/03/2010
Archive powered by MHonArc 2.6.24.