MIME-Version: 1.0
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Date: Mon, 9 Aug 2010 13:21:07 +0000
From: Izumi Tsutsui <tsutsui@netbsd.org>
Subject: CVS commit: pkgsrc/x11/qt3-libs
To: pkgsrc-changes@NetBSD.org
Reply-To: tsutsui@netbsd.org
Message-Id: <20100809132107.C8ECF175DD@cvs.netbsd.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: list

Module Name:	pkgsrc
Committed By:	tsutsui
Date:		Mon Aug  9 13:21:07 UTC 2010

Modified Files:
	pkgsrc/x11/qt3-libs: distinfo
	pkgsrc/x11/qt3-libs/patches: patch-ad
Added Files:
	pkgsrc/x11/qt3-libs/patches: patch-ch

Log Message:
Fix build failure on NetBSD/arm.

patch-ad:
 src/tools/qglobal.h mentionss about Q_NO_PACKED_REFERENCE:
---
/* ARM gcc pads structs to 32 bits, even when they contain a single
   char, or short.  We tell gcc to pack QChars to 16 bits, to avoid
   QString bloat. However, gcc 3.4 doesn't allow us to create references to
   members of a packed struct. (Pointers are OK, because then you
   supposedly know what you are doing.) */
#  if (defined(__arm__) || defined(__ARMEL__)) && !defined(QT_MOC_CPP)
#    define Q_PACKED __attribute__ ((packed))
#    if __GNUC__ == 3 && __GNUC_MINOR__ >= 4
#      define Q_NO_PACKED_REFERENCE
---
 but it seems we also have to define it on gcc4.

patch-ch:
 Furthermore, it looks gcc4 also rejects implicit pointer casts, so
 add an explicit cast where the above Q_NO_PACKED_REFERENCE is referred.


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 pkgsrc/x11/qt3-libs/distinfo
cvs rdiff -u -r1.8 -r1.9 pkgsrc/x11/qt3-libs/patches/patch-ad
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/qt3-libs/patches/patch-ch

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.