Hello community, here is the log from the commit of package NetworkManager-pptp for openSUSE:Factory checked in at Fri Jul 8 10:39:04 CEST 2011. -------- --- NetworkManager-pptp/NetworkManager-pptp.changes 2011-05-04 17:32:00.000000000 +0200 +++ /mounts/work_src_done/STABLE/NetworkManager-pptp/NetworkManager-pptp.changes 2011-06-21 11:15:14.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Jun 21 09:13:24 UTC 2011 - dimstar@opensuse.org + +- Add NetworkManager-pptp-gtk_box_new.patch: Fix build with GTK+ + 3.1.6, which has gtk_{h|v}box_new deprecated. Patch taken from + upstream git, commit id 81b8afb2. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- NetworkManager-pptp-gtk_box_new.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager-pptp.spec ++++++ --- /var/tmp/diff_new_pack.X8A5St/_old 2011-07-08 10:38:33.000000000 +0200 +++ /var/tmp/diff_new_pack.X8A5St/_new 2011-07-08 10:38:33.000000000 +0200 @@ -22,7 +22,7 @@ %define pppd_plugin_dir %(rpm -ql ppp | grep -m1 pppd/[0-9]*) Summary: NetworkManager VPN support for PPTP Version: 0.8.999 -Release: 1 +Release: 2 # FIXME .desktop icons are currently disabled (on purpose) in the NM tarballs. They will re-appear later on (when nmce supports --import) License: GPLv2+ Group: Productivity/Networking/System @@ -30,6 +30,8 @@ Source0: %{name}-%{version}.tar.bz2 Source1: gnome-mime-application-x-pptp-settings.png Patch0: nm-pptp-desktop.patch +# PATCH-FIX-UPSTREAM NetworkManager-pptp-gtk_box_new.patch bgo#652801 dimstar@opensuse.org -- Fix build with GTK+ 3.1.6. Patch taken from upstream git, commit id 81b8afb2. +Patch1: NetworkManager-pptp-gtk_box_new.patch BuildRequires: grep BuildRequires: intltool BuildRequires: ppp-devel @@ -63,6 +65,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 cp -a %{S:1} nm-pptp-settings.png %build ++++++ NetworkManager-pptp-gtk_box_new.patch ++++++
From 81b8afb29d52959bbbbf5e07030eab2c7a3247d8 Mon Sep 17 00:00:00 2001 From: Jiří Klimeš <jklimes@redhat.com> Date: Mon, 20 Jun 2011 11:46:33 +0000 Subject: auth-dialog: use gtk_box_new() instead of gtk_(h/v)box_new() (bgo #652801)
These functions have been deprecated in GTK+ 3.1.6. --- diff --git a/auth-dialog/gnome-two-password-dialog.c b/auth-dialog/gnome-two-password-dialog.c index d9555b8..9ca3663 100644 --- a/auth-dialog/gnome-two-password-dialog.c +++ b/auth-dialog/gnome-two-password-dialog.c @@ -352,10 +352,14 @@ gnome_two_password_dialog_new (const char *dialog_title, gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (password_dialog->details->connect_with_no_userpass_button), TRUE); } +#if GTK_CHECK_VERSION (3,1,6) + password_dialog->details->radio_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); +#else password_dialog->details->radio_vbox = gtk_vbox_new (FALSE, 6); +#endif gtk_box_pack_start (GTK_BOX (password_dialog->details->radio_vbox), password_dialog->details->connect_with_no_userpass_button, - FALSE, FALSE, 0); + FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (password_dialog->details->radio_vbox), password_dialog->details->connect_with_userpass_button, FALSE, FALSE, 0); @@ -416,14 +420,23 @@ gnome_two_password_dialog_new (const char *dialog_title, add_table_rows (password_dialog); /* Adds some eye-candy to the dialog */ +#if GTK_CHECK_VERSION (3,1,6) + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12); +#else hbox = gtk_hbox_new (FALSE, 12); +#endif + gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); dialog_icon = gtk_image_new_from_stock (GTK_STOCK_DIALOG_AUTHENTICATION, GTK_ICON_SIZE_DIALOG); gtk_misc_set_alignment (GTK_MISC (dialog_icon), 0.5, 0.0); gtk_box_pack_start (GTK_BOX (hbox), dialog_icon, FALSE, FALSE, 0); /* Fills the vbox */ +#if GTK_CHECK_VERSION (3,1,6) + main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 18); +#else main_vbox = gtk_vbox_new (FALSE, 18); +#endif if (message) { message_label = GTK_LABEL (gtk_label_new (message)); @@ -434,7 +447,11 @@ gnome_two_password_dialog_new (const char *dialog_title, FALSE, FALSE, 0); } +#if GTK_CHECK_VERSION (3,1,6) + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); +#else vbox = gtk_vbox_new (FALSE, 6); +#endif gtk_box_pack_start (GTK_BOX (main_vbox), vbox, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), password_dialog->details->radio_vbox, -- cgit v0.9 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org