1 |
tomjbe 10/07/03 12:11:49 |
2 |
|
3 |
Modified: xdx-2.4.ebuild ChangeLog xdx-2.4.2.ebuild |
4 |
Log: |
5 |
Fix for deprecated macro in GTK+-2.20 and later (bug #326627). Thanks Diego and Kevin. |
6 |
(Portage version: 2.1.8.3/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.5 media-radio/xdx/xdx-2.4.ebuild |
10 |
|
11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-radio/xdx/xdx-2.4.ebuild?rev=1.5&view=markup |
12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-radio/xdx/xdx-2.4.ebuild?rev=1.5&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-radio/xdx/xdx-2.4.ebuild?r1=1.4&r2=1.5 |
14 |
|
15 |
Index: xdx-2.4.ebuild |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/media-radio/xdx/xdx-2.4.ebuild,v |
18 |
retrieving revision 1.4 |
19 |
retrieving revision 1.5 |
20 |
diff -u -r1.4 -r1.5 |
21 |
--- xdx-2.4.ebuild 2 Dec 2008 15:26:05 -0000 1.4 |
22 |
+++ xdx-2.4.ebuild 3 Jul 2010 12:11:48 -0000 1.5 |
23 |
@@ -1,12 +1,12 @@ |
24 |
-# Copyright 1999-2008 Gentoo Foundation |
25 |
+# Copyright 1999-2010 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/media-radio/xdx/xdx-2.4.ebuild,v 1.4 2008/12/02 15:26:05 darkside Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/media-radio/xdx/xdx-2.4.ebuild,v 1.5 2010/07/03 12:11:48 tomjbe Exp $ |
29 |
|
30 |
inherit eutils |
31 |
|
32 |
DESCRIPTION="a GTK+ TCP/IP DX-cluster and ON4KST chat client." |
33 |
-HOMEPAGE="http://www.qsl.net/pg4i/linux/xdx.html" |
34 |
-SRC_URI="http://www.qsl.net/pg4i/download/${P}.tar.gz" |
35 |
+HOMEPAGE="http://www.ibiblio.org/pub/linux/apps/ham" |
36 |
+SRC_URI="http://www.ibiblio.org/pub/linux/apps/ham/${P}.tar.gz" |
37 |
|
38 |
LICENSE="GPL-2" |
39 |
SLOT="0" |
40 |
@@ -23,6 +23,10 @@ |
41 |
cd "${S}" |
42 |
# fix for deprecated macro in GTK+-2.14 and later |
43 |
epatch "${FILESDIR}"/xdx-2.4-gtk.patch |
44 |
+ # fix for bug #326627 - deprecated macro in gtk+ from 2.20 on |
45 |
+ if has_version ">=x11-libs/gtk+-2.20" ; then |
46 |
+ epatch "${FILESDIR}"/${PN}-gtk-2.20.patch |
47 |
+ fi |
48 |
} |
49 |
|
50 |
src_compile() { |
51 |
@@ -32,7 +36,7 @@ |
52 |
|
53 |
src_install() { |
54 |
emake DESTDIR="${D}" install || die "emake install failed." |
55 |
- dodoc AUTHORS ChangeLog NEWS README TODO |
56 |
+ dodoc AUTHORS ChangeLog NEWS README TODO || die |
57 |
} |
58 |
|
59 |
pkg_postinst() { |
60 |
|
61 |
|
62 |
|
63 |
1.18 media-radio/xdx/ChangeLog |
64 |
|
65 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-radio/xdx/ChangeLog?rev=1.18&view=markup |
66 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-radio/xdx/ChangeLog?rev=1.18&content-type=text/plain |
67 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-radio/xdx/ChangeLog?r1=1.17&r2=1.18 |
68 |
|
69 |
Index: ChangeLog |
70 |
=================================================================== |
71 |
RCS file: /var/cvsroot/gentoo-x86/media-radio/xdx/ChangeLog,v |
72 |
retrieving revision 1.17 |
73 |
retrieving revision 1.18 |
74 |
diff -u -r1.17 -r1.18 |
75 |
--- ChangeLog 30 Apr 2010 20:33:41 -0000 1.17 |
76 |
+++ ChangeLog 3 Jul 2010 12:11:48 -0000 1.18 |
77 |
@@ -1,6 +1,11 @@ |
78 |
# ChangeLog for media-radio/xdx |
79 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
80 |
-# $Header: /var/cvsroot/gentoo-x86/media-radio/xdx/ChangeLog,v 1.17 2010/04/30 20:33:41 tomjbe Exp $ |
81 |
+# $Header: /var/cvsroot/gentoo-x86/media-radio/xdx/ChangeLog,v 1.18 2010/07/03 12:11:48 tomjbe Exp $ |
82 |
+ |
83 |
+ 03 Jul 2010; Thomas Beierlein <tomjbe@g.o> xdx-2.4.ebuild, |
84 |
+ xdx-2.4.2.ebuild, +files/xdx-gtk-2.20.patch: |
85 |
+ Fix for deprecated macro in GTK+-2.20 and later (bug #326627). Thanks |
86 |
+ Diego and Kevin. |
87 |
|
88 |
*xdx-2.4.2 (30 Apr 2010) |
89 |
|
90 |
|
91 |
|
92 |
|
93 |
1.2 media-radio/xdx/xdx-2.4.2.ebuild |
94 |
|
95 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-radio/xdx/xdx-2.4.2.ebuild?rev=1.2&view=markup |
96 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-radio/xdx/xdx-2.4.2.ebuild?rev=1.2&content-type=text/plain |
97 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-radio/xdx/xdx-2.4.2.ebuild?r1=1.1&r2=1.2 |
98 |
|
99 |
Index: xdx-2.4.2.ebuild |
100 |
=================================================================== |
101 |
RCS file: /var/cvsroot/gentoo-x86/media-radio/xdx/xdx-2.4.2.ebuild,v |
102 |
retrieving revision 1.1 |
103 |
retrieving revision 1.2 |
104 |
diff -u -r1.1 -r1.2 |
105 |
--- xdx-2.4.2.ebuild 30 Apr 2010 20:33:41 -0000 1.1 |
106 |
+++ xdx-2.4.2.ebuild 3 Jul 2010 12:11:48 -0000 1.2 |
107 |
@@ -1,6 +1,10 @@ |
108 |
# Copyright 1999-2010 Gentoo Foundation |
109 |
# Distributed under the terms of the GNU General Public License v2 |
110 |
-# $Header: /var/cvsroot/gentoo-x86/media-radio/xdx/xdx-2.4.2.ebuild,v 1.1 2010/04/30 20:33:41 tomjbe Exp $ |
111 |
+# $Header: /var/cvsroot/gentoo-x86/media-radio/xdx/xdx-2.4.2.ebuild,v 1.2 2010/07/03 12:11:48 tomjbe Exp $ |
112 |
+ |
113 |
+EAPI="2" |
114 |
+ |
115 |
+inherit eutils |
116 |
|
117 |
DESCRIPTION="a GTK+ TCP/IP DX-cluster and ON4KST chat client." |
118 |
HOMEPAGE="http://www.ibiblio.org/pub/linux/apps/ham" |
119 |
@@ -16,9 +20,15 @@ |
120 |
dev-util/pkgconfig |
121 |
nls? ( sys-devel/gettext )" |
122 |
|
123 |
-src_compile() { |
124 |
+src_prepare() { |
125 |
+ # fix for bug #326627 - deprecated macro in gtk+ from 2.20 on |
126 |
+ if has_version ">=x11-libs/gtk+-2.20" ; then |
127 |
+ epatch "${FILESDIR}"/${PN}-gtk-2.20.patch |
128 |
+ fi |
129 |
+} |
130 |
+ |
131 |
+src_configure() { |
132 |
econf $(use_enable nls) |
133 |
- emake || die "emake failed." |
134 |
} |
135 |
|
136 |
src_install() { |