diff options
| author | Koop Mast <kwm@FreeBSD.org> | 2011-10-31 09:53:19 +0000 |
|---|---|---|
| committer | Koop Mast <kwm@FreeBSD.org> | 2011-10-31 09:53:19 +0000 |
| commit | a829062c83aee6625059c5ad9fb89c6e27af9380 (patch) | |
| tree | 7a15d028c353a432bd5f8afb975ff1e54173011b | |
| parent | ae14a86c45aa3a9888499befe14d67e9dec2c3b6 (diff) | |
| download | ports-a829062c83aee6625059c5ad9fb89c6e27af9380.tar.gz ports-a829062c83aee6625059c5ad9fb89c6e27af9380.zip | |
Notes
61 files changed, 713 insertions, 227 deletions
@@ -2841,3 +2841,4 @@ devel/py-reverse||2011-10-27|Has expired: Now part of pylint devel/py-vmaps||2011-10-27|Has expired: Author recommends using math/py-numpy instead devel/rubygem-rack-protection||2011-10-28|Removed graphics/tumbler|deskutils/xfce4-tumbler|2011-10-29|Duplicate +graphics/poppler-gtk|graphics/poppler-glib|2011-10-31|Move to match library name diff --git a/converters/pdf2djvu/Makefile b/converters/pdf2djvu/Makefile index 24d178448d54..557830905569 100644 --- a/converters/pdf2djvu/Makefile +++ b/converters/pdf2djvu/Makefile @@ -7,7 +7,7 @@ PORTNAME= pdf2djvu PORTVERSION= 0.5.11 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= converters MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} DISTNAME= ${PORTNAME}_${PORTVERSION}${EXTRACT_SUFFIX} @@ -16,7 +16,7 @@ MAINTAINER= darcsis@gmail.com COMMENT= Pdf2djvu creates DjVu files from PDF files BUILD_DEPENDS= ${LOCALBASE}/include/pstreams/pstream.h:${PORTSDIR}/devel/pstreams -LIB_DEPENDS= poppler.13:${PORTSDIR}/graphics/poppler +LIB_DEPENDS= poppler.18:${PORTSDIR}/graphics/poppler LIB_DEPENDS+= djvulibre.24:${PORTSDIR}/graphics/djvulibre-nox11 GNU_CONFIGURE= yes diff --git a/converters/pdf2djvu/files/patch-pdf-backend.hh b/converters/pdf2djvu/files/patch-pdf-backend.hh new file mode 100644 index 000000000000..67d3669597f1 --- /dev/null +++ b/converters/pdf2djvu/files/patch-pdf-backend.hh @@ -0,0 +1,14 @@ +--- pdf-backend.hh.orig 2011-10-23 16:16:08.000000000 +0000 ++++ pdf-backend.hh 2011-10-23 16:17:13.000000000 +0000 +@@ -77,7 +77,11 @@ + + namespace link + { ++#if POPPLER_VERSION < 1700 + typedef ::Link Link; ++#else ++ typedef ::AnnotLink Link; ++#endif + typedef ::LinkAction Action; + typedef ::LinkDest Destination; + typedef ::LinkGoTo GoTo; diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile index f307cb7bcbb0..73ae50694866 100644 --- a/deskutils/calibre/Makefile +++ b/deskutils/calibre/Makefile @@ -7,6 +7,7 @@ PORTNAME= calibre PORTVERSION= 0.8.21 +PORTREVISION= 1 CATEGORIES= deskutils python MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}/ diff --git a/deskutils/calibre/files/patch-src_calibre_ebooks_pdf_reflow.cpp b/deskutils/calibre/files/patch-src_calibre_ebooks_pdf_reflow.cpp new file mode 100644 index 000000000000..9f13078ba714 --- /dev/null +++ b/deskutils/calibre/files/patch-src_calibre_ebooks_pdf_reflow.cpp @@ -0,0 +1,14 @@ +--- src/calibre/ebooks/pdf/reflow.cpp.orig 2011-10-26 01:52:43.000000000 +0000 ++++ src/calibre/ebooks/pdf/reflow.cpp 2011-10-26 12:02:17.000000000 +0000 +@@ -625,11 +625,7 @@ static string get_link_dest(LinkAction * + return oss.str(); + } + +-#if (POPPLER_MAJOR_VERSION == 0) && (POPPLER_MINOR_VERSION < 17) +-void XMLOutputDev::process_link(Link* link){ +-#else + void XMLOutputDev::process_link(AnnotLink* link){ +-#endif + + double _x1, _y1, _x2, _y2; + int x1, y1, x2, y2; diff --git a/deskutils/calibre/files/patch-src_calibre_ebooks_pdf_reflow.h b/deskutils/calibre/files/patch-src_calibre_ebooks_pdf_reflow.h new file mode 100644 index 000000000000..47ab911dcd79 --- /dev/null +++ b/deskutils/calibre/files/patch-src_calibre_ebooks_pdf_reflow.h @@ -0,0 +1,14 @@ +--- src/calibre/ebooks/pdf/reflow.h.orig 2011-10-26 12:04:54.000000000 +0000 ++++ src/calibre/ebooks/pdf/reflow.h 2011-10-26 12:09:04.000000000 +0000 +@@ -244,11 +244,7 @@ class XMLOutputDev : public OutputDev { + XMLImages *images; + PDFDoc *doc; + +-#if (POPPLER_MAJOR_VERSION == 0) && (POPPLER_MINOR_VERSION < 17) +- void process_link(Link* link); +-#else + void process_link(AnnotLink* link); +-#endif + + }; + } diff --git a/deskutils/xfce4-tumbler/Makefile b/deskutils/xfce4-tumbler/Makefile index 2b093da99cd5..9188b93ce8b7 100644 --- a/deskutils/xfce4-tumbler/Makefile +++ b/deskutils/xfce4-tumbler/Makefile @@ -7,6 +7,7 @@ PORTNAME= tumbler PORTVERSION= 0.1.22 +PORTREVISION= 1 CATEGORIES= deskutils xfce MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR= src/xfce/${PORTNAME}/${PORTVERSION:R} @@ -96,7 +97,7 @@ PLIST_SUB+= FFMPEG="@comment " .endif .if !defined(WITHOUT_POPPLER) -LIB_DEPENDS+= poppler-glib.6:${PORTSDIR}/graphics/poppler-gtk +LIB_DEPENDS+= poppler-glib.8:${PORTSDIR}/graphics/poppler-glib CONFIGURE_ARGS+=--enable-poppler-thumbnailer PLIST_SUB+= POPPLER="" .else diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile index 85b8008a08fc..6283e0405fea 100644 --- a/editors/calligra/Makefile +++ b/editors/calligra/Makefile @@ -7,7 +7,7 @@ PORTNAME= koffice PORTVERSION= 2.3.3 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= editors kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KOFFICE2_BRANCH}/${PORTNAME}-${PORTVERSION}/ diff --git a/editors/koffice-kde3/Makefile b/editors/koffice-kde3/Makefile index 046f71b6bcc1..4806e78fb877 100644 --- a/editors/koffice-kde3/Makefile +++ b/editors/koffice-kde3/Makefile @@ -26,7 +26,6 @@ LIB_DEPENDS= GraphicsMagick++.1:${PORTSDIR}/graphics/GraphicsMagick \ freetype.9:${PORTSDIR}/print/freetype2 \ lcms.1:${PORTSDIR}/graphics/lcms \ paper.2:${PORTSDIR}/print/libpaper \ - poppler-qt.3:${PORTSDIR}/graphics/poppler-qt \ wpd-0.8.8:${PORTSDIR}/textproc/libwpd08 \ wv2.4:${PORTSDIR}/textproc/wv2 RUN_DEPENDS= ${LOCALBASE}/lib/libpqxx.a:${PORTSDIR}/databases/postgresql-libpqxx diff --git a/editors/koffice-kde4/Makefile b/editors/koffice-kde4/Makefile index 85b8008a08fc..6283e0405fea 100644 --- a/editors/koffice-kde4/Makefile +++ b/editors/koffice-kde4/Makefile @@ -7,7 +7,7 @@ PORTNAME= koffice PORTVERSION= 2.3.3 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= editors kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KOFFICE2_BRANCH}/${PORTNAME}-${PORTVERSION}/ diff --git a/editors/libreoffice-legacy/Makefile b/editors/libreoffice-legacy/Makefile index 1f7275e0ccb3..5ddc4796df24 100644 --- a/editors/libreoffice-legacy/Makefile +++ b/editors/libreoffice-legacy/Makefile @@ -7,7 +7,7 @@ PORTNAME= libreoffice PORTVERSION= 3.3.3 -PORTREVISION= 3 +PORTREVISION= 4 LOVERSION= ${PORTVERSION}.1 CATEGORIES= editors MASTER_SITES= http://ftp.osuosl.org/pub/tdf/libreoffice/src/ \ @@ -90,7 +90,7 @@ LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo \ jpeg.11:${PORTSDIR}/graphics/jpeg \ curl.6:${PORTSDIR}/ftp/curl \ hunspell-1.3.0:${PORTSDIR}/textproc/hunspell \ - poppler.13:${PORTSDIR}/graphics/poppler \ + poppler-glib.8:${PORTSDIR}/graphics/poppler-glib \ wpd-0.9.9:${PORTSDIR}/textproc/libwpd \ wpg-0.2.2:${PORTSDIR}/graphics/libwpg \ wps-0.2.2:${PORTSDIR}/textproc/libwps \ diff --git a/editors/libreoffice-legacy/files/patch-build__libreoffice__sdext__source__pdfimport__xpdfwrapper__pdfioutdev_gpl.cxx b/editors/libreoffice-legacy/files/patch-build__libreoffice__sdext__source__pdfimport__xpdfwrapper__pdfioutdev_gpl.cxx new file mode 100644 index 000000000000..8a1a054775d2 --- /dev/null +++ b/editors/libreoffice-legacy/files/patch-build__libreoffice__sdext__source__pdfimport__xpdfwrapper__pdfioutdev_gpl.cxx @@ -0,0 +1,20 @@ +--- ./build/libreoffice/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig 2010-11-11 16:03:29.000000000 +0000 ++++ ./build/libreoffice/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2011-10-29 17:46:20.000000000 +0000 +@@ -150,7 +150,7 @@ + void writeJpeg_( OutputBuffer& o_rOutputBuf, Stream* str, bool bWithLinefeed ) + { + // dump JPEG file as-is +- str = ((DCTStream *)str)->getRawStream(); ++ str = str->getBaseStream(); + str->reset(); + + int c; +@@ -489,7 +489,7 @@ + printf("endPage\n"); + } + +-void PDFOutDev::processLink(Link* link, Catalog*) ++void PDFOutDev::processLink(AnnotLink* link, Catalog*) + { + assert(link); + diff --git a/editors/libreoffice-legacy/files/patch-build__libreoffice__sdext__source__pdfimport__xpdfwrapper__pdfioutdev_gpl.hxx b/editors/libreoffice-legacy/files/patch-build__libreoffice__sdext__source__pdfimport__xpdfwrapper__pdfioutdev_gpl.hxx new file mode 100644 index 000000000000..f6234c7d1076 --- /dev/null +++ b/editors/libreoffice-legacy/files/patch-build__libreoffice__sdext__source__pdfimport__xpdfwrapper__pdfioutdev_gpl.hxx @@ -0,0 +1,22 @@ +--- ./build/libreoffice/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx.orig 2010-11-11 16:03:29.000000000 +0000 ++++ ./build/libreoffice/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx 2011-10-29 17:47:36.000000000 +0000 +@@ -65,7 +65,10 @@ + class GfxFont; + class PDFDoc; + #ifndef SYSTEM_POPPLER ++#define POPPLER_CHECK_VERSION(major, minor, micro) (0) + typedef GString GooString; ++#else ++#include <glib/poppler-features.h> + #endif + + namespace pdfi +@@ -195,7 +198,7 @@ + // virtual void cvtUserToDev(double ux, double uy, int *dx, int *dy); + + //----- link borders +- virtual void processLink(Link *link, Catalog *catalog); ++ virtual void processLink(AnnotLink *link, Catalog *catalog); + + //----- save/restore graphics state + virtual void saveState(GfxState *state); diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile index ae59ed24b2d1..5588e76ac2c5 100644 --- a/editors/libreoffice/Makefile +++ b/editors/libreoffice/Makefile @@ -7,7 +7,7 @@ PORTNAME= libreoffice PORTVERSION= 3.4.3 -PORTREVISION= 1 +PORTREVISION= 2 LOVERSION= ${PORTVERSION}.2 CATEGORIES= editors MASTER_SITES= http://ftp.osuosl.org/pub/tdf/libreoffice/src/${PORTVERSION}/ \ @@ -91,7 +91,7 @@ LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo \ hunspell-1.3.0:${PORTSDIR}/textproc/hunspell \ mythes-1.2.0:${PORTSDIR}/textproc/mythes \ hyphen.2:${PORTSDIR}/textproc/hyphen \ - poppler.13:${PORTSDIR}/graphics/poppler \ + poppler-glib.8:${PORTSDIR}/graphics/poppler-glib \ wpd-0.9.9:${PORTSDIR}/textproc/libwpd \ wpg-0.2.2:${PORTSDIR}/graphics/libwpg \ wps-0.2.2:${PORTSDIR}/textproc/libwps \ diff --git a/editors/libreoffice/files/patch-clone__extensions__sdext__source__pdfimport__xpdfwrapper__pdfioutdev_gpl.cxx b/editors/libreoffice/files/patch-clone__extensions__sdext__source__pdfimport__xpdfwrapper__pdfioutdev_gpl.cxx new file mode 100644 index 000000000000..59a896b3d577 --- /dev/null +++ b/editors/libreoffice/files/patch-clone__extensions__sdext__source__pdfimport__xpdfwrapper__pdfioutdev_gpl.cxx @@ -0,0 +1,11 @@ +--- clone/extensions/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig 2011-10-26 13:23:40.000000000 +0000 ++++ clone/extensions/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2011-10-26 13:23:57.000000000 +0000 +@@ -489,7 +489,7 @@ void PDFOutDev::endPage() + printf("endPage\n"); + } + +-void PDFOutDev::processLink(Link* link, Catalog*) ++void PDFOutDev::processLink(AnnotLink* link, Catalog*) + { + assert(link); + diff --git a/editors/libreoffice/files/patch-clone__extensions__sdext__source__pdfimport__xpdfwrapper__pdfioutdev_gpl.hxx b/editors/libreoffice/files/patch-clone__extensions__sdext__source__pdfimport__xpdfwrapper__pdfioutdev_gpl.hxx new file mode 100644 index 000000000000..b891f3d08615 --- /dev/null +++ b/editors/libreoffice/files/patch-clone__extensions__sdext__source__pdfimport__xpdfwrapper__pdfioutdev_gpl.hxx @@ -0,0 +1,22 @@ +--- clone/extensions/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx.orig 2011-05-19 09:14:21.000000000 +0000 ++++ clone/extensions/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx 2011-10-29 20:19:33.000000000 +0000 +@@ -65,7 +65,10 @@ class GfxPath; + class GfxFont; + class PDFDoc; + #ifndef SYSTEM_POPPLER ++#define POPPLER_CHECK_VERSION(major,minor,micro) (0) + typedef GString GooString; ++#else ++#include <glib/poppler-features.h> + #endif + + namespace pdfi +@@ -195,7 +198,7 @@ namespace pdfi + // virtual void cvtUserToDev(double ux, double uy, int *dx, int *dy); + + //----- link borders +- virtual void processLink(Link *link, Catalog *catalog); ++ virtual void processLink(AnnotLink *link, Catalog *catalog); + + //----- save/restore graphics state + virtual void saveState(GfxState *state); diff --git a/editors/texmaker/Makefile b/editors/texmaker/Makefile index d5dbafc91531..d32ca012cb13 100644 --- a/editors/texmaker/Makefile +++ b/editors/texmaker/Makefile @@ -8,6 +8,7 @@ PORTNAME= texmaker PORTVERSION= 3.1 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= editors MASTER_SITES= http://www.xm1math.net/texmaker/ @@ -15,7 +16,7 @@ MASTER_SITES= http://www.xm1math.net/texmaker/ MAINTAINER= makc@FreeBSD.org COMMENT= LaTeX Development Environment -LIB_DEPENDS= poppler.13:${PORTSDIR}/graphics/poppler \ +LIB_DEPENDS= poppler.18:${PORTSDIR}/graphics/poppler \ poppler-qt4.3:${PORTSDIR}/graphics/poppler-qt4 RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX-base \ dvips:${PORTSDIR}/print/dvipsk-tetex \ diff --git a/editors/texmakerx/Makefile b/editors/texmakerx/Makefile index 0717df3fc46b..85c59e480089 100644 --- a/editors/texmakerx/Makefile +++ b/editors/texmakerx/Makefile @@ -7,7 +7,7 @@ PORTNAME= texmakerx PORTVERSION= 2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= editors MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/TexMakerX%20${PORTVERSION} DISTNAME= ${PORTNAME}-${PORTVERSION:S:.0::} @@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S:.0::} MAINTAINER= lx@FreeBSD.org COMMENT= A LaTeX IDE derived from Texmaker -LIB_DEPENDS= poppler.13:${PORTSDIR}/graphics/poppler \ +LIB_DEPENDS= poppler.18:${PORTSDIR}/graphics/poppler \ poppler-qt4.3:${PORTSDIR}/graphics/poppler-qt4 RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX-base \ dvips:${PORTSDIR}/print/dvipsk-tetex \ diff --git a/editors/texworks/Makefile b/editors/texworks/Makefile index de11f4b4de28..ccf8ec72f964 100644 --- a/editors/texworks/Makefile +++ b/editors/texworks/Makefile @@ -7,7 +7,7 @@ PORTNAME= texworks PORTVERSION= 0.2.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= editors MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} diff --git a/graphics/Makefile b/graphics/Makefile index 2516dbced90f..6333874c945d 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -753,8 +753,7 @@ SUBDIR += podofo SUBDIR += poppler SUBDIR += poppler-data - SUBDIR += poppler-gtk - SUBDIR += poppler-qt + SUBDIR += poppler-glib SUBDIR += poppler-qt4 SUBDIR += poppler-utils SUBDIR += popplerkit diff --git a/graphics/apvlv/Makefile b/graphics/apvlv/Makefile index b77925da3798..efc785e75bee 100644 --- a/graphics/apvlv/Makefile +++ b/graphics/apvlv/Makefile @@ -7,6 +7,7 @@ PORTNAME= apvlv PORTVERSION= 0.1.2 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://cloud.github.com/downloads/naihe2010/apvlv/ DISTNAME= ${PORTNAME}-${PORTVERSION}-Source @@ -16,8 +17,9 @@ COMMENT= Apvlv is a PDF/DJVU Viewer and its behaviour like Vim LICENSE= GPLv2 -LIB_DEPENDS= poppler-glib.6:${PORTSDIR}/graphics/poppler-gtk +LIB_DEPENDS= poppler-glib.8:${PORTSDIR}/graphics/poppler-glib +USE_GNOME= gtk20 USE_CMAKE= yes MAKE_JOBS_SAFE= yes CMAKE_ARGS+= -DSYSCONFDIR=${PREFIX}/etc \ diff --git a/graphics/apvlv/files/patch-poppler-0.18 b/graphics/apvlv/files/patch-poppler-0.18 new file mode 100644 index 000000000000..44331aec7bb2 --- /dev/null +++ b/graphics/apvlv/files/patch-poppler-0.18 @@ -0,0 +1,151 @@ +http://bugs.gentoo.org/385057 +http://projects.archlinux.org/svntogit/community.git/tree/trunk/poppler-gdk.patch?h=packages/apvlv + +--- src/ApvlvFile.cpp ++++ src/ApvlvFile.cpp +@@ -29,6 +29,10 @@ + #include "ApvlvUtil.hpp" + #include "ApvlvView.hpp" + ++#ifndef POPPLER_WITH_GDK ++#include "poppler-gdk.h" ++#endif ++ + #ifdef HAVE_LIBUMD + #define LIBUMD_ENABLE_GTK + #include <umd.h> +--- src/poppler-gdk.h ++++ src/poppler-gdk.h +@@ -0,0 +1,132 @@ ++#include <goo/gtypes.h> ++ ++static void ++copy_cairo_surface_to_pixbuf (cairo_surface_t *surface, ++ GdkPixbuf *pixbuf) ++{ ++ int cairo_width, cairo_height, cairo_rowstride; ++ unsigned char *pixbuf_data, *dst, *cairo_data; ++ int pixbuf_rowstride, pixbuf_n_channels; ++ unsigned int *src; ++ int x, y; ++ ++ cairo_width = cairo_image_surface_get_width (surface); ++ cairo_height = cairo_image_surface_get_height (surface); ++ cairo_rowstride = cairo_image_surface_get_stride (surface); ++ cairo_data = cairo_image_surface_get_data (surface); ++ ++ pixbuf_data = gdk_pixbuf_get_pixels (pixbuf); ++ pixbuf_rowstride = gdk_pixbuf_get_rowstride (pixbuf); ++ pixbuf_n_channels = gdk_pixbuf_get_n_channels (pixbuf); ++ ++ if (cairo_width > gdk_pixbuf_get_width (pixbuf)) ++ cairo_width = gdk_pixbuf_get_width (pixbuf); ++ if (cairo_height > gdk_pixbuf_get_height (pixbuf)) ++ cairo_height = gdk_pixbuf_get_height (pixbuf); ++ for (y = 0; y < cairo_height; y++) ++ { ++ src = (unsigned int *) (cairo_data + y * cairo_rowstride); ++ dst = pixbuf_data + y * pixbuf_rowstride; ++ for (x = 0; x < cairo_width; x++) ++ { ++ dst[0] = (*src >> 16) & 0xff; ++ dst[1] = (*src >> 8) & 0xff; ++ dst[2] = (*src >> 0) & 0xff; ++ if (pixbuf_n_channels == 4) ++ dst[3] = (*src >> 24) & 0xff; ++ dst += pixbuf_n_channels; ++ src++; ++ } ++ } ++} ++ ++static void ++_poppler_page_render_to_pixbuf (PopplerPage *page, ++ int src_x, int src_y, ++ int src_width, int src_height, ++ double scale, ++ int rotation, ++ GBool printing, ++ GdkPixbuf *pixbuf) ++{ ++ cairo_t *cr; ++ cairo_surface_t *surface; ++ ++ surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, ++ src_width, src_height); ++ cr = cairo_create (surface); ++ cairo_save (cr); ++ switch (rotation) { ++ case 90: ++ cairo_translate (cr, src_x + src_width, -src_y); ++ break; ++ case 180: ++ cairo_translate (cr, src_x + src_width, src_y + src_height); ++ break; ++ case 270: ++ cairo_translate (cr, -src_x, src_y + src_height); ++ break; ++ default: ++ cairo_translate (cr, -src_x, -src_y); ++ } ++ ++ if (scale != 1.0) ++ cairo_scale (cr, scale, scale); ++ ++ if (rotation != 0) ++ cairo_rotate (cr, rotation * G_PI / 180.0); ++ ++ if (printing) ++ poppler_page_render_for_printing (page, cr); ++ else ++ poppler_page_render (page, cr); ++ cairo_restore (cr); ++ ++ cairo_set_operator (cr, CAIRO_OPERATOR_DEST_OVER); ++ cairo_set_source_rgb (cr, 1., 1., 1.); ++ cairo_paint (cr); ++ ++ cairo_destroy (cr); ++ ++ copy_cairo_surface_to_pixbuf (surface, pixbuf); ++ cairo_surface_destroy (surface); ++} ++ ++/** ++ * poppler_page_render_to_pixbuf: ++ * @page: the page to render from ++ * @src_x: x coordinate of upper left corner ++ * @src_y: y coordinate of upper left corner ++ * @src_width: width of rectangle to render ++ * @src_height: height of rectangle to render ++ * @scale: scale specified as pixels per point ++ * @rotation: rotate the document by the specified degree ++ * @pixbuf: pixbuf to render into ++ * ++ * First scale the document to match the specified pixels per point, ++ * then render the rectangle given by the upper left corner at ++ * (src_x, src_y) and src_width and src_height. ++ * This function is for rendering a page that will be displayed. ++ * If you want to render a page that will be printed use ++ * poppler_page_render_to_pixbuf_for_printing() instead ++ * ++ * Deprecated: 0.16 ++ **/ ++void ++poppler_page_render_to_pixbuf (PopplerPage *page, ++ int src_x, int src_y, ++ int src_width, int src_height, ++ double scale, ++ int rotation, ++ GdkPixbuf *pixbuf) ++{ ++ g_return_if_fail (POPPLER_IS_PAGE (page)); ++ g_return_if_fail (scale > 0.0); ++ g_return_if_fail (pixbuf != NULL); ++ ++ _poppler_page_render_to_pixbuf (page, src_x, src_y, ++ src_width, src_height, ++ scale, rotation, ++ gFalse, ++ pixbuf); ++} diff --git a/graphics/epdfview/Makefile b/graphics/epdfview/Makefile index 3a5e6bef471c..9da93bdbaf45 100644 --- a/graphics/epdfview/Makefile +++ b/graphics/epdfview/Makefile @@ -7,7 +7,7 @@ PORTNAME= epdfview PORTVERSION= 0.1.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics print gnome MASTER_SITES= http://trac.emma-soft.com/epdfview/chrome/site/releases/ \ http://mirror.slitaz.org/sources/packages/e/ @@ -16,7 +16,7 @@ MAINTAINER= sylvio@FreeBSD.org COMMENT= A lightweight PDF document viewer BUILD_DEPENDS= cppunit-config:${PORTSDIR}/devel/cppunit -LIB_DEPENDS= poppler-glib.6:${PORTSDIR}/graphics/poppler-gtk +LIB_DEPENDS= poppler-glib.8:${PORTSDIR}/graphics/poppler-glib LICENSE= GPLv2 diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile index 4d94d7ac9cc3..502fc7dadf17 100644 --- a/graphics/evince/Makefile +++ b/graphics/evince/Makefile @@ -8,7 +8,7 @@ PORTNAME= evince PORTVERSION= 2.32.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics print gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -17,7 +17,7 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME 2 multi-format document viewer BUILD_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme -LIB_DEPENDS= poppler-glib.6:${PORTSDIR}/graphics/poppler-gtk \ +LIB_DEPENDS= poppler-glib.8:${PORTSDIR}/graphics/poppler-glib \ spectre.1:${PORTSDIR}/print/libspectre RUN_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme diff --git a/graphics/gambas2-gb-pdf/files/patch-gb.pdf_src_CPdfDocument.cpp b/graphics/gambas2-gb-pdf/files/patch-gb.pdf_src_CPdfDocument.cpp index 65d1f7c279fc..b49d10f7289b 100644 --- a/graphics/gambas2-gb-pdf/files/patch-gb.pdf_src_CPdfDocument.cpp +++ b/graphics/gambas2-gb-pdf/files/patch-gb.pdf_src_CPdfDocument.cpp @@ -1,5 +1,5 @@ ---- gb.pdf/src/CPdfDocument.cpp.orig 2009-09-27 18:30:35.000000000 +0200 -+++ gb.pdf/src/CPdfDocument.cpp 2009-09-27 20:10:45.000000000 +0200 +--- gb.pdf/src/CPdfDocument.cpp.orig 2009-07-25 21:33:49.000000000 +0000 ++++ gb.pdf/src/CPdfDocument.cpp 2011-10-25 19:38:45.000000000 +0000 @@ -510,9 +510,15 @@ END_PROPERTY BEGIN_PROPERTY(PDFINFO_format) @@ -17,3 +17,15 @@ GB.ReturnNewZeroString(ctx); GB.Free(POINTER(&ctx)); +@@ -946,10 +952,7 @@ END_METHOD + ******************************************************************************/ + void aux_fill_links(void *_object) + { +- Object obj; +- +- THIS->links = new Links (THIS->page->getAnnots (&obj),THIS->doc->getCatalog()->getBaseURI ()); +- obj.free(); ++ THIS->links = new Links (THIS->page->getAnnots(THIS->doc->getCatalog())); + } + + BEGIN_PROPERTY (PDFPAGELINKS_count) diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile index c0df2d0ad759..4f0175209d48 100644 --- a/graphics/gimp-app/Makefile +++ b/graphics/gimp-app/Makefile @@ -155,7 +155,7 @@ CONFIGURE_ARGS+= --disable-mp .endif .if defined(WITH_POPPLER) -LIB_DEPENDS+= poppler-glib.6:${PORTSDIR}/graphics/poppler-gtk +LIB_DEPENDS+= poppler-glib.8:${PORTSDIR}/graphics/poppler-glib PLIST_SUB+= POPPLER="" .else CONFIGURE_ARGS+= --without-poppler diff --git a/graphics/gimp-app/files/patch-plugins_common_file-pdf.c b/graphics/gimp-app/files/patch-plugins_common_file-pdf.c new file mode 100644 index 000000000000..72017ebea56a --- /dev/null +++ b/graphics/gimp-app/files/patch-plugins_common_file-pdf.c @@ -0,0 +1,128 @@ +--- plug-ins/common/file-pdf.c.orig 2010-07-02 22:51:56.000000000 +0000 ++++ plug-ins/common/file-pdf.c 2011-10-23 19:29:37.000000000 +0000 +@@ -566,6 +566,84 @@ layer_from_pixbuf (gint32 image, + return layer; + } + ++static void ++copy_cairo_surface_to_pixbuf (cairo_surface_t *surface, ++ GdkPixbuf *pixbuf) ++{ ++ int cairo_width, cairo_height, cairo_rowstride; ++ unsigned char *pixbuf_data, *dst, *cairo_data; ++ int pixbuf_rowstride, pixbuf_n_channels; ++ unsigned int *src; ++ int x, y; ++ ++ cairo_width = cairo_image_surface_get_width (surface); ++ cairo_height = cairo_image_surface_get_height (surface); ++ cairo_rowstride = cairo_image_surface_get_stride (surface); ++ cairo_data = cairo_image_surface_get_data (surface); ++ ++ pixbuf_data = gdk_pixbuf_get_pixels (pixbuf); ++ pixbuf_rowstride = gdk_pixbuf_get_rowstride (pixbuf); ++ pixbuf_n_channels = gdk_pixbuf_get_n_channels (pixbuf); ++ ++ if (cairo_width > gdk_pixbuf_get_width (pixbuf)) ++ cairo_width = gdk_pixbuf_get_width (pixbuf); ++ if (cairo_height > gdk_pixbuf_get_height (pixbuf)) ++ cairo_height = gdk_pixbuf_get_height (pixbuf); ++ ++ for (y = 0; y < cairo_height; y++) ++ { ++ src = (unsigned int *) (cairo_data + y * cairo_rowstride); ++ dst = pixbuf_data + y * pixbuf_rowstride; ++ ++ for (x = 0; x < cairo_width; x++) ++ { ++ dst[0] = (*src >> 16) & 0xff; ++ dst[1] = (*src >> 8) & 0xff; ++ dst[2] = (*src >> 0) & 0xff; ++ ++ if (pixbuf_n_channels == 4) ++ dst[3] = (*src >> 24) & 0xff; ++ ++ dst += pixbuf_n_channels; ++ src++; ++ } ++ } ++} ++ ++static GdkPixbuf * ++render_page_to_pixbuf (PopplerPage *page, ++ int width, ++ int height, ++ double scale) ++{ ++ GdkPixbuf *pixbuf; ++ cairo_surface_t *surface; ++ cairo_t *cr; ++ ++ pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, width, height); ++ surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, width, height); ++ cr = cairo_create (surface); ++ ++ cairo_save (cr); ++ cairo_translate (cr, 0.0, 0.0); ++ ++ if (scale != 1.0) ++ cairo_scale (cr, scale, scale); ++ ++ poppler_page_render (page, cr); ++ cairo_restore (cr); ++ ++ cairo_set_operator (cr, CAIRO_OPERATOR_DEST_OVER); ++ cairo_set_source_rgb (cr, 1.0, 1.0, 1.0); ++ cairo_paint (cr); ++ ++ cairo_destroy (cr); ++ copy_cairo_surface_to_pixbuf (surface, pixbuf); ++ cairo_surface_destroy (surface); ++ ++ return pixbuf; ++} ++ + static gint32 + load_image (PopplerDocument *doc, + const gchar *filename, +@@ -597,7 +675,7 @@ load_image (PopplerDocument *doc, + gdouble page_width; + gdouble page_height; + +- GdkPixbuf *buf; ++ GdkPixbuf *pixbuf; + gint width; + gint height; + +@@ -627,15 +705,13 @@ load_image (PopplerDocument *doc, + gimp_image_set_resolution (image_ID, resolution, resolution); + } + +- buf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, width, height); ++ pixbuf = render_page_to_pixbuf (page, width, height, scale); + +- poppler_page_render_to_pixbuf (page, 0, 0, width, height, scale, 0, buf); +- +- layer_from_pixbuf (image_ID, page_label, i, buf, ++ layer_from_pixbuf (image_ID, page_label, i, pixbuf, + doc_progress, 1.0 / pages->n_pages); + + g_free (page_label); +- g_object_unref (buf); ++ g_object_unref (pixbuf); + + doc_progress = (double) (i + 1) / pages->n_pages; + gimp_progress_update (doc_progress); +@@ -712,11 +788,7 @@ get_thumbnail (PopplerDocument *doc, + width *= scale; + height *= scale; + +- pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, +- width, height); +- +- poppler_page_render_to_pixbuf (page, +- 0, 0, width, height, scale, 0, pixbuf); ++ pixbuf = render_page_to_pixbuf (page, width, height, scale); + } + + g_object_unref (page); diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile index bfc56b616095..4c0b8a16c944 100644 --- a/graphics/inkscape/Makefile +++ b/graphics/inkscape/Makefile @@ -7,7 +7,7 @@ PORTNAME= inkscape PORTVERSION= 0.48.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics gnome MASTER_SITES= SF MASTER_SITE_SUBDIR=${PORTNAME:L}/${PORTNAME:L}/0.48.1 @@ -54,7 +54,7 @@ CONFIGURE_ARGS+= --without-gnome-vfs .endif .if defined(WITH_POPPLER) -LIB_DEPENDS+= poppler-glib.6:${PORTSDIR}/graphics/poppler-gtk +LIB_DEPENDS+= poppler-glib.8:${PORTSDIR}/graphics/poppler-glib CONFIGURE_ARGS+= --enable-poppler-cairo .else CONFIGURE_ARGS+= --enable-poppler-cairo=no diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile index d2ab65e6cf73..fc1e17287907 100644 --- a/graphics/kdegraphics3/Makefile +++ b/graphics/kdegraphics3/Makefile @@ -23,8 +23,7 @@ LIB_DEPENDS= art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl \ freetype.9:${PORTSDIR}/print/freetype2 \ fribidi.3:${PORTSDIR}/converters/fribidi \ lcms.1:${PORTSDIR}/graphics/lcms \ - paper.2:${PORTSDIR}/print/libpaper \ - poppler-qt.3:${PORTSDIR}/graphics/poppler-qt + paper.2:${PORTSDIR}/print/libpaper CONFLICTS= kolourpaint-[0-9]* @@ -34,6 +33,7 @@ PREFIX= ${KDE_PREFIX} USE_GL= glut USE_BZIP2= yes USE_AUTOTOOLS= libtool +CONFIGURE_ARGS= --without-poppler USE_GMAKE= yes WANT_GNOME= yes USE_GHOSTSCRIPT=yes diff --git a/graphics/kdegraphics3/pkg-plist b/graphics/kdegraphics3/pkg-plist index 4e191ecdd3cc..f0dc148ae648 100644 --- a/graphics/kdegraphics3/pkg-plist +++ b/graphics/kdegraphics3/pkg-plist @@ -257,9 +257,6 @@ lib/kde3/kfile_jpeg.so lib/kde3/kfile_pcx.a lib/kde3/kfile_pcx.la lib/kde3/kfile_pcx.so -lib/kde3/kfile_pdf.a -lib/kde3/kfile_pdf.la -lib/kde3/kfile_pdf.so lib/kde3/kfile_png.a lib/kde3/kfile_png.la lib/kde3/kfile_png.so @@ -1181,7 +1178,6 @@ share/services/kfile_gif.desktop share/services/kfile_ico.desktop share/services/kfile_jpeg.desktop share/services/kfile_pcx.desktop -share/services/kfile_pdf.desktop share/services/kfile_png.desktop share/services/kfile_pnm.desktop share/services/kfile_ps.desktop diff --git a/graphics/okular/Makefile b/graphics/okular/Makefile index e767e0e29925..d28e6fbd7d9d 100644 --- a/graphics/okular/Makefile +++ b/graphics/okular/Makefile @@ -7,6 +7,7 @@ PORTNAME= okular PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= graphics kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src diff --git a/graphics/osg-devel/Makefile b/graphics/osg-devel/Makefile index f8c4a9ed9b1c..6ba5c1a01261 100644 --- a/graphics/osg-devel/Makefile +++ b/graphics/osg-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= osg PORTVERSION= 2.9.11 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://www.openscenegraph.org/downloads/developer_releases/ \ http://mirror.amdmi3.ru/distfiles/ @@ -195,7 +195,7 @@ PLIST_SUB+= SVG="@comment " .if defined(WITH_PDF) FORCE_REQUIRE+= Poppler-glib -LIB_DEPENDS+= poppler-glib.5:${PORTSDIR}/graphics/poppler-gtk +LIB_DEPENDS+= poppler-glib.8:${PORTSDIR}/graphics/poppler-glib PLIST_SUB+= PDF="" .else FORCE_IGNORE+= Poppler-glib diff --git a/graphics/osg/Makefile b/graphics/osg/Makefile index 760705d66684..6a38c448bd9a 100644 --- a/graphics/osg/Makefile +++ b/graphics/osg/Makefile @@ -7,7 +7,7 @@ PORTNAME= osg PORTVERSION= 2.8.2 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics MASTER_SITES= http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-${PORTVERSION}/source/ \ http://mirror.amdmi3.ru/distfiles/ @@ -179,7 +179,7 @@ PLIST_SUB+= SVG="@comment " .if defined(WITH_PDF) FORCE_PC_REQUIRE+=POPPLER -LIB_DEPENDS+= poppler-glib.5:${PORTSDIR}/graphics/poppler-gtk +LIB_DEPENDS+= poppler-glib.8:${PORTSDIR}/graphics/poppler-glib PLIST_SUB+= PDF="" .else FORCE_PC_IGNORE+=POPPLER diff --git a/graphics/pdf2svg/Makefile b/graphics/pdf2svg/Makefile index 9ce0df93886b..f2afd5f4d2ac 100644 --- a/graphics/pdf2svg/Makefile +++ b/graphics/pdf2svg/Makefile @@ -6,14 +6,14 @@ PORTNAME= pdf2svg PORTVERSION= 0.2.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= http://www.cityinthesky.co.uk/_media/opensource/ MAINTAINER= martin.dieringer@gmx.de COMMENT= Convert PDF to SVG -LIB_DEPENDS= poppler-glib:${PORTSDIR}/graphics/poppler-gtk \ +LIB_DEPENDS= poppler-glib:${PORTSDIR}/graphics/poppler-glib \ cairo:${PORTSDIR}/graphics/cairo \ gtk:${PORTSDIR}/x11-toolkits/gtk20 diff --git a/graphics/poppler-gtk/Makefile b/graphics/poppler-glib/Makefile index f9fe19076b2f..3fabcaeeac75 100644 --- a/graphics/poppler-gtk/Makefile +++ b/graphics/poppler-glib/Makefile @@ -3,17 +3,17 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/poppler-gtk/Makefile,v 1.20 2010/07/07 13:03:19 kwm Exp $ +# $MCom$ # PORTREVISION= 0 -PKGNAMESUFFIX= -gtk +PKGNAMESUFFIX= -glib MAINTAINER= gnome@FreeBSD.org -COMMENT= Gtk bindings to poppler +COMMENT= Glib bindings to poppler MASTERDIR= ${.CURDIR}/../../graphics/poppler -SLAVEPORT= gtk +SLAVEPORT= glib PLIST= ${.CURDIR}/pkg-plist pre-build: diff --git a/graphics/poppler-gtk/pkg-plist b/graphics/poppler-glib/pkg-plist index 5e4d115c12f2..9b4e94459cf0 100644 --- a/graphics/poppler-gtk/pkg-plist +++ b/graphics/poppler-glib/pkg-plist @@ -11,11 +11,11 @@ include/poppler/glib/poppler-media.h include/poppler/glib/poppler-movie.h include/poppler/glib/poppler-page.h include/poppler/glib/poppler.h -lib/girepository-1.0/Poppler-0.16.typelib +lib/girepository-1.0/Poppler-0.18.typelib lib/libpoppler-glib.a lib/libpoppler-glib.la lib/libpoppler-glib.so -lib/libpoppler-glib.so.6 +lib/libpoppler-glib.so.8 libdata/pkgconfig/poppler-glib.pc %%DOCSDIR%%/poppler/PopplerAnnot.html %%DOCSDIR%%/poppler/PopplerAttachment.html @@ -44,7 +44,9 @@ libdata/pkgconfig/poppler-glib.pc %%DOCSDIR%%/poppler/right.png %%DOCSDIR%%/poppler/style.css %%DOCSDIR%%/poppler/up.png -share/gir-1.0/Poppler-0.16.gir +share/gir-1.0/Poppler-0.18.gir +@dirrmtry share/gir-1.0 +@dirrmtry lib/girepository-1.0 @dirrmtry %%DOCSDIR%%/poppler @dirrmtry %%DOCSDIR%% @dirrm include/poppler/glib diff --git a/graphics/poppler-qt/Makefile b/graphics/poppler-qt/Makefile deleted file mode 100644 index c946b0bb223b..000000000000 --- a/graphics/poppler-qt/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -# New ports collection makefile for: poppler-qt -# Date created: 2006-01-12 -# Whom: Michael Johnson <ahze@FreeBSD.org> -# -# $FreeBSD$ -# $MCom: ports/graphics/poppler-qt/Makefile,v 1.13 2010/07/07 13:03:19 kwm Exp $ -# - -PORTREVISION= 0 -PKGNAMESUFFIX= -qt - -MAINTAINER= gnome@FreeBSD.org -COMMENT= Qt bindings to poppler - -MASTERDIR= ${.CURDIR}/../../graphics/poppler -SLAVEPORT= qt -PLIST= ${.CURDIR}/pkg-plist - -.include "${MASTERDIR}/Makefile" diff --git a/graphics/poppler-qt/pkg-plist b/graphics/poppler-qt/pkg-plist deleted file mode 100644 index 945777bec848..000000000000 --- a/graphics/poppler-qt/pkg-plist +++ /dev/null @@ -1,9 +0,0 @@ -include/poppler/qt3/poppler-link-qt3.h -include/poppler/qt3/poppler-page-transition.h -include/poppler/qt3/poppler-qt.h -lib/libpoppler-qt.a -lib/libpoppler-qt.la -lib/libpoppler-qt.so -lib/libpoppler-qt.so.3 -libdata/pkgconfig/poppler-qt.pc -@dirrm include/poppler/qt3 diff --git a/graphics/poppler-utils/pkg-plist b/graphics/poppler-utils/pkg-plist index 0b49f0caa627..b8e4fd3953c3 100644 --- a/graphics/poppler-utils/pkg-plist +++ b/graphics/poppler-utils/pkg-plist @@ -1,8 +1,10 @@ bin/pdffonts bin/pdfimages bin/pdfinfo -bin/pdftoabw +bin/pdfseparate +bin/pdftocairo bin/pdftohtml bin/pdftoppm bin/pdftops bin/pdftotext +bin/pdfunite diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile index 5cde3380abc5..1595dabaeaa9 100644 --- a/graphics/poppler/Makefile +++ b/graphics/poppler/Makefile @@ -7,7 +7,7 @@ # PORTNAME= poppler -PORTVERSION= 0.16.7 +PORTVERSION= 0.18.0 PORTREVISION?= 0 CATEGORIES= graphics print MASTER_SITES= http://poppler.freedesktop.org/ @@ -15,13 +15,13 @@ MASTER_SITES= http://poppler.freedesktop.org/ MAINTAINER?= gnome@FreeBSD.org COMMENT?= A PDF rendering library +LICENSE= GPLv2 + LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \ lcms.1:${PORTSDIR}/graphics/lcms RUN_DEPENDS= poppler-data>0:${PORTSDIR}/graphics/poppler-data -LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/COPYING USE_GMAKE= yes USE_GNOME= gnomehack libxml2 ltverhack USE_AUTOTOOLS= libtool @@ -29,8 +29,9 @@ MAKE_JOBS_UNSAFE= yes USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-zlib \ --enable-xpdf-headers \ + --disable-gtk-test \ --with-html-dir=${DOCSDIR} -CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 ${PTHREAD_CFLAGS} +CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} .if !defined(SLAVEPORT) @@ -41,26 +42,17 @@ OPTIONS= CAIRO "Enable cairo output backend" on \ .include <bsd.port.options.mk> .if defined(SLAVEPORT) -LIB_DEPENDS+= poppler.13:${PORTSDIR}/graphics/poppler +LIB_DEPENDS+= poppler.18:${PORTSDIR}/graphics/poppler -.if ${SLAVEPORT}=="gtk" +.if ${SLAVEPORT}=="glib" +BUILD_DEPENDS+= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection +LIB_DEPENDS+= cairo.2:${PORTSDIR}/graphics/cairo CONFIGURE_ARGS+=--enable-poppler-glib -USE_GNOME+= gtk20 +USE_GNOME+= gnomehier glib20 BUILD_WRKSRC= ${WRKSRC}/glib INSTALL_WRKSRC= ${WRKSRC}/glib .else -CONFIGURE_ARGS+=--disable-poppler-glib \ - --disable-gdk \ - --disable-gtk-test -.endif - -.if ${SLAVEPORT}=="qt" -CONFIGURE_ARGS+=--enable-poppler-qt -USE_QT_VER+= 3 -BUILD_WRKSRC= ${WRKSRC}/qt -INSTALL_WRKSRC= ${WRKSRC}/qt -.else -CONFIGURE_ARGS+=--disable-poppler-qt +CONFIGURE_ARGS+=--disable-poppler-glib .endif .if ${SLAVEPORT}=="qt4" @@ -77,20 +69,21 @@ CONFIGURE_ARGS+=--disable-poppler-qt4 .endif .if ${SLAVEPORT}=="utils" +LIB_DEPENDS+= poppler-glib.8:${PORTSDIR}/graphics/poppler-glib CONFIGURE_ARGS+=--enable-utils CONFLICTS= xpdf-[0-9]* BUILD_WRKSRC= ${WRKSRC}/utils INSTALL_WRKSRC= ${WRKSRC}/utils -MAN1= pdffonts.1 pdfimages.1 pdfinfo.1 \ - pdftohtml.1 pdftops.1 pdftotext.1 pdftoppm.1 +MAN1= pdffonts.1 pdfimages.1 pdfinfo.1 pdfseparate.1 pdftocairo.1 \ + pdftohtml.1 pdftops.1 pdftotext.1 pdftoppm.1 pdfunite.1 .else CONFIGURE_ARGS+=--disable-utils .endif .else -CONFIGURE_ARGS+=--disable-poppler-glib --disable-poppler-qt \ - --disable-poppler-qt4 --disable-utils --disable-gdk \ - --disable-gtk-test +CONFIGURE_ARGS+=--disable-poppler-glib \ + --disable-poppler-qt4 \ + --disable-utils .if defined(WITHOUT_CAIRO) CONFIGURE_ARGS+=--disable-cairo-output @@ -109,12 +102,6 @@ LIB_DEPENDS+= openjpeg.2:${PORTSDIR}/graphics/openjpeg .endif post-patch: -.if defined(SLAVEPORT) && ${SLAVEPORT}=="qt" - @${REINPLACE_CMD} -e 's|/usr/local/qt/include|${LOCALBASE}/include|; \ - s|$$QTDIR|${QT_PREFIX}|; \ - s|/usr/local/qt/lib|${LOCALBASE}/lib|' \ - ${WRKSRC}/configure -.endif .if defined(SLAVEPORT) && ${SLAVEPORT}=="qt4" @${REINPLACE_CMD} -e 's|MOCQT4=`.*|MOCQT4="${LOCALBASE}/bin/moc-qt4"|' \ ${WRKSRC}/configure @@ -122,10 +109,8 @@ post-patch: post-install: .if defined(SLAVEPORT) -.if ${SLAVEPORT}=="gtk" +.if ${SLAVEPORT}=="glib" ${INSTALL_DATA} ${WRKSRC}/poppler-glib.pc ${PREFIX}/libdata/pkgconfig -.elif ${SLAVEPORT}=="qt" - ${INSTALL_DATA} ${WRKSRC}/poppler-qt.pc ${PREFIX}/libdata/pkgconfig .elif ${SLAVEPORT}=="qt4" ${INSTALL_DATA} ${WRKSRC}/poppler-qt4.pc ${PREFIX}/libdata/pkgconfig .endif diff --git a/graphics/poppler/distinfo b/graphics/poppler/distinfo index 24b6b668852b..efbd2491d727 100644 --- a/graphics/poppler/distinfo +++ b/graphics/poppler/distinfo @@ -1,2 +1,2 @@ -SHA256 (poppler-0.16.7.tar.gz) = fab4e8af2d34d4142a718819fd747d40930b71ef520ee0e6bcc94e2c44f22bcd -SIZE (poppler-0.16.7.tar.gz) = 1952179 +SHA256 (poppler-0.18.0.tar.gz) = 9019b15ef10a878e607e4088a27fb4967f61cdfada7806d0fee97954f76648e8 +SIZE (poppler-0.18.0.tar.gz) = 1949737 diff --git a/graphics/poppler/files/patch-glib_Makefile.in b/graphics/poppler/files/patch-glib_Makefile.in index 4afb4b2aa878..3cebc9ce24fd 100644 --- a/graphics/poppler/files/patch-glib_Makefile.in +++ b/graphics/poppler/files/patch-glib_Makefile.in @@ -1,47 +1,19 @@ ---- glib/Makefile.in.orig 2010-08-14 16:50:48.000000000 +0200 -+++ glib/Makefile.in 2010-08-14 16:50:48.000000000 +0200 -@@ -82,7 +82,6 @@ +--- glib/Makefile.in.orig 2011-10-03 23:55:25.000000000 +0200 ++++ glib/Makefile.in 2011-10-03 23:56:20.000000000 +0200 +@@ -84,7 +84,6 @@ am__installdirs = "$(DESTDIR)$(libdir)" LTLIBRARIES = $(lib_LTLIBRARIES) am__DEPENDENCIES_1 = libpoppler_glib_la_DEPENDENCIES = \ - $(top_builddir)/poppler/libpoppler.la \ $(top_builddir)/poppler/libpoppler-cairo.la \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -@@ -105,8 +104,7 @@ - @BUILD_WITH_GDK_TRUE@ test-poppler-glib.$(OBJEXT) - test_poppler_glib_OBJECTS = $(am_test_poppler_glib_OBJECTS) - @BUILD_WITH_GDK_TRUE@test_poppler_glib_DEPENDENCIES = \ --@BUILD_WITH_GDK_TRUE@ $(top_builddir)/poppler/libpoppler.la \ --@BUILD_WITH_GDK_TRUE@ libpoppler-glib.la $(am__DEPENDENCIES_1) \ -+@BUILD_WITH_GDK_TRUE@ $(am__DEPENDENCIES_1) \ - @BUILD_WITH_GDK_TRUE@ $(am__DEPENDENCIES_1) \ - @BUILD_WITH_GDK_TRUE@ $(am__DEPENDENCIES_1) - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler -@@ -386,7 +384,7 @@ - top_srcdir = @top_srcdir@ - win32_libs = @win32_libs@ - AM_LDFLAGS = @auto_import_flags@ --SUBDIRS = . reference demo -+SUBDIRS = . reference - INCLUDES = \ - -DG_LOG_DOMAIN=\"Poppler\" \ - -I$(top_srcdir) \ -@@ -439,7 +437,7 @@ + $(am__DEPENDENCIES_1) +@@ -433,7 +432,7 @@ libpoppler_glib_la_SOURCES = \ poppler-private.h libpoppler_glib_la_LIBADD = \ - $(top_builddir)/poppler/libpoppler.la \ -+ -lpoppler \ ++ -lpoppler \ $(top_builddir)/poppler/libpoppler-cairo.la \ $(POPPLER_GLIB_LIBS) \ - $(GDK_LIBS) \ -@@ -451,7 +449,7 @@ - @BUILD_WITH_GDK_TRUE@ test-poppler-glib.cc - - @BUILD_WITH_GDK_TRUE@test_poppler_glib_LDADD = \ --@BUILD_WITH_GDK_TRUE@ $(top_builddir)/poppler/libpoppler.la \ -+@BUILD_WITH_GDK_TRUE@ -lpoppler \ - @BUILD_WITH_GDK_TRUE@ libpoppler-glib.la \ - @BUILD_WITH_GDK_TRUE@ $(POPPLER_GLIB_LIBS) \ - @BUILD_WITH_GDK_TRUE@ $(GDK_LIBS) \ + $(FREETYPE_LIBS) \ diff --git a/graphics/poppler/files/patch-glib_demo_Makefile.in b/graphics/poppler/files/patch-glib_demo_Makefile.in new file mode 100644 index 000000000000..4671dc0998ea --- /dev/null +++ b/graphics/poppler/files/patch-glib_demo_Makefile.in @@ -0,0 +1,20 @@ +--- glib/demo/Makefile.in.orig 2011-10-04 00:03:29.000000000 +0200 ++++ glib/demo/Makefile.in 2011-10-04 00:04:47.000000000 +0200 +@@ -66,7 +66,7 @@ poppler_glib_demo_LDADD = $(LDADD) + am__DEPENDENCIES_1 = + poppler_glib_demo_DEPENDENCIES = \ + $(top_builddir)/glib/libpoppler-glib.la \ +- $(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1) ++ -lpoppler $(am__DEPENDENCIES_1) + AM_V_lt = $(am__v_lt_$(V)) + am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) + am__v_lt_0 = --silent +@@ -355,7 +355,7 @@ poppler_glib_demo_SOURCES = \ + + LDADD = \ + $(top_builddir)/glib/libpoppler-glib.la \ +- $(top_builddir)/poppler/libpoppler.la \ ++ -lpoppler \ + $(GTK_TEST_LIBS) + + all: all-am diff --git a/graphics/poppler/files/patch-poppler_PSOutputDev.cc b/graphics/poppler/files/patch-poppler_PSOutputDev.cc new file mode 100644 index 000000000000..b345cdbc48d5 --- /dev/null +++ b/graphics/poppler/files/patch-poppler_PSOutputDev.cc @@ -0,0 +1,11 @@ +--- poppler/PSOutputDev.cc.orig 2011-10-03 23:24:27.000000000 +0200 ++++ poppler/PSOutputDev.cc 2011-10-03 23:26:21.000000000 +0200 +@@ -1315,7 +1315,7 @@ + writePS("%!PS-Adobe-3.0 Resource-Form\n"); + break; + } +- writePSFmt("% Produced by poppler pdftops version: {0:s} (http://poppler.freedesktop.org)\n", PACKAGE_VERSION); ++ writePSFmt("%Produced by poppler pdftops version: {0:s} (http://poppler.freedesktop.org)\n", PACKAGE_VERSION); + xref->getDocInfo(&info); + if (info.isDict() && info.dictLookup("Creator", &obj1)->isString()) { + writePS("%%Creator: "); diff --git a/graphics/poppler/files/patch-poppler_Page.cc b/graphics/poppler/files/patch-poppler_Page.cc deleted file mode 100644 index 1d0f6329831f..000000000000 --- a/graphics/poppler/files/patch-poppler_Page.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- poppler/Page.cc.orig 2008-07-09 17:53:56.000000000 +0200 -+++ poppler/Page.cc 2008-07-09 17:54:49.000000000 +0200 -@@ -230,7 +230,7 @@ - - Page::Page(XRef *xrefA, int numA, Dict *pageDict, PageAttrs *attrsA, Form *form) { - Object tmp; -- -+ pageWidgets = NULL; - ok = gTrue; - xref = xrefA; - num = numA; diff --git a/graphics/poppler/files/patch-qt_Makefile.in b/graphics/poppler/files/patch-qt_Makefile.in deleted file mode 100644 index d872262ea020..000000000000 --- a/graphics/poppler/files/patch-qt_Makefile.in +++ /dev/null @@ -1,39 +0,0 @@ ---- qt/Makefile.in.orig 2008-03-27 08:17:35.000000000 -0400 -+++ qt/Makefile.in 2008-03-27 08:18:20.000000000 -0400 -@@ -59,8 +59,7 @@ - libLTLIBRARIES_INSTALL = $(INSTALL) - LTLIBRARIES = $(lib_LTLIBRARIES) - am__DEPENDENCIES_1 = --libpoppler_qt_la_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \ -- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ -+libpoppler_qt_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) - am_libpoppler_qt_la_OBJECTS = poppler-document.lo poppler-fontinfo.lo \ - poppler-link.lo poppler-page.lo poppler-page-transition.lo -@@ -71,7 +70,7 @@ - PROGRAMS = $(noinst_PROGRAMS) - am_test_poppler_qt_OBJECTS = test-poppler-qt.$(OBJEXT) - test_poppler_qt_OBJECTS = $(am_test_poppler_qt_OBJECTS) --test_poppler_qt_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \ -+test_poppler_qt_DEPENDENCIES = \ - libpoppler-qt.la $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler - depcomp = $(SHELL) $(top_srcdir)/depcomp -@@ -273,7 +272,7 @@ - poppler-private.h - - libpoppler_qt_la_LIBADD = \ -- $(top_builddir)/poppler/libpoppler.la \ -+ -lpoppler -lqt-mt \ - $(POPPLER_QT_LIBS) \ - $(FREETYPE_LIBS) \ - $(FONTCONFIG_LIBS) -@@ -283,7 +282,7 @@ - test-poppler-qt.cpp - - test_poppler_qt_LDADD = \ -- $(top_builddir)/poppler/libpoppler.la \ -+ -lpoppler -lqt-mt \ - libpoppler-qt.la \ - $(POPPLER_QT_LIBS) \ - $(FREETYPE_LIBS) diff --git a/graphics/poppler/files/patch-utils_Makefile.in b/graphics/poppler/files/patch-utils_Makefile.in index 94606516664d..6407099a16ec 100644 --- a/graphics/poppler/files/patch-utils_Makefile.in +++ b/graphics/poppler/files/patch-utils_Makefile.in @@ -1,6 +1,6 @@ ---- utils/Makefile.in.orig 2011-01-05 13:06:04.000000000 +0100 -+++ utils/Makefile.in 2011-01-05 13:06:26.000000000 +0100 -@@ -64,7 +64,7 @@ am_pdffonts_OBJECTS = pdffonts.$(OBJEXT) +--- utils/Makefile.in.orig 2011-10-04 00:18:03.000000000 +0200 ++++ utils/Makefile.in 2011-10-04 00:24:39.000000000 +0200 +@@ -65,7 +65,7 @@ pdffonts_OBJECTS = $(am_pdffonts_OBJECTS) pdffonts_LDADD = $(LDADD) am__DEPENDENCIES_1 = @@ -9,7 +9,7 @@ $(am__DEPENDENCIES_1) AM_V_lt = $(am__v_lt_$(V)) am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) -@@ -73,19 +73,19 @@ am_pdfimages_OBJECTS = pdfimages.$(OBJEX +@@ -74,56 +74,56 @@ $(am__objects_1) pdfimages_OBJECTS = $(am_pdfimages_OBJECTS) pdfimages_LDADD = $(LDADD) @@ -23,16 +23,24 @@ -pdfinfo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \ +pdfinfo_DEPENDENCIES = \ $(am__DEPENDENCIES_1) - am__pdftoabw_SOURCES_DIST = pdftoabw.cc parseargs.cc parseargs.h - @BUILD_ABIWORD_OUTPUT_TRUE@am_pdftoabw_OBJECTS = pdftoabw.$(OBJEXT) \ - @BUILD_ABIWORD_OUTPUT_TRUE@ $(am__objects_1) - pdftoabw_OBJECTS = $(am_pdftoabw_OBJECTS) + am_pdfseparate_OBJECTS = pdfseparate.$(OBJEXT) $(am__objects_1) + pdfseparate_OBJECTS = $(am_pdfseparate_OBJECTS) + pdfseparate_LDADD = $(LDADD) +-pdfseparate_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \ ++pdfseparate_DEPENDENCIES = \ + $(am__DEPENDENCIES_1) + am__pdftocairo_SOURCES_DIST = pdftocairo.cc parseargs.cc parseargs.h + @BUILD_CAIRO_OUTPUT_TRUE@am_pdftocairo_OBJECTS = pdftocairo.$(OBJEXT) \ + @BUILD_CAIRO_OUTPUT_TRUE@ $(am__objects_1) + pdftocairo_OBJECTS = $(am_pdftocairo_OBJECTS) -am__DEPENDENCIES_2 = $(top_builddir)/poppler/libpoppler.la \ -+am__DEPENDENCIES_2 = \ ++am__DEPENDENCIES_2 = \ $(am__DEPENDENCIES_1) - @BUILD_ABIWORD_OUTPUT_TRUE@pdftoabw_DEPENDENCIES = \ - @BUILD_ABIWORD_OUTPUT_TRUE@ $(am__DEPENDENCIES_2) \ -@@ -94,25 +94,25 @@ am_pdftohtml_OBJECTS = pdftohtml.$(OBJEX +-@BUILD_CAIRO_OUTPUT_TRUE@pdftocairo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler-cairo.la \ ++@BUILD_CAIRO_OUTPUT_TRUE@pdftocairo_DEPENDENCIES = \ + @BUILD_CAIRO_OUTPUT_TRUE@ $(am__DEPENDENCIES_2) \ + @BUILD_CAIRO_OUTPUT_TRUE@ $(am__DEPENDENCIES_1) + am_pdftohtml_OBJECTS = pdftohtml.$(OBJEXT) HtmlFonts.$(OBJEXT) \ HtmlLinks.$(OBJEXT) HtmlOutputDev.$(OBJEXT) $(am__objects_1) pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS) pdftohtml_LDADD = $(LDADD) @@ -60,14 +68,29 @@ -pdftotext_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \ +pdftotext_DEPENDENCIES = \ $(am__DEPENDENCIES_1) + am_pdfunite_OBJECTS = pdfunite.$(OBJEXT) $(am__objects_1) + pdfunite_OBJECTS = $(am_pdfunite_OBJECTS) + pdfunite_LDADD = $(LDADD) +-pdfunite_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \ ++pdfunite_DEPENDENCIES = \ + $(am__DEPENDENCIES_1) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler depcomp = $(SHELL) $(top_srcdir)/depcomp -@@ -405,7 +405,7 @@ INCLUDES = \ - $(ABIWORD_CFLAGS) +@@ -409,7 +409,7 @@ + $(CAIRO_CFLAGS) LDADD = \ - $(top_builddir)/poppler/libpoppler.la \ -+ -lpoppler \ ++ -lpoppler \ $(UTILS_LIBS) \ $(FONTCONFIG_LIBS) +@@ -418,7 +418,7 @@ + @BUILD_CAIRO_OUTPUT_TRUE@ $(common) + + @BUILD_CAIRO_OUTPUT_TRUE@pdftocairo_LDADD = \ +-@BUILD_CAIRO_OUTPUT_TRUE@ $(top_builddir)/poppler/libpoppler-cairo.la \ ++@BUILD_CAIRO_OUTPUT_TRUE@ -lpoppler-glib \ + @BUILD_CAIRO_OUTPUT_TRUE@ $(LDADD) $(CAIRO_LIBS) + + @BUILD_CAIRO_OUTPUT_TRUE@pdftocairo_binary = pdftocairo diff --git a/graphics/poppler/pkg-plist b/graphics/poppler/pkg-plist index 9ce414c391e6..18c37146ede5 100644 --- a/graphics/poppler/pkg-plist +++ b/graphics/poppler/pkg-plist @@ -65,6 +65,7 @@ include/poppler/UnicodeDecompTables.h include/poppler/UnicodeMap.h include/poppler/UnicodeMapTables.h include/poppler/UnicodeTypeTable.h +include/poppler/ViewerPreferences.h include/poppler/XRef.h include/poppler/XpdfPluginAPI.h include/poppler/cpp/poppler-document.h @@ -93,6 +94,7 @@ include/poppler/goo/GooTimer.h include/poppler/goo/ImgWriter.h include/poppler/goo/JpegWriter.h include/poppler/goo/PNGWriter.h +include/poppler/goo/TiffWriter.h include/poppler/goo/gfile.h include/poppler/goo/gmem.h include/poppler/goo/gstrtod.h @@ -128,7 +130,7 @@ lib/libpoppler-cpp.so.0 lib/libpoppler.a lib/libpoppler.la lib/libpoppler.so -lib/libpoppler.so.13 +lib/libpoppler.so.18 %%CAIRO%%libdata/pkgconfig/poppler-cairo.pc libdata/pkgconfig/poppler-cpp.pc libdata/pkgconfig/poppler-splash.pc diff --git a/graphics/popplerkit/Makefile b/graphics/popplerkit/Makefile index b641e7bed5a3..02a9345db788 100644 --- a/graphics/popplerkit/Makefile +++ b/graphics/popplerkit/Makefile @@ -7,7 +7,7 @@ PORTNAME= popplerkit PORTVERSION= 1.0.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics gnustep MASTER_SITES= http://download.gna.org/etoile/ DISTNAME= etoile-0.4.1 diff --git a/graphics/py-poppler/Makefile b/graphics/py-poppler/Makefile index 46befd6689da..8993479cd6fe 100644 --- a/graphics/py-poppler/Makefile +++ b/graphics/py-poppler/Makefile @@ -7,7 +7,7 @@ PORTNAME= poppler PORTVERSION= 0.10.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics python MASTER_SITES= https://launchpad.net/poppler-python/trunk/development/+download/ \ http://launchpadlibrarian.net/30270080/ \ @@ -18,7 +18,7 @@ DISTNAME= py${PORTNAME}-${PORTVERSION} MAINTAINER= romain@FreeBSD.org COMMENT= Python bindings for the Poppler PDF rendering library -LIB_DEPENDS= poppler-glib.6:${PORTSDIR}/graphics/poppler-gtk +LIB_DEPENDS= poppler-glib.8:${PORTSDIR}/graphics/poppler-glib USE_PYTHON= yes GNU_CONFIGURE= yes diff --git a/graphics/qcomicbook/Makefile b/graphics/qcomicbook/Makefile index 5dc65d85d83c..16db714ba1b4 100644 --- a/graphics/qcomicbook/Makefile +++ b/graphics/qcomicbook/Makefile @@ -7,7 +7,7 @@ PORTNAME= qcomicbook PORTVERSION= 0.8.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://qcomicbook.linux-projects.net/releases/ diff --git a/graphics/xournal/Makefile b/graphics/xournal/Makefile index 54808f0d7cd8..c475113cf09b 100644 --- a/graphics/xournal/Makefile +++ b/graphics/xournal/Makefile @@ -7,14 +7,14 @@ PORTNAME= xournal PORTVERSION= 0.4.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= SF MAINTAINER= me@janh.de COMMENT= A notetaking application that can annotate PDFs -LIB_DEPENDS= poppler-glib.6:${PORTSDIR}/graphics/poppler-gtk +LIB_DEPENDS= poppler-glib.8:${PORTSDIR}/graphics/poppler-glib LICENSE= GPLv2 diff --git a/graphics/xournal/files/patch-poppler-0.18 b/graphics/xournal/files/patch-poppler-0.18 new file mode 100644 index 000000000000..61c757fc74ad --- /dev/null +++ b/graphics/xournal/files/patch-poppler-0.18 @@ -0,0 +1,136 @@ +--- src/xo-misc.c 2010/10/18 18:45:36 1.23 ++++ src/xo-misc.c 2011/07/21 22:07:33 1.24 +@@ -2197,3 +2197,93 @@ + if(GTK_IS_CONTAINER(w)) + gtk_container_forall(GTK_CONTAINER(w), install_focus_hooks, data); + } ++ ++// wrapper for missing poppler functions (defunct poppler-gdk api) ++ ++static void ++wrapper_copy_cairo_surface_to_pixbuf (cairo_surface_t *surface, ++ GdkPixbuf *pixbuf) ++{ ++ int cairo_width, cairo_height, cairo_rowstride; ++ unsigned char *pixbuf_data, *dst, *cairo_data; ++ int pixbuf_rowstride, pixbuf_n_channels; ++ unsigned int *src; ++ int x, y; ++ ++ cairo_width = cairo_image_surface_get_width (surface); ++ cairo_height = cairo_image_surface_get_height (surface); ++ cairo_rowstride = cairo_image_surface_get_stride (surface); ++ cairo_data = cairo_image_surface_get_data (surface); ++ ++ pixbuf_data = gdk_pixbuf_get_pixels (pixbuf); ++ pixbuf_rowstride = gdk_pixbuf_get_rowstride (pixbuf); ++ pixbuf_n_channels = gdk_pixbuf_get_n_channels (pixbuf); ++ ++ if (cairo_width > gdk_pixbuf_get_width (pixbuf)) ++ cairo_width = gdk_pixbuf_get_width (pixbuf); ++ if (cairo_height > gdk_pixbuf_get_height (pixbuf)) ++ cairo_height = gdk_pixbuf_get_height (pixbuf); ++ for (y = 0; y < cairo_height; y++) ++ { ++ src = (unsigned int *) (cairo_data + y * cairo_rowstride); ++ dst = pixbuf_data + y * pixbuf_rowstride; ++ for (x = 0; x < cairo_width; x++) ++ { ++ dst[0] = (*src >> 16) & 0xff; ++ dst[1] = (*src >> 8) & 0xff; ++ dst[2] = (*src >> 0) & 0xff; ++ if (pixbuf_n_channels == 4) ++ dst[3] = (*src >> 24) & 0xff; ++ dst += pixbuf_n_channels; ++ src++; ++ } ++ } ++} ++ ++void ++wrapper_poppler_page_render_to_pixbuf (PopplerPage *page, ++ int src_x, int src_y, ++ int src_width, int src_height, ++ double scale, ++ int rotation, ++ GdkPixbuf *pixbuf) ++{ ++ cairo_t *cr; ++ cairo_surface_t *surface; ++ ++ surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, ++ src_width, src_height); ++ cr = cairo_create (surface); ++ cairo_save (cr); ++ switch (rotation) { ++ case 90: ++ cairo_translate (cr, src_x + src_width, -src_y); ++ break; ++ case 180: ++ cairo_translate (cr, src_x + src_width, src_y + src_height); ++ break; ++ case 270: ++ cairo_translate (cr, -src_x, src_y + src_height); ++ break; ++ default: ++ cairo_translate (cr, -src_x, -src_y); ++ } ++ ++ if (scale != 1.0) ++ cairo_scale (cr, scale, scale); ++ ++ if (rotation != 0) ++ cairo_rotate (cr, rotation * G_PI / 180.0); ++ ++ poppler_page_render (page, cr); ++ cairo_restore (cr); ++ ++ cairo_set_operator (cr, CAIRO_OPERATOR_DEST_OVER); ++ cairo_set_source_rgb (cr, 1., 1., 1.); ++ cairo_paint (cr); ++ ++ cairo_destroy (cr); ++ ++ wrapper_copy_cairo_surface_to_pixbuf (surface, pixbuf); ++ cairo_surface_destroy (surface); ++} +--- src/xo-misc.h 2009/09/28 06:14:17 1.15 ++++ src/xo-misc.h 2011/07/21 22:07:33 1.16 +@@ -107,6 +107,15 @@ + gboolean intercept_activate_events(GtkWidget *w, GdkEvent *ev, gpointer data); + void install_focus_hooks(GtkWidget *w, gpointer data); + ++// wrapper for a function no longer provided by poppler 0.17+ ++void ++wrapper_poppler_page_render_to_pixbuf (PopplerPage *page, ++ int src_x, int src_y, ++ int src_width, int src_height, ++ double scale, ++ int rotation, ++ GdkPixbuf *pixbuf); ++ + // defines for paper rulings + + #define RULING_MARGIN_COLOR 0xff0080ff +--- src/xo-file.c 2010/10/20 22:22:36 1.23 ++++ src/xo-file.c 2011/07/21 22:07:33 1.24 +@@ -1031,7 +1031,7 @@ + scaled_height = (int) (req->dpi * height/72); + pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, + FALSE, 8, scaled_width, scaled_height); +- poppler_page_render_to_pixbuf( ++ wrapper_poppler_page_render_to_pixbuf( + pdfpage, 0, 0, scaled_width, scaled_height, + req->dpi/72, 0, pixbuf); + g_object_unref(pdfpage); +--- src/xo-print.c 2009/11/15 05:06:00 1.13 ++++ src/xo-print.c 2011/07/21 22:07:33 1.14 +@@ -728,7 +728,7 @@ + width = (int) (PDFTOPPM_PRINTING_DPI * pgwidth/72.0); + height = (int) (PDFTOPPM_PRINTING_DPI * pgheight/72.0); + pix = gdk_pixbuf_new(GDK_COLORSPACE_RGB, FALSE, 8, width, height); +- poppler_page_render_to_pixbuf( ++ wrapper_poppler_page_render_to_pixbuf( + pdfpage, 0, 0, width, height, PDFTOPPM_PRINTING_DPI/72.0, 0, pix); + g_object_unref(pdfpage); + } diff --git a/graphics/zathura/Makefile b/graphics/zathura/Makefile index a706e443dacd..fd9d08b97f1f 100644 --- a/graphics/zathura/Makefile +++ b/graphics/zathura/Makefile @@ -7,14 +7,14 @@ PORTNAME= zathura PORTVERSION= 0.0.8.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics print MASTER_SITES= http://pwmt.org/download/ MAINTAINER= acieroid@awesom.eu COMMENT= Customizable lightweight pdf viewer -LIB_DEPENDS= poppler-glib.6:${PORTSDIR}/graphics/poppler-gtk \ +LIB_DEPENDS= poppler-glib.8:${PORTSDIR}/graphics/poppler-glib \ cairo.2:${PORTSDIR}/graphics/cairo USE_GNOME= glib20 gtk20 diff --git a/misc/tellico-kde4/Makefile b/misc/tellico-kde4/Makefile index 6c3420bfcfbe..4f600f39729f 100644 --- a/misc/tellico-kde4/Makefile +++ b/misc/tellico-kde4/Makefile @@ -7,6 +7,7 @@ PORTNAME= tellico PORTVERSION= 2.3.4 +PORTREVISION= 1 CATEGORIES= misc kde MASTER_SITES= http://tellico-project.org/files/ diff --git a/misc/tellico/Makefile b/misc/tellico/Makefile index 76f477af82e8..cf3bfba044f4 100644 --- a/misc/tellico/Makefile +++ b/misc/tellico/Makefile @@ -16,7 +16,6 @@ COMMENT= Collection manager for KDE LICENSE= GPLv2 LIB_DEPENDS= tag:${PORTSDIR}/audio/taglib \ - poppler-qt:${PORTSDIR}/graphics/poppler-qt \ yaz.4:${PORTSDIR}/net/yaz \ exempi:${PORTSDIR}/textproc/exempi diff --git a/print/pdfcube/Makefile b/print/pdfcube/Makefile index 7b37917358b8..4bfbd69a976e 100644 --- a/print/pdfcube/Makefile +++ b/print/pdfcube/Makefile @@ -15,9 +15,11 @@ MAINTAINER= lwhsu@FreeBSD.org COMMENT= An OpenGL presentation viewer on a spinning cube LIB_DEPENDS= gtkglext:${PORTSDIR}/x11-toolkits/gtkglext \ - poppler-glib:${PORTSDIR}/graphics/poppler-gtk \ + poppler-glib:${PORTSDIR}/graphics/poppler-glib \ boost_program_options:${PORTSDIR}/devel/boost-libs +BROKEN= Doesn't build with poppler 0.18 + USE_GL= glut GNU_CONFIGURE= yes CONFIGURE_ARGS= --libdir=${LOCALBASE}/lib --includedir=${LOCALBASE}/include diff --git a/sysutils/tracker-client/Makefile b/sysutils/tracker-client/Makefile index f870a1acc6e0..39ce63b4383c 100644 --- a/sysutils/tracker-client/Makefile +++ b/sysutils/tracker-client/Makefile @@ -8,7 +8,7 @@ PORTNAME= tracker PORTVERSION= 0.6.95 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= sysutils gnome MASTER_SITES= GNOME PKGNAMESUFFIX?= -client @@ -18,7 +18,7 @@ COMMENT= Object database, tag/metadata database, search tool and indexer LIB_DEPENDS= sqlite3.8:${PORTSDIR}/databases/sqlite3 \ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ - poppler-glib.6:${PORTSDIR}/graphics/poppler-gtk \ + poppler-glib.8:${PORTSDIR}/graphics/poppler-glib \ exif.12:${PORTSDIR}/graphics/libexif \ wv-1.2.4:${PORTSDIR}/textproc/wv \ gmime-2.0.4:${PORTSDIR}/mail/gmime2 \ diff --git a/textproc/libextractor/Makefile b/textproc/libextractor/Makefile index 68703b628b68..62cffe142079 100644 --- a/textproc/libextractor/Makefile +++ b/textproc/libextractor/Makefile @@ -7,7 +7,7 @@ PORTNAME= libextractor PORTVERSION= 0.6.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/textproc/pdfgrep/Makefile b/textproc/pdfgrep/Makefile index 2c6686b557c0..ffe0df960e26 100644 --- a/textproc/pdfgrep/Makefile +++ b/textproc/pdfgrep/Makefile @@ -7,7 +7,7 @@ PORTNAME= pdfgrep PORTVERSION= 1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}/ MASTER_SITE_SUBDIR= ${PORTNAME} @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= michael@ranner.eu COMMENT= A tool to search text in PDF files -LIB_DEPENDS= poppler.13:${PORTSDIR}/graphics/poppler +LIB_DEPENDS= poppler.18:${PORTSDIR}/graphics/poppler LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING diff --git a/x11-toolkits/ruby-poppler/Makefile b/x11-toolkits/ruby-poppler/Makefile index 9e1ddcb62853..83fa392ca9ba 100644 --- a/x11-toolkits/ruby-poppler/Makefile +++ b/x11-toolkits/ruby-poppler/Makefile @@ -7,7 +7,7 @@ PORTNAME= poppler PORTVERSION= ${RUBY_GNOME_PORTVERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits ruby MASTER_SITES= ${RUBY_GNOME_MASTER_SITES} MASTER_SITE_SUBDIR= ${RUBY_GNOME_MASTER_SITE_SUBDIR} @@ -18,7 +18,7 @@ DIST_SUBDIR= ruby MAINTAINER= ruby@FreeBSD.org COMMENT= Ruby binding for Poppler -LIB_DEPENDS= poppler-glib.6:${PORTSDIR}/graphics/poppler-gtk +LIB_DEPENDS= poppler-glib.8:${PORTSDIR}/graphics/poppler-glib BUILD_DEPENDS= rubygem-pkg-config>=1.0.7:${PORTSDIR}/devel/rubygem-pkg-config RUN_DEPENDS= rubygem-pkg-config>=1.0.7:${PORTSDIR}/devel/rubygem-pkg-config |