Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Mart Raudsepp (leio)" <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in gnome-extra/gtkhtml: gtkhtml-3.6.2.ebuild ChangeLog gtkhtml-3.2.5.ebuild gtkhtml-3.14.3-r1.ebuild gtkhtml-3.14.3.ebuild
Date: Mon, 17 Mar 2008 02:14:01
Message-Id: E1Jb4rO-0004cI-N9@stork.gentoo.org
1 leio 08/03/17 02:13:58
2
3 Modified: gtkhtml-3.6.2.ebuild ChangeLog gtkhtml-3.2.5.ebuild
4 gtkhtml-3.14.3-r1.ebuild gtkhtml-3.14.3.ebuild
5 Log:
6 Be compatible with newer glib and more future-proof in the old versions as well, bug 210657
7 (Portage version: 2.1.4.4)
8
9 Revision Changes Path
10 1.9 gnome-extra/gtkhtml/gtkhtml-3.6.2.ebuild
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.6.2.ebuild?rev=1.9&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.6.2.ebuild?rev=1.9&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.6.2.ebuild?r1=1.8&r2=1.9
15
16 Index: gtkhtml-3.6.2.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.6.2.ebuild,v
19 retrieving revision 1.8
20 retrieving revision 1.9
21 diff -u -r1.8 -r1.9
22 --- gtkhtml-3.6.2.ebuild 29 Jan 2008 18:13:06 -0000 1.8
23 +++ gtkhtml-3.6.2.ebuild 17 Mar 2008 02:13:58 -0000 1.9
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2008 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.6.2.ebuild,v 1.8 2008/01/29 18:13:06 dang Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.6.2.ebuild,v 1.9 2008/03/17 02:13:58 leio Exp $
29 EAPI="1"
30
31 inherit gnome2 eutils
32 @@ -42,4 +42,12 @@
33 cd "${S}"
34
35 epatch "${FILESDIR}/${P}-fbsd.patch"
36 +
37 + # Fix deprecated API disabling in used glib library - this is not future-proof, bug 210657
38 + sed -i -e '/G_DISABLE_DEPRECATED/d' \
39 + "${S}/src/Makefile.am" "${S}/src/Makefile.in" \
40 + "${S}/components/html-editor/Makefile.am" "${S}/components/html-editor/Makefile.in"
41 +
42 + sed -i -e 's:-DGTK_DISABLE_DEPRECATED=1 -DGDK_DISABLE_DEPRECATED=1 -DG_DISABLE_DEPRECATED=1 -DGNOME_DISABLE_DEPRECATED=1::g' \
43 + "${S}/a11y/Makefile.am" "${S}/a11y/Makefile.in"
44 }
45
46
47
48 1.152 gnome-extra/gtkhtml/ChangeLog
49
50 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/gtkhtml/ChangeLog?rev=1.152&view=markup
51 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/gtkhtml/ChangeLog?rev=1.152&content-type=text/plain
52 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/gtkhtml/ChangeLog?r1=1.151&r2=1.152
53
54 Index: ChangeLog
55 ===================================================================
56 RCS file: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v
57 retrieving revision 1.151
58 retrieving revision 1.152
59 diff -u -r1.151 -r1.152
60 --- ChangeLog 15 Mar 2008 17:33:18 -0000 1.151
61 +++ ChangeLog 17 Mar 2008 02:13:58 -0000 1.152
62 @@ -1,6 +1,11 @@
63 # ChangeLog for gnome-extra/gtkhtml
64 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
65 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.151 2008/03/15 17:33:18 leio Exp $
66 +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.152 2008/03/17 02:13:58 leio Exp $
67 +
68 + 17 Mar 2008; Mart Raudsepp <leio@g.o> gtkhtml-3.2.5.ebuild,
69 + gtkhtml-3.6.2.ebuild, gtkhtml-3.14.3.ebuild, gtkhtml-3.14.3-r1.ebuild:
70 + Be compatible with newer glib and more future-proof in the old versions as
71 + well, bug 210657
72
73 15 Mar 2008; Mart Raudsepp <leio@g.o> gtkhtml-3.16.3.ebuild:
74 Be compatible with newer glib, bug 210657
75
76
77
78 1.11 gnome-extra/gtkhtml/gtkhtml-3.2.5.ebuild
79
80 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.2.5.ebuild?rev=1.11&view=markup
81 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.2.5.ebuild?rev=1.11&content-type=text/plain
82 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.2.5.ebuild?r1=1.10&r2=1.11
83
84 Index: gtkhtml-3.2.5.ebuild
85 ===================================================================
86 RCS file: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.2.5.ebuild,v
87 retrieving revision 1.10
88 retrieving revision 1.11
89 diff -u -r1.10 -r1.11
90 --- gtkhtml-3.2.5.ebuild 30 Jan 2008 12:23:13 -0000 1.10
91 +++ gtkhtml-3.2.5.ebuild 17 Mar 2008 02:13:58 -0000 1.11
92 @@ -1,6 +1,6 @@
93 # Copyright 1999-2008 Gentoo Foundation
94 # Distributed under the terms of the GNU General Public License v2
95 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.2.5.ebuild,v 1.10 2008/01/30 12:23:13 opfer Exp $
96 +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.2.5.ebuild,v 1.11 2008/03/17 02:13:58 leio Exp $
97 EAPI="1"
98
99 inherit gnome2 eutils
100 @@ -41,4 +41,12 @@
101 epatch "${FILESDIR}/${PN}-3.2-i18n.patch" || die "gettext fix"
102 # bug 193458
103 epatch "${FILESDIR}/${PN}-3.2-gi18n.patch" || die
104 +
105 + # Fix deprecated API disabling in used glib library - this is not future-proof, bug 210657
106 + sed -i -e '/G_DISABLE_DEPRECATED/d' \
107 + "${S}/src/Makefile.am" "${S}/src/Makefile.in" \
108 + "${S}/components/html-editor/Makefile.am" "${S}/components/html-editor/Makefile.in"
109 +
110 + sed -i -e 's:-DGTK_DISABLE_DEPRECATED=1 -DGDK_DISABLE_DEPRECATED=1 -DG_DISABLE_DEPRECATED=1 -DGNOME_DISABLE_DEPRECATED=1::g' \
111 + "${S}/a11y/Makefile.am" "${S}/a11y/Makefile.in"
112 }
113
114
115
116 1.10 gnome-extra/gtkhtml/gtkhtml-3.14.3-r1.ebuild
117
118 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.14.3-r1.ebuild?rev=1.10&view=markup
119 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.14.3-r1.ebuild?rev=1.10&content-type=text/plain
120 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.14.3-r1.ebuild?r1=1.9&r2=1.10
121
122 Index: gtkhtml-3.14.3-r1.ebuild
123 ===================================================================
124 RCS file: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.14.3-r1.ebuild,v
125 retrieving revision 1.9
126 retrieving revision 1.10
127 diff -u -r1.9 -r1.10
128 --- gtkhtml-3.14.3-r1.ebuild 29 Jan 2008 18:13:06 -0000 1.9
129 +++ gtkhtml-3.14.3-r1.ebuild 17 Mar 2008 02:13:58 -0000 1.10
130 @@ -1,6 +1,6 @@
131 # Copyright 1999-2008 Gentoo Foundation
132 # Distributed under the terms of the GNU General Public License v2
133 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.14.3-r1.ebuild,v 1.9 2008/01/29 18:13:06 dang Exp $
134 +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.14.3-r1.ebuild,v 1.10 2008/03/17 02:13:58 leio Exp $
135 EAPI="1"
136
137 inherit gnome2 eutils
138 @@ -42,3 +42,15 @@
139 # A fix for a html_object_get_left_margin related crashes
140 epatch "${FILESDIR}/${P}-get_left_margin-fix.patch"
141 }
142 +
143 +src_unpack() {
144 + gnome2_src_unpack
145 +
146 + # Fix deprecated API disabling in used glib library - this is not future-proof, bug 210657
147 + sed -i -e '/G_DISABLE_DEPRECATED/d' \
148 + "${S}/src/Makefile.am" "${S}/src/Makefile.in" \
149 + "${S}/components/html-editor/Makefile.am" "${S}/components/html-editor/Makefile.in"
150 +
151 + sed -i -e 's:-DGTK_DISABLE_DEPRECATED=1 -DGDK_DISABLE_DEPRECATED=1 -DG_DISABLE_DEPRECATED=1 -DGNOME_DISABLE_DEPRECATED=1::g' \
152 + "${S}/a11y/Makefile.am" "${S}/a11y/Makefile.in"
153 +}
154
155
156
157 1.10 gnome-extra/gtkhtml/gtkhtml-3.14.3.ebuild
158
159 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.14.3.ebuild?rev=1.10&view=markup
160 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.14.3.ebuild?rev=1.10&content-type=text/plain
161 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.14.3.ebuild?r1=1.9&r2=1.10
162
163 Index: gtkhtml-3.14.3.ebuild
164 ===================================================================
165 RCS file: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.14.3.ebuild,v
166 retrieving revision 1.9
167 retrieving revision 1.10
168 diff -u -r1.9 -r1.10
169 --- gtkhtml-3.14.3.ebuild 29 Jan 2008 18:13:06 -0000 1.9
170 +++ gtkhtml-3.14.3.ebuild 17 Mar 2008 02:13:58 -0000 1.10
171 @@ -1,6 +1,6 @@
172 # Copyright 1999-2008 Gentoo Foundation
173 # Distributed under the terms of the GNU General Public License v2
174 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.14.3.ebuild,v 1.9 2008/01/29 18:13:06 dang Exp $
175 +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.14.3.ebuild,v 1.10 2008/03/17 02:13:58 leio Exp $
176 EAPI="1"
177
178 inherit gnome2
179 @@ -35,3 +35,15 @@
180 ELTCONF="--reverse-deps"
181 G2CONF="$(use_enable static) --enable-file-chooser"
182 }
183 +
184 +src_unpack() {
185 + gnome2_src_unpack
186 +
187 + # Fix deprecated API disabling in used glib library - this is not future-proof, bug 210657
188 + sed -i -e '/G_DISABLE_DEPRECATED/d' \
189 + "${S}/src/Makefile.am" "${S}/src/Makefile.in" \
190 + "${S}/components/html-editor/Makefile.am" "${S}/components/html-editor/Makefile.in"
191 +
192 + sed -i -e 's:-DGTK_DISABLE_DEPRECATED=1 -DGDK_DISABLE_DEPRECATED=1 -DG_DISABLE_DEPRECATED=1 -DGNOME_DISABLE_DEPRECATED=1::g' \
193 + "${S}/a11y/Makefile.am" "${S}/a11y/Makefile.in"
194 +}
195
196
197
198 --
199 gentoo-commits@l.g.o mailing list
Report Message
Find on MARC Find on Google Groups