Hello community, here is the log from the commit of package yast2-gtk for openSUSE:Factory checked in at 2012-04-12 09:57:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-gtk (Old) and /work/SRC/openSUSE:Factory/.yast2-gtk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-gtk", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-gtk/yast2-gtk.changes 2012-02-08 22:37:14.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-gtk.new/yast2-gtk.changes 2012-04-12 09:57:51.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Apr 9 22:12:42 CEST 2012 - [email protected] + +- BuildRequire libxcrypt-devel only for < 12.2 + +------------------------------------------------------------------- New: ---- bug-751309_yast2-gtk-support-a-name-tag.patch bug-751309_yast2-gtk-support-dl-tag.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-gtk.spec ++++++ --- /var/tmp/diff_new_pack.GntYnl/_old 2012-04-12 09:57:54.000000000 +0200 +++ /var/tmp/diff_new_pack.GntYnl/_new 2012-04-12 09:57:54.000000000 +0200 @@ -31,19 +31,24 @@ BuildRequires: gcc-c++ BuildRequires: gdk-pixbuf-devel BuildRequires: gtk3-devel +%if 0%{?suse_version} < 1220 BuildRequires: libxcrypt-devel +%endif BuildRequires: libzypp-devel >= 6.3.0 BuildRequires: yast2-devtools >= 2.16.3 BuildRequires: yast2-libyui-devel >= 2.18.8 Requires: gtk3 +Requires: libzypp >= 6.3.0 +Requires: yast2-branding Requires: yast2-libyui >= 2.18.8 Requires: yast2_theme >= 2.16.1 -Requires: yast2-branding -Requires: libzypp >= 6.3.0 -Provides: yast2_ui yast2-ui-gtk +Provides: yast2-ui-gtk +Provides: yast2_ui Provides: yast2_ui_pkg Source1: yast2-gtk-rpmlintrc Patch0: new.patch +Patch1: bug-751309_yast2-gtk-support-a-name-tag.patch +Patch2: bug-751309_yast2-gtk-support-dl-tag.patch %description One of several user interfaces available for YaST2, based on GTK and @@ -52,6 +57,8 @@ %prep %setup %patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build mkdir build ++++++ bug-751309_yast2-gtk-support-a-name-tag.patch ++++++ --- src/ygtkrichtext.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) --- a/src/ygtkrichtext.c +++ b/src/ygtkrichtext.c @@ -68,8 +68,16 @@ static gboolean event_after (GtkWidget * return FALSE; const char *link = get_link (GTK_TEXT_VIEW (text_view), event->x, event->y); - if (link) // report link - g_signal_emit (YGTK_RICH_TEXT (text_view), link_clicked_signal, 0, link); + if (link) { + if (*link == '#') { + GtkTextMark *mark = gtk_text_buffer_get_mark (buffer, link + 1); + if (mark) + gtk_text_view_scroll_to_mark (GTK_TEXT_VIEW (text_view), mark, 0.4, TRUE, 0, 0); + } else { + // report link + g_signal_emit (YGTK_RICH_TEXT (text_view), link_clicked_signal, 0, link); + } + } return FALSE; } @@ -355,6 +363,10 @@ rt_start_element (GMarkupParseContext *c g_object_set (tag->tag, "foreground-gdk", &link_color, NULL); g_object_set_data (G_OBJECT (tag->tag), "link", g_strdup (attribute_values[0])); } + else if (attribute_names[0] && + !g_ascii_strcasecmp (attribute_names[0], "name")) { + gtk_text_buffer_create_mark (state->buffer, attribute_values[0], &iter, TRUE); + } else g_warning ("Unknown a attribute: '%s'", attribute_names[0]); } ++++++ bug-751309_yast2-gtk-support-dl-tag.patch ++++++ --- src/ygtkrichtext.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/src/ygtkrichtext.c +++ b/src/ygtkrichtext.c @@ -80,7 +80,7 @@ static int mystrcmp(void *a, void *b) static gboolean isBlockTag (const char *tag) { static const char *Tags[] = - { "blockquote", "h1", "h2", "h3", "h4", "h5", "li", "p", "pre" }; + { "blockquote", "dd", "dl", "dt", "h1", "h2", "h3", "h4", "h5", "li", "p", "pre" }; void *ret; ret = bsearch (&tag, Tags, sizeof (Tags)/sizeof(char*), sizeof(char *), (void*)mystrcmp); return ret != 0; @@ -88,7 +88,7 @@ static gboolean isBlockTag (const char * static gboolean isIdentTag (const char *tag) { static const char *Tags[] = - { "blockquote", "ol", "ul" }; + { "blockquote", "dd", "ol", "ul" }; void *ret; ret = bsearch (&tag, Tags, sizeof (Tags)/sizeof(char*), sizeof(char *), (void*)mystrcmp); return ret != 0; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
