Hello community, here is the log from the commit of package yast2-gtk for openSUSE:Factory checked in at 2012-05-08 12:29:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-04-12 09:57:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-gtk.new/yast2-gtk.changes 2012-05-08 12:29:24.000000000 +0200 @@ -2 +2 @@ -Mon Apr 9 22:12:42 CEST 2012 - [email protected] +Mon Apr 30 10:25:22 CEST 2012 - [email protected] @@ -4 +4,2 @@ -- BuildRequire libxcrypt-devel only for < 12.2 +- Fix for bnc #722053 by Michael Meeks +- 2.22.5 @@ -7 +8 @@ -Wed Feb 8 21:36:29 UTC 2012 - [email protected] +Fri Mar 16 15:27:50 CET 2012 - [email protected] @@ -9 +10,2 @@ -- fix glib.h include +- Fix for bnc #751309: markup of release notes +- 2.22.4 @@ -12 +14 @@ -Fri Sep 23:50:00 UTC 2011 - [email protected] +Sat Sep 08 07:02:00 UTC 2011 - [email protected] @@ -14,3 +16,2 @@ -- layout issues for the manual conflicts resolver and other - sw_single dialogs. (bnc#716336) -- 2.22.2 +- disabled building of test-cases; broken in obs. +- 2.22.3 @@ -19 +20 @@ -Sat Sep 07:02:00 UTC 2011 - [email protected] +Fri Sep 07 23:50:00 UTC 2011 - [email protected] @@ -21,2 +22,3 @@ -- disabled building of test-cases; broken in obs. -- 2.22.3 +- layout issues for the manual conflicts resolver and other + sw_single dialogs. (bnc#716336) +- 2.22.2 Old: ---- bug-751309_yast2-gtk-support-a-name-tag.patch bug-751309_yast2-gtk-support-dl-tag.patch new.patch yast2-gtk-2.22.3.tar.bz2 New: ---- yast2-gtk-2.22.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-gtk.spec ++++++ --- /var/tmp/diff_new_pack.LNFkMl/_old 2012-05-08 12:29:25.000000000 +0200 +++ /var/tmp/diff_new_pack.LNFkMl/_new 2012-05-08 12:29:25.000000000 +0200 @@ -16,39 +16,42 @@ # + Name: yast2-gtk -Version: 2.22.3 +Version: 2.22.5 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-gtk-2.22.3.tar.bz2 +Source0: yast2-gtk-2.22.5.tar.bz2 Url: http://en.opensuse.org/YaST2-GTK Summary: YaST2 - GTK+ Graphical User Interface -License: GPL-2.0 or GPL-3.0 Group: System/YaST -BuildRequires: blocxx-devel +License: GPL-2.0 or GPL-3.0 BuildRequires: cmake -BuildRequires: gcc-c++ -BuildRequires: gdk-pixbuf-devel +BuildRequires: blocxx-devel gcc-c++ BuildRequires: gtk3-devel +BuildRequires: gdk-pixbuf-devel +BuildRequires: yast2-devtools >= 2.16.3 +BuildRequires: yast2-libyui-devel >= 2.18.8 +BuildRequires: libzypp-devel >= 6.3.0 %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 +%if 0%{?force_gcc_46} +BuildRequires: gcc46 +BuildRequires: gcc46-c++ +%else +BuildRequires: gcc-c++ >= 4.6 +%endif + Requires: gtk3 -Requires: libzypp >= 6.3.0 -Requires: yast2-branding Requires: yast2-libyui >= 2.18.8 Requires: yast2_theme >= 2.16.1 -Provides: yast2-ui-gtk -Provides: yast2_ui +Requires: yast2-branding +Requires: libzypp >= 6.3.0 +Provides: yast2_ui yast2-ui-gtk 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 @@ -56,9 +59,6 @@ %prep %setup -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 %build mkdir build @@ -74,6 +74,10 @@ %install cd build +%if 0%{?force_gcc_46} +export CC=gcc-4.6 +export CXX=g++-4.6 +%endif make install DESTDIR=$RPM_BUILD_ROOT cd .. ++++++ yast2-gtk-2.22.3.tar.bz2 -> yast2-gtk-2.22.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.22.3/Makefile new/yast2-gtk-2.22.5/Makefile --- old/yast2-gtk-2.22.3/Makefile 2011-09-10 07:03:13.000000000 +0200 +++ new/yast2-gtk-2.22.5/Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -1,21 +0,0 @@ -# Makefile meant only for convenience and to provide a nicer -# interface for the newcomer. - -all: - make -f Makefile.cvs - -install: - make -f Makefile.cvs install - -clean: - rm -rf build - -package: - cd build ; make package_source - mv build/*.tar.bz2 build/package/* package - -test: - build/src/test - -.PHONY: all install clean package test - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.22.3/README new/yast2-gtk-2.22.5/README --- old/yast2-gtk-2.22.3/README 2011-09-10 07:03:13.000000000 +0200 +++ new/yast2-gtk-2.22.5/README 2012-05-04 16:34:41.000000000 +0200 @@ -23,6 +23,7 @@ Building / Installing + cmake -D CMAKE_INSTALL_PREFIX=/usr -f CMakeLists.txt make && sudo make install [1] [1] - if you want sudo not to ask you a password, add yourself to the @@ -30,6 +31,7 @@ Running + export Y2DEBUG=1 /usr/lib/YaST2/bin/y2base /usr/share/doc/packages/yast2-core/libyui/examples/HelloWorld.ycp gtk From OpenSuse 10.3 on, it should be picked up automatically if you use Gnome. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.22.3/VERSION new/yast2-gtk-2.22.5/VERSION --- old/yast2-gtk-2.22.3/VERSION 2011-09-10 07:03:13.000000000 +0200 +++ new/yast2-gtk-2.22.5/VERSION 2012-05-04 16:34:41.000000000 +0200 @@ -1 +1 @@ -2.22.3 +2.22.5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.22.3/VERSION.cmake new/yast2-gtk-2.22.5/VERSION.cmake --- old/yast2-gtk-2.22.3/VERSION.cmake 2011-09-10 07:03:13.000000000 +0200 +++ new/yast2-gtk-2.22.5/VERSION.cmake 2012-05-04 16:34:41.000000000 +0200 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "22") -SET(VERSION_PATCH "3") +SET(VERSION_PATCH "5") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.22.3/package/yast2-gtk-rpmlintrc new/yast2-gtk-2.22.5/package/yast2-gtk-rpmlintrc --- old/yast2-gtk-2.22.3/package/yast2-gtk-rpmlintrc 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-gtk-2.22.5/package/yast2-gtk-rpmlintrc 2012-05-04 16:34:41.000000000 +0200 @@ -0,0 +1,3 @@ +# yast2 likes a .so file for it's plugin that looks like a -devel pkg thing +addFilter("devel-file-in-non-devel-package") + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.22.3/package/yast2-gtk.changes new/yast2-gtk-2.22.5/package/yast2-gtk.changes --- old/yast2-gtk-2.22.3/package/yast2-gtk.changes 2011-09-10 07:03:13.000000000 +0200 +++ new/yast2-gtk-2.22.5/package/yast2-gtk.changes 2012-05-04 16:34:41.000000000 +0200 @@ -1,11 +1,23 @@ ------------------------------------------------------------------- -Sat Sep 07:02:00 UTC 2011 - [email protected] +Mon Apr 30 10:25:22 CEST 2012 - [email protected] + +- Fix for bnc #722053 by Michael Meeks +- 2.22.5 + +------------------------------------------------------------------- +Fri Mar 16 15:27:50 CET 2012 - [email protected] + +- Fix for bnc #751309: markup of release notes +- 2.22.4 + +------------------------------------------------------------------- +Sat Sep 08 07:02:00 UTC 2011 - [email protected] - disabled building of test-cases; broken in obs. - 2.22.3 ------------------------------------------------------------------- -Fri Sep 23:50:00 UTC 2011 - [email protected] +Fri Sep 07 23:50:00 UTC 2011 - [email protected] - layout issues for the manual conflicts resolver and other sw_single dialogs. (bnc#716336) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.22.3/package/yast2-gtk.spec new/yast2-gtk-2.22.5/package/yast2-gtk.spec --- old/yast2-gtk-2.22.3/package/yast2-gtk.spec 2011-09-10 07:03:13.000000000 +0200 +++ new/yast2-gtk-2.22.5/package/yast2-gtk.spec 1970-01-01 01:00:00.000000000 +0100 @@ -1,69 +0,0 @@ -# -# spec file for package yast2-gtk (Version 2.22.2) -# -# norootforbuild;, - - -Name: yast2-gtk -Version: 2.22.2 -Release: 0 - - -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-gtk-2.22.2.tar.bz2 -Url: http://en.opensuse.org/YaST2-GTK -Summary: YaST2 - GTK+ Graphical User Interface -Group: System/YaST -License: GPL-2.0 or GPL-3.0 -BuildRequires: cmake -BuildRequires: gcc-c++ blocxx-devel libxcrypt-devel -BuildRequires: gtk3-devel -BuildRequires: gdk-pixbuf-devel -BuildRequires: yast2-devtools >= 2.16.3 -BuildRequires: yast2-libyui-devel >= 2.18.8 -BuildRequires: libzypp-devel >= 6.3.0 -Requires: gtk3 -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_pkg -Source1: yast2-gtk-rpmlintrc - -%description -One of several user interfaces available for YaST2, based on GTK and -the X Window System. - -%prep -%setup - -%build -mkdir build -cd build -export CFLAGS="$RPM_OPT_FLAGS" -export CXXFLAGS="$CFLAGS" -cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - -DLIB=%{_lib} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=1 \ - .. -make %{?_smp_mflags} VERBOSE=1 - -%install -cd build -make install DESTDIR=$RPM_BUILD_ROOT -cd .. - -%clean -rm -rf "$RPM_BUILD_ROOT" - -%files -%defattr (-, root, root) -%dir %_libdir/YaST2 -%_libdir/YaST2/plugin/ -%doc COPYING.GPL2 -%doc COPYING.GPL3 - -%changelog - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.22.3/src/YGDialog.cc new/yast2-gtk-2.22.5/src/YGDialog.cc --- old/yast2-gtk-2.22.3/src/YGDialog.cc 2011-09-10 07:03:13.000000000 +0200 +++ new/yast2-gtk-2.22.5/src/YGDialog.cc 2012-05-04 16:34:41.000000000 +0200 @@ -375,17 +375,16 @@ { // libyui calls YDialog::setSize() to force a geometry recalculation as a // result of changed layout properties + bool resize = false; GtkWidget *window = m_window->getWidget(); if (gtk_widget_get_realized (window)) { gtk_widget_queue_resize (window); width = MIN (width, YUI::app()->displayWidth()); height = MIN (height, YUI::app()->displayHeight()); -#if 1 - bool resize = false; if (isMainDialog()) { - GtkAllocation allocation; - gtk_widget_get_allocation(window, &allocation); - if (allocation.width < width || allocation.height < height) { + GtkAllocation allocation; + gtk_widget_get_allocation(window, &allocation); + if (allocation.width < width || allocation.height < height) { resize = true; width = MAX (width, allocation.width), height = MAX (height, allocation.height); @@ -393,12 +392,11 @@ } else resize = true; - if (resize) -#else - if (!isMainDialog()) -#endif - gtk_window_resize (GTK_WINDOW (window), width, height); } + if (resize) + gtk_window_resize (GTK_WINDOW (window), width, height); + else + gtk_window_set_default_size (GTK_WINDOW (window), width, height); } void YGDialog::highlight (YWidget *ywidget) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.22.3/src/YGUI.cc new/yast2-gtk-2.22.5/src/YGUI.cc --- old/yast2-gtk-2.22.3/src/YGUI.cc 2011-09-10 07:03:13.000000000 +0200 +++ new/yast2-gtk-2.22.5/src/YGUI.cc 2012-05-04 16:34:41.000000000 +0200 @@ -17,7 +17,7 @@ #include "YGi18n.h" #include "YGUtils.h" #include "YGDialog.h" -#include <glib/gthread.h> +#include <glib.h> static std::string askForFileOrDirectory (GtkFileChooserAction action, const std::string &path, const std::string &filter, const std::string &title); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.22.3/src/ygtkrichtext.c new/yast2-gtk-2.22.5/src/ygtkrichtext.c --- old/yast2-gtk-2.22.3/src/ygtkrichtext.c 2011-09-10 07:03:13.000000000 +0200 +++ new/yast2-gtk-2.22.5/src/ygtkrichtext.c 2012-05-04 16:34:41.000000000 +0200 @@ -68,8 +68,16 @@ 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; } @@ -80,7 +88,7 @@ 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 +96,7 @@ 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; @@ -362,6 +370,10 @@ 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]); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.22.3/src/ygtkwindow.c new/yast2-gtk-2.22.5/src/ygtkwindow.c --- old/yast2-gtk-2.22.3/src/ygtkwindow.c 2011-09-10 07:03:13.000000000 +0200 +++ new/yast2-gtk-2.22.5/src/ygtkwindow.c 2012-05-04 16:34:41.000000000 +0200 @@ -18,20 +18,27 @@ GtkWidget* ygtk_window_new (void) { return g_object_new (YGTK_TYPE_WINDOW, NULL); } -void ygtk_window_get_preferred_width (GtkWidget *widget, - gint *minimum_width, gint *natural_width) +static void ygtk_window_get_preferred_width (GtkWidget *widget, + gint *minimum_width, gint *natural_width) { GTK_WIDGET_CLASS (ygtk_window_parent_class)->get_preferred_width(widget, minimum_width, natural_width); *minimum_width = 0; } -void ygtk_window_get_preferred_height (GtkWidget *widget, - gint *minimum_height, gint *natural_height) +static void ygtk_window_get_preferred_height (GtkWidget *widget, + gint *minimum_height, gint *natural_height) { GTK_WIDGET_CLASS (ygtk_window_parent_class)->get_preferred_height(widget, minimum_height, natural_height); *minimum_height = 0; } +static void +ygtk_window_size_allocate (GtkWidget *widget, + GtkAllocation *allocation) +{ + GTK_WIDGET_CLASS (ygtk_window_parent_class)->size_allocate(widget, allocation); +} + static void ygtk_window_class_init (YGtkWindowClass *klass) { ygtk_window_parent_class = g_type_class_peek_parent (klass); @@ -39,5 +46,6 @@ GtkWidgetClass* widget_class = GTK_WIDGET_CLASS (klass); widget_class->get_preferred_width = ygtk_window_get_preferred_width; widget_class->get_preferred_height = ygtk_window_get_preferred_height; + widget_class->size_allocate = ygtk_window_size_allocate; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.22.3/yast2-gtk.spec.in new/yast2-gtk-2.22.5/yast2-gtk.spec.in --- old/yast2-gtk-2.22.3/yast2-gtk.spec.in 2011-09-10 07:03:13.000000000 +0200 +++ new/yast2-gtk-2.22.5/yast2-gtk.spec.in 2012-05-04 16:34:41.000000000 +0200 @@ -7,12 +7,22 @@ Group: System/YaST License: GPL-2.0 or GPL-3.0 BuildRequires: cmake -BuildRequires: gcc-c++ blocxx-devel libxcrypt-devel +BuildRequires: gcc-c++ blocxx-devel BuildRequires: gtk3-devel BuildRequires: gdk-pixbuf-devel BuildRequires: yast2-devtools >= 2.16.3 BuildRequires: yast2-libyui-devel >= 2.18.8 BuildRequires: libzypp-devel >= 6.3.0 +%if 0%{?suse_version} < 1220 +BuildRequires: libxcrypt-devel +%endif +%if 0%{?force_gcc_46} +BuildRequires: gcc46 +BuildRequires: gcc46-c++ +%else +BuildRequires: gcc-c++ >= 4.6 +%endif + Requires: gtk3 Requires: yast2-libyui >= 2.18.8 Requires: yast2_theme >= 2.16.1 @@ -43,6 +53,10 @@ %install cd build +%if 0%{?force_gcc_46} +export CC=gcc-4.6 +export CXX=g++-4.6 +%endif make install DESTDIR=$RPM_BUILD_ROOT cd .. ++++++ yast2-gtk-rpmlintrc ++++++ --- /var/tmp/diff_new_pack.LNFkMl/_old 2012-05-08 12:29:26.000000000 +0200 +++ /var/tmp/diff_new_pack.LNFkMl/_new 2012-05-08 12:29:26.000000000 +0200 @@ -1,2 +1,3 @@ # yast2 likes a .so file for it's plugin that looks like a -devel pkg thing addFilter("devel-file-in-non-devel-package") + -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
