Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package tupitube for openSUSE:Factory checked in at 2022-04-26 20:15:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tupitube (Old) and /work/SRC/openSUSE:Factory/.tupitube.new.1538 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tupitube" Tue Apr 26 20:15:57 2022 rev:8 rq:972878 version:0.2.18 Changes: -------- --- /work/SRC/openSUSE:Factory/tupitube/tupitube.changes 2021-12-07 00:02:04.967991351 +0100 +++ /work/SRC/openSUSE:Factory/.tupitube.new.1538/tupitube.changes 2022-04-26 20:17:50.416765892 +0200 @@ -1,0 +2,5 @@ +Tue Apr 26 12:25:31 UTC 2022 - Luigi Baldoni <[email protected]> + +- Future proof tupitube.quazip5.patch and fix Factory build + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tupitube.spec ++++++ --- /var/tmp/diff_new_pack.NYC6wV/_old 2022-04-26 20:17:50.860766430 +0200 +++ /var/tmp/diff_new_pack.NYC6wV/_new 2022-04-26 20:17:50.864766434 +0200 @@ -1,7 +1,7 @@ # # spec file for package tupitube # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # Copyright (c) 2016 Packman Team <[email protected]> # # All modifications and additions to the file contributed by third parties @@ -102,8 +102,12 @@ # Add path to ffmpeg ffmpeg_include=$(pkg-config --cflags-only-I libavutil) + +# Add Quazip path +quazip_include=$(pkg-config --cflags-only-I quazip1-qt5) + find . -type f -name \*.pro | while read f; do -echo "QMAKE_CXXFLAGS += %{optflags} ${ffmpeg_include}" >> "$f" +echo "QMAKE_CXXFLAGS += %{optflags} ${ffmpeg_include} ${quazip_include}" >> "$f" done # Remove shebang ++++++ tupitube.quazip5.patch ++++++ --- /var/tmp/diff_new_pack.NYC6wV/_old 2022-04-26 20:17:50.904766482 +0200 +++ /var/tmp/diff_new_pack.NYC6wV/_new 2022-04-26 20:17:50.908766487 +0200 @@ -1,21 +1,23 @@ -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 +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-Qt5-1.2/quazip/quazip.h" -+#include "QuaZip-Qt5-1.2/quazip/quazipfile.h" ++#include <quazip/quazip.h> ++#include <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 @@ +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 @@ -24,7 +26,7 @@ qmakeLine = "'LIBS += #{extraLib}'" end else -@@ -165,10 +165,10 @@ +@@ -165,10 +165,10 @@ class Test if conf.hasArgument?("with-quazip") config.addLib("-lquazip") else @@ -37,9 +39,10 @@ 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 +Index: tupitube.desk/src/libtupi/tuppackagehandler.cpp +=================================================================== +--- tupitube.desk.orig/src/libtupi/tuppackagehandler.cpp ++++ tupitube.desk/src/libtupi/tuppackagehandler.cpp @@ -34,9 +34,9 @@ ***************************************************************************/ @@ -47,9 +50,9 @@ -#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" ++#include <quazip/quazip.h> ++#include <quazip/quazipfile.h> ++#include <quazip/JlCompress.h> TupPackageHandler::TupPackageHandler() {
