summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2008-11-02 08:11:07 +0000
committerMike Frysinger <vapier@gentoo.org>2008-11-02 08:11:07 +0000
commit04e70dd09ee54c374ad249133416fe0d3ed20f10 (patch)
tree58b7378aa4d2c3458958f96827ff9fdb238a5bdd /dev-libs/chmlib/files
parentAdd ppc64 love for KDE 4. (diff)
downloadgentoo-2-04e70dd09ee54c374ad249133416fe0d3ed20f10.tar.gz
gentoo-2-04e70dd09ee54c374ad249133416fe0d3ed20f10.tar.bz2
gentoo-2-04e70dd09ee54c374ad249133416fe0d3ed20f10.zip
Decrappify this ebuild and package and add ppc64 love for KDE 4.
(Portage version: 2.2_rc12/cvs/Linux 2.6.26.2 x86_64)
Diffstat (limited to 'dev-libs/chmlib/files')
-rw-r--r--dev-libs/chmlib/files/chmlib-0.39-headers.patch32
-rw-r--r--dev-libs/chmlib/files/chmlib-0.39-stdtypes.patch20
2 files changed, 52 insertions, 0 deletions
diff --git a/dev-libs/chmlib/files/chmlib-0.39-headers.patch b/dev-libs/chmlib/files/chmlib-0.39-headers.patch
new file mode 100644
index 000000000000..0b2421a867ce
--- /dev/null
+++ b/dev-libs/chmlib/files/chmlib-0.39-headers.patch
@@ -0,0 +1,32 @@
+--- src/chm_http.c
++++ src/chm_http.c
+@@ -34,6 +34,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <unistd.h>
+ #if __sun || __sgi
+ #include <strings.h>
+ #endif
+@@ -42,6 +43,7 @@
+ #include <sys/socket.h>
+ #include <sys/types.h>
+ #include <netinet/in.h>
++#include <arpa/inet.h>
+
+ /* threading includes */
+ #include <pthread.h>
+--- src/extract_chmLib.c
++++ src/extract_chmLib.c
+@@ -27,11 +27,7 @@
+ #define snprintf _snprintf
+ #define rindex strrchr
+ #else
+-#if __i386__
+ #include <string.h>
+-#else
+-#include <strings.h>
+-#endif
+ #include <unistd.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
diff --git a/dev-libs/chmlib/files/chmlib-0.39-stdtypes.patch b/dev-libs/chmlib/files/chmlib-0.39-stdtypes.patch
new file mode 100644
index 000000000000..0f9232017689
--- /dev/null
+++ b/dev-libs/chmlib/files/chmlib-0.39-stdtypes.patch
@@ -0,0 +1,20 @@
+--- src/chm_lib.c
++++ src/chm_lib.c
+@@ -149,6 +149,17 @@ typedef unsigned __int32 UInt32;
+ typedef __int64 Int64;
+ typedef unsigned __int64 UInt64;
+
++/* Linux: use C standard types */
++#elif defined(__linux__)
++#include <stdint.h>
++typedef unsigned char UChar;
++typedef int16_t Int16;
++typedef uint16_t UInt16;
++typedef int32_t Int32;
++typedef uint32_t UInt32;
++typedef int64_t Int64;
++typedef uint64_t UInt64;
++
+ /* I386, 32-bit, non-Windows */
+ /* Sparc */
+ /* MIPS */