[gentoo-commits] gentoo-x86 commit in www-client/opera/files: opera-simplify-desktop.patch opera-freedesktop.patch opera-gentoo.patch

[Jeroen Roovers (jer)]

jer         08/10/02 02:59:21

  Added:                opera-simplify-desktop.patch
                        opera-freedesktop.patch opera-gentoo.patch
  Log:
  Version bump <http://my.opera.com/desktopteam/blog/2008/10/01/opera-9-6-rc-1>. Implement install.sh changes thanks to Pacho Ramos (bug #204294).
  (Portage version: 2.2_rc11/cvs/Linux 2.6.25-gentoo-r7-JeR i686)

Revision  Changes    Path
1.1                  www-client/opera/files/opera-simplify-desktop.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/opera/files/opera-simplify-desktop.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/opera/files/opera-simplify-desktop.patch?rev=1.1&content-type=text/plain

Index: opera-simplify-desktop.patch
===================================================================
--- install.sh~	2008-08-12 23:39:54.000000000 +0200
+++ install.sh	2008-08-12 23:39:54.000000000 +0200
@@ -1331,20 +1331,7 @@
 	fi
 
 	# Shorcuts and Icons
-	bool_icons=1 # install icons by default
-	if test "${flag_mode}" = "--force" -o "${flag_mode}" = "--prefix="
-	then
-	    warn
-	    warn "Shortcut icons would be ignored if installed with the prefix \"$prefix\"."
-	    if [ "$flag_mode" = "--force" ]
-	    then warn "Installing them in default locations."
-	    else bool_icons=0; warn "Ignoring them; menus shall lack nice icons."
-	    fi
-	fi
-
-	if test "$bool_icons" -ne 0
-	then xdg
-	fi
+	xdg
 
     fi # OPERADESTDIR
 



1.1                  www-client/opera/files/opera-freedesktop.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/opera/files/opera-freedesktop.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/opera/files/opera-freedesktop.patch?rev=1.1&content-type=text/plain

Index: opera-freedesktop.patch
===================================================================
--- install.sh~	2008-09-07 14:22:32.000000000 +0200
+++ install.sh	2008-09-07 14:22:32.000000000 +0200
@@ -1405,7 +1405,6 @@
 EOF
 	fi
 	cat <<EOF
-Encoding=UTF-8
 Name=Opera
 Name[af]=opera
 Name[eo]=Opero
@@ -1438,19 +1437,20 @@
 # http://standards.freedesktop.org/menu-spec/menu-spec-latest.html
 #
 # but Chris included it anyway to fix
-# http://bugs.gentoo.org/show_bug.cgi?id=90508
+# http://bugs.gentoo.org/show_bug.cgi?id=90508 -> This is already fixed
+# in Gnome
 #
 # Other possible categories:
 # Email, Presentation, IRCClient, FileTransfer, P2P, News, WebDevelopment
 
 	if test "$1" = "xdg"
 	then cat <<EOF
-Categories=Application;Qt;Network;WebBrowser;X-Ximian-Main;X-Ximian-Toplevel
-Icon=opera.png
+Categories=Qt;Network;WebBrowser;X-Ximian-Main;X-Ximian-Toplevel;
+Icon=opera
 EOF
 	else echo 'Icon=opera'
 	fi
-	echo 'MimeType=text/html;text/xml;application/xhtml+xml'
+	echo 'MimeType=text/html;text/xml;application/xhtml+xml;'
     fi
     cat <<EOF
 Comment=Web Browser



1.1                  www-client/opera/files/opera-gentoo.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/opera/files/opera-gentoo.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/opera/files/opera-gentoo.patch?rev=1.1&content-type=text/plain

Index: opera-gentoo.patch
===================================================================
--- install.sh.orig	2008-08-12 23:45:42.000000000 +0200
+++ install.sh	2008-08-13 23:09:44.000000000 +0200
@@ -1720,6 +1720,18 @@
     fi
 }
 
+gentoo()
+{
+	if test -e /etc/gentoo-release ; then
+		for res in 16x16 22x22 32x32 48x48 ; do
+			mkdir -p /usr/share/icons/hicolor/${res}/apps
+			cp usr/share/icons/hicolor/${res}/apps/opera.png /usr/share/icons/hicolor/${res}/apps
+		done
+		mkdir -p ${D}/usr/share/applications
+		generate_desktop ${D}/usr/share/applications xdg
+	fi
+}
+
 huntdirs()
 {
     # $GNOME2PATH and $GNOMEPATH skipped (too few hits google site:gnome.org)
@@ -1737,47 +1749,7 @@
 
 xdg()
 {   # http://standards.freedesktop.org
-    UDD=''
-    for BIN_DIR in `pathdirs`; do
-	test -x ${BIN_DIR}/update-desktop-database || continue
-	UDD=${BIN_DIR}/update-desktop-database; break
-    done
-
-    # http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html
-    if test "$UDD"; then
-	for ICON_DIR in `echo ${XDG_DATA_DIRS}:/usr/local/share:/usr/share|tr : '\012'|sed -e '/^$/d;s:$:/icons/hicolor:'` /usr/share/pixmaps/hicolor
-	do test -d ${ICON_DIR} && break
-	done
-
-	if   test ! -d ${ICON_DIR}
-	then warn "Could not find icon installation directory, icons not installed."
-	elif test ! -w ${ICON_DIR}
-	then warn "Directory \"${ICON_DIR}\" not writable by user \"${USER}\", icons not installed."
-	elif [ "`cd $ICON_DIR; /bin/pwd`" != "`cd usr/share/icons/hicolor; /bin/pwd`" ]
-	then
-	    for RESOLUTION in 48x48 32x32 22x22
-	    do	TO_DIR=${ICON_DIR}/${RESOLUTION}/apps
-		test -d $TO_DIR && test -w $TO_DIR && cp $cpv usr/share/icons/hicolor/$RESOLUTION/apps/opera.png $TO_DIR
-	    done
-	fi
-
-	for SHORTCUT_DIR in ${XDG_DATA_HOME}/applications /usr/local/share/applications /usr/share/applications
-	do test -d ${SHORTCUT_DIR} && break;
-	done
-
-	if   test ! -d ${SHORTCUT_DIR}; then warn "Could not find shortcut installation directory, desktop entry not installed."; return
-	elif test ! -w ${SHORTCUT_DIR}; then warn "Directory \"${SHORTCUT_DIR}\" not writable by user \"${USER}\", desktop entry not installed."; return
-	fi
-	generate_desktop ${SHORTCUT_DIR} xdg
-	${UDD}
-    else
-	icons
-	gnome
-	kde 3
-	kde 2
-	kde1
-	mandrake
-    fi
+	gentoo
 }
 
 echo test | sed -n -e 's/test//' || error 'sed'