From f89eb987a28bc6dea8697e4cc9bbe32b7f961802 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 28 Sep 2006 14:21:50 +0000 Subject: h4000: Update defonfig, enable audio (statically). --- packages/linux/handhelds-pxa-2.6/h4000/defconfig | 55 +++++++++++++----------- 1 file changed, 30 insertions(+), 25 deletions(-) diff --git a/packages/linux/handhelds-pxa-2.6/h4000/defconfig b/packages/linux/handhelds-pxa-2.6/h4000/defconfig index 2bba0377eb..fa75078717 100644 --- a/packages/linux/handhelds-pxa-2.6/h4000/defconfig +++ b/packages/linux/handhelds-pxa-2.6/h4000/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.16-hh2 -# Sat Jun 24 13:09:54 2006 +# Linux kernel version: 2.6.16-hh5 +# Sun Aug 27 21:52:45 2006 # CONFIG_ARM=y CONFIG_MMU=y @@ -65,8 +65,8 @@ CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_OBSOLETE_MODPARM=y # CONFIG_MODVERSIONS is not set -CONFIG_MODULE_SRCVERSION_ALL=y -# CONFIG_KMOD is not set +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_KMOD=y # # Block layer @@ -254,8 +254,8 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set CONFIG_CPU_FREQ_GOV_PERFORMANCE=y CONFIG_CPU_FREQ_GOV_POWERSAVE=y -CONFIG_CPU_FREQ_GOV_USERSPACE=y -CONFIG_CPU_FREQ_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_GOV_USERSPACE=m +CONFIG_CPU_FREQ_GOV_ONDEMAND=m CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y CONFIG_CPU_FREQ_PXA=y CONFIG_PXA25x_ALTERNATE_FREQS=y @@ -283,7 +283,7 @@ CONFIG_BINFMT_ELF=y # Power management options # CONFIG_PM=y -CONFIG_PM_LEGACY=y +# CONFIG_PM_LEGACY is not set CONFIG_PM_DEBUG=y CONFIG_APM=y @@ -410,7 +410,7 @@ CONFIG_IRDA=y # # IrDA protocols # -CONFIG_IRLAN=y +CONFIG_IRLAN=m CONFIG_IRCOMM=y # CONFIG_IRDA_ULTRA is not set @@ -593,7 +593,7 @@ CONFIG_BLK_DEV_LOOP=m # CONFIG_BLK_DEV_CRYPTOLOOP is not set CONFIG_BLK_DEV_NBD=m CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_COUNT=6 CONFIG_BLK_DEV_RAM_SIZE=8192 CONFIG_BLK_DEV_INITRD=y # CONFIG_CDROM_PKTCDVD is not set @@ -788,7 +788,7 @@ CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_UNIX98_PTYS=y CONFIG_LEGACY_PTYS=y -CONFIG_LEGACY_PTY_COUNT=256 +CONFIG_LEGACY_PTY_COUNT=32 # # I2C support @@ -807,8 +807,8 @@ CONFIG_I2C_CHARDEV=y # I2C Hardware Bus support # # CONFIG_I2C_ELV is not set -CONFIG_I2C_PXA=m -CONFIG_I2C_PXA_SLAVE=y +CONFIG_I2C_PXA=y +# CONFIG_I2C_PXA_SLAVE is not set # CONFIG_I2C_PARPORT_LIGHT is not set # CONFIG_I2C_STUB is not set # CONFIG_I2C_PCA_ISA is not set @@ -1022,17 +1022,18 @@ CONFIG_SOUND=y # # Advanced Linux Sound Architecture # -CONFIG_SND=m -CONFIG_SND_TIMER=m -CONFIG_SND_PCM=m +CONFIG_SND=y +CONFIG_SND_TIMER=y +CONFIG_SND_PCM=y # CONFIG_SND_SEQUENCER is not set CONFIG_SND_OSSEMUL=y -CONFIG_SND_MIXER_OSS=m -CONFIG_SND_PCM_OSS=m +CONFIG_SND_MIXER_OSS=y +CONFIG_SND_PCM_OSS=y # CONFIG_SND_DYNAMIC_MINORS is not set -CONFIG_SND_SUPPORT_OLD_API=y -# CONFIG_SND_VERBOSE_PRINTK is not set -# CONFIG_SND_DEBUG is not set +# CONFIG_SND_SUPPORT_OLD_API is not set +CONFIG_SND_VERBOSE_PRINTK=y +CONFIG_SND_DEBUG=y +CONFIG_SND_DEBUG_DETECT=y # # Generic devices @@ -1048,14 +1049,18 @@ CONFIG_SND_SUPPORT_OLD_API=y # CONFIG_SND_A716 is not set # CONFIG_SND_H1910 is not set # CONFIG_SND_H2200 is not set +CONFIG_SND_H4000=y # CONFIG_SND_HTCMAGICIAN is not set # CONFIG_SND_HX4700 is not set +# CONFIG_SND_HTCUNIVERSAL is not set # CONFIG_SND_H5XXX_AK4535 is not set +CONFIG_SND_PXA2xx_I2SOUND=y # CONFIG_SND_PXA2XX_AC97 is not set # # PCMCIA devices # +CONFIG_SND_UDA1380=y # # Open Sound System @@ -1173,7 +1178,7 @@ CONFIG_RAMFS=y # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set # CONFIG_JFFS_FS is not set -CONFIG_JFFS2_FS=y +CONFIG_JFFS2_FS=m CONFIG_JFFS2_FS_DEBUG=1 CONFIG_JFFS2_FS_WRITEBUFFER=y # CONFIG_JFFS2_SUMMARY is not set @@ -1204,7 +1209,7 @@ CONFIG_NFS_COMMON=y CONFIG_SUNRPC=y # CONFIG_RPCSEC_GSS_KRB5 is not set # CONFIG_RPCSEC_GSS_SPKM3 is not set -CONFIG_SMB_FS=y +CONFIG_SMB_FS=m # CONFIG_SMB_NLS_DEFAULT is not set # CONFIG_CIFS is not set # CONFIG_NCP_FS is not set @@ -1226,8 +1231,8 @@ CONFIG_NLS_DEFAULT="iso8859-1" CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set -CONFIG_NLS_CODEPAGE_850=y -CONFIG_NLS_CODEPAGE_852=y +# CONFIG_NLS_CODEPAGE_850 is not set +# CONFIG_NLS_CODEPAGE_852 is not set # CONFIG_NLS_CODEPAGE_855 is not set # CONFIG_NLS_CODEPAGE_857 is not set # CONFIG_NLS_CODEPAGE_860 is not set @@ -1248,7 +1253,7 @@ CONFIG_NLS_CODEPAGE_1250=y CONFIG_NLS_CODEPAGE_1251=y # CONFIG_NLS_ASCII is not set CONFIG_NLS_ISO8859_1=y -CONFIG_NLS_ISO8859_2=y +# CONFIG_NLS_ISO8859_2 is not set # CONFIG_NLS_ISO8859_3 is not set # CONFIG_NLS_ISO8859_4 is not set # CONFIG_NLS_ISO8859_5 is not set -- cgit v1.2.3 From c4de89456a82bc97d97b0905f33f825ee303a099 Mon Sep 17 00:00:00 2001 From: Michael-Luke Jones Date: Thu, 28 Sep 2006 14:36:34 +0000 Subject: ixp4xx-kernel: SVN Revision bump * now includes patches allowing LE ethernet functionality --- packages/linux/ixp4xx-kernel_2.6.18.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/linux/ixp4xx-kernel_2.6.18.bb b/packages/linux/ixp4xx-kernel_2.6.18.bb index 0933a3c914..a5f2ff5b8c 100644 --- a/packages/linux/ixp4xx-kernel_2.6.18.bb +++ b/packages/linux/ixp4xx-kernel_2.6.18.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 = "427" +IXP4XX_KERNEL_SVN_REV = "435" # # Increment the number below (i.e. the digits after PR) when # the changes in SVN between revisions include changes in the -- cgit v1.2.3 From 1decdb826d58ca77eedf9516b4b250b03d398afc Mon Sep 17 00:00:00 2001 From: Michael-Luke Jones Date: Thu, 28 Sep 2006 15:41:26 +0000 Subject: slugos-init: Further improvements to module loading --- packages/slugos-init/files/boot/disk | 2 +- .../slugos-init/files/initscripts/loadmodules.sh | 11 +++---- packages/slugos-init/files/modulefunctions | 37 ++++++++++++++++++++++ packages/slugos-init/slugos-init_0.10.bb | 2 +- 4 files changed, 43 insertions(+), 9 deletions(-) create mode 100644 packages/slugos-init/files/modulefunctions diff --git a/packages/slugos-init/files/boot/disk b/packages/slugos-init/files/boot/disk index d0b093c602..dca1e422aa 100644 --- a/packages/slugos-init/files/boot/disk +++ b/packages/slugos-init/files/boot/disk @@ -26,7 +26,7 @@ then # # load USB & SCSI storage modules (/proc required!) echo "boot: loading modules required for boot" - loadusbmods + loaddiskmods # # Mount read-write because before exec'ing init # If a UUID is given (in the environment) this diff --git a/packages/slugos-init/files/initscripts/loadmodules.sh b/packages/slugos-init/files/initscripts/loadmodules.sh index 1bc540a148..e80f995598 100644 --- a/packages/slugos-init/files/initscripts/loadmodules.sh +++ b/packages/slugos-init/files/initscripts/loadmodules.sh @@ -1,18 +1,15 @@ #!/bin/sh # This script is used for loading modules required by SlugOS -# Currently, this script only supports the NSLU2 +# This script may not be necessary if udev is present, but is included +# for 'backup' purposes in case udev is playing silly buggers -. /etc/default/functions # Load $(machine) function required -. /etc/default/modulefunctions +. /etc/default/modulefunctions # Load module loading logic -echo "Loading networking modules" loadnetmods -echo "Loading usb storage modules" -loadusbmods +loaddiskmods -echo "Loading other modules" loadmiscmods exit 0 diff --git a/packages/slugos-init/files/modulefunctions b/packages/slugos-init/files/modulefunctions new file mode 100644 index 0000000000..c6719d4f79 --- /dev/null +++ b/packages/slugos-init/files/modulefunctions @@ -0,0 +1,37 @@ +#!/bin/sh +# . this file to load the functions for automatically loading modules + +. /etc/default/functions + +loaddiskmods(){ + modprobe scsi_mod + modprobe sd_mod + modprobe usbcore + case "$(machine)" in + nslu2) + modprobe ehci-hcd + modprobe ohci-hcd + ;; + nas100d) + modprobe ehci-hcd + modprobe uhci-hcd + ;; + + esac + modprobe usb-storage +} + +loadnetmods(){ + modprobe af_packet + case "$(machine)" in + ixdp425|nslu2|nas100d) + modprobe ixp4xx_mac + ;; + esac +} + +loadmiscmods(){ + modprobe ixp4xx_rng + modprobe i2c_dev +} + diff --git a/packages/slugos-init/slugos-init_0.10.bb b/packages/slugos-init/slugos-init_0.10.bb index 66e2ae5712..d6ce0b5f65 100644 --- a/packages/slugos-init/slugos-init_0.10.bb +++ b/packages/slugos-init/slugos-init_0.10.bb @@ -4,7 +4,7 @@ PRIORITY = "required" LICENSE = "GPL" DEPENDS = "base-files devio" RDEPENDS = "busybox devio" -PR = "r68" +PR = "r69" SRC_URI = "file://boot/flash \ file://boot/disk \ -- cgit v1.2.3 From 07d63ec4d25f444630a2077e805df488b0d58772 Mon Sep 17 00:00:00 2001 From: Michael-Luke Jones Date: Thu, 28 Sep 2006 16:15:16 +0000 Subject: udev: Enable udev-100 on SlugOS --- packages/udev/udev_100.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/udev/udev_100.bb b/packages/udev/udev_100.bb index fe24573b8d..6c40299a08 100644 --- a/packages/udev/udev_100.bb +++ b/packages/udev/udev_100.bb @@ -1,4 +1,5 @@ DEFAULT_PREFERENCE = "-1" +DEFAULT_PREFERENCE_slugos = "1" DESCRIPTION = "udev is a daemon which dynamically creates and removes device nodes from \ /dev/, handles hotplug events and loads drivers at boot time. It replaces \ -- cgit v1.2.3 From 0846c33022e583c178c20cf328a7c53fa7f881ab Mon Sep 17 00:00:00 2001 From: Michael-Luke Jones Date: Thu, 28 Sep 2006 16:17:03 +0000 Subject: slugos: Revert to using udev (mdev functions, but turnup breaks) --- packages/images/slugos-image.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/images/slugos-image.bb b/packages/images/slugos-image.bb index 08866600b3..34ca424821 100644 --- a/packages/images/slugos-image.bb +++ b/packages/images/slugos-image.bb @@ -7,7 +7,7 @@ DESCRIPTION = "Generic SlugOS image" MAINTAINER = "NSLU2 Linux " HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r35" +PR = "r36" # SLUGOS_IMAGENAME defines the name of the image to be build, if it # is not set this package will be skipped! @@ -65,7 +65,7 @@ EXTRA_IMAGEDEPENDS += "${IMAGE_TOOLS}" # udev is the default way of handling devices, there is no guarantee # that the static device table is completely correct (it is just # known to be sufficient for boot.) -SLUGOS_SUPPORT ?= "diffutils cpio findutils mdev" +SLUGOS_SUPPORT ?= "diffutils cpio findutils udev" # kernel-module-af-packet must be in the image for DHCP to work # kernel-module-netconsole is here because it is small and is -- cgit v1.2.3 From ebed5320160e3629522ff7a5498e66724eada3f0 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 28 Sep 2006 17:51:36 +0000 Subject: glibc_2.4.bb: Typo fix in comment. --- packages/glibc/glibc_2.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/glibc/glibc_2.4.bb b/packages/glibc/glibc_2.4.bb index de010e3717..4483edb0aa 100644 --- a/packages/glibc/glibc_2.4.bb +++ b/packages/glibc/glibc_2.4.bb @@ -65,7 +65,7 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-2.4.tar.bz2 \ file://etc/ld.so.conf \ file://generate-supported.mk" -# Build fails of x86 without additional patches, but these break arm +# Build fails on x86 without additional patches, but these break arm SRC_URI_append_x86 = " file://openat-bugzilla-fix-1220.patch;patch=1 \ file://fix-fchownat-20060808.patch;patch=1" -- cgit v1.2.3 From f2507544324c98e06b21fa8103ad50cac39fa5d0 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 28 Sep 2006 18:11:59 +0000 Subject: rocksndiamonds 3.2.0: Pass target AR & RANLIB to make. --- packages/rocksndiamonds/rocksndiamonds_3.2.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/rocksndiamonds/rocksndiamonds_3.2.0.bb b/packages/rocksndiamonds/rocksndiamonds_3.2.0.bb index ab5a5c8932..f9b99278cf 100644 --- a/packages/rocksndiamonds/rocksndiamonds_3.2.0.bb +++ b/packages/rocksndiamonds/rocksndiamonds_3.2.0.bb @@ -13,7 +13,7 @@ SRC_URI = "http://artsoft.org/RELEASES/unix/rocksndiamonds/rocksndiamonds-${PV}. DEPENDS += "libsdl-net smpeg" APPIMAGE = "../rocksndiamonds.png" -EXTRA_OEMAKE = "CC='${CC}' RO_GAME_DIR='${datadir}/${PN}' RW_GAME_DIR='${datadir}/${PN}'" +EXTRA_OEMAKE = "CC='${CC}' AR='${AR}' RANLIB='${RANLIB}' RO_GAME_DIR='${datadir}/${PN}' RW_GAME_DIR='${datadir}/${PN}'" inherit sdl -- cgit v1.2.3 From dfdac86de873437af6abfb18e2bb7586e0d4ce8c Mon Sep 17 00:00:00 2001 From: Michael-Luke Jones Date: Thu, 28 Sep 2006 18:15:49 +0000 Subject: slugos-init: Add delay to disk booting to cope with module loading --- packages/slugos-init/files/boot/disk | 18 +++++++++--------- packages/slugos-init/slugos-init_0.10.bb | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/slugos-init/files/boot/disk b/packages/slugos-init/files/boot/disk index dca1e422aa..17fb1f3243 100644 --- a/packages/slugos-init/files/boot/disk +++ b/packages/slugos-init/files/boot/disk @@ -16,17 +16,17 @@ if test -n "$1" then device="$1" shift - echo "boot: rootfs: mount $* $device [$UUID]" - # - # wait if required + # proc is needed for UUID mount and module load + mount -t proc proc /proc + # load USB & SCSI storage modules (/proc required!) + echo "boot: loading modules required for disk boot" + loaddiskmods + # waiting for disk (FIXME) + sleep=5 test "$sleep" -gt 0 && sleep "$sleep" # - # proc is needed for UUID mount - mount -t proc proc /proc - # - # load USB & SCSI storage modules (/proc required!) - echo "boot: loading modules required for boot" - loaddiskmods + # fire the boot + echo "boot: rootfs: mount $* $device [$UUID]" # # Mount read-write because before exec'ing init # If a UUID is given (in the environment) this diff --git a/packages/slugos-init/slugos-init_0.10.bb b/packages/slugos-init/slugos-init_0.10.bb index d6ce0b5f65..7c8d0fa9f5 100644 --- a/packages/slugos-init/slugos-init_0.10.bb +++ b/packages/slugos-init/slugos-init_0.10.bb @@ -4,7 +4,7 @@ PRIORITY = "required" LICENSE = "GPL" DEPENDS = "base-files devio" RDEPENDS = "busybox devio" -PR = "r69" +PR = "r70" SRC_URI = "file://boot/flash \ file://boot/disk \ -- cgit v1.2.3 From 025dcf03ba051ac356efbf128868a2283a6d940a Mon Sep 17 00:00:00 2001 From: Michael-Luke Jones Date: Thu, 28 Sep 2006 19:01:32 +0000 Subject: ixp4xx-kernel: Add auto-byteswapping patch ixp4xx-npe: Remove byteswapping behaviour slugos-init: lengthen delay slightly --- packages/ixp4xx/ixp4xx-npe_2.1.bb | 16 ++++++++-------- packages/ixp4xx/ixp4xx-npe_2.3.bb | 16 ++++++++-------- packages/linux/ixp4xx-kernel_2.6.18.bb | 2 +- packages/slugos-init/files/boot/disk | 2 +- packages/slugos-init/slugos-init_0.10.bb | 2 +- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/packages/ixp4xx/ixp4xx-npe_2.1.bb b/packages/ixp4xx/ixp4xx-npe_2.1.bb index c06b4c28fb..efeb0cbbba 100644 --- a/packages/ixp4xx/ixp4xx-npe_2.1.bb +++ b/packages/ixp4xx/ixp4xx-npe_2.1.bb @@ -1,7 +1,7 @@ DESCRIPTION = "NPE firmware for the IXP4xx line of devices" MAINTAINER = "Oyvind Repvik " LICENSE = "Intel Public Licence" -PR = "r5" +PR = "r6" DEPENDS = "ixp4xx-npe-native" SRC_URI = "http://www.intel.com/Please-Read-The-BB-File/IPL_ixp400NpeLibrary-2_1.zip" @@ -10,14 +10,14 @@ S = ${WORKDIR}/ixp400_xscale_sw/src/npeDl FILES_${PN} = "${base_libdir}/firmware/NPE-B" do_compile() { - if test '${ARCH_BYTE_SEX}' = be - then +# if test '${ARCH_BYTE_SEX}' = be +# then ${STAGING_BINDIR}/IxNpeMicrocode-${PV} -be - fi - if test '${ARCH_BYTE_SEX}' = le - then - ${STAGING_BINDIR}/IxNpeMicrocode-${PV} -le - fi +# fi +# if test '${ARCH_BYTE_SEX}' = le +# then +# ${STAGING_BINDIR}/IxNpeMicrocode-${PV} -le +# fi } do_install() { diff --git a/packages/ixp4xx/ixp4xx-npe_2.3.bb b/packages/ixp4xx/ixp4xx-npe_2.3.bb index 9e13c8766b..babb7e1292 100644 --- a/packages/ixp4xx/ixp4xx-npe_2.3.bb +++ b/packages/ixp4xx/ixp4xx-npe_2.3.bb @@ -1,7 +1,7 @@ DESCRIPTION = "NPE firmware for the IXP4xx line of devices" MAINTAINER = "Oyvind Repvik " LICENSE = "Intel Public Licence" -PR = "r5" +PR = "r6" DEPENDS = "ixp4xx-npe-native" SRC_URI = "http://www.intel.com/Please-Read-The-BB-File/IPL_ixp400NpeLibrary-2_3.zip" @@ -10,14 +10,14 @@ S = ${WORKDIR}/ixp400_xscale_sw/src/npeDl FILES_${PN} = "${base_libdir}/firmware/NPE-B" do_compile() { - if test '${ARCH_BYTE_SEX}' = be - then +# if test '${ARCH_BYTE_SEX}' = be +# then ${STAGING_BINDIR}/IxNpeMicrocode-${PV} -be - fi - if test '${ARCH_BYTE_SEX}' = le - then - ${STAGING_BINDIR}/IxNpeMicrocode-${PV} -le - fi +# fi +# if test '${ARCH_BYTE_SEX}' = le +# then +# ${STAGING_BINDIR}/IxNpeMicrocode-${PV} -le +# fi } do_install() { diff --git a/packages/linux/ixp4xx-kernel_2.6.18.bb b/packages/linux/ixp4xx-kernel_2.6.18.bb index a5f2ff5b8c..bfa1059825 100644 --- a/packages/linux/ixp4xx-kernel_2.6.18.bb +++ b/packages/linux/ixp4xx-kernel_2.6.18.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 = "435" +IXP4XX_KERNEL_SVN_REV = "438" # # Increment the number below (i.e. the digits after PR) when # the changes in SVN between revisions include changes in the diff --git a/packages/slugos-init/files/boot/disk b/packages/slugos-init/files/boot/disk index 17fb1f3243..ff55baa04c 100644 --- a/packages/slugos-init/files/boot/disk +++ b/packages/slugos-init/files/boot/disk @@ -22,7 +22,7 @@ then echo "boot: loading modules required for disk boot" loaddiskmods # waiting for disk (FIXME) - sleep=5 + sleep=6 test "$sleep" -gt 0 && sleep "$sleep" # # fire the boot diff --git a/packages/slugos-init/slugos-init_0.10.bb b/packages/slugos-init/slugos-init_0.10.bb index 7c8d0fa9f5..efd396e84f 100644 --- a/packages/slugos-init/slugos-init_0.10.bb +++ b/packages/slugos-init/slugos-init_0.10.bb @@ -4,7 +4,7 @@ PRIORITY = "required" LICENSE = "GPL" DEPENDS = "base-files devio" RDEPENDS = "busybox devio" -PR = "r70" +PR = "r71" SRC_URI = "file://boot/flash \ file://boot/disk \ -- cgit v1.2.3 From a9d25d38b1c306ba46eba11b34d92b5225b4d88e Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 28 Sep 2006 20:36:14 +0000 Subject: gumstix.conf: fix typos for kernel modules * this file still (R)DEPENDS on kernel modules, which is bug, one should only RRECOMMEND them, leaving that to the maintainer or to the convert-to-task-base-squad --- conf/machine/gumstix.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/machine/gumstix.conf b/conf/machine/gumstix.conf index 75c671a3d4..0fccf05b3b 100644 --- a/conf/machine/gumstix.conf +++ b/conf/machine/gumstix.conf @@ -19,6 +19,6 @@ GUMSTIX_400MHZ = "y" SERIAL_CONSOLE = "115200 ttyS0 vt100" USE_VT = "0" -BOOTSTRAP_EXTRA_RDEPENDS = "kernel-modules-mmc kernel-modules-usb kernel-modules-fat kernel-modules-bluetooth kernel-module-jfs udev lrzsz" +BOOTSTRAP_EXTRA_RDEPENDS = "kernel-module-mmc kernel-module-usb kernel-module-fat kernel-module-bluetooth kernel-module-jfs udev lrzsz" PREFERRED_VERSION_task-bootstrap = "1.0unionroot" -- cgit v1.2.3 From 1598a110f47633c846d7f2fc2b0188e5d924a137 Mon Sep 17 00:00:00 2001 From: Michael-Luke Jones Date: Thu, 28 Sep 2006 20:40:29 +0000 Subject: ixp4xx-kernel: One last revbump, cleaning up the patch directory --- packages/linux/ixp4xx-kernel_2.6.18.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/linux/ixp4xx-kernel_2.6.18.bb b/packages/linux/ixp4xx-kernel_2.6.18.bb index bfa1059825..d191cbfbfc 100644 --- a/packages/linux/ixp4xx-kernel_2.6.18.bb +++ b/packages/linux/ixp4xx-kernel_2.6.18.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 = "438" +IXP4XX_KERNEL_SVN_REV = "439" # # Increment the number below (i.e. the digits after PR) when # the changes in SVN between revisions include changes in the -- cgit v1.2.3 From 6e7162ef3b75528537da5dab0afedb755b5e5497 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 28 Sep 2006 20:47:55 +0000 Subject: gnu-config: Add missing install -d (from packaged-staging) --- packages/gnu-config/gnu-config-native_20050701.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/gnu-config/gnu-config-native_20050701.bb b/packages/gnu-config/gnu-config-native_20050701.bb index e729520d60..43df124f7f 100644 --- a/packages/gnu-config/gnu-config-native_20050701.bb +++ b/packages/gnu-config/gnu-config-native_20050701.bb @@ -6,7 +6,8 @@ inherit native FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gnu-config" do_stage () { - install -d ${STAGING_DATADIR}/gnu-config + install -d ${STAGING_DATADIR}/gnu-config/ + install -d ${STAGING_BINDIR}/ cat ${WORKDIR}/gnu-configize.in | \ sed -e 's,@gnu-configdir@,${STAGING_DATADIR}/gnu-config,' \ -e 's,@autom4te_perllibdir@,${STAGING_DATADIR}/autoconf,' > ${STAGING_BINDIR}/gnu-configize -- cgit v1.2.3 From a65ba920e8f634f3d7130291431c86880ace71d5 Mon Sep 17 00:00:00 2001 From: Jamie Lenehan Date: Thu, 28 Sep 2006 21:21:31 +0000 Subject: perl: Update cpan.bbclass to set CCFLAGS to CFLAGS so that the compiler settings for the current OE build are used instead of the made up values in the perl config (which were manually generated since we are cross compiling). Remove this from each of the perl modules that was manually setting this. --- classes/cpan.bbclass | 2 +- packages/perl/libcompress-zlib-perl_1.42.bb | 3 --- packages/perl/libdigest-sha1-perl_2.11.bb | 5 +---- packages/perl/libipc-sharelite-perl_0.09.bb | 5 +---- packages/perl/libparams-validate-perl_0.86.bb | 5 +---- 5 files changed, 4 insertions(+), 16 deletions(-) diff --git a/classes/cpan.bbclass b/classes/cpan.bbclass index c48bd1a980..0b90e754df 100644 --- a/classes/cpan.bbclass +++ b/classes/cpan.bbclass @@ -17,7 +17,7 @@ cpan_do_configure () { } cpan_do_compile () { - oe_runmake PASTHRU_INC="${CFLAGS}" + oe_runmake PASTHRU_INC="${CFLAGS}" CCFLAGS="${CFLAGS}" } cpan_do_install () { diff --git a/packages/perl/libcompress-zlib-perl_1.42.bb b/packages/perl/libcompress-zlib-perl_1.42.bb index 1dce1bf325..c26678a9b9 100644 --- a/packages/perl/libcompress-zlib-perl_1.42.bb +++ b/packages/perl/libcompress-zlib-perl_1.42.bb @@ -9,6 +9,3 @@ SRC_URI = "http://search.cpan.org/CPAN/authors/id/P/PM/PMQS/Compress-Zlib-1.42.t S = "${WORKDIR}/Compress-Zlib-${PV}" inherit cpan - -# Stop from searching /include - should put this in cpan class? -export CCFLAGS = "${CFLAGS}" diff --git a/packages/perl/libdigest-sha1-perl_2.11.bb b/packages/perl/libdigest-sha1-perl_2.11.bb index 912fdb1843..712c0e6737 100644 --- a/packages/perl/libdigest-sha1-perl_2.11.bb +++ b/packages/perl/libdigest-sha1-perl_2.11.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Digest::SHA1 - Perl interface to the SHA-1 algorithm" SECTION = "libs" MAINTAINER = "Jamie Lenehan " LICENSE = "Artistic" -PR = "r4" +PR = "r5" SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/Digest-SHA1-2.11.tar.gz" @@ -14,6 +14,3 @@ FILES_${PN} = "${libdir}/perl5/*/*/auto/Digest/SHA1/* \ ${libdir}/perl5/*/*/auto/Digest/SHA1/.packlist \ ${libdir}/perl5/*/*/Digest" FILES_${PN}-dbg += "${libdir}/perl5/*/*/auto/Digest/SHA1/.debug" - -# Stop from searching /include - should put this in cpan class? -export CCFLAGS = "${CFLAGS}" diff --git a/packages/perl/libipc-sharelite-perl_0.09.bb b/packages/perl/libipc-sharelite-perl_0.09.bb index 5598eed93e..6e2c7f16e3 100644 --- a/packages/perl/libipc-sharelite-perl_0.09.bb +++ b/packages/perl/libipc-sharelite-perl_0.09.bb @@ -2,7 +2,7 @@ DESCRIPTION = "IPC::ShareLite - Light-weight interface to shared memory" SECTION = "libs" MAINTAINER = "Jamie Lenehan " LICENSE = "Artistic" -PR = "r4" +PR = "r5" SRC_URI = "http://search.cpan.org/CPAN/authors/id/M/MA/MAURICE/IPC-ShareLite-0.09.tar.gz" @@ -14,6 +14,3 @@ FILES_${PN} = "${libdir}/perl5/*/*/auto/IPC/ShareLite/* \ ${libdir}/perl5/*/*/auto/IPC/ShareLite/.packlist \ ${libdir}/perl5/*/*/IPC" FILES_${PN}-dbg += "${libdir}/perl5/*/*/auto/IPC/ShareLite/.debug" - -# Stop from searching /include - should put this in cpan class? -export CCFLAGS = "${CFLAGS}" diff --git a/packages/perl/libparams-validate-perl_0.86.bb b/packages/perl/libparams-validate-perl_0.86.bb index 75894af662..cd628f4809 100644 --- a/packages/perl/libparams-validate-perl_0.86.bb +++ b/packages/perl/libparams-validate-perl_0.86.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Params::Validate - Validate method/function parameters" SECTION = "libs" MAINTAINER = "Jamie Lenehan " LICENSE = "Artistic" -PR = "r4" +PR = "r5" SRC_URI = "http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Params-Validate-0.86.tar.gz" @@ -15,6 +15,3 @@ FILES_${PN} = "${libdir}/perl5/*/*/auto/Params/Validate/* \ ${libdir}/perl5/*/*/Params \ ${libdir}/perl5/*/*/Attribute" FILES_${PN}-dbg += "${libdir}/perl5/*/*/auto/Params/Validate/.debug" - -# Stop from searching /include - should put this in cpan class? -export CCFLAGS = "${CFLAGS}" -- cgit v1.2.3 From 9640459cd8419e4305cf7792ed23233628de0f97 Mon Sep 17 00:00:00 2001 From: Jamie Lenehan Date: Thu, 28 Sep 2006 21:23:33 +0000 Subject: perl: Add the perl Locale::gettext module, which is used for gettext style message handling. --- packages/perl/liblocale-gettext-perl_1.05.bb | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 packages/perl/liblocale-gettext-perl_1.05.bb diff --git a/packages/perl/liblocale-gettext-perl_1.05.bb b/packages/perl/liblocale-gettext-perl_1.05.bb new file mode 100644 index 0000000000..54e85c751f --- /dev/null +++ b/packages/perl/liblocale-gettext-perl_1.05.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "Locale::gettext - message handling functions" +SECTION = "libs" +MAINTAINER = "Jamie Lenehan " +LICENSE = "Artistic" +DEPENDS = "virtual/libintl" +PR = "r0" + +SRC_URI = "http://search.cpan.org/CPAN/authors/id/P/PV/PVANDRY/gettext-1.05.tar.gz" + +S = "${WORKDIR}/gettext-${PV}" + +inherit cpan -- cgit v1.2.3 From d8c34c96401935a2ca35ee7e7f5e417e3cc686d4 Mon Sep 17 00:00:00 2001 From: Jamie Lenehan Date: Thu, 28 Sep 2006 21:29:17 +0000 Subject: perl: Add the native version of the Local::gettext module. --- packages/perl/liblocale-gettext-perl-native_1.05.bb | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 packages/perl/liblocale-gettext-perl-native_1.05.bb diff --git a/packages/perl/liblocale-gettext-perl-native_1.05.bb b/packages/perl/liblocale-gettext-perl-native_1.05.bb new file mode 100644 index 0000000000..14561664d3 --- /dev/null +++ b/packages/perl/liblocale-gettext-perl-native_1.05.bb @@ -0,0 +1,7 @@ +SECTION = "libs" + +inherit native + +EXTRA_CPANFLAGS += " EXPATINCPATH='${STAGING_INCDIR}' EXPATLIBPATH='${STAGING_LIBDIR}'" + +require liblocale-gettext-perl_${PV}.bb -- cgit v1.2.3 From 2bcdf40d8415d833a6392199f7dd4506f3d599ab Mon Sep 17 00:00:00 2001 From: Jamie Lenehan Date: Thu, 28 Sep 2006 21:33:32 +0000 Subject: perl: Add the 1.1.6 version of libintl-perl. The 1.11 versions which are currently in OE are no longer available on cpan. --- packages/perl/libintl-perl-native_1.16.bb | 5 +++++ packages/perl/libintl-perl_1.16.bb | 11 +++++++++++ 2 files changed, 16 insertions(+) create mode 100644 packages/perl/libintl-perl-native_1.16.bb create mode 100644 packages/perl/libintl-perl_1.16.bb diff --git a/packages/perl/libintl-perl-native_1.16.bb b/packages/perl/libintl-perl-native_1.16.bb new file mode 100644 index 0000000000..17b6789bda --- /dev/null +++ b/packages/perl/libintl-perl-native_1.16.bb @@ -0,0 +1,5 @@ +SECTION = "libs" + +inherit native + +include libintl-perl_${PV}.bb diff --git a/packages/perl/libintl-perl_1.16.bb b/packages/perl/libintl-perl_1.16.bb new file mode 100644 index 0000000000..5a8fde1ea6 --- /dev/null +++ b/packages/perl/libintl-perl_1.16.bb @@ -0,0 +1,11 @@ +SECTION = "libs" +LICENSE = "Artistic|GPL" +RDEPENDS = "perl-module-vars perl-module-locale perl-module-io-handle \ + perl-module-symbol perl-module-selectsaver perl-module-io \ + perl-module-integer perl-module-exporter-heavy" + +SRC_URI = "http://www.cpan.org/authors/id/G/GU/GUIDO/libintl-perl-${PV}.tar.gz" + +S = "${WORKDIR}/libintl-perl-${PV}" + +inherit cpan -- cgit v1.2.3 From 43466984142b559813c7270c6d2d988ec57b0d9e Mon Sep 17 00:00:00 2001 From: Jamie Lenehan Date: Thu, 28 Sep 2006 22:01:19 +0000 Subject: perl: Update the LICENSE on the modules to indicate that they are available under either the Artistic license or the GPL, and not just under the Artistic license. --- packages/perl/libarchive-tar-perl_1.30.bb | 4 ++-- packages/perl/libcache-cache-perl_1.05.bb | 4 ++-- packages/perl/libclass-container-perl_0.12.bb | 4 ++-- packages/perl/libclass-data-inheritable-perl_0.06.bb | 4 ++-- packages/perl/libcompress-zlib-perl_1.42.bb | 4 ++-- packages/perl/libdevel-stacktrace-perl_1.13.bb | 4 ++-- packages/perl/libdigest-sha1-perl_2.11.bb | 4 ++-- packages/perl/liberror-perl_0.17004.bb | 4 ++-- packages/perl/libexception-class-perl_1.23.bb | 4 ++-- packages/perl/libextutils-cbuilder-perl_0.18.bb | 4 ++-- packages/perl/libextutils-parsexs-perl_2.16.bb | 4 ++-- packages/perl/libio-zlib-perl_1.04.bb | 4 ++-- packages/perl/libipc-sharelite-perl_0.09.bb | 4 ++-- packages/perl/liblocale-gettext-perl_1.05.bb | 4 ++-- packages/perl/liblog-dispatch-perl_2.13.bb | 4 ++-- packages/perl/liblog-log4perl-perl_1.06.bb | 4 ++-- packages/perl/libmodule-build-perl_0.2805.bb | 4 ++-- packages/perl/libnet-ip-perl_1.25.bb | 4 ++-- packages/perl/libparams-validate-perl_0.86.bb | 4 ++-- packages/perl/libversion-perl_0.6701.bb | 4 ++-- packages/perl/libyaml-perl_0.62.bb | 4 ++-- 21 files changed, 42 insertions(+), 42 deletions(-) diff --git a/packages/perl/libarchive-tar-perl_1.30.bb b/packages/perl/libarchive-tar-perl_1.30.bb index 258cf1cb67..21b961242a 100644 --- a/packages/perl/libarchive-tar-perl_1.30.bb +++ b/packages/perl/libarchive-tar-perl_1.30.bb @@ -1,10 +1,10 @@ DESCRIPTION = "Archive::Tar - module for manipulations of tar archives" SECTION = "libs" MAINTAINER = "Jamie Lenehan " -LICENSE = "Artistic" +LICENSE = "Artistic|GPL" DEPENDS += "libio-zlib-perl-native" RDEPENDS += "libio-zlib-perl" -PR = "r0" +PR = "r1" SRC_URI = "http://search.cpan.org/CPAN/authors/id/K/KA/KANE/Archive-Tar-1.30.tar.gz" diff --git a/packages/perl/libcache-cache-perl_1.05.bb b/packages/perl/libcache-cache-perl_1.05.bb index 1869659aa8..d0e7ec46d5 100644 --- a/packages/perl/libcache-cache-perl_1.05.bb +++ b/packages/perl/libcache-cache-perl_1.05.bb @@ -1,11 +1,11 @@ DESCRIPTION = "Cache::Cache -- the Cache interface." SECTION = "libs" MAINTAINER = "Jamie Lenehan " -LICENSE = "Artistic" +LICENSE = "Artistic|GPL" DEPENDS = "libdigest-sha1-perl-native liberror-perl-native \ libipc-sharelite-perl-native" RDEPENDS = "libdigest-sha1-perl liberror-perl libipc-sharelite-perl" -PR = "r2" +PR = "r3" SRC_URI = "http://search.cpan.org/CPAN/authors/id/D/DC/DCLINTON/Cache-Cache-1.05.tar.gz" diff --git a/packages/perl/libclass-container-perl_0.12.bb b/packages/perl/libclass-container-perl_0.12.bb index e3643575e2..38fbebbe01 100644 --- a/packages/perl/libclass-container-perl_0.12.bb +++ b/packages/perl/libclass-container-perl_0.12.bb @@ -1,10 +1,10 @@ DESCRIPTION = "Class::Container - Glues object frameworks together transparently" SECTION = "libs" MAINTAINER = "Jamie Lenehan " -LICENSE = "Artistic" +LICENSE = "Artistic|GPL" DEPENDS = "libparams-validate-perl-native" RDEPENDS = "libparams-validate-perl" -PR = "r2" +PR = "r3" SRC_URI = "http://search.cpan.org/CPAN/authors/id/K/KW/KWILLIAMS/Class-Container-0.12.tar.gz" diff --git a/packages/perl/libclass-data-inheritable-perl_0.06.bb b/packages/perl/libclass-data-inheritable-perl_0.06.bb index c4e28ba434..56f099669b 100644 --- a/packages/perl/libclass-data-inheritable-perl_0.06.bb +++ b/packages/perl/libclass-data-inheritable-perl_0.06.bb @@ -1,8 +1,8 @@ DESCRIPTION = "Class::Data::Inheritable - Inheritable, overridable class data" SECTION = "libs" MAINTAINER = "Jamie Lenehan " -LICENSE = "Artistic" -PR = "r2" +LICENSE = "Artistic|GPL" +PR = "r3" SRC_URI = "http://search.cpan.org/CPAN/authors/id/T/TM/TMTM/Class-Data-Inheritable-0.06.tar.gz" diff --git a/packages/perl/libcompress-zlib-perl_1.42.bb b/packages/perl/libcompress-zlib-perl_1.42.bb index c26678a9b9..dfbfdb5633 100644 --- a/packages/perl/libcompress-zlib-perl_1.42.bb +++ b/packages/perl/libcompress-zlib-perl_1.42.bb @@ -1,8 +1,8 @@ DESCRIPTION = "Compress::Zlib - Interface to zlib compression library" SECTION = "libs" MAINTAINER = "Jamie Lenehan " -LICENSE = "Artistic" -PR = "r0" +LICENSE = "Artistic|GPL" +PR = "r1" SRC_URI = "http://search.cpan.org/CPAN/authors/id/P/PM/PMQS/Compress-Zlib-1.42.tar.gz" diff --git a/packages/perl/libdevel-stacktrace-perl_1.13.bb b/packages/perl/libdevel-stacktrace-perl_1.13.bb index 254d82afa1..b4d9b9febd 100644 --- a/packages/perl/libdevel-stacktrace-perl_1.13.bb +++ b/packages/perl/libdevel-stacktrace-perl_1.13.bb @@ -1,8 +1,8 @@ DESCRIPTION = "Devel::StackTrace - Stack trace and stack trace frame objects" SECTION = "libs" MAINTAINER = "Jamie Lenehan " -LICENSE = "Artistic" -PR = "r2" +LICENSE = "Artistic|GPL" +PR = "r3" SRC_URI = "http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Devel-StackTrace-1.13.tar.gz" diff --git a/packages/perl/libdigest-sha1-perl_2.11.bb b/packages/perl/libdigest-sha1-perl_2.11.bb index 712c0e6737..9d40110653 100644 --- a/packages/perl/libdigest-sha1-perl_2.11.bb +++ b/packages/perl/libdigest-sha1-perl_2.11.bb @@ -1,8 +1,8 @@ DESCRIPTION = "Digest::SHA1 - Perl interface to the SHA-1 algorithm" SECTION = "libs" MAINTAINER = "Jamie Lenehan " -LICENSE = "Artistic" -PR = "r5" +LICENSE = "Artistic|GPL" +PR = "r6" SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/Digest-SHA1-2.11.tar.gz" diff --git a/packages/perl/liberror-perl_0.17004.bb b/packages/perl/liberror-perl_0.17004.bb index f7f86db907..b2411adecf 100644 --- a/packages/perl/liberror-perl_0.17004.bb +++ b/packages/perl/liberror-perl_0.17004.bb @@ -1,8 +1,8 @@ DESCRIPTION = "Error - Error/exception handling in an OO-ish way" SECTION = "libs" MAINTAINER = "Jamie Lenehan " -LICENSE = "Artistic" -PR = "r2" +LICENSE = "Artistic|GPL" +PR = "r4" SRC_URI = "http://search.cpan.org/CPAN/authors/id/P/PE/PEVANS/Error-0.17004.tar.gz" diff --git a/packages/perl/libexception-class-perl_1.23.bb b/packages/perl/libexception-class-perl_1.23.bb index bcd7f1fbfd..b62e4d0ab1 100644 --- a/packages/perl/libexception-class-perl_1.23.bb +++ b/packages/perl/libexception-class-perl_1.23.bb @@ -1,10 +1,10 @@ DESCRIPTION = "Exception::Class - A module that allows you to declare real exception classes in Perl" SECTION = "libs" MAINTAINER = "Jamie Lenehan " -LICENSE = "Artistic" +LICENSE = "Artistic|GPL" DEPENDS = "libclass-data-inheritable-perl-native libdevel-stacktrace-perl-native" RDEPENDS = "libclass-data-inheritable-perl libdevel-stacktrace-perl" -PR = "r3" +PR = "r4" SRC_URI = "http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Exception-Class-1.23.tar.gz" diff --git a/packages/perl/libextutils-cbuilder-perl_0.18.bb b/packages/perl/libextutils-cbuilder-perl_0.18.bb index 8bf18e9f88..4b2b874972 100644 --- a/packages/perl/libextutils-cbuilder-perl_0.18.bb +++ b/packages/perl/libextutils-cbuilder-perl_0.18.bb @@ -1,8 +1,8 @@ DESCRIPTION = "ExtUtils::CBuilder - Compile and link C code for Perl modules" SECTION = "libs" MAINTAINER = "Jamie Lenehan " -LICENSE = "Artistic" -PR = "r0" +LICENSE = "Artistic|GPL" +PR = "r1" SRC_URI = "http://search.cpan.org/CPAN/authors/id/K/KW/KWILLIAMS/ExtUtils-CBuilder-0.18.tar.gz" diff --git a/packages/perl/libextutils-parsexs-perl_2.16.bb b/packages/perl/libextutils-parsexs-perl_2.16.bb index 313a743713..57f57edc06 100644 --- a/packages/perl/libextutils-parsexs-perl_2.16.bb +++ b/packages/perl/libextutils-parsexs-perl_2.16.bb @@ -1,8 +1,8 @@ DESCRIPTION = "ExtUtils::ParseXS - converts Perl XS code into C code" SECTION = "libs" MAINTAINER = "Jamie Lenehan " -LICENSE = "Artistic" -PR = "r0" +LICENSE = "Artistic|GPL" +PR = "r1" SRC_URI = "http://search.cpan.org/CPAN/authors/id/K/KW/KWILLIAMS/ExtUtils-ParseXS-2.16.tar.gz" diff --git a/packages/perl/libio-zlib-perl_1.04.bb b/packages/perl/libio-zlib-perl_1.04.bb index b25aeeee83..0cdbd93bdd 100644 --- a/packages/perl/libio-zlib-perl_1.04.bb +++ b/packages/perl/libio-zlib-perl_1.04.bb @@ -1,10 +1,10 @@ DESCRIPTION = "IO::Zlib - IO:: style interface to Compress::Zlib" SECTION = "libs" MAINTAINER = "Jamie Lenehan " -LICENSE = "Artistic" +LICENSE = "Artistic|GPL" DEPENDS = "libcompress-zlib-perl-native" RDEPENDS += "libcompress-zlib-perl" -PR = "r0" +PR = "r1" SRC_URI = "http://search.cpan.org/CPAN/authors/id/T/TO/TOMHUGHES/IO-Zlib-1.04.tar.gz" diff --git a/packages/perl/libipc-sharelite-perl_0.09.bb b/packages/perl/libipc-sharelite-perl_0.09.bb index 6e2c7f16e3..39808423a4 100644 --- a/packages/perl/libipc-sharelite-perl_0.09.bb +++ b/packages/perl/libipc-sharelite-perl_0.09.bb @@ -1,8 +1,8 @@ DESCRIPTION = "IPC::ShareLite - Light-weight interface to shared memory" SECTION = "libs" MAINTAINER = "Jamie Lenehan " -LICENSE = "Artistic" -PR = "r5" +LICENSE = "Artistic|GPL" +PR = "r6" SRC_URI = "http://search.cpan.org/CPAN/authors/id/M/MA/MAURICE/IPC-ShareLite-0.09.tar.gz" diff --git a/packages/perl/liblocale-gettext-perl_1.05.bb b/packages/perl/liblocale-gettext-perl_1.05.bb index 54e85c751f..0f98e9bde0 100644 --- a/packages/perl/liblocale-gettext-perl_1.05.bb +++ b/packages/perl/liblocale-gettext-perl_1.05.bb @@ -1,9 +1,9 @@ DESCRIPTION = "Locale::gettext - message handling functions" SECTION = "libs" MAINTAINER = "Jamie Lenehan " -LICENSE = "Artistic" +LICENSE = "Artistic|GPL" DEPENDS = "virtual/libintl" -PR = "r0" +PR = "r1" SRC_URI = "http://search.cpan.org/CPAN/authors/id/P/PV/PVANDRY/gettext-1.05.tar.gz" diff --git a/packages/perl/liblog-dispatch-perl_2.13.bb b/packages/perl/liblog-dispatch-perl_2.13.bb index b421dafa03..9b136a5bad 100644 --- a/packages/perl/liblog-dispatch-perl_2.13.bb +++ b/packages/perl/liblog-dispatch-perl_2.13.bb @@ -1,9 +1,9 @@ DESCRIPTION = "Log::Dispatch - Dispatches messages to one or more outputs" SECTION = "libs" MAINTAINER = "Jamie Lenehan " -LICENSE = "Artistic" +LICENSE = "Artistic|GPL" DEPENDS = "libmodule-build-perl-native" -PR = "r0" +PR = "r1" SRC_URI = "http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Log-Dispatch-2.13.tar.gz" diff --git a/packages/perl/liblog-log4perl-perl_1.06.bb b/packages/perl/liblog-log4perl-perl_1.06.bb index 31495374e8..b12b6c411a 100644 --- a/packages/perl/liblog-log4perl-perl_1.06.bb +++ b/packages/perl/liblog-log4perl-perl_1.06.bb @@ -1,8 +1,8 @@ DESCRIPTION = "Log::Log4perl - Log4j implementation for Perl" SECTION = "libs" MAINTAINER = "Jamie Lenehan " -LICENSE = "Artistic" -PR = "r0" +LICENSE = "Artistic|GPL" +PR = "r1" SRC_URI = "http://search.cpan.org/CPAN/authors/id/M/MS/MSCHILLI/Log-Log4perl-1.06.tar.gz" diff --git a/packages/perl/libmodule-build-perl_0.2805.bb b/packages/perl/libmodule-build-perl_0.2805.bb index ef646a5c1c..f8910f406d 100644 --- a/packages/perl/libmodule-build-perl_0.2805.bb +++ b/packages/perl/libmodule-build-perl_0.2805.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Module::Build - Build and install Perl modules" SECTION = "libs" SRC_URI = "http://search.cpan.org/CPAN/authors/id/K/KW/KWILLIAMS/Module-Build-0.2805.tar.gz" -LICENSE = "Artistic" +LICENSE = "Artistic|GPL" MAINTAINER = "Jamie Lenehan " DEPENDS = "libyaml-perl-native libversion-perl-native \ libextutils-cbuilder-perl-native \ @@ -9,7 +9,7 @@ DEPENDS = "libyaml-perl-native libversion-perl-native \ libarchive-tar-perl-native" RDEPENDS = "libyaml-perl libversion-perl libextutils-cbuilder-perl \ libextutils-parsexs-perl libarchive-tar-perl" -PR = "r2" +PR = "r3" S = "${WORKDIR}/Module-Build-${PV}" diff --git a/packages/perl/libnet-ip-perl_1.25.bb b/packages/perl/libnet-ip-perl_1.25.bb index 1bce440731..e8de918a5e 100644 --- a/packages/perl/libnet-ip-perl_1.25.bb +++ b/packages/perl/libnet-ip-perl_1.25.bb @@ -1,10 +1,10 @@ DESCRIPTION = "Net::IP - Perl extension for manipulating IPv4/IPv6 addresses" SECTION = "libs" MAINTAINER = "Jamie Lenehan " -LICENSE = "Artistic" +LICENSE = "Artistic|GPL" DEPENDS += "libio-zlib-perl-native" RDEPENDS += "libio-zlib-perl" -PR = "r0" +PR = "r1" SRC_URI = "http://search.cpan.org/CPAN/authors/id/M/MA/MANU/Net-IP-1.25.tar.gz" diff --git a/packages/perl/libparams-validate-perl_0.86.bb b/packages/perl/libparams-validate-perl_0.86.bb index cd628f4809..55bbe54d0e 100644 --- a/packages/perl/libparams-validate-perl_0.86.bb +++ b/packages/perl/libparams-validate-perl_0.86.bb @@ -1,8 +1,8 @@ DESCRIPTION = "Params::Validate - Validate method/function parameters" SECTION = "libs" MAINTAINER = "Jamie Lenehan " -LICENSE = "Artistic" -PR = "r5" +LICENSE = "Artistic|GPL" +PR = "r6" SRC_URI = "http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Params-Validate-0.86.tar.gz" diff --git a/packages/perl/libversion-perl_0.6701.bb b/packages/perl/libversion-perl_0.6701.bb index 19b0631a04..cbbe2fda40 100644 --- a/packages/perl/libversion-perl_0.6701.bb +++ b/packages/perl/libversion-perl_0.6701.bb @@ -1,8 +1,8 @@ DESCRIPTION = "version - Perl extension for Version Objects" SECTION = "libs" MAINTAINER = "Jamie Lenehan " -LICENSE = "Artistic" -PR = "r0" +LICENSE = "Artistic|GPL" +PR = "r1" SRC_URI = "http://search.cpan.org/CPAN/authors/id/J/JP/JPEACOCK/version-0.6701.tar.gz" diff --git a/packages/perl/libyaml-perl_0.62.bb b/packages/perl/libyaml-perl_0.62.bb index 2874fa9266..290f28c294 100644 --- a/packages/perl/libyaml-perl_0.62.bb +++ b/packages/perl/libyaml-perl_0.62.bb @@ -1,11 +1,11 @@ DESCRIPTION = "YAML - YAML Ain't Markup Language (tm)" SECTION = "libs" MAINTAINER = "Jamie Lenehan " -LICENSE = "Artistic" +LICENSE = "Artistic|GPL" DEPENDS = "libdigest-sha1-perl-native liberror-perl-native \ libipc-sharelite-perl-native" RDEPENDS = "libdigest-sha1-perl liberror-perl libipc-sharelite-perl" -PR = "r0" +PR = "r1" SRC_URI = "http://search.cpan.org/CPAN/authors/id/I/IN/INGY/YAML-0.62.tar.gz" -- cgit v1.2.3 From 3becc4e6d4863f316776c048358a5a73273fb948 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 28 Sep 2006 22:06:36 +0000 Subject: gtk+_2.10.3.bb : new version --- packages/gtk+/gtk+-2.10.3/.mtn2git_empty | 0 packages/gtk+/gtk+-2.10.3/automake-lossage.patch | 24 + packages/gtk+/gtk+-2.10.3/disable-print.patch | 50 ++ packages/gtk+/gtk+-2.10.3/disable-tooltips.patch | 11 + packages/gtk+/gtk+-2.10.3/gtk+-handhelds.patch | 236 +++++++++ packages/gtk+/gtk+-2.10.3/gtklabel-resize-patch | 10 + packages/gtk+/gtk+-2.10.3/hardcoded_libtool.patch | 29 + packages/gtk+/gtk+-2.10.3/menu-deactivate.patch | 51 ++ packages/gtk+/gtk+-2.10.3/migration.patch | 615 ++++++++++++++++++++++ packages/gtk+/gtk+-2.10.3/no-demos.patch | 10 + packages/gtk+/gtk+-2.10.3/no-xwc.patch | 151 ++++++ packages/gtk+/gtk+-2.10.3/run-iconcache.patch | 19 + packages/gtk+/gtk+-2.10.3/scroll-timings.patch | 11 + packages/gtk+/gtk+-2.10.3/single-click.patch | 54 ++ packages/gtk+/gtk+-2.10.3/small-gtkfilesel.patch | 267 ++++++++++ packages/gtk+/gtk+-2.10.3/spinbutton.patch | 128 +++++ packages/gtk+/gtk+-2.10.3/xsettings.patch | 16 + packages/gtk+/gtk+_2.10.3.bb | 92 ++++ 18 files changed, 1774 insertions(+) create mode 100644 packages/gtk+/gtk+-2.10.3/.mtn2git_empty create mode 100644 packages/gtk+/gtk+-2.10.3/automake-lossage.patch create mode 100644 packages/gtk+/gtk+-2.10.3/disable-print.patch create mode 100644 packages/gtk+/gtk+-2.10.3/disable-tooltips.patch create mode 100644 packages/gtk+/gtk+-2.10.3/gtk+-handhelds.patch create mode 100644 packages/gtk+/gtk+-2.10.3/gtklabel-resize-patch create mode 100644 packages/gtk+/gtk+-2.10.3/hardcoded_libtool.patch create mode 100644 packages/gtk+/gtk+-2.10.3/menu-deactivate.patch create mode 100644 packages/gtk+/gtk+-2.10.3/migration.patch create mode 100644 packages/gtk+/gtk+-2.10.3/no-demos.patch create mode 100644 packages/gtk+/gtk+-2.10.3/no-xwc.patch create mode 100644 packages/gtk+/gtk+-2.10.3/run-iconcache.patch create mode 100644 packages/gtk+/gtk+-2.10.3/scroll-timings.patch create mode 100644 packages/gtk+/gtk+-2.10.3/single-click.patch create mode 100644 packages/gtk+/gtk+-2.10.3/small-gtkfilesel.patch create mode 100644 packages/gtk+/gtk+-2.10.3/spinbutton.patch create mode 100644 packages/gtk+/gtk+-2.10.3/xsettings.patch create mode 100644 packages/gtk+/gtk+_2.10.3.bb diff --git a/packages/gtk+/gtk+-2.10.3/.mtn2git_empty b/packages/gtk+/gtk+-2.10.3/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gtk+/gtk+-2.10.3/automake-lossage.patch b/packages/gtk+/gtk+-2.10.3/automake-lossage.patch new file mode 100644 index 0000000000..0d423ddbb9 --- /dev/null +++ b/packages/gtk+/gtk+-2.10.3/automake-lossage.patch @@ -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/packages/gtk+/gtk+-2.10.3/disable-print.patch b/packages/gtk+/gtk+-2.10.3/disable-print.patch new file mode 100644 index 0000000000..1067773f12 --- /dev/null +++ b/packages/gtk+/gtk+-2.10.3/disable-print.patch @@ -0,0 +1,50 @@ +--- gtk+-2.10.0/configure.in~ 2006-07-05 18:11:44.000000000 +0200 ++++ gtk+-2.10.0/configure.in 2006-07-05 18:11:44.000000000 +0200 +@@ -1539,26 +1539,27 @@ + # Printing system checks + ################################################################ + +-AC_PATH_PROG(CUPS_CONFIG, cups-config, no) +-if test "x$CUPS_CONFIG" != "xno"; then +- CUPS_CFLAGS=`cups-config --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'` +- CUPS_LIBS=`cups-config --libs` +- +- CUPS_API_VERSION=`cups-config --api-version` +- CUPS_API_MAJOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $1}'` +- CUPS_API_MINOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $2}'` +- +- if test $CUPS_API_MAJOR -gt 1 -o \ +- $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then +- AC_DEFINE(HAVE_CUPS_API_1_2) +- fi +- +- AC_SUBST(CUPS_API_MAJOR) +- AC_SUBST(CUPS_API_MINOR) +- AC_SUBST(CUPS_CFLAGS) +- AC_SUBST(CUPS_LIBS) +-fi +-AM_CONDITIONAL(HAVE_CUPS, test "x$CUPS_CONFIG" != "xno") ++#AC_PATH_PROG(CUPS_CONFIG, cups-config, no) ++#if test "x$CUPS_CONFIG" != "xno"; then ++# CUPS_CFLAGS=`cups-config --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'` ++# CUPS_LIBS=`cups-config --libs` ++# ++# CUPS_API_VERSION=`cups-config --api-version` ++# CUPS_API_MAJOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $1}'` ++# CUPS_API_MINOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $2}'` ++# ++# if test $CUPS_API_MAJOR -gt 1 -o \ ++# $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then ++# AC_DEFINE(HAVE_CUPS_API_1_2) ++# fi ++# ++# AC_SUBST(CUPS_API_MAJOR) ++# AC_SUBST(CUPS_API_MINOR) ++# AC_SUBST(CUPS_CFLAGS) ++# AC_SUBST(CUPS_LIBS) ++#fi ++#AM_CONDITIONAL(HAVE_CUPS, test "x$CUPS_CONFIG" != "xno") ++AM_CONDITIONAL(HAVE_CUPS,false) + + gtk_save_cppflags="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS" diff --git a/packages/gtk+/gtk+-2.10.3/disable-tooltips.patch b/packages/gtk+/gtk+-2.10.3/disable-tooltips.patch new file mode 100644 index 0000000000..d71d839c3c --- /dev/null +++ b/packages/gtk+/gtk+-2.10.3/disable-tooltips.patch @@ -0,0 +1,11 @@ +--- gtk+-2.4.3/gtk/gtktooltips.c.old 2004-07-04 18:52:04.000000000 +0100 ++++ gtk+-2.4.3/gtk/gtktooltips.c 2004-07-04 18:52:08.000000000 +0100 +@@ -118,7 +118,7 @@ + tooltips->tips_data_list = NULL; + + tooltips->delay = DEFAULT_DELAY; +- tooltips->enabled = TRUE; ++ tooltips->enabled = FALSE; + tooltips->timer_tag = 0; + tooltips->use_sticky_delay = FALSE; + tooltips->last_popdown.tv_sec = -1; diff --git a/packages/gtk+/gtk+-2.10.3/gtk+-handhelds.patch b/packages/gtk+/gtk+-2.10.3/gtk+-handhelds.patch new file mode 100644 index 0000000000..20481f059b --- /dev/null +++ b/packages/gtk+/gtk+-2.10.3/gtk+-handhelds.patch @@ -0,0 +1,236 @@ +--- gtk+-2.4.1/gtk/gtkarrow.c 2004-03-13 09:51:13.000000000 +1100 ++++ gtk+-2.4.1/gtk/gtkarrow.c 2004-05-26 14:52:17.000000000 +1000 +@@ -29,7 +29,7 @@ + #include "gtkarrow.h" + #include "gtkintl.h" + +-#define MIN_ARROW_SIZE 15 ++#define MIN_ARROW_SIZE 7 + + enum { + PROP_0, +@@ -53,6 +53,8 @@ + guint prop_id, + GValue *value, + GParamSpec *pspec); ++static void gtk_arrow_size_request (GtkWidget *arrow, ++ GtkRequisition *requisition); + + GType + gtk_arrow_get_type (void) +@@ -111,6 +113,7 @@ + G_PARAM_READABLE | G_PARAM_WRITABLE)); + + widget_class->expose_event = gtk_arrow_expose; ++ widget_class->size_request = gtk_arrow_size_request; + } + + static void +@@ -166,13 +169,18 @@ + } + + static void ++gtk_arrow_size_request (GtkWidget *arrow, ++ GtkRequisition *requisition) ++{ ++ requisition->width = MIN_ARROW_SIZE + GTK_MISC (arrow)->xpad * 2; ++ requisition->height = MIN_ARROW_SIZE + GTK_MISC (arrow)->ypad * 2; ++} ++ ++static void + gtk_arrow_init (GtkArrow *arrow) + { + GTK_WIDGET_SET_FLAGS (arrow, GTK_NO_WINDOW); + +- GTK_WIDGET (arrow)->requisition.width = MIN_ARROW_SIZE + GTK_MISC (arrow)->xpad * 2; +- GTK_WIDGET (arrow)->requisition.height = MIN_ARROW_SIZE + GTK_MISC (arrow)->ypad * 2; +- + arrow->arrow_type = GTK_ARROW_RIGHT; + arrow->shadow_type = GTK_SHADOW_OUT; + } +--- gtk+-2.4.1/gtk/gtkcalendar.c 2004-03-06 14:37:26.000000000 +1100 ++++ gtk+-2.4.1/gtk/gtkcalendar.c 2004-05-26 14:58:57.000000000 +1000 +@@ -340,6 +340,9 @@ + static void gtk_calendar_select_and_focus_day (GtkCalendar *calendar, + guint day); + ++static void gtk_calendar_do_select_day (GtkCalendar *calendar, ++ guint day); ++ + static void gtk_calendar_paint_arrow (GtkWidget *widget, + guint arrow); + static void gtk_calendar_paint_day_num (GtkWidget *widget, +@@ -861,13 +864,13 @@ + if (month_len < calendar->selected_day) + { + calendar->selected_day = 0; +- gtk_calendar_select_day (calendar, month_len); ++ gtk_calendar_do_select_day (calendar, month_len); + } + else + { + if (calendar->selected_day < 0) + calendar->selected_day = calendar->selected_day + 1 + month_length[leap (calendar->year)][calendar->month + 1]; +- gtk_calendar_select_day (calendar, calendar->selected_day); ++ gtk_calendar_do_select_day (calendar, calendar->selected_day); + } + + gtk_widget_queue_draw (GTK_WIDGET (calendar)); +@@ -908,10 +911,10 @@ + if (month_len < calendar->selected_day) + { + calendar->selected_day = 0; +- gtk_calendar_select_day (calendar, month_len); ++ gtk_calendar_do_select_day (calendar, month_len); + } + else +- gtk_calendar_select_day (calendar, calendar->selected_day); ++ gtk_calendar_do_select_day (calendar, calendar->selected_day); + + gtk_widget_queue_draw (GTK_WIDGET (calendar)); + gtk_calendar_thaw (calendar); +@@ -939,10 +942,10 @@ + if (month_len < calendar->selected_day) + { + calendar->selected_day = 0; +- gtk_calendar_select_day (calendar, month_len); ++ gtk_calendar_do_select_day (calendar, month_len); + } + else +- gtk_calendar_select_day (calendar, calendar->selected_day); ++ gtk_calendar_do_select_day (calendar, calendar->selected_day); + + gtk_widget_queue_draw (GTK_WIDGET (calendar)); + gtk_calendar_thaw (calendar); +@@ -974,10 +977,10 @@ + if (month_len < calendar->selected_day) + { + calendar->selected_day = 0; +- gtk_calendar_select_day (calendar, month_len); ++ gtk_calendar_do_select_day (calendar, month_len); + } + else +- gtk_calendar_select_day (calendar, calendar->selected_day); ++ gtk_calendar_do_select_day (calendar, calendar->selected_day); + + gtk_widget_queue_draw (GTK_WIDGET (calendar)); + gtk_calendar_thaw (calendar); +@@ -2480,9 +2483,9 @@ + return TRUE; + } + +-void +-gtk_calendar_select_day (GtkCalendar *calendar, +- guint day) ++static void ++gtk_calendar_do_select_day (GtkCalendar *calendar, ++ guint day) + { + g_return_if_fail (GTK_IS_CALENDAR (calendar)); + g_return_if_fail (day <= 31); +@@ -2499,6 +2502,13 @@ + if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (calendar))) + gtk_calendar_paint_day_num (GTK_WIDGET (calendar), selected_day); + } ++} ++ ++void ++gtk_calendar_select_day (GtkCalendar *calendar, ++ guint day) ++{ ++ gtk_calendar_do_select_day (calendar, day); + + calendar->selected_day = day; + +--- gtk+-2.4.1/gtk/gtkentry.c 2004-04-22 08:08:08.000000000 +1000 ++++ gtk+-2.4.1/gtk/gtkentry.c 2004-05-26 14:52:17.000000000 +1000 +@@ -557,6 +557,15 @@ + 0.0, + G_PARAM_READABLE | G_PARAM_WRITABLE)); + ++ gtk_widget_class_install_style_property (widget_class, ++ g_param_spec_int ("min_width", ++ _("Minimum width"), ++ _("Minimum width of the entry field"), ++ 0, ++ G_MAXINT, ++ MIN_ENTRY_WIDTH, ++ G_PARAM_READABLE)); ++ + signals[POPULATE_POPUP] = + g_signal_new ("populate_popup", + G_OBJECT_CLASS_TYPE (gobject_class), +@@ -1124,7 +1133,7 @@ + { + GtkEntry *entry = GTK_ENTRY (widget); + PangoFontMetrics *metrics; +- gint xborder, yborder; ++ gint xborder, yborder, min_width; + PangoContext *context; + + gtk_widget_ensure_style (widget); +@@ -1140,9 +1149,11 @@ + + xborder += INNER_BORDER; + yborder += INNER_BORDER; +- ++ ++ gtk_widget_style_get (widget, "min_width", &min_width, NULL); ++ + if (entry->width_chars < 0) +- requisition->width = MIN_ENTRY_WIDTH + xborder * 2; ++ requisition->width = min_width + xborder * 2; + else + { + gint char_width = pango_font_metrics_get_approximate_char_width (metrics); +--- gtk+-2.4.1/gtk/gtkrange.c 2004-03-06 14:38:08.000000000 +1100 ++++ gtk+-2.4.1/gtk/gtkrange.c 2004-05-26 14:52:17.000000000 +1000 +@@ -180,6 +180,7 @@ + static GtkWidgetClass *parent_class = NULL; + static guint signals[LAST_SIGNAL]; + ++static GdkAtom recognize_protocols_atom, atom_atom; + + GType + gtk_range_get_type (void) +@@ -220,6 +221,9 @@ + object_class = (GtkObjectClass*) class; + widget_class = (GtkWidgetClass*) class; + ++ recognize_protocols_atom = gdk_atom_intern ("RECOGNIZE_PROTOCOLS", FALSE); ++ atom_atom = gdk_atom_intern ("ATOM", FALSE); ++ + parent_class = g_type_class_peek_parent (class); + + gobject_class->set_property = gtk_range_set_property; +@@ -815,6 +819,12 @@ + &attributes, attributes_mask); + gdk_window_set_user_data (range->event_window, range); + ++ gdk_property_change (range->event_window, ++ recognize_protocols_atom, ++ atom_atom, ++ 32, GDK_PROP_MODE_REPLACE, ++ NULL, 0); ++ + widget->style = gtk_style_attach (widget->style, widget->window); + } + +@@ -1186,7 +1196,7 @@ + + /* ignore presses when we're already doing something else. */ + if (range->layout->grab_location != MOUSE_OUTSIDE) +- return FALSE; ++ return TRUE; + + range->layout->mouse_x = event->x; + range->layout->mouse_y = event->y; +@@ -1364,7 +1374,7 @@ + return TRUE; + } + +- return FALSE; ++ return TRUE; + } + + /** diff --git a/packages/gtk+/gtk+-2.10.3/gtklabel-resize-patch b/packages/gtk+/gtk+-2.10.3/gtklabel-resize-patch new file mode 100644 index 0000000000..df29656343 --- /dev/null +++ b/packages/gtk+/gtk+-2.10.3/gtklabel-resize-patch @@ -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/packages/gtk+/gtk+-2.10.3/hardcoded_libtool.patch b/packages/gtk+/gtk+-2.10.3/hardcoded_libtool.patch new file mode 100644 index 0000000000..bdbdb32f97 --- /dev/null +++ b/packages/gtk+/gtk+-2.10.3/hardcoded_libtool.patch @@ -0,0 +1,29 @@ +--- gtk+-2.10.0/configure.in.orig 2006-07-07 09:31:34.000000000 +0100 ++++ gtk+-2.10.0/configure.in 2006-07-07 09:32:49.000000000 +0100 +@@ -370,7 +370,7 @@ + AC_MSG_CHECKING([Whether to write dependencies into .pc files]) + case $enable_explicit_deps in + auto) +- deplibs_check_method=`(./libtool --config; echo eval echo \\$deplibs_check_method) | sh` ++ deplibs_check_method=`(./$host_alias-libtool --config; echo eval echo \\$deplibs_check_method) | sh` + if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then + enable_explicit_deps=yes + else +@@ -768,7 +768,7 @@ + dnl Now we check to see if our libtool supports shared lib deps + dnl (in a rather ugly way even) + if $dynworks; then +- pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config" ++ pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./$host_alias-libtool --config" + pixbuf_deplibs_check=`$pixbuf_libtool_config | \ + grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \ + sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'` +@@ -1600,7 +1600,7 @@ + # + # We are using gmodule-no-export now, but I'm leaving the stripping + # code in place for now, since pango and atk still require gmodule. +-export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` ++export_dynamic=`(./$host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` + if test -n "$export_dynamic"; then + GDK_PIXBUF_DEP_LIBS=`echo $GDK_PIXBUF_DEP_LIBS | sed -e "s/$export_dynamic//"` + GDK_PIXBUF_XLIB_DEP_LIBS=`echo $GDK_PIXBUF_XLIB_DEP_LIBS | sed -e "s/$export_dynamic//"` diff --git a/packages/gtk+/gtk+-2.10.3/menu-deactivate.patch b/packages/gtk+/gtk+-2.10.3/menu-deactivate.patch new file mode 100644 index 0000000000..cfb8849e9f --- /dev/null +++ b/packages/gtk+/gtk+-2.10.3/menu-deactivate.patch @@ -0,0 +1,51 @@ +--- gtk+-2.10.0/gtk/gtkmenushell.c.orig 2006-07-05 17:17:34.000000000 +0200 ++++ gtk+-2.10.0/gtk/gtkmenushell.c 2006-07-05 17:19:01.000000000 +0200 +@@ -42,7 +42,7 @@ + #include "gtkintl.h" + #include "gtkalias.h" + +-#define MENU_SHELL_TIMEOUT 500 ++#define MENU_SHELL_TIMEOUT 2000 + + #define PACK_DIRECTION(m) \ + (GTK_IS_MENU_BAR (m) \ +@@ -203,6 +203,8 @@ + + G_DEFINE_TYPE (GtkMenuShell, gtk_menu_shell, GTK_TYPE_CONTAINER) + ++static int last_crossing_time; ++ + static void + gtk_menu_shell_class_init (GtkMenuShellClass *klass) + { +@@ -517,6 +519,7 @@ + gtk_grab_add (GTK_WIDGET (menu_shell)); + menu_shell->have_grab = TRUE; + menu_shell->active = TRUE; ++ last_crossing_time = 0; + } + } + +@@ -669,6 +672,13 @@ + menu_shell->activate_time = 0; + deactivate = FALSE; + } ++ ++ if (last_crossing_time != 0 ++ && ((event->time - last_crossing_time) < 500)) ++ { ++ last_crossing_time = 0; ++ deactivate = FALSE; ++ } + + if (deactivate) + { +@@ -716,6 +726,8 @@ + { + menu_item = gtk_get_event_widget ((GdkEvent*) event); + ++ last_crossing_time = event->time; ++ + if (!menu_item || + (GTK_IS_MENU_ITEM (menu_item) && + !_gtk_menu_item_is_selectable (menu_item))) diff --git a/packages/gtk+/gtk+-2.10.3/migration.patch b/packages/gtk+/gtk+-2.10.3/migration.patch new file mode 100644 index 0000000000..4850f85e4f --- /dev/null +++ b/packages/gtk+/gtk+-2.10.3/migration.patch @@ -0,0 +1,615 @@ +Index: configure.in +=================================================================== +RCS file: /cvs/gnome/gtk+/configure.in,v +retrieving revision 1.419.2.4 +diff -u -r1.419.2.4 configure.in +--- configure.in 8 Feb 2005 21:39:42 -0000 1.419.2.4 ++++ configure.in 27 Feb 2005 13:10:16 -0000 +@@ -1495,6 +1495,16 @@ + GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GTK_PACKAGES` $GTK_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS" + GTK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GTK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS $GTK_EXTRA_CFLAGS" + ++AC_ARG_ENABLE(display-migration, ++ [AC_HELP_STRING([--enable-display-migration], ++ [include support for GPE_CHANGE_DISPLAY protocol])], ++ enable_migration=yes, enable_migration=no) ++if test "$enable_migration" = "yes"; then ++ AC_DEFINE([ENABLE_MIGRATION], 1, [Define if display migration is enabled]) ++ GTK_DEP_LIBS="$GTK_DEP_LIBS -lgcrypt" ++fi ++AM_CONDITIONAL(ENABLE_MIGRATION, test $enable_migration = "yes") ++ + AC_SUBST(GTK_PACKAGES) + AC_SUBST(GTK_EXTRA_LIBS) + AC_SUBST(GTK_EXTRA_CFLAGS) +Index: gtk/Makefile.am +=================================================================== +RCS file: /cvs/gnome/gtk+/gtk/Makefile.am,v +retrieving revision 1.266.2.1 +diff -u -r1.266.2.1 Makefile.am +--- gtk/Makefile.am 13 Jan 2005 15:18:21 -0000 1.266.2.1 ++++ gtk/Makefile.am 27 Feb 2005 13:10:17 -0000 +@@ -520,6 +520,10 @@ + gtkwindow.c \ + xembed.h + ++if ENABLE_MIGRATION ++gtk_c_sources += gtkmigration.c ++endif ++ + if OS_UNIX + gtk_private_h_sources += gtkfilesystemunix.h + gtk_c_sources += gtkfilesystemunix.c +Index: gtk/gtkmain.c +=================================================================== +RCS file: /cvs/gnome/gtk+/gtk/gtkmain.c,v +retrieving revision 1.255 +diff -u -r1.255 gtkmain.c +--- gtk/gtkmain.c 27 Dec 2004 05:25:15 -0000 1.255 ++++ gtk/gtkmain.c 27 Feb 2005 13:10:19 -0000 +@@ -491,6 +491,10 @@ + _gtk_accel_map_init (); + _gtk_rc_init (); + ++#ifdef ENABLE_MIGRATION ++ gtk_migration_init (); ++#endif ++ + /* Set the 'initialized' flag. + */ + gtk_initialized = TRUE; +--- /dev/null 2005-02-20 01:07:50.714416160 +0000 ++++ gtk/gtkmigration.c 2005-02-27 15:05:04.052757352 +0000 +@@ -0,0 +1,529 @@ ++/* ++ * Copyright (C) 2003, 2005 Philip Blundell ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License ++ * as published by the Free Software Foundation; either version ++ * 2 of the License, or (at your option) any later version. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++ ++#include ++ ++#include "gtk.h" ++#include "gdk.h" ++#include "x11/gdkx.h" ++ ++#define _(x) gettext(x) ++ ++static GdkAtom string_gdkatom, display_change_gdkatom; ++static GdkAtom rsa_challenge_gdkatom; ++ ++#define DISPLAY_CHANGE_SUCCESS 0 ++#define DISPLAY_CHANGE_UNABLE_TO_CONNECT 1 ++#define DISPLAY_CHANGE_NO_SUCH_SCREEN 2 ++#define DISPLAY_CHANGE_AUTHENTICATION_BAD 3 ++#define DISPLAY_CHANGE_INDETERMINATE_ERROR 4 ++ ++static gboolean no_auth; ++ ++static GSList *all_widgets; ++ ++static gboolean gtk_migration_initialised; ++ ++#define CHALLENGE_LEN 64 ++ ++gchar *gtk_migration_auth_challenge_string; ++ ++static unsigned char challenge_bytes[CHALLENGE_LEN]; ++static unsigned long challenge_seq; ++ ++#define hexbyte(x) ((x) >= 10 ? (x) + 'a' - 10 : (x) + '0') ++ ++struct rsa_key ++{ ++ gcry_mpi_t n, e, d, p, q, u; ++}; ++ ++static gcry_mpi_t ++mpi_from_sexp (gcry_sexp_t r, char *tag) ++{ ++ gcry_sexp_t s = gcry_sexp_find_token (r, tag, 0); ++ return gcry_sexp_nth_mpi (s, 1, GCRYMPI_FMT_USG); ++} ++ ++static char * ++hex_from_mpi (gcry_mpi_t m) ++{ ++ char *buf; ++ gcry_mpi_aprint (GCRYMPI_FMT_HEX, (void *)&buf, NULL, m); ++ return buf; ++} ++ ++static void ++gtk_migration_crypt_create_hash (char *display, char *challenge, size_t len, char *result) ++{ ++ size_t dlen = strlen (display); ++ gchar *buf = g_malloc (dlen + 1 + len); ++ strcpy (buf, display); ++ memcpy (buf + dlen + 1, challenge, len); ++ gcry_md_hash_buffer (GCRY_MD_SHA1, result, buf, len + dlen + 1); ++ g_free (buf); ++} ++ ++static int ++do_encode_md (const unsigned char *digest, size_t digestlen, int algo, ++ unsigned int nbits, gcry_mpi_t *r_val) ++{ ++ int nframe = (nbits+7) / 8; ++ unsigned char *frame; ++ int i, n; ++ unsigned char asn[100]; ++ size_t asnlen; ++ ++ asnlen = sizeof(asn); ++ if (gcry_md_algo_info (algo, GCRYCTL_GET_ASNOID, asn, &asnlen)) ++ return -1; ++ ++ if (digestlen + asnlen + 4 > nframe ) ++ return -1; ++ ++ /* We encode the MD in this way: ++ * ++ * 0 1 PAD(n bytes) 0 ASN(asnlen bytes) MD(len bytes) ++ * ++ * PAD consists of FF bytes. ++ */ ++ frame = g_malloc (nframe); ++ n = 0; ++ frame[n++] = 0; ++ frame[n++] = 1; /* block type */ ++ i = nframe - digestlen - asnlen -3 ; ++ assert ( i > 1 ); ++ memset ( frame+n, 0xff, i ); n += i; ++ frame[n++] = 0; ++ memcpy ( frame+n, asn, asnlen ); n += asnlen; ++ memcpy ( frame+n, digest, digestlen ); n += digestlen; ++ assert ( n == nframe ); ++ ++ gcry_mpi_scan (r_val, GCRYMPI_FMT_USG, frame, nframe, &nframe); ++ g_free (frame); ++ return 0; ++} ++ ++static gboolean ++gtk_migration_crypt_check_signature (struct rsa_key *k, char *hash, char *sigbuf) ++{ ++ gcry_mpi_t mpi, mpi2; ++ gcry_sexp_t data, sig, key; ++ int rc; ++ ++ do_encode_md (hash, 20, GCRY_MD_SHA1, 1024, &mpi); ++ ++ gcry_sexp_build (&data, NULL, "(data (value %m))", mpi); ++ ++ gcry_mpi_release (mpi); ++ ++ gcry_sexp_build (&key, NULL, "(public-key (rsa (n %m) (e %m)))", k->n, k->e); ++ ++ if (gcry_mpi_scan (&mpi2, GCRYMPI_FMT_HEX, sigbuf, 0, NULL)) ++ { ++ gcry_sexp_release (data); ++ return FALSE; ++ } ++ ++ gcry_sexp_build (&sig, NULL, "(sig-val (rsa (s %m)))", mpi2); ++ ++ rc = gcry_pk_verify (sig, data, key); ++ ++ gcry_sexp_release (data); ++ gcry_sexp_release (key); ++ gcry_sexp_release (sig); ++ gcry_mpi_release (mpi2); ++ ++ if (rc) ++ return FALSE; ++ ++ return TRUE; ++} ++ ++static void ++gtk_migration_auth_update_challenge (void) ++{ ++ int i; ++ unsigned char *p; ++ ++ if (gtk_migration_auth_challenge_string == NULL) ++ gtk_migration_auth_challenge_string = g_malloc ((CHALLENGE_LEN * 2) + 9); ++ ++ p = gtk_migration_auth_challenge_string; ++ ++ for (i = 0; i < CHALLENGE_LEN; i++) ++ { ++ *p++ = hexbyte (challenge_bytes[i] >> 4); ++ *p++ = hexbyte (challenge_bytes[i] & 15); ++ } ++ ++ sprintf (p, "%08lx", challenge_seq++); ++} ++ ++static void ++gtk_migration_auth_generate_challenge (void) ++{ ++ gcry_randomize (challenge_bytes, sizeof (challenge_bytes), GCRY_STRONG_RANDOM); ++ gtk_migration_auth_update_challenge (); ++} ++ ++static struct rsa_key * ++parse_pubkey (char *s) ++{ ++ struct rsa_key *r; ++ gcry_mpi_t n, e; ++ gchar *sp; ++ ++ sp = strtok (s, " \n"); ++ gcry_mpi_scan (&e, GCRYMPI_FMT_HEX, sp, 0, NULL); ++ sp = strtok (NULL, " \n"); ++ gcry_mpi_scan (&n, GCRYMPI_FMT_HEX, sp, 0, NULL); ++ ++ r = g_malloc0 (sizeof (struct rsa_key)); ++ r->e = e; ++ r->n = n; ++ return r; ++} ++ ++static struct rsa_key * ++lookup_pubkey (u_int32_t id) ++{ ++ const gchar *home_dir = g_get_home_dir (); ++ gchar *filename = g_strdup_printf ("%s/.gpe/migrate/public", home_dir); ++ FILE *fp = fopen (filename, "r"); ++ struct rsa_key *r = NULL; ++ ++ if (fp) ++ { ++ while (!feof (fp)) ++ { ++ char buffer[4096]; ++ if (fgets (buffer, 4096, fp)) ++ { ++ char *p; ++ u_int32_t this_id = strtoul (buffer, &p, 16); ++ if (p != buffer && *p == ' ') ++ { ++#ifdef DEBUG ++ fprintf (stderr, "found id %x\n", this_id); ++#endif ++ if (this_id == id) ++ { ++ r = parse_pubkey (++p); ++ break; ++ } ++ } ++ } ++ } ++ fclose (fp); ++ } ++ ++ g_free (filename); ++ return r; ++} ++ ++static void ++free_pubkey (struct rsa_key *k) ++{ ++ gcry_mpi_release (k->n); ++ gcry_mpi_release (k->e); ++ ++ g_free (k); ++} ++ ++static gboolean ++gtk_migration_auth_validate_request (char *display, char *data) ++{ ++ u_int32_t key_id; ++ char *ep; ++ char *p; ++ struct rsa_key *k; ++ char hash[20]; ++ gboolean rc; ++ ++ p = strchr (data, ' '); ++ if (p == NULL) ++ return FALSE; ++ *p++ = 0; ++ ++ key_id = strtoul (data, &ep, 16); ++ if (*ep) ++ return FALSE; ++ ++ k = lookup_pubkey (key_id); ++ if (k == NULL) ++ return FALSE; ++ ++ gtk_migration_crypt_create_hash (display, gtk_migration_auth_challenge_string, ++ strlen (gtk_migration_auth_challenge_string), hash); ++ ++ rc = gtk_migration_crypt_check_signature (k, hash, p); ++ ++ free_pubkey (k); ++ ++ return rc; ++} ++ ++static int ++do_change_display (GtkWidget *w, char *display_name) ++{ ++ GdkDisplay *newdisplay; ++ guint screen_nr = 1; ++ guint i; ++ ++ if (display_name[0] == 0) ++ return DISPLAY_CHANGE_INDETERMINATE_ERROR; ++ ++ i = strlen (display_name) - 1; ++ while (i > 0 && isdigit (display_name[i])) ++ i--; ++ ++ if (display_name[i] == '.') ++ { ++ screen_nr = atoi (display_name + i + 1); ++ display_name[i] = 0; ++ } ++ ++ newdisplay = gdk_display_open (display_name); ++ if (newdisplay) ++ { ++ GdkScreen *screen = gdk_display_get_screen (newdisplay, screen_nr); ++ if (screen) ++ { ++ gtk_window_set_screen (GTK_WINDOW (w), screen); ++ gdk_display_manager_set_default_display (gdk_display_manager_get (), ++ newdisplay); ++ return DISPLAY_CHANGE_SUCCESS; ++ } ++ else ++ return DISPLAY_CHANGE_NO_SUCH_SCREEN; ++ } ++ ++ return DISPLAY_CHANGE_UNABLE_TO_CONNECT; ++} ++ ++static void ++set_challenge_on_window (GdkWindow *window) ++{ ++ gdk_property_change (window, rsa_challenge_gdkatom, string_gdkatom, ++ 8, GDK_PROP_MODE_REPLACE, gtk_migration_auth_challenge_string, ++ strlen (gtk_migration_auth_challenge_string)); ++} ++ ++static void ++update_challenge_on_windows (void) ++{ ++ GSList *i; ++ ++ gtk_migration_auth_update_challenge (); ++ ++ for (i = all_widgets; i; i = i->next) ++ { ++ GtkWidget *w = GTK_WIDGET (i->data); ++ if (w->window) ++ set_challenge_on_window (w->window); ++ } ++} ++ ++static void ++reset_state (GdkWindow *window) ++{ ++ gdk_property_change (window, display_change_gdkatom, string_gdkatom, ++ 8, GDK_PROP_MODE_REPLACE, NULL, 0); ++} ++ ++static void ++generate_response (GdkDisplay *gdisplay, Display *dpy, Window window, int code) ++{ ++ XClientMessageEvent ev; ++ Atom atom = gdk_x11_atom_to_xatom_for_display (gdisplay, ++ display_change_gdkatom); ++ ++ memset (&ev, 0, sizeof (ev)); ++ ++ ev.type = ClientMessage; ++ ev.window = window; ++ ev.message_type = atom; ++ ev.format = 32; ++ ++ ev.data.l[0] = window; ++ ev.data.l[1] = code; ++ ++ XSendEvent (dpy, DefaultRootWindow (dpy), False, SubstructureNotifyMask, (XEvent *)&ev); ++} ++ ++static int ++handle_request (GdkWindow *gwindow, char *prop) ++{ ++ GtkWidget *widget; ++ char *target, *auth_method, *auth_data; ++ char *p; ++ ++ target = prop; ++ auth_method = "NULL"; ++ auth_data = NULL; ++ ++ p = strchr (prop, ' '); ++ if (p) ++ { ++ *p = 0; ++ auth_method = ++p; ++ ++ p = strchr (p, ' '); ++ if (p) ++ { ++ *p = 0; ++ auth_data = ++p; ++ } ++ } ++ ++ if (no_auth == FALSE) ++ { ++ if (!strcasecmp (auth_method, "null")) ++ return DISPLAY_CHANGE_AUTHENTICATION_BAD; ++ else if (!strcasecmp (auth_method, "rsa-sig")) ++ { ++ if (gtk_migration_auth_validate_request (target, auth_data) == FALSE) ++ return DISPLAY_CHANGE_AUTHENTICATION_BAD; ++ } ++ else ++ return DISPLAY_CHANGE_AUTHENTICATION_BAD; ++ } ++ ++ gdk_window_get_user_data (gwindow, (gpointer*) &widget); ++ ++ if (widget) ++ return do_change_display (widget, target); ++ ++ return DISPLAY_CHANGE_INDETERMINATE_ERROR; ++} ++ ++static GdkFilterReturn ++filter_func (GdkXEvent *xevp, GdkEvent *ev, gpointer p) ++{ ++ XPropertyEvent *xev = (XPropertyEvent *)xevp; ++ ++ if (xev->type == PropertyNotify) ++ { ++ GdkDisplay *gdisplay; ++ Atom atom; ++ ++ gdisplay = gdk_x11_lookup_xdisplay (xev->display); ++ if (gdisplay) ++ { ++ atom = gdk_x11_atom_to_xatom_for_display (gdisplay, display_change_gdkatom); ++ ++ if (xev->atom == atom) ++ { ++ GdkWindow *gwindow; ++ ++ gwindow = gdk_window_lookup_for_display (gdisplay, xev->window); ++ ++ if (gwindow) ++ { ++ GdkAtom actual_type; ++ gint actual_format; ++ gint actual_length; ++ unsigned char *prop = NULL; ++ ++ if (gdk_property_get (gwindow, display_change_gdkatom, string_gdkatom, ++ 0, G_MAXLONG, FALSE, &actual_type, &actual_format, ++ &actual_length, &prop)) ++ { ++ if (actual_length != 0) ++ { ++ if (actual_type == string_gdkatom && actual_length > 8) ++ { ++ gchar *buf = g_malloc (actual_length + 1); ++ int rc; ++ ++ memcpy (buf, prop, actual_length); ++ buf[actual_length] = 0; ++ ++ rc = handle_request (gwindow, buf); ++ ++ g_free (buf); ++ generate_response (gdisplay, xev->display, xev->window, rc); ++ ++ if (rc == DISPLAY_CHANGE_SUCCESS) ++ update_challenge_on_windows (); ++ } ++ ++ reset_state (gwindow); ++ } ++ } ++ ++ if (prop) ++ g_free (prop); ++ } ++ } ++ ++ return GDK_FILTER_REMOVE; ++ } ++ } ++ ++ return GDK_FILTER_CONTINUE; ++} ++ ++static void ++unrealize_window (GtkWidget *w) ++{ ++ all_widgets = g_slist_remove (all_widgets, w); ++} ++ ++void ++gtk_migration_mark_window (GtkWidget *w) ++{ ++ if (! gtk_migration_initialised) ++ { ++ g_warning ("gtk_migration not initialised yet"); ++ return; ++ } ++ ++ if (GTK_WIDGET_REALIZED (w)) ++ { ++ GdkWindow *window = w->window; ++ ++ gdk_window_add_filter (window, filter_func, NULL); ++ ++ reset_state (window); ++ set_challenge_on_window (window); ++ ++ all_widgets = g_slist_append (all_widgets, w); ++ ++ g_signal_connect (G_OBJECT (w), "unrealize", G_CALLBACK (unrealize_window), NULL); ++ } ++ else ++ g_signal_connect (G_OBJECT (w), "realize", G_CALLBACK (gtk_migration_mark_window), NULL); ++} ++ ++void ++gtk_migration_init (void) ++{ ++ if (getenv ("GPE_DISPLAY_MIGRATION_NO_AUTH") != NULL) ++ no_auth = TRUE; ++ ++ string_gdkatom = gdk_atom_intern ("STRING", FALSE); ++ display_change_gdkatom = gdk_atom_intern ("_GPE_DISPLAY_CHANGE", FALSE); ++ rsa_challenge_gdkatom = gdk_atom_intern ("_GPE_DISPLAY_CHANGE_RSA_CHALLENGE", FALSE); ++ ++ gtk_migration_auth_generate_challenge (); ++ ++ gtk_migration_initialised = TRUE; ++} +--- gtk/gtkwindow.c~ 2006-07-05 13:07:08.000000000 +0200 ++++ gtk/gtkwindow.c 2006-07-05 13:07:08.000000000 +0200 +@@ -50,6 +50,9 @@ + #include "x11/gdkx.h" + #endif + ++extern void gtk_migration_mark_window (GtkWidget *w); ++ ++ + enum { + SET_FOCUS, + FRAME_EVENT, +@@ -823,6 +826,10 @@ + + g_signal_connect (window->screen, "composited_changed", + G_CALLBACK (gtk_window_on_composited_changed), window); ++ ++#ifdef ENABLE_MIGRATION ++ gtk_migration_mark_window (window); ++#endif + } + + static void diff --git a/packages/gtk+/gtk+-2.10.3/no-demos.patch b/packages/gtk+/gtk+-2.10.3/no-demos.patch new file mode 100644 index 0000000000..0fc4c48d1a --- /dev/null +++ b/packages/gtk+/gtk+-2.10.3/no-demos.patch @@ -0,0 +1,10 @@ +--- gtk+-2.10.1/Makefile.am.orig 2006-08-08 12:37:30.000000000 +0100 ++++ gtk+-2.10.1/Makefile.am 2006-08-08 12:37:48.000000000 +0100 +@@ -1,6 +1,6 @@ + ## Makefile.am for GTK+ + +-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib ++SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests perf contrib + SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros + + # require automake 1.4 diff --git a/packages/gtk+/gtk+-2.10.3/no-xwc.patch b/packages/gtk+/gtk+-2.10.3/no-xwc.patch new file mode 100644 index 0000000000..affb4a303e --- /dev/null +++ b/packages/gtk+/gtk+-2.10.3/no-xwc.patch @@ -0,0 +1,151 @@ +diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c +--- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c 2004-11-30 14:57:14 +00:00 ++++ gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c 2005-01-02 15:38:06 +00:00 +@@ -576,12 +576,14 @@ + GDK_GC_GET_XGC (gc), x, y, (XChar2b *) text, text_length / 2); + } + } ++#ifdef HAVE_XWC + else if (font->type == GDK_FONT_FONTSET) + { + XFontSet fontset = (XFontSet) GDK_FONT_XFONT (font); + XmbDrawString (xdisplay, impl->xid, + fontset, GDK_GC_GET_XGC (gc), x, y, text, text_length); + } ++#endif + else + g_error("undefined font type\n"); + } +@@ -613,6 +615,7 @@ + GDK_GC_GET_XGC (gc), x, y, text_8bit, text_length); + g_free (text_8bit); + } ++#ifdef HAVE_XWC + else if (font->type == GDK_FONT_FONTSET) + { + if (sizeof(GdkWChar) == sizeof(wchar_t)) +@@ -633,6 +636,7 @@ + g_free (text_wchar); + } + } ++#endif + else + g_error("undefined font type\n"); + } +diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkfont-x11.c gtk+-2.6.0/gdk/x11/gdkfont-x11.c +--- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkfont-x11.c 2004-08-26 01:23:46 +01:00 ++++ gtk+-2.6.0/gdk/x11/gdkfont-x11.c 2005-01-02 15:45:39 +00:00 +@@ -525,10 +525,12 @@ + width = XTextWidth16 (xfont, (XChar2b *) text, text_length / 2); + } + break; ++#ifdef HAVE_XWC + case GDK_FONT_FONTSET: + fontset = (XFontSet) private->xfont; + width = XmbTextEscapement (fontset, text, text_length); + break; ++#endif + default: + width = 0; + } +@@ -578,6 +580,7 @@ + width = 0; + } + break; ++#ifdef HAVE_XWC + case GDK_FONT_FONTSET: + if (sizeof(GdkWChar) == sizeof(wchar_t)) + { +@@ -595,6 +598,7 @@ + g_free (text_wchar); + } + break; ++#endif + default: + width = 0; + } +@@ -667,6 +671,7 @@ + if (descent) + *descent = overall.descent; + break; ++#ifdef HAVE_XWC + case GDK_FONT_FONTSET: + fontset = (XFontSet) private->xfont; + XmbTextExtents (fontset, text, text_length, &ink, &logical); +@@ -681,6 +686,7 @@ + if (descent) + *descent = ink.y + ink.height; + break; ++#endif + } + + } +@@ -753,6 +759,7 @@ + *descent = overall.descent; + break; + } ++#ifdef HAVE_XWC + case GDK_FONT_FONTSET: + fontset = (XFontSet) private->xfont; + +@@ -780,6 +787,7 @@ + if (descent) + *descent = ink.y + ink.height; + break; ++#endif + } + + } +diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkim-x11.c gtk+-2.6.0/gdk/x11/gdkim-x11.c +--- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkim-x11.c 2004-11-17 00:55:10 +00:00 ++++ gtk+-2.6.0/gdk/x11/gdkim-x11.c 2005-01-02 15:42:04 +00:00 +@@ -48,6 +48,7 @@ + void + _gdk_x11_initialize_locale (void) + { ++#ifdef HAVE_XWC + wchar_t result; + gchar *current_locale; + static char *last_locale = NULL; +@@ -93,7 +94,8 @@ + GDK_NOTE (XIM, + g_message ("%s multi-byte string functions.", + gdk_use_mb ? "Using" : "Not using")); +- ++#endif ++ + return; + } + +@@ -136,6 +138,7 @@ + { + gchar *mbstr; + ++#ifdef HAVE_XWC + if (gdk_use_mb) + { + GdkDisplay *display = find_a_display (); +@@ -178,6 +181,7 @@ + XFree (tpr.value); + } + else ++#endif + { + gint length = 0; + gint i; +@@ -210,6 +214,7 @@ + gint + gdk_mbstowcs (GdkWChar *dest, const gchar *src, gint dest_max) + { ++#ifdef HAVE_XWC + if (gdk_use_mb) + { + GdkDisplay *display = find_a_display (); +@@ -242,6 +247,7 @@ + return len_cpy; + } + else ++#endif + { + gint i; + diff --git a/packages/gtk+/gtk+-2.10.3/run-iconcache.patch b/packages/gtk+/gtk+-2.10.3/run-iconcache.patch new file mode 100644 index 0000000000..f0bb6ba842 --- /dev/null +++ b/packages/gtk+/gtk+-2.10.3/run-iconcache.patch @@ -0,0 +1,19 @@ +--- gtk+-2.10.0/gtk/Makefile.am~ 2006-07-05 16:49:16.000000000 +0200 ++++ gtk+-2.10.0/gtk/Makefile.am 2006-07-05 16:49:16.000000000 +0200 +@@ -1088,11 +1088,11 @@ + done \ + && touch stamp-icons + +-gtkbuiltincache.h: @REBUILD@ stamp-icons +- $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache +- GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders \ +- ./gtk-update-icon-cache --force --ignore-theme-index \ +- --source builtin_icons stock-icons > gtkbuiltincache.h ++#gtkbuiltincache.h: @REBUILD@ stamp-icons ++# $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache ++# GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders \ ++# ./gtk-update-icon-cache --force --ignore-theme-index \ ++# --source builtin_icons stock-icons > gtkbuiltincache.h + + EXTRA_DIST += \ + $(STOCK_ICONS) \ diff --git a/packages/gtk+/gtk+-2.10.3/scroll-timings.patch b/packages/gtk+/gtk+-2.10.3/scroll-timings.patch new file mode 100644 index 0000000000..3f823a7880 --- /dev/null +++ b/packages/gtk+/gtk+-2.10.3/scroll-timings.patch @@ -0,0 +1,11 @@ +--- gtk+-2.10.0/gtk/gtkrange.c.orig 2006-07-05 12:41:39.000000000 +0200 ++++ gtk+-2.10.0/gtk/gtkrange.c 2006-07-05 12:41:58.000000000 +0200 +@@ -39,7 +39,7 @@ + #include "gtkalias.h" + + #define SCROLL_DELAY_FACTOR 5 /* Scroll repeat multiplier */ +-#define UPDATE_DELAY 300 /* Delay for queued update */ ++#define UPDATE_DELAY 1000 /* Delay for queued update */ + + enum { + PROP_0, diff --git a/packages/gtk+/gtk+-2.10.3/single-click.patch b/packages/gtk+/gtk+-2.10.3/single-click.patch new file mode 100644 index 0000000000..3bb208d4d6 --- /dev/null +++ b/packages/gtk+/gtk+-2.10.3/single-click.patch @@ -0,0 +1,54 @@ +diff -urNd ../gtk+-2.6.3-r0.old/gtk+-2.6.3/gtk/gtkcalendar.c gtk+-2.6.3/gtk/gtkcalendar.c +--- ../gtk+-2.6.3-r0.old/gtk+-2.6.3/gtk/gtkcalendar.c 2005-04-06 16:57:04 +01:00 ++++ gtk+-2.6.3/gtk/gtkcalendar.c 2005-04-06 20:05:18 +01:00 +@@ -1023,9 +1023,11 @@ + } + + gtk_calendar_select_and_focus_day (calendar, day); +- } ++ ++ // This change causes the calendar to disappear after choosing a day ++/* } + else if (event->type == GDK_2BUTTON_PRESS) +- { ++ {*/ + private_data->in_drag = 0; + if (day_month == MONTH_CURRENT) + g_signal_emit (calendar, +diff -urNd ../gtk+-2.6.3-r0.old/gtk+-2.6.3/gtk/gtkfilesel.c gtk+-2.6.3/gtk/gtkfilesel.c +--- ../gtk+-2.6.3-r0.old/gtk+-2.6.3/gtk/gtkfilesel.c 2005-04-06 16:57:07 +01:00 ++++ gtk+-2.6.3/gtk/gtkfilesel.c 2005-04-07 13:40:32 +01:00 +@@ -2468,6 +2468,33 @@ + if (fs->last_selected != NULL) + g_free (fs->last_selected); + ++ // Single-click directory entry ++ if (new_names->len == 1) ++ { ++ GtkTreeView *tree_view; ++ GtkTreeModel *model; ++ GtkTreePath *path; ++ GtkTreeIter iter; ++ gboolean is_file; ++ ++ tree_view = gtk_tree_selection_get_tree_view (selection); ++ ++ if (gtk_tree_selection_get_selected (selection, &model, &iter)) ++ { ++ path = gtk_tree_model_get_path (model, &iter); ++ gtk_tree_model_get (model, &iter, ISFILE_COLUMN, &is_file, -1); ++ ++ if (!is_file) ++ { ++ gtk_file_selection_dir_activate (tree_view, path, ++ gtk_tree_view_get_column (tree_view, DIR_COLUMN), ++ user_data); ++ } ++ ++ gtk_tree_path_free (path); ++ } ++ } ++ + fs->last_selected = g_strdup (g_ptr_array_index (new_names, index)); + filename = get_real_filename (fs->last_selected, FALSE); + diff --git a/packages/gtk+/gtk+-2.10.3/small-gtkfilesel.patch b/packages/gtk+/gtk+-2.10.3/small-gtkfilesel.patch new file mode 100644 index 0000000000..20bf4cf366 --- /dev/null +++ b/packages/gtk+/gtk+-2.10.3/small-gtkfilesel.patch @@ -0,0 +1,267 @@ +diff -urNd ../gtk+-2.4.4-r5/gtk+-2.4.4/gtk/gtkfilesel.c gtk+-2.4.4/gtk/gtkfilesel.c +--- ../gtk+-2.4.4-r5/gtk+-2.4.4/gtk/gtkfilesel.c 2004-07-10 05:02:10.000000000 +0100 ++++ gtk+-2.4.4/gtk/gtkfilesel.c 2004-09-13 13:40:09.000000000 +0100 +@@ -68,6 +68,7 @@ + #include "gtkprivate.h" + #include "gtkscrolledwindow.h" + #include "gtkstock.h" ++#include "gtksignal.h" + #include "gtktreeselection.h" + #include "gtktreeview.h" + #include "gtkvbox.h" +@@ -77,6 +78,7 @@ + #include "gtkmessagedialog.h" + #include "gtkdnd.h" + #include "gtkeventbox.h" ++#include "gtkimage.h" + + #undef GTK_DISABLE_DEPRECATED + #include "gtkoptionmenu.h" +@@ -245,7 +247,8 @@ + }; + + enum { +- DIR_COLUMN ++ DIR_COLUMN, ++ ISFILE_COLUMN + }; + + enum { +@@ -400,6 +403,12 @@ + GtkTreePath *path, + GtkTreeViewColumn *column, + gpointer user_data); ++ ++static void gtk_file_selection_activate (GtkTreeView *tree_view, ++ GtkTreePath *path, ++ GtkTreeViewColumn *column, ++ gpointer user_data); ++ + static void gtk_file_selection_file_changed (GtkTreeSelection *selection, + gpointer user_data); + static void gtk_file_selection_dir_activate (GtkTreeView *tree_view, +@@ -419,6 +428,7 @@ + static void gtk_file_selection_create_dir (GtkWidget *widget, gpointer data); + static void gtk_file_selection_delete_file (GtkWidget *widget, gpointer data); + static void gtk_file_selection_rename_file (GtkWidget *widget, gpointer data); ++static void gtk_file_selection_style_set (GtkWidget *widget, GtkStyle *prev_style); + + static void free_selected_names (GPtrArray *names); + +@@ -578,6 +588,23 @@ + G_PARAM_WRITABLE)); + object_class->destroy = gtk_file_selection_destroy; + widget_class->map = gtk_file_selection_map; ++ widget_class->style_set = gtk_file_selection_style_set; ++ ++ gtk_widget_class_install_style_property (widget_class, ++ g_param_spec_boolean ("show_fileops_default", ++ _("Show fileop buttons by default"), ++ _("Whether file operation buttons are shown by default"), ++ TRUE, ++ G_PARAM_READABLE)); ++ ++ gtk_widget_class_install_style_property (widget_class, ++ g_param_spec_int ("border_width", ++ _("Border width"), ++ _("Width of border around the main dialog area"), ++ 0, ++ G_MAXINT, ++ 10, ++ G_PARAM_READABLE)); + } + + static void gtk_file_selection_set_property (GObject *object, +@@ -649,7 +676,29 @@ + gtk_widget_grab_default (widget); + return FALSE; + } +- ++ ++static void ++gtk_file_selection_style_set (GtkWidget *filesel, ++ GtkStyle *prev_style) ++{ ++ gboolean show_fileops; ++ gint border_width; ++ ++ gtk_widget_style_get (filesel, ++ "show_fileops_default", ++ &show_fileops, ++ "border_width", ++ &border_width, ++ NULL); ++ ++ gtk_container_set_border_width (GTK_CONTAINER (filesel), border_width); ++ ++ if (show_fileops) ++ gtk_file_selection_show_fileop_buttons (GTK_FILE_SELECTION (filesel)); ++ else ++ gtk_file_selection_hide_fileop_buttons (GTK_FILE_SELECTION (filesel)); ++} ++ + static void + gtk_file_selection_init (GtkFileSelection *filesel) + { +@@ -674,17 +723,15 @@ + + /* The dialog-sized vertical box */ + filesel->main_vbox = dialog->vbox; +- gtk_container_set_border_width (GTK_CONTAINER (filesel), 10); + + /* The horizontal box containing create, rename etc. buttons */ + filesel->button_area = gtk_hbutton_box_new (); + gtk_button_box_set_layout (GTK_BUTTON_BOX (filesel->button_area), GTK_BUTTONBOX_START); +- gtk_box_set_spacing (GTK_BOX (filesel->button_area), 0); + gtk_box_pack_start (GTK_BOX (filesel->main_vbox), filesel->button_area, + FALSE, FALSE, 0); + gtk_widget_show (filesel->button_area); + +- gtk_file_selection_show_fileop_buttons (filesel); ++ gtk_file_selection_style_set (GTK_WIDGET (filesel), NULL); + + /* hbox for pulldown menu */ + pulldown_hbox = gtk_hbox_new (TRUE, 5); +@@ -723,25 +770,32 @@ + + /* The directories list */ + +- model = gtk_list_store_new (1, G_TYPE_STRING); ++ model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_BOOLEAN); /* MA */ + filesel->dir_list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model)); + g_object_unref (model); + +- column = gtk_tree_view_column_new_with_attributes (_("Folders"), ++ column = gtk_tree_view_column_new_with_attributes (/*_("Folders")*/ NULL, + gtk_cell_renderer_text_new (), + "text", DIR_COLUMN, + NULL); + label = gtk_label_new_with_mnemonic (_("Fol_ders")); + gtk_label_set_mnemonic_widget (GTK_LABEL (label), filesel->dir_list); + gtk_widget_show (label); +- gtk_tree_view_column_set_widget (column, label); ++ ++ /* gtk_tree_view_column_set_widget (column, label); */ ++ gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (filesel->dir_list), FALSE); ++ + gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE); + gtk_tree_view_append_column (GTK_TREE_VIEW (filesel->dir_list), column); + + gtk_widget_set_size_request (filesel->dir_list, + DIR_LIST_WIDTH, DIR_LIST_HEIGHT); + g_signal_connect (filesel->dir_list, "row_activated", +- G_CALLBACK (gtk_file_selection_dir_activate), filesel); ++ G_CALLBACK (gtk_file_selection_activate), filesel); ++ ++ g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (filesel->dir_list)), "changed", ++ G_CALLBACK (gtk_file_selection_file_changed), filesel); ++ + + /* gtk_clist_column_titles_passive (GTK_CLIST (filesel->dir_list)); */ + +@@ -758,41 +812,6 @@ + gtk_widget_show (filesel->dir_list); + gtk_widget_show (scrolled_win); + +- /* The files list */ +- model = gtk_list_store_new (1, G_TYPE_STRING); +- filesel->file_list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model)); +- g_object_unref (model); +- +- column = gtk_tree_view_column_new_with_attributes (_("Files"), +- gtk_cell_renderer_text_new (), +- "text", FILE_COLUMN, +- NULL); +- label = gtk_label_new_with_mnemonic (_("_Files")); +- gtk_label_set_mnemonic_widget (GTK_LABEL (label), filesel->file_list); +- gtk_widget_show (label); +- gtk_tree_view_column_set_widget (column, label); +- gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE); +- gtk_tree_view_append_column (GTK_TREE_VIEW (filesel->file_list), column); +- +- gtk_widget_set_size_request (filesel->file_list, +- FILE_LIST_WIDTH, FILE_LIST_HEIGHT); +- g_signal_connect (filesel->file_list, "row_activated", +- G_CALLBACK (gtk_file_selection_file_activate), filesel); +- g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (filesel->file_list)), "changed", +- G_CALLBACK (gtk_file_selection_file_changed), filesel); +- +- /* gtk_clist_column_titles_passive (GTK_CLIST (filesel->file_list)); */ +- +- scrolled_win = gtk_scrolled_window_new (NULL, NULL); +- gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_win), GTK_SHADOW_IN); +- gtk_container_add (GTK_CONTAINER (scrolled_win), filesel->file_list); +- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win), +- GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS); +- gtk_container_set_border_width (GTK_CONTAINER (scrolled_win), 0); +- gtk_container_add (GTK_CONTAINER (list_container), scrolled_win); +- gtk_widget_show (filesel->file_list); +- gtk_widget_show (scrolled_win); +- + /* action area for packing buttons into. */ + filesel->action_area = gtk_hbox_new (TRUE, 0); + gtk_box_pack_start (GTK_BOX (filesel->main_vbox), filesel->action_area, +@@ -2008,6 +2027,23 @@ + } + + static void ++gtk_file_selection_activate (GtkTreeView *tree_view, ++ GtkTreePath *path, ++ GtkTreeViewColumn *column, ++ gpointer user_data) ++{ ++ GtkTreeModel *model = gtk_tree_view_get_model (tree_view); ++ GtkTreeIter iter; ++ gboolean is_file; ++ ++ gtk_tree_model_get_iter (model, &iter, path); ++ gtk_tree_model_get (model, &iter, ISFILE_COLUMN, &is_file, -1); ++ ++ if (! is_file) ++ gtk_file_selection_dir_activate (tree_view, path, column, user_data); ++} ++ ++static void + gtk_file_selection_file_activate (GtkTreeView *tree_view, + GtkTreePath *path, + GtkTreeViewColumn *column, +@@ -2103,7 +2139,6 @@ + PossibleCompletion* poss; + GtkTreeIter iter; + GtkListStore *dir_model; +- GtkListStore *file_model; + gchar* filename; + gchar* rem_path = rel_path; + gchar* sel_text; +@@ -2125,10 +2160,8 @@ + g_assert (cmpl_state->reference_dir); + + dir_model = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (fs->dir_list))); +- file_model = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (fs->file_list))); + + gtk_list_store_clear (dir_model); +- gtk_list_store_clear (file_model); + + /* Set the dir list to include ./ and ../ */ + gtk_list_store_append (dir_model, &iter); +@@ -2150,13 +2183,17 @@ + strcmp (filename, ".." G_DIR_SEPARATOR_S) != 0) + { + gtk_list_store_append (dir_model, &iter); +- gtk_list_store_set (dir_model, &iter, DIR_COLUMN, filename, -1); ++ gtk_list_store_set (dir_model, &iter, ++ DIR_COLUMN, filename, ++ ISFILE_COLUMN, FALSE, -1); + } + } + else + { +- gtk_list_store_append (file_model, &iter); +- gtk_list_store_set (file_model, &iter, DIR_COLUMN, filename, -1); ++ gtk_list_store_append (dir_model, &iter); ++ gtk_list_store_set (dir_model, &iter, ++ DIR_COLUMN, filename, ++ ISFILE_COLUMN, TRUE, -1); + } + } + diff --git a/packages/gtk+/gtk+-2.10.3/spinbutton.patch b/packages/gtk+/gtk+-2.10.3/spinbutton.patch new file mode 100644 index 0000000000..8ad7507af0 --- /dev/null +++ b/packages/gtk+/gtk+-2.10.3/spinbutton.patch @@ -0,0 +1,128 @@ +--- gtk+-2.4.3/gtk/gtkspinbutton.c.old 2004-04-22 14:49:27.000000000 +0100 ++++ gtk+-2.4.3/gtk/gtkspinbutton.c 2004-06-30 21:48:18.000000000 +0100 +@@ -733,7 +733,7 @@ + + spin = GTK_SPIN_BUTTON (widget); + arrow_size = spin_button_get_arrow_size (spin); +- panel_width = arrow_size + 2 * widget->style->xthickness; ++ panel_width = (2 * arrow_size) + 4 * widget->style->xthickness; + + widget->allocation = *allocation; + +@@ -866,19 +866,16 @@ + { + width = spin_button_get_arrow_size (spin_button) + 2 * widget->style->xthickness; + ++ y = widget->style->ythickness; ++ height = widget->requisition.height - (2 * y); ++ + if (arrow_type == GTK_ARROW_UP) + { + x = 0; +- y = 0; +- +- height = widget->requisition.height / 2; + } + else + { +- x = 0; +- y = widget->requisition.height / 2; +- +- height = (widget->requisition.height + 1) / 2; ++ x = width; + } + + if (spin_button_at_limit (spin_button, arrow_type)) +@@ -908,32 +905,17 @@ + shadow_type = GTK_SHADOW_OUT; + } + } +- ++ + gtk_paint_box (widget->style, spin_button->panel, + state_type, shadow_type, + NULL, widget, +- (arrow_type == GTK_ARROW_UP)? "spinbutton_up" : "spinbutton_down", ++ NULL, + x, y, width, height); + + height = widget->requisition.height; + +- if (arrow_type == GTK_ARROW_DOWN) +- { +- y = height / 2; +- height = height - y - 2; +- } +- else +- { +- y = 2; +- height = height / 2 - 2; +- } +- + width -= 3; +- +- if (widget && gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) +- x = 2; +- else +- x = 1; ++ height -= 3; + + w = width / 2; + w -= w % 2 - 1; /* force odd */ +@@ -1108,7 +1090,7 @@ + if (GTK_ENTRY (widget)->editable) + gtk_spin_button_update (spin); + +- if (event->y <= widget->requisition.height / 2) ++ if (event->x <= (spin_button_get_arrow_size (spin) + widget->style->xthickness)) + { + if (event->button == 1) + start_spinning (spin, GTK_ARROW_UP, spin->adjustment->step_increment); +@@ -1143,44 +1125,11 @@ + + arrow_size = spin_button_get_arrow_size (spin); + +- if (event->button == spin->button) +- { +- int click_child = spin->click_child; ++ gtk_spin_button_stop_spinning (spin); + +- gtk_spin_button_stop_spinning (spin); +- +- if (event->button == 3) +- { +- if (event->y >= 0 && event->x >= 0 && +- event->y <= widget->requisition.height && +- event->x <= arrow_size + 2 * widget->style->xthickness) +- { +- if (click_child == GTK_ARROW_UP && +- event->y <= widget->requisition.height / 2) +- { +- gdouble diff; +- +- diff = spin->adjustment->upper - spin->adjustment->value; +- if (diff > EPSILON) +- gtk_spin_button_real_spin (spin, diff); +- } +- else if (click_child == GTK_ARROW_DOWN && +- event->y > widget->requisition.height / 2) +- { +- gdouble diff; +- +- diff = spin->adjustment->value - spin->adjustment->lower; +- if (diff > EPSILON) +- gtk_spin_button_real_spin (spin, -diff); +- } +- } +- } +- spin_button_redraw (spin); ++ spin_button_redraw (spin); + +- return TRUE; +- } +- else +- return GTK_WIDGET_CLASS (parent_class)->button_release_event (widget, event); ++ return TRUE; + } + + static gint diff --git a/packages/gtk+/gtk+-2.10.3/xsettings.patch b/packages/gtk+/gtk+-2.10.3/xsettings.patch new file mode 100644 index 0000000000..b63e262d34 --- /dev/null +++ b/packages/gtk+/gtk+-2.10.3/xsettings.patch @@ -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 diff --git a/packages/gtk+/gtk+_2.10.3.bb b/packages/gtk+/gtk+_2.10.3.bb new file mode 100644 index 0000000000..401583987e --- /dev/null +++ b/packages/gtk+/gtk+_2.10.3.bb @@ -0,0 +1,92 @@ +LICENSE = "LGPL" +DESCRIPTION = "GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete \ +set of widgets, GTK+ is suitable for projects ranging from small one-off projects to complete application suites." +HOMEPAGE = "http://www.gtk.org" +SECTION = "libs" +PRIORITY = "optional" +MAINTAINER = "Philip Blundell " +DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cairo cups" +PR = "r0" + +# disable per default - untested and not all patches included. +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \ + file://no-xwc.patch;patch=1 \ + file://automake-lossage.patch;patch=1 \ + file://disable-tooltips.patch;patch=1 \ + file://gtklabel-resize-patch;patch=1 \ + file://menu-deactivate.patch;patch=1 \ + file://xsettings.patch;patch=1 \ + file://scroll-timings.patch;patch=1 \ + file://small-gtkfilesel.patch;patch=1 \ + file://migration.patch;patch=1;pnum=0 \ + file://run-iconcache.patch;patch=1 \ + file://disable-print.patch;patch=1 \ + file://hardcoded_libtool.patch;patch=1 \ + file://no-demos.patch;patch=1" +# file://gtk+-handhelds.patch;patch=1 +# file://single-click.patch;patch=1 +# file://spinbutton.patch;patch=1 \ + +inherit autotools pkgconfig + +FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ + ${bindir}/gtk-query-immodules-2.0 \ + ${libdir}/lib*.so.* \ + ${datadir}/themes ${sysconfdir} \ + ${libdir}/gtk-2.0/${LIBV}/engines/libpixmap.so" +FILES_${PN}-dev += "${datadir}/gtk-2.0/include ${libdir}/gtk-2.0/include ${bindir}/gdk-pixbuf-csource" + +RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1" +RRECOMMENDS_${PN}_angstrom = "glibc-gconv-iso8859-1 gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" +RRECOMMENDS_${PN}_openzaurus = "glibc-gconv-iso8859-1 gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" + +EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-display-migration" + +LIBV = "2.10.0" + +do_stage () { + oe_libinstall -so -C gtk libgtk-x11-2.0 ${STAGING_LIBDIR} + oe_libinstall -so -C gdk libgdk-x11-2.0 ${STAGING_LIBDIR} + oe_libinstall -so -C contrib/gdk-pixbuf-xlib libgdk_pixbuf_xlib-2.0 ${STAGING_LIBDIR} + oe_libinstall -so -C gdk-pixbuf libgdk_pixbuf-2.0 ${STAGING_LIBDIR} + + autotools_stage_includes + + mkdir -p ${STAGING_LIBDIR}/gtk-2.0/include + install -m 0644 gdk/gdkconfig.h ${STAGING_LIBDIR}/gtk-2.0/include/gdkconfig.h + + install -m 0644 m4macros/gtk-2.0.m4 ${STAGING_DATADIR}/aclocal/ +} + +do_install_append () { + install -d ${D}${sysconfdir}/gtk-2.0 +} + +postinst_prologue() { +if [ "x$D" != "x" ]; then + exit 1 +fi + +} + +PACKAGES_DYNAMIC = "gdk-pixbuf-loader-* gtk-immodule-* gtk-printbackend-*" + +python populate_packages_prepend () { + import os.path + + prologue = bb.data.getVar("postinst_prologue", d, 1) + + gtk_libdir = bb.data.expand('${libdir}/gtk-2.0/${LIBV}', d) + loaders_root = os.path.join(gtk_libdir, 'loaders') + immodules_root = os.path.join(gtk_libdir, 'immodules') + printmodules_root = os.path.join(gtk_libdir, 'printbackends'); + + do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', prologue + 'gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders') + do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', prologue + 'gtk-query-immodules > /etc/gtk-2.0/gtk.immodules') + do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s') + + if (bb.data.getVar('DEBIAN_NAMES', d, 1)): + bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d) +} -- cgit v1.2.3 From 4bc7418d5cc0b37c5bc820f4ada4439eaafc8bd2 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 28 Sep 2006 22:09:23 +0000 Subject: glib-2.0_2.12.3.bb : new version --- packages/glib-2.0/glib-2.0-2.12.3/.mtn2git_empty | 0 .../glib-2.0-2.12.3/configure-libtool.patch | 20 +++++++++ packages/glib-2.0/glib-2.0_2.12.3.bb | 49 ++++++++++++++++++++++ 3 files changed, 69 insertions(+) create mode 100644 packages/glib-2.0/glib-2.0-2.12.3/.mtn2git_empty create mode 100644 packages/glib-2.0/glib-2.0-2.12.3/configure-libtool.patch create mode 100644 packages/glib-2.0/glib-2.0_2.12.3.bb diff --git a/packages/glib-2.0/glib-2.0-2.12.3/.mtn2git_empty b/packages/glib-2.0/glib-2.0-2.12.3/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/glib-2.0/glib-2.0-2.12.3/configure-libtool.patch b/packages/glib-2.0/glib-2.0-2.12.3/configure-libtool.patch new file mode 100644 index 0000000000..478ef132af --- /dev/null +++ b/packages/glib-2.0/glib-2.0-2.12.3/configure-libtool.patch @@ -0,0 +1,20 @@ +--- glib-2.12.0/configure.in.orig 2006-07-07 09:21:56.000000000 +0100 ++++ glib-2.12.0/configure.in 2006-07-07 09:25:44.000000000 +0100 +@@ -1169,7 +1169,7 @@ + dnl No use for this on Win32 + G_MODULE_LDFLAGS= + else +- G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` ++ G_MODULE_LDFLAGS=`(./$host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` + fi + dnl G_MODULE_IMPL= don't reset, so cmd-line can override + G_MODULE_NEED_USCORE=0 +@@ -1234,7 +1234,7 @@ + LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS" + dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness + echo "void glib_plugin_test(void) { }" > plugin.c +- ${SHELL} ./libtool --mode=compile ${CC} -shared \ ++ ${SHELL} ./$host_alias-libtool --mode=compile ${CC} -shared \ + -export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null + AC_CACHE_CHECK([for RTLD_GLOBAL brokenness], + glib_cv_rtldglobal_broken,[ diff --git a/packages/glib-2.0/glib-2.0_2.12.3.bb b/packages/glib-2.0/glib-2.0_2.12.3.bb new file mode 100644 index 0000000000..c796f08090 --- /dev/null +++ b/packages/glib-2.0/glib-2.0_2.12.3.bb @@ -0,0 +1,49 @@ +DESCRIPTION = "GLib is a general-purpose utility library, \ +which provides many useful data types, macros, \ +type conversions, string utilities, file utilities, a main \ +loop abstraction, and so on. It works on many \ +UNIX-like platforms, Windows, OS/2 and BeOS." +LICENSE = "LGPL" +SECTION = "libs" +PRIORITY = "optional" +MAINTAINER = "Philip Blundell " +DEPENDS += "glib-2.0-native gtk-doc" +DEPENDS += "virtual/libiconv virtual/libintl" +PACKAGES =+ "glib-2.0-utils " +PR = "r0" + +LEAD_SONAME = "libglib-2.0.*" +FILES_glib-2.0-utils = "${bindir}/*" + +EXTRA_OECONF = "--disable-debug" + +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.12/glib-${PV}.tar.bz2 \ + file://glibconfig-sysdefs.h \ + file://configure-libtool.patch;patch=1" + +S = "${WORKDIR}/glib-${PV}" + +inherit autotools pkgconfig gettext + +python () { + if bb.data.getVar("USE_NLS", d, 1) == "no": + raise bb.parse.SkipPackage("${PN} requires native language support.") +} + +acpaths = "" +do_configure_prepend () { + install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h . +} + +do_stage () { + oe_libinstall -so -C glib libglib-2.0 ${STAGING_LIBDIR} + oe_libinstall -so -C gmodule libgmodule-2.0 ${STAGING_LIBDIR} + oe_libinstall -so -C gthread libgthread-2.0 ${STAGING_LIBDIR} + oe_libinstall -so -C gobject libgobject-2.0 ${STAGING_LIBDIR} + autotools_stage_includes + install -d ${STAGING_INCDIR}/glib-2.0/glib + install -m 0755 ${S}/glibconfig.h ${STAGING_INCDIR}/glib-2.0/glibconfig.h + install -d ${STAGING_DATADIR}/aclocal + install -m 0644 ${S}/m4macros/glib-2.0.m4 ${STAGING_DATADIR}/aclocal/glib-2.0.m4 + install -m 0644 ${S}/m4macros/glib-gettext.m4 ${STAGING_DATADIR}/aclocal/glib-gettext.m4 +} -- cgit v1.2.3 From 061d89ea56ac50554456d1f807ef97e581439f2b Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 28 Sep 2006 22:13:31 +0000 Subject: kismet_2006-04-R1.bb : new version --- packages/kismet/kismet-2006-04-R1/.mtn2git_empty | 0 packages/kismet/kismet-2006-04-R1/no-chmod.patch | 173 +++++++++++++++++++++++ packages/kismet/kismet_2006-04-R1.bb | 29 ++++ 3 files changed, 202 insertions(+) create mode 100644 packages/kismet/kismet-2006-04-R1/.mtn2git_empty create mode 100644 packages/kismet/kismet-2006-04-R1/no-chmod.patch create mode 100644 packages/kismet/kismet_2006-04-R1.bb diff --git a/packages/kismet/kismet-2006-04-R1/.mtn2git_empty b/packages/kismet/kismet-2006-04-R1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/kismet/kismet-2006-04-R1/no-chmod.patch b/packages/kismet/kismet-2006-04-R1/no-chmod.patch new file mode 100644 index 0000000000..b22c513b68 --- /dev/null +++ b/packages/kismet/kismet-2006-04-R1/no-chmod.patch @@ -0,0 +1,173 @@ +--- kismet-2006-04-R1/Makefile.in.orig 2006-09-14 11:37:20.000000000 +0100 ++++ kismet-2006-04-R1/Makefile.in 2006-09-14 11:38:01.000000000 +0100 +@@ -130,52 +130,52 @@ + fi + + binuserinstall: +- install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(PS) $(BIN)/$(PS); +- install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(DRONE) $(BIN)/$(DRONE); ++ install -m 755 $(PS) $(BIN)/$(PS); ++ install -m 755 $(DRONE) $(BIN)/$(DRONE); + + binsuidinstall: +- install -o $(INSTUSR) -g $(INSTGRP) -s -m 4755 $(PS) $(BIN)/$(PS); +- install -o $(INSTUSR) -g $(INSTGRP) -s -m 4755 $(DRONE) $(BIN)/$(DRONE); ++ install -m 4755 $(PS) $(BIN)/$(PS); ++ install -m 4755 $(DRONE) $(BIN)/$(DRONE); + + commoninstall: + mkdir -p $(ETC) + mkdir -p $(BIN) + +- install -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/kismet $(BIN)/kismet +- install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(NC) $(BIN)/$(NC) +- # install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(HOPPER) $(BIN)/$(HOPPER) ++ install -m 755 scripts/kismet $(BIN)/kismet ++ install -m 755 $(NC) $(BIN)/$(NC) ++ # install -m 755 $(HOPPER) $(BIN)/$(HOPPER) + @if test "$(ZAURUS)" = "yes"; then \ +- install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(BUZZER) $(BIN)/buzzme; \ +- echo install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(BUZZER) $(BIN)/buzzme; \ ++ install -m 755 $(BUZZER) $(BIN)/buzzme; \ ++ echo install -m 755 $(BUZZER) $(BIN)/buzzme; \ + fi +-#install -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/kismet_monitor $(BIN)/kismet_monitor +-#install -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/kismet_unmonitor $(BIN)/kismet_unmonitor ++#install -m 755 scripts/kismet_monitor $(BIN)/kismet_monitor ++#install -m 755 scripts/kismet_unmonitor $(BIN)/kismet_unmonitor + mkdir -p $(MAN)/man1 +- install -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet.1 $(MAN)/man1/kismet.1 +- # install -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet_monitor.1 $(MAN)/man1/kismet_monitor.1 +- # install -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet_hopper.1 $(MAN)/man1/kismet_hopper.1 +- install -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet_drone.1 $(MAN)/man1/kismet_drone.1 ++ install -m 644 man/kismet.1 $(MAN)/man1/kismet.1 ++ # install -m 644 man/kismet_monitor.1 $(MAN)/man1/kismet_monitor.1 ++ # install -m 644 man/kismet_hopper.1 $(MAN)/man1/kismet_hopper.1 ++ install -m 644 man/kismet_drone.1 $(MAN)/man1/kismet_drone.1 + mkdir -p $(MAN)/man5 +- install -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet.conf.5 $(MAN)/man5/kismet.conf.5 +- install -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet_ui.conf.5 $(MAN)/man5/kismet_ui.conf.5 +- install -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet_drone.conf.5 $(MAN)/man5/kismet_drone.conf.5 ++ install -m 644 man/kismet.conf.5 $(MAN)/man5/kismet.conf.5 ++ install -m 644 man/kismet_ui.conf.5 $(MAN)/man5/kismet_ui.conf.5 ++ install -m 644 man/kismet_drone.conf.5 $(MAN)/man5/kismet_drone.conf.5 + + @if test "$(GPSLBUILD)" = "$(GPSL)"; then \ +- install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(GPSL) $(BIN)/$(GPSL); \ +- echo install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(GPSL) $(BIN)/$(GPSL); \ +- install -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/gpsmap-helper-earthamaps $(BIN)/gpsmap-helper-earthamaps; \ +- echo install -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/gpsmap-helper-earthamaps $(BIN)/gpsmap-helper-earthamaps; \ +- install -o $(INSTUSR) -g $(MANGRP) -m 644 man/gpsmap.1 $(MAN)/man1/gpsmap.1; \ +- echo install -o $(INSTUSR) -g $(MANGRP) -m 644 man/gpsmap.1 $(MAN)/man1/gpsmap.1; \ ++ install -m 755 $(GPSL) $(BIN)/$(GPSL); \ ++ echo install -m 755 $(GPSL) $(BIN)/$(GPSL); \ ++ install -m 755 scripts/gpsmap-helper-earthamaps $(BIN)/gpsmap-helper-earthamaps; \ ++ echo install -m 755 scripts/gpsmap-helper-earthamaps $(BIN)/gpsmap-helper-earthamaps; \ ++ install -m 644 man/gpsmap.1 $(MAN)/man1/gpsmap.1; \ ++ echo install -m 644 man/gpsmap.1 $(MAN)/man1/gpsmap.1; \ + fi + + mkdir -p $(WAV) +- install -o $(INSTUSR) -g $(INSTGRP) -m 644 wav/new_network.wav $(WAV)/new_network.wav +- install -o $(INSTUSR) -g $(INSTGRP) -m 644 wav/traffic.wav $(WAV)/traffic.wav +- install -o $(INSTUSR) -g $(INSTGRP) -m 644 wav/junk_traffic.wav $(WAV)/junk_traffic.wav +- install -o $(INSTUSR) -g $(INSTGRP) -m 644 wav/alert.wav $(WAV)/alert.wav +- install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/ap_manuf $(ETC)/ap_manuf; +- install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/client_manuf $(ETC)/client_manuf; ++ install -m 644 wav/new_network.wav $(WAV)/new_network.wav ++ install -m 644 wav/traffic.wav $(WAV)/traffic.wav ++ install -m 644 wav/junk_traffic.wav $(WAV)/junk_traffic.wav ++ install -m 644 wav/alert.wav $(WAV)/alert.wav ++ install -m 644 conf/ap_manuf $(ETC)/ap_manuf; ++ install -m 644 conf/client_manuf $(ETC)/client_manuf; + + @if test -f $(BIN)/kismet_curses; then \ + echo "Removing old kismet_curses binary. The panels frontend is now kismet_client."; \ +@@ -188,22 +188,22 @@ + @if test -f $(ETC)/kismet.conf; then \ + $(MAKE) -e checkconfig; \ + else \ +- install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet.conf $(ETC)/kismet.conf; \ +- echo install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet.conf $(ETC)/kismet.conf; \ ++ install -m 644 conf/kismet.conf $(ETC)/kismet.conf; \ ++ echo install -m 644 conf/kismet.conf $(ETC)/kismet.conf; \ + echo "Installed config into $(ETC)/kismet.conf."; \ + fi + @if test -f $(ETC)/kismet_drone.conf; then \ + $(MAKE) -e checkdroneconfig; \ + else \ +- install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf; \ +- echo install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf; \ ++ install -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf; \ ++ echo install -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf; \ + echo "Installed drone config into $(ETC)/kismet_drone.conf."; \ + fi + @if test -f $(ETC)/kismet_ui.conf; then \ + $(MAKE) -e checkuiconfig; \ + else \ +- install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_ui.conf $(ETC)/kismet_ui.conf; \ +- echo install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_ui.conf $(ETC)/kismet_ui.conf; \ ++ install -m 644 conf/kismet_ui.conf $(ETC)/kismet_ui.conf; \ ++ echo install -m 644 conf/kismet_ui.conf $(ETC)/kismet_ui.conf; \ + echo "Installed UI config into $(ETC)/kismet_ui.conf."; \ + fi + @echo "Installed kismet into $(BIN)/." +@@ -221,22 +221,22 @@ + @if test -f $(ETC)/kismet.conf; then \ + $(MAKE) -e checkconfig; \ + else \ +- install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet.conf $(ETC)/kismet.conf; \ +- echo install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet.conf $(ETC)/kismet.conf; \ ++ install -m 644 conf/kismet.conf $(ETC)/kismet.conf; \ ++ echo install -m 644 conf/kismet.conf $(ETC)/kismet.conf; \ + echo "Installed config into $(ETC)/kismet.conf."; \ + fi + @if test -f $(ETC)/kismet_drone.conf; then \ + $(MAKE) -e checkdroneconfig; \ + else \ +- install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf; \ +- echo install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf; \ ++ install -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf; \ ++ echo install -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf; \ + echo "Installed drone config into $(ETC)/kismet_drone.conf."; \ + fi + @if test -f $(ETC)/kismet_ui.conf; then \ + $(MAKE) -e checkuiconfig; \ + else \ +- install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_ui.conf $(ETC)/kismet_ui.conf; \ +- echo install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_ui.conf $(ETC)/kismet_ui.conf; \ ++ install -m 644 conf/kismet_ui.conf $(ETC)/kismet_ui.conf; \ ++ echo install -m 644 conf/kismet_ui.conf $(ETC)/kismet_ui.conf; \ + echo "Installed UI config into $(ETC)/kismet_ui.conf."; \ + fi + @echo "Installed kismet into $(BIN)/." +@@ -252,11 +252,11 @@ + forceinstall: $(PS) + $(MAKE) -e commoninstall + $(MAKE) -e binuserinstall +- install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet.conf $(ETC)/kismet.conf; \ ++ install -m 644 conf/kismet.conf $(ETC)/kismet.conf; \ + echo "Installed config into $(ETC)/kismet.conf."; +- install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf; \ ++ install -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf; \ + echo "Installed drone config into $(ETC)/kismet_drone.conf."; +- install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_ui.conf $(ETC)/kismet_ui.conf; \ ++ install -m 644 conf/kismet_ui.conf $(ETC)/kismet_ui.conf; \ + echo "Installed UI config into $(ETC)/kismet_ui.conf."; + @echo "Installed kismet into $(BIN)/." + @echo "If you have not done so already, read the README file and the FAQ file. Additional" +@@ -271,11 +271,11 @@ + suidforceinstall: $(PS) + $(MAKE) -e commoninstall + $(MAKE) -e binsuidinstall +- install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet.conf $(ETC)/kismet.conf; \ ++ install -m 644 conf/kismet.conf $(ETC)/kismet.conf; \ + echo "Installed config into $(ETC)/kismet.conf."; +- install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf; \ ++ install -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf; \ + echo "Installed drone config into $(ETC)/kismet_drone.conf."; +- install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_ui.conf $(ETC)/kismet_ui.conf; \ ++ install -m 644 conf/kismet_ui.conf $(ETC)/kismet_ui.conf; \ + echo "Installed UI config into $(ETC)/kismet_ui.conf."; + @echo "Installed kismet into $(BIN)/." + @echo "If you have not done so already, read the README file and the FAQ file. Additional" diff --git a/packages/kismet/kismet_2006-04-R1.bb b/packages/kismet/kismet_2006-04-R1.bb new file mode 100644 index 0000000000..44fb768c95 --- /dev/null +++ b/packages/kismet/kismet_2006-04-R1.bb @@ -0,0 +1,29 @@ +SECTION = "console/network" +DESCRIPTION = "Kismet is an 802.11 layer2 wireless network detector, sniffer, and intrusion detection system" +HOMEPAGE = "http://www.kismetwireless.net/" +MAINTAINER = "Graeme Gregory " +LICENSE = "GPLv2" +DEPENDS = "expat gmp" + +SRC_URI = "http://www.kismetwireless.net/code/kismet-2006-04-R1.tar.gz \ + file://no-chmod.patch;patch=1" + + +EXTRA_OECONF = "--with-pcap=linux --disable-setuid --with-linuxheaders=${STAGING_KERNEL_DIR}/include" + +inherit autotools + +do_configure() { + oe_runconf +} + +do_install_append() { + if test -e ${WORKDIR}/kismet.conf; then + install -m 644 ${WORKDIR}/kismet.conf ${D}${sysconfdir}/ + fi +} + +PACKAGES =+ "kismet-sounds" +FILES_kismet-sounds = "/usr/share/kismet/wav" + +CONFFILES_${PN}_nylon = "${sysconfdir}/kismet.conf" -- cgit v1.2.3 From f662cfc52df978469eef38abbddcaea297bb478c Mon Sep 17 00:00:00 2001 From: Jamie Lenehan Date: Thu, 28 Sep 2006 22:18:54 +0000 Subject: perl: Update cpan_build to automatically add libmodule-build-perl-native to DEPENDS when building anything apart from libmodule-build-perl or libmodule-build-perl-native. When building itself it uses itself to provide the libmodule-build-perl code, for anything else it needs to have been built and installed. Remove the explicit depends from the modules that use it. --- classes/cpan_build.bbclass | 17 +++++++++++++++++ packages/perl/liblog-dispatch-perl_2.13.bb | 3 +-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/classes/cpan_build.bbclass b/classes/cpan_build.bbclass index b7cdf7d821..0660ef9b82 100644 --- a/classes/cpan_build.bbclass +++ b/classes/cpan_build.bbclass @@ -7,6 +7,23 @@ FILES_${PN} += '${libdir}/perl5' DEPENDS += "perl-native" RDEPENDS += "perl" +# +# We also need to have built libmodule-build-perl-native for +# everything except libmodule-build-perl-native itself (which uses +# this class, but uses itself as the probider of +# libmodule-build-perl) +# +def cpan_build_dep_prepend(d): + import bb; + if bb.data.getVar('CPAN_BUILD_DEPS', d, 1): + return '' + pn = bb.data.getVar('PN', d, 1) + if pn in ['libmodule-build-perl', 'libmodule-build-perl-native']: + return '' + return 'libmodule-build-perl-native ' + +DEPENDS_prepend = "${@cpan_build_dep_prepend(d)}" + def is_crosscompiling(d): import bb if not bb.data.inherits_class('native', d): diff --git a/packages/perl/liblog-dispatch-perl_2.13.bb b/packages/perl/liblog-dispatch-perl_2.13.bb index 9b136a5bad..e14e65cb65 100644 --- a/packages/perl/liblog-dispatch-perl_2.13.bb +++ b/packages/perl/liblog-dispatch-perl_2.13.bb @@ -2,8 +2,7 @@ DESCRIPTION = "Log::Dispatch - Dispatches messages to one or more outputs" SECTION = "libs" MAINTAINER = "Jamie Lenehan " LICENSE = "Artistic|GPL" -DEPENDS = "libmodule-build-perl-native" -PR = "r1" +PR = "r2" SRC_URI = "http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Log-Dispatch-2.13.tar.gz" -- cgit v1.2.3 From ed2839b63153f9a448503df962b925f0a437d7b5 Mon Sep 17 00:00:00 2001 From: Jamie Lenehan Date: Thu, 28 Sep 2006 23:51:13 +0000 Subject: libxslt 1.1.12: Disable searching for libgcrypt. Currently it will either include or not include it depending on if it has been built and if an OE version hasn't been built but a host version is installed it'll try and link with the host version. Closes #1160. --- packages/libxslt/libxslt_1.1.12.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/libxslt/libxslt_1.1.12.bb b/packages/libxslt/libxslt_1.1.12.bb index b98a3c54e8..5201a0ab4b 100644 --- a/packages/libxslt/libxslt_1.1.12.bb +++ b/packages/libxslt/libxslt_1.1.12.bb @@ -3,13 +3,14 @@ SECTION = "libs" PRIORITY = "optional" DEPENDS = "libxml2" LICENSE = "MIT" +PR = "r1" SRC_URI = "ftp://xmlsoft.org/libxml2/libxslt-${PV}.tar.gz" S = "${WORKDIR}/libxslt-${PV}" inherit autotools pkgconfig -EXTRA_OECONF = "--without-python --without-debug --without-mem-debug" +EXTRA_OECONF = "--without-python --without-debug --without-mem-debug --without-crypto" xsltheaders = "attributes.h documents.h extensions.h extra.h functions.h imports.h \ keys.h namespaces.h numbersInternals.h pattern.h preproc.h security.h \ -- cgit v1.2.3 From 4233398a4db19e323cb7c73790e6ead1eb33f69d Mon Sep 17 00:00:00 2001 From: Jamie Lenehan Date: Thu, 28 Sep 2006 23:56:22 +0000 Subject: libxslt 1.1.12: Add the -dbg package to the PACKAGES list. --- packages/libxslt/libxslt_1.1.12.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/libxslt/libxslt_1.1.12.bb b/packages/libxslt/libxslt_1.1.12.bb index 5201a0ab4b..816b3fdd04 100644 --- a/packages/libxslt/libxslt_1.1.12.bb +++ b/packages/libxslt/libxslt_1.1.12.bb @@ -3,7 +3,7 @@ SECTION = "libs" PRIORITY = "optional" DEPENDS = "libxml2" LICENSE = "MIT" -PR = "r1" +PR = "r2" SRC_URI = "ftp://xmlsoft.org/libxml2/libxslt-${PV}.tar.gz" S = "${WORKDIR}/libxslt-${PV}" @@ -39,7 +39,7 @@ do_stage () { install -m 0644 libxslt.m4 ${STAGING_DATADIR}/aclocal/ } -PACKAGES = "${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale" +PACKAGES = "${PN}-dbg ${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale" FILES_${PN}-dev += "${bindir}/xslt-config" FILES_${PN}-utils += "${bindir}" -- cgit v1.2.3 From ab65d156b24915068d09e4add646329b5ef4d674 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 29 Sep 2006 01:12:32 +0000 Subject: xserver-kdrive X11R7.1-1.1.0: Follow git renaming of xcalibrateext to xcalibrateproto. * XCalibrate was migrated to X.org git, where most other packages live. * After that, to follow new convention, its protocol definition part (vs implementation library) was renamed to have "proto" suffix. * That's state of git repo now, and if we patch older xserver release with XCalibrate support, let's make sure that this is done in a manner compatible with the git (as obviously, that will be base for new release). * This means, xserver-kdrive cannot be any longer built with older XCalibrate from previous CVS repo, and thus, it better be removed to alleviate confusion. --- packages/xorg-xserver/xserver-kdrive/xcalibrate.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/xorg-xserver/xserver-kdrive/xcalibrate.patch b/packages/xorg-xserver/xserver-kdrive/xcalibrate.patch index 3f8cd4ea5c..b07d55c5ff 100644 --- a/packages/xorg-xserver/xserver-kdrive/xcalibrate.patch +++ b/packages/xorg-xserver/xserver-kdrive/xcalibrate.patch @@ -37,7 +37,7 @@ +AM_CONDITIONAL(XCALIBRATE, [test "x$XCALIBRATE" = xyes]) +if test "x$XCALIBRATE" = xyes; then + AC_DEFINE(XCALIBRATE, 1, [Build XCalibrate extension]) -+ REQUIRED_MODULES="$REQUIRED_MODULES xcalibrateext" ++ REQUIRED_MODULES="$REQUIRED_MODULES xcalibrateproto" +fi + AM_CONDITIONAL(XEVIE, [test "x$XEVIE" = xyes]) -- cgit v1.2.3 From 704b415e17bf1fa00937acd5a0e7d7b925609d01 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 29 Sep 2006 01:41:23 +0000 Subject: xserver-kdrive X11R7.1-1.1.0: xserver-xorg git has XCalibrate disabled by default, follow that behavior. --- packages/xorg-xserver/xserver-kdrive/xcalibrate.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/xorg-xserver/xserver-kdrive/xcalibrate.patch b/packages/xorg-xserver/xserver-kdrive/xcalibrate.patch index b07d55c5ff..5d44dd679d 100644 --- a/packages/xorg-xserver/xserver-kdrive/xcalibrate.patch +++ b/packages/xorg-xserver/xserver-kdrive/xcalibrate.patch @@ -26,7 +26,7 @@ AC_ARG_ENABLE(xf86vidmode, AS_HELP_STRING([--disable-xf86vidmode], [Build XF86VidMode extension (default: enabled)]), [XF86VIDMODE=$enableval], [XF86VIDMODE=yes]) AC_ARG_ENABLE(xf86misc, AS_HELP_STRING([--disable-xf86misc], [Build XF86Misc extension (default: enabled)]), [XF86MISC=$enableval], [XF86MISC=yes]) AC_ARG_ENABLE(xcsecurity, AS_HELP_STRING([--disable-xcsecurity], [Build Security extension (default: enabled)]), [XCSECURITY=$enableval], [XCSECURITY=yes]) -+AC_ARG_ENABLE(xcalibrate, AS_HELP_STRING([--disable-xcalibrate], [Build XCalibrate extension (default: enabled)]), [XCALIBRATE=$enableval], [XCALIBRATE=yes]) ++AC_ARG_ENABLE(xcalibrate, AS_HELP_STRING([--enable-xcalibrate], [Build XCalibrate extension (default: disabled)]), [XCALIBRATE=$enableval], [XCALIBRATE=no]) AC_ARG_ENABLE(xevie, AS_HELP_STRING([--disable-xevie], [Build XEvIE extension (default: enabled)]), [XEVIE=$enableval], [XEVIE=yes]) AC_ARG_ENABLE(lbx, AS_HELP_STRING([--disable-lbx], [Build LBX extension (default: no)]), [LBX=$enableval], [LBX=no]) AC_ARG_ENABLE(appgroup, AS_HELP_STRING([--disable-appgroup], [Build XC-APPGROUP extension (default: enabled)]), [APPGROUP=$enableval], [APPGROUP=yes]) -- cgit v1.2.3 From 6148d0d6c1c662ce6c00893028001ed0db64951f Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 29 Sep 2006 01:45:10 +0000 Subject: xserver-kdrive X11R7.1-1.1.0: Bump PR after XCalibrate cleanups. --- packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb index 47225ff5b0..c28f3a739b 100644 --- a/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb +++ b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb @@ -1,7 +1,7 @@ LICENSE = "MIT" DEPENDS = "tslib virtual/libsdl xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" -PR = "r3" +PR = "r4" PROVIDES = "virtual/xserver" RPROVIDES = "virtual/xserver" -- cgit v1.2.3 From 8c3b8c97db1b8fbef02db8b6dc41cd7adc281e7e Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 29 Sep 2006 01:53:33 +0000 Subject: xcalibrateext_cvs: Follow git renaming of xcalibrateext to xcalibrateproto. * XCalibrate was migrated to X.org git, where most other packages live. * After that, to follow new convention, its protocol definition part (vs implementation library) was renamed to have "proto" suffix. * That's state of git repo now, and if we patch older xserver release with XCalibrate support, let's make sure that this is done in a manner compatible with the git (as obviously, that will be base for new release). * This means, xserver-kdrive cannot be any longer built with older XCalibrate from previous CVS repo, and thus, it better be removed to alleviate confusion. * Move CVS bb to obsolete/ for now. --- packages/obsolete/xcalibrateext/.mtn2git_empty | 0 packages/obsolete/xcalibrateext/xcalibrateext_cvs.bb | 13 +++++++++++++ packages/xcalibrateext/xcalibrateext_cvs.bb | 13 ------------- 3 files changed, 13 insertions(+), 13 deletions(-) create mode 100644 packages/obsolete/xcalibrateext/.mtn2git_empty create mode 100644 packages/obsolete/xcalibrateext/xcalibrateext_cvs.bb delete mode 100644 packages/xcalibrateext/xcalibrateext_cvs.bb diff --git a/packages/obsolete/xcalibrateext/.mtn2git_empty b/packages/obsolete/xcalibrateext/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/obsolete/xcalibrateext/xcalibrateext_cvs.bb b/packages/obsolete/xcalibrateext/xcalibrateext_cvs.bb new file mode 100644 index 0000000000..4e47c1677e --- /dev/null +++ b/packages/obsolete/xcalibrateext/xcalibrateext_cvs.bb @@ -0,0 +1,13 @@ +PV = "0.0+cvs${SRCDATE}" +SECTION = "x11/libs" +LICENSE = "BSD-X" +DESCRIPTION = "XCalibrate extension headers" + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XCalibrateExt" +S = "${WORKDIR}/XCalibrateExt" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xcalibrateext/xcalibrateext_cvs.bb b/packages/xcalibrateext/xcalibrateext_cvs.bb deleted file mode 100644 index 4e47c1677e..0000000000 --- a/packages/xcalibrateext/xcalibrateext_cvs.bb +++ /dev/null @@ -1,13 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -SECTION = "x11/libs" -LICENSE = "BSD-X" -DESCRIPTION = "XCalibrate extension headers" - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XCalibrateExt" -S = "${WORKDIR}/XCalibrateExt" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} -- cgit v1.2.3 From f0e5f6e2d7e39e5dab9e76cc200804b1948670d3 Mon Sep 17 00:00:00 2001 From: Jamie Lenehan Date: Fri, 29 Sep 2006 08:59:03 +0000 Subject: perl: More shared library fixes for sh3/sh4, this time for the shared libraries used by standard perl modules. This was picking up LD from OE which as the linking when we need to use gcc to link. Override LD when calling oe_make to force the use of gcc to link. --- packages/perl/perl.inc | 7 ++++++- packages/perl/perl_5.8.7.bb | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/perl/perl.inc b/packages/perl/perl.inc index ad0562d3a4..4cddcdb18a 100644 --- a/packages/perl/perl.inc +++ b/packages/perl/perl.inc @@ -41,7 +41,12 @@ do_configure() { do_compile() { sed -i -e 's|/usr/include|${STAGING_INCDIR}|g' ext/Errno/Errno_pm.PL cd Cross - oe_runmake perl + # You must use gcc to link on sh + OPTIONS="" + if test ${TARGET_ARCH} = "sh3" -o ${TARGET_ARCH} = "sh4"; then + OPTIONS="LD=${TARGET_ARCH}-${TARGET_OS}-gcc" + fi + oe_runmake perl $OPTIONS } do_install() { diff --git a/packages/perl/perl_5.8.7.bb b/packages/perl/perl_5.8.7.bb index 834be8fcc9..2bc2e16a32 100644 --- a/packages/perl/perl_5.8.7.bb +++ b/packages/perl/perl_5.8.7.bb @@ -19,7 +19,7 @@ SRC_URI_append_sh3 += "file://makefile-usegcc-to-link.patch;patch=1" PARALLEL_MAKE = "" -PR = "r18" +PR = "r19" do_configure() { ln -sf ${HOSTPERL} ${STAGING_BINDIR}/hostperl -- cgit v1.2.3 From a4fb8cb9e3d0de0caa21da16f9644331ccab10c3 Mon Sep 17 00:00:00 2001 From: Jamie Lenehan Date: Fri, 29 Sep 2006 09:05:19 +0000 Subject: perl: Don't try and patch up references to /usr/include in binary files, as per #1439, so that configure doesn't fail if you happen to end up with this string in the perl-native binary. --- packages/perl/perl_5.8.7.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/perl/perl_5.8.7.bb b/packages/perl/perl_5.8.7.bb index 2bc2e16a32..1b69cf0e8b 100644 --- a/packages/perl/perl_5.8.7.bb +++ b/packages/perl/perl_5.8.7.bb @@ -53,7 +53,7 @@ do_configure() { sed -i -e "s%/usr/include/%${STAGING_INCDIR}/%g" config.sh-${TARGET_ARCH}-${TARGET_OS} #These are strewn all over the source tree - for foo in `grep -m1 \/usr\/include\/.*\\.h ${WORKDIR}/* -r | cut -f 1 -d ":"` ; do + for foo in `grep -m1 \/usr\/include\/.*\\.h ${WORKDIR}/* -r | grep -v "^Binary file .* matches$" | cut -f 1 -d ":"` ; do echo Fixing: $foo sed -e "s%/usr/include/%${STAGING_INCDIR}/%g" -i $foo done -- cgit v1.2.3