From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Aug 17 20:20:00 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id A915D447 for ; Sat, 17 Aug 2013 20:20:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 88D8C29F8 for ; Sat, 17 Aug 2013 20:20:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r7HKK0Gh019847 for ; Sat, 17 Aug 2013 20:20:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r7HKK0ll019846; Sat, 17 Aug 2013 20:20:00 GMT (envelope-from gnats) Resent-Date: Sat, 17 Aug 2013 20:20:00 GMT Resent-Message-Id: <201308172020.r7HKK0ll019846@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, John Marino Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id A92AA34C for ; Sat, 17 Aug 2013 20:16:12 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from oldred.freebsd.org (oldred.freebsd.org [8.8.178.121]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7B9EB29E2 for ; Sat, 17 Aug 2013 20:16:12 +0000 (UTC) Received: from oldred.freebsd.org ([127.0.1.6]) by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id r7HKGC8g070779 for ; Sat, 17 Aug 2013 20:16:12 GMT (envelope-from nobody@oldred.freebsd.org) Received: (from nobody@localhost) by oldred.freebsd.org (8.14.5/8.14.5/Submit) id r7HKGBeh070778; Sat, 17 Aug 2013 20:16:11 GMT (envelope-from nobody) Message-Id: <201308172016.r7HKGBeh070778@oldred.freebsd.org> Date: Sat, 17 Aug 2013 20:16:11 GMT From: John Marino To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/181360: [PATCH] unbreak archivers/quazip X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Aug 2013 20:20:00 -0000 >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(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(buf), "test"); + curDir.remove("tmp/test.gz"); + curDir.rmdir("tmp"); >Release-Note: >Audit-Trail: >Unformatted: