summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-02-10 12:06:32 +0000
committerRichard Purdie <richard@openedhand.com>2006-02-10 12:06:32 +0000
commit42dfbb2a0223ba5d091f053ad5401ecce6446e41 (patch)
tree2636ad1c536f88f79517299d441be6584a58d892
parentdd1b4430b5d74ee7f3827ed6eed56a2bd5f99d42 (diff)
downloadpoky-42dfbb2a0223ba5d091f053ad5401ecce6446e41.tar.gz
Sync more files with OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@271 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat
-rw-r--r--openembedded/conf/distro/familiar-unstable.conf72
-rw-r--r--openembedded/conf/distro/familiar.conf16
-rw-r--r--openembedded/conf/distro/openzaurus-unstable.conf67
-rw-r--r--openembedded/conf/distro/poky.conf106
-rw-r--r--openembedded/conf/distro/preferred-gpe-versions-2.7.inc16
-rw-r--r--openembedded/packages/apmd/apmd-3.2.2/zaurus24.patch50
-rw-r--r--openembedded/packages/glibc/glibc-package.bbclass2
-rw-r--r--openembedded/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb2
-rw-r--r--openembedded/packages/gtk+/gtk+-2.8.3/README63
-rw-r--r--openembedded/packages/gtk+/gtk+-2.8.3/automake-lossage.patch24
-rw-r--r--openembedded/packages/gtk+/gtk+-2.8.3/disable-tooltips.patch11
-rw-r--r--openembedded/packages/gtk+/gtk+-2.8.3/gtk+-handhelds.patch236
-rw-r--r--openembedded/packages/gtk+/gtk+-2.8.3/gtklabel-resize-patch10
-rw-r--r--openembedded/packages/gtk+/gtk+-2.8.3/hardcoded_libtool.patch29
-rw-r--r--openembedded/packages/gtk+/gtk+-2.8.3/menu-deactivate.patch50
-rw-r--r--openembedded/packages/gtk+/gtk+-2.8.3/no-demos.patch10
-rw-r--r--openembedded/packages/gtk+/gtk+-2.8.3/no-xwc.patch151
-rw-r--r--openembedded/packages/gtk+/gtk+-2.8.3/scroll-timings.patch15
-rw-r--r--openembedded/packages/gtk+/gtk+-2.8.3/single-click.patch54
-rw-r--r--openembedded/packages/gtk+/gtk+-2.8.3/small-gtkfilesel.patch267
-rw-r--r--openembedded/packages/gtk+/gtk+-2.8.3/spinbutton.patch128
-rw-r--r--openembedded/packages/gtk+/gtk+_2.6.4-1.osso7.bb2
-rw-r--r--openembedded/packages/gtk+/gtk+_2.6.7.bb2
-rw-r--r--openembedded/packages/gtk+/gtk+_2.8.3.bb82
-rw-r--r--openembedded/packages/gtk+/gtk+_2.8.9.bb2
-rw-r--r--openembedded/packages/pango/pango_1.10.0.bb2
-rw-r--r--openembedded/packages/pango/pango_1.9.1.bb2
-rw-r--r--openembedded/packages/perl/perl.inc4
-rw-r--r--openembedded/packages/vera-fonts/ttf-bitstream-vera_1.10.bb2
-rw-r--r--openembedded/packages/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/fix_watch_cursor.patch24
-rw-r--r--openembedded/site/armeb-linux5
31 files changed, 312 insertions, 1194 deletions
diff --git a/openembedded/conf/distro/familiar-unstable.conf b/openembedded/conf/distro/familiar-unstable.conf
new file mode 100644
index 0000000000..1d40bbac56
--- /dev/null
+++ b/openembedded/conf/distro/familiar-unstable.conf
@@ -0,0 +1,72 @@
1DISTRO = "familiar"
2DISTRO_NAME = "Familiar Linux"
3DISTRO_VERSION = "unstable-${DATE}"
4MAINTAINER = "Koen Kooi <koen@handhelds.org>"
5# Do not touch this file before notifying familiar-dev@handhelds.org
6
7include conf/distro/familiar.conf
8
9
10DISTRO_TYPE = "debug"
11#DISTRO_TYPE = "release"
12#!!!!! DON'T FORGET TO ENABLE ZAPROOTPASSWD !!!!!
13
14
15FEED_URIS += " \
16 base##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/base \
17 updates##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/updates"
18
19#SRCDATE = 20050331
20#SRCDATE = "now"
21
22PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
23PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross"
24PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross"
25
26PREFERRED_PROVIDER_virtual/libiconv=glibc
27PREFERRED_PROVIDER_virtual/libintl=glibc
28PREFERRED_PROVIDER_x11=diet-x11
29
30PREFERRED_VERSION_hostap-modules ?= "0.3.9"
31
32#2.4 machines prefer 0.13e ones
33PREFERRED_VERSION_orinoco-modules ?= "0.13e"
34
35#but 0.13e doesn't build against 2.6
36PREFERRED_VERSION_orinoco-modules_h2200 ?= "0.15"
37PREFERRED_VERSION_orinoco-modules_ipaq-pxa270 ?= "0.15"
38
39
40
41# The CSL compiler is unusable because
42# 1) certain programs stop to compile
43# 2) more programs segfault
44PREFERRED_VERSION_gcc ?= "3.4.4"
45PREFERRED_VERSION_gcc-cross ?= "3.4.4"
46PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4"
47
48#
49# Opie
50#
51
52PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie"
53PREFERRED_VERSION_qte = "2.3.10"
54
55#OPIE_VERSION = "1.2.1"
56#include conf/distro/preferred-opie-versions.inc
57
58#
59# GPE
60#
61
62PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
63PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus"
64PREFERRED_PROVIDER_x11 = "diet-x11"
65
66include conf/distro/preferred-gpe-versions-2.8.inc
67
68#
69# E
70#
71include conf/distro/preferred-e-versions.inc
72
diff --git a/openembedded/conf/distro/familiar.conf b/openembedded/conf/distro/familiar.conf
new file mode 100644
index 0000000000..99e501589f
--- /dev/null
+++ b/openembedded/conf/distro/familiar.conf
@@ -0,0 +1,16 @@
1#@TYPE: Distribution
2#@NAME: Familiar Linux
3#@DESCRIPTION: Distribution configuration for Familiar Linux (handhelds.org)
4
5INHERIT += "package_ipk debian"
6TARGET_OS = "linux"
7
8PARALLEL_INSTALL_MODULES = "1"
9UDEV_DEVFS_RULES = "1"
10IMAGE_NAME = "${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}"
11
12BOOTSTRAP_EXTRA_RDEPENDS += "familiar-version"
13
14DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}"
15
16include conf/distro/include/multimachine.conf
diff --git a/openembedded/conf/distro/openzaurus-unstable.conf b/openembedded/conf/distro/openzaurus-unstable.conf
new file mode 100644
index 0000000000..f424b16696
--- /dev/null
+++ b/openembedded/conf/distro/openzaurus-unstable.conf
@@ -0,0 +1,67 @@
1DISTRO_VERSION = ".dev-snapshot-${DATE}"
2
3include conf/distro/openzaurus.conf
4
5DISTRO_TYPE = "debug"
6# DISTRO_TYPE = "release"
7
8#FEED_URIS += " \
9# upgrades##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/ \
10#upgrades-${MACHINE}##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/${MACHINE} \
11# machine##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/machine/${MACHINE} \
12# base##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/base/ \
13# libs##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/libs/ \
14# console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \
15# devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel"
16
17# SRCDATE = "20050704"
18
19#
20# Zaurus
21#
22
23ASSUME_PROVIDED += "virtual/arm-linux-gcc-2.95"
24
25KERNEL_CONSOLE = "ttyS0"
26#DEBUG_OPTIMIZATION = "-O -g3"
27#DEBUG_BUILD = "1"
28#INHIBIT_PACKAGE_STRIP = "1"
29
30PREFERRED_VERSION_gcc-cross ?= "3.4.4"
31PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4"
32
33PREFERRED_VERSION_hostap-modules ?= "0.3.9"
34
35#fix some iconv issues, needs to be adjusted when doing uclibc builds
36PREFERRED_PROVIDER_virtual/libiconv = "glibc"
37PREFERRED_PROVIDER_virtual/libintl = "glibc"
38
39
40#
41# Base
42#
43PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1"
44PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
45PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
46PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
47
48#
49# Opie
50#
51PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie"
52
53#OPIE_VERSION = "1.2.1"
54#include conf/distro/preferred-opie-versions.inc
55
56#
57# GPE
58#
59PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
60PREFERRED_PROVIDER_x11 = "diet-x11"
61include conf/distro/preferred-gpe-versions-2.8.inc
62
63#
64# E
65#
66include conf/distro/preferred-e-versions.inc
67
diff --git a/openembedded/conf/distro/poky.conf b/openembedded/conf/distro/poky.conf
index d628b1d3fc..ad35c65b00 100644
--- a/openembedded/conf/distro/poky.conf
+++ b/openembedded/conf/distro/poky.conf
@@ -73,44 +73,44 @@ PREFERRED_PROVIDER_gnome-vfs=gnome-vfs-dbus
73# 73#
74# CVS Dates to use: 74# CVS Dates to use:
75# 75#
76#CVSDATE_gnome-vfs-dbus = "20051215" 76#SRCDATE_gnome-vfs-dbus = "20051215"
77CVSDATE_gconf-dbus = "20060119" 77SRCDATE_gconf-dbus = "20060119"
78CVSDATE_gnome-vfs-dbus = "20060119" 78SRCDATE_gnome-vfs-dbus = "20060119"
79CVSDATE_contacts = "20060207" 79SRCDATE_contacts = "20060207"
80CVSDATE_dates = "20060120" 80SRCDATE_dates = "20060120"
81CVSDATE_eds-dbus = "20060126" 81SRCDATE_eds-dbus = "20060126"
82CVSDATE_minimo = "20050401" 82SRCDATE_minimo = "20050401"
83CVSDATE_ipkg-utils-native = "20050930" 83SRCDATE_ipkg-utils-native = "20050930"
84CVSDATE_ipkg-link-1 = "20050930" 84SRCDATE_ipkg-link-1 = "20050930"
85CVSDATE_ipkg-utils = "20050930" 85SRCDATE_ipkg-utils = "20050930"
86CVSDATE_ipkg-link = "20050930" 86SRCDATE_ipkg-link = "20050930"
87CVSDATE_matchbox-common = "20051101" 87SRCDATE_matchbox-common = "20051101"
88CVSDATE_matchbox-config-gtk = "20051101" 88SRCDATE_matchbox-config-gtk = "20051101"
89CVSDATE_matchbox-desktop = "20060120" 89SRCDATE_matchbox-desktop = "20060120"
90CVSDATE_matchbox-keyboard = "20051101" 90SRCDATE_matchbox-keyboard = "20051101"
91CVSDATE_matchbox-panel = "20051101" 91SRCDATE_matchbox-panel = "20051101"
92CVSDATE_matchbox-panel-manager = "20051101" 92SRCDATE_matchbox-panel-manager = "20051101"
93CVSDATE_matchbox-stroke = "20051101" 93SRCDATE_matchbox-stroke = "20051101"
94CVSDATE_matchbox-themes-extra = "20051101" 94SRCDATE_matchbox-themes-extra = "20051101"
95CVSDATE_matchbox-wm = "20060120" 95SRCDATE_matchbox-wm = "20060120"
96CVSDATE_libmatchbox = "20060120" 96SRCDATE_libmatchbox = "20060120"
97CVSDATE_tslib = "20051101" 97SRCDATE_tslib = "20051101"
98CVSDATE_xext = "20051101" 98SRCDATE_xext = "20051101"
99CVSDATE_renderext = "20051101" 99SRCDATE_renderext = "20051101"
100CVSDATE_libxrender = "20051101" 100SRCDATE_libxrender = "20051101"
101CVSDATE_fixesext = "20051101" 101SRCDATE_fixesext = "20051101"
102CVSDATE_damageext = "20051101" 102SRCDATE_damageext = "20051101"
103CVSDATE_compositeext = "20051101" 103SRCDATE_compositeext = "20051101"
104CVSDATE_xcalibrateext = "20051101" 104SRCDATE_xcalibrateext = "20051101"
105CVSDATE_recordext = "20051101" 105SRCDATE_recordext = "20051101"
106CVSDATE_libfakekey = "20051101" 106SRCDATE_libfakekey = "20051101"
107CVSDATE_xmodmap = "20051101" 107SRCDATE_xmodmap = "20051101"
108CVSDATE_xrandr = "20051101" 108SRCDATE_xrandr = "20051101"
109CVSDATE_xtst = "20051101" 109SRCDATE_xtst = "20051101"
110CVSDATE_xcalibrate = "20051101" 110SRCDATE_xcalibrate = "20051101"
111CVSDATE_xmu = "20051115" 111SRCDATE_xmu = "20051115"
112CVSDATE_xdpyinfo = "20051115" 112SRCDATE_xdpyinfo = "20051115"
113CVSDATE_xauth = "20060120" 113SRCDATE_xauth = "20060120"
114 114
115# 115#
116# Preferred Versions: 116# Preferred Versions:
@@ -118,15 +118,15 @@ CVSDATE_xauth = "20060120"
118PREFERRED_VERSION_matchbox = "0.9.1" 118PREFERRED_VERSION_matchbox = "0.9.1"
119PREFERRED_VERSION_matchbox-applet-inputmanager = "0.6" 119PREFERRED_VERSION_matchbox-applet-inputmanager = "0.6"
120PREFERRED_VERSION_matchbox-applet-startup-monitor = "0.1" 120PREFERRED_VERSION_matchbox-applet-startup-monitor = "0.1"
121PREFERRED_VERSION_matchbox-common = "0.9.1+cvs-${CVSDATE}" 121PREFERRED_VERSION_matchbox-common = "0.9.1+svn${SRCDATE}"
122PREFERRED_VERSION_matchbox-config-gtk = "0.0+cvs-${CVSDATE}" 122PREFERRED_VERSION_matchbox-config-gtk = "0.0+svn${SRCDATE}"
123PREFERRED_VERSION_matchbox-desktop = "0.9.1+cvs-${CVSDATE}" 123PREFERRED_VERSION_matchbox-desktop = "0.9.1+svn${SRCDATE}"
124PREFERRED_VERSION_matchbox-keyboard = "0.0+cvs-${CVSDATE}" 124PREFERRED_VERSION_matchbox-keyboard = "0.0+svn${SRCDATE}"
125PREFERRED_VERSION_matchbox-panel = "0.9.2+cvs-${CVSDATE}" 125PREFERRED_VERSION_matchbox-panel = "0.9.2+svn${SRCDATE}"
126PREFERRED_VERSION_matchbox-stroke = "0.0+cvs-${CVSDATE}" 126PREFERRED_VERSION_matchbox-stroke = "0.0+svn${SRCDATE}"
127PREFERRED_VERSION_matchbox-themes-extra = "0.3+cvs-${CVSDATE}" 127PREFERRED_VERSION_matchbox-themes-extra = "0.3+svn${SRCDATE}"
128PREFERRED_VERSION_matchbox-wm = "0.9.5+cvs-${CVSDATE}" 128PREFERRED_VERSION_matchbox-wm = "0.9.5+svn${SRCDATE}"
129PREFERRED_VERSION_libmatchbox = "1.7+cvs-${CVSDATE}" 129PREFERRED_VERSION_libmatchbox = "1.7+svn${SRCDATE}"
130 130
131#PREFERRED_VERSION_atk = "1.10.0" 131#PREFERRED_VERSION_atk = "1.10.0"
132#PREFERRED_VERSION_cairo = "1.0.0" 132#PREFERRED_VERSION_cairo = "1.0.0"
@@ -155,18 +155,18 @@ PREFERRED_VERSION_libschedule ?= "0.15"
155PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1" 155PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1"
156PREFERRED_VERSION_linphone ?= "0.12.2" 156PREFERRED_VERSION_linphone ?= "0.12.2"
157PREFERRED_VERSION_minilite ?= "0.49" 157PREFERRED_VERSION_minilite ?= "0.49"
158PREFERRED_VERSION_minimo ?= "0.0cvs${CVSDATE_minimo}" 158PREFERRED_VERSION_minimo ?= "0.0+cvs${SRCDATE_minimo}"
159PREFERRED_VERSION_poppler ?= "0.3.3" 159PREFERRED_VERSION_poppler ?= "0.3.3"
160PREFERRED_VERSION_rosetta ?= "0.0cvs${CVSDATE}" 160PREFERRED_VERSION_rosetta ?= "0.0+cvs${SRCDATE}"
161PREFERRED_VERSION_rxvt-unicode ?= "5.6" 161PREFERRED_VERSION_rxvt-unicode ?= "5.6"
162PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1" 162PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1"
163PREFERRED_VERSION_xdemineur ?= "2.1.1" 163PREFERRED_VERSION_xdemineur ?= "2.1.1"
164PREFERRED_VERSION_xextensions ?= "1.0.1" 164PREFERRED_VERSION_xextensions ?= "1.0.1"
165PREFERRED_VERSION_xhost ?= "0.0cvs20040413" 165PREFERRED_VERSION_xhost ?= "0.0+cvs20040413"
166PREFERRED_VERSION_xmonobut ?= "0.4" 166PREFERRED_VERSION_xmonobut ?= "0.4"
167PREFERRED_VERSION_xprop ?= "0.0cvs${CVSDATE}" 167PREFERRED_VERSION_xprop ?= "0.0+cvs${SRCDATE}"
168PREFERRED_VERSION_xproto ?= "6.6.2" 168PREFERRED_VERSION_xproto ?= "6.6.2"
169PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}" 169PREFERRED_VERSION_xrdb ?= "0.0+cvs${SRCDATE}"
170PREFERRED_VERSION_xst ?= "0.15" 170PREFERRED_VERSION_xst ?= "0.15"
171 171
172PREFERRED_VERSION_oprofile ?= "0.0cvs${CVSDATE}" 172PREFERRED_VERSION_oprofile ?= "0.0+cvs${SRCDATE}"
diff --git a/openembedded/conf/distro/preferred-gpe-versions-2.7.inc b/openembedded/conf/distro/preferred-gpe-versions-2.7.inc
index e535f4e12a..f8af96435b 100644
--- a/openembedded/conf/distro/preferred-gpe-versions-2.7.inc
+++ b/openembedded/conf/distro/preferred-gpe-versions-2.7.inc
@@ -3,7 +3,7 @@
3# 3#
4 4
5#work around some breakages 5#work around some breakages
6#CVSDATE_minimo=20050401 6#SRCDATE_minimo=20050401
7 7
8#set some preferred providers: 8#set some preferred providers:
9PREFERRED_PROVIDER_gconf=gconf-dbus 9PREFERRED_PROVIDER_gconf=gconf-dbus
@@ -14,7 +14,7 @@ PREFERRED_VERSION_libmatchbox ?= "1.7"
14PREFERRED_VERSION_matchbox ?= "0.9.1" 14PREFERRED_VERSION_matchbox ?= "0.9.1"
15PREFERRED_VERSION_matchbox-common ?= "0.9.1" 15PREFERRED_VERSION_matchbox-common ?= "0.9.1"
16PREFERRED_VERSION_matchbox-desktop ?= "0.9.1" 16PREFERRED_VERSION_matchbox-desktop ?= "0.9.1"
17PREFERRED_VERSION_matchbox-wm ?= "0.9.5+cvs-${CVSDATE}" 17PREFERRED_VERSION_matchbox-wm ?= "0.9.5+svn${SRCDATE}"
18PREFERRED_VERSION_matchbox-panel ?= "0.9.2" 18PREFERRED_VERSION_matchbox-panel ?= "0.9.2"
19PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6" 19PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6"
20PREFERRED_VERSION_atk ?= "1.9.0" 20PREFERRED_VERSION_atk ?= "1.9.0"
@@ -36,10 +36,10 @@ PREFERRED_VERSION_rxvt-unicode ?= "5.6"
36PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3" 36PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3"
37PREFERRED_VERSION_xst ?= "0.15" 37PREFERRED_VERSION_xst ?= "0.15"
38PREFERRED_VERSION_xextensions ?= "1.0.1" 38PREFERRED_VERSION_xextensions ?= "1.0.1"
39PREFERRED_VERSION_xserver-kdrive = "0.0cvs20050207" 39PREFERRED_VERSION_xserver-kdrive = "0.0+cvs20050207"
40PREFERRED_VERSION_xprop ?= "0.0cvs${CVSDATE}" 40PREFERRED_VERSION_xprop ?= "0.0+cvs${SRCDATE}"
41PREFERRED_VERSION_xhost ?= "0.0cvs20040413" 41PREFERRED_VERSION_xhost ?= "0.0+cvs20040413"
42PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}" 42PREFERRED_VERSION_xrdb ?= "0.0+cvs${SRCDATE}"
43PREFERRED_VERSION_gpe-login ?= "0.83" 43PREFERRED_VERSION_gpe-login ?= "0.83"
44PREFERRED_VERSION_gpe-session-scripts ?= "0.66" 44PREFERRED_VERSION_gpe-session-scripts ?= "0.66"
45PREFERRED_VERSION_gpe-soundserver ?= "0.4-1" 45PREFERRED_VERSION_gpe-soundserver ?= "0.4-1"
@@ -82,9 +82,9 @@ PREFERRED_VERSION_gpe-tetris ?= "0.6-4"
82PREFERRED_VERSION_gsoko ?= "0.4.2-gpe6" 82PREFERRED_VERSION_gsoko ?= "0.4.2-gpe6"
83PREFERRED_VERSION_xdemineur ?= "2.1.1" 83PREFERRED_VERSION_xdemineur ?= "2.1.1"
84PREFERRED_VERSION_matchbox-panel-hacks ?= "0.3-1" 84PREFERRED_VERSION_matchbox-panel-hacks ?= "0.3-1"
85PREFERRED_VERSION_rosetta ?= "0.0cvs${CVSDATE}" 85PREFERRED_VERSION_rosetta ?= "0.0+cvs${SRCDATE}"
86PREFERRED_VERSION_dillo2 ?= "0.6.6" 86PREFERRED_VERSION_dillo2 ?= "0.6.6"
87PREFERRED_VERSION_minimo ?= "0.0cvs${CVSDATE_minimo}" 87PREFERRED_VERSION_minimo ?= "0.0+cvs${SRCDATE_minimo}"
88PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1" 88PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1"
89PREFERRED_VERSION_linphone ?= "0.12.2" 89PREFERRED_VERSION_linphone ?= "0.12.2"
90PREFERRED_VERSION_firefox ?= "1.0" 90PREFERRED_VERSION_firefox ?= "1.0"
diff --git a/openembedded/packages/apmd/apmd-3.2.2/zaurus24.patch b/openembedded/packages/apmd/apmd-3.2.2/zaurus24.patch
new file mode 100644
index 0000000000..5df016ab77
--- /dev/null
+++ b/openembedded/packages/apmd/apmd-3.2.2/zaurus24.patch
@@ -0,0 +1,50 @@
1Index: apmd-3.2.2.orig/apm.c
2===================================================================
3--- apmd-3.2.2.orig.orig/apm.c 2006-01-26 15:15:27.000000000 +0100
4+++ apmd-3.2.2.orig/apm.c 2006-01-26 17:50:14.000000000 +0100
5@@ -24,10 +24,12 @@
6 #include <unistd.h>
7 #include <sys/types.h>
8 #include <sys/stat.h>
9+#include <sys/utsname.h>
10 #include <fcntl.h>
11 #include <errno.h>
12 #include <time.h>
13 #include <getopt.h>
14+#include <signal.h>
15 #include "apm.h"
16
17 static int verbose = 0;
18@@ -43,6 +45,9 @@
19 int fd;
20 time_t then, now;
21 int error;
22+ FILE* pid_file;
23+ int apmd_pid;
24+ struct utsname uname_ver;
25
26 fd = open(APM_DEVICE, O_WRONLY);
27 if (fd < 0)
28@@ -54,6 +59,22 @@
29 switch (mode)
30 {
31 case SUSPEND:
32+ if(0 == system("grep -i hardware /proc/cpuinfo|grep -i SHARP"))
33+ {
34+ uname(&uname_ver);
35+
36+ if(0 == strncmp("2.4", uname_ver.release, 3))
37+ {
38+ pid_file = fopen("/var/run/apmd.pid", "r");
39+ if(pid_file)
40+ {
41+ fscanf(pid_file, "%d", &apmd_pid);
42+ fclose(pid_file);
43+ }
44+
45+ kill(apmd_pid, SIGKILL);
46+ }
47+ }
48 error = apm_suspend(fd);
49 break;
50 case STANDBY:
diff --git a/openembedded/packages/glibc/glibc-package.bbclass b/openembedded/packages/glibc/glibc-package.bbclass
index 053794ed7f..9a91e3ab24 100644
--- a/openembedded/packages/glibc/glibc-package.bbclass
+++ b/openembedded/packages/glibc/glibc-package.bbclass
@@ -95,6 +95,8 @@ mv ${TMP_LOCALE}/locale-archive ${libdir}/locale/
95rm -rf ${TMP_LOCALE} 95rm -rf ${TMP_LOCALE}
96} 96}
97 97
98PACKAGES_DYNAMIC = "glibc-gconv-* glibc-charmap-* glibc-localedata-*"
99
98python package_do_split_gconvs () { 100python package_do_split_gconvs () {
99 import os, re 101 import os, re
100 if (bb.data.getVar('PACKAGE_NO_GCONV', d, 1) == '1'): 102 if (bb.data.getVar('PACKAGE_NO_GCONV', d, 1) == '1'):
diff --git a/openembedded/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb b/openembedded/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb
index 2e6ac43f8a..8133be73e0 100644
--- a/openembedded/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb
+++ b/openembedded/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb
@@ -81,7 +81,7 @@ do_install() {
81 oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" DESTDIR="${D}" install 81 oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" DESTDIR="${D}" install
82} 82}
83 83
84PACKAGES_DYNAMIC = "gnome=vfs-plugin-*" 84PACKAGES_DYNAMIC = "gnome-vfs-plugin-*"
85 85
86python populate_packages_prepend () { 86python populate_packages_prepend () {
87 print bb.data.getVar('FILES_gnome-vfs', d, 1) 87 print bb.data.getVar('FILES_gnome-vfs', d, 1)
diff --git a/openembedded/packages/gtk+/gtk+-2.8.3/README b/openembedded/packages/gtk+/gtk+-2.8.3/README
deleted file mode 100644
index 3cc3a2d42b..0000000000
--- a/openembedded/packages/gtk+/gtk+-2.8.3/README
+++ /dev/null
@@ -1,63 +0,0 @@
1Definitely Keep
2===
3
4disable-tooltips.patch
5
6 Makes sense for toucscreens at least. Could be made better by being
7 an XSettings property: http://bugzilla.gnome.org/show_bug.cgi?id=315112
8
9hardcoded_libtool.patch
10
11 Fix libtool calls in configure - likely needed although should go upstream in
12 some form if possible.
13
14
15Probably Uneeded
16===
17
18no-xwc.patch
19
20 Removes any (uneeded) i18n xlib calls that are just stubs in an xlib built
21 with --disable-locale. Might not be needed as Xlib should provide stubs.
22
23gtklabel-resize-patch
24
25 Forces a resize when the style is set. Shouldn't be needed as the
26 clear_layout() call should do what is required. Remove and see?
27
28no-demos.patch
29
30 Do we want demos to be built? RB: does it matter if they are built, can we
31 just not install gtk-demo?
32
33scroll-timings.patch
34
35 Slows down the delays when clicking on scrollbars.
36
37single-click.patch
38
39 Makes the (deprecated) GtkFileSelector use single-click rather than double.
40
41gtk+-handhelds.patch
42
43 Crack insane patch which changes the size of arrows, fiddles how the calendar
44 works, adds a min-width style property on GtkEntry, and adds support for the
45 RECOGNISE_PROTOCOLS atom.
46
47
48Not Sure
49===
50
51Not sure what this appears to do or how they affect things too be useful;
52
53 menu-deactivate.patch
54 spinbutton.patch
55
56 automake-lossage.patch
57
58
59Can Definitely Go
60===
61
62small-gtkfilesel.patch - CRACK!
63xsettings.patch - EVEEL!
diff --git a/openembedded/packages/gtk+/gtk+-2.8.3/automake-lossage.patch b/openembedded/packages/gtk+/gtk+-2.8.3/automake-lossage.patch
deleted file mode 100644
index 0d423ddbb9..0000000000
--- a/openembedded/packages/gtk+/gtk+-2.8.3/automake-lossage.patch
+++ /dev/null
@@ -1,24 +0,0 @@
1--- gtk+-2.4.1/docs/tutorial/Makefile.am~ 2003-05-06 22:54:20.000000000 +0100
2+++ gtk+-2.4.1/docs/tutorial/Makefile.am 2004-05-08 12:31:41.000000000 +0100
3@@ -52,21 +52,5 @@
4
5 dist-hook: html
6 cp -Rp $(srcdir)/html $(distdir)
7-else
8-html:
9- echo "***"
10- echo "*** Warning: Tutorial not built"
11- echo "***"
12-
13-pdf:
14- echo "***"
15- echo "*** Warning: Tutorial not built"
16- echo "***"
17-
18-dist-hook:
19- echo "***"
20- echo "*** Warning: Tutorial not built"
21- echo "*** DISTRIBUTION IS INCOMPLETE"
22- echo "***"
23 endif
24
diff --git a/openembedded/packages/gtk+/gtk+-2.8.3/disable-tooltips.patch b/openembedded/packages/gtk+/gtk+-2.8.3/disable-tooltips.patch
deleted file mode 100644
index d71d839c3c..0000000000
--- a/openembedded/packages/gtk+/gtk+-2.8.3/disable-tooltips.patch
+++ /dev/null
@@ -1,11 +0,0 @@
1--- gtk+-2.4.3/gtk/gtktooltips.c.old 2004-07-04 18:52:04.000000000 +0100
2+++ gtk+-2.4.3/gtk/gtktooltips.c 2004-07-04 18:52:08.000000000 +0100
3@@ -118,7 +118,7 @@
4 tooltips->tips_data_list = NULL;
5
6 tooltips->delay = DEFAULT_DELAY;
7- tooltips->enabled = TRUE;
8+ tooltips->enabled = FALSE;
9 tooltips->timer_tag = 0;
10 tooltips->use_sticky_delay = FALSE;
11 tooltips->last_popdown.tv_sec = -1;
diff --git a/openembedded/packages/gtk+/gtk+-2.8.3/gtk+-handhelds.patch b/openembedded/packages/gtk+/gtk+-2.8.3/gtk+-handhelds.patch
deleted file mode 100644
index 20481f059b..0000000000
--- a/openembedded/packages/gtk+/gtk+-2.8.3/gtk+-handhelds.patch
+++ /dev/null
@@ -1,236 +0,0 @@
1--- gtk+-2.4.1/gtk/gtkarrow.c 2004-03-13 09:51:13.000000000 +1100
2+++ gtk+-2.4.1/gtk/gtkarrow.c 2004-05-26 14:52:17.000000000 +1000
3@@ -29,7 +29,7 @@
4 #include "gtkarrow.h"
5 #include "gtkintl.h"
6
7-#define MIN_ARROW_SIZE 15
8+#define MIN_ARROW_SIZE 7
9
10 enum {
11 PROP_0,
12@@ -53,6 +53,8 @@
13 guint prop_id,
14 GValue *value,
15 GParamSpec *pspec);
16+static void gtk_arrow_size_request (GtkWidget *arrow,
17+ GtkRequisition *requisition);
18
19 GType
20 gtk_arrow_get_type (void)
21@@ -111,6 +113,7 @@
22 G_PARAM_READABLE | G_PARAM_WRITABLE));
23
24 widget_class->expose_event = gtk_arrow_expose;
25+ widget_class->size_request = gtk_arrow_size_request;
26 }
27
28 static void
29@@ -166,13 +169,18 @@
30 }
31
32 static void
33+gtk_arrow_size_request (GtkWidget *arrow,
34+ GtkRequisition *requisition)
35+{
36+ requisition->width = MIN_ARROW_SIZE + GTK_MISC (arrow)->xpad * 2;
37+ requisition->height = MIN_ARROW_SIZE + GTK_MISC (arrow)->ypad * 2;
38+}
39+
40+static void
41 gtk_arrow_init (GtkArrow *arrow)
42 {
43 GTK_WIDGET_SET_FLAGS (arrow, GTK_NO_WINDOW);
44
45- GTK_WIDGET (arrow)->requisition.width = MIN_ARROW_SIZE + GTK_MISC (arrow)->xpad * 2;
46- GTK_WIDGET (arrow)->requisition.height = MIN_ARROW_SIZE + GTK_MISC (arrow)->ypad * 2;
47-
48 arrow->arrow_type = GTK_ARROW_RIGHT;
49 arrow->shadow_type = GTK_SHADOW_OUT;
50 }
51--- gtk+-2.4.1/gtk/gtkcalendar.c 2004-03-06 14:37:26.000000000 +1100
52+++ gtk+-2.4.1/gtk/gtkcalendar.c 2004-05-26 14:58:57.000000000 +1000
53@@ -340,6 +340,9 @@
54 static void gtk_calendar_select_and_focus_day (GtkCalendar *calendar,
55 guint day);
56
57+static void gtk_calendar_do_select_day (GtkCalendar *calendar,
58+ guint day);
59+
60 static void gtk_calendar_paint_arrow (GtkWidget *widget,
61 guint arrow);
62 static void gtk_calendar_paint_day_num (GtkWidget *widget,
63@@ -861,13 +864,13 @@
64 if (month_len < calendar->selected_day)
65 {
66 calendar->selected_day = 0;
67- gtk_calendar_select_day (calendar, month_len);
68+ gtk_calendar_do_select_day (calendar, month_len);
69 }
70 else
71 {
72 if (calendar->selected_day < 0)
73 calendar->selected_day = calendar->selected_day + 1 + month_length[leap (calendar->year)][calendar->month + 1];
74- gtk_calendar_select_day (calendar, calendar->selected_day);
75+ gtk_calendar_do_select_day (calendar, calendar->selected_day);
76 }
77
78 gtk_widget_queue_draw (GTK_WIDGET (calendar));
79@@ -908,10 +911,10 @@
80 if (month_len < calendar->selected_day)
81 {
82 calendar->selected_day = 0;
83- gtk_calendar_select_day (calendar, month_len);
84+ gtk_calendar_do_select_day (calendar, month_len);
85 }
86 else
87- gtk_calendar_select_day (calendar, calendar->selected_day);
88+ gtk_calendar_do_select_day (calendar, calendar->selected_day);
89
90 gtk_widget_queue_draw (GTK_WIDGET (calendar));
91 gtk_calendar_thaw (calendar);
92@@ -939,10 +942,10 @@
93 if (month_len < calendar->selected_day)
94 {
95 calendar->selected_day = 0;
96- gtk_calendar_select_day (calendar, month_len);
97+ gtk_calendar_do_select_day (calendar, month_len);
98 }
99 else
100- gtk_calendar_select_day (calendar, calendar->selected_day);
101+ gtk_calendar_do_select_day (calendar, calendar->selected_day);
102
103 gtk_widget_queue_draw (GTK_WIDGET (calendar));
104 gtk_calendar_thaw (calendar);
105@@ -974,10 +977,10 @@
106 if (month_len < calendar->selected_day)
107 {
108 calendar->selected_day = 0;
109- gtk_calendar_select_day (calendar, month_len);
110+ gtk_calendar_do_select_day (calendar, month_len);
111 }
112 else
113- gtk_calendar_select_day (calendar, calendar->selected_day);
114+ gtk_calendar_do_select_day (calendar, calendar->selected_day);
115
116 gtk_widget_queue_draw (GTK_WIDGET (calendar));
117 gtk_calendar_thaw (calendar);
118@@ -2480,9 +2483,9 @@
119 return TRUE;
120 }
121
122-void
123-gtk_calendar_select_day (GtkCalendar *calendar,
124- guint day)
125+static void
126+gtk_calendar_do_select_day (GtkCalendar *calendar,
127+ guint day)
128 {
129 g_return_if_fail (GTK_IS_CALENDAR (calendar));
130 g_return_if_fail (day <= 31);
131@@ -2499,6 +2502,13 @@
132 if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (calendar)))
133 gtk_calendar_paint_day_num (GTK_WIDGET (calendar), selected_day);
134 }
135+}
136+
137+void
138+gtk_calendar_select_day (GtkCalendar *calendar,
139+ guint day)
140+{
141+ gtk_calendar_do_select_day (calendar, day);
142
143 calendar->selected_day = day;
144
145--- gtk+-2.4.1/gtk/gtkentry.c 2004-04-22 08:08:08.000000000 +1000
146+++ gtk+-2.4.1/gtk/gtkentry.c 2004-05-26 14:52:17.000000000 +1000
147@@ -557,6 +557,15 @@
148 0.0,
149 G_PARAM_READABLE | G_PARAM_WRITABLE));
150
151+ gtk_widget_class_install_style_property (widget_class,
152+ g_param_spec_int ("min_width",
153+ _("Minimum width"),
154+ _("Minimum width of the entry field"),
155+ 0,
156+ G_MAXINT,
157+ MIN_ENTRY_WIDTH,
158+ G_PARAM_READABLE));
159+
160 signals[POPULATE_POPUP] =
161 g_signal_new ("populate_popup",
162 G_OBJECT_CLASS_TYPE (gobject_class),
163@@ -1124,7 +1133,7 @@
164 {
165 GtkEntry *entry = GTK_ENTRY (widget);
166 PangoFontMetrics *metrics;
167- gint xborder, yborder;
168+ gint xborder, yborder, min_width;
169 PangoContext *context;
170
171 gtk_widget_ensure_style (widget);
172@@ -1140,9 +1149,11 @@
173
174 xborder += INNER_BORDER;
175 yborder += INNER_BORDER;
176-
177+
178+ gtk_widget_style_get (widget, "min_width", &min_width, NULL);
179+
180 if (entry->width_chars < 0)
181- requisition->width = MIN_ENTRY_WIDTH + xborder * 2;
182+ requisition->width = min_width + xborder * 2;
183 else
184 {
185 gint char_width = pango_font_metrics_get_approximate_char_width (metrics);
186--- gtk+-2.4.1/gtk/gtkrange.c 2004-03-06 14:38:08.000000000 +1100
187+++ gtk+-2.4.1/gtk/gtkrange.c 2004-05-26 14:52:17.000000000 +1000
188@@ -180,6 +180,7 @@
189 static GtkWidgetClass *parent_class = NULL;
190 static guint signals[LAST_SIGNAL];
191
192+static GdkAtom recognize_protocols_atom, atom_atom;
193
194 GType
195 gtk_range_get_type (void)
196@@ -220,6 +221,9 @@
197 object_class = (GtkObjectClass*) class;
198 widget_class = (GtkWidgetClass*) class;
199
200+ recognize_protocols_atom = gdk_atom_intern ("RECOGNIZE_PROTOCOLS", FALSE);
201+ atom_atom = gdk_atom_intern ("ATOM", FALSE);
202+
203 parent_class = g_type_class_peek_parent (class);
204
205 gobject_class->set_property = gtk_range_set_property;
206@@ -815,6 +819,12 @@
207 &attributes, attributes_mask);
208 gdk_window_set_user_data (range->event_window, range);
209
210+ gdk_property_change (range->event_window,
211+ recognize_protocols_atom,
212+ atom_atom,
213+ 32, GDK_PROP_MODE_REPLACE,
214+ NULL, 0);
215+
216 widget->style = gtk_style_attach (widget->style, widget->window);
217 }
218
219@@ -1186,7 +1196,7 @@
220
221 /* ignore presses when we're already doing something else. */
222 if (range->layout->grab_location != MOUSE_OUTSIDE)
223- return FALSE;
224+ return TRUE;
225
226 range->layout->mouse_x = event->x;
227 range->layout->mouse_y = event->y;
228@@ -1364,7 +1374,7 @@
229 return TRUE;
230 }
231
232- return FALSE;
233+ return TRUE;
234 }
235
236 /**
diff --git a/openembedded/packages/gtk+/gtk+-2.8.3/gtklabel-resize-patch b/openembedded/packages/gtk+/gtk+-2.8.3/gtklabel-resize-patch
deleted file mode 100644
index df29656343..0000000000
--- a/openembedded/packages/gtk+/gtk+-2.8.3/gtklabel-resize-patch
+++ /dev/null
@@ -1,10 +0,0 @@
1--- gtk+-2.4.3/gtk/gtklabel.c~ 2004-06-11 13:50:34.000000000 +0100
2+++ gtk+-2.4.3/gtk/gtklabel.c 2004-07-05 13:33:57.000000000 +0100
3@@ -1623,6 +1623,7 @@
4
5 /* We have to clear the layout, fonts etc. may have changed */
6 gtk_label_clear_layout (label);
7+ gtk_widget_queue_resize (GTK_WIDGET (label));
8 }
9
10 static void
diff --git a/openembedded/packages/gtk+/gtk+-2.8.3/hardcoded_libtool.patch b/openembedded/packages/gtk+/gtk+-2.8.3/hardcoded_libtool.patch
deleted file mode 100644
index b2afddcc61..0000000000
--- a/openembedded/packages/gtk+/gtk+-2.8.3/hardcoded_libtool.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1--- gtk+-2.6.0/configure.in.old 2005-01-01 16:23:45.000000000 +0000
2+++ gtk+-2.6.0/configure.in 2005-01-01 16:24:03.000000000 +0000
3@@ -360,7 +360,7 @@
4 AC_MSG_CHECKING([Whether to write dependencies into .pc files])
5 case $enable_explicit_deps in
6 auto)
7- deplib_check_method=`(./libtool --config; echo eval echo \\$deplib_check_method) | sh`
8+ deplib_check_method=`($host_alias-libtool --config; echo eval echo \\$deplib_check_method) | sh`
9 if test "X$deplib_check_method" = Xnone || test "x$enable_static" = xyes ; then
10 enable_explicit_deps=yes
11 else
12@@ -688,7 +688,7 @@
13 dnl Now we check to see if our libtool supports shared lib deps
14 dnl (in a rather ugly way even)
15 if $dynworks; then
16- pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config"
17+ pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} $host_alias-libtool --config"
18 pixbuf_deplibs_check=`$pixbuf_libtool_config | \
19 grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \
20 sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'`
21@@ -1512,7 +1512,7 @@
22 #
23 # We are using gmodule-no-export now, but I'm leaving the stripping
24 # code in place for now, since pango and atk still require gmodule.
25-export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
26+export_dynamic=`($host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
27 if test -n "$export_dynamic"; then
28 GDK_PIXBUF_DEP_LIBS=`echo $GDK_PIXBUF_DEP_LIBS | sed -e "s/$export_dynamic//"`
29 GDK_PIXBUF_XLIB_DEP_LIBS=`echo $GDK_PIXBUF_XLIB_DEP_LIBS | sed -e "s/$export_dynamic//"`
diff --git a/openembedded/packages/gtk+/gtk+-2.8.3/menu-deactivate.patch b/openembedded/packages/gtk+/gtk+-2.8.3/menu-deactivate.patch
deleted file mode 100644
index 29e665fbf3..0000000000
--- a/openembedded/packages/gtk+/gtk+-2.8.3/menu-deactivate.patch
+++ /dev/null
@@ -1,50 +0,0 @@
1--- gtk+-2.4.4/gtk/gtkmenushell.c.old Thu Aug 26 23:45:28 2004
2+++ gtk+-2.4.4/gtk/gtkmenushell.c Fri Aug 27 00:13:33 2004
3@@ -37,7 +37,7 @@
4 #include "gtktearoffmenuitem.h"
5 #include "gtkwindow.h"
6
7-#define MENU_SHELL_TIMEOUT 500
8+#define MENU_SHELL_TIMEOUT 2000
9
10 enum {
11 DEACTIVATE,
12@@ -156,6 +156,7 @@
13 static GtkContainerClass *parent_class = NULL;
14 static guint menu_shell_signals[LAST_SIGNAL] = { 0 };
15
16+static int last_crossing_time;
17
18 GType
19 gtk_menu_shell_get_type (void)
20@@ -418,6 +419,7 @@
21 gtk_grab_add (GTK_WIDGET (menu_shell));
22 menu_shell->have_grab = TRUE;
23 menu_shell->active = TRUE;
24+ last_crossing_time = 0;
25 }
26 }
27
28@@ -545,6 +547,13 @@
29 menu_shell->activate_time = 0;
30 deactivate = FALSE;
31 }
32+
33+ if (last_crossing_time != 0
34+ && ((event->time - last_crossing_time) < 500))
35+ {
36+ last_crossing_time = 0;
37+ deactivate = FALSE;
38+ }
39
40 if (deactivate)
41 {
42@@ -597,6 +606,8 @@
43 if (menu_shell->active)
44 {
45 menu_item = gtk_get_event_widget ((GdkEvent*) event);
46+
47+ last_crossing_time = event->time;
48
49 if (!menu_item ||
50 (GTK_IS_MENU_ITEM (menu_item) &&
diff --git a/openembedded/packages/gtk+/gtk+-2.8.3/no-demos.patch b/openembedded/packages/gtk+/gtk+-2.8.3/no-demos.patch
deleted file mode 100644
index 2f10a30dda..0000000000
--- a/openembedded/packages/gtk+/gtk+-2.8.3/no-demos.patch
+++ /dev/null
@@ -1,10 +0,0 @@
1--- gtk+-2.4.1/Makefile.am~ 2004-01-17 22:15:56.000000000 +0000
2+++ gtk+-2.4.1/Makefile.am 2004-05-08 12:25:32.000000000 +0100
3@@ -1,6 +1,6 @@
4 ## Makefile.am for GTK+
5
6-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests contrib
7+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests contrib
8 SUBDIRS = po po-properties $(SRC_SUBDIRS) docs build m4macros
9
10 # require automake 1.4
diff --git a/openembedded/packages/gtk+/gtk+-2.8.3/no-xwc.patch b/openembedded/packages/gtk+/gtk+-2.8.3/no-xwc.patch
deleted file mode 100644
index affb4a303e..0000000000
--- a/openembedded/packages/gtk+/gtk+-2.8.3/no-xwc.patch
+++ /dev/null
@@ -1,151 +0,0 @@
1diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c
2--- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c 2004-11-30 14:57:14 +00:00
3+++ gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c 2005-01-02 15:38:06 +00:00
4@@ -576,12 +576,14 @@
5 GDK_GC_GET_XGC (gc), x, y, (XChar2b *) text, text_length / 2);
6 }
7 }
8+#ifdef HAVE_XWC
9 else if (font->type == GDK_FONT_FONTSET)
10 {
11 XFontSet fontset = (XFontSet) GDK_FONT_XFONT (font);
12 XmbDrawString (xdisplay, impl->xid,
13 fontset, GDK_GC_GET_XGC (gc), x, y, text, text_length);
14 }
15+#endif
16 else
17 g_error("undefined font type\n");
18 }
19@@ -613,6 +615,7 @@
20 GDK_GC_GET_XGC (gc), x, y, text_8bit, text_length);
21 g_free (text_8bit);
22 }
23+#ifdef HAVE_XWC
24 else if (font->type == GDK_FONT_FONTSET)
25 {
26 if (sizeof(GdkWChar) == sizeof(wchar_t))
27@@ -633,6 +636,7 @@
28 g_free (text_wchar);
29 }
30 }
31+#endif
32 else
33 g_error("undefined font type\n");
34 }
35diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkfont-x11.c gtk+-2.6.0/gdk/x11/gdkfont-x11.c
36--- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkfont-x11.c 2004-08-26 01:23:46 +01:00
37+++ gtk+-2.6.0/gdk/x11/gdkfont-x11.c 2005-01-02 15:45:39 +00:00
38@@ -525,10 +525,12 @@
39 width = XTextWidth16 (xfont, (XChar2b *) text, text_length / 2);
40 }
41 break;
42+#ifdef HAVE_XWC
43 case GDK_FONT_FONTSET:
44 fontset = (XFontSet) private->xfont;
45 width = XmbTextEscapement (fontset, text, text_length);
46 break;
47+#endif
48 default:
49 width = 0;
50 }
51@@ -578,6 +580,7 @@
52 width = 0;
53 }
54 break;
55+#ifdef HAVE_XWC
56 case GDK_FONT_FONTSET:
57 if (sizeof(GdkWChar) == sizeof(wchar_t))
58 {
59@@ -595,6 +598,7 @@
60 g_free (text_wchar);
61 }
62 break;
63+#endif
64 default:
65 width = 0;
66 }
67@@ -667,6 +671,7 @@
68 if (descent)
69 *descent = overall.descent;
70 break;
71+#ifdef HAVE_XWC
72 case GDK_FONT_FONTSET:
73 fontset = (XFontSet) private->xfont;
74 XmbTextExtents (fontset, text, text_length, &ink, &logical);
75@@ -681,6 +686,7 @@
76 if (descent)
77 *descent = ink.y + ink.height;
78 break;
79+#endif
80 }
81
82 }
83@@ -753,6 +759,7 @@
84 *descent = overall.descent;
85 break;
86 }
87+#ifdef HAVE_XWC
88 case GDK_FONT_FONTSET:
89 fontset = (XFontSet) private->xfont;
90
91@@ -780,6 +787,7 @@
92 if (descent)
93 *descent = ink.y + ink.height;
94 break;
95+#endif
96 }
97
98 }
99diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkim-x11.c gtk+-2.6.0/gdk/x11/gdkim-x11.c
100--- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkim-x11.c 2004-11-17 00:55:10 +00:00
101+++ gtk+-2.6.0/gdk/x11/gdkim-x11.c 2005-01-02 15:42:04 +00:00
102@@ -48,6 +48,7 @@
103 void
104 _gdk_x11_initialize_locale (void)
105 {
106+#ifdef HAVE_XWC
107 wchar_t result;
108 gchar *current_locale;
109 static char *last_locale = NULL;
110@@ -93,7 +94,8 @@
111 GDK_NOTE (XIM,
112 g_message ("%s multi-byte string functions.",
113 gdk_use_mb ? "Using" : "Not using"));
114-
115+#endif
116+
117 return;
118 }
119
120@@ -136,6 +138,7 @@
121 {
122 gchar *mbstr;
123
124+#ifdef HAVE_XWC
125 if (gdk_use_mb)
126 {
127 GdkDisplay *display = find_a_display ();
128@@ -178,6 +181,7 @@
129 XFree (tpr.value);
130 }
131 else
132+#endif
133 {
134 gint length = 0;
135 gint i;
136@@ -210,6 +214,7 @@
137 gint
138 gdk_mbstowcs (GdkWChar *dest, const gchar *src, gint dest_max)
139 {
140+#ifdef HAVE_XWC
141 if (gdk_use_mb)
142 {
143 GdkDisplay *display = find_a_display ();
144@@ -242,6 +247,7 @@
145 return len_cpy;
146 }
147 else
148+#endif
149 {
150 gint i;
151
diff --git a/openembedded/packages/gtk+/gtk+-2.8.3/scroll-timings.patch b/openembedded/packages/gtk+/gtk+-2.8.3/scroll-timings.patch
deleted file mode 100644
index a38b21dcc2..0000000000
--- a/openembedded/packages/gtk+/gtk+-2.8.3/scroll-timings.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1--- gtk+-2.4.4/gtk/gtkrange.c~ 2004-08-23 01:50:22.000000000 +0100
2+++ gtk+-2.4.4/gtk/gtkrange.c 2004-08-27 15:48:49.000000000 +0100
3@@ -35,9 +35,9 @@
4 #include "gtkintl.h"
5 #include "gtkscrollbar.h"
6
7-#define SCROLL_INITIAL_DELAY 250 /* must hold button this long before ... */
8-#define SCROLL_LATER_DELAY 100 /* ... it starts repeating at this rate */
9-#define UPDATE_DELAY 300 /* Delay for queued update */
10+#define SCROLL_INITIAL_DELAY 500 /* must hold button this long before ... */
11+#define SCROLL_LATER_DELAY 200 /* ... it starts repeating at this rate */
12+#define UPDATE_DELAY 1000 /* Delay for queued update */
13
14 enum {
15 PROP_0,
diff --git a/openembedded/packages/gtk+/gtk+-2.8.3/single-click.patch b/openembedded/packages/gtk+/gtk+-2.8.3/single-click.patch
deleted file mode 100644
index 3bb208d4d6..0000000000
--- a/openembedded/packages/gtk+/gtk+-2.8.3/single-click.patch
+++ /dev/null
@@ -1,54 +0,0 @@
1diff -urNd ../gtk+-2.6.3-r0.old/gtk+-2.6.3/gtk/gtkcalendar.c gtk+-2.6.3/gtk/gtkcalendar.c
2--- ../gtk+-2.6.3-r0.old/gtk+-2.6.3/gtk/gtkcalendar.c 2005-04-06 16:57:04 +01:00
3+++ gtk+-2.6.3/gtk/gtkcalendar.c 2005-04-06 20:05:18 +01:00
4@@ -1023,9 +1023,11 @@
5 }
6
7 gtk_calendar_select_and_focus_day (calendar, day);
8- }
9+
10+ // This change causes the calendar to disappear after choosing a day
11+/* }
12 else if (event->type == GDK_2BUTTON_PRESS)
13- {
14+ {*/
15 private_data->in_drag = 0;
16 if (day_month == MONTH_CURRENT)
17 g_signal_emit (calendar,
18diff -urNd ../gtk+-2.6.3-r0.old/gtk+-2.6.3/gtk/gtkfilesel.c gtk+-2.6.3/gtk/gtkfilesel.c
19--- ../gtk+-2.6.3-r0.old/gtk+-2.6.3/gtk/gtkfilesel.c 2005-04-06 16:57:07 +01:00
20+++ gtk+-2.6.3/gtk/gtkfilesel.c 2005-04-07 13:40:32 +01:00
21@@ -2468,6 +2468,33 @@
22 if (fs->last_selected != NULL)
23 g_free (fs->last_selected);
24
25+ // Single-click directory entry
26+ if (new_names->len == 1)
27+ {
28+ GtkTreeView *tree_view;
29+ GtkTreeModel *model;
30+ GtkTreePath *path;
31+ GtkTreeIter iter;
32+ gboolean is_file;
33+
34+ tree_view = gtk_tree_selection_get_tree_view (selection);
35+
36+ if (gtk_tree_selection_get_selected (selection, &model, &iter))
37+ {
38+ path = gtk_tree_model_get_path (model, &iter);
39+ gtk_tree_model_get (model, &iter, ISFILE_COLUMN, &is_file, -1);
40+
41+ if (!is_file)
42+ {
43+ gtk_file_selection_dir_activate (tree_view, path,
44+ gtk_tree_view_get_column (tree_view, DIR_COLUMN),
45+ user_data);
46+ }
47+
48+ gtk_tree_path_free (path);
49+ }
50+ }
51+
52 fs->last_selected = g_strdup (g_ptr_array_index (new_names, index));
53 filename = get_real_filename (fs->last_selected, FALSE);
54
diff --git a/openembedded/packages/gtk+/gtk+-2.8.3/small-gtkfilesel.patch b/openembedded/packages/gtk+/gtk+-2.8.3/small-gtkfilesel.patch
deleted file mode 100644
index 20bf4cf366..0000000000
--- a/openembedded/packages/gtk+/gtk+-2.8.3/small-gtkfilesel.patch
+++ /dev/null
@@ -1,267 +0,0 @@
1diff -urNd ../gtk+-2.4.4-r5/gtk+-2.4.4/gtk/gtkfilesel.c gtk+-2.4.4/gtk/gtkfilesel.c
2--- ../gtk+-2.4.4-r5/gtk+-2.4.4/gtk/gtkfilesel.c 2004-07-10 05:02:10.000000000 +0100
3+++ gtk+-2.4.4/gtk/gtkfilesel.c 2004-09-13 13:40:09.000000000 +0100
4@@ -68,6 +68,7 @@
5 #include "gtkprivate.h"
6 #include "gtkscrolledwindow.h"
7 #include "gtkstock.h"
8+#include "gtksignal.h"
9 #include "gtktreeselection.h"
10 #include "gtktreeview.h"
11 #include "gtkvbox.h"
12@@ -77,6 +78,7 @@
13 #include "gtkmessagedialog.h"
14 #include "gtkdnd.h"
15 #include "gtkeventbox.h"
16+#include "gtkimage.h"
17
18 #undef GTK_DISABLE_DEPRECATED
19 #include "gtkoptionmenu.h"
20@@ -245,7 +247,8 @@
21 };
22
23 enum {
24- DIR_COLUMN
25+ DIR_COLUMN,
26+ ISFILE_COLUMN
27 };
28
29 enum {
30@@ -400,6 +403,12 @@
31 GtkTreePath *path,
32 GtkTreeViewColumn *column,
33 gpointer user_data);
34+
35+static void gtk_file_selection_activate (GtkTreeView *tree_view,
36+ GtkTreePath *path,
37+ GtkTreeViewColumn *column,
38+ gpointer user_data);
39+
40 static void gtk_file_selection_file_changed (GtkTreeSelection *selection,
41 gpointer user_data);
42 static void gtk_file_selection_dir_activate (GtkTreeView *tree_view,
43@@ -419,6 +428,7 @@
44 static void gtk_file_selection_create_dir (GtkWidget *widget, gpointer data);
45 static void gtk_file_selection_delete_file (GtkWidget *widget, gpointer data);
46 static void gtk_file_selection_rename_file (GtkWidget *widget, gpointer data);
47+static void gtk_file_selection_style_set (GtkWidget *widget, GtkStyle *prev_style);
48
49 static void free_selected_names (GPtrArray *names);
50
51@@ -578,6 +588,23 @@
52 G_PARAM_WRITABLE));
53 object_class->destroy = gtk_file_selection_destroy;
54 widget_class->map = gtk_file_selection_map;
55+ widget_class->style_set = gtk_file_selection_style_set;
56+
57+ gtk_widget_class_install_style_property (widget_class,
58+ g_param_spec_boolean ("show_fileops_default",
59+ _("Show fileop buttons by default"),
60+ _("Whether file operation buttons are shown by default"),
61+ TRUE,
62+ G_PARAM_READABLE));
63+
64+ gtk_widget_class_install_style_property (widget_class,
65+ g_param_spec_int ("border_width",
66+ _("Border width"),
67+ _("Width of border around the main dialog area"),
68+ 0,
69+ G_MAXINT,
70+ 10,
71+ G_PARAM_READABLE));
72 }
73
74 static void gtk_file_selection_set_property (GObject *object,
75@@ -649,7 +676,29 @@
76 gtk_widget_grab_default (widget);
77 return FALSE;
78 }
79-
80+
81+static void
82+gtk_file_selection_style_set (GtkWidget *filesel,
83+ GtkStyle *prev_style)
84+{
85+ gboolean show_fileops;
86+ gint border_width;
87+
88+ gtk_widget_style_get (filesel,
89+ "show_fileops_default",
90+ &show_fileops,
91+ "border_width",
92+ &border_width,
93+ NULL);
94+
95+ gtk_container_set_border_width (GTK_CONTAINER (filesel), border_width);
96+
97+ if (show_fileops)
98+ gtk_file_selection_show_fileop_buttons (GTK_FILE_SELECTION (filesel));
99+ else
100+ gtk_file_selection_hide_fileop_buttons (GTK_FILE_SELECTION (filesel));
101+}
102+
103 static void
104 gtk_file_selection_init (GtkFileSelection *filesel)
105 {
106@@ -674,17 +723,15 @@
107
108 /* The dialog-sized vertical box */
109 filesel->main_vbox = dialog->vbox;
110- gtk_container_set_border_width (GTK_CONTAINER (filesel), 10);
111
112 /* The horizontal box containing create, rename etc. buttons */
113 filesel->button_area = gtk_hbutton_box_new ();
114 gtk_button_box_set_layout (GTK_BUTTON_BOX (filesel->button_area), GTK_BUTTONBOX_START);
115- gtk_box_set_spacing (GTK_BOX (filesel->button_area), 0);
116 gtk_box_pack_start (GTK_BOX (filesel->main_vbox), filesel->button_area,
117 FALSE, FALSE, 0);
118 gtk_widget_show (filesel->button_area);
119
120- gtk_file_selection_show_fileop_buttons (filesel);
121+ gtk_file_selection_style_set (GTK_WIDGET (filesel), NULL);
122
123 /* hbox for pulldown menu */
124 pulldown_hbox = gtk_hbox_new (TRUE, 5);
125@@ -723,25 +770,32 @@
126
127 /* The directories list */
128
129- model = gtk_list_store_new (1, G_TYPE_STRING);
130+ model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_BOOLEAN); /* MA */
131 filesel->dir_list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model));
132 g_object_unref (model);
133
134- column = gtk_tree_view_column_new_with_attributes (_("Folders"),
135+ column = gtk_tree_view_column_new_with_attributes (/*_("Folders")*/ NULL,
136 gtk_cell_renderer_text_new (),
137 "text", DIR_COLUMN,
138 NULL);
139 label = gtk_label_new_with_mnemonic (_("Fol_ders"));
140 gtk_label_set_mnemonic_widget (GTK_LABEL (label), filesel->dir_list);
141 gtk_widget_show (label);
142- gtk_tree_view_column_set_widget (column, label);
143+
144+ /* gtk_tree_view_column_set_widget (column, label); */
145+ gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (filesel->dir_list), FALSE);
146+
147 gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
148 gtk_tree_view_append_column (GTK_TREE_VIEW (filesel->dir_list), column);
149
150 gtk_widget_set_size_request (filesel->dir_list,
151 DIR_LIST_WIDTH, DIR_LIST_HEIGHT);
152 g_signal_connect (filesel->dir_list, "row_activated",
153- G_CALLBACK (gtk_file_selection_dir_activate), filesel);
154+ G_CALLBACK (gtk_file_selection_activate), filesel);
155+
156+ g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (filesel->dir_list)), "changed",
157+ G_CALLBACK (gtk_file_selection_file_changed), filesel);
158+
159
160 /* gtk_clist_column_titles_passive (GTK_CLIST (filesel->dir_list)); */
161
162@@ -758,41 +812,6 @@
163 gtk_widget_show (filesel->dir_list);
164 gtk_widget_show (scrolled_win);
165
166- /* The files list */
167- model = gtk_list_store_new (1, G_TYPE_STRING);
168- filesel->file_list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model));
169- g_object_unref (model);
170-
171- column = gtk_tree_view_column_new_with_attributes (_("Files"),
172- gtk_cell_renderer_text_new (),
173- "text", FILE_COLUMN,
174- NULL);
175- label = gtk_label_new_with_mnemonic (_("_Files"));
176- gtk_label_set_mnemonic_widget (GTK_LABEL (label), filesel->file_list);
177- gtk_widget_show (label);
178- gtk_tree_view_column_set_widget (column, label);
179- gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
180- gtk_tree_view_append_column (GTK_TREE_VIEW (filesel->file_list), column);
181-
182- gtk_widget_set_size_request (filesel->file_list,
183- FILE_LIST_WIDTH, FILE_LIST_HEIGHT);
184- g_signal_connect (filesel->file_list, "row_activated",
185- G_CALLBACK (gtk_file_selection_file_activate), filesel);
186- g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (filesel->file_list)), "changed",
187- G_CALLBACK (gtk_file_selection_file_changed), filesel);
188-
189- /* gtk_clist_column_titles_passive (GTK_CLIST (filesel->file_list)); */
190-
191- scrolled_win = gtk_scrolled_window_new (NULL, NULL);
192- gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_win), GTK_SHADOW_IN);
193- gtk_container_add (GTK_CONTAINER (scrolled_win), filesel->file_list);
194- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win),
195- GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
196- gtk_container_set_border_width (GTK_CONTAINER (scrolled_win), 0);
197- gtk_container_add (GTK_CONTAINER (list_container), scrolled_win);
198- gtk_widget_show (filesel->file_list);
199- gtk_widget_show (scrolled_win);
200-
201 /* action area for packing buttons into. */
202 filesel->action_area = gtk_hbox_new (TRUE, 0);
203 gtk_box_pack_start (GTK_BOX (filesel->main_vbox), filesel->action_area,
204@@ -2008,6 +2027,23 @@
205 }
206
207 static void
208+gtk_file_selection_activate (GtkTreeView *tree_view,
209+ GtkTreePath *path,
210+ GtkTreeViewColumn *column,
211+ gpointer user_data)
212+{
213+ GtkTreeModel *model = gtk_tree_view_get_model (tree_view);
214+ GtkTreeIter iter;
215+ gboolean is_file;
216+
217+ gtk_tree_model_get_iter (model, &iter, path);
218+ gtk_tree_model_get (model, &iter, ISFILE_COLUMN, &is_file, -1);
219+
220+ if (! is_file)
221+ gtk_file_selection_dir_activate (tree_view, path, column, user_data);
222+}
223+
224+static void
225 gtk_file_selection_file_activate (GtkTreeView *tree_view,
226 GtkTreePath *path,
227 GtkTreeViewColumn *column,
228@@ -2103,7 +2139,6 @@
229 PossibleCompletion* poss;
230 GtkTreeIter iter;
231 GtkListStore *dir_model;
232- GtkListStore *file_model;
233 gchar* filename;
234 gchar* rem_path = rel_path;
235 gchar* sel_text;
236@@ -2125,10 +2160,8 @@
237 g_assert (cmpl_state->reference_dir);
238
239 dir_model = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (fs->dir_list)));
240- file_model = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (fs->file_list)));
241
242 gtk_list_store_clear (dir_model);
243- gtk_list_store_clear (file_model);
244
245 /* Set the dir list to include ./ and ../ */
246 gtk_list_store_append (dir_model, &iter);
247@@ -2150,13 +2183,17 @@
248 strcmp (filename, ".." G_DIR_SEPARATOR_S) != 0)
249 {
250 gtk_list_store_append (dir_model, &iter);
251- gtk_list_store_set (dir_model, &iter, DIR_COLUMN, filename, -1);
252+ gtk_list_store_set (dir_model, &iter,
253+ DIR_COLUMN, filename,
254+ ISFILE_COLUMN, FALSE, -1);
255 }
256 }
257 else
258 {
259- gtk_list_store_append (file_model, &iter);
260- gtk_list_store_set (file_model, &iter, DIR_COLUMN, filename, -1);
261+ gtk_list_store_append (dir_model, &iter);
262+ gtk_list_store_set (dir_model, &iter,
263+ DIR_COLUMN, filename,
264+ ISFILE_COLUMN, TRUE, -1);
265 }
266 }
267
diff --git a/openembedded/packages/gtk+/gtk+-2.8.3/spinbutton.patch b/openembedded/packages/gtk+/gtk+-2.8.3/spinbutton.patch
deleted file mode 100644
index 8ad7507af0..0000000000
--- a/openembedded/packages/gtk+/gtk+-2.8.3/spinbutton.patch
+++ /dev/null
@@ -1,128 +0,0 @@
1--- gtk+-2.4.3/gtk/gtkspinbutton.c.old 2004-04-22 14:49:27.000000000 +0100
2+++ gtk+-2.4.3/gtk/gtkspinbutton.c 2004-06-30 21:48:18.000000000 +0100
3@@ -733,7 +733,7 @@
4
5 spin = GTK_SPIN_BUTTON (widget);
6 arrow_size = spin_button_get_arrow_size (spin);
7- panel_width = arrow_size + 2 * widget->style->xthickness;
8+ panel_width = (2 * arrow_size) + 4 * widget->style->xthickness;
9
10 widget->allocation = *allocation;
11
12@@ -866,19 +866,16 @@
13 {
14 width = spin_button_get_arrow_size (spin_button) + 2 * widget->style->xthickness;
15
16+ y = widget->style->ythickness;
17+ height = widget->requisition.height - (2 * y);
18+
19 if (arrow_type == GTK_ARROW_UP)
20 {
21 x = 0;
22- y = 0;
23-
24- height = widget->requisition.height / 2;
25 }
26 else
27 {
28- x = 0;
29- y = widget->requisition.height / 2;
30-
31- height = (widget->requisition.height + 1) / 2;
32+ x = width;
33 }
34
35 if (spin_button_at_limit (spin_button, arrow_type))
36@@ -908,32 +905,17 @@
37 shadow_type = GTK_SHADOW_OUT;
38 }
39 }
40-
41+
42 gtk_paint_box (widget->style, spin_button->panel,
43 state_type, shadow_type,
44 NULL, widget,
45- (arrow_type == GTK_ARROW_UP)? "spinbutton_up" : "spinbutton_down",
46+ NULL,
47 x, y, width, height);
48
49 height = widget->requisition.height;
50
51- if (arrow_type == GTK_ARROW_DOWN)
52- {
53- y = height / 2;
54- height = height - y - 2;
55- }
56- else
57- {
58- y = 2;
59- height = height / 2 - 2;
60- }
61-
62 width -= 3;
63-
64- if (widget && gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
65- x = 2;
66- else
67- x = 1;
68+ height -= 3;
69
70 w = width / 2;
71 w -= w % 2 - 1; /* force odd */
72@@ -1108,7 +1090,7 @@
73 if (GTK_ENTRY (widget)->editable)
74 gtk_spin_button_update (spin);
75
76- if (event->y <= widget->requisition.height / 2)
77+ if (event->x <= (spin_button_get_arrow_size (spin) + widget->style->xthickness))
78 {
79 if (event->button == 1)
80 start_spinning (spin, GTK_ARROW_UP, spin->adjustment->step_increment);
81@@ -1143,44 +1125,11 @@
82
83 arrow_size = spin_button_get_arrow_size (spin);
84
85- if (event->button == spin->button)
86- {
87- int click_child = spin->click_child;
88+ gtk_spin_button_stop_spinning (spin);
89
90- gtk_spin_button_stop_spinning (spin);
91-
92- if (event->button == 3)
93- {
94- if (event->y >= 0 && event->x >= 0 &&
95- event->y <= widget->requisition.height &&
96- event->x <= arrow_size + 2 * widget->style->xthickness)
97- {
98- if (click_child == GTK_ARROW_UP &&
99- event->y <= widget->requisition.height / 2)
100- {
101- gdouble diff;
102-
103- diff = spin->adjustment->upper - spin->adjustment->value;
104- if (diff > EPSILON)
105- gtk_spin_button_real_spin (spin, diff);
106- }
107- else if (click_child == GTK_ARROW_DOWN &&
108- event->y > widget->requisition.height / 2)
109- {
110- gdouble diff;
111-
112- diff = spin->adjustment->value - spin->adjustment->lower;
113- if (diff > EPSILON)
114- gtk_spin_button_real_spin (spin, -diff);
115- }
116- }
117- }
118- spin_button_redraw (spin);
119+ spin_button_redraw (spin);
120
121- return TRUE;
122- }
123- else
124- return GTK_WIDGET_CLASS (parent_class)->button_release_event (widget, event);
125+ return TRUE;
126 }
127
128 static gint
diff --git a/openembedded/packages/gtk+/gtk+_2.6.4-1.osso7.bb b/openembedded/packages/gtk+/gtk+_2.6.4-1.osso7.bb
index 146da9f3e0..fbebed2e45 100644
--- a/openembedded/packages/gtk+/gtk+_2.6.4-1.osso7.bb
+++ b/openembedded/packages/gtk+/gtk+_2.6.4-1.osso7.bb
@@ -150,6 +150,8 @@ do_install_append () {
150 install -d ${D}${sysconfdir}/gtk-2.0 150 install -d ${D}${sysconfdir}/gtk-2.0
151} 151}
152 152
153PACKAGES_DYNAMIC = "gdk-pixbuf-loader-* gtk-immodule-*"
154
153python populate_packages_prepend () { 155python populate_packages_prepend () {
154 import os.path 156 import os.path
155 157
diff --git a/openembedded/packages/gtk+/gtk+_2.6.7.bb b/openembedded/packages/gtk+/gtk+_2.6.7.bb
index ef09049e60..bcfd2b598d 100644
--- a/openembedded/packages/gtk+/gtk+_2.6.7.bb
+++ b/openembedded/packages/gtk+/gtk+_2.6.7.bb
@@ -64,6 +64,8 @@ fi
64 64
65} 65}
66 66
67PACKAGES_DYANMIC = "gdk-pixbuf-loader-* gtk-immodule-*"
68
67python populate_packages_prepend () { 69python populate_packages_prepend () {
68 import os.path 70 import os.path
69 71
diff --git a/openembedded/packages/gtk+/gtk+_2.8.3.bb b/openembedded/packages/gtk+/gtk+_2.8.3.bb
deleted file mode 100644
index cf32491db7..0000000000
--- a/openembedded/packages/gtk+/gtk+_2.8.3.bb
+++ /dev/null
@@ -1,82 +0,0 @@
1LICENSE = "LGPL"
2DESCRIPTION = "GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete \
3set of widgets, GTK+ is suitable for projects ranging from small one-off projects to complete application suites."
4HOMEPAGE = "http://www.gtk.org"
5SECTION = "libs"
6PRIORITY = "optional"
7MAINTAINER = "Philip Blundell <pb@handhelds.org>"
8DEPENDS = "glib-2.0 pango atk jpeg libpng xext libxcursor gtk-doc libgcrypt cairo"
9PR = "r0"
10
11SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-${PV}.tar.bz2 \
12 file://no-xwc.patch;patch=1 \
13 file://automake-lossage.patch;patch=1 \
14 file://hardcoded_libtool.patch;patch=1 \
15 file://disable-tooltips.patch;patch=1 \
16 file://gtklabel-resize-patch;patch=1"
17# file://menu-deactivate.patch;patch=1 \
18# file://xsettings.patch;patch=1 \
19# file://scroll-timings.patch;patch=1 \
20# file://small-gtkfilesel.patch;patch=1 \
21# file://migration.patch;patch=1;pnum=0
22# file://no-demos.patch;patch=1
23# file://gtk+-handhelds.patch;patch=1
24# file://single-click.patch;patch=1
25# file://spinbutton.patch;patch=1 \
26
27inherit autotools pkgconfig
28
29FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \
30 ${bindir}/gtk-query-immodules-2.0 \
31 ${libdir}/lib*.so.* \
32 ${datadir}/themes ${sysconfdir} \
33 ${libdir}/gtk-2.0/${LIBV}/engines/libpixmap.so"
34FILES_${PN}-dev += "${datadir}/gtk-2.0/include ${libdir}/gtk-2.0/include ${bindir}/gdk-pixbuf-csource"
35
36RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1"
37
38EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-display-migration"
39# --disable-cruft
40
41LIBV = "2.4.0"
42
43do_stage () {
44 oe_libinstall -so -C gtk libgtk-x11-2.0 ${STAGING_LIBDIR}
45 oe_libinstall -so -C gdk libgdk-x11-2.0 ${STAGING_LIBDIR}
46 oe_libinstall -so -C contrib/gdk-pixbuf-xlib libgdk_pixbuf_xlib-2.0 ${STAGING_LIBDIR}
47 oe_libinstall -so -C gdk-pixbuf libgdk_pixbuf-2.0 ${STAGING_LIBDIR}
48
49 autotools_stage_includes
50
51 mkdir -p ${STAGING_LIBDIR}/gtk-2.0/include
52 install -m 0644 gdk/gdkconfig.h ${STAGING_LIBDIR}/gtk-2.0/include/gdkconfig.h
53
54 install -m 0644 m4macros/gtk-2.0.m4 ${STAGING_DATADIR}/aclocal/
55}
56
57do_install_append () {
58 install -d ${D}${sysconfdir}/gtk-2.0
59}
60
61postinst_prologue() {
62if [ "x$D" != "x" ]; then
63 exit 1
64fi
65
66}
67
68python populate_packages_prepend () {
69 import os.path
70
71 prologue = bb.data.getVar("postinst_prologue", d, 1)
72
73 gtk_libdir = bb.data.expand('${libdir}/gtk-2.0/${LIBV}', d)
74 loaders_root = os.path.join(gtk_libdir, 'loaders')
75 immodules_root = os.path.join(gtk_libdir, 'immodules')
76
77 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')
78 do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', prologue + 'gtk-query-immodules > /etc/gtk-2.0/gtk.immodules')
79
80 if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
81 bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d)
82}
diff --git a/openembedded/packages/gtk+/gtk+_2.8.9.bb b/openembedded/packages/gtk+/gtk+_2.8.9.bb
index a6a87d8d6d..d1c42082dd 100644
--- a/openembedded/packages/gtk+/gtk+_2.8.9.bb
+++ b/openembedded/packages/gtk+/gtk+_2.8.9.bb
@@ -67,6 +67,8 @@ fi
67 67
68} 68}
69 69
70PACKAGES_DYNAMIC = "gdk-pixbuf-loader-* gtk-immodule-*"
71
70python populate_packages_prepend () { 72python populate_packages_prepend () {
71 import os.path 73 import os.path
72 74
diff --git a/openembedded/packages/pango/pango_1.10.0.bb b/openembedded/packages/pango/pango_1.10.0.bb
index 88d1b847d8..dda4df2fda 100644
--- a/openembedded/packages/pango/pango_1.10.0.bb
+++ b/openembedded/packages/pango/pango_1.10.0.bb
@@ -38,6 +38,8 @@ fi
38 38
39} 39}
40 40
41PACKAGES_DYNAMIC = "pango-module-*"
42
41python populate_packages_prepend () { 43python populate_packages_prepend () {
42 prologue = bb.data.getVar("postinst_prologue", d, 1) 44 prologue = bb.data.getVar("postinst_prologue", d, 1)
43 45
diff --git a/openembedded/packages/pango/pango_1.9.1.bb b/openembedded/packages/pango/pango_1.9.1.bb
index bc7698c592..e66b65f367 100644
--- a/openembedded/packages/pango/pango_1.9.1.bb
+++ b/openembedded/packages/pango/pango_1.9.1.bb
@@ -38,6 +38,8 @@ fi
38 38
39} 39}
40 40
41PACKAGES_DYNAMIC = "pango-module-*"
42
41python populate_packages_prepend () { 43python populate_packages_prepend () {
42 prologue = bb.data.getVar("postinst_prologue", d, 1) 44 prologue = bb.data.getVar("postinst_prologue", d, 1)
43 45
diff --git a/openembedded/packages/perl/perl.inc b/openembedded/packages/perl/perl.inc
index 5ee5418fc4..12fffa1c33 100644
--- a/openembedded/packages/perl/perl.inc
+++ b/openembedded/packages/perl/perl.inc
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.perl.org/"
3LICENSE = "Artistic|GPL" 3LICENSE = "Artistic|GPL"
4SECTION = "devel" 4SECTION = "devel"
5PRIORITY = "optional" 5PRIORITY = "optional"
6DEPENDS = "db3 perl-native" 6DEPENDS = "virtual/db perl-native"
7 7
8SRC_URI = "http://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \ 8SRC_URI = "http://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \
9 file://Makefile.patch;patch=1 \ 9 file://Makefile.patch;patch=1 \
@@ -54,6 +54,8 @@ do_stage() {
54 install config.sh ${STAGING_DIR}/${HOST_SYS}/perl/ 54 install config.sh ${STAGING_DIR}/${HOST_SYS}/perl/
55} 55}
56 56
57PACKAGES_DYNAMIC = "perl-module-*"
58
57python populate_packages_prepend () { 59python populate_packages_prepend () {
58 libdir = bb.data.expand('${libdir}/perl5/${PV}', d) 60 libdir = bb.data.expand('${libdir}/perl5/${PV}', d)
59 archlibdir = bb.data.expand('${libdir}/perl5/${PV}/${TARGET_ARCH}-${TARGET_OS}', d) 61 archlibdir = bb.data.expand('${libdir}/perl5/${PV}/${TARGET_ARCH}-${TARGET_OS}', d)
diff --git a/openembedded/packages/vera-fonts/ttf-bitstream-vera_1.10.bb b/openembedded/packages/vera-fonts/ttf-bitstream-vera_1.10.bb
index b756c99e4c..a6f4cd62fb 100644
--- a/openembedded/packages/vera-fonts/ttf-bitstream-vera_1.10.bb
+++ b/openembedded/packages/vera-fonts/ttf-bitstream-vera_1.10.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
4LICENSE = "Bitstream Vera" 4LICENSE = "Bitstream Vera"
5PACKAGE_ARCH = "all" 5PACKAGE_ARCH = "all"
6PR = "r3" 6PR = "r3"
7RDEPENDS = "libfontconfig-utils" 7RDEPENDS = "fontconfig-utils"
8 8
9SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-${PV}.tar.bz2" 9SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-${PV}.tar.bz2"
10 10
diff --git a/openembedded/packages/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/fix_watch_cursor.patch b/openembedded/packages/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/fix_watch_cursor.patch
new file mode 100644
index 0000000000..73a5b2a87a
--- /dev/null
+++ b/openembedded/packages/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/fix_watch_cursor.patch
@@ -0,0 +1,24 @@
1diff -NurP xcursor-transparent-theme-0.1.1-orig/cursors/Makefile.am xcursor-transparent-theme-0.1.1/cursors/Makefile.am
2--- xcursor-transparent-theme-0.1.1-orig/cursors/Makefile.am 2003-10-30 13:13:59.000000000 +0100
3+++ xcursor-transparent-theme-0.1.1/cursors/Makefile.am 2005-12-20 23:35:17.000000000 +0100
4@@ -79,7 +79,7 @@
5 ul_angle \
6 ur_angle \
7 v_double_arrow \
8- watcha \
9+ watch \
10 xterm
11
12 CURSOR_DIR = $(datadir)/icons/xcursor-transparent/cursors
13diff -NurP xcursor-transparent-theme-0.1.1-orig/cursors/Makefile.in xcursor-transparent-theme-0.1.1/cursors/Makefile.in
14--- xcursor-transparent-theme-0.1.1-orig/cursors/Makefile.in 2003-10-31 15:31:13.000000000 +0100
15+++ xcursor-transparent-theme-0.1.1/cursors/Makefile.in 2005-12-20 23:35:36.000000000 +0100
16@@ -67,7 +67,7 @@
17 PACKAGE = @PACKAGE@
18 VERSION = @VERSION@
19
20-CURSOR_NAMES = 00008160000006810000408080010102 028006030e0e7ebffc7f7070c0600140 03b6e0fcb3499374a867c041f52298f0 08e8e1c95fe2fc01f976f1e063a24ccd 14fef782d02440884392942c11205230 2870a09082c103050810ffdffffe0204 3ecb610c1bf2410f44200f48c40d3599 4498f0e0c1937ffe01fd06f973665830 9d800788f1b08800ae810202380a0822 c7088f0f3e6c8088236ef8e1e3e70000 d9ce0ab605698f320427677b458ad60b e29285e634086352946a0e7090d73106 fcf1c3c7cd4491d801f1e1c78f100000 X_cursor arrow base_arrow_down base_arrow_up based_arrow_down based_arrow_up bd_double_arrow boat bottom_left_corner bottom_right_corner bottom_side bottom_tee center_ptr circle cross cross_reverse crossed_circle crosshair dot dot_box_mask dotbox double_arrow draft_large draft_small draped_box exchange fd_double_arrow fleur gumby h_double_arrow hand hand1 hand2 left_ptr left_ptr_watch left_side left_tee ll_angle lr_angle move pencil pirate plus question_arrow right_ptr right_side right_tee sailboat sb_down_arrow sb_h_double_arrow sb_left_arrow sb_right_arrow sb_up_arrow sb_v_double_arrow shuttle sizing target tcross top_left_arrow top_left_corner top_right_corner top_side top_tee trek ul_angle ur_angle v_double_arrow watcha xterm
21+CURSOR_NAMES = 00008160000006810000408080010102 028006030e0e7ebffc7f7070c0600140 03b6e0fcb3499374a867c041f52298f0 08e8e1c95fe2fc01f976f1e063a24ccd 14fef782d02440884392942c11205230 2870a09082c103050810ffdffffe0204 3ecb610c1bf2410f44200f48c40d3599 4498f0e0c1937ffe01fd06f973665830 9d800788f1b08800ae810202380a0822 c7088f0f3e6c8088236ef8e1e3e70000 d9ce0ab605698f320427677b458ad60b e29285e634086352946a0e7090d73106 fcf1c3c7cd4491d801f1e1c78f100000 X_cursor arrow base_arrow_down base_arrow_up based_arrow_down based_arrow_up bd_double_arrow boat bottom_left_corner bottom_right_corner bottom_side bottom_tee center_ptr circle cross cross_reverse crossed_circle crosshair dot dot_box_mask dotbox double_arrow draft_large draft_small draped_box exchange fd_double_arrow fleur gumby h_double_arrow hand hand1 hand2 left_ptr left_ptr_watch left_side left_tee ll_angle lr_angle move pencil pirate plus question_arrow right_ptr right_side right_tee sailboat sb_down_arrow sb_h_double_arrow sb_left_arrow sb_right_arrow sb_up_arrow sb_v_double_arrow shuttle sizing target tcross top_left_arrow top_left_corner top_right_corner top_side top_tee trek ul_angle ur_angle v_double_arrow watch xterm
22
23
24 CURSOR_DIR = $(datadir)/icons/xcursor-transparent/cursors
diff --git a/openembedded/site/armeb-linux b/openembedded/site/armeb-linux
index 21f7397da4..452e3abbf7 100644
--- a/openembedded/site/armeb-linux
+++ b/openembedded/site/armeb-linux
@@ -99,6 +99,11 @@ samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=${samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=yes}
99samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=${samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=yes} 99samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=${samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=yes}
100samba_cv_HAVE_KERNEL_SHARE_MODES=${samba_cv_HAVE_KERNEL_SHARE_MODES=yes} 100samba_cv_HAVE_KERNEL_SHARE_MODES=${samba_cv_HAVE_KERNEL_SHARE_MODES=yes}
101samba_cv_LINUX_LFS_SUPPORT=${samba_cv_LINUX_LFS_SUPPORT=yes} 101samba_cv_LINUX_LFS_SUPPORT=${samba_cv_LINUX_LFS_SUPPORT=yes}
102samba_cv_STAT_STATVFS64=${samba_cv_STAT_STATVFS64=yes}
103samba_cv_SIZEOF_OFF_T=${samba_cv_SIZEOF_OFF_T=yes}
104samba_cv_SIZEOF_INO_T=${samba_cv_SIZEOF_INO_T=yes}
105samba_cv_HAVE_STRUCT_FLOCK64=${samba_cv_HAVE_STRUCT_FLOCK64=yes}
106
102 107
103# sleepycat db 108# sleepycat db
104db_cv_fcntl_f_setfd=${db_cv_fcntl_f_setfd=yes} 109db_cv_fcntl_f_setfd=${db_cv_fcntl_f_setfd=yes}
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-07-04 09:42:44 +0000