Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-office/teapot/files: teapot-2.2.0-doc-dir.patch teapot-2.2.0-helpfile.patch
Date: Thu, 03 Feb 2011 16:26:20
Message-Id: 20110203162610.AE90A20054@flycatcher.gentoo.org
1 ssuominen 11/02/03 16:26:10
2
3 Added: teapot-2.2.0-doc-dir.patch
4 teapot-2.2.0-helpfile.patch
5 Log:
6 Initial commit wrt #353579 by Kevin McCarthy.
7
8 (Portage version: 2.2.0_alpha19/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.1 app-office/teapot/files/teapot-2.2.0-doc-dir.patch
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/teapot/files/teapot-2.2.0-doc-dir.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/teapot/files/teapot-2.2.0-doc-dir.patch?rev=1.1&content-type=text/plain
15
16 Index: teapot-2.2.0-doc-dir.patch
17 ===================================================================
18 Fix to put docs in correct location based on ${PF}
19 This requires -DPF=${PF} passed to cmake
20
21 Also prevent the installation of COPYING
22
23 Patch by Kevin McCarthy <signals42@×××××.com>
24
25
26 --- CMakeLists.txt
27 +++ CMakeLists.txt
28 @@ -83,12 +83,12 @@
29 add_custom_target(pdf DEPENDS teapot.pdf)
30 add_custom_target(html DEPENDS html/index.html)
31 add_custom_target(doc ALL DEPENDS teapot.pdf html/index.html)
32 - install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION share/doc/teapot FILES_MATCHING PATTERN *.html PATTERN *.png)
33 - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/teapot.pdf DESTINATION share/doc/teapot)
34 - set(HELPFILE "${CMAKE_INSTALL_PREFIX}/share/doc/teapot/html/index.html")
35 + install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION share/doc/${PF} FILES_MATCHING PATTERN *.html PATTERN *.png)
36 + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/teapot.pdf DESTINATION share/doc/${PF})
37 + set(HELPFILE "/usr/share/doc/${PF}/html/index.html")
38 endif ()
39
40 -install(FILES COPYING README DESTINATION share/doc/teapot)
41 +install(FILES README DESTINATION share/doc/${PF})
42
43 add_custom_target(dist
44 COMMAND ${CMAKE_COMMAND} -E remove_directory teapot-${Teapot_VERSION_MAJOR}.${Teapot_VERSION_MINOR}.${Teapot_VERSION_PATCH}
45
46
47
48 1.1 app-office/teapot/files/teapot-2.2.0-helpfile.patch
49
50 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/teapot/files/teapot-2.2.0-helpfile.patch?rev=1.1&view=markup
51 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/teapot/files/teapot-2.2.0-helpfile.patch?rev=1.1&content-type=text/plain
52
53 Index: teapot-2.2.0-helpfile.patch
54 ===================================================================
55 This fixes a bug where HELPFILE was being overridden by a hard coded path
56
57 This also fixes an issue with fl_filename_absolute returning a relative path
58 preventing fteapot from finding its helpfile when started from any directory
59 except /
60
61 Patch by Kevin McCarthy <signals42@×××××.com>
62
63 --- fteapot.fl
64 +++ fteapot.fl
65 @@ -8,6 +8,9 @@
66 decl {\#include "misc.h"} {private global
67 }
68
69 +decl {\#include "config.h"} {private global
70 +}
71 +
72 decl {\#include <stdint.h>} {private global
73 }
74
75 @@ -781,8 +784,8 @@
76
77 Function {find_helpfile(char *buf, int size, const char *argv0)} {open C return_type void
78 } {
79 - code {fl_filename_absolute(buf, size, argv0);
80 + code {strncpy(buf, argv0, size);
81 char *p = (char *)fl_filename_name(buf);
82 -strncpy(p, "../share/doc/teapot/html/index.html", buf+size-p);
83 +strncpy(p, HELPFILE, buf+size-p);
84 buf[size-1] = 0;} {}
85 }