From owner-svn-ports-all@freebsd.org Thu Jan 21 13:01:56 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B4E5CA89C71; Thu, 21 Jan 2016 13:01:56 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 68A7A1767; Thu, 21 Jan 2016 13:01:56 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0LD1tw9018664; Thu, 21 Jan 2016 13:01:55 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0LD1tRf018663; Thu, 21 Jan 2016 13:01:55 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201601211301.u0LD1tRf018663@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Thu, 21 Jan 2016 13:01:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r406853 - head/sysutils/pcbsd-utils-qt5/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.20 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: Thu, 21 Jan 2016 13:01:56 -0000 Author: rakuco Date: Thu Jan 21 13:01:55 2016 New Revision: 406853 URL: https://svnweb.freebsd.org/changeset/ports/406853 Log: Pull in an upstream commit to fix the build with the upcoming Qt 5.5.1. Contrary to what the upstream commit message says, this is also required on FreeBSD 10. Added: head/sysutils/pcbsd-utils-qt5/files/ head/sysutils/pcbsd-utils-qt5/files/patch-git_9c218253 (contents, props changed) Added: head/sysutils/pcbsd-utils-qt5/files/patch-git_9c218253 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/pcbsd-utils-qt5/files/patch-git_9c218253 Thu Jan 21 13:01:55 2016 (r406853) @@ -0,0 +1,29 @@ +From 9c21825332543189ca7083171c7aff9f1e3aff06 Mon Sep 17 00:00:00 2001 +From: Ken Moore +Date: Wed, 28 Oct 2015 13:55:55 -0400 +Subject: [PATCH] Add a couple "const" declarations to the PC-BSD utilities + keyboard settings classes. This is apparently needed for 11.x compilation. + +--- + src-qt5/libpcbsd/utils/keyboardsettings.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +--- libpcbsd/utils/keyboardsettings.h ++++ libpcbsd/utils/keyboardsettings.h +@@ -41,7 +41,7 @@ namespace keyboard + SLayout(){;} + SLayout(QString layout, QString variant):layout_id(layout),variant_id(variant){;} + +- bool operator==(const SLayout& l) ++ bool operator==(const SLayout& l) const + { + return (layout_id == l.layout_id) && (variant_id == l.variant_id); + } +@@ -80,7 +80,7 @@ namespace keyboard + group_name = fullName.split(":")[0]; + option = fullName.split(":")[1]; + } +- bool operator==(const SOption& opt) ++ bool operator==(const SOption& opt) const + { + return ((group_name == opt.group_name)&&(option == opt.option)); + }