Attachment 125455 Details for Bug 169070 – opera-12.00.patch

[patch] opera-12.00.patch

opera-12.00.patch (text/plain), 13.23 KB, created by Mark Felder on 2012-06-14 16:20:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Felder

Created: 2012-06-14 16:20:02 UTC

Size: 13.23 KB

patch

obsolete

>diff -ruN --exclude=CVS ../opera.orig/Makefile ./Makefile
>--- ../opera.orig/Makefile	2012-05-17 08:34:05.000000000 -0500
>+++ ./Makefile	2012-06-14 09:26:31.000000000 -0500
>@@ -26,41 +26,42 @@
> BUILD_DEPENDS=	${LOCALBASE}/bin/update-mime-database:${PORTSDIR}/misc/shared-mime-info
> RUN_DEPENDS=	${LOCALBASE}/bin/update-mime-database:${PORTSDIR}/misc/shared-mime-info
> 
>-OPERA_VER?=	11.64
>-OPERA_BUILD?=	1403
>+OPERA_VER?=	12.00
>+OPERA_BUILD?=	1467
> MASTER_SITES_VER_PATH=	unix/${OPERA_VER:S/.//}
> 
> USE_XZ=		yes
> USE_XORG=	x11 xext sm ice xft xrender
> USE_GNOME=	desktopfileutils
>+INSTALLS_ICONS=	yes
> 
>-MAN1=		opera.1 opera-widget-manager.1
>+MAN1=		opera.1
> MANCOMPRESSED=	yes
> 
> NO_BUILD=	yes
> EXPLICIT_PACKAGE_DEPENDS=	yes
> 
>-OPTIONS=	CUPS	"Enable support for printing (requires CUPS)"		on \
>-		VIDEO	"Enable support for HTML5 video (requires GStreamer)"	on \
>-		GTK	"Use GTK backend"	off \
>-		KDE4	"Use KDE4 backend"	off
>+OPTIONS_DEFINE=	CUPS VIDEO GTK2 KDE4
>+OPTIONS_DEFAULT=	CUPS VIDEO
>+
>+CUPS_DESC=	Enable support for printing (requires CUPS)
>+VIDEO_DESC=	Enable support for HTML5 video (requires GStreamer)
> 
> .include <bsd.port.options.mk>
> 
>-.if !defined(WITHOUT_CUPS)
>+.if ${PORT_OPTIONS:MCUPS)
> LIB_DEPENDS+=	cups.2:${PORTSDIR}/print/cups-client
> .endif
> 
>-.if !defined(WITHOUT_VIDEO)
>+.if ${PORT_OPTIONS:MVIDEO)
> USE_GSTREAMER+=	vorbis ogg theora vp8 good
> .endif
> 
>-.if defined(WITH_GTK)
>+.if ${PORT_OPTIONS:MGTK2)
> USE_GNOME+=	gtk20
>-INSTALLS_ICONS=	yes
> .endif
> 
>-.if defined(WITH_KDE4)
>+.if ${PORT_OPTIONS:MKDE4)
> USE_KDE4+=	kdelibs
> .endif
> 
>@@ -79,15 +80,12 @@
> 
> do-install:
> 	@${INSTALL_MAN} ${WRKSRC}/man/man1/${PORTNAME}.1.gz ${MANPREFIX}/man/man1/
>-	@${INSTALL_MAN} ${WRKSRC}/man/man1/${PORTNAME}-widget-manager.1.gz ${MANPREFIX}/man/man1/
> 	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' ${WRKSRC}/install
> 	@${REINPLACE_CMD} -e 's|share/man|man|g' ${WRKSRC}/install
> 	@(cd ${WRKSRC} && ./install --text --system --unattended)
> 	@${REINPLACE_CMD} -e 's|/usr/X11R6/lib/browser_plugins|${LOCALBASE}/lib/browser_plugins/symlinks/opera|g' \
> 		${DATADIR}/defaults/pluginpath.ini
> 	@${RM} ${DATADIR}/defaults/pluginpath.ini.bak
>-	@${CP} ${LOCALBASE}/lib/opera/operapluginwrapper ${LOCALBASE}/lib/opera/operapluginwrapper.freebsd
>-	@${INSTALL_SCRIPT} ${PATCHDIR}/operapluginwrapper ${LOCALBASE}/lib/opera/
> 	-${LOCALBASE}/bin/update-desktop-database
> 	-${LOCALBASE}/bin/update-mime-database ${LOCALBASE}/share/mime
> 
>diff -ruN --exclude=CVS ../opera.orig/distinfo ./distinfo
>--- ../opera.orig/distinfo	2012-05-17 08:34:05.000000000 -0500
>+++ ./distinfo	2012-06-14 09:17:31.000000000 -0500
>@@ -1,4 +1,4 @@
>-SHA256 (opera-11.64-1403.i386.freebsd.tar.xz) = 09c5e7a058161fc5a8cca2190f8056a656e4a766e425912d436e516fbf49392f
>-SIZE (opera-11.64-1403.i386.freebsd.tar.xz) = 11544224
>-SHA256 (opera-11.64-1403.amd64.freebsd.tar.xz) = 54b080fd9ec998d5172b49649cffc0df9e0133b168ef5167d9bfa1455f9e2ad8
>-SIZE (opera-11.64-1403.amd64.freebsd.tar.xz) = 12108252
>+SHA256 (opera-12.00-1467.amd64.freebsd.tar.xz) = 0f1f9f99408923b09c1f90735214de262f8df3966a28c24a41cf9185d67cde73
>+SIZE (opera-12.00-1467.amd64.freebsd.tar.xz) = 13278660
>+SHA256 (opera-12.00-1467.i386.freebsd.tar.xz) = 4f572f7c2c1198b7e638b4850a0c93f0465edfe8afacc6264cee1d103ff22594
>+SIZE (opera-12.00-1467.i386.freebsd.tar.xz) = 12617668
>diff -ruN --exclude=CVS ../opera.orig/files/operapluginwrapper ./files/operapluginwrapper
>--- ../opera.orig/files/operapluginwrapper	2010-08-13 07:21:17.000000000 -0500
>+++ ./files/operapluginwrapper	1969-12-31 18:00:00.000000000 -0600
>@@ -1,22 +0,0 @@
>-#!/bin/sh
>-
>-if [ -n "$5" ]; then
>-	ELFTYPE=`brandelf $5`
>-elif [ -n "$4" ]; then
>-	ELFTYPE=`brandelf $4`
>-elif [ -n "$3" ]; then
>-	ELFTYPE=`brandelf $3`
>-fi
>-
>-WRAPPER="freebsd"
>-
>-case "${ELFTYPE}" in
>-	*SVR4*|*Linux*)
>-		if [ -x "$0.linux" ]; then
>-			WRAPPER="linux"
>-		fi
>-	;;
>-esac
>-
>-exec $0.$WRAPPER $@
>-
>diff -ruN --exclude=CVS ../opera.orig/pkg-plist ./pkg-plist
>--- ../opera.orig/pkg-plist	2012-01-27 15:40:14.000000000 -0600
>+++ ./pkg-plist	2012-06-14 09:18:32.000000000 -0500
>@@ -1,66 +1,32 @@
> bin/opera
>-bin/opera-widget-manager
> bin/uninstall-opera
> lib/opera/gstreamer/plugins/libgstoperamatroska.so
> lib/opera/gstreamer/plugins/libgstoperavp8.so
> lib/opera/liboperagtk2.so
> lib/opera/liboperakde4.so
> lib/opera/opera
>-lib/opera/operaplugincleaner
>-lib/opera/operapluginwrapper
>-lib/opera/operapluginwrapper.freebsd
>+lib/opera/pluginwrapper/operapluginwrapper
>+lib/opera/pluginwrapper/operapluginwrapper-native
> lib/opera/plugins/README
> %%DOCSDIR%%/LGPL-2
> %%DOCSDIR%%/LICENSE
> %%DOCSDIR%%/README.gstreamer
> share/applications/opera-browser.desktop
>-share/applications/opera-widget-installer.desktop
>-share/applications/opera-widget-manager.desktop
>+share/icons/hicolor/256x256/apps/opera-browser.png
> share/icons/hicolor/128x128/apps/opera-browser.png
>-share/icons/hicolor/128x128/apps/opera-widget-manager.png
>-share/icons/hicolor/128x128/apps/opera-widget.png
> share/icons/hicolor/128x128/mimetypes/opera-extension.png
>-share/icons/hicolor/128x128/mimetypes/opera-unite-application.png
>-share/icons/hicolor/128x128/mimetypes/opera-widget.png
> share/icons/hicolor/16x16/apps/opera-browser.png
>-share/icons/hicolor/16x16/apps/opera-widget-manager.png
>-share/icons/hicolor/16x16/apps/opera-widget.png
> share/icons/hicolor/16x16/mimetypes/opera-extension.png
>-share/icons/hicolor/16x16/mimetypes/opera-unite-application.png
>-share/icons/hicolor/16x16/mimetypes/opera-widget.png
> share/icons/hicolor/22x22/apps/opera-browser.png
>-share/icons/hicolor/22x22/apps/opera-widget-manager.png
>-share/icons/hicolor/22x22/apps/opera-widget.png
> share/icons/hicolor/22x22/mimetypes/opera-extension.png
>-share/icons/hicolor/22x22/mimetypes/opera-unite-application.png
>-share/icons/hicolor/22x22/mimetypes/opera-widget.png
> share/icons/hicolor/24x24/apps/opera-browser.png
>-share/icons/hicolor/24x24/apps/opera-widget-manager.png
>-share/icons/hicolor/24x24/apps/opera-widget.png
> share/icons/hicolor/24x24/mimetypes/opera-extension.png
>-share/icons/hicolor/24x24/mimetypes/opera-unite-application.png
>-share/icons/hicolor/24x24/mimetypes/opera-widget.png
> share/icons/hicolor/32x32/apps/opera-browser.png
>-share/icons/hicolor/32x32/apps/opera-widget-manager.png
>-share/icons/hicolor/32x32/apps/opera-widget.png
> share/icons/hicolor/32x32/mimetypes/opera-extension.png
>-share/icons/hicolor/32x32/mimetypes/opera-unite-application.png
>-share/icons/hicolor/32x32/mimetypes/opera-widget.png
> share/icons/hicolor/48x48/apps/opera-browser.png
>-share/icons/hicolor/48x48/apps/opera-widget-manager.png
>-share/icons/hicolor/48x48/apps/opera-widget.png
> share/icons/hicolor/48x48/mimetypes/opera-extension.png
>-share/icons/hicolor/48x48/mimetypes/opera-unite-application.png
>-share/icons/hicolor/48x48/mimetypes/opera-widget.png
>-share/icons/hicolor/scalable/apps/opera-browser.svg
>-share/icons/hicolor/scalable/apps/opera-widget-manager.svg
>-share/icons/hicolor/scalable/apps/opera-widget.svg
> share/icons/hicolor/scalable/mimetypes/opera-extension.svg
>-share/icons/hicolor/scalable/mimetypes/opera-unite-application.svg
>-share/icons/hicolor/scalable/mimetypes/opera-widget.svg
> share/mime/packages/opera-extension.xml
>-share/mime/packages/opera-unite-application.xml
>-share/mime/packages/opera-widget.xml
> %%DATADIR%%/defaults/bookmarks.adr
> %%DATADIR%%/defaults/dictionaries.xml
> %%DATADIR%%/defaults/feedreaders.ini
>@@ -78,6 +44,7 @@
> %%DATADIR%%/defaults/webmailproviders.ini
> %%DATADIR%%/defaults/xmlentities.ini
> %%DATADIR%%/encoding.bin
>+%%DATADIR%%/extra/unix-opengl.blocklist.json
> %%DATADIR%%/extra/missingplugin.svg
> %%DATADIR%%/extra/missingpluginhover.svg
> %%DATADIR%%/extra/svg-mo.dat
>@@ -92,6 +59,7 @@
> %%DATADIR%%/html5_entity_init.dat
> %%DATADIR%%/lngcode.txt
> %%DATADIR%%/locale/af/af.lng
>+%%DATADIR%%/locale/ar/ar.lng
> %%DATADIR%%/locale/az/az.lng
> %%DATADIR%%/locale/be/be.lng
> %%DATADIR%%/locale/be/bookmarks.adr
>@@ -122,6 +90,7 @@
> %%DATADIR%%/locale/es-ES/standard_speeddial.ini
> %%DATADIR%%/locale/es-LA/es-LA.lng
> %%DATADIR%%/locale/et/et.lng
>+%%DATADIR%%/locale/fa/fa.lng
> %%DATADIR%%/locale/fi/fi.lng
> %%DATADIR%%/locale/fr-CA/fr-CA.lng
> %%DATADIR%%/locale/fr/bookmarks.adr
>@@ -130,6 +99,7 @@
> %%DATADIR%%/locale/fr/standard_speeddial.ini
> %%DATADIR%%/locale/fy/fy.lng
> %%DATADIR%%/locale/gd/gd.lng
>+%%DATADIR%%/locale/he/he.lng
> %%DATADIR%%/locale/hi/hi.lng
> %%DATADIR%%/locale/hr/hr.lng
> %%DATADIR%%/locale/hu/bookmarks.adr
>@@ -146,6 +116,7 @@
> %%DATADIR%%/locale/ja/search.ini
> %%DATADIR%%/locale/ja/standard_speeddial.ini
> %%DATADIR%%/locale/ka/ka.lng
>+%%DATADIR%%/locale/kk/kk.lng
> %%DATADIR%%/locale/ko/ko.lng
> %%DATADIR%%/locale/lt/lt.lng
> %%DATADIR%%/locale/me/me.lng
>@@ -197,6 +168,7 @@
> %%DATADIR%%/locale/uk/search.ini
> %%DATADIR%%/locale/uk/standard_speeddial.ini
> %%DATADIR%%/locale/uk/uk.lng
>+%%DATADIR%%/locale/ur/ur.lng
> %%DATADIR%%/locale/uz/uz.lng
> %%DATADIR%%/locale/vi/vi.lng
> %%DATADIR%%/locale/zh-cn/bookmarks.adr
>@@ -207,17 +179,6 @@
> %%DATADIR%%/locale/zu/zu.lng
> %%DATADIR%%/mathml.dtd
> %%DATADIR%%/package-id.ini
>-%%DATADIR%%/package/lib/binprint.sh
>-%%DATADIR%%/package/lib/layout_common.sh
>-%%DATADIR%%/package/lib/layout_deb.sh
>-%%DATADIR%%/package/lib/layout_tar.sh
>-%%DATADIR%%/package/lib/main.sh
>-%%DATADIR%%/package/lib/normalize.sh
>-%%DATADIR%%/package/lib/package_deb.sh
>-%%DATADIR%%/package/lib/package_rpm.sh
>-%%DATADIR%%/package/lib/package_tar.sh
>-%%DATADIR%%/package/lib/xml.sh
>-%%DATADIR%%/package/main.sh
> %%DATADIR%%/pubsuffix.xml
> %%DATADIR%%/region/cis/en/bookmarks.adr
> %%DATADIR%%/region/cis/en/search.ini
>@@ -247,7 +208,13 @@
> %%DATADIR%%/region/middle_east/bookmarks.adr
> %%DATADIR%%/region/middle_east/search.ini
> %%DATADIR%%/region/middle_east/standard_speeddial.ini
>+%%DATADIR%%/region/ng/bookmarks.adr
>+%%DATADIR%%/region/ng/standard_speeddial.ini
> %%DATADIR%%/region/region.ini
>+%%DATADIR%%/region/ph/bookmarks.adr
>+%%DATADIR%%/region/ph/standard_speeddial.ini
>+%%DATADIR%%/region/pk/bookmarks.adr
>+%%DATADIR%%/region/pk/standard_speeddial.ini
> %%DATADIR%%/region/tw/browser.js
> %%DATADIR%%/region/tw/turbosettings.xml
> %%DATADIR%%/region/ua/ru/bookmarks.adr
>@@ -256,6 +223,8 @@
> %%DATADIR%%/region/us/bookmarks.adr
> %%DATADIR%%/region/us/search.ini
> %%DATADIR%%/region/us/standard_speeddial.ini
>+%%DATADIR%%/region/vn/bookmarks.adr
>+%%DATADIR%%/region/vn/standard_speeddial.ini
> %%DATADIR%%/skin/standard_skin.zip
> %%DATADIR%%/skin/unix_skin.zip
> %%DATADIR%%/styles/about.css
>@@ -263,10 +232,12 @@
> %%DATADIR%%/styles/certinfo.css
> %%DATADIR%%/styles/config.css
> %%DATADIR%%/styles/contentblock.css
>+%%DATADIR%%/styles/cpu.css
> %%DATADIR%%/styles/debug.css
> %%DATADIR%%/styles/dir.css
> %%DATADIR%%/styles/error.css
> %%DATADIR%%/styles/feed.css
>+%%DATADIR%%/styles/gpu.css
> %%DATADIR%%/styles/history.css
> %%DATADIR%%/styles/im.css
> %%DATADIR%%/styles/image.css
>@@ -333,7 +304,8 @@
> %%DATADIR%%/styles/webstorage.css
> %%DATADIR%%/styles/wml.css
> %%DATADIR%%/ui/dialog.ini
>-%%DATADIR%%/ui/dialogs.yaml
>+%%DATADIR%%/ui/dialogs.yml
>+%%DATADIR%%/ui/widgets.yml
> %%DATADIR%%/ui/fastforward.ini
> %%DATADIR%%/ui/standard_keyboard.ini
> %%DATADIR%%/ui/standard_keyboard_compat.ini
>@@ -341,24 +313,19 @@
> %%DATADIR%%/ui/standard_mouse.ini
> %%DATADIR%%/ui/standard_toolbar.ini
> %%DATADIR%%/ui/unix_keyboard.ini
>-%%DATADIR%%/ui/widgets.yaml
>-%%DATADIR%%/unite/fileSharing.ua
>-%%DATADIR%%/unite/fridge.ua
>-%%DATADIR%%/unite/home.ua
>-%%DATADIR%%/unite/mediaPlayer.ua
>-%%DATADIR%%/unite/messenger.ua
>-%%DATADIR%%/unite/photoSharing.ua
>-%%DATADIR%%/unite/webserver.ua
>-@dirrm %%DATADIR%%/unite
> @dirrm %%DATADIR%%/ui
> @dirrm %%DATADIR%%/styles/user
> @dirrm %%DATADIR%%/styles/images
> @dirrm %%DATADIR%%/styles
> @dirrm %%DATADIR%%/skin
>+@dirrm %%DATADIR%%/region/vn
> @dirrm %%DATADIR%%/region/us
> @dirrm %%DATADIR%%/region/ua/ru
> @dirrm %%DATADIR%%/region/ua
> @dirrm %%DATADIR%%/region/tw
>+@dirrm %%DATADIR%%/region/pk
>+@dirrm %%DATADIR%%/region/ph
>+@dirrm %%DATADIR%%/region/ng
> @dirrm %%DATADIR%%/region/middle_east
> @dirrm %%DATADIR%%/region/latin_america
> @dirrm %%DATADIR%%/region/in
>@@ -371,13 +338,12 @@
> @dirrm %%DATADIR%%/region/cis/en
> @dirrm %%DATADIR%%/region/cis
> @dirrm %%DATADIR%%/region
>-@dirrm %%DATADIR%%/package/lib
>-@dirrm %%DATADIR%%/package
> @dirrm %%DATADIR%%/locale/zu
> @dirrm %%DATADIR%%/locale/zh-tw
> @dirrm %%DATADIR%%/locale/zh-cn
> @dirrm %%DATADIR%%/locale/vi
> @dirrm %%DATADIR%%/locale/uz
>+@dirrm %%DATADIR%%/locale/ur
> @dirrm %%DATADIR%%/locale/uk
> @dirrm %%DATADIR%%/locale/tr
> @dirrm %%DATADIR%%/locale/tl
>@@ -402,6 +368,7 @@
> @dirrm %%DATADIR%%/locale/me
> @dirrm %%DATADIR%%/locale/lt
> @dirrm %%DATADIR%%/locale/ko
>+@dirrm %%DATADIR%%/locale/kk
> @dirrm %%DATADIR%%/locale/ka
> @dirrm %%DATADIR%%/locale/ja
> @dirrm %%DATADIR%%/locale/it
>@@ -409,11 +376,13 @@
> @dirrm %%DATADIR%%/locale/hu
> @dirrm %%DATADIR%%/locale/hr
> @dirrm %%DATADIR%%/locale/hi
>+@dirrm %%DATADIR%%/locale/he
> @dirrm %%DATADIR%%/locale/gd
> @dirrm %%DATADIR%%/locale/fy
> @dirrm %%DATADIR%%/locale/fr-CA
> @dirrm %%DATADIR%%/locale/fr
> @dirrm %%DATADIR%%/locale/fi
>+@dirrm %%DATADIR%%/locale/fa
> @dirrm %%DATADIR%%/locale/et
> @dirrm %%DATADIR%%/locale/es-LA
> @dirrm %%DATADIR%%/locale/es-ES
>@@ -427,6 +396,7 @@
> @dirrm %%DATADIR%%/locale/bg
> @dirrm %%DATADIR%%/locale/be
> @dirrm %%DATADIR%%/locale/az
>+@dirrm %%DATADIR%%/locale/ar
> @dirrm %%DATADIR%%/locale/af
> @dirrm %%DATADIR%%/locale
> @dirrm %%DATADIR%%/extra
>@@ -460,6 +430,7 @@
> @dirrm %%DOCSDIR%%
> @dirrmtry share/applications
> @dirrm lib/opera/plugins
>+@dirrm lib/opera/pluginwrapper
> @dirrm lib/opera/gstreamer/plugins
> @dirrm lib/opera/gstreamer
> @dirrm lib/opera

Actions: View | Diff

Attachments on bug 169070: 125455