Fixed gcc3.4 compile-time error. Closes #67255.
authorAndrej Kacian <ticho@gentoo.org>
Tue, 12 Oct 2004 19:42:04 +0000 (19:42 +0000)
committerAndrej Kacian <ticho@gentoo.org>
Tue, 12 Oct 2004 19:42:04 +0000 (19:42 +0000)
net-im/silc-plugin/ChangeLog
net-im/silc-plugin/Manifest
net-im/silc-plugin/files/1.0.1-gcc34.patch [new file with mode: 0644]
net-im/silc-plugin/silc-plugin-1.0.1.ebuild

index 01838c2792a25a369d0f1a52b90f15a98afc5117..72451c26c1b13733fc8051b23df72492f0f1ae49 100644 (file)
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/silc-plugin
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-plugin/ChangeLog,v 1.6 2004/09/04 23:15:40 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-plugin/ChangeLog,v 1.7 2004/10/12 19:42:04 ticho Exp $
+
+  12 Oct 2004; Andrej Kacian <ticho@gentoo.org> +files/1.0.1-gcc34.patch,
+  silc-plugin-1.0.1.ebuild:
+  Fix compile-time error with gcc3.4. Closes #67255, reported by viq
+  <viq@go2.pl>. Thanks to c0ffee for providing the fix promptly.
 
   05 Sep 2004; David Holm <dholm@gentoo.org> silc-plugin-1.0.1.ebuild:
   Added to ~ppc.
index de023fd0e21b819b3a4993a494bc6ea9e768e2f7..af4653968fac48f5d2a073736086238e583070a5 100644 (file)
@@ -1,4 +1,15 @@
-MD5 0365731137fb3b86c331ff6b97f55039 ChangeLog 859
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f6d26cfbae99200b2df227d077fa41be silc-plugin-1.0.1.ebuild 2965
+MD5 e1e0712204dc60aad98100bcb96378ec ChangeLog 1096
 MD5 3d21d1bc81cfd81bfd0b0b3b2123b71c metadata.xml 271
-MD5 54a6b97f19ca72b71565fd93f4da175b silc-plugin-1.0.1.ebuild 2807
 MD5 ce1069db2e4cfc5c0b0d4b988c6c053c files/digest-silc-plugin-1.0.1 202
+MD5 1acb3335a10232ac14f179305e20477f files/1.0.1-gcc34.patch 471
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBbDOW10xuJSrg3/sRAtVbAJ0RVxWx+RCg9DPYJQ82HaMlU3xsnwCfZ8ee
+4LeRD7+6cRswvS4c0x9NZS0=
+=iJYN
+-----END PGP SIGNATURE-----
diff --git a/net-im/silc-plugin/files/1.0.1-gcc34.patch b/net-im/silc-plugin/files/1.0.1-gcc34.patch
new file mode 100644 (file)
index 0000000..3ddf0f6
--- /dev/null
@@ -0,0 +1,21 @@
+--- src/silc/core/silc-core.c  2004-10-12 21:11:54.000000000 +0200
++++ src2/silc/core/silc-core.c 2004-10-12 21:09:08.000000000 +0200
+@@ -54,8 +54,7 @@
+ void silc_lag_init(void);
+ void silc_lag_deinit(void);
+ 
+-void silc_lag_init(void);
+-void silc_lag_deinit(void);
++void silc_core_deinit(void);
+ 
+ static int my_silc_scheduler(void)
+ {
+@@ -548,7 +547,7 @@
+   }
+ 
+   module_register("silc", "core");
+-fail:
++fail: ;
+ }
+ 
+ /* Deinit SILC. Called from src/fe-text/silc.c */
index 34e694a674fcef08aa6a485c4acf2560e0c0213c..446f6a91c41d361f879ccbad3f3ef635d95811ca 100644 (file)
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-plugin/silc-plugin-1.0.1.ebuild,v 1.6 2004/09/04 23:15:40 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-plugin/silc-plugin-1.0.1.ebuild,v 1.7 2004/10/12 19:42:04 ticho Exp $
+
+inherit eutils
 
 IRSSI_PV=0.8.9
 
@@ -39,9 +41,13 @@ src_compile() {
        cd ${S}
        emake patch IRSSI=${S_IRSSI} SILC=${S_SILC} || die "patching irssi sources failed"
 
+       cd ${S_IRSSI}
+
+       # this tiny patch fixes a compile-time error (bug #67255)  - ticho
+       epatch ${FILESDIR}/${PV}-gcc34.patch || die "${PV}-gcc34.patch failed"
+
        echo
        einfo "Configuring irssi\n"
-       cd ${S_IRSSI}
        econf --sysconfdir=/etc || die "irssi configure failed"
        echo
        einfo "Compiling silc-plugin\n"