- release 7 (by relup.sh)

[packages/mkvtoolnix.git] / mkvtoolnix-init_locales.patch

diff --git a/mkvtoolnix-init_locales.patch b/mkvtoolnix-init_locales.patch
index 9bff4fce2440a6994e45d29bdf72bf58ef49765d..fad38c88041565c5cb49d16b7c837592c6d5c950 100644 (file)
--- a/mkvtoolnix-init_locales.patch
+++ b/mkvtoolnix-init_locales.patch
@@ -9,31 +9,3 @@
  
    locale_dir = MTX_LOCALE_DIR;
  # endif  // SYS_WINDOWS
---- mkvtoolnix-2.9.7/src/mmg/options/mmg.cpp.orig      2009-07-01 18:40:03.000000000 +0200
-+++ mkvtoolnix-2.9.7/src/mmg/options/mmg.cpp   2009-07-05 19:50:07.000000000 +0200
-@@ -163,8 +163,9 @@
-   siz_all->Add(new wxStaticLine(this),                             0, wxGROW | wxLEFT | wxRIGHT, 5);
-   siz_all->AddSpacer(5);
- 
-+  wxBoxSizer *siz_line;
- #if defined(HAVE_LIBINTL_H)
--  wxBoxSizer *siz_line = new wxBoxSizer(wxHORIZONTAL);
-+  siz_line = new wxBoxSizer(wxHORIZONTAL);
-   siz_line->Add(st_ui_language, 0, wxALIGN_CENTER_VERTICAL);
-   siz_line->Add(cob_ui_language, 0, wxALIGN_CENTER_VERTICAL | wxLEFT, 5);
- 
---- mkvtoolnix-2.9.7/src/mmg/options/mmg.cpp.orig      2009-07-05 19:51:07.000000000 +0200
-+++ mkvtoolnix-2.9.7/src/mmg/options/mmg.cpp   2009-07-05 19:59:06.000000000 +0200
-@@ -248,10 +248,12 @@
-   b_browse_output_directory->Enable(enable && odm_is_fixed);
- }
- 
-+#if defined(HAVE_LIBINTL_H)
- std::string
- optdlg_mmg_tab::get_selected_ui_language() {
-   return m_sorted_locales[cob_ui_language->GetSelection()];
- }
-+#endif  // HAVE_LIBINTL_H
- 
- void
- optdlg_mmg_tab::save_options() {