Date: Thu, 21 Jan 2016 13:01:55 +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: r406853 - head/sysutils/pcbsd-utils-qt5/files Message-ID: <201601211301.u0LD1tRf018663@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <moorekou@gmail.com> +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)); + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601211301.u0LD1tRf018663>