From owner-svn-ports-head@freebsd.org Mon Mar 11 11:34:09 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 02705153E8E4; Mon, 11 Mar 2019 11:34:09 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 991DE921C3; Mon, 11 Mar 2019 11:34:08 +0000 (UTC) (envelope-from danfe@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8F654A2EB; Mon, 11 Mar 2019 11:34:08 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2BBY85A010334; Mon, 11 Mar 2019 11:34:08 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2BBY8eh010333; Mon, 11 Mar 2019 11:34:08 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201903111134.x2BBY8eh010333@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Mon, 11 Mar 2019 11:34:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r495348 - in head/x11-wm/ede: . files X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: in head/x11-wm/ede: . files X-SVN-Commit-Revision: 495348 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 991DE921C3 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-0.99)[-0.995,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.97)[-0.969,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Mar 2019 11:34:09 -0000 Author: danfe Date: Mon Mar 11 11:34:07 2019 New Revision: 495348 URL: https://svnweb.freebsd.org/changeset/ports/495348 Log: Unbreak the build by fixing two common errors that upset new C++ compilers: 1) evoke/Xsm.cpp:653:17: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal] 2) pekwm/ActionHandler.cc:631:10: error: case value evaluates to 4294967294, which cannot be narrowed to type 'int' [-Wc++11-narrowing] Added: head/x11-wm/ede/files/patch-evoke_Xsm.cpp (contents, props changed) Modified: head/x11-wm/ede/Makefile Modified: head/x11-wm/ede/Makefile ============================================================================== --- head/x11-wm/ede/Makefile Mon Mar 11 11:14:53 2019 (r495347) +++ head/x11-wm/ede/Makefile Mon Mar 11 11:34:07 2019 (r495348) @@ -18,8 +18,6 @@ LICENSE_COMB= multi LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING LICENSE_FILE_LGPL20+ = ${EDELIB_WRKSRC}/COPYING -BROKEN= fails to build - BUILD_DEPENDS= doxygen:devel/doxygen \ jam:devel/jam LIB_DEPENDS= libdbus-1.so:devel/dbus \ @@ -79,6 +77,9 @@ post-patch: @${REINPLACE_CMD} -e \ 's|"\(panel-applets\)"|"../../lib/ede/\1"|' \ ${WRKSRC}/ede-panel/Panel.cpp + @${REINPLACE_CMD} -e \ + 's| int direction| uint direction|' \ + ${WRKSRC}/pekwm/ActionHandler.?? pre-configure: @(cd ${EDELIB_WRKSRC} \ Added: head/x11-wm/ede/files/patch-evoke_Xsm.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-wm/ede/files/patch-evoke_Xsm.cpp Mon Mar 11 11:34:07 2019 (r495348) @@ -0,0 +1,24 @@ +--- evoke/Xsm.cpp.orig 2014-06-21 21:24:41 UTC ++++ evoke/Xsm.cpp +@@ -523,7 +523,7 @@ bool Xsm::load_serialized(void) { + * this will load SETTINGS_FILENAME only from local directory; + * intended for development and testing only + */ +- String file = SETTINGS_FILENAME".conf"; ++ String file = SETTINGS_FILENAME ".conf"; + #else + /* try to find it in home directory, then will scan for the system one */ + String file = Resource::find_config(SETTINGS_FILENAME); +@@ -647,10 +647,10 @@ bool Xsm::save_serialized(void) { + * this will load SETTINGS_FILENAME only from local directory; + * intended for development and testing only + */ +- String file = SETTINGS_FILENAME".conf"; ++ String file = SETTINGS_FILENAME ".conf"; + #else + String file = user_config_dir(); +- file += "/ede/"SETTINGS_FILENAME".conf"; ++ file += "/ede/" SETTINGS_FILENAME ".conf"; + #endif + + FILE* setting_file = fopen(file.c_str(), "w");