summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-02-22 21:38:09 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-02-22 21:45:28 +0000
commitbe9262233975911e404f6fcdb3c81ba916d28e32 (patch)
tree2149a99c8d1116e8811d2fc9efad3f973971dd9b /meta
parentd26cbff22a3dfc3f5682b44d6e753f1c4091a56d (diff)
downloadpoky-be9262233975911e404f6fcdb3c81ba916d28e32.tar.gz
Remove all comments from multiline expressions (as mentioned in bug #704)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/gettext/gettext_0.14.1.bb2
-rw-r--r--meta/recipes-core/glibc/glibc_2.10.1.bb7
-rw-r--r--meta/recipes-core/meta/external-csl-toolchain_2008q3-72.bb2
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.12.bb2
-rw-r--r--meta/recipes-devtools/gcc/gcc-4.3.3.inc8
-rw-r--r--meta/recipes-devtools/gcc/gcc-csl-arm-2008q1.inc39
-rw-r--r--meta/recipes-devtools/perl/perl_5.12.2.bb2
-rw-r--r--meta/recipes-devtools/rpm/rpm_5.4.0.bb12
-rw-r--r--meta/recipes-extended/minicom/minicom_2.4.bb2
-rw-r--r--meta/recipes-extended/tasks/task-poky-basic.bb2
-rw-r--r--meta/recipes-extended/time/time_1.7.bb4
-rw-r--r--meta/recipes-extended/tzdata/tzdata_2010o.bb2
-rw-r--r--meta/recipes-gnome/gtk+/gtk+_2.12.7.bb11
-rw-r--r--meta/recipes-gnome/gtk+/gtk+_2.16.6.bb22
-rw-r--r--meta/recipes-gnome/gtk+/gtk+_2.22.1.bb20
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-kdrive_1.7.99.2.bb9
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.9.3.bb4
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb12
18 files changed, 83 insertions, 79 deletions
diff --git a/meta/recipes-core/gettext/gettext_0.14.1.bb b/meta/recipes-core/gettext/gettext_0.14.1.bb
index ad5121736e..90756bcb28 100644
--- a/meta/recipes-core/gettext/gettext_0.14.1.bb
+++ b/meta/recipes-core/gettext/gettext_0.14.1.bb
@@ -17,7 +17,7 @@ SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
17 file://getline.m4.patch \ 17 file://getline.m4.patch \
18 file://disable_java.patch" 18 file://disable_java.patch"
19 19
20# file://gettext-autoconf-lib-link-no-L.patch \ 20# file://gettext-autoconf-lib-link-no-L.patch
21 21
22SRC_URI_append_linux-uclibc = " file://gettext-error_print_progname.patch" 22SRC_URI_append_linux-uclibc = " file://gettext-error_print_progname.patch"
23SRC_URI_append_linux-uclibceabi = " file://gettext-error_print_progname.patch" 23SRC_URI_append_linux-uclibceabi = " file://gettext-error_print_progname.patch"
diff --git a/meta/recipes-core/glibc/glibc_2.10.1.bb b/meta/recipes-core/glibc/glibc_2.10.1.bb
index 364a0e5d12..8cb97d5ccf 100644
--- a/meta/recipes-core/glibc/glibc_2.10.1.bb
+++ b/meta/recipes-core/glibc/glibc_2.10.1.bb
@@ -37,10 +37,9 @@ RDEPENDS_${PN}-dev = "linux-libc-headers-dev"
37 37
38# file://noinfo.patch;patch=1 38# file://noinfo.patch;patch=1
39# file://ldconfig.patch;patch=1;pnum=0 39# file://ldconfig.patch;patch=1;pnum=0
40# file://arm-machine-gmon.patch;patch=1;pnum=0 \ 40# file://arm-machine-gmon.patch;patch=1;pnum=0
41# \ 41# file://arm-ioperm.patch;patch=1;pnum=0
42# file://arm-ioperm.patch;patch=1;pnum=0 \ 42# file://ldd.patch;patch=1;pnum=0
43# file://ldd.patch;patch=1;pnum=0 \
44SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \ 43SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \
45 ftp://ftp.gnu.org/pub/gnu/glibc/glibc-ports-${PV}.tar.bz2 \ 44 ftp://ftp.gnu.org/pub/gnu/glibc/glibc-ports-${PV}.tar.bz2 \
46 ftp://ftp.gnu.org/pub/gnu/glibc/glibc-libidn-${PV}.tar.bz2 \ 45 ftp://ftp.gnu.org/pub/gnu/glibc/glibc-libidn-${PV}.tar.bz2 \
diff --git a/meta/recipes-core/meta/external-csl-toolchain_2008q3-72.bb b/meta/recipes-core/meta/external-csl-toolchain_2008q3-72.bb
index 0d58445de2..f7149289d7 100644
--- a/meta/recipes-core/meta/external-csl-toolchain_2008q3-72.bb
+++ b/meta/recipes-core/meta/external-csl-toolchain_2008q3-72.bb
@@ -20,7 +20,7 @@ RPROVIDES = "glibc-utils libsegfault glibc-thread-db"
20PACKAGES_DYNAMIC = "glibc-gconv-*" 20PACKAGES_DYNAMIC = "glibc-gconv-*"
21PR = "r1" 21PR = "r1"
22 22
23#SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-linux-gnueabi/arm-${PV}-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2 \ 23#SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-linux-gnueabi/arm-${PV}-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2"
24 24
25SRC_URI = "file://SUPPORTED" 25SRC_URI = "file://SUPPORTED"
26 26
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.12.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.12.bb
index ffe6dce17d..1c0f893ca9 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.12.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.12.bb
@@ -7,7 +7,7 @@ SRC_URI += "file://quotefix.patch;patch=1 \
7 7
8SRC_URI[md5sum] = "1b24a21fc0c2381ef420961cbfec733f" 8SRC_URI[md5sum] = "1b24a21fc0c2381ef420961cbfec733f"
9SRC_URI[sha256sum] = "9c26d0dc20bfdafd0f27f3564791d6121d1c1876549d4f2ff1e41955c9bb9f20" 9SRC_URI[sha256sum] = "9c26d0dc20bfdafd0f27f3564791d6121d1c1876549d4f2ff1e41955c9bb9f20"
10#file://no-hardlinks.patch;patch=1 \ 10#file://no-hardlinks.patch;patch=1
11 11
12PARALLEL_MAKE = "" 12PARALLEL_MAKE = ""
13 13
diff --git a/meta/recipes-devtools/gcc/gcc-4.3.3.inc b/meta/recipes-devtools/gcc/gcc-4.3.3.inc
index 9b600a0f1f..55d66f5664 100644
--- a/meta/recipes-devtools/gcc/gcc-4.3.3.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3.inc
@@ -43,10 +43,7 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
43 file://arm-nolibfloat.patch;patch=1 \ 43 file://arm-nolibfloat.patch;patch=1 \
44 file://arm-softfloat.patch;patch=1 \ 44 file://arm-softfloat.patch;patch=1 \
45 file://cache-amnesia.patch;patch=1 \ 45 file://cache-amnesia.patch;patch=1 \
46# file://gfortran.patch;patch=1 \
47 file://gcc-4.0.2-e300c2c3.patch;patch=1 \ 46 file://gcc-4.0.2-e300c2c3.patch;patch=1 \
48# file://pr34130.patch;patch=1 \
49# file://fortran-static-linking.patch;patch=1 \
50 file://gcc-arm-frename-registers.patch;patch=1 \ 47 file://gcc-arm-frename-registers.patch;patch=1 \
51 file://gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch;patch=1 \ 48 file://gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch;patch=1 \
52 file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch;patch=1 \ 49 file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch;patch=1 \
@@ -58,6 +55,11 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
58 file://64bithack.patch;patch=1 \ 55 file://64bithack.patch;patch=1 \
59" 56"
60 57
58# file://gfortran.patch;patch=1
59# file://pr34130.patch;patch=1
60# file://fortran-static-linking.patch;patch=1
61
62
61SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch;patch=1 " 63SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch;patch=1 "
62 64
63# Language Overrides 65# Language Overrides
diff --git a/meta/recipes-devtools/gcc/gcc-csl-arm-2008q1.inc b/meta/recipes-devtools/gcc/gcc-csl-arm-2008q1.inc
index e84bd835d2..cb5b087286 100644
--- a/meta/recipes-devtools/gcc/gcc-csl-arm-2008q1.inc
+++ b/meta/recipes-devtools/gcc/gcc-csl-arm-2008q1.inc
@@ -6,31 +6,30 @@ PV = "4.2.3+csl-arm-2008q1-126"
6FILESDIR = "${FILE_DIRNAME}/gcc-csl-arm" 6FILESDIR = "${FILE_DIRNAME}/gcc-csl-arm"
7 7
8SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-eabi/arm-2008q1-126-arm-none-eabi.src.tar.bz2 \ 8SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-eabi/arm-2008q1-126-arm-none-eabi.src.tar.bz2 \
9# file://100-uclibc-conf.patch;patch=1 \
10# file://103-uclibc-conf-noupstream.patch;patch=1 \
11# file://200-uclibc-locale.patch;patch=1 \
12# file://203-uclibc-locale-no__x.patch;patch=1 \
13# file://204-uclibc-locale-wchar_fix.patch;patch=1 \
14# file://205-uclibc-locale-update.patch;patch=1 \
15# file://300-libstdc++-pic.patch;patch=1 \
16# file://302-c99-snprintf.patch;patch=1 \
17# file://303-c99-complex-ugly-hack.patch;patch=1 \
18# file://304-index_macro.patch;patch=1 \
19# file://305-libmudflap-susv3-legacy.patch;patch=1 \
20# file://306-libstdc++-namespace.patch;patch=1 \
21# file://307-locale_facets.patch;patch=1 \
22# file://402-libbackend_dep_gcov-iov.h.patch;patch=1 \
23# file://602-sdk-libstdc++-includes.patch;patch=1 \
24 file://gcc41-configure.in.patch;patch=1 \ 9 file://gcc41-configure.in.patch;patch=1 \
25 file://arm-nolibfloat.patch;patch=1 \ 10 file://arm-nolibfloat.patch;patch=1 \
26 file://arm-softfloat.patch;patch=1 \ 11 file://arm-softfloat.patch;patch=1 \
27 file://zecke-xgcc-cpp.patch;patch=1 \ 12 file://zecke-xgcc-cpp.patch;patch=1 \
28# file://gfortran.patch;patch=1 \
29# file://fortran-static-linking.patch;patch=1 \
30# file://gcc-configure-no-fortran.patch;patch=1;pnum=1 \
31# file://gcc-new-makeinfo.patch;patch=1 \
32" 13"
33 14# file://100-uclibc-conf.patch;patch=1
15# file://103-uclibc-conf-noupstream.patch;patch=1
16# file://200-uclibc-locale.patch;patch=1
17# file://203-uclibc-locale-no__x.patch;patch=1
18# file://204-uclibc-locale-wchar_fix.patch;patch=1
19# file://205-uclibc-locale-update.patch;patch=1
20# file://300-libstdc++-pic.patch;patch=1
21# file://302-c99-snprintf.patch;patch=1
22# file://303-c99-complex-ugly-hack.patch;patch=1
23# file://304-index_macro.patch;patch=1
24# file://305-libmudflap-susv3-legacy.patch;patch=1
25# file://306-libstdc++-namespace.patch;patch=1
26# file://307-locale_facets.patch;patch=1
27# file://402-libbackend_dep_gcov-iov.h.patch;patch=1
28# file://602-sdk-libstdc++-includes.patch;patch=1
29# file://gfortran.patch;patch=1
30# file://fortran-static-linking.patch;patch=1
31# file://gcc-configure-no-fortran.patch;patch=1;pnum=1
32# file://gcc-new-makeinfo.patch;patch=1
34 33
35S = "${WORKDIR}/gcc-4.2" 34S = "${WORKDIR}/gcc-4.2"
36 35
diff --git a/meta/recipes-devtools/perl/perl_5.12.2.bb b/meta/recipes-devtools/perl/perl_5.12.2.bb
index ce9998601d..e659152d4b 100644
--- a/meta/recipes-devtools/perl/perl_5.12.2.bb
+++ b/meta/recipes-devtools/perl/perl_5.12.2.bb
@@ -37,7 +37,6 @@ SRC_URI = "ftp://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \
37 file://debian/enc2xs_inc.diff \ 37 file://debian/enc2xs_inc.diff \
38 file://debian/errno_ver.diff \ 38 file://debian/errno_ver.diff \
39 file://debian/extutils_hacks.diff \ 39 file://debian/extutils_hacks.diff \
40# file://debian/fakeroot.diff \
41 file://debian/instmodsh_doc.diff \ 40 file://debian/instmodsh_doc.diff \
42 file://debian/ld_run_path.diff \ 41 file://debian/ld_run_path.diff \
43 file://debian/libnet_config_path.diff \ 42 file://debian/libnet_config_path.diff \
@@ -69,6 +68,7 @@ SRC_URI = "ftp://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \
69 file://config.sh-64 \ 68 file://config.sh-64 \
70 file://config.sh-64-le \ 69 file://config.sh-64-le \
71 file://config.sh-64-be" 70 file://config.sh-64-be"
71# file://debian/fakeroot.diff
72 72
73SRC_URI[md5sum] = "af2df531d46b77fdf0d97eecb03eddb2" 73SRC_URI[md5sum] = "af2df531d46b77fdf0d97eecb03eddb2"
74SRC_URI[sha256sum] = "cf888340021d5a2d1238bbd9b8b55aaf420a848d46e4d317cb8567f86ceb1022" 74SRC_URI[sha256sum] = "cf888340021d5a2d1238bbd9b8b55aaf420a848d46e4d317cb8567f86ceb1022"
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.0.bb b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
index ac9df6fa82..8bce395483 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.0.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
@@ -186,12 +186,12 @@ FILES_${PN} = "${bindir}/rpm \
186 ${libdir}/rpm/bin/wget \ 186 ${libdir}/rpm/bin/wget \
187 " 187 "
188 188
189# ${libdir}/rpm/magic \ 189# ${libdir}/rpm/magic
190# ${libdir}/rpm/magic.mgc \ 190# ${libdir}/rpm/magic.mgc
191# ${libdir}/rpm/magic.mime \ 191# ${libdir}/rpm/magic.mime
192# ${libdir}/rpm/magic.mime.mgc \ 192# ${libdir}/rpm/magic.mime.mgc
193# ${libdir}/rpm/bin/db_* \ 193# ${libdir}/rpm/bin/db_*
194# ${libdir}/rpm/bin/grep \ 194# ${libdir}/rpm/bin/grep
195 195
196FILES_${PN}-dbg = "${bindir}/.debug \ 196FILES_${PN}-dbg = "${bindir}/.debug \
197 ${libdir}/.debug \ 197 ${libdir}/.debug \
diff --git a/meta/recipes-extended/minicom/minicom_2.4.bb b/meta/recipes-extended/minicom/minicom_2.4.bb
index fbe2d30cd8..8718a1fa92 100644
--- a/meta/recipes-extended/minicom/minicom_2.4.bb
+++ b/meta/recipes-extended/minicom/minicom_2.4.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=420477abc567404debca0a2a1cb6b645 \
9SRC_URI = "http://alioth.debian.org/frs/download.php/3195/minicom-${PV}.tar.gz \ 9SRC_URI = "http://alioth.debian.org/frs/download.php/3195/minicom-${PV}.tar.gz \
10 file://rename-conflicting-functions.patch \ 10 file://rename-conflicting-functions.patch \
11 " 11 "
12# file://gcc4-scope.patch;patch=1 \ 12# file://gcc4-scope.patch;patch=1
13 13
14SRC_URI[md5sum] = "700976a3c2dcc8bbd50ab9bb1c08837b" 14SRC_URI[md5sum] = "700976a3c2dcc8bbd50ab9bb1c08837b"
15SRC_URI[sha256sum] = "6b7af240b073ba847b091fd75aed4bf720eb94d30e188d23bb098d016bf40a48" 15SRC_URI[sha256sum] = "6b7af240b073ba847b091fd75aed4bf720eb94d30e188d23bb098d016bf40a48"
diff --git a/meta/recipes-extended/tasks/task-poky-basic.bb b/meta/recipes-extended/tasks/task-poky-basic.bb
index 145d4fc9e0..d7beafedd8 100644
--- a/meta/recipes-extended/tasks/task-poky-basic.bb
+++ b/meta/recipes-extended/tasks/task-poky-basic.bb
@@ -98,9 +98,9 @@ RDEPENDS_task-poky-basic-extended = "\
98 iputils \ 98 iputils \
99 iptables \ 99 iptables \
100 module-init-tools \ 100 module-init-tools \
101# openssh \
102 openssl \ 101 openssl \
103 " 102 "
103# openssh
104 104
105RDEPENDS_task-poky-dev-utils = "\ 105RDEPENDS_task-poky-dev-utils = "\
106 byacc \ 106 byacc \
diff --git a/meta/recipes-extended/time/time_1.7.bb b/meta/recipes-extended/time/time_1.7.bb
index e82077fa40..ef2cb8a9d7 100644
--- a/meta/recipes-extended/time/time_1.7.bb
+++ b/meta/recipes-extended/time/time_1.7.bb
@@ -5,8 +5,8 @@ SRC_URI = "${GNU_MIRROR}/time/time-${PV}.tar.gz \
5 5
6SRC_URI[md5sum] = "e38d2b8b34b1ca259cf7b053caac32b3" 6SRC_URI[md5sum] = "e38d2b8b34b1ca259cf7b053caac32b3"
7SRC_URI[sha256sum] = "e37ea79a253bf85a85ada2f7c632c14e481a5fd262a362f6f4fd58e68601496d" 7SRC_URI[sha256sum] = "e37ea79a253bf85a85ada2f7c632c14e481a5fd262a362f6f4fd58e68601496d"
8# file://autofoo.patch;patch=1 \ 8# file://autofoo.patch;patch=1
9# file://compile.patch;patch=1" 9# file://compile.patch;patch=1
10S = "${WORKDIR}/time-${PV}" 10S = "${WORKDIR}/time-${PV}"
11 11
12inherit autotools 12inherit autotools
diff --git a/meta/recipes-extended/tzdata/tzdata_2010o.bb b/meta/recipes-extended/tzdata/tzdata_2010o.bb
index 882d67ac81..d250e5ca1b 100644
--- a/meta/recipes-extended/tzdata/tzdata_2010o.bb
+++ b/meta/recipes-extended/tzdata/tzdata_2010o.bb
@@ -22,8 +22,8 @@ S = "${WORKDIR}"
22 22
23TZONES= "africa antarctica asia australasia europe northamerica southamerica \ 23TZONES= "africa antarctica asia australasia europe northamerica southamerica \
24 factory solar87 solar88 solar89 etcetera backward systemv \ 24 factory solar87 solar88 solar89 etcetera backward systemv \
25# pacificnew \
26 " 25 "
26# pacificnew
27 27
28do_compile () { 28do_compile () {
29 for zone in ${TZONES}; do \ 29 for zone in ${TZONES}; do \
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb b/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb
index 7f242d94df..7c72a09257 100644
--- a/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb
+++ b/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb
@@ -16,13 +16,14 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.12/gtk+-${PV}.tar.bz2 \
16 file://filechooser-props.patch;patch=1 \ 16 file://filechooser-props.patch;patch=1 \
17 file://filechooser-default.patch;patch=1 \ 17 file://filechooser-default.patch;patch=1 \
18 file://filechooser-sizefix.patch;patch=1 \ 18 file://filechooser-sizefix.patch;patch=1 \
19 "
19# temporary 20# temporary
20# file://gtklabel-resize-patch;patch=1 \ 21# file://gtklabel-resize-patch;patch=1
21# file://menu-deactivate.patch;patch=1 \ 22# file://menu-deactivate.patch;patch=1
22# file://combo-arrow-size.patch;patch=1;pnum=0 \ 23# file://combo-arrow-size.patch;patch=1;pnum=0
23# die die die 24# die die die
24# file://pangoxft2.10.6.diff;patch=1 \ 25# file://pangoxft2.10.6.diff;patch=1
25 " 26
26 27
27EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-display-migration" 28EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-display-migration"
28 29
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb b/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb
index 5060829e4b..deea3d07cd 100644
--- a/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb
+++ b/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb
@@ -10,18 +10,20 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.16/gtk+-${PV}.tar.bz2 \
10 file://cellrenderer-cairo.patch;patch=1;pnum=0 \ 10 file://cellrenderer-cairo.patch;patch=1;pnum=0 \
11 file://toggle-font.diff;patch=1;pnum=0 \ 11 file://toggle-font.diff;patch=1;pnum=0 \
12 file://0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch;patch=1 \ 12 file://0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch;patch=1 \
13# TO MERGE
14# file://entry-cairo.patch;patch=1;pnum=0 \
15# file://filesystem-volumes.patch;patch=1 \
16# file://filechooser-props.patch;patch=1 \
17# file://filechooser-default.patch;patch=1 \
18# file://filechooser-sizefix.patch;patch=1 \
19# temporary
20# file://gtklabel-resize-patch;patch=1 \
21# file://menu-deactivate.patch;patch=1 \
22# file://combo-arrow-size.patch;patch=1;pnum=0 \
23 file://disable-gio-png-sniff-test.diff;patch=1 \ 13 file://disable-gio-png-sniff-test.diff;patch=1 \
24 " 14 "
15# TO MERGE
16# file://entry-cairo.patch;patch=1;pnum=0
17# file://filesystem-volumes.patch;patch=1
18# file://filechooser-props.patch;patch=1
19# file://filechooser-default.patch;patch=1
20# file://filechooser-sizefix.patch;patch=1
21# temporary
22# file://gtklabel-resize-patch;patch=1
23# file://menu-deactivate.patch;patch=1
24# file://combo-arrow-size.patch;patch=1;pnum=0
25
26
25 27
26EXTRA_OECONF = "--without-libtiff --without-libjasper --disable-xkb --disable-glibtest --disable-cups" 28EXTRA_OECONF = "--without-libtiff --without-libjasper --disable-xkb --disable-glibtest --disable-cups"
27 29
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.22.1.bb b/meta/recipes-gnome/gtk+/gtk+_2.22.1.bb
index e311a8cc44..9ae762da35 100644
--- a/meta/recipes-gnome/gtk+/gtk+_2.22.1.bb
+++ b/meta/recipes-gnome/gtk+/gtk+_2.22.1.bb
@@ -15,18 +15,18 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.22/gtk+-${PV}.tar.bz2 \
15 file://toggle-font.diff;patch=1;pnum=0 \ 15 file://toggle-font.diff;patch=1;pnum=0 \
16 file://0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch;patch=1 \ 16 file://0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch;patch=1 \
17 file://doc-fixes.patch \ 17 file://doc-fixes.patch \
18 "
18# TO MERGE 19# TO MERGE
19# file://entry-cairo.patch;patch=1;pnum=0 \ 20# file://entry-cairo.patch;patch=1;pnum=0
20# file://filesystem-volumes.patch;patch=1 \ 21# file://filesystem-volumes.patch;patch=1
21# file://filechooser-props.patch;patch=1 \ 22# file://filechooser-props.patch;patch=1
22# file://filechooser-default.patch;patch=1 \ 23# file://filechooser-default.patch;patch=1
23# file://filechooser-sizefix.patch;patch=1 \ 24# file://filechooser-sizefix.patch;patch=1
24# temporary 25# temporary
25# file://gtklabel-resize-patch;patch=1 \ 26# file://gtklabel-resize-patch;patch=1
26# file://menu-deactivate.patch;patch=1 \ 27# file://menu-deactivate.patch;patch=1
27# file://combo-arrow-size.patch;patch=1;pnum=0 \ 28# file://combo-arrow-size.patch;patch=1;pnum=0
28# file://configurefix.patch;patch=1 \ 29# file://configurefix.patch;patch=1
29 "
30 30
31SRC_URI[md5sum] = "fdce46ba354c155230b7d4090b17f7d9" 31SRC_URI[md5sum] = "fdce46ba354c155230b7d4090b17f7d9"
32SRC_URI[sha256sum] = "965bc124f0d25087c4cb2a64cbfd7e4f896e05be8d560fbba68dd8685ba24d07" 32SRC_URI[sha256sum] = "965bc124f0d25087c4cb2a64cbfd7e4f896e05be8d560fbba68dd8685ba24d07"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive_1.7.99.2.bb b/meta/recipes-graphics/xorg-xserver/xserver-kdrive_1.7.99.2.bb
index f6a0d83ccb..b7e5520f42 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive_1.7.99.2.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive_1.7.99.2.bb
@@ -13,10 +13,6 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
13 file://extra-kmodes.patch;patch=1 \ 13 file://extra-kmodes.patch;patch=1 \
14 file://disable-apm.patch;patch=1 \ 14 file://disable-apm.patch;patch=1 \
15 file://no-serial-probing.patch;patch=1 \ 15 file://no-serial-probing.patch;patch=1 \
16# file://kdrive-evdev.patch;patch=1 \
17# file://kdrive-use-evdev.patch;patch=1 \
18# file://enable-builtin-fonts.patch;patch=1 \
19# file://optional-xkb.patch;patch=1 \
20 file://keyboard-resume-workaround.patch;patch=1 \ 16 file://keyboard-resume-workaround.patch;patch=1 \
21 file://enable-xcalibrate.patch;patch=1 \ 17 file://enable-xcalibrate.patch;patch=1 \
22 file://hide-cursor-and-ppm-root.patch;patch=1 \ 18 file://hide-cursor-and-ppm-root.patch;patch=1 \
@@ -24,5 +20,10 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
24 file://fix-newer-xorg-headers.patch;patch=1 \ 20 file://fix-newer-xorg-headers.patch;patch=1 \
25 file://crosscompile.patch;patch=1 \ 21 file://crosscompile.patch;patch=1 \
26 file://nodolt.patch;patch=1" 22 file://nodolt.patch;patch=1"
23# file://kdrive-evdev.patch;patch=1
24# file://kdrive-use-evdev.patch;patch=1
25# file://enable-builtin-fonts.patch;patch=1
26# file://optional-xkb.patch;patch=1
27
27 28
28S = "${WORKDIR}/xorg-server-${PV}" 29S = "${WORKDIR}/xorg-server-${PV}"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.9.3.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.9.3.bb
index 9ff85de6c3..faa4f64159 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.9.3.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.9.3.bb
@@ -10,8 +10,8 @@ PR = "r0"
10 10
11SRC_URI += "file://nodolt.patch \ 11SRC_URI += "file://nodolt.patch \
12 file://crosscompile.patch" 12 file://crosscompile.patch"
13# file://libdri-xinerama-symbol.patch;patch=1 \ 13# file://libdri-xinerama-symbol.patch;patch=1
14# file://xserver-boottime.patch;patch=1" 14# file://xserver-boottime.patch;patch=1
15 15
16# Misc build failure for master HEAD 16# Misc build failure for master HEAD
17SRC_URI += "file://fix_open_max_preprocessor_error.patch" 17SRC_URI += "file://fix_open_max_preprocessor_error.patch"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb
index 4789f28f5f..99804a21bd 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb
@@ -10,18 +10,18 @@ DEPENDS += "font-util"
10 10
11RDEPENDS_${PN} += "xkeyboard-config" 11RDEPENDS_${PN} += "xkeyboard-config"
12 12
13# file://cache-xkbcomp-output-for-fast-start-up.patch;patch=1 \ 13# file://cache-xkbcomp-output-for-fast-start-up.patch;patch=1
14# file://xserver-1.5.0-bg-none-root.patch;patch=1 \ 14# file://xserver-1.5.0-bg-none-root.patch;patch=1
15# file://xserver-no-root-2.patch;patch=1 \ 15# file://xserver-no-root-2.patch;patch=1
16# file://xserver-boottime.patch;patch=1" 16# file://xserver-boottime.patch;patch=1
17# file://xserver-DRI2Swapbuffer.patch;patch=1" 17# file://xserver-DRI2Swapbuffer.patch;patch=1
18 18
19 19
20SRC_URI = "git://anongit.freedesktop.org/git/xorg/xserver;protocol=git;branch=master \ 20SRC_URI = "git://anongit.freedesktop.org/git/xorg/xserver;protocol=git;branch=master \
21 file://nodolt.patch;patch=1 \ 21 file://nodolt.patch;patch=1 \
22 file://crosscompile.patch;patch=1 \ 22 file://crosscompile.patch;patch=1 \
23 file://fix_macros1.patch;patch=1" 23 file://fix_macros1.patch;patch=1"
24# file://libdri-xinerama-symbol.patch;patch=1" 24# file://libdri-xinerama-symbol.patch;patch=1
25 25
26# Misc build failure for master HEAD 26# Misc build failure for master HEAD
27SRC_URI += "file://fix_open_max_preprocessor_error.patch;patch=1" 27SRC_URI += "file://fix_open_max_preprocessor_error.patch;patch=1"