1 |
remi 08/05/28 14:03:45 |
2 |
|
3 |
Added: pygtk-2.12.1-fix-amd64.patch |
4 |
pygtk-2.12.1-fix-codegen-location.patch |
5 |
Log: |
6 |
dev-python/pygtk: fix bug #194343 and bug #209531, add amd64 keyword back |
7 |
(Portage version: 2.1.5.2) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 dev-python/pygtk/files/pygtk-2.12.1-fix-amd64.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/pygtk/files/pygtk-2.12.1-fix-amd64.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/pygtk/files/pygtk-2.12.1-fix-amd64.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: pygtk-2.12.1-fix-amd64.patch |
16 |
=================================================================== |
17 |
Index: gtk/gtk.override |
18 |
=================================================================== |
19 |
--- gtk/gtk.override (revision 2949) |
20 |
+++ gtk/gtk.override (working copy) |
21 |
@@ -1168,7 +1168,7 @@ |
22 |
static GSource * |
23 |
pygtk_main_watch_new(void) |
24 |
{ |
25 |
- return g_source_new(&pygtk_main_watch_funcs, sizeof(GSource)); |
26 |
+ return g_source_new(&pygtk_main_watch_funcs, sizeof(PySignalWatchSource)); |
27 |
} |
28 |
|
29 |
|
30 |
|
31 |
|
32 |
|
33 |
1.1 dev-python/pygtk/files/pygtk-2.12.1-fix-codegen-location.patch |
34 |
|
35 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/pygtk/files/pygtk-2.12.1-fix-codegen-location.patch?rev=1.1&view=markup |
36 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/pygtk/files/pygtk-2.12.1-fix-codegen-location.patch?rev=1.1&content-type=text/plain |
37 |
|
38 |
Index: pygtk-2.12.1-fix-codegen-location.patch |
39 |
=================================================================== |
40 |
Index: pygtk-2.0.pc.in |
41 |
=================================================================== |
42 |
--- pygtk-2.0.pc.in (revision 2949) |
43 |
+++ pygtk-2.0.pc.in (working copy) |
44 |
@@ -12,7 +12,7 @@ |
45 |
|
46 |
# same here. Useful when calling the code generator in addon packages. |
47 |
defsdir=${datadir}/pygtk/2.0/defs |
48 |
-codegendir=${datadir}/pygtk/2.0/codegen |
49 |
+codegendir=${pyexecdir}/gtk-2.0/codegen |
50 |
|
51 |
Name: PyGTK |
52 |
Description: Python bindings for GTK+ and related libraries |
53 |
Index: codegen/pygtk-codegen-2.0.in |
54 |
=================================================================== |
55 |
--- codegen/pygtk-codegen-2.0.in (revision 2949) |
56 |
+++ codegen/pygtk-codegen-2.0.in (working copy) |
57 |
@@ -3,7 +3,7 @@ |
58 |
prefix=@prefix@ |
59 |
datarootdir=@datarootdir@ |
60 |
datadir=@datadir@ |
61 |
-codegendir=${datadir}/pygtk/2.0/codegen |
62 |
+codegendir=@pyexecdir@/gtk-2.0/codegen |
63 |
|
64 |
PYTHONPATH=$codegendir |
65 |
export PYTHONPATH |
66 |
Index: codegen/Makefile.am |
67 |
=================================================================== |
68 |
--- codegen/Makefile.am (revision 2949) |
69 |
+++ codegen/Makefile.am (working copy) |
70 |
@@ -2,7 +2,7 @@ |
71 |
|
72 |
bin_SCRIPTS = pygtk-codegen-$(PLATFORM_VERSION) |
73 |
|
74 |
-codegendir = $(pkgdatadir)/$(PLATFORM_VERSION)/codegen |
75 |
+codegendir = $(pyexecdir)/gtk-2.0/codegen |
76 |
|
77 |
codegen_PYTHON = \ |
78 |
__init__.py \ |
79 |
|
80 |
|
81 |
|
82 |
-- |
83 |
gentoo-commits@l.g.o mailing list |