r225 - in /packages/gnash/trunk/debian: changelog control patches/paused-widget.patch patches/series
miriam at users.alioth.debian.org
miriam at users.alioth.debian.org
Tue Apr 29 08:47:01 UTC 2008
Author: miriam
Date: Tue Apr 29 08:47:01 2008
New Revision: 225
URL: http://svn.debian.org/wsvn/pkg-flash/?sc=1&rev=225
Log:
Synced with 0.8.2 branch
Added:
packages/gnash/trunk/debian/patches/paused-widget.patch
Modified:
packages/gnash/trunk/debian/changelog
packages/gnash/trunk/debian/control
packages/gnash/trunk/debian/patches/series
Modified: packages/gnash/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/trunk/debian/changelog?rev=225&op=diff
==============================================================================
--- packages/gnash/trunk/debian/changelog (original)
+++ packages/gnash/trunk/debian/changelog Tue Apr 29 08:47:01 2008
@@ -1,9 +1,11 @@
-gnash (0.8.2-2) UNRELEASED; urgency=low
-
- * Compare libqt3-mt-dev and libqt3-mt with 3:3.3.8 instead of 3.3.8 to check
- that it's GPLv3 sompatible
-
- -- Miriam Ruiz <miriam at xana.digi.com> Wed, 09 Apr 2008 12:35:55 +0200
+gnash (0.8.2-2) unstable; urgency=low
+
+ * Add myself to Uploaders (with Miriam's blessing).
+ * debian/patches/paused-widget.patch: New. Backport from upstream CVS.
+ Implements a widget for paused mode. (Closes: #477911)
+ * debian/control (Build-Depends): Remove base-files. (Closes: #441019)
+
+ -- Robert Millan <rmh at aybabtu.com> Sun, 27 Apr 2008 14:18:36 +0200
gnash (0.8.2-1) unstable; urgency=low
Modified: packages/gnash/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/trunk/debian/control?rev=225&op=diff
==============================================================================
--- packages/gnash/trunk/debian/control (original)
+++ packages/gnash/trunk/debian/control Tue Apr 29 08:47:01 2008
@@ -1,7 +1,7 @@
Source: gnash
Priority: optional
Maintainer: Miriam Ruiz <little_miry at yahoo.es>
-Uploaders: Alexander Sack <asac at jwsdot.com>
+Uploaders: Alexander Sack <asac at jwsdot.com>, Robert Millan <rmh at aybabtu.com>
Build-Depends: dpkg-dev (>= 1.13.19), debhelper (>= 4.0.0), quilt, autoconf, dh-buildinfo,
automake1.9 | automake, libtool, libltdl3-dev, help2man, libxmu-dev, dejagnu,
autotools-dev, libboost-dev, libboost-thread-dev, libxml2-dev, libjpeg-dev,
@@ -9,8 +9,8 @@
libpango1.0-dev | pango-devel, libgtkglext1-dev, libmad0-dev,
libcurl4-gnutls-dev | libcurl3-gnutls-dev | libcurl4-openssl-dev | libcurl3-openssl-dev,
libcaca-dev, libboost-date-time-dev, libavcodec-dev, libavformat-dev, libming-dev,
- libming-util, libgstreamer-plugins-base0.10-dev, libqt3-mt-dev (>= 3:3.3.8),
- libboost-serialization-dev, python, base-files (>= 4.0.1)
+ libming-util, libgstreamer-plugins-base0.10-dev, libqt3-mt-dev (>=3.3.8),
+ libboost-serialization-dev, python
Standards-Version: 3.7.3
Section: utils
Homepage: http://www.gnu.org/software/gnash/
@@ -52,7 +52,7 @@
Package: klash
Section: utils
Architecture: any
-Depends: gnash-common (= ${binary:Version}), libqt3-mt (>= 3:3.3.8),
+Depends: gnash-common (= ${binary:Version}), libqt3-mt (>= 3.3.8),
${shlibs:Depends}, ${misc:Depends}
Description: free Flash movie player - standalone player for KDE
Gnash is a free GPL'd Flash movie player, which works either standalone, or as
Added: packages/gnash/trunk/debian/patches/paused-widget.patch
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/trunk/debian/patches/paused-widget.patch?rev=225&op=file
==============================================================================
--- packages/gnash/trunk/debian/patches/paused-widget.patch (added)
+++ packages/gnash/trunk/debian/patches/paused-widget.patch Tue Apr 29 08:47:01 2008
@@ -1,0 +1,159 @@
+
+Merged in CVS. See https://savannah.gnu.org/patch/?6495
+
+diff -ur gnash-0.8.2/gui/gtk.cpp gnash-0.8.2.new/gui/gtk.cpp
+--- gnash-0.8.2/gui/gtk.cpp 2008-02-20 22:42:14.000000000 +0100
++++ gnash-0.8.2.new/gui/gtk.cpp 2008-04-27 12:53:11.000000000 +0200
+@@ -78,6 +78,18 @@
+ GtkGui::GtkGui(unsigned long xid, float scale, bool loop, unsigned int depth)
+ :
+ Gui(xid, scale, loop, depth)
++#ifdef GUI_HILDON
++ ,_hildon_program(0)
++#endif
++ ,_window(0)
++ ,_overlay(0)
++ ,_drawingArea(0)
++ ,_resumeButton(0)
++ ,_popup_menu(0)
++ ,_menubar(0)
++ ,_vbox(0)
++ ,_drawbounds()
++ ,_glue()
+ {
+ }
+
+@@ -125,6 +137,19 @@
+
+ _drawingArea = gtk_drawing_area_new();
+
++ // Increase reference count to prevent its destruction (which could happen
++ // later if we remove it from its container).
++ g_object_ref(G_OBJECT(_drawingArea));
++
++ _resumeButton = gtk_button_new();
++ gtk_container_add(GTK_CONTAINER(_resumeButton), gtk_label_new(_("Click to play")));
++
++ // Same here.
++ g_object_ref(G_OBJECT(_resumeButton));
++
++ // This callback indirectly results in playHook() being called.
++ g_signal_connect(G_OBJECT(_resumeButton), "clicked", G_CALLBACK (menuitem_play_callback), this);
++
+ // IF we don't set this flag we won't be able to grab focus
+ // ( grabFocus() would be a no-op )
+ GTK_WIDGET_SET_FLAGS (GTK_WIDGET(_drawingArea), GTK_CAN_FOCUS);
+@@ -210,6 +235,11 @@
+ g_timeout_add_full (G_PRIORITY_LOW, _interval, (GSourceFunc)advance_movie,
+ this, NULL);
+
++ // The first time stop() was called, stopHook() might not have had a chance
++ // to do anything, because GTK+ wasn't garanteed to be initialised.
++ if (isStopped())
++ stopHook();
++
+ gtk_main();
+ return true;
+ }
+@@ -2142,5 +2172,44 @@
+ return true;
+ }
+
++
++void
++GtkGui::stopHook()
++{
++ // FIXME: this can't work for the stand-alone player, because _drawingArea is
++ // packed into a vbox.
++ if (! _xid)
++ return;
++
++ // Assert they're either both initialised or both uninitialised
++ assert ((_resumeButton && _drawingArea) || !(_resumeButton || _drawingArea));
++
++ if (_drawingArea)
++ gtk_container_remove(GTK_CONTAINER(_window), _drawingArea);
++ if (_resumeButton)
++ gtk_container_add(GTK_CONTAINER(_window), _resumeButton);
++
++ gtk_widget_show_all(_resumeButton);
++}
++
++void
++GtkGui::playHook()
++{
++ // FIXME: this can't work for the stand-alone player, because _drawingArea is
++ // packed into a vbox.
++ if (! _xid)
++ return;
++
++ // Assert they're either both initialised or both uninitialised
++ assert ((_resumeButton && _drawingArea) || !(_resumeButton || _drawingArea));
++
++ if (_resumeButton)
++ gtk_container_remove(GTK_CONTAINER(_window), _resumeButton);
++ if (_drawingArea)
++ gtk_container_add(GTK_CONTAINER(_window), _drawingArea);
++
++ gtk_widget_show_all(_drawingArea);
++}
++
+ } // end of namespace gnash
+
+diff -ur gnash-0.8.2/gui/gtksup.h gnash-0.8.2.new/gui/gtksup.h
+--- gnash-0.8.2/gui/gtksup.h 2008-02-14 14:27:56.000000000 +0100
++++ gnash-0.8.2.new/gui/gtksup.h 2008-04-27 12:52:46.000000000 +0200
+@@ -185,6 +185,7 @@
+ HildonProgram *_hildon_program;
+ #endif
+ GtkWidget *_window;
++ GtkWidget *_resumeButton;
+
+ // A window only for rendering the plugin as fullscreen.
+ GtkWidget *_overlay;
+@@ -248,6 +249,8 @@
+ static void handlePrefs(GtkWidget* widget, gint response, gpointer data);
+ static void openFile(GtkWidget* dialog, gpointer data);
+
++ void stopHook();
++ void playHook();
+ };
+
+ // end of namespace gnash
+diff -ur gnash-0.8.2/gui/gui.cpp gnash-0.8.2.new/gui/gui.cpp
+--- gnash-0.8.2/gui/gui.cpp 2008-02-19 20:20:49.000000000 +0100
++++ gnash-0.8.2.new/gui/gui.cpp 2008-04-27 12:52:46.000000000 +0200
+@@ -656,6 +656,8 @@
+
+ _stopped = false;
+ if ( ! _started ) start();
++
++ playHook ();
+ }
+
+ void
+@@ -664,6 +666,8 @@
+ if ( _stopped ) return;
+
+ _stopped = true;
++
++ stopHook ();
+ }
+
+ void
+diff -ur gnash-0.8.2/gui/gui.h gnash-0.8.2.new/gui/gui.h
+--- gnash-0.8.2/gui/gui.h 2008-01-21 21:55:42.000000000 +0100
++++ gnash-0.8.2.new/gui/gui.h 2008-04-27 12:52:46.000000000 +0200
+@@ -364,6 +364,12 @@
+ // True if Gnash is running in fullscreen
+ bool _fullscreen;
+
++ /// Called by Gui::stop(). This can be used by GUIs to implement pause
++ /// widgets (so that resuming a stopped animation is more user-friendly)
++ virtual void stopHook() {}
++ /// Called by Gui::play().
++ virtual void playHook() {}
++
+ private:
+
+ bool display(movie_root* m);
Modified: packages/gnash/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/trunk/debian/patches/series?rev=225&op=diff
==============================================================================
--- packages/gnash/trunk/debian/patches/series (original)
+++ packages/gnash/trunk/debian/patches/series Tue Apr 29 08:47:01 2008
@@ -1,3 +1,4 @@
do-not-delete-gmo-files
#fix-upstream-manpage.patch
gcc-4.3.patch
+paused-widget.patch
More information about the pkg-flash-devel
mailing list