Luigi Baldoni
c9c6894d1c
- Update to version 0.2.18 (no changelog supplied) - Removed 0001-Fix-build-with-Qt-5.15.patch - Adjusted tupitube.quazip5.patch OBS-URL: https://build.opensuse.org/request/show/935979 OBS-URL: https://build.opensuse.org/package/show/graphics/tupitube?expand=0&rev=15
56 lines
2.2 KiB
Diff
56 lines
2.2 KiB
Diff
diff -Nur tupitube.desk/configure.tests/quazip/main.cpp new/configure.tests/quazip/main.cpp
|
|
--- tupitube.desk/configure.tests/quazip/main.cpp 2020-08-15 03:55:13.000000000 +0200
|
|
+++ new/configure.tests/quazip/main.cpp 2020-11-08 08:21:32.051836695 +0100
|
|
@@ -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-Qt5-1.2/quazip/quazip.h"
|
|
+#include "QuaZip-Qt5-1.2/quazip/quazipfile.h"
|
|
#include <QFile>
|
|
|
|
int main()
|
|
diff -Nur tupitube.desk/qonf/test.rb new/qonf/test.rb
|
|
--- tupitube.desk/qonf/test.rb 2020-08-15 03:55:13.000000000 +0200
|
|
+++ new/qonf/test.rb 2020-11-08 08:21:42.415752963 +0100
|
|
@@ -103,7 +103,7 @@
|
|
qmakeLine = "'LIBS += #{extraLib}'"
|
|
qmakeLine += " 'INCLUDEPATH += #{extraInclude}'"
|
|
else
|
|
- extraLib = "-lquazip-qt5"
|
|
+ extraLib = "-lquazip1-qt5"
|
|
qmakeLine = "'LIBS += #{extraLib}'"
|
|
end
|
|
else
|
|
@@ -165,10 +165,10 @@
|
|
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)
|
|
diff -Nur tupitube.desk/src/libtupi/tuppackagehandler.cpp new/src/libtupi/tuppackagehandler.cpp
|
|
--- tupitube.desk/src/libtupi/tuppackagehandler.cpp 2020-08-15 03:55:40.000000000 +0200
|
|
+++ new/src/libtupi/tuppackagehandler.cpp 2020-11-08 08:21:32.051836695 +0100
|
|
@@ -34,9 +34,9 @@
|
|
***************************************************************************/
|
|
|
|
#include "tuppackagehandler.h"
|
|
-#include "quazip/quazip.h"
|
|
-#include "quazip/quazipfile.h"
|
|
-#include "quazip/JlCompress.h"
|
|
+#include "QuaZip-Qt5-1.2/quazip/quazip.h"
|
|
+#include "QuaZip-Qt5-1.2/quazip/quazipfile.h"
|
|
+#include "QuaZip-Qt5-1.2/quazip/JlCompress.h"
|
|
|
|
TupPackageHandler::TupPackageHandler()
|
|
{
|