From 8123c49e38cb0d24a3540e2d23bf9745393fe0cc Mon Sep 17 00:00:00 2001 From: ponce Date: Tue, 14 Feb 2012 12:23:07 +0100 Subject: multimeda/avidemux: Updated for version 2.5.6 Also added some fixes followin alienBOB's hints. Signed-off-by: Robby Workman --- multimedia/avidemux/avidemux-2.5.1-i18n.patch | 42 --------------------------- 1 file changed, 42 deletions(-) delete mode 100644 multimedia/avidemux/avidemux-2.5.1-i18n.patch (limited to 'multimedia/avidemux/avidemux-2.5.1-i18n.patch') diff --git a/multimedia/avidemux/avidemux-2.5.1-i18n.patch b/multimedia/avidemux/avidemux-2.5.1-i18n.patch deleted file mode 100644 index 956bbd1921..0000000000 --- a/multimedia/avidemux/avidemux-2.5.1-i18n.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp b/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp -index 4cce636..b875528 100644 ---- a/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp -+++ b/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp -@@ -73,7 +73,7 @@ void loadTranslator(void) - #ifdef __APPLE__ - QString appdir = QCoreApplication::applicationDirPath() + "/../Resources/locale/"; - #else -- QString appdir = QCoreApplication::applicationDirPath() + "/i18n/"; -+ QString appdir = "/usr/share/avidemux/i18n/"; - #endif - - loadTranslation(&qtTranslator, appdir + "qt_" + QLocale::system().name()); -@@ -164,4 +164,4 @@ const char* getNativeRendererDesc(void) - } - - return "Qt"; --} -\ No newline at end of file -+} -diff --git a/cmake/Ts.cmake b/cmake/Ts.cmake -index 15eb89b..e40f078 100644 ---- a/cmake/Ts.cmake -+++ b/cmake/Ts.cmake -@@ -64,7 +64,7 @@ MACRO(COMPILE_AVIDEMUX_TS_FILES ts_subdir _sources) - - SET(qm_files ${qm_files} ${_outXml} ${_out}) - -- INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/i18n") -+ INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/avidemux/i18n") - ENDFOREACH(ts_input ${ts_files}) - - SET(${_sources} ${${_sources}} ${qm_files}) -@@ -95,7 +95,7 @@ MACRO(COMPILE_QT_TS_FILES ts_subdir _sources) - - SET(qm_files ${qm_files} ${_out}) - -- INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/i18n") -+ INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/avidemux/i18n") - ENDFOREACH(ts_input ${ts_files}) - - SET(${_sources} ${${_sources}} ${qm_files}) -- cgit v1.2.3