File avidemux-package_version.patch of Package avidemux3

File avidemux-package_version.patch of Package avidemux3 (Revision 2786688af2c78293b3f60afbb433f162)

Currently displaying revision 2786688af2c78293b3f60afbb433f162 , Show latest

diff -uNr avidemux_2.7.0/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp avidemux_2.7.0.new/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp
--- avidemux_2.7.0/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp	2017-08-14 19:48:01.481407444 +0200
+++ avidemux_2.7.0.new/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp	2017-08-14 20:01:48.190879204 +0200
@@ -143,7 +143,7 @@
     QString referenceFile = QCoreApplication::applicationDirPath() + "/help/" + ((FileAction*)sender())->filePath();
 #else
     QString referenceFile = ADM_getInstallRelativePath(
-                                "share", "avidemux6/help", ((FileAction*)sender())->filePath().toUtf8().constData());
+                                "share", "avidemux3/help", ((FileAction*)sender())->filePath().toUtf8().constData());
 #endif
 
     QDesktopServices::openUrl(QUrl("file:///" + referenceFile, QUrl::TolerantMode));
diff -uNr avidemux_2.7.0/avidemux_core/ADM_core/src/ADM_folder_linux.cpp avidemux_2.7.0.new/avidemux_core/ADM_core/src/ADM_folder_linux.cpp
--- avidemux_2.7.0/avidemux_core/ADM_core/src/ADM_folder_linux.cpp	2017-08-14 19:48:01.433408213 +0200
+++ avidemux_2.7.0.new/avidemux_core/ADM_core/src/ADM_folder_linux.cpp	2017-08-14 20:01:48.022882248 +0200
@@ -103,14 +103,14 @@
     if(isPortable)
     {
         std::string i18n=pluginDir;
-        i18n+=std::string("/../../share/avidemux6/")+flavor+std::string("/i18n");
+        i18n+=std::string("/../../share/avidemux3/")+flavor+std::string("/i18n");
         ADM_i18nDir=canonize(i18n);
         ADM_info("Relative to install i18n mode : <%s>\n",ADM_i18nDir.c_str());
         // 181n
     }else
     {        
         std::string partialPath=flavor+std::string("/i18n");
-        char *ppath=ADM_getInstallRelativePath("share","avidemux6",partialPath.c_str());
+        char *ppath=ADM_getInstallRelativePath("share","avidemux3",partialPath.c_str());
         ADM_i18nDir=std::string(ppath);
         delete [] ppath;
         ppath=NULL;
@@ -143,7 +143,7 @@
     strcpy(ADM_basedir, homeEnv);
     AddSeparator(ADM_basedir);
 
-    const char *ADM_DIR_NAME = ".avidemux6";
+    const char *ADM_DIR_NAME = ".avidemux3";
 
     strcat(ADM_basedir, ADM_DIR_NAME);
     strcat(ADM_basedir, ADM_SEPARATOR);
diff -uNr avidemux_2.7.0/avidemux_core/ADM_core/src/ADM_folder_mac.cpp avidemux_2.7.0.new/avidemux_core/ADM_core/src/ADM_folder_mac.cpp
--- avidemux_2.7.0/avidemux_core/ADM_core/src/ADM_folder_mac.cpp	2017-08-14 19:48:01.433408213 +0200
+++ avidemux_2.7.0.new/avidemux_core/ADM_core/src/ADM_folder_mac.cpp	2017-08-14 20:01:48.022882248 +0200
@@ -124,7 +124,7 @@
     strcpy(ADM_basedir, homeEnv);
     AddSeparator(ADM_basedir);
 
-    const char *ADM_DIR_NAME = ".avidemux6";
+    const char *ADM_DIR_NAME = ".avidemux3";
 
     strcat(ADM_basedir, ADM_DIR_NAME);
     strcat(ADM_basedir, ADM_SEPARATOR);
@@ -146,9 +146,9 @@
     
     std::string partialPath=flavor+std::string("/i18n");
 #ifdef CREATE_BUNDLE
-    char *ppath=ADM_getInstallRelativePath("../Resources/share","avidemux6",partialPath.c_str());
+    char *ppath=ADM_getInstallRelativePath("../Resources/share","avidemux3",partialPath.c_str());
 #else
-    char *ppath=ADM_getInstallRelativePath("../share","avidemux6",partialPath.c_str());
+    char *ppath=ADM_getInstallRelativePath("../share","avidemux3",partialPath.c_str());
 #endif
     std::string r=std::string(ppath);
     delete [] ppath;
diff -uNr avidemux_2.7.0/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp avidemux_2.7.0.new/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp
--- avidemux_2.7.0/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp	2017-08-14 19:48:01.357409430 +0200
+++ avidemux_2.7.0.new/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp	2017-08-14 20:01:47.582890218 +0200
@@ -265,7 +265,7 @@
 		this->callEventHandlers(IScriptEngine::Information, NULL, -1,
 			(string("Executing ") + string(name) + string("...")).c_str());
 
-		tp_import(_vm, name.c_str(), "avidemux6", NULL, 0);
+		tp_import(_vm, name.c_str(), "avidemux3", NULL, 0);
 
 		this->callEventHandlers(IScriptEngine::Information, NULL, -1, "Done");
 
diff -uNr avidemux_2.7.0/cmake/se_plugin.cmake avidemux_2.7.0.new/cmake/se_plugin.cmake
--- avidemux_2.7.0/cmake/se_plugin.cmake	2017-08-14 19:47:33.749847944 +0200
+++ avidemux_2.7.0.new/cmake/se_plugin.cmake	2017-08-14 20:01:14.587487760 +0200
@@ -15,7 +15,7 @@
 if (WIN32)
     set(helpDir "${CMAKE_INSTALL_PREFIX}/help/${_engineName}")
 else (WIN32)
-    set(helpDir "${CMAKE_INSTALL_PREFIX}/share/avidemux6/help/${_engineName}")
+    set(helpDir "${CMAKE_INSTALL_PREFIX}/share/avidemux3/help/${_engineName}")
 endif (WIN32)
 
     install(DIRECTORY "${_sourceDirectory}" DESTINATION "${helpDir}" COMPONENT plugins)
diff -uNr avidemux_2.7.0/cmake/sql/update.sh avidemux_2.7.0.new/cmake/sql/update.sh
--- avidemux_2.7.0/cmake/sql/update.sh	2017-08-14 19:48:19.685114476 +0200
+++ avidemux_2.7.0.new/cmake/sql/update.sh	2017-08-14 20:02:01.410639682 +0200
@@ -1,3 +1,3 @@
-sqlite3 ~/.avidemux6/jobs.sql .d > dump
+sqlite3 ~/.avidemux3/jobs.sql .d > dump
 #sql2class -sqlite -global -license -wrapped  -lib $PWD dump
 sql2class -sqlite -build -global -prefix $PWD -lib sqlJobs -namespace db -overwrite dump
diff -uNr avidemux_2.7.0/cmake/Ts.cmake avidemux_2.7.0.new/cmake/Ts.cmake
--- avidemux_2.7.0/cmake/Ts.cmake	2017-08-14 19:47:33.737848134 +0200
+++ avidemux_2.7.0.new/cmake/Ts.cmake	2017-08-14 20:01:14.567488123 +0200
@@ -28,7 +28,7 @@
         IF(WIN32)
                 SET(i18dir "${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/${QT_EXTENSION}/i18n")
         ELSE(WIN32)
-                SET(i18dir "${CMAKE_INSTALL_PREFIX}/share/avidemux6/${QT_EXTENSION}/i18n")
+                SET(i18dir "${CMAKE_INSTALL_PREFIX}/share/avidemux3/${QT_EXTENSION}/i18n")
         ENDIF(WIN32)
         INSTALL(FILES ${ARGN} DESTINATION "${i18dir}" COMPONENT runtime)
 ENDMACRO(INSTALL_I18N _files)