packages: avidemux/qtlocale.patch - merge 2.5.1 from DEVEL

[glen]

Author: glen                         Date: Thu Dec 17 17:46:52 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- merge 2.5.1 from DEVEL

---- Files affected:
packages/avidemux:
   qtlocale.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/avidemux/qtlocale.patch
diff -u /dev/null packages/avidemux/qtlocale.patch:1.2
--- /dev/null	Thu Dec 17 18:46:52 2009
+++ packages/avidemux/qtlocale.patch	Thu Dec 17 18:46:46 2009
@@ -0,0 +1,47 @@
+--- avidemux_2.5.0/cmake/Ts.cmake.qtlocale	2008-03-11 19:21:46.000000000 +0100
++++ avidemux_2.5.0/cmake/Ts.cmake	2009-07-18 19:44:50.000000000 +0200
+@@ -64,7 +64,7 @@
+                 
+             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 @@
+                 
+             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})
+--- avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp.qtlocale	2008-10-01 15:49:39.000000000 +0200
++++ avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp	2009-07-18 19:51:36.000000000 +0200
+@@ -9,6 +9,7 @@
+ #include <Carbon/Carbon.h>
+ #endif
+ #include <QtGui/QPaintEngine>
++//#include "../../config.h"  // for ADMLOCALE with CMake
+ 
+ #include "ADM_inttype.h"
+ #include "ADM_files.h"
+@@ -73,7 +74,8 @@
+ #ifdef __APPLE__
+ 	QString appdir = QCoreApplication::applicationDirPath() + "/../Resources/locale/";
+ #else
+-	QString appdir = QCoreApplication::applicationDirPath() + "/i18n/";
++//	QString appdir = ADMLOCALE;
++	QString appdir = "/usr/share/avidemux/i18n/";
+ #endif
+ 
+ 	loadTranslation(&qtTranslator, appdir + "qt_" + QLocale::system().name());
+@@ -164,4 +165,4 @@
+ 	}
+ 
+ 	return "Qt";
+-}
+\ No newline at end of file
++}
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/avidemux/qtlocale.patch?r1=1.1&r2=1.2&f=u