Update some gtk stuff, add redundant debug info to hildon-desktop and improve README
authorKirtika Ruchandani <kirtibr@gmail.com>
Tue, 21 Jul 2009 19:22:40 +0000 (00:52 +0530)
committerKirtika Ruchandani <kirtibr@gmail.com>
Tue, 21 Jul 2009 19:22:40 +0000 (00:52 +0530)
README
gtk+/files/gtk+2.0-2.12.12/automake-lossage.patch [new file with mode: 0644]
gtk+/files/gtk+2.0-2.12.12/gtklabel-resize-patch [new file with mode: 0644]
gtk+/files/gtk+2.0-2.12.12/png-use-old-symbol.patch [new file with mode: 0644]
gtk+/files/gtk+2.0-2.12.12/xsettings.patch [new file with mode: 0644]
gtk+/gtk+_2.12.12.bb
hd-trial.tar.gz
hildon-desktop_2.0.19.bb

diff --git a/README b/README
index 193c8af..f685030 100644 (file)
--- a/README
+++ b/README
@@ -9,6 +9,10 @@ BUILD INSTRUCTIONS
 NOTE: The tarballs for hildon-desktop and hildon-desktop-python-loader are locally hosted. 
 The corresponding recipes use file:// in their SRC_URI
 3. The image file, hildon-angstrom-image.bb goes under images.
+3b. The gtk and glib recipes should go to the corresponding folders, as they make use 
+of native recipes from the OE pack. Don't forget maemo-glib.inc
+3c. Angstrom conf files need to be put at the proper place, to stop angstrom
+from demanding latest gtk/glib
 4. For checksums.ini, merge into the existing one ????
 
 * The above steps should let one get started with an image build.
diff --git a/gtk+/files/gtk+2.0-2.12.12/automake-lossage.patch b/gtk+/files/gtk+2.0-2.12.12/automake-lossage.patch
new file mode 100644 (file)
index 0000000..0d423dd
--- /dev/null
@@ -0,0 +1,24 @@
+--- gtk+-2.4.1/docs/tutorial/Makefile.am~      2003-05-06 22:54:20.000000000 +0100
++++ gtk+-2.4.1/docs/tutorial/Makefile.am       2004-05-08 12:31:41.000000000 +0100
+@@ -52,21 +52,5 @@
+ dist-hook: html
+       cp -Rp $(srcdir)/html $(distdir)
+-else
+-html:
+-      echo "***"
+-      echo "*** Warning: Tutorial not built"
+-      echo "***"
+-
+-pdf:
+-      echo "***"
+-      echo "*** Warning: Tutorial not built"
+-      echo "***"
+-
+-dist-hook:
+-      echo "***"
+-      echo "*** Warning: Tutorial not built"
+-      echo "*** DISTRIBUTION IS INCOMPLETE"
+-      echo "***"
+ endif
diff --git a/gtk+/files/gtk+2.0-2.12.12/gtklabel-resize-patch b/gtk+/files/gtk+2.0-2.12.12/gtklabel-resize-patch
new file mode 100644 (file)
index 0000000..df29656
--- /dev/null
@@ -0,0 +1,10 @@
+--- gtk+-2.4.3/gtk/gtklabel.c~ 2004-06-11 13:50:34.000000000 +0100
++++ gtk+-2.4.3/gtk/gtklabel.c  2004-07-05 13:33:57.000000000 +0100
+@@ -1623,6 +1623,7 @@
+   /* We have to clear the layout, fonts etc. may have changed */
+   gtk_label_clear_layout (label);
++  gtk_widget_queue_resize (GTK_WIDGET (label));
+ }
+ static void 
diff --git a/gtk+/files/gtk+2.0-2.12.12/png-use-old-symbol.patch b/gtk+/files/gtk+2.0-2.12.12/png-use-old-symbol.patch
new file mode 100644 (file)
index 0000000..bc245c7
--- /dev/null
@@ -0,0 +1,56 @@
+Index: sources/gtk+2.0-2.12.12/gdk-pixbuf/io-png.c
+===================================================================
+--- gdk-pixbuf/io-png.c        2009-07-15 18:28:39.000000000 +0530
++++ gdk-pixbuf/io-png.c        2009-07-16 02:10:44.000000000 +0530
+@@ -259,20 +259,22 @@
+         gchar *key;
+         gchar *value;
+-#ifdef PNG_USER_MEM_SUPPORTED
+-      png_ptr = png_create_read_struct_2 (PNG_LIBPNG_VER_STRING,
++// Temp. fix [15/07/09 18:30:19  Kirtika B Ruchandani <kirtibr@gmail.com>]
++// Usage of png_create_read_struct_2 creates run-time problems 
++/*#ifdef PNG_USER_MEM_SUPPORTED
++        png_ptr = png_create_read_struct_2 (PNG_LIBPNG_VER_STRING,
+                                             error,
+                                             png_simple_error_callback,
+                                             png_simple_warning_callback,
+                                             NULL, 
+                                             png_malloc_callback, 
+                                             png_free_callback);
+-#else
++#else*/
+       png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING,
+                                           error,
+                                           png_simple_error_callback,
+                                           png_simple_warning_callback);
+-#endif
++//#endif
+       if (!png_ptr)
+               return NULL;
+@@ -422,20 +424,20 @@
+         
+         /* Create the main PNG context struct */
+-#ifdef PNG_USER_MEM_SUPPORTED
++/*#ifdef PNG_USER_MEM_SUPPORTED
+         lc->png_read_ptr = png_create_read_struct_2 (PNG_LIBPNG_VER_STRING,
+-                                                     lc, /* error/warning callback data */
++                                                     lc, 
+                                                      png_error_callback,
+                                                      png_warning_callback,
+                                                      NULL,
+                                                      png_malloc_callback,
+                                                      png_free_callback);
+-#else
++#else*/
+         lc->png_read_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,
+                                                   lc, /* error/warning callback data */
+                                                   png_error_callback,
+                                                   png_warning_callback);
+-#endif
++//#endif
+         if (lc->png_read_ptr == NULL) {
+                 g_free(lc);
+                 /* error callback should have set the error */
diff --git a/gtk+/files/gtk+2.0-2.12.12/xsettings.patch b/gtk+/files/gtk+2.0-2.12.12/xsettings.patch
new file mode 100644 (file)
index 0000000..b63e262
--- /dev/null
@@ -0,0 +1,16 @@
+--- gtk+-2.4.4/gdk/x11/gdkevents-x11.c.old     Sun Aug 22 17:14:00 2004
++++ gtk+-2.4.4/gdk/x11/gdkevents-x11.c Sun Aug 22 17:14:00 2004
+@@ -2827,10 +2827,9 @@
+ {
+   GdkScreenX11 *screen = data;
+   
+-  if (xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent))
+-    return GDK_FILTER_REMOVE;
+-  else
+-    return GDK_FILTER_CONTINUE;
++  xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent);
++
++  return GDK_FILTER_CONTINUE;
+ }
+ static void 
index 52f5edb..9d118b4 100644 (file)
@@ -4,14 +4,13 @@
 
 require gtk+.inc
 
-# Temporary additions for testing
+# Temporary addition for testing
 # to get rid of the vagaries of the 
 # standalone gdk-pixbuf recipe
 PROVIDES = "gdk-pixbuf"
 RPROVIDES = "gdk-pixbuf"
-EXTRA_OECONF += "--with-included-loaders=png,tga --disable-gtk-doc"
 
-PR = "r1"
+PR = "r103"
 
 DEPENDS += "cairo"
 
@@ -19,9 +18,8 @@ DEFAULT_PREFERENCE = 1
 
 S="${WORKDIR}/gtk+2.0-2.12.12"
 
-#FIXME : Patches currently used are only to get the build working. 
-#        After testing on the device,
-#        uncomment the required patches
+#FIXME : Patches currently used are only to get the build working. After testing on the device,
+#uncomment the required patches
 
 SRC_URI = "http://repository.maemo.org/pool/fremantle/free/g/gtk+2.0/gtk+2.0_${PV}-1maemo12+0m5.tar.gz \
            file://gtk+2.0-2.12.12/mer-changes.patch;patch=1 \
@@ -31,7 +29,6 @@ SRC_URI = "http://repository.maemo.org/pool/fremantle/free/g/gtk+2.0/gtk+2.0_${P
 #          file://gtk+2.0-2.12.12/run-iconcache.patch;patch=1 \
 #          file://gtk+2.0-2.12.12/hardcoded_libtool.patch;patch=1 \
            file://gtk+2.0-2.12.12/cellrenderer-cairo.patch;patch=1;pnum=0 \
-#this one really needs to be killed
            file://gtk+2.0-2.12.12/png-use-old-symbol.patch;patch=1;pnum=0 \
            file://gtk+2.0-2.12.12/entry-cairo.patch;patch=1;pnum=0 "
 #           file://gtk+2.0-2.12.12/toggle-font.diff;patch=1;pnum=0 \
@@ -46,6 +43,10 @@ SRC_URI = "http://repository.maemo.org/pool/fremantle/free/g/gtk+2.0/gtk+2.0_${P
 EXTRA_OECONF = "--with-libtiff --with-gdktarget=x11 --disable-xkb --enable-display-migration --disable-gtk-doc --with-maemo=yes --with-libpng --with-libjpeg --with-x "
 
 
+#Used for the gdk-pixbuf stuff
+EXTRA_OECONF += "--with-included-loaders=png,tga --disable-gtk-doc"
+
+
 
 
 LIBV = "2.10.0"
@@ -74,16 +75,20 @@ python populate_packages_prepend () {
                 bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d)
 }
 
+# check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points
+require gtk-fpu.inc
+EXTRA_OECONF += "${@get_gtk_fpu_setting(bb, d)}"
+
+
 PACKAGES += "gdk-pixbuf"
 
 FILES_gdk-pixbuf = " ${bindir}/gdk-pixbuf-query-loaders \
                         ${bindir}/gtk-update-icon-cache \
                         ${libdir}/libgdk*"
 
-# check for TARGET_FPU=soft and inform configure of the result 
-# so it can disable some floating points
-require gtk-fpu.inc
-EXTRA_OECONF += "${@get_gtk_fpu_setting(bb, d)}"
-
 
 
+# Needed while Testing 
+do_rm_work(){
+    :
+}
index 8af3ef1..4fdddf1 100644 (file)
Binary files a/hd-trial.tar.gz and b/hd-trial.tar.gz differ
index 78c5807..0e461ab 100644 (file)
@@ -11,9 +11,9 @@ PR = "r1"
 ##Temporary: to be fixed later
 SRC_URI = "file://hd-trial.tar.gz"
 
-EXTRA_OECONF += "--disable-gtk-doc"
+EXTRA_OECONF += "--enable-debug --disable-gtk-doc"
 
-S = "${WORKDIR}/hd-trial"
+S = "${WORKDIR}/hd-ins_in_usr"
 
 inherit autotools pkgconfig