From ab10f0e3a0ec236a80d03c614647ff940c506d36 Mon Sep 17 00:00:00 2001 From: Xiao Pan Date: Thu, 19 Dec 2024 23:36:47 -0800 Subject: My pull request is merged, no need any more https://github.com/dreemurrs-embedded/Pine64-Arch/pull/683 --- .../fix-config-parsing-with-libstdc++.patch | 39 ---------------------- 1 file changed, 39 deletions(-) delete mode 100644 pkgbuilds/osk-sdl/fix-config-parsing-with-libstdc++.patch (limited to 'pkgbuilds/osk-sdl/fix-config-parsing-with-libstdc++.patch') diff --git a/pkgbuilds/osk-sdl/fix-config-parsing-with-libstdc++.patch b/pkgbuilds/osk-sdl/fix-config-parsing-with-libstdc++.patch deleted file mode 100644 index 2e60e4f..0000000 --- a/pkgbuilds/osk-sdl/fix-config-parsing-with-libstdc++.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- src/config.cpp -+++ src/config.cpp -@@ -175,24 +175,26 @@ - std::istringstream iss(line); - std::string id, eq, val; - -- bool error = false; -- -- if (!(iss >> id)) { -- continue; -- } else if (id[0] == '#') { -+ iss >> id; -+ if (iss.fail()) { - continue; - } else if (id.empty()) { - continue; -- } else if (!(iss >> eq >> val >> std::ws) || eq != "=" || iss.get() != EOF) { -- error = true; -+ } else if (id[0] == '#') { -+ continue; - } - -- if (error) { -+ iss >> eq >> val; -+ // check that: -+ // 1) fail/bad bits aren't set -+ // 2) eq field is '=' -+ // 3) that there are no trailing fields, after ignoring any trailing whitespace -+ if (iss.fail() || eq.compare("=") || !(iss >> std::ws).eof()) { - SDL_LogError(SDL_LOG_CATEGORY_ERROR, "Syntax error on line %d", lineno); - return false; -- } else { -- Config::options[id] = val; - } -+ -+ Config::options[id] = val; - } - return true; - } -- cgit v1.2.3-70-g09d2