File librsvg-2.32.0-gtk3.patch of Package mingw64-librsvg

Overview Repositories Revisions Requests Users Attributes Meta

File librsvg-2.32.0-gtk3.patch of Package mingw64-librsvg (Revision 42fc5a9756c45e2536b2fa519e16f866)

Currently displaying revision 42fc5a9756c45e2536b2fa519e16f866 , Show latest

--- librsvg-2.32.0/configure.in	2010-09-27 01:24:18.000000000 +0200
+++ librsvg-2.32.0/configure.in	2010-09-27 11:50:13.000000000 +0200
@@ -248,6 +248,14 @@
   fi
 fi
 
+if test "x$enable_gtk_theme" = "xyes" -o "x$enable_pixbuf_loader" = "xyes"; then
+  PKG_CHECK_MODULES([GTK3],[gtk+-3.0 >= $GTK3_REQUIRED],[have_gtk_3=yes],[have_gtk_3=no])
+
+  if test "$have_gtk_3" = "yes"; then
+     GTK2_BINARY_VERSION="`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`"
+  fi
+fi
+
 AC_SUBST([GTK2_BINARY_VERSION])
 AC_SUBST([GTK3_BINARY_VERSION])
 
--- librsvg-2.32.0/gtk-engine/svg-render.c	2010-07-02 15:10:58.000000000 +0200
+++ librsvg-2.32.0/gtk-engine/svg-render.c	2010-09-11 04:42:37.000000000 +0200
@@ -418,21 +418,30 @@
       y_offset = 0;
     }
 
+  cairo_t *cr;
+
   if (mask)
     {
-      gdk_pixbuf_render_threshold_alpha (tmp_pixbuf, mask,
-					 x_offset, y_offset,
-					 rect.x, rect.y,
-					 rect.width, rect.height,
-					 128);
-    }
+      cr = gdk_cairo_create (mask);
+
+      gdk_cairo_set_source_pixbuf (cr, tmp_pixbuf,
+                                   -x_offset + rect.x, 
+                                   -y_offset + rect.y);
+      gdk_cairo_rectangle (cr, &rect);
+      cairo_fill (cr);
+
+      cairo_destroy (cr);
+    }
+
+  cr = gdk_cairo_create (window);
+  gdk_cairo_set_source_pixbuf (cr, 
+                               tmp_pixbuf,
+                               -x_offset + rect.x, 
+                               -y_offset + rect.y);
+  gdk_cairo_rectangle (cr, &rect);
+  cairo_fill (cr);
 
-  gdk_draw_pixbuf (window, NULL, tmp_pixbuf, 
-		   x_offset, y_offset,
-		   rect.x, rect.y,
-		   rect.width, rect.height,
-		   GDK_RGB_DITHER_NORMAL,
-		   0, 0);
+  cairo_destroy (cr);
   g_object_unref (tmp_pixbuf);
 }
 
@@ -827,37 +836,20 @@
 	}
       else
 	{
-	  GdkPixmap *tmp_pixmap;
-	  GdkGC *tmp_gc;
-	  GdkGCValues gc_values;
-
-	  tmp_pixmap = gdk_pixmap_new (window,
-				       pixbuf_width,
-				       pixbuf_height,
-				       -1);
-	  tmp_gc = gdk_gc_new (tmp_pixmap);
-	  gdk_draw_pixbuf (tmp_pixmap, tmp_gc, pixbuf, 
-			   0, 0, 
-			   0, 0,
-			   pixbuf_width, pixbuf_height,
-			   GDK_RGB_DITHER_NORMAL,
-			   0, 0);
-	  g_object_unref (tmp_gc);
-
-	  gc_values.fill = GDK_TILED;
-	  gc_values.tile = tmp_pixmap;
-	  tmp_gc = gdk_gc_new_with_values (window,
-					   &gc_values, GDK_GC_FILL | GDK_GC_TILE);
+          cairo_t *cr = gdk_cairo_create (window);
+
+          gdk_cairo_set_source_pixbuf (cr, pixbuf, 0, 0);
+          cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT);
+
 	  if (clip_rect)
-	    gdk_draw_rectangle (window, tmp_gc, TRUE,
-				clip_rect->x, clip_rect->y, clip_rect->width, clip_rect->height);
+	    gdk_cairo_rectangle (cr, clip_rect);
 	  else
-	    gdk_draw_rectangle (window, tmp_gc, TRUE, x, y, width, height);
+	    cairo_rectangle (cr, x, y, width, height);
 	  
-	  g_object_unref (tmp_gc);
-	  g_object_unref (tmp_pixmap);
+          cairo_fill (cr);
+
+          cairo_destroy (cr);
 	}
     }
-
   g_object_unref(pixbuf);
 }
--- librsvg-2.32.0/test-display.c	2010-07-02 15:10:58.000000000 +0200
+++ librsvg-2.32.0/test-display.c	2010-09-11 05:05:53.000000000 +0200
@@ -532,16 +532,26 @@
         g_signal_connect (menu_item, "activate", G_CALLBACK (copy_svg_location), info);
         gtk_widget_show (menu_item);
         gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), menu_item);
+#if GTK_CHECK_VERSION(2,90,7)
+        gtk_widget_add_accelerator (menu_item, "activate", info->accel_group, GDK_KEY_C,
+                                    GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
+#else
         gtk_widget_add_accelerator (menu_item, "activate", info->accel_group, GDK_C,
                                     GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
+#endif
     }
 
     menu_item = gtk_image_menu_item_new_from_stock (GTK_STOCK_SAVE, NULL);
     g_signal_connect (menu_item, "activate", G_CALLBACK (save_svg), info);
     gtk_widget_show (menu_item);
     gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), menu_item);
+#if GTK_CHECK_VERSION(2,90,7)
+    gtk_widget_add_accelerator (menu_item, "activate", info->accel_group, GDK_KEY_S, GDK_CONTROL_MASK,
+                                GTK_ACCEL_VISIBLE);
+#else
     gtk_widget_add_accelerator (menu_item, "activate", info->accel_group, GDK_S, GDK_CONTROL_MASK,
                                 GTK_ACCEL_VISIBLE);
+#endif
 
     menu_item = gtk_image_menu_item_new_with_label (_("Save as PNG"));
     stock = gtk_image_new_from_stock (GTK_STOCK_SAVE_AS, GTK_ICON_SIZE_MENU);
@@ -550,31 +560,51 @@
     g_signal_connect (menu_item, "activate", G_CALLBACK (save_pixbuf), info);
     gtk_widget_show (menu_item);
     gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), menu_item);
+#if GTK_CHECK_VERSION(2,90,7)
+    gtk_widget_add_accelerator (menu_item, "activate", info->accel_group, GDK_KEY_S,
+                                GDK_CONTROL_MASK | GDK_SHIFT_MASK, GTK_ACCEL_VISIBLE);
+#else
     gtk_widget_add_accelerator (menu_item, "activate", info->accel_group, GDK_S,
                                 GDK_CONTROL_MASK | GDK_SHIFT_MASK, GTK_ACCEL_VISIBLE);
+#endif
 
 #if GTK_CHECK_VERSION(2,10,0)
     menu_item = gtk_image_menu_item_new_from_stock (GTK_STOCK_PRINT, NULL);
     g_signal_connect (menu_item, "activate", G_CALLBACK (print_pixbuf), info);
     gtk_widget_show (menu_item);
     gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), menu_item);
+#if GTK_CHECK_VERSION(2,90,7)
+    gtk_widget_add_accelerator (menu_item, "activate", info->accel_group, GDK_KEY_P, GDK_CONTROL_MASK,
+                                GTK_ACCEL_VISIBLE);
+#else
     gtk_widget_add_accelerator (menu_item, "activate", info->accel_group, GDK_P, GDK_CONTROL_MASK,
                                 GTK_ACCEL_VISIBLE);
 #endif
+#endif
 
     menu_item = gtk_image_menu_item_new_from_stock (GTK_STOCK_ZOOM_IN, NULL);
     g_signal_connect (menu_item, "activate", G_CALLBACK (zoom_in), info);
     gtk_widget_show (menu_item);
     gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), menu_item);
+#if GTK_CHECK_VERSION(2,90,7)
+    gtk_widget_add_accelerator (menu_item, "activate", info->accel_group, GDK_KEY_plus,
+                                GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
+#else
     gtk_widget_add_accelerator (menu_item, "activate", info->accel_group, GDK_plus,
                                 GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
+#endif
 
     menu_item = gtk_image_menu_item_new_from_stock (GTK_STOCK_ZOOM_OUT, NULL);
     g_signal_connect (menu_item, "activate", G_CALLBACK (zoom_out), info);
     gtk_widget_show (menu_item);
     gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), menu_item);
+#if GTK_CHECK_VERSION(2,90,7)
+    gtk_widget_add_accelerator (menu_item, "activate", info->accel_group, GDK_KEY_minus,
+                                GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
+#else
     gtk_widget_add_accelerator (menu_item, "activate", info->accel_group, GDK_minus,
                                 GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
+#endif
 
     info->popup_menu = popup_menu;
 }

Places

File librsvg-2.32.0-gtk3.patch of Package mingw64-librsvg (Revision 42fc5a9756c45e2536b2fa519e16f866)

Places