diff options
author | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2007-03-21 23:22:30 +0000 |
---|---|---|
committer | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2007-03-21 23:22:30 +0000 |
commit | aae9de2a89a3b6464ba893df30e711b574aa1467 (patch) | |
tree | 1097aac5849b0d58bf0b8c290d7cfba421d92bcf | |
parent | a0c00ff8342e3b41f3feb60b3710665ea7879546 (diff) | |
parent | df30e95c8af93e2fafac7cc7bca7ef0f4c27e035 (diff) |
merge of '6c7f9afdafc67f5e5a8263301ca0cfce430be173'
and '8ee01e7aef977a6c51cf71b7d11f65f42e0dc413'
191 files changed, 2684 insertions, 8522 deletions
diff --git a/classes/e.bbclass b/classes/e.bbclass index f20c1f8b60..59f2771027 100644 --- a/classes/e.bbclass +++ b/classes/e.bbclass @@ -22,11 +22,12 @@ export ESMART_CONFIG = "${STAGING_BINDIR_CROSS}/esmart-config" export FREETYPE_CONFIG = "${STAGING_BINDIR_CROSS}/freetype-config" export IMLIB2_CONFIG = "${STAGING_BINDIR_CROSS}/imlib2-config" -do_compile_prepend() { - find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:' - find ${S} -name Makefile | xargs sed -i 's:/usr/X11R6/include:${STAGING_INCDIR}:' -} +#do_compile_prepend() { +# find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:' +# find ${S} -name Makefile | xargs sed -i 's:/usr/X11R6/include:${STAGING_INCDIR}:' +#} -PACKAGES = "${PN}-dbg ${PN} ${PN}-themes" +PACKAGES = "${PN}-dbg ${PN} ${PN}-themes ${PN}-dev" FILES_${PN} = "${libdir}/lib*.so*" FILES_${PN}-themes = "${datadir}/${PN}/themes ${datadir}/${PN}/data ${datadir}/${PN}/fonts ${datadir}/${PN}/pointers ${datadir}/${PN}/images ${datadir}/${PN}/users ${datadir}/${PN}/images ${datadir}/${PN}/styles" +FILES_${PN}-dev += "${includedir}"
\ No newline at end of file diff --git a/classes/lsppchd-image.bbclass b/classes/lsppchd-image.bbclass new file mode 100644 index 0000000000..6aab20127a --- /dev/null +++ b/classes/lsppchd-image.bbclass @@ -0,0 +1,3 @@ +lsppchd_pack_image() { +: +}
\ No newline at end of file diff --git a/classes/lsppchg-image.bbclass b/classes/lsppchg-image.bbclass new file mode 100644 index 0000000000..5d9da87c7d --- /dev/null +++ b/classes/lsppchg-image.bbclass @@ -0,0 +1,3 @@ +lsppchg_pack_image() { +: +}
\ No newline at end of file diff --git a/classes/n2100-image.bbclass b/classes/n2100-image.bbclass new file mode 100644 index 0000000000..519be213d5 --- /dev/null +++ b/classes/n2100-image.bbclass @@ -0,0 +1,30 @@ +n2100_pack_image() { + # find latest kernel + KERNEL=`ls -tr ${DEPLOY_DIR_IMAGE}/zImage* | tail -1` + if [ -z "$KERNEL" ]; then + oefatal "No kernel found in ${DEPLOY_DIR_IMAGE}. Bitbake linux to create one." + exit 1 + fi + ROOTFS=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 + OUTPUT=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.flash.img + PADFILE=${DEPLOY_DIR_IMAGE}/padfile.zzz + HEX_MAX_KERN_SIZE=1C0000 + DEC_MAX_KERN_SIZE=`echo "ibase=16; $HEX_MAX_KERN_SIZE" | bc ` + HEX_MAX_ROOT_SIZE=DC0000 + DEC_MAX_ROOT_SIZE=`echo "ibase=16; $HEX_MAX_ROOT_SIZE" | bc ` + KERNEL_SIZE=`ls -l $KERNEL | awk '{print $5}'` + if [ $KERNEL_SIZE -gt $DEC_MAX_KERN_SIZE ]; then + oefatal "Kernel too large at $KERNEL_SIZE bytes. Max is $DEC_MAX_KERN_SIZE." + exit 1 + fi + ROOT_SIZE=`ls -l $ROOTFS | awk '{print $5}'` + if [ $ROOT_SIZE -gt $DEC_MAX_ROOT_SIZE ]; then + oefatal "Rootfs is too large at $ROOT_SIZE bytes. Max is $DEC_MAX_ROOT_SIZE." + exit 1 + fi + PAD_SIZE=`echo "$DEC_MAX_KERN_SIZE - $KERNEL_SIZE" | bc ` + dd if=/dev/zero of=$PADFILE bs=$PAD_SIZE count=1 2>>/dev/null + cat $KERNEL $PADFILE $ROOTFS > $OUTPUT + rm -f $PADFILE + ls -l $OUTPUT +} diff --git a/classes/storcenter-image.bbclass b/classes/storcenter-image.bbclass new file mode 100644 index 0000000000..de77f1b417 --- /dev/null +++ b/classes/storcenter-image.bbclass @@ -0,0 +1,30 @@ +storcenter_pack_image() { + # find latest kernel + KERNEL=`ls -tr ${DEPLOY_DIR_IMAGE}/uImage* | tail -1` + if [ -z "$KERNEL" ]; then + oefatal "No kernel found in ${DEPLOY_DIR_IMAGE}. Bitbake linux-storcenter to create one." + exit 1 + fi + ROOTFS=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 + OUTPUT=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.flash.img + PADFILE=${DEPLOY_DIR_IMAGE}/padfile.zzz + HEX_MAX_KERN_SIZE=170000 + DEC_MAX_KERN_SIZE=`echo "ibase=16; $HEX_MAX_KERN_SIZE" | bc ` + HEX_MAX_ROOT_SIZE=590000 + DEC_MAX_ROOT_SIZE=`echo "ibase=16; $HEX_MAX_ROOT_SIZE" | bc ` + KERNEL_SIZE=`ls -l $KERNEL | awk '{print $5}'` + if [ $KERNEL_SIZE -gt $DEC_MAX_KERN_SIZE ]; then + oefatal "Kernel too large at $KERNEL_SIZE bytes. Max is $DEC_MAX_KERN_SIZE." + exit 1 + fi + ROOT_SIZE=`ls -l $ROOTFS | awk '{print $5}'` + if [ $ROOT_SIZE -gt $DEC_MAX_ROOT_SIZE ]; then + oefatal "Rootfs is too large at $ROOT_SIZE bytes. Max is $DEC_MAX_ROOT_SIZE." + exit 1 + fi + PAD_SIZE=`echo "$DEC_MAX_KERN_SIZE - $KERNEL_SIZE" | bc ` + dd if=/dev/zero of=$PADFILE bs=$PAD_SIZE count=1 2>>/dev/null + cat $KERNEL $PADFILE $ROOTFS > $OUTPUT + rm -f $PADFILE + ls -l $OUTPUT +} diff --git a/classes/turbostation-image.bbclass b/classes/turbostation-image.bbclass new file mode 100644 index 0000000000..e61ffc825b --- /dev/null +++ b/classes/turbostation-image.bbclass @@ -0,0 +1,30 @@ +turbostation_pack_image() { + # find latest kernel + KERNEL=`ls -tr ${DEPLOY_DIR_IMAGE}/uImage* | tail -1` + if [ -z "$KERNEL" ]; then + oefatal "No kernel found in ${DEPLOY_DIR_IMAGE}. Bitbake linux-turbostation to create one." + exit 1 + fi + ROOTFS=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 + OUTPUT=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.flash.img + PADFILE=${DEPLOY_DIR_IMAGE}/padfile.zzz + HEX_MAX_KERN_SIZE=200000 + DEC_MAX_KERN_SIZE=`echo "ibase=16; $HEX_MAX_KERN_SIZE" | bc ` + HEX_MAX_ROOT_SIZE=D00000 + DEC_MAX_ROOT_SIZE=`echo "ibase=16; $HEX_MAX_ROOT_SIZE" | bc ` + KERNEL_SIZE=`ls -l $KERNEL | awk '{print $5}'` + if [ $KERNEL_SIZE -gt $DEC_MAX_KERN_SIZE ]; then + oefatal "Kernel too large at $KERNEL_SIZE bytes. Max is $DEC_MAX_KERN_SIZE." + exit 1 + fi + ROOT_SIZE=`ls -l $ROOTFS | awk '{print $5}'` + if [ $ROOT_SIZE -gt $DEC_MAX_ROOT_SIZE ]; then + oefatal "Rootfs is too large at $ROOT_SIZE bytes. Max is $DEC_MAX_ROOT_SIZE." + exit 1 + fi + PAD_SIZE=`echo "$DEC_MAX_KERN_SIZE - $KERNEL_SIZE" | bc ` + dd if=/dev/zero of=$PADFILE bs=$PAD_SIZE count=1 2>>/dev/null + cat $KERNEL $PADFILE $ROOTFS > $OUTPUT + rm -f $PADFILE + ls -l $OUTPUT +} diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 122bd44b34..097b1c9b0d 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -8,7 +8,7 @@ #DISTRO_VERSION = "2007.3" DISTRO_VERSION = "test-${DATE}" -DISTRO_REVISION = "36" +DISTRO_REVISION = "37" require conf/distro/include/angstrom.inc require conf/distro/include/sane-srcdates.inc @@ -107,16 +107,14 @@ PREFERRED_PROVIDER_dbus-glib = "dbus-glib" PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11" PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11" PREFERRED_PROVIDER_esound ?= "pulseaudio" +PREFERRED_PROVIDER_gdk-pixbuf-loader-png ?= "gtk+" PREFERRED_VERSION_fontconfig = "2.4.1" -PREFERRED_VERSION_freetype = "2.3.0" +PREFERRED_VERSION_freetype = "2.3.1" PREFERRED_VERSION_freetype-native = "2.2.1" -PREFERRED_VERSION_cairo = "1.4.0" - -#work around a segfault in gcc for armv4t -PREFERRED_VERSION_glib-2.0_ep93xx = "2.12.3" -PREFERRED_VERSION_glib-2.0_h6300 = "2.12.3" +PREFERRED_VERSION_cairo = "1.4.2" +PREFERRED_VERSION_glib-2.0 = "2.12.10" #Small machines prefer kdrive, but we might ship full Xorg in other images PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" @@ -125,7 +123,7 @@ PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" require conf/distro/include/preferred-xorg-versions-X11R7.1.inc PREFERRED_VERSION_xserver-kdrive = "X11R7.1-1.1.0" -PREFERRED_VERSION_gtk+ = "2.10.9" +PREFERRED_VERSION_gtk+ = "2.10.10" #zap extra stuff taking place in $MACHINE.conf GPE_EXTRA_INSTALL = "" diff --git a/conf/distro/foonas.conf b/conf/distro/foonas.conf index 201d463732..d21e5cfe6f 100644 --- a/conf/distro/foonas.conf +++ b/conf/distro/foonas.conf @@ -1,3 +1,4 @@ + # # FooNAS distribution - a NAS-centric distribution # based on openprotium @@ -12,15 +13,37 @@ DISTRO_TYPE = "alpha" FEED_URIS = "foonas-packages##http://ipkg.foonas.org/${MACHINE}/cross/1.0-dev/packages" FEED_URIS += "foonas-kernel##http://ipkg.foonas.org/${MACHINE}/cross/1.0-dev/kernel" +TARGET_OS = "linux" +HOTPLUG = "udev" + +# Various defines for Thecus N2100 FOONAS_KERNEL_n2100 = "kernel-module-ext2 kernel-module-usb-storage" +FOONAS_SUPPORT_n2100 += "fis" +BOOTSTRAP_EXTRA_RDEPENDS_n2100 = "udev mdadm" + +IMAGE_PREPROCESS_COMMAND += "sed -i -es,^id:5:initdefault:,id:3:initdefault:, ${IMAGE_ROOTFS}/etc/inittab;" +IMAGE_PREPROCESS_COMMAND += "sed -i -es,^root::0,root:BTMzOOAQfESg6:0, ${IMAGE_ROOTFS}/etc/passwd;" +IMAGE_PREPROCESS_COMMAND += "sed -i -es,^VERBOSE=no,VERBOSE=very, ${IMAGE_ROOTFS}/etc/default/rcS;" +FOONAS_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-slugos.txt')}" + + +# Various defines for QNAP Turbostation FOONAS_KERNEL_turbostation = "kernel-module-ext3 kernel-module-minix \ kernel-module-usb-storage" -FOONAS_KERNEL_linkstationppchd = "kernel-module-dm-mod kernel-module-raid1 \ - kernel-module-raid0 kernel-module-raid456 \ - kernel-module-multipath" -FOONAS_KERNEL_linkstationppchg = "kernel-module-dm-mod kernel-module-raid1 \ +FOONAS_SUPPORT_turbostation += "uboot-utils" +BOOTSTRAP_EXTRA_RDEPENDS_turbostation = "udev mdadm" + +# Various defines for Linkstations +FOONAS_KERNEL_lsppchg = "kernel-module-dm-mod kernel-module-raid1 \ kernel-module-raid0 kernel-module-raid456 \ kernel-module-multipath" +FOONAS_KERNEL_lsppchd = "${FOONAS_KERNEL_lsppchg}" +FOONAS_SUPPORT_lsppchd = "uboot-utils dtc" +FOONAS_SUPPORT_lsppchg = ${FOONAS_SUPPORT_lsppchd} +IMAGE_FSTYPES_lsppchd = "tar.gz" +IMAGE_FSTYPES_lsppchg = ${IMAGE_FSTYPES_lsppchd} + +IMAGE_POSTPROCESS_COMMAND += '${MACHINE}_pack_image;' # # Naming schemes @@ -30,77 +53,9 @@ INHERIT += "debian" # # Packaging and output format # + INHERIT += "package_ipk" IMAGE_BASENAME = "foonas" -IMAGE_FSTYPES = "jffs2" - -# -# binutils and compilers -# - -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate" -PREFERRED_PROVIDER_virtual/arm-foonas-linux-gnueabi-libc-for-gcc = "glibc-intermediate" -PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" -PREFERRED_PROVIDER_virtual/powerpc-foonas-linux-libc-for-gcc = "glibc-intermediate" - -# not used yet -#PREFERRED_PROVIDER_virtual/armeb-linux-libc-for-gcc = "glibc-intermediate" -#PREFERRED_PROVIDER_virtual/armeb-foonas-linux-gnueabi-libc-for-gcc = "glibc-intermediate" -#PREFERRED_PROVIDER_virtual/mipsel-foonas-linux-libc-for-gcc = "glibc-intermediate" - -TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" -#mess with compiler flags to use -Os instead of -O2 -#Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info -# perl has some problems, see http://bugs.openembedded.org/show_bug.cgi?id=1616 - -FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os" -FULL_OPTIMIZATION_pn-perl = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O1" - -BUILD_OPTIMIZATION = "-Os" -BUILD_OPTIMIZATION_pn-perl = "-O1" - -CXXFLAGS += "-fvisibility-inlines-hidden" - -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross" -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" -#conflict between this and the last below. -#PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc" -# Select 2.6 versions of the depmod support -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc-intermediate" - -PREFERRED_PROVIDER_virtual/libx11 = "libx11" -PREFERRED_PROVIDER_virtual/libiconv = "glibc" -PREFERRED_PROVIDER_virtual/libintl = "glibc" - -PREFERRED_PROVIDER_virtual/db = "db" -PREFERRED_PROVIDER_virtual/db-native = "db-native" - -PREFERRED_VERSION_binutils = "2.17.50.0.12" -PREFERRED_VERSION_binutils-cross = "2.17.50.0.12" - -PREFERRED_VERSION_gcc = "4.1.1" -PREFERRED_VERSION_gcc-cross = "4.1.1" -PREFERRED_VERSION_gcc-cross-sdk ?= "4.1.1" -PREFERRED_VERSION_gcc-cross-initial = "4.1.1" - -PREFERRED_VERSION_glibc = "2.5" -PREFERRED_VERSION_glibc-intermediate = "2.5" -PREFERRED_VERSION_glibc-initial = "2.5" -GLIBC_EXTRA_OECONF = "--with-tls" - -PREFERRED_VERSION_linux-libc-headers ?= "2.6.18" -GLIBC_ADDONS ?= "ports,nptl,libidn" - - -# -# Target OS -# - -TARGET_OS = "linux" -HOTPLUG = "udev" require conf/distro/include/sane-srcdates.inc - -CMDLINE_DEBUG = "noirqdebug" +require conf/distro/include/foonas.inc diff --git a/conf/distro/include/foonas.inc b/conf/distro/include/foonas.inc new file mode 100644 index 0000000000..189b932716 --- /dev/null +++ b/conf/distro/include/foonas.inc @@ -0,0 +1,60 @@ +# +# binutils and compilers +# + +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/arm-foonas-linux-gnueabi-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/powerpc-foonas-linux-libc-for-gcc = "glibc-intermediate" + +# not used yet +#PREFERRED_PROVIDER_virtual/armeb-linux-libc-for-gcc = "glibc-intermediate" +#PREFERRED_PROVIDER_virtual/armeb-foonas-linux-gnueabi-libc-for-gcc = "glibc-intermediate" +#PREFERRED_PROVIDER_virtual/mipsel-foonas-linux-libc-for-gcc = "glibc-intermediate" + +TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" + +#mess with compiler flags to use -Os instead of -O2 +#Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info +# perl has some problems, see http://bugs.openembedded.org/show_bug.cgi?id=1616 + +FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os" +FULL_OPTIMIZATION_pn-perl = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O1" + +BUILD_OPTIMIZATION = "-Os" +BUILD_OPTIMIZATION_pn-perl = "-O1" + +CXXFLAGS += "-fvisibility-inlines-hidden" + +PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" +PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross" +PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" +#conflict between this and the last below. +#PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc" +# Select 2.6 versions of the depmod support +PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" +PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc-intermediate" + +PREFERRED_PROVIDER_virtual/libx11 = "libx11" +PREFERRED_PROVIDER_virtual/libiconv = "glibc" +PREFERRED_PROVIDER_virtual/libintl = "glibc" + +PREFERRED_PROVIDER_virtual/db = "db" +PREFERRED_PROVIDER_virtual/db-native = "db-native" + +PREFERRED_VERSION_binutils = "2.17.50.0.12" +PREFERRED_VERSION_binutils-cross = "2.17.50.0.12" + +PREFERRED_VERSION_gcc = "4.1.1" +PREFERRED_VERSION_gcc-cross = "4.1.1" +PREFERRED_VERSION_gcc-cross-sdk ?= "4.1.1" +PREFERRED_VERSION_gcc-cross-initial = "4.1.1" + +PREFERRED_VERSION_glibc = "2.5" +PREFERRED_VERSION_glibc-intermediate = "2.5" +PREFERRED_VERSION_glibc-initial = "2.5" +GLIBC_EXTRA_OECONF = "--with-tls" + +PREFERRED_VERSION_linux-libc-headers ?= "2.6.18" +GLIBC_ADDONS ?= "ports,nptl,libidn" + diff --git a/conf/machine/linkstationppchd.conf b/conf/machine/lsppchd.conf index 52d58ded5b..51d0186dbe 100644 --- a/conf/machine/linkstationppchd.conf +++ b/conf/machine/lsppchd.conf @@ -3,5 +3,6 @@ #@DESCRIPTION: Machine configuration for the Buffalo Linkstation HD UBOOT_MACHINE = "linkstation_HDLAN" +IMAGE_FSTYPES = "tar.gz" require conf/machine/include/linkstationppc.conf diff --git a/conf/machine/linkstationppchg.conf b/conf/machine/lsppchg.conf index b7ceb6fc95..516a3aaa98 100644 --- a/conf/machine/linkstationppchg.conf +++ b/conf/machine/lsppchg.conf @@ -3,5 +3,6 @@ #@DESCRIPTION: Machine configuration for the Buffalo Linkstation HG UBOOT_MACHINE = "linkstation_HGLAN" +IMAGE_FSTYPES = "tar.gz" require conf/machine/include/linkstationppc.conf diff --git a/conf/machine/n2100.conf b/conf/machine/n2100.conf index 554157ca85..c84bf352da 100644 --- a/conf/machine/n2100.conf +++ b/conf/machine/n2100.conf @@ -7,21 +7,19 @@ SERIAL_CONSOLE="115200 console" USE_VT="0" MODUTILS=26 -MACHINE_FEATURES= "kernel26 usbhost" +MACHINE_FEATURES= "kernel26 usbhost pci ext2" PREFERRED_PROVIDER_virtual/kernel = "linux" PREFERRED_VERSION_linux = "2.6.20" - -# Do we need any kernel modules? -FOONAS_KERNEL = "kernel-module-ext2 kernel-module-usb-storage" - -FOONAS_SUPPORT += "fis" +MACHINE_TASK_PROVIDER = "task-base" # We want udev support in the image udevdir = "/dev" -BOOTSTRAP_EXTRA_RDEPENDS = "udev mdadm" -EXTRA_IMAGECMD_jffs2 += " --little-endian" -ERASEBLOCK_SIZE = "0x20000" -JFFS2_ROOTFS_SIZE = "0xC80000" -KERNEL_IMAGE_SIZE = "0x280000" +ERASEBLOCK_SIZE = "0x20000" +IMAGE_FSTYPES = "jffs2" +EXTRA_IMAGECMD = "--little-endian" +# Creating an image that works with the webinterface required encrypting it +# So we'll need openssl +EXTRA_IMAGEDEPENDS = "openssl-native" + require conf/machine/include/tune-xscale.conf diff --git a/conf/machine/turbostation.conf b/conf/machine/turbostation.conf index 41dfd8d09e..ffa44207cd 100644 --- a/conf/machine/turbostation.conf +++ b/conf/machine/turbostation.conf @@ -9,19 +9,15 @@ SERIAL_CONSOLE="115200 console" USE_VT="0" MODUTILS=26 -MACHINE_FEATURES= "kernel26 usbhost" +MACHINE_FEATURES= "kernel26 usbhost pci ext2" PREFERRED_PROVIDER_virtual/kernel = "linux-turbostation" -FOONAS_KERNEL = "kernel-module-ext3 kernel-module-minix \ - kernel-module-usb-storage" +MACHINE_TASK_PROVIDER = "task-base" # We want udev support in the image udevdir = "/dev" -BOOTSTRAP_EXTRA_RDEPENDS = "udev mdadm" -FOONAS_SUPPORT += "uboot-utils" -# Hardware stuff used in image generation EXTRA_IMAGECMD = "--big-endian" -ERASEBLOCK_SIZE = "0x20000" -JFFS2_ROOTFS_SIZE = "0xC80000" -KERNEL_IMAGE_SIZE = "0x280000" +ERASEBLOCK_SIZE = "0x20000" +IMAGE_FSTYPES = "jffs2" + require conf/machine/include/tune-ppc603e.conf diff --git a/packages/angstrom/angstrom-e-image.bb b/packages/angstrom/angstrom-e-image.bb new file mode 100644 index 0000000000..da40f7e00c --- /dev/null +++ b/packages/angstrom/angstrom-e-image.bb @@ -0,0 +1,37 @@ +#Angstrom e image +LICENSE = "MIT" +PR = "r0" + + +PREFERRED_PROVIDER_virtual/evas ?= "evas-x11" +PREFERRED_PROVIDER_virtual/ecore ?= "ecore-x11" +PREFERRED_PROVIDER_virtual/imlib2 ?= "imlib2-x11" +PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" + +PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget" +PREFERRED_PROVIDER_tslib ?= "tslib" +PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11" +PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11" + +ANGSTROM_EXTRA_INSTALL ?= "" +XSERVER ?= "xserver-kdrive-fbdev" + +export IMAGE_BASENAME = "e-image" + +DEPENDS = "task-base" +RDEPENDS = "\ + ${XSERVER} \ + task-base-core-default \ + task-base \ + angstrom-e-base-depends \ + angstrom-e-depends \ + angstrom-gpe-task-settings \ + ${ANGSTROM_EXTRA_INSTALL}" + + +export PACKAGE_INSTALL = "${RDEPENDS}" + +#zap root password for release images +ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}' + +inherit image diff --git a/packages/angstrom/task-angstrom-e.bb b/packages/angstrom/task-angstrom-e.bb new file mode 100644 index 0000000000..228c637158 --- /dev/null +++ b/packages/angstrom/task-angstrom-e.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "Task packages for the Angstrom distribution" +PR = "r0" +ALLOW_EMPTY = "1" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +PACKAGES = "\ + angstrom-e-base-depends \ + angstrom-e-depends" + +RDEPENDS_angstrom-e-base-depends := "\ + angstrom-x11-base-depends \ + rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo \ + ttf-bitstream-vera \ + entrance e-wm \ + glibc-charmap-utf-8 glibc-localedata-i18n" +#xserver-kdrive-fbdev + +RDEPENDS_angstrom-e-depends := "\ + pango-module-basic-fc \ + gdk-pixbuf-loader-bmp \ + gdk-pixbuf-loader-gif \ + gdk-pixbuf-loader-jpeg \ + gdk-pixbuf-loader-png \ + gdk-pixbuf-loader-pnm \ + gdk-pixbuf-loader-xbm \ + gdk-pixbuf-loader-xpm"
\ No newline at end of file diff --git a/packages/apt/apt_0.6.46.2.bb b/packages/apt/apt_0.6.46.2.bb index 1cd8eb270e..73285f37c3 100644 --- a/packages/apt/apt_0.6.46.2.bb +++ b/packages/apt/apt_0.6.46.2.bb @@ -1,7 +1,6 @@ require apt.inc -SRC_URI += "file://autofoo.patch;patch=1 \ - file://nodoc.patch;patch=1" +SRC_URI += "file://nodoc.patch;patch=1" require apt-package.inc diff --git a/packages/apt/files/apt.conf b/packages/apt/files/apt.conf index fc19018533..6fd653dfcd 100644 --- a/packages/apt/files/apt.conf +++ b/packages/apt/files/apt.conf @@ -21,6 +21,10 @@ Dir "${STAGING_DIR}/" apt-get "apt-get"; apt-cache "apt-cache"; }; + Etc "etc/apt/" + { + Preferences "preferences"; + }; }; APT diff --git a/packages/gtk+/gtk+-2.10.3/.mtn2git_empty b/packages/base-files/base-files/oplinux-uclibc/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/gtk+/gtk+-2.10.3/.mtn2git_empty +++ b/packages/base-files/base-files/oplinux-uclibc/.mtn2git_empty diff --git a/packages/base-files/base-files/oplinux-uclibc/issue b/packages/base-files/base-files/oplinux-uclibc/issue new file mode 100644 index 0000000000..9d0ef9c636 --- /dev/null +++ b/packages/base-files/base-files/oplinux-uclibc/issue @@ -0,0 +1,14 @@ +.-------.-------. .---. .---. .---. .---. +| | __ | | | '---' \ \/ / +| | | | | | .---.-----.--.--.\ / +| | | .---' | '--| | | | |/ \ +| | | | | | | | | /\ \ +'-------'---' '------'---'--'--'-----'--' '---' +===================================================== + .--.--.-----.--. .--.-----.-----. + | | | __| | | | -- | __| + | | | '-| | -- | | + '-----'-----'----'--'-----'-----' + +The OPLinux-uclibc distribution \l + diff --git a/packages/base-files/base-files/oplinux-uclibc/issue.net b/packages/base-files/base-files/oplinux-uclibc/issue.net new file mode 100644 index 0000000000..b74869dba1 --- /dev/null +++ b/packages/base-files/base-files/oplinux-uclibc/issue.net @@ -0,0 +1,16 @@ +.-------.-------. .---. .---. .---. .---. +| | __ | | | '---' \ \/ / +| | | | | | .---.-----.--.--.\ / +| | | .---' | '--| | | | |/ \ +| | | | | | | | | /\ \ +'-------'---' '------'---'--'--'-----'--' '---' +===================================================== + .--.--.-----.--. .--.-----.-----. + | | | __| | | | -- | __| + | | | '-| | -- | | + '-----'-----'----'--'-----'-----' + + +The OPLinux-uclibc distribution %h + + diff --git a/packages/base-files/base-files/oplinux-uclibc/motd b/packages/base-files/base-files/oplinux-uclibc/motd new file mode 100644 index 0000000000..5fad7d5707 --- /dev/null +++ b/packages/base-files/base-files/oplinux-uclibc/motd @@ -0,0 +1,12 @@ +.-------.-------. .---. .---. .---. .---. +| | __ | | | '---' \ \/ / +| | | | | | .---.-----.--.--.\ / +| | | .---' | '--| | | | |/ \ +| | | | | | | | | /\ \ +'-------'---' '------'---'--'--'-----'--' '---' +===================================================== + .--.--.-----.--. .--.-----.-----. + | | | __| | | | -- | __| + | | | '-| | -- | | + '-----'-----'----'--'-----'-----' + diff --git a/packages/base-files/base-files/oplinux-uclibc/profile b/packages/base-files/base-files/oplinux-uclibc/profile new file mode 100644 index 0000000000..f6ae329b57 --- /dev/null +++ b/packages/base-files/base-files/oplinux-uclibc/profile @@ -0,0 +1,32 @@ +# /etc/profile: system-wide .profile file for the Bourne shell (sh(1)) +# and Bourne compatible shells (bash(1), ksh(1), ash(1), ...). + +PATH="/usr/local/bin:/usr/bin:/bin" +EDITOR="/usr/bin/nano" # needed for packages like cron +TERM="linux" # Basic terminal capab. For screen etc. + +if [ ! -e /etc/localtime ]; then + TZ="UTC" # Time Zone. Look at http://theory.uwinnipeg.ca/gnu/glibc/libc_303.html + # for an explanation of how to set this to your local timezone. + export TZ +fi + +if [ "`id -u`" -eq 0 ]; then + PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin: +fi +if [ "$PS1" ]; then +# works for bash and ash (no other shells known to be in use here) + PS1='\u@\h:\w\$ ' +fi + +if [ -d /etc/profile.d ]; then + for i in `ls /etc/profile.d/`; do + . /etc/profile.d/$i + done + unset i +fi + +export PATH PS1 OPIEDIR QPEDIR QTDIR EDITOR TERM + +umask 022 + diff --git a/packages/gtk+/gtk+-2.10.6/.mtn2git_empty b/packages/base-files/base-files/oplinux/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/gtk+/gtk+-2.10.6/.mtn2git_empty +++ b/packages/base-files/base-files/oplinux/.mtn2git_empty diff --git a/packages/base-files/base-files/oplinux/issue b/packages/base-files/base-files/oplinux/issue new file mode 100644 index 0000000000..9b9c437510 --- /dev/null +++ b/packages/base-files/base-files/oplinux/issue @@ -0,0 +1,10 @@ +.-------.-------. .---. .---. .---. .---. +| | __ | | | '---' \ \/ / +| | | | | | .---.-----.--.--.\ / +| | | .---' | '--| | | | |/ \ +| | | | | | | | | /\ \ +'-------'---' '------'---'--'--'-----'--' '---' +===================================================== + +The OPLinux distribution \l + diff --git a/packages/base-files/base-files/oplinux/issue.net b/packages/base-files/base-files/oplinux/issue.net new file mode 100644 index 0000000000..93a6f8a7d5 --- /dev/null +++ b/packages/base-files/base-files/oplinux/issue.net @@ -0,0 +1,11 @@ +.-------.-------. .---. .---. .---. .---. +| | __ | | | '---' \ \/ / +| | | | | | .---.-----.--.--.\ / +| | | .---' | '--| | | | |/ \ +| | | | | | | | | /\ \ +'-------'---' '------'---'--'--'-----'--' '---' +===================================================== + +The OPLinux distribution %h + + diff --git a/packages/base-files/base-files/oplinux/motd b/packages/base-files/base-files/oplinux/motd new file mode 100644 index 0000000000..10e458b9b5 --- /dev/null +++ b/packages/base-files/base-files/oplinux/motd @@ -0,0 +1,8 @@ +.-------.-------. .---. .---. .---. .---. +| | __ | | | '---' \ \/ / +| | | | | | .---.-----.--.--.\ / +| | | .---' | '--| | | | |/ \ +| | | | | | | | | /\ \ +'-------'---' '------'---'--'--'-----'--' '---' +===================================================== + diff --git a/packages/base-files/base-files/oplinux/profile b/packages/base-files/base-files/oplinux/profile new file mode 100644 index 0000000000..f6ae329b57 --- /dev/null +++ b/packages/base-files/base-files/oplinux/profile @@ -0,0 +1,32 @@ +# /etc/profile: system-wide .profile file for the Bourne shell (sh(1)) +# and Bourne compatible shells (bash(1), ksh(1), ash(1), ...). + +PATH="/usr/local/bin:/usr/bin:/bin" +EDITOR="/usr/bin/nano" # needed for packages like cron +TERM="linux" # Basic terminal capab. For screen etc. + +if [ ! -e /etc/localtime ]; then + TZ="UTC" # Time Zone. Look at http://theory.uwinnipeg.ca/gnu/glibc/libc_303.html + # for an explanation of how to set this to your local timezone. + export TZ +fi + +if [ "`id -u`" -eq 0 ]; then + PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin: +fi +if [ "$PS1" ]; then +# works for bash and ash (no other shells known to be in use here) + PS1='\u@\h:\w\$ ' +fi + +if [ -d /etc/profile.d ]; then + for i in `ls /etc/profile.d/`; do + . /etc/profile.d/$i + done + unset i +fi + +export PATH PS1 OPIEDIR QPEDIR QTDIR EDITOR TERM + +umask 022 + diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb index 0f80f17b19..393e0e3ec2 100644 --- a/packages/base-files/base-files_3.0.14.bb +++ b/packages/base-files/base-files_3.0.14.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Miscellaneous files for the base system." SECTION = "base" PRIORITY = "required" -PR = "r62" +PR = "r64" LICENSE = "GPL" SRC_URI = " \ diff --git a/packages/cairo/cairo_1.4.2.bb b/packages/cairo/cairo_1.4.2.bb new file mode 100644 index 0000000000..3e5d2fdb15 --- /dev/null +++ b/packages/cairo/cairo_1.4.2.bb @@ -0,0 +1,7 @@ +require cairo.inc + +SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \ + file://cairo-surface-cache-3.patch;patch=1" + +PR = "r0" + diff --git a/packages/dtc/dtc_20070216.bb b/packages/dtc/dtc_20070216.bb new file mode 100644 index 0000000000..476a84eba8 --- /dev/null +++ b/packages/dtc/dtc_20070216.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "dtc tool" +SECTION = "bootloader" +PRIORITY = "optional" +LICENSE = "GPL" + +SRC_URI = "http://www.jdl.com/pub/software/dtc-${PV}.tgz" + +S = "${WORKDIR}/dtc" + +inherit autotools + +do_install() { + install -m 0755 -d ${D}${bindir} + install -m 755 dtc ${D}${bindir}/dtc +} diff --git a/packages/dtc/dtc_git.bb b/packages/dtc/dtc_git.bb new file mode 100644 index 0000000000..e8523173a1 --- /dev/null +++ b/packages/dtc/dtc_git.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "dtc tool" +SECTION = "bootloader" +PRIORITY = "optional" +LICENSE = "GPL" + +SRC_URI = "git://www.jdl.com/software/dtc.git;protocol=git" + +S = "${WORKDIR}/git" + +inherit autotools + +do_install() { + install -m 0755 -d ${D}${bindir} + install -m 755 dtc ${D}${bindir}/dtc +} diff --git a/packages/e17/e-wm_0.16.999.037.bb b/packages/e17/e-wm_0.16.999.037.bb index 3084fd99bc..0ccd0c67f2 100644 --- a/packages/e17/e-wm_0.16.999.037.bb +++ b/packages/e17/e-wm_0.16.999.037.bb @@ -1,7 +1,7 @@ DESCRIPTION = "E17 - the Enlightenment Window Mananger" DEPENDS = "evas-x11 ecore-x11 edje eet embryo" LICENSE = "MIT" -PR = "r4" +PR = "r5" inherit e update-alternatives @@ -23,7 +23,9 @@ EXTRA_OECONF = "--with-profile=${PROFILE} \ --x-includes=${STAGING_INCDIR}/X11 \ --x-libraries=${STAGING_LIBDIR}" -FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir}" +FILES_${PN} = "${bindir}/* ${libdir}/enlightenment/modules/*/*.edj ${libdir}/enlightenment/modules/*/*.desktop ${libdir}/enlightenment/modules/*/*/*.so ${libdir}/enlightenment/preload/*.so ${datadir} ${sysconfdir} ${libdir}/enlightenment/modules/cpufreq/*/freqset" +FILES_${PN}-dev += "${libdir}/enlightenment/modules/*/*/*.a ${libdir}/enlightenment/modules/*/*/*.la ${libdir}/enlightenment/preload/*.a ${libdir}/enlightenment/preload/*.la" +FILES_${PN}-dbg += "${libdir}/enlightenment/modules/*/*/.debug/ ${libdir}/enlightenment/preload/.debug/" do_compile_prepend() { find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:' diff --git a/packages/efl/edje-native_0.5.0.037.bb b/packages/efl/edje-native_0.5.0.037.bb index c66639d25e..1dc5c1de10 100644 --- a/packages/efl/edje-native_0.5.0.037.bb +++ b/packages/efl/edje-native_0.5.0.037.bb @@ -13,7 +13,7 @@ do_configure_prepend() { } do_stage_append() { - edje_data_dir=`${STAGING_BINDIR}/edje-config-native --datadir` + edje_data_dir=`edje-config --datadir` # could also use ${STAGING_DATADIR}/edje/include install -d $edje_data_dir/include install -m 0644 data/include/edje.inc $edje_data_dir/include diff --git a/packages/efl/evas-fb_0.9.9.037.bb b/packages/efl/evas-fb_0.9.9.037.bb index 3e29b80cc0..4acc857982 100644 --- a/packages/efl/evas-fb_0.9.9.037.bb +++ b/packages/efl/evas-fb_0.9.9.037.bb @@ -1,5 +1,5 @@ require evas.inc -PR = "r5" +PR = "r6" EXTRA_OECONF = "--enable-fb \ --disable-directfb \ diff --git a/packages/efl/evas-x11_0.9.9.037.bb b/packages/efl/evas-x11_0.9.9.037.bb index 121922591e..765a8b73d4 100644 --- a/packages/efl/evas-x11_0.9.9.037.bb +++ b/packages/efl/evas-x11_0.9.9.037.bb @@ -1,6 +1,6 @@ require evas.inc DEPENDS += "edb virtual/libx11 libxext freetype" -PR = "r7" +PR = "r8" EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ --x-libraries=${STAGING_LIBDIR} \ diff --git a/packages/efl/evas.inc b/packages/efl/evas.inc index f065d944f8..ceca03c0a8 100644 --- a/packages/efl/evas.inc +++ b/packages/efl/evas.inc @@ -28,6 +28,10 @@ do_configure_prepend() { fi } +#do_install_append() { +# find "${S}" -name .debug -type d | xargs -iBLAH rm -rf "BLAH" +#} + do_stage_append() { cd src modules=`find modules -name ".libs"` @@ -40,4 +44,6 @@ do_stage_append() { headers = "<override me>" libraries = "libevas" -FILES_${PN} += "/usr/lib/evas/" +FILES_${PN} += "/usr/lib/evas/modules/*/*/*/*.so" +FILES_${PN}-dev += "/usr/lib/evas/modules/*/*/*/*.a /usr/lib/evas/modules/*/*/*/*.la" +FILES_${PN}-dbg += "/usr/lib/evas/modules/*/*/*/.debug/"
\ No newline at end of file diff --git a/packages/efl/imlib2-fb_1.2.2.001.bb b/packages/efl/imlib2-fb_1.2.2.001.bb index 776acb43f6..f2ee48f5d9 100644 --- a/packages/efl/imlib2-fb_1.2.2.001.bb +++ b/packages/efl/imlib2-fb_1.2.2.001.bb @@ -1,4 +1,5 @@ require imlib2.inc +PR = "r2" EXTRA_OECONF = "--without-x \ --disable-mmx" diff --git a/packages/efl/imlib2-native_1.2.2.001.bb b/packages/efl/imlib2-native_1.2.2.001.bb index da75e8f439..65c5b672b2 100644 --- a/packages/efl/imlib2-native_1.2.2.001.bb +++ b/packages/efl/imlib2-native_1.2.2.001.bb @@ -2,6 +2,7 @@ require imlib2.inc inherit native PROVIDES = "imlib2-native" DEPENDS = "freetype-native libpng-native jpeg-native" +PR = "r2" EXTRA_OECONF = "--disable-mmx \ --without-x" diff --git a/packages/efl/imlib2-x11_1.2.2.001.bb b/packages/efl/imlib2-x11_1.2.2.001.bb index e7814971c3..67ed947e08 100644 --- a/packages/efl/imlib2-x11_1.2.2.001.bb +++ b/packages/efl/imlib2-x11_1.2.2.001.bb @@ -1,6 +1,6 @@ require imlib2.inc DEPENDS += "virtual/libx11 libxext" -PR = "r1" +PR = "r3" EXTRA_OECONF = "--disable-mmx \ --with-x \ diff --git a/packages/efl/imlib2.inc b/packages/efl/imlib2.inc index 4691bf2ce0..6a040c5386 100644 --- a/packages/efl/imlib2.inc +++ b/packages/efl/imlib2.inc @@ -30,8 +30,9 @@ do_stage_append() { } do_install() { + install -d "${D}${includedir}" oe_libinstall -C src/lib libImlib2 ${D}${libdir}/ - install -m 0644 ${S}/src/lib/Imlib2.h ${D}${incdir}/ + install -m 0644 ${S}/src/lib/Imlib2.h ${D}${includedir}/ install -d ${D}${libdir}/imlib2/loaders for i in src/modules/loaders/.libs/*.so @@ -46,9 +47,12 @@ do_install() { done } -PACKAGES =+ "imlib2-loaders imlib2-filters" -FILES_${PN} = "${libdir}/lib*.so.* ${libdir}/imlib2" -FILES_${PN}-dev += "${bindir}/imlib2-config" +PACKAGES =+ "imlib2-loaders-dbg imlib2-filters-dbg imlib2-loaders imlib2-filters" +FILES_${PN} = "${libdir}/lib*.so.* ${libdir}/imlib2/*/*.so" +FILES_${PN}-dbg = "${libdir}/.debug/" +FILES_${PN}-dev += "${bindir}/imlib2-config ${libdir}/*.so ${includedir}" FILES_imlib2-bin = "${bindir}" FILES_imlib2-loaders = "${libdir}/imlib2/loaders/*.so" FILES_imlib2-filters = "${libdir}/imlib2/filters/*.so" +FILES_imlib2-loaders-dbg += "${libdir}/imlib2/loaders/.debug" +FILES_imlib2-filters-dbg += "${libdir}/imlib2/filters/.debug" diff --git a/packages/gtk+/gtk+-2.10.7/.mtn2git_empty b/packages/freetype/freetype-2.3.1/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/gtk+/gtk+-2.10.7/.mtn2git_empty +++ b/packages/freetype/freetype-2.3.1/.mtn2git_empty diff --git a/packages/freetype/freetype-2.3.1/fix-x86_64-build.patch b/packages/freetype/freetype-2.3.1/fix-x86_64-build.patch new file mode 100644 index 0000000000..ae504dcb0b --- /dev/null +++ b/packages/freetype/freetype-2.3.1/fix-x86_64-build.patch @@ -0,0 +1,26 @@ +Index: freetype-2.3.1/builds/unix/configure.raw +=================================================================== +--- freetype-2.3.1.orig/builds/unix/configure.raw ++++ freetype-2.3.1/builds/unix/configure.raw +@@ -40,7 +40,7 @@ AC_SUBST(EXEEXT) + # checks for native programs to generate building tool + + if test ${cross_compiling} = yes; then +- AC_CHECK_PROG(CC_BUILD, ${build}-gcc, ${build-gcc}) ++ AC_CHECK_PROG(CC_BUILD, ${build}-gcc, ${build}-gcc) + test -z "${CC_BUILD}" && AC_CHECK_PROG(CC_BUILD, gcc, gcc) + test -z "${CC_BUILD}" && AC_CHECK_PROG(CC_BUILD, cc, cc, , , /usr/ucb/cc) + test -z "${CC_BUILD}" && AC_MSG_ERROR([cannot find native C compiler]) +Index: freetype-2.3.1/builds/unix/configure.ac +=================================================================== +--- freetype-2.3.1.orig/builds/unix/configure.ac ++++ freetype-2.3.1/builds/unix/configure.ac +@@ -40,7 +40,7 @@ AC_SUBST(EXEEXT) + # checks for native programs to generate building tool + + if test ${cross_compiling} = yes; then +- AC_CHECK_PROG(CC_BUILD, ${build}-gcc, ${build-gcc}) ++ AC_CHECK_PROG(CC_BUILD, ${build}-gcc, ${build}-gcc) + test -z "${CC_BUILD}" && AC_CHECK_PROG(CC_BUILD, gcc, gcc) + test -z "${CC_BUILD}" && AC_CHECK_PROG(CC_BUILD, cc, cc, , , /usr/ucb/cc) + test -z "${CC_BUILD}" && AC_MSG_ERROR([cannot find native C compiler]) diff --git a/packages/freetype/freetype_2.3.1.bb b/packages/freetype/freetype_2.3.1.bb new file mode 100644 index 0000000000..79633a3d7f --- /dev/null +++ b/packages/freetype/freetype_2.3.1.bb @@ -0,0 +1,40 @@ +DESCRIPTION = "Freetype font rendering library" +SECTION = "libs" +LICENSE = "freetype" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \ + file://fix-x86_64-build.patch;patch=1" +# file://no-hardcode.patch;patch=1" +# file://configure.patch;patch=1 \ +S = "${WORKDIR}/freetype-${PV}" + +inherit autotools pkgconfig binconfig + +DEFAULT_PREFERENCE = "-1" + +LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool" +EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'" +EXTRA_OECONF = "--without-zlib" + +do_configure() { + cd builds/unix + gnu-configize + aclocal -I . + autoconf + cd ${S} + oe_runconf +} + +do_compile_prepend() { + ${BUILD_CC} -o objs/apinames src/tools/apinames.c +} + +do_stage() { + export LIBTOOL='${LIBTOOL}' + autotools_stage_includes + oe_libinstall -so -a -C objs libfreetype ${STAGING_LIBDIR} +} + +FILES_${PN} = "${libdir}/lib*.so.*" +FILES_${PN}-dev += "${bindir}" diff --git a/packages/gcc/gcc-cross_4.1.1.bb b/packages/gcc/gcc-cross_4.1.1.bb index 42e9d151b1..67dbc83940 100644 --- a/packages/gcc/gcc-cross_4.1.1.bb +++ b/packages/gcc/gcc-cross_4.1.1.bb @@ -5,7 +5,7 @@ inherit cross FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" # NOTE: split PR. If the main .oe changes something that affects its *build* # remember to increment this one too. -PR = "r11" +PR = "r12" DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native" PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" diff --git a/packages/gcc/gcc-cross_4.1.2.bb b/packages/gcc/gcc-cross_4.1.2.bb new file mode 100644 index 0000000000..bb1114cf3b --- /dev/null +++ b/packages/gcc/gcc-cross_4.1.2.bb @@ -0,0 +1,18 @@ +require gcc_${PV}.bb +# path mangling, needed by the cross packaging +require gcc-paths-cross.inc +inherit cross +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" +# NOTE: split PR. If the main .oe changes something that affects its *build* +# remember to increment this one too. +PR = "r0" + +DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native" +PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" + +# cross build +require gcc3-build-cross.inc +# cross packaging +require gcc-package-cross.inc + +EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR}/${BUILD_SYS}" diff --git a/packages/gift/gift_0.11.5.bb b/packages/gift/gift_0.11.5.bb index a2a1e45bab..23ba2378ca 100644 --- a/packages/gift/gift_0.11.5.bb +++ b/packages/gift/gift_0.11.5.bb @@ -1,13 +1,10 @@ SECTION = "console/network" LICENSE = "GPL" -DEPENDS = "libvorbis libogg" +DEPENDS = "libvorbis libogg libtool" DESCRIPTION = "giFT is a framework for bridging multiple \ backend peer-to-peer protocols and the user interface \ associated with them." PR="r1" - -DEPENDS=libtool - FILES_gift_append = " ${datadir}/giFT" SRC_URI = "${SOURCEFORGE_MIRROR}/gift/gift-${PV}.tar.bz2" diff --git a/packages/gnome/libgnomeui_2.16.1.bb b/packages/gnome/libgnomeui_2.16.1.bb index 8f3e0a725c..a6700434c3 100644 --- a/packages/gnome/libgnomeui_2.16.1.bb +++ b/packages/gnome/libgnomeui_2.16.1.bb @@ -4,6 +4,8 @@ PR = "r0" DEPENDS = "libgnome libgnomecanvas libbonoboui gnome-keyring" DESCRIPTION = "GNOME User Interface Library" +DEFAULT_PREFERENCE = "-1" + FILES_${PN} += "${libdir}/gtk-2.0/*/filesystems/lib*.so \ ${libdir}/libglade/*/lib*.so" diff --git a/packages/gpe-conf/gpe-conf_0.2.5.bb b/packages/gpe-conf/gpe-conf_0.2.5.bb new file mode 100644 index 0000000000..39f7679cc0 --- /dev/null +++ b/packages/gpe-conf/gpe-conf_0.2.5.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "Configuration applets for GPE" +SECTION = "gpe" +PRIORITY = "optional" +LICENSE = "GPL" + +DEPENDS = "gtk+ esound audiofile libgpewidget libxsettings libxsettings-client libxrandr" +RDEPENDS_${PN} = "xst xset ntpdate gpe-login gpe-icons timezones xrandr" +RDEPENDS_gpe-conf-panel = "gpe-conf" + +RPROVIDES_${PN} += " bl" +RCONFLICTS_${PN} = "bl" + +PR = "r0" + +GPE_TARBALL_SUFFIX = "bz2" + +inherit gpe autotools pkgconfig + +PACKAGES += "gpe-conf-panel" + +FILES_${PN} = "${sysconfdir} ${bindir} ${datadir}/pixmaps \ + ${datadir}/applications/gpe-conf-* ${datadir}/gpe/pixmaps \ + ${datadir}/gpe-conf" +FILES_gpe-conf-panel = "${datadir}/applications/gpe-conf.desktop" diff --git a/packages/gpe-login/files/busybox-bad-perms.patch b/packages/gpe-login/files/busybox-bad-perms.patch deleted file mode 100644 index a422089167..0000000000 --- a/packages/gpe-login/files/busybox-bad-perms.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- gpe-login.pre-session.orig 2005-09-08 00:18:21.000000000 +0200 -+++ gpe-login-0.82/X11/gpe-login.pre-session 2005-09-08 00:18:13.000000000 +0200 -@@ -4,26 +4,28 @@ - - # Sound devices on various devices # - -+if [ -e /dev/dsp ]; then -+chown $USER /dev/dsp -+fi -+ -+if [ -e /dev/mixer ]; then -+chown $USER /dev/mixer -+fi -+ - if [ -e /dev/sound/dsp ]; then - chown $USER /dev/sound/dsp -+chmod u+rw /dev/sound/dsp - fi - - if [ -e /dev/sound/mixer ]; then - chown $USER /dev/sound/mixer -+chmod u+rw /dev/sound/mixer - fi - - if [ -e /dev/misc/buzzer ]; then - chown $USER /dev/misc/buzzer - fi - --if [ -e /dev/dsp ]; then --chown $USER /dev/dsp --fi -- --if [ -e /dev/mixer ]; then --chown $USER /dev/mixer --fi -- - # touchscreen devices # - - if [ -e /dev/touchscreen/0raw ]; then diff --git a/packages/gpe-login/files/highdpifontfix.patch b/packages/gpe-login/files/highdpifontfix.patch deleted file mode 100644 index cc5a42dcfc..0000000000 --- a/packages/gpe-login/files/highdpifontfix.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- /tmp/gpe-login.gtkrc 2005-11-08 17:15:50.363302568 +0100 -+++ gpe-login-0.83/X11/gpe-login.gtkrc 2005-11-08 17:16:22.659392816 +0100 -@@ -1,9 +1,2 @@ --gtk-font-name = "Sans 8" --include "/usr/share/themes/Angelistic/gtk-2.0/gtkrc" -- --style "default" --{ -- bg[NORMAL] = "#90d8ff" --} -- --widget "*" style "default" -+gtk-font-name = "Sans 5" -+include "/usr/share/themes/Industrial/gtk-2.0/gtkrc" diff --git a/packages/gpe-login/files/pre-session.patch b/packages/gpe-login/files/pre-session.patch deleted file mode 100644 index ac1629f08a..0000000000 --- a/packages/gpe-login/files/pre-session.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- /tmp/gpe-login.pre-session 2005-02-17 10:49:01.726436296 +0100 -+++ gpe-login-0.75/X11/gpe-login.pre-session 2005-02-17 10:48:42.297389960 +0100 -@@ -4,10 +4,22 @@ - - if [ -e /dev/sound/dsp ]; then - chown $USER /dev/sound/dsp -+chmod u+rw /dev/sound/dsp -+fi -+ -+if [ -e /dev/dsp ]; then -+chown $USER /dev/dsp -+chmod u+rw /dev/dsp - fi - - if [ -e /dev/sound/mixer ]; then - chown $USER /dev/sound/mixer -+chmod u+rw /dev/sound/mixer -+fi -+ -+if [ -e /dev/mixer ]; then -+chown $USER /dev/mixer -+chmod u+rw /dev/mixer - fi - - if [ -e /dev/touchscreen/0raw ]; then -@@ -18,13 +30,26 @@ - chown $USER /dev/touchscreen/0 - fi - -+if [ -e /dev/collie-fl ]; then -+chown $USER /dev/sharp_fl -+fi -+ - if [ -e /dev/misc/buzzer ]; then - chown $USER /dev/misc/buzzer - fi - --mkdir -p /mnt/ramfs/home/$USER --chown $USER /mnt/ramfs/home/$USER -+# check for ramdisk location -+if [ -d /mnt/ramfs ]; then -+# old location as used in familiar <= 0.7.2 -+RAMDISK="/mnt/ramfs" -+else -+# default to new style location -+RAMDISK="/mnt/ram" -+fi -+ -+mkdir -p $RAMDISK/home/$USER -+chown $USER $RAMDISK/home/$USER - - # this location MUST be consistent with HOME_VOLATILE in /etc/X11/Xsession --ln -s /mnt/ramfs/home/$USER /home/$USER/ramdisk --ln -s /home/$USER/ramdisk/.xsession-errors /home/$USER/.xsession-errors -+ln -sf $RAMDISK/home/$USER /home/$USER/ramdisk -+ln -sf /home/$USER/ramdisk/.xsession-errors /home/$USER/.xsession-errors diff --git a/packages/gpe-login/files/user-own-collie-devs.patch b/packages/gpe-login/files/user-own-collie-devs.patch deleted file mode 100644 index 3a0ce9b7b8..0000000000 --- a/packages/gpe-login/files/user-own-collie-devs.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -urNd ../gpe-login-0.76-r0/gpe-login-0.76/X11/gpe-login.pre-session gpe-login-0.76/X11/gpe-login.pre-session ---- ../gpe-login-0.76-r0/gpe-login-0.76/X11/gpe-login.pre-session 2005-04-01 21:58:46 +01:00 -+++ gpe-login-0.76/X11/gpe-login.pre-session 2005-04-01 22:04:04 +01:00 -@@ -30,13 +30,23 @@ - chown $USER /dev/touchscreen/0 - fi - --if [ -e /dev/collie-fl ]; then -+if [ -e /dev/misc/buzzer ]; then -+chown $USER /dev/misc/buzzer -+fi -+ -+# The following added for collie -+if [ -e /dev/sharp_fl ]; then - chown $USER /dev/sharp_fl - fi - --if [ -e /dev/misc/buzzer ]; then --chown $USER /dev/misc/buzzer -+if [ -e /dev/fb0 ]; then -+chown $USER /dev/fb0 -+fi -+ -+if [ -e /dev/tty ]; then -+chown $USER /dev/tty* - fi -+# collie bits finished - - # check for ramdisk location - if [ -d /mnt/ramfs ]; then diff --git a/packages/gpe-login/gpe-login-0.88/.mtn2git_empty b/packages/gpe-login/gpe-login-0.88/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gpe-login/gpe-login-0.88/.mtn2git_empty diff --git a/packages/gpe-login/gpe-login-0.88/chvt-keylaunch.patch b/packages/gpe-login/gpe-login-0.88/chvt-keylaunch.patch new file mode 100644 index 0000000000..798c059ccc --- /dev/null +++ b/packages/gpe-login/gpe-login-0.88/chvt-keylaunch.patch @@ -0,0 +1,12 @@ +--- /tmp/gpe-login.keylaunchrc 2006-05-29 23:46:42.806081576 +0200 ++++ gpe-login-0.87/gpe-login.keylaunchrc 2006-05-29 23:48:18.476537456 +0200 +@@ -1,3 +1,9 @@ + key=????XF86AudioRecord:xcalibrate:/usr/bin/gpe-xcalibrate.sh + key=????XF86PowerDown:-:/usr/bin/apm --suspend + key=????Held XF86PowerDown:-:bl toggle ++ ++# VT changing ++key=...*Left:-:~chvt 1 ++key=...*Right:-:~chvt 3 ++key=...*Escape:-:~/etc/init.d/gpe-dm stop ++ diff --git a/packages/gpe-login/gpe-login_0.88.bb b/packages/gpe-login/gpe-login_0.88.bb new file mode 100644 index 0000000000..ea1723d52d --- /dev/null +++ b/packages/gpe-login/gpe-login_0.88.bb @@ -0,0 +1,13 @@ +LICENSE = "GPL" +inherit gpe + +DESCRIPTION = "GPE user login screen" +SECTION = "gpe" +PRIORITY = "optional" +DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd" +RDEPENDS = "xkbd" +RPROVIDES = "gpe-session-starter" +PR = "r0" + +SRC_URI += "file://removeblue-fontsize8.patch;patch=1" +SRC_URI += " file://chvt-keylaunch.patch;patch=1 " diff --git a/packages/gpephone/libabenabler_0.1.bb b/packages/gpephone/libabenabler_0.1.bb index 7a8efb8382..c76d8f469b 100644 --- a/packages/gpephone/libabenabler_0.1.bb +++ b/packages/gpephone/libabenabler_0.1.bb @@ -1,5 +1,5 @@ LICENSE = "LGPL" -DESCRIPTION = "LiPS event model library." +DESCRIPTION = "LiPS address book library." SECTION = "gpe/libs" PRIORITY = "optional" DEPENDS = "glib-2.0 librecord liblipsevent libim sqlite3" diff --git a/packages/gpephone/libcalenabler_1.0.bb b/packages/gpephone/libcalenabler_1.0.bb index f4be78092e..c23e1b42a5 100644 --- a/packages/gpephone/libcalenabler_1.0.bb +++ b/packages/gpephone/libcalenabler_1.0.bb @@ -1,5 +1,5 @@ LICENSE = "LiPS" -DESCRIPTION = "LiPS event model library." +DESCRIPTION = "LiPS calendar database backend library." SECTION = "gpe/libs" PRIORITY = "optional" DEPENDS = "glib-2.0 e2fsprogs-libs sqlite3" diff --git a/packages/gpephone/libim_0.2.bb b/packages/gpephone/libim_0.2.bb index 4d59957d79..a802aface5 100644 --- a/packages/gpephone/libim_0.2.bb +++ b/packages/gpephone/libim_0.2.bb @@ -1,5 +1,5 @@ LICENSE = "LGPL" -DESCRIPTION = "LiPS event model library." +DESCRIPTION = "LiPS instant messenger library." SECTION = "gpe/libs" PRIORITY = "optional" DEPENDS = "glib-2.0 libgpg-error libgcrypt gnutls libidn iksemel gloox dbus-glib liblipsevent" diff --git a/packages/gpephone/libmsgenabler_1.0.bb b/packages/gpephone/libmsgenabler_1.0.bb index 385501c959..0522507db0 100644 --- a/packages/gpephone/libmsgenabler_1.0.bb +++ b/packages/gpephone/libmsgenabler_1.0.bb @@ -1,5 +1,5 @@ LICENSE = "LiPS" -DESCRIPTION = "LiPS event model library." +DESCRIPTION = "LiPS message backend library." SECTION = "gpe/libs" PRIORITY = "optional" DEPENDS = "glib-2.0 dbus-glib librecord sqlite3" diff --git a/packages/gsm/files/.mtn2git_empty b/packages/gsm/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gsm/files/.mtn2git_empty diff --git a/packages/gsm/files/fic-gta01/.mtn2git_empty b/packages/gsm/files/fic-gta01/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gsm/files/fic-gta01/.mtn2git_empty diff --git a/packages/gsm/files/fic-gta01/default b/packages/gsm/files/fic-gta01/default new file mode 100644 index 0000000000..1511376a6c --- /dev/null +++ b/packages/gsm/files/fic-gta01/default @@ -0,0 +1,9 @@ +# gsmd This shell script configures for the gsmd init script. + +# If you must specify special options, uncomment and modify the next line +GSMD_OPTS="-s 115200 -F" + +# If your GSM device needs to be powered up, uncomment and modify the next line +GSM_POW="/sys/bus/platform/devices/gta01-pm-gsm.0/power_on" + +GSM_DEV="/dev/ttySAC0" diff --git a/packages/gsm/files/gsmd b/packages/gsm/files/gsmd new file mode 100644 index 0000000000..254fe0a451 --- /dev/null +++ b/packages/gsm/files/gsmd @@ -0,0 +1,107 @@ +#!/bin/sh +# +# gsmd This shell script starts and stops gsmd. +# +# chkconfig: 345 90 40 +# description: Gsmd manages access to a serial- or USB-connected GSM +# processname: gsmd + +# Source configuration +. /etc/default/gsmd + +# Source function library. +#. /etc/rc.d/init.d/functions + +RETVAL=0 +prog="gsmd" + +start() { + # FIXME add check whether GSM_POW is set at all, otherwise don't try to power on + # Power on GSM device + + # Hack for broken uboot and/or kernel on the neo1973 + dmesg -n1 + + if [ -e "${GSM_POW}" ] + then + echo -n "Powering up GSM device..." + echo "1" > ${GSM_POW} + sleep 1 + echo "done" + else + echo "GSM device not found. Aborting startup" + return false + fi + # Start daemons. + echo -n "Starting $prog: " + # We don't use the daemon function here because of a known bug + # in initlog -- it spuriously returns a nonzero status when + # starting daemons that fork themselves. See + # http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=130629 + # for discussion. Fortunately: + # + # 1. gsmd startup can't fail, or at least not in the absence of + # much larger resource-exhaustion problems that would be very obvious. + # + # 2. We don't need all the logging crud that daemon/initlog sets + # up -- gsmd does its own syslog calls. + # + if [ -e "${GSM_DEV}" ] + then + stty -F ${GSM_DEV} crtscts + gsmd -p ${GSM_DEV} ${GSMD_OPTS} >/tmp/gsm.log 2>&1 & + echo "success" + else + # User needs to symlink ${GPS_DEV} to the right thing + echo "No ${GSM_DEV} device, aborting gsmd startup." + fi + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/gsmd + return $RETVAL +} + +stop() { + # Stop daemons. + echo -n "Shutting down $prog: " + killall gsmd +# killproc gsmd + RETVAL=$? + echo + if [ $RETVAL -eq 0 ] + then + rm -f /var/lock/subsys/gsmd; + fi + return $RETVAL +} + +# See how we were called. +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart|reload) + stop + start + RETVAL=$? + ;; + condrestart) + if [ -f /var/lock/subsys/gsmd ]; then + stop + start + RETVAL=$? + fi + ;; + status) +# status gsmd +# RETVAL=$? + ;; + *) + echo "Usage: $0 {start|stop|restart|condrestart|status}" + exit 1 +esac + +exit $RETVAL diff --git a/packages/gsm/files/magician/.mtn2git_empty b/packages/gsm/files/magician/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gsm/files/magician/.mtn2git_empty diff --git a/packages/gsm/files/magician/default b/packages/gsm/files/magician/default new file mode 100644 index 0000000000..fb19d46fd5 --- /dev/null +++ b/packages/gsm/files/magician/default @@ -0,0 +1,9 @@ +# gsmd This shell script configures for the gsmd init script. + +# If you must specify special options, uncomment and modify the next line +GSMD_OPTS="-s 115200 -F" + +# If your GSM device needs to be powered up, uncomment and modify the next line +#GSM_POW="/sys/bus/platform/devices/gta01-pm-gsm.0/power_on" + +GSM_DEV="/dev/ttyS1" diff --git a/packages/gsm/libgsmd_svn.bb b/packages/gsm/libgsmd_svn.bb index 860adf3b0a..734624b3ff 100644 --- a/packages/gsm/libgsmd_svn.bb +++ b/packages/gsm/libgsmd_svn.bb @@ -4,21 +4,33 @@ LICENSE = "GPL" SECTION = "libs/gsm" PROVIDES += "gsmd" PV = "0.0+svn${SRCDATE}" -PR = "r2" +PR = "r7" -SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http" +SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \ + file://gsmd \ + file://default" S = "${WORKDIR}/gsm" -inherit autotools pkgconfig +inherit autotools pkgconfig update-rc.d + +INITSCRIPT_NAME = "gsmd" +INITSCRIPT_PARAMS = "defaults 35" do_stage() { autotools_stage_all } +do_install_append() { + install -d ${D}/${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/gsmd ${D}/${sysconfdir}/init.d/ + install -d ${D}/${sysconfdir}/default + install ${WORKDIR}/default ${D}/${sysconfdir}/default/gsmd +} + PACKAGES =+ "${PN}-tools gsmd" RDEPENDS_${PN} = "gsmd" FILES_${PN}-tools = "${bindir}/*" -FILES_gsmd = "${sbindir}/gsmd" +FILES_gsmd = "${sbindir}/gsmd ${sysconfdir}" PACKAGES_DYNAMIC = "libgsmd* gsmd" diff --git a/packages/gtk+/gtk+-2.10.3/automake-lossage.patch b/packages/gtk+/gtk+-2.10.3/automake-lossage.patch deleted file mode 100644 index 0d423ddbb9..0000000000 --- a/packages/gtk+/gtk+-2.10.3/automake-lossage.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- 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 deleted file mode 100644 index 1067773f12..0000000000 --- a/packages/gtk+/gtk+-2.10.3/disable-print.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- 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 deleted file mode 100644 index d71d839c3c..0000000000 --- a/packages/gtk+/gtk+-2.10.3/disable-tooltips.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 20481f059b..0000000000 --- a/packages/gtk+/gtk+-2.10.3/gtk+-handhelds.patch +++ /dev/null @@ -1,236 +0,0 @@ ---- 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 deleted file mode 100644 index df29656343..0000000000 --- a/packages/gtk+/gtk+-2.10.3/gtklabel-resize-patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 deleted file mode 100644 index bdbdb32f97..0000000000 --- a/packages/gtk+/gtk+-2.10.3/hardcoded_libtool.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- 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 deleted file mode 100644 index cfb8849e9f..0000000000 --- a/packages/gtk+/gtk+-2.10.3/menu-deactivate.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- 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 deleted file mode 100644 index 4850f85e4f..0000000000 --- a/packages/gtk+/gtk+-2.10.3/migration.patch +++ /dev/null @@ -1,615 +0,0 @@ -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 <philb@gnu.org> -+ * -+ * 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 <stdlib.h> -+#include <ctype.h> -+#include <libintl.h> -+#include <string.h> -+#include <assert.h> -+ -+#include <X11/X.h> -+#include <X11/Xlib.h> -+#include <X11/Xatom.h> -+ -+#include <gcrypt.h> -+ -+#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 deleted file mode 100644 index 0fc4c48d1a..0000000000 --- a/packages/gtk+/gtk+-2.10.3/no-demos.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 deleted file mode 100644 index affb4a303e..0000000000 --- a/packages/gtk+/gtk+-2.10.3/no-xwc.patch +++ /dev/null @@ -1,151 +0,0 @@ -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 deleted file mode 100644 index f0bb6ba842..0000000000 --- a/packages/gtk+/gtk+-2.10.3/run-iconcache.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- 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 deleted file mode 100644 index 3f823a7880..0000000000 --- a/packages/gtk+/gtk+-2.10.3/scroll-timings.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 3bb208d4d6..0000000000 --- a/packages/gtk+/gtk+-2.10.3/single-click.patch +++ /dev/null @@ -1,54 +0,0 @@ -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 deleted file mode 100644 index 20bf4cf366..0000000000 --- a/packages/gtk+/gtk+-2.10.3/small-gtkfilesel.patch +++ /dev/null @@ -1,267 +0,0 @@ -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 deleted file mode 100644 index 8ad7507af0..0000000000 --- a/packages/gtk+/gtk+-2.10.3/spinbutton.patch +++ /dev/null @@ -1,128 +0,0 @@ ---- 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 deleted file mode 100644 index b63e262d34..0000000000 --- a/packages/gtk+/gtk+-2.10.3/xsettings.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- 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.6/automake-lossage.patch b/packages/gtk+/gtk+-2.10.6/automake-lossage.patch deleted file mode 100644 index 0d423ddbb9..0000000000 --- a/packages/gtk+/gtk+-2.10.6/automake-lossage.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- 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.6/disable-print.patch b/packages/gtk+/gtk+-2.10.6/disable-print.patch deleted file mode 100644 index 1067773f12..0000000000 --- a/packages/gtk+/gtk+-2.10.6/disable-print.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- 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.6/disable-tooltips.patch b/packages/gtk+/gtk+-2.10.6/disable-tooltips.patch deleted file mode 100644 index d71d839c3c..0000000000 --- a/packages/gtk+/gtk+-2.10.6/disable-tooltips.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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.6/gtk+-handhelds.patch b/packages/gtk+/gtk+-2.10.6/gtk+-handhelds.patch deleted file mode 100644 index 1ea86ce6b2..0000000000 --- a/packages/gtk+/gtk+-2.10.6/gtk+-handhelds.patch +++ /dev/null @@ -1,149 +0,0 @@ -Index: gtk+-2.10.6/gtk/gtkarrow.c -=================================================================== ---- gtk+-2.10.6.orig/gtk/gtkarrow.c 2006-05-14 05:25:28.000000000 +0100 -+++ gtk+-2.10.6/gtk/gtkarrow.c 2006-11-14 12:03:45.000000000 +0000 -@@ -31,7 +31,7 @@ - #include "gtkintl.h" - #include "gtkalias.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); - - - G_DEFINE_TYPE (GtkArrow, gtk_arrow, GTK_TYPE_MISC) -@@ -88,6 +90,7 @@ - GTK_PARAM_READWRITE)); - - widget_class->expose_event = gtk_arrow_expose; -+ widget_class->size_request = gtk_arrow_size_request; - } - - static void -@@ -143,13 +146,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; - } -Index: gtk+-2.10.6/gtk/gtkentry.c -=================================================================== ---- gtk+-2.10.6.orig/gtk/gtkentry.c 2006-11-14 12:03:45.000000000 +0000 -+++ gtk+-2.10.6/gtk/gtkentry.c 2006-11-14 12:07:02.000000000 +0000 -@@ -577,6 +577,18 @@ - 0.0, - GTK_PARAM_READWRITE)); - -+ // Added by gtk+-handhelds.patch -+ gtk_widget_class_install_style_property (widget_class, -+ g_param_spec_int ("min_width", -+ P_("Minimum width"), -+ P_("Minimum width of the entry field"), -+ 0, -+ G_MAXINT, -+ MIN_ENTRY_WIDTH, -+ G_PARAM_READABLE)); -+ -+ -+ - /** - * GtkEntry:truncate-multiline: - * -@@ -1286,7 +1298,7 @@ - { - GtkEntry *entry = GTK_ENTRY (widget); - PangoFontMetrics *metrics; -- gint xborder, yborder; -+ gint xborder, yborder, min_width; - GtkBorder inner_border; - PangoContext *context; - -@@ -1302,8 +1314,10 @@ - _gtk_entry_get_borders (entry, &xborder, &yborder); - _gtk_entry_effective_inner_border (entry, &inner_border); - -+ gtk_widget_style_get (widget, "min_width", &min_width, NULL); -+ - if (entry->width_chars < 0) -- requisition->width = MIN_ENTRY_WIDTH + xborder * 2 + inner_border.left + inner_border.right; -+ requisition->width = min_width + xborder * 2 + inner_border.left + inner_border.right; - else - { - gint char_width = pango_font_metrics_get_approximate_char_width (metrics); -Index: gtk+-2.10.6/gtk/gtkrange.c -=================================================================== ---- gtk+-2.10.6.orig/gtk/gtkrange.c 2006-11-14 12:03:44.000000000 +0000 -+++ gtk+-2.10.6/gtk/gtkrange.c 2006-11-14 12:07:40.000000000 +0000 -@@ -197,6 +197,7 @@ - static gboolean gtk_range_key_press (GtkWidget *range, - GdkEventKey *event); - -+static GdkAtom recognize_protocols_atom, atom_atom; - - static guint signals[LAST_SIGNAL]; - -@@ -213,6 +214,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); -+ - gobject_class->set_property = gtk_range_set_property; - gobject_class->get_property = gtk_range_get_property; - gobject_class->finalize = gtk_range_finalize; -@@ -1020,6 +1024,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); - } - -@@ -1569,7 +1579,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; -@@ -1778,7 +1788,7 @@ - return TRUE; - } - -- return FALSE; -+ return TRUE; - } - - /** diff --git a/packages/gtk+/gtk+-2.10.6/gtklabel-resize-patch b/packages/gtk+/gtk+-2.10.6/gtklabel-resize-patch deleted file mode 100644 index df29656343..0000000000 --- a/packages/gtk+/gtk+-2.10.6/gtklabel-resize-patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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.6/hardcoded_libtool.patch b/packages/gtk+/gtk+-2.10.6/hardcoded_libtool.patch deleted file mode 100644 index bdbdb32f97..0000000000 --- a/packages/gtk+/gtk+-2.10.6/hardcoded_libtool.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- 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.6/menu-deactivate.patch b/packages/gtk+/gtk+-2.10.6/menu-deactivate.patch deleted file mode 100644 index cfb8849e9f..0000000000 --- a/packages/gtk+/gtk+-2.10.6/menu-deactivate.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- 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.6/migration.patch b/packages/gtk+/gtk+-2.10.6/migration.patch deleted file mode 100644 index 4ee786e688..0000000000 --- a/packages/gtk+/gtk+-2.10.6/migration.patch +++ /dev/null @@ -1,611 +0,0 @@ -Index: configure.in -=================================================================== ---- configure.in.orig 2006-10-03 17:54:09.000000000 +0100 -+++ configure.in 2006-10-30 12:58:33.000000000 +0000 -@@ -1529,6 +1529,16 @@ - GTK_EXTRA_CFLAGS="$msnative_struct" - fi - -+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 -=================================================================== ---- gtk/Makefile.am.orig 2006-10-02 18:27:53.000000000 +0100 -+++ gtk/Makefile.am 2006-10-30 12:59:14.000000000 +0000 -@@ -589,6 +589,11 @@ - gtkwindow-decorate.c \ - gtkwindow.c \ - $(gtk_clipboard_dnd_c_sources) -+ -+if ENABLE_MIGRATION -+gtk_base_c_sources += gtkmigration.c -+endif -+ - gtk_c_sources = $(gtk_base_c_sources) - gtk_all_c_sources = $(gtk_base_c_sources) - -Index: gtk/gtkmain.c -=================================================================== ---- gtk/gtkmain.c.orig 2006-09-03 06:31:21.000000000 +0100 -+++ gtk/gtkmain.c 2006-10-30 12:56:34.000000000 +0000 -@@ -507,6 +507,10 @@ - _gtk_accel_map_init (); - _gtk_rc_init (); - -+#ifdef ENABLE_MIGRATION -+ gtk_migration_init (); -+#endif -+ - /* Set the 'initialized' flag. - */ - gtk_initialized = TRUE; -Index: gtk/gtkmigration.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gtk/gtkmigration.c 2006-10-30 12:56:34.000000000 +0000 -@@ -0,0 +1,529 @@ -+/* -+ * Copyright (C) 2003, 2005 Philip Blundell <philb@gnu.org> -+ * -+ * 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 <stdlib.h> -+#include <ctype.h> -+#include <libintl.h> -+#include <string.h> -+#include <assert.h> -+ -+#include <X11/X.h> -+#include <X11/Xlib.h> -+#include <X11/Xatom.h> -+ -+#include <gcrypt.h> -+ -+#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; -+} -Index: gtk/gtkwindow.c -=================================================================== ---- gtk/gtkwindow.c.orig 2006-10-03 16:51:46.000000000 +0100 -+++ gtk/gtkwindow.c 2006-10-30 12:56:34.000000000 +0000 -@@ -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.6/no-demos.patch b/packages/gtk+/gtk+-2.10.6/no-demos.patch deleted file mode 100644 index 0fc4c48d1a..0000000000 --- a/packages/gtk+/gtk+-2.10.6/no-demos.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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.6/no-xwc.patch b/packages/gtk+/gtk+-2.10.6/no-xwc.patch deleted file mode 100644 index affb4a303e..0000000000 --- a/packages/gtk+/gtk+-2.10.6/no-xwc.patch +++ /dev/null @@ -1,151 +0,0 @@ -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.6/pangoxft2.10.6.diff b/packages/gtk+/gtk+-2.10.6/pangoxft2.10.6.diff deleted file mode 100644 index 63828cec63..0000000000 --- a/packages/gtk+/gtk+-2.10.6/pangoxft2.10.6.diff +++ /dev/null @@ -1,2456 +0,0 @@ -http://mail.gnome.org/archives/performance-list/2006-October/msg00063.html - -From: Xan Lópe -To: ext Matt Hoosier -Cc: performance-list gnome org -Subject: Re: [patch] Remove pangocairo from Gtk+ 2.8.20 -Date: Mon, 30 Oct 2006 14:31:56 +0200 -Hi, - -I've upgraded your patch against GTK+ 2.10.6, and we are getting great -performance figures compared to GTK+ 2.10.6 with pangocairo too -(basically at the level of GTK+ 2.6.10 again). Right now I'm working on -a python/cairo script to get some nice graphics from a torture test -session with several GTK+s, hope to get it ready soon. - -Index: gtk+-2.10.6/configure.in -=================================================================== ---- gtk+-2.10.6.orig/configure.in 2006-10-30 12:59:28.000000000 +0000 -+++ gtk+-2.10.6/configure.in 2006-10-30 12:59:30.000000000 +0000 -@@ -1435,7 +1435,7 @@ - if test "x$gdktarget" = "xwin32"; then - PANGO_PACKAGES="pangowin32 pangocairo" - else -- PANGO_PACKAGES="pango pangocairo" -+ PANGO_PACKAGES="pango pangocairo pangoxft" - fi - - AC_MSG_CHECKING(Pango flags) -Index: gtk+-2.10.6/gdk/gdkaliasdef.c -=================================================================== ---- gtk+-2.10.6.orig/gdk/gdkaliasdef.c 2006-10-30 12:58:29.000000000 +0000 -+++ gtk+-2.10.6/gdk/gdkaliasdef.c 2006-10-30 12:59:30.000000000 +0000 -@@ -1799,9 +1799,6 @@ - #undef gdk_pango_context_get - extern __typeof (gdk_pango_context_get) gdk_pango_context_get __attribute((alias("IA__gdk_pango_context_get"), visibility("default"))); - --#undef gdk_pango_context_get_for_screen --extern __typeof (gdk_pango_context_get_for_screen) gdk_pango_context_get_for_screen __attribute((alias("IA__gdk_pango_context_get_for_screen"), visibility("default"))); -- - #ifndef GDK_DISABLE_DEPRECATED - #undef gdk_pango_context_set_colormap - extern __typeof (gdk_pango_context_set_colormap) gdk_pango_context_set_colormap __attribute((alias("IA__gdk_pango_context_set_colormap"), visibility("default"))); -@@ -1836,6 +1833,13 @@ - - #endif - #endif -+#if IN_HEADER(__GDK_PANGO_H__) -+#if IN_FILE(__GDK_PANGO_X11_C__) -+#undef gdk_pango_context_get_for_screen -+extern __typeof (gdk_pango_context_get_for_screen) gdk_pango_context_get_for_screen __attribute((alias("IA__gdk_pango_context_get_for_screen"), visibility("default"))); -+ -+#endif -+#endif - #if IN_HEADER(__GDK_PIXBUF_H__) - #if IN_FILE(__GDK_PIXBUF_DRAWABLE_C__) - #undef gdk_pixbuf_get_from_drawable -Index: gtk+-2.10.6/gdk/gdkalias.h -=================================================================== ---- gtk+-2.10.6.orig/gdk/gdkalias.h 2006-10-30 12:58:29.000000000 +0000 -+++ gtk+-2.10.6/gdk/gdkalias.h 2006-10-30 12:59:30.000000000 +0000 -@@ -1796,9 +1796,6 @@ - extern __typeof (gdk_pango_context_get) IA__gdk_pango_context_get __attribute((visibility("hidden"))); - #define gdk_pango_context_get IA__gdk_pango_context_get - --extern __typeof (gdk_pango_context_get_for_screen) IA__gdk_pango_context_get_for_screen __attribute((visibility("hidden"))); --#define gdk_pango_context_get_for_screen IA__gdk_pango_context_get_for_screen -- - #ifndef GDK_DISABLE_DEPRECATED - extern __typeof (gdk_pango_context_set_colormap) IA__gdk_pango_context_set_colormap __attribute((visibility("hidden"))); - #define gdk_pango_context_set_colormap IA__gdk_pango_context_set_colormap -@@ -1833,6 +1830,13 @@ - - #endif - #endif -+#if IN_HEADER(__GDK_PANGO_H__) -+#if IN_FILE(__GDK_PANGO_X11_C__) -+extern __typeof (gdk_pango_context_get_for_screen) IA__gdk_pango_context_get_for_screen __attribute((visibility("hidden"))); -+#define gdk_pango_context_get_for_screen IA__gdk_pango_context_get_for_screen -+ -+#endif -+#endif - #if IN_HEADER(__GDK_PIXBUF_H__) - #if IN_FILE(__GDK_PIXBUF_DRAWABLE_C__) - extern __typeof (gdk_pixbuf_get_from_drawable) IA__gdk_pixbuf_get_from_drawable __attribute((visibility("hidden"))); -Index: gtk+-2.10.6/gdk/gdkdraw.c -=================================================================== ---- gtk+-2.10.6.orig/gdk/gdkdraw.c 2006-10-30 12:58:29.000000000 +0000 -+++ gtk+-2.10.6/gdk/gdkdraw.c 2006-10-30 12:59:30.000000000 +0000 -@@ -909,9 +909,9 @@ - { - g_return_if_fail (GDK_IS_DRAWABLE (drawable)); - g_return_if_fail (GDK_IS_GC (gc)); -- -- real_draw_glyphs (drawable, gc, NULL, font, -- x, y, glyphs); -+ -+ -+ GDK_DRAWABLE_GET_CLASS (drawable)->draw_glyphs (drawable, gc, font, x, y, glyphs); - } - - /** -@@ -949,8 +949,9 @@ - g_return_if_fail (GDK_IS_DRAWABLE (drawable)); - g_return_if_fail (GDK_IS_GC (gc)); - -- real_draw_glyphs (drawable, gc, matrix, font, -- x / PANGO_SCALE, y / PANGO_SCALE, glyphs); -+ if (GDK_DRAWABLE_GET_CLASS (drawable)->draw_glyphs_transformed) -+ GDK_DRAWABLE_GET_CLASS (drawable)->draw_glyphs_transformed (drawable, gc, matrix, -+ font, x, y, glyphs); - } - - /** -@@ -974,28 +975,12 @@ - GdkTrapezoid *trapezoids, - gint n_trapezoids) - { -- cairo_t *cr; -- int i; -- - g_return_if_fail (GDK_IS_DRAWABLE (drawable)); - g_return_if_fail (GDK_IS_GC (gc)); - g_return_if_fail (n_trapezoids == 0 || trapezoids != NULL); - -- cr = gdk_cairo_create (drawable); -- _gdk_gc_update_context (gc, cr, NULL, NULL, TRUE); -- -- for (i = 0; i < n_trapezoids; i++) -- { -- cairo_move_to (cr, trapezoids[i].x11, trapezoids[i].y1); -- cairo_line_to (cr, trapezoids[i].x21, trapezoids[i].y1); -- cairo_line_to (cr, trapezoids[i].x22, trapezoids[i].y2); -- cairo_line_to (cr, trapezoids[i].x21, trapezoids[i].y2); -- cairo_close_path (cr); -- } -- -- cairo_fill (cr); -- -- cairo_destroy (cr); -+ GDK_DRAWABLE_GET_CLASS (drawable)->draw_trapezoids (drawable, gc, -+ trapezoids, n_trapezoids); - } - - /** -Index: gtk+-2.10.6/gdk/gdkpango.c -=================================================================== ---- gtk+-2.10.6.orig/gdk/gdkpango.c 2006-10-30 12:58:29.000000000 +0000 -+++ gtk+-2.10.6/gdk/gdkpango.c 2006-10-30 12:59:30.000000000 +0000 -@@ -50,19 +50,34 @@ - GdkBitmap *stipple[MAX_RENDER_PART + 1]; - gboolean embossed; - -- cairo_t *cr; -- PangoRenderPart last_part; -+ /* When switching between the normal and shadow copies when -+ * drawing shadows we can get unexpected recursion into the -+ * drawing functions; the 'in_emboss' flag guards against that. -+ */ -+ gboolean in_emboss; - - /* Current target */ - GdkDrawable *drawable; - GdkGC *base_gc; - - gboolean gc_changed; -+ -+ /* Cached GC, derived from base_gc */ -+ GdkGC *gc; -+ PangoColor gc_color; -+ gboolean gc_color_set; -+ GdkBitmap *gc_stipple; -+ -+ /* we accumulate trapezoids for the same PangoRenderPart */ -+ GArray *trapezoids; -+ PangoRenderPart trapezoid_part; - }; - - static PangoAttrType gdk_pango_attr_stipple_type; - static PangoAttrType gdk_pango_attr_embossed_type; - -+static void flush_trapezoids (GdkPangoRenderer *gdk_renderer); -+ - enum { - PROP_0, - PROP_SCREEN -@@ -77,6 +92,10 @@ - GdkPangoRendererPrivate *priv = gdk_renderer->priv; - int i; - -+ if (priv->gc) -+ g_object_unref (priv->gc); -+ if (priv->gc_stipple) -+ g_object_unref (priv->gc_stipple); - if (priv->base_gc) - g_object_unref (priv->base_gc); - if (priv->drawable) -@@ -86,6 +105,8 @@ - if (priv->stipple[i]) - g_object_unref (priv->stipple[i]); - -+ g_array_free (priv->trapezoids, TRUE); -+ - G_OBJECT_CLASS (gdk_pango_renderer_parent_class)->finalize (object); - } - -@@ -112,25 +133,6 @@ - return object; - } - --/* Adjusts matrix and color for the renderer to draw the secondary -- * "shadow" copy for embossed text */ --static void --emboss_context (cairo_t *cr) --{ -- cairo_matrix_t tmp_matrix; -- -- /* The gymnastics here to adjust the matrix are because we want -- * to offset by +1,+1 in device-space, not in user-space, -- * so we can't just draw the layout at x + 1, y + 1 -- */ -- cairo_get_matrix (cr, &tmp_matrix); -- tmp_matrix.x0 += 1.0; -- tmp_matrix.y0 += 1.0; -- cairo_set_matrix (cr, &tmp_matrix); -- -- cairo_set_source_rgb (cr, 1.0, 1.0, 1.0); --} -- - static inline gboolean - color_equal (PangoColor *c1, PangoColor *c2) - { -@@ -146,74 +148,154 @@ - return FALSE; - } - --static cairo_t * --get_cairo_context (GdkPangoRenderer *gdk_renderer, -- PangoRenderPart part) -+/* Adjusts matrix and color for the renderer to draw the secondar -+ * "shadow" copy for embossed text */ -+static void -+emboss_renderer (PangoRenderer *renderer, -+ PangoRenderPart part, -+ PangoMatrix **save_matrix, -+ PangoColor **save_color) -+{ -+ GdkPangoRendererPrivate *priv = GDK_PANGO_RENDERER(renderer)->priv; -+ static const PangoColor white = { 0xffff, 0xffff, 0xffff }; -+ PangoMatrix tmp_matrix = PANGO_MATRIX_INIT; -+ -+ priv->in_emboss = TRUE; -+ -+ *save_color = pango_renderer_get_color (renderer, part); -+ if (*save_color) -+ *save_color = pango_color_copy (*save_color); -+ -+ *save_matrix = renderer->matrix; -+ if (*save_matrix) -+ { -+ *save_matrix = pango_matrix_copy (*save_matrix); -+ tmp_matrix = **save_matrix; -+ } -+ -+ /* The gymnastics here to adjust the matrix are because we want -+ * to offset by +1,+1 in device-space, not in user-space, -+ * so we can't just draw the layout at x + 1, y + 1 -+ */ -+ tmp_matrix.x0 += 1; -+ tmp_matrix.y0 += 1; -+ -+ pango_renderer_set_matrix (renderer, &tmp_matrix); -+ pango_renderer_set_color (renderer, part, &white); -+} -+ -+/* Restores from emboss_renderer() */ -+static void -+unemboss_renderer (PangoRenderer *renderer, -+ PangoRenderPart part, -+ PangoMatrix **save_matrix, -+ PangoColor **save_color) -+{ -+ GdkPangoRendererPrivate *priv = GDK_PANGO_RENDERER(renderer)->priv; -+ pango_renderer_set_matrix (renderer, *save_matrix); -+ pango_renderer_set_color (renderer, part, *save_color); -+ -+ if (*save_matrix) -+ pango_matrix_free (*save_matrix); -+ if (*save_color) -+ pango_color_free (*save_color); -+ -+ priv->in_emboss = FALSE; -+} -+ -+/* Gets the GC for drawing @part. This make involve copying the base GC -+ * for the renderer, in which case we keep a one-GC cache. */ -+static GdkGC * -+get_gc (GdkPangoRenderer *gdk_renderer, -+ PangoRenderPart part) - { - PangoRenderer *renderer = PANGO_RENDERER (gdk_renderer); -+ PangoColor *color; -+ GdkBitmap *stipple; - GdkPangoRendererPrivate *priv = gdk_renderer->priv; - -- if (!priv->cr) -+ color = pango_renderer_get_color (renderer, part); -+ -+ if (part <= MAX_RENDER_PART) -+ stipple = priv->stipple[part]; -+ else -+ stipple = NULL; -+ -+ if (!color && !stipple) /* nothing override, use base_gc */ -+ return priv->base_gc; -+ else - { -- const PangoMatrix *matrix; -+ gboolean new_stipple = FALSE; -+ gboolean new_color = FALSE; - -- priv->cr = gdk_cairo_create (priv->drawable); -+ if (stipple != priv->gc_stipple) -+ new_stipple = TRUE; - -- matrix = pango_renderer_get_matrix (renderer); -- if (matrix) -+ if ((priv->gc_color_set && !color) || -+ (!priv->gc_color_set && color) || -+ priv->gc_color.red != color->red || -+ priv->gc_color.green != color->green || -+ priv->gc_color.blue != color->blue) -+ new_color = TRUE; -+ -+ if (!priv->gc) - { -- cairo_matrix_t cairo_matrix; -- -- cairo_matrix_init (&cairo_matrix, -- matrix->xx, matrix->yx, -- matrix->xy, matrix->yy, -- matrix->x0, matrix->y0); -- cairo_set_matrix (priv->cr, &cairo_matrix); -+ priv->gc = gdk_gc_new (priv->drawable); -+ gdk_gc_copy (priv->gc, priv->base_gc); -+ } -+ else if (new_color && priv->gc_color_set && !color) -+ { -+ /* We have to recopy the original GC onto the cached GC -+ * to get the default color */ -+ new_stipple = TRUE; -+ gdk_gc_copy (priv->gc, priv->base_gc); -+ } -+ else if (new_stipple && priv->gc_stipple && !stipple) -+ { -+ /* Similarly, we need to make a new copy to restore to the -+ * default stipple state (the caller may have set a stipple -+ * on the GC, and even if not, gdk_gc_set_stipple (gc, NULL) -+ * doesn't work currently to restore to the default X stipple) */ -+ new_color = TRUE; -+ gdk_gc_copy (priv->gc, priv->base_gc); - } -- } -- -- if (part != priv->last_part) -- { -- PangoColor *pango_color; -- GdkColor *color; -- GdkColor tmp_color; -- gboolean changed; - -- pango_color = pango_renderer_get_color (renderer, part); -- -- if (priv->last_part != -1) -- changed = priv->gc_changed || -- priv->stipple[priv->last_part] != priv->stipple[part] || -- !color_equal (pango_color, -- pango_renderer_get_color (renderer, priv->last_part)); -- else -- changed = TRUE; -- -- if (changed) -+ if (new_color) - { -- if (pango_color) -+ if (color) - { -- tmp_color.red = pango_color->red; -- tmp_color.green = pango_color->green; -- tmp_color.blue = pango_color->blue; -+ GdkColor gdk_color; -+ -+ gdk_color.red = color->red; -+ gdk_color.green = color->green; -+ gdk_color.blue = color->blue; - -- color = &tmp_color; -+ gdk_gc_set_rgb_fg_color (priv->gc, &gdk_color); -+ -+ priv->gc_color = *color; -+ priv->gc_color_set = TRUE; - } - else -- color = NULL; -+ priv->gc_color_set = FALSE; -+ } - -- _gdk_gc_update_context (priv->base_gc, -- priv->cr, -- color, -- priv->stipple[part], -- priv->gc_changed); -+ if (new_stipple) -+ { -+ if (priv->gc_stipple) -+ g_object_unref (priv->gc_stipple); -+ -+ if (stipple) -+ { -+ gdk_gc_set_stipple (priv->gc, stipple); -+ gdk_gc_set_fill (priv->gc, GDK_STIPPLED); -+ priv->gc_stipple = g_object_ref (stipple); -+ } -+ else -+ priv->gc_stipple = NULL; - } - -- priv->last_part = part; -- priv->gc_changed = FALSE; -+ return priv->gc; - } -- -- return priv->cr; - } - - static void -@@ -225,133 +307,78 @@ - { - GdkPangoRenderer *gdk_renderer = GDK_PANGO_RENDERER (renderer); - GdkPangoRendererPrivate *priv = gdk_renderer->priv; -- cairo_t *cr; - -- cr = get_cairo_context (gdk_renderer, -- PANGO_RENDER_PART_FOREGROUND); -+ flush_trapezoids (gdk_renderer); - -- if (priv->embossed) -+ if (!priv->in_emboss && priv->embossed) - { -- cairo_save (cr); -- emboss_context (cr); -- cairo_move_to (cr, (double)x / PANGO_SCALE, (double)y / PANGO_SCALE); -- pango_cairo_show_glyph_string (cr, font, glyphs); -- cairo_restore (cr); -- } -- -- cairo_move_to (cr, (double)x / PANGO_SCALE, (double)y / PANGO_SCALE); -- pango_cairo_show_glyph_string (cr, font, glyphs); --} -- --/* Draws an error underline that looks like one of: -- * H E H -- * /\ /\ /\ /\ /\ - -- * A/ \ / \ / \ A/ \ / \ | -- * \ \ / \ / /D \ \ / \ | -- * \ \/ C \/ / \ \/ C \ | height = HEIGHT_SQUARES * square -- * \ /\ F / \ F /\ \ | -- * \ / \ / \ / \ \G | -- * \ / \ / \ / \ / | -- * \/ \/ \/ \/ - -- * B B -- * |----| -- * unit_width = (HEIGHT_SQUARES - 1) * square -- * -- * The x, y, width, height passed in give the desired bounding box; -- * x/width are adjusted to make the underline a integer number of units -- * wide. -- */ --#define HEIGHT_SQUARES 2.5 -+ PangoMatrix *save_matrix; -+ PangoColor *save_color; - --/* Cut-and-pasted between here and pango/pango/pangocairo-render.c */ -+ emboss_renderer (renderer, PANGO_RENDER_PART_FOREGROUND, &save_matrix, &save_color); -+ gdk_draw_glyphs_transformed (priv->drawable, -+ get_gc (gdk_renderer, PANGO_RENDER_PART_FOREGROUND), -+ renderer->matrix, font, x, y, glyphs); -+ unemboss_renderer (renderer, PANGO_RENDER_PART_FOREGROUND, &save_matrix, &save_color); -+ } -+ -+ gdk_draw_glyphs_transformed (priv->drawable, -+ get_gc (gdk_renderer, PANGO_RENDER_PART_FOREGROUND), -+ renderer->matrix, font, x, y, glyphs); -+} -+ -+/* Outputs any pending trapezoids, we do this when the part or -+ * part color changes, when we are about to draw text, etc. */ - static void --draw_error_underline (cairo_t *cr, -- double x, -- double y, -- double width, -- double height) --{ -- double square = height / HEIGHT_SQUARES; -- double unit_width = (HEIGHT_SQUARES - 1) * square; -- int width_units = (width + unit_width / 2) / unit_width; -- double y_top, y_bottom; -- int i; -+flush_trapezoids (GdkPangoRenderer *gdk_renderer) -+{ -+ GdkPangoRendererPrivate *priv = gdk_renderer->priv; - -- x += (width - width_units * unit_width) / 2; -- width = width_units * unit_width; -+ if (!priv->trapezoids || priv->trapezoids->len == 0) -+ return; - -- y_top = y; -- y_bottom = y + height; -- -- /* Bottom of squiggle */ -- cairo_move_to (cr, x - square / 2, y_top + square / 2); /* A */ -- for (i = 0; i < width_units; i += 2) -- { -- double x_middle = x + (i + 1) * unit_width; -- double x_right = x + (i + 2) * unit_width; -- -- cairo_line_to (cr, x_middle, y_bottom); /* B */ -- -- if (i + 1 == width_units) -- /* Nothing */; -- else if (i + 2 == width_units) -- cairo_line_to (cr, x_right + square / 2, y_top + square / 2); /* D */ -- else -- cairo_line_to (cr, x_right, y_top + square); /* C */ -- } -- -- /* Top of squiggle */ -- for (i -= 2; i >= 0; i -= 2) -- { -- double x_left = x + i * unit_width; -- double x_middle = x + (i + 1) * unit_width; -- double x_right = x + (i + 2) * unit_width; -- -- if (i + 1 == width_units) -- cairo_line_to (cr, x_middle + square / 2, y_bottom - square / 2); /* G */ -- else { -- if (i + 2 == width_units) -- cairo_line_to (cr, x_right, y_top); /* E */ -- cairo_line_to (cr, x_middle, y_bottom - square); /* F */ -- } -- -- cairo_line_to (cr, x_left, y_top); /* H */ -- } -+ gdk_draw_trapezoids (priv->drawable, -+ get_gc (gdk_renderer, priv->trapezoid_part), -+ (GdkTrapezoid *)priv->trapezoids->data, -+ priv->trapezoids->len); - -- cairo_close_path (cr); -- cairo_fill (cr); -+ g_array_set_size (priv->trapezoids, 0); - } - -+/* Draws a single trapezoid ... we don't draw it immediately, but rather -+ * cache it to join together with other trapezoids that form part of the -+ * same logical shape */ - static void --gdk_pango_renderer_draw_rectangle (PangoRenderer *renderer, -- PangoRenderPart part, -- int x, -- int y, -- int width, -- int height) -+gdk_pango_renderer_draw_trapezoid (PangoRenderer *renderer, -+ PangoRenderPart part, -+ double y1, -+ double x11, -+ double x21, -+ double y2, -+ double x12, -+ double x22) - { - GdkPangoRenderer *gdk_renderer = GDK_PANGO_RENDERER (renderer); -- GdkPangoRendererPrivate *priv = gdk_renderer->priv; -- cairo_t *cr; -- -- cr = get_cairo_context (gdk_renderer, part); -- -- if (priv->embossed && part != PANGO_RENDER_PART_BACKGROUND) -- { -- cairo_save (cr); -- emboss_context (cr); -- cairo_rectangle (cr, -- (double)x / PANGO_SCALE, (double)y / PANGO_SCALE, -- (double)width / PANGO_SCALE, (double)height / PANGO_SCALE); -+ GdkTrapezoid trap; - -- cairo_fill (cr); -- cairo_restore (cr); -- } -+ if (!gdk_renderer->priv->trapezoids) -+ gdk_renderer->priv->trapezoids = g_array_new (FALSE, FALSE, -+ sizeof (GdkTrapezoid)); -+ -+ if (gdk_renderer->priv->trapezoids->len > 0 && -+ gdk_renderer->priv->trapezoid_part != part) -+ flush_trapezoids (gdk_renderer); -+ -+ gdk_renderer->priv->trapezoid_part = part; -+ -+ trap.y1 = y1; -+ trap.x11 = x11 / 2; -+ trap.x21 = x21; -+ trap.y2 = y2; -+ trap.x12 = x12; -+ trap.x22 = x22; - -- cairo_rectangle (cr, -- (double)x / PANGO_SCALE, (double)y / PANGO_SCALE, -- (double)width / PANGO_SCALE, (double)height / PANGO_SCALE); -- cairo_fill (cr); -+ g_array_append_val (gdk_renderer->priv->trapezoids, trap); - } - - static void -@@ -363,23 +390,51 @@ - { - GdkPangoRenderer *gdk_renderer = GDK_PANGO_RENDERER (renderer); - GdkPangoRendererPrivate *priv = gdk_renderer->priv; -- cairo_t *cr; -- -- cr = get_cairo_context (gdk_renderer, PANGO_RENDER_PART_UNDERLINE); -- -- if (priv->embossed) -+ -+ if (!priv->in_emboss && priv->embossed) - { -- cairo_save (cr); -- emboss_context (cr); -- draw_error_underline (cr, -- (double)x / PANGO_SCALE, (double)y / PANGO_SCALE, -- (double)width / PANGO_SCALE, (double)height / PANGO_SCALE); -- cairo_restore (cr); -+ PangoMatrix *save_matrix; -+ PangoColor *save_color; -+ -+ emboss_renderer (renderer, PANGO_RENDER_PART_UNDERLINE, &save_matrix, &save_color); -+ PANGO_RENDERER_CLASS (gdk_pango_renderer_parent_class)->draw_error_underline (renderer, -+ x, y, width, height); -+ unemboss_renderer (renderer, PANGO_RENDER_PART_UNDERLINE, &save_matrix, &save_color); - } - -- draw_error_underline (cr, -- (double)x / PANGO_SCALE, (double)y / PANGO_SCALE, -- (double)width / PANGO_SCALE, (double)height / PANGO_SCALE); -+ PANGO_RENDERER_CLASS (gdk_pango_renderer_parent_class)->draw_error_underline (renderer, -+ x, y, width, height); -+} -+ -+/* We can't handle embossing at the level of trapezoids, because when an -+ * underline is split into multiple trapezoids, the normal and shadow -+ * trapezoids will be drawn mixed together. Instead, we have to emboss -+ * and entire rectangle or error underline -+ */ -+static void -+gdk_pango_renderer_draw_rectangle (PangoRenderer *renderer, -+ PangoRenderPart part, -+ int x, -+ int y, -+ int width, -+ int height) -+{ -+ GdkPangoRenderer *gdk_renderer = GDK_PANGO_RENDERER (renderer); -+ GdkPangoRendererPrivate *priv = gdk_renderer->priv; -+ -+ if (!priv->in_emboss && priv->embossed && part != PANGO_RENDER_PART_BACKGROUND) -+ { -+ PangoMatrix *save_matrix; -+ PangoColor *save_color; -+ -+ emboss_renderer (renderer, part, &save_matrix, &save_color); -+ PANGO_RENDERER_CLASS (gdk_pango_renderer_parent_class)->draw_rectangle (renderer, part, -+ x, y, width, height); -+ unemboss_renderer (renderer, part, &save_matrix, &save_color); -+ } -+ -+ PANGO_RENDERER_CLASS (gdk_pango_renderer_parent_class)->draw_rectangle (renderer, part, -+ x, y, width, height); - } - - static void -@@ -388,8 +443,8 @@ - { - GdkPangoRenderer *gdk_renderer = GDK_PANGO_RENDERER (renderer); - -- if (gdk_renderer->priv->last_part == part) -- gdk_renderer->priv->last_part = (PangoRenderPart)-1; -+ if (part == gdk_renderer->priv->trapezoid_part) -+ flush_trapezoids (gdk_renderer); - } - - static void -@@ -410,13 +465,8 @@ - { - GdkPangoRenderer *gdk_renderer = GDK_PANGO_RENDERER (renderer); - GdkPangoRendererPrivate *priv = gdk_renderer->priv; -- -- if (priv->cr) -- { -- cairo_destroy (priv->cr); -- priv->cr = NULL; -- } -- priv->last_part = (PangoRenderPart)-1; -+ -+ flush_trapezoids (gdk_renderer); - } - - static void -@@ -515,7 +565,6 @@ - GDK_TYPE_PANGO_RENDERER, - GdkPangoRendererPrivate); - -- renderer->priv->last_part = (PangoRenderPart)-1; - renderer->priv->gc_changed = TRUE; - } - -@@ -527,6 +576,7 @@ - PangoRendererClass *renderer_class = PANGO_RENDERER_CLASS (klass); - - renderer_class->draw_glyphs = gdk_pango_renderer_draw_glyphs; -+ renderer_class->draw_trapezoid = gdk_pango_renderer_draw_trapezoid; - renderer_class->draw_rectangle = gdk_pango_renderer_draw_rectangle; - renderer_class->draw_error_underline = gdk_pango_renderer_draw_error_underline; - renderer_class->part_changed = gdk_pango_renderer_part_changed; -@@ -647,6 +697,8 @@ - - priv = gdk_renderer->priv; - -+ flush_trapezoids (gdk_renderer); -+ - if (priv->drawable != drawable) - { - if (priv->drawable) -@@ -681,6 +733,8 @@ - - priv = gdk_renderer->priv; - -+ flush_trapezoids (gdk_renderer); -+ - if (priv->base_gc != gc) - { - if (priv->base_gc) -@@ -689,6 +743,20 @@ - if (priv->base_gc) - g_object_ref (priv->base_gc); - -+ if (priv->gc) -+ { -+ g_object_unref (priv->gc); -+ priv->gc = NULL; -+ } -+ -+ priv->gc_color_set = FALSE; -+ -+ if (priv->gc_stipple) -+ { -+ g_object_unref (priv->gc_stipple); -+ priv->gc_stipple = NULL; -+ } -+ - priv->gc_changed = TRUE; - } - } -@@ -1414,50 +1482,5 @@ - return gdk_pango_context_get_for_screen (gdk_screen_get_default ()); - } - --/** -- * gdk_pango_context_get_for_screen: -- * @screen: the #GdkScreen for which the context is to be created. -- * -- * Creates a #PangoContext for @screen. -- * -- * The context must be freed when you're finished with it. -- * -- * When using GTK+, normally you should use gtk_widget_get_pango_context() -- * instead of this function, to get the appropriate context for -- * the widget you intend to render text onto. -- * -- * The newly created context will have the default font options -- * (see #cairo_font_options_t) for the screen; if these options -- * change it will not be updated. Using gtk_widget_get_pango_context() -- * is more convenient if you want to keep a context around and track -- * changes to the screen's font rendering settings. -- * -- * Return value: a new #PangoContext for @screen -- * -- * Since: 2.2 -- **/ --PangoContext * --gdk_pango_context_get_for_screen (GdkScreen *screen) --{ -- PangoFontMap *fontmap; -- PangoContext *context; -- const cairo_font_options_t *options; -- double dpi; -- -- g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL); -- -- fontmap = pango_cairo_font_map_get_default (); -- -- context = pango_cairo_font_map_create_context (PANGO_CAIRO_FONT_MAP (fontmap)); -- -- options = gdk_screen_get_font_options (screen); -- pango_cairo_context_set_font_options (context, options); -- -- dpi = gdk_screen_get_resolution (screen); -- pango_cairo_context_set_resolution (context, dpi); -- -- return context; --} -- - #define __GDK_PANGO_C__ - #include "gdkaliasdef.c" -Index: gtk+-2.10.6/gdk/gdk.symbols -=================================================================== ---- gtk+-2.10.6.orig/gdk/gdk.symbols 2006-10-30 12:58:29.000000000 +0000 -+++ gtk+-2.10.6/gdk/gdk.symbols 2006-10-30 12:59:30.000000000 +0000 -@@ -861,7 +861,6 @@ - gdk_pango_attr_embossed_new - gdk_pango_attr_stipple_new - gdk_pango_context_get --gdk_pango_context_get_for_screen - #ifndef GDK_DISABLE_DEPRECATED - gdk_pango_context_set_colormap - #endif -@@ -877,6 +876,12 @@ - #endif - #endif - -+#if IN_HEADER(__GDK_PANGO_H__) -+#if IN_FILE(__GDK_PANGO_X11_C__) -+gdk_pango_context_get_for_screen -+#endif -+#endif -+ - #if IN_HEADER(__GDK_PIXBUF_H__) - #if IN_FILE(__GDK_PIXBUF_DRAWABLE_C__) - gdk_pixbuf_get_from_drawable -Index: gtk+-2.10.6/gdk/gdkwindow.c -=================================================================== ---- gtk+-2.10.6.orig/gdk/gdkwindow.c 2006-10-30 12:58:29.000000000 +0000 -+++ gtk+-2.10.6/gdk/gdkwindow.c 2006-10-30 12:59:30.000000000 +0000 -@@ -1834,9 +1834,14 @@ - } - else - { -- method->cr = cairo_create (paint->surface); -+ /*method->cr = cairo_create (paint->surface); - -- gdk_cairo_set_source_color (method->cr, &private->bg_color); -+ gdk_cairo_set_source_color (method->cr, &private->bg_color);*/ -+ GdkGC *gc = _gdk_drawable_get_scratch_gc (paint->pixmap, FALSE); -+ -+ gdk_gc_set_foreground (gc, &(private->bg_color)); -+ -+ method->gc = g_object_ref (gc); - } - } - -Index: gtk+-2.10.6/gdk/x11/gdkdisplay-x11.c -=================================================================== ---- gtk+-2.10.6.orig/gdk/x11/gdkdisplay-x11.c 2006-10-30 12:58:29.000000000 +0000 -+++ gtk+-2.10.6/gdk/x11/gdkdisplay-x11.c 2006-10-30 12:59:30.000000000 +0000 -@@ -190,7 +190,8 @@ - display_x11->leader_window_title_set = FALSE; - - display_x11->have_render = GDK_UNKNOWN; -- -+ display_x11->have_render_with_trapezoids = GDK_UNKNOWN; -+ - #ifdef HAVE_XFIXES - if (XFixesQueryExtension (display_x11->xdisplay, - &display_x11->xfixes_event_base, -Index: gtk+-2.10.6/gdk/x11/gdkdisplay-x11.h -=================================================================== ---- gtk+-2.10.6.orig/gdk/x11/gdkdisplay-x11.h 2006-10-30 12:58:29.000000000 +0000 -+++ gtk+-2.10.6/gdk/x11/gdkdisplay-x11.h 2006-10-30 12:59:30.000000000 +0000 -@@ -78,6 +78,7 @@ - gboolean use_xshm; - gboolean have_shm_pixmaps; - GdkTristate have_render; -+ GdkTristate have_render_with_trapezoids; - gboolean have_xfixes; - gint xfixes_event_base; - -Index: gtk+-2.10.6/gdk/x11/gdkdrawable-x11.c -=================================================================== ---- gtk+-2.10.6.orig/gdk/x11/gdkdrawable-x11.c 2006-10-30 12:58:30.000000000 +0000 -+++ gtk+-2.10.6/gdk/x11/gdkdrawable-x11.c 2006-10-30 12:59:30.000000000 +0000 -@@ -26,6 +26,8 @@ - - #include <config.h> - -+#include <pango/pangoxft.h> -+ - #include "gdkx.h" - #include "gdkregion-generic.h" - -@@ -106,7 +108,21 @@ - GdkGC *gc, - GdkPoint *points, - gint npoints); -- -+ -+static void gdk_x11_draw_glyphs (GdkDrawable *drawable, -+ GdkGC *gc, -+ PangoFont *font, -+ gint x, -+ gint y, -+ PangoGlyphString *glyphs); -+static void gdk_x11_draw_glyphs_transformed (GdkDrawable *drawable, -+ GdkGC *gc, -+ PangoMatrix *matrix, -+ PangoFont *font, -+ gint x, -+ gint y, -+ PangoGlyphString *glyphs); -+ - static void gdk_x11_draw_image (GdkDrawable *drawable, - GdkGC *gc, - GdkImage *image, -@@ -129,6 +145,11 @@ - gint x_dither, - gint y_dither); - -+static void gdk_x11_draw_trapezoids (GdkDrawable *drawable, -+ GdkGC *gc, -+ GdkTrapezoid *trapezoids, -+ gint n_trapezoids); -+ - static cairo_surface_t *gdk_x11_ref_cairo_surface (GdkDrawable *drawable); - - static void gdk_x11_set_colormap (GdkDrawable *drawable, -@@ -163,8 +184,11 @@ - drawable_class->draw_points = gdk_x11_draw_points; - drawable_class->draw_segments = gdk_x11_draw_segments; - drawable_class->draw_lines = gdk_x11_draw_lines; -+ drawable_class->draw_glyphs = gdk_x11_draw_glyphs; -+ drawable_class->draw_glyphs_transformed = gdk_x11_draw_glyphs_transformed; - drawable_class->draw_image = gdk_x11_draw_image; - drawable_class->draw_pixbuf = gdk_x11_draw_pixbuf; -+ drawable_class->draw_trapezoids = gdk_x11_draw_trapezoids; - - drawable_class->ref_cairo_surface = gdk_x11_ref_cairo_surface; - -@@ -327,6 +351,72 @@ - return x11display->have_render == GDK_YES; - } - -+gboolean -+_gdk_x11_have_render_with_trapezoids (GdkDisplay *display) -+{ -+ Display *xdisplay = GDK_DISPLAY_XDISPLAY (display); -+ GdkDisplayX11 *x11display = GDK_DISPLAY_X11 (display); -+ -+ if (x11display->have_render_with_trapezoids == GDK_UNKNOWN) -+ { -+ x11display->have_render_with_trapezoids = GDK_NO; -+ if (_gdk_x11_have_render (display)) -+ { -+ /* -+ * Require protocol >= 0.4 for CompositeTrapezoids support. -+ */ -+ int major_version, minor_version; -+ -+#define XRENDER_TETRAPEZOIDS_MAJOR 0 -+#define XRENDER_TETRAPEZOIDS_MINOR 4 -+ -+ if (XRenderQueryVersion (xdisplay, &major_version, -+ &minor_version)) -+ if ((major_version == XRENDER_TETRAPEZOIDS_MAJOR) && -+ (minor_version >= XRENDER_TETRAPEZOIDS_MINOR)) -+ x11display->have_render_with_trapezoids = GDK_YES; -+ } -+ } -+ -+ return x11display->have_render_with_trapezoids == GDK_YES; -+} -+ -+static XftDraw * -+gdk_x11_drawable_get_xft_draw (GdkDrawable *drawable) -+{ -+ GdkDrawableImplX11 *impl = GDK_DRAWABLE_IMPL_X11 (drawable); -+ -+ if (impl->xft_draw == NULL) -+ { -+ GdkColormap *colormap = gdk_drawable_get_colormap (drawable); -+ -+ if (colormap) -+ { -+ GdkVisual *visual; -+ -+ visual = gdk_colormap_get_visual (colormap); -+ -+ impl->xft_draw = XftDrawCreate (GDK_SCREEN_XDISPLAY (impl->screen), impl->xid, -+ GDK_VISUAL_XVISUAL (visual), GDK_COLORMAP_XCOLORMAP (colormap)); -+ } -+ else if (gdk_drawable_get_depth (drawable) == 1) -+ { -+ impl->xft_draw = XftDrawCreateBitmap (GDK_SCREEN_XDISPLAY (impl->screen), impl->xid); -+ } -+ else -+ { -+ g_warning ("Using Xft rendering requires the drawable argument to\n" -+ "have a specified colormap. All windows have a colormap,\n" -+ "however, pixmaps only have colormap by default if they\n" -+ "were created with a non-NULL window argument. Otherwise\n" -+ "a colormap must be set on them with gdk_drawable_set_colormap"); -+ return NULL; -+ } -+ } -+ -+ return impl->xft_draw; -+} -+ - static Picture - gdk_x11_drawable_get_picture (GdkDrawable *drawable) - { -@@ -393,6 +483,57 @@ - } - } - -+static void -+gdk_x11_drawable_update_xft_clip (GdkDrawable *drawable, -+ GdkGC *gc) -+{ -+ XftDraw *xft_draw = gdk_x11_drawable_get_xft_draw (drawable); -+ GdkRegion *clip_region = _gdk_gc_get_clip_region (gc); -+ -+ if (gc && clip_region) -+ { -+ GdkRegionBox *boxes = clip_region->rects; -+ gint n_boxes = clip_region->numRects; -+#if 0 /* Until XftDrawSetClipRectangles is there */ -+ XRectangle *rects = g_new (XRectangle, n_boxes); -+ int i; -+ -+ for (i=0; i < n_boxes; i++) -+ { -+ rects[i].x = CLAMP (boxes[i].x1 + gc->clip_x_origin, G_MINSHORT, G_MAXSHORT); -+ rects[i].y = CLAMP (boxes[i].y1 + gc->clip_y_origin, G_MINSHORT, G_MAXSHORT); -+ rects[i].width = CLAMP (boxes[i].x2 + gc->clip_x_origin, G_MINSHORT, G_MAXSHORT) - rects[i].x; -+ rects[i].height = CLAMP (boxes[i].y2 + gc->clip_y_origin, G_MINSHORT, G_MAXSHORT) - rects[i].y; -+ } -+ XftDrawSetClipRectangles (xft_draw, 0, 0, rects, n_boxes); -+ -+ g_free (rects); -+#else -+ Region xregion = XCreateRegion (); -+ int i; -+ -+ for (i=0; i < n_boxes; i++) -+ { -+ XRectangle rect; -+ -+ rect.x = CLAMP (boxes[i].x1 + gc->clip_x_origin, G_MINSHORT, G_MAXSHORT); -+ rect.y = CLAMP (boxes[i].y1 + gc->clip_y_origin, G_MINSHORT, G_MAXSHORT); -+ rect.width = CLAMP (boxes[i].x2 + gc->clip_x_origin, G_MINSHORT, G_MAXSHORT) - rect.x; -+ rect.height = CLAMP (boxes[i].y2 + gc->clip_y_origin, G_MINSHORT, G_MAXSHORT) - rect.y; -+ -+ XUnionRectWithRegion (&rect, xregion, xregion); -+ } -+ -+ XftDrawSetClip (xft_draw, xregion); -+ XDestroyRegion (xregion); -+#endif -+ } -+ else -+ { -+ XftDrawSetClip (xft_draw, NULL); -+ } -+} -+ - /***************************************************** - * X11 specific implementations of generic functions * - *****************************************************/ -@@ -780,6 +921,45 @@ - } - - static void -+gdk_x11_draw_glyphs (GdkDrawable *drawable, -+ GdkGC *gc, -+ PangoFont *font, -+ gint x, -+ gint y, -+ PangoGlyphString *glyphs) -+{ -+ gdk_x11_draw_glyphs_transformed (drawable, gc, NULL, -+ font, -+ x * PANGO_SCALE, -+ y * PANGO_SCALE, -+ glyphs); -+} -+ -+static void -+gdk_x11_draw_glyphs_transformed (GdkDrawable *drawable, -+ GdkGC *gc, -+ PangoMatrix *matrix, -+ PangoFont *font, -+ gint x, -+ gint y, -+ PangoGlyphString *glyphs) -+{ -+ GdkDrawableImplX11 *impl; -+ PangoRenderer *renderer; -+ -+ impl = GDK_DRAWABLE_IMPL_X11 (drawable); -+ -+ g_return_if_fail (PANGO_XFT_IS_FONT (font)); -+ -+ renderer = _gdk_x11_renderer_get (drawable, gc); -+ if (matrix) -+ pango_renderer_set_matrix (renderer, matrix); -+ pango_renderer_draw_glyphs (renderer, font, glyphs, x, y); -+ if (matrix) -+ pango_renderer_set_matrix (renderer, NULL); -+} -+ -+static void - gdk_x11_draw_image (GdkDrawable *drawable, - GdkGC *gc, - GdkImage *image, -@@ -1444,6 +1624,47 @@ - } - - static void -+gdk_x11_draw_trapezoids (GdkDrawable *drawable, -+ GdkGC *gc, -+ GdkTrapezoid *trapezoids, -+ gint n_trapezoids) -+{ -+ GdkScreen *screen = GDK_DRAWABLE_IMPL_X11 (drawable)->screen; -+ GdkDisplay *display = gdk_screen_get_display (screen); -+ XTrapezoid *xtrapezoids; -+ gint i; -+ -+ if (!_gdk_x11_have_render_with_trapezoids (display)) -+ { -+ GdkDrawable *wrapper = GDK_DRAWABLE_IMPL_X11 (drawable)->wrapper; -+ GDK_DRAWABLE_CLASS (_gdk_drawable_impl_x11_parent_class)->draw_trapezoids (wrapper, gc, -+ trapezoids, n_trapezoids); -+ return; -+ } -+ -+ xtrapezoids = g_new (XTrapezoid, n_trapezoids); -+ -+ for (i = 0; i < n_trapezoids; i++) -+ { -+ xtrapezoids[i].top = XDoubleToFixed (trapezoids[i].y1); -+ xtrapezoids[i].bottom = XDoubleToFixed (trapezoids[i].y2); -+ xtrapezoids[i].left.p1.x = XDoubleToFixed (trapezoids[i].x11); -+ xtrapezoids[i].left.p1.y = XDoubleToFixed (trapezoids[i].y1); -+ xtrapezoids[i].left.p2.x = XDoubleToFixed (trapezoids[i].x12); -+ xtrapezoids[i].left.p2.y = XDoubleToFixed (trapezoids[i].y2); -+ xtrapezoids[i].right.p1.x = XDoubleToFixed (trapezoids[i].x21); -+ xtrapezoids[i].right.p1.y = XDoubleToFixed (trapezoids[i].y1); -+ xtrapezoids[i].right.p2.x = XDoubleToFixed (trapezoids[i].x22); -+ xtrapezoids[i].right.p2.y = XDoubleToFixed (trapezoids[i].y2); -+ } -+ -+ _gdk_x11_drawable_draw_xtrapezoids (drawable, gc, -+ xtrapezoids, n_trapezoids); -+ -+ g_free (xtrapezoids); -+} -+ -+static void - gdk_x11_cairo_surface_destroy (void *data) - { - GdkDrawableImplX11 *impl = data; -@@ -1498,5 +1719,89 @@ - return impl->cairo_surface; - } - -+void -+_gdk_x11_drawable_draw_xtrapezoids (GdkDrawable *drawable, -+ GdkGC *gc, -+ XTrapezoid *xtrapezoids, -+ int n_trapezoids) -+{ -+ GdkScreen *screen = GDK_DRAWABLE_IMPL_X11 (drawable)->screen; -+ GdkDisplay *display = gdk_screen_get_display (screen); -+ GdkDisplayX11 *x11display = GDK_DISPLAY_X11 (display); -+ -+ XftDraw *draw; -+ -+ if (!_gdk_x11_have_render_with_trapezoids (display)) -+ { -+ /* This is the case of drawing the borders of the unknown glyph box -+ * without render on the display, we need to feed it back to -+ * fallback code. Not efficient, but doesn't matter. -+ */ -+ GdkTrapezoid *trapezoids = g_new (GdkTrapezoid, n_trapezoids); -+ int i; -+ -+ for (i = 0; i < n_trapezoids; i++) -+ { -+ trapezoids[i].y1 = XFixedToDouble (xtrapezoids[i].top); -+ trapezoids[i].y2 = XFixedToDouble (xtrapezoids[i].bottom); -+ trapezoids[i].x11 = XFixedToDouble (xtrapezoids[i].left.p1.x); -+ trapezoids[i].x12 = XFixedToDouble (xtrapezoids[i].left.p2.x); -+ trapezoids[i].x21 = XFixedToDouble (xtrapezoids[i].right.p1.x); -+ trapezoids[i].x22 = XFixedToDouble (xtrapezoids[i].right.p2.x); -+ } -+ -+ gdk_x11_draw_trapezoids (drawable, gc, trapezoids, n_trapezoids); -+ g_free (trapezoids); -+ -+ return; -+ } -+ -+ gdk_x11_drawable_update_xft_clip (drawable, gc); -+ draw = gdk_x11_drawable_get_xft_draw (drawable); -+ -+ if (!x11display->mask_format) -+ x11display->mask_format = XRenderFindStandardFormat (x11display->xdisplay, -+ PictStandardA8); -+ -+ XRenderCompositeTrapezoids (x11display->xdisplay, PictOpOver, -+ _gdk_x11_gc_get_fg_picture (gc), -+ XftDrawPicture (draw), -+ x11display->mask_format, -+ - gc->ts_x_origin, - gc->ts_y_origin, -+ xtrapezoids, n_trapezoids); -+} -+ -+void -+_gdk_x11_drawable_draw_xft_glyphs (GdkDrawable *drawable, -+ GdkGC *gc, -+ XftFont *xft_font, -+ XftGlyphSpec *glyphs, -+ gint n_glyphs) -+{ -+ GdkScreen *screen = GDK_DRAWABLE_IMPL_X11 (drawable)->screen; -+ GdkDisplay *display = gdk_screen_get_display (screen); -+ GdkDisplayX11 *x11display = GDK_DISPLAY_X11 (display); -+ XftDraw *draw; -+ -+ gdk_x11_drawable_update_xft_clip (drawable, gc); -+ draw = gdk_x11_drawable_get_xft_draw (drawable); -+ -+ if (_gdk_x11_have_render (display)) -+ { -+ XftGlyphSpecRender (x11display->xdisplay, PictOpOver, -+ _gdk_x11_gc_get_fg_picture (gc), -+ xft_font, -+ XftDrawPicture (draw), -+ - gc->ts_x_origin, - gc->ts_y_origin, -+ glyphs, n_glyphs); -+ } -+ else -+ { -+ XftColor color; -+ -+ _gdk_gc_x11_get_fg_xft_color (gc, &color); -+ XftDrawGlyphSpec (draw, &color, xft_font, glyphs, n_glyphs); -+ } -+} - #define __GDK_DRAWABLE_X11_C__ - #include "gdkaliasdef.c" -Index: gtk+-2.10.6/gdk/x11/gdkdrawable-x11.h -=================================================================== ---- gtk+-2.10.6.orig/gdk/x11/gdkdrawable-x11.h 2006-10-30 12:58:30.000000000 +0000 -+++ gtk+-2.10.6/gdk/x11/gdkdrawable-x11.h 2006-10-30 12:59:30.000000000 +0000 -@@ -33,6 +33,7 @@ - - #include <X11/Xlib.h> - #include <X11/extensions/Xrender.h> -+#include <X11/Xft/Xft.h> - - G_BEGIN_DECLS - -@@ -68,6 +69,8 @@ - Window xid; - GdkScreen *screen; - -+ XftDraw *xft_draw; -+ - Picture picture; - cairo_surface_t *cairo_surface; - }; -@@ -92,7 +95,15 @@ - /* Note that the following take GdkDrawableImplX11, not the wrapper drawable */ - void _gdk_x11_drawable_finish (GdkDrawable *drawable); - void _gdk_x11_drawable_update_size (GdkDrawable *drawable); -- -+void _gdk_x11_drawable_draw_xtrapezoids (GdkDrawable *drawable, -+ GdkGC *gc, -+ XTrapezoid *xtrapezoids, -+ int n_trapezoids); -+void _gdk_x11_drawable_draw_xft_glyphs (GdkDrawable *drawable, -+ GdkGC *gc, -+ XftFont *xft_font, -+ XftGlyphSpec *glyphs, -+ gint n_glyphs); - G_END_DECLS - - #endif /* __GDK_DRAWABLE_X11_H__ */ -Index: gtk+-2.10.6/gdk/x11/gdkgc-x11.c -=================================================================== ---- gtk+-2.10.6.orig/gdk/x11/gdkgc-x11.c 2006-10-30 12:58:30.000000000 +0000 -+++ gtk+-2.10.6/gdk/x11/gdkgc-x11.c 2006-10-30 12:59:30.000000000 +0000 -@@ -80,7 +80,10 @@ - gdk_gc_x11_finalize (GObject *object) - { - GdkGCX11 *x11_gc = GDK_GC_X11 (object); -- -+ -+ if (x11_gc->fg_picture != None) -+ XRenderFreePicture (GDK_GC_XDISPLAY (x11_gc), x11_gc->fg_picture); -+ - XFreeGC (GDK_GC_XDISPLAY (x11_gc), GDK_GC_XGC (x11_gc)); - - G_OBJECT_CLASS (_gdk_gc_x11_parent_class)->finalize (object); -@@ -110,7 +113,7 @@ - - private->dirty_mask = 0; - private->have_clip_mask = FALSE; -- -+ - private->screen = GDK_DRAWABLE_IMPL_X11 (drawable)->screen; - - private->depth = gdk_drawable_get_depth (drawable); -@@ -339,6 +342,18 @@ - } - - static void -+clear_fg_picture (GdkGC *gc) -+{ -+ GdkGCX11 *x11_gc = GDK_GC_X11 (gc); -+ -+ if (x11_gc->fg_picture != None) -+ { -+ XRenderFreePicture (GDK_GC_XDISPLAY (x11_gc), x11_gc->fg_picture); -+ x11_gc->fg_picture = None; -+ } -+} -+ -+static void - gdk_x11_gc_set_values (GdkGC *gc, - GdkGCValues *values, - GdkGCValuesMask values_mask) -@@ -367,6 +382,29 @@ - x11_gc->have_clip_mask = values->clip_mask != NULL; - } - -+ if (values_mask & GDK_GC_BACKGROUND) -+ { -+ if (_gdk_gc_get_fill (gc) == GDK_OPAQUE_STIPPLED) -+ clear_fg_picture (gc); -+ } -+ -+ if (values_mask & GDK_GC_FILL) -+ { -+ clear_fg_picture (gc); -+ } -+ -+ if (values_mask & GDK_GC_STIPPLE) -+ { -+ if (_gdk_gc_get_fill (gc) == GDK_STIPPLED || _gdk_gc_get_fill (gc) == GDK_OPAQUE_STIPPLED) -+ clear_fg_picture (gc); -+ } -+ -+ if (values_mask & GDK_GC_TILE) -+ { -+ if (_gdk_gc_get_fill (gc) == GDK_TILED) -+ clear_fg_picture (gc); -+ } -+ - gdk_x11_gc_values_to_xvalues (values, values_mask, &xvalues, &xvalues_mask); - - XChangeGC (GDK_GC_XDISPLAY (gc), -@@ -642,6 +680,8 @@ - x11_dst_gc->dirty_mask = x11_src_gc->dirty_mask; - x11_dst_gc->have_clip_region = x11_src_gc->have_clip_region; - x11_dst_gc->have_clip_mask = x11_src_gc->have_clip_mask; -+ -+ clear_fg_picture (dst_gc); - } - - /** -@@ -701,5 +741,359 @@ - return gc_x11->xgc; - } - -+/* Various bits of the below are roughly cribbed from XFree86 -+ * lib/Xft/xftdraw.c, Copyright 2000, Keith Packard -+ */ -+ -+static XRenderPictFormat * -+foreground_format (GdkGC *gc) -+{ -+ XRenderPictFormat pf; -+ -+ pf.type = PictTypeDirect; -+ pf.depth = 32; -+ pf.direct.redMask = 0xff; -+ pf.direct.greenMask = 0xff; -+ pf.direct.blueMask = 0xff; -+ pf.direct.alphaMask = 0xff; -+ -+ return XRenderFindFormat (GDK_GC_XDISPLAY (gc), -+ (PictFormatType | -+ PictFormatDepth | -+ PictFormatRedMask | -+ PictFormatGreenMask | -+ PictFormatBlueMask | -+ PictFormatAlphaMask), -+ &pf, -+ 0); -+} -+ -+static Picture -+make_fg_tile_picture (GdkGC *gc) -+{ -+ GdkGCX11 *x11_gc = GDK_GC_X11 (gc); -+ GdkVisual *visual = gdk_drawable_get_visual (_gdk_gc_get_tile (gc)); -+ XRenderPictFormat *format = NULL; -+ -+ if (visual) -+ { -+ format = XRenderFindVisualFormat (GDK_GC_XDISPLAY (gc), -+ GDK_VISUAL_XVISUAL (visual)); -+ } -+ else if (x11_gc->depth == 1) -+ { -+ format = XRenderFindStandardFormat (GDK_GC_XDISPLAY (gc), -+ PictStandardA1); -+ } -+ -+ if (format) -+ { -+ XRenderPictureAttributes pa; -+ pa.repeat = True; -+ -+ return XRenderCreatePicture (GDK_GC_XDISPLAY (gc), -+ GDK_PIXMAP_XID (_gdk_gc_get_tile (gc)), -+ format, -+ CPRepeat, &pa); -+ } -+ -+ return None; -+} -+ -+static Picture -+make_stipple_picture (GdkGC *gc) -+{ -+ XRenderPictFormat *format = NULL; -+ XRenderPictureAttributes pa; -+ -+ format = XRenderFindStandardFormat (GDK_GC_XDISPLAY (gc), -+ PictStandardA1); -+ -+ pa.repeat = True; -+ return XRenderCreatePicture (GDK_GC_XDISPLAY (gc), -+ GDK_PIXMAP_XID (_gdk_gc_get_stipple (gc)), -+ format, -+ CPRepeat, &pa); -+} -+ -+static Picture -+make_color_picture (GdkGC *gc, -+ XRenderColor *color) -+{ -+ GdkGCX11 *x11_gc = GDK_GC_X11 (gc); -+ XRenderPictureAttributes pa; -+ XRenderPictFormat *pix_format = foreground_format (gc); -+ Pixmap pix; -+ Picture picture; -+ -+ if (!pix_format) -+ return None; -+ -+ pix = XCreatePixmap (GDK_GC_XDISPLAY (gc), -+ GDK_SCREEN_XROOTWIN (x11_gc->screen), -+ 1, 1, pix_format->depth); -+ pa.repeat = True; -+ picture = XRenderCreatePicture (GDK_GC_XDISPLAY (gc), -+ pix, -+ pix_format, -+ CPRepeat, &pa); -+ XFreePixmap (GDK_GC_XDISPLAY (gc), pix); -+ -+ XRenderFillRectangle (GDK_GC_XDISPLAY (gc), PictOpSrc, -+ picture, color, -+ 0, 0, 1, 1); -+ -+ return picture; -+} -+ -+static void -+get_bg_color (GdkGC *gc, -+ XRenderColor *render_color) -+{ -+ GdkColormap *cmap; -+ -+ cmap = gdk_gc_get_colormap (gc); -+ -+ if (cmap) -+ { -+ GdkColor color; -+ -+ gdk_colormap_query_color (cmap, _gdk_gc_get_bg_pixel (gc), &color); -+ -+ render_color->alpha = 0xffff; -+ render_color->red = color.red; -+ render_color->green = color.green; -+ render_color->blue = color.blue; -+ } -+ else /* Not worth warning, just use black */ -+ { -+ render_color->alpha = 0xffff; -+ render_color->red = 0; -+ render_color->green = 0; -+ render_color->blue = 0; -+ } -+} -+ -+/** -+ * _gdk_x11_gc_get_fg_picture: -+ * @gc: a #GdkGC -+ * -+ * Gets a Xrender Picture object suitable for being the source -+ * drawable for drawing with the foreground the graphics context. -+ * -+ * Return value: a Picture, owned by the GC; this cannot be -+ * used over subsequent modification of the GC. -+ **/ -+Picture -+_gdk_x11_gc_get_fg_picture (GdkGC *gc) -+{ -+ GdkGCX11 *x11_gc; -+ gboolean new = FALSE; -+ XftColor xftcolor; -+ GdkFill fill; -+ int width, height; -+ -+ g_return_val_if_fail (GDK_IS_GC_X11 (gc), None); -+ -+ if (!_gdk_x11_have_render (GDK_GC_DISPLAY (gc))) -+ return None; -+ -+ x11_gc = GDK_GC_X11 (gc); -+ -+ fill = GDK_SOLID; -+ width = 1; -+ height = 1; -+ -+ switch (_gdk_gc_get_fill (gc)) -+ { -+ case GDK_SOLID: -+ break; -+ case GDK_TILED: -+ if (_gdk_gc_get_tile (gc)) -+ { -+ if (!x11_gc->fg_picture) -+ x11_gc->fg_picture = make_fg_tile_picture (gc); -+ -+ if (x11_gc->fg_picture != None) -+ return x11_gc->fg_picture; -+ } -+ break; -+ case GDK_STIPPLED: -+ case GDK_OPAQUE_STIPPLED: -+ if (_gdk_gc_get_stipple (gc)) -+ { -+ gdk_drawable_get_size (_gdk_gc_get_stipple (gc), &width, &height); -+ fill = _gdk_gc_get_fill (gc); -+ } -+ break; -+ } -+ -+ if (x11_gc->fg_picture == None) -+ { -+ XRenderPictureAttributes pa; -+ XRenderPictFormat *pix_format = foreground_format (gc); -+ Pixmap pix; -+ -+ if (!pix_format) -+ return None; -+ -+ pix = XCreatePixmap (GDK_GC_XDISPLAY (gc), -+ GDK_SCREEN_XROOTWIN (x11_gc->screen), -+ width, height, pix_format->depth); -+ pa.repeat = True; -+ x11_gc->fg_picture = XRenderCreatePicture (GDK_GC_XDISPLAY (gc), -+ pix, -+ pix_format, -+ CPRepeat, &pa); -+ XFreePixmap (GDK_GC_XDISPLAY (gc), pix); -+ -+ new = TRUE; -+ } -+ -+ _gdk_gc_x11_get_fg_xft_color (gc, &xftcolor); -+ -+ if (x11_gc->fg_picture_color.alpha != 0xffff || -+ x11_gc->fg_picture_color.red != xftcolor.color.red || -+ x11_gc->fg_picture_color.green != xftcolor.color.green || -+ x11_gc->fg_picture_color.blue != xftcolor.color.blue) -+ { -+ x11_gc->fg_picture_color.alpha = 0xffff; -+ x11_gc->fg_picture_color.red = xftcolor.color.red; -+ x11_gc->fg_picture_color.green = xftcolor.color.green; -+ x11_gc->fg_picture_color.blue = xftcolor.color.blue; -+ -+ new = TRUE; -+ } -+ -+ switch (fill) -+ { -+ case GDK_SOLID: -+ XRenderFillRectangle (GDK_GC_XDISPLAY (gc), PictOpSrc, -+ x11_gc->fg_picture, &x11_gc->fg_picture_color, -+ 0, 0, width, height); -+ break; -+ case GDK_STIPPLED: -+ { -+ Picture stipple_picture = make_stipple_picture (gc); -+ -+ XRenderFillRectangle (GDK_GC_XDISPLAY (gc), PictOpSrc, -+ x11_gc->fg_picture, &x11_gc->fg_picture_color, -+ 0, 0, width, height); -+ XRenderComposite (GDK_GC_XDISPLAY (gc), -+ PictOpInReverse, -+ stipple_picture, None, x11_gc->fg_picture, -+ 0, 0, 0, 0, 0, 0, width, height); -+ -+ XRenderFreePicture (GDK_GC_XDISPLAY (x11_gc), stipple_picture); -+ } -+ break; -+ case GDK_OPAQUE_STIPPLED: -+ { -+ XRenderColor bg_color; -+ -+ Picture stipple_picture = make_stipple_picture (gc); -+ Picture fg_picture = make_color_picture (gc, &x11_gc->fg_picture_color); -+ -+ get_bg_color (gc, &bg_color); -+ -+ XRenderFillRectangle (GDK_GC_XDISPLAY (gc), PictOpSrc, -+ x11_gc->fg_picture, &bg_color, -+ 0, 0, width, height); -+ XRenderComposite (GDK_GC_XDISPLAY (gc), -+ PictOpOver, -+ fg_picture, stipple_picture, x11_gc->fg_picture, -+ 0, 0, 0, 0, 0, 0, width, height); -+ -+ XRenderFreePicture (GDK_GC_XDISPLAY (x11_gc), stipple_picture); -+ XRenderFreePicture (GDK_GC_XDISPLAY (x11_gc), fg_picture); -+ } -+ break; -+ case GDK_TILED: -+ g_assert_not_reached (); /* handled above */ -+ break; -+ } -+ -+ return x11_gc->fg_picture; -+} -+ -+/** -+ * _gdk_gc_x11_get_fg_xft_color: -+ * @gc: a #GdkGC -+ * @xftcolor: location to store the color -+ * -+ * Gets the foreground color of the GC as a XftColor. -+ **/ -+void -+_gdk_gc_x11_get_fg_xft_color (GdkGC *gc, -+ XftColor *xftcolor) -+{ -+ GdkGCX11 *x11_gc; -+ GdkColormap *cmap; -+ GdkColor color; -+ -+ g_return_if_fail (GDK_IS_GC_X11 (gc)); -+ -+ x11_gc = GDK_GC_X11 (gc); -+ -+ cmap = gdk_gc_get_colormap (gc); -+ -+ xftcolor->pixel = _gdk_gc_get_fg_pixel (gc); -+ -+ if (cmap) -+ { -+ gdk_colormap_query_color (cmap, xftcolor->pixel, &color); -+ xftcolor->color.alpha = 0xffff; -+ xftcolor->color.red = color.red; -+ xftcolor->color.green = color.green; -+ xftcolor->color.blue = color.blue; -+ } -+ else if (x11_gc->depth == 1) -+ { -+ /* Drawing with Xft on a bitmap is a bit bizzare; it -+ * takes alpha >= 0x8000 to mean 'set to 1' and -+ * alpha < 0x8000 to mean 'set to 0'. -+ */ -+ if (xftcolor->pixel) -+ { -+ xftcolor->color.red = 0xffff; -+ xftcolor->color.green = 0xffff; -+ xftcolor->color.blue = 0xffff; -+ xftcolor->color.alpha = 0xffff; -+ } -+ else -+ { -+ xftcolor->color.red = 0; -+ xftcolor->color.green = 0; -+ xftcolor->color.blue = 0; -+ xftcolor->color.alpha = 0; -+ } -+ } -+ else -+ { -+ g_warning ("Using Xft rendering requires the GC argument to have a\n" -+ "specified colormap. If the GC was created for a drawable\n" -+ "with a colormap, the colormap will be set on the GC\n" -+ "automatically. Otherwise, a colormap must be set on it with" -+ "gdk_gc_set_colormap"); -+ } -+} -+ -+void -+_gdk_windowing_gc_get_foreground (GdkGC *gc, -+ GdkColor *color) -+{ -+ GdkColormap *cmap; -+ -+ g_return_if_fail (GDK_IS_GC_X11 (gc)); -+ -+ color->pixel = _gdk_gc_get_fg_pixel (gc); -+ -+ cmap = gdk_gc_get_colormap (gc); -+ -+ if (cmap) -+ gdk_colormap_query_color (cmap, _gdk_gc_get_fg_pixel (gc), color); -+ else -+ g_warning ("No colormap in _gdk_windowing_gc_get_foreground"); -+} - #define __GDK_GC_X11_C__ - #include "gdkaliasdef.c" -Index: gtk+-2.10.6/gdk/x11/gdkprivate-x11.h -=================================================================== ---- gtk+-2.10.6.orig/gdk/x11/gdkprivate-x11.h 2006-10-30 12:58:30.000000000 +0000 -+++ gtk+-2.10.6/gdk/x11/gdkprivate-x11.h 2006-10-30 12:59:30.000000000 +0000 -@@ -63,6 +63,9 @@ - guint have_clip_region : 1; - guint have_clip_mask : 1; - guint depth : 8; -+ -+ Picture fg_picture; -+ XRenderColor fg_picture_color; - }; - - struct _GdkGCX11Class -@@ -102,6 +105,11 @@ - GType _gdk_gc_x11_get_type (void); - - gboolean _gdk_x11_have_render (GdkDisplay *display); -+gboolean _gdk_x11_have_render_with_trapezoids (GdkDisplay *display); -+ -+Picture _gdk_x11_gc_get_fg_picture (GdkGC *gc); -+void _gdk_gc_x11_get_fg_xft_color (GdkGC *gc, -+ XftColor *xftcolor); - - GdkGC *_gdk_x11_gc_new (GdkDrawable *drawable, - GdkGCValues *values, -Index: gtk+-2.10.6/gdk/x11/gdkwindow-x11.c -=================================================================== ---- gtk+-2.10.6.orig/gdk/x11/gdkwindow-x11.c 2006-10-30 12:58:30.000000000 +0000 -+++ gtk+-2.10.6/gdk/x11/gdkwindow-x11.c 2006-10-30 12:59:30.000000000 +0000 -@@ -1114,7 +1114,8 @@ - { - GdkWindowObject *private = (GdkWindowObject *)window; - GdkToplevelX11 *toplevel; -- -+ GdkDrawableImplX11 *draw_impl; -+ - g_return_if_fail (GDK_IS_WINDOW (window)); - - _gdk_selection_window_destroyed (window); -@@ -1126,6 +1127,11 @@ - if (toplevel) - gdk_toplevel_x11_free_contents (GDK_WINDOW_DISPLAY (window), toplevel); - -+ draw_impl = GDK_DRAWABLE_IMPL_X11 (private->impl); -+ -+ if (draw_impl->xft_draw) -+ XftDrawDestroy (draw_impl->xft_draw); -+ - _gdk_x11_drawable_finish (private->impl); - - if (!recursing && !foreign_destroy) -Index: gtk+-2.10.6/gdk/x11/Makefile.am -=================================================================== ---- gtk+-2.10.6.orig/gdk/x11/Makefile.am 2006-10-30 12:58:30.000000000 +0000 -+++ gtk+-2.10.6/gdk/x11/Makefile.am 2006-10-30 12:59:30.000000000 +0000 -@@ -37,6 +37,7 @@ - gdkinput.c \ - gdkkeys-x11.c \ - gdkmain-x11.c \ -+ gdkpango-x11.c \ - gdkpixmap-x11.c \ - gdkpixmap-x11.h \ - gdkproperty-x11.c \ -Index: gtk+-2.10.6/gtk/gtkcalendar.c -=================================================================== ---- gtk+-2.10.6.orig/gtk/gtkcalendar.c 2006-10-30 12:58:30.000000000 +0000 -+++ gtk+-2.10.6/gtk/gtkcalendar.c 2006-10-30 12:59:30.000000000 +0000 -@@ -1821,7 +1821,7 @@ - } - } - -- -+ - /**************************************** - * Repainting * - ****************************************/ -@@ -1831,7 +1831,7 @@ - { - GtkWidget *widget = GTK_WIDGET (calendar); - GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar); -- cairo_t *cr; -+ GdkGC *gc; - char buffer[255]; - int x, y; - gint header_width; -@@ -1849,7 +1849,7 @@ - else - year_left = !priv->year_before; - -- cr = gdk_cairo_create (priv->header_win); -+ gc = calendar->gc; - - header_width = widget->allocation.width - 2 * widget->style->xthickness; - -@@ -1902,9 +1902,9 @@ - - (max_year_width - logical_rect.width)/2); - - -- gdk_cairo_set_source_color (cr, HEADER_FG_COLOR (GTK_WIDGET (calendar))); -- cairo_move_to (cr, x, y); -- pango_cairo_show_layout (cr, layout); -+ gdk_gc_set_foreground (gc, HEADER_FG_COLOR (GTK_WIDGET (calendar))); -+ gdk_draw_layout (priv->header_win, gc, x, y, layout); -+ - - /* Draw month */ - g_snprintf (buffer, sizeof (buffer), "%s", default_monthname[calendar->month]); -@@ -1924,19 +1924,19 @@ - else - x = 3 + priv->arrow_width + (max_month_width - logical_rect.width)/2; - -- cairo_move_to (cr, x, y); -- pango_cairo_show_layout (cr, layout); -- -+ gdk_draw_layout (priv->header_win, gc, x, y, layout); -+ -+ gdk_gc_set_foreground (gc, BACKGROUND_COLOR (GTK_WIDGET (calendar))); -+ - g_object_unref (layout); -- cairo_destroy (cr); - } - - static void - calendar_paint_day_names (GtkCalendar *calendar) - { - GtkWidget *widget = GTK_WIDGET (calendar); -+ GdkGC *gc; - GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar); -- cairo_t *cr; - char buffer[255]; - int day,i; - int day_width, cal_width; -@@ -1946,8 +1946,7 @@ - gint focus_padding; - gint focus_width; - -- cr = gdk_cairo_create (priv->day_name_win); -- -+ gc = calendar->gc; - gtk_widget_style_get (GTK_WIDGET (widget), - "focus-line-width", &focus_width, - "focus-padding", &focus_padding, -@@ -1961,22 +1960,19 @@ - * Draw rectangles as inverted background for the labels. - */ - -- gdk_cairo_set_source_color (cr, SELECTED_BG_COLOR (widget)); -- cairo_rectangle (cr, -- CALENDAR_MARGIN, CALENDAR_MARGIN, -- cal_width-CALENDAR_MARGIN * 2, -- priv->day_name_h - CALENDAR_MARGIN); -- cairo_fill (cr); -- -+ gdk_gc_set_foreground (gc, SELECTED_BG_COLOR (widget)); -+ gdk_draw_rectangle (priv->day_name_win, gc, TRUE, -+ CALENDAR_MARGIN, CALENDAR_MARGIN, -+ cal_width-CALENDAR_MARGIN * 2, -+ priv->day_name_h - CALENDAR_MARGIN); -+ - if (calendar->display_flags & GTK_CALENDAR_SHOW_WEEK_NUMBERS) -- { -- cairo_rectangle (cr, -- CALENDAR_MARGIN, -- priv->day_name_h - CALENDAR_YSEP, -- priv->week_width - CALENDAR_YSEP - CALENDAR_MARGIN, -- CALENDAR_YSEP); -- cairo_fill (cr); -- } -+ gdk_draw_rectangle (priv->day_name_win, gc, TRUE, -+ CALENDAR_MARGIN, -+ priv->day_name_h - CALENDAR_YSEP, -+ priv->week_width - CALENDAR_YSEP - CALENDAR_MARGIN, -+ CALENDAR_YSEP); -+ - - /* - * Write the labels -@@ -1984,7 +1980,7 @@ - - layout = gtk_widget_create_pango_layout (widget, NULL); - -- gdk_cairo_set_source_color (cr, SELECTED_FG_COLOR (widget)); -+ gdk_gc_set_foreground (gc, SELECTED_FG_COLOR (widget)); - for (i = 0; i < 7; i++) - { - if (gtk_widget_get_direction (GTK_WIDGET (calendar)) == GTK_TEXT_DIR_RTL) -@@ -1997,19 +1993,18 @@ - pango_layout_set_text (layout, buffer, -1); - pango_layout_get_pixel_extents (layout, NULL, &logical_rect); - -- cairo_move_to (cr, -- (CALENDAR_MARGIN + -- + (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR ? -- (priv->week_width + (priv->week_width ? CALENDAR_XSEP : 0)) -- : 0) -- + day_wid_sep * i -- + (day_width - logical_rect.width)/2), -- CALENDAR_MARGIN + focus_width + focus_padding + logical_rect.y); -- pango_cairo_show_layout (cr, layout); -+ gdk_draw_layout (priv->day_name_win, gc, -+ (CALENDAR_MARGIN + -+ + (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR ? -+ (priv->week_width + (priv->week_width ? CALENDAR_XSEP : 0)) -+ : 0) -+ + day_wid_sep * i -+ + (day_width - logical_rect.width)/2), -+ CALENDAR_MARGIN + focus_width + focus_padding + logical_rect.y, -+ layout); - } - - g_object_unref (layout); -- cairo_destroy (cr); - } - - static void -@@ -2017,7 +2012,7 @@ - { - GtkWidget *widget = GTK_WIDGET (calendar); - GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar); -- cairo_t *cr; -+ GdkGC *gc; - gint row, week = 0, year; - gint x_loc; - char buffer[32]; -@@ -2027,7 +2022,7 @@ - gint focus_padding; - gint focus_width; - -- cr = gdk_cairo_create (priv->week_win); -+ gc = calendar->gc; - - gtk_widget_style_get (GTK_WIDGET (widget), - "focus-line-width", &focus_width, -@@ -2038,20 +2033,20 @@ - * Draw a rectangle as inverted background for the labels. - */ - -- gdk_cairo_set_source_color (cr, SELECTED_BG_COLOR (widget)); -+ gdk_gc_set_foreground (gc, SELECTED_BG_COLOR (widget)); - if (priv->day_name_win) -- cairo_rectangle (cr, -- CALENDAR_MARGIN, -- 0, -- priv->week_width - CALENDAR_MARGIN, -- priv->main_h - CALENDAR_MARGIN); -+ gdk_draw_rectangle (priv->week_win, gc, TRUE, -+ CALENDAR_MARGIN, -+ 0, -+ priv->week_width - CALENDAR_MARGIN, -+ priv->main_h - CALENDAR_MARGIN); - else -- cairo_rectangle (cr, -- CALENDAR_MARGIN, -- CALENDAR_MARGIN, -- priv->week_width - CALENDAR_MARGIN, -- priv->main_h - 2 * CALENDAR_MARGIN); -- cairo_fill (cr); -+ gdk_draw_rectangle (priv->week_win, gc, TRUE, -+ CALENDAR_MARGIN, -+ CALENDAR_MARGIN, -+ priv->week_width - CALENDAR_MARGIN, -+ priv->main_h - 2 * CALENDAR_MARGIN); -+ - - /* - * Write the labels -@@ -2059,7 +2054,7 @@ - - layout = gtk_widget_create_pango_layout (widget, NULL); - -- gdk_cairo_set_source_color (cr, SELECTED_FG_COLOR (widget)); -+ gdk_gc_set_foreground (gc, SELECTED_FG_COLOR (widget)); - day_height = calendar_row_height (calendar); - for (row = 0; row < 6; row++) - { -@@ -2095,12 +2090,10 @@ - - logical_rect.width - - CALENDAR_XSEP - focus_padding - focus_width); - -- cairo_move_to (cr, x_loc, y_loc); -- pango_cairo_show_layout (cr, layout); -+ gdk_draw_layout (priv->week_win, gc, x_loc, y_loc, layout); - } - - g_object_unref (layout); -- cairo_destroy (cr); - } - - static void -@@ -2149,7 +2142,7 @@ - { - GtkWidget *widget = GTK_WIDGET (calendar); - GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar); -- cairo_t *cr; -+ GdkGC *gc; - GdkColor *text_color; - gchar buffer[32]; - gint day; -@@ -2162,7 +2155,7 @@ - g_return_if_fail (row < 6); - g_return_if_fail (col < 7); - -- cr = gdk_cairo_create (priv->main_win); -+ gc = calendar->gc; - - day = calendar->day[row][col]; - -@@ -2170,11 +2163,11 @@ - - if (calendar->day_month[row][col] == MONTH_PREV) - { -- text_color = PREV_MONTH_COLOR (widget); -+ gdk_gc_set_foreground (gc, PREV_MONTH_COLOR (GTK_WIDGET (calendar))); - } - else if (calendar->day_month[row][col] == MONTH_NEXT) - { -- text_color = NEXT_MONTH_COLOR (widget); -+ gdk_gc_set_foreground (gc, NEXT_MONTH_COLOR (GTK_WIDGET (calendar))); - } - else - { -@@ -2188,16 +2181,16 @@ - #endif - if (calendar->selected_day == day) - { -- gdk_cairo_set_source_color (cr, SELECTED_BG_COLOR (widget)); -- gdk_cairo_rectangle (cr, &day_rect); -- cairo_fill (cr); -+ gdk_gc_set_foreground (gc, SELECTED_BG_COLOR (GTK_WIDGET (calendar))); -+ gdk_draw_rectangle (priv->main_win, gc, TRUE, day_rect.x, day_rect.y, -+ day_rect.width, day_rect.height); - } - if (calendar->selected_day == day) -- text_color = SELECTED_FG_COLOR (widget); -+ gdk_gc_set_foreground (gc, SELECTED_FG_COLOR (GTK_WIDGET (calendar))); - else if (calendar->marked_date[day-1]) -- text_color = MARKED_COLOR (widget); -+ gdk_gc_set_foreground (gc, MARKED_COLOR (GTK_WIDGET (calendar))); - else -- text_color = NORMAL_DAY_COLOR (widget); -+ gdk_gc_set_foreground (gc, NORMAL_DAY_COLOR (GTK_WIDGET (calendar))); - } - - /* Translators: this defines whether the day numbers should use -@@ -2219,16 +2212,13 @@ - x_loc -= logical_rect.width; - y_loc = day_rect.y + (day_rect.height - logical_rect.height) / 2; - -- gdk_cairo_set_source_color (cr, text_color); -- cairo_move_to (cr, x_loc, y_loc); -- pango_cairo_show_layout (cr, layout); -+ gdk_draw_layout (priv->main_win, gc, -+ x_loc, y_loc, layout); - - if (calendar->marked_date[day-1] - && calendar->day_month[row][col] == MONTH_CURRENT) -- { -- cairo_move_to (cr, x_loc - 1, y_loc); -- pango_cairo_show_layout (cr, layout); -- } -+ gdk_draw_layout (priv->main_win, gc, -+ x_loc-1, y_loc, layout); - - if (GTK_WIDGET_HAS_FOCUS (calendar) - && calendar->focus_row == row && calendar->focus_col == col) -@@ -2253,7 +2243,6 @@ - } - - g_object_unref (layout); -- cairo_destroy (cr); - } - - static void -Index: gtk+-2.10.6/gtk/gtkentry.c -=================================================================== ---- gtk+-2.10.6.orig/gtk/gtkentry.c 2006-10-30 12:58:30.000000000 +0000 -+++ gtk+-2.10.6/gtk/gtkentry.c 2006-10-30 12:59:30.000000000 +0000 -@@ -3333,7 +3333,6 @@ - if (GTK_WIDGET_DRAWABLE (entry)) - { - PangoLayout *layout = gtk_entry_ensure_layout (entry, TRUE); -- cairo_t *cr; - gint x, y; - gint start_pos, end_pos; - -@@ -3341,56 +3340,60 @@ - - get_layout_position (entry, &x, &y); - -- cr = gdk_cairo_create (entry->text_area); -- -- cairo_move_to (cr, x, y); -- gdk_cairo_set_source_color (cr, &widget->style->text [widget->state]); -- pango_cairo_show_layout (cr, layout); -- -+ gdk_draw_layout (entry->text_area, widget->style->text_gc [widget->state], -+ x, y, -+ layout); -+ - if (gtk_editable_get_selection_bounds (GTK_EDITABLE (entry), &start_pos, &end_pos)) - { - gint *ranges; - gint n_ranges, i; - PangoRectangle logical_rect; -- GdkColor *selection_color, *text_color; -+ GdkGC *selection_gc, *text_gc; - GtkBorder inner_border; -- -+ GdkRegion *clip_region; -+ - pango_layout_get_pixel_extents (layout, NULL, &logical_rect); - gtk_entry_get_pixel_ranges (entry, &ranges, &n_ranges); - - if (GTK_WIDGET_HAS_FOCUS (entry)) - { -- selection_color = &widget->style->base [GTK_STATE_SELECTED]; -- text_color = &widget->style->text [GTK_STATE_SELECTED]; -+ selection_gc = widget->style->base_gc [GTK_STATE_SELECTED]; -+ text_gc = widget->style->text_gc [GTK_STATE_SELECTED]; - } - else - { -- selection_color = &widget->style->base [GTK_STATE_ACTIVE]; -- text_color = &widget->style->text [GTK_STATE_ACTIVE]; -+ selection_gc = widget->style->base_gc [GTK_STATE_ACTIVE]; -+ text_gc = widget->style->text_gc [GTK_STATE_ACTIVE]; - } -- -+ -+ clip_region = gdk_region_new (); - _gtk_entry_effective_inner_border (entry, &inner_border); - - for (i = 0; i < n_ranges; ++i) -- cairo_rectangle (cr, -- inner_border.left - entry->scroll_offset + ranges[2 * i], -- y, -- ranges[2 * i + 1], -- logical_rect.height); -+ { -+ GdkRectangle rect; - -- cairo_clip (cr); -- -- gdk_cairo_set_source_color (cr, selection_color); -- cairo_paint (cr); -+ rect.x = inner_border.left - entry->scroll_offset + ranges[2 * i]; -+ rect.y = y; -+ rect.width = ranges[2 * i + 1]; -+ rect.height = logical_rect.height; -+ -+ gdk_draw_rectangle (entry->text_area, selection_gc, TRUE, -+ rect.x, rect.y, rect.width, rect.height); - -- cairo_move_to (cr, x, y); -- gdk_cairo_set_source_color (cr, text_color); -- pango_cairo_show_layout (cr, layout); -+ gdk_region_union_with_rect (clip_region, &rect); -+ } - -+ gdk_gc_set_clip_region (text_gc, clip_region); -+ gdk_draw_layout (entry->text_area, text_gc, -+ x, y, -+ layout); -+ gdk_gc_set_clip_region (text_gc, NULL); -+ -+ gdk_region_destroy (clip_region); - g_free (ranges); - } -- -- cairo_destroy (cr); - } - } - -Index: gtk+-2.10.6/gtk/gtkwidget.c -=================================================================== ---- gtk+-2.10.6.orig/gtk/gtkwidget.c 2006-10-30 12:58:30.000000000 +0000 -+++ gtk+-2.10.6/gtk/gtkwidget.c 2006-10-30 12:59:30.000000000 +0000 -@@ -5445,7 +5445,8 @@ - GdkScreen *screen; - - update_pango_context (widget, context); -- -+/* TODO: Figure out the proper way to handle this in a pangoxft setting -+ - screen = gtk_widget_get_screen_unchecked (widget); - if (screen) - { -@@ -5453,7 +5454,7 @@ - gdk_screen_get_resolution (screen)); - pango_cairo_context_set_font_options (context, - gdk_screen_get_font_options (screen)); -- } -+ }*/ - } - } - -Index: gtk+-2.10.6/gdk/x11/gdkpango-x11.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gtk+-2.10.6/gdk/x11/gdkpango-x11.c 2006-10-30 12:59:30.000000000 +0000 -@@ -0,0 +1,174 @@ -+/* GDK - The GIMP Drawing Kit -+ * Copyright (C) 2000 Red Hat, Inc. -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+#include <config.h> -+#include <stdlib.h> -+ -+#include "gdkx.h" -+#include "gdkdisplay-x11.h" -+#include "gdkpango.h" -+#include <pango/pangoxft.h> -+#include <pango/pangoxft-render.h> -+#include "gdkalias.h" -+ -+#include <math.h> -+ -+typedef struct _GdkX11Renderer GdkX11Renderer; -+typedef struct _GdkX11RendererClass GdkX11RendererClass; -+ -+#define GDK_TYPE_X11_RENDERER (_gdk_x11_renderer_get_type()) -+#define GDK_X11_RENDERER(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_X11_RENDERER, GdkX11Renderer)) -+#define GDK_IS_X11_RENDERER(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_X11_RENDERER)) -+#define GDK_X11_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_X11_RENDERER, GdkX11RendererClass)) -+#define GDK_IS_X11_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_X11_RENDERER)) -+#define GDK_X11_RENDERER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_X11_RENDERER, GdkX11RendererClass)) -+ -+#define MAX_RENDER_PART PANGO_RENDER_PART_STRIKETHROUGH -+ -+struct _GdkX11Renderer -+{ -+ PangoXftRenderer parent_instance; -+ -+ XRenderPictFormat *mask_format; -+ -+ GdkDrawable *drawable; -+ GdkGC *gc; -+}; -+ -+struct _GdkX11RendererClass -+{ -+ PangoXftRendererClass parent_class; -+}; -+ -+G_DEFINE_TYPE (GdkX11Renderer, _gdk_x11_renderer, PANGO_TYPE_XFT_RENDERER) -+ -+static void -+gdk_x11_renderer_finalize (GObject *object) -+{ -+ G_OBJECT_CLASS (_gdk_x11_renderer_parent_class)->finalize (object); -+} -+ -+static void -+gdk_x11_renderer_composite_trapezoids (PangoXftRenderer *xftrenderer, -+ PangoRenderPart part, -+ XTrapezoid *trapezoids, -+ int n_trapezoids) -+{ -+ /* Because we only use this renderer for "draw_glyphs()" calls, we -+ * won't hit this code path much. However, it is hit for drawing -+ * the "unknown glyph" hex squares. We can safely ignore the part, -+ */ -+ GdkX11Renderer *x11_renderer = GDK_X11_RENDERER (xftrenderer); -+ -+ _gdk_x11_drawable_draw_xtrapezoids (x11_renderer->drawable, -+ x11_renderer->gc, -+ trapezoids, n_trapezoids); -+ -+} -+ -+static void -+gdk_x11_renderer_composite_glyphs (PangoXftRenderer *xftrenderer, -+ XftFont *xft_font, -+ XftGlyphSpec *glyphs, -+ gint n_glyphs) -+{ -+ GdkX11Renderer *x11_renderer = GDK_X11_RENDERER (xftrenderer); -+ -+ _gdk_x11_drawable_draw_xft_glyphs (x11_renderer->drawable, -+ x11_renderer->gc, -+ xft_font, glyphs, n_glyphs); -+} -+ -+static void -+_gdk_x11_renderer_init (GdkX11Renderer *renderer) -+{ -+} -+ -+static void -+_gdk_x11_renderer_class_init (GdkX11RendererClass *klass) -+{ -+ PangoXftRendererClass *xftrenderer_class = PANGO_XFT_RENDERER_CLASS (klass); -+ GObjectClass *object_class = G_OBJECT_CLASS (klass); -+ -+ xftrenderer_class->composite_glyphs = gdk_x11_renderer_composite_glyphs; -+ xftrenderer_class->composite_trapezoids = gdk_x11_renderer_composite_trapezoids; -+ -+ object_class->finalize = gdk_x11_renderer_finalize; -+} -+ -+PangoRenderer * -+_gdk_x11_renderer_get (GdkDrawable *drawable, -+ GdkGC *gc) -+{ -+ GdkScreen *screen = GDK_DRAWABLE_IMPL_X11 (drawable)->screen; -+ GdkScreenX11 *screen_x11 = GDK_SCREEN_X11 (screen); -+ GdkX11Renderer *x11_renderer; -+ -+ if (!screen_x11->renderer) -+ { -+ screen_x11->renderer = g_object_new (GDK_TYPE_X11_RENDERER, -+ "display", GDK_SCREEN_XDISPLAY (screen), -+ "screen", GDK_SCREEN_XNUMBER (screen), -+ NULL); -+ } -+ -+ x11_renderer = GDK_X11_RENDERER (screen_x11->renderer); -+ -+ x11_renderer->drawable = drawable; -+ x11_renderer->gc = gc; -+ -+ return screen_x11->renderer; -+} -+ -+/** -+ * gdk_pango_context_get_for_screen: -+ * @screen: the #GdkScreen for which the context is to be created. -+ * -+ * Creates a #PangoContext for @screen. -+ * -+ * The context must be freed when you're finished with it. -+ * -+ * When using GTK+, normally you should use gtk_widget_get_pango_context() -+ * instead of this function, to get the appropriate context for -+ * the widget you intend to render text onto. -+ * -+ * Return value: a new #PangoContext for @screen -+ * -+ * Since: 2.2 -+ **/ -+PangoContext * -+gdk_pango_context_get_for_screen (GdkScreen *screen) -+{ -+ PangoContext *context; -+ -+ g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL); -+ -+ if (screen->closed) -+ return NULL; -+ -+ context = pango_xft_get_context (GDK_SCREEN_XDISPLAY (screen), -+ GDK_SCREEN_X11 (screen)->screen_num); -+ -+ g_object_set_data (G_OBJECT (context), "gdk-pango-screen", screen); -+ -+ return context; -+} -+ -+#define __GDK_PANGO_X11_C__ -+#include "gdkaliasdef.c" -Index: gtk+-2.10.6/gdk/x11/gdkpixmap-x11.c -=================================================================== ---- gtk+-2.10.6.orig/gdk/x11/gdkpixmap-x11.c 2006-10-30 12:58:30.000000000 +0000 -+++ gtk+-2.10.6/gdk/x11/gdkpixmap-x11.c 2006-10-30 12:59:30.000000000 +0000 -@@ -119,6 +119,9 @@ - { - GdkDrawableImplX11 *draw_impl = GDK_DRAWABLE_IMPL_X11 (impl); - -+ if (draw_impl->xft_draw) -+ XftDrawDestroy (draw_impl->xft_draw); -+ - _gdk_x11_drawable_finish (GDK_DRAWABLE (draw_impl)); - } - ---- gtk+-2.10.6.orig/gtk/gtkcalendar.c.orig 2006-11-14 14:39:34.000000000 -0800 -+++ gtk+-2.10.6/gtk/gtkcalendar.c 2006-11-14 14:37:34.000000000 -0800 -@@ -1495,6 +1495,10 @@ gtk_calendar_realize (GtkWidget *widget) - BACKGROUND_COLOR ( GTK_WIDGET ( calendar))); - gdk_window_show (priv->main_win); - gdk_window_set_user_data (priv->main_win, widget); -+ -+ /* Set widgets gc */ -+ calendar->gc = gdk_gc_new (widget->window); -+ - gdk_window_set_background (widget->window, BACKGROUND_COLOR (widget)); - gdk_window_show (widget->window); - gdk_window_set_user_data (widget->window, widget); diff --git a/packages/gtk+/gtk+-2.10.6/run-iconcache.patch b/packages/gtk+/gtk+-2.10.6/run-iconcache.patch deleted file mode 100644 index 5c114dbdda..0000000000 --- a/packages/gtk+/gtk+-2.10.6/run-iconcache.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: gtk+-2.10.6/gtk/Makefile.am -=================================================================== ---- gtk+-2.10.6.orig/gtk/Makefile.am 2006-10-30 12:56:34.000000000 +0000 -+++ gtk+-2.10.6/gtk/Makefile.am 2006-10-30 12:57:08.000000000 +0000 -@@ -1119,11 +1119,11 @@ - done \ - && touch stamp-icons - --gtkbuiltincache.h: @REBUILD@ stamp-icons -- $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) -- 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$(EXEEXT) -+# 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.6/scroll-timings.patch b/packages/gtk+/gtk+-2.10.6/scroll-timings.patch deleted file mode 100644 index 3f823a7880..0000000000 --- a/packages/gtk+/gtk+-2.10.6/scroll-timings.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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.6/single-click.patch b/packages/gtk+/gtk+-2.10.6/single-click.patch deleted file mode 100644 index 250f1629f5..0000000000 --- a/packages/gtk+/gtk+-2.10.6/single-click.patch +++ /dev/null @@ -1,56 +0,0 @@ -Index: gtk+-2.10.6/gtk/gtkcalendar.c -=================================================================== ---- gtk+-2.10.6.orig/gtk/gtkcalendar.c -+++ gtk+-2.10.6/gtk/gtkcalendar.c -@@ -2482,9 +2482,11 @@ calendar_main_button_press (GtkCalendar - } - - 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) -- { -+ {*/ - priv->in_drag = 0; - if (day_month == MONTH_CURRENT) - g_signal_emit (calendar, -Index: gtk+-2.10.6/gtk/gtkfilesel.c -=================================================================== ---- gtk+-2.10.6.orig/gtk/gtkfilesel.c -+++ gtk+-2.10.6/gtk/gtkfilesel.c -@@ -2426,6 +2426,33 @@ gtk_file_selection_file_changed (GtkTree - 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.6/small-gtkfilesel.patch b/packages/gtk+/gtk+-2.10.6/small-gtkfilesel.patch deleted file mode 100644 index 20bf4cf366..0000000000 --- a/packages/gtk+/gtk+-2.10.6/small-gtkfilesel.patch +++ /dev/null @@ -1,267 +0,0 @@ -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.6/spinbutton.patch b/packages/gtk+/gtk+-2.10.6/spinbutton.patch deleted file mode 100644 index c26dc6d93c..0000000000 --- a/packages/gtk+/gtk+-2.10.6/spinbutton.patch +++ /dev/null @@ -1,130 +0,0 @@ -Index: gtk+-2.10.6/gtk/gtkspinbutton.c -=================================================================== ---- gtk+-2.10.6.orig/gtk/gtkspinbutton.c -+++ gtk+-2.10.6/gtk/gtkspinbutton.c -@@ -682,7 +682,7 @@ gtk_spin_button_size_allocate (GtkWidget - - 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; - -@@ -815,19 +815,16 @@ gtk_spin_button_draw_arrow (GtkSpinButto - { - 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)) -@@ -857,32 +854,17 @@ gtk_spin_button_draw_arrow (GtkSpinButto - 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 */ -@@ -1062,7 +1044,7 @@ gtk_spin_button_button_press (GtkWidget - 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); -@@ -1097,44 +1079,11 @@ gtk_spin_button_button_release (GtkWidge - - 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 (gtk_spin_button_parent_class)->button_release_event (widget, event); -+ return TRUE; - } - - static gint diff --git a/packages/gtk+/gtk+-2.10.6/xsettings.patch b/packages/gtk+/gtk+-2.10.6/xsettings.patch deleted file mode 100644 index b63e262d34..0000000000 --- a/packages/gtk+/gtk+-2.10.6/xsettings.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- 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.7/automake-lossage.patch b/packages/gtk+/gtk+-2.10.7/automake-lossage.patch deleted file mode 100644 index 0d423ddbb9..0000000000 --- a/packages/gtk+/gtk+-2.10.7/automake-lossage.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- 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.7/disable-print.patch b/packages/gtk+/gtk+-2.10.7/disable-print.patch deleted file mode 100644 index 1067773f12..0000000000 --- a/packages/gtk+/gtk+-2.10.7/disable-print.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- 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.7/disable-tooltips.patch b/packages/gtk+/gtk+-2.10.7/disable-tooltips.patch deleted file mode 100644 index d71d839c3c..0000000000 --- a/packages/gtk+/gtk+-2.10.7/disable-tooltips.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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.7/gnome-bug-341177.patch b/packages/gtk+/gtk+-2.10.7/gnome-bug-341177.patch deleted file mode 100644 index c31868462a..0000000000 --- a/packages/gtk+/gtk+-2.10.7/gnome-bug-341177.patch +++ /dev/null @@ -1,217 +0,0 @@ -diff -uprN gtk+-2.8.13.org/gdk-pixbuf/pixops/pixops.c gtk+-2.8.13.INNER_LOOP/gdk-pixbuf/pixops/pixops.c ---- gtk+-2.8.13.org/gdk-pixbuf/pixops/pixops.c Tue Jul 12 18:58:57 2005 -+++ gtk+-2.8.13.INNER_LOOP/gdk-pixbuf/pixops/pixops.c Tue May 9 17:30:53 2006 -@@ -71,35 +71,24 @@ get_check_shift (int check_size) - return check_shift; - } - --static void --pixops_scale_nearest (guchar *dest_buf, -- int render_x0, -- int render_y0, -- int render_x1, -- int render_y1, -- int dest_rowstride, -- int dest_channels, -- gboolean dest_has_alpha, -- const guchar *src_buf, -- int src_width, -- int src_height, -- int src_rowstride, -- int src_channels, -- gboolean src_has_alpha, -- double scale_x, -- double scale_y) --{ -- int i; -- int x; -- int x_step = (1 << SCALE_SHIFT) / scale_x; -- int y_step = (1 << SCALE_SHIFT) / scale_y; -- int xmax, xstart, xstop, x_pos, y_pos; -- const guchar *p; -+typedef struct { guchar a,b,c; } b3; -+extern void BUG_bad_size_of_struct_b3(void); - --#define INNER_LOOP(SRC_CHANNELS,DEST_CHANNELS,ASSIGN_PIXEL) \ -+#define INNER_LOOP_PREP() \ -+ do { \ -+ x = render_x0 * x_step + x_step / 2; \ - xmax = x + (render_x1 - render_x0) * x_step; \ - xstart = MIN (0, xmax); \ - xstop = MIN (src_width << SCALE_SHIFT, xmax); \ -+ } while(0) -+ -+#define INNER_LOOP_BODY(SRC_CHANNELS,DEST_CHANNELS,ASSIGN_PIXEL)\ -+ do { \ -+ y_pos = ((i + render_y0) * y_step + y_step / 2) >> SCALE_SHIFT; \ -+ y_pos = CLAMP (y_pos, 0, src_height - 1); \ -+ src = src_buf + y_pos * src_rowstride; \ -+ dest = dest_buf + i * dest_rowstride; \ -+ x = render_x0 * x_step + x_step / 2; \ - p = src + (CLAMP (x, xstart, xstop) >> SCALE_SHIFT) * SRC_CHANNELS; \ - while (x < xstart) \ - { \ -@@ -121,42 +110,58 @@ pixops_scale_nearest (guchar *des - ASSIGN_PIXEL; \ - dest += DEST_CHANNELS; \ - x += x_step; \ -- } -+ } \ -+ } while(0) - -- for (i = 0; i < (render_y1 - render_y0); i++) -- { -- const guchar *src; -- guchar *dest; -- y_pos = ((i + render_y0) * y_step + y_step / 2) >> SCALE_SHIFT; -- y_pos = CLAMP (y_pos, 0, src_height - 1); -- src = src_buf + y_pos * src_rowstride; -- dest = dest_buf + i * dest_rowstride; -+static void -+pixops_scale_nearest (guchar *dest_buf, -+ int render_x0, -+ int render_y0, -+ int render_x1, -+ int render_y1, -+ int dest_rowstride, -+ int dest_channels, -+ gboolean dest_has_alpha, -+ const guchar *src_buf, -+ int src_width, -+ int src_height, -+ int src_rowstride, -+ int src_channels, -+ gboolean src_has_alpha, -+ double scale_x, -+ double scale_y) -+{ -+ int i; -+ int x; -+ int x_step = (1 << SCALE_SHIFT) / scale_x; -+ int y_step = (1 << SCALE_SHIFT) / scale_y; -+ int xmax, xstart, xstop, x_pos, y_pos; -+ const guchar *p; - -- x = render_x0 * x_step + x_step / 2; -+ const guchar *src; -+ guchar *dest; - -- if (src_channels == 3) -- { -- if (dest_channels == 3) -- { -- INNER_LOOP (3, 3, dest[0]=p[0];dest[1]=p[1];dest[2]=p[2]); -- } -- else -- { -- INNER_LOOP (3, 4, dest[0]=p[0];dest[1]=p[1];dest[2]=p[2];dest[3]=0xff); -- } -- } -- else if (src_channels == 4) -- { -- if (dest_channels == 3) -- { -- INNER_LOOP (4, 3, dest[0]=p[0];dest[1]=p[1];dest[2]=p[2]); -- } -- else -- { -- guint32 *p32; -- INNER_LOOP(4, 4, p32=(guint32*)dest;*p32=*((guint32*)p)); -- } -- } -+ if(sizeof(b3) != 3) BUG_bad_size_of_struct_b3(); -+ -+ INNER_LOOP_PREP(); -+ -+ if (src_channels == 3) -+ { -+ if (dest_channels == 3) -+ for (i = 0; i < (render_y1 - render_y0); i++) -+ INNER_LOOP_BODY (3, 3, *(b3*)dest = *(b3*)p); -+ else -+ for (i = 0; i < (render_y1 - render_y0); i++) -+ INNER_LOOP_BODY (3, 4, (*(b3*)dest = *(b3*)p, dest[3]=0xff) ); -+ } -+ else if (src_channels == 4) -+ { -+ if (dest_channels == 3) -+ for (i = 0; i < (render_y1 - render_y0); i++) -+ INNER_LOOP_BODY (4, 3, *(b3*)dest = *(b3*)p); -+ else -+ for (i = 0; i < (render_y1 - render_y0); i++) -+ INNER_LOOP_BODY (4, 4, *(guint32*)dest = *((guint32*)p)); - } - } - -@@ -187,18 +192,14 @@ pixops_composite_nearest (guchar - const guchar *p; - unsigned int a0; - -+ INNER_LOOP_PREP(); -+ - for (i = 0; i < (render_y1 - render_y0); i++) - { - const guchar *src; - guchar *dest; -- y_pos = ((i + render_y0) * y_step + y_step / 2) >> SCALE_SHIFT; -- y_pos = CLAMP (y_pos, 0, src_height - 1); -- src = src_buf + y_pos * src_rowstride; -- dest = dest_buf + i * dest_rowstride; -- -- x = render_x0 * x_step + x_step / 2; - -- INNER_LOOP(src_channels, dest_channels, -+ INNER_LOOP_BODY(src_channels, dest_channels, - if (src_has_alpha) - a0 = (p[3] * overall_alpha) / 0xff; - else -@@ -209,9 +210,7 @@ pixops_composite_nearest (guchar - case 0: - break; - case 255: -- dest[0] = p[0]; -- dest[1] = p[1]; -- dest[2] = p[2]; -+ *(b3*)dest = *(b3*)p; - if (dest_has_alpha) - dest[3] = 0xff; - break; -@@ -279,17 +278,12 @@ pixops_composite_color_nearest (guchar - const guchar *p; - unsigned int a0; - -+ INNER_LOOP_PREP(); -+ - for (i = 0; i < (render_y1 - render_y0); i++) - { - const guchar *src; - guchar *dest; -- y_pos = ((i + render_y0) * y_step + y_step / 2) >> SCALE_SHIFT; -- y_pos = CLAMP (y_pos, 0, src_height - 1); -- src = src_buf + y_pos * src_rowstride; -- dest = dest_buf + i * dest_rowstride; -- -- x = render_x0 * x_step + x_step / 2; -- - - if (((i + check_y) >> check_shift) & 1) - { -@@ -313,7 +307,7 @@ pixops_composite_color_nearest (guchar - } - - j = 0; -- INNER_LOOP(src_channels, dest_channels, -+ INNER_LOOP_BODY(src_channels, dest_channels, - if (src_has_alpha) - a0 = (p[3] * overall_alpha + 0xff) >> 8; - else -@@ -372,7 +366,8 @@ pixops_composite_color_nearest (guchar - ); - } - } --#undef INNER_LOOP -+#undef INNER_LOOP_BODY -+#undef INNER_LOOP_PREP - - static void - composite_pixel (guchar *dest, int dest_x, int dest_channels, int dest_has_alpha, diff --git a/packages/gtk+/gtk+-2.10.7/gtk+-handhelds.patch b/packages/gtk+/gtk+-2.10.7/gtk+-handhelds.patch deleted file mode 100644 index 1ea86ce6b2..0000000000 --- a/packages/gtk+/gtk+-2.10.7/gtk+-handhelds.patch +++ /dev/null @@ -1,149 +0,0 @@ -Index: gtk+-2.10.6/gtk/gtkarrow.c -=================================================================== ---- gtk+-2.10.6.orig/gtk/gtkarrow.c 2006-05-14 05:25:28.000000000 +0100 -+++ gtk+-2.10.6/gtk/gtkarrow.c 2006-11-14 12:03:45.000000000 +0000 -@@ -31,7 +31,7 @@ - #include "gtkintl.h" - #include "gtkalias.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); - - - G_DEFINE_TYPE (GtkArrow, gtk_arrow, GTK_TYPE_MISC) -@@ -88,6 +90,7 @@ - GTK_PARAM_READWRITE)); - - widget_class->expose_event = gtk_arrow_expose; -+ widget_class->size_request = gtk_arrow_size_request; - } - - static void -@@ -143,13 +146,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; - } -Index: gtk+-2.10.6/gtk/gtkentry.c -=================================================================== ---- gtk+-2.10.6.orig/gtk/gtkentry.c 2006-11-14 12:03:45.000000000 +0000 -+++ gtk+-2.10.6/gtk/gtkentry.c 2006-11-14 12:07:02.000000000 +0000 -@@ -577,6 +577,18 @@ - 0.0, - GTK_PARAM_READWRITE)); - -+ // Added by gtk+-handhelds.patch -+ gtk_widget_class_install_style_property (widget_class, -+ g_param_spec_int ("min_width", -+ P_("Minimum width"), -+ P_("Minimum width of the entry field"), -+ 0, -+ G_MAXINT, -+ MIN_ENTRY_WIDTH, -+ G_PARAM_READABLE)); -+ -+ -+ - /** - * GtkEntry:truncate-multiline: - * -@@ -1286,7 +1298,7 @@ - { - GtkEntry *entry = GTK_ENTRY (widget); - PangoFontMetrics *metrics; -- gint xborder, yborder; -+ gint xborder, yborder, min_width; - GtkBorder inner_border; - PangoContext *context; - -@@ -1302,8 +1314,10 @@ - _gtk_entry_get_borders (entry, &xborder, &yborder); - _gtk_entry_effective_inner_border (entry, &inner_border); - -+ gtk_widget_style_get (widget, "min_width", &min_width, NULL); -+ - if (entry->width_chars < 0) -- requisition->width = MIN_ENTRY_WIDTH + xborder * 2 + inner_border.left + inner_border.right; -+ requisition->width = min_width + xborder * 2 + inner_border.left + inner_border.right; - else - { - gint char_width = pango_font_metrics_get_approximate_char_width (metrics); -Index: gtk+-2.10.6/gtk/gtkrange.c -=================================================================== ---- gtk+-2.10.6.orig/gtk/gtkrange.c 2006-11-14 12:03:44.000000000 +0000 -+++ gtk+-2.10.6/gtk/gtkrange.c 2006-11-14 12:07:40.000000000 +0000 -@@ -197,6 +197,7 @@ - static gboolean gtk_range_key_press (GtkWidget *range, - GdkEventKey *event); - -+static GdkAtom recognize_protocols_atom, atom_atom; - - static guint signals[LAST_SIGNAL]; - -@@ -213,6 +214,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); -+ - gobject_class->set_property = gtk_range_set_property; - gobject_class->get_property = gtk_range_get_property; - gobject_class->finalize = gtk_range_finalize; -@@ -1020,6 +1024,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); - } - -@@ -1569,7 +1579,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; -@@ -1778,7 +1788,7 @@ - return TRUE; - } - -- return FALSE; -+ return TRUE; - } - - /** diff --git a/packages/gtk+/gtk+-2.10.7/gtklabel-resize-patch b/packages/gtk+/gtk+-2.10.7/gtklabel-resize-patch deleted file mode 100644 index df29656343..0000000000 --- a/packages/gtk+/gtk+-2.10.7/gtklabel-resize-patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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.7/hardcoded_libtool.patch b/packages/gtk+/gtk+-2.10.7/hardcoded_libtool.patch deleted file mode 100644 index 6adb0cfef6..0000000000 --- a/packages/gtk+/gtk+-2.10.7/hardcoded_libtool.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- /tmp/configure.in 2007-01-08 17:50:49.000000000 +0100 -+++ gtk+-2.10.7/configure.in 2007-01-08 17:52:33.495251000 +0100 -@@ -371,7 +371,7 @@ - case $enable_explicit_deps in - auto) - export SED -- 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 -@@ -773,7 +773,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/'` -@@ -1611,7 +1611,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 SED --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.7/integer-pixops.patch b/packages/gtk+/gtk+-2.10.7/integer-pixops.patch deleted file mode 100644 index 490a60dd8a..0000000000 --- a/packages/gtk+/gtk+-2.10.7/integer-pixops.patch +++ /dev/null @@ -1,348 +0,0 @@ ---- /tmp/config.h.in 2006-12-23 00:00:38.000000000 +0100 -+++ gtk+-2.10.6/config.h.in 2006-12-23 00:01:05.632227000 +0100 -@@ -253,3 +253,7 @@ - - /* Define to `int' if <sys/types.h> doesn't define. */ - #undef uid_t -+ -+/* Define to use integer math rather than floating point where possible. */ -+#undef ENABLE_INTEGER_PIXOPS -+ ---- /tmp/configure.in 2006-12-23 00:02:16.000000000 +0100 -+++ gtk+-2.10.6/configure.in 2006-12-23 00:05:11.172227000 +0100 -@@ -203,6 +203,15 @@ - [AC_HELP_STRING([--disable-rebuilds], - [disable all source autogeneration rules])],, - [enable_rebuilds=yes]) -+AC_ARG_ENABLE(integer-pixops, -+ [AC_HELP_STRING([--enable-integer-pixops], -+ [use integer math where possible])],, -+ [enable_integer_pixops=no]) -+ -+if test "x$enable_integer_pixops" = "xyes"; then -+ AC_DEFINE(ENABLE_INTEGER_PIXOPS) -+fi -+ - AC_ARG_ENABLE(visibility, - [AC_HELP_STRING([--disable-visibility], - [don't use ELF visibility attributes])],, ---- /tmp/pixops.c 2006-12-23 10:04:02.000000000 +0100 -+++ gtk+-2.10.6/gdk-pixbuf/pixops/pixops.c 2006-12-23 10:04:21.772227000 +0100 -@@ -28,6 +28,10 @@ - #define SUBSAMPLE_MASK ((1 << SUBSAMPLE_BITS)-1) - #define SCALE_SHIFT 16 - -+#ifdef ENABLE_INTEGER_PIXOPS -+#define FRAC 0x10000ULL -+#endif -+ - typedef struct _PixopsFilter PixopsFilter; - typedef struct _PixopsFilterDimension PixopsFilterDimension; - -@@ -972,6 +976,29 @@ - (*pixel_func) (dest, dest_x, dest_channels, dest_has_alpha, src_has_alpha, check_size, color1, color2, r, g, b, a); - } - -+#ifdef ENABLE_INTEGER_PIXOPS -+ -+static void -+correct_total (int *weights, -+ int n_x, -+ int n_y, -+ int total, -+ unsigned long overall_alpha) -+{ -+ int correction = (int)(overall_alpha - total); -+ int i; -+ for (i = n_x * n_y - 1; i >= 0; i--) -+ { -+ if (*(weights + i) + correction >= 0) -+ { -+ *(weights + i) += correction; -+ break; -+ } -+ } -+} -+ -+#else -+ - static void - correct_total (int *weights, - int n_x, -@@ -998,6 +1025,8 @@ - } - } - -+#endif -+ - static int * - make_filter_table (PixopsFilter *filter) - { -@@ -1026,7 +1055,11 @@ - *(pixel_weights + n_x * i + j) = weight; - } - -- correct_total (pixel_weights, n_x, n_y, total, filter->overall_alpha); -+#ifdef ENABLE_INTEGER_PIXOPS -+ correct_total (pixel_weights, n_x, n_y, total, overall_alpha * FRAC); -+#else -+ correct_total (pixel_weights, n_x, n_y, total, overall_alpha); -+#endif - } - - return weights; -@@ -1178,6 +1211,93 @@ - /* Compute weights for reconstruction by replication followed by - * sampling with a box filter - */ -+#ifdef ENABLE_INTEGER_PIXOPS -+ -+static void -+tile_make_weights (PixopsFilter *filter, double x_scale_d, double y_scale_d, double overall_alpha_d) -+{ -+ int i_offset, j_offset; -+ unsigned long x_scale = x_scale_d * FRAC; -+ unsigned long y_scale = y_scale_d * FRAC; -+ unsigned long overall_alpha = overall_alpha_d * FRAC; -+ unsigned long x_scale_r = FRAC / x_scale; -+ unsigned long y_scale_r = FRAC / y_scale; -+ -+ int n_x = ceil(1/x_scale_d + 1); -+ int n_y = ceil(1/y_scale_d + 1); -+ -+ filter->x_offset = 0; -+ filter->y_offset = 0; -+ filter->n_x = n_x; -+ filter->n_y = n_y; -+ filter->weights = g_new (int, SUBSAMPLE * SUBSAMPLE * n_x * n_y); -+ -+ for (i_offset=0; i_offset<SUBSAMPLE; i_offset++) -+ for (j_offset=0; j_offset<SUBSAMPLE; j_offset++) -+ { -+ int *pixel_weights = filter->weights + ((i_offset*SUBSAMPLE) + j_offset) * n_x * n_y; -+ unsigned long x = j_offset * FRAC / SUBSAMPLE; -+ unsigned long y = i_offset * FRAC / SUBSAMPLE; -+ int i,j; -+ int total = 0; -+ -+ for (i = 0; i < n_y; i++) -+ { -+ unsigned long tw, th; -+ -+ if (i < y) -+ { -+ -+ if (i + FRAC > y) -+ th = MIN(i+FRAC, y + y_scale_r) - y; -+ else -+ th = 0; -+ } -+ else -+ { -+ if (y + FRAC/y_scale > i) -+ th = MIN(i+FRAC, y + y_scale_r) - i; -+ else -+ th = 0; -+ } -+ -+ for (j = 0; j < n_x; j++) -+ { -+ int weight; -+ -+ if (j < x) -+ { -+ if (j + FRAC > x) -+ tw = MIN(j+FRAC, x + x_scale_r) - x; -+ else -+ tw = 0; -+ } -+ else -+ { -+ if (x + FRAC/x_scale > j) -+ tw = MIN(j+FRAC, x + x_scale_r) - j; -+ else -+ tw = 0; -+ } -+ -+ { -+ unsigned long lweight = (tw * x_scale) / FRAC; -+ lweight = (lweight * th) / FRAC; -+ lweight = (lweight * y_scale) / FRAC; -+ lweight = (lweight * overall_alpha) / FRAC; -+ weight = lweight; -+ } -+ total += weight; -+ *(pixel_weights + n_x * i + j) = weight; -+ } -+ } -+ -+ correct_total (pixel_weights, n_x, n_y, total, overall_alpha); -+ } -+} -+ -+#else -+ - static void - tile_make_weights (PixopsFilterDimension *dim, - double scale) -@@ -1216,10 +1336,151 @@ - } - } - -+#endif -+ - /* Compute weights for a filter that, for minification - * is the same as 'tiles', and for magnification, is bilinear - * reconstruction followed by a sampling with a delta function. - */ -+#ifdef ENABLE_INTEGER_PIXOPS -+ -+static void -+bilinear_magnify_make_weights (PixopsFilter *filter, double x_scale_d, double y_scale_d, double overall_alpha_d) -+{ -+ int i_offset, j_offset; -+ unsigned long *x_weights, *y_weights; -+ int n_x, n_y; -+ unsigned long x_scale = x_scale_d * FRAC; -+ unsigned long y_scale = y_scale_d * FRAC; -+ unsigned long overall_alpha = overall_alpha_d * FRAC; -+ unsigned long x_scale_r = (FRAC / x_scale_d); -+ unsigned long y_scale_r = (FRAC / y_scale_d); -+ -+ if (x_scale > FRAC) /* Bilinear */ -+ { -+ n_x = 2; -+ filter->x_offset = 0.5 * (1/x_scale_d - 1); -+ } -+ else /* Tile */ -+ { -+ n_x = ceil(1.0 + 1.0/x_scale_d); -+ filter->x_offset = 0.0; -+ } -+ -+ if (y_scale > FRAC) /* Bilinear */ -+ { -+ n_y = 2; -+ filter->y_offset = 0.5 * (1/y_scale_d - 1); -+ } -+ else /* Tile */ -+ { -+ n_y = ceil(1.0 + 1.0/y_scale_d); -+ filter->y_offset = 0.0; -+ } -+ -+ filter->n_y = n_y; -+ filter->n_x = n_x; -+ filter->weights = g_new (int, SUBSAMPLE * SUBSAMPLE * n_x * n_y); -+ -+ x_weights = g_new (unsigned long, n_x); -+ y_weights = g_new (unsigned long, n_y); -+ -+ for (i_offset=0; i_offset<SUBSAMPLE; i_offset++) -+ for (j_offset=0; j_offset<SUBSAMPLE; j_offset++) -+ { -+ int *pixel_weights = filter->weights + ((i_offset*SUBSAMPLE) + j_offset) * n_x * n_y; -+ unsigned long x = j_offset * FRAC / SUBSAMPLE; -+ unsigned long y = i_offset * FRAC / SUBSAMPLE; -+ int i,j; -+ int total = 0; -+ -+ if (x_scale > FRAC) /* Bilinear */ -+ { -+ for (i = 0; i < n_x; i++) -+ { -+ /* x_weights[i] = ((i == 0) ? (1 - x) : x) / x_scale; */ -+ unsigned long w = (((i == 0) ? (FRAC - x) : x) * x_scale_r); -+ x_weights[i] = w / FRAC; -+ } -+ } -+ else /* Tile */ -+ { -+ /* x -+ * ---------|--.-|----|--.-|------- SRC -+ * ------------|---------|--------- DEST -+ */ -+ for (i = 0; i < n_x; i++) -+ { -+ if (i < x) -+ { -+ if (i + 1 > x) -+ x_weights[i] = MIN(FRAC*(i+1), FRAC * x + (((unsigned long long)(FRAC * FRAC)) / (unsigned long)x_scale)) - (x * FRAC); -+ else -+ x_weights[i] = 0; -+ } -+ else -+ { -+ if (x + 1/x_scale > i) -+ x_weights[i] = MIN(FRAC*(i+1), FRAC * x + (((unsigned long long)(FRAC * FRAC)) / (unsigned long)x_scale)) - (i * FRAC); -+ else -+ x_weights[i] = 0; -+ } -+ } -+ } -+ -+ if (y_scale > FRAC) /* Bilinear */ -+ { -+ for (i = 0; i < n_y; i++) -+ { -+ unsigned long w = ((unsigned long)((i == 0) ? (FRAC - y) : y) * y_scale_r); -+ y_weights[i] = w / FRAC; -+ } -+ } -+ else /* Tile */ -+ { -+ /* y -+ * ---------|--.-|----|--.-|------- SRC -+ * ------------|---------|--------- DEST -+ */ -+ for (i = 0; i < n_y; i++) -+ { -+ if (i < y) -+ { -+ if (i + 1 > y) -+ y_weights[i] = MIN(FRAC*(i+1), FRAC * y + (FRAC * FRAC / (unsigned long)y_scale)) - (y * FRAC); -+ else -+ y_weights[i] = 0; -+ } -+ else -+ { -+ if (y + 1/y_scale > i) -+ y_weights[i] = MIN(FRAC*(i+1), FRAC * y + (FRAC * FRAC / (unsigned long)y_scale)) - (i * FRAC); -+ else -+ y_weights[i] = 0; -+ } -+ } -+ } -+ -+ for (i = 0; i < n_y; i++) -+ for (j = 0; j < n_x; j++) -+ { -+ unsigned long long weight = (x_weights[j] * x_scale) / FRAC; -+ weight = (weight * y_weights[i]) / FRAC; -+ weight = (weight * y_scale) / FRAC; -+ weight = (weight * overall_alpha) / FRAC; -+ *(pixel_weights + n_x * i + j) = (unsigned long)weight; -+ total += (unsigned long)weight; -+ } -+ -+ correct_total (pixel_weights, n_x, n_y, total, overall_alpha); -+ } -+ -+ g_free (x_weights); -+ g_free (y_weights); -+} -+ -+#else -+ - static void - bilinear_magnify_make_weights (PixopsFilterDimension *dim, - double scale) -@@ -1283,6 +1544,8 @@ - } - } - -+#endif -+ - /* Computes the integral from b0 to b1 of - * - * f(x) = x; 0 <= x < 1 diff --git a/packages/gtk+/gtk+-2.10.7/menu-deactivate.patch b/packages/gtk+/gtk+-2.10.7/menu-deactivate.patch deleted file mode 100644 index cfb8849e9f..0000000000 --- a/packages/gtk+/gtk+-2.10.7/menu-deactivate.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- 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.7/migration.patch b/packages/gtk+/gtk+-2.10.7/migration.patch deleted file mode 100644 index 4ee786e688..0000000000 --- a/packages/gtk+/gtk+-2.10.7/migration.patch +++ /dev/null @@ -1,611 +0,0 @@ -Index: configure.in -=================================================================== ---- configure.in.orig 2006-10-03 17:54:09.000000000 +0100 -+++ configure.in 2006-10-30 12:58:33.000000000 +0000 -@@ -1529,6 +1529,16 @@ - GTK_EXTRA_CFLAGS="$msnative_struct" - fi - -+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 -=================================================================== ---- gtk/Makefile.am.orig 2006-10-02 18:27:53.000000000 +0100 -+++ gtk/Makefile.am 2006-10-30 12:59:14.000000000 +0000 -@@ -589,6 +589,11 @@ - gtkwindow-decorate.c \ - gtkwindow.c \ - $(gtk_clipboard_dnd_c_sources) -+ -+if ENABLE_MIGRATION -+gtk_base_c_sources += gtkmigration.c -+endif -+ - gtk_c_sources = $(gtk_base_c_sources) - gtk_all_c_sources = $(gtk_base_c_sources) - -Index: gtk/gtkmain.c -=================================================================== ---- gtk/gtkmain.c.orig 2006-09-03 06:31:21.000000000 +0100 -+++ gtk/gtkmain.c 2006-10-30 12:56:34.000000000 +0000 -@@ -507,6 +507,10 @@ - _gtk_accel_map_init (); - _gtk_rc_init (); - -+#ifdef ENABLE_MIGRATION -+ gtk_migration_init (); -+#endif -+ - /* Set the 'initialized' flag. - */ - gtk_initialized = TRUE; -Index: gtk/gtkmigration.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gtk/gtkmigration.c 2006-10-30 12:56:34.000000000 +0000 -@@ -0,0 +1,529 @@ -+/* -+ * Copyright (C) 2003, 2005 Philip Blundell <philb@gnu.org> -+ * -+ * 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 <stdlib.h> -+#include <ctype.h> -+#include <libintl.h> -+#include <string.h> -+#include <assert.h> -+ -+#include <X11/X.h> -+#include <X11/Xlib.h> -+#include <X11/Xatom.h> -+ -+#include <gcrypt.h> -+ -+#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; -+} -Index: gtk/gtkwindow.c -=================================================================== ---- gtk/gtkwindow.c.orig 2006-10-03 16:51:46.000000000 +0100 -+++ gtk/gtkwindow.c 2006-10-30 12:56:34.000000000 +0000 -@@ -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.7/no-demos.patch b/packages/gtk+/gtk+-2.10.7/no-demos.patch deleted file mode 100644 index 0fc4c48d1a..0000000000 --- a/packages/gtk+/gtk+-2.10.7/no-demos.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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.7/no-xwc.patch b/packages/gtk+/gtk+-2.10.7/no-xwc.patch deleted file mode 100644 index affb4a303e..0000000000 --- a/packages/gtk+/gtk+-2.10.7/no-xwc.patch +++ /dev/null @@ -1,151 +0,0 @@ -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.7/run-iconcache.patch b/packages/gtk+/gtk+-2.10.7/run-iconcache.patch deleted file mode 100644 index ac15e9ab24..0000000000 --- a/packages/gtk+/gtk+-2.10.7/run-iconcache.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- /tmp/Makefile.am 2007-01-08 17:44:47.000000000 +0100 -+++ gtk+-2.10.7/gtk/Makefile.am 2007-01-08 17:45:17.025251000 +0100 -@@ -1128,11 +1128,11 @@ - ./gtk-update-icon-cache - endif - --gtkbuiltincache.h: @REBUILD@ stamp-icons -- $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) -- $(gtk_update_icon_cache_program) --force --ignore-theme-index \ -- --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \ -- mv gtkbuiltincache.h.tmp gtkbuiltincache.h -+#gtkbuiltincache.h: @REBUILD@ stamp-icons -+# $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) -+# $(gtk_update_icon_cache_program) --force --ignore-theme-index \ -+# --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \ -+# mv gtkbuiltincache.h.tmp gtkbuiltincache.h - - EXTRA_DIST += \ - $(STOCK_ICONS) \ diff --git a/packages/gtk+/gtk+-2.10.7/scroll-timings.patch b/packages/gtk+/gtk+-2.10.7/scroll-timings.patch deleted file mode 100644 index 3f823a7880..0000000000 --- a/packages/gtk+/gtk+-2.10.7/scroll-timings.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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.7/single-click.patch b/packages/gtk+/gtk+-2.10.7/single-click.patch deleted file mode 100644 index 250f1629f5..0000000000 --- a/packages/gtk+/gtk+-2.10.7/single-click.patch +++ /dev/null @@ -1,56 +0,0 @@ -Index: gtk+-2.10.6/gtk/gtkcalendar.c -=================================================================== ---- gtk+-2.10.6.orig/gtk/gtkcalendar.c -+++ gtk+-2.10.6/gtk/gtkcalendar.c -@@ -2482,9 +2482,11 @@ calendar_main_button_press (GtkCalendar - } - - 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) -- { -+ {*/ - priv->in_drag = 0; - if (day_month == MONTH_CURRENT) - g_signal_emit (calendar, -Index: gtk+-2.10.6/gtk/gtkfilesel.c -=================================================================== ---- gtk+-2.10.6.orig/gtk/gtkfilesel.c -+++ gtk+-2.10.6/gtk/gtkfilesel.c -@@ -2426,6 +2426,33 @@ gtk_file_selection_file_changed (GtkTree - 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.7/small-gtkfilesel.patch b/packages/gtk+/gtk+-2.10.7/small-gtkfilesel.patch deleted file mode 100644 index 20bf4cf366..0000000000 --- a/packages/gtk+/gtk+-2.10.7/small-gtkfilesel.patch +++ /dev/null @@ -1,267 +0,0 @@ -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.7/spinbutton.patch b/packages/gtk+/gtk+-2.10.7/spinbutton.patch deleted file mode 100644 index c26dc6d93c..0000000000 --- a/packages/gtk+/gtk+-2.10.7/spinbutton.patch +++ /dev/null @@ -1,130 +0,0 @@ -Index: gtk+-2.10.6/gtk/gtkspinbutton.c -=================================================================== ---- gtk+-2.10.6.orig/gtk/gtkspinbutton.c -+++ gtk+-2.10.6/gtk/gtkspinbutton.c -@@ -682,7 +682,7 @@ gtk_spin_button_size_allocate (GtkWidget - - 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; - -@@ -815,19 +815,16 @@ gtk_spin_button_draw_arrow (GtkSpinButto - { - 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)) -@@ -857,32 +854,17 @@ gtk_spin_button_draw_arrow (GtkSpinButto - 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 */ -@@ -1062,7 +1044,7 @@ gtk_spin_button_button_press (GtkWidget - 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); -@@ -1097,44 +1079,11 @@ gtk_spin_button_button_release (GtkWidge - - 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 (gtk_spin_button_parent_class)->button_release_event (widget, event); -+ return TRUE; - } - - static gint diff --git a/packages/gtk+/gtk+-2.10.7/xsettings.patch b/packages/gtk+/gtk+-2.10.7/xsettings.patch deleted file mode 100644 index b63e262d34..0000000000 --- a/packages/gtk+/gtk+-2.10.7/xsettings.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- 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.7.bb b/packages/gtk+/gtk+-directfb_2.10.9.bb index f78b9d459c..f8062f33f7 100644 --- a/packages/gtk+/gtk+_2.10.7.bb +++ b/packages/gtk+/gtk+-directfb_2.10.9.bb @@ -4,6 +4,10 @@ PR = "r0" # disable per default - untested and not all patches included. DEFAULT_PREFERENCE = "-1" +S = "${WORKDIR}/gtk+-${PV}" + +LDFLAGS_append += " -ldirectfb" +CFLAGS_append += " -I${STAGING_INCDIR}/directfb" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \ file://no-xwc.patch;patch=1 \ @@ -20,5 +24,15 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \ file://no-demos.patch;patch=1 \ file://single-click.patch;patch=1 \ file://spinbutton.patch;patch=1 \ - file://gtk+-handhelds.patch;patch=1" + file://gtk+-handhelds.patch;patch=1 \ + file://directfb_pixbuf_deprecated_fix.patch;patch=1 \ +# file://gtk-doc.patch;patch=1 \ +" +EXTRA_OECONF =" \ + --prefix=${STAGING_DIR} \ + --with-gdktarget=directfb \ + --without-x \ + --without-libtiff \ + " +GDKTARGET="directfb" diff --git a/packages/gtk+/gtk+_2.10.3.bb b/packages/gtk+/gtk+_2.10.3.bb deleted file mode 100644 index 51a79598dd..0000000000 --- a/packages/gtk+/gtk+_2.10.3.bb +++ /dev/null @@ -1,103 +0,0 @@ -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" -DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cairo cups" -PR = "r3" - -# 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-update-icon-cache \ - ${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 \ - ${libdir}/gtk-2.0/${LIBV}/loaders/*.la \ - ${libdir}/gtk-2.0/${LIBV}/immodules/*.la \ - ${libdir}/gtk-2.0/${LIBV}/engines/*.la \ - ${bindir}/gdk-pixbuf-csource" -FILES_${PN}-dbg += " \ - ${libdir}/gtk-2.0/${LIBV}/loaders/.debug/* \ - ${libdir}/gtk-2.0/${LIBV}/immodules/.debug/* \ - ${libdir}/gtk-2.0/${LIBV}/engines/.debug/*" - - -RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1 ttf-dejavu-sans" -RRECOMMENDS_${PN}_angstrom = "glibc-gconv-iso8859-1 ttf-dejavu-sans gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" -RRECOMMENDS_${PN}_openzaurus = "glibc-gconv-iso8859-1 ttf-dejavu-sans 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-2.0 > /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) -} diff --git a/packages/gtk+/gtk+_2.10.6.bb b/packages/gtk+/gtk+_2.10.6.bb deleted file mode 100644 index 33be0019cb..0000000000 --- a/packages/gtk+/gtk+_2.10.6.bb +++ /dev/null @@ -1,103 +0,0 @@ -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" -DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cairo cups" -PR = "r7" - -# 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://hardcoded_libtool.patch;patch=1 \ - file://no-demos.patch;patch=1 \ - file://pangoxft2.10.6.diff;patch=1 \ - file://single-click.patch;patch=1 \ - file://spinbutton.patch;patch=1 \ - file://gtk+-handhelds.patch;patch=1" - -inherit autotools pkgconfig - -FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ - ${bindir}/gtk-update-icon-cache \ - ${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 \ - ${libdir}/gtk-2.0/${LIBV}/loaders/*.la \ - ${libdir}/gtk-2.0/${LIBV}/immodules/*.la \ - ${libdir}/gtk-2.0/${LIBV}/engines/*.la \ - ${bindir}/gdk-pixbuf-csource" -FILES_${PN}-dbg += " \ - ${libdir}/gtk-2.0/${LIBV}/loaders/.debug/* \ - ${libdir}/gtk-2.0/${LIBV}/immodules/.debug/* \ - ${libdir}/gtk-2.0/${LIBV}/engines/.debug/*" - - -RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1 ttf-dejavu-sans" -RRECOMMENDS_${PN}_angstrom = "glibc-gconv-iso8859-1 ttf-dejavu-sans gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" -RRECOMMENDS_${PN}_openzaurus = "glibc-gconv-iso8859-1 ttf-dejavu-sans 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-2.0 > /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) -} diff --git a/packages/gtk+/gtk-2.10.inc b/packages/gtk+/gtk-2.10.inc index 0a5860f01a..6f9035055b 100644 --- a/packages/gtk+/gtk-2.10.inc +++ b/packages/gtk+/gtk-2.10.inc @@ -33,11 +33,13 @@ RRECOMMENDS_${PN}_openzaurus = "glibc-gconv-iso8859-1 ttf-dejavu-sans gdk-pixbuf EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-display-migration" +export GDKTARGET="x11" + 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 gtk libgtk-$GDKTARGET-2.0 ${STAGING_LIBDIR} + oe_libinstall -so -C gdk libgdk-$GDKTARGET-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} diff --git a/packages/images/foonas-image.bb b/packages/images/foonas-image.bb index 3d2c621438..8dc2370b5e 100644 --- a/packages/images/foonas-image.bb +++ b/packages/images/foonas-image.bb @@ -2,20 +2,11 @@ DESCRIPTION = "Foonas image" LICENSE = "GPL" PR = "r0" -inherit image +inherit image n2100-image turbostation-image lsppchg-image lsppchd-image storcenter-image DEPENDS = "${MACHINE_TASK_PROVIDER} makedevs-native mtd-utils-native" -DEPENDS_n2100 += "openssl-native" - -IMAGE_POSTPROCESS_COMMAND += "${PACK_IMAGE}" -PACK_IMAGE_DEPENDS = "" -PACK_IMAGE = '${MACHINE}_pack_image;' -IMAGE_PREPROCESS_COMMAND += "sed -i -es,^id:5:initdefault:,id:3:initdefault:, ${IMAGE_ROOTFS}/etc/inittab;" -IMAGE_PREPROCESS_COMMAND += "sed -i -es,^root::0,root:BTMzOOAQfESg6:0, ${IMAGE_ROOTFS}/etc/passwd;" -IMAGE_PREPROCESS_COMMAND += "sed -i -es,^VERBOSE=no,VERBOSE=very, ${IMAGE_ROOTFS}/etc/default/rcS;" -FOONAS_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-slugos.txt')}" -EXTRA_IMAGECMD_jffs2 += " --eraseblock=${ERASEBLOCK_SIZE} -D ${FOONAS_DEVICE_TABLE}" +EXTRA_IMAGECMD_jffs2 += " --pad --eraseblock=${ERASEBLOCK_SIZE} -D ${FOONAS_DEVICE_TABLE}" IMAGE_LINGUAS = "" RDEPENDS = " \ @@ -25,78 +16,10 @@ RDEPENDS = " \ module-init-tools-depmod modutils-initscripts \ ipkg-collateral ipkg ipkg-link \ libgcc1 diffutils cpio findutils\ - portmap \ - dropbear \ - e2fsprogs-blkid \ - mdadm \ - hdparm \ - mtd-utils \ - udev \ + dropbear e2fsprogs-blkid \ + mdadm hdparm mtd-utils udev \ ${FOONAS_SUPPORT} \ ${FOONAS_KERNEL} " PACKAGE_INSTALL = "${RDEPENDS}" -# At this point you have to make a ${MACHINE}_pack_image for your machine. - -turbostation_pack_image() { - # find latest kernel - KERNEL=`ls -tr ${DEPLOY_DIR_IMAGE}/uImage* | tail -1` - if [ -z "$KERNEL" ]; then - oefatal "No kernel found in ${DEPLOY_DIR_IMAGE}. Bitbake linux-turbostation to create one." - exit 1 - fi - ROOTFS=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 - OUTPUT=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.flash.img - PADFILE=${DEPLOY_DIR_IMAGE}/padfile.zzz - HEX_MAX_KERN_SIZE=200000 - DEC_MAX_KERN_SIZE=`echo "ibase=16; $HEX_MAX_KERN_SIZE" | bc ` - HEX_MAX_ROOT_SIZE=D00000 - DEC_MAX_ROOT_SIZE=`echo "ibase=16; $HEX_MAX_ROOT_SIZE" | bc ` - KERNEL_SIZE=`ls -l $KERNEL | awk '{print $5}'` - if [ $KERNEL_SIZE -gt $DEC_MAX_KERN_SIZE ]; then - oefatal "Kernel too large at $KERNEL_SIZE bytes. Max is $DEC_MAX_KERN_SIZE." - exit 1 - fi - ROOT_SIZE=`ls -l $ROOTFS | awk '{print $5}'` - if [ $ROOT_SIZE -gt $DEC_MAX_ROOT_SIZE ]; then - oefatal "Rootfs is too large at $ROOT_SIZE bytes. Max is $DEC_MAX_ROOT_SIZE." - exit 1 - fi - PAD_SIZE=`echo "$DEC_MAX_KERN_SIZE - $KERNEL_SIZE" | bc ` - dd if=/dev/zero of=$PADFILE bs=$PAD_SIZE count=1 2>>/dev/null - cat $KERNEL $PADFILE $ROOTFS > $OUTPUT - rm -f $PADFILE - ls -l $OUTPUT -} - -n2100_pack_image() { - # find latest kernel - KERNEL=`ls -tr ${DEPLOY_DIR_IMAGE}/zImage* | tail -1` - if [ -z "$KERNEL" ]; then - oefatal "No kernel found in ${DEPLOY_DIR_IMAGE}. Bitbake linux to create one." - exit 1 - fi - ROOTFS=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 - OUTPUT=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.flash.img - PADFILE=${DEPLOY_DIR_IMAGE}/padfile.zzz - HEX_MAX_KERN_SIZE=1C0000 - DEC_MAX_KERN_SIZE=`echo "ibase=16; $HEX_MAX_KERN_SIZE" | bc ` - HEX_MAX_ROOT_SIZE=DC0000 - DEC_MAX_ROOT_SIZE=`echo "ibase=16; $HEX_MAX_ROOT_SIZE" | bc ` - KERNEL_SIZE=`ls -l $KERNEL | awk '{print $5}'` - if [ $KERNEL_SIZE -gt $DEC_MAX_KERN_SIZE ]; then - oefatal "Kernel too large at $KERNEL_SIZE bytes. Max is $DEC_MAX_KERN_SIZE." - exit 1 - fi - ROOT_SIZE=`ls -l $ROOTFS | awk '{print $5}'` - if [ $ROOT_SIZE -gt $DEC_MAX_ROOT_SIZE ]; then - oefatal "Rootfs is too large at $ROOT_SIZE bytes. Max is $DEC_MAX_ROOT_SIZE." - exit 1 - fi - PAD_SIZE=`echo "$DEC_MAX_KERN_SIZE - $KERNEL_SIZE" | bc ` - dd if=/dev/zero of=$PADFILE bs=$PAD_SIZE count=1 2>>/dev/null - cat $KERNEL $PADFILE $ROOTFS > $OUTPUT - rm -f $PADFILE - ls -l $OUTPUT -}
\ No newline at end of file diff --git a/packages/images/openmoko-image.bb b/packages/images/openmoko-image.bb index 0ebddcb276..632963076c 100644 --- a/packages/images/openmoko-image.bb +++ b/packages/images/openmoko-image.bb @@ -14,7 +14,9 @@ export PACKAGE_INSTALL = "\ task-openmoko-phone \ task-openmoko-finger \ task-openmoko-pim \ -" + task-openmoko-demo \ + " + DEPENDS = "\ ${MACHINE_TASK_PROVIDER} \ task-openmoko \ diff --git a/packages/initscripts/initscripts-1.0/oplinux-uclibc/.mtn2git_empty b/packages/initscripts/initscripts-1.0/oplinux-uclibc/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/initscripts/initscripts-1.0/oplinux-uclibc/.mtn2git_empty diff --git a/packages/initscripts/initscripts-1.0/oplinux-uclibc/checkroot.sh b/packages/initscripts/initscripts-1.0/oplinux-uclibc/checkroot.sh new file mode 100755 index 0000000000..e5fc6ed8b5 --- /dev/null +++ b/packages/initscripts/initscripts-1.0/oplinux-uclibc/checkroot.sh @@ -0,0 +1,201 @@ +# +# checkroot.sh Check to root filesystem. +# +# Version: @(#)checkroot.sh 2.84 25-Jan-2002 miquels@cistron.nl +# + +. /etc/default/rcS + +# +# Set SULOGIN in /etc/default/rcS to yes if you want a sulogin to be spawned +# from this script *before anything else* with a timeout, like SCO does. +# +test "$SULOGIN" = yes && sulogin -t 30 $CONSOLE + +# +# Ensure that bdflush (update) is running before any major I/O is +# performed (the following fsck is a good example of such activity :). +# +test -x /sbin/update && update + +# +# Read /etc/fstab. +# +exec 9>&0 </etc/fstab +rootmode=rw +rootopts=rw +test "$ENABLE_ROOTFS_FSCK" = yes && rootcheck="yes" || rootcheck="no" +swap_on_md=no +devfs= +while read fs mnt type opts dump pass junk +do + case "$fs" in + ""|\#*) + continue; + ;; + /dev/md*) + # Swap on md device. + test "$type" = swap && swap_on_md=yes + ;; + /dev/*) + ;; + *) + # Might be a swapfile. + test "$type" = swap && swap_on_md=yes + ;; + esac + + test "$type" = devfs && devfs="$fs" + + # Currently we do not care about the other entries + if test "$mnt" = "/" + then + #echo "[$fs] [$mnt] [$type] [$opts] [$dump] [$pass] [$junk]" + + rootopts="$opts" + roottype="$type" + + #The "spinner" is broken on busybox sh + TERM=dumb + + test "$pass" = 0 -o "$pass" = "" && rootcheck=no + + # Enable fsck for ext2 and ext3 rootfs, disable for everything else + case "$type" in + ext2|ext3) rootcheck=yes;; + *) rootcheck=no;; + esac + + if test "$rootcheck" = yes + then + if ! test -x "/sbin/fsck.${roottype}" + then + echo -e "\n * * * WARNING: /sbin/fsck.${roottype} is missing! * * *\n" + rootcheck=no + fi + fi + + case "$opts" in + ro|ro,*|*,ro|*,ro,*) + rootmode=ro + ;; + esac + fi +done +exec 0>&9 9>&- + +# +# Activate the swap device(s) in /etc/fstab. This needs to be done +# before fsck, since fsck can be quite memory-hungry. +# +doswap=no +test -d /proc/1 || mount -n /proc +case "`uname -r`" in + 2.[0123].*) + if test $swap_on_md = yes && grep -qs resync /proc/mdstat + then + test "$VERBOSE" != no && echo "Not activating swap - RAID array resyncing" + else + doswap=yes + fi + ;; + *) + doswap=yes + ;; +esac +if test $doswap = yes +then + test "$VERBOSE" != no && echo "Activating swap" + swapon -a 2> /dev/null +fi + +# +# Check the root filesystem. +# +if test -f /fastboot || test $rootcheck = no +then + test $rootcheck = yes && echo "Fast boot, no filesystem check" +else + # + # Ensure that root is quiescent and read-only before fsck'ing. + # + mount -n -o remount,ro / + if test $? = 0 + then + if test -f /forcefsck + then + force="-f" + else + force="" + fi + if test "$FSCKFIX" = yes + then + fix="-y" + else + fix="-a" + fi + spinner="-C" + case "$TERM" in + dumb|network|unknown|"") spinner="" ;; + esac + test `uname -m` = s390 && spinner="" # This should go away + test "$VERBOSE" != no && echo "Checking root filesystem..." + fsck $spinner $force $fix / + # + # If there was a failure, drop into single-user mode. + # + # NOTE: "failure" is defined as exiting with a return code of + # 2 or larger. A return code of 1 indicates that filesystem + # errors were corrected but that the boot may proceed. + # + if test "$?" -gt 1 + then + # Surprise! Re-directing from a HERE document (as in + # "cat << EOF") won't work, because the root is read-only. + echo + echo "fsck failed. Please repair manually and reboot. Please note" + echo "that the root filesystem is currently mounted read-only. To" + echo "remount it read-write:" + echo + echo " # mount -n -o remount,rw /" + echo + echo "CONTROL-D will exit from this shell and REBOOT the system." + echo + # Start a single user shell on the console + /sbin/sulogin $CONSOLE + reboot -f + fi + else + echo "*** ERROR! Cannot fsck root fs because it is not mounted read-only!" + echo + fi +fi + +# +# If the root filesystem was not marked as read-only in /etc/fstab, +# remount the rootfs rw but do not try to change mtab because it +# is on a ro fs until the remount succeeded. Then clean up old mtabs +# and finally write the new mtab. +# This part is only needed if the rootfs was mounted ro. +# + +if [ $(grep "/dev/root" /proc/mounts | awk '{print $4}') = rw ]; then + exit 0 +fi + + +echo "Remounting root file system..." +mount -n -o remount,$rootmode / +if test "$rootmode" = rw +then + if test ! -L /etc/mtab + then + rm -f /etc/mtab~ /etc/nologin + : > /etc/mtab + fi + mount -f -o remount / + mount -f /proc + test "$devfs" && grep -q '^devfs /dev' /proc/mounts && mount -f "$devfs" +fi + +: exit 0 diff --git a/packages/initscripts/initscripts-1.0/oplinux/.mtn2git_empty b/packages/initscripts/initscripts-1.0/oplinux/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/initscripts/initscripts-1.0/oplinux/.mtn2git_empty diff --git a/packages/initscripts/initscripts-1.0/oplinux/checkroot.sh b/packages/initscripts/initscripts-1.0/oplinux/checkroot.sh new file mode 100755 index 0000000000..e5fc6ed8b5 --- /dev/null +++ b/packages/initscripts/initscripts-1.0/oplinux/checkroot.sh @@ -0,0 +1,201 @@ +# +# checkroot.sh Check to root filesystem. +# +# Version: @(#)checkroot.sh 2.84 25-Jan-2002 miquels@cistron.nl +# + +. /etc/default/rcS + +# +# Set SULOGIN in /etc/default/rcS to yes if you want a sulogin to be spawned +# from this script *before anything else* with a timeout, like SCO does. +# +test "$SULOGIN" = yes && sulogin -t 30 $CONSOLE + +# +# Ensure that bdflush (update) is running before any major I/O is +# performed (the following fsck is a good example of such activity :). +# +test -x /sbin/update && update + +# +# Read /etc/fstab. +# +exec 9>&0 </etc/fstab +rootmode=rw +rootopts=rw +test "$ENABLE_ROOTFS_FSCK" = yes && rootcheck="yes" || rootcheck="no" +swap_on_md=no +devfs= +while read fs mnt type opts dump pass junk +do + case "$fs" in + ""|\#*) + continue; + ;; + /dev/md*) + # Swap on md device. + test "$type" = swap && swap_on_md=yes + ;; + /dev/*) + ;; + *) + # Might be a swapfile. + test "$type" = swap && swap_on_md=yes + ;; + esac + + test "$type" = devfs && devfs="$fs" + + # Currently we do not care about the other entries + if test "$mnt" = "/" + then + #echo "[$fs] [$mnt] [$type] [$opts] [$dump] [$pass] [$junk]" + + rootopts="$opts" + roottype="$type" + + #The "spinner" is broken on busybox sh + TERM=dumb + + test "$pass" = 0 -o "$pass" = "" && rootcheck=no + + # Enable fsck for ext2 and ext3 rootfs, disable for everything else + case "$type" in + ext2|ext3) rootcheck=yes;; + *) rootcheck=no;; + esac + + if test "$rootcheck" = yes + then + if ! test -x "/sbin/fsck.${roottype}" + then + echo -e "\n * * * WARNING: /sbin/fsck.${roottype} is missing! * * *\n" + rootcheck=no + fi + fi + + case "$opts" in + ro|ro,*|*,ro|*,ro,*) + rootmode=ro + ;; + esac + fi +done +exec 0>&9 9>&- + +# +# Activate the swap device(s) in /etc/fstab. This needs to be done +# before fsck, since fsck can be quite memory-hungry. +# +doswap=no +test -d /proc/1 || mount -n /proc +case "`uname -r`" in + 2.[0123].*) + if test $swap_on_md = yes && grep -qs resync /proc/mdstat + then + test "$VERBOSE" != no && echo "Not activating swap - RAID array resyncing" + else + doswap=yes + fi + ;; + *) + doswap=yes + ;; +esac +if test $doswap = yes +then + test "$VERBOSE" != no && echo "Activating swap" + swapon -a 2> /dev/null +fi + +# +# Check the root filesystem. +# +if test -f /fastboot || test $rootcheck = no +then + test $rootcheck = yes && echo "Fast boot, no filesystem check" +else + # + # Ensure that root is quiescent and read-only before fsck'ing. + # + mount -n -o remount,ro / + if test $? = 0 + then + if test -f /forcefsck + then + force="-f" + else + force="" + fi + if test "$FSCKFIX" = yes + then + fix="-y" + else + fix="-a" + fi + spinner="-C" + case "$TERM" in + dumb|network|unknown|"") spinner="" ;; + esac + test `uname -m` = s390 && spinner="" # This should go away + test "$VERBOSE" != no && echo "Checking root filesystem..." + fsck $spinner $force $fix / + # + # If there was a failure, drop into single-user mode. + # + # NOTE: "failure" is defined as exiting with a return code of + # 2 or larger. A return code of 1 indicates that filesystem + # errors were corrected but that the boot may proceed. + # + if test "$?" -gt 1 + then + # Surprise! Re-directing from a HERE document (as in + # "cat << EOF") won't work, because the root is read-only. + echo + echo "fsck failed. Please repair manually and reboot. Please note" + echo "that the root filesystem is currently mounted read-only. To" + echo "remount it read-write:" + echo + echo " # mount -n -o remount,rw /" + echo + echo "CONTROL-D will exit from this shell and REBOOT the system." + echo + # Start a single user shell on the console + /sbin/sulogin $CONSOLE + reboot -f + fi + else + echo "*** ERROR! Cannot fsck root fs because it is not mounted read-only!" + echo + fi +fi + +# +# If the root filesystem was not marked as read-only in /etc/fstab, +# remount the rootfs rw but do not try to change mtab because it +# is on a ro fs until the remount succeeded. Then clean up old mtabs +# and finally write the new mtab. +# This part is only needed if the rootfs was mounted ro. +# + +if [ $(grep "/dev/root" /proc/mounts | awk '{print $4}') = rw ]; then + exit 0 +fi + + +echo "Remounting root file system..." +mount -n -o remount,$rootmode / +if test "$rootmode" = rw +then + if test ! -L /etc/mtab + then + rm -f /etc/mtab~ /etc/nologin + : > /etc/mtab + fi + mount -f -o remount / + mount -f /proc + test "$devfs" && grep -q '^devfs /dev' /proc/mounts && mount -f "$devfs" +fi + +: exit 0 diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb index 06a6017e15..33cbf9ca03 100644 --- a/packages/initscripts/initscripts_1.0.bb +++ b/packages/initscripts/initscripts_1.0.bb @@ -5,7 +5,7 @@ DEPENDS = "makedevs" DEPENDS_openzaurus = "makedevs virtual/kernel" RDEPENDS = "makedevs" LICENSE = "GPL" -PR = "r86" +PR = "r87" SRC_URI = "file://halt \ file://ramdisk \ diff --git a/packages/ipkg/ipkg-collateral.bb b/packages/ipkg/ipkg-collateral.bb index ec45a10e2d..cfe7d71c2d 100644 --- a/packages/ipkg/ipkg-collateral.bb +++ b/packages/ipkg/ipkg-collateral.bb @@ -1,7 +1,7 @@ DESCRIPTION = "ipkg configuration files" SECTION = "base" LICENSE = "MIT" -PR = "r5" +PR = "r6" PACKAGE_ARCH = "all" SRC_URI = " \ diff --git a/packages/ipkg/ipkg-collateral/oplinux-uclibc/.mtn2git_empty b/packages/ipkg/ipkg-collateral/oplinux-uclibc/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/ipkg/ipkg-collateral/oplinux-uclibc/.mtn2git_empty diff --git a/packages/ipkg/ipkg-collateral/oplinux-uclibc/dest b/packages/ipkg/ipkg-collateral/oplinux-uclibc/dest new file mode 100644 index 0000000000..b786746b63 --- /dev/null +++ b/packages/ipkg/ipkg-collateral/oplinux-uclibc/dest @@ -0,0 +1,3 @@ +dest root / +dest ram /tmp +dest smbfs /tmp/smbfs diff --git a/packages/ipkg/ipkg-collateral/oplinux/.mtn2git_empty b/packages/ipkg/ipkg-collateral/oplinux/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/ipkg/ipkg-collateral/oplinux/.mtn2git_empty diff --git a/packages/ipkg/ipkg-collateral/oplinux/dest b/packages/ipkg/ipkg-collateral/oplinux/dest new file mode 100644 index 0000000000..b786746b63 --- /dev/null +++ b/packages/ipkg/ipkg-collateral/oplinux/dest @@ -0,0 +1,3 @@ +dest root / +dest ram /tmp +dest smbfs /tmp/smbfs diff --git a/packages/linux/linux-efika-2.6.20/0033-EFIKA-fullduplex-prpl_aln.txt b/packages/linux/linux-efika-2.6.20/0033-EFIKA-fullduplex-prpl_aln.txt new file mode 100644 index 0000000000..6feba7b112 --- /dev/null +++ b/packages/linux/linux-efika-2.6.20/0033-EFIKA-fullduplex-prpl_aln.txt @@ -0,0 +1,27 @@ +diff -uNr orig-drivers/net/fec_mpc52xx/fec.c drivers/net/fec_mpc52xx/fec.c +--- /orig-drivers/net/fec_mpc52xx/fec.c 2007-03-10 13:34:46.000000000 +0200 ++++ /drivers/net/fec_mpc52xx/fec.c 2007-03-10 13:45:45.000000000 +0200 +@@ -525,7 +525,7 @@ + priv->phy_speed = ((bd->bi_ipbfreq >> 20) / 5) << 1; + #endif + +- fec_restart(dev, 0); /* always use half duplex mode only */ ++ fec_restart(dev, 1); /* always use full duplex mode only */ + /* + * Read MIB counters in order to reset them, + * then zero all the stats fields in memory +diff -uNr orig-drivers/net/fec_mpc52xx/fec_phy.c drivers/net/fec_mpc52xx/fec_phy.c +--- /orig-drivers/net/fec_mpc52xx/fec_phy.c 2007-03-10 13:34:47.000000000 +0200 ++++ /drivers/net/fec_mpc52xx/fec_phy.c 2007-03-10 13:44:56.000000000 +0200 +@@ -227,8 +227,8 @@ + "GENERIC", + + (const phy_cmd_t []) { /* config */ +- /* advertise only half-duplex capabilities */ +- { mk_mii_write(MII_ADVERTISE, MII_ADVERTISE_HALF), ++ /* advertise only full-duplex capabilities */ ++ { mk_mii_write(MII_ADVERTISE, MII_ADVERTISE_ALL), + mii_parse_anar }, + + /* enable auto-negotiation */ + diff --git a/packages/linux/linux-gta01_2.6.20.bb b/packages/linux/linux-gta01_2.6.20.bb index a041877c55..67e6c76960 100644 --- a/packages/linux/linux-gta01_2.6.20.bb +++ b/packages/linux/linux-gta01_2.6.20.bb @@ -5,7 +5,7 @@ HOMEPAGE = "N/A" LICENSE = "GPL" DEPENDS += "u-boot-mkimage-gta01-native" MOKOR = "moko8" -PR = "${MOKOR}-r1" +PR = "${MOKOR}-r2" VANILLA_VERSION = "2.6.20" @@ -29,7 +29,7 @@ ALLOW_EMPTY = "1" COMPATIBLE_MACHINE = 'fic-gta01' -CMDLINE_CON = "console=ttySAC0,115200n8" +CMDLINE_CON = "" #CMDLINE_ROOT = "root=/dev/mmcblk0p1 rootfstype=ext3 rootdelay=5" # uncomment if you want to boot over NFS #CMDLINE_ROOT = "root=/dev/nfs nfsroot=192.168.1.10:/export/opie-image rootdelay=5 3" diff --git a/packages/linux/linux-rp-2.6.20/defconfig-spitz b/packages/linux/linux-rp-2.6.20/defconfig-spitz index 824fd57aaa..91f73ed4e9 100644 --- a/packages/linux/linux-rp-2.6.20/defconfig-spitz +++ b/packages/linux/linux-rp-2.6.20/defconfig-spitz @@ -1601,3 +1601,4 @@ CONFIG_CRC32=y CONFIG_LIBCRC32C=m CONFIG_ZLIB_INFLATE=m CONFIG_ZLIB_DEFLATE=m +CONFIG_SHARPSL_RC=m
\ No newline at end of file diff --git a/packages/linux/linux-rp-2.6.20/sharpsl-rc-r0.patch b/packages/linux/linux-rp-2.6.20/sharpsl-rc-r0.patch new file mode 100644 index 0000000000..9761f43aca --- /dev/null +++ b/packages/linux/linux-rp-2.6.20/sharpsl-rc-r0.patch @@ -0,0 +1,491 @@ +Index: linux-2.6.20/arch/arm/mach-pxa/spitz.c +=================================================================== +--- linux-2.6.20.orig/arch/arm/mach-pxa/spitz.c ++++ linux-2.6.20/arch/arm/mach-pxa/spitz.c +@@ -244,6 +244,13 @@ static struct platform_device spitzkbd_d + .id = -1, + }; + ++/* ++ * Spitz Remote Control Device ++ */ ++static struct platform_device sharpsl_rc_device = { ++ .name = "sharpsl-remote-control", ++ .id = -1, ++}; + + /* + * Spitz LEDs +@@ -476,6 +483,7 @@ static struct platform_device *devices[] + &spitzscoop_device, + &spitzssp_device, + &spitzkbd_device, ++ &sharpsl_rc_device, + &spitzts_device, + &spitzbl_device, + &spitzled_device, +Index: linux-2.6.20/drivers/input/keyboard/Kconfig +=================================================================== +--- linux-2.6.20.orig/drivers/input/keyboard/Kconfig ++++ linux-2.6.20/drivers/input/keyboard/Kconfig +@@ -154,6 +154,17 @@ config KEYBOARD_SPITZ + To compile this driver as a module, choose M here: the + module will be called spitzkbd. + ++config SHARPSL_RC ++ tristate "Sharp SL-Cxx00 Remote Control" ++ depends on PXA_SHARPSL ++ default y ++ help ++ Say Y here to enable the remote on the Sharp Zaurus SL-Cxx00, ++ SL-C1000, SL-C3000 and Sl-C3100 series of PDAs. ++ ++ To compile this driver as a module, choose M here: the ++ module will be called sharpsl_rc. ++ + config KEYBOARD_AMIGA + tristate "Amiga keyboard" + depends on AMIGA +Index: linux-2.6.20/drivers/input/keyboard/Makefile +=================================================================== +--- linux-2.6.20.orig/drivers/input/keyboard/Makefile ++++ linux-2.6.20/drivers/input/keyboard/Makefile +@@ -14,6 +14,7 @@ obj-$(CONFIG_KEYBOARD_NEWTON) += newton + obj-$(CONFIG_KEYBOARD_STOWAWAY) += stowaway.o + obj-$(CONFIG_KEYBOARD_CORGI) += corgikbd.o + obj-$(CONFIG_KEYBOARD_SPITZ) += spitzkbd.o ++obj-$(CONFIG_SHARPSL_RC) += sharpsl_rc.o + obj-$(CONFIG_KEYBOARD_HIL) += hil_kbd.o + obj-$(CONFIG_KEYBOARD_HIL_OLD) += hilkbd.o + obj-$(CONFIG_KEYBOARD_OMAP) += omap-keypad.o +Index: linux-2.6.20/drivers/input/keyboard/sharpsl_rc.c +=================================================================== +--- /dev/null ++++ linux-2.6.20/drivers/input/keyboard/sharpsl_rc.c +@@ -0,0 +1,263 @@ ++/* ++ * Keyboard driver for Sharp Clamshell Models (SL-Cxx00) ++ * ++ * Copyright (c) 2004-2005 Richard Purdie ++ * ++ * Based on corgikbd.c and Sharp's RC driver ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ * ++ */ ++ ++#define DEBUG 1 ++#include <linux/delay.h> ++#include <linux/platform_device.h> ++#include <linux/init.h> ++#include <linux/input.h> ++#include <linux/interrupt.h> ++#include <linux/jiffies.h> ++#include <linux/module.h> ++#include <linux/slab.h> ++ ++#include <asm/arch/spitz.h> ++#include <asm/arch/hardware.h> ++#include <asm/arch/pxa-regs.h> ++#include <asm/hardware/scoop.h> ++#include <asm/arch/sharpsl.h> ++#include <asm/hardware/sharpsl_pm.h> ++ ++#define DPRINTK(fmt, args...) dev_dbg(data->dev, fmt "\n", ##args) ++ ++struct remote_control_key { ++ unsigned char min; ++ unsigned char max; ++ unsigned char key; ++}; ++ ++static struct remote_control_key spitz_remote_keys[] = { ++ { 25, 35, KEY_STOPCD}, ++ { 55, 65, KEY_PLAYPAUSE}, ++ { 85, 95, KEY_NEXTSONG}, ++ { 115, 125, KEY_VOLUMEUP}, ++ { 145, 155, KEY_PREVIOUSSONG}, ++ { 180, 190, KEY_MUTE}, ++ { 215, 225, KEY_VOLUMEDOWN}, ++}; ++ ++#define RELEASE_HI 230 ++#define MAX_EARPHONE 6 ++#define RC_POLL_MS 10 ++#define RC_FINISH_MS 500 ++#define WAIT_STATE 3 ++#define NOISE_THRESHOLD 100 ++ ++struct sharpsl_rc { ++ struct input_dev *input; ++ struct device *dev; ++ ++ spinlock_t lock; ++ struct timer_list rctimer; ++ struct timer_list rctimer_finish; ++ ++ unsigned int handling_press; ++ unsigned int noise; ++ unsigned int state; ++ unsigned int last_key; ++}; ++ ++static int get_remocon_raw(void) ++{ ++ int i, val; ++ ++ val = sharpsl_pm_pxa_read_max1111(MAX1111_REMCOM); ++ for (i = 0; i < ARRAY_SIZE(spitz_remote_keys); ++i) { ++ if (val >= spitz_remote_keys[i].min ++ && val <= spitz_remote_keys[i].max) { ++ printk("get_remocon_raw: VAL=%i, KEY=%i\n", val, spitz_remote_keys[i].key); ++ return spitz_remote_keys[i].key; ++ } ++ } ++ return 0; ++} ++ ++static irqreturn_t sharpsl_rc_interrupt(int irq, void *dev_id, struct pt_regs *regs) ++{ ++ struct sharpsl_rc *data = dev_id; ++ DPRINTK("sharpsl_rc_interrupt %d\n", irq); ++ if (!data->handling_press) { ++ DPRINTK("handling interrupt"); ++ data->handling_press = 1; ++ data->noise = 0; ++ data->state = 0; ++ data->last_key = 0; ++ ++ reset_scoop_gpio(&spitzscoop2_device.dev, SPITZ_SCP2_AKIN_PULLUP); ++ ++ mod_timer(&data->rctimer, jiffies + msecs_to_jiffies(RC_POLL_MS)); ++ } ++ return IRQ_HANDLED; ++} ++ ++static void sharpsl_rc_timer_callback(unsigned long dataPtr) ++{ ++ struct sharpsl_rc *data = (struct sharpsl_rc *) dataPtr; ++ int timer = 1; ++ int key = get_remocon_raw(); ++ DPRINTK("timer callback, key: %d", key); ++ ++ //wait for value to stabilize ++ if (data->state < WAIT_STATE) { ++ if (data->last_key != key) { ++ ++data->noise; ++ if (data->noise > NOISE_THRESHOLD) { ++ DPRINTK("too much noise, bailing"); ++ timer = 0; ++ } ++ data->state = 0; ++ } else { ++ ++data->state; ++ } ++ data->last_key = key; ++ ++ //stable value, send event ++ } else if (data->state == WAIT_STATE) { ++ data->noise = 0; ++ //non-key returned, skip the rest of the states and bail now ++ if (data->last_key == 0) { ++ DPRINTK("non-key detected %d, noise: %d", data->last_key, data->noise); ++ timer = 0; ++ //send button press ++ } else { ++ DPRINTK("key press detected %d, noise %d", data->last_key, data->noise); ++ input_report_key(data->input, data->last_key, 1); ++ } ++ ++data->state; ++ ++ //wait until key is released ++ } else if (data->state < WAIT_STATE * 2) { ++ if (key == data->last_key ++ && data->noise < NOISE_THRESHOLD) { ++ data->state = WAIT_STATE + 1; ++ ++data->noise; ++ } else { ++ ++data->state; ++ } ++ //key is released, send event ++ } else { ++ //send button release ++ DPRINTK("release key %d", data->last_key); ++ input_report_key(data->input, data->last_key, 0); ++ timer = 0; ++ } ++ if (timer) { ++ mod_timer(&data->rctimer, jiffies + msecs_to_jiffies(RC_POLL_MS)); ++ } else { ++ set_scoop_gpio(&spitzscoop2_device.dev, SPITZ_SCP2_AKIN_PULLUP); ++ data->handling_press = 0; ++ } ++} ++ ++static int __init sharpsl_rc_probe(struct platform_device *pdev) ++{ ++ struct sharpsl_rc *sharpsl_rc; ++ struct input_dev *input_dev; ++ int i, ret; ++ ++ dev_dbg(&pdev->dev, "sharpsl_rc_probe\n"); ++ ++ sharpsl_rc = kzalloc(sizeof(struct sharpsl_rc), GFP_KERNEL); ++ input_dev = input_allocate_device(); ++ if (!sharpsl_rc || !input_dev) { ++ kfree(sharpsl_rc); ++ input_free_device(input_dev); ++ return -ENOMEM; ++ } ++ ++ platform_set_drvdata(pdev, sharpsl_rc); ++ ++ sharpsl_rc->dev = &pdev->dev; ++ sharpsl_rc->input = input_dev; ++ spin_lock_init(&sharpsl_rc->lock); ++ ++ /* Init Remote Control Timer */ ++ init_timer(&sharpsl_rc->rctimer); ++ sharpsl_rc->rctimer.function = sharpsl_rc_timer_callback; ++ sharpsl_rc->rctimer.data = (unsigned long) sharpsl_rc; ++ ++ input_dev->name = "Spitz Remote Control"; ++ input_dev->phys = "sharpsl_rc/input0"; ++ input_dev->id.bustype = BUS_HOST; ++ input_dev->id.vendor = 0x0001; ++ input_dev->id.product = 0x0001; ++ input_dev->id.version = 0x0100; ++ input_dev->cdev.dev = &pdev->dev; ++ input_dev->private = sharpsl_rc; ++ ++ input_dev->evbit[0] = BIT(EV_KEY); ++ ++ for (i = 0; i <= ARRAY_SIZE(spitz_remote_keys); i++) ++ set_bit(spitz_remote_keys[i].key, input_dev->keybit); ++ ++ input_register_device(sharpsl_rc->input); ++ ++ pxa_gpio_mode(SPITZ_GPIO_AK_INT | GPIO_IN); ++ ret = request_irq(SPITZ_IRQ_GPIO_AK_INT, ++ sharpsl_rc_interrupt, ++ IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_SHARED, ++ "sharpsl_rc", ++ sharpsl_rc); ++ if (ret < 0) { ++ dev_dbg(&pdev->dev, "Can't get IRQ: %d!\n", i); ++ kfree(sharpsl_rc); ++ input_free_device(input_dev); ++ return ret; ++ } ++ ++ return 0; ++} ++ ++static int sharpsl_rc_remove(struct platform_device *pdev) ++{ ++ struct sharpsl_rc *sharpsl_rc = platform_get_drvdata(pdev); ++ ++ dev_dbg(&pdev->dev, "sharpsl_rc_remove\n"); ++ ++ free_irq(SPITZ_IRQ_GPIO_AK_INT, sharpsl_rc); ++ del_timer_sync(&sharpsl_rc->rctimer); ++ input_unregister_device(sharpsl_rc->input); ++ kfree(sharpsl_rc); ++ ++ return 0; ++} ++ ++static struct platform_driver sharpsl_rc_driver = { ++ .probe = sharpsl_rc_probe, ++ .remove = sharpsl_rc_remove, ++ .suspend = NULL, ++ .resume = NULL, ++ .driver = { ++ .name = "sharpsl-remote-control", ++ }, ++}; ++ ++static int __devinit sharpsl_rc_init(void) ++{ ++ printk("sharpsl_rc_init\n"); ++ return platform_driver_register(&sharpsl_rc_driver); ++} ++ ++static void __exit sharpsl_rc_exit(void) ++{ ++ printk("sharpsl_rc_exit\n"); ++ platform_driver_unregister(&sharpsl_rc_driver); ++} ++ ++module_init(sharpsl_rc_init); ++module_exit(sharpsl_rc_exit); ++ ++MODULE_AUTHOR("Justin Patrin <papercrane@reversefold.com>"); ++MODULE_AUTHOR("Richard Purdie <rpurdie@rpsys.net>"); ++MODULE_DESCRIPTION("SharpSL Remote Control Driver"); ++MODULE_LICENSE("GPL"); +Index: linux-2.6.20/drivers/input/keyboard/spitzkbd.c +=================================================================== +--- linux-2.6.20.orig/drivers/input/keyboard/spitzkbd.c ++++ linux-2.6.20/drivers/input/keyboard/spitzkbd.c +@@ -19,6 +19,7 @@ + #include <linux/jiffies.h> + #include <linux/module.h> + #include <linux/slab.h> ++#include <linux/kmod.h> + + #include <asm/arch/spitz.h> + #include <asm/arch/hardware.h> +@@ -279,13 +280,21 @@ static irqreturn_t spitzkbd_hinge_isr(in + static int sharpsl_hinge_state; + static int hinge_count; + ++void spitzkbd_handle_sharpsl_rc(void *arg) { ++ request_module("sharpsl_rc"); ++} ++ ++DECLARE_WORK(spitzkbd_work, spitzkbd_handle_sharpsl_rc); ++ + static void spitzkbd_hinge_timer(unsigned long data) + { + struct spitzkbd *spitzkbd_data = (struct spitzkbd *) data; + unsigned long state; + unsigned long flags; ++ unsigned int headphone, remote; + + state = GPLR(SPITZ_GPIO_SWA) & (GPIO_bit(SPITZ_GPIO_SWA)|GPIO_bit(SPITZ_GPIO_SWB)); ++ state |= (GPLR(SPITZ_GPIO_HP_IN) & GPIO_bit(SPITZ_GPIO_HP_IN)); + state |= (GPLR(SPITZ_GPIO_AK_INT) & GPIO_bit(SPITZ_GPIO_AK_INT)); + if (state != sharpsl_hinge_state) { + hinge_count = 0; +@@ -299,9 +308,18 @@ static void spitzkbd_hinge_timer(unsigne + + input_report_switch(spitzkbd_data->input, SW_LID, ((GPLR(SPITZ_GPIO_SWA) & GPIO_bit(SPITZ_GPIO_SWA)) != 0)); + input_report_switch(spitzkbd_data->input, SW_TABLET_MODE, ((GPLR(SPITZ_GPIO_SWB) & GPIO_bit(SPITZ_GPIO_SWB)) != 0)); +- input_report_switch(spitzkbd_data->input, SW_HEADPHONE_INSERT, ((GPLR(SPITZ_GPIO_AK_INT) & GPIO_bit(SPITZ_GPIO_AK_INT)) != 0)); ++ ++ headphone = ((GPLR(SPITZ_GPIO_HP_IN) & GPIO_bit(SPITZ_GPIO_HP_IN)) != 0); ++ input_report_switch(spitzkbd_data->input, SW_HEADPHONE_INSERT, headphone); ++ ++ remote = headphone && ((GPLR(SPITZ_GPIO_AK_INT) & GPIO_bit(SPITZ_GPIO_AK_INT)) == 0); ++ input_report_switch(spitzkbd_data->input, SW_REMOTE_INSERT, remote); + input_sync(spitzkbd_data->input); + ++ if (remote) { ++ schedule_work(&spitzkbd_work); ++ } ++ + spin_unlock_irqrestore(&spitzkbd_data->lock, flags); + } else { + mod_timer(&spitzkbd_data->htimer, jiffies + msecs_to_jiffies(HINGE_SCAN_INTERVAL)); +@@ -394,6 +412,7 @@ static int __init spitzkbd_probe(struct + set_bit(SW_LID, input_dev->swbit); + set_bit(SW_TABLET_MODE, input_dev->swbit); + set_bit(SW_HEADPHONE_INSERT, input_dev->swbit); ++ set_bit(SW_REMOTE_INSERT, input_dev->swbit); + + err = input_register_device(input_dev); + if (err) +@@ -431,9 +450,12 @@ static int __init spitzkbd_probe(struct + request_irq(SPITZ_IRQ_GPIO_SWB, spitzkbd_hinge_isr, + IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING, + "Spitzkbd SWB", spitzkbd); +- request_irq(SPITZ_IRQ_GPIO_AK_INT, spitzkbd_hinge_isr, ++ request_irq(SPITZ_IRQ_GPIO_HP_IN, spitzkbd_hinge_isr, + IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING, + "Spitzkbd HP", spitzkbd); ++ request_irq(SPITZ_IRQ_GPIO_AK_INT, spitzkbd_hinge_isr, ++ IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING | IRQF_SHARED, ++ "Spitzkbd HP Type", spitzkbd); + + return 0; + +@@ -454,6 +476,7 @@ static int spitzkbd_remove(struct platfo + free_irq(SPITZ_IRQ_GPIO_ON_KEY, spitzkbd); + free_irq(SPITZ_IRQ_GPIO_SWA, spitzkbd); + free_irq(SPITZ_IRQ_GPIO_SWB, spitzkbd); ++ free_irq(SPITZ_IRQ_GPIO_HP_IN, spitzkbd); + free_irq(SPITZ_IRQ_GPIO_AK_INT, spitzkbd); + + del_timer_sync(&spitzkbd->htimer); +Index: linux-2.6.20/arch/arm/mach-pxa/sharpsl.h +=================================================================== +--- linux-2.6.20.orig/arch/arm/mach-pxa/sharpsl.h ++++ linux-2.6.20/arch/arm/mach-pxa/sharpsl.h +@@ -50,15 +50,10 @@ void spitz_wait_hsync(void); + + #define READ_GPIO_BIT(x) (GPLR(x) & GPIO_bit(x)) + +-/* MAX1111 Channel Definitions */ +-#define MAX1111_BATT_VOLT 4u +-#define MAX1111_BATT_TEMP 2u +-#define MAX1111_ACIN_VOLT 6u +- + extern struct battery_thresh spitz_battery_levels_acin[]; + extern struct battery_thresh spitz_battery_levels_noac[]; + void sharpsl_pm_pxa_init(void); + void sharpsl_pm_pxa_remove(void); +-int sharpsl_pm_pxa_read_max1111(int channel); ++ + + +Index: linux-2.6.20/arch/arm/mach-pxa/sharpsl_pm.c +=================================================================== +--- linux-2.6.20.orig/arch/arm/mach-pxa/sharpsl_pm.c ++++ linux-2.6.20/arch/arm/mach-pxa/sharpsl_pm.c +@@ -135,6 +135,8 @@ int sharpsl_pm_pxa_read_max1111(int chan + | MAXCTRL_SGL | MAXCTRL_UNI | MAXCTRL_STR); + } + ++EXPORT_SYMBOL(sharpsl_pm_pxa_read_max1111); ++ + void sharpsl_pm_pxa_init(void) + { + pxa_gpio_mode(sharpsl_pm.machinfo->gpio_acin | GPIO_IN); +Index: linux-2.6.20/include/asm-arm/hardware/sharpsl_pm.h +=================================================================== +--- linux-2.6.20.orig/include/asm-arm/hardware/sharpsl_pm.h ++++ linux-2.6.20/include/asm-arm/hardware/sharpsl_pm.h +@@ -104,3 +104,10 @@ irqreturn_t sharpsl_ac_isr(int irq, void + irqreturn_t sharpsl_chrg_full_isr(int irq, void *dev_id); + irqreturn_t sharpsl_fatal_isr(int irq, void *dev_id); + ++/* MAX1111 Channel Definitions */ ++#define MAX1111_REMCOM 0u ++#define MAX1111_BATT_VOLT 4u ++#define MAX1111_BATT_TEMP 2u ++#define MAX1111_ACIN_VOLT 6u ++ ++int sharpsl_pm_pxa_read_max1111(int channel); +Index: linux-2.6.20/include/linux/input.h +=================================================================== +--- linux-2.6.20.orig/include/linux/input.h ++++ linux-2.6.20/include/linux/input.h +@@ -602,6 +602,7 @@ struct input_absinfo { + #define SW_LID 0x00 /* set = lid shut */ + #define SW_TABLET_MODE 0x01 /* set = tablet mode */ + #define SW_HEADPHONE_INSERT 0x02 /* set = inserted */ ++#define SW_REMOTE_INSERT 0x04 /* set = remote */ + #define SW_MAX 0x0f + + /* +Index: linux-2.6.20/arch/arm/mach-pxa/spitz_pm.c +=================================================================== +--- linux-2.6.20.orig/arch/arm/mach-pxa/spitz_pm.c ++++ linux-2.6.20/arch/arm/mach-pxa/spitz_pm.c +@@ -161,6 +161,13 @@ static int spitz_should_wakeup(unsigned + if (resume_on_alarm && (PEDR & PWER_RTC)) + is_resume |= PWER_RTC; + ++ printk("wakeup: PEDR: %x, PKSR: %x, HP_IN: %x, AK_INT: %x\n", PEDR, PKSR, GPIO_bit(SPITZ_GPIO_HP_IN), GPIO_bit(SPITZ_GPIO_AK_INT)); ++ ++ //remote/headphone interrupt, wakeup ++ if (PEDR == 0 && (PKSR & 0xc0d01) != 0) { ++ is_resume |= PWER_RTC; ++ } ++ + dev_dbg(sharpsl_pm.dev, "is_resume: %x\n",is_resume); + return is_resume; + } diff --git a/packages/linux/linux-rp_2.6.20.bb b/packages/linux/linux-rp_2.6.20.bb index 49446a772a..70aa40610a 100644 --- a/packages/linux/linux-rp_2.6.20.bb +++ b/packages/linux/linux-rp_2.6.20.bb @@ -1,6 +1,6 @@ require linux-rp.inc -PR = "r6" +PR = "r7" # Handy URLs # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046 @@ -53,6 +53,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2 \ file://connectplus-remove-ide-HACK.patch;patch=1;status=hack \ file://squashfs3.0-2.6.15.patch;patch=1;status=external \ file://vesafb-tng-1.0-rc2-2.6.20-rc2.patch;patch=1;status=external \ + file://sharpsl-rc-r0.patch;patch=1 \ file://defconfig-c7x0 \ file://defconfig-hx2000 \ file://defconfig-collie \ diff --git a/packages/linux/mx31ads-kernel_2.6.19rc6.bb b/packages/linux/mx31ads-kernel_2.6.19rc6.bb index 2081693d68..88726073c2 100644 --- a/packages/linux/mx31ads-kernel_2.6.19rc6.bb +++ b/packages/linux/mx31ads-kernel_2.6.19rc6.bb @@ -28,7 +28,7 @@ RPROVIDES_kernel-image += "hostap-modules" do_configure_prepend() { install -m 0644 ${WORKDIR}/imx31ads_defconfig ${S}/defconfig - if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then + if [ "${TARGET_OS}" = "linux-gnueabi" -o "${TARGET_OS}" = "linux-uclibcgnueabi" ]; then echo "CONFIG_AEABI=y" >> ${S}/.config echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config else diff --git a/packages/llvm/.mtn2git_empty b/packages/llvm/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/llvm/.mtn2git_empty diff --git a/packages/llvm/llvm-native_1.9.bb b/packages/llvm/llvm-native_1.9.bb new file mode 100644 index 0000000000..1493bab886 --- /dev/null +++ b/packages/llvm/llvm-native_1.9.bb @@ -0,0 +1,9 @@ +require llvm.inc + +inherit native + +S = "${WORKDIR}/llvm-${PV}" + +do_stage() { + install -m 755 ${S}/Release/bin/* ${STAGING_BINDIR_NATIVE}/ +} diff --git a/packages/llvm/llvm.inc b/packages/llvm/llvm.inc new file mode 100644 index 0000000000..d9664aeebd --- /dev/null +++ b/packages/llvm/llvm.inc @@ -0,0 +1,16 @@ +DESCRIPTION = "The Low Level Virtual Machine" +HOMEPAGE = "http://llvm.org" +LICENSE = "various" + +SRC_URI = "http://llvm.org/releases/1.9/llvm-${PV}.tar.gz" + +inherit autotools + +do_configure() { + oe_runconf +} + +do_stage() { + autotools_stage_all +} + diff --git a/packages/ltrace/files/.mtn2git_empty b/packages/ltrace/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/ltrace/files/.mtn2git_empty diff --git a/packages/ltrace/files/no-usr-include.patch b/packages/ltrace/files/no-usr-include.patch new file mode 100644 index 0000000000..adadfa8032 --- /dev/null +++ b/packages/ltrace/files/no-usr-include.patch @@ -0,0 +1,16 @@ +--- ltrace-0.4.orig/configure.ac ++++ ltrace-0.4/configure.ac +@@ -41,13 +41,6 @@ + dnl AC_CHECK_FUNCS(gettimeofday strdup strerror strspn) + AC_CHECK_FUNCS(getopt getopt_long) + +-for path in /usr/include/elfutils /usr/local/include/elfutils \ +- /usr/include/libelf /usr/local/include/libelf; do +- if test -f ${path}/gelf.h; then +- CPPFLAGS="$CPPFLAGS -I ${path}" +- fi +-done +- + AC_CHECK_HEADER(gelf.h,,AC_MSG_ERROR([***** gelf.h not found *****])) + + AC_CHECK_LIB(elf,gelf_getdyn) diff --git a/packages/ltrace/ltrace_0.4.bb b/packages/ltrace/ltrace_0.4.bb index 4ef906f2f9..97b7d18d22 100644 --- a/packages/ltrace/ltrace_0.4.bb +++ b/packages/ltrace/ltrace_0.4.bb @@ -6,7 +6,8 @@ LICENSE = "GPL" PR = "r0" SRC_URI = "ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.4.orig.tar.gz \ - ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.4-1.diff.gz;patch=1" + ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.4-1.diff.gz;patch=1 \ + file://no-usr-include.patch;patch=1" inherit autotools PARALLEL_MAKE = "" diff --git a/packages/monotone/monotone-6_0.33.bb b/packages/monotone/monotone-6_0.33.bb index 47e58a48c6..64b1d1699e 100644 --- a/packages/monotone/monotone-6_0.33.bb +++ b/packages/monotone/monotone-6_0.33.bb @@ -25,7 +25,7 @@ inherit autotools #FIXME: remove the following ARM_INSTRUCTION_SET = "arm" -PR = "r0" +PR = "r1" SRC_URI = "http://monotone.ca/downloads/${PV}/monotone-${PV}.tar.gz \ file://txt2c-cross-post-0.22.patch;patch=1 \ @@ -42,7 +42,7 @@ do_install_append() { install -d ${D}${tsd} install -c -m 755 testsuite ${D}${tsd}/testsuite cp -pPR tests ${D}${tsd}/tests - rm ${D}/home/monotone/monotone-6/tests/tests/diff_a_binary_file/binary + rm ${D}/home/monotone/monotone-6/tests/diff_a_binary_file/binary } PACKAGES = "${PN} ${PN}-doc ${PN}-testsuite" diff --git a/packages/musicpd/gmpc_svn.bb b/packages/musicpd/gmpc_svn.bb index fbaea3e5f2..72fd3af1b6 100644 --- a/packages/musicpd/gmpc_svn.bb +++ b/packages/musicpd/gmpc_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "GTK+ Frontend for mpd" HOMEPAGE = "http://www.musicpd.org/gmpc.shtml" SECTION = "x11/multimedia" LICENSE = "GPLv2" -DEPENDS = "libmpd gtk+ libglade gnome-vfs gob2" +DEPENDS = "libmpd gtk+ libglade gnome-vfs gob2 curl" SRCDATE = "20070120" PV = "0.13.0+svn${SRCDATE}" diff --git a/packages/mysql/mysql-native_4.1.18.bb b/packages/mysql/mysql-native_4.1.18.bb index dc87549e24..9a81bc8f00 100644 --- a/packages/mysql/mysql-native_4.1.18.bb +++ b/packages/mysql/mysql-native_4.1.18.bb @@ -1,6 +1,7 @@ SECTION = "console/network" require mysql_${PV}.bb inherit native +PR="r3" RDEPENDS_${PN} = "" @@ -9,7 +10,7 @@ DEPENDS = "ncurses-native" EXTRA_OEMAKE = "" EXTRA_OECONF = " --with-embedded-server " -do_stage() { +do_stage_append() { install -m 0755 sql/gen_lex_hash ${STAGING_BINDIR}/ } diff --git a/packages/netbase/netbase/oplinux-uclibc/.mtn2git_empty b/packages/netbase/netbase/oplinux-uclibc/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/netbase/netbase/oplinux-uclibc/.mtn2git_empty diff --git a/packages/netbase/netbase/oplinux-uclibc/interfaces b/packages/netbase/netbase/oplinux-uclibc/interfaces new file mode 100644 index 0000000000..673618f636 --- /dev/null +++ b/packages/netbase/netbase/oplinux-uclibc/interfaces @@ -0,0 +1,10 @@ +# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8) + +# The loopback interface +auto lo +iface lo inet loopback + +# Ethernet +auto eth0 +iface eth0 inet dhcp + diff --git a/packages/netbase/netbase/oplinux-uclibc/options b/packages/netbase/netbase/oplinux-uclibc/options new file mode 100644 index 0000000000..14380f4376 --- /dev/null +++ b/packages/netbase/netbase/oplinux-uclibc/options @@ -0,0 +1,3 @@ +ip_forward=yes +spoofprotect=yes +syncookies=no diff --git a/packages/netbase/netbase/oplinux/.mtn2git_empty b/packages/netbase/netbase/oplinux/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/netbase/netbase/oplinux/.mtn2git_empty diff --git a/packages/netbase/netbase/oplinux/interfaces b/packages/netbase/netbase/oplinux/interfaces new file mode 100644 index 0000000000..673618f636 --- /dev/null +++ b/packages/netbase/netbase/oplinux/interfaces @@ -0,0 +1,10 @@ +# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8) + +# The loopback interface +auto lo +iface lo inet loopback + +# Ethernet +auto eth0 +iface eth0 inet dhcp + diff --git a/packages/netbase/netbase/oplinux/options b/packages/netbase/netbase/oplinux/options new file mode 100644 index 0000000000..14380f4376 --- /dev/null +++ b/packages/netbase/netbase/oplinux/options @@ -0,0 +1,3 @@ +ip_forward=yes +spoofprotect=yes +syncookies=no diff --git a/packages/netbase/netbase_4.21.bb b/packages/netbase/netbase_4.21.bb index f97d8986aa..53c9f3d17c 100644 --- a/packages/netbase/netbase_4.21.bb +++ b/packages/netbase/netbase_4.21.bb @@ -2,7 +2,7 @@ DESCRIPTION = "This package provides the necessary \ infrastructure for basic TCP/IP based networking." SECTION = "base" LICENSE = "GPL" -PR = "r15" +PR = "r16" inherit update-rc.d diff --git a/packages/openmoko-base/files/session b/packages/openmoko-base/files/session index b2e7fd0a69..1fc2f4d17a 100644 --- a/packages/openmoko-base/files/session +++ b/packages/openmoko-base/files/session @@ -14,5 +14,6 @@ matchbox-panel --start-applets=showdesktop,systray,windowselector --end-applets= mbinputmgr & openmoko-footer & +openmoko-dialer & exec matchbox-window-manager -use_titlebar no -use_cursor $SHOWCURSOR $@ diff --git a/packages/openmoko-base/openmoko-icon-theme-standard_svn.bb b/packages/openmoko-base/openmoko-icon-theme-standard_svn.bb new file mode 100644 index 0000000000..8be6211d68 --- /dev/null +++ b/packages/openmoko-base/openmoko-icon-theme-standard_svn.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "Standard Gtk+ icon theme for the OpenMoko distribution" +SECTION = "openmoko/base" +PV = "0.0+svn${SRCDATE}" +PR = "r0" + +inherit openmoko-base autotools + +SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/artwork;module=icons;proto=http" +S = "${WORKDIR}/icons" + +PACKAGE_ARCH = "all" diff --git a/packages/openmoko-base/openmoko-session_svn.bb b/packages/openmoko-base/openmoko-session_svn.bb index 5f0a88cfbf..c085606a7d 100644 --- a/packages/openmoko-base/openmoko-session_svn.bb +++ b/packages/openmoko-base/openmoko-session_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Matchbox session files for OpenMoko" SECTION = "openmoko/base" RDEPENDS = "matchbox gconf matchbox-applet-startup-monitor gtk-theme-clearlooks" PV = "0.0+svn${SRCDATE}" -PR = "r6" +PR = "r7" inherit openmoko-base diff --git a/packages/openpbx/.mtn2git_empty b/packages/openpbx/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/openpbx/.mtn2git_empty diff --git a/packages/openpbx/files/.mtn2git_empty b/packages/openpbx/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/openpbx/files/.mtn2git_empty diff --git a/packages/openpbx/files/init b/packages/openpbx/files/init new file mode 100644 index 0000000000..0ce88c4626 --- /dev/null +++ b/packages/openpbx/files/init @@ -0,0 +1,75 @@ +#! /bin/sh +# +# This is an init script for openembedded +# Copy it to /etc/init.d/openpbx and type +# > update-rc.d openpbx defaults 60 +# +openpbx=/usr/sbin/openpbx +pidfile=/var/run/openpbx.org/openpbx.pid + +test -x "$openpbx" || exit 0 + +case "$1" in + start) + echo -n "Starting OpenPBX" + start-stop-daemon --start --quiet --exec $openpbx -- -npq + echo "." + ;; + stop) + echo -n "Stopping OpenPBX" + $openpbx -rx "stop gracefully" + sleep 4 + if [ -f $pidfile ]; then + start-stop-daemon --stop --quiet --pidfile $pidfile + fi + echo "." + ;; + force-stop) + echo -n "Stopping OpenPBX" + $openpbx -rx "stop now" + sleep 2 + if [ -f $pidfile ]; then + start-stop-daemon --stop --quiet --pidfile $pidfile + fi + echo "." + ;; + restart) + echo -n "Restarting OpenPBX" + if [ -f $pidfile ]; then + $openpbx -rx "restart gracefully" + sleep 2 + else + start-stop-daemon --start --quiet --exec $openpbx -- -npq + fi + ;; + force-restart) + echo -n "Forcibly Restarting OpenPBX" + if [ -f $pidfile ]; then + $openpbx -rx "restart now" + sleep 2 + else + start-stop-daemon --start --quiet --exec $openpbx -- -npq + fi + ;; + reload) + echo -n "Reloading OpenPBX Configuration" + if [ -f $pidfile ]; then + $openpbx -rx "reload" + else + start-stop-daemon --start --quiet --exec $openpbx -- -npq + fi + echo "." + ;; + logger-reload) +# echo -n "Restating OpenPBX Logger" + if [ -f $pidfile ]; then + $openpbx -rx "logger reload" + fi +# echo "." + ;; + *) + echo "Usage: /etc/init.d/openpbx {start|stop|force-stop|restart|force-restart|reload|logger-reload}" + exit 1 +esac + +exit 0 diff --git a/packages/openpbx/files/logrotate b/packages/openpbx/files/logrotate new file mode 100644 index 0000000000..a0192538a3 --- /dev/null +++ b/packages/openpbx/files/logrotate @@ -0,0 +1,13 @@ +/var/log/openpbx.org/cdr-csv/Master.csv /var/log/openpbx.org/queue_log /var/log/openpbx.org/event_log /var/log/openpbx.org/messages +/var/log/openpbx.org/full { + daily + missingok + compress + delaycompress + rotate 30 + sharedscripts + postrotate + /etc/init.d/openpbx logger-reload + endscript +} + diff --git a/packages/openpbx/files/volatiles b/packages/openpbx/files/volatiles new file mode 100644 index 0000000000..716d469e86 --- /dev/null +++ b/packages/openpbx/files/volatiles @@ -0,0 +1,6 @@ +d openpbx openpbx 0775 /var/run/openpbx.org none +d openpbx openpbx 0775 /var/lib/openpbx.org none +d openpbx openpbx 0775 /var/log/openpbx.org/cdr-csv none +d openpbx openpbx 0775 /var/log/openpbx.org/cdr-custom none +d openpbx openpbx 0775 /var/spool/openpbx.org/outgoing none +d openpbx openpbx 0775 /var/spool/openpbx.org/voicemail none diff --git a/packages/openpbx/openpbx.org-1.2_rc3/.mtn2git_empty b/packages/openpbx/openpbx.org-1.2_rc3/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/openpbx/openpbx.org-1.2_rc3/.mtn2git_empty diff --git a/packages/openpbx/openpbx.org-1.2_rc3/bootstrap.patch b/packages/openpbx/openpbx.org-1.2_rc3/bootstrap.patch new file mode 100644 index 0000000000..7f89772efa --- /dev/null +++ b/packages/openpbx/openpbx.org-1.2_rc3/bootstrap.patch @@ -0,0 +1,37 @@ +*** openpbx.org-1.2_rc3.old/bootstrap.sh Mon Feb 26 16:02:40 2007 +--- openpbx.org-1.2_rc3/bootstrap.sh Mon Feb 26 16:04:11 2007 +*************** +*** 89,104 **** + # Check for required version and die if unhappy + + if [ "x$UNAME" = "xFreeBSD" ]; then +! version_compare libtoolize 1 5 20 || exit 1 +! version_compare automake19 1 9 6 || exit 1 + version_compare autoconf259 2 59 || exit 1 + ACLOCAL=aclocal19 + AUTOHEADER=autoheader259 + AUTOMAKE=automake19 + AUTOCONF=autoconf259 + else +! version_compare libtoolize 1 5 20 || exit 1 +! version_compare automake 1 9 6 || exit 1 + version_compare autoconf 2 59 || exit 1 + ACLOCAL=aclocal + AUTOHEADER=autoheader +--- 89,104 ---- + # Check for required version and die if unhappy + + if [ "x$UNAME" = "xFreeBSD" ]; then +! version_compare libtoolize 1 5 10 || exit 1 +! version_compare automake19 1 9 3 || exit 1 + version_compare autoconf259 2 59 || exit 1 + ACLOCAL=aclocal19 + AUTOHEADER=autoheader259 + AUTOMAKE=automake19 + AUTOCONF=autoconf259 + else +! version_compare libtoolize 1 5 10 || exit 1 +! version_compare automake 1 9 3 || exit 1 + version_compare autoconf 2 59 || exit 1 + ACLOCAL=aclocal + AUTOHEADER=autoheader diff --git a/packages/openpbx/openpbx.org-1.2_rc3/openssl.m4.patch b/packages/openpbx/openpbx.org-1.2_rc3/openssl.m4.patch new file mode 100644 index 0000000000..55d0d33832 --- /dev/null +++ b/packages/openpbx/openpbx.org-1.2_rc3/openssl.m4.patch @@ -0,0 +1,46 @@ +*** openpbx.org-1.2_rc3.old/acmacros/openssl.m4 Tue Mar 6 15:21:39 2007 +--- openpbx.org-1.2_rc3/acmacros/openssl.m4 Tue Mar 6 15:23:18 2007 +*************** +*** 3,13 **** + # + AC_DEFUN([CHECK_SSL], + [AC_MSG_CHECKING(if ssl is wanted) +! # AC_ARG_WITH(ssl, +! # [ --with-ssl enable ssl [will check /usr/local/ssl +! # /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr /usr/sfw ] +! # ], +! #[ AC_MSG_RESULT(yes) + for dir in $withval /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr /usr/sfw; do + ssldir="$dir" + if test -f "$dir/include/openssl/ssl.h"; then +--- 3,13 ---- + # + AC_DEFUN([CHECK_SSL], + [AC_MSG_CHECKING(if ssl is wanted) +! AC_ARG_WITH(ssl, +! [ --with-ssl enable ssl [will check /usr/local/ssl +! /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr /usr/sfw ] +! ], +! [ AC_MSG_RESULT(yes) + for dir in $withval /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr /usr/sfw; do + ssldir="$dir" + if test -f "$dir/include/openssl/ssl.h"; then +*************** +*** 33,40 **** + AC_SUBST([HAVE_SSL]) + AC_SUBST([SSL_LIBS]) + AC_SUBST([SSL_CFLAGS]) +! #], +! #[ +! # AC_MSG_RESULT(no) +! #]) + ])dnl +--- 33,40 ---- + AC_SUBST([HAVE_SSL]) + AC_SUBST([SSL_LIBS]) + AC_SUBST([SSL_CFLAGS]) +! ], +! [ +! AC_MSG_RESULT(no) +! ]) + ])dnl diff --git a/packages/openpbx/openpbx.org-perl.bb b/packages/openpbx/openpbx.org-perl.bb new file mode 100644 index 0000000000..124dfcfc8b --- /dev/null +++ b/packages/openpbx/openpbx.org-perl.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "Openpbx::OGI Perl Gateway Interface Module" +HOMEPAGE = "http://www.openpbx.org" +SECTION = "libs" +LICENSE = "GPL" +DEPENDS = "install-native" +RDEPENDS = "perl openpbx.org-ogi" +PR = "r0" + +OPBXV = "openpbx.org-1.2_rc3" + +SRC_URI = "http://www.openpbx.org/releases/${OPBXV}.tar.gz" + +S = "${WORKDIR}/${OPBXV}/contrib/ogi-perl/openpbx-perl-${PV}" + +inherit cpan + +do_install_append () { + install -d ${D}${datadir}/openpbx.org/ogi/perl + install ${S}/examples/* ${D}${datadir}/openpbx.org/ogi/perl +} + +PACKAGES =+ "${PN}-examples" + +FILES_${PN}-examples = "${datadir}/openpbx.org/ogi/perl" diff --git a/packages/openpbx/openpbx.org_1.2_rc3.bb b/packages/openpbx/openpbx.org_1.2_rc3.bb new file mode 100644 index 0000000000..76c1f0c7bd --- /dev/null +++ b/packages/openpbx/openpbx.org_1.2_rc3.bb @@ -0,0 +1,124 @@ +DESCRIPTION = "A flexible VOIP soft switch/PBX." +HOMEPAGE = "http://www.openpbx.org" +#RDEPENDS = "ssmtp" +SECTION = "voip" +LICENSE = "GPL" +DEPENDS = "openssl zlib tiff libcap spandsp speex readline js \ + sox-native findutils-native" +DEPENDS_${PN}-ldap = "openldap" +RRECOMMENDS = "logrotate" +RRECOMMENDS_${PN}-ogi = "perl perl-module-strict openpbx.org-perl" +PV = "1.2_rc3" +PR = "r1" + +SRC_URI = "http://www.openpbx.org/releases/${P}.tar.gz \ + svn://svn.openpbx.org/openpbx-sounds/trunk/sounds/en_US;module=MelanieTaylor;proto=svn \ + file://bootstrap.patch;patch=1 \ + file://openssl.m4.patch;patch=1 \ + file://logrotate \ + file://volatiles \ + file://init" + +PARALLEL_MAKE = "" +INITSCRIPT_NAME = "openpbx" +INITSCRIPT_PARAMS = "defaults 60" + +inherit autotools update-rc.d + +EXTRA_OECONF = " --with-ssl=${STAGING_DIR}/${HOST_SYS} --enable-low_memory \ + --disable-zaptel --with-directory-layout=lsb --with-chan_fax \ + --with-codec-speex=${STAGING_DIR}/${HOST_SYS} --with-app_ldap \ + --with-perl-shebang='#!${bindir}/perl' --with-jabber --with-res_jabber \ + --enable-t38 --with-javascript --with-res_js \ + --bindir=${bindir} --datadir=${datadir} --sysconfdir=${sysconfdir} \ + --includedir=${includedir} --infodir=${infodir} --mandir=${mandir} \ + --localstatedir=${localstatedir} --libdir=${libdir}" + +do_configure_prepend () { + ${S}/bootstrap.sh + # Fix some stupidness with the VoiceMail app naming. Case Matters! + sed -i 's:Voicemail:VoiceMail:' ${S}/configs/extensions.conf.sample + sed -i 's:/var:${localstatedir}:' ${WORKDIR}/volatiles + sed -i 's:/var:${localstatedir}:' ${WORKDIR}/logrotate + sed -i 's:/etc/init.d:${sysconfdir}/init.d:' ${WORKDIR}/logrotate +} + +do_install_append() { + install -c -D -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/openpbx + install -c -D -m 644 ${WORKDIR}/logrotate ${D}${sysconfdir}/logrotate.d/openpbx + install -c -D -m 644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/openpbx + # And now for sounds... + for file in `find ${WORKDIR}/MelanieTaylor -name \*.wav`; do + echo $file + sox -V $file -t raw -s -r 8000 -c 1 -w `echo $file|sed -e s/\.wav$/.sln/` resample -ql; + sox -V $file -t raw -U -r 8000 -c 1 -b `echo $file|sed -e s/\.wav$/.ulaw/` resample -ql; + sox -V $file -t raw -A -r 8000 -c 1 -b `echo $file|sed -e s/\.wav$/.alaw/` resample -ql; + sox -V $file -t gsm -r 8000 -c 1 -b `echo $file|sed -e s/\.wav$/.gsm/` resample -ql; + relfile=`echo $file|sed -e s:^${WORKDIR}/MelanieTaylor/::` + relfile2=`echo $relfile|sed -e s:\.wav$::` + install -c -D -m 644 ${WORKDIR}/MelanieTaylor/$relfile2.sln ${D}${datadir}/openpbx.org/sounds/$relfile2.sln + install -c -D -m 644 ${WORKDIR}/MelanieTaylor/$relfile2.ulaw ${D}${datadir}/openpbx.org/sounds/$relfile2.ulaw + install -c -D -m 644 ${WORKDIR}/MelanieTaylor/$relfile2.alaw ${D}${datadir}/openpbx.org/sounds/$relfile2.alaw + install -c -D -m 644 ${WORKDIR}/MelanieTaylor/$relfile2.gsm ${D}${datadir}/openpbx.org/sounds/$relfile2.gsm + done +} + +PACKAGES = "${PN}-sounds ${PN}-fax ${PN}-ogi ${PN}-ldap ${PN}-doc ${PN}-dev ${PN}" + +FILES_${PN}-sounds = "${datadir}/openpbx.org/sounds/*" +FILES_${PN}-dev = "${libdir}/openpbx.org/modules/*.la \ + ${libdir}/openpbx.org/*.la \ + ${includedir}/openpbx/*" +FILES_${PN}-fax = "${libdir}/openpbx.org/modules/chan_fax.so \ + ${libdir}/openpbx.org/modules/app_rxfax.so \ + ${libdir}/openpbx.org/modules/app_txfax.so \ + ${libdir}/openpbx.org/modules/app_faxdetect.so \ + ${sysconfdir}/openpbx.org/chan_fax.conf" +FILES_${PN}-ogi = "${libdir}/openpbx.org/modules/res_ogi.so \ + ${datadir}/openpbx.org/ogi/*" +FILES_${PN}-ldap = "${libdir}/openpbx.org/modules/app_ldap.*" + +pkg_postinst_prepend() { + grep -q openpbx ${sysconfdir}/group || addgroup --system openpbx + grep -q openpbx ${sysconfdir}/passwd || adduser --system --home ${localstatedir}/run/openpbx.org --no-create-home --disabled-password --ingroup openpbx -s ${base_bindir}/false openpbx + chown -R openpbx:openpbx ${localstatedir}/lib/openpbx.org ${localstatedir}/spool/openpbx.org ${localstatedir}/log/openpbx.org ${localstatedir}/run/openpbx.org ${sysconfdir}/openpbx.org ${datadir}/openpbx.org + /etc/init.d/populate-volatile.sh update +} + +CONFFILES_${PN}-fax += "${sysconfdir}/openpbx.org/chan_fax.conf" +CONFFILES_${PN} += "${sysconfdir}/openpbx.org/musiconhold.conf" +CONFFILES_${PN} += "${sysconfdir}/openpbx.org/adsi.conf" +CONFFILES_${PN} += "${sysconfdir}/openpbx.org/adtranvofr.conf" +CONFFILES_${PN} += "${sysconfdir}/openpbx.org/agents.conf" +CONFFILES_${PN} += "${sysconfdir}/openpbx.org/cdr.conf" +CONFFILES_${PN} += "${sysconfdir}/openpbx.org/cdr_custom.conf" +CONFFILES_${PN} += "${sysconfdir}/openpbx.org/cdr_manager.conf" +CONFFILES_${PN} += "${sysconfdir}/openpbx.org/cdr_tds.conf" +CONFFILES_${PN} += "${sysconfdir}/openpbx.org/codecs.conf" +CONFFILES_${PN} += "${sysconfdir}/openpbx.org/dnsmgr.conf" +CONFFILES_${PN} += "${sysconfdir}/openpbx.org/dundi.conf" +CONFFILES_${PN} += "${sysconfdir}/openpbx.org/enum.conf" +CONFFILES_${PN} += "${sysconfdir}/openpbx.org/extconfig.conf" +CONFFILES_${PN} += "${sysconfdir}/openpbx.org/extensions.ael" +CONFFILES_${PN} += "${sysconfdir}/openpbx.org/features.conf" +CONFFILES_${PN} += "${sysconfdir}/openpbx.org/iax.conf" +CONFFILES_${PN} += "${sysconfdir}/openpbx.org/indications.conf" +CONFFILES_${PN} += "${sysconfdir}/openpbx.org/logger.conf" +CONFFILES_${PN} += "${sysconfdir}/openpbx.org/manager.conf" +CONFFILES_${PN} += "${sysconfdir}/openpbx.org/meetme.conf" +CONFFILES_${PN} += "${sysconfdir}/openpbx.org/mgcp.conf" +CONFFILES_${PN} += "${sysconfdir}/openpbx.org/modem.conf" +CONFFILES_${PN} += "${sysconfdir}/openpbx.org/modules.conf" +CONFFILES_${PN} += "${sysconfdir}/openpbx.org/muted.conf" +CONFFILES_${PN} += "${sysconfdir}/openpbx.org/openpbx.adsi" +CONFFILES_${PN} += "${sysconfdir}/openpbx.org/openpbx.conf" +CONFFILES_${PN} += "${sysconfdir}/openpbx.org/osp.conf" +CONFFILES_${PN} += "${sysconfdir}/openpbx.org/privacy.conf" +CONFFILES_${PN} += "${sysconfdir}/openpbx.org/queues.conf" +CONFFILES_${PN} += "${sysconfdir}/openpbx.org/rpt.conf" +CONFFILES_${PN} += "${sysconfdir}/openpbx.org/rtp.conf" +CONFFILES_${PN} += "${sysconfdir}/openpbx.org/sip.conf" +CONFFILES_${PN} += "${sysconfdir}/openpbx.org/sip_notify.conf" +CONFFILES_${PN} += "${sysconfdir}/openpbx.org/udptl.conf" +CONFFILES_${PN} += "${sysconfdir}/openpbx.org/voicemail.conf" +CONFFILES_${PN} += "${sysconfdir}/openpbx.org/woomera.conf" diff --git a/packages/php/php-5.2.0/.mtn2git_empty b/packages/php/php-5.2.0/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/php/php-5.2.0/.mtn2git_empty diff --git a/packages/php/php-5.2.0/acinclude-xml2-config.patch b/packages/php/php-5.2.0/acinclude-xml2-config.patch new file mode 100644 index 0000000000..bf519d2934 --- /dev/null +++ b/packages/php/php-5.2.0/acinclude-xml2-config.patch @@ -0,0 +1,18 @@ +--- /orig-acinclude.m4 2007-02-20 15:03:25.000000000 +0200 ++++ /acinclude.m4 2007-02-20 15:03:24.000000000 +0200 +@@ -2359,12 +2359,9 @@ + AC_DEFUN([PHP_SETUP_LIBXML], [ + AC_CACHE_CHECK([for xml2-config path], ac_cv_php_xml2_config_path, + [ +- for i in $PHP_LIBXML_DIR /usr/local /usr; do +- if test -x "$i/bin/xml2-config"; then +- ac_cv_php_xml2_config_path="$i/bin/xml2-config" +- break +- fi +- done ++ ++ ac_cv_php_xml2_config_path="$PHP_LIBXML_DIR/xml2-config" ++ + ]) + + if test -x "$ac_cv_php_xml2_config_path"; then diff --git a/packages/php/php-5.2.0/autotools.patch b/packages/php/php-5.2.0/autotools.patch new file mode 100644 index 0000000000..9f1289fd11 --- /dev/null +++ b/packages/php/php-5.2.0/autotools.patch @@ -0,0 +1,95 @@ +diff -u'rNF^function' php-5.1.4~/acinclude.m4 php-5.1.4/acinclude.m4 +--- php-5.1.4~/acinclude.m4 2006-04-10 08:17:36.000000000 -0400 ++++ php-5.1.4/acinclude.m4 2006-08-16 22:32:58.000000000 -0400 +@@ -818,10 +818,10 @@ + OVERALL_TARGET=[]ifelse($1,,php,$1) + php_c_pre='$(LIBTOOL) --mode=compile $(CC)' + php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' +- php_c_post= ++ php_c_post=' && echo "[#] Generated by PHP badness - GNU libtool" > $[@] && echo "pic_object=none" >> $[@] && echo "non_pic_object=$[@]" | sed -e "s,=.*/,=,; s,\.lo,\.o,g" >> $[@]' + php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' + php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' +- php_cxx_post= ++ php_cxx_post=' && echo "[#] Generated by PHP badness - GNU libtool" > $[@] && echo "pic_object=none" >> $[@] && echo "non_pic_object=$[@]" | sed -e "s,=.*/,=,; s,\.lo,\.o,g" >> $[@]' + php_lo=lo + + case $with_pic in +@@ -1670,6 +1670,7 @@ + have_fopen_cookie=yes + + dnl even newer glibcs have a different seeker definition... ++AC_CACHE_CHECK([if cookie io functions use off64_t], php_cv_lib_cookie_io_functions_use_off64_t, + AC_TRY_RUN([ + #define _GNU_SOURCE + #include <stdio.h> +@@ -1702,10 +1703,11 @@ + cookie_io_functions_use_off64_t=yes + ], [ + cookie_io_functions_use_off64_t=no +-], [ +- cookie_io_functions_use_off64_t=no +-]) +- ++], ++[ php_cv_lib_cookie_io_functions_use_off64_t=yes ], ++[ php_cv_lib_cookie_io_functions_use_off64_t=no ] )) ++ ++ + else + + dnl older glibc versions (up to 2.1.2 ?) +diff -u'rNF^function' php-5.1.4~/configure.in php-5.1.4/configure.in +--- php-5.1.4~/configure.in 2006-05-03 19:30:02.000000000 -0400 ++++ php-5.1.4/configure.in 2006-08-16 20:39:19.000000000 -0400 +@@ -209,6 +209,7 @@ + + sinclude(Zend/Zend.m4) + sinclude(TSRM/tsrm.m4) ++sinclude(TSRM/threads.m4) + + + divert(2) +@@ -255,11 +255,6 @@ + PTHREADS_FLAGS + fi + +-if test "$PHP_ENABLE_FASTCGI" = "yes"; then +- PHP_CONFIGURE_PART(Running FastCGI checks) +- sinclude(sapi/cgi/libfcgi/acinclude.m4) +- sinclude(sapi/cgi/libfcgi/libfcgi.m4) +-fi + + divert(3) + +diff -u'rNF^function' php-5.1.4~/scripts/phpize.m4 php-5.1.4/scripts/phpize.m4 +--- php-5.1.4~/scripts/phpize.m4 2006-04-10 08:16:17.000000000 -0400 ++++ php-5.1.4/scripts/phpize.m4 2006-08-16 20:39:19.000000000 -0400 +@@ -3,7 +3,6 @@ + divert(1) + + AC_PREREQ(2.13) +-AC_INIT(config.m4) + + PHP_CONFIG_NICE(config.nice) + +@@ -69,8 +68,6 @@ + PHP_PROG_RE2C + PHP_PROG_AWK + +-sinclude(config.m4) +- + enable_static=no + enable_shared=yes + +diff -u'rNF^function' php-5.1.4~/TSRM/threads.m4 php-5.1.4/TSRM/threads.m4 +--- php-5.1.4~/TSRM/threads.m4 2005-04-27 09:22:18.000000000 -0400 ++++ php-5.1.4/TSRM/threads.m4 2006-08-16 20:39:19.000000000 -0400 +@@ -86,7 +86,7 @@ + pthreads_working=no + ], [ + dnl For cross compiling running this test is of no use. NetWare supports pthreads +- pthreads_working=no ++ pthreads_working=yes + case $host_alias in + *netware*) + pthreads_working=yes diff --git a/packages/php/php-5.2.0/pear-makefile.patch b/packages/php/php-5.2.0/pear-makefile.patch new file mode 100644 index 0000000000..26de98a48f --- /dev/null +++ b/packages/php/php-5.2.0/pear-makefile.patch @@ -0,0 +1,11 @@ +--- /pear/orig-Makefile.frag 2007-03-16 12:18:33.000000000 +0200 ++++ /pear/Makefile.frag 2007-03-16 12:35:48.000000000 +0200 +@@ -6,7 +6,7 @@ + PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dsafe_mode=0 -dopen_basedir= -derror_reporting=E_ALL -dmemory_limit=-1 -ddetect_unicode=0 + + install-pear-installer: $(SAPI_CLI_PATH) +- @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) $(builddir)/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ++ @$(PHP_NATIVE_DIR)/php $(PEAR_INSTALL_FLAGS) $(builddir)/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" + + install-pear: + @echo "Installing PEAR environment: $(INSTALL_ROOT)$(peardir)/" diff --git a/packages/php/php_5.2.0.bb b/packages/php/php_5.2.0.bb index 3b24fbec40..a4674f08ef 100644 --- a/packages/php/php_5.2.0.bb +++ b/packages/php/php_5.2.0.bb @@ -1,12 +1,15 @@ SECTION = "console/network" DESCRIPTION = "A server-side, HTML-embedded scripting language. This package provides the CGI." LICENSE = "PHP" -DEPENDS = "zlib libxml2 mysql libiconv" +DEPENDS = "zlib libxml2 mysql libiconv php-native" + SRC_URI = "http://us2.php.net/distributions/php-${PV}.tar.bz2\ + file://autotools.patch;patch=1 \ + file://acinclude-xml2-config.patch;patch=1 \ + file://pear-makefile.patch;patch=1 \ " - S = "${WORKDIR}/php-${PV}" -PR = "r0" +PR = "r1" inherit autotools @@ -14,28 +17,29 @@ export THREADS="pthread" export LIBS=" -lpthread " CFLAGS += " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED" - EXTRA_OECONF = " --without-iconv \ --enable-discard-path \ --enable-sockets \ --enable-memory-limit \ --enable-wddx \ - --with-zlib" + --enable-embedded-mysqli \ + --enable-magic-quotes \ + --with-zlib \ + --with-mysql="${STAGING_DIR}/${TARGET_SYS}" \ + --with-mysqli="${STAGING_BINDIR_NATIVE}/mysql_config" \ +" -EXTRA_OECONF += " --without-pear --with-libxml-dir=${STAGING_BINDIR} " -export LD_LIBRARY_PATH = "${STAGING_LIBDIR}" -# Uncomment the following two lines, and comment the above to enable PEAR -#EXTRA_OECONF += " --with-pear-php-cli=${STAGING_BINDIR_NATIVE}/php" -#DEPENDS += " php-native" -acpaths = "" -do_configure () { - autoreconf -ac_cv_php_xml2_config_path=${STAGING_BINDIR_CROSS}/xml2-config oe_runconf -} +# Uncomment the following two lines, and comment the above to enable PEAR +EXTRA_OECONF += " --with-pear-php-cli=${STAGING_BINDIR} --with-libxml-dir=${STAGING_BINDIR}" + +export LD_LIBRARY_PATH = "${STAGING_LIBDIR}" +export PHP_NATIVE_DIR="${STAGING_BINDIR_NATIVE}" +export PHP_PEAR_PHP_BIN="/usr/bin/php" +acpaths = "" do_configure_append() { find ${S} -type f | xargs sed -i 's:I/usr/include:I${STAGING_INCDIR}:g' @@ -45,3 +49,44 @@ do_install () { oe_runmake 'INSTALL_ROOT=${D}' install } + + +PACKAGES = "${PN}-dbg \ + ${PN}-cli \ + ${PN}-pear \ + ${PN}-dev \ + ${PN} \ +" + + +FILES_${PN}-dbg ="/usr/bin/.debug" + +FILES_${PN}-cli ="/usr/bin/php" + +FILES_${PN}-pear ="/usr/bin/pear* /usr/bin/pecl \ + /usr/lib/php/PEAR \ + /usr/lib/php/PEAR.php \ + /usr/lib/php/System.php /usr/lib/php/peclcmd.php /usr/lib/php/pearcmd.php \ + /usr/lib/php/.channels /usr/lib/php/.channels/.alias \ + /usr/lib/php/.channels\__uri.reg \ + /usr/lib/php/.channels\pear.php.net.reg /usr/lib/php/.channels/pecl.php.net.reg \ + /usr/lib/php/.registry \ + /usr/lib/php/Archive/Tar.php \ + /usr/lib/php/Console/Getopt.php /usr/lib/php/OS/Guess.php \ + /usr/lib/php/.depdb /usr/lib/php/.depdblock /usr/lib/php/.filemap \ + /usr/lib/php/.lock" + + +FILES_${PN}-dev ="/usr/include/php /usr/include/build \ + /usr/bin/phpize /usr/bin/php-config" + +FILES_${PN} ="/usr/lib/php" +FILES_${PN} +="/usr/bin" + + + +RDEPENDS_${PN}-pear =${PN} +RDEPENDS_${PN}-cli =${PN} +RDEPENDS_${PN}-dev =${PN} + + diff --git a/packages/prismstumbler/prismstumbler-0.7.3/crosscompile.patch b/packages/prismstumbler/prismstumbler-0.7.3/crosscompile.patch new file mode 100644 index 0000000000..63e9f677a5 --- /dev/null +++ b/packages/prismstumbler/prismstumbler-0.7.3/crosscompile.patch @@ -0,0 +1,166 @@ +Index: prismstumbler-0.7.3/src/gpsd/Makefile.in +=================================================================== +--- prismstumbler-0.7.3.orig/src/gpsd/Makefile.in ++++ prismstumbler-0.7.3/src/gpsd/Makefile.in +@@ -128,8 +128,8 @@ xgpsspeed: $(XGPSOBJS) + $(LINK.c) -o $@ $(XGPSOBJS) -L. -lgpsd $(LIBXAW) $(ALL_X_LIBS) $(LIBS) + + libgpsd.a: $(LIB_OBJECTS) +- ar -r libgpsd.a $(LIB_OBJECTS) +- ranlib libgpsd.a ++ $(AR) -r libgpsd.a $(LIB_OBJECTS) ++ $(RANLIB) libgpsd.a + + clean: + rm -f *.o *.a gpsd gps *~ config.status +Index: prismstumbler-0.7.3/src/gpsd/Makefile +=================================================================== +--- prismstumbler-0.7.3.orig/src/gpsd/Makefile ++++ prismstumbler-0.7.3/src/gpsd/Makefile +@@ -1,4 +1,3 @@ +-# Generated automatically from Makefile.in by configure. + # Makefile.in + # $Modified: Thu Jan 22 11:55:32 1998 by brook $ + +@@ -7,10 +6,10 @@ + + # What we use to compile C files. + # CC = cc +-CC = gcc ++CC = ccache arm-angstrom-linux-gnueabi-gcc -march=armv5te -mtune=xscale + + # The flags we use to compile C files. +-CFLAGS = -g -O2 ++CFLAGS = -I/home/papercrane/oe/angstrom.build/tmp/work/armv5te-angstrom-linux-gnueabi/prismstumbler-0.7.3-r5/prismstumbler-0.7.3/include -D_GNU_SOURCE -isystem/home/papercrane/oe/angstrom.build/tmp/staging/arm-angstrom-linux-gnueabi/include -fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os + + + ## The C preprocessor. +@@ -19,7 +18,7 @@ CFLAGS = -g -O2 + CPP = @CPP_TRADITIONAL@ + + # Flags passed to the C preprocessor. () +-CPPFLAGS = ++CPPFLAGS = -isystem/home/papercrane/oe/angstrom.build/tmp/staging/arm-angstrom-linux-gnueabi/include + + # Definitions to be passed to the C preprocessor. (-DHAVE_CONFIG_H) + DEFS = -DHAVE_CONFIG_H +@@ -28,10 +27,10 @@ DEFS = -DHAVE_CONFIG_H + ## The Linker. + + # Flags passed to the linker. (-g -O) +-LDFLAGS = ++LDFLAGS = -L/home/papercrane/oe/angstrom.build/tmp/staging/arm-angstrom-linux-gnueabi/lib -Wl,-rpath-link,/home/papercrane/oe/angstrom.build/tmp/staging/arm-angstrom-linux-gnueabi/lib -Wl,-O1 + + # Use this for building statically linked executables with GCC. +-# LDFLAGS = -static ++# LDFLAGS = -static -L/home/papercrane/oe/angstrom.build/tmp/staging/arm-angstrom-linux-gnueabi/lib -Wl,-rpath-link,/home/papercrane/oe/angstrom.build/tmp/staging/arm-angstrom-linux-gnueabi/lib -Wl,-O1 + + + ## Local libraries +@@ -52,7 +51,7 @@ NETLIBS = $(LIBNSL) $(LIBSOCKET) + ## X Libraries + + # Special flags for linking with X. (-L/usr/X11R5/lib) +-X_LDFLAGS = -L/usr/X11R6/lib ++X_LDFLAGS = -L/usr/lib -L/home/papercrane/oe/angstrom.build/tmp/staging/arm-angstrom-linux-gnueabi/lib + + # Motif library. (-lXm) + LIBXM = +@@ -62,10 +61,10 @@ LIBXM = + # LIBXM = -Wl,-Bstatic -Wl,-Bdynamic + + # X extension library; needed for Athena and Motif >= 2.0. (-lXext) +-LIBXEXT = -lXext ++LIBXEXT = + + # Xpm library; needed for DDD and sometimes for Motif >= 2.0. (-lXpm) +-LIBXPM = -lXpm ++LIBXPM = + + # Xp library; sometimes needed for Motif >= 2.1. (-lXp) + LIBXP = +@@ -74,13 +73,13 @@ LIBXP = + LIBGEN = + + # X toolkit library. (-lXt) +-LIBXT = -lXt ++LIBXT = + + # Xaw library. (-lXaw) +-LIBXAW = -lXaw ++LIBXAW = + + # X library. (-lSM -lICE -lX11 -lnsl -lsocket) +-LIBX11 = -lSM -lICE -lX11 ++LIBX11 = -lSM -lICE + + # All libraries shown above + ALL_X_LIBS = $(X_LDFLAGS) $(LIBXM) $(LIBXP) $(LIBXPM) $(LIBXEXT) \ +@@ -94,7 +93,7 @@ COMPILE_AND_LINK.c = \ + $(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) $(LDFLAGS) + + ## Where to look for X include files. (-I/usr/X11R5/include) +-X_INCLUDE = -I/usr/X11R6/include ++X_INCLUDE = -I/usr/include -I/home/papercrane/oe/angstrom.build/tmp/staging/arm-angstrom-linux-gnueabi/include/X11 + + ## Where to look for include files. + INCLUDE = -I. $(X_INCLUDE) +@@ -129,8 +128,8 @@ xgpsspeed: $(XGPSOBJS) + $(LINK.c) -o $@ $(XGPSOBJS) -L. -lgpsd $(LIBXAW) $(ALL_X_LIBS) $(LIBS) + + libgpsd.a: $(LIB_OBJECTS) +- ar -r libgpsd.a $(LIB_OBJECTS) +- ranlib libgpsd.a ++ $(AR) -r libgpsd.a $(LIB_OBJECTS) ++ $(RANLIB) libgpsd.a + + clean: + rm -f *.o *.a gpsd gps *~ config.status +Index: prismstumbler-0.7.3/src/gpsd/Makefile.arm +=================================================================== +--- prismstumbler-0.7.3.orig/src/gpsd/Makefile.arm ++++ prismstumbler-0.7.3/src/gpsd/Makefile.arm +@@ -94,7 +94,7 @@ COMPILE_AND_LINK.c = \ + $(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) $(LDFLAGS) + + ## Where to look for X include files. (-I/usr/X11R5/include) +-X_INCLUDE = -I/skiff/local/arm-linux/include/X11 ++X_INCLUDE = @X_CFLAGS@ + + ## Where to look for include files. + INCLUDE = -I. $(X_INCLUDE) +@@ -129,8 +129,8 @@ xgpsspeed: $(XGPSOBJS) + $(LINK.c) -o $@ $(XGPSOBJS) -L. -lgpsd $(LIBXAW) $(ALL_X_LIBS) $(LIBS) + + libgpsd.a: $(LIB_OBJECTS) +- ar -r libgpsd.a $(LIB_OBJECTS) +- ranlib libgpsd.a ++ $(AR) -r libgpsd.a $(LIB_OBJECTS) ++ $(RANLIB) libgpsd.a + + clean: + rm -f *.o *.a gpsd gps *~ config.status +Index: prismstumbler-0.7.3/src/gpsd/Makefile.i386 +=================================================================== +--- prismstumbler-0.7.3.orig/src/gpsd/Makefile.i386 ++++ prismstumbler-0.7.3/src/gpsd/Makefile.i386 +@@ -94,7 +94,7 @@ COMPILE_AND_LINK.c = \ + $(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) $(LDFLAGS) + + ## Where to look for X include files. (-I/usr/X11R5/include) +-X_INCLUDE = -I/usr/X11R6/include ++X_INCLUDE = @X_CFLAGS@ + + ## Where to look for include files. + INCLUDE = -I. $(X_INCLUDE) +@@ -129,8 +129,8 @@ xgpsspeed: $(XGPSOBJS) + $(LINK.c) -o $@ $(XGPSOBJS) -L. -lgpsd $(LIBXAW) $(ALL_X_LIBS) $(LIBS) + + libgpsd.a: $(LIB_OBJECTS) +- ar -r libgpsd.a $(LIB_OBJECTS) +- ranlib libgpsd.a ++ $(AR) -r libgpsd.a $(LIB_OBJECTS) ++ $(RANLIB) libgpsd.a + + clean: + rm -f *.o *.a gpsd gps *~ config.status diff --git a/packages/prismstumbler/prismstumbler-0.7.3/fix-includes.patch b/packages/prismstumbler/prismstumbler-0.7.3/fix-includes.patch deleted file mode 100644 index 9aef61e9d3..0000000000 --- a/packages/prismstumbler/prismstumbler-0.7.3/fix-includes.patch +++ /dev/null @@ -1,26 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- prismstumbler-0.7.3/src/gpsd/Makefile.in~fix-includes -+++ prismstumbler-0.7.3/src/gpsd/Makefile.in -@@ -92,18 +92,6 @@ - COMPILE_AND_LINK.c = \ - $(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) $(LDFLAGS) - --## Where to look for X include files. (-I/usr/X11R5/include) --X_INCLUDE = @X_CFLAGS@ -- --## Where to look for include files. --INCLUDE = -I. $(X_INCLUDE) -- --## Implicit rules. --.SUFFIXES: .c --.c.o: -- $(COMPILE.c) $(INCLUDE) -o $@ $< -- -- - ## Libraries and object files - LIB_OBJECTS = netlib.o nmea_parse.o serial.o tm.o em.o $(MOTIF_OBJECTS) - diff --git a/packages/prismstumbler/prismstumbler_0.7.3.bb b/packages/prismstumbler/prismstumbler_0.7.3.bb index 8699e5668b..bf38d10ca1 100644 --- a/packages/prismstumbler/prismstumbler_0.7.3.bb +++ b/packages/prismstumbler/prismstumbler_0.7.3.bb @@ -1,5 +1,5 @@ SECTION = "x11/network" -PR = "r4" +PR = "r5" PACKAGES = "prismstumbler prismstumbler-frontend prismstumbler-doc" DESCRIPTION = "Prismstumbler wireless LAN scanner" @@ -9,12 +9,18 @@ RDEPENDS = "wireless-tools" SRC_URI = "${SOURCEFORGE_MIRROR}/prismstumbler/${PN}-${PV}.tar.bz2 \ file://bogoconf.patch;patch=1 \ - file://fix-includes.patch;patch=1 \ + file://crosscompile.patch;patch=1 \ file://libz.patch;patch=1;pnum=0" inherit autotools pkgconfig -EXTRA_OECONF = "--with-libpcap=${STAGING_DIR}/${HOST_SYS} --with-sqlite-libs=${STAGING_LIBDIR} --with-sqlite-includes=${STAGING_INCDIR}" +EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ + --x-libraries=${STAGING_LIBDIR} \ + --with-libpcap=${STAGING_DIR}/${HOST_SYS} \ + --with-sqlite-includes=${STAGING_INCDIR} \ + --with-sqlite-libs=${STAGING_LIBDIR} \ + --without-athena" + CFLAGS =+ "-I${S}/include -D_GNU_SOURCE" FILES_${PN} = "${bindir}/prismstumbler" diff --git a/packages/python/python-pygtk2_2.6.3.bb b/packages/python/python-pygtk2_2.6.3.bb new file mode 100644 index 0000000000..61250631ef --- /dev/null +++ b/packages/python/python-pygtk2_2.6.3.bb @@ -0,0 +1,34 @@ +DESCRIPTION = "Python GTK+ Bindings" +SECTION = "devel/python" +# needs gtk+-2.6.x +DEPENDS = "gtk+ libglade" +RDEPENDS = "python-shell" +SRCNAME = "pygtk" +LICENSE = "LGPL" +PR = "ml0" + +SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.6/${SRCNAME}-${PV}.tar.bz2 \ + file://acinclude.m4" +S = "${WORKDIR}/${SRCNAME}-${PV}" + +inherit autotools pkgconfig distutils-base + +PACKAGES = "${PN}-dbg ${PN}-dev ${PN}-doc ${PN}" +FILES_${PN}-dbg += "${libdir}/python2.4/site-packages/gtk-2.0/gtk/.debug \ + ${libdir}/python2.4/site-packages/gtk-2.0/.debug" +FILES_${PN}-dev += "${bindir} ${datadir}/pygtk ${libdir}/pygtk" + +do_configure_prepend() { + install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/ +} + +do_stage() { + autotools_stage_includes + sed -i s:/usr/share:${STAGING_DATADIR}: codegen/pygtk-codegen-2.0 + install -m 0755 codegen/pygtk-codegen-2.0 ${STAGING_BINDIR_NATIVE}/ + install -d ${STAGING_DATADIR}/pygtk/2.0/codegen + install -d ${STAGING_DATADIR}/pygtk/2.0/defs/ + cp -pPr codegen/*.py* ${STAGING_DATADIR}/pygtk/2.0/codegen/ + cp -pPr *.defs ${STAGING_DATADIR}/pygtk/2.0/defs/ + cp -pPr gtk/*.defs ${STAGING_DATADIR}/pygtk/2.0/defs/ +} diff --git a/packages/slugos-init/files/leds b/packages/slugos-init/files/leds index f5011f8bad..8043dae682 100644 --- a/packages/slugos-init/files/leds +++ b/packages/slugos-init/files/leds @@ -18,8 +18,9 @@ esac # handle the 'user' setting. led_user_default(){ case "$(machine)" in - nslu2) echo -n "cpu-idle";; - *) echo -n "cpu";; + nslu2) echo -n "cpu-idle";; + nas100d) echo -n "on";; + *) echo -n "cpu";; esac } # diff --git a/packages/slugos-init/slugos-init_0.10.bb b/packages/slugos-init/slugos-init_0.10.bb index 55fea3e120..56f3c7242a 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 = "r79" +PR = "r80" SRC_URI = "file://boot/flash \ file://boot/disk \ diff --git a/packages/sox/sox-native_13.0.0.bb b/packages/sox/sox-native_13.0.0.bb new file mode 100644 index 0000000000..9b4dd29433 --- /dev/null +++ b/packages/sox/sox-native_13.0.0.bb @@ -0,0 +1,19 @@ +include sox_${PV}.bb + +S = "${WORKDIR}/sox-${PV}" + +inherit native + +do_patch() { + true +} + +do_stage() { + make bindir="${STAGING_BINDIR}" libdir="${STAGING_LIBDIR}" mandir="${STAGING_DIR}/${HOST_SYS}/man" includedir="${STAGING_INCDIR}" install + rm ${STAGING_BINDIR}/rec + ln -s ${STAGING_BINDIR}/play ${STAGING_BINDIR}/rec +} + +do_install() { + true +} diff --git a/packages/sox/sox/src-Makefile.am.patch b/packages/sox/sox/src-Makefile.am.patch new file mode 100644 index 0000000000..b5ffd398ae --- /dev/null +++ b/packages/sox/sox/src-Makefile.am.patch @@ -0,0 +1,11 @@ +--- sox-13.0.0.old/src/Makefile.am 2007-03-18 22:19:52.296535098 -0400 ++++ sox-13.0.0/src/Makefile.am 2007-03-18 22:21:48.968947731 -0400 +@@ -42,7 +42,7 @@ + $(MAKE) -C libgsm + + play rec: sox$(EXEEXT) +- ./sox --help > /dev/null ++# ./sox --help > /dev/null + test -f .libs/lt-sox && ( $(RM) $@ && $(LN_S) .libs/lt-sox $@ ) || $(LN_S) sox$(EXEEXT) $@ + + install-exec-hook: diff --git a/packages/sox/sox_12.17.5.bb b/packages/sox/sox_12.17.5.bb index 6c70eaad7b..a3cd84e726 100644 --- a/packages/sox/sox_12.17.5.bb +++ b/packages/sox/sox_12.17.5.bb @@ -4,7 +4,7 @@ DESCRIPTION="SoX is the Swiss Army knife of sound processing tools. \ It converts audio files among various standard audio file formats \ -and can apply different effects and filters to the audio data." +and can apply different effects and filters to the audio data." LICENSE="GPL" HOMEPAGE="http://sox.sourceforge.net" diff --git a/packages/sox/sox_13.0.0.bb b/packages/sox/sox_13.0.0.bb new file mode 100644 index 0000000000..f5c554799d --- /dev/null +++ b/packages/sox/sox_13.0.0.bb @@ -0,0 +1,18 @@ +DESCRIPTION="SoX is the Swiss Army knife of sound processing tools. \ +It converts audio files among various standard audio file formats \ +and can apply different effects and filters to the audio data." +HOMEPAGE = "http://sox.sourceforge.net" +SECTION = "audio" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/sox/sox-${PV}.tar.gz \ + file://src-Makefile.am.patch;patch=1" + +inherit autotools + +do_install() { + make bindir="${D}${bindir}" libdir="${D}${libdir}" mandir="${D}/${mandir}" includedir="${D}${includedir}" install + rm ${D}${bindir}/rec + ln -s /usr/bin/play ${D}${bindir}/rec +} diff --git a/packages/spandsp/spandsp_0.0.3.bb b/packages/spandsp/spandsp_0.0.3.bb new file mode 100644 index 0000000000..26702f998b --- /dev/null +++ b/packages/spandsp/spandsp_0.0.3.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "A library of many DSP functions for telephony." +HOMEPAGE = "http://www.soft-switch.org" +DEPENDS = "tiff libxml2" +SECTION = "voip" +LICENSE = "GPL" +PV = "0.0.3" +PSUBV = "pre27" +PR = "r0" + +SRC_URI = "http://www.soft-switch.org/downloads/snapshots/spandsp/spandsp-20070123.tar.gz" + +inherit autotools + +PARALLEL_MAKE = "" + +do_stage () { + autotools_stage_all +} diff --git a/packages/sysvinit/sysvinit/oplinux-uclibc/.mtn2git_empty b/packages/sysvinit/sysvinit/oplinux-uclibc/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/sysvinit/sysvinit/oplinux-uclibc/.mtn2git_empty diff --git a/packages/sysvinit/sysvinit/oplinux-uclibc/inittab b/packages/sysvinit/sysvinit/oplinux-uclibc/inittab new file mode 100644 index 0000000000..1bb7c45254 --- /dev/null +++ b/packages/sysvinit/sysvinit/oplinux-uclibc/inittab @@ -0,0 +1,39 @@ +# /etc/inittab: init(8) configuration. +# $Id: inittab,v 1.91 2002/01/25 13:35:21 miquels Exp $ + +# The default runlevel. +id:2:initdefault: + +# Boot-time system configuration/initialization script. +# This is run first except when booting in emergency (-b) mode. +si::sysinit:/etc/init.d/rcS + +# What to do in single-user mode. +~~:S:wait:/sbin/sulogin + +# /etc/init.d executes the S and K scripts upon change +# of runlevel. +# +# Runlevel 0 is halt. +# Runlevel 1 is single-user. +# Runlevels 2-5 are multi-user. +# Runlevel 6 is reboot. + +l0:0:wait:/etc/init.d/rc 0 +l1:1:wait:/etc/init.d/rc 1 +l2:2:wait:/etc/init.d/rc 2 +l3:3:wait:/etc/init.d/rc 3 +l4:4:wait:/etc/init.d/rc 4 +l5:5:wait:/etc/init.d/rc 5 +l6:6:wait:/etc/init.d/rc 6 +# Normally not reached, but fallthrough in case of emergency. +z6:6:respawn:/sbin/sulogin + + +1:2345:respawn:/sbin/getty 115200 tty1 +2:23:respawn:/sbin/getty 115200 tty2 +3:23:respawn:/sbin/getty 115200 tty3 +4:23:respawn:/sbin/getty 115200 tty4 +5:23:respawn:/sbin/getty 115200 tty5 +6:23:respawn:/sbin/getty 115200 tty6 + diff --git a/packages/sysvinit/sysvinit/oplinux/.mtn2git_empty b/packages/sysvinit/sysvinit/oplinux/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/sysvinit/sysvinit/oplinux/.mtn2git_empty diff --git a/packages/sysvinit/sysvinit/oplinux/inittab b/packages/sysvinit/sysvinit/oplinux/inittab new file mode 100644 index 0000000000..1bb7c45254 --- /dev/null +++ b/packages/sysvinit/sysvinit/oplinux/inittab @@ -0,0 +1,39 @@ +# /etc/inittab: init(8) configuration. +# $Id: inittab,v 1.91 2002/01/25 13:35:21 miquels Exp $ + +# The default runlevel. +id:2:initdefault: + +# Boot-time system configuration/initialization script. +# This is run first except when booting in emergency (-b) mode. +si::sysinit:/etc/init.d/rcS + +# What to do in single-user mode. +~~:S:wait:/sbin/sulogin + +# /etc/init.d executes the S and K scripts upon change +# of runlevel. +# +# Runlevel 0 is halt. +# Runlevel 1 is single-user. +# Runlevels 2-5 are multi-user. +# Runlevel 6 is reboot. + +l0:0:wait:/etc/init.d/rc 0 +l1:1:wait:/etc/init.d/rc 1 +l2:2:wait:/etc/init.d/rc 2 +l3:3:wait:/etc/init.d/rc 3 +l4:4:wait:/etc/init.d/rc 4 +l5:5:wait:/etc/init.d/rc 5 +l6:6:wait:/etc/init.d/rc 6 +# Normally not reached, but fallthrough in case of emergency. +z6:6:respawn:/sbin/sulogin + + +1:2345:respawn:/sbin/getty 115200 tty1 +2:23:respawn:/sbin/getty 115200 tty2 +3:23:respawn:/sbin/getty 115200 tty3 +4:23:respawn:/sbin/getty 115200 tty4 +5:23:respawn:/sbin/getty 115200 tty5 +6:23:respawn:/sbin/getty 115200 tty6 + diff --git a/packages/sysvinit/sysvinit_2.86.bb b/packages/sysvinit/sysvinit_2.86.bb index 1a2d79c9be..a4c4ff8381 100644 --- a/packages/sysvinit/sysvinit_2.86.bb +++ b/packages/sysvinit/sysvinit_2.86.bb @@ -2,7 +2,7 @@ DESCRIPTION = "System-V like init." SECTION = "base" LICENSE = "GPL" HOMEPAGE = "http://freshmeat.net/projects/sysvinit/" -PR = "r32" +PR = "r33" # USE_VT and SERIAL_CONSOLE are generally defined by the MACHINE .conf. # Set PACKAGE_ARCH appropriately. diff --git a/packages/tzdata/tzdata_2007c.bb b/packages/tzdata/tzdata_2007c.bb index 3b6c45502b..1e8ff25137 100644 --- a/packages/tzdata/tzdata_2007c.bb +++ b/packages/tzdata/tzdata_2007c.bb @@ -3,11 +3,13 @@ SECTION = "base" PRIORITY = "optional" DEPENDS = "tzcode-native" +PR = "r1" + PROVIDES = "tzdata tzdata-misc tzdata-posix tzdata-right tzdata-africa \ tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia \ tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific" RPROVIDES = "tzdata" -RCONFLICTS= "timezone-africa timezone-america timezone-antarctica \ +RCONFLICTS= "timezones timezone-africa timezone-america timezone-antarctica \ timezone-arctic timezone-asia timezone-atlantic \ timezone-australia timezone-europe timezone-indian \ timezone-iso3166.tab timezone-pacific timezone-zone.tab" diff --git a/site/ix86-common b/site/ix86-common index 496c2e3403..96a36cf9c8 100644 --- a/site/ix86-common +++ b/site/ix86-common @@ -107,6 +107,9 @@ ac_cv_func_posix_getpwnam_r=${ac_cv_func_posix_getpwnam_r=yes} dpkg_cv_va_copy=${ac_cv_va_copy=no} dpkg_cv___va_copy=${ac_cv___va_copy=yes} +# enca +yeti_cv_func_scanf_modif_size_t=yes + # ettercap ettercap_cv_type_socklen_t=${ettercap_cv_type_socklen_t=yes} |