[Widelands-dev] [Merge] lp:~widelands-dev/widelands/fri-portraits into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/fri-portraits into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/fri-portraits/+merge/356221 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fri-portraits. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1795976-port-attack-crash into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1795976-port-attack-crash into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1795976-port-attack-crash/+merge/356454 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1795976-port-attack-crash. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1795570-chat-br-tags into lp:widelands
Continuous integration builds have changed state: Travis build 4118. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/440588155. Appveyor build 3915. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1795570_chat_br_tags-3915. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1795570-chat-br-tags/+merge/356653 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1795570-chat-br-tags into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1795976-port-attack-crash into lp:widelands
Thanks yourself for the savegame! -- https://code.launchpad.net/~widelands-dev/widelands/bug-1795976-port-attack-crash/+merge/356454 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1795976-port-attack-crash. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1791605-on-failure-fail into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1791605-on-failure-fail into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1791605-on-failure-fail/+merge/356654 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1791605-on-failure-fail. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1791605-on-failure-fail into lp:widelands
Continuous integration builds have changed state: Travis build 4117. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/440586787. Appveyor build 3914. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1791605_on_failure_fail-3914. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1791605-on-failure-fail/+merge/356654 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1791605-on-failure-fail. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1795976-port-attack-crash into lp:widelands
Great, thanks :) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1795976-port-attack-crash/+merge/356454 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1795976-port-attack-crash. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/fri-portraits into lp:widelands
If I may be so bold – I have added the missing dev-credit entry for myself here, and as there are two approves: @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/fri-portraits/+merge/356221 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fri-portraits. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1795976-port-attack-crash into lp:widelands
Review: Approve Tested, bug is fixed :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1795976-port-attack-crash/+merge/356454 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1795976-port-attack-crash. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1791605-on-failure-fail into lp:widelands
Review: Approve The messages are gone. I think this change is uncritical, so: @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1791605-on-failure-fail/+merge/356654 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1791605-on-failure-fail. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/cmakepolicy into lp:widelands
Continuous integration builds have changed state: Travis build 4116. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/440557293. Appveyor build 3913. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_cmakepolicy-3913. -- https://code.launchpad.net/~widelands-dev/widelands/cmakepolicy/+merge/356018 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/cmakepolicy. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/frisian_music into lp:widelands
@Gun What´s the status here? Will this get into b20? -- https://code.launchpad.net/~widelands-dev/widelands/frisian_music/+merge/350429 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/frisian_music into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1795976-port-attack-crash into lp:widelands
@Gun, can you look at the diff? I removed your std::set and just look into vector instead. Usually it is <=5 items, so no big overhead I tested with bug's savegame and with a random game from scratch... -- https://code.launchpad.net/~widelands-dev/widelands/bug-1795976-port-attack-crash/+merge/356454 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1795976-port-attack-crash. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/ship_scheduling_2 into lp:widelands
Please stop insulting everybody whenever you don't get your way. Yes, the release cycles are too long. No, we won't solve the problem of managing testing exposure by merging your feature right now this very instant. Changing the release process in the middle of a release is not going to happen, because that's far too stressful for me. I'm only human and this is supposed to be a fun hobby. End of discussion. -- https://code.launchpad.net/~widelands-dev/widelands/ship_scheduling_2/+merge/355510 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ship_scheduling_2. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1791605-on-failure-fail into lp:widelands
GunChleoc has proposed merging
lp:~widelands-dev/widelands/bug-1791605-on-failure-fail into lp:widelands.
Commit message:
Remove test logging output from production_program.cc
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1791605 in widelands: "Warnings for "on failure fail" while loading
tribes"
https://bugs.launchpad.net/widelands/+bug/1791605
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1791605-on-failure-fail/+merge/356654
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1791605-on-failure-fail into lp:widelands.
=== modified file 'src/logic/map_objects/tribes/production_program.cc'
--- src/logic/map_objects/tribes/production_program.cc 2018-09-10 12:32:56 +
+++ src/logic/map_objects/tribes/production_program.cc 2018-10-12 10:31:38 +
@@ -583,7 +583,6 @@
while (!reached_end) {
skip(parameters);
match_force_skip(parameters, "on");
- log("found \"on \": parameters = \"%s\"\n", parameters);
ProgramResult result_to_set_method_for;
if (match_force_skip(parameters, "failure")) {
@@ -616,9 +615,6 @@
"{\"fail\"|\"complete\"|\"skip\"|\"repeat\"}", parameters);
handling_methods_[result_to_set_method_for - 1] = handling_method;
reached_end = !*parameters;
- log("read handling method for result %u: %u, parameters = \"%s\", "
- "reached_end = %u\n",
- result_to_set_method_for, handling_method, parameters, reached_end);
}
} catch (const WException& e) {
throw GameDataError("call: %s", e.what());
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1795570-chat-br-tags into lp:widelands
GunChleoc has proposed merging
lp:~widelands-dev/widelands/bug-1795570-chat-br-tags into lp:widelands.
Commit message:
Fix br tag in chat server help message
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1795570 in widelands: "Chat /help prints instead of using it"
https://bugs.launchpad.net/widelands/+bug/1795570
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1795570-chat-br-tags/+merge/356653
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1795570-chat-br-tags into lp:widelands.
=== modified file 'src/wui/chat_msg_layout.cc'
--- src/wui/chat_msg_layout.cc 2018-08-20 19:00:20 +
+++ src/wui/chat_msg_layout.cc 2018-10-12 10:30:39 +
@@ -19,6 +19,7 @@
#include "wui/chat_msg_layout.h"
+#include
#include
#include "chat/chat.h"
@@ -39,6 +40,13 @@
return "99";
}
+std::string sanitize_message(const std::string& given_text) {
+ std::string result = richtext_escape(given_text);
+ // Preserve br tag
+ boost::replace_all(result, "br", "");
+ return result;
+}
+
} // namespace
// Returns a richtext string that can be displayed to the user.
@@ -46,7 +54,7 @@
const std::string& font_face = "serif";
std::string message = "";
- std::string sanitized = richtext_escape(chat_message.msg);
+ const std::string sanitized = sanitize_message(chat_message.msg);
// time calculation
char ts[13];
@@ -57,8 +65,8 @@
color(chat_message.playern))
.str();
- std::string sender_escaped = richtext_escape(chat_message.sender);
- std::string recipient_escaped = richtext_escape(chat_message.recipient);
+ const std::string sender_escaped = richtext_escape(chat_message.sender);
+ const std::string recipient_escaped = richtext_escape(chat_message.recipient);
if (chat_message.recipient.size() && chat_message.sender.size()) {
// Personal message handling
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/cmakepolicy into lp:widelands
Thanks allot. I changed the the line for the linker flags. > From my understanding your change will use GLVND on my system. Wouldn't this > make bug hunting a > bit more complicated, because some bugs may appear on systems using the > legacy GL driver but not > on systems using GLVND libraries? Correct, but if only the new drivers would be installed on a system then only those would be used. And isn't it unavoidable to switch and test with the new drivers as well? For the sake of bug hunting this could be set to OLD, but this would defeat the purpose of the policy. I think settings this to OLD manually when needed would be sensible. As for now, this fixes the bug with the buildsystem, silences the warning and compiles when GLVND are used. @GunChleoc what's your opinion here. -- https://code.launchpad.net/~widelands-dev/widelands/cmakepolicy/+merge/356018 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/cmakepolicy. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/cmakepolicy_2 into lp:widelands
Continuous integration builds have changed state: Travis build 4113. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/440355897. Appveyor build 3910. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_cmakepolicy_2-3910. -- https://code.launchpad.net/~widelands-dev/widelands/cmakepolicy_2/+merge/356609 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/cmakepolicy_2 into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Build #15531997] amd64 build of widelands 1:19-ppa0-bzr8876-201810120802~ubuntu14.04.1 in ubuntu trusty RELEASE [~widelands-dev/ubuntu/widelands-daily]
* Source Package: widelands * Version: 1:19-ppa0-bzr8876-201810120802~ubuntu14.04.1 * Architecture: amd64 * Archive: ~widelands-dev/ubuntu/widelands-daily * Component: main * State: Failed to build * Duration: 5 minutes * Build Log: https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/15531997/+files/buildlog_ubuntu-trusty-amd64.widelands_1%3A19-ppa0-bzr8876-201810120802~ubuntu14.04.1_BUILDING.txt.gz * Builder: https://launchpad.net/builders/lgw01-amd64-025 * Source: not available If you want further information about this situation, feel free to contact a member of the Launchpad Buildd Administrators team. -- amd64 build of widelands 1:19-ppa0-bzr8876-201810120802~ubuntu14.04.1 in ubuntu trusty RELEASE https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/15531997 You are receiving this email because you created this version of this package. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/cmakepolicy into lp:widelands
>From my understanding your change will use GLVND on my system. Wouldn't this
>make bug hunting a bit more complicated, because some bugs may appear on
>systems using the legacy GL driver but not on systems using GLVND libraries?
Anyway, i have removed the linker flags bit by bit (from right to left),
removed the /build directory after each remove and compiled again. The result
is:
if("${OpenGL_GL_PREFERENCE}" STREQUAL "GLVND")
set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lGL")
message(STATUS "Adding linker flags for GLVND.")
endif()
Removing this last flag (commenting tho whole block) produces the linker errors:
[ 98%] Building CXX object
src/economy/test/CMakeFiles/test_economy.dir/test_road.cc.o
/usr/bin/ld: graphic/libgraphic_gl_utils.a(initialize.cc.o): undefined
reference to symbol 'glDrawBuffer'
/usr/bin/ld: /usr/lib/libGL.so.1: error adding symbols: DSO missing from
command line
collect2: Fehler: ld gab 1 als Ende-Status zurück
make[2]: *** [src/CMakeFiles/widelands.dir/build.make:441: src/widelands]
Fehler 1
make[1]: *** [CMakeFiles/Makefile2:1217: src/CMakeFiles/widelands.dir/all]
Fehler 2
make[1]: *** Es wird auf noch nicht beendete Prozesse gewartet
[ 98%] Building CXX object
src/economy/test/CMakeFiles/test_economy.dir/test_routing.cc.o
[ 99%] Linking CXX executable test_io_filesystem
/usr/bin/ld: ../../../graphic/libgraphic_gl_utils.a(initialize.cc.o): undefined
reference to symbol 'glDrawBuffer'
/usr/bin/ld: /usr/lib/libGL.so.1: error adding symbols: DSO missing from
command line
collect2: Fehler: ld gab 1 als Ende-Status zurück
make[2]: ***
[src/io/filesystem/test/CMakeFiles/test_io_filesystem.dir/build.make:455:
src/io/filesystem/test/test_io_filesystem] Fehler 1
make[1]: *** [CMakeFiles/Makefile2:14128:
src/io/filesystem/test/CMakeFiles/test_io_filesystem.dir/all] Fehler 2
[ 99%] Linking CXX executable test_economy
/usr/bin/ld: ../../graphic/libgraphic_gl_utils.a(initialize.cc.o): undefined
reference to symbol 'glDrawBuffer'
/usr/bin/ld: /usr/lib/libGL.so.1: error adding symbols: DSO missing from
command line
collect2: Fehler: ld gab 1 als Ende-Status zurück
make[2]: *** [src/economy/test/CMakeFiles/test_economy.dir/build.make:472:
src/economy/test/test_economy] Fehler 1
make[1]: *** [CMakeFiles/Makefile2:5808:
src/economy/test/CMakeFiles/test_economy.dir/all] Fehler 2
make: *** [Makefile:141: all] Fehler 2
mv: der Aufruf von stat für 'src/widelands' ist nicht möglich: Datei oder
Verzeichnis nicht gefunden
mv: der Aufruf von stat für '../build/src/website/wl_map_object_info' ist nicht
möglich: Datei oder Verzeichnis nicht gefunden
mv: der Aufruf von stat für '../build/src/website/wl_map_info' ist nicht
möglich: Datei oder Verzeichnis nicht gefunden
--
https://code.launchpad.net/~widelands-dev/widelands/cmakepolicy/+merge/356018
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/cmakepolicy.
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
