pool/tupitube
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 972878 from graphics

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/972878
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tupitube?expand=0&rev=8
This commit is contained in:
Dominique Leuenberger 2022-04-26 18:15:57 +00:00 committed by Git OBS Bridge
commit c439c23a73
3 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tupitube.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Apr 26 12:25:31 UTC 2022 - Luigi Baldoni <aloisio@gmx.com>
- Future proof tupitube.quazip5.patch and fix Factory build
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Dec 6 10:05:57 UTC 2021 - Hans-Peter Jansen <hpj@urpla.net> Mon Dec 6 10:05:57 UTC 2021 - Hans-Peter Jansen <hpj@urpla.net>

35
tupitube.quazip5.patch
View File

@ -1,21 +1,23 @@
diff -Nur tupitube.desk/configure.tests/quazip/main.cpp new/configure.tests/quazip/main.cpp Index: tupitube.desk/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 --- tupitube.desk.orig/configure.tests/quazip/main.cpp
+++ tupitube.desk/configure.tests/quazip/main.cpp
@@ -33,8 +33,8 @@ @@ -33,8 +33,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * * along with this program. If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/ ***************************************************************************/
-#include "quazip/quazip.h" -#include "quazip/quazip.h"
-#include "quazip/quazipfile.h" -#include "quazip/quazipfile.h"
+#include "QuaZip-Qt5-1.2/quazip/quazip.h" +#include <quazip/quazip.h>
+#include "QuaZip-Qt5-1.2/quazip/quazipfile.h" +#include <quazip/quazipfile.h>
#include <QFile> #include <QFile>
int main() int main()
diff -Nur tupitube.desk/qonf/test.rb new/qonf/test.rb Index: tupitube.desk/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 --- tupitube.desk.orig/qonf/test.rb
@@ -103,7 +103,7 @@ +++ tupitube.desk/qonf/test.rb
@@ -103,7 +103,7 @@ class Test
qmakeLine = "'LIBS += #{extraLib}'" qmakeLine = "'LIBS += #{extraLib}'"
qmakeLine += " 'INCLUDEPATH += #{extraInclude}'" qmakeLine += " 'INCLUDEPATH += #{extraInclude}'"
else else
@ -24,7 +26,7 @@ diff -Nur tupitube.desk/qonf/test.rb new/qonf/test.rb
qmakeLine = "'LIBS += #{extraLib}'" qmakeLine = "'LIBS += #{extraLib}'"
end end
else else
@@ -165,10 +165,10 @@ @@ -165,10 +165,10 @@ class Test
if conf.hasArgument?("with-quazip") if conf.hasArgument?("with-quazip")
config.addLib("-lquazip") config.addLib("-lquazip")
else else
@ -37,9 +39,10 @@ diff -Nur tupitube.desk/qonf/test.rb new/qonf/test.rb
parser.defines.each { |define| parser.defines.each { |define|
config.addDefine(define) config.addDefine(define)
diff -Nur tupitube.desk/src/libtupi/tuppackagehandler.cpp new/src/libtupi/tuppackagehandler.cpp Index: tupitube.desk/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 --- tupitube.desk.orig/src/libtupi/tuppackagehandler.cpp
+++ tupitube.desk/src/libtupi/tuppackagehandler.cpp
@@ -34,9 +34,9 @@ @@ -34,9 +34,9 @@
***************************************************************************/ ***************************************************************************/
@ -47,9 +50,9 @@ diff -Nur tupitube.desk/src/libtupi/tuppackagehandler.cpp new/src/libtupi/tuppac
-#include "quazip/quazip.h" -#include "quazip/quazip.h"
-#include "quazip/quazipfile.h" -#include "quazip/quazipfile.h"
-#include "quazip/JlCompress.h" -#include "quazip/JlCompress.h"
+#include "QuaZip-Qt5-1.2/quazip/quazip.h" +#include <quazip/quazip.h>
+#include "QuaZip-Qt5-1.2/quazip/quazipfile.h" +#include <quazip/quazipfile.h>
+#include "QuaZip-Qt5-1.2/quazip/JlCompress.h" +#include <quazip/JlCompress.h>
TupPackageHandler::TupPackageHandler() TupPackageHandler::TupPackageHandler()
{ {

8
tupitube.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package tupitube # spec file for package tupitube
# #
# Copyright (c) 2021 SUSE LLC # Copyright (c) 2022 SUSE LLC
# Copyright (c) 2016 Packman Team <packman@links2linux.de> # Copyright (c) 2016 Packman Team <packman@links2linux.de>
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
@ -102,8 +102,12 @@ dos2unix src/shell/html/css/tupitube.css
# Add path to ffmpeg # Add path to ffmpeg
ffmpeg_include=$(pkg-config --cflags-only-I libavutil) 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 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 done
# Remove shebang # Remove shebang