]> git.pld-linux.org Git - packages/avidemux.git/blob - qtlocale.patch
This commit was manufactured by cvs2git to create branch 'AVIDEMUX_2_5_2'.
[packages/avidemux.git] / qtlocale.patch
1 --- avidemux_2.5.0/cmake/Ts.cmake.qtlocale      2008-03-11 19:21:46.000000000 +0100
2 +++ avidemux_2.5.0/cmake/Ts.cmake       2009-07-18 19:44:50.000000000 +0200
3 @@ -64,7 +64,7 @@
4                  
5              SET(qm_files ${qm_files} ${_outXml} ${_out})
6  
7 -                       INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/i18n")
8 +                       INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/avidemux/i18n")
9          ENDFOREACH(ts_input ${ts_files})
10  
11          SET(${_sources} ${${_sources}} ${qm_files})
12 @@ -95,7 +95,7 @@
13                  
14              SET(qm_files ${qm_files} ${_out})
15  
16 -                       INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/i18n")
17 +                       INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/avidemux/i18n")
18          ENDFOREACH(ts_input ${ts_files})
19  
20          SET(${_sources} ${${_sources}} ${qm_files})
21 --- avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp.qtlocale  2008-10-01 15:49:39.000000000 +0200
22 +++ avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp   2009-07-18 19:51:36.000000000 +0200
23 @@ -9,6 +9,7 @@
24  #include <Carbon/Carbon.h>
25  #endif
26  #include <QtGui/QPaintEngine>
27 +//#include "../../config.h"  // for ADMLOCALE with CMake
28  
29  #include "ADM_inttype.h"
30  #include "ADM_files.h"
31 @@ -73,7 +74,8 @@
32  #ifdef __APPLE__
33         QString appdir = QCoreApplication::applicationDirPath() + "/../Resources/locale/";
34  #else
35 -       QString appdir = QCoreApplication::applicationDirPath() + "/i18n/";
36 +//     QString appdir = ADMLOCALE;
37 +       QString appdir = "/usr/share/avidemux/i18n/";
38  #endif
39  
40         loadTranslation(&qtTranslator, appdir + "qt_" + QLocale::system().name());
41 @@ -164,4 +165,4 @@
42         }
43  
44         return "Qt";
45 -}
46 \ No newline at end of file
47 +}
This page took 0.290207 seconds and 3 git commands to generate.