----- Original Message ----- > Hi Andrew, > below are the outputs for git diff and just below that is what i would like > to prepend to the changelog file. > Unfortunately as you can see, i've left the previous includes commented out > and not deleted them in case something goes horribly wrong. > Should i go and delete those lines or keep them commented out just in case?
Go ahead and delete them. They'll be in the git history anyway and the Classpath developer guide says dead code shouldn't be kept. > Hopefully the format of the changelog bit is okay. > Probably more detailed than it needs to be. You don't need to alter THANK YOU. You do need to add yourself to AUTHORS on your first commit :) > Also in terms of the next steps in committing do I just use > git add -a > git commit > To commit the patch once its confirmed? > Yes, assuming the ChangeLog is part of the patch. That commits it locally. To push it to the public repository, you need to use git push. It's usually set up to work with just "git push" though I recommend adding -v for verbosity. > diff --git a/native/jni/gtk-peer/Makefile.am > b/native/jni/gtk-peer/Makefile.am > index 6ab3263..682ba32 100644 > --- a/native/jni/gtk-peer/Makefile.am > +++ b/native/jni/gtk-peer/Makefile.am > @@ -58,4 +58,6 @@ AM_CPPFLAGS = @CLASSPATH_INCLUDES@ > # headers contain broken prototypes (by design, see gtkitemfactory.h). > AM_CFLAGS = @WARNING_CFLAGS@ @ERROR_CFLAGS@ \ > @GTK_CFLAGS@ @FREETYPE2_CFLAGS@ @PANGOFT2_CFLAGS@ \ > - @X_CFLAGS@ @EXTRA_CFLAGS@ > + @X_CFLAGS@ @EXTRA_CFLAGS@ \ > + "-DGTK_DISABLE_SINGLE_INCLUDES" > + > diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c > b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c > index 58f003e..f54fb49 100644 > --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c > +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c > @@ -39,8 +39,11 @@ exception statement from your version. */ > #include "gdkfont.h" > #include "cairographics2d.h" > #include "gnu_java_awt_peer_gtk_CairoGraphics2D.h" > -#include <gdk/gdktypes.h> > -#include <gdk/gdkprivate.h> > +#include <gdk/gdk.h> > +#include <gdk/gdkx.h> > + > +//#include <gdk/gdktypes.h> > +//#include <gdk/gdkprivate.h> > > #include <cairo-ft.h> > > diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c > b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c > index 31bab77..a697e3b 100644 > --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c > +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c > @@ -37,8 +37,12 @@ exception statement from your version. */ > > #include "jcl.h" > #include "gtkpeer.h" > -#include <gdk/gdktypes.h> > -#include <gdk/gdkprivate.h> > + > +//#include <gdk/gdktypes.h> > +#include <gdk/gdk.h> > + > +//#include <gdk/gdkprivate.h> > +#include <gdk/gdkx.h> > > #include <gdk-pixbuf/gdk-pixbuf.h> > #include <gdk-pixbuf/gdk-pixdata.h> > diff --git > a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphicsCopy.c > b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphicsCopy.c > index df700f5..7171e48 100644 > --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphicsCopy.c > +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphicsCopy.c > @@ -37,8 +37,12 @@ exception statement from your version. */ > > #include "jcl.h" > #include "gtkpeer.h" > -#include <gdk/gdktypes.h> > -#include <gdk/gdkprivate.h> > + > +//#include <gdk/gdktypes.h> > +#include <gdk/gdk.h> > + > +//#include <gdk/gdkprivate.h> > +#include <gdk/gdkx.h> > > #include <gdk-pixbuf/gdk-pixbuf.h> > #include <gdk-pixbuf/gdk-pixdata.h> > diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c > b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c > index 5de5d82..592d944 100644 > --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c > +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c > @@ -39,7 +39,8 @@ exception statement from your version. */ > #include "gtkpeer.h" > #include "gnu_java_awt_peer_gtk_GtkComponentPeer.h" > > -#include <gtk/gtkprivate.h> > +#include <gtk/gtk.h> > +//#include <gtk/gtkprivate.h> > > #define AWT_DEFAULT_CURSOR 0 > #define AWT_CROSSHAIR_CURSOR 1 > diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c > b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c > index af0868c..9f323d6 100644 > --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c > +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c > @@ -37,8 +37,14 @@ exception statement from your version. */ > > #include "jcl.h" > #include "gtkpeer.h" > -#include <gdk/gdktypes.h> > -#include <gdk/gdkprivate.h> > + > + > +//#include <gdk/gdktypes.h> > +#include <gdk/gdk.h> > + > +//#include <gdk/gdkprivate.h> > +#include <gdk/gdkx.h> > + > #include <gdk-pixbuf/gdk-pixbuf.h> > #include <gdk-pixbuf/gdk-pixdata.h> > > CHANGELOG > > 2013-06-30 Farshad Muhammad <farshadmuham...@cmail.carleton.ca> > * THANK YOU: List Andrew John Hughes > * native/jni/gtk-peer/Makefile.am > added AM_CFLAGS Macro > Line 62: "-DGTK_DISABLE_SINGLE_INCLUDES" > * native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c > Changed includes > Line 42: #include <gdk/gdktypes.h> to #include <gdk/gdk.h> > Line 43: #include <gdk/gdkprivate.h> to #include > <gdk/gdkx.h> > * native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c > Changed includes > Line 41: #include <gdk/gdktypes.h> to #include > <gdk/gdk.h> > Line 44: #include <gdk/gdkprivate.h> to #include > <gdk/gdkx.h> > * > native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphicsCopy.c > Changed includes > Line 41: #include <gdk/gdktypes.h> to #include <gdk/gdk.h> > Line 44: #include <gdk/gdkprivate.h> to #include > <gdk/gdkx.h> > * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c > Changed includes > Line 43: #include <gtk/gtkprivate.h> to #include <gtk/gtk.h> > * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c > Changed includes > Line 42: #include <gdk/gdktypes.h> to #include > <gdk/gdk.h> > Line 45: #include <gdk/gdkprivate.h> to #include > <gdk/gdkx.h> > > > ________________________________________ > From: Andrew Hughes [gnu.and...@redhat.com] > Sent: Friday, May 31, 2013 4:22 AM > To: Farshad Muhammad > Cc: classpath-patches@gnu.org > Subject: Re: [cp-patches] [GNU ClassPath] porting the GTK+3 AWT support > > ----- Original Message ----- > > Hey guys, > > My name is Farshad Muhammad and i've recently been accepted to GSoC 2013. > > > > I will be working to port GTK+3 AWT support for the gtk-peer in the > > classpath > > following a migration guide provided here: > > https://developer.gnome.org/gtk3/3.5/gtk-migrating-2-to-3.html > > > > The porting process requires the classpath first to be prepared under GTK + > > 2.24 and built under certain CFLAG macros. I have successfully resolved one > > of the macros which require there to be no single includes in the gtk-peer > > of the classpath. > > > > The classpath now builds successfully using the command : > > > > make CFLAGS+="-DGTK_DISABLE_SINGLE_INCLUDES" > > > > Here is a list of changes I had to make to achieve this: > > > > LOG FOR SINGLE INCLUDE CHANGES: > > > > gtk_CairoGraphics2D.c > > > > Line 42: #include <gdk/gdktypes.h> to #include <gdk/gdk.h> > > Line 43: #include <gdk/gdkprivate.h> to #include <gdk/gdkx.h> > > > > > > gtk_ComponentGraphics.c > > > > Line 41: #include <gdk/gdktypes.h> to #include <gdk/gdk.h> > > Line 44: #include <gdk/gdkprivate.h> to #include <gdk/gdkx.h> > > > > gtk_ComponentGraphicsCopy.c > > > > Line 41: #include <gdk/gdktypes.h> to #include <gdk/gdk.h> > > Line 44: #include <gdk/gdkprivate.h> to #include <gdk/gdkx.h> > > > > gtk_ComponentPeer.c > > > > Line 43: #include <gtk/gtkprivate.h> to #include <gtk/gtk.h> > > > > gtk_VolatileImage.c > > > > Line 42: #include <gdk/gdktypes.h> to #include <gdk/gdk.h> > > Line 45: #include <gdk/gdkprivate.h> to #include <gdk/gdkx.h> > > > > I would like to commit these changes as a classpath patch. > > > > > > > > Hi Farshad, > > First of all, welcome to the project and I hope you enjoy working > with us for Google's Summer of Code. > > For your patch, you should attach the output of 'git diff' to your > mail. You also need to make the CFLAGS change permanent in the > Makefile.am. > > Each change also needs a ChangeLog entry. You can look in the file > ChangeLog for examples and add yours there. Include the entry in the > mail but not as part of the attached patch (though it should be part > of the final commit), as this makes it easier for others to apply and > test your patch. > > Thanks and congratulations on your first contribution! > -- > Andrew :) > > Free Java Software Engineer > Red Hat, Inc. (http://www.redhat.com) > > PGP Key: 248BDC07 (https://keys.indymedia.org/) > Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 > > > > > -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) PGP Key: 248BDC07 (https://keys.indymedia.org/) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07
