Hello community,
here is the log from the commit of package chessx for openSUSE:Factory checked
in at 2020-11-12 22:48:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/chessx (Old)
and /work/SRC/openSUSE:Factory/.chessx.new.24930 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "chessx"
Thu Nov 12 22:48:45 2020 rev:9 rq:848139 version:1.5.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/chessx/chessx.changes 2020-05-09
19:53:10.128942780 +0200
+++ /work/SRC/openSUSE:Factory/.chessx.new.24930/chessx.changes 2020-11-12
22:50:06.262812756 +0100
@@ -1,0 +2,6 @@
+Thu Nov 12 13:55:48 UTC 2020 - Luigi Baldoni <aloi...@gmx.com>
+
+- Updated chessx-use_system_quazip.patch to search also
+ for quazip1-qt5, fixes (boo#1178681)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ chessx.spec ++++++
--- /var/tmp/diff_new_pack.eHQdGi/_old 2020-11-12 22:50:06.950813474 +0100
+++ /var/tmp/diff_new_pack.eHQdGi/_new 2020-11-12 22:50:06.954813478 +0100
@@ -41,7 +41,10 @@
BuildRequires: pkgconfig(Qt5TextToSpeech)
BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(Qt5Xml)
-%if (0%{?suse_version} > 1500 || 0%{?sle_version} >= 150200)
+%if 0%{?suse_version} > 1500
+BuildRequires: pkgconfig(quazip1-qt5)
+%endif
+%if 0%{?sle_version} == 150200
BuildRequires: pkgconfig(quazip)
%endif
BuildRequires: pkgconfig(zlib)
++++++ chessx-use_system_quazip.patch ++++++
--- /var/tmp/diff_new_pack.eHQdGi/_old 2020-11-12 22:50:06.994813520 +0100
+++ /var/tmp/diff_new_pack.eHQdGi/_new 2020-11-12 22:50:06.998813524 +0100
@@ -59,7 +59,7 @@
src/database/arenabook.cpp \
src/gui/gamelistsortmodel.cpp \
src/gui/listwidgetex.cpp
-@@ -412,8 +383,9 @@ INCLUDEPATH += src/database
+@@ -412,8 +383,25 @@ INCLUDEPATH += src/database
INCLUDEPATH += src/guess
INCLUDEPATH += src/gui
INCLUDEPATH += src/dialogs
@@ -67,7 +67,23 @@
-INCLUDEPATH += $$[QT_INSTALL_PREFIX]/src/3rdparty/zlib
+
+CONFIG += link_pkgconfig
-+PKGCONFIG += quazip
++packagesExist(quazip1-qt5) {
++ HAVE_QUAZIP = yes
++ PKGCONFIG += quazip1-qt5
++ message("Using quazip1-qt5")
++}
++packagesExist(quazip) {
++ !defined(HAVE_QUAZIP, var) {
++ HAVE_QUAZIP = yes
++ PKGCONFIG += quazip
++ DEFINES += USE_QUAZIP5
++ message("Using quazip")
++ }
++}
++
++!defined(HAVE_QUAZIP, var) {
++ error("Need at least one of quazip1-qt5 or quazip")
++}
win32 {
# DEFINES += ZLIB_WINAPI
@@ -75,14 +91,19 @@
===================================================================
--- chessx-1.5.4.orig/src/gui/mainwindow.cpp
+++ chessx-1.5.4/src/gui/mainwindow.cpp
-@@ -43,8 +43,8 @@
+@@ -43,8 +43,13 @@
#include "output.h"
#include "pgndatabase.h"
#include "playerlistwidget.h"
-#include "quazip.h"
-#include "quazipfile.h"
++#ifndef USE_QUAZIP5
++#include <quazip/quazip.h>
++#include <quazip/quazipfile.h>
++#else
+#include <quazip5/quazip.h>
+#include <quazip5/quazipfile.h>
++#endif
#include "savedialog.h"
#include "settings.h"
#include "style.h"
_______________________________________________
openSUSE Commits mailing list -- commit@lists.opensuse.org
To unsubscribe, email commit-le...@lists.opensuse.org
List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette
List Archives:
https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
