Gentoo Archives: gentoo-commits

From: "Pacho Ramos (pacho)" <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-misc/pavuk/files: pavuk-0.9.36_pre20120215-fix-underlinking.patch pavuk-0.9.36_pre20120215-fix-gtkmulticol-segfault.patch
Date: Sat, 25 Feb 2012 12:31:25
Message-Id: 20120225123113.306D02004B@flycatcher.gentoo.org
1 pacho 12/02/25 12:31:13
2
3 Added: pavuk-0.9.36_pre20120215-fix-underlinking.patch
4 pavuk-0.9.36_pre20120215-fix-gtkmulticol-segfault.patch
5 Log:
6 Fixes underlinking, bug #405337 by Attila Tóth; fixes a segfault in the GTK+2 interface on amd64, bug #262504#c40. Thanks to Richard Grenville for the fixes.
7
8 (Portage version: 2.1.10.49/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.1 net-misc/pavuk/files/pavuk-0.9.36_pre20120215-fix-underlinking.patch
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/pavuk/files/pavuk-0.9.36_pre20120215-fix-underlinking.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/pavuk/files/pavuk-0.9.36_pre20120215-fix-underlinking.patch?rev=1.1&content-type=text/plain
15
16 Index: pavuk-0.9.36_pre20120215-fix-underlinking.patch
17 ===================================================================
18 --- configure.in~ 2011-03-02 10:44:45.000000000 +0800
19 +++ configure.in 2012-02-23 09:55:28.073709216 +0800
20 @@ -1749,6 +1749,7 @@
21
22 if test -n "$GTK_LIBS" ; then
23 if test -n "$GTK_LIBS"; then
24 + AX_ADD_OPTION([LIBS], [$X_LIBS])
25 AX_ADD_OPTION([LIBS], [$GTK_LIBS])
26 AX_ADD_OPTION([CPPFLAGS], [$GTK_CFLAGS])
27 AC_DEFINE_UNQUOTED(GTK_FACE, [$GTK_VERSION], [with GTK+ GUI])
28
29
30
31 1.1 net-misc/pavuk/files/pavuk-0.9.36_pre20120215-fix-gtkmulticol-segfault.patch
32
33 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/pavuk/files/pavuk-0.9.36_pre20120215-fix-gtkmulticol-segfault.patch?rev=1.1&view=markup
34 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/pavuk/files/pavuk-0.9.36_pre20120215-fix-gtkmulticol-segfault.patch?rev=1.1&content-type=text/plain
35
36 Index: pavuk-0.9.36_pre20120215-fix-gtkmulticol-segfault.patch
37 ===================================================================
38 --- src/gtkmulticol.c 2009-01-21 16:37:39.000000000 +0800
39 +++ src/gtkmulticol.c 2012-02-21 09:47:21.680512626 +0800
40 @@ -45,9 +45,9 @@
41 static void gtk_multicol_size_request(GtkWidget *widget, GtkRequisition *requisition);
42 static void gtk_multicol_size_allocate(GtkWidget *widget, GtkAllocation *allocation);
43
44 -guint gtk_multicol_get_type(void)
45 +GType gtk_multicol_get_type(void)
46 {
47 - static guint multicol_type = 0;
48 + static GType multicol_type = 0;
49
50 if (!multicol_type)
51 {
52
53 --- src/gtkmulticol.h 2009-01-21 16:37:40.000000000 +0800
54 +++ src/gtkmulticol.h 2012-02-21 09:47:42.880514545 +0800
55 @@ -41,7 +41,7 @@
56 GtkBoxClass parent_class;
57 };
58
59 -guint gtk_multicol_get_type(void);
60 +GType gtk_multicol_get_type(void);
61 GtkWidget *gtk_multicol_new(gint nrows);
62 void gtk_multicol_set_number_of_rows(GtkMultiCol *multicol, gint nrows);
63 void gtk_multicol_set_spacing(GtkMultiCol *multicol, gint hspacing, gint vspacing);