rpms/dia/devel dia-0.94-fallbacktoxpmicons.patch, 1.1, 1.2 dia-0.95-pre6-help.patch, 1.1, 1.2 dia.spec, 1.25, 1.26

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/dia/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23537

Modified Files:
	dia-0.94-fallbacktoxpmicons.patch dia-0.95-pre6-help.patch 
	dia.spec 
Log Message:
Resolves: rhbz#464982 FTBFS, defuzz patches

dia-0.94-fallbacktoxpmicons.patch:

Index: dia-0.94-fallbacktoxpmicons.patch
===================================================================
RCS file: /cvs/pkgs/rpms/dia/devel/dia-0.94-fallbacktoxpmicons.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dia-0.94-fallbacktoxpmicons.patch	17 Oct 2005 10:54:39 -0000	1.1
+++ dia-0.94-fallbacktoxpmicons.patch	22 Oct 2008 07:46:42 -0000	1.2
@@ -1,6 +1,6 @@
 --- dia-0.94/app/interface.c.orit	2005-03-10 08:29:36.000000000 +0000
 +++ dia-0.94/app/interface.c	2005-03-10 08:30:44.000000000 +0000
-@@ -877,6 +877,17 @@
+@@ -940,6 +940,17 @@
        GError* gerror = NULL;
        
        pixbuf = gdk_pixbuf_new_from_file(sheet_obj->pixmap_file, &gerror);
@@ -16,11 +16,11 @@
 +      }
 +
        if (pixbuf != NULL) {
-           gdk_pixbuf_render_pixmap_and_mask(pixbuf, &pixmap, &mask, 1.0);
+           gdk_pixbuf_render_pixmap_and_mask_for_colormap(pixbuf, gtk_widget_get_colormap(sheet_wbox), &pixmap, &mask, 1.0);
            gdk_pixbuf_unref(pixbuf);
-@@ -885,6 +896,7 @@
-           g_warning("failed to load pixbuf for file %s; cause=%s",
-                     sheet_obj->pixmap_file,gerror?gerror->message:"[NULL]");
+@@ -951,6 +962,7 @@
+           message_warning("failed to load icon for file\n %s\n cause=%s",
+                           sheet_obj->pixmap_file,gerror?gerror->message:"[NULL]");
        }
 +      if (gerror) g_error_free (gerror);
      } else {

dia-0.95-pre6-help.patch:

Index: dia-0.95-pre6-help.patch
===================================================================
RCS file: /cvs/pkgs/rpms/dia/devel/dia-0.95-pre6-help.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dia-0.95-pre6-help.patch	31 Mar 2006 18:15:44 -0000	1.1
+++ dia-0.95-pre6-help.patch	22 Oct 2008 07:46:42 -0000	1.2
@@ -42,4 +42,4 @@
 +"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
    [
  
-     <!ENTITY VERSION "0.95-pre6">
+     <!ENTITY VERSION "0.96.1">


Index: dia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dia/devel/dia.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- dia.spec	1 Feb 2008 14:35:55 -0000	1.25
+++ dia.spec	22 Oct 2008 07:46:42 -0000	1.26
@@ -1,6 +1,6 @@
 Name:           dia
 Version:        0.96.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Epoch:          1
 Summary:        Diagram drawing program
 Group:          Applications/Multimedia
@@ -110,6 +110,9 @@
 
 
 %changelog
+* Wed Oct 22 2008 Caolán McNamara <caolanm at redhat.com> 1:0.96.1-7
+- Resolves: rhbz#464982 FTBFS, defuzz patches
+
 * Fri Feb  1 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1:0.96.1-6
 - Fix svg export (bug 431184)