Hello community, here is the log from the commit of package xsettingsd for openSUSE:Factory checked in at 2014-12-03 22:47:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xsettingsd (Old) and /work/SRC/openSUSE:Factory/.xsettingsd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xsettingsd" Changes: -------- --- /work/SRC/openSUSE:Factory/xsettingsd/xsettingsd.changes 2014-10-15 16:21:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xsettingsd.new/xsettingsd.changes 2014-12-03 22:48:17.000000000 +0100 @@ -1,0 +2,10 @@ +Mon Nov 1 19:14:01 UTC 2014 - sor.alexei@meowr.ru + +- Update to 0.0~git20141123: + * fix an issue that int values returned by + ConfigParser::FileCharStream::GetCharImpl() were cast to chars, + resulting in EOF getting lost +- Add missing CXXFLAGS. +- Add SLE 11 support. + +------------------------------------------------------------------- @@ -13 +22,0 @@ - Old: ---- xsettingsd-0.0~git20140814.tar.gz New: ---- xsettingsd-0.0~git20141123.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xsettingsd.spec ++++++ --- /var/tmp/diff_new_pack.pOxLS6/_old 2014-12-03 22:48:19.000000000 +0100 +++ /var/tmp/diff_new_pack.pOxLS6/_new 2014-12-03 22:48:19.000000000 +0100 @@ -17,7 +17,7 @@ Name: xsettingsd -Version: 0.0~git20140814 +Version: 0.0~git20141123 Release: 0 Summary: Provides settings to X11 applications License: BSD-3-Clause @@ -27,7 +27,8 @@ BuildRequires: gcc-c++ BuildRequires: pkg-config BuildRequires: scons -BuildRequires: pkgconfig(x11) +BuildRequires: xorg-x11-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description xsettingsd is a daemon that implements the XSETTINGS specification. @@ -41,7 +42,7 @@ %setup -q %build -scons CC="$(which gcc)" CXX="$(which g++)" %{?_smp_mflags} +CFLAGS='%{optflags}' CXXFLAGS='%{optflags}' scons %{?_smp_mflags} %install for file in %{name} dump_xsettings; do ++++++ xsettingsd-0.0~git20140814.tar.gz -> xsettingsd-0.0~git20141123.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xsettingsd-0.0~git20140814/config_parser.cc new/xsettingsd-0.0~git20141123/config_parser.cc --- old/xsettingsd-0.0~git20140814/config_parser.cc 2014-08-15 03:50:55.000000000 +0200 +++ new/xsettingsd-0.0~git20141123/config_parser.cc 2014-11-23 06:12:49.000000000 +0100 @@ -70,7 +70,7 @@ bool in_comment = false; while (!stream_->AtEOF()) { - char ch = stream_->GetChar(); + int ch = stream_->GetChar(); if (ch == '#') { in_comment = true; @@ -138,7 +138,7 @@ return (!have_buffered_char_ && AtEOFImpl()); } -char ConfigParser::CharStream::GetChar() { +int ConfigParser::CharStream::GetChar() { assert(initialized_); prev_at_line_end_ = at_line_end_; @@ -147,7 +147,7 @@ at_line_end_ = false; } - char ch = 0; + int ch = 0; if (have_buffered_char_) { have_buffered_char_ = false; ch = buffered_char_; @@ -161,7 +161,7 @@ return ch; } -void ConfigParser::CharStream::UngetChar(char ch) { +void ConfigParser::CharStream::UngetChar(int ch) { if (prev_at_line_end_) line_num_--; at_line_end_ = prev_at_line_end_; @@ -202,10 +202,9 @@ return ch == EOF; } -char ConfigParser::FileCharStream::GetCharImpl() { +int ConfigParser::FileCharStream::GetCharImpl() { assert(file_); - int ch = fgetc(file_); - return ch; + return fgetc(file_); } ConfigParser::StringCharStream::StringCharStream(const string& data) @@ -217,7 +216,7 @@ return pos_ == data_.size(); } -char ConfigParser::StringCharStream::GetCharImpl() { +int ConfigParser::StringCharStream::GetCharImpl() { return data_.at(pos_++); } @@ -230,7 +229,7 @@ if (stream_->AtEOF()) break; - char ch = stream_->GetChar(); + int ch = stream_->GetChar(); if (isspace(ch) || ch == '#') { stream_->UngetChar(ch); break; @@ -287,7 +286,7 @@ return false; } - char ch = stream_->GetChar(); + int ch = stream_->GetChar(); stream_->UngetChar(ch); if ((ch >= '0' && ch <= '9') || ch == '-') { @@ -322,7 +321,7 @@ if (stream_->AtEOF()) break; - char ch = stream_->GetChar(); + int ch = stream_->GetChar(); if (isspace(ch) || ch == '#') { stream_->UngetChar(ch); break; @@ -383,7 +382,7 @@ return false; } - char ch = stream_->GetChar(); + int ch = stream_->GetChar(); if (ch == '\n') { SetErrorF("Got newline mid-string"); return false; @@ -440,7 +439,7 @@ return false; } - char ch = stream_->GetChar(); + int ch = stream_->GetChar(); if (ch == '\n') { SetErrorF("Got newline mid-color"); return false; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xsettingsd-0.0~git20140814/config_parser.h new/xsettingsd-0.0~git20141123/config_parser.h --- old/xsettingsd-0.0~git20140814/config_parser.h 2014-08-15 03:50:55.000000000 +0200 +++ new/xsettingsd-0.0~git20141123/config_parser.h 2014-11-23 06:12:49.000000000 +0100 @@ -70,16 +70,16 @@ bool AtEOF(); // Get the next character in the stream. - char GetChar(); + int GetChar(); // Push a previously-read character back onto the stream. // At most one character can be buffered. - void UngetChar(char ch); + void UngetChar(int ch); private: virtual bool InitImpl(std::string* error_out) { return true; } virtual bool AtEOFImpl() = 0; - virtual char GetCharImpl() = 0; + virtual int GetCharImpl() = 0; // Has Init() been called? bool initialized_; @@ -88,7 +88,7 @@ bool have_buffered_char_; // The character returned by UngetChar(). - char buffered_char_; + int buffered_char_; // Are we currently at the end of the line? bool at_line_end_; @@ -110,7 +110,7 @@ private: bool InitImpl(std::string* error_out); bool AtEOFImpl(); - char GetCharImpl(); + int GetCharImpl(); std::string filename_; FILE* file_; @@ -125,7 +125,7 @@ private: bool AtEOFImpl(); - char GetCharImpl(); + int GetCharImpl(); std::string data_; size_t pos_; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org