Skip to Content.
Sympa Menu

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

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 (05a91f578b19ec2ea20d49fedd5490617892ed2c)
  • Date: Wed, 16 Aug 2017 15:45:10 +0000

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

graphics/maim/BUILD | 6 ++++
graphics/maim/DEPENDS | 21 +++++++++++++-
graphics/maim/DETAILS | 4 +-
graphics/maim/HISTORY | 8 +++++
graphics/maim/PRE_BUILD | 7 ++++
graphics/maim/boost_regex.patch | 46 ++++++++++++++++++++++++++++++++
graphics/maim/gcc46.patch | 57
++++++++++++++++++++++++++++++++++++++++
utils/slop/BUILD | 6 ++++
utils/slop/DEPENDS | 18 +++++++++---
utils/slop/DETAILS | 4 +-
utils/slop/HISTORY | 10 +++++++
utils/slop/PRE_BUILD | 5 ++-
utils/slop/boost_regex.patch | 46 ++++++++++++++++++++++++++++++++
utils/slop/gcc46.patch | 57
++++++++++++++++++++++++++++++++++++++++
utils/slop/gl-opt.patch | 26 ------------------
15 files changed, 283 insertions(+), 38 deletions(-)

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

maim: => 5.4.68

commit 9584b117e380e62906587238698e08343fcefd8a
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

slop: => 7.3.49

diff --git a/graphics/maim/BUILD b/graphics/maim/BUILD
index 2652efb..a970b4e 100755
--- a/graphics/maim/BUILD
+++ b/graphics/maim/BUILD
@@ -1,3 +1,9 @@
+CXXFLAGS="-D_GLIBCXX_USE_NANOSLEEP ${CXXFLAGS}" &&
+
+if is_depends_enabled ${SPELL} boost; then
+ LDFLAGS="-lboost_regex ${LDFLAGS}"
+fi &&
+
OPTS="-DCMAKE_INSTALL_MANDIR=${INSTALL_ROOT}/usr/share/man ${OPTS}" &&

cmake_build
diff --git a/graphics/maim/DEPENDS b/graphics/maim/DEPENDS
index 222a59f..ea79223 100755
--- a/graphics/maim/DEPENDS
+++ b/graphics/maim/DEPENDS
@@ -1,7 +1,24 @@
+. "${GRIMOIRE}/FUNCTIONS" &&
+
depends cmake &&
-depends imlib2 &&
+depends libpng &&
+depends JPEG &&
depends libx11 &&
+depends libxrender &&
depends libxrandr &&
depends libxfixes &&
+depends libxcomposite &&
+depends slop &&
+
+if spell_ok slop && is_version_less $(installed_version slop) 7; then
+ force_depends slop
+fi &&
+
+if spell_ok gcc && is_version_less $(installed_version gcc) 4.8; then
+ depends -sub REGEX boost
+fi &&

-suggest_depends slop "" "" "for region selection support"
+optional_depends icu \
+ "-DMAIM_UNICODE=ON" \
+ "-DMAIM_UNICODE=OFF" \
+ "for Unicode support"
diff --git a/graphics/maim/DETAILS b/graphics/maim/DETAILS
index e69fb9a..05990a2 100755
--- a/graphics/maim/DETAILS
+++ b/graphics/maim/DETAILS
@@ -1,8 +1,8 @@
SPELL=maim
- VERSION=3.4.47
+ VERSION=5.4.68
SOURCE=$SPELL-$VERSION.tar.gz

SOURCE_URL[0]=https://github.com/naelstrof/$SPELL/archive/v$VERSION/$SOURCE
-
SOURCE_HASH=sha512:4b21f8ad8f9f2f19693d5c489f5e815133e1b8308653c52934cdb8a3d8ae38732733a5ffb5527b44db49f59c3818a9bc83840ced5db71807a68277d0dcc03392
+
SOURCE_HASH=sha512:820c6286f9a2624736d5d2aa16b9d3531cd43250bc4909d3e31bdb21660eb7fbb4ddf3fca1056ceacd5ac70d1fbc646db39fff67ae57afb751b9000a538efd6f
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=https://github.com/naelstrof/maim
LICENSE[0]=GPL
diff --git a/graphics/maim/HISTORY b/graphics/maim/HISTORY
index 26bbba2..96590db 100644
--- a/graphics/maim/HISTORY
+++ b/graphics/maim/HISTORY
@@ -1,3 +1,11 @@
+2017-08-16 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 5.4.68
+ * DEPENDS: refresh dependencies for newer version
+ * BUILD: added _GLIBCXX_USE_NANOSLEEP flag and optional linking with
+ boost to compile with gcc 4.6
+ * PRE_BUILD: added, to apply patches
+ * gcc46.patch, boost_regex.patch: added, for gcc 4.6 compat
+
2016-08-20 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 3.4.47
* DEPENDS: added slop suggest dep
diff --git a/graphics/maim/PRE_BUILD b/graphics/maim/PRE_BUILD
new file mode 100755
index 0000000..fdd7cc6
--- /dev/null
+++ b/graphics/maim/PRE_BUILD
@@ -0,0 +1,7 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+
+if spell_ok gcc && is_version_less $(installed_version gcc) 4.8; then
+ patch -p0 < "${SPELL_DIRECTORY}/gcc46.patch" &&
+ patch -p0 < "${SPELL_DIRECTORY}/boost_regex.patch"
+fi
diff --git a/graphics/maim/boost_regex.patch b/graphics/maim/boost_regex.patch
new file mode 100644
index 0000000..c34d7d6
--- /dev/null
+++ b/graphics/maim/boost_regex.patch
@@ -0,0 +1,46 @@
+--- src/cxxopts.hpp.orig 2017-08-10 06:38:49.000000000 -0400
++++ src/cxxopts.hpp 2017-08-14 15:19:42.432433782 -0400
+@@ -35,7 +35,7 @@
+ #include <iostream>
+ #include <map>
+ #include <memory>
+-#include <regex>
++#include <boost/regex.hpp>
+ #include <sstream>
+ #include <string>
+ #include <unordered_set>
+@@ -852,10 +852,10 @@
+ constexpr int OPTION_LONGEST = 30;
+ constexpr int OPTION_DESC_GAP = 2;
+
+- std::basic_regex<char> option_matcher
++ boost::basic_regex<char> option_matcher
+ ("--([[:alnum:]][-_[:alnum:]]+)(=(.*))?|-([[:alnum:]]+)");
+
+- std::basic_regex<char> option_specifier
++ boost::basic_regex<char> option_specifier
+ ("(([[:alnum:]]),)?([[:alnum:]][-_[:alnum:]]+)");
+
+ String
+@@ -979,8 +979,8 @@
+ 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())
+ {
+@@ -1122,8 +1122,8 @@
+ 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())
+ {
diff --git a/graphics/maim/gcc46.patch b/graphics/maim/gcc46.patch
new file mode 100644
index 0000000..8d4f820
--- /dev/null
+++ b/graphics/maim/gcc46.patch
@@ -0,0 +1,57 @@
+--- src/cxxopts.hpp.orig 2017-08-10 06:38:49.000000000 -0400
++++ src/cxxopts.hpp 2017-08-14 15:16:39.087376955 -0400
+@@ -285,6 +285,8 @@
+ {
+ }
+
++ ~OptionException() throw() { }
++
+ virtual const char*
+ what() const noexcept
+ {
+@@ -471,11 +473,15 @@
+ standard_value()
+ : m_result(std::make_shared<T>())
+ , m_store(m_result.get())
++ , m_default(false)
++ , m_implicit(false)
+ {
+ }
+
+ standard_value(T* t)
+ : m_store(t)
++ , m_default(false)
++ , m_implicit(false)
+ {
+ }
+
+@@ -557,9 +563,9 @@
+ protected:
+ std::shared_ptr<T> m_result;
+ T* m_store;
+- bool m_default = false;
++ bool m_default;
+ std::string m_default_value;
+- bool m_implicit = false;
++ bool m_implicit;
+ std::string m_implicit_value;
+ };
+ }
+@@ -743,7 +749,7 @@
+
+ inline
+ std::string
+- help(const std::vector<std::string>& groups = {""}) const;
++ help(const std::vector<std::string>& groups =
std::vector<std::string>({""})) const;
+
+ inline
+ const std::vector<std::string>
+@@ -1304,7 +1310,7 @@
+ std::shared_ptr<OptionDetails> details
+ )
+ {
+- auto in = m_options.emplace(option, details);
++ auto in = m_options.insert(make_pair(option, std::move(details)));
+
+ if (!in.second)
+ {
diff --git a/utils/slop/BUILD b/utils/slop/BUILD
index e013b8d..1849703 100755
--- a/utils/slop/BUILD
+++ b/utils/slop/BUILD
@@ -1 +1,7 @@
+CXXFLAGS="-D_GLIBCXX_USE_NANOSLEEP ${CXXFLAGS}" &&
+
+if is_depends_enabled ${SPELL} boost; then
+ LDFLAGS="-lboost_regex ${LDFLAGS}"
+fi &&
+
cmake_build
diff --git a/utils/slop/DEPENDS b/utils/slop/DEPENDS
index 413f520..d213cc4 100755
--- a/utils/slop/DEPENDS
+++ b/utils/slop/DEPENDS
@@ -1,15 +1,25 @@
+. "${GRIMOIRE}/FUNCTIONS" &&
+
depends cmake &&
-depends imlib2 &&
depends libx11 &&
depends libxext &&
+depends glm &&
+
+if spell_ok gcc && is_version_less $(installed_version gcc) 4.8; then
+ depends -sub REGEX boost
+fi &&
+
+optional_depends icu \
+ "-DSLOP_UNICODE=ON" \
+ "-DSLOP_UNICODE=OFF" \
+ "for Unicode support" &&

optional_depends OPENGL \
- "-DCMAKE_OPENGL_SUPPORT=ON" \
- "-DCMAKE_OPENGL_SUPPORT=OFF" \
+ "-DSLOP_OPENGL=ON" \
+ "-DSLOP_OPENGL=OFF" \
"for OpenGL support (also requires GLEW)" &&

if is_depends_enabled ${SPELL} $(get_spell_provider ${SPELL} OPENGL); then
depends libxrender &&
- depends libxrandr &&
depends glew
fi
diff --git a/utils/slop/DETAILS b/utils/slop/DETAILS
index 3b1a718..49c5c46 100755
--- a/utils/slop/DETAILS
+++ b/utils/slop/DETAILS
@@ -1,8 +1,8 @@
SPELL=slop
- VERSION=4.3.21
+ VERSION=7.3.49
SOURCE=${SPELL}-${VERSION}.tar.gz

SOURCE_URL[0]=https://github.com/naelstrof/${SPELL}/archive/v${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:4489a108883b785eb5dda368a06ea0b7c61e3afeefdeb421f211e01e3cb7eb20836200197abc755be653f086fcd3b8647a460dacf15062fe2cd44438b4f54b68
+
SOURCE_HASH=sha512:35d51a812e48b1e57314c937f69341e35099fe415caf479a3da3d212ed790d93c11fe496f63f79d29ac35a16ceb7cf68b9e477cd536e365996cdbe13c38bab9b
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE=https://github.com/naelstrof/slop
LICENSE[0]=GPL
diff --git a/utils/slop/HISTORY b/utils/slop/HISTORY
index dac398e..a5a4257 100644
--- a/utils/slop/HISTORY
+++ b/utils/slop/HISTORY
@@ -1,3 +1,13 @@
+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
+ flags; added boost for systems with gcc 4.6
+ * BUILD: added _GLIBCXX_USE_NANOSLEEP flag and optional linking with
+ boost to compile with gcc 4.6
+ * PRE_BUILD: apply patches
+ * gcc46.patch, boost_regex.patch: added, for gcc 4.6 compat
+ * gl-opt.patch: dropped, fixed by upstream
+
2016-08-20 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS, DEPENDS, {PRE_,}BUILD, gl-opt.patch: created spell, version
4.3.21
diff --git a/utils/slop/PRE_BUILD b/utils/slop/PRE_BUILD
index c3d4388..fdd7cc6 100755
--- a/utils/slop/PRE_BUILD
+++ b/utils/slop/PRE_BUILD
@@ -1,6 +1,7 @@
default_pre_build &&
cd "${SOURCE_DIRECTORY}" &&

-if ! is_depends_enabled ${SPELL} $(get_spell_provider ${SPELL} OPENGL); then
- patch -p0 < "${SPELL_DIRECTORY}/gl-opt.patch"
+if spell_ok gcc && is_version_less $(installed_version gcc) 4.8; then
+ patch -p0 < "${SPELL_DIRECTORY}/gcc46.patch" &&
+ patch -p0 < "${SPELL_DIRECTORY}/boost_regex.patch"
fi
diff --git a/utils/slop/boost_regex.patch b/utils/slop/boost_regex.patch
new file mode 100644
index 0000000..a3dec45
--- /dev/null
+++ b/utils/slop/boost_regex.patch
@@ -0,0 +1,46 @@
+--- src/cxxopts.hpp.orig 2017-08-14 14:13:46.000000000 -0400
++++ src/cxxopts.hpp 2017-08-14 14:50:39.388795666 -0400
+@@ -35,7 +35,7 @@
+ #include <iostream>
+ #include <map>
+ #include <memory>
+-#include <regex>
++#include <boost/regex.hpp>
+ #include <sstream>
+ #include <string>
+ #include <unordered_set>
+@@ -854,10 +854,10 @@
+ constexpr int OPTION_LONGEST = 30;
+ constexpr int OPTION_DESC_GAP = 2;
+
+- std::basic_regex<char> option_matcher
++ boost::basic_regex<char> option_matcher
+ ("--([[:alnum:]][-_[:alnum:]]+)(=(.*))?|-([[:alnum:]]+)");
+
+- std::basic_regex<char> option_specifier
++ boost::basic_regex<char> option_specifier
+ ("(([[:alnum:]]),)?([[:alnum:]][-_[:alnum:]]+)");
+
+ String
+@@ -981,8 +981,8 @@
+ 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())
+ {
+@@ -1124,8 +1124,8 @@
+ 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())
+ {
diff --git a/utils/slop/gcc46.patch b/utils/slop/gcc46.patch
new file mode 100644
index 0000000..1172855
--- /dev/null
+++ b/utils/slop/gcc46.patch
@@ -0,0 +1,57 @@
+--- src/cxxopts.hpp.orig 2017-08-10 06:29:55.000000000 -0400
++++ src/cxxopts.hpp 2017-08-14 15:04:04.205481497 -0400
+@@ -291,6 +291,8 @@
+ return m_message.c_str();
+ }
+
++ ~OptionException() throw() { }
++
+ private:
+ std::string m_message;
+ };
+@@ -471,11 +473,15 @@
+ standard_value()
+ : m_result(std::make_shared<T>())
+ , m_store(m_result.get())
++ , m_default(false)
++ , m_implicit(false)
+ {
+ }
+
+ standard_value(T* t)
+ : m_store(t)
++ , m_default(false)
++ , m_implicit(false)
+ {
+ }
+
+@@ -557,9 +563,9 @@
+ protected:
+ std::shared_ptr<T> m_result;
+ T* m_store;
+- bool m_default = false;
++ bool m_default;
+ std::string m_default_value;
+- bool m_implicit = false;
++ bool m_implicit;
+ std::string m_implicit_value;
+ };
+ }
+@@ -743,7 +749,7 @@
+
+ inline
+ std::string
+- help(const std::vector<std::string>& groups = {""}) const;
++ help(const std::vector<std::string>& groups =
std::vector<std::string>({""})) const;
+
+ inline
+ const std::vector<std::string>
+@@ -1304,7 +1310,7 @@
+ std::shared_ptr<OptionDetails> details
+ )
+ {
+- auto in = m_options.emplace(option, details);
++ auto in = m_options.insert(make_pair(option, std::move(details)));
+
+ if (!in.second)
+ {
diff --git a/utils/slop/gl-opt.patch b/utils/slop/gl-opt.patch
deleted file mode 100644
index fbb0dd9..0000000
--- a/utils/slop/gl-opt.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- CMakeLists.txt.orig 2015-11-13 14:35:52.000000000 -0500
-+++ CMakeLists.txt 2016-08-20 15:36:20.418931196 -0400
-@@ -106,11 +106,6 @@
- find_package( Imlib2 REQUIRED )
- find_package( X11 REQUIRED )
- find_package( XExt REQUIRED )
--find_package( OpenGL REQUIRED )
--find_package( GLX REQUIRED )
--find_package( XRender REQUIRED )
--find_package( XRandr REQUIRED )
--find_package( GLEW REQUIRED )
- # This library is needed only for Ubuntu it seems, some platforms don't even
- # ship with it. I couldn't find a way to do a test compile to check if librt
- # was needed, so instead I just didn't mark it as REQUIRED.
-@@ -124,6 +119,11 @@
- "${XEXT_INCLUDE_DIR}" )
-
- if ( CMAKE_OPENGL_SUPPORT )
-+find_package( OpenGL REQUIRED )
-+find_package( GLX REQUIRED )
-+find_package( XRender REQUIRED )
-+find_package( XRandr REQUIRED )
-+find_package( GLEW REQUIRED )
- include_directories( "${IMLIB2_INCLUDE_DIR}"
- "${XRANDR_INCLUDE_DIR}"
- "${OPENGL_INCLUDE_DIR}"



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

Archive powered by MHonArc 2.6.24.

Top of Page