[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

[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

[Pacho Ramos (pacho)]

pacho       12/02/25 12:31:13

  Added:                pavuk-0.9.36_pre20120215-fix-underlinking.patch
                        pavuk-0.9.36_pre20120215-fix-gtkmulticol-segfault.patch
  Log:
  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.
  
  (Portage version: 2.1.10.49/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  net-misc/pavuk/files/pavuk-0.9.36_pre20120215-fix-underlinking.patch

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
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

Index: pavuk-0.9.36_pre20120215-fix-underlinking.patch
===================================================================
--- configure.in~	2011-03-02 10:44:45.000000000 +0800
+++ configure.in	2012-02-23 09:55:28.073709216 +0800
@@ -1749,6 +1749,7 @@
 
     if test -n "$GTK_LIBS" ; then
       if test -n "$GTK_LIBS"; then
+        AX_ADD_OPTION([LIBS], [$X_LIBS])
         AX_ADD_OPTION([LIBS], [$GTK_LIBS])
         AX_ADD_OPTION([CPPFLAGS], [$GTK_CFLAGS])
         AC_DEFINE_UNQUOTED(GTK_FACE, [$GTK_VERSION], [with GTK+ GUI])



1.1                  net-misc/pavuk/files/pavuk-0.9.36_pre20120215-fix-gtkmulticol-segfault.patch

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
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

Index: pavuk-0.9.36_pre20120215-fix-gtkmulticol-segfault.patch
===================================================================
--- src/gtkmulticol.c	2009-01-21 16:37:39.000000000 +0800
+++ src/gtkmulticol.c	2012-02-21 09:47:21.680512626 +0800
@@ -45,9 +45,9 @@
 static void gtk_multicol_size_request(GtkWidget *widget, GtkRequisition *requisition);
 static void gtk_multicol_size_allocate(GtkWidget *widget, GtkAllocation *allocation);
 
-guint gtk_multicol_get_type(void)
+GType gtk_multicol_get_type(void)
 {
-    static guint multicol_type = 0;
+    static GType multicol_type = 0;
 
     if (!multicol_type)
     {

--- src/gtkmulticol.h	2009-01-21 16:37:40.000000000 +0800
+++ src/gtkmulticol.h	2012-02-21 09:47:42.880514545 +0800
@@ -41,7 +41,7 @@
     GtkBoxClass parent_class;
 };
 
-guint gtk_multicol_get_type(void);
+GType gtk_multicol_get_type(void);
 GtkWidget *gtk_multicol_new(gint nrows);
 void gtk_multicol_set_number_of_rows(GtkMultiCol *multicol, gint nrows);
 void gtk_multicol_set_spacing(GtkMultiCol *multicol, gint hspacing, gint vspacing);