[PATCH 1/4] xf86-input-elographics: add 1.2.3

[PATCH 1/4] xf86-input-elographics: add 1.2.3

[Michael Smith]

Fixes build with xserver-xorg 1.6.1.

Signed-off-by: Michael Smith <msmith@cbnco.com>
---
 conf/checksums.ini                                 |    4 ++++
 ...cs_1.1.0.bb => xf86-input-elographics_1.2.3.bb} |    0
 2 files changed, 4 insertions(+), 0 deletions(-)
 copy recipes/xorg-driver/{xf86-input-elographics_1.1.0.bb => xf86-input-elographics_1.2.3.bb} (100%)

diff --git a/conf/checksums.ini b/conf/checksums.ini
index a29274d..b9a2d85 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -25482,6 +25482,10 @@ sha256=1583e1dae6e3ecd34ba55deae7dfc052efede0378f852de6224308d7e7d5b2d8
 md5=50a9c32af12ca4733afe23042f012f9c
 sha256=76ded0e6977f7d562a8236bc810423cd050320531be9621d868a48309ebc4d63
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-elographics-1.2.3.tar.bz2]
+md5=cc2923460c8eff9652b01889a063058d
+sha256=67550c8f4a85a8029f08880adf487e2efd4585e7adbe8da357fbd49750b08d8f
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-elographics-X11R7.0-1.0.0.5.tar.bz2]
 md5=24c33f833bb2db72a07c3d28bfc0aae9
 sha256=f1b7f84175d33f4d18c83cd0d37bd3962acd668922fa074a8ae29e18517cdda7
diff --git a/recipes/xorg-driver/xf86-input-elographics_1.1.0.bb b/recipes/xorg-driver/xf86-input-elographics_1.2.3.bb
similarity index 100%
copy from recipes/xorg-driver/xf86-input-elographics_1.1.0.bb
copy to recipes/xorg-driver/xf86-input-elographics_1.2.3.bb
-- 
1.6.3

[PATCH 2/4] xf86-video-vesa: add 2.2.0

[Michael Smith]

Fixes build with xserver-xorg 1.6.1.

Signed-off-by: Michael Smith <msmith@cbnco.com>
---
 conf/checksums.ini                                 |    4 ++++
 ...ideo-vesa_2.0.0.bb => xf86-video-vesa_2.2.0.bb} |    0
 2 files changed, 4 insertions(+), 0 deletions(-)
 copy recipes/xorg-driver/{xf86-video-vesa_2.0.0.bb => xf86-video-vesa_2.2.0.bb} (100%)

diff --git a/conf/checksums.ini b/conf/checksums.ini
index b9a2d85..23d36e2 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -26562,6 +26562,10 @@ sha256=b96c80ae81f5123ecef344dac4c734b2e281143d3ab7a7e633d6bf04c893e203
 md5=433cf6f961eb4a2ab6fcb086def0b2b4
 sha256=f20b2e429657552eea207fb8bc4b47c8e293d99c229dcb4da11b7c5bfdc1e165
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vesa-2.2.0.tar.bz2]
+md5=9a86b683f73f3806f55d05cd804a6f4a
+sha256=8b3e077d2534722033d7b1c647aa7f31fc7fbb5014da096b7a53170005e80226
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-vesa-X11R7.0-1.0.1.3.tar.bz2]
 md5=049ada4df1abb5aa2b6633ba90353e78
 sha256=c6601cd278ebc30a0d20b49b6284bc21b4910f8ef5d24d1c62daa1591a251452
diff --git a/recipes/xorg-driver/xf86-video-vesa_2.0.0.bb b/recipes/xorg-driver/xf86-video-vesa_2.2.0.bb
similarity index 100%
copy from recipes/xorg-driver/xf86-video-vesa_2.0.0.bb
copy to recipes/xorg-driver/xf86-video-vesa_2.2.0.bb
-- 
1.6.3

[PATCH 3/4] hicolor-icon-theme: don't inherit gnome

[Michael Smith]

inherit autotools instead, so the theme doesn't end up depending
on gconf and gnome-common.

Signed-off-by: Michael Smith <msmith@cbnco.com>
---
 .../hicolor-icon-theme/hicolor-icon-theme_0.10.bb  |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/recipes/hicolor-icon-theme/hicolor-icon-theme_0.10.bb b/recipes/hicolor-icon-theme/hicolor-icon-theme_0.10.bb
index a1cb41b..b09f8a9 100644
--- a/recipes/hicolor-icon-theme/hicolor-icon-theme_0.10.bb
+++ b/recipes/hicolor-icon-theme/hicolor-icon-theme_0.10.bb
@@ -1,6 +1,6 @@
 SECTION = "unknown"
 LICENSE = "GPL"
-inherit gnome
+inherit autotools
 
 SRC_URI = "http://icon-theme.freedesktop.org/releases/${P}.tar.gz"
 
-- 
1.6.3

[PATCH 4/4] xf86-video-intel: add 2.6.3

[Michael Smith]

Fixes build with xserver-xorg 1.6.1.

Signed-off-by: Michael Smith <msmith@cbnco.com>
---
 conf/checksums.ini                                 |    4 ++++
 ...deo-i810_1.7.4.bb => xf86-video-intel_2.6.3.bb} |    0
 2 files changed, 4 insertions(+), 0 deletions(-)
 copy recipes/xorg-driver/{xf86-video-i810_1.7.4.bb => xf86-video-intel_2.6.3.bb} (100%)

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 23d36e2..a14c64f 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -26134,6 +26134,10 @@ sha256=d976c5f5e9c84f3817aba6ad22855446f1c2b9bfa0d53bd11c37c62cfdefa60a
 md5=5cd6b3ed57c7e78ab51e9d9266e73fb6
 sha256=5afdc91e93ffed09ea5258c6fde210c729ea2b44d83f98acfd92c3da7e99e64b
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-2.6.3.tar.bz2]
+md5=440c014bbd3072b5d379fe1bdb861918
+sha256=b35a142aeba034ad06b8d9b477c243f82ce9f82ad65a0ee4408630f228e90258
+
 [http://xorg.freedesktop.org/releases/individual/driver/xf86-video-mach64-6.8.0.tar.bz2]
 md5=6081b8fa50c689d51f85c2fbaf93867e
 sha256=fba616f88d351759e00a90965e38a0d82608698ae36fc2a18df4036cd384e1a1
diff --git a/recipes/xorg-driver/xf86-video-i810_1.7.4.bb b/recipes/xorg-driver/xf86-video-intel_2.6.3.bb
similarity index 100%
copy from recipes/xorg-driver/xf86-video-i810_1.7.4.bb
copy to recipes/xorg-driver/xf86-video-intel_2.6.3.bb
-- 
1.6.3

Re: [PATCH 4/4] xf86-video-intel: add 2.6.3

[Phil Blundell]

On Fri, 2009-07-10 at 20:37 -0400, Michael Smith wrote:
>  conf/checksums.ini                                 |    4 ++++
>  ...deo-i810_1.7.4.bb => xf86-video-intel_2.6.3.bb} |    0
>  2 files changed, 4 insertions(+), 0 deletions(-)
>  copy recipes/xorg-driver/{xf86-video-i810_1.7.4.bb => xf86-video-intel_2.6.3.bb} (100%)

Thanks for the patch.  I checked this in.

p.

Re: [PATCH 3/4] hicolor-icon-theme: don't inherit gnome

[Koen Kooi]

On 11-07-09 02:37, Michael Smith wrote:
> inherit autotools instead, so the theme doesn't end up depending
> on gconf and gnome-common.

NAK, it's dragging gnome for gtk-icon-cache.bbclass to update the theme 
cache files, your change would break that.

regards,

Koen

Re: [PATCH 3/4] hicolor-icon-theme: don't inherit gnome

[Marcin Juszkiewicz]

Dnia sobota, 11 lipca 2009 o 09:05:34 Koen Kooi napisał(a):
> On 11-07-09 02:37, Michael Smith wrote:
> > inherit autotools instead, so the theme doesn't end up depending
> > on gconf and gnome-common.
>
> NAK, it's dragging gnome for gtk-icon-cache.bbclass to update the
> theme cache files, your change would break that.

So maybe it should inherit autotools and gtk-icon-cache?

Regards, 
-- 
JID:      hrw@jabber.org
Website:  http://marcin.juszkiewicz.com.pl/
LinkedIn: http://www.linkedin.com/in/marcinjuszkiewicz

Re: [PATCH 3/4] hicolor-icon-theme: don't inherit gnome

[Koen Kooi]

On 11-07-09 09:29, Marcin Juszkiewicz wrote:
> Dnia sobota, 11 lipca 2009 o 09:05:34 Koen Kooi napisał(a):
>> On 11-07-09 02:37, Michael Smith wrote:
>>> inherit autotools instead, so the theme doesn't end up depending
>>> on gconf and gnome-common.
>>
>> NAK, it's dragging gnome for gtk-icon-cache.bbclass to update the
>> theme cache files, your change would break that.
>
> So maybe it should inherit autotools and gtk-icon-cache?

exactly

Re: [PATCH 3/4] hicolor-icon-theme: don't inherit gnome

[Michael Smith]

On Sat, 11 Jul 2009, Koen Kooi wrote:

> On 11-07-09 02:37, Michael Smith wrote:
> > inherit autotools instead, so the theme doesn't end up depending
> > on gconf and gnome-common.
> 
> NAK, it's dragging gnome for gtk-icon-cache.bbclass to update the theme cache
> files, your change would break that.

OK, I'll inherit gtk-icon-cache.

I'm going to set RDEPENDS = "" to override the RDEPENDS = 
"hicolor-icon-theme" in gtk-icon-cache.bbclass. The package shouldn't 
depend on itself (although it hasn't hurt anything thus far).

I'm also setting RDEPENDS_${PN} = "" because I think the RDEPENDS in 
gtk-icon-cache should probably be RDEPENDS_${PN}, and maybe someone will 
fix it later :)

Mike

[PATCH v2] hicolor-icon-theme: don't inherit gnome

[Michael Smith]

inherit autotools and gtk-icon-cache instead, so the theme doesn't
depend on gconf.

Signed-off-by: Michael Smith <msmith@cbnco.com>
---
 .../hicolor-icon-theme/hicolor-icon-theme_0.10.bb  |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/recipes/hicolor-icon-theme/hicolor-icon-theme_0.10.bb b/recipes/hicolor-icon-theme/hicolor-icon-theme_0.10.bb
index a1cb41b..db13279 100644
--- a/recipes/hicolor-icon-theme/hicolor-icon-theme_0.10.bb
+++ b/recipes/hicolor-icon-theme/hicolor-icon-theme_0.10.bb
@@ -1,6 +1,10 @@
 SECTION = "unknown"
 LICENSE = "GPL"
-inherit gnome
+inherit autotools gtk-icon-cache
+
+# Override RDEPENDS = hicolor-icon-theme from gtk-icon-cache
+RDEPENDS = ""
+RDEPENDS_${PN} = ""
 
 SRC_URI = "http://icon-theme.freedesktop.org/releases/${P}.tar.gz"
 
-- 
1.6.3

Re: [PATCH 3/4] hicolor-icon-theme: don't inherit gnome

[Koen Kooi]

On 12-07-09 23:05, Michael Smith wrote:
> On Sat, 11 Jul 2009, Koen Kooi wrote:

> I'm also setting RDEPENDS_${PN} = "" because I think the RDEPENDS in
> gtk-icon-cache should probably be RDEPENDS_${PN},

it indeed should be RDEPENDS_${PN}

regards,

Koen

Re: [PATCH 2/4] xf86-video-vesa: add 2.2.0

[Phil Blundell]

On Fri, 2009-07-10 at 20:36 -0400, Michael Smith wrote:
>  conf/checksums.ini                                 |    4 ++++
>  ...ideo-vesa_2.0.0.bb => xf86-video-vesa_2.2.0.bb} |    0
>  2 files changed, 4 insertions(+), 0 deletions(-)
>  copy recipes/xorg-driver/{xf86-video-vesa_2.0.0.bb => xf86-video-vesa_2.2.0.bb} (100%)

Thanks, I checked this in.

p.

Re: [PATCH 1/4] xf86-input-elographics: add 1.2.3

[Phil Blundell]

On Fri, 2009-07-10 at 20:36 -0400, Michael Smith wrote:
> Fixes build with xserver-xorg 1.6.1.
> 
> Signed-off-by: Michael Smith <msmith@cbnco.com>
> ---
>  conf/checksums.ini                                 |    4 ++++
>  ...cs_1.1.0.bb => xf86-input-elographics_1.2.3.bb} |    0
>  2 files changed, 4 insertions(+), 0 deletions(-)
>  copy recipes/xorg-driver/{xf86-input-elographics_1.1.0.bb => xf86-input-elographics_1.2.3.bb} (100%)

Thanks, I checked this in.

p.