| 1 |
xmw 13/05/31 13:49:47 |
| 2 |
|
| 3 |
Added: teapot-2.3.0-doc-dir.patch |
| 4 |
teapot-2.3.0-helpfile.patch |
| 5 |
Log: |
| 6 |
Version bump (bug 451738) |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key 62EEF090) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 app-office/teapot/files/teapot-2.3.0-doc-dir.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/teapot/files/teapot-2.3.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.3.0-doc-dir.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: teapot-2.3.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 |
--- teapot-2.3.0/CMakeLists.txt |
| 26 |
+++ teapot-2.3.0/CMakeLists.txt |
| 27 |
@@ -99,12 +99,12 @@ |
| 28 |
add_custom_target(pdf DEPENDS teapot.pdf) |
| 29 |
add_custom_target(html DEPENDS html/index.html) |
| 30 |
add_custom_target(doc ALL DEPENDS teapot.pdf html/index.html) |
| 31 |
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION share/doc/teapot FILES_MATCHING PATTERN *.html PATTERN *.png) |
| 32 |
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/teapot.pdf DESTINATION share/doc/teapot) |
| 33 |
- set(HELPFILE "${CMAKE_INSTALL_PREFIX}/share/doc/teapot/index.html") |
| 34 |
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION share/doc/${PF} FILES_MATCHING PATTERN *.html PATTERN *.png) |
| 35 |
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/teapot.pdf DESTINATION share/doc/${PF}) |
| 36 |
+ set(HELPFILE "${CMAKE_INSTALL_PREFIX}/share/doc/${PF}/html/index.html") |
| 37 |
endif () |
| 38 |
|
| 39 |
-install(FILES COPYING README DESTINATION share/doc/teapot) |
| 40 |
+install(FILES README DESTINATION share/doc/teapot) |
| 41 |
install(FILES teapot.1 DESTINATION share/man/man1) |
| 42 |
|
| 43 |
add_custom_target(dist |
| 44 |
|
| 45 |
|
| 46 |
|
| 47 |
1.1 app-office/teapot/files/teapot-2.3.0-helpfile.patch |
| 48 |
|
| 49 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/teapot/files/teapot-2.3.0-helpfile.patch?rev=1.1&view=markup |
| 50 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/teapot/files/teapot-2.3.0-helpfile.patch?rev=1.1&content-type=text/plain |
| 51 |
|
| 52 |
Index: teapot-2.3.0-helpfile.patch |
| 53 |
=================================================================== |
| 54 |
This fixes a bug where HELPFILE was being overridden by a hard coded path |
| 55 |
|
| 56 |
This also fixes an issue with fl_filename_absolute returning a relative path |
| 57 |
preventing fteapot from finding its helpfile when started from any directory |
| 58 |
except / |
| 59 |
|
| 60 |
Patch by Kevin McCarthy <signals42@×××××.com> |
| 61 |
|
| 62 |
--- teapot-2.3.0/fteapot.fl |
| 63 |
+++ teapot-2.3.0/fteapot.fl |
| 64 |
@@ -5,6 +5,10 @@ |
| 65 |
decl {\#include <stdint.h>} {private global |
| 66 |
} |
| 67 |
|
| 68 |
+decl {\#include "config.h"} {private global |
| 69 |
+} |
| 70 |
+ |
| 71 |
+ |
| 72 |
decl {\#include <limits.h>} {private global |
| 73 |
} |
| 74 |
|
| 75 |
@@ -824,9 +828,9 @@ |
| 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, size, argv0); |
| 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 |
|
| 86 |
// Check if help exists in default installed location, fallback value is valid for build directory |
Archives