[oe-commits] org.oe.dev merge of '089057d0f120a7856abf8245745dc0cddf2018de'

[rwhitby commit]

merge of '089057d0f120a7856abf8245745dc0cddf2018de'
     and 'bfbb7a4b91b1cef9bf586944b836302144e3c8b0'

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: e827e49beb99d448d8fffea3f155c549865b2e84
ViewMTN: http://monotone.openembedded.org/revision/info/e827e49beb99d448d8fffea3f155c549865b2e84
Files:
1
packages/gtkhtml/gtkhtml-3.8
packages/gtkhtml/gtkhtml-3.8/60_glib-2.15-g-gnuc-function.patch
packages/gtkhtml/gtkhtml-3.8_3.12.3.bb
packages/linux/linux-ixp4xx/defconfig-2.6.24.3
packages/linux/linux-ixp4xx/defconfig-2.6.24.4
packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.3
packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.4
packages/linux/linux-ixp4xx_2.6.24.3.bb
packages/linux/linux-ixp4xx_2.6.24.4.bb
conf/machine/include/ixp4xx.inc
Diffs:

#
# mt diff -r089057d0f120a7856abf8245745dc0cddf2018de -re827e49beb99d448d8fffea3f155c549865b2e84
#
#
#
# add_dir "packages/gtkhtml/gtkhtml-3.8"
# 
# add_file "packages/gtkhtml/gtkhtml-3.8/60_glib-2.15-g-gnuc-function.patch"
#  content [b1b1fae7207eeac786b8ee9ea7f0b098b2de0009]
# 
# add_file "packages/gtkhtml/gtkhtml-3.8_3.12.3.bb"
#  content [8472e2a38e79fa83c7aac126c8fbd65d7797528e]
#
============================================================
--- packages/gtkhtml/gtkhtml-3.8/60_glib-2.15-g-gnuc-function.patch	b1b1fae7207eeac786b8ee9ea7f0b098b2de0009
+++ packages/gtkhtml/gtkhtml-3.8/60_glib-2.15-g-gnuc-function.patch	b1b1fae7207eeac786b8ee9ea7f0b098b2de0009
@@ -0,0 +1,39 @@
+diff -Nur gtkhtml3.8-3.12.3/src/htmlengine-edit-clueflowstyle.c gtkhtml3.8-3.12.3.new/src/htmlengine-edit-clueflowstyle.c
+--- gtkhtml3.8-3.12.3/src/htmlengine-edit-clueflowstyle.c	2007-01-29 10:50:59.000000000 +0100
++++ gtkhtml3.8-3.12.3.new/src/htmlengine-edit-clueflowstyle.c	2008-02-15 10:07:22.000000000 +0100
+@@ -175,7 +175,7 @@
+ 	while (p != NULL) {
+ 		if (HTML_OBJECT_TYPE (obj->parent) != HTML_TYPE_CLUEFLOW) {
+ 			g_warning ("(%s:%s)  Eeeek!  Unknown parent type `%s'.",
+-				   __FILE__, G_GNUC_FUNCTION,
++				   __FILE__, G_STRFUNC,
+ 				   html_type_name (HTML_OBJECT_TYPE (obj->parent)));
+ 			break;
+ 		}
+@@ -209,7 +209,7 @@
+ 				/* This should not happen.  */
+ 				g_warning ("(%s:%s)  There were not enough paragraphs for "
+ 					   "setting the paragraph style.",
+-					   __FILE__, G_GNUC_FUNCTION);
++					   __FILE__, G_STRFUNC);
+ 				break;
+ 			}
+ 		} while (obj != NULL && HTML_CLUEFLOW (obj->parent) == clueflow);
+@@ -217,7 +217,7 @@
+ 
+ 	if (prop_list == NULL) {
+ 		/* This should not happen.  */
+-		g_warning ("%s:%s Eeek!  Nothing done?", __FILE__, G_GNUC_FUNCTION);
++		g_warning ("%s:%s Eeek!  Nothing done?", __FILE__, G_STRFUNC);
+ 		return;
+ 	}
+ 
+@@ -280,7 +280,7 @@
+ 	while (p != NULL) {
+ 		if (HTML_OBJECT_TYPE (p->parent) != HTML_TYPE_CLUEFLOW) {
+ 			g_warning ("(%s:%s)  Eeeek!  Unknown parent type `%s'.",
+-				   __FILE__, G_GNUC_FUNCTION,
++				   __FILE__, G_STRFUNC,
+ 				   html_type_name (HTML_OBJECT_TYPE (p->parent)));
+ 			break;
+ 		}
============================================================
--- packages/gtkhtml/gtkhtml-3.8_3.12.3.bb	8472e2a38e79fa83c7aac126c8fbd65d7797528e
+++ packages/gtkhtml/gtkhtml-3.8_3.12.3.bb	8472e2a38e79fa83c7aac126c8fbd65d7797528e
@@ -0,0 +1,29 @@
+DESCRIPTION = "HTML rendering/editing library"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui"
+
+SRC_URI = "${GNOME_MIRROR}/gtkhtml/3.12/gtkhtml-${PV}.tar.bz2 \
+           file://60_glib-2.15-g-gnuc-function.patch;patch=1"
+
+S = "${WORKDIR}/gtkhtml-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-gtk-doc"
+
+ORBIT_IDL = "${STAGING_BINDIR_NATIVE}/orbit-idl-2"
+
+do_configure_append() {
+        find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
+        find ${S} -name Makefile | xargs sed -i s:'-I${prefix}/include':'-I.':g
+        find ${S} -name Makefile | xargs sed -i 's|ORBIT_IDL =.*|ORBIT_IDL = ${ORBIT_IDL}|'
+}
+
+do_stage() {
+	autotools_stage_all
+}
+
+FILES_${PN} += "${datadir}/gtkhtml-3.8"
+


#
# mt diff -rbfbb7a4b91b1cef9bf586944b836302144e3c8b0 -re827e49beb99d448d8fffea3f155c549865b2e84
#
#
#
# rename "packages/linux/linux-ixp4xx/defconfig-2.6.24.3"
#     to "packages/linux/linux-ixp4xx/defconfig-2.6.24.4"
# 
# rename "packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.3"
#     to "packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.4"
# 
# rename "packages/linux/linux-ixp4xx_2.6.24.3.bb"
#     to "packages/linux/linux-ixp4xx_2.6.24.4.bb"
# 
# patch "conf/machine/include/ixp4xx.inc"
#  from [af1b2871a2c2334a9ab155190f79070786c9c41f]
#    to [858cbefa25de1ab4bbfcb2a59425e5b0487f6de4]
# 
# patch "packages/linux/linux-ixp4xx_2.6.24.4.bb"
#  from [067925905346daa80ca610740fd9398e7c32ca12]
#    to [493df9f1f9f80a8b08911a0846783e5101b6b828]
#
============================================================
--- conf/machine/include/ixp4xx.inc	af1b2871a2c2334a9ab155190f79070786c9c41f
+++ conf/machine/include/ixp4xx.inc	858cbefa25de1ab4bbfcb2a59425e5b0487f6de4
@@ -7,7 +7,7 @@ PREFERRED_PROVIDER_virtual/kernel ?= "li
 
 # Select an appropriate default kernel
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-ixp4xx"
-PREFERRED_VERSION_linux-ixp4xx ?= "2.6.24.3+svnr${SRCREV}"
+PREFERRED_VERSION_linux-ixp4xx ?= "2.6.24.4+svnr${SRCREV}"
 
 # Add packages required for basic networking support
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "ixp4xx-npe"
============================================================
--- packages/linux/linux-ixp4xx_2.6.24.3.bb	067925905346daa80ca610740fd9398e7c32ca12
+++ packages/linux/linux-ixp4xx_2.6.24.4.bb	493df9f1f9f80a8b08911a0846783e5101b6b828
@@ -2,7 +2,7 @@ VANILLA_VERSION = "2.6.24"
 require linux-ixp4xx.inc
 
 VANILLA_VERSION = "2.6.24"
-KERNEL_RELEASE = "2.6.24.3"
+KERNEL_RELEASE = "2.6.24.4"
 
 # If you use a rc, you will need to use this:
 #PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}+svnr${SRCREV}"