summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-bsp/uboot/u-boot-mkimage-2011.03/0001-Drop-config.h-include-in-tools-imximage.h.patch2
-rw-r--r--meta/recipes-bsp/uboot/u-boot-mkimage-2011.03/0002-config.mk-move-LDSCRIPT-processing-to-the-top-level-.patch2
-rw-r--r--meta/recipes-bsp/uboot/u-boot-mkimage/0001-Drop-config.h-include-in-tools-imximage.h.patch2
-rw-r--r--meta/recipes-bsp/uboot/u-boot-mkimage/0002-config.mk-move-LDSCRIPT-processing-to-the-top-level-.patch2
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.13/mips-rld-map-check.patch4
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.13/shorten-build-commands.patch1
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/0003-gatomic-proper-pointer-get-cast.patch.patch2
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/0005-glib-mkenums-interpreter.patch.patch2
-rw-r--r--meta/recipes-core/glibc/glibc-2.10.1/glibc-check_pf.patch2
-rw-r--r--meta/recipes-devtools/cdrtools/cdrtools-native/no_usr_src.patch2
-rw-r--r--meta/recipes-devtools/elfutils/elfutils/mempcpy.patch1
-rw-r--r--meta/recipes-devtools/makedevs/makedevs-1.0.0/COPYING.patch2
-rw-r--r--meta/recipes-devtools/qemu/qemu-0.14.0/qemugl-fix.patch3
-rw-r--r--meta/recipes-devtools/qemu/qemu-git/qemugl-fix.patch2
-rw-r--r--meta/recipes-extended/at/at-3.1.12/configure.patch1
-rw-r--r--meta/recipes-extended/libtirpc/libtirpc-0.2.2/libtirpc-0.2.1-fortify.patch2
-rw-r--r--meta/recipes-graphics/clutter/clutter-gst/autofoo-0.4.patch19
-rw-r--r--meta/recipes-graphics/clutter/clutter-gst/autofoo-9db4a61a25677764bb927369c5c68ada958fb65c.patch29
-rw-r--r--meta/recipes-graphics/clutter/clutter-gst/autofoo.patch31
-rw-r--r--meta/recipes-qt/qt4/files/qt-dbus-const.patch3
20 files changed, 15 insertions, 99 deletions
diff --git a/meta/recipes-bsp/uboot/u-boot-mkimage-2011.03/0001-Drop-config.h-include-in-tools-imximage.h.patch b/meta/recipes-bsp/uboot/u-boot-mkimage-2011.03/0001-Drop-config.h-include-in-tools-imximage.h.patch
index f4b12ac9f6..0405834698 100644
--- a/meta/recipes-bsp/uboot/u-boot-mkimage-2011.03/0001-Drop-config.h-include-in-tools-imximage.h.patch
+++ b/meta/recipes-bsp/uboot/u-boot-mkimage-2011.03/0001-Drop-config.h-include-in-tools-imximage.h.patch
@@ -6,7 +6,7 @@ MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8 6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit 7Content-Transfer-Encoding: 8bit
8 8
9Upstream-Status: Applied 9Upstream-Status: Accepted
10 10
11"make tools-all" should allow building tools such as mkimage and the new 11"make tools-all" should allow building tools such as mkimage and the new
12imximage without any config, but imximage.c currently fails to build 12imximage without any config, but imximage.c currently fails to build
diff --git a/meta/recipes-bsp/uboot/u-boot-mkimage-2011.03/0002-config.mk-move-LDSCRIPT-processing-to-the-top-level-.patch b/meta/recipes-bsp/uboot/u-boot-mkimage-2011.03/0002-config.mk-move-LDSCRIPT-processing-to-the-top-level-.patch
index c1026913af..5729cd9473 100644
--- a/meta/recipes-bsp/uboot/u-boot-mkimage-2011.03/0002-config.mk-move-LDSCRIPT-processing-to-the-top-level-.patch
+++ b/meta/recipes-bsp/uboot/u-boot-mkimage-2011.03/0002-config.mk-move-LDSCRIPT-processing-to-the-top-level-.patch
@@ -3,7 +3,7 @@ From: Ilya Yanok <yanok@emcraft.com>
3Date: Mon, 20 Jun 2011 12:45:37 +0000 3Date: Mon, 20 Jun 2011 12:45:37 +0000
4Subject: config.mk: move LDSCRIPT processing to the top-level Makefile 4Subject: config.mk: move LDSCRIPT processing to the top-level Makefile
5 5
6Upstream-Status: Applied 6Upstream-Status: Accepted
7 7
8LDSCRIPT is used only from the top-level Makefile and only when the 8LDSCRIPT is used only from the top-level Makefile and only when the
9system is configured so we can move LDSCRIPT and CONFIG_SYS_LDSCRIPT 9system is configured so we can move LDSCRIPT and CONFIG_SYS_LDSCRIPT
diff --git a/meta/recipes-bsp/uboot/u-boot-mkimage/0001-Drop-config.h-include-in-tools-imximage.h.patch b/meta/recipes-bsp/uboot/u-boot-mkimage/0001-Drop-config.h-include-in-tools-imximage.h.patch
index f4b12ac9f6..0405834698 100644
--- a/meta/recipes-bsp/uboot/u-boot-mkimage/0001-Drop-config.h-include-in-tools-imximage.h.patch
+++ b/meta/recipes-bsp/uboot/u-boot-mkimage/0001-Drop-config.h-include-in-tools-imximage.h.patch
@@ -6,7 +6,7 @@ MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8 6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit 7Content-Transfer-Encoding: 8bit
8 8
9Upstream-Status: Applied 9Upstream-Status: Accepted
10 10
11"make tools-all" should allow building tools such as mkimage and the new 11"make tools-all" should allow building tools such as mkimage and the new
12imximage without any config, but imximage.c currently fails to build 12imximage without any config, but imximage.c currently fails to build
diff --git a/meta/recipes-bsp/uboot/u-boot-mkimage/0002-config.mk-move-LDSCRIPT-processing-to-the-top-level-.patch b/meta/recipes-bsp/uboot/u-boot-mkimage/0002-config.mk-move-LDSCRIPT-processing-to-the-top-level-.patch
index c1026913af..5729cd9473 100644
--- a/meta/recipes-bsp/uboot/u-boot-mkimage/0002-config.mk-move-LDSCRIPT-processing-to-the-top-level-.patch
+++ b/meta/recipes-bsp/uboot/u-boot-mkimage/0002-config.mk-move-LDSCRIPT-processing-to-the-top-level-.patch
@@ -3,7 +3,7 @@ From: Ilya Yanok <yanok@emcraft.com>
3Date: Mon, 20 Jun 2011 12:45:37 +0000 3Date: Mon, 20 Jun 2011 12:45:37 +0000
4Subject: config.mk: move LDSCRIPT processing to the top-level Makefile 4Subject: config.mk: move LDSCRIPT processing to the top-level Makefile
5 5
6Upstream-Status: Applied 6Upstream-Status: Accepted
7 7
8LDSCRIPT is used only from the top-level Makefile and only when the 8LDSCRIPT is used only from the top-level Makefile and only when the
9system is configured so we can move LDSCRIPT and CONFIG_SYS_LDSCRIPT 9system is configured so we can move LDSCRIPT and CONFIG_SYS_LDSCRIPT
diff --git a/meta/recipes-core/eglibc/eglibc-2.13/mips-rld-map-check.patch b/meta/recipes-core/eglibc/eglibc-2.13/mips-rld-map-check.patch
index 7772e6ffa8..9b646fea95 100644
--- a/meta/recipes-core/eglibc/eglibc-2.13/mips-rld-map-check.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.13/mips-rld-map-check.patch
@@ -1,4 +1,3 @@
1Upstream-Status: Pending
2 1
3On mips target, binutils currently sets DT_MIPS_RLD_MAP to 0 in dynamic 2On mips target, binutils currently sets DT_MIPS_RLD_MAP to 0 in dynamic
4section if a --version-script sets _RLD_MAP to local. This is apparently 3section if a --version-script sets _RLD_MAP to local. This is apparently
@@ -6,9 +5,10 @@ a binutils bug, but libc shouldn't segfault in this case.
6 5
7see also: http://sourceware.org/bugilla/show_bug.cgi?id=11615 6see also: http://sourceware.org/bugilla/show_bug.cgi?id=11615
8 7
8Upstream-Status: Pending
9
99/19/2010 - added by Qing He <qing.he@intel.com> 109/19/2010 - added by Qing He <qing.he@intel.com>
10 11
11Upstream-Status: Pending
12 12
13--- 13---
14diff -ru glibc-2.10.1.orig/ports/sysdeps/mips/dl-machine.h glibc-2.10.1/ports/sysdeps/mips/dl-machine.h 14diff -ru glibc-2.10.1.orig/ports/sysdeps/mips/dl-machine.h glibc-2.10.1/ports/sysdeps/mips/dl-machine.h
diff --git a/meta/recipes-core/eglibc/eglibc-2.13/shorten-build-commands.patch b/meta/recipes-core/eglibc/eglibc-2.13/shorten-build-commands.patch
index c17d58b28b..080568d9c2 100644
--- a/meta/recipes-core/eglibc/eglibc-2.13/shorten-build-commands.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.13/shorten-build-commands.patch
@@ -1,4 +1,3 @@
1Upstream-Status: Pending
2 1
3Source: http://sourceware.org/ml/libc-alpha/2010-03/msg00064.html 2Source: http://sourceware.org/ml/libc-alpha/2010-03/msg00064.html
4 3
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0003-gatomic-proper-pointer-get-cast.patch.patch b/meta/recipes-core/glib-2.0/glib-2.0/0003-gatomic-proper-pointer-get-cast.patch.patch
index ad1ca12b80..5c0afbce71 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/0003-gatomic-proper-pointer-get-cast.patch.patch
+++ b/meta/recipes-core/glib-2.0/glib-2.0/0003-gatomic-proper-pointer-get-cast.patch.patch
@@ -3,7 +3,7 @@ From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Sat, 18 Jun 2011 23:51:35 +0200 3Date: Sat, 18 Jun 2011 23:51:35 +0200
4Subject: [PATCH 3/7] gatomic-proper-pointer-get-cast.patch 4Subject: [PATCH 3/7] gatomic-proper-pointer-get-cast.patch
5 5
6Upstream-Status: Unknown 6Upstream-Status: Pending
7 7
8Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> 8Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
9--- 9---
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0005-glib-mkenums-interpreter.patch.patch b/meta/recipes-core/glib-2.0/glib-2.0/0005-glib-mkenums-interpreter.patch.patch
index 678033039f..db9a7993b2 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/0005-glib-mkenums-interpreter.patch.patch
+++ b/meta/recipes-core/glib-2.0/glib-2.0/0005-glib-mkenums-interpreter.patch.patch
@@ -3,7 +3,7 @@ From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Sat, 18 Jun 2011 23:52:17 +0200 3Date: Sat, 18 Jun 2011 23:52:17 +0200
4Subject: [PATCH 5/7] don't leak buildpaths into perl hashbang 4Subject: [PATCH 5/7] don't leak buildpaths into perl hashbang
5 5
6Upstream-Status: Unknown 6Upstream-Status: Inappropriate [configuration]
7 7
8Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> 8Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
9--- 9---
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/glibc-check_pf.patch b/meta/recipes-core/glibc/glibc-2.10.1/glibc-check_pf.patch
index dec0892459..a0e55bfaec 100644
--- a/meta/recipes-core/glibc/glibc-2.10.1/glibc-check_pf.patch
+++ b/meta/recipes-core/glibc/glibc-2.10.1/glibc-check_pf.patch
@@ -1,5 +1,3 @@
1Upstream-Status: Pending
2
3From libc-ports-return-550-listarch-libc-ports=sources dot redhat dot com at sourceware dot org Tue Oct 31 17:37:21 2006 1From libc-ports-return-550-listarch-libc-ports=sources dot redhat dot com at sourceware dot org Tue Oct 31 17:37:21 2006
4Return-Path: <libc-ports-return-550-listarch-libc-ports=sources dot redhat dot com at sourceware dot org> 2Return-Path: <libc-ports-return-550-listarch-libc-ports=sources dot redhat dot com at sourceware dot org>
5Delivered-To: listarch-libc-ports at sources dot redhat dot com 3Delivered-To: listarch-libc-ports at sources dot redhat dot com
diff --git a/meta/recipes-devtools/cdrtools/cdrtools-native/no_usr_src.patch b/meta/recipes-devtools/cdrtools/cdrtools-native/no_usr_src.patch
index 82e57d182d..61df41f5bf 100644
--- a/meta/recipes-devtools/cdrtools/cdrtools-native/no_usr_src.patch
+++ b/meta/recipes-devtools/cdrtools/cdrtools-native/no_usr_src.patch
@@ -1,7 +1,7 @@
1Remove hard-coded references to /usr/src/linux/include to avoid 1Remove hard-coded references to /usr/src/linux/include to avoid
2host contamination. 2host contamination.
3 3
4Upstream-Status: [Other (build-system specific)] 4Upstream-Status: Inappropriate [configuration]
5 5
6Signed-off-by: Scott Garman <scott.a.garman@intel.com> 6Signed-off-by: Scott Garman <scott.a.garman@intel.com>
7 7
diff --git a/meta/recipes-devtools/elfutils/elfutils/mempcpy.patch b/meta/recipes-devtools/elfutils/elfutils/mempcpy.patch
index 218a57bd84..24e31fa5b3 100644
--- a/meta/recipes-devtools/elfutils/elfutils/mempcpy.patch
+++ b/meta/recipes-devtools/elfutils/elfutils/mempcpy.patch
@@ -1,4 +1,3 @@
1Upstream-Status: Backport
2 1
3uclibc does not export __mempcpy like glibc so we alias it here. 2uclibc does not export __mempcpy like glibc so we alias it here.
4This patch may make sense for upstream but elfutils uses more 3This patch may make sense for upstream but elfutils uses more
diff --git a/meta/recipes-devtools/makedevs/makedevs-1.0.0/COPYING.patch b/meta/recipes-devtools/makedevs/makedevs-1.0.0/COPYING.patch
index c63ab53bcb..3a8902b97a 100644
--- a/meta/recipes-devtools/makedevs/makedevs-1.0.0/COPYING.patch
+++ b/meta/recipes-devtools/makedevs/makedevs-1.0.0/COPYING.patch
@@ -1,4 +1,4 @@
1Upstream-Status: Inapropriate [others] 1Upstream-Status: Inappropriate [licensing]
2 2
3diff -ruN makedevs-1.0.0-orig/COPYING makedevs-1.0.0/COPYING 3diff -ruN makedevs-1.0.0-orig/COPYING makedevs-1.0.0/COPYING
4--- makedevs-1.0.0-orig/COPYING 1970-01-01 08:00:00.000000000 +0800 4--- makedevs-1.0.0-orig/COPYING 1970-01-01 08:00:00.000000000 +0800
diff --git a/meta/recipes-devtools/qemu/qemu-0.14.0/qemugl-fix.patch b/meta/recipes-devtools/qemu/qemu-0.14.0/qemugl-fix.patch
index 76aae2fa3a..0858f76b52 100644
--- a/meta/recipes-devtools/qemu/qemu-0.14.0/qemugl-fix.patch
+++ b/meta/recipes-devtools/qemu/qemu-0.14.0/qemugl-fix.patch
@@ -5,11 +5,10 @@ support 32/64b combination of target/host.
5 5
6This is not perfect fix, and we need consider other GL alternatives in future. 6This is not perfect fix, and we need consider other GL alternatives in future.
7 7
8Upstream-Status: other (logical part of qemu-git-qemugl-host.patch) 8Upstream-Status: Inappropriate [other] - depends on qemu gl patch
9 9
10Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> 10Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
11 11
12Upstream-Status: Inappropriate [other] - depends on qemu gl patch
13 12
14Index: qemu-0.14.0/target-i386/opengl_func.h 13Index: qemu-0.14.0/target-i386/opengl_func.h
15=================================================================== 14===================================================================
diff --git a/meta/recipes-devtools/qemu/qemu-git/qemugl-fix.patch b/meta/recipes-devtools/qemu/qemu-git/qemugl-fix.patch
index 029aacf2a9..0bfbf10988 100644
--- a/meta/recipes-devtools/qemu/qemu-git/qemugl-fix.patch
+++ b/meta/recipes-devtools/qemu/qemu-git/qemugl-fix.patch
@@ -5,7 +5,7 @@ support 32/64b combination of target/host.
5 5
6This is not perfect fix, and we need consider other GL alternatives in future. 6This is not perfect fix, and we need consider other GL alternatives in future.
7 7
8Upstream-Status: other (logical part of qemu-git-qemugl-host.patch) 8Upstream-Status: Inappropriate [other (logical part of qemu-git-qemugl-host.patch)]
9 9
10Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> 10Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
11 11
diff --git a/meta/recipes-extended/at/at-3.1.12/configure.patch b/meta/recipes-extended/at/at-3.1.12/configure.patch
index 99b40774d6..14310e3354 100644
--- a/meta/recipes-extended/at/at-3.1.12/configure.patch
+++ b/meta/recipes-extended/at/at-3.1.12/configure.patch
@@ -1,4 +1,3 @@
1Upstream-Status: Inappropriate [licensing]
2 1
3Fix cross-compilation issues in configure.ac 2Fix cross-compilation issues in configure.ac
4Derived from an OE patch for at-3.1.8 3Derived from an OE patch for at-3.1.8
diff --git a/meta/recipes-extended/libtirpc/libtirpc-0.2.2/libtirpc-0.2.1-fortify.patch b/meta/recipes-extended/libtirpc/libtirpc-0.2.2/libtirpc-0.2.1-fortify.patch
index 32644b5b72..4a785d344a 100644
--- a/meta/recipes-extended/libtirpc/libtirpc-0.2.2/libtirpc-0.2.1-fortify.patch
+++ b/meta/recipes-extended/libtirpc/libtirpc-0.2.2/libtirpc-0.2.1-fortify.patch
@@ -2,7 +2,7 @@ Fix a possible overflow (reported by _FORTIFY_SOURCE=2)
2 2
3Ported from Gentoo 3Ported from Gentoo
4 4
5Upstream-Status: Unknown 5Upstream-Status: Pending
6 6
7Signed-off-by: Khem Raj <raj.khem@gmail.com> 7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8 8
diff --git a/meta/recipes-graphics/clutter/clutter-gst/autofoo-0.4.patch b/meta/recipes-graphics/clutter/clutter-gst/autofoo-0.4.patch
deleted file mode 100644
index e22d2dbe50..0000000000
--- a/meta/recipes-graphics/clutter/clutter-gst/autofoo-0.4.patch
+++ /dev/null
@@ -1,19 +0,0 @@
1Upstream-Status: Inappropriate [not used]
2
3---
4 doc/reference/Makefile.am | 2 +-
5 examples/Makefile.am | 2 +-
6 2 files changed, 2 insertions(+), 2 deletions(-)
7
8Upstream-Status: Inappropriate [configuration]
9
10Index: clutter-gst/examples/Makefile.am
11===================================================================
12--- clutter-gst.orig/examples/Makefile.am 2007-11-06 12:31:36.000000000 +0000
13+++ clutter-gst/examples/Makefile.am 2007-11-06 18:53:59.000000000 +0000
14@@ -1,4 +1,4 @@
15-noinst_PROGRAMS = video-player video-sink audio
16+bin_PROGRAMS = video-player video-sink audio
17
18 INCLUDES = -I$(top_srcdir)/
19
diff --git a/meta/recipes-graphics/clutter/clutter-gst/autofoo-9db4a61a25677764bb927369c5c68ada958fb65c.patch b/meta/recipes-graphics/clutter/clutter-gst/autofoo-9db4a61a25677764bb927369c5c68ada958fb65c.patch
deleted file mode 100644
index 8b3d84d36d..0000000000
--- a/meta/recipes-graphics/clutter/clutter-gst/autofoo-9db4a61a25677764bb927369c5c68ada958fb65c.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1Upstream-Status: Inappropriate [not used]
2
3---
4 doc/reference/Makefile.am | 2 +-
5 examples/Makefile.am | 2 +-
6 2 files changed, 2 insertions(+), 2 deletions(-)
7
8Upstream-Status: Inappropriate [configuration]
9
10Index: clutter-gst/examples/Makefile.am
11===================================================================
12--- clutter-gst.orig/examples/Makefile.am 2007-11-06 12:31:36.000000000 +0000
13+++ clutter-gst/examples/Makefile.am 2007-11-06 18:53:59.000000000 +0000
14@@ -1,4 +1,4 @@
15-noinst_PROGRAMS = video-player video-sink audio
16+bin_PROGRAMS = video-player video-sink audio
17
18 INCLUDES = -I$(top_srcdir)/
19
20Index: clutter-gst/doc/reference/Makefile.am
21===================================================================
22--- clutter-gst.orig/doc/reference/Makefile.am 2007-11-06 19:36:56.000000000 +0000
23+++ clutter-gst/doc/reference/Makefile.am 2007-11-06 19:37:02.000000000 +0000
24@@ -77,4 +77,4 @@ include $(top_srcdir)/gtk-doc.make
25
26 # Other files to distribute
27 # e.g. EXTRA_DIST += version.xml.in
28-EXTRA_DIST += version.xml.in
29+EXTRA_DIST = version.xml.in
diff --git a/meta/recipes-graphics/clutter/clutter-gst/autofoo.patch b/meta/recipes-graphics/clutter/clutter-gst/autofoo.patch
deleted file mode 100644
index b557c6ea12..0000000000
--- a/meta/recipes-graphics/clutter/clutter-gst/autofoo.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1Upstream-Status: Inappropriate [not used]
2
3---
4 doc/reference/Makefile.am | 2 +-
5 examples/Makefile.am | 2 +-
6 2 files changed, 2 insertions(+), 2 deletions(-)
7
8Upstream-Status: Inappropriate [configuration]
9
10Index: git/examples/Makefile.am
11===================================================================
12--- git.orig/examples/Makefile.am 2009-06-30 16:41:53.000000000 +0100
13+++ git/examples/Makefile.am 2009-06-30 16:43:00.000000000 +0100
14@@ -1,6 +1,6 @@
15 NULL = #
16
17-noinst_PROGRAMS = video-player video-sink audio-player
18+bin_PROGRAMS = video-player video-sink audio-player
19
20 INCLUDES = -I$(top_srcdir) \
21 $(MAINTAINER_CFLAGS) \
22Index: git/doc/reference/Makefile.am
23===================================================================
24--- git.orig/doc/reference/Makefile.am 2009-06-30 16:41:53.000000000 +0100
25+++ git/doc/reference/Makefile.am 2009-06-30 16:41:53.000000000 +0100
26@@ -77,4 +77,4 @@
27
28 # Other files to distribute
29 # e.g. EXTRA_DIST += version.xml.in
30-EXTRA_DIST += version.xml.in
31+EXTRA_DIST = version.xml.in
diff --git a/meta/recipes-qt/qt4/files/qt-dbus-const.patch b/meta/recipes-qt/qt4/files/qt-dbus-const.patch
index a856912604..f3de77e3e6 100644
--- a/meta/recipes-qt/qt4/files/qt-dbus-const.patch
+++ b/meta/recipes-qt/qt4/files/qt-dbus-const.patch
@@ -1,12 +1,13 @@
1Remove "const" usage that causes compile failure building qt4-tools-nativesdk 1Remove "const" usage that causes compile failure building qt4-tools-nativesdk
2 2
3Upstream-Status: Denied [possible retry]
4
3Patch has apparently been rejected upstream, not because it is invalid 5Patch has apparently been rejected upstream, not because it is invalid
4but because the submitter did not submit a merge request for it, so the 6but because the submitter did not submit a merge request for it, so the
5validity of the patch upstream is uncertain. For further details see: 7validity of the patch upstream is uncertain. For further details see:
6http://bugreports.qt.nokia.com/browse/QTBUG-17962 8http://bugreports.qt.nokia.com/browse/QTBUG-17962
7 9
8Original Author: Pavel Heimlich <tropikhajma at gmail.com> 10Original Author: Pavel Heimlich <tropikhajma at gmail.com>
9Upstream-Status: Rejected
10 11
11--- qt-everywhere-opensource-src-4.7.3/src/dbus/qdbusintegrator.cpp.orig 2011-03-12 02:11:32.313467991 +0100 12--- qt-everywhere-opensource-src-4.7.3/src/dbus/qdbusintegrator.cpp.orig 2011-03-12 02:11:32.313467991 +0100
12+++ qt-everywhere-opensource-src-4.7.3/src/dbus/qdbusintegrator.cpp 2011-03-12 02:11:03.795809176 +0100 13+++ qt-everywhere-opensource-src-4.7.3/src/dbus/qdbusintegrator.cpp 2011-03-12 02:11:03.795809176 +0100
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 03:30:56 +0000