Bug#1138499: transition: libquazip1

[Ben Westover]

Hello,




Here is the list of source packages that still fail to build:
* collatinus
* fritzing
* seafile-client
* tupi


Here is the list of source packages that will work fine with a binNMU:
* krita
* plume-creator
* texstudio
* corectrl
* connectome-workbench
* sachesi
* qmapshack
* openboard
* nomacs
* apvlv
* librepcb
* libxpertmass
* libpappsomspp
* libodsstream
* gimagereader
* ckb-next
* rlottie-qml

Regards
--
Ben Westover

diff --git a/debian/patches/quazip.patch b/debian/patches/quazip.patch
index 7bae598..1c61ed9 100644
--- a/debian/patches/quazip.patch
+++ b/debian/patches/quazip.patch
@@ -22,7 +22,7 @@ Index: collatinus/collatinus.pro
  TEMPLATE = app
  TARGET = collatinus
 -INCLUDEPATH += . src
-+INCLUDEPATH += . src /usr/include/QuaZip-Qt5-1.5
++INCLUDEPATH += . src /usr/include/QuaZip-Qt5-1.7.1
  DEPENDPATH += .
  
  qtHaveModule(printsupport): QT += printsupport

diff --git a/debian/patches/other-libraries.patch b/debian/patches/other-libraries.patch
index 9333f3f..a079b3b 100644
--- a/debian/patches/other-libraries.patch
+++ b/debian/patches/other-libraries.patch
@@ -33,10 +33,10 @@ Index: fritzing/pri/quazipdetect.pri
  
 -exists($$absolute_path($$PWD/../../quazip_qt$$QT_MAJOR_VERSION)) {
 -        QUAZIPPATH = $$absolute_path($$PWD/../../quazip_qt$$QT_MAJOR_VERSION)
-+exists(/usr/include/QuaZip-Qt5-1.5) {
++exists(/usr/include/QuaZip-Qt5-1.7.1) {
 +        ## QUAZIPPATH = $$absolute_path($$PWD/../../quazip_qt$$QT_MAJOR_VERSION)
 +	# in Debian, the package libquazip1-qt5-dev provides:
-+	QUAZIPPATH = /usr/include/QuaZip-Qt5-1.5/quazip
++	QUAZIPPATH = /usr/include/QuaZip-Qt5-1.7.1/quazip
          message("found quazip in $${QUAZIPPATH}")
      } else {
          error("quazip could not be found.")

diff --git a/debian/patches/0002-Don-t-use-bundled-QuaZip.patch b/debian/patches/0002-Don-t-use-bundled-QuaZip.patch
index ee49abc..addafcf 100644
--- a/debian/patches/0002-Don-t-use-bundled-QuaZip.patch
+++ b/debian/patches/0002-Don-t-use-bundled-QuaZip.patch
@@ -59,7 +59,7 @@ index 5f2ee1c..8eaebb4 100644
 -
 -ADD_SC_LIBRARY(quazip ${quazip_sources})
 +FIND_PACKAGE(QuaZip-Qt6 REQUIRED PATHS "/usr/share/quazip")
-+INCLUDE_DIRECTORIES(/usr/include/QuaZip-Qt6-1.5/quazip)
++INCLUDE_DIRECTORIES(/usr/include/QuaZip-Qt6-1.7.1/quazip)
 +SET(EXTRA_LIBS ${EXTRA_LIBS} ${INTERFACE_LINK_LIBRARIES})
  
 -SET(SC_LIBS utils quazip)

diff --git a/debian/patches/fix_quazip_path.patch b/debian/patches/fix_quazip_path.patch
index 573e5b6..7500d31 100644
--- a/debian/patches/fix_quazip_path.patch
+++ b/debian/patches/fix_quazip_path.patch
@@ -13,7 +13,7 @@ Bug-Debian: https://bugs.debian.org/963386
  
  unix:!macx {
 -  INCLUDEPATH += /usr/include/quazip
-+  INCLUDEPATH += /usr/include/QuaZip-Qt5-1.5
++  INCLUDEPATH += /usr/include/QuaZip-Qt5-1.7.1
  }
  
  LIBS += -lz
@@ -24,7 +24,7 @@ Bug-Debian: https://bugs.debian.org/963386
  		</defines>
                  <includes>
 -                        <include path="/usr/include/quazip/" />
-+                        <include path="/usr/include/QuaZip-Qt5-1.5/" />
++                        <include path="/usr/include/QuaZip-Qt5-1.7.1/" />
                  </includes>
  	</provide>
  	<solution>
@@ -33,7 +33,7 @@ Bug-Debian: https://bugs.debian.org/963386
 @@ -1,5 +1,5 @@
  # Generated automatically at 2016-08-01 18:07:32 -0500! PLEASE DO NOT EDIT!
 -INCLUDEPATH += /usr/local/include /usr/include/libavformat/ /usr/include/libavcodec/ /usr/include/quazip/
-+INCLUDEPATH += /usr/local/include /usr/include/libavformat/ /usr/include/libavcodec/ /usr/include/QuaZip-Qt5-1.5/
++INCLUDEPATH += /usr/local/include /usr/include/libavformat/ /usr/include/libavcodec/ /usr/include/QuaZip-Qt5-1.7.1/
  LIBS += -L/usr/local/lib -lavformat -lavcodec -lquazip -lz -ltheora -ltheoraenc -ltheoradec -logg -ltupifwgui -ltupifwcore
  QT += opengl core gui svg xml network
  DEFINES += HAVE_LIBAV HAVE_QUAZIP HAVE_ZLIB HAVE_MULTIMEDIA HAVE_THEORA K_NODEBUG VERSION=\\\"0.2\\\" CODE_NAME=\\\"Beraba\\\" REVISION=\\\"git08\\\" CONFIG_VERSION=\\\"2\\\"

It turns out all of the packages which use the Qt5 variant were failing to build because of an upstream bug that is now fixed in version 1.7.1. All of these packages fail to build because they have patches which hard-code the include path of version 1.5. I have attached patches which make all of them build successfully.

OpenPGP_signature.asc
Description: OpenPGP digital signature