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

Currently displaying revision 60 , Show latest

114
 
1
--- a/avidemux/osxInstaller/CMakeLists.txt
2
+++ b/avidemux/osxInstaller/CMakeLists.txt
3
@@ -110,7 +110,7 @@
4
 FILE(COPY "${ORIGINAL}/Contents/Resources/avidemux.icns" DESTINATION "${RESOURCES}") 
5
 
6
 # Entice macOS to return correct system language (QTBUG-72491)
7
-FILE(GLOB ListOfTranslationFiles "${RESOURCES}/share/avidemux6/qt${ADM_QT_VERSION}/i18n/avidemux_*.qm")
8
+FILE(GLOB ListOfTranslationFiles "${RESOURCES}/share/avidemux3/qt${ADM_QT_VERSION}/i18n/avidemux_*.qm")
9
 FOREACH(lang ${ListOfTranslationFiles})
10
     STRING(REGEX REPLACE ".*avidemux_" "" lang "${lang}")
11
     STRING(REPLACE ".qm" "" lang "${lang}")
12
--- a/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp
13
+++ b/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp
14
@@ -143,7 +143,7 @@
15
     QString referenceFile = QCoreApplication::applicationDirPath() + "/help/" + ((FileAction*)sender())->filePath();
16
 #else
17
     QString referenceFile = ADM_getInstallRelativePath(
18
-                                "share", "avidemux6/help", ((FileAction*)sender())->filePath().toUtf8().constData());
19
+                                "share", "avidemux3/help", ((FileAction*)sender())->filePath().toUtf8().constData());
20
 #endif
21
 
22
     QDesktopServices::openUrl(QUrl("file:///" + referenceFile, QUrl::TolerantMode));
23
--- a/avidemux/qt4/i18n/Ts.cmake
24
+++ b/avidemux/qt4/i18n/Ts.cmake
25
@@ -28,7 +28,7 @@
26
         IF(WIN32)
27
                 SET(i18dir "${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/${QT_EXTENSION}/i18n")
28
         ELSE(WIN32)
29
-                SET(i18dir "${CMAKE_INSTALL_PREFIX}/share/avidemux6/${QT_EXTENSION}/i18n")
30
+                SET(i18dir "${CMAKE_INSTALL_PREFIX}/share/avidemux3/${QT_EXTENSION}/i18n")
31
         ENDIF(WIN32)
32
         INSTALL(FILES ${ARGN} DESTINATION "${i18dir}" COMPONENT runtime)
33
 ENDMACRO(INSTALL_I18N _files)
34
--- a/avidemux_core/ADM_core/src/ADM_folder_linux.cpp
35
+++ b/avidemux_core/ADM_core/src/ADM_folder_linux.cpp
36
@@ -126,14 +126,14 @@
37
     if(isPortable)
38
     {
39
         std::string i18n=pluginDir;
40
-        i18n+=std::string("/../../share/avidemux6/")+flavor+std::string("/i18n");
41
+        i18n+=std::string("/../../share/avidemux3/")+flavor+std::string("/i18n");
42
         ADM_i18nDir=canonize(i18n);
43
         ADM_info("Relative to install i18n mode : <%s>\n",ADM_i18nDir.c_str());
44
         // 181n
45
     }else
46
     {        
47
         std::string partialPath=flavor+std::string("/i18n");
48
-        char *ppath=ADM_getInstallRelativePath("share","avidemux6",partialPath.c_str());
49
+        char *ppath=ADM_getInstallRelativePath("share","avidemux3",partialPath.c_str());
50
         ADM_i18nDir=std::string(ppath);
51
         delete [] ppath;
52
         ppath=NULL;
53
@@ -165,7 +165,7 @@
54
     strcpy(ADM_basedir, homeEnv);
55
     AddSeparator(ADM_basedir);
56
 
57
-    const char *ADM_DIR_NAME = ".avidemux6";
58
+    const char *ADM_DIR_NAME = ".avidemux3";
59
 
60
     strcat(ADM_basedir, ADM_DIR_NAME);
61
     strcat(ADM_basedir, ADM_SEPARATOR);
62
--- a/avidemux_core/ADM_core/src/ADM_folder_mac.cpp
63
+++ b/avidemux_core/ADM_core/src/ADM_folder_mac.cpp
64
@@ -132,7 +132,7 @@
65
     strcpy(ADM_basedir, homeEnv);
66
     AddSeparator(ADM_basedir);
67
 
68
-    const char *ADM_DIR_NAME = ".avidemux6";
69
+    const char *ADM_DIR_NAME = ".avidemux3";
70
 
71
     strcat(ADM_basedir, ADM_DIR_NAME);
72
     strcat(ADM_basedir, ADM_SEPARATOR);
73
@@ -154,9 +154,9 @@
74
     
75
     std::string partialPath=flavor+std::string("/i18n");
76
 #ifdef CREATE_BUNDLE
77
-    char *ppath=ADM_getInstallRelativePath("../Resources/share","avidemux6",partialPath.c_str());
78
+    char *ppath=ADM_getInstallRelativePath("../Resources/share","avidemux3",partialPath.c_str());
79
 #else
80
-    char *ppath=ADM_getInstallRelativePath("../share","avidemux6",partialPath.c_str());
81
+    char *ppath=ADM_getInstallRelativePath("../share","avidemux3",partialPath.c_str());
82
 #endif
83
     std::string r=std::string(ppath);
84
     delete [] ppath;
85
--- a/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp
86
+++ b/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp
87
@@ -268,7 +268,7 @@
88
        this->callEventHandlers(IScriptEngine::Information, NULL, -1,
89
            (string("Executing ") + string(name) + string("...")).c_str());
90
 
91
-       tp_import(_vm, name.c_str(), "avidemux6", NULL, 0);
92
+       tp_import(_vm, name.c_str(), "avidemux3", NULL, 0);
93
 
94
        this->callEventHandlers(IScriptEngine::Information, NULL, -1, "Done");
95
 
96
--- a/cmake/se_plugin.cmake
97
+++ b/cmake/se_plugin.cmake
98
@@ -16,7 +16,7 @@
99
 if (WIN32)
100
     set(helpDir "${CMAKE_INSTALL_PREFIX}/help/${_engineName}")
101
 else (WIN32)
102
-    set(helpDir "${CMAKE_INSTALL_PREFIX}/share/avidemux6/help/${_engineName}")
103
+    set(helpDir "${CMAKE_INSTALL_PREFIX}/share/avidemux3/help/${_engineName}")
104
 endif (WIN32)
105
 
106
     install(DIRECTORY "${_sourceDirectory}" DESTINATION "${helpDir}" COMPONENT plugins)
107
--- a/cmake/sql/update.sh
108
+++ b/cmake/sql/update.sh
109
@@ -1,3 +1,3 @@
110
-sqlite3 ~/.avidemux6/jobs.sql .d > dump
111
+sqlite3 ~/.avidemux3/jobs.sql .d > dump
112
 #sql2class -sqlite -global -license -wrapped  -lib $PWD dump
113
 sql2class -sqlite -build -global -prefix $PWD -lib sqlJobs -namespace db -overwrite dump
114