Patch introduced for quazip-qt5. http://www.maefloresta.com/portal/node/783

3 files changed, 88 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b5d56bfea5b1..dd8c482f1ffc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = tupi-git
 	pkgdesc = A 2D animation tool for 8-100 years old kids.
 	pkgver = 156.11cadda
-	pkgrel = 2
+	pkgrel = 1
 	url = http://www.maefloresta.com/
 	install = tupi.install
 	arch = i686
@@ -20,7 +20,9 @@ pkgbase = tupi-git
 	depends = aspell
 	depends = shared-mime-info
 	source = git://anongit.kde.org/tupi
+	source = quazip5.patch
 	md5sums = SKIP
+	md5sums = c8e05ddef493102349e3f15b07e0c6e2
 
 pkgname = tupi-git
 
diff --git a/PKGBUILD b/PKGBUILD
index f3afe4ea67e6..eafa5929a64d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,17 +4,23 @@
 
 pkgname="tupi-git"
 pkgver=156.11cadda
-pkgrel=2
+pkgrel=1
 pkgdesc="A 2D animation tool for 8-100 years old kids."
 url="http://www.maefloresta.com/"
 license=("GPL3")
 arch=("i686" "x86_64")
 depends=("qt5-tools" "qt5-multimedia" "qt5-svg" "quazip-qt5" "libtheora" "ffmpeg" "aspell" "shared-mime-info")
 makedepends=("git" "ruby" "zlib" "libgl")
-source=("git://anongit.kde.org/tupi")
-md5sums=("SKIP")
+source=("git://anongit.kde.org/tupi" "quazip5.patch")
+md5sums=('SKIP'
+         'c8e05ddef493102349e3f15b07e0c6e2')
 install="tupi.install"
 
+prepare() {
+	cd tupi
+	patch -p1 -i ../quazip5.patch
+}
+
 pkgver() {
 	cd tupi
 	echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
@@ -25,6 +31,7 @@ build() {
 	./configure \
 		--prefix="/usr" \
 		--libdir="/usr/lib" \
+		--with-quazip="/usr" \
 		# --sharedir="/usr/share/tupi"
 		# --with-debug \
 	make
diff --git a/quazip5.patch b/quazip5.patch
new file mode 100644
index 000000000000..cd82c6157965
--- /dev/null
+++ b/quazip5.patch
@@ -0,0 +1,75 @@
+diff --git a/configure.rb b/configure.rb
+index 1df69be..c6329be 100755
+--- a/configure.rb
++++ b/configure.rb
+@@ -108,7 +108,7 @@ _EOH_
+        quazipDir = conf.argumentValue("with-quazip")
+        if File.directory? quazipDir
+           quazipLib = quazipDir + "/lib"
+-          quazipInclude = quazipDir + "/include"
++          quazipInclude = quazipDir + "/include/quazip5"
+           config.addLib("-L" + quazipLib)
+           config.addIncludePath(quazipInclude)
+        else
+diff --git a/configure.tests/quazip/quazip.pro b/configure.tests/quazip/quazip.pro
+index 4db2eeb..b9e21fa 100755
+--- a/configure.tests/quazip/quazip.pro
++++ b/configure.tests/quazip/quazip.pro
+@@ -10,7 +10,7 @@ macx {
+ }
+ 
+ unix:!macx {
+-  INCLUDEPATH += /usr/include/quazip
++  INCLUDEPATH += /usr/include/quazip5
+ }
+ 
+ LIBS += -lz
+diff --git a/configure.tests/quazip/quazip.qonf b/configure.tests/quazip/quazip.qonf
+index 7d259a8..da8aa2c 100755
+--- a/configure.tests/quazip/quazip.qonf
++++ b/configure.tests/quazip/quazip.qonf
+@@ -8,7 +8,7 @@
+ 			<define value="HAVE_QUAZIP" />
+ 		</defines>
+                 <includes>
+-                        <include path="/usr/include/quazip/" />
++                        <include path="/usr/include/quazip5/" />
+                 </includes>
+ 	</provide>
+ 	<solution>
+diff --git a/qonf/test.rb b/qonf/test.rb
+index 79a7ecc..9e43036 100755
+--- a/qonf/test.rb
++++ b/qonf/test.rb
+@@ -98,15 +98,15 @@ class Test
+                       if conf.hasArgument?("with-quazip")
+                          quazipDir = conf.argumentValue("with-quazip")
+                          quazipLib = quazipDir + "/lib"
+-                         extraLib += "-L#{quazipLib} -lquazip"
+-                         extraInclude = quazipDir + "/include"
++                         extraLib += "-L#{quazipLib} -lquazip5"
++                         extraInclude = quazipDir + "/include/quazip5"
+                          qmakeLine = "'LIBS += #{extraLib}'"
+                          qmakeLine += " 'INCLUDEPATH += #{extraInclude}'"
+                       else
+                          if parser.os.eql? "14.10" 
+-                            extraLib = "-lquazip-qt5"
++                            extraLib = "-lquazip5"
+                          else
+-                            extraLib = "-lquazip"
++                            extraLib = "-lquazip5"
+                          end
+                          qmakeLine = "'LIBS += #{extraLib}'"
+                       end
+@@ -178,9 +178,9 @@ class Test
+         }
+ 
+         if parser.os.eql? "14.10"
+-           config.addLib("-lquazip-qt5")
++           config.addLib("-lquazip5")
+         else
+-           config.addLib("-lquazip")
++           config.addLib("-lquazip5")
+         end
+         
+         parser.defines.each { |define|