From 00cc4024e5fec921337ab8e4309a09ba4e0c70c1 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Oct 30 2018 06:26:22 +0000 Subject: import glibmm24-2.56.0-1.el7 --- diff --git a/.gitignore b/.gitignore index 79b815d..0877b7d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/glibmm-2.50.0.tar.xz +SOURCES/glibmm-2.56.0.tar.xz diff --git a/.glibmm24.metadata b/.glibmm24.metadata index 6b72d91..94dfb7c 100644 --- a/.glibmm24.metadata +++ b/.glibmm24.metadata @@ -1 +1 @@ -21ed63712e1bf84163768d4b909af80e4373e298 SOURCES/glibmm-2.50.0.tar.xz +d733d9206d706d53058749f92dfb319bb189c289 SOURCES/glibmm-2.56.0.tar.xz diff --git a/SOURCES/no-regex-replace.patch b/SOURCES/no-regex-replace.patch new file mode 100644 index 0000000..9292615 --- /dev/null +++ b/SOURCES/no-regex-replace.patch @@ -0,0 +1,38 @@ +diff -up glibmm-2.56.0/tools/extra_defs_gen/generate_extra_defs.cc.no-regex-replace glibmm-2.56.0/tools/extra_defs_gen/generate_extra_defs.cc +--- glibmm-2.56.0/tools/extra_defs_gen/generate_extra_defs.cc.no-regex-replace 2018-06-09 12:23:09.263360049 -0400 ++++ glibmm-2.56.0/tools/extra_defs_gen/generate_extra_defs.cc 2018-06-09 12:42:26.490317489 -0400 +@@ -36,6 +36,25 @@ void add_signal_flag_if(std::string& str + + } // anonymous namespace + ++static std::string ++string_replace (const char *input, ++ const char *old_token, ++ const char *new_token) ++{ ++ char **split_string; ++ char *c_output; ++ std::string output; ++ ++ split_string = g_strsplit (input, old_token, -1); ++ c_output = g_strjoinv (new_token, split_string); ++ g_strfreev (split_string); ++ ++ output = c_output; ++ g_free (c_output); ++ ++ return output; ++} ++ + std::string + get_property_with_node_name( + GParamSpec* pParamSpec, const std::string& strObjectName, const std::string& strNodeName) +@@ -87,7 +106,7 @@ get_property_with_node_name( + // Replace newlines with \n. + // A string default value can contain newline characters. + // gmmproc removes all newlines when it reads .defs files. +- defString = std::regex_replace(defCString, std::regex("\n"), "\\n"); ++ defString = string_replace (defCString, "\n", "\\n"); + } + else + defString = ""; // A NULL string pointer becomes an empty string. diff --git a/SPECS/glibmm24.spec b/SPECS/glibmm24.spec index f7bfdd2..5f44477 100644 --- a/SPECS/glibmm24.spec +++ b/SPECS/glibmm24.spec @@ -5,7 +5,7 @@ %global libsigc_version 2.9.1 Name: glibmm24 -Version: 2.50.0 +Version: 2.56.0 Release: 1%{?dist} Summary: C++ interface for the GLib library @@ -25,6 +25,8 @@ BuildRequires: perl(Getopt::Long) Requires: glib2%{?_isa} >= %{glib2_version} Requires: libsigc++20%{?_isa} >= %{libsigc_version} +Patch0: no-regex-replace.patch + %description glibmm is the official C++ interface for the popular cross-platform library GLib. It provides non-UI API that is not available in standard @@ -52,6 +54,7 @@ This package contains the full API documentation for %{name}. %prep %setup -q -n glibmm-%{version} +%patch0 -p1 -b .no-regex-replace %build @@ -92,6 +95,10 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' %changelog +* Fri Jun 08 2018 Ray Strode - 2.56.0-1 +- Update to 2.56.0 + Resolves: #1567380 + * Tue Sep 20 2016 Kalev Lember - 2.50.0-1 - Update to 2.50.0 - Resolves: #1386875