Hello community, here is the log from the commit of package pinentry for openSUSE:Factory checked in at 2011-11-23 19:37:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pinentry (Old) and /work/SRC/openSUSE:Factory/.pinentry.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pinentry", Maintainer is "vci...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/pinentry/pinentry.changes 2011-10-26 15:43:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pinentry.new/pinentry.changes 2011-11-23 19:37:38.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Nov 22 15:57:45 UTC 2011 - vci...@suse.com + +- patch that fixes Glib warning (bnc#730453) +- add -ltinfo to fix build + +------------------------------------------------------------------- New: ---- pinentry-0.8.1-editing-cancelled_warning.patch pinentry-0.8.1-tinfo.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pinentry.spec ++++++ --- /var/tmp/diff_new_pack.pAqWIo/_old 2011-11-23 19:37:40.000000000 +0100 +++ /var/tmp/diff_new_pack.pAqWIo/_new 2011-11-23 19:37:40.000000000 +0100 @@ -36,6 +36,10 @@ Patch5: pinentry-0.8.1-allow_paste_gtk2.patch # PATCH-FIX-SUSE fix qt4 password entry not to allow IM (bnc#725471) Patch6: qt4-disable-inputmethod-for-passwords.diff +# PATCH-FIX-UPSTREAM prevents glib warning (bnc#690514) +Patch7: pinentry-0.8.1-editing-cancelled_warning.patch +# PATCH-FIX-SUSE add -ltinfo to fix build +Patch8: pinentry-0.8.1-tinfo.patch BuildRequires: cmake BuildRequires: libcap-devel BuildRequires: libdrm-devel @@ -108,6 +112,8 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 +%patch8 -p1 %build cp /usr/share/gettext/config.rpath . ++++++ pinentry-0.8.1-editing-cancelled_warning.patch ++++++ Index: pinentry-0.8.1/gtk+-2/gtksecentry.c =================================================================== --- pinentry-0.8.1.orig/gtk+-2/gtksecentry.c 2011-11-22 15:56:56.909315227 +0100 +++ pinentry-0.8.1/gtk+-2/gtksecentry.c 2011-11-22 15:56:56.941316154 +0100 @@ -22,7 +22,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ /* @@ -71,7 +71,8 @@ PROP_ACTIVATES_DEFAULT, PROP_WIDTH_CHARS, PROP_SCROLL_OFFSET, - PROP_TEXT + PROP_TEXT, + PROP_EDITING_CANCELED }; static guint signals[LAST_SIGNAL] = { 0 }; @@ -428,6 +429,10 @@ class->delete_from_cursor = gtk_secure_entry_delete_from_cursor; class->activate = gtk_secure_entry_real_activate; + g_object_class_override_property (gobject_class, + PROP_EDITING_CANCELED, + "editing-canceled"); + g_object_class_install_property(gobject_class, PROP_CURSOR_POSITION, g_param_spec_int("cursor_position", @@ -723,6 +728,14 @@ gtk_secure_entry_set_text(entry, g_value_get_string(value)); break; + case PROP_EDITING_CANCELED: + /* We may want to implement the GtkCelllEditable methods. + However it is only used by GtkTreeView and we don't use that + here. We provide this property only to get rid of a Gtk+ + runtime warning. */ + entry->editing_canceled = g_value_get_boolean (value); + break; + case PROP_SCROLL_OFFSET: case PROP_CURSOR_POSITION: default: @@ -766,6 +779,9 @@ case PROP_TEXT: g_value_set_string(value, gtk_secure_entry_get_text(entry)); break; + case PROP_EDITING_CANCELED: + g_value_set_boolean (value, entry->editing_canceled); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); @@ -2704,14 +2720,14 @@ * be clamped to the range 0-65536. * * Creates a new #GtkSecureEntry widget with the given maximum length. - * + * * Note: the existence of this function is inconsistent * with the rest of the GTK+ API. The normal setup would * be to just require the user to make an extra call * to gtk_secure_entry_set_max_length() instead. It is not * expected that this function will be removed, but * it would be better practice not to use it. - * + * * Return value: a new #GtkSecureEntry. **/ GtkWidget * @@ -2784,7 +2800,7 @@ * gtk_secure_entry_set_invisible_char: * @entry: a #GtkSecureEntry * @ch: a Unicode character - * + * * Sets the character to use in place of the actual text when * gtk_secure_entry_set_visibility() has been called to set text visibility * to %FALSE. i.e. this is the character used in "password mode" to @@ -2792,7 +2808,7 @@ * invisible char is an asterisk ('*'). If you set the invisible char * to 0, then the user will get no feedback at all; there will be * no text on the screen as they type. - * + * **/ void gtk_secure_entry_set_invisible_char(GtkSecureEntry * entry, gunichar ch) @@ -2815,7 +2831,7 @@ * for entries with visisbility set to false. See gtk_secure_entry_set_invisible_char(). * * Return value: the current invisible char, or 0, if the entry does not - * show invisible text at all. + * show invisible text at all. **/ gunichar gtk_secure_entry_get_invisible_char(GtkSecureEntry * entry) @@ -2858,7 +2874,7 @@ * @max: the maximum length of the entry, or 0 for no maximum. * (other than the maximum length of entries.) The value passed in will * be clamped to the range 0-65536. - * + * * Sets the maximum allowed length of the contents of the widget. If * the current contents are longer than the given length, then they * will be truncated to fit. @@ -2908,7 +2924,7 @@ * (For experts: if @setting is %TRUE, the entry calls * gtk_window_activate_default() on the window containing the entry, in * the default handler for the "activate" signal.) - * + * **/ void gtk_secure_entry_set_activates_default(GtkSecureEntry * entry, @@ -2926,9 +2942,9 @@ /** * gtk_secure_entry_get_activates_default: * @entry: a #GtkSecureEntry - * + * * Retrieves the value set by gtk_secure_entry_set_activates_default(). - * + * * Return value: %TRUE if the entry will activate the default widget **/ gboolean @@ -2949,7 +2965,7 @@ * <emphasis>request</emphasis>, the size can still be affected by * how you pack the widget into containers. If @n_chars is -1, the * size reverts to the default entry size. - * + * **/ void gtk_secure_entry_set_width_chars(GtkSecureEntry * entry, gint n_chars) @@ -2966,9 +2982,9 @@ /** * gtk_secure_entry_get_width_chars: * @entry: a #GtkSecureEntry - * + * * Gets the value set by gtk_secure_entry_set_width_chars(). - * + * * Return value: number of chars to request space for, or negative if unset **/ gint @@ -2983,7 +2999,7 @@ * gtk_secure_entry_set_has_frame: * @entry: a #GtkSecureEntry * @setting: new value - * + * * Sets whether the entry has a beveled frame around it. **/ void @@ -3004,9 +3020,9 @@ /** * gtk_secure_entry_get_has_frame: * @entry: a #GtkSecureEntry - * + * * Gets the value set by gtk_secure_entry_set_has_frame(). - * + * * Return value: whether the entry has a beveled frame **/ gboolean @@ -3021,7 +3037,7 @@ /** * gtk_secure_entry_get_layout: * @entry: a #GtkSecureEntry - * + * * Gets the #PangoLayout used to display the entry. * The layout is useful to e.g. convert text positions to * pixel positions, in combination with gtk_secure_entry_get_layout_offsets(). @@ -3032,7 +3048,7 @@ * gtk_secure_entry_layout_index_to_text_index() and * gtk_secure_entry_text_index_to_layout_index() are needed to convert byte * indices in the layout to byte indices in the entry contents. - * + * * Return value: the #PangoLayout for this entry **/ PangoLayout * @@ -3052,12 +3068,12 @@ * gtk_secure_entry_layout_index_to_text_index: * @entry: a #GtkSecureEntry * @layout_index: byte index into the entry layout text - * + * * Converts from a position in the entry contents (returned * by gtk_secure_entry_get_text()) to a position in the * entry's #PangoLayout (returned by gtk_secure_entry_get_layout(), * with text retrieved via pango_layout_get_text()). - * + * * Return value: byte index into the entry contents **/ gint @@ -3089,11 +3105,11 @@ * gtk_secure_entry_text_index_to_layout_index: * @entry: a #GtkSecureEntry * @text_index: byte index into the entry contents - * + * * Converts from a position in the entry's #PangoLayout(returned by * gtk_secure_entry_get_layout()) to a position in the entry contents * (returned by gtk_secure_entry_get_text()). - * + * * Return value: byte index into the entry layout text **/ gint @@ -3131,7 +3147,7 @@ * Also useful to convert mouse events into coordinates inside the * #PangoLayout, e.g. to take some action if some part of the entry text * is clicked. - * + * * Note that as the user scrolls around in the entry the offsets will * change; you'll need to connect to the "notify::scroll_offset" * signal to track this. Remember when using the #PangoLayout @@ -3142,7 +3158,7 @@ * gtk_secure_entry_layout_index_to_text_index() and * gtk_secure_entry_text_index_to_layout_index() are needed to convert byte * indices in the layout to byte indices in the entry contents. - * + * **/ void gtk_secure_entry_get_layout_offsets(GtkSecureEntry * entry, Index: pinentry-0.8.1/gtk+-2/pinentry-gtk-2.c =================================================================== --- pinentry-0.8.1.orig/gtk+-2/pinentry-gtk-2.c 2010-10-19 18:34:51.000000000 +0200 +++ pinentry-0.8.1/gtk+-2/pinentry-gtk-2.c 2011-11-22 15:56:56.941316154 +0100 @@ -11,12 +11,12 @@ it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -97,7 +97,7 @@ GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE); } - + /* Realize the window as transient if we grab the keyboard. This makes the window a modal dialog to the root window, which helps the window manager. See the following quote from: @@ -273,7 +273,7 @@ snprintf (textbuf, sizeof textbuf, "%d%%", percent); color.green = 0xffff; } - gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (qualitybar), + gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (qualitybar), (double)percent/100.0); gtk_progress_bar_set_text (GTK_PROGRESS_BAR (qualitybar), textbuf); gtk_widget_modify_bg (qualitybar, GTK_STATE_PRELIGHT, &color); @@ -327,7 +327,7 @@ G_CALLBACK (ungrab_keyboard), NULL); } gtk_window_add_accel_group (GTK_WINDOW (win), acc); - + wvbox = gtk_vbox_new (FALSE, HIG_LARGE * 2); gtk_container_add (GTK_CONTAINER (win), wvbox); gtk_container_set_border_width (GTK_CONTAINER (wvbox), HIG_LARGE); @@ -435,7 +435,7 @@ 2, 0); gtk_box_pack_start (GTK_BOX (sbox), time_out, FALSE, FALSE, 0); gtk_widget_show (time_out); - + w = gtk_label_new ("seconds"); gtk_box_pack_start (GTK_BOX (sbox), w, FALSE, FALSE, 0); gtk_widget_show (w); @@ -483,7 +483,7 @@ (gpointer) CONFIRM_CANCEL); GTK_WIDGET_SET_FLAGS (w, GTK_CAN_DEFAULT); } - + if (confirm_mode && !pinentry->one_button && pinentry->notok) { msg = pinentry_utf8_validate (pinentry->notok); @@ -496,7 +496,7 @@ (gpointer) CONFIRM_NOTOK); GTK_WIDGET_SET_FLAGS (w, GTK_CAN_DEFAULT); } - + if (pinentry->ok) { msg = pinentry_utf8_validate (pinentry->ok); @@ -506,7 +506,7 @@ else if (pinentry->default_ok) { GtkWidget *image; - + msg = pinentry_utf8_validate (pinentry->default_ok); w = gtk_button_new_with_mnemonic (msg); g_free (msg); @@ -540,7 +540,7 @@ gtk_window_set_keep_above (GTK_WINDOW (win), TRUE); gtk_widget_show_all (win); gtk_window_present (GTK_WINDOW (win)); /* Make sure it has the focus. */ - + return win; } @@ -595,7 +595,7 @@ g_mem_set_vtable (&secure_mem); pinentry_init (PGMNAME); - + #ifdef FALLBACK_CURSES if (pinentry_have_display (argc, argv)) gtk_init (&argc, &argv); @@ -611,9 +611,9 @@ printf(PGMNAME " " VERSION "\n"); exit(EXIT_SUCCESS); } - + if (pinentry_loop ()) return 1; - + return 0; } ++++++ pinentry-0.8.1-tinfo.patch ++++++ Index: pinentry-0.8.1/m4/curses.m4 =================================================================== --- pinentry-0.8.1.orig/m4/curses.m4 2011-11-22 15:56:56.000000000 +0100 +++ pinentry-0.8.1/m4/curses.m4 2011-11-22 16:33:06.707257991 +0100 @@ -28,7 +28,7 @@ AC_ARG_ENABLE(ncurses, [ --disable-ncurses don't prefer -lncurses over -lcurses], , enable_ncurses=yes) if test "$enable_ncurses" = yes; then - AC_CHECK_LIB(ncursesw, initscr, LIBNCURSES="-lncursesw") + AC_CHECK_LIB(ncursesw, initscr, LIBNCURSES="-lncursesw -ltinfo") if test "$LIBNCURSES"; then # Use ncurses header files instead of the ordinary ones, if possible; # is there a better way of doing this, that avoids looking in specific -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
