diff options
52 files changed, 94 insertions, 400 deletions
diff --git a/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/configurefix.patch b/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/configurefix.patch index 01b4f64191..892946f782 100644 --- a/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/configurefix.patch +++ b/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/configurefix.patch @@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [configuration] + Index: gnome-settings-daemon-2.26.1/configure.ac =================================================================== --- gnome-settings-daemon-2.26.1.orig/configure.ac 2009-09-16 22:57:31.000000000 +0100 diff --git a/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/desktop-moblin.patch b/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/desktop-moblin.patch index d3fd76c621..b8f1661b06 100644 --- a/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/desktop-moblin.patch +++ b/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/desktop-moblin.patch @@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [configuration] + --- gnome-settings-daemon-2.26.1/data/gnome-settings-daemon.desktop.in.in~ 2009-04-24 20:59:51.000000000 -0700 +++ gnome-settings-daemon-2.26.1/data/gnome-settings-daemon.desktop.in.in 2009-04-24 20:59:51.000000000 -0700 @@ -2,7 +2,7 @@ diff --git a/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/gnome-settings-daemon-2.24.0-catch-deviceadded.patch b/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/gnome-settings-daemon-2.24.0-catch-deviceadded.patch index 8e1d0ce9ce..b9cf6e17d3 100644 --- a/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/gnome-settings-daemon-2.24.0-catch-deviceadded.patch +++ b/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/gnome-settings-daemon-2.24.0-catch-deviceadded.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + ============================================================ Listen for DeviceAdded in addition to DeviceEnabled diff --git a/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/gnome-settings-daemon-fix-gthread.patch b/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/gnome-settings-daemon-fix-gthread.patch index d77063eba7..965da0961e 100644 --- a/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/gnome-settings-daemon-fix-gthread.patch +++ b/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/gnome-settings-daemon-fix-gthread.patch @@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [configuration] + Index: gnome-settings-daemon-2.25.90/configure.ac =================================================================== --- gnome-settings-daemon-2.25.90.orig/configure.ac diff --git a/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/mojito-cleanup.patch b/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/mojito-cleanup.patch index 1aff2d6d6f..79f28711c5 100644 --- a/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/mojito-cleanup.patch +++ b/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/mojito-cleanup.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + diff --git a/plugins/housekeeping/gsd-housekeeping-manager.c b/plugins/housekeeping/gsd-housekeeping-manager.c index f84cfad..e8f474a 100644 --- a/plugins/housekeeping/gsd-housekeeping-manager.c diff --git a/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/mount-plugin.patch b/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/mount-plugin.patch index 67f056b505..25dc36e672 100644 --- a/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/mount-plugin.patch +++ b/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/mount-plugin.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + diff --git a/configure.ac b/configure.ac index 135f2ce..ba737a5 100644 --- a/configure.ac diff --git a/meta-demoapps/recipes-graphics/libxklavier/libxklavier/pkgconfigfix.patch b/meta-demoapps/recipes-graphics/libxklavier/libxklavier/pkgconfigfix.patch index 4aaafb2b1e..f58f30b2cd 100644 --- a/meta-demoapps/recipes-graphics/libxklavier/libxklavier/pkgconfigfix.patch +++ b/meta-demoapps/recipes-graphics/libxklavier/libxklavier/pkgconfigfix.patch @@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [configuration] + Index: libxklavier-3.7/libxklavier.pc.in =================================================================== --- libxklavier-3.7.orig/libxklavier.pc.in 2009-06-10 15:58:46.000000000 +0100 diff --git a/meta-demoapps/recipes-graphics/xorg-lib/liblbxutil/mkg3states.patch b/meta-demoapps/recipes-graphics/xorg-lib/liblbxutil/mkg3states.patch index 029d761d95..63c1847223 100644 --- a/meta-demoapps/recipes-graphics/xorg-lib/liblbxutil/mkg3states.patch +++ b/meta-demoapps/recipes-graphics/xorg-lib/liblbxutil/mkg3states.patch @@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [configuration] + During the build process the mkg3states binary needs to be run. This patch allows it to be built with the build systems gcc allowing this to work. diff --git a/meta/recipes-devtools/tcf-agent/tcf-agent/fix_tcf-agent.init.patch b/meta/recipes-devtools/tcf-agent/tcf-agent/fix_tcf-agent.init.patch index fa9e458714..60b0b2728e 100644 --- a/meta/recipes-devtools/tcf-agent/tcf-agent/fix_tcf-agent.init.patch +++ b/meta/recipes-devtools/tcf-agent/tcf-agent/fix_tcf-agent.init.patch @@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [poky-specific script] + --- a/Makefile +++ b/Makefile @@ -32,7 +32,7 @@ diff --git a/meta/recipes-devtools/tcf-agent/tcf-agent/terminals_agent.patch b/meta/recipes-devtools/tcf-agent/tcf-agent/terminals_agent.patch index b88b5e70cd..aed62fad84 100644 --- a/meta/recipes-devtools/tcf-agent/tcf-agent/terminals_agent.patch +++ b/meta/recipes-devtools/tcf-agent/tcf-agent/terminals_agent.patch @@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [source code; we'll remove it when upgrading tcf-agent in future] + Index: org.eclipse.tm.tcf.terminals.agent/terminals.c =================================================================== --- org.eclipse.tm.tcf.terminals.agent/terminals.c (revision 0) diff --git a/meta/recipes-extended/screen/screen-4.0.3/configure.patch b/meta/recipes-extended/screen/screen-4.0.3/configure.patch index 1061a56999..b29071de93 100644 --- a/meta/recipes-extended/screen/screen-4.0.3/configure.patch +++ b/meta/recipes-extended/screen/screen-4.0.3/configure.patch @@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [configuration] + # The patch is borrowed from OE: # http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=4ee790cc6974bdfe1c9b06c0567b1c56f56d6615 # and was rebased to screen-4.0.3's configure.in diff --git a/meta/recipes-extended/which/which-2.18/fix_name_conflict_group_member.patch b/meta/recipes-extended/which/which-2.18/fix_name_conflict_group_member.patch index 568d4233fd..fb9b1a4083 100644 --- a/meta/recipes-extended/which/which-2.18/fix_name_conflict_group_member.patch +++ b/meta/recipes-extended/which/which-2.18/fix_name_conflict_group_member.patch @@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [this is 2.18(GPLv2) specific] + # glibc also implements the function group_member. To avoid name conflict, # here let us append a "_" to which's version. # diff --git a/meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gconftool-lossage.patch b/meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gconftool-lossage.patch index 3dbc130ddc..0f52136e30 100644 --- a/meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gconftool-lossage.patch +++ b/meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gconftool-lossage.patch @@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [configuration] + --- gnome-vfs-2.6.0/configure.in~ 2004-03-22 12:36:23.000000000 +0000 +++ gnome-vfs-2.6.0/configure.in 2004-06-07 16:04:34.000000000 +0100 @@ -154,7 +154,7 @@ diff --git a/meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch b/meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch index e25ecdd66f..dabec32c6a 100644 --- a/meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch +++ b/meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch @@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [configuration] + removes kerberos completely to avoid conflicts with installed kerberos --- configure.in.orig 2007-01-05 19:42:26.418541610 +0200 +++ configure.in 2007-01-05 19:42:56.604261797 +0200 diff --git a/meta/recipes-gnome/gnome/libart-lgpl/Makefile.am.patch b/meta/recipes-gnome/gnome/libart-lgpl/Makefile.am.patch index 28acbe108f..190ba96085 100644 --- a/meta/recipes-gnome/gnome/libart-lgpl/Makefile.am.patch +++ b/meta/recipes-gnome/gnome/libart-lgpl/Makefile.am.patch @@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [configuration] + Index: libart_lgpl-2.3.21/Makefile.am =================================================================== --- libart_lgpl-2.3.21.orig/Makefile.am 2009-04-18 05:29:25.000000000 -0700 diff --git a/meta/recipes-gnome/librsvg/librsvg-2.32.1/doc_Makefile.patch b/meta/recipes-gnome/librsvg/librsvg-2.32.1/doc_Makefile.patch index 217573bd27..860d7a984e 100644 --- a/meta/recipes-gnome/librsvg/librsvg-2.32.1/doc_Makefile.patch +++ b/meta/recipes-gnome/librsvg/librsvg-2.32.1/doc_Makefile.patch @@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [configuration] + Automake complains about using += before setting with = Signed-off-by: Saul Wold <sgw@linux.intel.com> diff --git a/meta/recipes-graphics/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch b/meta/recipes-graphics/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch index 7fec1e9104..c8a3bf5d17 100644 --- a/meta/recipes-graphics/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch +++ b/meta/recipes-graphics/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch @@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [configuration] + --- fontconfig.pc.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/freetype/freetype-2.4.4/no-hardcode.patch b/meta/recipes-graphics/freetype/freetype-2.4.4/no-hardcode.patch index 44ae450a14..0f21d1ff26 100644 --- a/meta/recipes-graphics/freetype/freetype-2.4.4/no-hardcode.patch +++ b/meta/recipes-graphics/freetype/freetype-2.4.4/no-hardcode.patch @@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [configuration] + --- freetype-2.1.10/builds/unix/freetype-config.in.old 2006-05-01 12:39:20.000000000 +0100 +++ freetype-2.1.10/builds/unix/freetype-config.in 2006-05-01 12:39:34.000000000 +0100 @@ -16,7 +16,7 @@ diff --git a/meta/recipes-graphics/libxsettings-client/libxsettings-client/disable_Os_option.patch b/meta/recipes-graphics/libxsettings-client/libxsettings-client/disable_Os_option.patch index 716f562f67..64b7efac23 100644 --- a/meta/recipes-graphics/libxsettings-client/libxsettings-client/disable_Os_option.patch +++ b/meta/recipes-graphics/libxsettings-client/libxsettings-client/disable_Os_option.patch @@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [configuration] + Do not set Os optimization in target APP CFLAGS, since it may have potential error if "--enable-target-optspace" is not set when configuring GCC. diff --git a/meta/recipes-graphics/libxsettings-client/libxsettings-client/link-x11.patch b/meta/recipes-graphics/libxsettings-client/libxsettings-client/link-x11.patch index ee12f0a5b3..d08d0d5b99 100644 --- a/meta/recipes-graphics/libxsettings-client/libxsettings-client/link-x11.patch +++ b/meta/recipes-graphics/libxsettings-client/libxsettings-client/link-x11.patch @@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [configuration] + Index: Xsettings-client-0.10/Makefile.am =================================================================== --- Xsettings-client-0.10.orig/Makefile.am 2008-02-07 14:49:54.000000000 +0000 diff --git a/meta/recipes-graphics/xcb/libxcb/xcbincludedir.patch b/meta/recipes-graphics/xcb/libxcb/xcbincludedir.patch index cef635096e..d858a63b72 100644 --- a/meta/recipes-graphics/xcb/libxcb/xcbincludedir.patch +++ b/meta/recipes-graphics/xcb/libxcb/xcbincludedir.patch @@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [configuration] + --- libxcb-1.0.orig/configure.ac 2006-11-23 15:33:01.000000000 +0000 +++ libxcb-1.0/configure.ac 2008-09-10 20:29:12.000000000 +0100 @@ -50,7 +50,7 @@ diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/include_fix.patch b/meta/recipes-graphics/xorg-lib/libx11-1.3.4/include_fix.patch index c8aa08595d..eeb4175b4f 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/include_fix.patch +++ b/meta/recipes-graphics/xorg-lib/libx11-1.3.4/include_fix.patch @@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [configuration] + --- configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/nodolt.patch b/meta/recipes-graphics/xorg-lib/libx11-1.3.4/nodolt.patch index 011c23e8d8..bf6c7d59c2 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/nodolt.patch +++ b/meta/recipes-graphics/xorg-lib/libx11-1.3.4/nodolt.patch @@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [configuration] + --- libX11-1.3.4.orig/configure.ac +++ libX11-1.3.4/configure.ac @@ -32,7 +32,6 @@ diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch index 4036757e54..561b57762a 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch +++ b/meta/recipes-graphics/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch @@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [configuration] + --- src/util/Makefile.am | 21 ----------------- 1 file changed, 21 deletions(-) diff --git a/meta/recipes-graphics/xorg-lib/libx11-git/X18NCMSstubs.diff b/meta/recipes-graphics/xorg-lib/libx11-git/X18NCMSstubs.diff index 2dd27fc94f..b49fc2271b 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-git/X18NCMSstubs.diff +++ b/meta/recipes-graphics/xorg-lib/libx11-git/X18NCMSstubs.diff @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- configure.ac | 9 - src/Makefile.am | 5 diff --git a/meta/recipes-graphics/xorg-lib/libx11-git/fix-disable-xlocale.diff b/meta/recipes-graphics/xorg-lib/libx11-git/fix-disable-xlocale.diff index 9dbf6dac68..7dcdd6af22 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-git/fix-disable-xlocale.diff +++ b/meta/recipes-graphics/xorg-lib/libx11-git/fix-disable-xlocale.diff @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- libX11-X11R7.0-1.0.0/src/Font.c.orig 2006-03-12 18:35:42.000000000 +0100 +++ libX11-X11R7.0-1.0.0/src/Font.c 2006-03-12 18:40:27.000000000 +0100 @@ -701,7 +701,11 @@ diff --git a/meta/recipes-graphics/xorg-lib/libx11-git/fix-utf8-wrong-define.patch b/meta/recipes-graphics/xorg-lib/libx11-git/fix-utf8-wrong-define.patch index a098db1941..26d3349bed 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-git/fix-utf8-wrong-define.patch +++ b/meta/recipes-graphics/xorg-lib/libx11-git/fix-utf8-wrong-define.patch @@ -1,3 +1,4 @@ +Upstream-Status: Pending # # Patch managed by http://www.holgerschurig.de/patcher.html diff --git a/meta/recipes-graphics/xorg-lib/libx11-git/include_fix.patch b/meta/recipes-graphics/xorg-lib/libx11-git/include_fix.patch index 99ed57194e..b3bcbabfeb 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-git/include_fix.patch +++ b/meta/recipes-graphics/xorg-lib/libx11-git/include_fix.patch @@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [configuration] + --- configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-graphics/xorg-lib/libx11-git/nodolt.patch b/meta/recipes-graphics/xorg-lib/libx11-git/nodolt.patch index ecf9625cad..cc05fdca7e 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-git/nodolt.patch +++ b/meta/recipes-graphics/xorg-lib/libx11-git/nodolt.patch @@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [configuration] + Index: libX11-1.2.1/configure.ac =================================================================== --- libX11-1.2.1.orig/configure.ac 2009-07-02 14:07:54.000000000 +0100 diff --git a/meta/recipes-graphics/xorg-lib/libx11-git/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11-git/x11_disable_makekeys.patch index 9cc2bbbbdd..5dc6f06689 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-git/x11_disable_makekeys.patch +++ b/meta/recipes-graphics/xorg-lib/libx11-git/x11_disable_makekeys.patch @@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [configuration] + --- src/util/Makefile.am | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/meta/recipes-graphics/xorg-lib/libx11-git/xim.patch b/meta/recipes-graphics/xorg-lib/libx11-git/xim.patch deleted file mode 100644 index 0eab197a80..0000000000 --- a/meta/recipes-graphics/xorg-lib/libx11-git/xim.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- libX11-6.2.1/src/X18NCMSstubs.c 2003-12-04 22:47:47.000000000 +0000 -+++ libX11-6.2.1/src/X18NCMSstubs.c-new 2005-12-09 12:09:03.000000000 +0000 -@@ -90,6 +90,52 @@ - return; - } - -+XIM -+XOpenIM ( -+ Display* display, -+ struct _XrmHashBucketRec* rdb, -+ char* res_name, -+ char* res_class) -+{ -+ return (XIM) NULL; -+} -+ -+Status -+XCloseIM ( XIM im ) -+{ -+ return NULL; -+} -+ -+XIC -+XCreateIC ( XIM im, ...) -+{ -+ return NULL; -+} -+ -+void -+XDestroyIC ( XIC ic ) -+{ -+ return; -+} -+ -+int -+XmbLookupString ( -+ XIC ic, -+ XKeyPressedEvent* ev, -+ char* buffer, -+ int nbytes, -+ KeySym* keysym, -+ Status* status) -+{ -+ return XLookupNone; -+} -+ -+char * -+XGetICValues( XIC ic, ...) -+{ -+ return (char *) NULL; -+} -+ - XPointer - _XimGetLocaleCode ( _Xconst char* encoding_name ) - { diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim/include_fix.patch b/meta/recipes-graphics/xorg-lib/libx11-trim/include_fix.patch index 99ed57194e..b3bcbabfeb 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-trim/include_fix.patch +++ b/meta/recipes-graphics/xorg-lib/libx11-tr |