rpms/kazehakase/devel kazehakase-0.4.7-glib-2.13.3-g_regex_free_replace.patch, NONE, 1.1 kazehakase.spec, 1.17, 1.18
Mamoru Tasaka (mtasaka)
fedora-extras-commits at redhat.com
Tue Jun 5 06:02:58 UTC 2007
Author: mtasaka
Update of /cvs/extras/rpms/kazehakase/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18118
Modified Files:
kazehakase.spec
Added Files:
kazehakase-0.4.7-glib-2.13.3-g_regex_free_replace.patch
Log Message:
* Tue Jun 5 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.7-3
- Patch to follow the newest GLib symbol
kazehakase-0.4.7-glib-2.13.3-g_regex_free_replace.patch:
--- NEW FILE kazehakase-0.4.7-glib-2.13.3-g_regex_free_replace.patch ---
--- kazehakase-0.4.7/src/actions/kz-actions.c.glib 2007-05-29 23:25:05.000000000 +0900
+++ kazehakase-0.4.7/src/actions/kz-actions.c 2007-06-05 14:29:14.000000000 +0900
@@ -336,7 +336,7 @@
}
g_match_info_free(match_info);
- g_regex_free(regex);
+ g_regex_unref(regex);
g_free(text);
}
--- kazehakase-0.4.7/src/actions/kz-history-action.c.glib 2007-05-29 23:25:05.000000000 +0900
+++ kazehakase-0.4.7/src/actions/kz-history-action.c 2007-06-05 14:29:14.000000000 +0900
@@ -127,7 +127,7 @@
if (action->completion_regex)
{
- g_regex_free(action->completion_regex);
+ g_regex_unref(action->completion_regex);
action->completion_regex = NULL;
}
@@ -296,7 +296,7 @@
if (action->completion_previous_key &&
strcmp(action->completion_previous_key, key))
{
- g_regex_free(action->completion_regex);
+ g_regex_unref(action->completion_regex);
action->completion_regex = NULL;
g_free(action->completion_previous_key);
--- kazehakase-0.4.7/src/actions/kz-location-entry-action.c.glib 2007-05-29 23:25:05.000000000 +0900
+++ kazehakase-0.4.7/src/actions/kz-location-entry-action.c 2007-06-05 14:29:14.000000000 +0900
@@ -522,7 +522,7 @@
}
g_match_info_free(match_info);
- g_regex_free(regex);
+ g_regex_unref(regex);
}
static gboolean
--- kazehakase-0.4.7/src/bookmarks/kz-bookmark-filter.c.glib 2007-05-29 23:25:05.000000000 +0900
+++ kazehakase-0.4.7/src/bookmarks/kz-bookmark-filter.c 2007-06-05 14:29:14.000000000 +0900
@@ -112,7 +112,7 @@
match = g_regex_match(regex, str, 0, NULL);
g_free(exp);
- g_regex_free(regex);
+ g_regex_unref(regex);
if (match)
return TRUE;
--- kazehakase-0.4.7/src/bookmarks/kz-smart-bookmark.c.glib 2007-05-29 23:25:05.000000000 +0900
+++ kazehakase-0.4.7/src/bookmarks/kz-smart-bookmark.c 2007-06-05 14:29:14.000000000 +0900
@@ -289,7 +289,7 @@
}
ret = g_regex_match(regex, text, 0, &match_info);
- g_regex_free(regex);
+ g_regex_unref(regex);
if (ret)
{
--- kazehakase-0.4.7/src/kz-migemo.c.glib 2007-05-29 23:25:05.000000000 +0900
+++ kazehakase-0.4.7/src/kz-migemo.c 2007-06-05 14:29:14.000000000 +0900
@@ -211,7 +211,7 @@
if (!last) break;
}
g_match_info_free(match_info);
- g_regex_free(regex);
+ g_regex_unref(regex);
return matched_text;
}
--- kazehakase-0.4.7/src/utils/gregex.c.glib 2007-05-29 23:25:05.000000000 +0900
+++ kazehakase-0.4.7/src/utils/gregex.c 2007-06-05 14:29:15.000000000 +0900
@@ -838,7 +838,7 @@
}
/**
- * g_regex_free:
+ * g_regex_unref:
* @regex: a #GRegex
*
* Frees all the memory associated with the regex structure.
@@ -846,7 +846,7 @@
* Since: 2.14
*/
void
-g_regex_free (GRegex *regex)
+g_regex_unref (GRegex *regex)
{
if (regex == NULL)
return;
@@ -952,7 +952,7 @@
if (!regex)
return FALSE;
result = g_regex_match_full (regex, string, -1, 0, match_options, NULL, NULL);
- g_regex_free (regex);
+ g_regex_unref (regex);
return result;
}
@@ -993,7 +993,7 @@
* g_match_info_next (match_info, NULL);
* }
* g_match_info_free (match_info);
- * g_regex_free (regex);
+ * g_regex_unref (regex);
* }
* </programlisting></informalexample>
*
@@ -1056,7 +1056,7 @@
* g_match_info_next (match_info, &error);
* }
* g_match_info_free (match_info);
- * g_regex_free (regex);
+ * g_regex_unref (regex);
* if (error != NULL)
* {
* g_printerr ("Error while matching: %s\n", error->message);
@@ -1317,7 +1317,7 @@
if (!regex)
return NULL;
result = g_regex_split_full (regex, string, -1, 0, match_options, 0, NULL);
- g_regex_free (regex);
+ g_regex_unref (regex);
return result;
}
--- kazehakase-0.4.7/src/utils/gregex.h.glib 2007-05-29 23:25:05.000000000 +0900
+++ kazehakase-0.4.7/src/utils/gregex.h 2007-06-05 14:29:15.000000000 +0900
@@ -88,7 +88,7 @@
GRegexCompileFlags compile_options,
GRegexMatchFlags match_options,
GError **error);
-void g_regex_free (GRegex *regex);
+void g_regex_unref (GRegex *regex);
const gchar *g_regex_get_pattern (const GRegex *regex);
gint g_regex_get_max_backref (const GRegex *regex);
gint g_regex_get_capture_count (const GRegex *regex);
Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/kazehakase.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- kazehakase.spec 4 Jun 2007 18:42:08 -0000 1.17
+++ kazehakase.spec 5 Jun 2007 06:02:18 -0000 1.18
@@ -22,17 +22,18 @@
%define repoid 25610
-%define svnver 3221
+%define glib_regex_unref_ver 2.13.3
Name: kazehakase
Version: 0.4.7
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Kazehakase browser
Group: Applications/Internet
License: GPL
URL: http://kazehakase.sourceforge.jp/
Source0: http://downloads.sourceforge.jp/kazehakase/%{repoid}/%{name}-%{version}.tar.gz
+Patch0: kazehakase-0.4.7-glib-2.13.3-g_regex_free_replace.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: expat-devel
@@ -62,7 +63,7 @@
# Require Binary Compatible glib
# returns bogus value if glib2-devel is not installed in order for parsing to succeed
# bogus value wont make it into a real package
-%define glib_ver %([ -a %{_libdir}/pkgconfig/glib-2.0.pc ] && pkg-config --modversion glib-2.0 | cut -d. -f 1,2 || echo -n "999")
+%define glib_ver %([ -a %{_libdir}/pkgconfig/glib-2.0.pc ] && pkg-config --modversion glib-2.0 || echo -n "999")
BuildRequires: glib2-devel
Requires: glib2 >= %{glib_ver}
@@ -120,6 +121,9 @@
%prep
%setup -q
+if pkg-config --exists 'glib-2.0 >= %{glib_regex_unref_ver}' ; then
+%patch0 -p1 -b .glib
+fi
%{__sed} -i.multilib -e \
'/gecko/s|mozilla-config.h|mozilla-config*.h|' \
@@ -214,6 +218,9 @@
%endif
%changelog
+* Tue Jun 5 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.7-3
+- Patch to follow the newest GLib symbol
+
* Tue Jun 5 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.7-2
- Parse GLib version dependency
More information about the scm-commits
mailing list