r149 - in /packages/gnash/branches/0.8.1/debian/patches: fix_network.patch gnashg_png.patch series

[baby-guest at users.alioth.debian.org]

Author: baby-guest
Date: Thu Aug 16 21:29:51 2007
New Revision: 149

URL: http://svn.debian.org/wsvn/pkg-flash/?sc=1&rev=149
Log:
Updated patches


Added:
    packages/gnash/branches/0.8.1/debian/patches/fix_network.patch
Modified:
    packages/gnash/branches/0.8.1/debian/patches/gnashg_png.patch
    packages/gnash/branches/0.8.1/debian/patches/series

Added: packages/gnash/branches/0.8.1/debian/patches/fix_network.patch
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/branches/0.8.1/debian/patches/fix_network.patch?rev=149&op=file
==============================================================================
--- packages/gnash/branches/0.8.1/debian/patches/fix_network.patch (added)
+++ packages/gnash/branches/0.8.1/debian/patches/fix_network.patch Thu Aug 16 21:29:51 2007
@@ -1,0 +1,11 @@
+--- gnash-0.8.0+cvs20070815.1920.orig/libbase/network.cpp
++++ gnash-0.8.0+cvs20070815.1920/libbase/network.cpp
+@@ -149,7 +149,7 @@
+     }
+ 
+     // set protocol type
+-    if (DEFAULTPROTO == "udp") {
++    if (strcmp(DEFAULTPROTO, "udp") == 0) {
+         type = SOCK_DGRAM;
+     } else {
+         type = SOCK_STREAM;

Modified: packages/gnash/branches/0.8.1/debian/patches/gnashg_png.patch
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/branches/0.8.1/debian/patches/gnashg_png.patch?rev=149&op=diff
==============================================================================
--- packages/gnash/branches/0.8.1/debian/patches/gnashg_png.patch (original)
+++ packages/gnash/branches/0.8.1/debian/patches/gnashg_png.patch Thu Aug 16 21:29:51 2007
@@ -1,16 +1,28 @@
---- gnash-0.8.0+cvs20070615.1440/gui/gtk.cpp.orig	2007-06-13 17:56:18.000000000 +0000
-+++ gnash-0.8.0+cvs20070615.1440/gui/gtk.cpp	2007-06-15 17:50:33.057615687 +0000
-@@ -40,6 +40,9 @@
+--- gnash-0.8.0+cvs20070815.1920.orig/gui/Makefile.am
++++ gnash-0.8.0+cvs20070815.1920/gui/Makefile.am
+@@ -159,7 +159,7 @@
+ AM_CPPFLAGS += -DRENDERER_CONFIG=\"$(RENDERER_CONFIG)\"
+ AM_CPPFLAGS += -DMEDIA_CONFIG=\"$(MEDIA_CONFIG)\"
+ AM_CPPFLAGS += -DTARGET_CONFIG=\"$(target)\"
+-AM_CPPFLAGS += -DCONFIG_CONFIG="\"$(shell cat .configline)\""
++AM_CPPFLAGS += -DCONFIG_CONFIG="\"$(shell cat .configline | sed -e 's/\\/\\\\/g' -e 's/"/\\"/g')\""
+ 
+ dist_images_DATA = images/gnash_128_96.ico images/GnashG.png
+ #dist_images_DATA = images/gnash_G_v3.ico
+--- gnash-0.8.0+cvs20070815.1920.orig/gui/gtk.cpp
++++ gnash-0.8.0+cvs20070815.1920/gui/gtk.cpp
+@@ -40,6 +40,10 @@
  #include <gdk/gdkkeysyms.h>
  #include <string>
  
 +#ifndef GNASHG_PNG
 +#define GNASHG_PNG "GnashG.png"
 +#endif
- 
- using namespace std;
- 
-@@ -85,7 +88,7 @@
++
+ #ifdef RENDERER_OPENGL
+ #include "gtk_glue_gtkglext.h"
+ #endif
+@@ -104,7 +108,7 @@
      // XXXbjacques: why do we need this?
      gtk_container_set_reallocate_redraws(GTK_CONTAINER (_window), TRUE);
  
@@ -19,7 +31,7 @@
      if (_window_icon_pixbuf) {
          gtk_window_set_icon (GTK_WINDOW (_window), _window_icon_pixbuf);
  	gdk_pixbuf_unref (_window_icon_pixbuf);
-@@ -866,7 +869,7 @@
+@@ -920,7 +924,7 @@
      comments += ".";
  
      gtk_about_dialog_set_url_hook(NULL, NULL, NULL);

Modified: packages/gnash/branches/0.8.1/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/branches/0.8.1/debian/patches/series?rev=149&op=diff
==============================================================================
--- packages/gnash/branches/0.8.1/debian/patches/series (original)
+++ packages/gnash/branches/0.8.1/debian/patches/series Thu Aug 16 21:29:51 2007
@@ -1,4 +1,5 @@
 #ming_headers.patch
 #exclude-testsuite-from-built
 #no-kde-ldflags
-#gnashg_png.patch
+gnashg_png.patch
+fix_network.ptch