| 1 |
dang 08/05/29 02:28:18 |
| 2 |
|
| 3 |
Modified: pygtk-2.12.1-fix-codegen-location.patch |
| 4 |
Log: |
| 5 |
Set exec_prefix in codegen patch; bug #194343 |
| 6 |
(Portage version: 2.1.5.2) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 dev-python/pygtk/files/pygtk-2.12.1-fix-codegen-location.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/pygtk/files/pygtk-2.12.1-fix-codegen-location.patch?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/pygtk/files/pygtk-2.12.1-fix-codegen-location.patch?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/pygtk/files/pygtk-2.12.1-fix-codegen-location.patch?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: pygtk-2.12.1-fix-codegen-location.patch |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/pygtk/files/pygtk-2.12.1-fix-codegen-location.patch,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- pygtk-2.12.1-fix-codegen-location.patch 28 May 2008 14:03:45 -0000 1.1 |
| 22 |
+++ pygtk-2.12.1-fix-codegen-location.patch 29 May 2008 02:28:17 -0000 1.2 |
| 23 |
@@ -1,22 +1,23 @@ |
| 24 |
-Index: pygtk-2.0.pc.in |
| 25 |
-=================================================================== |
| 26 |
---- pygtk-2.0.pc.in (revision 2949) |
| 27 |
-+++ pygtk-2.0.pc.in (working copy) |
| 28 |
-@@ -12,7 +12,7 @@ |
| 29 |
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN pygtk-2.12.1.orig/codegen/Makefile.am pygtk-2.12.1/codegen/Makefile.am |
| 30 |
+--- pygtk-2.12.1.orig/codegen/Makefile.am 2007-11-01 12:20:22.000000000 -0400 |
| 31 |
++++ pygtk-2.12.1/codegen/Makefile.am 2008-05-28 22:21:04.000000000 -0400 |
| 32 |
+@@ -2,7 +2,7 @@ PLATFORM_VERSION = 2.0 |
| 33 |
|
| 34 |
- # same here. Useful when calling the code generator in addon packages. |
| 35 |
- defsdir=${datadir}/pygtk/2.0/defs |
| 36 |
--codegendir=${datadir}/pygtk/2.0/codegen |
| 37 |
-+codegendir=${pyexecdir}/gtk-2.0/codegen |
| 38 |
+ bin_SCRIPTS = pygtk-codegen-$(PLATFORM_VERSION) |
| 39 |
+ |
| 40 |
+-codegendir = $(pkgdatadir)/$(PLATFORM_VERSION)/codegen |
| 41 |
++codegendir = $(pyexecdir)/gtk-2.0/codegen |
| 42 |
+ |
| 43 |
+ codegen_PYTHON = \ |
| 44 |
+ __init__.py \ |
| 45 |
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN pygtk-2.12.1.orig/codegen/pygtk-codegen-2.0.in pygtk-2.12.1/codegen/pygtk-codegen-2.0.in |
| 46 |
+--- pygtk-2.12.1.orig/codegen/pygtk-codegen-2.0.in 2007-11-01 12:20:22.000000000 -0400 |
| 47 |
++++ pygtk-2.12.1/codegen/pygtk-codegen-2.0.in 2008-05-28 22:24:38.000000000 -0400 |
| 48 |
+@@ -1,9 +1,10 @@ |
| 49 |
+ #!/bin/sh |
| 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 |
++exec_prefix=@exec_prefix@ |
| 60 |
datarootdir=@datarootdir@ |
| 61 |
datadir=@datadir@ |
| 62 |
-codegendir=${datadir}/pygtk/2.0/codegen |
| 63 |
@@ -24,16 +25,15 @@ |
| 64 |
|
| 65 |
PYTHONPATH=$codegendir |
| 66 |
export PYTHONPATH |
| 67 |
-Index: codegen/Makefile.am |
| 68 |
-=================================================================== |
| 69 |
---- codegen/Makefile.am (revision 2949) |
| 70 |
-+++ codegen/Makefile.am (working copy) |
| 71 |
-@@ -2,7 +2,7 @@ |
| 72 |
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN pygtk-2.12.1.orig/pygtk-2.0.pc.in pygtk-2.12.1/pygtk-2.0.pc.in |
| 73 |
+--- pygtk-2.12.1.orig/pygtk-2.0.pc.in 2007-11-01 12:20:22.000000000 -0400 |
| 74 |
++++ pygtk-2.12.1/pygtk-2.0.pc.in 2008-05-28 22:21:04.000000000 -0400 |
| 75 |
+@@ -12,7 +12,7 @@ pygtkincludedir=${includedir}/pygtk-2.0 |
| 76 |
|
| 77 |
- bin_SCRIPTS = pygtk-codegen-$(PLATFORM_VERSION) |
| 78 |
- |
| 79 |
--codegendir = $(pkgdatadir)/$(PLATFORM_VERSION)/codegen |
| 80 |
-+codegendir = $(pyexecdir)/gtk-2.0/codegen |
| 81 |
+ # same here. Useful when calling the code generator in addon packages. |
| 82 |
+ defsdir=${datadir}/pygtk/2.0/defs |
| 83 |
+-codegendir=${datadir}/pygtk/2.0/codegen |
| 84 |
++codegendir=${pyexecdir}/gtk-2.0/codegen |
| 85 |
|
| 86 |
- codegen_PYTHON = \ |
| 87 |
- __init__.py \ |
| 88 |
+ Name: PyGTK |
| 89 |
+ Description: Python bindings for GTK+ and related libraries |
| 90 |
|
| 91 |
|
| 92 |
|
| 93 |
-- |
| 94 |
gentoo-commits@l.g.o mailing list |
Archives