File avidemux-package_version.patch of Package avidemux3 (Revision 44)
Currently displaying revision 44 , Show latest
110
1
diff -uNr avidemux_2.7.2/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp avidemux_2.7.2.new/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp
2
--- avidemux_2.7.2/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp 2019-03-16 11:52:17.881954253 +0100
3
+++ avidemux_2.7.2.new/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp 2019-03-16 11:56:10.833191154 +0100
4
5
QString referenceFile = QCoreApplication::applicationDirPath() + "/help/" + ((FileAction*)sender())->filePath();
6
#else
7
QString referenceFile = ADM_getInstallRelativePath(
8
- "share", "avidemux6/help", ((FileAction*)sender())->filePath().toUtf8().constData());
9
+ "share", "avidemux3/help", ((FileAction*)sender())->filePath().toUtf8().constData());
10
#endif
11
12
QDesktopServices::openUrl(QUrl("file:///" + referenceFile, QUrl::TolerantMode));
13
diff -uNr avidemux_2.7.2/avidemux_core/ADM_core/src/ADM_folder_linux.cpp avidemux_2.7.2.new/avidemux_core/ADM_core/src/ADM_folder_linux.cpp
14
--- avidemux_2.7.2/avidemux_core/ADM_core/src/ADM_folder_linux.cpp 2019-03-16 11:52:17.853954826 +0100
15
+++ avidemux_2.7.2.new/avidemux_core/ADM_core/src/ADM_folder_linux.cpp 2019-03-16 11:56:07.877251594 +0100
16
17
if(isPortable)
18
{
19
std::string i18n=pluginDir;
20
- i18n+=std::string("/../../share/avidemux6/")+flavor+std::string("/i18n");
21
+ i18n+=std::string("/../../share/avidemux3/")+flavor+std::string("/i18n");
22
ADM_i18nDir=canonize(i18n);
23
ADM_info("Relative to install i18n mode : <%s>\n",ADM_i18nDir.c_str());
24
// 181n
25
}else
26
{
27
std::string partialPath=flavor+std::string("/i18n");
28
- char *ppath=ADM_getInstallRelativePath("share","avidemux6",partialPath.c_str());
29
+ char *ppath=ADM_getInstallRelativePath("share","avidemux3",partialPath.c_str());
30
ADM_i18nDir=std::string(ppath);
31
delete [] ppath;
32
ppath=NULL;
33
34
strcpy(ADM_basedir, homeEnv);
35
AddSeparator(ADM_basedir);
36
37
- const char *ADM_DIR_NAME = ".avidemux6";
38
+ const char *ADM_DIR_NAME = ".avidemux3";
39
40
strcat(ADM_basedir, ADM_DIR_NAME);
41
strcat(ADM_basedir, ADM_SEPARATOR);
42
diff -uNr avidemux_2.7.2/avidemux_core/ADM_core/src/ADM_folder_mac.cpp avidemux_2.7.2.new/avidemux_core/ADM_core/src/ADM_folder_mac.cpp
43
--- avidemux_2.7.2/avidemux_core/ADM_core/src/ADM_folder_mac.cpp 2019-03-16 11:52:17.853954826 +0100
44
+++ avidemux_2.7.2.new/avidemux_core/ADM_core/src/ADM_folder_mac.cpp 2019-03-16 11:56:07.877251594 +0100
45
46
strcpy(ADM_basedir, homeEnv);
47
AddSeparator(ADM_basedir);
48
49
- const char *ADM_DIR_NAME = ".avidemux6";
50
+ const char *ADM_DIR_NAME = ".avidemux3";
51
52
strcat(ADM_basedir, ADM_DIR_NAME);
53
strcat(ADM_basedir, ADM_SEPARATOR);
54
55
56
std::string partialPath=flavor+std::string("/i18n");
57
#ifdef CREATE_BUNDLE
58
- char *ppath=ADM_getInstallRelativePath("../Resources/share","avidemux6",partialPath.c_str());
59
+ char *ppath=ADM_getInstallRelativePath("../Resources/share","avidemux3",partialPath.c_str());
60
#else
61
- char *ppath=ADM_getInstallRelativePath("../share","avidemux6",partialPath.c_str());
62
+ char *ppath=ADM_getInstallRelativePath("../share","avidemux3",partialPath.c_str());
63
#endif
64
std::string r=std::string(ppath);
65
delete [] ppath;
66
diff -uNr avidemux_2.7.2/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp avidemux_2.7.2.new/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp
67
--- avidemux_2.7.2/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp 2019-03-16 11:52:17.737957198 +0100
68
+++ avidemux_2.7.2.new/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp 2019-03-16 11:56:04.405322583 +0100
69
70
this->callEventHandlers(IScriptEngine::Information, NULL, -1,
71
(string("Executing ") + string(name) + string("...")).c_str());
72
73
- tp_import(_vm, name.c_str(), "avidemux6", NULL, 0);
74
+ tp_import(_vm, name.c_str(), "avidemux3", NULL, 0);
75
76
this->callEventHandlers(IScriptEngine::Information, NULL, -1, "Done");
77
78
diff -uNr avidemux_2.7.2/cmake/se_plugin.cmake avidemux_2.7.2.new/cmake/se_plugin.cmake
79
--- avidemux_2.7.2/cmake/se_plugin.cmake 2019-03-16 11:52:17.401964068 +0100
80
+++ avidemux_2.7.2.new/cmake/se_plugin.cmake 2019-03-16 11:56:12.493157213 +0100
81
82
if (WIN32)
83
set(helpDir "${CMAKE_INSTALL_PREFIX}/help/${_engineName}")
84
else (WIN32)
85
- set(helpDir "${CMAKE_INSTALL_PREFIX}/share/avidemux6/help/${_engineName}")
86
+ set(helpDir "${CMAKE_INSTALL_PREFIX}/share/avidemux3/help/${_engineName}")
87
endif (WIN32)
88
89
install(DIRECTORY "${_sourceDirectory}" DESTINATION "${helpDir}" COMPONENT plugins)
90
diff -uNr avidemux_2.7.2/cmake/sql/update.sh avidemux_2.7.2.new/cmake/sql/update.sh
91
--- avidemux_2.7.2/cmake/sql/update.sh 2019-03-16 11:52:17.921953435 +0100
92
+++ avidemux_2.7.2.new/cmake/sql/update.sh 2019-03-16 11:56:12.229162611 +0100
93
94
-sqlite3 ~/.avidemux6/jobs.sql .d > dump
95
+sqlite3 ~/.avidemux3/jobs.sql .d > dump
96
#sql2class -sqlite -global -license -wrapped -lib $PWD dump
97
sql2class -sqlite -build -global -prefix $PWD -lib sqlJobs -namespace db -overwrite dump
98
diff -uNr avidemux_2.7.2/cmake/Ts.cmake avidemux_2.7.2.new/cmake/Ts.cmake
99
--- avidemux_2.7.2/cmake/Ts.cmake 2019-03-16 11:52:17.393964231 +0100
100
+++ avidemux_2.7.2.new/cmake/Ts.cmake 2019-03-16 11:56:12.265161875 +0100
101
102
IF(WIN32)
103
SET(i18dir "${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/${QT_EXTENSION}/i18n")
104
ELSE(WIN32)
105
- SET(i18dir "${CMAKE_INSTALL_PREFIX}/share/avidemux6/${QT_EXTENSION}/i18n")
106
+ SET(i18dir "${CMAKE_INSTALL_PREFIX}/share/avidemux3/${QT_EXTENSION}/i18n")
107
ENDIF(WIN32)
108
INSTALL(FILES ${ARGN} DESTINATION "${i18dir}" COMPONENT runtime)
109
ENDMACRO(INSTALL_I18N _files)
110