[packages/mediainfo] - fix building with wxWidgets 3.0 - rel 3

[baggins]

commit 5d9f618cf0179fe4b5ab467f6e42a421cd69df93
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Jan 19 18:24:41 2014 +0100

    - fix building with wxWidgets 3.0
    - rel 3

 mediainfo.spec   |  4 +++-
 wxWidgets3.patch | 42 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 1 deletion(-)
---
diff --git a/mediainfo.spec b/mediainfo.spec
index f05a5a2..9dd3f48 100644
--- a/mediainfo.spec
+++ b/mediainfo.spec
@@ -2,11 +2,12 @@ Summary:	Supplies technical and tag information about a video or audio file (CLI
 Summary(pl.UTF-8):	Informacje techniczne i znaczniki dla plików wideo i dźwiękowych (CLI)
 Name:		mediainfo
 Version:	0.7.61
-Release:	2
+Release:	3
 License:	LGPL v2+
 Group:		Applications/Multimedia
 Source0:	http://downloads.sourceforge.net/mediainfo/%{name}_%{version}.tar.bz2
 # Source0-md5:	46fd776968ec1047cd2a5056a906cdf2
+Patch0:		wxWidgets3.patch
 URL:		http://mediainfo.sourceforge.net/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
@@ -123,6 +124,7 @@ Obsługiwane formaty/kontenery:
 
 %prep
 %setup -q -n MediaInfo
+%patch0 -p1
 %undos *.html *.txt Release/*.txt
 chmod 644 *.html *.txt Release/*.txt
 
diff --git a/wxWidgets3.patch b/wxWidgets3.patch
new file mode 100644
index 0000000..d18099b
--- /dev/null
+++ b/wxWidgets3.patch
@@ -0,0 +1,42 @@
+diff -ur MediaInfo/Source/GUI/WxWidgets/GUI_Main_FileDrop.cpp MediaInfo.wx3/Source/GUI/WxWidgets/GUI_Main_FileDrop.cpp
+--- MediaInfo/Source/GUI/WxWidgets/GUI_Main_FileDrop.cpp	2012-08-08 08:53:31.000000000 +0200
++++ MediaInfo.wx3/Source/GUI/WxWidgets/GUI_Main_FileDrop.cpp	2014-01-19 18:20:42.772051511 +0100
+@@ -69,7 +69,7 @@
+     #if defined(__WXMSW__)
+         C->Menu_File_Open_Files_Continue(FileNames[Pos].c_str());
+     #else //defined(__WXMSW__)
+-        C->Menu_File_Open_Files_Continue(FileNames2[Pos].c_str());
++        C->Menu_File_Open_Files_Continue((const MediaInfoNameSpace::String)FileNames2[Pos].c_str());
+     #endif //defined(__WXMSW__)
+     wxTimeSpan Span=wxDateTime::UNow()-Begin;
+     ((GUI_Main*)C->GUI_Main_Handler)->View_Refresh();
+diff -ur MediaInfo/Source/GUI/WxWidgets/GUI_Main_Menu.cpp MediaInfo.wx3/Source/GUI/WxWidgets/GUI_Main_Menu.cpp
+--- MediaInfo/Source/GUI/WxWidgets/GUI_Main_Menu.cpp	2012-08-08 08:53:31.000000000 +0200
++++ MediaInfo.wx3/Source/GUI/WxWidgets/GUI_Main_Menu.cpp	2014-01-19 18:22:20.495384138 +0100
+@@ -158,7 +158,7 @@
+ void GUI_Main::OnMenu_File_Open_Files(wxCommandEvent& WXUNUSED(event))
+ {
+     //User interaction
+-    wxFileDialog* Dialog=new wxFileDialog(this, __T("Choose a file"), __T(""), __T(""), __T("*.*"), wxOPEN|wxFILE_MUST_EXIST|wxMULTIPLE);
++    wxFileDialog* Dialog=new wxFileDialog(this, __T("Choose a file"), __T(""), __T(""), __T("*.*"), wxFD_OPEN|wxFD_FILE_MUST_EXIST|wxFD_MULTIPLE);
+     if (Dialog->ShowModal()!=wxID_OK)
+     {
+         delete Dialog;
+@@ -171,7 +171,7 @@
+     //Configuring
+     C->Menu_File_Open_Files_Begin();
+     for (size_t Pos=0; Pos<FileNames.size(); Pos++)
+-        C->Menu_File_Open_Files_Continue(FileNames[Pos].c_str());
++        C->Menu_File_Open_Files_Continue((const MediaInfoNameSpace::String)FileNames[Pos].c_str());
+ 
+     //Showing
+     View->GUI_Refresh();
+@@ -189,7 +189,7 @@
+ 
+     //Configuring
+     C->Menu_File_Open_Files_Begin();
+-    C->Menu_File_Open_Files_Continue(DirName.c_str());
++    C->Menu_File_Open_Files_Continue((const MediaInfoNameSpace::String)DirName.c_str());
+ 
+     //Showing
+     View->GUI_Refresh();
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mediainfo.git/commitdiff/5d9f618cf0179fe4b5ab467f6e42a421cd69df93