[mingw-gtk2] make patch apply
sailer
sailer at fedoraproject.org
Tue Feb 11 11:22:49 UTC 2014
commit ddd58a934aaef613897909f38f6e287645851ca5
Author: Thomas Sailer <t.sailer at alumni.ethz.ch>
Date: Tue Feb 11 12:23:16 2014 +0100
make patch apply
gnomebug671538.patch | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/gnomebug671538.patch b/gnomebug671538.patch
index ea07420..771a422 100644
--- a/gnomebug671538.patch
+++ b/gnomebug671538.patch
@@ -13,14 +13,26 @@ https://bugzilla.gnome.org/show_bug.cgi?id=671538
gdk/win32/gdkpixmap-win32.h | 1 +
2 files changed, 8 insertions(+)
+diff --git a/gdk/win32/gdkpixmap-win32.h b/gdk/win32/gdkpixmap-win32.h
+index fbeb28f..e9d965d 100644
+--- a/gdk/win32/gdkpixmap-win32.h
++++ b/gdk/win32/gdkpixmap-win32.h
+@@ -53,6 +53,7 @@ struct _GdkPixmapImplWin32
+ gint height;
+ guchar *bits;
+ guint is_foreign : 1;
++ guint is_allocated : 1;
+ };
+
+ struct _GdkPixmapImplWin32Class
diff --git a/gdk/win32/gdkpixmap-win32.c b/gdk/win32/gdkpixmap-win32.c
index 6d18ca4..53c6f3c 100644
--- a/gdk/win32/gdkpixmap-win32.c
+++ b/gdk/win32/gdkpixmap-win32.c
-@@ -121,6 +121,11 @@ gdk_pixmap_impl_win32_finalize (GObject *object)
- /* Drop our reference */
- cairo_surface_destroy (drawable_impl->cairo_surface);
- drawable_impl->cairo_surface = NULL;
+@@ -126,6 +126,11 @@
+ cairo_surface_destroy (drawable_impl->cairo_surface);
+ drawable_impl->cairo_surface = NULL;
+ }
+
+ if (impl->is_allocated) {
+ GDI_CALL (DeleteDC, (drawable_impl->hdc));
@@ -29,7 +41,7 @@ index 6d18ca4..53c6f3c 100644
}
_gdk_win32_drawable_finish (GDK_DRAWABLE (object));
-@@ -264,6 +269,8 @@ _gdk_pixmap_new (GdkDrawable *drawable,
+@@ -269,6 +274,8 @@
HWND hwnd;
GdkVisual *visual;
@@ -38,17 +50,5 @@ index 6d18ca4..53c6f3c 100644
if (GDK_IS_WINDOW (drawable))
hwnd = GDK_WINDOW_HWND (drawable);
else
-diff --git a/gdk/win32/gdkpixmap-win32.h b/gdk/win32/gdkpixmap-win32.h
-index fbeb28f..e9d965d 100644
---- a/gdk/win32/gdkpixmap-win32.h
-+++ b/gdk/win32/gdkpixmap-win32.h
-@@ -53,6 +53,7 @@ struct _GdkPixmapImplWin32
- gint height;
- guchar *bits;
- guint is_foreign : 1;
-+ guint is_allocated : 1;
- };
-
- struct _GdkPixmapImplWin32Class
--
-1.8.1.1.439.g50a6b54
\ No newline at end of file
+1.8.1.1.439.g50a6b54
More information about the scm-commits
mailing list