Applied sekret's changes:

- Changed url to go directly to the site of tupi
- Changed source to github, recommended by the maintainer
- Changed quazip5.patch, so the package builds
- Changed pkgver(), so the actual pkgver is being included and so it gets more meaning
- Changed configure options to what I find reasonable
- Added an ld.so.conf file for the libraries in /usr/lib/tupi

1 files changed, 44 insertions, 18 deletions

diff --git a/quazip5.patch b/quazip5.patch
index cd82c6157965..dc56e7b53f16 100644
--- a/quazip5.patch
+++ b/quazip5.patch
@@ -1,5 +1,5 @@
 diff --git a/configure.rb b/configure.rb
-index 1df69be..c6329be 100755
+index 23f3dcc9..951db1fa 100755
 --- a/configure.rb
 +++ b/configure.rb
 @@ -108,7 +108,7 @@ _EOH_
@@ -11,8 +11,23 @@ index 1df69be..c6329be 100755
            config.addLib("-L" + quazipLib)
            config.addIncludePath(quazipInclude)
         else
+diff --git a/configure.tests/quazip/main.cpp b/configure.tests/quazip/main.cpp
+index f9ec3753..cf1820da 100644
+--- a/configure.tests/quazip/main.cpp
++++ b/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 "quazip5/quazip.h"
++#include "quazip5/quazipfile.h"
+ #include <QFile>
+ 
+ int main()
 diff --git a/configure.tests/quazip/quazip.pro b/configure.tests/quazip/quazip.pro
-index 4db2eeb..b9e21fa 100755
+index 4db2eeb8..b9e21faa 100755
 --- a/configure.tests/quazip/quazip.pro
 +++ b/configure.tests/quazip/quazip.pro
 @@ -10,7 +10,7 @@ macx {
@@ -25,7 +40,7 @@ index 4db2eeb..b9e21fa 100755
  
  LIBS += -lz
 diff --git a/configure.tests/quazip/quazip.qonf b/configure.tests/quazip/quazip.qonf
-index 7d259a8..da8aa2c 100755
+index 7d259a82..da8aa2ca 100755
 --- a/configure.tests/quazip/quazip.qonf
 +++ b/configure.tests/quazip/quazip.qonf
 @@ -8,7 +8,7 @@
@@ -38,10 +53,10 @@ index 7d259a8..da8aa2c 100755
  	</provide>
  	<solution>
 diff --git a/qonf/test.rb b/qonf/test.rb
-index 79a7ecc..9e43036 100755
+index ba63f319..d746377c 100755
 --- a/qonf/test.rb
 +++ b/qonf/test.rb
-@@ -98,15 +98,15 @@ class Test
+@@ -98,12 +98,12 @@ class Test
                        if conf.hasArgument?("with-quazip")
                           quazipDir = conf.argumentValue("with-quazip")
                           quazipLib = quazipDir + "/lib"
@@ -52,24 +67,35 @@ index 79a7ecc..9e43036 100755
                           qmakeLine = "'LIBS += #{extraLib}'"
                           qmakeLine += " 'INCLUDEPATH += #{extraInclude}'"
                        else
-                          if parser.os.eql? "14.10" 
--                            extraLib = "-lquazip-qt5"
-+                            extraLib = "-lquazip5"
-                          else
--                            extraLib = "-lquazip"
-+                            extraLib = "-lquazip5"
-                          end
+-                         extraLib = "-lquazip-qt5"
++                         extraLib = "-lquazip5"
                           qmakeLine = "'LIBS += #{extraLib}'"
                        end
-@@ -178,9 +178,9 @@ class Test
+                    else
+@@ -174,9 +174,9 @@ class Test
          }
  
-         if parser.os.eql? "14.10"
--           config.addLib("-lquazip-qt5")
+         if conf.hasArgument?("with-quazip")
+-           config.addLib("-lquazip")
 +           config.addLib("-lquazip5")
          else
--           config.addLib("-lquazip")
+-           config.addLib("-lquazip-qt5")
 +           config.addLib("-lquazip5")
          end
-         
-         parser.defines.each { |define|
+ 
+         # config.addLib("-lquazip-qt5")
+diff --git a/src/libtupi/tuppackagehandler.h b/src/libtupi/tuppackagehandler.h
+index 413bae8a..5e623971 100644
+--- a/src/libtupi/tuppackagehandler.h
++++ b/src/libtupi/tuppackagehandler.h
+@@ -38,8 +38,8 @@
+ 
+ #include "tglobal.h"
+ #include "tapplicationproperties.h"
+-#include "quazip/quazip.h"
+-#include "quazip/quazipfile.h"
++#include "quazip5/quazip.h"
++#include "quazip5/quazipfile.h"
+ 
+ // SQA: Pending to enable in the future
+ // #include "quazip/JlCompress.h"