From owner-svn-ports-all@FreeBSD.ORG Wed Aug 28 15:40:55 2013 Return-Path: Delivered-To: svn-ports-all@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 70D536B2; Wed, 28 Aug 2013 15:40:55 +0000 (UTC) (envelope-from nivit@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (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 452952219; Wed, 28 Aug 2013 15:40:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7SFetEj004528; Wed, 28 Aug 2013 15:40:55 GMT (envelope-from nivit@svn.freebsd.org) Received: (from nivit@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7SFesEx004511; Wed, 28 Aug 2013 15:40:54 GMT (envelope-from nivit@svn.freebsd.org) Message-Id: <201308281540.r7SFesEx004511@svn.freebsd.org> From: Nicola Vitale Date: Wed, 28 Aug 2013 15:40:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r325540 - in head/archivers/quazip: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Aug 2013 15:40:55 -0000 Author: nivit Date: Wed Aug 28 15:40:54 2013 New Revision: 325540 URL: http://svnweb.freebsd.org/changeset/ports/325540 Log: - Unbreak the port by a patch suitable for the newer zlib PR: ports/181360 Submitted by: marino Modified: head/archivers/quazip/Makefile head/archivers/quazip/files/patch-qztest__testquagzipfile.cpp Modified: head/archivers/quazip/Makefile ============================================================================== --- head/archivers/quazip/Makefile Wed Aug 28 15:25:18 2013 (r325539) +++ head/archivers/quazip/Makefile Wed Aug 28 15:40:54 2013 (r325540) @@ -12,8 +12,6 @@ COMMENT= Qt/C++ wrapper for ZIP/UNZIP pa LICENSE= LGPL21 -BROKEN= Does not build - QMAKE_ARGS= PREFIX=${PREFIX} ${QMAKE_PRO} QMAKE_PRO= ${WRKSRC}/${PORTNAME}.pro Modified: head/archivers/quazip/files/patch-qztest__testquagzipfile.cpp ============================================================================== --- head/archivers/quazip/files/patch-qztest__testquagzipfile.cpp Wed Aug 28 15:25:18 2013 (r325539) +++ head/archivers/quazip/files/patch-qztest__testquagzipfile.cpp Wed Aug 28 15:40:54 2013 (r325540) @@ -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");