merge of '7c5dba6a4cc7c7a653ff9454f9d2787304cdc736'

and 'a92b3f38a2b90eca4b4e230c498fbe32f7013525'
author: Richard Purdie <rpurdie@rpsys.net> 2006-11-15 10:44:22 +0000
committer: Richard Purdie <rpurdie@rpsys.net> 2006-11-15 10:44:22 +0000
commit: 528450f67d00cd3cad700d93cbe88bff666dea84 (patch)
tree: 119422052188818eb8da2bcdf3bed73763d1a9ff /packages
parent: c01740ed8f1e0ad54311af8677210462df368046 (diff)
parent: cd0d5e6081b0ea60ebfcf0b455a18d56c8c25e32 (diff)
22 files changed, 129 insertions, 14 deletions
diff --git a/packages/gtk+/gtk+-2.10.6/pangoxft2.10.6.diff b/packages/gtk+/gtk+-2.10.6/pangoxft2.10.6.diff
index 142a9a8e88..63828cec63 100644
--- a/packages/gtk+/gtk+-2.10.6/pangoxft2.10.6.diff
+++ b/packages/gtk+/gtk+-2.10.6/pangoxft2.10.6.diff
@@ -2441,3 +2441,16 @@ Index: gtk+-2.10.6/gdk/x11/gdkpixmap-x11.c
        _gdk_x11_drawable_finish (GDK_DRAWABLE (draw_impl));
      }
  
+--- gtk+-2.10.6.orig/gtk/gtkcalendar.c.orig	2006-11-14 14:39:34.000000000 -0800
++++ gtk+-2.10.6/gtk/gtkcalendar.c	2006-11-14 14:37:34.000000000 -0800
+@@ -1495,6 +1495,10 @@ gtk_calendar_realize (GtkWidget *widget)
+ 			     BACKGROUND_COLOR ( GTK_WIDGET ( calendar)));
+   gdk_window_show (priv->main_win);
+   gdk_window_set_user_data (priv->main_win, widget);
++
++  /* Set widgets gc */
++  calendar->gc = gdk_gc_new (widget->window);
++
+   gdk_window_set_background (widget->window, BACKGROUND_COLOR (widget));
+   gdk_window_show (widget->window);
+   gdk_window_set_user_data (widget->window, widget);
diff --git a/packages/gtk+/gtk+_2.10.6.bb b/packages/gtk+/gtk+_2.10.6.bb
index 2ea55b33c5..82549b028b 100644
--- a/packages/gtk+/gtk+_2.10.6.bb
+++ b/packages/gtk+/gtk+_2.10.6.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org"
 SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cairo cups"
-PR = "r6"
+PR = "r7"
 
 # disable per default - untested and not all patches included.
 DEFAULT_PREFERENCE = "-1" 
diff --git a/packages/linux/ixp4xx-kernel_2.6.19-rc5.bb b/packages/linux/ixp4xx-kernel_2.6.19-rc5.bb
index bfb9dccb80..8e2932b9ca 100644
--- a/packages/linux/ixp4xx-kernel_2.6.19-rc5.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.19-rc5.bb
@@ -6,7 +6,7 @@
 # http://trac.nslu2-linux.org/kernel/
 #
 # The revision that is pulled from SVN is specified below
-IXP4XX_KERNEL_SVN_REV = "577"
+IXP4XX_KERNEL_SVN_REV = "579"
 #
 # The directory containing the patches to be applied is
 # specified below
diff --git a/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb b/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb
index 3df8b1af99..79592a84eb 100644
--- a/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb
+++ b/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb
@@ -2,7 +2,7 @@ SECTION = "kernel"
 DESCRIPTION = "Linux kernel for MNCI device"
 LICENSE = "GPL"
 DEPENDS = "modutils-cross virtual/${TARGET_PREFIX}gcc${KERNEL_CCSUFFIX}"
-COMPATIBLE_HOST = "arm.*-linux"
+COMPATIBLE_MACHINE = "mnci"
 KV = "2.4.21"
 RMKV = "2"
 PXAV = "1"
diff --git a/packages/linux/mx31ads-kernel_2.6.19rc5.bb b/packages/linux/mx31ads-kernel_2.6.19rc5.bb
index 1c3179bcfb..0957fe71fe 100644
--- a/packages/linux/mx31ads-kernel_2.6.19rc5.bb
+++ b/packages/linux/mx31ads-kernel_2.6.19rc5.bb
@@ -39,7 +39,7 @@ do_configure_prepend() {
 
         sed     -e '/CONFIG_AEABI/d' \
                 -e '/CONFIG_OABI_COMPAT=/d' \
-                '${WORKDIR}/defconfig' >>'${S}/.config'
+                '${S}/defconfig' >>'${S}/.config'
 
 
 #	echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config
diff --git a/packages/nslu2-binary-only/unslung-rootfs/rc.bootdisk b/packages/nslu2-binary-only/unslung-rootfs/rc.bootdisk
index 3055c1a6c4..c83881a333 100755
--- a/packages/nslu2-binary-only/unslung-rootfs/rc.bootdisk
+++ b/packages/nslu2-binary-only/unslung-rootfs/rc.bootdisk
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+# If the nobootdisk flag is set, exit.
+if ( [ -f /.nobootdisk ] ) ; then return 0 ; fi
+
 # If we're not booting from flash, exit.
 i=`grep "/dev/root / jffs2" /proc/mounts`
 if ( [ -z "$i" ] ) ; then return 0 ; fi
@@ -12,30 +15,56 @@ echo "====> real_hostname is $real_hostname"
 
 # but don't duplicate
 if ( [ "$linksys_hostname" = `hostname` ] ) ; then linksys_hostname= ; fi
-if ( [ "$real_hostname" = "unslung" ] ) ; then real_hostname= ; fi
+if ( [ "$real_hostname" = "default" ] ) ; then real_hostname= ; fi
 
 # Search all FAT/NTFS filesystem in order.
 # (heavily borrowed from the rc.start-optware script).
+
 for i in /share/*/data/HDD_* ; do
+
+  # if the value of i is the string with the wildcards, no match occurred.
   if ( [ "$i" = '/share/*/data/HDD_*' ] ) ; then break ; fi
+
   echo "====> searching $i..."
-  for j in $linksys_hostname $real_hostname "unslung" ; do
+
+  # Now check inside directories named for the Linksys hostname, the real
+  # hostname, and finally the name "default"...
+  for j in $linksys_hostname $real_hostname "default" ; do
+
     echo "====> checking $i/bootdisk/$j ..."
-    if ( [ -d "$i"/bootdisk/"$j" ] ) ; then
-      for k in "$i"/bootdisk/"$j"/S??* ; do
+    if ( [ -d "$i/bootdisk/$j" ] ) ; then
+
+      # We have the correct subdirectory...
+      for k in "$i/bootdisk/$j"/S??* ; do
+
+        # Bail out if no match in that directory
+        if ( [ "$k" = "$i/bootdisk/$j"'/S??*' ] ) ; then break ; fi
+
         echo "====> found $k ..."
         [ ! -f "$k" ] && continue
-	nocopy=`grep "^#unslung-nocopy" "$k"`
+
+	# Check to see if we need to copy or run in-place..
+	nocopy=`grep "^#bootdisk:nocopy" "$k"`
         if ( [ -z "$nocopy" ] ) ; then
+
+	  # copy and strip the MSDOS-style line endings, then execute.
           echo "====> running copy: /tmp/tmpscript $k $i"
           dos2unix -u <"$k" >/tmp/tmpscript
           /bin/sh /tmp/tmpscript "$k" "$i"
           rm -f   /tmp/tmpscript
+
         else
+
+	  # execute in place
           echo "====> running in-place $k $k $i"
           /bin/sh "$k" "$k" "$i"
+
         fi
+
       done
+
     fi
+
   done
+
 done
diff --git a/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb b/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb
index f6b65aad2a..dab61db94e 100644
--- a/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb
+++ b/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb
@@ -1,7 +1,7 @@
 SECTION = "base"
 COMPATIBLE_MACHINE = "nslu2"
 
-PR = "r17"
+PR = "r18"
 
 DEPENDS = "nslu2-linksys-libs nslu2-linksys-sambacodepages"
 
@@ -165,7 +165,7 @@ do_compile () {
 
 	# No reason not to have a home directory for root...
 	mkdir -p ${S}/root
-	chmod 775 ${S}/root
+	chmod 755 ${S}/root
 }
 
 do_install () {
diff --git a/packages/ossie/ossie-c-wavloader_svn.bb b/packages/ossie/ossie-c-wavloader_svn.bb
index 4fed260694..eb85b5bd98 100644
--- a/packages/ossie/ossie-c-wavloader_svn.bb
+++ b/packages/ossie/ossie-c-wavloader_svn.bb
@@ -12,3 +12,4 @@ SRC_URI = "svn://ossie-dev.mprg.org/repos/ossie/platform/c_wavLoader/trunk;modul
 
 inherit autotools
 
+BROKEN = "1"
diff --git a/packages/ossie/ossie-channeldemo_svn.bb b/packages/ossie/ossie-channeldemo_svn.bb
index d64464ade7..8c51a5dc16 100644
--- a/packages/ossie/ossie-channeldemo_svn.bb
+++ b/packages/ossie/ossie-channeldemo_svn.bb
@@ -17,3 +17,4 @@ inherit autotools
 
 FILES_${PN} += "/home/sca/xml/ChannelDemo/*.xml"
 
+BROKEN = "1"
diff --git a/packages/ossie/ossie-demo_svn.bb b/packages/ossie/ossie-demo_svn.bb
index 583299af02..1108a37c28 100644
--- a/packages/ossie/ossie-demo_svn.bb
+++ b/packages/ossie/ossie-demo_svn.bb
@@ -16,3 +16,4 @@ prefix="/home/sca"
 inherit autotools
 
 FILES_${PN} += "/home/sca/waveforms/ossie_demo/*.xml /home/sca/xml/TxDemo/*.xml"
+BROKEN = "1"
diff --git a/packages/ossie/ossie-gpp-device_svn.bb b/packages/ossie/ossie-gpp-device_svn.bb
index dcd58c73c6..b9d3eeb929 100644
--- a/packages/ossie/ossie-gpp-device_svn.bb
+++ b/packages/ossie/ossie-gpp-device_svn.bb
@@ -17,3 +17,4 @@ inherit autotools
 
 FILES_${PN} += "/home/sca/xml/GPP/*xml"
 
+BROKEN = "1"
diff --git a/packages/ossie/ossie-nodebooter_svn.bb b/packages/ossie/ossie-nodebooter_svn.bb
index 34d6041e6c..b79ff91d07 100644
--- a/packages/ossie/ossie-nodebooter_svn.bb
+++ b/packages/ossie/ossie-nodebooter_svn.bb
@@ -12,3 +12,4 @@ SRC_URI = "svn://ossie-dev.mprg.org/repos/ossie/platform/nodebooter/trunk;module
 
 inherit autotools
 
+BROKEN = "1"
diff --git a/packages/ossie/ossie-rxdemo_svn.bb b/packages/ossie/ossie-rxdemo_svn.bb
index 566397c72e..75d9e3057c 100644
--- a/packages/ossie/ossie-rxdemo_svn.bb
+++ b/packages/ossie/ossie-rxdemo_svn.bb
@@ -17,3 +17,4 @@ inherit autotools
 
 FILES_${PN} += "/home/sca/xml/RxDemo/*.xml"
 
+BROKEN = "1"
diff --git a/packages/ossie/ossie-soundout-device_svn.bb b/packages/ossie/ossie-soundout-device_svn.bb
index f5a85c45b2..6d7eb082ef 100644
--- a/packages/ossie/ossie-soundout-device_svn.bb
+++ b/packages/ossie/ossie-soundout-device_svn.bb
@@ -17,3 +17,4 @@ inherit autotools
 
 FILES_${PN} += "/home/sca/xml/soundCard/*xml"
 
+BROKEN = "1"
diff --git a/packages/ossie/ossie-standardinterfaces_svn.bb b/packages/ossie/ossie-standardinterfaces_svn.bb
index 46b85f80ef..7482430ec8 100644
--- a/packages/ossie/ossie-standardinterfaces_svn.bb
+++ b/packages/ossie/ossie-standardinterfaces_svn.bb
@@ -16,3 +16,4 @@ inherit autotools pkgconfig
 do_stage () {
 	autotools_stage_all
 }
+BROKEN = "1"
diff --git a/packages/ossie/ossie-usrp-device_svn.bb b/packages/ossie/ossie-usrp-device_svn.bb
index 02d006b711..c5467b3487 100644
--- a/packages/ossie/ossie-usrp-device_svn.bb
+++ b/packages/ossie/ossie-usrp-device_svn.bb
@@ -17,3 +17,4 @@ inherit autotools
 
 FILES_${PN} += "/home/sca/xml/USRP/*xml"
 
+BROKEN = "1"
diff --git a/packages/ossie/ossiecf_svn.bb b/packages/ossie/ossiecf_svn.bb
index d286ef4aa7..2cd45a6796 100644
--- a/packages/ossie/ossiecf_svn.bb
+++ b/packages/ossie/ossiecf_svn.bb
@@ -18,3 +18,4 @@ do_stage () {
 
 FILES_${PN} += "/home/sca/xml/dtd/*.dtd"
 
+BROKEN = "1"
diff --git a/packages/python/python-sword_1.5.9.bb b/packages/python/python-sword_1.5.9.bb
new file mode 100644
index 0000000000..6c777bb54d
--- /dev/null
+++ b/packages/python/python-sword_1.5.9.bb
@@ -0,0 +1,31 @@
+DESCRIPTION = "Python bindings for the sword library"
+SECTION = "devel/python"
+PRIORITY = "optional"
+LICENSE = "GPL"
+RDEPENDS = "python-core sword"
+DEPENDS = "sword-${PV} swig-native"
+SRCNAME = "sword"
+PR = "r0"
+
+SRC_URI = "http://crosswire.org/ftpmirror/pub/sword/source/v1.5/sword-${PV}.tar.gz"
+
+S = "${WORKDIR}/${SRCNAME}-${PV}/bindings/swig/package"
+
+EXTRA_OECONF = "--with-sword-dir=${STAGING_DIR}/${HOST_SYS}"
+
+inherit distutils autotools
+
+PARALLEL_MAKE = ""
+
+#do_configure_prepend() {
+#	./autogen.sh
+#}
+
+do_compile() {
+        oe_runmake BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} pythonswig python_make
+}
+
+do_install() {
+	cd ${S}/python
+	distutils_do_install
+}
diff --git a/packages/qemu/qemu-native.inc b/packages/qemu/qemu-native.inc
index 758c81a1a4..d0d6604ec5 100644
--- a/packages/qemu/qemu-native.inc
+++ b/packages/qemu/qemu-native.inc
@@ -14,6 +14,10 @@ python __anonymous() {
     if not oldOeConf: oldOeConf = ""
     if len(which(path, 'gcc-3.4')) != 0:
         data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc-3.4", d)
+    elif len(which(path, 'gcc34')) != 0:
+        data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc34", d)
+    elif len(which(path, 'gcc33')) != 0:
+        data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc33", d)
     elif len(which(path, 'gcc-3.3')) != 0:
         data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc-3.3", d)
     elif len(which(path, 'gcc-3.3.6')) != 0:
diff --git a/packages/slugimage/slugimage.bb b/packages/slugimage/slugimage.bb
index d553a21777..2e9d16ac34 100644
--- a/packages/slugimage/slugimage.bb
+++ b/packages/slugimage/slugimage.bb
@@ -3,11 +3,11 @@ SECTION = "console/utils"
 LICENSE = "BSD"
 DESCRIPTION = "Slugimage is a small app to disassemble and reassemble \
 flash images for the Linksys NSLU2 device. It also has jffs2 support"
-PR = "r6"
+PR = "r7"
 
 RDEPENDS = "perl"
 
-SLUGIMAGE_SVN_REV  ?= 77
+SLUGIMAGE_SVN_REV  ?= 78
 SLUGIMAGE_SVN_REPO ?= http://svn.nslu2-linux.org/svnroot/slugimage/trunk
 
 addtask svnfetch before do_configure after do_patch
diff --git a/packages/sword/sword_1.5.9.bb b/packages/sword/sword_1.5.9.bb
new file mode 100644
index 0000000000..362b75e57c
--- /dev/null
+++ b/packages/sword/sword_1.5.9.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "The SWORD Project is an open source, cross-platform \
+(Linux, Windows, Solaris, MacOSX etc.) API and library for \
+Bible software with a constantly growing list of front-ends \
+(GUI, textmode, web-based, etc.) and a library of over 200 text modules"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://www.crosswire.org/ftpmirror/pub/sword/source/v1.5/sword-${PV}.tar.gz"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--without-clucene --without-curl"
+
+do_stage() {
+	oe_libinstall -so -C lib libsword ${STAGING_LIBDIR}
+
+	install -d ${STAGING_INCDIR}/sword/
+	for f in include/*.h
+	do
+		install -m 0644 $f ${STAGING_INCDIR}/sword/
+	done
+
+}
+
+FILES_${PN} = "${libdir}/libsword*so ${sysconfdir} ${bindir} ${datadir}"
diff --git a/packages/tinymail/tinymail_svn.bb b/packages/tinymail/tinymail_svn.bb
index 037e78d119..4902697df7 100644
--- a/packages/tinymail/tinymail_svn.bb
+++ b/packages/tinymail/tinymail_svn.bb
@@ -8,8 +8,9 @@ PR = "r2"
 
 EXTRA_OECONF=" --disable-gnome --with-platform=gpe --with-html-component=none"
 
+#camel-lite-configure-hack.patch is still needed after the maxdate, but needs fixing
 SRC_URI = "svn://svn.tinymail.org/svn/tinymail/;module=trunk;proto=https \
-	   file://camel-lite-configure-hack.patch;patch=1 \
+	   file://camel-lite-configure-hack.patch;patch=1;maxdate=20061113 \
 	   file://gtk-doc.m4 \
            file://gtk-doc.make"
author	Richard Purdie <rpurdie@rpsys.net>	2006-11-15 10:44:22 +0000
committer	Richard Purdie <rpurdie@rpsys.net>	2006-11-15 10:44:22 +0000
commit	528450f67d00cd3cad700d93cbe88bff666dea84 (patch)
tree	119422052188818eb8da2bcdf3bed73763d1a9ff /packages
parent	c01740ed8f1e0ad54311af8677210462df368046 (diff)
parent	cd0d5e6081b0ea60ebfcf0b455a18d56c8c25e32 (diff)