ports/181360: [PATCH] unbreak archivers/quazip

[John Marino]

>Number:         181360
>Category:       ports
>Synopsis:       [PATCH] unbreak archivers/quazip
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Aug 17 20:20:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     John Marino
>Release:        
>Organization:
>Environment:
>Description:
The previous added gzip patch is incorrect, causes quazip to break with the newer zlib.  The provided diff will fix that patch, remove the BROKEN definition, and bump the PORTREVISION.

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: archivers/quazip/Makefile
===================================================================
--- archivers/quazip/Makefile	(revision 324691)
+++ archivers/quazip/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	quazip
 PORTVERSION=	0.5.1
-#PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	archivers
 MASTER_SITES=	SF
 
@@ -12,8 +12,6 @@
 
 LICENSE=	LGPL21
 
-BROKEN=		Does not build
-
 QMAKE_ARGS=	PREFIX=${PREFIX} ${QMAKE_PRO}
 QMAKE_PRO=	${WRKSRC}/${PORTNAME}.pro
 
Index: archivers/quazip/files/patch-qztest__testquagzipfile.cpp
===================================================================
--- archivers/quazip/files/patch-qztest__testquagzipfile.cpp	(revision 324691)
+++ archivers/quazip/files/patch-qztest__testquagzipfile.cpp	(working copy)
@@ -1,20 +1,30 @@
---- ./qztest/testquagzipfile.cpp.orig	2013-06-15 14:53:18.000000000 +0200
-+++ ./qztest/testquagzipfile.cpp	2013-06-15 14:51:57.000000000 +0200
-@@ -8,7 +8,7 @@
+--- qztest/testquagzipfile.cpp.orig	2012-09-05 15:24:35.000000000 +0000
++++ qztest/testquagzipfile.cpp
+@@ -8,9 +8,9 @@ void TestQuaGzipFile::read()
  {
      QDir curDir;
      curDir.mkpath("tmp");
 -    voidp gzFile = gzopen("tmp/test.gz", "wb");
-+    gzFile_s* /*voidp*/ gzFile = gzopen("tmp/test.gz", "wb");
-     gzwrite(gzFile, "test", 4);
-     gzclose(gzFile);
+-    gzwrite(gzFile, "test", 4);
+-    gzclose(gzFile);
++    gzFile gzf = gzopen("tmp/test.gz", "wb");
++    gzwrite(gzf, "test", 4);
++    gzclose(gzf);
      QuaGzipFile testFile("tmp/test.gz");
-@@ -32,7 +32,7 @@
+     QVERIFY(testFile.open(QIODevice::ReadOnly));
+     char buf[5];
+@@ -32,11 +32,11 @@ void TestQuaGzipFile::write()
      QCOMPARE(testFile.write("test", 4), static_cast<qint64>(4));
      testFile.close();
      QVERIFY(!testFile.isOpen());
 -    voidp gzFile = gzopen("tmp/test.gz", "rb");
-+    gzFile_s* /*voidp*/ gzFile = gzopen("tmp/test.gz", "rb");
++    gzFile gzf = gzopen("tmp/test.gz", "rb");
      char buf[5];
      buf[4] = '\0';
-     QCOMPARE(gzread(gzFile, buf, 5), 4);
+-    QCOMPARE(gzread(gzFile, buf, 5), 4);
+-    gzclose(gzFile);
++    QCOMPARE(gzread(gzf, buf, 5), 4);
++    gzclose(gzf);
+     QCOMPARE(static_cast<const char*>(buf), "test");
+     curDir.remove("tmp/test.gz");
+     curDir.rmdir("tmp");


>Release-Note:
>Audit-Trail:
>Unformatted: