svn commit: r495348 - in head/x11-wm/ede: . files
Alexey Dokuchaev
danfe at FreeBSD.org
Mon Mar 11 11:34:09 UTC 2019
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");
More information about the svn-ports-all
mailing list