Upstream-Status Updates

PATCH Applied Dexuan Cui 2 participants 26 messages May 11, 2011 – May 13, 2011

lore

Share & tools

lore

Dexuan Cui

author

2011-05-11 06:29 UTC #0 lore raw

cover Upstream-Status Updates

From: Dexuan Cui <[email protected]>

Hi Saul,

These commits update the Upstream-Status field.

For "Inappropriate", I added the reason "configuration" or a specific reason.

Some are "Pending": I will further update them later.

I also removed some patches since they're not used at all now.

Please help to review and pull.

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: dcui/distro
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dcui/distro

Thanks,
Dexuan Cui <[email protected]>
---

Dexuan Cui (24):
tcf-agent: update its patch's Upstream-Status
screen: update its patch's Upstream-Status
which (GPLv2): update its patch's Upstream-Status
gnome-vfs: update its patch's Upstream-Status
libart-lgpl: update its patch's Upstream-Status
librsvg: update its patch's Upstream-Status
fontconfig: update its patch's Upstream-Status
freetype: update its patch's Upstream-Status
libxsettings-client: update its patch's Upstream-Status
libxcb: update its patch's Upstream-Status
libx11: update its patch's Upstream-Status
libx11-trim: update its patch's Upstream-Status
libxcalibrate: update its patch's Upstream-Status
libxcomposite: update its patch's Upstream-Status
libxfont: update its patch's Upstream-Status
xtrans: update its patch's Upstream-Status
calibrateproto: update its patch's Upstream-Status
latencytop: update its patch's Upstream-Status
oprofile: update its patch's Upstream-Status and remove an unused
patch
powertop: update its patch's Upstream-Status
settings-daemon: update its patch's Upstream-Status
gnome-settings-daemon: update its patch's Upstream-Status
libxklavier: update its patch's Upstream-Status
liblbxutil: update its patch's Upstream-Status

 .../gnome/gnome-settings-daemon/configurefix.patch |    2 +
 .../gnome-settings-daemon/desktop-moblin.patch     |    2 +
 ...-settings-daemon-2.24.0-catch-deviceadded.patch |    2 +
 .../gnome-settings-daemon-fix-gthread.patch        |    2 +
 .../gnome-settings-daemon/mojito-cleanup.patch     |    2 +
 .../gnome/gnome-settings-daemon/mount-plugin.patch |    2 +
 .../libxklavier/libxklavier/pkgconfigfix.patch     |    2 +
 .../xorg-lib/liblbxutil/mkg3states.patch           |    2 +
 .../tcf-agent/tcf-agent/fix_tcf-agent.init.patch   |    2 +
 .../tcf-agent/tcf-agent/terminals_agent.patch      |    2 +
 .../screen/screen-4.0.3/configure.patch            |    2 +
 .../fix_name_conflict_group_member.patch           |    2 +
 .../gnome/gnome-vfs-2.24.4/gconftool-lossage.patch |    2 +
 .../gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch   |    2 +
 .../gnome/libart-lgpl/Makefile.am.patch            |    2 +
 .../librsvg/librsvg-2.32.1/doc_Makefile.patch      |    2 +
 .../fontconfig-2.8.0/fix-pkgconfig.patch           |    2 +
 .../freetype/freetype-2.4.4/no-hardcode.patch      |    2 +
 .../libxsettings-client/disable_Os_option.patch    |    2 +
 .../libxsettings-client/link-x11.patch             |    2 +
 .../xcb/libxcb/xcbincludedir.patch                 |    2 +
 .../xorg-lib/libx11-1.3.4/include_fix.patch        |    2 +
 .../xorg-lib/libx11-1.3.4/nodolt.patch             |    2 +
 .../libx11-1.3.4/x11_disable_makekeys.patch        |    2 +
 .../xorg-lib/libx11-git/X18NCMSstubs.diff          |    2 +
 .../xorg-lib/libx11-git/fix-disable-xlocale.diff   |    2 +
 .../libx11-git/fix-utf8-wrong-define.patch         |    1 +
 .../xorg-lib/libx11-git/include_fix.patch          |    2 +
 .../xorg-lib/libx11-git/nodolt.patch               |    2 +
 .../xorg-lib/libx11-git/x11_disable_makekeys.patch |    2 +
 .../recipes-graphics/xorg-lib/libx11-git/xim.patch |   55 -----
 .../xorg-lib/libx11-trim/include_fix.patch         |    2 +
 .../xorg-lib/libx11-trim/nodolt.patch              |    2 +
 .../libx11-trim/x11_disable_makekeys.patch         |    2 +
 .../xorg-lib/libx11/X18NCMSstubs.diff              |    2 +
 .../xorg-lib/libx11/fix-disable-xlocale.diff       |    2 +
 .../xorg-lib/libx11/fix-utf8-wrong-define.patch    |    1 +
 .../xorg-lib/libx11/include_fix.patch              |    2 +
 meta/recipes-graphics/xorg-lib/libx11/nodolt.patch |    2 +
 .../xorg-lib/libx11/x11_disable_makekeys.patch     |    2 +
 meta/recipes-graphics/xorg-lib/libx11/xim.patch    |   55 -----
 .../xorg-lib/libxcalibrate/fix-xcb.patch           |    2 +
 .../libxcomposite/change-include-order.patch       |    2 +
 .../xorg-lib/libxfont/no-scalable-crash.patch      |    2 +
 .../xorg-lib/xtrans/abstract_socket_fix.patch      |   58 -----
 .../xorg-proto/calibrateproto/fix.patch            |    2 +
 .../latencytop-0.5/latencytop-makefile.patch       |    2 +
 .../recipes-kernel/oprofile/oprofile/opstart.patch |    2 +
 .../oprofile/oprofile/xml_callgraph_details.patch  |  232 --------------------
 .../stub_out_the_ncurses_calls_in_dump_mode.patch  |    2 +
 .../settings-daemon/files/addsoundkeys.patch       |    2 +
 .../files/dso_linking_change_build_fix.patch       |    2 +
 52 files changed, 94 insertions(+), 400 deletions(-)
 delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-git/xim.patch
 delete mode 100644 meta/recipes-graphics/xorg-lib/libx11/xim.patch
 delete mode 100644 meta/recipes-graphics/xorg-lib/xtrans/abstract_socket_fix.patch
 delete mode 100644 meta/recipes-kernel/oprofile/oprofile/xml_callgraph_details.patch

Signature · 1 line

1.7.2

Dexuan Cui

author

2011-05-11 06:29 UTC #1 lore raw

PATCH 1/24 tcf-agent: update its patch's Upstream-Status

From: Dexuan Cui <[email protected]>

Signed-off-by Dexuan Cui <[email protected]>

---
 .../tcf-agent/tcf-agent/fix_tcf-agent.init.patch   |    2 ++
 .../tcf-agent/tcf-agent/terminals_agent.patch      |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)

meta/recipes-devtools/tcf-agent/tcf-agent/fix_tcf-agent.init.patch +2 -0

index fa9e458..60b0b27 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [poky-specific script]
+
 --- a/Makefile
 +++ b/Makefile
 @@ -32,7 +32,7 @@

meta/recipes-devtools/tcf-agent/tcf-agent/terminals_agent.patch +2 -0

index b88b5e7..aed62fa 100644
@@ -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)

Signature · 1 line

1.7.2

Dexuan Cui

author

2011-05-11 06:29 UTC #2 lore raw

PATCH 2/24 screen: update its patch's Upstream-Status

In reply to Dexuan Cui

From: Dexuan Cui <[email protected]>

Signed-off-by Dexuan Cui <[email protected]>

---
 .../screen/screen-4.0.3/configure.patch            |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

meta/recipes-extended/screen/screen-4.0.3/configure.patch +2 -0

index 1061a56..b29071d 100644
@@ -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

Signature · 1 line

1.7.2

Dexuan Cui

author

2011-05-11 06:29 UTC #3 lore raw

PATCH 3/24 which (GPLv2): update its patch's Upstream-Status

In reply to Dexuan Cui

From: Dexuan Cui <[email protected]>

Signed-off-by Dexuan Cui <[email protected]>

---
 .../fix_name_conflict_group_member.patch           |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

meta/recipes-extended/which/which-2.18/fix_name_conflict_group_member.patch +2 -0

index 568d423..fb9b1a4 100644
@@ -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.
 #

Signature · 1 line

1.7.2

Dexuan Cui

author

2011-05-11 06:29 UTC #4 lore raw

PATCH 4/24 gnome-vfs: update its patch's Upstream-Status

In reply to Dexuan Cui

From: Dexuan Cui <[email protected]>

Signed-off-by Dexuan Cui <[email protected]>

---
 .../gnome/gnome-vfs-2.24.4/gconftool-lossage.patch |    2 ++
 .../gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch   |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)

meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gconftool-lossage.patch +2 -0

index 3dbc130..0f52136 100644
@@ -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 @@

meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch +2 -0

index e25ecdd..dabec32 100644
@@ -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

Signature · 1 line

1.7.2

Dexuan Cui

author

2011-05-11 06:29 UTC #5 lore raw

PATCH 5/24 libart-lgpl: update its patch's Upstream-Status

In reply to Dexuan Cui

From: Dexuan Cui <[email protected]>

Signed-off-by Dexuan Cui <[email protected]>

---
 .../gnome/libart-lgpl/Makefile.am.patch            |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

meta/recipes-gnome/gnome/libart-lgpl/Makefile.am.patch +2 -0

index 28acbe1..190ba96 100644
@@ -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

Signature · 1 line

1.7.2

Dexuan Cui

author

2011-05-11 06:29 UTC #6 lore raw

PATCH 6/24 librsvg: update its patch's Upstream-Status

In reply to Dexuan Cui

From: Dexuan Cui <[email protected]>

Signed-off-by Dexuan Cui <[email protected]>

---
 .../librsvg/librsvg-2.32.1/doc_Makefile.patch      |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

meta/recipes-gnome/librsvg/librsvg-2.32.1/doc_Makefile.patch +2 -0

index 217573b..860d7a9 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
 Automake complains about using += before setting with =
 
 Signed-off-by: Saul Wold <[email protected]>

Signature · 1 line

1.7.2

Dexuan Cui

author

2011-05-11 06:29 UTC #7 lore raw

PATCH 7/24 fontconfig: update its patch's Upstream-Status

In reply to Dexuan Cui

From: Dexuan Cui <[email protected]>

Signed-off-by Dexuan Cui <[email protected]>

---
 .../fontconfig-2.8.0/fix-pkgconfig.patch           |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

meta/recipes-graphics/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch +2 -0

index 7fec1e9..c8a3bf5 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
 ---
  fontconfig.pc.in |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

Signature · 1 line

1.7.2

Dexuan Cui

author

2011-05-11 06:29 UTC #8 lore raw

PATCH 8/24 freetype: update its patch's Upstream-Status

In reply to Dexuan Cui

From: Dexuan Cui <[email protected]>

Signed-off-by Dexuan Cui <[email protected]>

---
 .../freetype/freetype-2.4.4/no-hardcode.patch      |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

meta/recipes-graphics/freetype/freetype-2.4.4/no-hardcode.patch +2 -0

index 44ae450..0f21d1f 100644
@@ -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 @@

Signature · 1 line

1.7.2

Dexuan Cui

author

2011-05-11 06:29 UTC #9 lore raw

PATCH 9/24 libxsettings-client: update its patch's Upstream-Status

In reply to Dexuan Cui

From: Dexuan Cui <[email protected]>

Signed-off-by Dexuan Cui <[email protected]>

---
 .../libxsettings-client/disable_Os_option.patch    |    2 ++
 .../libxsettings-client/link-x11.patch             |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)

meta/recipes-graphics/libxsettings-client/libxsettings-client/disable_Os_option.patch +2 -0

index 716f562..64b7efa 100644
@@ -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.

meta/recipes-graphics/libxsettings-client/libxsettings-client/link-x11.patch +2 -0

index ee12f0a..d08d0d5 100644
@@ -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

Signature · 1 line

1.7.2

Dexuan Cui

author

2011-05-11 06:29 UTC #10 lore raw

PATCH 10/24 libxcb: update its patch's Upstream-Status

In reply to Dexuan Cui

From: Dexuan Cui <[email protected]>

Signed-off-by Dexuan Cui <[email protected]>

---
 .../xcb/libxcb/xcbincludedir.patch                 |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

meta/recipes-graphics/xcb/libxcb/xcbincludedir.patch +2 -0

index cef6350..d858a63 100644
@@ -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 @@

Signature · 1 line

1.7.2

Dexuan Cui

author

2011-05-11 06:29 UTC #11 lore raw

PATCH 11/24 libx11: update its patch's Upstream-Status

In reply to Dexuan Cui

From: Dexuan Cui <[email protected]>

remove 2 unused xim.patch.

Signed-off-by Dexuan Cui <[email protected]>

---
 .../xorg-lib/libx11-1.3.4/include_fix.patch        |    2 +
 .../xorg-lib/libx11-1.3.4/nodolt.patch             |    2 +
 .../libx11-1.3.4/x11_disable_makekeys.patch        |    2 +
 .../xorg-lib/libx11-git/X18NCMSstubs.diff          |    2 +
 .../xorg-lib/libx11-git/fix-disable-xlocale.diff   |    2 +
 .../libx11-git/fix-utf8-wrong-define.patch         |    1 +
 .../xorg-lib/libx11-git/include_fix.patch          |    2 +
 .../xorg-lib/libx11-git/nodolt.patch               |    2 +
 .../xorg-lib/libx11-git/x11_disable_makekeys.patch |    2 +
 .../recipes-graphics/xorg-lib/libx11-git/xim.patch |   55 --------------------
 .../xorg-lib/libx11/X18NCMSstubs.diff              |    2 +
 .../xorg-lib/libx11/fix-disable-xlocale.diff       |    2 +
 .../xorg-lib/libx11/fix-utf8-wrong-define.patch    |    1 +
 .../xorg-lib/libx11/include_fix.patch              |    2 +
 meta/recipes-graphics/xorg-lib/libx11/nodolt.patch |    2 +
 .../xorg-lib/libx11/x11_disable_makekeys.patch     |    2 +
 meta/recipes-graphics/xorg-lib/libx11/xim.patch    |   55 --------------------
 17 files changed, 28 insertions(+), 110 deletions(-)
 delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-git/xim.patch
 delete mode 100644 meta/recipes-graphics/xorg-lib/libx11/xim.patch

meta/recipes-graphics/xorg-lib/libx11-1.3.4/include_fix.patch +2 -0

index c8aa085..eeb4175 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
 ---
  configure.ac |    6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)

meta/recipes-graphics/xorg-lib/libx11-1.3.4/nodolt.patch +2 -0

index 011c23e..bf6c7d5 100644
@@ -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 @@

meta/recipes-graphics/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch +2 -0

index 4036757..561b577 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
 ---
  src/util/Makefile.am |   21 -----------------
  1 file changed, 21 deletions(-)

meta/recipes-graphics/xorg-lib/libx11-git/X18NCMSstubs.diff +2 -0

index 2dd27fc..b49fc22 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
 ---
  configure.ac       |    9 -
  src/Makefile.am    |    5

meta/recipes-graphics/xorg-lib/libx11-git/fix-disable-xlocale.diff +2 -0

index 9dbf6da..7dcdd6a 100644
@@ -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 @@

meta/recipes-graphics/xorg-lib/libx11-git/fix-utf8-wrong-define.patch +1 -0

index a098db1..26d3349 100644
@@ -1,3 +1,4 @@
+Upstream-Status: Pending
 
 #
 # Patch managed by http://www.holgerschurig.de/patcher.html

meta/recipes-graphics/xorg-lib/libx11-git/include_fix.patch +2 -0

index 99ed571..b3bcbab 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
 ---
  configure.ac |    6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)

meta/recipes-graphics/xorg-lib/libx11-git/nodolt.patch +2 -0

index ecf9625..cc05fdc 100644
@@ -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

meta/recipes-graphics/xorg-lib/libx11-git/x11_disable_makekeys.patch +2 -0

index 9cc2bbb..5dc6f06 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
 ---
  src/util/Makefile.am |   17 -----------------
  1 file changed, 17 deletions(-)

meta/recipes-graphics/xorg-lib/libx11-git/xim.patch deleted +0 ~~-55~~

55 lines not on this page · raw message

meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff +2 -0

index 54b1727..2e86a48 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
 --- libX11-X11R7.0-1.0.0/src/imConv.c.orig	2006-03-08 09:46:03.000000000 +0100
 +++ libX11-X11R7.0-1.0.0/src/imConv.c	2006-03-08 10:50:10.000000000 +0100
 @@ -83,6 +83,7 @@

meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff +2 -0

index 9dbf6da..7dcdd6a 100644
@@ -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 @@

meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch +1 -0

index a098db1..26d3349 100644
@@ -1,3 +1,4 @@
+Upstream-Status: Pending
 
 #
 # Patch managed by http://www.holgerschurig.de/patcher.html

meta/recipes-graphics/xorg-lib/libx11/include_fix.patch +2 -0

index 99ed571..b3bcbab 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
 ---
  configure.ac |    6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)

meta/recipes-graphics/xorg-lib/libx11/nodolt.patch +2 -0

index ecf9625..cc05fdc 100644
@@ -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

meta/recipes-graphics/xorg-lib/libx11/x11_disable_makekeys.patch +2 -0

index 6705782..0445835 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
 ---
  src/util/Makefile.am |   17 -----------------
  1 file changed, 17 deletions(-)

meta/recipes-graphics/xorg-lib/libx11/xim.patch deleted +0 ~~-55~~

55 lines not on this page · raw message

Signature · 1 line

1.7.2

Dexuan Cui

author

2011-05-11 06:29 UTC #12 lore raw

PATCH 12/24 libx11-trim: update its patch's Upstream-Status

In reply to Dexuan Cui

From: Dexuan Cui <[email protected]>

Signed-off-by Dexuan Cui <[email protected]>

---
 .../xorg-lib/libx11-trim/include_fix.patch         |    2 ++
 .../xorg-lib/libx11-trim/nodolt.patch              |    2 ++
 .../libx11-trim/x11_disable_makekeys.patch         |    2 ++
 3 files changed, 6 insertions(+), 0 deletions(-)

meta/recipes-graphics/xorg-lib/libx11-trim/include_fix.patch +2 -0

index 99ed571..b3bcbab 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
 ---
  configure.ac |    6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)

meta/recipes-graphics/xorg-lib/libx11-trim/nodolt.patch +2 -0

index ecf9625..cc05fdc 100644
@@ -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

meta/recipes-graphics/xorg-lib/libx11-trim/x11_disable_makekeys.patch +2 -0

index 6705782..0445835 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
 ---
  src/util/Makefile.am |   17 -----------------
  1 file changed, 17 deletions(-)

Signature · 1 line

1.7.2

Dexuan Cui

author

2011-05-11 06:29 UTC #13 lore raw

PATCH 13/24 libxcalibrate: update its patch's Upstream-Status

In reply to Dexuan Cui

From: Dexuan Cui <[email protected]>

Signed-off-by Dexuan Cui <[email protected]>

---
 .../xorg-lib/libxcalibrate/fix-xcb.patch           |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

meta/recipes-graphics/xorg-lib/libxcalibrate/fix-xcb.patch +2 -0

index 0d7efc7..d614883 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
 There is no extra reply data and if we say not to disgard it, xcb
 throws fatal asserts.

Signature · 1 line

1.7.2

Dexuan Cui

author

2011-05-11 06:29 UTC #14 lore raw

PATCH 14/24 libxcomposite: update its patch's Upstream-Status

In reply to Dexuan Cui

From: Dexuan Cui <[email protected]>

Signed-off-by Dexuan Cui <[email protected]>

---
 .../libxcomposite/change-include-order.patch       |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

meta/recipes-graphics/xorg-lib/libxcomposite/change-include-order.patch +2 -0

index 848beff..60331f6 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
 This patch makes the build use its own Xcomposite.h over rather than an
 older Xcomposite.h that might already be installed in the staging dir.

Signature · 1 line

1.7.2

Dexuan Cui

author

2011-05-11 06:29 UTC #15 lore raw

PATCH 15/24 libxfont: update its patch's Upstream-Status

In reply to Dexuan Cui

From: Dexuan Cui <[email protected]>

Signed-off-by Dexuan Cui <[email protected]>

---
 .../xorg-lib/libxfont/no-scalable-crash.patch      |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

meta/recipes-graphics/xorg-lib/libxfont/no-scalable-crash.patch +2 -0

index 90bded6..b3c58af 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
 --- /tmp/fontdir.c	2006-08-01 16:17:22.000000000 +0200
 +++ libXfont-1.2.0/src/fontfile/fontdir.c	2006-08-01 16:20:37.248306000 +0200
 @@ -695,6 +695,11 @@

Signature · 1 line

1.7.2

Dexuan Cui

author

2011-05-11 06:29 UTC #16 lore raw

PATCH 16/24 xtrans: update its patch's Upstream-Status

In reply to Dexuan Cui

From: Dexuan Cui <[email protected]>

remove abstract_socket_fix.patch as it's not used at all for long.

Signed-off-by Dexuan Cui <[email protected]>

---
 .../xorg-lib/xtrans/abstract_socket_fix.patch      |   58 --------------------
 1 files changed, 0 insertions(+), 58 deletions(-)
 delete mode 100644 meta/recipes-graphics/xorg-lib/xtrans/abstract_socket_fix.patch

meta/recipes-graphics/xorg-lib/xtrans/abstract_socket_fix.patch deleted +0 ~~-58~~

deleted file mode 100644
index 197da07..0000000
@@ -1,58 +0,0 @@
-From 556a351de83fc6f401b02213dae95731553c216d Mon Sep 17 00:00:00 2001
-From: Loïc Minier <[email protected]>
-Date: Mon, 24  Mar  2008  19:38:27  +0000
-Subject: Bug #10489: Don't retry unix socket connect()s on ENOENT.
-
-If the socket isn't there, it's not gonna magically appear.  Either it's
-a server socket and you should have just waited for the SIGUSR1 from the
-server, or it's a stale reference to an ICE socket.
-
-However, do retry once, so fallback from abstract to filesystem namespace
-works.
-
-Originally Debian bug #385976.
----
-diff --git a/Xtranssock.c b/Xtranssock.c
-index 8a7d2ec..da4afe9 100644
---- a/Xtranssock.c
-+++ b/Xtranssock.c
-@@ -2146,8 +2146,13 @@ TRANS(SocketUNIXConnect) (XtransConnInfo ciptr, char *host, char *port)
- 	    errno = olderrno;
- 	    
- 	    /*
--	     * If the error was ENOENT, the server may be starting up
--	     * and we should try again.
-+	     * If the error was ENOENT, the server may be starting up; we used
-+	     * to suggest to try again in this case with
-+	     * TRANS_TRY_CONNECT_AGAIN, but this introduced problems for
-+	     * processes still referencing stale sockets in their environment.
-+	     * Hence, we now return a hard error, TRANS_CONNECT_FAILED, and it
-+	     * is suggested that higher level stacks handle retries on their
-+	     * level when they face a slow starting server.
- 	     *
- 	     * If the error was EWOULDBLOCK or EINPROGRESS then the socket
- 	     * was non-blocking and we should poll using select
-@@ -2161,14 +2166,14 @@ TRANS(SocketUNIXConnect) (XtransConnInfo ciptr, char *host, char *port)
- 	    else if (olderrno == EINTR)
- 		return TRANS_TRY_CONNECT_AGAIN;
- 	    else if (olderrno == ENOENT) {
--		/*
--		* If opening as abstract socket failed, try again "normally"
--		*/
--		if (abstract)
-+		/* If opening as abstract socket failed, try again normally */
-+		if (abstract) {
- 		    ciptr->transptr->flags &= ~(TRANS_ABSTRACT);
--		return TRANS_TRY_CONNECT_AGAIN;
--	    }
--	    else {
-+		    return TRANS_TRY_CONNECT_AGAIN;
-+		} else {
-+		    return TRANS_CONNECT_FAILED;
-+		}
-+	    } else {
- 		PRMSG (2,"SocketUNIXConnect: Can't connect: errno = %d\n",
- 		       EGET(),0, 0);
- 
---
-cgit v0.7.2-37-g538c

Signature · 1 line

1.7.2

Dexuan Cui

author

2011-05-11 06:29 UTC #17 lore raw

PATCH 17/24 calibrateproto: update its patch's Upstream-Status

In reply to Dexuan Cui

From: Dexuan Cui <[email protected]>

Signed-off-by Dexuan Cui <[email protected]>

---
 .../xorg-proto/calibrateproto/fix.patch            |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

meta/recipes-graphics/xorg-proto/calibrateproto/fix.patch +2 -0

index 0c85cb0..ff8cb25 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
 Add missing length fields to the replies. Without these, sanity checking in recent X
 breaks things.

Signature · 1 line

1.7.2

Dexuan Cui

author

2011-05-11 06:29 UTC #18 lore raw

PATCH 18/24 latencytop: update its patch's Upstream-Status

In reply to Dexuan Cui

From: Dexuan Cui <[email protected]>

Signed-off-by Dexuan Cui <[email protected]>

---
 .../latencytop-0.5/latencytop-makefile.patch       |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

meta/recipes-kernel/latencytop/latencytop-0.5/latencytop-makefile.patch +2 -0

index b979f57..59a0b1f 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
 --- a/Makefile	2010-07-20 18:51:32.000000000 +0800
 +++ b/Makefile	2010-07-20 18:54:54.000000000 +0800
 @@ -4,7 +4,8 @@

Signature · 1 line

1.7.2

Dexuan Cui

author

2011-05-11 06:29 UTC #19 lore raw

PATCH 19/24 oprofile: update its patch's Upstream-Status and remove an unused patch

In reply to Dexuan Cui

From: Dexuan Cui <[email protected]>

delete xml_callgraph_details.patch as it's not used at all.

Signed-off-by Dexuan Cui <[email protected]>

---
 .../recipes-kernel/oprofile/oprofile/opstart.patch |    2 +
 .../oprofile/oprofile/xml_callgraph_details.patch  |  232 --------------------
 2 files changed, 2 insertions(+), 232 deletions(-)
 delete mode 100644 meta/recipes-kernel/oprofile/oprofile/xml_callgraph_details.patch

meta/recipes-kernel/oprofile/oprofile/opstart.patch +2 -0

index d61c300..c588deb 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
 Index: oprofile/utils/Makefile.am
 ===================================================================
 --- oprofile.orig/utils/Makefile.am	2005-03-31 18:20:41.000000000 +0100

meta/recipes-kernel/oprofile/oprofile/xml_callgraph_details.patch deleted +0 ~~-232~~

232 lines not on this page · raw message

Signature · 1 line

1.7.2

Dexuan Cui

author

2011-05-11 06:29 UTC #20 lore raw

PATCH 20/24 powertop: update its patch's Upstream-Status

In reply to Dexuan Cui

From: Dexuan Cui <[email protected]>

Signed-off-by Dexuan Cui <[email protected]>

---
 .../stub_out_the_ncurses_calls_in_dump_mode.patch  |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

meta/recipes-kernel/powertop/powertop-1.13/stub_out_the_ncurses_calls_in_dump_mode.patch +2 -0

index e837765..ae4cf5d 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [this patch is 1.13 specific and 2.0 will be coming.]
+
 Running PowerTop in Poky in dump mode (with --dump) always ends with a
 segmentation fault.

Signature · 1 line

1.7.2

Dexuan Cui

author

2011-05-11 06:29 UTC #21 lore raw

PATCH 21/24 settings-daemon: update its patch's Upstream-Status

In reply to Dexuan Cui

From: Dexuan Cui <[email protected]>

Signed-off-by Dexuan Cui <[email protected]>

---
 .../settings-daemon/files/addsoundkeys.patch       |    2 ++
 .../files/dso_linking_change_build_fix.patch       |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)

meta/recipes-sato/settings-daemon/files/addsoundkeys.patch +2 -0

index e06f029..baf06d6 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
 Index: settings-daemon/settings-daemon.c
 ===================================================================
 --- settings-daemon.orig/settings-daemon.c	2009-05-22 14:57:05.000000000 +0100

meta/recipes-sato/settings-daemon/files/dso_linking_change_build_fix.patch +2 -0

index 5fd96d4..5943744 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
 after gcc linking has changed, all the libraries must be explicitely specified to for linking. 
 This patch avoids this linking error:

Signature · 1 line

1.7.2

Dexuan Cui

author

2011-05-11 06:29 UTC #22 lore raw

PATCH 22/24 gnome-settings-daemon: update its patch's Upstream-Status

In reply to Dexuan Cui

From: Dexuan Cui <[email protected]>

Signed-off-by Dexuan Cui <[email protected]>

---
 .../gnome/gnome-settings-daemon/configurefix.patch |    2 ++
 .../gnome-settings-daemon/desktop-moblin.patch     |    2 ++
 ...-settings-daemon-2.24.0-catch-deviceadded.patch |    2 ++
 .../gnome-settings-daemon-fix-gthread.patch        |    2 ++
 .../gnome-settings-daemon/mojito-cleanup.patch     |    2 ++
 .../gnome/gnome-settings-daemon/mount-plugin.patch |    2 ++
 6 files changed, 12 insertions(+), 0 deletions(-)

meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/configurefix.patch +2 -0

index 01b4f64..892946f 100644
@@ -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

meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/desktop-moblin.patch +2 -0

index d3fd76c..b8f1661 100644
@@ -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 @@

meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/gnome-settings-daemon-2.24.0-catch-deviceadded.patch +2 -0

index 8e1d0ce..b9cf6e1 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
 ============================================================
  Listen for DeviceAdded in addition to DeviceEnabled

meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/gnome-settings-daemon-fix-gthread.patch +2 -0

index d77063e..965da09 100644
@@ -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

meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/mojito-cleanup.patch +2 -0

index 1aff2d6..79f2871 100644
@@ -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

meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/mount-plugin.patch +2 -0

index 67f056b..25dc36e 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
 diff --git a/configure.ac b/configure.ac
 index 135f2ce..ba737a5 100644
 --- a/configure.ac

Signature · 1 line

1.7.2

Dexuan Cui

author

2011-05-11 06:29 UTC #23 lore raw

PATCH 23/24 libxklavier: update its patch's Upstream-Status

In reply to Dexuan Cui

From: Dexuan Cui <[email protected]>

Signed-off-by Dexuan Cui <[email protected]>

---
 .../libxklavier/libxklavier/pkgconfigfix.patch     |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

meta-demoapps/recipes-graphics/libxklavier/libxklavier/pkgconfigfix.patch +2 -0

index 4aaafb2..f58f30b 100644
@@ -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

Signature · 1 line

1.7.2

Dexuan Cui

author

2011-05-11 06:29 UTC #24 lore raw

PATCH 24/24 liblbxutil: update its patch's Upstream-Status

In reply to Dexuan Cui

From: Dexuan Cui <[email protected]>

Signed-off-by Dexuan Cui <[email protected]>

---
 .../xorg-lib/liblbxutil/mkg3states.patch           |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

meta-demoapps/recipes-graphics/xorg-lib/liblbxutil/mkg3states.patch +2 -0

index 029d761..63c1847 100644
@@ -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.

Signature · 1 line

1.7.2

Saul Wold

Applied

2011-05-13 22:26 UTC #25 lore raw

In reply to Dexuan Cui

Quoted 103 lines · Dexuan Cui

From: Dexuan Cui<[email protected]>
Hi Saul,
These commits update the Upstream-Status field.
For "Inappropriate", I added the reason "configuration" or a specific reason.
Some are "Pending": I will further update them later.
I also removed some patches since they're not used at all now.
Please help to review and pull.
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: dcui/distro
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dcui/distro
Thanks,
Dexuan Cui<[email protected]>
---
Dexuan Cui (24):
tcf-agent: update its patch's Upstream-Status
screen: update its patch's Upstream-Status
which (GPLv2): update its patch's Upstream-Status
gnome-vfs: update its patch's Upstream-Status
libart-lgpl: update its patch's Upstream-Status
librsvg: update its patch's Upstream-Status
fontconfig: update its patch's Upstream-Status
freetype: update its patch's Upstream-Status
libxsettings-client: update its patch's Upstream-Status
libxcb: update its patch's Upstream-Status
libx11: update its patch's Upstream-Status
libx11-trim: update its patch's Upstream-Status
libxcalibrate: update its patch's Upstream-Status
libxcomposite: update its patch's Upstream-Status
libxfont: update its patch's Upstream-Status
xtrans: update its patch's Upstream-Status
calibrateproto: update its patch's Upstream-Status
latencytop: update its patch's Upstream-Status
oprofile: update its patch's Upstream-Status and remove an unused
patch
powertop: update its patch's Upstream-Status
settings-daemon: update its patch's Upstream-Status
gnome-settings-daemon: update its patch's Upstream-Status
libxklavier: update its patch's Upstream-Status
liblbxutil: update its patch's Upstream-Status
  .../gnome/gnome-settings-daemon/configurefix.patch |    2 +
  .../gnome-settings-daemon/desktop-moblin.patch     |    2 +
  ...-settings-daemon-2.24.0-catch-deviceadded.patch |    2 +
  .../gnome-settings-daemon-fix-gthread.patch        |    2 +
  .../gnome-settings-daemon/mojito-cleanup.patch     |    2 +
  .../gnome/gnome-settings-daemon/mount-plugin.patch |    2 +
  .../libxklavier/libxklavier/pkgconfigfix.patch     |    2 +
  .../xorg-lib/liblbxutil/mkg3states.patch           |    2 +
  .../tcf-agent/tcf-agent/fix_tcf-agent.init.patch   |    2 +
  .../tcf-agent/tcf-agent/terminals_agent.patch      |    2 +
  .../screen/screen-4.0.3/configure.patch            |    2 +
  .../fix_name_conflict_group_member.patch           |    2 +
  .../gnome/gnome-vfs-2.24.4/gconftool-lossage.patch |    2 +
  .../gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch   |    2 +
  .../gnome/libart-lgpl/Makefile.am.patch            |    2 +
  .../librsvg/librsvg-2.32.1/doc_Makefile.patch      |    2 +
  .../fontconfig-2.8.0/fix-pkgconfig.patch           |    2 +
  .../freetype/freetype-2.4.4/no-hardcode.patch      |    2 +
  .../libxsettings-client/disable_Os_option.patch    |    2 +
  .../libxsettings-client/link-x11.patch             |    2 +
  .../xcb/libxcb/xcbincludedir.patch                 |    2 +
  .../xorg-lib/libx11-1.3.4/include_fix.patch        |    2 +
  .../xorg-lib/libx11-1.3.4/nodolt.patch             |    2 +
  .../libx11-1.3.4/x11_disable_makekeys.patch        |    2 +
  .../xorg-lib/libx11-git/X18NCMSstubs.diff          |    2 +
  .../xorg-lib/libx11-git/fix-disable-xlocale.diff   |    2 +
  .../libx11-git/fix-utf8-wrong-define.patch         |    1 +
  .../xorg-lib/libx11-git/include_fix.patch          |    2 +
  .../xorg-lib/libx11-git/nodolt.patch               |    2 +
  .../xorg-lib/libx11-git/x11_disable_makekeys.patch |    2 +
  .../recipes-graphics/xorg-lib/libx11-git/xim.patch |   55 -----
  .../xorg-lib/libx11-trim/include_fix.patch         |    2 +
  .../xorg-lib/libx11-trim/nodolt.patch              |    2 +
  .../libx11-trim/x11_disable_makekeys.patch         |    2 +
  .../xorg-lib/libx11/X18NCMSstubs.diff              |    2 +
  .../xorg-lib/libx11/fix-disable-xlocale.diff       |    2 +
  .../xorg-lib/libx11/fix-utf8-wrong-define.patch    |    1 +
  .../xorg-lib/libx11/include_fix.patch              |    2 +
  meta/recipes-graphics/xorg-lib/libx11/nodolt.patch |    2 +
  .../xorg-lib/libx11/x11_disable_makekeys.patch     |    2 +
  meta/recipes-graphics/xorg-lib/libx11/xim.patch    |   55 -----
  .../xorg-lib/libxcalibrate/fix-xcb.patch           |    2 +
  .../libxcomposite/change-include-order.patch       |    2 +
  .../xorg-lib/libxfont/no-scalable-crash.patch      |    2 +
  .../xorg-lib/xtrans/abstract_socket_fix.patch      |   58 -----
  .../xorg-proto/calibrateproto/fix.patch            |    2 +
  .../latencytop-0.5/latencytop-makefile.patch       |    2 +
  .../recipes-kernel/oprofile/oprofile/opstart.patch |    2 +
  .../oprofile/oprofile/xml_callgraph_details.patch  |  232 --------------------
  .../stub_out_the_ncurses_calls_in_dump_mode.patch  |    2 +
  .../settings-daemon/files/addsoundkeys.patch       |    2 +
  .../files/dso_linking_change_build_fix.patch       |    2 +
  52 files changed, 94 insertions(+), 400 deletions(-)

Quoted 5 lines

delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-git/xim.patch delete mode 100644 meta/recipes-graphics/xorg-lib/libx11/xim.patch delete mode 100644 meta/recipes-graphics/xorg-lib/xtrans/abstract_socket_fix.patch delete mode 100644 meta/recipes-kernel/oprofile/oprofile/xml_callgraph_details.patch

Merged, thanks for the great work with these!

Sau!