Luigi Baldoni
250ce6ba79
- Update to 0.2.15. No changelog. - Rebase tupitube.quazip5.patch - Drop tupitube.libav.patch. No longer necessary. - Add patch to fix build with Qt 5.15: * 0001-Fix-build-with-Qt-5.15.patch - Spec cleanup OBS-URL: https://build.opensuse.org/request/show/812030 OBS-URL: https://build.opensuse.org/package/show/graphics/tupitube?expand=0&rev=7
55 lines
1.8 KiB
Diff
55 lines
1.8 KiB
Diff
diff --git a/configure.tests/quazip/main.cpp b/configure.tests/quazip/main.cpp
|
|
index dacfcd1..3e06e40 100755
|
|
--- a/configure.tests/quazip/main.cpp
|
|
+++ b/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 "quazip5/quazip.h"
|
|
+#include "quazip5/quazipfile.h"
|
|
#include <QFile>
|
|
|
|
int main()
|
|
diff --git a/qonf/test.rb b/qonf/test.rb
|
|
index a73280f..4f4b59f 100755
|
|
--- a/qonf/test.rb
|
|
+++ b/qonf/test.rb
|
|
@@ -103,7 +103,7 @@ class Test
|
|
qmakeLine = "'LIBS += #{extraLib}'"
|
|
qmakeLine += " 'INCLUDEPATH += #{extraInclude}'"
|
|
else
|
|
- extraLib = "-lquazip-qt5"
|
|
+ extraLib = "-lquazip5"
|
|
qmakeLine = "'LIBS += #{extraLib}'"
|
|
end
|
|
else
|
|
@@ -176,7 +176,7 @@ class Test
|
|
if conf.hasArgument?("with-quazip")
|
|
config.addLib("-lquazip")
|
|
else
|
|
- config.addLib("-lquazip-qt5")
|
|
+ config.addLib("-lquazip5")
|
|
end
|
|
|
|
# config.addLib("-lquazip-qt5")
|
|
diff --git a/src/libtupi/tuppackagehandler.cpp b/src/libtupi/tuppackagehandler.cpp
|
|
index 8885859..971e90d 100755
|
|
--- a/src/libtupi/tuppackagehandler.cpp
|
|
+++ b/src/libtupi/tuppackagehandler.cpp
|
|
@@ -34,9 +34,9 @@
|
|
***************************************************************************/
|
|
|
|
#include "tuppackagehandler.h"
|
|
-#include "quazip/quazip.h"
|
|
-#include "quazip/quazipfile.h"
|
|
-#include "quazip/JlCompress.h"
|
|
+#include "quazip5/quazip.h"
|
|
+#include "quazip5/quazipfile.h"
|
|
+#include "quazip5/JlCompress.h"
|
|
|
|
TupPackageHandler::TupPackageHandler()
|
|
{
|