Attachment 116056 Details for Bug 157961 – patch

[patch] patch

patch (text/plain), 15.14 KB, created by Chris Mangin on 2011-06-17 21:40:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Mangin

Created: 2011-06-17 21:40:10 UTC

Size: 15.14 KB

patch

obsolete

>diff -ruN gnash.orig/Makefile gnash/Makefile
>--- gnash.orig/Makefile	2011-03-10 08:48:02.000000000 -0500
>+++ gnash/Makefile	2011-06-17 16:10:10.169953919 -0400
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	gnash
>-PORTVERSION=	0.8.8
>-PORTREVISION=	1
>+PORTVERSION=	0.8.9
> CATEGORIES=	graphics
> MASTER_SITES=	GNU/${PORTNAME}/${PORTVERSION}/ \
> 		http://mirror.amdmi3.ru/distfiles/
>@@ -34,13 +33,14 @@
> USE_XORG=	x11 xau xdmcp xext xi xinerama ice sm xv
> USE_AUTOTOOLS=	libltdl
> MAKE_JOBS_SAFE=	yes
>+INSTALLS_ICONS=	yes
> 
> # jemalloc leads to infinite recursion on FreeBSD
> # --enable-avm2 doesn't build (but consider for future)
> CONFIGURE_ARGS=	--with-boost-incl="${LOCALBASE}/include" \
> 		--with-boost-lib="${LOCALBASE}/lib" \
> 		--disable-testsuite --disable-avm2 \
>-		--with-plugins-install=system \
>+		--with-plugins-install=prefix \
> 		--sysconfdir="${WRKDIR}/etc" \
> 		--disable-jemalloc \
> 		--disable-silent-rules
>@@ -54,7 +54,7 @@
> USE_LDCONFIG=	${PREFIX}/lib/gnash
> 
> MAN1=		cygnal.1 findmicrophones.1 findwebcams.1 \
>-		flvdumper.1 gnash.1 gprocessor.1 gtk-gnash.1 kde4-gnash.1 \
>+		flvdumper.1 gnash.1 gprocessor.1 \
> 		rtmpget.1 soldumper.1
> 
> OPTIONS=	PLUGIN		"Enable browser plugin" on \
>@@ -95,7 +95,9 @@
> #
> .if !defined(WITHOUT_GTK) && !defined(WITHOUT_PLUGIN)
> USE_WEBPLUGINS=		native
>-WEBPLUGINS_FILES=	libgnashplugin.so
>+WEBPLUGINS_FILES=	gecko18/libgnashplugin.so gecko19/libgnashplugin.so\
>+			opera-devel/libgnashplugin.so opera/libgnashplugin.so\
>+			webkit-gtk2/libgnashplugin.so libgnashplugin.so
> .include "${PORTSDIR}/www/firefox/Makefile.webplugins"
> PLIST_SUB+=	NPAPI=""
> CONFIGURE_ARGS+=--with-npapi-plugindir="${WEBPLUGINS_DIR}"
>@@ -115,6 +117,8 @@
> .if defined(WITH_KDE4) && !defined(WITHOUT_PLUGIN)
> PLIST_SUB+=	KPARTS4=""
> USE_LDCONFIG+=	${KDE4_PREFIX}/lib/kde4
>+CONFIGURE_ARGS+=	--with-kde4_prefix=${PREFIX}/kde4
>+MAN1+=	gnash-qt-launcher.1 kde4-gnash.1
> .else
> PLIST_SUB+=	KPARTS4="@comment "
> CONFIGURE_ARGS+=	--disable-kparts4
>@@ -129,6 +133,7 @@
> USE_GNOME=	gtk20
> GNASH_GUIS+=	gtk
> PLIST_SUB+=	GTK=""
>+MAN1+=	gnash-gtk-launcher.1 gtk-gnash.1
> .else
> PLIST_SUB+=	GTK="@comment "
> .endif
>diff -ruN gnash.orig/distinfo gnash/distinfo
>--- gnash.orig/distinfo	2010-10-01 07:01:37.000000000 -0400
>+++ gnash/distinfo	2011-06-17 16:10:10.169953919 -0400
>@@ -1,3 +1,2 @@
>-MD5 (gnash-0.8.8.tar.bz2) = ce57f66e222f7eb1adf7f7b4a1274612
>-SHA256 (gnash-0.8.8.tar.bz2) = dcac4b81f81ecd6cc7c5422d7c731fc5c2a7be7fb18b5570a7e6f8fb5fc6e220
>-SIZE (gnash-0.8.8.tar.bz2) = 3850383
>+SHA256 (gnash-0.8.9.tar.bz2) = f90dbdc6f03d787b239b9edacbea077b46d69ae9d85f08af23f256af389c48bd
>+SIZE (gnash-0.8.9.tar.bz2) = 3777140
>diff -ruN gnash.orig/files/patch-configure gnash/files/patch-configure
>--- gnash.orig/files/patch-configure	1969-12-31 19:00:00.000000000 -0500
>+++ gnash/files/patch-configure	2011-06-17 16:10:10.169953919 -0400
>@@ -0,0 +1,14 @@
>+--- configure.orig	2011-06-17 14:55:08.857169643 -0400
>++++ configure	2011-06-17 15:03:29.300807257 -0400
>+@@ -27778,6 +27778,11 @@
>+       esac
>+     fi
>+ 
>++#  KDE4_PREFIX override
>++    if test x"${with_kde4_prefix}" != x; then
>++        KDE4_PREFIX="${with_kde4_prefix}"
>++    fi
>++
>+     if test x"${with_kde4_plugindir}" != x ; then
>+       KDE4_PLUGINDIR="${with_kde4_plugindir}"
>+     else
>diff -ruN gnash.orig/files/patch-libbase-tu_file.h gnash/files/patch-libbase-tu_file.h
>--- gnash.orig/files/patch-libbase-tu_file.h	2010-10-03 09:44:28.000000000 -0400
>+++ gnash/files/patch-libbase-tu_file.h	1969-12-31 19:00:00.000000000 -0500
>@@ -1,10 +0,0 @@
>---- libbase/tu_file.h.orig	2010-08-07 19:50:00.000000000 +0400
>-+++ libbase/tu_file.h	2010-10-01 20:49:40.000000000 +0400
>-@@ -12,6 +12,7 @@
>- #include "dsodefs.h" // DSOEXPORT
>- #include "utility.h"
>- #include "IOChannel.h" // for inheritance
>-+#include <cstdio>
>- 
>- 
>- namespace gnash {
>diff -ruN gnash.orig/files/patch-plugin-klash-klash_part.cpp gnash/files/patch-plugin-klash-klash_part.cpp
>--- gnash.orig/files/patch-plugin-klash-klash_part.cpp	2009-03-05 22:10:17.000000000 -0500
>+++ gnash/files/patch-plugin-klash-klash_part.cpp	2011-06-17 16:10:10.168954032 -0400
>@@ -1,6 +1,6 @@
>---- plugin/klash/klash_part.cpp.orig	2009-03-02 18:29:45.000000000 +0300
>-+++ plugin/klash/klash_part.cpp	2009-03-06 05:27:45.000000000 +0300
>-@@ -160,7 +160,7 @@
>+--- plugin/klash/klash_part.cpp.orig	2011-06-16 18:54:16.833252653 -0400
>++++ plugin/klash/klash_part.cpp	2011-06-16 18:54:56.913835639 -0400
>+@@ -161,7 +161,7 @@
>      QString procname;
>      char *gnash_env = getenv("KLASH_PLAYER");
>      if (!gnash_env) {
>diff -ruN gnash.orig/files/patch-plugin-klash4-klash_part.cpp gnash/files/patch-plugin-klash4-klash_part.cpp
>--- gnash.orig/files/patch-plugin-klash4-klash_part.cpp	2009-03-05 22:10:17.000000000 -0500
>+++ gnash/files/patch-plugin-klash4-klash_part.cpp	2011-06-17 16:10:10.169953919 -0400
>@@ -1,6 +1,6 @@
>---- plugin/klash4/klash_part.cpp.orig	2009-03-02 18:29:50.000000000 +0300
>-+++ plugin/klash4/klash_part.cpp	2009-03-06 05:44:08.000000000 +0300
>-@@ -147,7 +147,7 @@
>+--- plugin/klash4/klash_part.cpp.orig	2011-06-16 18:56:30.869545798 -0400
>++++ plugin/klash4/klash_part.cpp	2011-06-16 18:57:04.979892841 -0400
>+@@ -148,7 +148,7 @@
>          }
>      }
>      KParts::Part::setWidget (new KlashView (wparent));
>diff -ruN gnash.orig/files/patch-plugin-npapi-Makefile.in gnash/files/patch-plugin-npapi-Makefile.in
>--- gnash.orig/files/patch-plugin-npapi-Makefile.in	2010-10-01 07:01:37.000000000 -0400
>+++ gnash/files/patch-plugin-npapi-Makefile.in	2011-06-17 16:10:10.168954032 -0400
>@@ -1,11 +1,11 @@
>---- plugin/npapi/Makefile.in.orig	2010-08-21 22:04:45.000000000 +0400
>-+++ plugin/npapi/Makefile.in	2010-08-25 05:43:40.000000000 +0400
>-@@ -637,7 +637,7 @@
>+--- plugin/npapi/Makefile.in.orig	2011-06-16 18:47:41.180628330 -0400
>++++ plugin/npapi/Makefile.in	2011-06-16 18:48:21.950238296 -0400
>+@@ -633,7 +633,7 @@
>  	-I$(top_srcdir)/libcore/parser -I$(top_srcdir)/libbase \
>  	-I$(top_srcdir)/librender -I$(srcdir)/mozilla-sdk \
>- 	-I$(srcdir)/mozilla-sdk/include $(GLIB_CFLAGS) $(NULL) \
>--	$(am__append_1) $(am__append_2)
>-+	$(am__append_1) $(am__append_2) $(BOOST_CFLAGS)
>+ 	$(NPAPI_CFLAGS) $(X11_CFLAGS) $(GLIB_CFLAGS) $(NULL) \
>+-	$(am__append_1) $(am__append_2) $(am__append_3)
>++	$(am__append_1) $(am__append_2) $(am__append_3) $(BOOST_CFLAGS)
>  
>  # AM_CXXFLAGS = $(AM_CPPFLAGS)
>  noinst_HEADERS = plugin.h mozilla-sdk/pluginbase.h \
>diff -ruN gnash.orig/pkg-plist gnash/pkg-plist
>--- gnash.orig/pkg-plist	2011-03-10 01:29:13.000000000 -0500
>+++ gnash/pkg-plist	2011-06-17 16:10:10.169953919 -0400
>@@ -1,26 +1,29 @@
> bin/gnash
>+%%GTK%%bin/gnash-gtk-launcher
> %%GTK%%bin/gtk-gnash
> %%KDE%%bin/kde3-gnash
>+%%KDE4%%bin/gnash-qt-launcher
> %%KDE4%%bin/kde4-gnash
> bin/gprocessor
> bin/rtmpget
> %%GSTREAMER%%bin/findmicrophones
> %%GSTREAMER%%bin/findwebcams
> %%CYGNAL%%bin/cygnal
>-@comment %%CYGNAL%%bin/dumpshm
> %%CYGNAL%%bin/flvdumper
> %%CYGNAL%%bin/soldumper
> %%NPAPI%%%%WEBPLUGINS_DIR%%/libgnashplugin.so
>-@comment Should be //KPARTS//, but it is installed regardless of whether plugin is enabled
>-%%KPARTS%%share/apps/klash/pluginsinfo
>-%%KPARTS%%share/apps/klash/klashpartui.rc
>-@comment Should be //KPARTS//, but it is installed regardless of whether plugin is enabled
>-%%KPARTS%%share/services/klash_part.desktop
>+%%CYGNAL%%@unexec if cmp -s %D/etc/cygnalrc.dist %D/etc/cygnalrc; then rm -f %D/etc/cygnalrc; fi
>+%%CYGNAL%%etc/cygnalrc.dist
>+%%CYGNAL%%@exec if [ ! -f %B/cygnalrc ]; then cp -p %D/%F %B/cygnalrc; fi
>+@unexec if cmp -s %D/etc/gnashpluginrc.dist %D/etc/gnashpluginrc; then rm -f %D/etc/gnashpluginrc; fi
>+etc/gnashpluginrc.dist
>+@exec if [ ! -f %B/gnashpluginrc ]; then cp -p %D/%F %B/gnashpluginrc; fi
>+@unexec if cmp -s %D/etc/gnashrc.dist %D/etc/gnashrc; then rm -f %D/etc/gnashrc; fi
>+etc/gnashrc.dist
>+@exec if [ ! -f %B/gnashrc ]; then cp -p %D/%F %B/gnashrc; fi
> include/gnash/AMF.h
> include/gnash/BevelFilter_as.h
> include/gnash/BitmapData_as.h
>-include/gnash/BitmapFilterQuality_as.h
>-include/gnash/BitmapFilterType_as.h
> include/gnash/BitmapFilter_as.h
> include/gnash/BitsReader.h
> include/gnash/BlurFilter_as.h
>@@ -29,14 +32,13 @@
> include/gnash/ColorMatrixFilter_as.h
> include/gnash/ColorTransform_as.h
> include/gnash/ConvolutionFilter_as.h
>-include/gnash/DisplacementMapFilterMode_as.h
> include/gnash/DisplacementMapFilter_as.h
> include/gnash/DropShadowFilter_as.h
> include/gnash/ExternalInterface_as.h
>-include/gnash/FileTypes.h
> include/gnash/GC.h
> include/gnash/GlowFilter_as.h
> include/gnash/GnashAlgorithm.h
>+include/gnash/GnashEnums.h
> include/gnash/GnashException.h
> include/gnash/GnashFactory.h
> include/gnash/GnashFileUtilities.h
>@@ -50,6 +52,7 @@
> include/gnash/GradientBevelFilter_as.h
> include/gnash/GradientGlowFilter_as.h
> include/gnash/IOChannel.h
>+include/gnash/ImageIterators.h
> include/gnash/Matrix_as.h
> include/gnash/NamingPolicy.h
> include/gnash/NetworkAdapter.h
>@@ -58,15 +61,22 @@
> include/gnash/RTMP.h
> include/gnash/Range2d.h
> include/gnash/Rectangle_as.h
>+include/gnash/Renderer.h
>+include/gnash/SWFCtype.h
> include/gnash/SharedMem.h
> include/gnash/SimpleBuffer.h
> include/gnash/Socket.h
>+include/gnash/Stats.h
>+include/gnash/StreamProvider.h
> include/gnash/StringPredicates.h
> include/gnash/Transform_as.h
> include/gnash/URL.h
>+include/gnash/URLAccessManager.h
> include/gnash/WallClockTimer.h
>+include/gnash/accumulator.h
> include/gnash/arg_parser.h
> include/gnash/asobj/AMFConverter.h
>+include/gnash/asobj/ASConversions.h
> include/gnash/asobj/Accessibility_as.h
> include/gnash/asobj/Array_as.h
> include/gnash/asobj/AsBroadcaster.h
>@@ -77,18 +87,18 @@
> include/gnash/asobj/ContextMenuItem_as.h
> include/gnash/asobj/ContextMenu_as.h
> include/gnash/asobj/ControlTag.h
>-include/gnash/asobj/CustomActions.h
> include/gnash/asobj/Date_as.h
> include/gnash/asobj/DefinitionTag.h
> include/gnash/asobj/DisplayList.h
> include/gnash/asobj/DisplayObject.h
> include/gnash/asobj/DisplayObjectContainer.h
>+include/gnash/asobj/DragState.h
> include/gnash/asobj/DynamicShape.h
> include/gnash/asobj/Error_as.h
> include/gnash/asobj/FillStyle.h
>+include/gnash/asobj/Function_as.h
> include/gnash/asobj/Geometry.h
> include/gnash/asobj/Global_as.h
>-include/gnash/asobj/Globals.h
> include/gnash/asobj/GnashKey.h
> include/gnash/asobj/InteractiveObject.h
> include/gnash/asobj/Key_as.h
>@@ -119,6 +129,7 @@
> include/gnash/asobj/Relay.h
> include/gnash/asobj/RunResources.h
> include/gnash/asobj/SWF.h
>+include/gnash/asobj/SWFCxForm.h
> include/gnash/asobj/SWFMatrix.h
> include/gnash/asobj/SWFRect.h
> include/gnash/asobj/Selection_as.h
>@@ -126,7 +137,6 @@
> include/gnash/asobj/SharedObject_as.h
> include/gnash/asobj/Sound_as.h
> include/gnash/asobj/Stage_as.h
>-include/gnash/asobj/StreamProvider.h
> include/gnash/asobj/String_as.h
> include/gnash/asobj/System_as.h
> include/gnash/asobj/TagLoadersTable.h
>@@ -143,10 +153,7 @@
> include/gnash/asobj/as_object.h
> include/gnash/asobj/as_value.h
> include/gnash/asobj/builtin_function.h
>-include/gnash/asobj/cxform.h
>-include/gnash/asobj/drag_state.h
> include/gnash/asobj/event_id.h
>-include/gnash/asobj/gnash.h
> include/gnash/asobj/movie_root.h
> include/gnash/asobj/namedStrings.h
> include/gnash/display_pkg.h
>@@ -162,7 +169,6 @@
> include/gnash/log.h
> include/gnash/net_pkg.h
> include/gnash/noseek_fd_adapter.h
>-include/gnash/ogl.h
> include/gnash/parser/movie_definition.h
> include/gnash/rc.h
> include/gnash/ref_counted.h
>@@ -173,70 +179,54 @@
> include/gnash/text_pkg.h
> include/gnash/tree.hh
> include/gnash/tu_file.h
>-include/gnash/tu_opengl_includes.h
> include/gnash/utf8.h
> include/gnash/utility.h
> include/gnash/vm/ASHandlers.h
> include/gnash/vm/ActionExec.h
> include/gnash/vm/CallStack.h
> include/gnash/vm/ExecutableCode.h
>-include/gnash/vm/Machine.h
> include/gnash/vm/SafeStack.h
> include/gnash/vm/VM.h
> include/gnash/vm/fn_call.h
> include/gnash/zlib_adapter.h
>+%%KPARTS%%share/apps/klash/pluginsinfo
>+%%KPARTS%%share/apps/klash/klashpartui.rc
>+%%KPARTS%%share/services/klash_part.desktop
> %%KPARTS%%lib/kde3/libklashpart.so
>-%%KPARTS%%lib/kde3/libklashpart.la
> %%KPARTS4%%kde4/share/apps/klash/pluginsinfo
> %%KPARTS4%%kde4/share/apps/klash/klashpartui.rc
> %%KPARTS4%%kde4/share/kde4/services/klash_part.desktop
> %%KPARTS4%%kde4/lib/kde4/libklashpart.so
>-%%KPARTS4%%kde4/lib/kde4/libklashpart.la
>-%%CYGNAL%%@unexec if cmp -s %D/etc/cygnalrc.dist %D/etc/cygnalrc; then rm -f %D/etc/cygnalrc; fi
>-%%CYGNAL%%etc/cygnalrc.dist
>-%%CYGNAL%%@exec if [ ! -f %B/cygnalrc ]; then cp -p %D/%F %B/cygnalrc; fi
>-@unexec if cmp -s %D/etc/gnashpluginrc.dist %D/etc/gnashpluginrc; then rm -f %D/etc/gnashpluginrc; fi
>-etc/gnashpluginrc.dist
>-@exec if [ ! -f %B/gnashpluginrc ]; then cp -p %D/%F %B/gnashpluginrc; fi
>-@unexec if cmp -s %D/etc/gnashrc.dist %D/etc/gnashrc; then rm -f %D/etc/gnashrc; fi
>-etc/gnashrc.dist
>-@exec if [ ! -f %B/gnashrc ]; then cp -p %D/%F %B/gnashrc; fi
> %%CYGNAL%%lib/cygnal/plugins/echo.so
> %%CYGNAL%%lib/cygnal/plugins/oflaDemo.so
> %%CYGNAL%%lib/gnash/libgnashamf-%%GNASHVER%%.so
>-%%CYGNAL%%lib/gnash/libgnashamf.la
> %%CYGNAL%%lib/gnash/libgnashamf.so
> lib/gnash/libgnashbase-%%GNASHVER%%.so
>-lib/gnash/libgnashbase.la
> lib/gnash/libgnashbase.so
> lib/gnash/libgnashcore-%%GNASHVER%%.so
>-lib/gnash/libgnashcore.la
> lib/gnash/libgnashcore.so
> lib/gnash/libgnashmedia-%%GNASHVER%%.so
>-lib/gnash/libgnashmedia.la
> lib/gnash/libgnashmedia.so
>-%%CYGNAL%%lib/gnash/libgnashnet.la
>+%%CYGNAL%%lib/gnash/libgnashnet-%%GNASHVER%%.so
> %%CYGNAL%%lib/gnash/libgnashnet.so
>-%%CYGNAL%%lib/gnash/libgnashnet.so.0
>-lib/gnash/libgnashrender.la
>+lib/gnash/libgnashrender-%%GNASHVER%%.so
> lib/gnash/libgnashrender.so
>-lib/gnash/libgnashrender.so.0
> lib/gnash/libgnashsound-%%GNASHVER%%.so
>-lib/gnash/libgnashsound.la
> lib/gnash/libgnashsound.so
> %%VAAPI%%lib/gnash/libgnashvaapi-%%GNASHVER%%.so
> %%VAAPI%%lib/gnash/libgnashvaapi.la
> %%VAAPI%%lib/gnash/libgnashvaapi.so
>-@comment %%NPAPI%%lib/gnash/libmozsdk.la
>-@comment %%NPAPI%%lib/gnash/libmozsdk.so
>-@comment %%NPAPI%%lib/gnash/libmozsdk.so.0
> libdata/pkgconfig/gnash.pc
>-%%DOCSDIR%%/gnashuser.html
>-%%DOCSDIR%%/images/car_crash.png
>-%%DOCSDIR%%/images/rtmp.png
>-%%DOCSDIR%%/gnashref.html
>+%%GTK%%share/applications/gnash.desktop
>+%%KDE4%%share/applications/klash.desktop
>+%%DATADIR%%/doc/gnash/C/gnashref.html
>+%%DATADIR%%/doc/gnash/C/gnashuser.html
>+%%DATADIR%%/doc/gnash/C/images/rtmp.png
> %%DATADIR%%/GnashG.png
>+%%DATADIR%%/gnash-splash.swf
> %%DATADIR%%/gnash_128_96.ico
>+%%GTK%%share/icons/hicolor/32x32/apps/gnash.xpm
>+%%KDE4%%share/icons/hicolor/32x32/apps/klash.xpm
> share/locale/cs/LC_MESSAGES/gnash.mo
> share/locale/de/LC_MESSAGES/gnash.mo
> share/locale/es/LC_MESSAGES/gnash.mo
>@@ -244,17 +234,23 @@
> share/locale/fr/LC_MESSAGES/gnash.mo
> share/locale/it/LC_MESSAGES/gnash.mo
> share/locale/ja/LC_MESSAGES/gnash.mo
>+@dirrmtry share/icons/hicolor/32x32/apps
>+@dirrmtry share/icons/hicolor/32x32
>+@dirrmtry share/icons/hicolor
>+@dirrmtry share/icons
>+@dirrm %%DATADIR%%/doc/gnash/C/images
>+@dirrm %%DATADIR%%/doc/gnash/C
>+@dirrm %%DATADIR%%/doc/gnash
>+@dirrm %%DATADIR%%/doc
> @dirrm %%DATADIR%%
>-@dirrm %%DOCSDIR%%/images
>-@dirrm %%DOCSDIR%%
>+@dirrmtry share/applications
> @dirrm lib/gnash
>-%%CYGNAL%%@dirrm lib/cygnal/plugins
>-%%CYGNAL%%@dirrm lib/cygnal
>+%%CYGNAL%%@dirrmtry lib/cygnal/plugins
>+%%CYGNAL%%@dirrmtry lib/cygnal
> @dirrm include/gnash/vm
> @dirrm include/gnash/parser
> @dirrm include/gnash/asobj
> @dirrm include/gnash
>-@comment Should be //KPARTS//, but it is installed regardless of whether plugin is enabled
> %%KPARTS%%@dirrm share/apps/klash
> %%KPARTS4%%@dirrm kde4/share/apps/klash
> %%NPAPI%%@dirrmtry %%WEBPLUGINS_DIR%%

Actions: View | Diff

Attachments on bug 157961: 116056 | 116057 | 116058