Fix implicit declaration of function make_session_data_file wrt #308649.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/x11-wm/afterstep/ChangeLog b/x11-wm/afterstep/ChangeLog
index 3cc5547dd24bf6d6c5ca94bfaa8303c23e3e6c4d..5fe1794f232beaf7d41e00a441fa47787f1e6adc 100644 (file)
--- a/x11-wm/afterstep/ChangeLog
+++ b/x11-wm/afterstep/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/afterstep
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/ChangeLog,v 1.89 2010/06/22 14:36:26 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/ChangeLog,v 1.90 2010/06/22 16:10:08 ssuominen Exp $
+
+  22 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
+  afterstep-2.2.9.ebuild,
+  +files/afterstep-2.2.9-make_session_data_file.patch:
+  Fix implicit declaration of function make_session_data_file wrt #308649.
 
   22 Jun 2010; Jeroen Roovers <jer@gentoo.org> afterstep-2.2.9.ebuild:
   Stable for HPPA (bug #306107).

diff --git a/x11-wm/afterstep/Manifest b/x11-wm/afterstep/Manifest
index ef11840bb5a6b2d769736a316a350018e497d6d9..80b121e446eb0aa27338aa99d4a918d34975ee82 100644 (file)
--- a/x11-wm/afterstep/Manifest
+++ b/x11-wm/afterstep/Manifest
@@ -1,9 +1,10 @@
 AUX afterstep 29 RMD160 a1fafb8971d47c7cebfe972bb74bbef19de4ac52 SHA1 7ce7a198aef7adb7484981fed4b84798311f5409 SHA256 c6e31f7e4912188f1ce7c41298cb66178944960628e1451efd42331236cbc3c5
+AUX afterstep-2.2.9-make_session_data_file.patch 422 RMD160 b4e694ac6514d34dfbee5f6fe15ffa109e5bfbad SHA1 932abcf0c2fb469e45e95035244d97df40c8dfe1 SHA256 3fa0e494903d374db0da66de432e407889356cd50d1072aa4078516f5d31b5a3
 AUX no-alternatives-2.2.9.patch 1214 RMD160 c6a02643da9c82c5228800a399ffd6ce89c0b542 SHA1 140e5d5d011df340ece7f36a88c7f49540786a89 SHA256 f7a87859d043b210dd309128c9338e938f695cf248d2987ae2b8535243405e4f
 AUX no-alternatives.patch 1178 RMD160 de3efea2502d9f8f8dbe403a4cc5c2e796017afd SHA1 11e79670530f8c9846adbe2a4fbe2cfc53a9688e SHA256 c3849ba4cd53fa1de52ab3b743b194b005754577dbe661ad7ee23a4b3eef36fc
 DIST AfterStep-2.2.4.tar.bz2 5707951 RMD160 74ab7c74afce8d5d669a1520a3c02f04882e05b9 SHA1 592da988696a0745c4bef240e49274b3915ee277 SHA256 e1787184faaee583435730666ef3dd1c221ced493ccd9ba0a06f94ac5e5b05ec
 DIST AfterStep-2.2.9.tar.bz2 6094706 RMD160 b332078efa50abde522438c825fca91f31c4d554 SHA1 dfd7dd912866316e93c3be7a8460d34b95cd54a2 SHA256 678493cd3ec44eee219d65fee0e612f2d1e36f8b93cbabdf40a22133c0617148
 EBUILD afterstep-2.2.4.ebuild 3694 RMD160 75c6e61d8ea1c4ab1433f2c23f3a46f307c29952 SHA1 3ac1affaea4e59d03e5467698f391f14c3bb5f25 SHA256 4a5417a12984e0af4068c8d2e518fbced473acbe242f9008df7f038ce66789e4
-EBUILD afterstep-2.2.9.ebuild 3490 RMD160 24e463ae84a52b5ce9c112086a2cc564e4b64346 SHA1 009b76dce892e324b5660cc7d8df1b3e521f50c7 SHA256 1fbeb30d47f9dd60622ac1873e6b64db6ed247df14b42f21341023226c0e13f6
-MISC ChangeLog 12749 RMD160 0a17867373dc42a600e696dd9fa301a3d8f7453f SHA1 2e8c7972318825aec323e79d169b3bac80fa8b82 SHA256 7c823e60c50f0c75f07199188db13c40463c0b18c688ce44fd23acd545bb0bf3
+EBUILD afterstep-2.2.9.ebuild 3548 RMD160 c2a12a450b189dab6956a061d4ba9df8a24bbf16 SHA1 d4d5188d283a4fe98b662d00bd14db80581b6a6e SHA256 63a01099c11d4f40bd68dbe5b539355f0bd54cefbad0b51f5dd5e004d3718510
+MISC ChangeLog 12966 RMD160 0db8e9e325e2b94830bf329e29f272765f9275b2 SHA1 bf55350302e239ea267db06ef38175b092bb3e59 SHA256 2b346805f717a8e9724949566e9e233f5848c8fb26ed6392a8ee6d663083e7ea
 MISC metadata.xml 350 RMD160 8a78f43601183735a3e88e99953e83fa319a2c9c SHA1 a0887e36150abf9d32d108bd1339880ca2a21449 SHA256 ffc449f67b60b79df064e7843b19ce9c16ab0ccc495de3b9cd9b1a38bf6b0c26

diff --git a/x11-wm/afterstep/afterstep-2.2.9.ebuild b/x11-wm/afterstep/afterstep-2.2.9.ebuild
index b27c5920ad0b0b06bc58c025ba50060a174e1890..e63cee02f355b673c484119a628903abf7487632 100644 (file)
--- a/x11-wm/afterstep/afterstep-2.2.9.ebuild
+++ b/x11-wm/afterstep/afterstep-2.2.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.2.9.ebuild,v 1.8 2010/06/22 14:36:26 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.2.9.ebuild,v 1.9 2010/06/22 16:10:08 ssuominen Exp $
 
 EAPI=2
 inherit autotools flag-o-matic eutils
@@ -43,7 +43,8 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/AfterStep-${PV}
 
 src_prepare() {
-       epatch "${FILESDIR}"/no-alternatives-${PV}.patch
+       epatch "${FILESDIR}"/no-alternatives-${PV}.patch \
+               "${FILESDIR}"/${P}-make_session_data_file.patch
 
        # Do not strip binaries, bug #252119
        sed -e "/STRIP_BINARIES/s/-s//" \

diff --git a/x11-wm/afterstep/files/afterstep-2.2.9-make_session_data_file.patch b/x11-wm/afterstep/files/afterstep-2.2.9-make_session_data_file.patch
new file mode 100644 (file)
index 0000000..2c2f8bf
--- /dev/null
+++ b/x11-wm/afterstep/files/afterstep-2.2.9-make_session_data_file.patch
@@ -0,0 +1,14 @@
+http://bugs.gentoo.org/308649
+
+asgtklookedit.c:658:3: warning: implicit declaration of function ‘make_session_data_file’
+
+--- libASGTK/asgtklookedit.c
++++ libASGTK/asgtklookedit.c
+@@ -28,6 +28,7 @@
+ #include "../libAfterStep/parser.h"
+ #include "../libAfterStep/freestor.h"
+ #include "../libAfterStep/mystyle.h"
++#include "../libAfterStep/session.h"
+ #include "../libAfterConf/afterconf.h"
+ 
+ #include <unistd.h>