[108159] trunk/dports/python/py-chm

[devans at macports.org]

Revision: 108159
          https://trac.macports.org/changeset/108159
Author:   devans at macports.org
Date:     2013-07-14 19:38:01 -0700 (Sun, 14 Jul 2013)
Log Message:
-----------
py-chm: fix undefined symbol in extra.so, closes #39713.

Modified Paths:
--------------
    trunk/dports/python/py-chm/Portfile

Added Paths:
-----------
    trunk/dports/python/py-chm/files/
    trunk/dports/python/py-chm/files/patch-no-inline.diff

Modified: trunk/dports/python/py-chm/Portfile
===================================================================
--- trunk/dports/python/py-chm/Portfile	2013-07-14 22:12:48 UTC (rev 108158)
+++ trunk/dports/python/py-chm/Portfile	2013-07-15 02:38:01 UTC (rev 108159)
@@ -5,6 +5,7 @@
 
 name			py-chm
 version			0.8.4
+revision                1
 categories		python textproc
 platforms		darwin
 maintainers		jameskyle
@@ -21,6 +22,8 @@
 if {$subport != $name} {
     depends_lib-append	port:chmlib
 
+    patchfiles          patch-no-inline.diff
+
     build.env	CFLAGS=-I${prefix}/include \
 				LDFLAGS=-L${prefix}/lib
 

Added: trunk/dports/python/py-chm/files/patch-no-inline.diff
===================================================================
--- trunk/dports/python/py-chm/files/patch-no-inline.diff	                        (rev 0)
+++ trunk/dports/python/py-chm/files/patch-no-inline.diff	2013-07-15 02:38:01 UTC (rev 108159)
@@ -0,0 +1,72 @@
+--- chm/extra.c.orig	2013-07-10 11:20:33.000000000 -0700
++++ chm/extra.c	2013-07-10 11:21:36.000000000 -0700
+@@ -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 @@
+     b[3]<<24;
+ }
+ 
+-inline uint64_t 
++uint64_t 
+ get_uint64 (uint8_t* b) {
+   return b[0]           |
+     b[1]<<8             |
+@@ -96,7 +96,7 @@
+     (uint64_t) b[7]<<56;
+ }
+ 
+-inline uint64_t 
++uint64_t 
+ be_encint (unsigned char *buffer, size_t *length)
+ {
+   uint64_t result = 0;
+@@ -117,7 +117,7 @@
+   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 @@
+ }
+ 
+ 
+-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 @@
+ }
+ 
+             
+-inline uint32_t
++uint32_t
+ get_leaf_node_offset(struct chmFile *chmfile,
+                      const char *text,
+                      uint32_t initial_offset,
+@@ -294,7 +294,7 @@
+   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,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130714/6f13148b/attachment-0001.html>