Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (fa10a1e07c8c30c7219f31065181128dd50a73e6)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (fa10a1e07c8c30c7219f31065181128dd50a73e6)
  • Date: Thu, 17 Aug 2017 15:04:41 +0000

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

graphics/maim/DETAILS | 1 +
graphics/maim/HISTORY | 5 +++++
graphics/maim/boost_regex.patch | 20 ++++++++++++--------
utils/slop/DETAILS | 1 +
utils/slop/HISTORY | 5 +++++
utils/slop/boost_regex.patch | 22 +++++++++++++---------
6 files changed, 37 insertions(+), 17 deletions(-)

New commits:
commit fa10a1e07c8c30c7219f31065181128dd50a73e6
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

maim: correct regex matching for boost

commit 23c9051d306b11435b69c14db472ac76b79bb317
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

slop: correct regex matching for boost

diff --git a/graphics/maim/DETAILS b/graphics/maim/DETAILS
index 05990a2..ff15774 100755
--- a/graphics/maim/DETAILS
+++ b/graphics/maim/DETAILS
@@ -1,5 +1,6 @@
SPELL=maim
VERSION=5.4.68
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.gz

SOURCE_URL[0]=https://github.com/naelstrof/$SPELL/archive/v$VERSION/$SOURCE

SOURCE_HASH=sha512:820c6286f9a2624736d5d2aa16b9d3531cd43250bc4909d3e31bdb21660eb7fbb4ddf3fca1056ceacd5ac70d1fbc646db39fff67ae57afb751b9000a538efd6f
diff --git a/graphics/maim/HISTORY b/graphics/maim/HISTORY
index 96590db..811ea08 100644
--- a/graphics/maim/HISTORY
+++ b/graphics/maim/HISTORY
@@ -1,3 +1,8 @@
+2017-08-17 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * boost_regex.patch: corrected matching because of undefined effect
+ from boost::regex_match() on the result object in case of false
+
2017-08-16 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 5.4.68
* DEPENDS: refresh dependencies for newer version
diff --git a/graphics/maim/boost_regex.patch b/graphics/maim/boost_regex.patch
index c34d7d6..d51ff10 100644
--- a/graphics/maim/boost_regex.patch
+++ b/graphics/maim/boost_regex.patch
@@ -1,5 +1,5 @@
---- src/cxxopts.hpp.orig 2017-08-10 06:38:49.000000000 -0400
-+++ src/cxxopts.hpp 2017-08-14 15:19:42.432433782 -0400
+--- src/cxxopts.hpp.orig 2017-08-15 21:35:19.000000000 -0400
++++ src/cxxopts.hpp 2017-08-17 10:27:46.388968882 -0400
@@ -35,7 +35,7 @@
#include <iostream>
#include <map>
@@ -22,25 +22,29 @@
("(([[:alnum:]]),)?([[:alnum:]][-_[:alnum:]]+)");

String
-@@ -979,8 +979,8 @@
+@@ -979,10 +979,9 @@
std::string arg_help
)
{
- std::match_results<const char*> result;
- std::regex_match(opts.c_str(), result, option_specifier);
+ boost::match_results<const char*> result;
-+ boost::regex_match(opts.c_str(), result, option_specifier);

- if (result.empty())
+- if (result.empty())
++ if (!boost::regex_match(opts.c_str(), result, option_specifier))
{
-@@ -1122,8 +1122,8 @@
+ throw invalid_option_format_error(opts);
+ }
+@@ -1122,10 +1121,9 @@
break;
}

- std::match_results<const char*> result;
- std::regex_match(argv[current], result, option_matcher);
+ boost::match_results<const char*> result;
-+ boost::regex_match(argv[current], result, option_matcher);

- if (result.empty())
+- if (result.empty())
++ if (!boost::regex_match(argv[current], result, option_matcher))
{
+ //not a flag
+
diff --git a/utils/slop/DETAILS b/utils/slop/DETAILS
index 49c5c46..c69f52f 100755
--- a/utils/slop/DETAILS
+++ b/utils/slop/DETAILS
@@ -1,5 +1,6 @@
SPELL=slop
VERSION=7.3.49
+ PATCHLEVEL=1
SOURCE=${SPELL}-${VERSION}.tar.gz

SOURCE_URL[0]=https://github.com/naelstrof/${SPELL}/archive/v${VERSION}/${SOURCE}

SOURCE_HASH=sha512:35d51a812e48b1e57314c937f69341e35099fe415caf479a3da3d212ed790d93c11fe496f63f79d29ac35a16ceb7cf68b9e477cd536e365996cdbe13c38bab9b
diff --git a/utils/slop/HISTORY b/utils/slop/HISTORY
index a5a4257..44bbc6d 100644
--- a/utils/slop/HISTORY
+++ b/utils/slop/HISTORY
@@ -1,3 +1,8 @@
+2017-08-17 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * boost_regex.patch: corrected matching because of undefined effect
+ from boost::regex_match() on the result object in case of false
+
2017-08-16 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 7.3.49
* DEPENDS: added glm, icu; dropped imlib2, libxrandr; updated opengl
diff --git a/utils/slop/boost_regex.patch b/utils/slop/boost_regex.patch
index a3dec45..b2ba33f 100644
--- a/utils/slop/boost_regex.patch
+++ b/utils/slop/boost_regex.patch
@@ -1,5 +1,5 @@
---- src/cxxopts.hpp.orig 2017-08-14 14:13:46.000000000 -0400
-+++ src/cxxopts.hpp 2017-08-14 14:50:39.388795666 -0400
+--- src/cxxopts.hpp.orig 2017-08-10 06:29:55.000000000 -0400
++++ src/cxxopts.hpp 2017-08-17 10:59:00.786549078 -0400
@@ -35,7 +35,7 @@
#include <iostream>
#include <map>
@@ -9,7 +9,7 @@
#include <sstream>
#include <string>
#include <unordered_set>
-@@ -854,10 +854,10 @@
+@@ -852,10 +852,10 @@
constexpr int OPTION_LONGEST = 30;
constexpr int OPTION_DESC_GAP = 2;

@@ -22,25 +22,29 @@
("(([[:alnum:]]),)?([[:alnum:]][-_[:alnum:]]+)");

String
-@@ -981,8 +981,8 @@
+@@ -979,10 +979,9 @@
std::string arg_help
)
{
- std::match_results<const char*> result;
- std::regex_match(opts.c_str(), result, option_specifier);
+ boost::match_results<const char*> result;
-+ boost::regex_match(opts.c_str(), result, option_specifier);

- if (result.empty())
+- if (result.empty())
++ if (!boost::regex_match(opts.c_str(), result, option_specifier))
{
-@@ -1124,8 +1124,8 @@
+ throw invalid_option_format_error(opts);
+ }
+@@ -1122,10 +1121,9 @@
break;
}

- std::match_results<const char*> result;
- std::regex_match(argv[current], result, option_matcher);
+ boost::match_results<const char*> result;
-+ boost::regex_match(argv[current], result, option_matcher);

- if (result.empty())
+- if (result.empty())
++ if (!boost::regex_match(argv[current], result, option_matcher))
{
+ //not a flag
+



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (fa10a1e07c8c30c7219f31065181128dd50a73e6), Vlad Glagolev, 08/17/2017

Archive powered by MHonArc 2.6.24.

Top of Page