1 |
aidecoe 15/01/29 13:37:49 |
2 |
|
3 |
Added: |
4 |
0.19-0001-doc-gzipped-notmuch.3-before-trying-to.patch |
5 |
0.19-0003-build-eliminate-use-of-python-execfile.patch |
6 |
0.19-0002-Rename-rst2man-to-rst2man.py-for-Gento.patch |
7 |
Log: |
8 |
Apply rst2man related fixes. Fallback from sphinx to rst2man was ending up |
9 |
with build failure. Rels bug #530522. |
10 |
|
11 |
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key F0134531E1DBFAB5) |
12 |
|
13 |
Revision Changes Path |
14 |
1.1 net-mail/notmuch/files/0.19-0001-doc-gzipped-notmuch.3-before-trying-to.patch |
15 |
|
16 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/notmuch/files/0.19-0001-doc-gzipped-notmuch.3-before-trying-to.patch?rev=1.1&view=markup |
17 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/notmuch/files/0.19-0001-doc-gzipped-notmuch.3-before-trying-to.patch?rev=1.1&content-type=text/plain |
18 |
|
19 |
Index: 0.19-0001-doc-gzipped-notmuch.3-before-trying-to.patch |
20 |
=================================================================== |
21 |
From a95173249ae8811241da7640814934837abce53b Mon Sep 17 00:00:00 2001 |
22 |
From: David Bremner <david@×××××××.net> |
23 |
Date: Sun, 25 Jan 2015 15:04:51 +0100 |
24 |
Subject: [PATCH] doc: gzipped notmuch.3 before trying to install notmuch.3.gz |
25 |
|
26 |
If HAVE_SPHINX=0 but HAVE_DOXYGEN=1, then the previous version was |
27 |
trying to install notmuch.3.gz but only got as far as creating |
28 |
notmuch.3 |
29 |
--- |
30 |
doc/Makefile.local | 2 +- |
31 |
1 file changed, 1 insertion(+), 1 deletion(-) |
32 |
|
33 |
diff --git a/doc/Makefile.local b/doc/Makefile.local |
34 |
index e7d0bac..a719d8b 100644 |
35 |
--- a/doc/Makefile.local |
36 |
+++ b/doc/Makefile.local |
37 |
@@ -63,7 +63,7 @@ install-man: install-apidocs |
38 |
ifeq ($(HAVE_DOXYGEN),1) |
39 |
MAN_GZIP_FILES += ${APIMAN}.gz |
40 |
apidocs: $(APIMAN) |
41 |
-install-apidocs: apidocs |
42 |
+install-apidocs: ${APIMAN}.gz |
43 |
mkdir -p "$(DESTDIR)$(mandir)/man3" |
44 |
install -m0644 $(DOCBUILDDIR)/man/man3/*.3.gz $(DESTDIR)/$(mandir)/man3 |
45 |
|
46 |
-- |
47 |
2.2.2 |
48 |
|
49 |
|
50 |
|
51 |
|
52 |
1.1 net-mail/notmuch/files/0.19-0003-build-eliminate-use-of-python-execfile.patch |
53 |
|
54 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/notmuch/files/0.19-0003-build-eliminate-use-of-python-execfile.patch?rev=1.1&view=markup |
55 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/notmuch/files/0.19-0003-build-eliminate-use-of-python-execfile.patch?rev=1.1&content-type=text/plain |
56 |
|
57 |
Index: 0.19-0003-build-eliminate-use-of-python-execfile.patch |
58 |
=================================================================== |
59 |
From 381385ccb7581bb16b72c23fd804c40b0330fe71 Mon Sep 17 00:00:00 2001 |
60 |
From: David Bremner <david@×××××××.net> |
61 |
Date: Sat, 3 Jan 2015 14:14:03 +0100 |
62 |
Subject: [PATCH 3/3] build: eliminate use of python execfile command |
63 |
|
64 |
As discussed in |
65 |
id:8cc9dd580ad672527e12f43706f9803b2c8e99d8.1405220724.git.wking@×××××××.us, |
66 |
execfile is unavailable in python3. |
67 |
|
68 |
The approach of this commit avoids modifying the python module path, |
69 |
which is arguably preferable since it avoids potentially accidentally |
70 |
importing a module from the wrong place. |
71 |
--- |
72 |
devel/release-checks.sh | 2 +- |
73 |
doc/prerst2man.py | 3 ++- |
74 |
2 files changed, 3 insertions(+), 2 deletions(-) |
75 |
|
76 |
diff --git a/devel/release-checks.sh b/devel/release-checks.sh |
77 |
index 797d62a..ae02f55 100755 |
78 |
--- a/devel/release-checks.sh |
79 |
+++ b/devel/release-checks.sh |
80 |
@@ -130,7 +130,7 @@ else |
81 |
fi |
82 |
|
83 |
echo -n "Checking that python bindings version is $VERSION... " |
84 |
-py_version=`python -c "execfile('$PV_FILE'); print __VERSION__"` |
85 |
+py_version=`python -c "with open('$PV_FILE') as vf: exec(vf.read()); print __VERSION__"` |
86 |
if [ "$py_version" = "$VERSION" ] |
87 |
then |
88 |
echo Yes. |
89 |
diff --git a/doc/prerst2man.py b/doc/prerst2man.py |
90 |
index 22b8258..45dddca 100644 |
91 |
--- a/doc/prerst2man.py |
92 |
+++ b/doc/prerst2man.py |
93 |
@@ -10,7 +10,8 @@ outdir = argv[2] |
94 |
if not isdir(outdir): |
95 |
makedirs(outdir, 0o755) |
96 |
|
97 |
-execfile(sourcedir + "/conf.py") |
98 |
+with open(sourcedir + "/conf.py") as cf: |
99 |
+ exec(cf.read()) |
100 |
|
101 |
|
102 |
def header(file, startdocname, command, description, authors, section): |
103 |
-- |
104 |
2.2.2 |
105 |
|
106 |
|
107 |
|
108 |
|
109 |
1.1 net-mail/notmuch/files/0.19-0002-Rename-rst2man-to-rst2man.py-for-Gento.patch |
110 |
|
111 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/notmuch/files/0.19-0002-Rename-rst2man-to-rst2man.py-for-Gento.patch?rev=1.1&view=markup |
112 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/notmuch/files/0.19-0002-Rename-rst2man-to-rst2man.py-for-Gento.patch?rev=1.1&content-type=text/plain |
113 |
|
114 |
Index: 0.19-0002-Rename-rst2man-to-rst2man.py-for-Gento.patch |
115 |
=================================================================== |
116 |
From dcae4803d006af1a7b961a492d65c28a3cffbc3c Mon Sep 17 00:00:00 2001 |
117 |
From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@×××××××.name> |
118 |
Date: Thu, 29 Jan 2015 14:17:01 +0100 |
119 |
Subject: [PATCH 2/2] Rename rst2man to rst2man.py for Gentoo |
120 |
|
121 |
Gentoo doesn't provide symlink rst2man.py -> rst2man. |
122 |
--- |
123 |
configure | 2 +- |
124 |
doc/prerst2man.py | 2 +- |
125 |
2 files changed, 2 insertions(+), 2 deletions(-) |
126 |
|
127 |
diff --git a/configure b/configure |
128 |
index d14e7d1..bf78066 100755 |
129 |
--- a/configure |
130 |
+++ b/configure |
131 |
@@ -436,7 +436,7 @@ else |
132 |
have_sphinx=0 |
133 |
|
134 |
printf "Checking if rst2man is available... " |
135 |
- if rst2man -V > /dev/null 2>&1; then |
136 |
+ if rst2man.py -V > /dev/null 2>&1; then |
137 |
printf "Yes.\n" |
138 |
have_rst2man=1 |
139 |
else |
140 |
diff --git a/doc/prerst2man.py b/doc/prerst2man.py |
141 |
index 437dea9..22b8258 100644 |
142 |
--- a/doc/prerst2man.py |
143 |
+++ b/doc/prerst2man.py |
144 |
@@ -59,5 +59,5 @@ for page in man_pages: |
145 |
outfile.write("".join(lines)) |
146 |
outfile.close() |
147 |
|
148 |
- system('set -x; rst2man {0} {1}/{2}.{3}' |
149 |
+ system('set -x; rst2man.py {0} {1}/{2}.{3}' |
150 |
.format(filename, outdir, page[0], page[4])) |
151 |
-- |
152 |
2.2.2 |