From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 8E37E138A1A for ; Sat, 31 Jan 2015 20:19:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ED4ABE090E; Sat, 31 Jan 2015 20:19:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 90717E0909 for ; Sat, 31 Jan 2015 20:19:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3A63B3407E9 for ; Sat, 31 Jan 2015 20:19:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BA42BE4AF for ; Sat, 31 Jan 2015 20:19:15 +0000 (UTC) From: "Christoph Junghans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Christoph Junghans" Message-ID: <1422541662.8aa9e957f008d673188d8fedaa9851f467b4f9e7.ottxor@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-visualization/mantid/files/ X-VCS-Repository: proj/sci X-VCS-Files: sci-visualization/mantid/files/mantid-3.3.0-minigzip-OF.patch X-VCS-Directories: sci-visualization/mantid/files/ X-VCS-Committer: ottxor X-VCS-Committer-Name: Christoph Junghans X-VCS-Revision: 8aa9e957f008d673188d8fedaa9851f467b4f9e7 X-VCS-Branch: master Date: Sat, 31 Jan 2015 20:19:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 51dd0e3f-f96b-4152-828b-2dd4094e68ce X-Archives-Hash: 8ec014c8b43d2e36fe630939c10b73be commit: 8aa9e957f008d673188d8fedaa9851f467b4f9e7 Author: Chris Kerr dasganma tk> AuthorDate: Thu Jan 29 13:29:42 2015 +0000 Commit: Christoph Junghans gentoo org> CommitDate: Thu Jan 29 14:27:42 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=8aa9e957 Improved the minigzip patch after tracking down what OF() does --- .../mantid/files/mantid-3.3.0-minigzip-OF.patch | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/sci-visualization/mantid/files/mantid-3.3.0-minigzip-OF.patch b/sci-visualization/mantid/files/mantid-3.3.0-minigzip-OF.patch index 1dc5ec7..6067ad7 100644 --- a/sci-visualization/mantid/files/mantid-3.3.0-minigzip-OF.patch +++ b/sci-visualization/mantid/files/mantid-3.3.0-minigzip-OF.patch @@ -1,6 +1,7 @@ The minigzip code does the same thing as sys-libs/zlib[minizip] but for .gz files rather than .zip -It uses a macro 'OF(args)'. I'm not sure what it does but defining it as nothing seems to work. +It uses a macro 'OF(args)' - this seems to be for compatibility with old C compilers. +It is declared in zconf.h but newer versions of zlib use _Z_OF instead. This patch has been submitted upstream at: https://github.com/mantidproject/mantid/pull/149 @@ -9,12 +10,17 @@ diff --git a/MantidPlot/src/zlib123/minigzip.c b/MantidPlot/src/zlib123/minigzip index 97fbae1..5f4612f 100644 --- a/MantidPlot/src/zlib123/minigzip.c +++ b/MantidPlot/src/zlib123/minigzip.c -@@ -50,6 +50,10 @@ +@@ -50,6 +50,15 @@ # include /* for fileno */ #endif ++/* New versions of zlib use _Z_OF rather than OF */ +#ifndef OF -+# define OF(args) args ++# ifdef _Z_OF ++# define OF _Z_OF ++# else ++# define OF(args) args ++# endif +#endif + #ifndef WIN32 /* unlink already in stdio.h for WIN32 */