Compare commits

..

No commits in common. "factory" and "devel" have entirely different histories.

2 changed files with 61 additions and 0 deletions

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b765e39426531c383cc88cda62c5331efe5f965d02ec079e55eddd077749a4aa
size 6563244

58
tupitube.quazip5.patch Normal file
View File

@ -0,0 +1,58 @@
Index: tupitube.desk/configure.tests/quazip/main.cpp
===================================================================
--- tupitube.desk.orig/configure.tests/quazip/main.cpp
+++ tupitube.desk/configure.tests/quazip/main.cpp
@@ -33,8 +33,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/
-#include "quazip/quazip.h"
-#include "quazip/quazipfile.h"
+#include <quazip/quazip.h>
+#include <quazip/quazipfile.h>
#include <QFile>
int main()
Index: tupitube.desk/qonf/test.rb
===================================================================
--- tupitube.desk.orig/qonf/test.rb
+++ tupitube.desk/qonf/test.rb
@@ -103,7 +103,7 @@ class Test
qmakeLine = "'LIBS += #{extraLib}'"
qmakeLine += " 'INCLUDEPATH += #{extraInclude}'"
else
- extraLib = "-lquazip-qt5"
+ extraLib = "-lquazip1-qt5"
qmakeLine = "'LIBS += #{extraLib}'"
end
else
@@ -165,10 +165,10 @@ class Test
if conf.hasArgument?("with-quazip")
config.addLib("-lquazip")
else
- config.addLib("-lquazip-qt5")
+ config.addLib("-lquazip1-qt5")
end
- # config.addLib("-lquazip-qt5")
+ # config.addLib("-lquazip1-qt5")
parser.defines.each { |define|
config.addDefine(define)
Index: tupitube.desk/src/libtupi/tuppackagehandler.cpp
===================================================================
--- tupitube.desk.orig/src/libtupi/tuppackagehandler.cpp
+++ tupitube.desk/src/libtupi/tuppackagehandler.cpp
@@ -34,9 +34,9 @@
***************************************************************************/
#include "tuppackagehandler.h"
-#include "quazip/quazip.h"
-#include "quazip/quazipfile.h"
-#include "quazip/JlCompress.h"
+#include <quazip/quazip.h>
+#include <quazip/quazipfile.h>
+#include <quazip/JlCompress.h>
TupPackageHandler::TupPackageHandler()
{