June 2013 - openSUSE Commits - openSUSE Mailing Lists

commit at-spi2-atk for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '13

29 Jun '13

Hello community, here is the log from the commit of package at-spi2-atk for openSUSE:Factory checked in at 2013-06-29 19:36:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/at-spi2-atk (Old) and /work/SRC/openSUSE:Factory/.at-spi2-atk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "at-spi2-atk" Changes: -------- --- /work/SRC/openSUSE:Factory/at-spi2-atk/at-spi2-atk.changes 2013-04-26 15:36:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.at-spi2-atk.new/at-spi2-atk.changes 2013-06-29 19:36:34.000000000 +0200 @@ -1,0 +2,14 @@ +Fri Jun 21 19:07:47 UTC 2013 - dimstar(a)opensuse.org + +- Update to version 2.9.3: + + Fix reentrancy issues with gnome-shell (bgo#681276). + +------------------------------------------------------------------- +Tue May 28 19:51:22 UTC 2013 - dimstar(a)opensuse.org + +- Update to version 2.9.2: + + Fix various DBusError leaks (bgo#698951). + + Suppress a warning if an app returns NULL when referencing a + child. + +------------------------------------------------------------------- Old: ---- at-spi2-atk-2.8.1.tar.xz New: ---- at-spi2-atk-2.9.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ at-spi2-atk.spec ++++++ --- /var/tmp/diff_new_pack.hUiSlF/_old 2013-06-29 19:36:35.000000000 +0200 +++ /var/tmp/diff_new_pack.hUiSlF/_new 2013-06-29 19:36:35.000000000 +0200 @@ -17,18 +17,18 @@ Name: at-spi2-atk -Version: 2.8.1 +Version: 2.9.3 Release: 0 Summary: Assistive Technology Service Provider Interface - GTK+ module License: LGPL-2.0+ Group: System/Libraries Url: http://www.gnome.org/ -Source0: http://download.gnome.org/sources/at-spi2-atk/2.8/%{name}-%{version}.tar.xz +Source0: http://download.gnome.org/sources/at-spi2-atk/2.9/%{name}-%{version}.tar.xz Source98: baselibs.conf Source99: %{name}-rpmlintrc BuildRequires: fdupes BuildRequires: pkgconfig(atk) >= 2.7.5 -BuildRequires: pkgconfig(atspi-2) >= 2.7.5 +BuildRequires: pkgconfig(atspi-2) >= 2.9.3 BuildRequires: pkgconfig(dbus-1) >= 1.0 BuildRequires: pkgconfig(glib-2.0) >= 2.32.0 BuildRequires: pkgconfig(gmodule-2.0) >= 2.0.0 ++++++ at-spi2-atk-2.8.1.tar.xz -> at-spi2-atk-2.9.3.tar.xz ++++++ ++++ 1979 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/NEWS new/at-spi2-atk-2.9.3/NEWS --- old/at-spi2-atk-2.8.1/NEWS 2013-04-17 03:16:32.000000000 +0200 +++ new/at-spi2-atk-2.9.3/NEWS 2013-06-17 23:02:02.000000000 +0200 @@ -1,8 +1,16 @@ -What's new in at-spi2-atk 2.8.1: +What's new in at-spi2-atk 2.9.3: -* Fix memory leak in socketadaptor.c (BGO#696733) +* Fix for BGO#681276 (reentrancy issues with gnome-shell). -* Fix a crash when handling a D-Bus method reply after deinitialization. +What's new in at-spi2-atk 2.9.2: + +* Fix a memory leak in the socket adaptor (BGO#696733). + +* Fix various DBusError leaks (BGO#698951). + +* Fix crash when a main loop is shut down repeatedly (BGO#699554). + +* Suppress a warning if an app returns NULL when referencing a child. What's new in at-spi2-atk 2.7.91: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/accessible-adaptor.c new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/accessible-adaptor.c --- old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/accessible-adaptor.c 2013-04-03 23:16:53.000000000 +0200 +++ new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/accessible-adaptor.c 2013-05-14 19:50:48.000000000 +0200 @@ -144,15 +144,13 @@ { AtkObject *object = (AtkObject *) user_data; DBusMessage *reply; - DBusError error; dbus_int32_t i; AtkObject *child; - dbus_error_init (&error); g_return_val_if_fail (ATK_IS_OBJECT (user_data), droute_not_yet_handled_error (message)); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &i, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &i, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/action-adaptor.c new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/action-adaptor.c --- old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/action-adaptor.c 2012-12-17 19:52:09.000000000 +0100 +++ new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/action-adaptor.c 2013-05-14 19:50:48.000000000 +0200 @@ -43,16 +43,14 @@ void *user_data) { AtkAction *action = (AtkAction *) user_data; - DBusError error; DBusMessage *reply; dbus_int32_t index; const char *desc; - dbus_error_init (&error); g_return_val_if_fail (ATK_IS_ACTION (user_data), droute_not_yet_handled_error (message)); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -72,16 +70,14 @@ impl_get_name (DBusConnection * bus, DBusMessage * message, void *user_data) { DBusMessage *reply; - DBusError error; dbus_int32_t index; const char *name; AtkAction *action = (AtkAction *) user_data; - dbus_error_init (&error); g_return_val_if_fail (ATK_IS_ACTION (user_data), droute_not_yet_handled_error (message)); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -101,16 +97,14 @@ impl_get_localized_name (DBusConnection * bus, DBusMessage * message, void *user_data) { DBusMessage *reply; - DBusError error; dbus_int32_t index; const char *name; AtkAction *action = (AtkAction *) user_data; - dbus_error_init (&error); g_return_val_if_fail (ATK_IS_ACTION (user_data), droute_not_yet_handled_error (message)); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -131,16 +125,14 @@ void *user_data) { DBusMessage *reply; - DBusError error; dbus_int32_t index; const char *kb; AtkAction *action = (AtkAction *) user_data; - dbus_error_init (&error); g_return_val_if_fail (ATK_IS_ACTION (user_data), droute_not_yet_handled_error (message)); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -211,16 +203,14 @@ impl_DoAction (DBusConnection * bus, DBusMessage * message, void *user_data) { AtkAction *action = (AtkAction *) user_data; - DBusError error; dbus_int32_t index; dbus_bool_t rv = TRUE; DBusMessage *reply; g_return_val_if_fail (ATK_IS_ACTION (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/application-adaptor.c new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/application-adaptor.c --- old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/application-adaptor.c 2012-12-17 19:52:09.000000000 +0100 +++ new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/application-adaptor.c 2013-06-15 22:48:01.000000000 +0200 @@ -110,7 +110,7 @@ reply = dbus_message_new_method_return(msg); if (reply) { - const char *retval = (g_getenv ("AT_SPI_CLIENT") ? + const char *retval = (atspi_is_initialized () ? "": spi_global_app_data->app_bus_addr); if (!retval) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/cache-adaptor.c new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/cache-adaptor.c --- old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/cache-adaptor.c 2012-12-17 19:52:09.000000000 +0100 +++ new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/cache-adaptor.c 2013-05-20 23:24:46.000000000 +0200 @@ -154,8 +154,11 @@ AtkObject *child; child = atk_object_ref_accessible_child (obj, i); - spi_object_append_reference (&iter_sub_array, child); - g_object_unref (G_OBJECT (child)); + if (child) + { + spi_object_append_reference (&iter_sub_array, child); + g_object_unref (G_OBJECT (child)); + } } } if (ATK_IS_SOCKET (obj) && atk_socket_is_occupied (ATK_SOCKET (obj))) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/component-adaptor.c new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/component-adaptor.c --- old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/component-adaptor.c 2012-12-17 19:52:09.000000000 +0100 +++ new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/component-adaptor.c 2013-05-14 19:50:48.000000000 +0200 @@ -36,16 +36,14 @@ AtkComponent *component = (AtkComponent *) user_data; dbus_int32_t x, y; dbus_uint32_t coord_type; - DBusError error; dbus_bool_t retval; DBusMessage *reply; g_return_val_if_fail (ATK_IS_COMPONENT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y, + (message, NULL, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y, DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); @@ -69,15 +67,13 @@ dbus_int32_t x, y; dbus_uint32_t coord_type; DBusMessage *reply; - DBusError error; AtkObject *child; g_return_val_if_fail (ATK_IS_COMPONENT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y, + (message, NULL, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y, DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); @@ -96,16 +92,14 @@ impl_GetExtents (DBusConnection * bus, DBusMessage * message, void *user_data) { AtkComponent *component = (AtkComponent *) user_data; - DBusError error; dbus_uint32_t coord_type; gint ix, iy, iwidth, iheight; g_return_val_if_fail (ATK_IS_COMPONENT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -119,7 +113,6 @@ void *user_data) { AtkComponent *component = (AtkComponent *) user_data; - DBusError error; dbus_uint32_t coord_type; gint ix = 0, iy = 0; dbus_int32_t x, y; @@ -128,9 +121,8 @@ g_return_val_if_fail (ATK_IS_COMPONENT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/document-adaptor.c new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/document-adaptor.c --- old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/document-adaptor.c 2012-12-17 19:52:09.000000000 +0100 +++ new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/document-adaptor.c 2013-05-14 19:50:48.000000000 +0200 @@ -55,16 +55,14 @@ void *user_data) { AtkDocument *document = (AtkDocument *) user_data; - DBusError error; gchar *attributename; const gchar *atr; DBusMessage *reply; g_return_val_if_fail (ATK_IS_DOCUMENT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_STRING, &attributename, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_STRING, &attributename, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/editabletext-adaptor.c new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/editabletext-adaptor.c --- old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/editabletext-adaptor.c 2012-12-17 19:52:09.000000000 +0100 +++ new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/editabletext-adaptor.c 2013-05-14 19:50:48.000000000 +0200 @@ -35,14 +35,12 @@ AtkEditableText *editable = (AtkEditableText *) user_data; const char *newContents; dbus_bool_t rv; - DBusError error; DBusMessage *reply; g_return_val_if_fail (ATK_IS_EDITABLE_TEXT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_STRING, &newContents, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_STRING, &newContents, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -65,15 +63,13 @@ dbus_int32_t position, length; char *text; dbus_bool_t rv; - DBusError error; DBusMessage *reply; gint ip; g_return_val_if_fail (ATK_IS_EDITABLE_TEXT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &position, DBUS_TYPE_STRING, &text, + (message, NULL, DBUS_TYPE_INT32, &position, DBUS_TYPE_STRING, &text, DBUS_TYPE_INT32, &length, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); @@ -96,13 +92,11 @@ { AtkEditableText *editable = (AtkEditableText *) user_data; dbus_int32_t startPos, endPos; - DBusError error; g_return_val_if_fail (ATK_IS_EDITABLE_TEXT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &startPos, DBUS_TYPE_INT32, &endPos, + (message, NULL, DBUS_TYPE_INT32, &startPos, DBUS_TYPE_INT32, &endPos, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); @@ -116,15 +110,13 @@ { AtkEditableText *editable = (AtkEditableText *) user_data; dbus_int32_t startPos, endPos; - DBusError error; dbus_bool_t rv; DBusMessage *reply; g_return_val_if_fail (ATK_IS_EDITABLE_TEXT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &startPos, DBUS_TYPE_INT32, &endPos, + (message, NULL, DBUS_TYPE_INT32, &startPos, DBUS_TYPE_INT32, &endPos, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); @@ -146,15 +138,13 @@ { AtkEditableText *editable = (AtkEditableText *) user_data; dbus_int32_t startPos, endPos; - DBusError error; dbus_bool_t rv; DBusMessage *reply; g_return_val_if_fail (ATK_IS_EDITABLE_TEXT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &startPos, DBUS_TYPE_INT32, &endPos, + (message, NULL, DBUS_TYPE_INT32, &startPos, DBUS_TYPE_INT32, &endPos, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); @@ -176,15 +166,13 @@ { AtkEditableText *editable = (AtkEditableText *) user_data; dbus_int32_t position; - DBusError error; dbus_bool_t rv; DBusMessage *reply; g_return_val_if_fail (ATK_IS_EDITABLE_TEXT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &position, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &position, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/hyperlink-adaptor.c new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/hyperlink-adaptor.c --- old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/hyperlink-adaptor.c 2012-12-17 19:52:09.000000000 +0100 +++ new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/hyperlink-adaptor.c 2013-05-14 19:50:48.000000000 +0200 @@ -68,15 +68,13 @@ impl_GetObject (DBusConnection * bus, DBusMessage * message, void *user_data) { AtkHyperlink *link = get_hyperlink (user_data); - DBusError error; dbus_int32_t i; AtkObject *atk_object; g_return_val_if_fail (ATK_IS_HYPERLINK (link), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &i, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &i, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -89,15 +87,13 @@ { AtkHyperlink *link = get_hyperlink (user_data); dbus_int32_t i; - DBusError error; gchar *rv; DBusMessage *reply; g_return_val_if_fail (ATK_IS_HYPERLINK (link), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &i, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &i, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/hypertext-adaptor.c new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/hypertext-adaptor.c --- old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/hypertext-adaptor.c 2012-12-17 19:52:09.000000000 +0100 +++ new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/hypertext-adaptor.c 2013-05-14 19:50:48.000000000 +0200 @@ -53,15 +53,13 @@ impl_GetLink (DBusConnection * bus, DBusMessage * message, void *user_data) { AtkHypertext *hypertext = (AtkHypertext *) user_data; - DBusError error; dbus_int32_t linkIndex; AtkHyperlink *link; g_return_val_if_fail (ATK_IS_HYPERTEXT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &linkIndex, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &linkIndex, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -77,16 +75,14 @@ void *user_data) { AtkHypertext *hypertext = (AtkHypertext *) user_data; - DBusError error; dbus_int32_t characterIndex; dbus_int32_t rv; DBusMessage *reply; g_return_val_if_fail (ATK_IS_HYPERTEXT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &characterIndex, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &characterIndex, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/image-adaptor.c new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/image-adaptor.c --- old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/image-adaptor.c 2012-12-17 19:52:09.000000000 +0100 +++ new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/image-adaptor.c 2013-05-14 19:50:48.000000000 +0200 @@ -51,15 +51,13 @@ void *user_data) { AtkImage *image = (AtkImage *) user_data; - DBusError error; dbus_uint32_t coordType; gint ix, iy, iwidth, iheight; g_return_val_if_fail (ATK_IS_IMAGE (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_UINT32, &coordType, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_UINT32, &coordType, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -73,7 +71,6 @@ void *user_data) { AtkImage *image = (AtkImage *) user_data; - DBusError error; dbus_uint32_t coord_type; gint ix = 0, iy = 0; dbus_int32_t x, y; @@ -81,9 +78,8 @@ g_return_val_if_fail (ATK_IS_IMAGE (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/selection-adaptor.c new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/selection-adaptor.c --- old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/selection-adaptor.c 2012-12-17 19:52:09.000000000 +0100 +++ new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/selection-adaptor.c 2013-05-14 19:50:48.000000000 +0200 @@ -54,15 +54,13 @@ { AtkSelection *selection = (AtkSelection *) user_data; DBusMessage *reply; - DBusError error; dbus_int32_t selectedChildIndex; AtkObject *atk_object; g_return_val_if_fail (ATK_IS_SELECTION (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &selectedChildIndex, + (message, NULL, DBUS_TYPE_INT32, &selectedChildIndex, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); @@ -80,16 +78,14 @@ void *user_data) { AtkSelection *selection = (AtkSelection *) user_data; - DBusError error; dbus_int32_t childIndex; dbus_bool_t rv; DBusMessage *reply; g_return_val_if_fail (ATK_IS_SELECTION (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &childIndex, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &childIndex, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -108,16 +104,14 @@ void *user_data) { AtkSelection *selection = (AtkSelection *) user_data; - DBusError error; dbus_int32_t selectedChildIndex; dbus_bool_t rv; DBusMessage *reply; g_return_val_if_fail (ATK_IS_SELECTION (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &selectedChildIndex, + (message, NULL, DBUS_TYPE_INT32, &selectedChildIndex, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); @@ -137,16 +131,14 @@ void *user_data) { AtkSelection *selection = (AtkSelection *) user_data; - DBusError error; dbus_int32_t childIndex; dbus_bool_t rv; DBusMessage *reply; g_return_val_if_fail (ATK_IS_SELECTION (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &childIndex, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &childIndex, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -204,7 +196,6 @@ void *user_data) { AtkSelection *selection = (AtkSelection *) user_data; - DBusError error; dbus_int32_t selectedChildIndex; dbus_bool_t rv = FALSE; gint i, nselected; @@ -212,9 +203,8 @@ g_return_val_if_fail (ATK_IS_SELECTION (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &selectedChildIndex, + (message, NULL, DBUS_TYPE_INT32, &selectedChildIndex, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/socket-adaptor.c new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/socket-adaptor.c --- old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/socket-adaptor.c 2013-04-03 23:16:53.000000000 +0200 +++ new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/socket-adaptor.c 2013-05-14 19:50:48.000000000 +0200 @@ -117,7 +117,7 @@ dbus_message_unref (message); if (!reply) return; - if (!dbus_message_get_args (reply, &error, DBUS_TYPE_INT32, &x_dbus, + if (!dbus_message_get_args (reply, NULL, DBUS_TYPE_INT32, &x_dbus, DBUS_TYPE_INT32, &y_dbus, DBUS_TYPE_INVALID)) { g_warning ("GetPosition failed: %s", error.message); @@ -146,7 +146,7 @@ dbus_message_unref (message); if (!reply) return; - if (!dbus_message_get_args (reply, &error, DBUS_TYPE_INT32, &width_dbus, + if (!dbus_message_get_args (reply, NULL, DBUS_TYPE_INT32, &width_dbus, DBUS_TYPE_INT32, &height_dbus, DBUS_TYPE_INVALID)) { g_warning ("GetSize failed: %s", error.message); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/table-adaptor.c new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/table-adaptor.c --- old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/table-adaptor.c 2012-12-17 19:52:09.000000000 +0100 +++ new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/table-adaptor.c 2013-05-14 19:50:48.000000000 +0200 @@ -96,14 +96,12 @@ AtkTable *table = (AtkTable *) user_data; dbus_int32_t row, column; DBusMessage *reply; - DBusError error; AtkObject *obj; g_return_val_if_fail (ATK_IS_TABLE (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &row, DBUS_TYPE_INT32, &column, + (message, NULL, DBUS_TYPE_INT32, &row, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); @@ -122,14 +120,12 @@ AtkTable *table = (AtkTable *) user_data; dbus_int32_t row, column; dbus_int32_t index; - DBusError error; DBusMessage *reply; g_return_val_if_fail (ATK_IS_TABLE (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &row, DBUS_TYPE_INT32, &column, + (message, NULL, DBUS_TYPE_INT32, &row, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); @@ -151,14 +147,12 @@ AtkTable *table = (AtkTable *) user_data; dbus_int32_t index; dbus_int32_t row; - DBusError error; DBusMessage *reply; g_return_val_if_fail (ATK_IS_TABLE (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -179,14 +173,12 @@ AtkTable *table = (AtkTable *) user_data; dbus_int32_t index; dbus_int32_t column; - DBusError error; DBusMessage *reply; g_return_val_if_fail (ATK_IS_TABLE (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -220,14 +212,12 @@ dbus_int32_t row; AtkTable *table = (AtkTable *) user_data; const gchar *description; - DBusError error; DBusMessage *reply; g_return_val_if_fail (ATK_IS_TABLE (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &row, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &row, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -249,14 +239,12 @@ AtkTable *table = (AtkTable *) user_data; dbus_int32_t column; const char *description; - DBusError error; DBusMessage *reply; g_return_val_if_fail (ATK_IS_TABLE (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -278,14 +266,12 @@ AtkTable *table = (AtkTable *) user_data; dbus_int32_t row, column; dbus_int32_t extent; - DBusError error; DBusMessage *reply; g_return_val_if_fail (ATK_IS_TABLE (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &row, DBUS_TYPE_INT32, &column, + (message, NULL, DBUS_TYPE_INT32, &row, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); @@ -307,14 +293,12 @@ AtkTable *table = (AtkTable *) user_data; dbus_int32_t row, column; dbus_int32_t extent; - DBusError error; DBusMessage *reply; g_return_val_if_fail (ATK_IS_TABLE (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &row, DBUS_TYPE_INT32, &column, + (message, NULL, DBUS_TYPE_INT32, &row, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); @@ -335,14 +319,12 @@ { AtkTable *table = (AtkTable *) user_data; dbus_int32_t row; - DBusError error; AtkObject *obj = NULL; g_return_val_if_fail (ATK_IS_TABLE (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &row, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &row, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -356,14 +338,12 @@ { AtkTable *table = (AtkTable *) user_data; dbus_int32_t column; - DBusError error; AtkObject *obj; g_return_val_if_fail (ATK_IS_TABLE (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -429,15 +409,13 @@ { AtkTable *table = (AtkTable *) user_data; dbus_int32_t row; - DBusError error; DBusMessage *reply; dbus_bool_t ret; g_return_val_if_fail (ATK_IS_TABLE (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &row, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &row, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -457,15 +435,13 @@ { AtkTable *table = (AtkTable *) user_data; dbus_int32_t column; - DBusError error; DBusMessage *reply; dbus_bool_t ret; g_return_val_if_fail (ATK_IS_TABLE (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -484,15 +460,13 @@ { AtkTable *table = (AtkTable *) user_data; dbus_int32_t row, column; - DBusError error; DBusMessage *reply; dbus_bool_t ret; g_return_val_if_fail (ATK_IS_TABLE (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &row, DBUS_TYPE_INT32, &column, + (message, NULL, DBUS_TYPE_INT32, &row, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); @@ -513,15 +487,13 @@ { AtkTable *table = (AtkTable *) user_data; dbus_int32_t row; - DBusError error; DBusMessage *reply; dbus_bool_t ret; g_return_val_if_fail (ATK_IS_TABLE (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &row, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &row, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -541,15 +513,13 @@ { AtkTable *table = (AtkTable *) user_data; dbus_int32_t column; - DBusError error; DBusMessage *reply; dbus_bool_t ret; g_return_val_if_fail (ATK_IS_TABLE (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -569,15 +539,13 @@ { AtkTable *table = (AtkTable *) user_data; dbus_int32_t row; - DBusError error; DBusMessage *reply; dbus_bool_t ret; g_return_val_if_fail (ATK_IS_TABLE (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &row, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &row, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -597,15 +565,13 @@ { AtkTable *table = (AtkTable *) user_data; dbus_int32_t column; - DBusError error; DBusMessage *reply; dbus_bool_t ret; g_return_val_if_fail (ATK_IS_TABLE (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -625,7 +591,6 @@ { AtkTable *table = (AtkTable *) user_data; dbus_int32_t index; - DBusError error; dbus_int32_t row, column, row_extents, col_extents; dbus_bool_t is_selected; dbus_bool_t ret; @@ -635,9 +600,8 @@ g_return_val_if_fail (ATK_IS_TABLE (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/text-adaptor.c new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/text-adaptor.c --- old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/text-adaptor.c 2012-12-17 19:52:09.000000000 +0100 +++ new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/text-adaptor.c 2013-05-14 19:50:48.000000000 +0200 @@ -67,14 +67,12 @@ AtkText *text = (AtkText *) user_data; dbus_int32_t startOffset, endOffset; gchar *txt; - DBusError error; DBusMessage *reply; g_return_val_if_fail (ATK_IS_TEXT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &startOffset, DBUS_TYPE_INT32, + (message, NULL, DBUS_TYPE_INT32, &startOffset, DBUS_TYPE_INT32, &endOffset, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); @@ -98,14 +96,12 @@ AtkText *text = (AtkText *) user_data; dbus_int32_t offset; dbus_bool_t rv; - DBusError error; DBusMessage *reply; g_return_val_if_fail (ATK_IS_TEXT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &offset, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &offset, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -129,14 +125,12 @@ gchar *txt; dbus_int32_t startOffset, endOffset; gint intstart_offset = 0, intend_offset = 0; - DBusError error; DBusMessage *reply; g_return_val_if_fail (ATK_IS_TEXT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &offset, DBUS_TYPE_UINT32, &type, + (message, NULL, DBUS_TYPE_INT32, &offset, DBUS_TYPE_UINT32, &type, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); @@ -168,14 +162,12 @@ gchar *txt; dbus_int32_t startOffset, endOffset; gint intstart_offset = 0, intend_offset = 0; - DBusError error; DBusMessage *reply; g_return_val_if_fail (ATK_IS_TEXT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &offset, DBUS_TYPE_UINT32, &type, + (message, NULL, DBUS_TYPE_INT32, &offset, DBUS_TYPE_UINT32, &type, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); @@ -208,14 +200,12 @@ gchar *txt; dbus_int32_t startOffset, endOffset; gint intstart_offset = 0, intend_offset = 0; - DBusError error; DBusMessage *reply; g_return_val_if_fail (ATK_IS_TEXT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &offset, DBUS_TYPE_UINT32, &type, + (message, NULL, DBUS_TYPE_INT32, &offset, DBUS_TYPE_UINT32, &type, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); @@ -245,14 +235,12 @@ AtkText *text = (AtkText *) user_data; dbus_int32_t offset; dbus_int32_t ch; - DBusError error; DBusMessage *reply; g_return_val_if_fail (ATK_IS_TEXT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &offset, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &offset, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -277,7 +265,6 @@ dbus_bool_t defined; gint intstart_offset = 0, intend_offset = 0; char *rv = NULL; - DBusError error; DBusMessage *reply; AtkAttributeSet *set; GSList *cur_attr; @@ -285,9 +272,8 @@ g_return_val_if_fail (ATK_IS_TEXT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &offset, DBUS_TYPE_STRING, + (message, NULL, DBUS_TYPE_INT32, &offset, DBUS_TYPE_STRING, &attributeName, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); @@ -332,16 +318,14 @@ dbus_int32_t offset; dbus_int32_t startOffset, endOffset; gint intstart_offset, intend_offset; - DBusError error; DBusMessage *reply; AtkAttributeSet *set; DBusMessageIter iter; g_return_val_if_fail (ATK_IS_TEXT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &offset, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &offset, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -369,14 +353,12 @@ void *user_data) { AtkText *text = (AtkText *) user_data; - DBusError error; DBusMessage *reply; AtkAttributeSet *set; DBusMessageIter iter; g_return_val_if_fail (ATK_IS_TEXT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); set = atk_text_get_default_attributes (text); reply = dbus_message_new_method_return (message); @@ -398,14 +380,12 @@ dbus_uint32_t coordType; dbus_int32_t x, y, width, height; gint ix = 0, iy = 0, iw = 0, ih = 0; - DBusError error; DBusMessage *reply; g_return_val_if_fail (ATK_IS_TEXT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &offset, DBUS_TYPE_UINT32, + (message, NULL, DBUS_TYPE_INT32, &offset, DBUS_TYPE_UINT32, &coordType, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); @@ -434,14 +414,12 @@ dbus_int32_t x, y; dbus_uint32_t coordType; dbus_int32_t rv; - DBusError error; DBusMessage *reply; g_return_val_if_fail (ATK_IS_TEXT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y, + (message, NULL, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y, DBUS_TYPE_UINT32, &coordType, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); @@ -484,14 +462,12 @@ dbus_int32_t selectionNum; dbus_int32_t startOffset, endOffset; gint intstart_offset = 0, intend_offset = 0; - DBusError error; DBusMessage *reply; g_return_val_if_fail (ATK_IS_TEXT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &selectionNum, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &selectionNum, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -517,14 +493,12 @@ AtkText *text = (AtkText *) user_data; dbus_int32_t startOffset, endOffset; dbus_bool_t rv; - DBusError error; DBusMessage *reply; g_return_val_if_fail (ATK_IS_TEXT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &startOffset, DBUS_TYPE_INT32, + (message, NULL, DBUS_TYPE_INT32, &startOffset, DBUS_TYPE_INT32, &endOffset, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); @@ -546,14 +520,12 @@ AtkText *text = (AtkText *) user_data; dbus_int32_t selectionNum; dbus_bool_t rv; - DBusError error; DBusMessage *reply; g_return_val_if_fail (ATK_IS_TEXT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &selectionNum, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &selectionNum, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -574,14 +546,12 @@ AtkText *text = (AtkText *) user_data; dbus_int32_t selectionNum, startOffset, endOffset; dbus_bool_t rv; - DBusError error; DBusMessage *reply; g_return_val_if_fail (ATK_IS_TEXT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &selectionNum, DBUS_TYPE_INT32, + (message, NULL, DBUS_TYPE_INT32, &selectionNum, DBUS_TYPE_INT32, &startOffset, DBUS_TYPE_INT32, &endOffset, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); @@ -605,14 +575,12 @@ dbus_uint32_t coordType; AtkTextRectangle rect; dbus_int32_t x, y, width, height; - DBusError error; DBusMessage *reply; g_return_val_if_fail (ATK_IS_TEXT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &startOffset, DBUS_TYPE_INT32, + (message, NULL, DBUS_TYPE_INT32, &startOffset, DBUS_TYPE_INT32, &endOffset, DBUS_TYPE_UINT32, &coordType, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); @@ -643,7 +611,6 @@ AtkText *text = (AtkText *) user_data; dbus_int32_t x, y, width, height; dbus_uint32_t coordType, xClipType, yClipType; - DBusError error; AtkTextRange **range_list = NULL; AtkTextRectangle rect; DBusMessage *reply; @@ -651,9 +618,8 @@ g_return_val_if_fail (ATK_IS_TEXT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y, + (message, NULL, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y, DBUS_TYPE_INT32, &height, DBUS_TYPE_INT32, &width, DBUS_TYPE_UINT32, &coordType, DBUS_TYPE_UINT32, &xClipType, DBUS_TYPE_UINT32, &yClipType, DBUS_TYPE_INVALID)) @@ -713,7 +679,6 @@ impl_GetAttributeRun (DBusConnection * bus, DBusMessage * message, void *user_data) { - DBusError error; AtkText *text = (AtkText *) user_data; dbus_int32_t offset; dbus_bool_t includeDefaults; @@ -725,9 +690,8 @@ g_return_val_if_fail (ATK_IS_TEXT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &offset, DBUS_TYPE_BOOLEAN, + (message, NULL, DBUS_TYPE_INT32, &offset, DBUS_TYPE_BOOLEAN, &includeDefaults, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/value-adaptor.c new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/value-adaptor.c --- old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/value-adaptor.c 2012-12-17 19:52:09.000000000 +0100 +++ new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/value-adaptor.c 2013-05-14 19:50:48.000000000 +0200 @@ -156,7 +156,6 @@ { AtkValue *value = (AtkValue *) user_data; dbus_bool_t rv; - DBusError error; DBusMessage *reply; gdouble dub = 0; GValue new_value = { 0 }; @@ -164,9 +163,8 @@ g_return_val_if_fail (ATK_IS_VALUE (value), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_DOUBLE, &dub, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_DOUBLE, &dub, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/atk-adaptor/bridge.c new/at-spi2-atk-2.9.3/atk-adaptor/bridge.c --- old/at-spi2-atk-2.8.1/atk-adaptor/bridge.c 2013-04-17 03:16:18.000000000 +0200 +++ new/at-spi2-atk-2.9.3/atk-adaptor/bridge.c 2013-05-14 19:50:48.000000000 +0200 @@ -235,6 +235,14 @@ reply = dbus_pending_call_steal_reply (pending); dbus_pending_call_unref (pending); + + if (!spi_global_app_data) + { + if (reply) + dbus_message_unref (reply); + return; + } + if (reply) { gchar *app_name, *obj_path; @@ -274,11 +282,8 @@ { DBusMessage *message; DBusMessageIter iter; - DBusError error; DBusPendingCall *pending; - dbus_error_init (&error); - g_free (app->desktop_name); g_free (app->desktop_path); @@ -320,11 +325,8 @@ { DBusMessage *message; DBusMessageIter iter; - DBusError error; const char *uname; - dbus_error_init (&error); - message = dbus_message_new_method_call (SPI_DBUS_NAME_REGISTRY, ATSPI_DBUS_PATH_REGISTRY, ATSPI_DBUS_INTERFACE_REGISTRY, @@ -717,7 +719,7 @@ { #ifndef DISABLE_P2P DBusServer *server; - DBusError err; + DBusError error; if (getuid () != 0) { @@ -740,12 +742,12 @@ if (!spi_global_app_data->app_bus_addr) return -1; - dbus_error_init(&err); - server = dbus_server_listen(spi_global_app_data->app_bus_addr, &err); + dbus_error_init(&error); + server = dbus_server_listen(spi_global_app_data->app_bus_addr, &error); if (server == NULL) { - g_warning ("atk-bridge: Couldn't listen on dbus server: %s", err.message); - dbus_error_init (&err); + g_warning ("atk-bridge: Couldn't listen on dbus server: %s", error.message); + dbus_error_free (&error); spi_global_app_data->app_bus_addr [0] = '\0'; g_main_context_unref (spi_global_app_data->main_context); spi_global_app_data->main_context = NULL; @@ -949,6 +951,7 @@ else get_registered_event_listeners (spi_global_app_data); + dbus_error_free (&error); return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/atk-adaptor/event.c new/at-spi2-atk-2.9.3/atk-adaptor/event.c --- old/at-spi2-atk-2.8.1/atk-adaptor/event.c 2012-12-17 19:52:09.000000000 +0100 +++ new/at-spi2-atk-2.9.3/atk-adaptor/event.c 2013-06-16 20:58:00.000000000 +0200 @@ -98,15 +98,12 @@ { DBusPendingCall *pending; SpiReentrantCallClosure closure; - GMainContext *main_context; GSource *source; - main_context = (g_getenv ("AT_SPI_CLIENT") ? NULL : - spi_global_app_data->main_context); closure.bus = bus; - closure.loop = g_main_loop_new (main_context, FALSE); + closure.loop = g_main_loop_new (spi_global_app_data->main_context, FALSE); closure.reply = NULL; - switch_main_context (main_context); + switch_main_context (spi_global_app_data->main_context); if (!dbus_connection_send_with_reply (bus, message, &pending, 9000) || !pending) { @@ -116,7 +113,7 @@ dbus_pending_call_set_notify (pending, set_reply, (void *) &closure, NULL); source = g_timeout_source_new (500); g_source_set_callback (source, timeout_reply, &closure, NULL); - closure.timeout = g_source_attach (source, main_context); + closure.timeout = g_source_attach (source, spi_global_app_data->main_context); g_source_unref (source); g_main_loop_run (closure.loop); if (closure.timeout != -1) @@ -140,7 +137,6 @@ * key_event) { DBusMessage *message; - DBusError error; dbus_bool_t consumed = FALSE; message = @@ -149,7 +145,6 @@ ATSPI_DBUS_INTERFACE_DEC, "NotifyListenersSync"); - dbus_error_init (&error); if (spi_dbus_marshal_deviceEvent (message, key_event)) { DBusMessage *reply = @@ -158,8 +153,12 @@ { DBusError error; dbus_error_init (&error); - dbus_message_get_args (reply, &error, DBUS_TYPE_BOOLEAN, &consumed, - DBUS_TYPE_INVALID); + if (!dbus_message_get_args (reply, &error, DBUS_TYPE_BOOLEAN, + &consumed, DBUS_TYPE_INVALID)) + { + /* TODO: print a warning */ + dbus_error_free (&error); + } dbus_message_unref (reply); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/configure.ac new/at-spi2-atk-2.9.3/configure.ac --- old/at-spi2-atk-2.8.1/configure.ac 2013-04-17 03:16:32.000000000 +0200 +++ new/at-spi2-atk-2.9.3/configure.ac 2013-06-17 23:29:38.000000000 +0200 @@ -1,4 +1,4 @@ -AC_INIT([at-spi2-atk], [2.8.1], [accessibility-atspi(a)lists.linux-foundation.org] +AC_INIT([at-spi2-atk], [2.9.3], [accessibility-atspi(a)lists.linux-foundation.org] AC_CONFIG_AUX_DIR(config) AT_SPI_ATK_MAJOR_VERSION=0 @@ -55,7 +55,7 @@ AC_SUBST(ATK_LIBS) AC_SUBST(ATK_CFLAGS) -PKG_CHECK_MODULES(ATSPI, [atspi-2 >= 2.7.5]) +PKG_CHECK_MODULES(ATSPI, [atspi-2 >= 2.9.3]) AC_SUBST(ATSPI_LIBS) AC_SUBST(ATSPI_CFLAGS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/droute/droute.c new/at-spi2-atk-2.9.3/droute/droute.c --- old/at-spi2-atk-2.8.1/droute/droute.c 2012-12-17 19:52:09.000000000 +0100 +++ new/at-spi2-atk-2.9.3/droute/droute.c 2013-05-14 19:50:48.000000000 +0200 @@ -265,7 +265,12 @@ dbus_error_init (&error); if (!dbus_message_get_args (message, &error, DBUS_TYPE_STRING, &iface, DBUS_TYPE_INVALID)) - return dbus_message_new_error (message, DBUS_ERROR_FAILED, error.message); + { + DBusMessage *ret; + ret = dbus_message_new_error (message, DBUS_ERROR_FAILED, error.message); + dbus_error_free (&error); + return ret; + } reply = dbus_message_new_method_return (message); if (!reply) @@ -321,17 +326,26 @@ DBUS_TYPE_STRING, &(pair.two), DBUS_TYPE_INVALID)) - return dbus_message_new_error (message, DBUS_ERROR_FAILED, error.message); + { + DBusMessage *ret; + ret = dbus_message_new_error (message, DBUS_ERROR_FAILED, error.message); + dbus_error_free (&error); + } _DROUTE_DEBUG ("DRoute (handle prop): %s|%s on %s\n", pair.one, pair.two, pathstr); prop_funcs = (PropertyPair *) g_hash_table_lookup (path->properties, &pair); if (!prop_funcs) + { + DBusMessage *ret; #ifdef DBUS_ERROR_UNKNOWN_PROPERTY - return dbus_message_new_error (message, DBUS_ERROR_UNKNOWN_PROPERTY, "Property unavailable"); + ret = dbus_message_new_error (message, DBUS_ERROR_UNKNOWN_PROPERTY, "Property unavailable"); #else - return dbus_message_new_error (message, DBUS_ERROR_FAILED, "Property unavailable"); + ret = dbus_message_new_error (message, DBUS_ERROR_FAILED, "Property unavailable"); #endif + dbus_error_free (&error); + return ret; + } datum = path_get_datum (path, pathstr); if (!datum) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit atk for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '13

29 Jun '13

Hello community, here is the log from the commit of package atk for openSUSE:Factory checked in at 2013-06-29 19:36:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/atk (Old) and /work/SRC/openSUSE:Factory/.atk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "atk" Changes: -------- --- /work/SRC/openSUSE:Factory/atk/atk.changes 2013-04-02 11:38:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.atk.new/atk.changes 2013-06-29 19:36:23.000000000 +0200 @@ -1,0 +2,15 @@ +Fri Jun 21 18:47:46 UTC 2013 - dimstar(a)opensuse.org + +- Update to version 2.9.3: + + Removed pads from interfaces. + + Bugs fixed: bgo#697968, bgo#701503. + +------------------------------------------------------------------- +Tue May 28 19:51:40 UTC 2013 - dimstar(a)opensuse.org + +- Update to version 2.9.2: + + Updated documentations. + + Bugs fixed: bgo#699262, bgo#699368, bgo#699256, bgo#696466, + bgo#696409, bgo#700800. + +------------------------------------------------------------------- Old: ---- atk-2.8.0.tar.xz New: ---- atk-2.9.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ atk.spec ++++++ --- /var/tmp/diff_new_pack.Cn9xC1/_old 2013-06-29 19:36:24.000000000 +0200 +++ /var/tmp/diff_new_pack.Cn9xC1/_new 2013-06-29 19:36:24.000000000 +0200 @@ -20,10 +20,10 @@ Summary: An Accessibility ToolKit License: LGPL-2.1+ Group: System/Libraries -Version: 2.8.0 +Version: 2.9.3 Release: 0 Url: http://www.gtk.org/ -Source: http://download.gnome.org/sources/atk/2.8/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/atk/2.9/%{name}-%{version}.tar.xz Source99: baselibs.conf BuildRequires: fdupes BuildRequires: gcc-c++ ++++++ atk-2.8.0.tar.xz -> atk-2.9.3.tar.xz ++++++ ++++ 9410 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit anjuta for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '13

29 Jun '13

Hello community, here is the log from the commit of package anjuta for openSUSE:Factory checked in at 2013-06-29 19:35:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/anjuta (Old) and /work/SRC/openSUSE:Factory/.anjuta.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "anjuta" Changes: -------- --- /work/SRC/openSUSE:Factory/anjuta/anjuta.changes 2013-06-05 11:37:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.anjuta.new/anjuta.changes 2013-06-29 19:35:56.000000000 +0200 @@ -1,0 +2,49 @@ +Sat Jun 22 11:58:51 UTC 2013 - dimstar(a)opensuse.org + +- Update to version 3.9.3: + + sourceview: + - fix compile warnings. + + message-view: don't manually free private structure. + + snippets-manager: fix compile warnings. + + git: + - Add a context menu to the log pane. + - Add a context menu to the Branches pane. + - Add a popup menu to the Remotes pane. + - Check box action fixes in Push and Pull panes. + - Add a popup menu to the Stash pane. + - Fix a warning. + + libanjuta: + - Improve symbol-db behavior on cut, paste, undo, redo and + when multiple files are modified. + - Move scoped and descoped signal on AnjutaProfile object. + - Replace AnjutaPluginDescription by AnjutaPluginHandle in API. + - Move anjuta_profile_manager_load_profile function in + anjuta_profile. + - Always keep plugins in the system profile. + - Allow to enable only a set of plugins defined in the profile + file. + - Keep dynamic allocation data in AnjutaPluginDescription. + - Allow to change plugin description key from profile. + + Allow to select different profile on the command line. + + Add a sample custom profile keeping only the editor. + + document-manager: Automatically open an empty file if starter + plugin is not used. + + symbol-db: Update symbol database on editor changes without + saving. + + language-support-cpp-jave: Fix memory leak. + + Bugs fixed: bgo#701443, bgo#701207, bgo#700383 + + Updated translations. + +------------------------------------------------------------------- +Tue May 28 06:38:58 UTC 2013 - dimstar(a)opensuse.org + +- Update to version 3.9.2: + + subversion: convert builder file to gtk+-3.0. + + starter: guard for NULL document manager or project manager. + + Fix deprecation warnings. + + Bugs fixed: bgo#699323, bgo#699329, bgo#699327, bgo#699330, + bgo#699326, bgo#698705, bgo#699316, bgo#700615, bgo#696991, + bgo#698158, bgo#700318, bgo#694644. + + Updated translations. + +------------------------------------------------------------------- Old: ---- anjuta-3.9.1.tar.xz New: ---- anjuta-3.9.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ anjuta.spec ++++++ --- /var/tmp/diff_new_pack.GsgGqf/_old 2013-06-29 19:35:57.000000000 +0200 +++ /var/tmp/diff_new_pack.GsgGqf/_new 2013-06-29 19:35:57.000000000 +0200 @@ -17,7 +17,7 @@ Name: anjuta -Version: 3.9.1 +Version: 3.9.3 Release: 0 Summary: Versatile Integrated Development Environment for GNOME License: GPL-2.0+ ++++++ anjuta-3.9.1.tar.xz -> anjuta-3.9.3.tar.xz ++++++ ++++ 101275 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2 for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '13

29 Jun '13

Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at 2013-06-29 14:57:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2 (Old) and /work/SRC/openSUSE:Factory/.yast2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2/yast2.changes 2013-06-05 13:25:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2.new/yast2.changes 2013-06-29 14:57:51.000000000 +0200 @@ -1,0 +2,12 @@ +Thu Jun 27 16:10:13 CEST 2013 - jsuchome(a)suse.cz + +- show gpg key info in a term that allows copying the text + (bnc#611456) + -2.24.2 + +------------------------------------------------------------------- +Thu Jun 13 06:24:11 UTC 2013 - lslezak(a)suse.cz + +- updated the testsuite to make the transition to Ruby easier + +------------------------------------------------------------------- Old: ---- yast2-2.24.1.tar.bz2 New: ---- yast2-2.24.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.pBqJ7s/_old 2013-06-29 14:57:52.000000000 +0200 +++ /var/tmp/diff_new_pack.pBqJ7s/_new 2013-06-29 14:57:52.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 2.24.1 +Version: 2.24.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-2.24.1.tar.bz2 -> yast2-2.24.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.24.1/VERSION new/yast2-2.24.2/VERSION --- old/yast2-2.24.1/VERSION 2013-05-27 14:36:37.000000000 +0200 +++ new/yast2-2.24.2/VERSION 2013-06-27 17:03:12.000000000 +0200 @@ -1 +1 @@ -2.24.1 +2.24.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.24.1/configure new/yast2-2.24.2/configure --- old/yast2-2.24.1/configure 2013-05-28 14:02:30.000000000 +0200 +++ new/yast2-2.24.2/configure 2013-06-27 17:03:23.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for yast2 2.24.1. +# Generated by GNU Autoconf 2.69 for yast2 2.24.2. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -579,8 +579,8 @@ # Identity of this package. PACKAGE_NAME='yast2' PACKAGE_TARNAME='yast2' -PACKAGE_VERSION='2.24.1' -PACKAGE_STRING='yast2 2.24.1' +PACKAGE_VERSION='2.24.2' +PACKAGE_STRING='yast2 2.24.2' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1250,7 +1250,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2 2.24.1 to adapt to many kinds of systems. +\`configure' configures yast2 2.24.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1321,7 +1321,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2 2.24.1:";; + short | recursive ) echo "Configuration of yast2 2.24.2:";; esac cat <<\_ACEOF @@ -1401,7 +1401,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2 configure 2.24.1 +yast2 configure 2.24.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1418,7 +1418,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2 $as_me 2.24.1, which was +It was created by yast2 $as_me 2.24.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2357,7 +2357,7 @@ # Define the identity of the package. PACKAGE='yast2' - VERSION='2.24.1' + VERSION='2.24.2' cat >>confdefs.h <<_ACEOF @@ -2480,7 +2480,7 @@ -VERSION="2.24.1" +VERSION="2.24.2" RPMNAME="yast2" MAINTAINER="YaST2 Maintainers <yast2-maintainers(a)suse.de>" @@ -3522,7 +3522,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2 $as_me 2.24.1, which was +This file was extended by yast2 $as_me 2.24.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3575,7 +3575,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2 config.status 2.24.1 +yast2 config.status 2.24.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.24.1/configure.in new/yast2-2.24.2/configure.in --- old/yast2-2.24.1/configure.in 2013-05-28 14:02:17.000000000 +0200 +++ new/yast2-2.24.2/configure.in 2013-06-27 17:03:19.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2 dnl -dnl -- This file is generated by y2autoconf 2.24.0 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.24.1 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2, 2.24.1, http://bugs.opensuse.org/, yast2) +AC_INIT(yast2, 2.24.2, http://bugs.opensuse.org/, yast2) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.24.1" +VERSION="2.24.2" RPMNAME="yast2" MAINTAINER="YaST2 Maintainers <yast2-maintainers(a)suse.de>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.24.1/library/modules/Version.ycp new/yast2-2.24.2/library/modules/Version.ycp --- old/yast2-2.24.1/library/modules/Version.ycp 2013-05-28 14:02:38.000000000 +0200 +++ new/yast2-2.24.2/library/modules/Version.ycp 2013-06-27 17:03:30.000000000 +0200 @@ -20,7 +20,7 @@ /** * Version of the yast2 package */ -global string yast2 = "2.24.1"; +global string yast2 = "2.24.2"; /* EOF */ } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.24.1/library/packages/src/SignatureCheckDialogs.ycp new/yast2-2.24.2/library/packages/src/SignatureCheckDialogs.ycp --- old/yast2-2.24.1/library/packages/src/SignatureCheckDialogs.ycp 2013-01-22 12:22:06.000000000 +0100 +++ new/yast2-2.24.2/library/packages/src/SignatureCheckDialogs.ycp 2013-06-27 17:03:12.000000000 +0200 @@ -508,31 +508,28 @@ term GPGKeyAsTerm(map<string,any> key) { - boolean no_fingerprint = key["fingerprint"]:"" == nil || key["fingerprint"]:"" == ""; - boolean no_exp_date = key["expires"]:"" == nil || key["expires"]:"" == ""; - boolean no_create_date = key["created"]:"" == nil || key["expires"]:"" == ""; - - return `HBox( - `VBox( - // GPG key property - `Left(`Label(_("ID: "))), - // GPG key property - `Left(`Label(_("Name: "))), - // GPG key property - no_fingerprint ? `Empty() : `Left(`Label(_("Fingerprint: "))), - // GPG key property - no_create_date ? `Empty() : `Left(`Label(_("Created: "))), - // GPG key property - no_exp_date ? `Empty() : `Left(`Label(_("Expires: "))) - ), - `VBox( - `Left(`Label(key["id"]:"")), - `Left(`Label(key["name"]:"")), - no_fingerprint ? `Empty() : `Left(`Label(StringSplitter(key["fingerprint"]:"", " ", 4))), - no_create_date ? `Empty() : `Left(`Label(key["created"]:"")), - no_exp_date ? `Empty() : `Left(`Label(key["expires"]:"")) - ) - ); + string rt = + // GPG key property + sformat ("%1%2", _("ID: "), key["id"]:"") + + // GPG key property + sformat (" %1%2", _("Name: "), key["name"]:""); + if (size (key["fingerprint"]:"") > 0) + { + // GPG key property + rt = rt + sformat (" %1%2", _("Fingerprint: "), + StringSplitter(key["fingerprint"]:"", " ", 4)); + } + if (size (key["created"]:"") > 0) + { + // GPG key property + rt = rt + sformat (" %1%2", _("Created: "), key["created"]:""); + } + if (size (key["expires"]:"") > 0) + { + // GPG key property + rt = rt + sformat (" %1%2", _("Expires: "), key["expires"]:""); + } + return `RichText (rt); } /** @@ -801,10 +798,7 @@ // the important GPG key properties are completely displayed boolean hide_help = displayinfo["TextMode"]:false && displayinfo["Width"]:80 < 105; - UI::OpenDialog( - `opt(`decorated), - `HBox ( - `VSpacing(19), + UI::OpenDialog (`opt(`decorated), `HBox ( // left-side help hide_help ? `Empty() : `HWeight(3, @@ -814,39 +808,27 @@ ), `HSpacing(1.5), // dialog - `HWeight(5, - `VBox( - `Top ( - `VBox ( - `HBox ( - `VCenter(MessageIcon("question")), - // popup heading - `VCenter(`Heading(_("Import Untrusted GnuPG Key"))), - `HStretch() - ), - // dialog message - `MarginBox(0.5, 0.5, `VBox( - `Left(`Label(dialog_text)), - `VSpacing(0.5), - GPGKeyAsTerm(key), - `VSpacing(0.5), - `Left(`Label(dialog_text2)) - ) - ) - ) + `HWeight(5, `VBox( + `HBox ( + `VCenter(MessageIcon("question")), + // popup heading + `VCenter(`Heading(_("Import Untrusted GnuPG Key"))), + `HStretch() ), - // dialog buttons - `Bottom( + // dialog message + `MarginBox(0.4, 0.4, `VBox( + `Left(`Label(dialog_text)), + GPGKeyAsTerm(key), + `Left(`Label(dialog_text2)) + )), + // dialog buttons `ButtonBox ( // push button `PushButton(`id(`trust), `opt (`key_F10, `okButton), _("&Trust")), `PushButton(`id(`cancel), `opt (`key_F9, `cancelButton), Label::CancelButton()) ) - ) - ) - ) - ) - ); + )) + )); UI::SetFocus(`cancel); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.24.1/library/sequencer/src/Sequencer.ycp new/yast2-2.24.2/library/sequencer/src/Sequencer.ycp --- old/yast2-2.24.1/library/sequencer/src/Sequencer.ycp 2013-01-22 12:22:06.000000000 +0100 +++ new/yast2-2.24.2/library/sequencer/src/Sequencer.ycp 2013-06-13 08:30:58.000000000 +0200 @@ -88,7 +88,7 @@ } else if (is(val, list)) { if(size((list) val) < 2) { - y2error(2, "sequencer check: list too small: %1 (%2)", val, key); + y2error(2, "sequencer check: list size too small: %1 (key: %2)", size((list) val), key); return false; } /* FIXME: use function pointers diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.24.1/library/sequencer/testsuite/tests/WS_alias.out new/yast2-2.24.2/library/sequencer/testsuite/tests/WS_alias.out --- old/yast2-2.24.1/library/sequencer/testsuite/tests/WS_alias.out 2013-01-22 12:22:06.000000000 +0100 +++ new/yast2-2.24.2/library/sequencer/testsuite/tests/WS_alias.out 2013-06-13 08:30:58.000000000 +0200 @@ -4,10 +4,10 @@ Return nil Log sequencer: Alias not found: 1 Return nil -Return func1 () +Return `func1 Log sequencer: Invalid alias: [] Return nil Log sequencer: Invalid alias: nil Return nil -Return func2 () -Return func3 () +Return `func2 +Return `func3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.24.1/library/sequencer/testsuite/tests/WS_alias.ycp new/yast2-2.24.2/library/sequencer/testsuite/tests/WS_alias.ycp --- old/yast2-2.24.1/library/sequencer/testsuite/tests/WS_alias.ycp 2013-01-22 12:22:06.000000000 +0100 +++ new/yast2-2.24.2/library/sequencer/testsuite/tests/WS_alias.ycp 2013-06-13 08:30:58.000000000 +0200 @@ -24,9 +24,9 @@ include "testsuite.ycp"; import "Sequencer"; -void func1() { return; } -void func2() { return; } -void func3() { return; } +symbol func1() { return `func1; } +symbol func2() { return `func2; } +symbol func3() { return `func3; } map aliases = $[ "1" : nil, @@ -40,10 +40,10 @@ TEST(``(Sequencer::WS_alias($[], "blah")), [], nil); TEST(``(Sequencer::WS_alias(aliases, "blah")), [], nil); TEST(``(Sequencer::WS_alias(aliases, "1")), [], nil); -TEST(``(Sequencer::WS_alias(aliases, "2")), [], nil); +TEST(``(eval(Sequencer::WS_alias(aliases, "2"))), [], nil); TEST(``(Sequencer::WS_alias(aliases, "3")), [], nil); TEST(``(Sequencer::WS_alias(aliases, "4")), [], nil); -TEST(``(Sequencer::WS_alias(aliases, "5")), [], nil); -TEST(``(Sequencer::WS_alias(aliases, "6")), [], nil); +TEST(``(eval(Sequencer::WS_alias(aliases, "5"))), [], nil); +TEST(``(eval(Sequencer::WS_alias(aliases, "6"))), [], nil); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.24.1/library/sequencer/testsuite/tests/WS_check.out new/yast2-2.24.2/library/sequencer/testsuite/tests/WS_check.out --- old/yast2-2.24.1/library/sequencer/testsuite/tests/WS_check.out 2013-01-22 12:22:06.000000000 +0100 +++ new/yast2-2.24.2/library/sequencer/testsuite/tests/WS_check.out 2013-06-13 08:30:58.000000000 +0200 @@ -1,7 +1,7 @@ Log sequencer check: ws_start needs to be defined Return false -Log sequencer check: list too small: [] (2) -Log sequencer check: list too small: [f1 ()] (3) +Log sequencer check: list size too small: 0 (key: 2) +Log sequencer check: list size too small: 1 (key: 3) Log sequencer check: not a boolean: `x Log sequencer check: not a boolean: 5 Log sequencer check: not a string: `x -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit wireshark for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '13

29 Jun '13

Hello community, here is the log from the commit of package wireshark for openSUSE:Factory checked in at 2013-06-29 14:52:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wireshark (Old) and /work/SRC/openSUSE:Factory/.wireshark.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "wireshark" Changes: -------- --- /work/SRC/openSUSE:Factory/wireshark/wireshark.changes 2013-06-06 13:00:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.wireshark.new/wireshark.changes 2013-06-29 14:52:54.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Jun 27 20:26:33 UTC 2013 - andreas.stieger(a)gmx.de + +- fix factory builds, prevent build failures with pod2man: + wireshark-1.10.0-authors-pod2man.patch + wireshark-1.10.0-pod-characters.patch + +------------------------------------------------------------------- New: ---- wireshark-1.10.0-authors-pod2man.patch wireshark-1.10.0-pod-characters.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wireshark.spec ++++++ --- /var/tmp/diff_new_pack.0REMd5/_old 2013-06-29 14:52:56.000000000 +0200 +++ /var/tmp/diff_new_pack.0REMd5/_new 2013-06-29 14:52:56.000000000 +0200 @@ -28,13 +28,14 @@ Url: https://www.wireshark.org/ Source: https://www.wireshark.org/download/src/%{name}-%{version}.tar.bz2 Source2: https://www.wireshark.org/download/SIGNATURES-%{version}.txt -# https://www.wireshark.org/download/gerald_at_wireshark_dot_org.gpg -Source3: wireshark.keyring +Source3: https://www.wireshark.org/download/gerald_at_wireshark_dot_org.gpg#/wiresha… # PATCH-FIX-OPENSUSE wireshark-1.6.3-disable-warning-dialog.patch bnc#349782 prusnak(a)suse.cz -- don't show warning when running as root Patch1: wireshark-1.2.0-disable-warning-dialog.patch # PATCH-FEATURE-OPENSUSE wireshark-1.2.0-geoip.patch prusnak(a)suse.cz -- search in /var/lib/GeoIP if user hasn't set any GeoIP folders Patch2: wireshark-1.2.0-geoip.patch Patch4: wireshark-1.10.0-enable_lua.patch +Patch5: wireshark-1.10.0-authors-pod2man.patch +Patch6: wireshark-1.10.0-pod-characters.patch BuildRequires: bison BuildRequires: cairo-devel BuildRequires: flex @@ -122,6 +123,9 @@ sed -i 's!^Exec=wireshark!Exec=/usr/bin/xdg-su -c /usr/bin/wireshark!' wireshark.desktop %endif +%patch5 -p1 +%patch6 -p1 + %build # zlib-1.2.5 does not work well with wireshark, so disable it on pre-12.2 ++++++ wireshark-1.10.0-authors-pod2man.patch ++++++ From: Andreas Stieger <andreas.stieger(a)gmx.de> Date: Thu, 27 Jun 2013 21:02:17 +0100 Subject: [patch] change characters in AUTHORS file to be compatible with pod2man Upstream: never * remove some characters for which Pod::Man does not have an escape sequence * replace cyrillic name with transliteration Wide character in printf at /usr/lib/perl5/5.18.0/Pod/Simple.pm line 539. wireshark.pod around line 3455: Non-ASCII character seen before =encoding in 'Moń'. Assuming UTF-8 POD document had syntax errors at /usr/bin/pod2man line 71. make: *** [wireshark.1] Error 255 error: Bad exit status from /var/tmp/rpm-tmp.PtRL60 (%build) --- AUTHORS | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Index: wireshark-1.10.0/AUTHORS =================================================================== --- wireshark-1.10.0.orig/AUTHORS 2013-05-29 17:52:27.000000000 +0100 +++ wireshark-1.10.0/AUTHORS 2013-06-27 20:04:34.000000000 +0100 @@ -3509,7 +3509,7 @@ Peter Hatina <phatina[AT]redhat.com> { Gtk3 Wireshark fixes } -Tomasz Moń <desowin[AT]gmail.com> { +Tomasz Mon <desowin[AT]gmail.com> { USBPcap support } @@ -3612,7 +3612,7 @@ Cvetan Ivanov <zezo[AT]spnet.net> Vasanth Manickam <vasanth.manickam[AT]bt.com> Julian Onions <julian.onions[AT]gmail.com> Samuel Thibault <samuel.thibault[AT]ens-lyon.org> -Peter Kovář <peter.kovar[AT]gmail.com> +Peter Kovár <peter.kovar[AT]gmail.com> Paul Ollis <paul.ollis[AT]roke.co.uk> Dominik Kuhlen <dkuhlen[AT]gmx.net> Karl Knoebl <karl.knoebl[AT]siemens.com> @@ -3703,7 +3703,7 @@ Paul Stath <pstath[AT]axxcelera.com> DeCount <aatrade[AT]libero.it> Andras Veres-Szentkiralyi <vsza[AT]vsza.hu> Jakob Hirsch <jh.wireshark-bugzilla[AT]plonk.de> -Роман Донченко <DXDragon[AT]yandex.ru> +Roman Donchenko <DXDragon[AT]yandex.ru> <billyjeans[AT]gmail.com> Evan Huus <eapache[AT]gmail.com> Tom Cook <tcook[AT]ixiacom.com> ++++++ wireshark-1.10.0-pod-characters.patch ++++++ From: Andreas Stieger <andreas.stieger(a)gmx.de> Date: Thu, 27 Jun 2013 21:02:17 +0100 Subject: [patch] prevent pod2man failures due to non-ASCII characters References: http://anonsvn.wireshark.org/viewvc?view=revision&revision=49424 Upstream: submitted (different patch upstream but creates other errors) Prevents the following error sue to weird whitespache characters in the file: POD2MAN asn2deb.1 asn2deb.pod around line 8: Non-ASCII character seen before =encoding in '[-a?I<ASN.1'. Assuming ISO8859-1 POD document had syntax errors at /usr/bin/pod2man line 71. make: *** [asn2deb.1] Error 255 POD2MAN idl2deb.1 idl2deb.pod around line 8: Non-ASCII character seen before =encoding in '[B<-d?>I<opts>]'. Assuming ISO8859-1 POD document had syntax errors at /usr/bin/pod2man line 71. make: *** [idl2deb.1] Error 255 --- doc/asn2deb.pod | 4 ++-- doc/idl2deb.pod | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) Index: wireshark-1.10.0/doc/asn2deb.pod =================================================================== --- wireshark-1.10.0.orig/doc/asn2deb.pod 2013-06-27 20:33:01.000000000 +0100 +++ wireshark-1.10.0/doc/asn2deb.pod 2013-06-27 20:33:42.000000000 +0100 @@ -5,8 +5,8 @@ asn2deb - Create a Debian package for BE =head1 SYNOPSIS -B<asn2deb> [-a�I<ASN.1�file>] [--asn=I<ASN.1�file>] [B<-d�>I<opts>] [B<--dbopts=>I<opts>] [B<-e�>I<address>] -[B<--email=>I<address>] [B<-h>] [B<--help>] [B<-n�>I<name>] [B<--name=>I<name>] [B<-p>] [B<--preserve>] [B<-v>] [B<--version>] +B<asn2deb> [-a I<ASN.1 file>] [--asn=I<ASN.1 file>] [B<-d >I<opts>] [B<--dbopts=>I<opts>] [B<-e >I<address>] +[B<--email=>I<address>] [B<-h>] [B<--help>] [B<-n >I<name>] [B<--name=>I<name>] [B<-p>] [B<--preserve>] [B<-v>] [B<--version>] =head1 DESCRIPTION Index: wireshark-1.10.0/doc/idl2deb.pod =================================================================== --- wireshark-1.10.0.orig/doc/idl2deb.pod 2013-06-27 20:33:01.000000000 +0100 +++ wireshark-1.10.0/doc/idl2deb.pod 2013-06-27 20:33:42.000000000 +0100 @@ -5,8 +5,8 @@ idl2deb - Create a Debian package for CO =head1 SYNOPSIS -B<idl2deb> [B<-d�>I<opts>] [B<--dbopts=>I<opts>] [B<-e�>I<address>] [B<--email=>I<address>] [-i�I<idlfile>] -[--idl=I<idlfile>] [B<-h>] [B<--help>] [B<-n�>I<name>] [B<--name=>I<name>] [B<-p>] [B<--preserve>] [B<-v>] [B<--version>] +B<idl2deb> [B<-d >I<opts>] [B<--dbopts=>I<opts>] [B<-e >I<address>] [B<--email=>I<address>] [-i I<idlfile>] +[--idl=I<idlfile>] [B<-h>] [B<--help>] [B<-n >I<name>] [B<--name=>I<name>] [B<-p>] [B<--preserve>] [B<-v>] [B<--version>] =head1 DESCRIPTION -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit usbview for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '13

29 Jun '13

Hello community, here is the log from the commit of package usbview for openSUSE:Factory checked in at 2013-06-29 14:52:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/usbview (Old) and /work/SRC/openSUSE:Factory/.usbview.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "usbview" Changes: -------- --- /work/SRC/openSUSE:Factory/usbview/usbview.changes 2011-09-23 12:49:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.usbview.new/usbview.changes 2013-06-29 14:52:13.000000000 +0200 @@ -1,0 +2,7 @@ +Sat Jun 29 09:00:30 UTC 2013 - meissner(a)suse.com + +- updated to 2.0 + + gtk 3.0 port + + /proc/bus/usb/devices has moved to /sys/kernel/debug/usb/devices + +------------------------------------------------------------------- Old: ---- usbview-1.1.tar.bz2 New: ---- usbview-2.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ usbview.spec ++++++ --- /var/tmp/diff_new_pack.fXMpff/_old 2013-06-29 14:52:14.000000000 +0200 +++ /var/tmp/diff_new_pack.fXMpff/_new 2013-06-29 14:52:14.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package usbview (Version 1.1) +# spec file for package usbview # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,19 +15,17 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: usbview -Version: 1.1 -Release: 1 -License: GPL-2.0+ +Version: 2.0 +Release: 0 Summary: USB Topology and Device Viewer -Url: http://www.kroah.com/linux-usb/ +License: GPL-2.0+ Group: Hardware/Other -Source: http://www.kroah.com/linux-usb/%{name}-%{version}.tar.bz2 +Url: http://www.kroah.com/linux-usb/ +Source: http://www.kroah.com/linux-usb/%{name}-%{version}.tar.gz Source1: %name.desktop -BuildRequires: gtk2-devel +BuildRequires: gtk3-devel BuildRequires: update-desktop-files BuildRoot: %{_tmppath}/%{name}-%{version}-build -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit sudo for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '13

29 Jun '13

Hello community, here is the log from the commit of package sudo for openSUSE:Factory checked in at 2013-06-29 14:51:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sudo (Old) and /work/SRC/openSUSE:Factory/.sudo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sudo" Changes: -------- --- /work/SRC/openSUSE:Factory/sudo/sudo.changes 2013-03-01 21:03:23.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.sudo.new/sudo.changes 2013-06-29 14:51:56.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Jun 27 18:03:10 UTC 2013 - michael(a)stroeder.com + +- Update to upstream release 1.8.7 + * especially all local patches are obsoleted by upstream fixes + +------------------------------------------------------------------- Old: ---- sudo-1.8.6p3-CVE-2013-1775.patch sudo-1.8.6p3-CVE-2013-1776.patch sudo-1.8.6p3.tar.gz sudo-sudoers.patch sudoers2ldif-env.patch New: ---- sudo-1.8.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sudo.spec ++++++ --- /var/tmp/diff_new_pack.rEQEW3/_old 2013-06-29 14:51:57.000000000 +0200 +++ /var/tmp/diff_new_pack.rEQEW3/_new 2013-06-29 14:51:57.000000000 +0200 @@ -17,7 +17,7 @@ Name: sudo -Version: 1.8.6p3 +Version: 1.8.7 Release: 0 Summary: Execute some commands as root License: ISC @@ -26,10 +26,6 @@ Source0: http://sudo.ws/sudo/dist/%{name}-%{version}.tar.gz Source1: sudo.pamd Source2: README.SUSE -Patch0: sudoers2ldif-env.patch -Patch1: sudo-sudoers.patch -Patch2: sudo-1.8.6p3-CVE-2013-1775.patch -Patch3: sudo-1.8.6p3-CVE-2013-1776.patch BuildRequires: audit-devel BuildRequires: groff BuildRequires: libselinux-devel @@ -57,10 +53,6 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 %build %ifarch s390 s390x %sparc ++++++ sudo-1.8.6p3.tar.gz -> sudo-1.8.7.tar.gz ++++++ ++++ 90861 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rpmlint-mini for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '13

29 Jun '13

Hello community, here is the log from the commit of package rpmlint-mini for openSUSE:Factory checked in at 2013-06-29 14:51:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rpmlint-mini (Old) and /work/SRC/openSUSE:Factory/.rpmlint-mini.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rpmlint-mini" Changes: -------- --- /work/SRC/openSUSE:Factory/rpmlint-mini/rpmlint-mini.changes 2013-06-26 20:27:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rpmlint-mini.new/rpmlint-mini.changes 2013-06-29 14:51:36.000000000 +0200 @@ -1,0 +2,15 @@ +Fri Jun 28 16:16:25 UTC 2013 - dmueller(a)suse.com + +- update to desktop-file-validate 0.21: + - update to current version of menu specification (Vincent): + - only print hint if no main category is present, not an error + - make Science a main category + - add new registered categories: Adult, Feed, Humanities, Maps, + Shooter, Spirituality, XFCE + - update related categories + - add TDE to list of registered OnlyShowIn + - accept and validate GNOME3/GSettings for AutostartCondition (Vincent) + - output hint if more than one main category is present (Vincent) + - output hint about suggested related categories (Vincent) + +------------------------------------------------------------------- Old: ---- desktop-file-utils-0.20.tar.xz New: ---- desktop-file-utils-0.21.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpmlint-mini.spec ++++++ --- /var/tmp/diff_new_pack.m9tATW/_old 2013-06-29 14:51:37.000000000 +0200 +++ /var/tmp/diff_new_pack.m9tATW/_new 2013-06-29 14:51:37.000000000 +0200 @@ -34,11 +34,11 @@ Summary: Rpm correctness checker License: GPL-2.0+ Group: System/Packages -Version: 1.4 +Version: 1.5 Release: 0 Url: http://rpmlint.zarb.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source: desktop-file-utils-0.20.tar.xz +Source: desktop-file-utils-0.21.tar.xz Source100: rpmlint-deps.txt Source101: rpmlint.wrapper Source102: rpmlint-mini.config @@ -50,7 +50,7 @@ source packages can be checked. %prep -%setup -q -n desktop-file-utils-0.20 +%setup -q -n desktop-file-utils-0.21 [[ -r COPYING ]] %build ++++++ desktop-file-utils-0.20.tar.xz -> desktop-file-utils-0.21.tar.xz ++++++ ++++ 4910 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/desktop-file-utils-0.20/ChangeLog new/desktop-file-utils-0.21/ChangeLog --- old/desktop-file-utils-0.20/ChangeLog 2012-03-05 11:02:10.000000000 +0100 +++ new/desktop-file-utils-0.21/ChangeLog 2012-10-11 16:08:39.000000000 +0200 @@ -1,5 +1,270 @@ # Generated by Makefile. Do not edit. +commit c0c4c6c1dcfc410984a96193678f40b7a31c9ba1 +Author: Vincent Untz <vuntz(a)gnome.org> +Date: Thu Oct 11 15:25:25 2012 +0200 + + validate: Add Feed category, that can be used with Network + + https://bugs.freedesktop.org/show_bug.cgi?id=20197 + + See http://lists.freedesktop.org/archives/xdg/2012-October/012525.html + +M src/validate.c + +commit 689ec978d17769092e0dde3c79c1ce2db871737e +Author: Vincent Untz <vuntz(a)gnome.org> +Date: Thu Oct 11 15:24:56 2012 +0200 + + validate: Add Network as related category for Monitor + + https://bugs.freedesktop.org/show_bug.cgi?id=49699 + + See http://lists.freedesktop.org/archives/xdg/2012-October/012525.html + +M src/validate.c + +commit a0e4f097c4d5d0da91dd6112c42111c95b18fff9 +Author: Vincent Untz <vuntz(a)gnome.org> +Date: Thu Oct 11 15:24:22 2012 +0200 + + validate: Add Shooter category for games + + https://bugs.freedesktop.org/show_bug.cgi?id=38553 + + See http://lists.freedesktop.org/archives/xdg/2012-October/012525.html + +M src/validate.c + +commit 0c2cc0855f537c8751af0bd47415193a55a903d2 +Author: Vincent Untz <vuntz(a)gnome.org> +Date: Thu Oct 11 15:23:41 2012 +0200 + + validate: Add Maps category, and document where to put GIS applications + + https://bugs.freedesktop.org/show_bug.cgi?id=20187 + + See http://lists.freedesktop.org/archives/xdg/2012-October/012525.html + +M src/validate.c + +commit 10c0d9e0af220d973c7a6ca80f7bb4ea3074e85f +Author: Vincent Untz <vuntz(a)gnome.org> +Date: Thu Oct 11 15:22:59 2012 +0200 + + validate: Add Science as related category for more Education categories + + https://bugs.freedesktop.org/show_bug.cgi?id=20186 + + See http://lists.freedesktop.org/archives/xdg/2012-October/012525.html + +M src/validate.c + +commit dc41f7391463ed083edff89e6719949f2755d18a +Author: Vincent Untz <vuntz(a)gnome.org> +Date: Thu Oct 11 15:21:50 2012 +0200 + + validate: Make Science a main category + + https://bugs.freedesktop.org/show_bug.cgi?id=20186 + + See http://lists.freedesktop.org/archives/xdg/2012-October/012525.html + +M src/validate.c + +commit 7948c96f7cf698f117d32e6e796e9073e77cc610 +Author: Vincent Untz <vuntz(a)gnome.org> +Date: Thu Oct 11 15:00:32 2012 +0200 + + validate: Add Spirituality and Humanities categories + + https://bugs.freedesktop.org/show_bug.cgi?id=20192 + + See http://lists.freedesktop.org/archives/xdg/2012-October/012525.html + +M src/validate.c + +commit 7a647466f4455c289549e399b20f86bd50190df3 +Author: Vincent Untz <vuntz(a)gnome.org> +Date: Thu Oct 11 14:49:13 2012 +0200 + + validate: Change some related categories from "and" to "or" + + https://bugs.freedesktop.org/show_bug.cgi?id=35844 + + See http://lists.freedesktop.org/archives/xdg/2012-October/012526.html + +M src/validate.c + +commit 055c439fade52e30f3c3a866881f6a2890c2a331 +Author: Vincent Untz <vuntz(a)gnome.org> +Date: Wed Oct 3 15:55:52 2012 +0200 + + validate: Code style fixes + +M src/validate.c + +commit 38b319d92525d1b1f887b1b5f094d416b51bd74c +Author: Vincent Untz <vuntz(a)gnome.org> +Date: Wed Oct 3 15:48:35 2012 +0200 + + validate: Accept and validate GNOME3/GSettings for AutostartCondition + + We try to validate as much as we can the content of AutostartCondition. + This means: + + - for GNOME3, we check that if-session/unless-session is used with an + additional argument + - for GSettings, we check that two arguments are passed + + Additionally, we now add more validation for the GNOME condition (one + argument needs to be passed). + + https://bugs.freedesktop.org/show_bug.cgi?id=55483 + +M src/validate.c + +commit 355b4c6f7e4203a7c8ae184a2db76ae157235003 +Author: Vincent Untz <vuntz(a)gnome.org> +Date: Wed Oct 3 13:01:11 2012 +0200 + + validate: Rework multiple main categories detection + + AudioVideo is required if Audio or Video is present, and that would be + two main categories. But in that case, this is okay. So we need to + ignore the case of two main categories when one is required by the + other. + +M src/validate.c + +commit b18be61ad4957ea312efcbe65c6cffe2ef52fc6a +Author: Vincent Untz <vuntz(a)gnome.org> +Date: Wed Oct 3 11:48:19 2012 +0200 + + validate: Clarify message when outputting an item of list + + In some messages, we don't display the key value, but one item of the + value (which is a list). Make this clearer. + +M src/validate.c + +commit 682184ed59154d68c8c333609f4cea777ac67079 +Author: Vincent Untz <vuntz(a)gnome.org> +Date: Wed Oct 3 08:44:02 2012 +0200 + + validate: Add hint about suggested related categories + + Now that related categories are not required (in general, see below for + an exception), we don't need to error out when they're missing. Still, + it's nice to suggest them with a hint. + + Note that there are still cases where another category is required + (AudioVideo for Audio, for instance). + + Part of https://bugs.freedesktop.org/show_bug.cgi?id=35844 (comment 6 + and later) + +M src/validate.c + +commit 02cbbd7f90ccb4f1b7e65e32aaabaa3057c61b76 +Author: Vincent Untz <vuntz(a)gnome.org> +Date: Wed Oct 3 08:21:57 2012 +0200 + + validate: Add Adult category + + See http://lists.freedesktop.org/archives/xdg/2011-November/012106.html + +M src/validate.c + +commit 6a685a92691087eeb0325355e52b42ecf621f797 +Author: Vincent Untz <vuntz(a)gnome.org> +Date: Wed Oct 3 08:17:39 2012 +0200 + + validate: Output hint if more than one main category is present + +M src/validate.c + +commit c3eeb8c7b4a63233226ef76a56221a167510253e +Author: Vincent Untz <vuntz(a)gnome.org> +Date: Wed Oct 3 07:48:59 2012 +0200 + + validate: Only print hint if no main category is present, not an error + + The requirement to have at least one main category was removed for the + specification a few months ago. It's still useful to tell people with a + hint about the risk of not including one, though. + + See http://lists.freedesktop.org/archives/xdg/2011-November/012123.html + + Part of https://bugs.freedesktop.org/show_bug.cgi?id=35844 (comment 6 + and later) + +M src/validate.c + +commit a97707811e2669b6a52a861c41cf46838fab8eb5 +Author: Vincent Untz <vuntz(a)gnome.org> +Date: Wed Oct 3 07:41:14 2012 +0200 + + validate: Add function to print hints, and --no-hints option + + This is useful to suggest improvements to the user. + +M src/install.c +M src/validate.c +M src/validate.h +M src/validator.c + +commit fadbee1bdceffa3c6ffdbaa67563dbcb0ce059f7 +Author: Vincent Untz <vuntz(a)gnome.org> +Date: Fri May 11 14:06:28 2012 +0200 + + validate: Add TDE to to list of registered OnlyShowIn + + See http://lists.freedesktop.org/archives/xdg/2012-April/012374.html + +M src/validate.c + +commit ff6bf3b5f8e1e2f384939db9d212b4b21c24d5f3 +Author: Vincent Untz <vuntz(a)gnome.org> +Date: Wed Apr 11 12:48:05 2012 +0200 + + validate: Add XFCE to to list of registered categories + + See http://lists.freedesktop.org/archives/xdg/2012-March/012302.html and + http://lists.freedesktop.org/archives/xdg/2012-April/012348.html + +M src/validate.c + +commit 56eddf4ce5008dc95e2b3725684aa2b7cb053c54 +Author: Vincent Untz <vuntz(a)gnome.org> +Date: Tue Apr 3 14:07:50 2012 +0200 + + install: Do not require glib >= 2.28 + + We still only check for an older version of glib, and requiring 2.28 + just for g_slist_free_full() can be silly. So if we don't have 2.28, + just use the equivalent trivial code. + + https://bugs.freedesktop.org/show_bug.cgi?id=48133 + +M src/install.c + +commit e82a75619484c8a5362787187871ae1d04cf006c +Author: Vincent Untz <vuntz(a)gnome.org> +Date: Mon Mar 5 11:03:49 2012 +0100 + + release: post-release bump to 0.21 + +M configure.ac + +commit a00235a091e4d49825c62f6dbb2de43b432e052b +Author: Vincent Untz <vuntz(a)gnome.org> +Date: Mon Mar 5 11:02:30 2012 +0100 + + release: 0.20 + +M NEWS + commit 191a09f0e1bf2ebd5a4dcbb5b106a91a3b335716 Author: Vincent Untz <vuntz(a)gnome.org> Date: Fri Mar 2 18:57:24 2012 +0100 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/desktop-file-utils-0.20/NEWS new/desktop-file-utils-0.21/NEWS --- old/desktop-file-utils-0.20/NEWS 2012-03-05 10:55:56.000000000 +0100 +++ new/desktop-file-utils-0.21/NEWS 2012-10-11 16:08:32.000000000 +0200 @@ -1,4 +1,23 @@ ============ +Version 0.21 +============ + + desktop-file-validate + - update to current version of menu specification (Vincent): + - only print hint if no main category is present, not an error + - make Science a main category + - add new registered categories: Adult, Feed, Humanities, Maps, + Shooter, Spirituality, XFCE + - update related categories + - add TDE to list of registered OnlyShowIn + - accept and validate GNOME3/GSettings for AutostartCondition (Vincent) + - output hint if more than one main category is present (Vincent) + - output hint about suggested related categories (Vincent) + + misc + - do not require glib >= 2.28 for build (Vincent) + +============ Version 0.20 ============ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/desktop-file-utils-0.20/configure.ac new/desktop-file-utils-0.21/configure.ac --- old/desktop-file-utils-0.20/configure.ac 2011-12-20 16:10:48.000000000 +0100 +++ new/desktop-file-utils-0.21/configure.ac 2012-08-27 16:09:02.000000000 +0200 @@ -1,4 +1,4 @@ -AC_INIT([desktop-file-utils], [0.20], +AC_INIT([desktop-file-utils], [0.21], [https://bugs.freedesktop.org/enter_bug.cgi?product=desktop-file-utils] AC_CONFIG_SRCDIR(src/validate.h) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/desktop-file-utils-0.20/elisp-comp new/desktop-file-utils-0.21/elisp-comp --- old/desktop-file-utils-0.20/elisp-comp 2011-01-31 12:59:05.000000000 +0100 +++ new/desktop-file-utils-0.21/elisp-comp 2012-07-04 13:54:59.000000000 +0200 @@ -1,8 +1,7 @@ #!/bin/sh -# Copyright (C) 1995, 2000, 2003, 2004, 2005, 2009 Free Software -# Foundation, Inc. +# Copyright (C) 1995-2012 Free Software Foundation, Inc. -scriptversion=2009-04-28.21; # UTC +scriptversion=2010-02-06.18; # UTC # Franc,ois Pinard <pinard(a)iro.umontreal.ca>, 1995. # @@ -30,16 +29,16 @@ case $1 in '') - echo "$0: No files. Try \`$0 --help' for more information." 1>&2 + echo "$0: No files. Try '$0 --help' for more information." 1>&2 exit 1; ;; -h | --h*) cat <<\EOF Usage: elisp-comp [--help] [--version] FILES... -This script byte-compiles all `.el' files listed as FILES using GNU -Emacs, and put the resulting `.elc' files into the current directory, -so disregarding the original directories used in `.el' arguments. +This script byte-compiles all '.el' files listed as FILES using GNU +Emacs, and put the resulting '.elc' files into the current directory, +so disregarding the original directories used in '.el' arguments. This script manages in such a way that all Emacs LISP files to be compiled are made visible between themselves, in the event @@ -65,7 +64,11 @@ # Cleanup the temporary directory on exit. trap 'ret=$?; rm -rf "$tempdir" && exit $ret' 0 -trap '(exit $?); exit' 1 2 13 15 +do_exit='(exit $ret); exit $ret' +trap "ret=129; $do_exit" 1 +trap "ret=130; $do_exit" 2 +trap "ret=141; $do_exit" 13 +trap "ret=143; $do_exit" 15 mkdir $tempdir cp "$@" $tempdir diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/desktop-file-utils-0.20/missing new/desktop-file-utils-0.21/missing --- old/desktop-file-utils-0.20/missing 2011-01-31 12:59:05.000000000 +0100 +++ new/desktop-file-utils-0.21/missing 2012-07-04 13:54:59.000000000 +0200 @@ -1,10 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2009-04-28.21; # UTC +scriptversion=2012-01-06.18; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 1996-2012 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -26,7 +25,7 @@ # the same distribution terms that you use for the rest of that program. if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "Try '$0 --help' for more information" exit 1 fi @@ -34,7 +33,7 @@ sed_output='s/.* --output[ =]$[^ ]*$.*/\1/p' sed_minuso='s/.* -o $[^ ]*$.*/\1/p' -# In the cases where this matters, `missing' is being run in the +# In the cases where this matters, 'missing' is being run in the # srcdir already. if test -f configure.ac; then configure_ac=configure.ac @@ -65,7 +64,7 @@ echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an +Handle 'PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an error status if there is no known handling for PROGRAM. Options: @@ -74,21 +73,20 @@ --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' + aclocal touch file 'aclocal.m4' + autoconf touch file 'configure' + autoheader touch file 'config.h.in' autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c + automake touch all 'Makefile.in' files + bison create 'y.tab.[ch]', if possible, from existing .[ch] + flex create 'lex.yy.c', if possible, from existing .c help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c + lex create 'lex.yy.c', if possible, from existing .c makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch] + yacc create 'y.tab.[ch]', if possible, from existing .[ch] -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. Send bug reports to <bug-automake(a)gnu.org>." exit $? @@ -100,8 +98,8 @@ ;; -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "$0: Unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; @@ -122,22 +120,13 @@ # Not GNU programs, they don't have --version. ;; - tar*) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 elif test "x$2" = "x--version" || test "x$2" = "x--help"; then # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether + # running '$TOOL --version' or '$TOOL --help' to check whether # $TOOL exists and not knowing $TOOL uses missing. exit 1 fi @@ -149,27 +138,27 @@ case $program in aclocal*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from +WARNING: '$1' is $msg. You should only need it if + you modified 'acinclude.m4' or '${configure_ac}'. You might want + to install the Automake and Perl packages. Grab them from any GNU archive site." touch aclocal.m4 ;; autoconf*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU +WARNING: '$1' is $msg. You should only need it if + you modified '${configure_ac}'. You might want to install the + Autoconf and GNU m4 packages. Grab them from any GNU archive site." touch configure ;; autoheader*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them +WARNING: '$1' is $msg. You should only need it if + you modified 'acconfig.h' or '${configure_ac}'. You might want + to install the Autoconf and GNU m4 packages. Grab them from any GNU archive site." files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER($[^)]*$).*/\1/p' ${configure_ac}` test -z "$files" && files="config.h" @@ -186,9 +175,9 @@ automake*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. +WARNING: '$1' is $msg. You should only need it if + you modified 'Makefile.am', 'acinclude.m4' or '${configure_ac}'. + You might want to install the Automake and Perl packages. Grab them from any GNU archive site." find . -type f -name Makefile.am -print | sed 's/\.am$/.in/' | @@ -197,10 +186,10 @@ autom4te*) echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. +WARNING: '$1' is needed, but is $msg. You might have modified some files without having the proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU + You can get '$1' as part of Autoconf from any GNU archive site." file=`echo "$*" | sed -n "$sed_output"` @@ -220,13 +209,13 @@ bison*|yacc*) echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package +WARNING: '$1' $msg. You should only need it if + you modified a '.y' file. You may need the Bison package in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." + Bison from any GNU archive site." rm -f y.tab.c y.tab.h if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` @@ -250,13 +239,13 @@ lex*|flex*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package +WARNING: '$1' is $msg. You should only need it if + you modified a '.l' file. You may need the Flex package in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." + Flex from any GNU archive site." rm -f lex.yy.c if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` @@ -273,10 +262,10 @@ help2man*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if +WARNING: '$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." + Help2man package in order for those modifications to take + effect. You can get Help2man from any GNU archive site." file=`echo "$*" | sed -n "$sed_output"` test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` @@ -291,12 +280,12 @@ makeinfo*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file +WARNING: '$1' is $msg. You should only need it if + you modified a '.texi' or '.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." + call might also be the consequence of using a buggy 'make' (AIX, + DU, IRIX). You might want to install the Texinfo package or + the GNU make package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... file=`echo "$*" | sed -n "$sed_output"` test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` @@ -318,49 +307,14 @@ touch $file ;; - tar*) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - *) echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. +WARNING: '$1' is needed, and is $msg. You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, + proper tools for further handling them. Check the 'README' file, it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." + some other package would contain this missing '$1' program." exit 1 ;; esac diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/desktop-file-utils-0.20/src/install.c new/desktop-file-utils-0.21/src/install.c --- old/desktop-file-utils-0.20/src/install.c 2011-12-14 17:27:30.000000000 +0100 +++ new/desktop-file-utils-0.21/src/install.c 2012-10-03 13:02:22.000000000 +0200 @@ -248,7 +248,7 @@ g_key_file_free (kf); /* Load and validate the file we just wrote */ - if (!desktop_file_validate (new_filename, FALSE, TRUE)) + if (!desktop_file_validate (new_filename, FALSE, TRUE, TRUE)) { g_set_error (err, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_PARSE, _("Failed to validate the created desktop file")); @@ -940,7 +940,12 @@ } } +#if GLIB_CHECK_VERSION(2,28,0) g_slist_free_full (edit_actions, (GDestroyNotify) dfu_edit_action_free); +#else + g_slist_foreach (edit_actions, (GFunc) dfu_edit_action_free, NULL); + g_slist_free (edit_actions); +#endif g_option_context_free (context); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/desktop-file-utils-0.20/src/validate.c new/desktop-file-utils-0.21/src/validate.c --- old/desktop-file-utils-0.20/src/validate.c 2012-03-02 19:42:06.000000000 +0100 +++ new/desktop-file-utils-0.21/src/validate.c 2012-10-11 15:26:43.000000000 +0200 @@ -112,6 +112,7 @@ gboolean kde_reserved_warnings; gboolean no_deprecated_warnings; + gboolean no_hints; char *main_group; DesktopType type; @@ -360,7 +361,17 @@ }; static const char *show_in_registered[] = { - "GNOME", "KDE", "LXDE", "MATE", "Razor", "ROX", "Unity", "XFCE", "Old" + "GNOME", "KDE", "LXDE", "MATE", "Razor", "ROX", "TDE", "Unity", "XFCE", "Old" +}; + +static struct { + const char *name; + const char *first_arg[3]; + unsigned int additional_args; +} registered_autostart_condition[] = { + { "GNOME", { NULL }, 1 }, + { "GNOME3", { "if-session", "unless-session", NULL }, 1}, + { "GSettings", { NULL }, 2 } }; static struct { @@ -368,148 +379,156 @@ gboolean main; gboolean require_only_show_in; gboolean deprecated; - const char *requires[4]; + const char *requires[2]; + const char *suggests[4]; } registered_categories[] = { - { "AudioVideo", TRUE, FALSE, FALSE, { NULL } }, - { "Audio", TRUE, FALSE, FALSE, { "AudioVideo", NULL } }, - { "Video", TRUE, FALSE, FALSE, { "AudioVideo", NULL } }, - { "Development", TRUE, FALSE, FALSE, { NULL } }, - { "Education", TRUE, FALSE, FALSE, { NULL } }, - { "Game", TRUE, FALSE, FALSE, { NULL } }, - { "Graphics", TRUE, FALSE, FALSE, { NULL } }, - { "Network", TRUE, FALSE, FALSE, { NULL } }, - { "Office", TRUE, FALSE, FALSE, { NULL } }, - { "Settings", TRUE, FALSE, FALSE, { NULL } }, - { "System", TRUE, FALSE, FALSE, { NULL } }, - { "Utility", TRUE, FALSE, FALSE, { NULL } }, - { "Audio", FALSE, FALSE, FALSE, { "Development", NULL } }, - { "Video", FALSE, FALSE, FALSE, { "Development", NULL } }, - { "Building", FALSE, FALSE, FALSE, { "Development", NULL } }, - { "Debugger", FALSE, FALSE, FALSE, { "Development", NULL } }, - { "IDE", FALSE, FALSE, FALSE, { "Development", NULL } }, - { "GUIDesigner", FALSE, FALSE, FALSE, { "Development", NULL } }, - { "Profiling", FALSE, FALSE, FALSE, { "Development", NULL } }, - { "RevisionControl", FALSE, FALSE, FALSE, { "Development", NULL } }, - { "Translation", FALSE, FALSE, FALSE, { "Development", NULL } }, - { "Calendar", FALSE, FALSE, FALSE, { "Office", NULL } }, - { "ContactManagement", FALSE, FALSE, FALSE, { "Office", NULL } }, - { "Database", FALSE, FALSE, FALSE, { "Office", "Development", "AudioVideo", NULL } }, - { "Dictionary", FALSE, FALSE, FALSE, { "Office;TextTools", NULL } }, - { "Chart", FALSE, FALSE, FALSE, { "Office", NULL } }, - { "Email", FALSE, FALSE, FALSE, { "Office;Network", NULL } }, - { "Finance", FALSE, FALSE, FALSE, { "Office", NULL } }, - { "FlowChart", FALSE, FALSE, FALSE, { "Office", NULL } }, - { "PDA", FALSE, FALSE, FALSE, { "Office", NULL } }, - { "ProjectManagement", FALSE, FALSE, FALSE, { "Office;Development", NULL } }, - { "Presentation", FALSE, FALSE, FALSE, { "Office", NULL } }, - { "Spreadsheet", FALSE, FALSE, FALSE, { "Office", NULL } }, - { "WordProcessor", FALSE, FALSE, FALSE, { "Office", NULL } }, - { "2DGraphics", FALSE, FALSE, FALSE, { "Graphics", NULL } }, - { "VectorGraphics", FALSE, FALSE, FALSE, { "Graphics;2DGraphics", NULL } }, - { "RasterGraphics", FALSE, FALSE, FALSE, { "Graphics;2DGraphics", NULL } }, - { "3DGraphics", FALSE, FALSE, FALSE, { "Graphics", NULL } }, - { "Scanning", FALSE, FALSE, FALSE, { "Graphics", NULL } }, - { "OCR", FALSE, FALSE, FALSE, { "Graphics;Scanning", NULL } }, - { "Photography", FALSE, FALSE, FALSE, { "Graphics", "Office", NULL } }, - { "Publishing", FALSE, FALSE, FALSE, { "Graphics", "Office", NULL } }, - { "Viewer", FALSE, FALSE, FALSE, { "Graphics", "Office", NULL } }, - { "TextTools", FALSE, FALSE, FALSE, { "Utility", NULL } }, - { "DesktopSettings", FALSE, FALSE, FALSE, { "Settings", NULL } }, - { "HardwareSettings", FALSE, FALSE, FALSE, { "Settings", NULL } }, - { "Printing", FALSE, FALSE, FALSE, { "HardwareSettings;Settings", NULL } }, - { "PackageManager", FALSE, FALSE, FALSE, { "Settings", NULL } }, - { "Dialup", FALSE, FALSE, FALSE, { "Network", NULL } }, - { "InstantMessaging", FALSE, FALSE, FALSE, { "Network", NULL } }, - { "Chat", FALSE, FALSE, FALSE, { "Network", NULL } }, - { "IRCClient", FALSE, FALSE, FALSE, { "Network", NULL } }, - { "FileTransfer", FALSE, FALSE, FALSE, { "Network", NULL } }, - { "HamRadio", FALSE, FALSE, FALSE, { "Network", "Audio", NULL } }, - { "News", FALSE, FALSE, FALSE, { "Network", NULL } }, - { "P2P", FALSE, FALSE, FALSE, { "Network", NULL } }, - { "RemoteAccess", FALSE, FALSE, FALSE, { "Network", NULL } }, - { "Telephony", FALSE, FALSE, FALSE, { "Network", NULL } }, - { "TelephonyTools", FALSE, FALSE, FALSE, { "Utility", NULL } }, - { "VideoConference", FALSE, FALSE, FALSE, { "Network", NULL } }, - { "WebBrowser", FALSE, FALSE, FALSE, { "Network", NULL } }, - { "WebDevelopment", FALSE, FALSE, FALSE, { "Network", "Development", NULL } }, - { "Midi", FALSE, FALSE, FALSE, { "AudioVideo;Audio", NULL } }, - { "Mixer", FALSE, FALSE, FALSE, { "AudioVideo;Audio", NULL } }, - { "Sequencer", FALSE, FALSE, FALSE, { "AudioVideo;Audio", NULL } }, - { "Tuner", FALSE, FALSE, FALSE, { "AudioVideo;Audio", NULL } }, - { "TV", FALSE, FALSE, FALSE, { "AudioVideo;Video", NULL } }, - { "AudioVideoEditing", FALSE, FALSE, FALSE, { "Audio", "Video", "AudioVideo", NULL } }, - { "Player", FALSE, FALSE, FALSE, { "Audio", "Video", "AudioVideo", NULL } }, - { "Recorder", FALSE, FALSE, FALSE, { "Audio", "Video", "AudioVideo", NULL } }, - { "DiscBurning", FALSE, FALSE, FALSE, { "Audio", "Video", "AudioVideo", NULL } }, - { "ActionGame", FALSE, FALSE, FALSE, { "Game", NULL } }, - { "AdventureGame", FALSE, FALSE, FALSE, { "Game", NULL } }, - { "ArcadeGame", FALSE, FALSE, FALSE, { "Game", NULL } }, - { "BoardGame", FALSE, FALSE, FALSE, { "Game", NULL } }, - { "BlocksGame", FALSE, FALSE, FALSE, { "Game", NULL } }, - { "CardGame", FALSE, FALSE, FALSE, { "Game", NULL } }, - { "KidsGame", FALSE, FALSE, FALSE, { "Game", NULL } }, - { "LogicGame", FALSE, FALSE, FALSE, { "Game", NULL } }, - { "RolePlaying", FALSE, FALSE, FALSE, { "Game", NULL } }, - { "Simulation", FALSE, FALSE, FALSE, { "Game", NULL } }, - { "SportsGame", FALSE, FALSE, FALSE, { "Game", NULL } }, - { "StrategyGame", FALSE, FALSE, FALSE, { "Game", NULL } }, - { "Art", FALSE, FALSE, FALSE, { "Education", NULL } }, - { "Construction", FALSE, FALSE, FALSE, { "Education", NULL } }, - { "Music", FALSE, FALSE, FALSE, { "AudioVideo;Education", NULL } }, - { "Languages", FALSE, FALSE, FALSE, { "Education", NULL } }, - { "Science", FALSE, FALSE, FALSE, { "Education", NULL } }, - { "ArtificialIntelligence", FALSE, FALSE, FALSE, { "Education;Science", NULL } }, - { "Astronomy", FALSE, FALSE, FALSE, { "Education;Science", NULL } }, - { "Biology", FALSE, FALSE, FALSE, { "Education;Science", NULL } }, - { "Chemistry", FALSE, FALSE, FALSE, { "Education;Science", NULL } }, - { "ComputerScience", FALSE, FALSE, FALSE, { "Education;Science", NULL } }, - { "DataVisualization", FALSE, FALSE, FALSE, { "Education;Science", NULL } }, - { "Economy", FALSE, FALSE, FALSE, { "Education", NULL } }, - { "Electricity", FALSE, FALSE, FALSE, { "Education;Science", NULL } }, - { "Geography", FALSE, FALSE, FALSE, { "Education", NULL } }, - { "Geology", FALSE, FALSE, FALSE, { "Education;Science", NULL } }, - { "Geoscience", FALSE, FALSE, FALSE, { "Education;Science", NULL } }, - { "History", FALSE, FALSE, FALSE, { "Education", NULL } }, - { "ImageProcessing", FALSE, FALSE, FALSE, { "Education;Science", NULL } }, - { "Literature", FALSE, FALSE, FALSE, { "Education", NULL } }, - { "Math", FALSE, FALSE, FALSE, { "Education;Science", NULL } }, - { "NumericalAnalysis", FALSE, FALSE, FALSE, { "Education;Science;Math", NULL } }, - { "MedicalSoftware", FALSE, FALSE, FALSE, { "Education;Science", NULL } }, - { "Physics", FALSE, FALSE, FALSE, { "Education;Science", NULL } }, - { "Robotics", FALSE, FALSE, FALSE, { "Education;Science", NULL } }, - { "Sports", FALSE, FALSE, FALSE, { "Education", NULL } }, - { "ParallelComputing", FALSE, FALSE, FALSE, { "Education;Science;ComputerScience", NULL } }, - { "Amusement", FALSE, FALSE, FALSE, { NULL } }, - { "Archiving", FALSE, FALSE, FALSE, { "Utility", NULL } }, - { "Compression", FALSE, FALSE, FALSE, { "Utility;Archiving", NULL } }, - { "Electronics", FALSE, FALSE, FALSE, { NULL } }, - { "Emulator", FALSE, FALSE, FALSE, { "System", "Game", NULL } }, - { "Engineering", FALSE, FALSE, FALSE, { NULL } }, - { "FileTools", FALSE, FALSE, FALSE, { "Utility", "System", NULL } }, - { "FileManager", FALSE, FALSE, FALSE, { "System;FileTools", NULL } }, - { "TerminalEmulator", FALSE, FALSE, FALSE, { "System", NULL } }, - { "Filesystem", FALSE, FALSE, FALSE, { "System", NULL } }, - { "Monitor", FALSE, FALSE, FALSE, { "System", NULL } }, - { "Security", FALSE, FALSE, FALSE, { "Settings", "System", NULL } }, - { "Accessibility", FALSE, FALSE, FALSE, { "Settings", "Utility", NULL } }, - { "Calculator", FALSE, FALSE, FALSE, { "Utility", NULL } }, - { "Clock", FALSE, FALSE, FALSE, { "Utility", NULL } }, - { "TextEditor", FALSE, FALSE, FALSE, { "Utility", NULL } }, - { "Documentation", FALSE, FALSE, FALSE, { NULL } }, - { "Core", FALSE, FALSE, FALSE, { NULL } }, - { "KDE", FALSE, FALSE, FALSE, { "Qt", NULL } }, - { "GNOME", FALSE, FALSE, FALSE, { "GTK", NULL } }, - { "GTK", FALSE, FALSE, FALSE, { NULL } }, - { "Qt", FALSE, FALSE, FALSE, { NULL } }, - { "Motif", FALSE, FALSE, FALSE, { NULL } }, - { "Java", FALSE, FALSE, FALSE, { NULL } }, - { "ConsoleOnly", FALSE, FALSE, FALSE, { NULL } }, - { "Screensaver", FALSE, TRUE, FALSE, { NULL } }, - { "TrayIcon", FALSE, TRUE, FALSE, { NULL } }, - { "Applet", FALSE, TRUE, FALSE, { NULL } }, - { "Shell", FALSE, TRUE, FALSE, { NULL } }, - { "Application", FALSE, FALSE, TRUE, { NULL } }, - { "Applications", FALSE, FALSE, TRUE, { NULL } } + { "AudioVideo", TRUE, FALSE, FALSE, { NULL }, { NULL } }, + { "Audio", TRUE, FALSE, FALSE, { "AudioVideo", NULL }, { NULL } }, + { "Video", TRUE, FALSE, FALSE, { "AudioVideo", NULL }, { NULL } }, + { "Development", TRUE, FALSE, FALSE, { NULL }, { NULL } }, + { "Education", TRUE, FALSE, FALSE, { NULL }, { NULL } }, + { "Game", TRUE, FALSE, FALSE, { NULL }, { NULL } }, + { "Graphics", TRUE, FALSE, FALSE, { NULL }, { NULL } }, + { "Network", TRUE, FALSE, FALSE, { NULL }, { NULL } }, + { "Office", TRUE, FALSE, FALSE, { NULL }, { NULL } }, + { "Science", TRUE, FALSE, FALSE, { NULL }, { NULL } }, + { "Settings", TRUE, FALSE, FALSE, { NULL }, { NULL } }, + { "System", TRUE, FALSE, FALSE, { NULL }, { NULL } }, + { "Utility", TRUE, FALSE, FALSE, { NULL }, { NULL } }, + { "Audio", FALSE, FALSE, FALSE, { NULL }, { "Development", NULL } }, + { "Video", FALSE, FALSE, FALSE, { NULL }, { "Development", NULL } }, + { "Building", FALSE, FALSE, FALSE, { NULL }, { "Development", NULL } }, + { "Debugger", FALSE, FALSE, FALSE, { NULL }, { "Development", NULL } }, + { "IDE", FALSE, FALSE, FALSE, { NULL }, { "Development", NULL } }, + { "GUIDesigner", FALSE, FALSE, FALSE, { NULL }, { "Development", NULL } }, + { "Profiling", FALSE, FALSE, FALSE, { NULL }, { "Development", NULL } }, + { "RevisionControl", FALSE, FALSE, FALSE, { NULL }, { "Development", NULL } }, + { "Translation", FALSE, FALSE, FALSE, { NULL }, { "Development", NULL } }, + { "Calendar", FALSE, FALSE, FALSE, { NULL }, { "Office", NULL } }, + { "ContactManagement", FALSE, FALSE, FALSE, { NULL }, { "Office", NULL } }, + { "Database", FALSE, FALSE, FALSE, { NULL }, { "Office", "Development", "AudioVideo", NULL } }, + { "Dictionary", FALSE, FALSE, FALSE, { NULL }, { "Office", "TextTools", NULL } }, + { "Chart", FALSE, FALSE, FALSE, { NULL }, { "Office", NULL } }, + { "Email", FALSE, FALSE, FALSE, { NULL }, { "Office", "Network", NULL } }, + { "Finance", FALSE, FALSE, FALSE, { NULL }, { "Office", NULL } }, + { "FlowChart", FALSE, FALSE, FALSE, { NULL }, { "Office", NULL } }, + { "PDA", FALSE, FALSE, FALSE, { NULL }, { "Office", NULL } }, + { "ProjectManagement", FALSE, FALSE, FALSE, { NULL }, { "Office", "Development", NULL } }, + { "Presentation", FALSE, FALSE, FALSE, { NULL }, { "Office", NULL } }, + { "Spreadsheet", FALSE, FALSE, FALSE, { NULL }, { "Office", NULL } }, + { "WordProcessor", FALSE, FALSE, FALSE, { NULL }, { "Office", NULL } }, + { "2DGraphics", FALSE, FALSE, FALSE, { NULL }, { "Graphics", NULL } }, + { "VectorGraphics", FALSE, FALSE, FALSE, { NULL }, { "Graphics;2DGraphics", NULL } }, + { "RasterGraphics", FALSE, FALSE, FALSE, { NULL }, { "Graphics;2DGraphics", NULL } }, + { "3DGraphics", FALSE, FALSE, FALSE, { NULL }, { "Graphics", NULL } }, + { "Scanning", FALSE, FALSE, FALSE, { NULL }, { "Graphics", NULL } }, + { "OCR", FALSE, FALSE, FALSE, { NULL }, { "Graphics;Scanning", NULL } }, + { "Photography", FALSE, FALSE, FALSE, { NULL }, { "Graphics", "Office", NULL } }, + { "Publishing", FALSE, FALSE, FALSE, { NULL }, { "Graphics", "Office", NULL } }, + { "Viewer", FALSE, FALSE, FALSE, { NULL }, { "Graphics", "Office", NULL } }, + { "TextTools", FALSE, FALSE, FALSE, { NULL }, { "Utility", NULL } }, + { "DesktopSettings", FALSE, FALSE, FALSE, { NULL }, { "Settings", NULL } }, + { "HardwareSettings", FALSE, FALSE, FALSE, { NULL }, { "Settings", NULL } }, + { "Printing", FALSE, FALSE, FALSE, { NULL }, { "HardwareSettings;Settings", NULL } }, + { "PackageManager", FALSE, FALSE, FALSE, { NULL }, { "Settings", NULL } }, + { "Dialup", FALSE, FALSE, FALSE, { NULL }, { "Network", NULL } }, + { "InstantMessaging", FALSE, FALSE, FALSE, { NULL }, { "Network", NULL } }, + { "Chat", FALSE, FALSE, FALSE, { NULL }, { "Network", NULL } }, + { "IRCClient", FALSE, FALSE, FALSE, { NULL }, { "Network", NULL } }, + { "Feed", FALSE, FALSE, FALSE, { NULL }, { "Network", NULL } }, + { "FileTransfer", FALSE, FALSE, FALSE, { NULL }, { "Network", NULL } }, + { "HamRadio", FALSE, FALSE, FALSE, { NULL }, { "Network", "Audio", NULL } }, + { "News", FALSE, FALSE, FALSE, { NULL }, { "Network", NULL } }, + { "P2P", FALSE, FALSE, FALSE, { NULL }, { "Network", NULL } }, + { "RemoteAccess", FALSE, FALSE, FALSE, { NULL }, { "Network", NULL } }, + { "Telephony", FALSE, FALSE, FALSE, { NULL }, { "Network", NULL } }, + { "TelephonyTools", FALSE, FALSE, FALSE, { NULL }, { "Utility", NULL } }, + { "VideoConference", FALSE, FALSE, FALSE, { NULL }, { "Network", NULL } }, + { "WebBrowser", FALSE, FALSE, FALSE, { NULL }, { "Network", NULL } }, + { "WebDevelopment", FALSE, FALSE, FALSE, { NULL }, { "Network", "Development", NULL } }, + { "Midi", FALSE, FALSE, FALSE, { NULL }, { "AudioVideo;Audio", NULL } }, + { "Mixer", FALSE, FALSE, FALSE, { NULL }, { "AudioVideo;Audio", NULL } }, + { "Sequencer", FALSE, FALSE, FALSE, { NULL }, { "AudioVideo;Audio", NULL } }, + { "Tuner", FALSE, FALSE, FALSE, { NULL }, { "AudioVideo;Audio", NULL } }, + { "TV", FALSE, FALSE, FALSE, { NULL }, { "AudioVideo;Video", NULL } }, + { "AudioVideoEditing", FALSE, FALSE, FALSE, { NULL }, { "Audio", "Video", "AudioVideo", NULL } }, + { "Player", FALSE, FALSE, FALSE, { NULL }, { "Audio", "Video", "AudioVideo", NULL } }, + { "Recorder", FALSE, FALSE, FALSE, { NULL }, { "Audio", "Video", "AudioVideo", NULL } }, + { "DiscBurning", FALSE, FALSE, FALSE, { NULL }, { "Audio", "Video", "AudioVideo", NULL } }, + { "ActionGame", FALSE, FALSE, FALSE, { NULL }, { "Game", NULL } }, + { "AdventureGame", FALSE, FALSE, FALSE, { NULL }, { "Game", NULL } }, + { "ArcadeGame", FALSE, FALSE, FALSE, { NULL }, { "Game", NULL } }, + { "BoardGame", FALSE, FALSE, FALSE, { NULL }, { "Game", NULL } }, + { "BlocksGame", FALSE, FALSE, FALSE, { NULL }, { "Game", NULL } }, + { "CardGame", FALSE, FALSE, FALSE, { NULL }, { "Game", NULL } }, + { "KidsGame", FALSE, FALSE, FALSE, { NULL }, { "Game", NULL } }, + { "LogicGame", FALSE, FALSE, FALSE, { NULL }, { "Game", NULL } }, + { "RolePlaying", FALSE, FALSE, FALSE, { NULL }, { "Game", NULL } }, + { "Shooter", FALSE, FALSE, FALSE, { NULL }, { "Game", NULL } }, + { "Simulation", FALSE, FALSE, FALSE, { NULL }, { "Game", NULL } }, + { "SportsGame", FALSE, FALSE, FALSE, { NULL }, { "Game", NULL } }, + { "StrategyGame", FALSE, FALSE, FALSE, { NULL }, { "Game", NULL } }, + { "Art", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } }, + { "Construction", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } }, + { "Music", FALSE, FALSE, FALSE, { NULL }, { "AudioVideo", "Education", NULL } }, + { "Languages", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } }, + { "ArtificialIntelligence", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } }, + { "Astronomy", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } }, + { "Biology", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } }, + { "Chemistry", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } }, + { "ComputerScience", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } }, + { "DataVisualization", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } }, + { "Economy", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } }, + { "Electricity", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } }, + { "Geography", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } }, + { "Geology", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } }, + { "Geoscience", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } }, + { "History", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } }, + { "Humanities", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } }, + { "ImageProcessing", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } }, + { "Literature", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } }, + { "Maps", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", "Utility", NULL } }, + { "Math", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } }, + { "NumericalAnalysis", FALSE, FALSE, FALSE, { NULL }, { "Education;Math", "Science;Math", NULL } }, + { "MedicalSoftware", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } }, + { "Physics", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } }, + { "Robotics", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } }, + { "Spirituality", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", "Utility", NULL } }, + { "Sports", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } }, + { "ParallelComputing", FALSE, FALSE, FALSE, { NULL }, { "Education;ComputerScience", "Science;ComputerScience", NULL } }, + { "Amusement", FALSE, FALSE, FALSE, { NULL }, { NULL } }, + { "Archiving", FALSE, FALSE, FALSE, { NULL }, { "Utility", NULL } }, + { "Compression", FALSE, FALSE, FALSE, { NULL }, { "Utility;Archiving", NULL } }, + { "Electronics", FALSE, FALSE, FALSE, { NULL }, { NULL } }, + { "Emulator", FALSE, FALSE, FALSE, { NULL }, { "System", "Game", NULL } }, + { "Engineering", FALSE, FALSE, FALSE, { NULL }, { NULL } }, + { "FileTools", FALSE, FALSE, FALSE, { NULL }, { "Utility", "System", NULL } }, + { "FileManager", FALSE, FALSE, FALSE, { NULL }, { "System;FileTools", NULL } }, + { "TerminalEmulator", FALSE, FALSE, FALSE, { NULL }, { "System", NULL } }, + { "Filesystem", FALSE, FALSE, FALSE, { NULL }, { "System", NULL } }, + { "Monitor", FALSE, FALSE, FALSE, { NULL }, { "System", "Network", NULL } }, + { "Security", FALSE, FALSE, FALSE, { NULL }, { "Settings", "System", NULL } }, + { "Accessibility", FALSE, FALSE, FALSE, { NULL }, { "Settings", "Utility", NULL } }, + { "Calculator", FALSE, FALSE, FALSE, { NULL }, { "Utility", NULL } }, + { "Clock", FALSE, FALSE, FALSE, { NULL }, { "Utility", NULL } }, + { "TextEditor", FALSE, FALSE, FALSE, { NULL }, { "Utility", NULL } }, + { "Documentation", FALSE, FALSE, FALSE, { NULL }, { NULL } }, + { "Adult", FALSE, FALSE, FALSE, { NULL }, { NULL } }, + { "Core", FALSE, FALSE, FALSE, { NULL }, { NULL } }, + { "KDE", FALSE, FALSE, FALSE, { NULL }, { "Qt", NULL } }, + { "GNOME", FALSE, FALSE, FALSE, { NULL }, { "GTK", NULL } }, + { "XFCE", FALSE, FALSE, FALSE, { NULL }, { "GTK", NULL } }, + { "GTK", FALSE, FALSE, FALSE, { NULL }, { NULL } }, + { "Qt", FALSE, FALSE, FALSE, { NULL }, { NULL } }, + { "Motif", FALSE, FALSE, FALSE, { NULL }, { NULL } }, + { "Java", FALSE, FALSE, FALSE, { NULL }, { NULL } }, + { "ConsoleOnly", FALSE, FALSE, FALSE, { NULL }, { NULL } }, + { "Screensaver", FALSE, TRUE, FALSE, { NULL }, { NULL } }, + { "TrayIcon", FALSE, TRUE, FALSE, { NULL }, { NULL } }, + { "Applet", FALSE, TRUE, FALSE, { NULL }, { NULL } }, + { "Shell", FALSE, TRUE, FALSE, { NULL }, { NULL } }, + { "Application", FALSE, FALSE, TRUE, { NULL }, { NULL } }, + { "Applications", FALSE, FALSE, TRUE, { NULL }, { NULL } } }; static void @@ -565,6 +584,26 @@ g_free (str); } +static void +print_hint (kf_validator *kf, const char *format, ...) +{ + va_list args; + gchar *str; + + g_return_if_fail (kf != NULL && format != NULL); + + if (kf->no_hints) + return; + + va_start (args, format); + str = g_strdup_vprintf (format, args); + va_end (args); + + g_print ("%s: hint: %s", kf->filename, str); + + g_free (str); +} + /* + Key names must contain only the characters A-Za-z0-9-. * Checked. */ @@ -1021,11 +1060,12 @@ if (g_str_has_suffix (value, ".png") || g_str_has_suffix (value, ".xpm") || g_str_has_suffix (value, ".svg")) { - print_future_fatal (kf, "value \"%s\" for key \"%s\" in group \"%s\" is an icon " - "name with an extension, but there should be no extension " - "as described in the Icon Theme Specification if the " - "value is not an absolute path\n", - value, locale_key, kf->current_group); + print_future_fatal (kf, "value \"%s\" for key \"%s\" in group \"%s\" is an " + "icon name with an extension, but there should be " + "no extension as described in the Icon Theme " + "Specification if the value is not an absolute " + "path\n", + value, locale_key, kf->current_group); return FALSE; } @@ -1428,10 +1468,10 @@ break; case MU_INVALID: print_future_fatal (kf, "value \"%s\" for key \"%s\" in group \"%s\" " - "contains value \"%s\" which is an invalid MIME " - "type: %s\n", - value, locale_key, kf->current_group, - types[i], valid_error); + "contains value \"%s\" which is an invalid " + "MIME type: %s\n", + value, locale_key, kf->current_group, + types[i], valid_error); retval = FALSE; g_free (valid_error); @@ -1462,12 +1502,19 @@ * FIXME: it's not really deprecated, so the error message is wrong * + All categories extending the format should start with "X-". * Checked. - * + At least one main category must be included. + * + Using multiple main categories may lead to appearing more than once in + * application menu. + * Checked. + * + One main category should be included, otherwise application will appear in + * "catch-all" section of application menu. * Checked. * FIXME: decide if it's okay to have an empty list of categories. - * + Some categories, if include, require that another category is included. - * Eg: if Audio is there, AudioVideo must be there. Same for most additional - * categories. + * + Some categories, if included, require that another category is included. + * Eg: if Audio is there, AudioVideo must be there. + * Checked. + * + Some categories, if included, suggest that another category is included. + * Eg: Debugger suggests Development. + * This is the case for most additional categories. * Checked. */ static gboolean @@ -1480,7 +1527,7 @@ GHashTable *hashtable; int i; unsigned int j; - gboolean main_category_present; + int main_categories_nb; handle_key_for_application (kf, locale_key, value); @@ -1514,7 +1561,7 @@ } /* second pass */ - main_category_present = FALSE; + main_categories_nb = 0; for (i = 0; categories[i]; i++) { unsigned int k; @@ -1541,8 +1588,57 @@ continue; } - if (registered_categories[j].main) - main_category_present = TRUE; + if (registered_categories[j].main) { + /* only count it as a main category if none of the required categories + * for this one is also a main category (and is present) */ + gboolean required_main_category_present = FALSE; + + for (k = 0; registered_categories[j].requires[k] != NULL; k++) { + char **required_categories; + int l; + + required_categories = g_strsplit (registered_categories[j].requires[k], + ";", 0); + + for (l = 0; required_categories[l]; l++) { + unsigned int m; + + if (!g_hash_table_lookup (hashtable, required_categories[l])) + continue; + + for (m = 0; m < G_N_ELEMENTS (registered_categories); m++) { + if (strcmp (required_categories[l], + registered_categories[m].name) != 0) + continue; + + if (registered_categories[m].main) + required_main_category_present = TRUE; + + break; + } + + if (required_main_category_present) + break; + } + + if (required_main_category_present) { + g_strfreev (required_categories); + break; + } + + g_strfreev (required_categories); + } + + if (!required_main_category_present) + main_categories_nb++; + } + + if (registered_categories[j].main && main_categories_nb > 1) + print_hint (kf, "value \"%s\" for key \"%s\" in group \"%s\" " + "contains more than one main category; application " + "might appear more than once in the application menu\n", + value, locale_key, kf->current_group); + if (registered_categories[j].deprecated) { if (!kf->no_deprecated_warnings) @@ -1554,7 +1650,7 @@ if (registered_categories[j].require_only_show_in) { if (!g_hash_table_lookup (kf->current_keys, "OnlyShowIn")) { - print_fatal (kf, "value \"%s\" in key \"%s\" in group \"%s\" " + print_fatal (kf, "value item \"%s\" in key \"%s\" in group \"%s\" " "is a reserved category, so a \"OnlyShowIn\" key " "must be included\n", categories[i], locale_key, kf->current_group); @@ -1562,6 +1658,8 @@ } } + /* required categories */ + for (k = 0; registered_categories[j].requires[k] != NULL; k++) { char **required_categories; int l; @@ -1584,7 +1682,9 @@ g_strfreev (required_categories); } - /* there was a required category and it wasn't found */ + /* we've reached the end of a non-empty set of required categories; this + * means none of the possible required category (or list of required + * categories) was found */ if (k != 0 && registered_categories[j].requires[k] == NULL) { GString *output_required; @@ -1593,27 +1693,73 @@ g_string_append_printf (output_required, ", or %s", registered_categories[j].requires[k]); - print_future_fatal (kf, "value \"%s\" in key \"%s\" in group \"%s\" " - "requires another category to be present among the " - "following categories: %s\n", - categories[i], locale_key, kf->current_group, - output_required->str); + print_future_fatal (kf, "value item \"%s\" in key \"%s\" in group \"%s\" " + "requires another category to be present among " + "the following categories: %s\n", + categories[i], locale_key, kf->current_group, + output_required->str); g_string_free (output_required, TRUE); retval = FALSE; } + /* suggested categories */ + + for (k = 0; registered_categories[j].suggests[k] != NULL; k++) { + char **suggested_categories; + int l; + + suggested_categories = g_strsplit (registered_categories[j].suggests[k], + ";", 0); + + for (l = 0; suggested_categories[l]; l++) { + if (!g_hash_table_lookup (hashtable, suggested_categories[l])) + break; + } + + /* we've reached the end of a list of suggested categories, so + * the condition is satisfied */ + if (suggested_categories[l] == NULL) { + g_strfreev (suggested_categories); + break; + } + + g_strfreev (suggested_categories); + } + + /* we've reached the end of a non-empty set of suggested categories; this + * means none of the possible suggested category (or list of suggested + * categories) was found */ + if (k != 0 && registered_categories[j].suggests[k] == NULL) { + GString *output_suggested; + + output_suggested = g_string_new (registered_categories[j].suggests[0]); + for (k = 1; registered_categories[j].suggests[k] != NULL; k++) + g_string_append_printf (output_suggested, ", or %s", + registered_categories[j].suggests[k]); + + print_hint (kf, "value item \"%s\" in key \"%s\" in group \"%s\" " + "can be extended with another category among the " + "following categories: %s\n", + categories[i], locale_key, kf->current_group, + output_suggested->str); + + g_string_free (output_suggested, TRUE); + } + } g_strfreev (categories); g_hash_table_destroy (hashtable); - if (!main_category_present) { - print_future_fatal (kf, "value \"%s\" for key \"%s\" in group \"%s\" " - "does not contain a registered main category\n", - value, locale_key, kf->current_group, categories[i]); - retval = FALSE; - } + g_assert (main_categories_nb >= 0); + + if (main_categories_nb == 0) + print_hint (kf, "value \"%s\" for key \"%s\" in group \"%s\" " + "does not contain a registered main category; application " + "might only show up in a \"catch-all\" section of the " + "application menu\n", + value, locale_key, kf->current_group); return retval; } @@ -1740,6 +1886,7 @@ * - if-exists FILE * - unless-exists FILE * - DESKTOP-ENVIRONMENT-NAME [DESKTOP-SPECIFIC-TEST] + * - other known conditions (GNOME3, GSettings, etc.) * Checked. * + FILE must be a path to a filename, relative to $XDG_CONFIG_HOME. * Checked. @@ -1801,9 +1948,124 @@ value, locale_key, kf->current_group, argument); } + } else if (strncmp (condition, "X-", 2) == 0) { + if (argument && argument[0] == '\0') + print_warning (kf, "value \"%s\" for key \"%s\" in group \"%s\" " + "has trailing space(s)\n", + value, locale_key, kf->current_group); } else { - if (strncmp (condition, "X-", 2)) { - unsigned int i; + unsigned int i; + unsigned int j; + + /* Look if it's a registered AutostartCondition */ + + for (i = 0; i < G_N_ELEMENTS (registered_autostart_condition); i++) { + + if (strcmp (condition, registered_autostart_condition[i].name) != 0) + continue; + + /* check if first argument is one of the expected ones */ + for (j = 0; registered_autostart_condition[i].first_arg[j] != NULL; j++) { + const char *first = registered_autostart_condition[i].first_arg[j]; + char *after_first = argument; + + if (argument && !strncmp (argument, first, strlen (first))) { + after_first += strlen (first); + if (after_first[0] == '\0' || after_first[0] == ' ') { + /* find next argument */ + argument = after_first; + while (*argument == ' ') + argument++; + } + + break; + } + } + + /* we've reached the end of a non-empty set of first arguments; this + * means none of the possible first arguments was found */ + if (j != 0 && registered_autostart_condition[i].first_arg[j] == NULL) { + GString *output; + + output = g_string_new (registered_autostart_condition[i].first_arg[0]); + for (j = 1; registered_autostart_condition[i].first_arg[j] != NULL; j++) + g_string_append_printf (output, ", or %s", + registered_autostart_condition[i].first_arg[j]); + + print_fatal (kf, "value \"%s\" for key \"%s\" in group \"%s\" " + "does not contain a valid first argument for " + "condition \"%s\"; valid first arguments are: %s\n", + value, locale_key, kf->current_group, + condition, output->str); + retval = FALSE; + + g_string_free (output, TRUE); + + } else { + + switch (registered_autostart_condition[i].additional_args) { + case 0: + if (argument && argument[0] != '\0') { + print_fatal (kf, "value \"%s\" for key \"%s\" in group \"%s\" " + "has too many arguments for condition \"%s\"\n", + value, locale_key, kf->current_group, condition); + retval = FALSE; + } + break; + + case 1: + /* we handle the "one argument" case specially, as spaces might be + * normal there, and therefore we don't want to split the string + * based on spaces */ + if (!argument || argument[0] == '\0') { + print_fatal (kf, "value \"%s\" for key \"%s\" in group \"%s\" " + "is missing a last argument for condition " + "\"%s\"\n", + value, locale_key, kf->current_group, condition); + retval = FALSE; + } + break; + + default: + { + int argc_diff = -registered_autostart_condition[i].additional_args; + + while (argument && argument[0] != '\0') { + argc_diff++; + argument = g_utf8_strchr (argument, -1, ' '); + while (argument && *argument == ' ') + argument++; + } + + if (argc_diff > 0) { + print_fatal (kf, "value \"%s\" for key \"%s\" in group \"%s\" " + "has %d too many arguments for condition " + "\"%s\"\n", + value, locale_key, kf->current_group, + argc_diff, condition); + retval = FALSE; + } else if (argc_diff < 0) { + print_fatal (kf, "value \"%s\" for key \"%s\" in group \"%s\" " + "has %d too few arguments for condition " + "\"%s\"\n", + value, locale_key, kf->current_group, + -argc_diff, condition); + retval = FALSE; + } + } + break; + } + + } + + break; + + } + + /* Now, if we didn't find condition in list of registered + * AutostartCondition... */ + if (i == G_N_ELEMENTS (registered_autostart_condition)) { + /* Accept conditions with same name as OnlyShowIn values */ for (i = 0; i < G_N_ELEMENTS (show_in_registered); i++) { if (!strcmp (condition, show_in_registered[i])) @@ -1818,12 +2080,11 @@ value, locale_key, kf->current_group, condition); retval = FALSE; } - } - if (argument && argument[0] == '\0') { - print_warning (kf, "value \"%s\" for key \"%s\" in group \"%s\" " - "has trailing space(s)\n", - value, locale_key, kf->current_group); + if (argument && argument[0] == '\0') + print_warning (kf, "value \"%s\" for key \"%s\" in group \"%s\" " + "has trailing space(s)\n", + value, locale_key, kf->current_group); } } @@ -2778,7 +3039,8 @@ gboolean desktop_file_validate (const char *filename, gboolean warn_kde, - gboolean no_warn_deprecated) + gboolean no_warn_deprecated, + gboolean no_hints) { kf_validator kf; @@ -2795,6 +3057,7 @@ kf.current_keys = NULL; kf.kde_reserved_warnings = warn_kde; kf.no_deprecated_warnings = no_warn_deprecated; + kf.no_hints = no_hints; kf.main_group = NULL; kf.type = INVALID_TYPE; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/desktop-file-utils-0.20/src/validate.h new/desktop-file-utils-0.21/src/validate.h --- old/desktop-file-utils-0.20/src/validate.h 2010-03-19 11:55:41.000000000 +0100 +++ new/desktop-file-utils-0.21/src/validate.h 2012-10-03 13:02:22.000000000 +0200 @@ -34,7 +34,8 @@ gboolean desktop_file_validate (const char *filename, gboolean warn_kde, - gboolean no_warn_deprecated); + gboolean no_warn_deprecated, + gboolean no_hints); gboolean desktop_file_fixup (GKeyFile *keyfile, const char *filename); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/desktop-file-utils-0.20/src/validator.c new/desktop-file-utils-0.21/src/validator.c --- old/desktop-file-utils-0.20/src/validator.c 2010-09-10 02:31:04.000000000 +0200 +++ new/desktop-file-utils-0.21/src/validator.c 2012-10-03 13:02:22.000000000 +0200 @@ -29,10 +29,12 @@ #include "validate.h" static gboolean warn_kde = FALSE; +static gboolean no_hints = FALSE; static gboolean no_warn_deprecated = FALSE; static char **filename = NULL; static GOptionEntry option_entries[] = { + { "no-hints", 0, 0, G_OPTION_ARG_NONE, &no_hints, "Do not output hints to improve desktop file", NULL }, { "no-warn-deprecated", 0, 0, G_OPTION_ARG_NONE, &no_warn_deprecated, "Do not warn about usage of deprecated items", NULL }, { "warn-kde", 0, 0, G_OPTION_ARG_NONE, &warn_kde, "Warn about usage of KDE extensions to the specification", NULL }, { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &filename, NULL, "<desktop-file>" }, @@ -75,7 +77,7 @@ return 1; } - if (desktop_file_validate (filename[0], warn_kde, no_warn_deprecated)) + if (desktop_file_validate (filename[0], warn_kde, no_warn_deprecated, no_hints)) return 0; else return 1; ++++++ rpmlint-deps.txt ++++++ --- /var/tmp/diff_new_pack.m9tATW/_old 2013-06-29 14:51:37.000000000 +0200 +++ /var/tmp/diff_new_pack.m9tATW/_new 2013-06-29 14:51:37.000000000 +0200 @@ -13,6 +13,7 @@ commandsmodule.so commands.pyo commands.so +ConfigParser.pyo copy.pyo copy_regmodule.so copy_reg.pyo -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rpmlint for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '13

29 Jun '13

Hello community, here is the log from the commit of package rpmlint for openSUSE:Factory checked in at 2013-06-29 14:51:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rpmlint (Old) and /work/SRC/openSUSE:Factory/.rpmlint.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rpmlint" Changes: -------- --- /work/SRC/openSUSE:Factory/rpmlint/rpmlint.changes 2013-06-13 22:15:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rpmlint.new/rpmlint.changes 2013-06-29 14:51:25.000000000 +0200 @@ -1,0 +2,11 @@ +Fri Jun 28 16:06:43 UTC 2013 - dmueller(a)suse.com + +- drop outdated Update-alternatives check (bnc#826993) +- add basic new update-alternatives check + +------------------------------------------------------------------- +Fri Jun 21 14:05:53 UTC 2013 - nkrinner(a)suse.com + +- Add 'chef' to standard users and groups + +------------------------------------------------------------------- @@ -15,0 +27,8 @@ +------------------------------------------------------------------- +Tue May 28 12:10:33 UTC 2013 - dmueller(a)suse.com + +- update to 1.5: + * New Homepage + * Plenty of new checks +- add compressed-backup-regex.diff +- remove python3_magic_number_fix.diff Old: ---- python3_magic_number_fix.diff rpmlint-1.4.tar.xz New: ---- compressed-backup-regex.diff rpmlint-1.5.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpmlint.spec ++++++ --- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:27.000000000 +0200 +++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:27.000000000 +0200 @@ -25,9 +25,9 @@ Summary: Rpm correctness checker License: GPL-2.0+ Group: System/Packages -Version: 1.4 +Version: 1.5 Release: 0 -Source0: http://rpmlint.zarb.org/download/rpmlint-%{version}.tar.xz +Source0: https://downloads.sourceforge.net/project/rpmlint/rpmlint-%{version}.tar.xz Source1: rpmlint-checks-master.tar.gz Source2: config Source3: config.in @@ -35,7 +35,7 @@ Source11: pie.config Source12: licenses.config Source100: syntax-validator.py -Url: http://rpmlint.zarb.org/ +Url: https://sourceforge.net/projects/rpmlint/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: /usr/bin/readelf Requires: bash @@ -114,10 +114,10 @@ Patch84: extend-suse-conffiles-check.diff Patch85: suse-changelog.patch Patch86: suse-rclink-check.diff +Patch87: compressed-backup-regex.diff # accepted upstream Patch88: suse-speccheck-utf8.diff Patch89: suse-python-abi-check.diff -Patch90: python3_magic_number_fix.diff # PATCH-FIX-OPENSUSE: saschpe(a)suse.de - Don't complain about missing man-pages for rc-scripts Patch91: suse-manpages-for-rc-scripts.patch @@ -191,10 +191,9 @@ %patch84 %patch85 %patch86 -#patch87 -p1 +%patch87 %patch88 %patch89 -%patch90 %patch91 -p1 cp -p %{SOURCE2} . # Only move top-level python files ++++++ add-weak-dependencies.diff ++++++ --- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200 +++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- Pkg.py.orig +++ Pkg.py -@@ -426,6 +426,10 @@ class Pkg: +@@ -424,6 +424,10 @@ class Pkg: self._missingok_files = None self._files = None self._requires = None @@ -13,7 +13,7 @@ self._req_names = -1 if header: -@@ -673,6 +677,22 @@ class Pkg: +@@ -670,6 +674,22 @@ class Pkg: self._gatherDepInfo() return self._requires @@ -36,7 +36,7 @@ def prereq(self): """Get package PreReqs as list of (name, flags, (epoch, version, release)) tuples.""" -@@ -709,7 +729,7 @@ class Pkg: +@@ -706,7 +726,7 @@ class Pkg: # internal function to gather dependency info used by the above ones def _gather_aux(self, header, list, nametag, flagstag, versiontag, @@ -45,7 +45,7 @@ names = header[nametag] flags = header[flagstag] versions = header[versiontag] -@@ -720,7 +740,11 @@ class Pkg: +@@ -717,7 +737,11 @@ class Pkg: if prereq is not None and flags[loop] & PREREQ_FLAG: prereq.append((names[loop], flags[loop] & (~PREREQ_FLAG), evr)) @@ -58,7 +58,7 @@ list.append((names[loop], flags[loop], evr)) def _gatherDepInfo(self): -@@ -730,6 +754,10 @@ class Pkg: +@@ -727,6 +751,10 @@ class Pkg: self._provides = [] self._conflicts = [] self._obsoletes = [] @@ -69,7 +69,7 @@ self._gather_aux(self.header, self._requires, rpm.RPMTAG_REQUIRENAME, -@@ -748,6 +776,30 @@ class Pkg: +@@ -745,6 +773,30 @@ class Pkg: rpm.RPMTAG_OBSOLETENAME, rpm.RPMTAG_OBSOLETEFLAGS, rpm.RPMTAG_OBSOLETEVERSION) @@ -100,7 +100,7 @@ def scriptprog(self, which): """Get the specified script interpreter as a string. -@@ -761,6 +813,7 @@ class Pkg: +@@ -758,6 +810,7 @@ class Pkg: prog = " ".join(prog) return prog ++++++ avoid-mismatched-libregex.diff ++++++ --- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200 +++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- FilesCheck.py.orig +++ FilesCheck.py -@@ -654,7 +654,7 @@ buildconfig_rpath_regex = re.compile('(? +@@ -607,7 +607,7 @@ buildconfig_rpath_regex = re.compile('(? sofile_regex = re.compile('/lib(64)?/(.+/)?lib[^/]+\.so$') devel_regex = re.compile('(.*)-(debug(info)?|devel|headers|source|static)$') debuginfo_package_regex = re.compile('-debug(info)?$') ++++++ better-wrong-script.diff ++++++ --- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200 +++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- FilesCheck.py.orig +++ FilesCheck.py -@@ -1697,7 +1697,10 @@ executed.''', +@@ -1667,7 +1667,10 @@ executed.''', executed.''', 'wrong-script-interpreter', ++++++ buildroot-doc.diff ++++++ --- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200 +++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- SpecCheck.py.orig +++ SpecCheck.py -@@ -631,7 +631,7 @@ versions you can ignore this warning.''' +@@ -647,7 +647,7 @@ versions you can ignore this warning.''' 'hardcoded-path-in-buildroot-tag', '''A path is hardcoded in your Buildroot tag. It should be replaced ++++++ buildroot-in-scripts.diff ++++++ --- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200 +++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- SpecCheck.py.orig +++ SpecCheck.py -@@ -224,7 +224,9 @@ class SpecCheck(AbstractCheck.AbstractCh +@@ -234,7 +234,9 @@ class SpecCheck(AbstractCheck.AbstractCh continue ++++++ compressed-backup-regex.diff ++++++ Index: FilesCheck.py =================================================================== --- FilesCheck.py.orig +++ FilesCheck.py @@ -591,7 +591,7 @@ DEFAULT_STANDARD_GROUPS = ('root', 'bin' tmp_regex = re.compile('^(/var|/usr)?/tmp/') sub_bin_regex = re.compile('^(/usr)?/s?bin/\S+/') -backup_regex = re.compile('(~|\#[^/]+\#|\.orig|\.rej)$') +backup_regex = re.compile('(~|\#[^/]+\#|\.orig|\.orig\.gz|\.rej)$') compr_regex = re.compile('\.(gz|z|Z|zip|bz2|lzma|xz)$') absolute_regex = re.compile('^/([^/]+)') absolute2_regex = re.compile('^/?([^/]+)') ++++++ config ++++++ --- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200 +++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200 @@ -34,7 +34,7 @@ addCheck("CheckFilelist") addCheck("CheckKDE4Deps") addCheck("KMPPolicyCheck") -addCheck("CheckAlternativesGhostFiles") +addCheck("CheckUpdateAlternatives") addCheck("BashismsCheck") addCheck("CheckBuildDate") addCheck("CheckLogrotate") @@ -78,6 +78,7 @@ 'bin', 'casaauth', 'cdrom', + 'chef', 'citadel', 'colord', 'console', @@ -218,6 +219,7 @@ 'casaatsd', 'casaatvd', 'casaauth', + 'chef', 'citadel', 'cntlm', 'colord', ++++++ confusing-invalid-spec-name.patch ++++++ --- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200 +++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200 @@ -1,10 +1,10 @@ # Confusing message. The problem is not that the file does not end # with ".spec", but that there is a mismatch of specname and pkg name. -Index: rpmlint-1.4/SpecCheck.py +Index: rpmlint-1.5/SpecCheck.py =================================================================== ---- rpmlint-1.4.orig/SpecCheck.py -+++ rpmlint-1.4/SpecCheck.py -@@ -605,8 +605,8 @@ addDetails( +--- rpmlint-1.5.orig/SpecCheck.py ++++ rpmlint-1.5/SpecCheck.py +@@ -621,8 +621,8 @@ addDetails( SPEC file to build a valid RPM package.''', 'invalid-spec-name', ++++++ description-check.diff ++++++ --- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200 +++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- TagsCheck.py.orig +++ TagsCheck.py -@@ -704,6 +704,9 @@ class TagsCheck(AbstractCheck.AbstractCh +@@ -705,6 +705,9 @@ class TagsCheck(AbstractCheck.AbstractCh if not description: printError(pkg, 'no-description-tag') else: @@ -12,7 +12,7 @@ if not pkg[rpm.RPMTAG_HEADERI18NTABLE]: self._unexpanded_macros(pkg, '%description', description) else: -@@ -987,6 +990,10 @@ Name tag.''', +@@ -988,6 +991,10 @@ Name tag.''', '''The major number of the library isn't included in the package's name. ''', ++++++ devel-provide-is-devel-package.diff ++++++ --- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200 +++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- FilesCheck.py.orig +++ FilesCheck.py -@@ -842,6 +842,10 @@ class FilesCheck(AbstractCheck.AbstractC +@@ -806,6 +806,10 @@ class FilesCheck(AbstractCheck.AbstractC # Check if the package is a development package devel_pkg = devel_regex.search(pkg.name) ++++++ docdata-examples.diff ++++++ --- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200 +++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- FilesCheck.py.orig +++ FilesCheck.py -@@ -648,6 +648,7 @@ bin_regex = re.compile('^/(?:usr/(?:s?bi +@@ -601,6 +601,7 @@ bin_regex = re.compile('^/(?:usr/(?:s?bi includefile_regex = re.compile('\.(c|h)(pp|xx)?$', re.IGNORECASE) develfile_regex = re.compile('\.(a|cmxa?|mli?)$') buildconfigfile_regex = re.compile('(\.pc|/bin/.+-config)$') @@ -10,7 +10,7 @@ # room for improvement with catching more -R, but also for false positives... buildconfig_rpath_regex = re.compile('(?:-rpath|Wl,-R)\\b') sofile_regex = re.compile('/lib(64)?/(.+/)?lib[^/]+\.so$') -@@ -1199,7 +1200,7 @@ class FilesCheck(AbstractCheck.AbstractC +@@ -1158,7 +1159,7 @@ class FilesCheck(AbstractCheck.AbstractC includefile_regex.search(f) or \ develfile_regex.search(f) or \ logrotate_regex.search(f) @@ -19,7 +19,7 @@ printWarning(pkg, 'spurious-executable-perm', f) elif f.startswith('/etc/') and f not in config_files and \ f not in ghost_files: -@@ -1571,7 +1572,10 @@ included in your package.''', +@@ -1541,7 +1542,10 @@ included in your package.''', 'spurious-executable-perm', '''The file is installed with executable permissions, but was identified as one that probably should not be executable. Verify if the executable bits are ++++++ extend-suse-conffiles-check.diff ++++++ --- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200 +++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- FilesCheck.py.orig +++ FilesCheck.py -@@ -1217,7 +1217,7 @@ class FilesCheck(AbstractCheck.AbstractC +@@ -1176,7 +1176,7 @@ class FilesCheck(AbstractCheck.AbstractC if nonexec_file and not docdir_examples_regex.search(f): printWarning(pkg, 'spurious-executable-perm', f) elif f.startswith('/etc/') and f not in config_files and \ ++++++ filename-non-utf8-exception.diff ++++++ --- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200 +++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200 @@ -1,6 +1,8 @@ ---- Filter.py +Index: Filter.py +=================================================================== +--- Filter.py.orig +++ Filter.py -@@ -24,12 +24,8 @@ +@@ -23,14 +23,8 @@ _diagnostic = list() _badness_score = 0 printed_messages = { "I": 0, "W": 0, "E": 0 } @@ -9,7 +11,9 @@ - print(s) -else: - def __print(s): -- print(s.encode(locale.getpreferredencoding(), "replace")) +- if isinstance(s, unicode): +- s = s.encode(locale.getpreferredencoding(), "replace") +- print(s) +def __print(s): + print(s) ++++++ invalid-filerequires.diff ++++++ --- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200 +++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- TagsCheck.py.orig +++ TagsCheck.py -@@ -421,6 +421,7 @@ invalid_version_regex = re.compile('([0- +@@ -420,6 +420,7 @@ invalid_version_regex = re.compile('([0- # () are here for grouping purpose in the regexp forbidden_words_regex = re.compile('(' + Config.getOption('ForbiddenWords') + ')', re.IGNORECASE) valid_buildhost_regex = re.compile(Config.getOption('ValidBuildHost')) @@ -10,17 +10,17 @@ use_epoch = Config.getOption('UseEpoch', False) use_utf8 = Config.getOption('UseUTF8', Config.USEUTF8_DEFAULT) max_line_len = Config.getOption('MaxLineLength', 79) -@@ -603,6 +604,9 @@ class TagsCheck(AbstractCheck.AbstractCh +@@ -602,6 +603,9 @@ class TagsCheck(AbstractCheck.AbstractCh if d[0].startswith('/usr/local/'): printError(pkg, 'invalid-dependency', d[0]) + if d[0].startswith('/') and not valid_filedep_regex.search(d[0]): + printWarning(pkg, 'invalid-filepath-dependency', d[0]) + - if not devel_depend and not is_devel and not is_source and \ - FilesCheck.devel_regex.search(d[0]): - printError(pkg, 'devel-dependency', d[0]) -@@ -1089,6 +1093,12 @@ explicit Requires: tags.''', + if is_source: + if lib_devel_number_regex.search(d[0]): + printError(pkg, 'invalid-build-requires', d[0]) +@@ -1090,6 +1094,12 @@ explicit Requires: tags.''', '''This package provides 2 times the same capacity. It should only provide it once.''', ++++++ libtool-wrapper-check.diff ++++++ --- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200 +++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200 @@ -2,12 +2,12 @@ =================================================================== --- BinariesCheck.py.orig +++ BinariesCheck.py -@@ -253,8 +253,19 @@ class BinariesCheck(AbstractCheck.Abstra - is_elf = 'ELF' in pkgfile.magic +@@ -309,8 +309,19 @@ class BinariesCheck(AbstractCheck.Abstra is_ar = 'current ar archive' in pkgfile.magic is_ocaml_native = 'Objective caml native' in pkgfile.magic + is_lua_bytecode = 'Lua bytecode' in pkgfile.magic + is_shell = "shell script" in pkgfile.magic - is_binary = is_elf or is_ar or is_ocaml_native + is_binary = is_elf or is_ar or is_ocaml_native or is_lua_bytecode + if is_shell: + count= 0 @@ -22,7 +22,7 @@ if not is_binary: if reference_regex.search(fname): lines = pkg.grep(invalid_dir_ref_regex, fname) -@@ -502,6 +513,15 @@ recompiled separately from the static li +@@ -568,6 +579,15 @@ recompiled separately from the static li Another common mistake that causes this problem is linking with ``gcc -Wl,-shared'' instead of ``gcc -shared''.''', ++++++ no-badness-return.diff ++++++ --- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200 +++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- Filter.py.orig +++ Filter.py -@@ -112,7 +112,7 @@ def printAllReasons(): +@@ -113,7 +113,7 @@ def printAllReasons(): if len(last_reason): printDescriptions(last_reason) last_reason = reason @@ -15,7 +15,7 @@ =================================================================== --- rpmlint.orig +++ rpmlint -@@ -212,7 +212,7 @@ def main(): +@@ -211,7 +211,7 @@ def main(): % (packages_checked, specfiles_checked, printed_messages["E"], printed_messages["W"]) ++++++ no-doc-for-lib.diff ++++++ --- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200 +++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- FilesCheck.py.orig +++ FilesCheck.py -@@ -859,7 +859,7 @@ class FilesCheck(AbstractCheck.AbstractC +@@ -823,7 +823,7 @@ class FilesCheck(AbstractCheck.AbstractC debuginfo_srcs = False debuginfo_debugs = False ++++++ noarch-lib64.diff ++++++ --- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200 +++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- BinariesCheck.py.orig +++ BinariesCheck.py -@@ -234,6 +234,7 @@ class BinariesCheck(AbstractCheck.Abstra +@@ -289,6 +289,7 @@ class BinariesCheck(AbstractCheck.Abstra binary = False binary_in_usr_lib = False has_usr_lib_file = False @@ -10,7 +10,7 @@ multi_pkg = False res = srcname_regex.search(pkg[rpm.RPMTAG_SOURCERPM] or '') -@@ -250,6 +251,10 @@ class BinariesCheck(AbstractCheck.Abstra +@@ -305,6 +306,10 @@ class BinariesCheck(AbstractCheck.Abstra # only-non-binary-in-usr-lib false positives binary_in_usr_lib = True @@ -21,7 +21,7 @@ is_elf = 'ELF' in pkgfile.magic is_ar = 'current ar archive' in pkgfile.magic is_ocaml_native = 'Objective caml native' in pkgfile.magic -@@ -464,9 +469,12 @@ class BinariesCheck(AbstractCheck.Abstra +@@ -530,9 +535,12 @@ class BinariesCheck(AbstractCheck.Abstra if version and version != -1 and version not in pkg.name: printError(pkg, 'incoherent-version-in-name', version) @@ -35,7 +35,7 @@ if has_usr_lib_file and not binary_in_usr_lib: printWarning(pkg, 'only-non-binary-in-usr-lib') -@@ -490,6 +498,11 @@ FHS and the FSSTND forbid this.''', +@@ -556,6 +564,11 @@ FHS and the FSSTND forbid this.''', # 'non-sparc32-binary', # '', ++++++ only-reg-files-are-scripts.diff ++++++ --- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200 +++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- InitScriptCheck.py.orig +++ InitScriptCheck.py -@@ -18,7 +18,7 @@ from Filter import addDetails, printErro +@@ -17,7 +17,7 @@ from Filter import addDetails, printErro import AbstractCheck import Config import Pkg @@ -11,7 +11,7 @@ chkconfig_content_regex = re.compile('^\s*#\s*chkconfig:\s*([-0-9]+)\s+[-0-9]+\s+[-0-9]+') subsys_regex = re.compile('/var/lock/subsys/([^/"\'\n\s;&|]+)', re.MULTILINE) -@@ -64,6 +64,9 @@ class InitScriptCheck(AbstractCheck.Abst +@@ -63,6 +63,9 @@ class InitScriptCheck(AbstractCheck.Abst not fname.startswith('/etc/rc.d/init.d/'): continue ++++++ remove-expand-macros.diff ++++++ --- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200 +++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200 @@ -8,7 +8,7 @@ =================================================================== --- TagsCheck.py.orig +++ TagsCheck.py -@@ -433,15 +433,6 @@ so_dep_regex = re.compile(r'\.so(\.[0-9a +@@ -432,15 +432,6 @@ so_dep_regex = re.compile(r'\.so(\.[0-9a # we assume that no rpm packages existed before rpm itself existed... oldest_changelog_timestamp = calendar.timegm(time.strptime("1995-01-01", "%Y-%m-%d")) @@ -24,7 +24,7 @@ _enchant_checkers = {} def spell_check(pkg, str, fmt, lang, ignored): -@@ -856,30 +847,12 @@ class TagsCheck(AbstractCheck.AbstractCh +@@ -857,30 +848,12 @@ class TagsCheck(AbstractCheck.AbstractCh (apply(Pkg.formatRequire, obs), apply(Pkg.formatRequire, prov))) ++++++ rpmgroup-checks.diff ++++++ --- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200 +++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- TagsCheck.py.orig +++ TagsCheck.py -@@ -714,6 +714,8 @@ class TagsCheck(AbstractCheck.AbstractCh +@@ -715,6 +715,8 @@ class TagsCheck(AbstractCheck.AbstractCh self._unexpanded_macros(pkg, 'Group', group) if not group: printError(pkg, 'no-group-tag') @@ -11,7 +11,7 @@ elif VALID_GROUPS and group not in VALID_GROUPS: printWarning(pkg, 'non-standard-group', group) -@@ -1026,6 +1028,10 @@ won't fool the specfile parser, and rebu +@@ -1027,6 +1029,10 @@ won't fool the specfile parser, and rebu '''There is no Group tag in your package. You have to specify a valid group in your spec file using the Group tag.''', ++++++ rpmlint-1.4.tar.xz -> rpmlint-1.5.tar.xz ++++++ ++++ 19472 lines of diff (skipped) ++++++ rpmlint-checks-master.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmlint-checks-master/CheckAlternativesGhostFiles.py new/rpmlint-checks-master/CheckAlternativesGhostFiles.py --- old/rpmlint-checks-master/CheckAlternativesGhostFiles.py 2013-01-02 13:40:19.000000000 +0100 +++ new/rpmlint-checks-master/CheckAlternativesGhostFiles.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,85 +0,0 @@ -# vim:sw=4:et -############################################################################# -# File : CheckAlternativesGhostFiles.py -# Package : rpmlint -# Author : Michal Vyskocil -# Purpose : Check if files used by update-alternatives are marked as %ghost -############################################################################# - -from Filter import * -import AbstractCheck -import rpm - -class CheckAlternativesGhostFiles(AbstractCheck.AbstractCheck): - - INSTALL="--install" - SLAVE="--slave" - - def __init__(self): - AbstractCheck.AbstractCheck.__init__(self, "CheckAlternativesGhostFiles") - - @classmethod - def read_ghost_files(cls, script): - ghost_files = [] - - if not script or not 'update-alternatives' in script: - return ghost_files - - - for command in ( \ - c.replace('\\\n', '').strip() \ - for c in script.split('update-alternatives') \ - if cls.INSTALL in c): - - #parse install - command_args = [] - for arg in command.split(None): - if not arg.startswith("--"): - command_args.append(arg) - - ghost_files.append(command_args[0]) - - if cls.SLAVE in command: - for sc in ( \ - c.strip() \ - for c in command[command.index(cls.SLAVE):].split(cls.SLAVE) \ - if c.strip() != ''): - - xs = sc.split(None, 2) - ghost_files.append(xs[0]) - - return ghost_files - - def check(self, pkg): - - if pkg.isSource(): - return - - alt_files = [] - for script in (pkg.header[tag] for tag in (rpm.RPMTAG_POSTIN, rpm.RPMTAG_PREIN, rpm.RPMTAG_POSTTRANS)): - alt_files.extend(self.read_ghost_files(script)) - - files = pkg.files() - ghost_files = pkg.ghostFiles() - for af in (af for af in alt_files if not af in ghost_files): - if af in files: - printWarning(pkg, 'generic-name-not-marked-as-ghost %s' % (af)) - else: - printWarning(pkg, 'generic-name-not-in-filelist %s' % af) - - -check=CheckAlternativesGhostFiles() - -if Config.info: - addDetails( - -'generic-name-not-marked-as-ghost', -'''The update-alternatives generic name is not marked as a ghost in the %files section. -This causes problems during update. Mark it as a %ghost in %files section.''', - -'generic-name-not-in-filelist', -'''The update-alternatives generic name is not in a filelist of package. -Add it to list marked as %ghost. Note: this error will be raised, -if you use a hash ($) in file name, use rpm macros in spec file instead.''', - -) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmlint-checks-master/CheckUpdateAlternatives.py new/rpmlint-checks-master/CheckUpdateAlternatives.py --- old/rpmlint-checks-master/CheckUpdateAlternatives.py 1970-01-01 01:00:00.000000000 +0100 +++ new/rpmlint-checks-master/CheckUpdateAlternatives.py 2013-06-28 18:05:19.000000000 +0200 @@ -0,0 +1,123 @@ +# vim:sw=4:et +############################################################################# +# File : CheckUpdateAlternatives +# Package : rpmlint +# Author : SUSE Linux Products GmbH +# Purpose : Check if update-alternatives is used properly +############################################################################# + +from Filter import printWarning, addDetails, Config + +import AbstractCheck +import os +import rpm +import stat + + +class CheckUpdateAlternatives(AbstractCheck.AbstractCheck): + + """Check for compliance with SUSE's update-alternatives guidelines. + + See + http://en.opensuse.org/openSUSE:Packaging_Multiple_Version_guidelines + + """ + + INSTALL = "--install" + + def __init__(self): + AbstractCheck.AbstractCheck.__init__(self, "CheckUpdateAlternatives") + + @classmethod + def read_ghost_files(cls, script): + + if not script or not 'update-alternatives' in script: + return set() + + ghost_files = set() + + for command in ( + c.replace('\\\n', '').strip() + for c in script.split('update-alternatives') + if cls.INSTALL in c): + + #parse install + command_args = [] + for arg in command.split(None): + if not arg.startswith("--"): + command_args.append(arg) + + ghost_files.add(command_args[0]) + + SLAVE = "--slave" + + if SLAVE in command: + for sc in ( + c.strip() + for c in command[command.index(SLAVE):].split(SLAVE) + if c.strip() != ''): + + xs = sc.split(None, 2) + ghost_files.add(xs[0]) + + return ghost_files + + def check(self, pkg): + + if pkg.isSource(): + return + + alt_files = set() + for script in (pkg.header[tag] + for tag in (rpm.RPMTAG_POSTIN, + rpm.RPMTAG_PREIN, + rpm.RPMTAG_POSTTRANS)): + alt_files.update(self.read_ghost_files(script)) + + files = pkg.files() + ghost_files = pkg.ghostFiles() + + for af in alt_files: + # /etc/alternatives/$(basename) should be a ghost file + etc_alt_file = "/etc/alternatives/%s" % os.path.basename(af) + + if etc_alt_file not in files: + printWarning(pkg, + 'suse-alternative-link-missing', etc_alt_file) + elif etc_alt_file not in ghost_files: + printWarning(pkg, + 'suse-alternative-link-not-ghost', etc_alt_file) + + # generic-name should be a symlink to /etc/alternatives/$(basename) + if af not in files: + printWarning(pkg, + 'suse-alternative-generic-name-missing', af) + elif not stat.S_ISLNK(files[af].mode): + printWarning(pkg, + 'suse-alternative-generic-name-not-symlink', af) + + ### check that %post contains --install call + ### check that %preun contains --remove call + + +check = CheckUpdateAlternatives() + +if Config.info: + addDetails( +'suse-alternative-generic-name-not-symlink', +'''The update-alternative generic-name is not a symlink pointing to +%{_sysconfdir}/alternatives/$(basename generic-name). +''', + +'suse-alternative-link-not-ghost', +'''The %{_sysconfdir}/alternatives/$(basename generic-name) link exists but is +not marked as ghost. Mark it as %ghost.''', + +'suse-alternative-link-missing', +'''The file %{_sysconfdir}/alternatives/$(basename generic-name) is missing +in the file list. Mark it as %ghost and add it to the file list.''', + +'suse-alternative-generic-name-missing', +'''The update-alternatives generic name is not in the filelist. Create it as +a symlink to %{_sysconfdir}/alternatives/$(basename generic-name) and add it +to the file list.''') ++++++ rpmlint-pkg-quoting.diff ++++++ --- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200 +++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- Pkg.py.orig +++ Pkg.py -@@ -493,7 +493,7 @@ class Pkg: +@@ -490,7 +490,7 @@ class Pkg: dir = self.dirname) # TODO: better shell escaping or sequence based command invocation command_str = \ ++++++ rpmlint-suse.diff ++++++ --- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200 +++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200 @@ -15,7 +15,7 @@ =================================================================== --- I18NCheck.py.orig +++ I18NCheck.py -@@ -31,7 +31,7 @@ INCORRECT_LOCALES = { +@@ -30,7 +30,7 @@ INCORRECT_LOCALES = { 'en_UK': 'en_GB'} package_regex = re.compile('-(' + '|'.join(LANGUAGES) + ')$') ++++++ script-interpreter-only-for-exec-scripts.diff ++++++ --- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200 +++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- FilesCheck.py.orig +++ FilesCheck.py -@@ -1249,7 +1249,7 @@ class FilesCheck(AbstractCheck.AbstractC +@@ -1219,7 +1219,7 @@ class FilesCheck(AbstractCheck.AbstractC elif interpreter or mode & 0111 != 0 or \ script_regex.search(f): if interpreter: ++++++ selfconflicts-provide.diff ++++++ --- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200 +++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- TagsCheck.py.orig +++ TagsCheck.py -@@ -819,6 +819,7 @@ class TagsCheck(AbstractCheck.AbstractCh +@@ -820,6 +820,7 @@ class TagsCheck(AbstractCheck.AbstractCh obs_names = [x[0] for x in pkg.obsoletes()] prov_names = [x[0].split(':/')[0] for x in pkg.provides()] @@ -10,7 +10,7 @@ for o in (x for x in obs_names if x not in prov_names): printWarning(pkg, 'obsolete-not-provided', o) -@@ -830,6 +831,8 @@ class TagsCheck(AbstractCheck.AbstractCh +@@ -831,6 +832,8 @@ class TagsCheck(AbstractCheck.AbstractCh # https://bugzilla.redhat.com/460872 useless_provides = [] for p in prov_names: @@ -19,7 +19,7 @@ if prov_names.count(p) != 1 and p not in useless_provides: useless_provides.append(p) for p in useless_provides: -@@ -970,6 +973,10 @@ the Release tag.''', +@@ -971,6 +974,10 @@ the Release tag.''', '''There is no Name tag in your package. You have to specify a name using the Name tag.''', ++++++ sourced-dirs.diff ++++++ --- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200 +++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- FilesCheck.py.orig +++ FilesCheck.py -@@ -681,7 +681,7 @@ manifest_perl_regex = re.compile('^/usr/ +@@ -634,7 +634,7 @@ manifest_perl_regex = re.compile('^/usr/ shebang_regex = re.compile('^#!\s*(\S+)') interpreter_regex = re.compile('^/(usr/)?(s?bin|games|libexec(/.+)?|(lib(64)?|share)/.+)/[^/]+$') script_regex = re.compile('^/((usr/)?s?bin|etc/(rc\.d/init\.d|X11/xinit\.d|cron\.(hourly|daily|monthly|weekly)))/') ++++++ stricter-interpreter-check.diff ++++++ --- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200 +++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- FilesCheck.py.orig +++ FilesCheck.py -@@ -1272,7 +1272,8 @@ class FilesCheck(AbstractCheck.AbstractC +@@ -1242,7 +1242,8 @@ class FilesCheck(AbstractCheck.AbstractC f.endswith('.la')): printError(pkg, 'script-without-shebang', f) ++++++ suse-binarieschecks.diff ++++++ --- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200 +++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200 @@ -1,6 +1,8 @@ ---- BinariesCheck.py +Index: BinariesCheck.py +=================================================================== +--- BinariesCheck.py.orig +++ BinariesCheck.py -@@ -10,13 +10,15 @@ +@@ -9,13 +9,15 @@ import re import stat @@ -17,17 +19,17 @@ DEFAULT_SYSTEM_LIB_PATHS = ( -@@ -37,6 +39,9 @@ +@@ -42,6 +44,9 @@ class BinaryInfo: unused_regex = re.compile('^\s+(\S+)') - exit_call_regex = re.compile('\s+FUNC\s+.*?\s+(_?exit(?:@\S+)?)(?:\s|$)') - fork_call_regex = re.compile('\s+FUNC\s+.*?\s+(fork(?:@\S+)?)(?:\s|$)') + exit_call_regex = create_regexp_call('_?exit') + fork_call_regex = create_regexp_call('fork') + debuginfo_regex=re.compile('^\s+\[\s*\d+\]\s+\.debug_.*\s+') + symtab_regex=re.compile('^\s+\[\s*\d+\]\s+\.symtab\s+') + gethostbyname_call_regex = re.compile('\s+FUNC\s+.*?\s+(gethostbyname(?:@\S+)?)(?:\s|$)') - - def __init__(self, pkg, path, file, is_ar, is_shlib): - self.readelf_error = False -@@ -50,7 +55,10 @@ + # regexp for setgid setegid setresgid set(?:res|e)?gid + setgid_call_regex = create_regexp_call(['setresgid','setegid','setgid']) + setuid_call_regex = create_regexp_call(['setresuid','seteuid','setuid']) +@@ -62,7 +67,10 @@ class BinaryInfo: self.stack = False self.exec_stack = False self.exit_calls = [] @@ -37,8 +39,8 @@ + self.symtab=0 self.tail = '' - is_debug = path.endswith('.debug') -@@ -93,6 +101,11 @@ + self.setgid = False +@@ -131,6 +139,11 @@ class BinaryInfo: self.exec_stack = True continue @@ -50,7 +52,7 @@ if is_shlib: r = BinaryInfo.exit_call_regex.search(l) if r: -@@ -103,6 +116,14 @@ +@@ -141,6 +154,14 @@ class BinaryInfo: fork_called = True continue @@ -65,7 +67,7 @@ if self.non_pic: self.non_pic = 'TEXTREL' in res[1] -@@ -274,13 +295,26 @@ +@@ -330,13 +351,26 @@ class BinariesCheck(AbstractCheck.Abstra continue # stripped ? @@ -93,7 +95,7 @@ if is_shlib: has_lib = True -@@ -330,6 +364,10 @@ +@@ -386,6 +420,10 @@ class BinariesCheck(AbstractCheck.Abstra for ec in bin_info.exit_calls: printWarning(pkg, 'shared-lib-calls-exit', fname, ec) @@ -104,7 +106,7 @@ # rpath ? if bin_info.rpath: for p in bin_info.rpath: -@@ -524,6 +562,14 @@ +@@ -590,6 +628,14 @@ with the intended shared libraries only. 'ldd-failed', '''Executing ldd on this file failed, all checks could not be run.''', @@ -119,7 +121,7 @@ 'executable-stack', '''The binary declares the stack as executable. Executable stack is usually an error as it is only needed if the code contains GCC trampolines or similar -@@ -536,6 +582,10 @@ +@@ -602,6 +648,10 @@ don\'t define a proper .note.GNU-stack s make the stack executable. Usual suspects include use of a non-GNU linker or an old GNU linker version.''', @@ -130,7 +132,7 @@ 'shared-lib-calls-exit', '''This library package calls exit() or _exit(), probably in a non-fork() context. Doing so from a library is strongly discouraged - when a library -@@ -554,6 +604,12 @@ +@@ -620,6 +670,12 @@ that use prelink, make sure that prelink placing a blacklist file in /etc/prelink.conf.d. For more information, see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=256900#49''', ++++++ suse-changelog.patch ++++++ --- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200 +++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- TagsCheck.py.orig +++ TagsCheck.py -@@ -1024,8 +1024,8 @@ Development/''', +@@ -1025,8 +1025,8 @@ Development/''', "%s".''' % '", "'.join(VALID_GROUPS), 'no-changelogname-tag', ++++++ suse-check-optional-dependencies.diff ++++++ --- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200 +++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- FilesCheck.py.orig +++ FilesCheck.py -@@ -948,6 +948,16 @@ class FilesCheck(AbstractCheck.AbstractC +@@ -907,6 +907,16 @@ class FilesCheck(AbstractCheck.AbstractC if res.group(1) != pkg.name: printError(pkg, 'incoherent-logrotate-file', f) @@ -19,7 +19,7 @@ if link != '': ext = compr_regex.search(link) if ext: -@@ -1757,6 +1767,24 @@ consequences), or other compiler flags w +@@ -1727,6 +1737,24 @@ consequences), or other compiler flags w extraction not working as expected. Verify that the binaries are not unexpectedly stripped and that the intended compiler flags are used.''', ++++++ suse-checks.diff ++++++ --- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200 +++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- Config.py.orig +++ Config.py -@@ -17,14 +17,13 @@ try: +@@ -16,14 +16,13 @@ try: except ImportError: __version__ = 'devel' ++++++ suse-filesystem.diff ++++++ --- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200 +++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200 @@ -2,147 +2,7 @@ =================================================================== --- FilesCheck.py.orig +++ FilesCheck.py -@@ -29,65 +29,112 @@ STANDARD_DIRS = ( - '/', - '/bin', - '/boot', -+ '/dev', - '/etc', - '/etc/X11', -+ '/etc/aliases.d', -+ '/etc/cron.d', -+ '/etc/cron.daily', -+ '/etc/cron.hourly', -+ '/etc/cron.monthly', -+ '/etc/cron.weekly', -+ '/etc/cups', -+ '/etc/default', -+ '/etc/init.d', -+ '/etc/init.d/boot.d', -+ '/etc/init.d/rc0.d', -+ '/etc/init.d/rc1.d', -+ '/etc/init.d/rc2.d', -+ '/etc/init.d/rc3.d', -+ '/etc/init.d/rc4.d', -+ '/etc/init.d/rc5.d', -+ '/etc/init.d/rc6.d', -+ '/etc/init.d/rcS.d', -+ '/etc/java', -+ '/etc/ld.so.conf.d', -+ '/etc/logrotate.d', -+ '/etc/news', - '/etc/opt', -+ '/etc/permissions.d', -+ '/etc/ppp', -+ '/etc/ppp/ip-down.d', -+ '/etc/ppp/ip-up.d', - '/etc/profile.d', -+ '/etc/rc.d', - '/etc/skel', -+ '/etc/susehelp.d', -+ '/etc/susehelp.d/htdig', -+ '/etc/sysconfig', -+ '/etc/sysconfig/SuSEfirewall2.d', -+ '/etc/sysconfig/SuSEfirewall2.d/services', -+ '/etc/sysconfig/network', -+ '/etc/sysconfig/network/if-down.d', -+ '/etc/sysconfig/network/if-up.d', -+ '/etc/sysconfig/network/providers', -+ '/etc/sysconfig/network/scripts', -+ '/etc/sysconfig/scripts', -+ '/etc/uucp', -+ '/etc/xdg', -+ '/etc/xdg/autostart', - '/etc/xinetd.d', - '/home', - '/lib', -+ '/lib/YaST', -+ '/lib/firmware', -+ '/lib/lsb', - '/lib/modules', - '/lib64', -+ '/lib64/YaST', -+ '/lib64/firmware', -+ '/lib64/lsb', -+ '/lib64/modules', - '/media', -+ '/media/cdrom', -+ '/media/floppy', - '/mnt', -- '/mnt/cdrom', -- '/mnt/disk', -- '/mnt/floppy', - '/opt', - '/proc', - '/root', -+ '/root/.gnupg', -+ '/root/bin', - '/sbin', -- '/selinux', - '/srv', -+ '/srv/ftp', -+ '/srv/www', -+ '/srv/www/cgi-bin', -+ '/srv/www/htdocs', - '/sys', - '/tmp', -+ '/tmp/.ICE-unix', -+ '/tmp/.X11-unix', - '/usr', - '/usr/X11R6', - '/usr/X11R6/bin', -- '/usr/X11R6/doc', -- '/usr/X11R6/include', - '/usr/X11R6/lib', -- '/usr/X11R6/lib64', -- '/usr/X11R6/man', -- '/usr/X11R6/man/man1', -- '/usr/X11R6/man/man2', -- '/usr/X11R6/man/man3', -- '/usr/X11R6/man/man4', -- '/usr/X11R6/man/man5', -- '/usr/X11R6/man/man6', -- '/usr/X11R6/man/man7', -- '/usr/X11R6/man/man8', -- '/usr/X11R6/man/man9', -- '/usr/X11R6/man/mann', - '/usr/bin', -- '/usr/bin/X11', -- '/usr/etc', - '/usr/games', -+ '/usr/i586-suse-linux', -+ '/usr/i586-suse-linux/bin', -+ '/usr/i586-suse-linux/include', -+ '/usr/i586-suse-linux/lib', - '/usr/include', -+ '/usr/include/X11', - '/usr/lib', - '/usr/lib/X11', -- '/usr/lib/games', -- '/usr/lib/gcc-lib', -- '/usr/lib/menu', -+ '/usr/lib/browser-plugins', -+ '/usr/lib/lsb', -+ '/usr/lib/news', -+ '/usr/lib/pkgconfig', - '/usr/lib64', -- '/usr/lib64/gcc-lib', -+ '/usr/lib64/X11', -+ '/usr/lib64/browser-plugins', -+ '/usr/lib64/lsb', -+ '/usr/lib64/news', -+ '/usr/lib64/pkgconfig', - '/usr/local', - '/usr/local/bin', -- '/usr/local/doc', -- '/usr/local/etc', - '/usr/local/games', -- '/usr/local/info', -+ '/usr/local/include', - '/usr/local/lib', - '/usr/local/lib64', - '/usr/local/man', -@@ -103,24 +150,415 @@ STANDARD_DIRS = ( +@@ -103,24 +103,415 @@ STANDARD_DIRS = ( '/usr/local/man/mann', '/usr/local/sbin', '/usr/local/share', @@ -569,7 +429,7 @@ '/usr/share/man', '/usr/share/man/man1', '/usr/share/man/man2', -@@ -132,28 +570,57 @@ STANDARD_DIRS = ( +@@ -132,28 +523,57 @@ STANDARD_DIRS = ( '/usr/share/man/man8', '/usr/share/man/man9', '/usr/share/man/mann', ++++++ suse-filter-exception.diff ++++++ --- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200 +++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- Config.py.orig +++ Config.py -@@ -103,11 +103,23 @@ def getOption(name, default = ""): +@@ -102,11 +102,23 @@ def getOption(name, default = ""): _filters = [] _filters_re = None @@ -28,7 +28,7 @@ def removeFilter(s): global _filters_re -@@ -122,19 +134,38 @@ def removeFilter(s): +@@ -121,19 +133,38 @@ def removeFilter(s): _scoring = {} def setBadness(s, score): @@ -71,7 +71,7 @@ _filters_re = '(?:' + _filters[0] + ')' for idx in range(1, len(_filters)): -@@ -146,9 +177,27 @@ def isFiltered(s): +@@ -145,9 +176,27 @@ def isFiltered(s): _filters_re = _filters_re + '|(?:' + _filters[idx] +')' _filters_re = re.compile(_filters_re) ++++++ suse-filter-more-verbose.diff ++++++ --- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200 +++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200 @@ -1,6 +1,8 @@ ---- Config.py +Index: Config.py +=================================================================== +--- Config.py.orig +++ Config.py -@@ -11,6 +11,7 @@ +@@ -10,6 +10,7 @@ import locale import os.path import re @@ -8,7 +10,7 @@ try: from __version__ import __version__ -@@ -163,7 +164,17 @@ +@@ -162,7 +163,17 @@ def isFiltered(s): if '(' in _filters_non_except[idx]: _non_named_group_re.subn('(:?', _filters_non_except[idx]) _filters_non_except_re = _filters_non_except_re + '|(?:' + _filters_non_except[idx] +')' @@ -27,7 +29,7 @@ if _filters_re == None and len(_filters): _filters_re = '(?:' + _filters[0] + ')' -@@ -175,7 +186,17 @@ +@@ -174,7 +185,17 @@ def isFiltered(s): if '(' in _filters[idx]: _non_named_group_re.subn('(:?', _filters[idx]) _filters_re = _filters_re + '|(?:' + _filters[idx] +')' ++++++ suse-g-ir-chech.diff ++++++ --- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200 +++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- FilesCheck.py.orig +++ FilesCheck.py -@@ -646,7 +646,7 @@ points_regex = re.compile('^\.\./(.*)') +@@ -599,7 +599,7 @@ points_regex = re.compile('^\.\./(.*)') doc_regex = re.compile('^/usr(/share|/X11R6)?/(doc|man|info)/|^/opt/kde3/share/doc|^/usr/share/gnome/help') bin_regex = re.compile('^/(?:usr/(?:s?bin|games)|s?bin)/(.*)') includefile_regex = re.compile('\.(c|h)(pp|xx)?$', re.IGNORECASE) ++++++ suse-manpages-for-rc-scripts.patch ++++++ --- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200 +++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200 @@ -1,8 +1,8 @@ -Index: rpmlint-1.4/FilesCheck.py +Index: rpmlint-1.5/FilesCheck.py =================================================================== ---- rpmlint-1.4.orig/FilesCheck.py -+++ rpmlint-1.4/FilesCheck.py -@@ -1434,7 +1434,7 @@ class FilesCheck(AbstractCheck.AbstractC +--- rpmlint-1.5.orig/FilesCheck.py ++++ rpmlint-1.5/FilesCheck.py +@@ -1404,7 +1404,7 @@ class FilesCheck(AbstractCheck.AbstractC for exe, paths in bindir_exes.items(): if len(paths) > 1: printWarning(pkg, "duplicate-executable", exe, paths) ++++++ suse-no-run-ldconfig.diff ++++++ --- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200 +++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- SpecCheck.py.orig +++ SpecCheck.py -@@ -414,6 +414,10 @@ class SpecCheck(AbstractCheck.AbstractCh +@@ -424,6 +424,10 @@ class SpecCheck(AbstractCheck.AbstractCh printWarning(pkg, 'comparison-operator-in-deptoken', conf) @@ -13,7 +13,7 @@ if current_section == 'changelog': for match in AbstractCheck.macro_regex.findall(line): res = re.match('%+', match) -@@ -732,6 +736,14 @@ may break short circuit builds.''', +@@ -748,6 +752,14 @@ may break short circuit builds.''', '''Make check or other automated regression test should be run in %check, as they can be disabled with a rpm macro for short circuiting purposes.''', ++++++ suse-pkg-config-check.diff ++++++ --- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200 +++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- TagsCheck.py.orig +++ TagsCheck.py -@@ -416,6 +416,7 @@ lib_devel_number_regex = re.compile('^li +@@ -415,6 +415,7 @@ lib_devel_number_regex = re.compile('^li invalid_url_regex = re.compile(Config.getOption('InvalidURL'), re.IGNORECASE) lib_package_regex = re.compile('(?:^(?:compat-)?lib.*?(\.so.*)?|libs?[\d-]*)$', re.IGNORECASE) leading_space_regex = re.compile('^\s+') @@ -10,7 +10,7 @@ license_regex = re.compile('$([^)]+)$|\s(?:and|or)\s') invalid_version_regex = re.compile('([0-9](?:rc|alpha|beta|pre).*)', re.IGNORECASE) # () are here for grouping purpose in the regexp -@@ -629,10 +630,12 @@ class TagsCheck(AbstractCheck.AbstractCh +@@ -630,10 +631,12 @@ class TagsCheck(AbstractCheck.AbstractCh base = is_devel.group(1) dep = None has_so = False @@ -24,7 +24,7 @@ if has_so: base_or_libs = base + '/' + base + '-libs/lib' + base # try to match *%_isa as well (e.g. "(x86-64)", "(x86-32)") -@@ -669,6 +672,15 @@ class TagsCheck(AbstractCheck.AbstractCh +@@ -670,6 +673,15 @@ class TagsCheck(AbstractCheck.AbstractCh if prov not in (x[0] for x in pkg.provides()): printWarning(pkg, 'no-provides', prov) @@ -40,7 +40,7 @@ # List of words to ignore in spell check ignored_words = set() for pf in pkg.files(): -@@ -1108,6 +1120,11 @@ instead or require a file in bin or /etc +@@ -1109,6 +1121,11 @@ instead or require a file in bin or /etc 'no-url-tag', '''The URL tag is missing. Please add a http or ftp link to the project location.''', ++++++ suse-python-abi-check.diff ++++++ --- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200 +++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- FilesCheck.py.orig +++ FilesCheck.py -@@ -1148,8 +1148,11 @@ class FilesCheck(AbstractCheck.AbstractC +@@ -1107,8 +1107,11 @@ class FilesCheck(AbstractCheck.AbstractC if res and not (pkg.check_versioned_dep('python-base', res.group(1)) or pkg.check_versioned_dep('python', ++++++ suse-python3-naming-policy.diff ++++++ --- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200 +++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200 @@ -1,6 +1,8 @@ ---- NamingPolicyCheck.py +Index: NamingPolicyCheck.py +=================================================================== +--- NamingPolicyCheck.py.orig +++ NamingPolicyCheck.py -@@ -91,7 +91,7 @@ +@@ -90,7 +90,7 @@ check = NamingPolicyCheck() check.add_check('xmms', '^xmms(-|$)', '^/usr/lib(64)?/xmms/') ++++++ suse-rclink-check.diff ++++++ --- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200 +++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- InitScriptCheck.py.orig +++ InitScriptCheck.py -@@ -51,7 +51,7 @@ class InitScriptCheck(AbstractCheck.Abst +@@ -50,7 +50,7 @@ class InitScriptCheck(AbstractCheck.Abst return initscript_list = [] @@ -11,7 +11,7 @@ # check chkconfig call in %post and %preun postin = pkg[rpm.RPMTAG_POSTIN] or pkg.scriptprog(pkg[rpm.RPMTAG_POSTINPROG]) -@@ -60,6 +60,10 @@ class InitScriptCheck(AbstractCheck.Abst +@@ -59,6 +59,10 @@ class InitScriptCheck(AbstractCheck.Abst for fname, pkgfile in pkg.files().items(): @@ -22,7 +22,7 @@ if not fname.startswith('/etc/init.d/') and \ not fname.startswith('/etc/rc.d/init.d/'): continue -@@ -199,6 +203,12 @@ class InitScriptCheck(AbstractCheck.Abst +@@ -198,6 +202,12 @@ class InitScriptCheck(AbstractCheck.Abst elif subsys_regex_found and not use_subsys: printError(pkg, 'subsys-unsupported', fname) @@ -35,7 +35,7 @@ if len(initscript_list) == 1: pkgname = re.sub("-sysvinit$", "", pkg.name.lower()) goodnames = (pkgname, pkgname + 'd') -@@ -223,6 +233,10 @@ a call to chkconfig.''', +@@ -222,6 +232,10 @@ a call to chkconfig.''', '''The package contains an init script but doesn't contain a %preun with a call to chkconfig.''', ++++++ suse-shlib-devel-dependency.diff ++++++ --- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200 +++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- TagsCheck.py.orig +++ TagsCheck.py -@@ -637,10 +637,10 @@ class TagsCheck(AbstractCheck.AbstractCh +@@ -638,10 +638,10 @@ class TagsCheck(AbstractCheck.AbstractCh if pkg_config_regex.match(fname) and fname.endswith('.pc'): has_pc = True if has_so: ++++++ suse-speccheck-utf8.diff ++++++ --- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200 +++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- SpecCheck.py.orig +++ SpecCheck.py -@@ -609,8 +609,8 @@ SPEC file to build a valid RPM package.' +@@ -625,8 +625,8 @@ SPEC file to build a valid RPM package.' ("Name:" tag). Either rename your package or the specfile.''', 'non-utf8-spec-file', ++++++ suse-url-check.diff ++++++ --- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200 +++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- TagsCheck.py.orig +++ TagsCheck.py -@@ -780,7 +780,7 @@ class TagsCheck(AbstractCheck.AbstractCh +@@ -781,7 +781,7 @@ class TagsCheck(AbstractCheck.AbstractCh if not valid_license: self._unexpanded_macros(pkg, 'License', rpm_license) @@ -11,7 +11,7 @@ if hasattr(rpm, 'RPMTAG_%s' % tag.upper()): url = pkg[getattr(rpm, 'RPMTAG_%s' % tag.upper())] self._unexpanded_macros(pkg, tag, url, is_url = True) -@@ -1096,7 +1096,7 @@ once.''', +@@ -1097,7 +1097,7 @@ once.''', '''This rpm requires a specific release of another package.''', 'no-url-tag', ++++++ suse-version.diff ++++++ --- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:29.000000000 +0200 +++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:29.000000000 +0200 @@ -1,14 +1,16 @@ ---- SpecCheck.py +Index: SpecCheck.py +=================================================================== +--- SpecCheck.py.orig +++ SpecCheck.py -@@ -57,6 +57,7 @@ +@@ -66,6 +66,7 @@ libdir_regex = re.compile('%{?_lib(?:dir comment_or_empty_regex = re.compile('^\s*(#|$)') defattr_regex = re.compile('^\s*%defattr\\b') attr_regex = re.compile('^\s*%attr\\b') +suse_version_regex = re.compile('%suse_version\s*[<>=]+\s*(\d+)') section_regexs = dict( ([x, re.compile('^%' + x + '(?:\s|$)')] - for x in ('build', 'changelog', 'check', 'clean', 'description', 'files', -@@ -359,6 +360,12 @@ + for x in ['build', 'changelog', 'check', 'clean', 'description', 'files', +@@ -369,6 +370,12 @@ class SpecCheck(AbstractCheck.AbstractCh if not res.group(1).startswith('%'): printWarning(pkg, 'hardcoded-prefix-tag', res.group(1)) @@ -21,7 +23,7 @@ res = prereq_regex.search(line) if res: printError(pkg, 'prereq-use', res.group(2)) -@@ -774,6 +781,15 @@ +@@ -790,6 +797,15 @@ in the resulting binary package dependin version (typically < 4.4). Add default attributes using %defattr before it in the %files section, or use per entry %attr's.''', ++++++ suse-whitelist-opensuse.diff ++++++ --- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:29.000000000 +0200 +++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:29.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- TagsCheck.py.orig +++ TagsCheck.py -@@ -883,7 +883,7 @@ class TagsCheck(AbstractCheck.AbstractCh +@@ -884,7 +884,7 @@ class TagsCheck(AbstractCheck.AbstractCh spell_check(pkg, utf8summary, 'Summary(%s)', lang, ignored_words) if '\n' in summary: printError(pkg, 'summary-on-multiple-lines', lang) ++++++ sysv5-init-checks.diff ++++++ --- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:29.000000000 +0200 +++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:29.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- InitScriptCheck.py.orig +++ InitScriptCheck.py -@@ -30,6 +30,10 @@ lsb_tags_regex = re.compile('^# ([\w-]+) +@@ -29,6 +29,10 @@ lsb_tags_regex = re.compile('^# ([\w-]+) lsb_cont_regex = re.compile('^#(?:\t| )(.*?)\s*$') use_subsys = Config.getOption('UseVarLockSubsys', True) @@ -13,7 +13,7 @@ LSB_KEYWORDS = ('Provides', 'Required-Start', 'Required-Stop', 'Should-Start', 'Should-Stop', 'Default-Start', 'Default-Stop', 'Short-Description', 'Description') -@@ -47,6 +51,13 @@ class InitScriptCheck(AbstractCheck.Abst +@@ -46,6 +50,13 @@ class InitScriptCheck(AbstractCheck.Abst return initscript_list = [] @@ -27,7 +27,7 @@ for fname, pkgfile in pkg.files().items(): if not fname.startswith('/etc/init.d/') and \ -@@ -61,20 +72,16 @@ class InitScriptCheck(AbstractCheck.Abst +@@ -60,20 +71,16 @@ class InitScriptCheck(AbstractCheck.Abst if "." in basename: printError(pkg, 'init-script-name-with-dot', fname) @@ -56,7 +56,7 @@ status_found = False reload_found = False -@@ -275,6 +282,17 @@ of chkconfig don't work as expected with +@@ -274,6 +281,17 @@ of chkconfig don't work as expected with 'init-script-non-executable', '''The init script should have at least the execution bit set for root in order for it to run at boot time.''', ++++++ usr-arch.diff ++++++ --- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:29.000000000 +0200 +++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:29.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- BinariesCheck.py.orig +++ BinariesCheck.py -@@ -208,6 +208,7 @@ usr_lib_exception_regex = re.compile(Con +@@ -263,6 +263,7 @@ usr_lib_exception_regex = re.compile(Con srcname_regex = re.compile('(.*?)-[0-9]') invalid_dir_ref_regex = re.compile('/(home|tmp)(\W|$)') ocaml_mixed_regex = re.compile('^Caml1999X0\d\d$') @@ -10,7 +10,7 @@ def dir_base(path): res = path_regex.search(path) -@@ -280,7 +281,7 @@ class BinariesCheck(AbstractCheck.Abstra +@@ -336,7 +337,7 @@ class BinariesCheck(AbstractCheck.Abstra # arch dependent packages only from here on # in /usr/share ? ++++++ version-control-internal-file.diff ++++++ --- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:29.000000000 +0200 +++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:29.000000000 +0200 @@ -3,7 +3,7 @@ =================================================================== --- FilesCheck.py.orig +++ FilesCheck.py -@@ -659,7 +659,7 @@ ldconfig_regex = re.compile('^[^#]*ldcon +@@ -612,7 +612,7 @@ ldconfig_regex = re.compile('^[^#]*ldcon depmod_regex = re.compile('^[^#]*depmod', re.MULTILINE) install_info_regex = re.compile('^[^#]*install-info', re.MULTILINE) perl_temp_file_regex = re.compile('.*perl.*/(\.packlist|perllocal\.pod)$') ++++++ xdg-paths-update.diff ++++++ --- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:29.000000000 +0200 +++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:29.000000000 +0200 @@ -2,12 +2,12 @@ =================================================================== --- MenuXDGCheck.py.orig +++ MenuXDGCheck.py -@@ -18,7 +18,7 @@ class MenuXDGCheck(AbstractCheck.Abstrac - # $ echo $XDG_DATA_DIRS/applications +@@ -21,7 +21,7 @@ class MenuXDGCheck(AbstractCheck.Abstrac # /var/lib/menu-xdg:/usr/share + self.cfp = RawConfigParser() AbstractCheck.AbstractFilesCheck.__init__( - self, "MenuXDGCheck", "/usr/share/applications/.*\.desktop$") + self, "MenuXDGCheck", "(?:/usr/share|/etc/opt/.*/share|/opt/.*)/applications/.*\.desktop$") def check_file(self, pkg, filename): - f = pkg.dirName() + filename + root = pkg.dirName() ++++++ yast-provides.diff ++++++ --- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:29.000000000 +0200 +++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:29.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- TagsCheck.py.orig +++ TagsCheck.py -@@ -813,7 +813,7 @@ class TagsCheck(AbstractCheck.AbstractCh +@@ -814,7 +814,7 @@ class TagsCheck(AbstractCheck.AbstractCh printWarning(pkg, 'no-url-tag') obs_names = [x[0] for x in pkg.obsoletes()] -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-WebTest for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '13

29 Jun '13

Hello community, here is the log from the commit of package python-WebTest for openSUSE:Factory checked in at 2013-06-29 14:48:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-WebTest (Old) and /work/SRC/openSUSE:Factory/.python-WebTest.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-WebTest" Changes: -------- --- /work/SRC/openSUSE:Factory/python-WebTest/python-WebTest.changes 2013-05-03 07:40:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-WebTest.new/python-WebTest.changes 2013-06-29 14:48:27.000000000 +0200 @@ -1,0 +2,9 @@ +Mon Jun 10 13:29:16 UTC 2013 - dmueller(a)suse.com + +- update to 2.0.6: +- fixed #64. cookiejar api has changed in python3.3 [gawel] +- allow to use a fixed StopableWSGIServer [gawel] +- Do not alter the BeautifulSoup object when parsing forms. [Georges +- Remove first newline while parse textarea block, how modern browsers does. + +------------------------------------------------------------------- Old: ---- WebTest-2.0.5.zip New: ---- WebTest-2.0.6.zip ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-WebTest.spec ++++++ --- /var/tmp/diff_new_pack.tsGjaf/_old 2013-06-29 14:48:28.000000000 +0200 +++ /var/tmp/diff_new_pack.tsGjaf/_new 2013-06-29 14:48:28.000000000 +0200 @@ -17,7 +17,7 @@ Name: python-WebTest -Version: 2.0.5 +Version: 2.0.6 Release: 0 Url: http://webtest.pythonpaste.org/ Summary: Helper to test WSGI applications -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0