From 5c3df2730bf047e7e453140731ef1cf1379a543f Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Mar 20 2016 02:05:52 +0000 Subject: Add patch for wxEVT_MEDIA_XXX event types (for Phoenix) --- diff --git a/wxGTK3-3.0.2-media-docs.patch b/wxGTK3-3.0.2-media-docs.patch new file mode 100644 index 0000000..d6a97fe --- /dev/null +++ b/wxGTK3-3.0.2-media-docs.patch @@ -0,0 +1,54 @@ +From 03903c1e459f108e0c464db24064e4cde84f174a Mon Sep 17 00:00:00 2001 +From: Vadim Zeitlin +Date: Fri, 20 Dec 2013 17:50:27 +0000 +Subject: [PATCH] Document wxEVT_MEDIA_XXX event types. + +See #15768. + +(cherry picked from commit 5c1f95bc71028e4562f847af56b815b2f13370a9 on master) +--- + interface/wx/mediactrl.h | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/interface/wx/mediactrl.h b/interface/wx/mediactrl.h +index e425fa0..8bcfada 100644 +--- a/interface/wx/mediactrl.h ++++ b/interface/wx/mediactrl.h +@@ -48,6 +48,7 @@ enum wxMediaCtrlPlayerControls + @beginEventTable{wxMediaEvent} + @event{EVT_MEDIA_LOADED(id\, func)} + Sent when a media has loaded enough data that it can start playing. ++ Processes a @c wxEVT_MEDIA_LOADED event type. + @event{EVT_MEDIA_STOP(id\, func)} + Sent when a media has switched to the @c wxMEDIASTATE_STOPPED state. + You may be able to Veto this event to prevent it from stopping, +@@ -55,14 +56,19 @@ enum wxMediaCtrlPlayerControls + the media (note that this may not have the desired effect - if you + want to loop the media, for example, catch the @c EVT_MEDIA_FINISHED + and play there instead). ++ Processes a @c wxEVT_MEDIA_STOP event type. + @event{EVT_MEDIA_FINISHED(id\, func)} + Sent when a media has finished playing in a wxMediaCtrl. ++ Processes a @c wxEVT_MEDIA_FINISHED event type. + @event{EVT_MEDIA_STATECHANGED(id\, func)} + Sent when a media has switched its state (from any media state). ++ Processes a @c wxEVT_MEDIA_STATECHANGED event type. + @event{EVT_MEDIA_PLAY(id\, func)} + Sent when a media has switched to the @c wxMEDIASTATE_PLAYING state. ++ Processes a @c wxEVT_MEDIA_PLAY event type. + @event{EVT_MEDIA_PAUSE(id\, func)} + Sent when a media has switched to the @c wxMEDIASTATE_PAUSED state. ++ Processes a @c wxEVT_MEDIA_PAUSE event type. + @endEventTable + + @library{wxmedia} +@@ -442,3 +448,9 @@ class wxMediaCtrl : public wxControl + wxFileOffset Tell(); + }; + ++wxEventType wxEVT_MEDIA_LOADED; ++wxEventType wxEVT_MEDIA_STOP; ++wxEventType wxEVT_MEDIA_FINISHED; ++wxEventType wxEVT_MEDIA_STATECHANGED; ++wxEventType wxEVT_MEDIA_PLAY; ++wxEventType wxEVT_MEDIA_PAUSE; diff --git a/wxGTK3.spec b/wxGTK3.spec index 64f7f33..b087415 100644 --- a/wxGTK3.spec +++ b/wxGTK3.spec @@ -11,7 +11,7 @@ Name: %{wxgtkname} Version: 3.0.2 -Release: 17%{?dist} +Release: 18%{?dist} Summary: GTK port of the wxWidgets GUI library License: wxWidgets Group: System Environment/Libraries @@ -57,6 +57,10 @@ Patch7: %{name}-%{version}-getbestsize.patch # https://github.com/wxWidgets/wxWidgets/commit/0388ce8e25535415d9bdd79ce14eb20e73859279 Patch8: %{name}-%{version}-wayland-window-sizing1.patch Patch9: %{name}-%{version}-wayland-window-sizing2.patch +# This patch adds docs for the wxEVT_MEDIA_XXX event types (for Phoenix) +# For more details, see the upstream commits: +# https://github.com/wxWidgets/wxWidgets/commit/03903c1e459f108e0c464db24064e4cde84f174a +Patch10: %{name}-%{version}-media-docs.patch BuildRequires: gtk%{gtkver}-devel #Note webkitgtk (GTK2) does not appear to be supported %if %{gtkver} == 3 @@ -179,6 +183,7 @@ This package provides XML documentation for the %{srcname} library. %patch7 -p1 -b .getbestsize %patch8 -p1 -b .wayland-window-sizing1 %patch9 -p1 -b .wayland-window-sizing2 +%patch10 -p1 -b .media-docs # patch some installed files to avoid conflicts with 2.8.* sed -i -e 's|aclocal)|aclocal/wxwin3.m4)|' Makefile.in @@ -316,6 +321,9 @@ popd %doc docs/doxygen/out/xml/* %changelog +* Sun Mar 20 2016 Scott Talbert - 3.0.2-18 +- Add patch for wxEVT_MEDIA_XXX event types (for Phoenix) + * Wed Feb 24 2016 Scott Talbert - 3.0.2-17 - Add patch to resolve issue with wxStaticText growing, fixes RH#1282142 - Add patches to resolve issues under Wayland with window sizing, RH#1294229