Hello community, here is the log from the commit of package ptokax for openSUSE:Factory checked in at 2017-06-08 15:04:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ptokax (Old) and /work/SRC/openSUSE:Factory/.ptokax.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ptokax" Thu Jun 8 15:04:31 2017 rev:3 rq:501829 version:0.5.2.2 Changes: -------- --- /work/SRC/openSUSE:Factory/ptokax/ptokax.changes 2017-04-30 21:23:46.073799397 +0200 +++ /work/SRC/openSUSE:Factory/.ptokax.new/ptokax.changes 2017-06-08 15:04:32.853945433 +0200 @@ -1,0 +2,5 @@ +Wed Jun 7 23:30:12 UTC 2017 - [email protected] + +- Add gcc7.diff + +------------------------------------------------------------------- New: ---- gcc7.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ptokax.spec ++++++ --- /var/tmp/diff_new_pack.IHrSxG/_old 2017-06-08 15:04:33.869802067 +0200 +++ /var/tmp/diff_new_pack.IHrSxG/_new 2017-06-08 15:04:33.877800939 +0200 @@ -32,6 +32,7 @@ Source1: ptokax.service Patch1: logs.patch Patch2: nodate.diff +Patch3: gcc7.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %{?systemd_requires} Requires(pre): pwdutils @@ -45,7 +46,7 @@ %prep %setup -q -n PtokaX -%patch -P 1 -P 2 -p1 +%patch -P 1 -P 2 -P 3 -p1 sed -i 's/\r//' ReadMe.txt Changelog.txt scripting.docs/scripting-interface.txt # remove tinyxml as we use system lib rm -rf tinyxml ++++++ gcc7.diff ++++++ From: Jan Engelhardt <[email protected]> Date: 2017-06-08 01:30:00.201233233 +0200 Repair some ancient code that newer g++ rightfully flags. [ 49s] error: ISO C++ forbids comparison between pointer and integer [-fpermissive] [ 49s] if(SetBoolCom[szi] != '\0') { [ 49s] if(SetShortCom[szi] != '\0') { [ 49s] if(SetTxtCom[szi] != '\0') { --- core/SettingManager.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) Index: PtokaX/core/SettingManager.cpp =================================================================== --- PtokaX.orig/core/SettingManager.cpp +++ PtokaX/core/SettingManager.cpp @@ -504,12 +504,12 @@ void SettingManager::Save() { for(size_t szi = 0; szi < SETBOOL_IDS_END; szi++) { // Don't save empty hint - if(SetBoolCom[szi] != '\0') { + if(SetBoolCom[szi] != NULL) { fputs(SetBoolCom[szi], fSettingsFile); } // Don't save setting with empty id - if(SetBoolStr[szi][0] == '\0') { + if(SetBoolStr[szi] == NULL || SetBoolStr[szi][0] == '\0') { continue; } @@ -527,12 +527,12 @@ void SettingManager::Save() { for(size_t szi = 0; szi < SETSHORT_IDS_END; szi++) { // Don't save empty hint - if(SetShortCom[szi] != '\0') { + if(SetShortCom[szi] != NULL) { fputs(SetShortCom[szi], fSettingsFile); } // Don't save setting with empty id - if(SetShortStr[szi][0] == '\0') { + if(SetShortStr[szi] == NULL || SetShortStr[szi][0] == '\0') { continue; } @@ -550,12 +550,12 @@ void SettingManager::Save() { for(size_t szi = 0; szi < SETTXT_IDS_END; szi++) { // Don't save empty hint - if(SetTxtCom[szi] != '\0') { + if(SetTxtCom[szi] != NULL) { fputs(SetTxtCom[szi], fSettingsFile); } // Don't save setting with empty id - if(SetTxtStr[szi][0] == '\0') { + if(SetTxtStr[szi] == NULL || SetTxtStr[szi][0] == '\0') { continue; }
