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

Currently displaying revision 57 , Show latest

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