1 |
commit: bab291738c843e2fbcfa74b7e704b46b60da3279 |
2 |
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Apr 1 11:42:39 2011 +0000 |
4 |
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Apr 1 11:42:39 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=bab29173 |
7 |
|
8 |
dev-python/pygobject: 2.28.0 → 2.28.3 |
9 |
|
10 |
--- |
11 |
...-2.28.3-support_multiple_python_versions.patch} | 33 +++++++++++-------- |
12 |
...bject-2.28.0.ebuild => pygobject-2.28.3.ebuild} | 2 +- |
13 |
2 files changed, 20 insertions(+), 15 deletions(-) |
14 |
|
15 |
diff --git a/dev-python/pygobject/files/pygobject-2.28.0-support_multiple_python_versions.patch b/dev-python/pygobject/files/pygobject-2.28.3-support_multiple_python_versions.patch |
16 |
similarity index 63% |
17 |
rename from dev-python/pygobject/files/pygobject-2.28.0-support_multiple_python_versions.patch |
18 |
rename to dev-python/pygobject/files/pygobject-2.28.3-support_multiple_python_versions.patch |
19 |
index 8cccdc9..844f271 100644 |
20 |
--- a/dev-python/pygobject/files/pygobject-2.28.0-support_multiple_python_versions.patch |
21 |
+++ b/dev-python/pygobject/files/pygobject-2.28.3-support_multiple_python_versions.patch |
22 |
@@ -1,5 +1,6 @@ |
23 |
---- a/codegen/pygobject-codegen-2.0.in |
24 |
-+++ b/codegen/pygobject-codegen-2.0.in |
25 |
+diff -Naur pygobject-2.28.3/codegen/pygobject-codegen-2.0.in pygobject-2.28.3.new/codegen/pygobject-codegen-2.0.in |
26 |
+--- pygobject-2.28.3/codegen/pygobject-codegen-2.0.in 2011-04-01 17:10:13.820719508 +0530 |
27 |
++++ pygobject-2.28.3.new/codegen/pygobject-codegen-2.0.in 2011-04-01 17:08:07.464719548 +0530 |
28 |
@@ -4,7 +4,7 @@ |
29 |
exec_prefix=@exec_prefix@ |
30 |
datarootdir=@datarootdir@ |
31 |
@@ -9,19 +10,21 @@ |
32 |
|
33 |
PYTHONPATH=$codegendir |
34 |
export PYTHONPATH |
35 |
---- a/gi/Makefile.am |
36 |
-+++ b/gi/Makefile.am |
37 |
-@@ -26,7 +26,7 @@ |
38 |
+diff -Naur pygobject-2.28.3/gi/Makefile.am pygobject-2.28.3.new/gi/Makefile.am |
39 |
+--- pygobject-2.28.3/gi/Makefile.am 2011-03-22 00:02:10.000000000 +0530 |
40 |
++++ pygobject-2.28.3.new/gi/Makefile.am 2011-04-01 17:08:49.836719533 +0530 |
41 |
+@@ -25,7 +25,7 @@ |
42 |
+ -export-symbols-regex "init_gi|PyInit__gi" |
43 |
_gi_la_LIBADD = \ |
44 |
$(GI_LIBS) \ |
45 |
- $(PYTHON_LIBS) \ |
46 |
- $(top_builddir)/glib/libpyglib-2.0-@PYTHON_BASENAME@.la |
47 |
+ $(top_builddir)/glib/libpyglib-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la |
48 |
_gi_la_SOURCES = \ |
49 |
pygi-repository.c \ |
50 |
pygi-repository.h \ |
51 |
---- a/gio/Makefile.am |
52 |
-+++ b/gio/Makefile.am |
53 |
+diff -Naur pygobject-2.28.3/gio/Makefile.am pygobject-2.28.3.new/gio/Makefile.am |
54 |
+--- pygobject-2.28.3/gio/Makefile.am 2011-03-23 03:04:52.000000000 +0530 |
55 |
++++ pygobject-2.28.3.new/gio/Makefile.am 2011-04-01 17:08:07.468719548 +0530 |
56 |
@@ -67,7 +67,7 @@ |
57 |
gio.c: $(GIO_DEFS) $(GIO_OVERRIDES) |
58 |
_gio_la_CFLAGS = $(GIO_CFLAGS) |
59 |
@@ -31,8 +34,9 @@ |
60 |
_gio_la_SOURCES = \ |
61 |
giomodule.c \ |
62 |
pygio-utils.c \ |
63 |
---- a/glib/Makefile.am |
64 |
-+++ b/glib/Makefile.am |
65 |
+diff -Naur pygobject-2.28.3/glib/Makefile.am pygobject-2.28.3.new/glib/Makefile.am |
66 |
+--- pygobject-2.28.3/glib/Makefile.am 2011-03-23 03:04:52.000000000 +0530 |
67 |
++++ pygobject-2.28.3.new/glib/Makefile.am 2011-04-01 17:09:16.336719519 +0530 |
68 |
@@ -4,7 +4,7 @@ |
69 |
pkgincludedir = $(includedir)/pygtk-2.0 |
70 |
pkginclude_HEADERS = pyglib.h |
71 |
@@ -47,10 +51,10 @@ |
72 |
endif |
73 |
|
74 |
-libpyglib_2_0_@PYTHON_BASENAME@_la_CFLAGS = $(GLIB_CFLAGS) |
75 |
--libpyglib_2_0_@PYTHON_BASENAME@_la_LIBADD = $(GLIB_LIBS) $(FFI_LIBS) $(PYTHON_LIBS) |
76 |
+-libpyglib_2_0_@PYTHON_BASENAME@_la_LIBADD = $(GLIB_LIBS) $(FFI_LIBS) |
77 |
-libpyglib_2_0_@PYTHON_BASENAME@_la_SOURCES = \ |
78 |
+libpyglib_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_CFLAGS = $(GLIB_CFLAGS) |
79 |
-+libpyglib_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_LIBADD = $(GLIB_LIBS) $(FFI_LIBS) $(PYTHON_LIBS) |
80 |
++libpyglib_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_LIBADD = $(GLIB_LIBS) $(FFI_LIBS) |
81 |
+libpyglib_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_SOURCES = \ |
82 |
pyglib.c \ |
83 |
pyglib.h \ |
84 |
@@ -64,8 +68,9 @@ |
85 |
_glib_la_SOURCES = \ |
86 |
glibmodule.c \ |
87 |
pygiochannel.c \ |
88 |
---- a/gobject/Makefile.am |
89 |
-+++ b/gobject/Makefile.am |
90 |
+diff -Naur pygobject-2.28.3/gobject/Makefile.am pygobject-2.28.3.new/gobject/Makefile.am |
91 |
+--- pygobject-2.28.3/gobject/Makefile.am 2011-03-23 03:04:52.000000000 +0530 |
92 |
++++ pygobject-2.28.3.new/gobject/Makefile.am 2011-04-01 17:08:07.471719548 +0530 |
93 |
@@ -35,7 +35,7 @@ |
94 |
_gobject_la_LIBADD = \ |
95 |
$(GLIB_LIBS) \ |
96 |
|
97 |
diff --git a/dev-python/pygobject/pygobject-2.28.0.ebuild b/dev-python/pygobject/pygobject-2.28.3.ebuild |
98 |
similarity index 98% |
99 |
rename from dev-python/pygobject/pygobject-2.28.0.ebuild |
100 |
rename to dev-python/pygobject/pygobject-2.28.3.ebuild |
101 |
index 854ae96..9d93a65 100644 |
102 |
--- a/dev-python/pygobject/pygobject-2.28.0.ebuild |
103 |
+++ b/dev-python/pygobject/pygobject-2.28.3.ebuild |
104 |
@@ -58,7 +58,7 @@ src_prepare() { |
105 |
epatch "${FILESDIR}/${PN}-2.28.0-make_check.patch" |
106 |
|
107 |
# Support installation for multiple Python versions |
108 |
- epatch "${FILESDIR}/${PN}-2.28.0-support_multiple_python_versions.patch" |
109 |
+ epatch "${FILESDIR}/${PN}-2.28.3-support_multiple_python_versions.patch" |
110 |
|
111 |
# Disable tests that fail |
112 |
epatch "${FILESDIR}/${PN}-2.28.0-disable-failing-tests.patch" |