| 1 |
rhill 14/05/23 08:21:26 |
| 2 |
|
| 3 |
Modified: ChangeLog wxGTK-2.8.12.1-r1.ebuild |
| 4 |
wxGTK-3.0.0.0.ebuild |
| 5 |
Removed: wxGTK-2.8.12.1.ebuild |
| 6 |
Log: |
| 7 |
Restore gconf dep to 2.8 (bug #501672). Apply libpath hack to 3.0.0.0 as |
| 8 |
well (bug #499984). |
| 9 |
|
| 10 |
Signed-off-by: Ryan Hill <rhill@g.o> |
| 11 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 957A8463) |
| 12 |
|
| 13 |
Revision Changes Path |
| 14 |
1.314 x11-libs/wxGTK/ChangeLog |
| 15 |
|
| 16 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/ChangeLog?rev=1.314&view=markup |
| 17 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/ChangeLog?rev=1.314&content-type=text/plain |
| 18 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/ChangeLog?r1=1.313&r2=1.314 |
| 19 |
|
| 20 |
Index: ChangeLog |
| 21 |
=================================================================== |
| 22 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v |
| 23 |
retrieving revision 1.313 |
| 24 |
retrieving revision 1.314 |
| 25 |
diff -u -r1.313 -r1.314 |
| 26 |
--- ChangeLog 19 Mar 2014 16:14:28 -0000 1.313 |
| 27 |
+++ ChangeLog 23 May 2014 08:21:26 -0000 1.314 |
| 28 |
@@ -1,6 +1,11 @@ |
| 29 |
# ChangeLog for x11-libs/wxGTK |
| 30 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 31 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.313 2014/03/19 16:14:28 ago Exp $ |
| 32 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.314 2014/05/23 08:21:26 rhill Exp $ |
| 33 |
+ |
| 34 |
+ 23 May 2014; Ryan Hill <rhill@g.o> -wxGTK-2.8.12.1.ebuild, |
| 35 |
+ wxGTK-2.8.12.1-r1.ebuild, wxGTK-3.0.0.0.ebuild: |
| 36 |
+ Restore gconf dep to 2.8 (bug #501672). Apply libpath hack to 3.0.0.0 as |
| 37 |
+ well (bug #499984). |
| 38 |
|
| 39 |
19 Mar 2014; Agostino Sarubbo <ago@g.o> wxGTK-2.8.12.1-r1.ebuild: |
| 40 |
Stable for alpha, wrt bug #499476 |
| 41 |
|
| 42 |
|
| 43 |
|
| 44 |
1.12 x11-libs/wxGTK/wxGTK-2.8.12.1-r1.ebuild |
| 45 |
|
| 46 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.12.1-r1.ebuild?rev=1.12&view=markup |
| 47 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.12.1-r1.ebuild?rev=1.12&content-type=text/plain |
| 48 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.12.1-r1.ebuild?r1=1.11&r2=1.12 |
| 49 |
|
| 50 |
Index: wxGTK-2.8.12.1-r1.ebuild |
| 51 |
=================================================================== |
| 52 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.12.1-r1.ebuild,v |
| 53 |
retrieving revision 1.11 |
| 54 |
retrieving revision 1.12 |
| 55 |
diff -u -r1.11 -r1.12 |
| 56 |
--- wxGTK-2.8.12.1-r1.ebuild 19 Mar 2014 16:14:28 -0000 1.11 |
| 57 |
+++ wxGTK-2.8.12.1-r1.ebuild 23 May 2014 08:21:26 -0000 1.12 |
| 58 |
@@ -1,6 +1,6 @@ |
| 59 |
# Copyright 1999-2014 Gentoo Foundation |
| 60 |
# Distributed under the terms of the GNU General Public License v2 |
| 61 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.12.1-r1.ebuild,v 1.11 2014/03/19 16:14:28 ago Exp $ |
| 62 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.12.1-r1.ebuild,v 1.12 2014/05/23 08:21:26 rhill Exp $ |
| 63 |
|
| 64 |
EAPI="5" |
| 65 |
|
| 66 |
@@ -37,6 +37,7 @@ |
| 67 |
x11-libs/pango[X] |
| 68 |
gnome? ( gnome-base/libgnomeprintui:2.2 ) |
| 69 |
gstreamer? ( |
| 70 |
+ gnome-base/gconf:2 |
| 71 |
media-libs/gstreamer:0.10 |
| 72 |
media-libs/gst-plugins-base:0.10 ) |
| 73 |
opengl? ( virtual/opengl ) |
| 74 |
|
| 75 |
|
| 76 |
|
| 77 |
1.4 x11-libs/wxGTK/wxGTK-3.0.0.0.ebuild |
| 78 |
|
| 79 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/wxGTK-3.0.0.0.ebuild?rev=1.4&view=markup |
| 80 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/wxGTK-3.0.0.0.ebuild?rev=1.4&content-type=text/plain |
| 81 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/wxGTK-3.0.0.0.ebuild?r1=1.3&r2=1.4 |
| 82 |
|
| 83 |
Index: wxGTK-3.0.0.0.ebuild |
| 84 |
=================================================================== |
| 85 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-3.0.0.0.ebuild,v |
| 86 |
retrieving revision 1.3 |
| 87 |
retrieving revision 1.4 |
| 88 |
diff -u -r1.3 -r1.4 |
| 89 |
--- wxGTK-3.0.0.0.ebuild 27 Jan 2014 17:35:05 -0000 1.3 |
| 90 |
+++ wxGTK-3.0.0.0.ebuild 23 May 2014 08:21:26 -0000 1.4 |
| 91 |
@@ -1,6 +1,6 @@ |
| 92 |
# Copyright 1999-2014 Gentoo Foundation |
| 93 |
# Distributed under the terms of the GNU General Public License v2 |
| 94 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-3.0.0.0.ebuild,v 1.3 2014/01/27 17:35:05 dirtyepic Exp $ |
| 95 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-3.0.0.0.ebuild,v 1.4 2014/05/23 08:21:26 rhill Exp $ |
| 96 |
|
| 97 |
EAPI="5" |
| 98 |
|
| 99 |
@@ -65,6 +65,11 @@ |
| 100 |
|
| 101 |
src_prepare() { |
| 102 |
epatch "${FILESDIR}"/${P}-collision.patch |
| 103 |
+ |
| 104 |
+ # https://bugs.gentoo.org/421851 |
| 105 |
+ # https://bugs.gentoo.org/499984 |
| 106 |
+ sed -i -e "/wx_cv_std_libpath=/s:=.*:=$(get_libdir):" configure || die |
| 107 |
+ |
| 108 |
epatch_user |
| 109 |
} |
Archives