Author: mandree
Date: Fri Aug 15 17:20:46 2014
New Revision: 365004
URL: http://svnweb.freebsd.org/changeset/ports/365004
QAT: https://qat.redports.org/buildarchive/r365004/
Log:
Fix a few of its glaring bugs around type widths.
Find newer BerkeleyDB versions.
Link with PNG again.
Added:
head/print/panda/files/patch-utility.c (contents, props changed)
Deleted:
head/print/panda/files/patch-configure
Modified:
head/print/panda/Makefile
head/print/panda/files/patch-database.c
head/print/panda/files/patch-images.c
head/print/panda/files/patch-objects.c
Modified: head/print/panda/Makefile
==============================================================================
--- head/print/panda/Makefile Fri Aug 15 17:04:41 2014 (r365003)
+++ head/print/panda/Makefile Fri Aug 15 17:20:46 2014 (r365004)
@@ -3,7 +3,7 @@
PORTNAME= panda
PORTVERSION= 0.5.4
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= print
MASTER_SITES= SF \
SAVANNAH \
@@ -26,7 +26,8 @@ CONFIGURE_ARGS= --enable-berkeley-db
USE_LDCONFIG= yes
OPTIONS_DEFINE= DOCS EXAMPLES
-CPPFLAGS+= -I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+CPPFLAGS+= -I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include -DHAVE_LIBPNG ${PTHREAD_CFLAGS}
+LIBS+= -lpng
LDFLAGS+= -L${BDB_LIB_DIR} -L${LOCALBASE}/lib ${PTHREAD_LIBS}
post-extract:
@@ -35,8 +36,9 @@ post-extract:
.endfor
post-patch:
- @${REINPLACE_CMD} -e 's| -lpanda| $$(top_srcdir)/libpanda.la|g' \
+ ${REINPLACE_CMD} -e 's| -lpanda| $$(top_srcdir)/libpanda.la|g' \
${WRKSRC}/examples/Makefile.in
+ ${REINPLACE_CMD} -e 's,-ldb,-l${BDB_LIB_NAME},' ${WRKSRC}/configure
post-install:
${INSTALL_MAN} ${WRKSRC}/man/panda_*.3 ${STAGEDIR}${MANPREFIX}/man/man3
Modified: head/print/panda/files/patch-database.c
==============================================================================
--- head/print/panda/files/patch-database.c Fri Aug 15 17:04:41 2014 (r365003)
+++ head/print/panda/files/patch-database.c Fri Aug 15 17:20:46 2014 (r365004)
@@ -1,5 +1,5 @@
---- database.c.orig Tue Apr 13 09:46:24 2004
-+++ database.c Fri Apr 16 01:13:10 2004
+--- ./database.c.orig 2004-04-13 02:46:24.000000000 +0200
++++ ./database.c 2014-08-15 19:09:39.000000000 +0200
@@ -160,6 +160,12 @@
panda_windbwrite (document, key, value);
#else
@@ -13,17 +13,17 @@
#if defined DEBUG
printf ("Storing (%s, %s) in 0x%08x\n", key, value, document->db);
#endif
-@@ -168,13 +174,6 @@
- panda_error (panda_true, "Cannot store null key\n");
+@@ -169,13 +175,6 @@
if (value == NULL)
panda_error (panda_true, "Cannot store null value\n");
--
+
-#ifdef USE_EDB
-
- e_db_data_set((E_DB_File *)document->db, key, value, strlen(value)+1);
-#else
- DBT db_key, db_data;
- int ec;
-
+-
memset(&db_key, 0, sizeof(db_key));
memset(&db_data, 0, sizeof(db_data));
+ db_key.data = key;
Modified: head/print/panda/files/patch-images.c
==============================================================================
--- head/print/panda/files/patch-images.c Fri Aug 15 17:04:41 2014 (r365003)
+++ head/print/panda/files/patch-images.c Fri Aug 15 17:20:46 2014 (r365004)
@@ -1,5 +1,14 @@
---- images.c.orig 2004-04-13 02:46:24.000000000 +0200
-+++ images.c 2010-03-29 12:55:47.000000000 +0200
+--- ./images.c.orig 2004-04-13 02:46:24.000000000 +0200
++++ ./images.c 2014-08-15 19:11:07.000000000 +0200
+@@ -835,7 +835,7 @@
+ panda_object * imageObj, char *filename)
+ {
+ FILE *image;
+- unsigned long width, height;
++ png_uint_32 width, height;
+ int bitdepth, colourtype, outColourType;
+ png_uint_32 i, rowbytes;
+ png_structp png;
@@ -854,7 +854,7 @@
// Check that it really is a PNG file
@@ -9,6 +18,15 @@
panda_error (panda_true, "PNG file was invalid");
// Start decompressing
+@@ -1399,7 +1399,7 @@
+ panda_imagesizePNG (int *width, int *height, char *filename)
+ {
+ FILE * image;
+- unsigned long pwidth, pheight;
++ png_uint_32 pwidth, pheight;
+ int bitdepth, colourtype;
+ png_structp png;
+ png_infop info;
@@ -1411,7 +1411,7 @@
// Check that it really is a PNG file
Modified: head/print/panda/files/patch-objects.c
==============================================================================
--- head/print/panda/files/patch-objects.c Fri Aug 15 17:04:41 2014 (r365003)
+++ head/print/panda/files/patch-objects.c Fri Aug 15 17:20:46 2014 (r365004)
@@ -1,5 +1,5 @@
---- objects.c.orig Tue Apr 13 09:46:24 2004
-+++ objects.c Wed Jun 27 23:25:53 2007
+--- ./objects.c.orig 2004-04-13 02:46:24.000000000 +0200
++++ ./objects.c 2014-08-15 19:09:39.000000000 +0200
@@ -99,7 +99,7 @@
created->children = (panda_child *) panda_xmalloc (sizeof (panda_child));
Added: head/print/panda/files/patch-utility.c
==============================================================================
Binary file. No diff available.