[packages/ruby-gnome2] - up to 3.3.7 - fix bad regex in header parser

baggins baggins at pld-linux.org
Mon Mar 23 00:51:33 CET 2020


commit 73e8bd00608210f31102178a677c7f9a4363b7b3
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Mar 23 00:51:10 2020 +0100

    - up to 3.3.7
    - fix bad regex in header parser

 fix-typedef-regexp.patch | 11 +++++++++++
 ruby-gnome2.spec         |  7 +++++--
 2 files changed, 16 insertions(+), 2 deletions(-)
---
diff --git a/ruby-gnome2.spec b/ruby-gnome2.spec
index 6f06c1a..8585ef6 100644
--- a/ruby-gnome2.spec
+++ b/ruby-gnome2.spec
@@ -7,14 +7,15 @@
 Summary:	GNOME 2 libraries for Ruby
 Summary(pl.UTF-8):	Biblioteki GNOME 2 dla języka Ruby
 Name:		ruby-gnome2
-Version:	3.3.6
+Version:	3.3.7
 Release:	1
 License:	LGPL v2.1
 Group:		Development/Languages
 Source0:	http://downloads.sourceforge.net/ruby-gnome2/%{name}-all-%{version}.tar.gz
-# Source0-md5:	eae2a41d1df634f51d9b0387f07b93a2
+# Source0-md5:	636bde778583af388390aaed1cde18d4
 Patch0:		no-native-package-install.patch
 Patch1:		missing-gem-import.patch
+Patch2:		fix-typedef-regexp.patch
 URL:		http://ruby-gnome2.sourceforge.jp/
 BuildRequires:	atk-devel >= 1:1.12.0
 BuildRequires:	cairo-devel >= 1.10.0
@@ -605,6 +606,8 @@ Przykłady do Ruby-GNOME2.
 %setup -q -n %{name}-all-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+
 find . -name '*.rb' | xargs sed -i -e '1s,#.*local/bin/ruby,#!%{_bindir}/ruby,'
 
 cp -p glib2/README.md README.glib2.md
diff --git a/fix-typedef-regexp.patch b/fix-typedef-regexp.patch
new file mode 100644
index 0000000..05a49b5
--- /dev/null
+++ b/fix-typedef-regexp.patch
@@ -0,0 +1,11 @@
+--- /home/users/baggins/devel/PLD/rpm/BUILD/ruby-gnome2-all-3.3.7/glib2/lib/glib-mkenums.rb.orig	2020-03-23 00:26:31.000000000 +0100
++++ /home/users/baggins/devel/PLD/rpm/BUILD/ruby-gnome2-all-3.3.7/glib2/lib/glib-mkenums.rb	2020-03-23 00:48:23.769518331 +0100
+@@ -112,7 +112,7 @@
+       data.force_encoding("utf-8") if data.respond_to?(:force_encoding)
+       data.scan(/^\s*typedef\s+enum\s*(\/\*<\s*flags\s*>\*\/)?\s*
+                 \{?\s*(.*?)
+-                \}\s*(\w+);/mx) do |force_flags, constants, name|
++                \}\s*(\w+)(\s|;)/mx) do |force_flags, constants, name|
+         enum_options = {}
+         enum_options[:force_flags] = !force_flags.nil?
+         force_flags_patterns = [(options[:force_flags] || [])].flatten
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ruby-gnome2.git/commitdiff/73e8bd00608210f31102178a677c7f9a4363b7b3



More information about the pld-cvs-commit mailing list