From 08b1847488788d59da36133dd6880a68b6fa70c2 Mon Sep 17 00:00:00 2001 From: mezz Date: Fri, 14 May 2004 03:51:21 +0000 Subject: - Update to 7.5. Changelog: http://www.opera.com/linux/changelogs/750/ - Use DOCSDIR. - Rename everything from opera to linux-opera, no longer in conflict with www/opera. - Handle the dependenies better for linux_base(8). - Handle the better check if GNOME and KDE exist. - Now, it will auto find flash plug-in by automatic without have to copy in plugins directory by manual. Finally got it works, really! Approved by: adamw (mentor) --- www/linux-opera/Makefile | 79 +++--- www/linux-opera/distinfo | 4 +- www/linux-opera/files/patch-config::opera6rc | 9 + www/linux-opera/files/patch-ini::pluginpath.ini | 49 ++++ www/linux-opera/files/patch-ini::spellcheck.ini | 9 + www/linux-opera/files/patch-install.sh | 340 ++++++++++++++++-------- www/linux-opera/pkg-message | 15 +- www/linux-opera/pkg-plist | 280 +++++++++---------- 8 files changed, 492 insertions(+), 293 deletions(-) create mode 100644 www/linux-opera/files/patch-config::opera6rc create mode 100644 www/linux-opera/files/patch-ini::pluginpath.ini create mode 100644 www/linux-opera/files/patch-ini::spellcheck.ini (limited to 'www/linux-opera') diff --git a/www/linux-opera/Makefile b/www/linux-opera/Makefile index ffdc3bb..a9b7125 100644 --- a/www/linux-opera/Makefile +++ b/www/linux-opera/Makefile @@ -6,37 +6,27 @@ # PORTNAME= opera -PORTVERSION= 7.23.20031119 +PORTVERSION= 7.50.20040511 CATEGORIES= www linux -MASTER_SITES= ftp://ftp.sunet.se/pub/www/clients/Opera/linux/723/final/en/i386/static/ \ - ftp://sunsite.cnlab-switch.ch/mirror/opera/linux/723/final/en/i386/static/ \ - ftp://ftp.tiscali.nl/pub/mirrors/opera/linux/723/final/en/i386/static/ \ - ftp://ftp.ntua.gr/pub/www/Opera/linux/723/final/en/i386/static/ \ - http://mirrors.pmmf.hu/mirror/opera/linux/723/final/en/i386/static/ \ - ftp://ftp.task.gda.pl/pub/opera/linux/723/final/en/i386/static/ \ - ftp://ftp.planetmirror.com/pub/opera/linux/723/final/en/i386/static/ \ - http://gd.tuwien.ac.at/infosys/browsers/opera/linux/723/final/en/i386/static/ \ - ftp://ftp.opera.com/pub/opera/linux/723/final/en/i386/static/ +MASTER_SITES= ftp://ftp.opera.com/pub/opera/linux/750/final/en/i386/static/ \ + ftp://ftp.sunet.se/pub/www/clients/Opera/linux/750/final/en/i386/static/ \ + ftp://sunsite.cnlab-switch.ch/mirror/opera/linux/750/final/en/i386/static/ \ + ftp://ftp.tiscali.nl/pub/mirrors/opera/linux/750/final/en/i386/static/ \ + ftp://ftp.ntua.gr/pub/www/Opera/linux/750/final/en/i386/static/ \ + http://mirrors.pmmf.hu/mirror/opera/linux/750/final/en/i386/static/ \ + ftp://ftp.task.gda.pl/pub/opera/linux/750/final/en/i386/static/ \ + ftp://ftp.planetmirror.com/pub/opera/linux/750/final/en/i386/static/ \ + http://gd.tuwien.ac.at/infosys/browsers/opera/linux/750/final/en/i386/static/ PKGNAMEPREFIX= linux- -DISTNAME= ${PORTNAME}-${PORTVERSION:S/.2003/-2003/}.1-static-qt.i386-en +DISTNAME= ${PORTNAME}-${PORTVERSION:S/.2004/-2004/}.1-static-qt.i386-en MAINTAINER= mezz@FreeBSD.org COMMENT= A blazingly fast, full-featured, standards-compliant browser -CONFLICTS= opera-* RESTRICTED= "not redistributable; commercial software" -.if defined(WITH_XFT2) -RUN_DEPENDS+= ${LINUXBASE}/usr/X11R6/lib/libXrandr.so.2:${PORTSDIR}/x11/linux-XFree86-libs \ - ${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux-fontconfig \ - ${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat -.else -USE_LINUX= yes -.endif - -RUN_DEPENDS+= ${LINUXBASE}/usr/X11R6/lib/libXm.so.2:${PORTSDIR}/x11-toolkits/linux-openmotif - USE_BZIP2= yes +WANT_GNOME= yes USE_X_PREFIX= yes USE_REINPLACE= yes ONLY_FOR_ARCHS= i386 @@ -44,52 +34,55 @@ ONLY_FOR_ARCHS= i386 NO_BUILD= yes NO_FILTER_SHLIBS=yes +DATADIR= ${PREFIX}/share/${UNIQUENAME} +DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME} + .include -.if exists(/etc/X11/applnk) -PLIST_SUB+= APPLNK:="" +.if exists(${LINUXBASE}/lib/libc-2.3.2.so) || defined(WITH_LINUX8) +RUN_DEPENDS+= ${LINUXBASE}/usr/X11R6/lib/libXrandr.so.2:${PORTSDIR}/x11/linux-XFree86-libs \ + ${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux-fontconfig \ + ${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat \ + ${LINUXBASE}/usr/lib/libaspell.so.15:${PORTSDIR}/textproc/linux-aspell \ + ${LINUXBASE}/usr/X11R6/lib/libXm.so.2.1:${PORTSDIR}/x11-toolkits/linux-openmotif +WITH_LINUX8= yes .else -PLIST_SUB+= APPLNK:="@comment " +RUN_DEPENDS+= ${LINUXBASE}/usr/X11R6/lib/libXm.so.2.1:${PORTSDIR}/x11-toolkits/linux-openmotif +USE_LINUX= yes .endif -.if exists(${X11BASE}/share/gnome) +.if ${HAVE_GNOME:Mgnomehier}!="" PLIST_SUB+= GNOME:="" .else PLIST_SUB+= GNOME:="@comment " .endif -.if exists(${LOCALBASE}/share/applnk/Internet) +.if exists(${LOCALBASE}/bin/kde-config) PLIST_SUB+= KDE:="" .else PLIST_SUB+= KDE:="@comment " .endif -.if exists(${LOCALBASE}/share/applnk/Networking) -PLIST_SUB+= KDE2:="" -.else -PLIST_SUB+= KDE2:="@comment " -.endif - -.if exists(${X11BASE}/share/gnome/apps) -PLIST_SUB+= GNOMELNK:="" -.else -PLIST_SUB+= GNOMELNK:="@comment " -.endif - pre-everything:: -.if !defined(WITH_XFT2) +.if !defined(WITH_LINUX8) @${ECHO_MSG} "You may specify the following on the command line:" @${ECHO_MSG} " " - @${ECHO_MSG} "WITH_XFT2=yes for use Xft2 (requires linux_base-8) with nicer anti-aliased fonts." + @${ECHO_MSG} "WITH_LINUX8=yes to use Xft2 and enable spell checker (requires linux_base-8)." .endif post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \ s|%%LOCALBASE%%|${LOCALBASE}|g ; s|%%X11BASE%%|${X11BASE}|g' \ - ${WRKSRC}/install.sh + ${WRKSRC}/install.sh ${WRKSRC}/ini/pluginpath.ini \ + ${WRKSRC}/ini/spellcheck.ini ${WRKSRC}/config/opera6rc do-install: - (cd ${WRKSRC} && ./install.sh --prefix=${PREFIX}) + @(cd ${WRKSRC} && ./install.sh \ + --prefix=${PREFIX} \ + --docdir=${DOCSDIR} \ + --sharedir=${DATADIR} \ + --exec_prefix=${DATADIR}/bin \ + --plugindir=${DATADIR}/plugins) post-install: @${CAT} ${PKGMESSAGE} diff --git a/www/linux-opera/distinfo b/www/linux-opera/distinfo index 03740cc..0187dac 100644 --- a/www/linux-opera/distinfo +++ b/www/linux-opera/distinfo @@ -1,2 +1,2 @@ -MD5 (opera-7.23-20031119.1-static-qt.i386-en.tar.bz2) = f3d22181a3016896b9bcc2c71afb28f7 -SIZE (opera-7.23-20031119.1-static-qt.i386-en.tar.bz2) = 4800860 +MD5 (opera-7.50-20040511.1-static-qt.i386-en.tar.bz2) = d08711644a4b4f84f1e6afca8fd16cc5 +SIZE (opera-7.50-20040511.1-static-qt.i386-en.tar.bz2) = 4849047 diff --git a/www/linux-opera/files/patch-config::opera6rc b/www/linux-opera/files/patch-config::opera6rc new file mode 100644 index 0000000..127fed6 --- /dev/null +++ b/www/linux-opera/files/patch-config::opera6rc @@ -0,0 +1,9 @@ +--- config/opera6rc.orig Thu May 13 13:57:43 2004 ++++ config/opera6rc Thu May 13 13:58:16 2004 +@@ -1,5 +1,5 @@ + ; Put any default settings here that are overridable by users + + [User Prefs] +-Language Files Directory=/usr/share/opera/locale/ ++Language Files Directory=%%PREFIX%%/share/linux-opera/locale/ + diff --git a/www/linux-opera/files/patch-ini::pluginpath.ini b/www/linux-opera/files/patch-ini::pluginpath.ini new file mode 100644 index 0000000..0b95b6c --- /dev/null +++ b/www/linux-opera/files/patch-ini::pluginpath.ini @@ -0,0 +1,49 @@ +--- ini/pluginpath.ini.orig Thu May 13 13:50:17 2004 ++++ ini/pluginpath.ini Thu May 13 13:50:25 2004 +@@ -1,31 +1,15 @@ +-Opera Preferences version 2.0 +-; Do not edit this file while Opera is running +-; This file is stored in UTF-8 encoding +- +-[Paths] +-$HOME/.opera/plugins=1 +-/usr/lib/opera/plugins=1 +-/usr/lib/opera/plugins=1 +-/usr/local/lib/opera/plugins=1 +-/opt/lib/opera/plugins=1 +- +-/usr/local/Acrobat5/Browsers/intellinux=1 +-/usr/local/Acrobat4/Browsers/intellinux=1 +-/usr/lib/Acrobat5/Browsers/intellinux=1 +-/usr/lib/Acrobat4/Browsers/intellinux=1 +-/usr/X11R6/lib/Acrobat5/Browsers/intellinux=1 +-/usr/X11R6/lib/Acrobat4/Browsers/intellinux=1 +-/opt/Acrobat5/Browsers/intellinux=1 +-/opt/Acrobat4/Browsers/intellinux=1 +-/usr/Acrobat5/Browsers/intellinux=1 +-/usr/Acrobat4/Browsers/intellinux=1 +- +-/usr/lib/RealPlayer8/Plugins=1 +-/usr/lib/realplay/plugins=1 +-/usr/lib/RealPlayer8=1 +-/usr/lib/realplay=1 +-$HOME/.netscape/plugins=1 +-/opt/netscape/plugins=1 +-/usr/lib/netscape/plugins=1 +-/usr/local/netscape/plugins=1 +-/usr/local/lib/netscape/plugins=1 ++Opera Preferences version 2.0 ++; Do not edit this file while Opera is running ++; This file is stored in UTF-8 encoding ++ ++[Paths] ++$HOME/.linux-opera/plugins=1 ++%%PREFIX%%/share/linux-opera/plugins=1 ++ ++%%LOCALBASE%%/lib/linux-flashplugin6=1 ++%%LOCALBASE%%/Acrobat5/Browsers/intellinux=1 ++%%LOCALBASE%%/Acrobat4/Browsers/intellinux=1 ++ ++%%LOCALBASE%%/lib/RealPlayer8/Plugins=1 ++$HOME/.netscape/plugins=1 ++%%LOCALBASE%%/lib/netscape-linux/plugins=1 diff --git a/www/linux-opera/files/patch-ini::spellcheck.ini b/www/linux-opera/files/patch-ini::spellcheck.ini new file mode 100644 index 0000000..d9cc18a --- /dev/null +++ b/www/linux-opera/files/patch-ini::spellcheck.ini @@ -0,0 +1,9 @@ +--- ini/spellcheck.ini.orig Thu May 13 13:51:43 2004 ++++ ini/spellcheck.ini Thu May 13 13:52:00 2004 +@@ -3,5 +3,6 @@ + ; This file is stored in UTF-8 encoding + + [Spell Check] ++Spell Check Engine=%%PREFIX%%/share/linux-opera/bin/spellcheck.so + Default Language=en + Default Encoding=iso8859-1 diff --git a/www/linux-opera/files/patch-install.sh b/www/linux-opera/files/patch-install.sh index c35b02c..b86b6a3 100644 --- a/www/linux-opera/files/patch-install.sh +++ b/www/linux-opera/files/patch-install.sh @@ -1,31 +1,26 @@ ---- install.sh.orig Mon Oct 13 17:19:39 2003 -+++ install.sh Mon Oct 13 17:26:37 2003 -@@ -180,7 +180,7 @@ - echo ' --help=long show advanced functions' - echo - echo 'If you choose to do a standard locations install, files will be put into' -- echo '/usr/bin, /usr/share/doc/opera and /usr/share/opera.' -+ echo '/usr/bin, %%PREFIX%%/share/doc/opera and %%PREFIX%%/share/opera.' - echo - echo 'However, if you choose to install to user defined locations, you must either' - echo ' specify one directory (all files will be put in this directory), or' -@@ -760,23 +760,18 @@ - - wrapper_opera_plugin_paths=" \"\${HOME}/.opera/plugins\" \\ - ${str_localdirplugin} \\ +--- install.sh.orig Thu May 13 12:53:51 2004 ++++ install.sh Thu May 13 13:43:32 2004 +@@ -758,25 +758,20 @@ + + debug_msg 0 "in generate_wrapper()" + +- wrapper_opera_plugin_paths=" \"\${HOME}/.opera/plugins\" \\ +- ${str_localdirplugin} \\ - /usr/lib/opera/plugins \\ - /usr/local/lib/opera/plugins \\ - /opt/lib/opera/plugins \\" -+ %%LOCALBASE%%/share/opera/plugins \\" ++ wrapper_opera_plugin_paths=" \"\${HOME}/.linux-opera/plugins\" \\ ++ ${str_localdirplugin} \\" case "${machine}:${os}" in - i[3456]86:Linux|i[3456]86:FreeBSD|i[3456]86:NetBSD|i[3456]86:OpenBSD) + i[3456]86:Linux|x86_64:Linux|i[3456]86:FreeBSD|i[3456]86:NetBSD|i[3456]86:OpenBSD) wrapper_plugin_paths=" - /usr/local/Acrobat[45]/Browsers/intellinux \\ - /usr/lib/Acrobat[45]/Browsers/intellinux \\ - /usr/X11R6/lib/Acrobat[45]/Browsers/intellinux \\ - /opt/Acrobat[45]/Browsers/intellinux \\ - /usr/Acrobat[45]/Browsers/intellinux \\" ++ %%LOCALBASE%%/lib/linux-flashplugin6 \\ + %%LOCALBASE%%/Acrobat4/Browsers/intellinux \\ + %%LOCALBASE%%/Acrobat5/Browsers/intellinux \\" @@ -39,7 +34,7 @@ wrapper_sunjava_machine="i386" ;; -@@ -817,15 +812,9 @@ +@@ -817,17 +812,11 @@ ;; esac wrapper_netscape_plugin_paths=" @@ -55,9 +50,28 @@ - /usr/local/lib/netscape/plugins \\" + %%LOCALBASE%%/lib/netscape-linux/plugins \\" - wrapper_file="${wrapper_dir}/opera" +- wrapper_file="${wrapper_dir}/opera" ++ wrapper_file="${wrapper_dir}/linux-opera" -@@ -887,39 +876,14 @@ + wrapper_contain="#!/bin/sh + +@@ -871,9 +860,13 @@ + OPERA_LD_PRELOAD=\"\${LD_PRELOAD}\" + export OPERA_LD_PRELOAD + ++# ~/.linux-opera ++OPERA_PERSONALDIR=\${HOME}/.linux-opera ++export OPERA_PERSONALDIR ++ + # Native Java enviroment +-if test -f \"\${HOME}/.opera/javapath.txt\"; then +- INIJAVA=\`cat \${HOME}/.opera/javapath.txt\` ++if test -f \"\${HOME}/.linux-opera/javapath.txt\"; then ++ INIJAVA=\`cat \${HOME}/.linux-opera/javapath.txt\` + if test -f \"\${INIJAVA}/libjava.so\"; then OPERA_JAVA_DIR=\"\${INIJAVA}\"; fi + fi + +@@ -887,39 +880,16 @@ if test ! \"\${OPERA_JAVA_DIR}\"; then @@ -97,13 +111,15 @@ - jre \\ + linux-blackdown-jdk1.3.1/jre \\ + linux-blackdown-jdk1.4.1/jre \\ ++ linux-blackdown-jdk1.4.2/jre \\ + linux-sun-jdk1.3.1/jre \\ + linux-sun-jdk1.4.1/jre \\ + linux-sun-jdk1.4.2/jre \\ ++ linux-sun-jdk1.5.0/jre \\ ; do for PREFIX in \${PREFIXES}; do if test -f \"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}/libjava.so\"; then OPERA_JAVA_DIR=\"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}\" && break; fi -@@ -983,11 +947,8 @@ +@@ -983,11 +953,8 @@ # Acrobat Reader for BINDIR in \\ @@ -117,7 +133,34 @@ ; do if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi done -@@ -1246,8 +1207,9 @@ +@@ -1086,7 +1053,7 @@ + chop "${OPERADESTDIR}" "str_localdirshare" + chop "${OPERADESTDIR}" "str_localdirplugin" + +- backup ${wrapper_dir}/opera opera ++ #backup ${wrapper_dir}/opera opera + + # Executable + debug_msg 1 "Executable" +@@ -1121,7 +1088,7 @@ + + #cp $cpv $cpf wrapper.sh $wrapper_dir/opera + generate_wrapper +- chmod $chmodv 755 $wrapper_dir/opera ++ chmod $chmodv 755 $wrapper_dir/linux-opera + + # Documentation + debug_msg 1 "Documentation" +@@ -1155,7 +1122,7 @@ + if test -d ini; then + mkdir $mkdirv $mkdirp $share_dir/ini/ + chmod $chmodv 755 $share_dir/ini +- cp $cpv $cpf $cpR ini/* $share_dir/ini/ ++ cp $cpv $cpf $cpR ini/*.ini $share_dir/ini/ + if test -f $share_dir/ini/pluginpath.ini; then + echo ${str_localdirplugin} >> $share_dir/ini/pluginpath.ini + fi +@@ -1255,8 +1222,9 @@ if test -z "${OPERADESTDIR}"; then # System wide configuration files @@ -128,7 +171,7 @@ echo echo "System wide configuration files:" echo " $config_dir/opera6rc" -@@ -1259,6 +1221,7 @@ +@@ -1268,6 +1236,7 @@ cp $cpv $cpf config/opera6rc $config_dir cp $cpv $cpf config/opera6rc.fixed $config_dir fi @@ -136,7 +179,38 @@ else echo echo "User \"${USERNAME}\" does not have write access to $config_dir" -@@ -1358,22 +1321,22 @@ +@@ -1281,9 +1250,9 @@ + icons + gnome + kde 3 +- kde 2 +- kde1 +- mandrake ++# kde 2 ++# kde1 ++# mandrake + + fi # OPERADESTDIR + +@@ -1328,13 +1297,13 @@ + { + # arg1 = location + +- desktop_file="${1}/opera.desktop" ++ desktop_file="${1}/linux-opera.desktop" + + desktop_contain='[Desktop Entry] +-Name=Opera ++Name=Opera (linux version) + Comment=Web Browser +-Exec=opera +-Icon=opera.xpm ++Exec=linux-opera ++Icon=linux-opera.xpm + Terminal=0 + Type=Application' + +@@ -1367,42 +1336,13 @@ debug_msg 0 "in icons()" @@ -145,138 +219,192 @@ - mkdir $mkdirv $mkdirp /usr/share/icons/ - chmod $chmodv 755 /usr/share/icons - cp $cpv $share_dir/images/opera.xpm /usr/share/icons/opera.xpm -+ if test ! -d %%X11BASE%%/share/icons; then -+ if test -w %%X11BASE%%/share; then -+ mkdir $mkdirv $mkdirp %%X11BASE%%/share/icons/ -+ chmod $chmodv 755 %%X11BASE%%/share/icons -+ cp $cpv $share_dir/images/opera.xpm %%X11BASE%%/share/icons/opera.xpm - fi +- fi - elif test -w /usr/share/icons; then cp $cpv $share_dir/images/opera.xpm /usr/share/icons/opera.xpm -+ elif test -w %%X11BASE%%/share/icons; then cp $cpv $share_dir/images/opera.xpm %%X11BASE%%/share/icons/opera.xpm - fi - +- fi +- - if test ! -d /usr/share/pixmaps; then - if test -w /usr/share; then - mkdir $mkdirv $mkdirp /usr/share/pixmaps/ - chmod $chmodv 755 /usr/share/pixmaps - cp $cpv $share_dir/images/opera.xpm /usr/share/pixmaps/opera.xpm +- fi +- elif test -w /usr/share/pixmaps/; then cp $cpv $share_dir/images/opera.xpm /usr/share/pixmaps/opera.xpm +- fi +- +- if test ! -d /etc/X11/wmconfig/; then +- if test -w /etc/X11; then +- mkdir $mkdirv $mkdirp /etc/X11/wmconfig/ +- chmod $chmodv 755 /etc/X11/wmconfig +- generate_wmconfig /etc/X11/wmconfig +- fi +- elif test -w /etc/X11/wmconfig/; then generate_wmconfig /etc/X11/wmconfig +- fi +- +- if test -d /etc/X11/applnk/; then +- if test ! -d /etc/X11/applnk/Internet/; then +- if test -w /etc/X11/applnk; then +- mkdir $mkdirv $mkdirp /etc/X11/applnk/Internet/ +- chmod $chmodv 755 /etc/X11/applnk/Internet +- generate_desktop /etc/X11/applnk/Internet +- fi +- elif test -w /etc/X11/applnk/Internet; then generate_desktop /etc/X11/applnk/Internet + if test ! -d %%X11BASE%%/share/pixmaps; then + if test -w %%X11BASE%%/share; then + mkdir $mkdirv $mkdirp %%X11BASE%%/share/pixmaps/ + chmod $chmodv 755 %%X11BASE%%/share/pixmaps -+ cp $cpv $share_dir/images/opera.xpm %%X11BASE%%/share/pixmaps/opera.xpm ++ cp $cpv $share_dir/images/opera.xpm %%X11BASE%%/share/pixmaps/linux-opera.xpm fi -- elif test -w /usr/share/pixmaps/; then cp $cpv $share_dir/images/opera.xpm /usr/share/pixmaps/opera.xpm -+ elif test -w %%X11BASE%%/share/pixmaps/; then cp $cpv $share_dir/images/opera.xpm %%X11BASE%%/share/pixmaps/opera.xpm ++ elif test -w %%X11BASE%%/share/pixmaps/; then cp $cpv $share_dir/images/opera.xpm %%X11BASE%%/share/pixmaps/linux-opera.xpm fi - - if test ! -d /etc/X11/wmconfig/; then -@@ -1439,36 +1402,36 @@ - fi - # end /opt/gnome share + } -- elif test -d /usr/share/gnome/; then -+ elif test -d %%X11BASE%%/share/gnome/; then +@@ -1412,72 +1352,36 @@ -- # /usr/share/gnome icon -- if test ! -d /usr/share/gnome/pixmaps/; then -- if test -w /usr/share/gnome; then -- mkdir $mkdirv $mkdirp /usr/share/gnome/pixmaps/ -- chmod $chmodv 755 /usr/share/gnome/pixmaps -- cp $cpv $share_dir/images/opera.xpm /usr/share/gnome/pixmaps/opera.xpm + debug_msg 1 "in gnome()" + +- if test -d /opt/gnome/; then ++ if test -d %%X11BASE%%/share/gnome/; then + +- # /opt/gnome share +- if test -d /opt/gnome/share; then +- +- # /opt/gnome icon +- if test ! -d /opt/gnome/share/pixmaps/; then +- if test -w /opt/gnome/share; then +- mkdir $mkdirv $mkdirp /opt/gnome/share/pixmaps/ +- chmod $chmodv 755 /opt/gnome/share/pixmaps +- cp $cpv $share_dir/images/opera.xpm /opt/gnome/share/pixmaps/opera.xpm + # %%X11BASE%%/share/gnome icon + if test ! -d %%X11BASE%%/share/gnome/pixmaps/; then + if test -w %%X11BASE%%/share/gnome; then + mkdir $mkdirv $mkdirp %%X11BASE%%/share/gnome/pixmaps/ + chmod $chmodv 755 %%X11BASE%%/share/gnome/pixmaps -+ cp $cpv $share_dir/images/opera.xpm %%X11BASE%%/share/gnome/pixmaps/opera.xpm ++ cp $cpv $share_dir/images/opera.xpm %%X11BASE%%/share/gnome/pixmaps/linux-opera.xpm fi -- elif test -w /usr/share/gnome/pixmaps; then cp $cpv $share_dir/images/opera.xpm /usr/share/gnome/pixmaps/opera.xpm -+ elif test -w %%X11BASE%%/share/gnome/pixmaps; then cp $cpv $share_dir/images/opera.xpm %%X11BASE%%/share/gnome/pixmaps/opera.xpm +- elif test -w /opt/gnome/share/pixmaps; then cp $cpv $share_dir/images/opera.xpm /opt/gnome/share/pixmaps/opera.xpm ++ elif test -w %%X11BASE%%/share/gnome/pixmaps; then cp $cpv $share_dir/images/opera.xpm %%X11BASE%%/share/gnome/pixmaps/linux-opera.xpm fi -- # end /usr/share/gnome icon +- # end /opt/gnome icon + # end %%X11BASE%%/share/gnome icon -- # /usr/share/gnome link -- if test -d /usr/share/gnome/apps/; then -- if test -d /usr/share/gnome/apps/Internet/; then -- if test -w /usr/share/gnome/apps/Internet; then -- generate_desktop /usr/share/gnome/apps/Internet +- # /opt/gnome link +- if test -d /opt/gnome/share/gnome/apps/; then +- if test -d /opt/gnome/share/gnome/apps/Internet/; then +- if test -w /opt/gnome/share/gnome/apps/Internet; then +- generate_desktop /opt/gnome/share/gnome/apps/Internet + # %%X11BASE%%/share/gnome link + if test -d %%X11BASE%%/share/gnome/apps/; then + if test -d %%X11BASE%%/share/gnome/apps/Internet/; then + if test -w %%X11BASE%%/share/gnome/apps/Internet; then + generate_desktop %%X11BASE%%/share/gnome/apps/Internet fi -- elif test -d /usr/share/gnome/apps/Networking/WWW/; then -- if test -w /usr/share/gnome/apps/Networking/WWW; then -- generate_desktop /usr/share/gnome/apps/Networking/WWW +- elif test -d /opt/gnome/share/gnome/apps/Networking/WWW/; then +- if test -w /opt/gnome/share/gnome/apps/Networking/WWW; then +- generate_desktop /opt/gnome/share/gnome/apps/Networking/WWW + elif test -d %%X11BASE%%/share/gnome/apps/Networking/WWW/; then + if test -w %%X11BASE%%/share/gnome/apps/Networking/WWW; then + generate_desktop %%X11BASE%%/share/gnome/apps/Networking/WWW fi -- elif test -w /usr/share/gnome/apps; then -- mkdir $mkdirv $mkdirp /usr/share/gnome/apps/Internet/ -- chmod $chmodv 755 /usr/share/gnome/apps/Internet -- generate_desktop /usr/share/gnome/apps/Internet +- elif test -w /opt/gnome/share/gnome/apps; then +- mkdir $mkdirv $mkdirp /opt/gnome/share/gnome/apps/Internet/ +- chmod $chmodv 755 /opt/gnome/share/gnome/apps/Internet +- generate_desktop /opt/gnome/share/gnome/apps/Internet + elif test -w %%X11BASE%%/share/gnome/apps; then + mkdir $mkdirv $mkdirp %%X11BASE%%/share/gnome/apps/Internet/ + chmod $chmodv 755 %%X11BASE%%/share/gnome/apps/Internet + generate_desktop %%X11BASE%%/share/gnome/apps/Internet fi fi +- # end /opt/gnome link +- fi +- # end /opt/gnome share +- +- elif test -d /usr/share/gnome/; then +- +- # /usr/share/gnome icon +- if test ! -d /usr/share/gnome/pixmaps/; then +- if test -w /usr/share/gnome; then +- mkdir $mkdirv $mkdirp /usr/share/gnome/pixmaps/ +- chmod $chmodv 755 /usr/share/gnome/pixmaps +- cp $cpv $share_dir/images/opera.xpm /usr/share/gnome/pixmaps/opera.xpm +- fi +- elif test -w /usr/share/gnome/pixmaps; then cp $cpv $share_dir/images/opera.xpm /usr/share/gnome/pixmaps/opera.xpm +- fi +- # end /usr/share/gnome icon +- +- # /usr/share/gnome link +- if test -d /usr/share/gnome/apps/; then +- if test -d /usr/share/gnome/apps/Internet/; then +- if test -w /usr/share/gnome/apps/Internet; then +- generate_desktop /usr/share/gnome/apps/Internet +- fi +- elif test -d /usr/share/gnome/apps/Networking/WWW/; then +- if test -w /usr/share/gnome/apps/Networking/WWW; then +- generate_desktop /usr/share/gnome/apps/Networking/WWW +- fi +- elif test -w /usr/share/gnome/apps; then +- mkdir $mkdirv $mkdirp /usr/share/gnome/apps/Internet/ +- chmod $chmodv 755 /usr/share/gnome/apps/Internet +- generate_desktop /usr/share/gnome/apps/Internet +- fi +- fi - # end /usr/share/gnome link + # end %%X11BASE%%/share/gnome link fi # Add ximian here } -@@ -1505,12 +1468,12 @@ +@@ -1488,39 +1392,31 @@ + + debug_msg 1 "in kde()" + +- if test -d /opt/kde${1}/share; then ++ if test -d %%LOCALBASE%%/share; then + +- DIR_HI=/opt/kde${1}/share/icons/hicolor ++ DIR_HI=%%LOCALBASE%%/share/icons/hicolor + if test -d "$DIR_HI" -a -w "$DIR_HI"; then +- if test -d "$DIR_HI"/48x48/apps -a -w "$DIR_HI"/48x48/apps; then cp $cpv $share_dir/images/opera_48x48.png $DIR_HI/48x48/apps/opera.png; fi +- if test -d "$DIR_HI"/32x32/apps -a -w "$DIR_HI"/32x32/apps; then cp $cpv $share_dir/images/opera_32x32.png $DIR_HI/32x32/apps/opera.png; fi +- if test -d "$DIR_HI"/22x22/apps -a -w "$DIR_HI"/22x22/apps; then cp $cpv $share_dir/images/opera_22x22.png $DIR_HI/22x22/apps/opera.png; fi ++ if test -d "$DIR_HI"/48x48/apps -a -w "$DIR_HI"/48x48/apps; then cp $cpv $share_dir/images/opera_48x48.png $DIR_HI/48x48/apps/linux-opera.png; fi ++ if test -d "$DIR_HI"/32x32/apps -a -w "$DIR_HI"/32x32/apps; then cp $cpv $share_dir/images/opera_32x32.png $DIR_HI/32x32/apps/linux-opera.png; fi ++ if test -d "$DIR_HI"/22x22/apps -a -w "$DIR_HI"/22x22/apps; then cp $cpv $share_dir/images/opera_22x22.png $DIR_HI/22x22/apps/linux-opera.png; fi + fi + +- DIR_LO=/opt/kde${1}/share/icons/locolor ++ DIR_LO=%%LOCALBASE%%/share/icons/locolor + if test -d $DIR_LO -a -w $DIR_LO; then +- if test -d $DIR_LO/32x32/apps -a -w $DIR_LO/32x32/apps; then cp $cpv $share_dir/images/opera_32x32.png $DIR_LO/32x32/apps/opera.png; fi +- if test -d $DIR_LO/22x22/apps -a -w $DIR_LO/22x22/apps; then cp $cpv $share_dir/images/opera_22x22.png $DIR_LO/22x22/apps/opera.png; fi +- if test -d $DIR_LO/16x16/apps -a -w $DIR_LO/16x16/apps; then cp $cpv $share_dir/images/opera_16x16.png $DIR_LO/16x16/apps/opera.png; fi ++ if test -d $DIR_LO/32x32/apps -a -w $DIR_LO/32x32/apps; then cp $cpv $share_dir/images/opera_32x32.png $DIR_LO/32x32/apps/linux-opera.png; fi ++ if test -d $DIR_LO/22x22/apps -a -w $DIR_LO/22x22/apps; then cp $cpv $share_dir/images/opera_22x22.png $DIR_LO/22x22/apps/linux-opera.png; fi ++ if test -d $DIR_LO/16x16/apps -a -w $DIR_LO/16x16/apps; then cp $cpv $share_dir/images/opera_16x16.png $DIR_LO/16x16/apps/linux-opera.png; fi + fi + +- if test -d /opt/kde${1}/share/applnk/; then +- if test ! -d /opt/kde${1}/share/applnk/Internet/ -a -w /opt/kde${1}/share/applnk; then +- mkdir $mkdirv $mkdirp /opt/kde${1}/share/applnk/Internet/ +- chmod $chmodv 755 /opt/kde${1}/share/applnk/Internet ++ if test -d %%LOCALBASE%%/share/applnk/; then ++ if test ! -d %%LOCALBASE%%/share/applnk/Internet/ -a -w %%LOCALBASE%%/share/applnk; then ++ mkdir $mkdirv $mkdirp %%LOCALBASE%%/share/applnk/Internet/ ++ chmod $chmodv 755 %%LOCALBASE%%/share/applnk/Internet + fi +- if test -w /opt/kde${1}/share/applnk/Internet; then generate_desktop /opt/kde${1}/share/applnk/Internet ${1}; fi ++ if test -w %%LOCALBASE%%/share/applnk/Internet; then generate_desktop %%LOCALBASE%%/share/applnk/Internet ${1}; fi + fi fi - +- - if test -d /usr/share/applnk/Networking; then - if test ! -d /usr/share/applnk/Networking/WWW/ -a -w /usr/share/applnk/Networking; then - mkdir $mkdirv $mkdirp /usr/share/applnk/Networking/WWW/ - chmod $chmodv 755 /usr/share/applnk/Networking/WWW -+ if test -d %%LOCALBASE%%/share/applnk/Networking; then -+ if test ! -d %%LOCALBASE%%/share/applnk/Networking/WWW/ -a -w %%LOCALBASE%%/share/applnk/Networking; then -+ mkdir $mkdirv $mkdirp %%LOCALBASE%%/share/applnk/Networking/WWW/ -+ chmod $chmodv 755 %%LOCALBASE%%/share/applnk/Networking/WWW - fi +- fi - if test -w /usr/share/applnk/Networking/WWW; then generate_desktop /usr/share/applnk/Networking/WWW ${1}; fi -+ if test -w %%LOCALBASE%%/share/applnk/Networking/WWW; then generate_desktop %%LOCALBASE%%/share/applnk/Networking/WWW ${1}; fi - fi - } - -@@ -1534,8 +1497,8 @@ - fi - if test -w /opt/kde/share/applnk/Internet; then generate_desktop /opt/kde/share/applnk/Internet; fi - -- elif test -d /usr/share/applnk/Internet/ -a -w /usr/share/applnk/Internet; then -- generate_desktop /usr/share/applnk/Internet -+ elif test -d %%LOCALBASE%%/share/applnk/Internet/ -a -w %%LOCALBASE%%/share/applnk/Internet; then -+ generate_desktop %%LOCALBASE%%/share/applnk/Internet - fi +- fi } -@@ -1546,14 +1509,14 @@ - test ! -d /usr/lib/menu && test -w /usr/lib && mkdir $mkdirv $mkdirp /usr/lib/menu/ - test -d /usr/lib/menu && generate_mdk_menu /usr/lib/menu - -- test ! -d /usr/share/icons && test -w /usr/share && mkdir $mkdirv $mkdirp /usr/share/icons/ && chmod $chmodv 755 /usr/share/icons -- test -d /usr/share/icons && cp $cpv $share_dir/images/opera_32x32.png /usr/share/icons/opera.png -+ test ! -d %%X11BASE%%/share/icons && test -w %%X11BASE%%/share && mkdir $mkdirv $mkdirp %%X11BASE%%/share/icons/ && chmod $chmodv 755 %%X11BASE%%/share/icons -+ test -d %%X11BASE%%/share/icons && cp $cpv $share_dir/images/opera_32x32.png %%X11BASE%%/share/icons/opera.png - -- test ! -d /usr/share/icons/mini && test -w /usr/share/icons && mkdir $mkdirv $mkdirp /usr/share/icons/mini/ && chmod $chmodv 755 /usr/share/icons/mini -- test -d /usr/share/icons/mini && cp $cpv $share_dir/images/opera_16x16.png /usr/share/icons/mini/opera.png -+ test ! -d %%X11BASE%%/share/icons/mini && test -w %%X11BASE%%/share/icons && mkdir $mkdirv $mkdirp %%X11BASE%%/share/icons/mini/ && chmod $chmodv 755 %%X11BASE%%/share/icons/mini -+ test -d %%X11BASE%%/share/icons/mini && cp $cpv $share_dir/images/opera_16x16.png %%X11BASE%%/share/icons/mini/opera.png - -- test ! -d /usr/share/icons/large && test -w /usr/share/icons && mkdir $mkdirv $mkdirp /usr/share/icons/large && chmod $chmodv 755 /usr/share/icons/large -- test -d /usr/share/icons/large && cp $cpv $share_dir/images/opera_48x48.png /usr/share/icons/large/opera.png -+ test ! -d %%X11BASE%%/share/icons/large && test -w %%X11BASE%%/share/icons && mkdir $mkdirv $mkdirp %%X11BASE%%/share/icons/large && chmod $chmodv 755 %%X11BASE%%/share/icons/large -+ test -d %%X11BASE%%/share/icons/large && cp $cpv $share_dir/images/opera_48x48.png %%X11BASE%%/share/icons/large/opera.png - - /usr/bin/update-menus || true - fi + kde1() diff --git a/www/linux-opera/pkg-message b/www/linux-opera/pkg-message index 5d8873f..8d2dfa6 100644 --- a/www/linux-opera/pkg-message +++ b/www/linux-opera/pkg-message @@ -1,8 +1,13 @@ ## -Changelogs for 7.23 Final: http://www.opera.com/linux/changelogs/723/ +Changelog for 7.50 Final: http://www.opera.com/linux/changelogs/750/ -If you are upgrade from version 6 final, 7 development or 7.11, it might be a -good idea to backup your personal "~/.opera" directory and remove it. This can -be done from the command line using "cp -Rp ~/.opera ~/.opera-mybackup" and -"rm -rf ~/.opera". +The name of the the binary, data directory, personal "~/.opera" directory, +etc., have been renamed from "opera" to "linux-opera." This means that +www/linux-opera and www/opera no longer conflict, and can be installed and +can run at the same time. Bookmarks and mail can be preserved by copying +~/.opera/mail and ~/.opera/opera6.adr into ~/.linux-opera. Configurations for +toolbars, options, etc., have changed from previous versions, and are not +recommend to transferred from the old configuration. The mail format will be +converted to the new format automatically when the new linux-opera is run for +the first time. ## diff --git a/www/linux-opera/pkg-plist b/www/linux-opera/pkg-plist index 8e98d4f..420b4c4 100644 --- a/www/linux-opera/pkg-plist +++ b/www/linux-opera/pkg-plist @@ -1,138 +1,144 @@ -bin/opera -share/doc/opera/LICENSE -share/doc/opera/help -share/icons/opera.xpm -share/opera/bin/m2.so -share/opera/bin/missingsyms.so -share/opera/bin/opera -share/opera/bin/works -share/opera/chartables.bin -share/opera/config/opera6rc -share/opera/config/opera6rc.fixed -share/opera/help/advertising.html -share/opera/help/background.png -share/opera/help/dialogs.html -share/opera/help/filetypes.html -share/opera/help/fonts.html -share/opera/help/glossary.html -share/opera/help/help.css -share/opera/help/history.html -share/opera/help/hotlist.html -share/opera/help/index.html -share/opera/help/input.html -share/opera/help/keyboard.html -share/opera/help/languages.html -share/opera/help/layout.html -share/opera/help/license.txt -share/opera/help/m2.html -share/opera/help/mail.html -share/opera/help/menus.html -share/opera/help/mouse.html -share/opera/help/multimedia.html -share/opera/help/network.html -share/opera/help/page.html -share/opera/help/paths.html -share/opera/help/personal.html -share/opera/help/preferences.html -share/opera/help/privacy.html -share/opera/help/search.html -share/opera/help/security.html -share/opera/help/skin.html -share/opera/help/sounds.html -share/opera/help/start.html -share/opera/help/toc.html -share/opera/help/toolbars.html -share/opera/help/windows.html -share/opera/hhd.ssr -share/opera/images/background.gif -share/opera/images/blank.gif -share/opera/images/drive.gif -share/opera/images/file.gif -share/opera/images/folder.gif -share/opera/images/link.gif -share/opera/images/opera.xpm -share/opera/images/opera_16x16.png -share/opera/images/opera_22x22.png -share/opera/images/opera_32x32.png -share/opera/images/opera_48x48.png -share/opera/images/operabanner.png -share/opera/images/shared.gif -share/opera/images/splash.png -share/opera/images/startup1.png -share/opera/images/startup2.png -share/opera/ini/dialog.ini -share/opera/ini/fastforward.ini -share/opera/ini/minimal_toolbar.ini -share/opera/ini/standard_keyboard.ini -share/opera/ini/standard_menu.ini -share/opera/ini/standard_mouse.ini -share/opera/ini/standard_toolbar.ini -share/opera/ini/unix_keyboard.ini -share/opera/java/opera.jar -share/opera/java/opera.policy -share/opera/jsconsole.html -share/opera/lngcode.txt -share/opera/locale/en/default.adr -share/opera/locale/en/search.ini -share/opera/locale/english.lng -share/opera/opera6.adr -share/opera/plugins/libnpp.so -share/opera/plugins/operamotifwrapper -share/opera/plugins/operamotifwrapper-3 -share/opera/plugins/operaplugincleaner -share/opera/search.ini -share/opera/skin/standard_skin.zip -share/opera/skin/windows_skin.zip -share/opera/styles/OPF.css -share/opera/styles/about.css -share/opera/styles/cache.css -share/opera/styles/csr.css -share/opera/styles/dir.css -share/opera/styles/drives.css -share/opera/styles/email.css -share/opera/styles/history.css -share/opera/styles/im.css -share/opera/styles/info.css -share/opera/styles/mime.css -share/opera/styles/mimehead.css -share/opera/styles/opf.css -share/opera/styles/plugins.css -share/opera/styles/user/accessibility.css -share/opera/styles/user/contrastbw.css -share/opera/styles/user/contrastwb.css -share/opera/styles/user/debugwithoutline.css -share/opera/styles/user/disabletables.css -share/opera/styles/user/hidecertainsizes.css -share/opera/styles/user/hidenonlinkimages.css -share/opera/styles/user/imageandlinkonly.css -share/opera/styles/user/nostalgia.css -share/opera/styles/user/showstructure.css -share/opera/styles/user/textonly.css -share/opera/styles/user/userstyle.ini -share/opera/styles/wml.css -share/pixmaps/opera.xpm -@dirrm share/opera/styles/user -@dirrm share/opera/styles -@dirrm share/opera/skin -@dirrm share/opera/plugins -@dirrm share/opera/locale/en -@dirrm share/opera/locale -@dirrm share/opera/java -@dirrm share/opera/ini -@dirrm share/opera/images -@dirrm share/opera/help -@dirrm share/opera/config -@dirrm share/opera/bin -@dirrm share/opera -@dirrm share/doc/opera +bin/linux-opera +%%DOCSDIR%%/LICENSE +%%DOCSDIR%%/help +%%GNOME:%%share/gnome/apps/Internet/linux-opera.desktop +%%GNOME:%%share/gnome/pixmaps/linux-opera.xpm +share/linux-opera/bin/missingsyms.so +share/linux-opera/bin/opera +share/linux-opera/bin/spellcheck.so +share/linux-opera/bin/works +share/linux-opera/chartables.bin +share/linux-opera/config/opera6rc +share/linux-opera/config/opera6rc.bak +share/linux-opera/config/opera6rc.fixed +share/linux-opera/config/opera6rc.orig +share/linux-opera/help/advertising.html +share/linux-opera/help/background.png +share/linux-opera/help/chat.html +share/linux-opera/help/dialogs.html +share/linux-opera/help/filetypes.html +share/linux-opera/help/fonts.html +share/linux-opera/help/glossary.html +share/linux-opera/help/help.css +share/linux-opera/help/history.html +share/linux-opera/help/hotlist.html +share/linux-opera/help/index.html +share/linux-opera/help/input.html +share/linux-opera/help/keyboard.html +share/linux-opera/help/languages.html +share/linux-opera/help/layout.html +share/linux-opera/help/license.txt +share/linux-opera/help/m2.html +share/linux-opera/help/mail.html +share/linux-opera/help/menus.html +share/linux-opera/help/mouse.html +share/linux-opera/help/multimedia.html +share/linux-opera/help/network.html +share/linux-opera/help/page.html +share/linux-opera/help/panels.html +share/linux-opera/help/paths.html +share/linux-opera/help/personal.html +share/linux-opera/help/preferences.html +share/linux-opera/help/privacy.html +share/linux-opera/help/search.html +share/linux-opera/help/security.html +share/linux-opera/help/skin.html +share/linux-opera/help/sounds.html +share/linux-opera/help/start.html +share/linux-opera/help/toc.html +share/linux-opera/help/toolbars.html +share/linux-opera/help/windows.html +share/linux-opera/hhd.ssr +share/linux-opera/images/background.gif +share/linux-opera/images/blank.gif +share/linux-opera/images/drive.gif +share/linux-opera/images/file.gif +share/linux-opera/images/folder.gif +share/linux-opera/images/link.gif +share/linux-opera/images/opera.xpm +share/linux-opera/images/opera_16x16.png +share/linux-opera/images/opera_22x22.png +share/linux-opera/images/opera_32x32.png +share/linux-opera/images/opera_48x48.png +share/linux-opera/images/operabanner.png +share/linux-opera/images/shared.gif +share/linux-opera/images/splash.png +share/linux-opera/images/startup1.png +share/linux-opera/images/startup2.png +share/linux-opera/ini/dialog.ini +share/linux-opera/ini/fastforward.ini +share/linux-opera/ini/filehandler.ini +share/linux-opera/ini/pluginpath.ini +share/linux-opera/ini/spellcheck.ini +share/linux-opera/ini/standard_keyboard.ini +share/linux-opera/ini/standard_menu.ini +share/linux-opera/ini/standard_mouse.ini +share/linux-opera/ini/standard_toolbar.ini +share/linux-opera/ini/unix_keyboard.ini +share/linux-opera/java/opera.jar +share/linux-opera/java/opera.policy +share/linux-opera/jsconsole.html +share/linux-opera/lngcode.txt +share/linux-opera/locale/en/default.adr +share/linux-opera/locale/en/lngcode.txt +share/linux-opera/locale/en/search.ini +share/linux-opera/locale/english.lng +share/linux-opera/opera6.adr +share/linux-opera/plugins/libnpp.so +share/linux-opera/plugins/operamotifwrapper +share/linux-opera/plugins/operamotifwrapper-3 +share/linux-opera/plugins/operaplugincleaner +share/linux-opera/search.ini +share/linux-opera/skin/standard_skin.zip +share/linux-opera/skin/windows_skin.zip +share/linux-opera/styles/OPF.css +share/linux-opera/styles/about.css +share/linux-opera/styles/cache.css +share/linux-opera/styles/csr.css +share/linux-opera/styles/dir.css +share/linux-opera/styles/drives.css +share/linux-opera/styles/email.css +share/linux-opera/styles/history.css +share/linux-opera/styles/im.css +share/linux-opera/styles/info.css +share/linux-opera/styles/mime.css +share/linux-opera/styles/mimehead.css +share/linux-opera/styles/opf.css +share/linux-opera/styles/plugins.css +share/linux-opera/styles/user/accessibility.css +share/linux-opera/styles/user/contrastbw.css +share/linux-opera/styles/user/contrastwb.css +share/linux-opera/styles/user/debugwithoutline.css +share/linux-opera/styles/user/disabletables.css +share/linux-opera/styles/user/hidecertainsizes.css +share/linux-opera/styles/user/hidenonlinkimages.css +share/linux-opera/styles/user/imageandlinkonly.css +share/linux-opera/styles/user/nostalgia.css +share/linux-opera/styles/user/showstructure.css +share/linux-opera/styles/user/textonly.css +share/linux-opera/styles/user/userstyle.ini +share/linux-opera/styles/wml.css +share/pixmaps/linux-opera.xpm +@dirrm share/linux-opera/styles/user +@dirrm share/linux-opera/styles +@dirrm share/linux-opera/skin +@dirrm share/linux-opera/plugins +@dirrm share/linux-opera/locale/en +@dirrm share/linux-opera/locale +@dirrm share/linux-opera/java +@dirrm share/linux-opera/ini +@dirrm share/linux-opera/images +@dirrm share/linux-opera/help +@dirrm share/linux-opera/config +@dirrm share/linux-opera/bin +@dirrm share/linux-opera +@dirrm %%DOCSDIR%% -%%GNOMELNK:%%share/gnome/apps/Internet/opera.desktop -%%GNOME:%%share/gnome/pixmaps/opera.xpm - -@cwd %%LOCALBASE%% -%%KDE:%%share/applnk/Internet/opera.desktop -%%KDE2:%%share/applnk/Networking/WWW/opera.desktop - -@cwd /etc/X11 -wmconfig/opera -%%APPLNK:%%applnk/Internet/opera.desktop +%%KDE:%%@cwd %%LOCALBASE%% +%%KDE:%%share/applnk/Internet/linux-opera.desktop +%%KDE:%%share/icons/hicolor/22x22/apps/linux-opera.png +%%KDE:%%share/icons/hicolor/32x32/apps/linux-opera.png +%%KDE:%%share/icons/hicolor/48x48/apps/linux-opera.png +%%KDE:%%share/icons/locolor/16x16/apps/linux-opera.png +%%KDE:%%share/icons/locolor/22x22/apps/linux-opera.png +%%KDE:%%share/icons/locolor/32x32/apps/linux-opera.png -- cgit v1.1