svn commit: r391359 - in head/textproc/pychm: . files
Ruslan Makhmatkhanov
rm at FreeBSD.org
Sun Jul 5 10:05:38 UTC 2015
Author: rm
Date: Sun Jul 5 10:05:36 2015
New Revision: 391359
URL: https://svnweb.freebsd.org/changeset/ports/391359
Log:
textproc/pychm: fix runtime
- fix missing symbol _get_leaf_node_offset which causes chm2pdf to exit
- pass maintainership to submitter
- bump PORTREVISION
While here, limit python version to 2.x, since it doesn't build with 3.x and
convert to autoplist.
PR: 201351
Submitted by: Carlos Jacobo Puga Medina <cpm at fbsd.es>
Added:
head/textproc/pychm/files/
head/textproc/pychm/files/patch-chm_extra.c (contents, props changed)
Deleted:
head/textproc/pychm/pkg-plist
Modified:
head/textproc/pychm/Makefile
Modified: head/textproc/pychm/Makefile
==============================================================================
--- head/textproc/pychm/Makefile Sun Jul 5 09:40:27 2015 (r391358)
+++ head/textproc/pychm/Makefile Sun Jul 5 10:05:36 2015 (r391359)
@@ -3,10 +3,11 @@
PORTNAME= pychm
PORTVERSION= 0.8.4
+PORTREVISION= 1
CATEGORIES= textproc python
MASTER_SITES= SF/gnochm/${PORTNAME}/${PORTVERSION}
-MAINTAINER= ports at FreeBSD.org
+MAINTAINER= cpm at fbsd.es
COMMENT= Bindings for CHMLIB library
LICENSE= GPLv2 # or later
@@ -15,8 +16,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libchm.so:${PORTSDIR}/misc/chmlib
NO_BUILD= yes
-USES= python
-USE_PYTHON= distutils
+USES= python:2
+USE_PYTHON= autoplist distutils
.include <bsd.port.pre.mk>
Added: head/textproc/pychm/files/patch-chm_extra.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/textproc/pychm/files/patch-chm_extra.c Sun Jul 5 10:05:36 2015 (r391359)
@@ -0,0 +1,63 @@
+--- chm/extra.c.orig 2015-07-05 03:15:19 UTC
++++ chm/extra.c
+@@ -70,13 +70,13 @@
+
+ #define FREE(x) free (x); x = NULL
+
+-inline uint16_t
++uint16_t
+ get_uint16 (uint8_t* b) {
+ return b[0] |
+ b[1]<<8;
+ }
+
+-inline uint32_t
++uint32_t
+ get_uint32 (uint8_t* b) {
+ return b[0] |
+ b[1]<<8 |
+@@ -84,7 +84,7 @@ get_uint32 (uint8_t* b) {
+ b[3]<<24;
+ }
+
+-inline uint64_t
++uint64_t
+ get_uint64 (uint8_t* b) {
+ return b[0] |
+ b[1]<<8 |
+@@ -117,7 +117,7 @@ be_encint (unsigned char *buffer, size_t
+ Finds the first unset bit in memory. Returns the number of set bits found.
+ Returns -1 if the buffer runs out before we find an unset bit.
+ */
+-inline int
++int
+ ffus (unsigned char* byte, int* bit, size_t *length) {
+ int bits = 0;
+ *length = 0;
+@@ -144,7 +144,7 @@ ffus (unsigned char* byte, int* bit, siz
+ }
+
+
+-inline uint64_t
++uint64_t
+ sr_int(unsigned char* byte, int* bit,
+ unsigned char s, unsigned char r, size_t *length)
+ {
+@@ -221,7 +221,7 @@ sr_int(unsigned char* byte, int* bit,
+ }
+
+
+-inline uint32_t
++uint32_t
+ get_leaf_node_offset(struct chmFile *chmfile,
+ const char *text,
+ uint32_t initial_offset,
+@@ -294,7 +294,7 @@ get_leaf_node_offset(struct chmFile *chm
+ return initial_offset;
+ }
+
+-inline int
++int
+ pychm_process_wlc (struct chmFile *chmfile,
+ uint64_t wlc_count, uint64_t wlc_size,
+ uint32_t wlc_offset, unsigned char ds,
More information about the svn-ports-all
mailing list