Fix building with linux-2.6.19 #156799 by Vlastimil Babka (Caster).

Package-Manager: portage-2.1.2_rc2-r3

diff --git a/media-libs/svgalib/ChangeLog b/media-libs/svgalib/ChangeLog
index f77308a8180c7b1a39b5c0b36088ea401b75738a..8f40d6f815aea6374bf9a46d2b50b403f30d31e2 100644 (file)
--- a/media-libs/svgalib/ChangeLog
+++ b/media-libs/svgalib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/svgalib
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.73 2006/09/29 23:27:10 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.74 2006/12/03 07:08:57 vapier Exp $
+
+  03 Dec 2006; Mike Frysinger <vapier@gentoo.org>
+  files/svgalib-1.9.25-linux2.6.patch:
+  Fix building with linux-2.6.19 #156799 by Vlastimil Babka (Caster).
 
   29 Sep 2006; <ticho@gentoo.org> svgalib-1.9.25.ebuild:
   Stable on x86, bug #148758.

diff --git a/media-libs/svgalib/Manifest b/media-libs/svgalib/Manifest
index 5751027dddf2073160f7e845d6e3742335ef26a7..0091ceda0076e41f21223797ba6979b2316ff758 100644 (file)
--- a/media-libs/svgalib/Manifest
+++ b/media-libs/svgalib/Manifest
@@ -29,10 +29,10 @@ AUX svgalib-1.9.25-gentoo.patch 1298 RMD160 a3a19dda08ea60a7b410ee6dd2cffea667e3
 MD5 b6162183ce7332f19e01ff9195d4d79b files/svgalib-1.9.25-gentoo.patch 1298
 RMD160 a3a19dda08ea60a7b410ee6dd2cffea667e355d7 files/svgalib-1.9.25-gentoo.patch 1298
 SHA256 eaea5e2cd0e808279070c067f2d88a64fce5a5904bc7cdf36678f45876e27fb5 files/svgalib-1.9.25-gentoo.patch 1298
-AUX svgalib-1.9.25-linux2.6.patch 3218 RMD160 a1e91095d2b695add3b24df63dfd6f5792d098ff SHA1 a38b3828a594550b2d8bd6ebeaff6e3d4db4e4d8 SHA256 888ecf49b2a5568a92998f0ca8277a9b89c735e036d2c652503f01dc12ceab2b
-MD5 459d817eb27be02a3634fed13af8b793 files/svgalib-1.9.25-linux2.6.patch 3218
-RMD160 a1e91095d2b695add3b24df63dfd6f5792d098ff files/svgalib-1.9.25-linux2.6.patch 3218
-SHA256 888ecf49b2a5568a92998f0ca8277a9b89c735e036d2c652503f01dc12ceab2b files/svgalib-1.9.25-linux2.6.patch 3218
+AUX svgalib-1.9.25-linux2.6.patch 3421 RMD160 b759e0b7e5bfa3a6491036a404305874b188a0ed SHA1 357453de37c4978e2eba9bdbfd0a1476e7e53cdd SHA256 fdb4373d418e42ba2ab3102cf4364c019350ad1152b51d2f965990e9433e3dac
+MD5 b96b10e69f74e0cf41f53f87123ccd42 files/svgalib-1.9.25-linux2.6.patch 3421
+RMD160 b759e0b7e5bfa3a6491036a404305874b188a0ed files/svgalib-1.9.25-linux2.6.patch 3421
+SHA256 fdb4373d418e42ba2ab3102cf4364c019350ad1152b51d2f965990e9433e3dac files/svgalib-1.9.25-linux2.6.patch 3421
 AUX svgalib.devfs 219 RMD160 921df16f9e771fcdb75ab9e6f44e4840ff72fd4b SHA1 c587ce84dff7f0e8f222660c004256b3b867d00a SHA256 3aa888f06d84d3ad49b9714986e43cad845082a1b2f6e06baa4637967920414a
 MD5 d137b721449f3fe88d6ec08a3cf6c51a files/svgalib.devfs 219
 RMD160 921df16f9e771fcdb75ab9e6f44e4840ff72fd4b files/svgalib.devfs 219
@@ -55,10 +55,10 @@ EBUILD svgalib-1.9.25.ebuild 4363 RMD160 c3394be94bc1c2b056f783c0713eaa53746344f
 MD5 a9ae8e34df92dac81a4c93f475796b2d svgalib-1.9.25.ebuild 4363
 RMD160 c3394be94bc1c2b056f783c0713eaa53746344f5 svgalib-1.9.25.ebuild 4363
 SHA256 a84c44cf59259b798788b1203e45bfc1300f6274e2f0505eaa228665034248b6 svgalib-1.9.25.ebuild 4363
-MISC ChangeLog 12899 RMD160 1ac00137c2d8f27a9719a9de1b70db1093fa6e6d SHA1 97a884db239631664887f5c5820469c9b8174fb6 SHA256 de1513b88f22c58ab510b8715488c75e9c96134fcc4d417b5a8d08a0df4426d7
-MD5 ce2f1b5ea23b310403b18ccc9ccf6e07 ChangeLog 12899
-RMD160 1ac00137c2d8f27a9719a9de1b70db1093fa6e6d ChangeLog 12899
-SHA256 de1513b88f22c58ab510b8715488c75e9c96134fcc4d417b5a8d08a0df4426d7 ChangeLog 12899
+MISC ChangeLog 13060 RMD160 77cd339e7c518c09dc1b3a161346e08b30633e33 SHA1 9ef5ff18bdcdc89a7ca5bb51de11371501403df2 SHA256 e0b0920b9ec09bf36bb78b0ef799db49653db86a7f32a631cd3f3e9d53d8da31
+MD5 c89694207f5c1d6a10930e437b804f4f ChangeLog 13060
+RMD160 77cd339e7c518c09dc1b3a161346e08b30633e33 ChangeLog 13060
+SHA256 e0b0920b9ec09bf36bb78b0ef799db49653db86a7f32a631cd3f3e9d53d8da31 ChangeLog 13060
 MISC metadata.xml 303 RMD160 1bc9684eb1b1f3b3c360df61b39b143ce2090916 SHA1 c273b6ce5b51e9d5690e54ae84982d9c2cf617d2 SHA256 08bfae407186f5088cd2b118396e784d8eaf7ab82ecc162cf8a73ff9cabcf717
 MD5 69845288d94413820ea3441dc9e60b24 metadata.xml 303
 RMD160 1bc9684eb1b1f3b3c360df61b39b143ce2090916 metadata.xml 303
@@ -72,7 +72,7 @@ SHA256 ddcc343b075e1ebcbceb0952eaa273fb40fd3a0bc00bb00b7d64e1c500a6cac4 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFHavV10xuJSrg3/sRAnAEAJ9/95ZTb2v96u1CwuINccBbe4nd9wCfQfFz
-sRbdK+XAHBT8wVex3sksSfI=
-=naci
+iD8DBQFFcngSamhnQswr0vIRArOUAJ9GPqDD2KWy0gT/KCnRxcEGlo1U9gCfaCAW
+CeGjQiQoXfop1Ka2iJVfyFE=
+=Dkc7
 -----END PGP SIGNATURE-----

diff --git a/media-libs/svgalib/files/svgalib-1.9.25-linux2.6.patch b/media-libs/svgalib/files/svgalib-1.9.25-linux2.6.patch
index 926698e7255616cfa8642d6a9437b0faa347094a..01bcaf856ca450707a158f5c6175a7ce7471f513 100644 (file)
--- a/media-libs/svgalib/files/svgalib-1.9.25-linux2.6.patch
+++ b/media-libs/svgalib/files/svgalib-1.9.25-linux2.6.patch
@@ -4,6 +4,7 @@
        - dont include headers that dont exist in 2.4.x kernels
        - use module_param() for 2.6.x and MODULE_PARM() for all others
        - dont declare all_devices as static since it is exported
+       - dont include <linux/config.h> as the build system does it for us
 
 --- svgalib/kernel/svgalib_helper/Makefile
 +++ svgalib/kernel/svgalib_helper/Makefile
@@ -61,6 +62,12 @@
  # else
 --- svgalib/kernel/svgalib_helper/main.c
 +++ svgalib/kernel/svgalib_helper/main.c
+@@ -1,5 +1,3 @@
+-#include <linux/config.h>
+-
+ #if defined (CONFIG_MODVERSIONS) && !defined (MODVERSIONS)
+ # define MODVERSIONS
+ #endif
 @@ -19,15 +19,22 @@
  #include <linux/ioport.h>
  #include <linux/interrupt.h>