Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 17 Jan 2015 15:06:02 +0000 (UTC)
From:      Raphael Kubo da Costa <rakuco@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r377226 - in head/devel/qca: . files
Message-ID:  <201501171506.t0HF62fC096421@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rakuco
Date: Sat Jan 17 15:06:01 2015
New Revision: 377226
URL: https://svnweb.freebsd.org/changeset/ports/377226
QAT: https://qat.redports.org/buildarchive/r377226/

Log:
  Add upstream patch to remove comma from the last item in an enum.
  
  This fixes the build of at least finance/skrooge on 8.4 and 9.3:
  In file included from /usr/local/include/QtCrypto/qca.h:38,
                   from /usr/local/include/QtCrypto/QtCrypto:1,
                   from /wrkdirs/usr/ports/finance/skrooge/work/skrooge-1.10.0/skgbasemodeler/skgservices.cpp:41:
  /usr/local/include/QtCrypto/qca_basic.h:598: error: comma at end of enumerator list

Added:
  head/devel/qca/files/patch-git_d4e9444f   (contents, props changed)
Modified:
  head/devel/qca/Makefile

Modified: head/devel/qca/Makefile
==============================================================================
--- head/devel/qca/Makefile	Sat Jan 17 14:53:01 2015	(r377225)
+++ head/devel/qca/Makefile	Sat Jan 17 15:06:01 2015	(r377226)
@@ -3,6 +3,7 @@
 
 PORTNAME=	qca
 PORTVERSION=	2.1.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://delta.affinix.com/download/qca/2.0/
 

Added: head/devel/qca/files/patch-git_d4e9444f
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/qca/files/patch-git_d4e9444f	Sat Jan 17 15:06:01 2015	(r377226)
@@ -0,0 +1,22 @@
+commit d4e9444f9dd2741cc2a4b3f4d6c510e4a1d7413c
+Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
+Date:   Sat Jan 17 15:12:03 2015 +0200
+
+    Do not end Cipher::Mode with a comma.
+
+    This solves a build failure with compilers such as GCC 4.2:
+    /usr/local/include/QtCrypto/qca_basic.h:598: error: comma at end of enumerator list
+
+    REVIEW: 122107
+
+--- include/QtCrypto/qca_basic.h
++++ include/QtCrypto/qca_basic.h
+@@ -595,7 +595,7 @@ public:
+ 		CFB, ///< operate in %Cipher FeedBack mode
+ 		ECB, ///< operate in Electronic Code Book mode
+ 		OFB, ///< operate in Output FeedBack Mode
+-		CTR, ///< operate in CounTer Mode
++		CTR  ///< operate in CounTer Mode
+ 	};
+ 
+ 	/**



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501171506.t0HF62fC096421>