Mercurial > projects > doodle

diff nobuild/gtkd-patches.diff @ 109:02fed38c6261

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Following updates to gtkd, updated gtkd-patches.diff and removed gtk64.diff as it is no longer necessary
author David Bryant <bagnose@gmail.com>
date Wed, 09 Mar 2011 13:32:06 +1030
parents ab745d8b10e5
children 403c34305a39
line wrap: on
line diff
--- a/nobuild/gtkd-patches.diff	Fri Mar 04 13:14:04 2011 +1030
+++ b/nobuild/gtkd-patches.diff	Wed Mar 09 13:32:06 2011 +1030
@@ -1,28 +1,6 @@
-Index: GNUmakefile
-===================================================================
---- GNUmakefile	(revision 797)
-+++ GNUmakefile	(working copy)
-@@ -1,6 +1,7 @@
- #makeAll.sh
- SHELL=/bin/sh
--prefix=/usr/local
-+#prefix=/usr/local
-+prefix=/home/daveb/source/d/dmd
- 
- OS=$(shell uname || uname -s)
- ARCH=$(shell arch || uname -m)
-@@ -19,7 +20,7 @@
- endif
- 
- ifeq ("$(DC)","dmd")
--    DCFLAGS=-O
-+    DCFLAGS=-O -w -wi
-     output=-of$@
- else ifeq ("$(DC)","ldc")
-     DCFLAGS=-O
 Index: src/gdkpixbuf/PixbufAnimation.d
 ===================================================================
---- src/gdkpixbuf/PixbufAnimation.d	(revision 797)
+--- src/gdkpixbuf/PixbufAnimation.d	(revision 802)
 +++ src/gdkpixbuf/PixbufAnimation.d	(working copy)
 @@ -167,7 +167,7 @@
  	 * Adds a reference to an animation.
@@ -44,7 +22,7 @@
  		gdk_pixbuf_animation_unref(gdkPixbufAnimation);
 Index: src/gdk/Drawable.d
 ===================================================================
---- src/gdk/Drawable.d	(revision 797)
+--- src/gdk/Drawable.d	(revision 802)
 +++ src/gdk/Drawable.d	(working copy)
 @@ -197,7 +197,7 @@
  	 * (Drawables were not objects in previous versions of GDK.)
@@ -66,7 +44,7 @@
  		gdk_drawable_unref(gdkDrawable);
 Index: src/gdk/GC.d
 ===================================================================
---- src/gdk/GC.d	(revision 797)
+--- src/gdk/GC.d	(revision 802)
 +++ src/gdk/GC.d	(working copy)
 @@ -211,7 +211,7 @@
  	 * Deprecated function; use g_object_ref() instead.
@@ -88,7 +66,7 @@
  		gdk_gc_unref(gdkGC);
 Index: src/gtk/OrientableT.d
 ===================================================================
---- src/gtk/OrientableT.d	(revision 797)
+--- src/gtk/OrientableT.d	(revision 802)
 +++ src/gtk/OrientableT.d	(working copy)
 @@ -92,7 +92,7 @@
  	 * Since 2.16
@@ -110,7 +88,7 @@
  		gtk_orientable_set_orientation(getOrientableTStruct(), orientation);
 Index: src/gtk/ScaleButton.d
 ===================================================================
---- src/gtk/ScaleButton.d	(revision 797)
+--- src/gtk/ScaleButton.d	(revision 802)
 +++ src/gtk/ScaleButton.d	(working copy)
 @@ -366,6 +366,7 @@
  		return new Widget(cast(GtkWidget*) p);
@@ -128,7 +106,7 @@
  }
 Index: src/gtk/Style.d
 ===================================================================
---- src/gtk/Style.d	(revision 797)
+--- src/gtk/Style.d	(revision 802)
 +++ src/gtk/Style.d	(working copy)
 @@ -281,7 +281,7 @@
  	 * Increase the reference count of style.
@@ -150,7 +128,7 @@
  		gtk_style_unref(gtkStyle);
 Index: src/gtk/BuildableT.d
 ===================================================================
---- src/gtk/BuildableT.d	(revision 797)
+--- src/gtk/BuildableT.d	(revision 802)
 +++ src/gtk/BuildableT.d	(working copy)
 @@ -95,7 +95,7 @@
  	protected GtkBuildable* gtkBuildable;
@@ -253,7 +231,7 @@
  		auto p = gtk_buildable_get_internal_child(getBuildableTStruct(), (builder is null) ? null : builder.getBuilderStruct(), Str.toStringz(childname));
 Index: src/gtk/ObjectGtk.d
 ===================================================================
---- src/gtk/ObjectGtk.d	(revision 797)
+--- src/gtk/ObjectGtk.d	(revision 802)
 +++ src/gtk/ObjectGtk.d	(working copy)
 @@ -227,7 +227,7 @@
  	 * Increases the reference count of the object.
@@ -275,11 +253,11 @@
  		gtk_object_unref(gtkObject);
 Index: src/gtk/TextBuffer.d
 ===================================================================
---- src/gtk/TextBuffer.d	(revision 797)
+--- src/gtk/TextBuffer.d	(revision 802)
 +++ src/gtk/TextBuffer.d	(working copy)
-@@ -119,7 +119,7 @@
- version(Tango) {
- 	private import tango.core.Vararg;
+@@ -125,7 +125,7 @@
+ 
+ 	version = druntime;
  } else {
 -	private import std.stdarg;
 +	private import core.vararg;
@@ -288,7 +266,7 @@
  
 Index: src/gtk/RecentChooserMenu.d
 ===================================================================
---- src/gtk/RecentChooserMenu.d	(revision 797)
+--- src/gtk/RecentChooserMenu.d	(revision 802)
 +++ src/gtk/RecentChooserMenu.d	(working copy)
 @@ -194,6 +194,7 @@
  		this(cast(GtkRecentChooserMenu*) p);
@@ -306,7 +284,7 @@
  }
 Index: src/gtk/Toolbar.d
 ===================================================================
---- src/gtk/Toolbar.d	(revision 797)
+--- src/gtk/Toolbar.d	(revision 802)
 +++ src/gtk/Toolbar.d	(working copy)
 @@ -437,6 +437,7 @@
  		gtk_toolbar_set_show_arrow(gtkToolbar, showArrow);
@@ -370,7 +348,7 @@
  	 * Warning
 Index: src/gtk/TreeViewColumn.d
 ===================================================================
---- src/gtk/TreeViewColumn.d	(revision 797)
+--- src/gtk/TreeViewColumn.d	(revision 802)
 +++ src/gtk/TreeViewColumn.d	(working copy)
 @@ -218,6 +218,7 @@
  		this(cast(GtkTreeViewColumn*) p);
@@ -404,24 +382,9 @@
  	
  	/**
  	 * Sets the spacing field of tree_column, which is the number of pixels to
-Index: src/cairo/Context.d
-===================================================================
---- src/cairo/Context.d	(revision 797)
-+++ src/cairo/Context.d	(working copy)
-@@ -152,6 +152,10 @@
- 		// cairo_t* gdk_cairo_create (GdkDrawable *);
- 		this(gdk_cairo_create(drawable.getDrawableStruct()));
- 	}
-+
-+        ~this () {
-+            cairo_destroy(cairo);
-+        }
- 	
- 	/**
- 	 * Sets the specified GdkColor as the source color of cr.
 Index: src/gio/InetAddress.d
 ===================================================================
---- src/gio/InetAddress.d	(revision 797)
+--- src/gio/InetAddress.d	(revision 802)
 +++ src/gio/InetAddress.d	(working copy)
 @@ -205,7 +205,7 @@
  	 * Since 2.22
@@ -434,7 +397,7 @@
  		return Str.toString(g_inet_address_to_string(gInetAddress));
 Index: src/gio/UnixInputStream.d
 ===================================================================
---- src/gio/UnixInputStream.d	(revision 797)
+--- src/gio/UnixInputStream.d	(revision 802)
 +++ src/gio/UnixInputStream.d	(working copy)
 @@ -171,9 +171,11 @@
  	 * Since 2.20
@@ -450,7 +413,7 @@
  }
 Index: src/gio/UnixOutputStream.d
 ===================================================================
---- src/gio/UnixOutputStream.d	(revision 797)
+--- src/gio/UnixOutputStream.d	(revision 802)
 +++ src/gio/UnixOutputStream.d	(working copy)
 @@ -171,9 +171,11 @@
  	 * Since 2.20
@@ -464,9 +427,31 @@
  	}
 +        +/
  }
+Index: GNUmakefile
+===================================================================
+--- GNUmakefile	(revision 802)
++++ GNUmakefile	(working copy)
+@@ -1,6 +1,7 @@
+ #makeAll.sh
+ SHELL=/bin/sh
+-prefix=/usr/local
++#prefix=/usr/local
++prefix=/home/daveb/source/d/dmd
+ 
+ OS=$(shell uname || uname -s)
+ ARCH=$(shell arch || uname -m)
+@@ -19,7 +20,7 @@
+ endif
+ 
+ ifeq ("$(DC)","dmd")
+-    DCFLAGS=-O
++    DCFLAGS=-O -w -wi -m32
+     output=-of$@
+ else ifeq ("$(DC)","ldc")
+     DCFLAGS=-O
 Index: demos/dsss.conf
 ===================================================================
---- demos/dsss.conf	(revision 797)
+--- demos/dsss.conf	(revision 802)
 +++ demos/dsss.conf	(working copy)
 @@ -31,5 +31,6 @@
  #type = subdir
@@ -478,9 +463,9 @@
 \ No newline at end of file
 Index: demos/gtkD/TestWindow/TestWindow.d
 ===================================================================
---- demos/gtkD/TestWindow/TestWindow.d	(revision 797)
+--- demos/gtkD/TestWindow/TestWindow.d	(revision 802)
 +++ demos/gtkD/TestWindow/TestWindow.d	(working copy)
-@@ -948,7 +948,8 @@
+@@ -949,7 +949,8 @@
  				gdkThreadsLeave();
  				yield();
  			}