diff options
Diffstat (limited to 'graphics')
28 files changed, 363 insertions, 150 deletions
diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile index 90d80493b2ca..d508901fdadf 100644 --- a/graphics/eog/Makefile +++ b/graphics/eog/Makefile @@ -3,14 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/eog/Makefile,v 1.9 2005/10/04 03:00:35 ahze Exp $ +# $MCom: ports/graphics/eog/Makefile,v 1.29 2006/04/13 07:52:35 bland Exp $ # PORTNAME= eog -PORTVERSION= 2.12.3 +PORTVERSION= 2.14.1 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.12 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -18,12 +18,13 @@ COMMENT= The Eye Of Gnome image viewer USE_BZIP2= yes USE_GMAKE= yes -USE_REINPLACE= yes USE_GNOME= gnomeprefix gnomehack intlhack libgnomeprintui \ - librsvg2 desktopfileutils libgnomeui + librsvg2 desktopfileutils gnomedesktop +USE_GETTEXT= yes USE_X_PREFIX= yes INSTALLS_OMF= yes GNU_CONFIGURE= yes +GNOME_DESKTOP_VERSION=2 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" diff --git a/graphics/eog/distinfo b/graphics/eog/distinfo index 5b6e99b42a05..60e00b1b88bc 100644 --- a/graphics/eog/distinfo +++ b/graphics/eog/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/eog-2.12.3.tar.bz2) = cb93289f47060af04026f78e0ecefd71 -SHA256 (gnome2/eog-2.12.3.tar.bz2) = 5833c6b7cb38555dff26821629136c8650a0edaea777a9e6d08d0cf42775e334 -SIZE (gnome2/eog-2.12.3.tar.bz2) = 801299 +MD5 (gnome2/eog-2.14.1.tar.bz2) = c77fbfa3a1e77cb7ed140567ebdfab12 +SHA256 (gnome2/eog-2.14.1.tar.bz2) = c26cefe7d594f31871ca2ddd847a12a4a7f28665ca9a545144e9fffe026e0ab9 +SIZE (gnome2/eog-2.14.1.tar.bz2) = 821034 diff --git a/graphics/eog/pkg-plist b/graphics/eog/pkg-plist index 2830c74e8e4d..77b6c479e9c3 100644 --- a/graphics/eog/pkg-plist +++ b/graphics/eog/pkg-plist @@ -76,6 +76,7 @@ share/locale/cs/LC_MESSAGES/eog.mo share/locale/cy/LC_MESSAGES/eog.mo share/locale/da/LC_MESSAGES/eog.mo share/locale/de/LC_MESSAGES/eog.mo +share/locale/dz/LC_MESSAGES/eog.mo share/locale/el/LC_MESSAGES/eog.mo share/locale/en_CA/LC_MESSAGES/eog.mo share/locale/en_GB/LC_MESSAGES/eog.mo @@ -96,6 +97,7 @@ share/locale/id/LC_MESSAGES/eog.mo share/locale/is/LC_MESSAGES/eog.mo share/locale/it/LC_MESSAGES/eog.mo share/locale/ja/LC_MESSAGES/eog.mo +share/locale/ka/LC_MESSAGES/eog.mo share/locale/kn/LC_MESSAGES/eog.mo share/locale/ko/LC_MESSAGES/eog.mo share/locale/ku/LC_MESSAGES/eog.mo @@ -140,8 +142,6 @@ share/locale/zh_TW/LC_MESSAGES/eog.mo share/locale/zu/LC_MESSAGES/eog.mo @dirrmtry share/locale/zu/LC_MESSAGES @dirrmtry share/locale/zu -@dirrmtry share/locale/zh_HK/LC_MESSAGES -@dirrmtry share/locale/zh_HK @dirrmtry share/locale/xh/LC_MESSAGES @dirrmtry share/locale/xh @dirrmtry share/locale/ug/LC_MESSAGES @@ -152,6 +152,8 @@ share/locale/zu/LC_MESSAGES/eog.mo @dirrmtry share/locale/nso @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/dz/LC_MESSAGES +@dirrmtry share/locale/dz @dirrm share/gnome/pixmaps/eog @dirrm share/gnome/omf/eog @dirrm share/gnome/help/eog/zh_TW/figures diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile index cbe79f439a50..5f5693145737 100644 --- a/graphics/evince/Makefile +++ b/graphics/evince/Makefile @@ -3,24 +3,24 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/evince/Makefile,v 1.35 2005/10/20 01:37:54 ahze Exp $ +# $MCom: ports/graphics/evince/Makefile,v 1.50 2006/04/24 00:54:32 ahze Exp $ # PORTNAME= evince -PORTVERSION= 0.4.0 -PORTREVISION= 4 +PORTVERSION= 0.5.2 +PORTREVISION= 2 CATEGORIES= graphics print gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.4 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.5 MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME 2 multi-format document viewer -LIB_DEPENDS= poppler.0:${PORTSDIR}/graphics/poppler +LIB_DEPENDS= poppler-glib.1:${PORTSDIR}/graphics/poppler-gtk USE_BZIP2= yes GNU_CONFIGURE= yes -USE_REINPLACE= yes +USE_GETTEXT= yes USE_X_PREFIX= yes USE_GMAKE= yes USE_GHOSTSCRIPT=yes @@ -35,8 +35,9 @@ GCONF_SCHEMAS= evince.schemas evince-thumbnailer.schemas OPTIONS= DVI "Enable DVI viewer support" off \ T1LIB "Enable T1LIB for TYPE1 fonts to DVI (Enables DVI)" off \ NAUTILUS "Enable Nautilus plugin" on \ - DBUS "Enable D-BUS support" off \ - DJVU "Enable DJVU support" off + DBUS "Enable D-BUS support" on \ + COMICS "Enable comic book archives support" off +# DJVU "Enable DJVU support" off .include <bsd.port.pre.mk> @@ -73,20 +74,30 @@ DJVU_DIR?= # empty DJVU_DIR?= -nox11 .endif -.if defined(WITH_DJVU) -LIB_DEPENDS+= djvulibre.17:${PORTSDIR}/graphics/djvulibre${DJVU_DIR} -CONFIGURE_ARGS+= --enable-djvu -GCONF_SCHEMAS+= evince-thumbnailer-djvu.schemas -.else +# DJVU is broken, need older version of djvu +#.if defined(WITH_DJVU) +#LIB_DEPENDS+= djvulibre.17:${PORTSDIR}/graphics/djvulibre${DJVU_DIR} +#CONFIGURE_ARGS+= --enable-djvu +#GCONF_SCHEMAS+= evince-thumbnailer-djvu.schemas +#.else CONFIGURE_ARGS+= --disable-djvu -.endif +#.endif -.if defined(WITH_DBUS) +.if !defined(WITHOUT_DBUS) LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus .endif +.if defined(WITH_COMICS) +CONFIGURE_ARGS+= --enable-comics +GCONF_SCHEMAS+= evince-thumbnailer-comics.schemas + +RUN_DEPENDS= unrar:${PORTSDIR}/archivers/unrar \ + unzip:${PORTSDIR}/archivers/unzip +.endif + post-patch: - @${REINPLACE_CMD} -e 's|-lt1lib|-lt1 -lm|' \ + @${REINPLACE_CMD} -e 's|-lt1lib|-lt1 -lm| ; \ + s|execinfo.h|#|g' \ ${WRKSRC}/configure \ ${WRKSRC}/dvi/mdvi-lib/Makefile.in diff --git a/graphics/evince/distinfo b/graphics/evince/distinfo index dcfa41b268dc..acd8bc52158e 100644 --- a/graphics/evince/distinfo +++ b/graphics/evince/distinfo @@ -1,3 +1,3 @@ -MD5 (evince-0.4.0.tar.bz2) = cc41e30108bc54a345bd6ca2556ab857 -SHA256 (evince-0.4.0.tar.bz2) = 0264f24b30820bef80473db9176a46524e6ec00db2024adef2e7c49673ad0b59 -SIZE (evince-0.4.0.tar.bz2) = 891605 +MD5 (evince-0.5.2.tar.bz2) = 732df368435cebddd4cc8132a8a280bd +SHA256 (evince-0.5.2.tar.bz2) = c3f923e9becee6aa59cc4dafbc36d376a88099cf4017a5e928f367bd428174de +SIZE (evince-0.5.2.tar.bz2) = 1000723 diff --git a/graphics/evince/files/patch-djvu_djvu-text.h b/graphics/evince/files/patch-djvu_djvu-text.h new file mode 100644 index 000000000000..ab717fac730c --- /dev/null +++ b/graphics/evince/files/patch-djvu_djvu-text.h @@ -0,0 +1,10 @@ +--- djvu/djvu-text.h.orig Fri Apr 21 23:12:56 2006 ++++ djvu/djvu-text.h Fri Apr 21 23:14:09 2006 +@@ -24,7 +24,6 @@ + #include <glib.h> + #include <libdjvu/ddjvuapi.h> + +-typedef struct miniexp_s* miniexp_t; + extern const miniexp_t miniexp_nil; + extern const miniexp_t miniexp_dummy; + diff --git a/graphics/evince/files/patch-shell_main.c b/graphics/evince/files/patch-shell_main.c deleted file mode 100644 index 05a0c788287d..000000000000 --- a/graphics/evince/files/patch-shell_main.c +++ /dev/null @@ -1,20 +0,0 @@ ---- shell/main.c.dbus-fix 2005-09-01 04:14:54.000000000 -0400 -+++ shell/main.c 2005-09-01 04:15:33.000000000 -0400 -@@ -152,7 +152,7 @@ - if (!files) { - #if DBUS_VERSION <= 33 - call = dbus_g_proxy_begin_call (remote_object, "OpenWindow", -- DBUS_TYPE_UINT32, timestamp, -+ DBUS_TYPE_UINT32, ×tamp, - DBUS_TYPE_INVALID); - - if (!dbus_g_proxy_end_call (remote_object, call, &error, DBUS_TYPE_INVALID)) { -@@ -193,7 +193,7 @@ - call = dbus_g_proxy_begin_call (remote_object, "OpenURI", - DBUS_TYPE_STRING, &uri, - DBUS_TYPE_STRING, &page_label, -- DBUS_TYPE_UINT32, timestamp, -+ DBUS_TYPE_UINT32, ×tamp, - DBUS_TYPE_INVALID); - - if (!dbus_g_proxy_end_call (remote_object, call, &error, DBUS_TYPE_INVALID)) { diff --git a/graphics/evince/pkg-plist b/graphics/evince/pkg-plist index 47ac1b8b1586..3c8660a61224 100644 --- a/graphics/evince/pkg-plist +++ b/graphics/evince/pkg-plist @@ -3,7 +3,6 @@ bin/evince-thumbnailer %%NAUTILUS%%lib/nautilus/extensions-1.0/libevince-properties-page.a %%NAUTILUS%%lib/nautilus/extensions-1.0/libevince-properties-page.la %%NAUTILUS%%lib/nautilus/extensions-1.0/libevince-properties-page.so -%%NAUTILUS%%lib/nautilus/extensions-1.0/libevince-properties-page.so.0 share/gnome/applications/evince.desktop share/gnome/evince/evince-password.glade share/gnome/evince/evince-properties.glade @@ -13,22 +12,34 @@ share/gnome/evince/hand-open.png share/gnome/help/evince/C/evince.xml share/gnome/help/evince/C/figures/evince_start_window.png share/gnome/help/evince/C/legal.xml +share/gnome/help/evince/bg/evince.xml +share/gnome/help/evince/bg/figures/evince_start_window.png share/gnome/help/evince/el/evince.xml share/gnome/help/evince/el/figures/evince_start_window.png share/gnome/help/evince/es/evince.xml share/gnome/help/evince/es/figures/evince_start_window.png +share/gnome/help/evince/nl/evince.xml +share/gnome/help/evince/nl/figures/evince_start_window.png +share/gnome/help/evince/ru/evince.xml +share/gnome/help/evince/ru/figures/evince_start_window.png share/gnome/help/evince/sr/evince.xml share/gnome/help/evince/sr/figures/evince_start_window.png share/gnome/help/evince/uk/evince.xml share/gnome/help/evince/uk/figures/evince_start_window.png share/gnome/omf/evince/evince-C.omf +share/gnome/omf/evince/evince-bg.omf share/gnome/omf/evince/evince-el.omf share/gnome/omf/evince/evince-es.omf +share/gnome/omf/evince/evince-nl.omf +share/gnome/omf/evince/evince-ru.omf share/gnome/omf/evince/evince-sr.omf share/gnome/omf/evince/evince-uk.omf +share/locale/be/LC_MESSAGES/evince.mo share/locale/bg/LC_MESSAGES/evince.mo +share/locale/bn/LC_MESSAGES/evince.mo share/locale/ca/LC_MESSAGES/evince.mo share/locale/cs/LC_MESSAGES/evince.mo +share/locale/cy/LC_MESSAGES/evince.mo share/locale/da/LC_MESSAGES/evince.mo share/locale/de/LC_MESSAGES/evince.mo share/locale/el/LC_MESSAGES/evince.mo @@ -37,6 +48,7 @@ share/locale/en_GB/LC_MESSAGES/evince.mo share/locale/es/LC_MESSAGES/evince.mo share/locale/et/LC_MESSAGES/evince.mo share/locale/eu/LC_MESSAGES/evince.mo +share/locale/fa/LC_MESSAGES/evince.mo share/locale/fi/LC_MESSAGES/evince.mo share/locale/fr/LC_MESSAGES/evince.mo share/locale/gl/LC_MESSAGES/evince.mo @@ -44,16 +56,24 @@ share/locale/gu/LC_MESSAGES/evince.mo share/locale/he/LC_MESSAGES/evince.mo share/locale/hi/LC_MESSAGES/evince.mo share/locale/hu/LC_MESSAGES/evince.mo +share/locale/id/LC_MESSAGES/evince.mo +share/locale/it/LC_MESSAGES/evince.mo share/locale/ja/LC_MESSAGES/evince.mo +share/locale/ka/LC_MESSAGES/evince.mo share/locale/ko/LC_MESSAGES/evince.mo +share/locale/ku/LC_MESSAGES/evince.mo share/locale/lt/LC_MESSAGES/evince.mo +share/locale/lv/LC_MESSAGES/evince.mo +share/locale/mk/LC_MESSAGES/evince.mo share/locale/nb/LC_MESSAGES/evince.mo share/locale/ne/LC_MESSAGES/evince.mo share/locale/nl/LC_MESSAGES/evince.mo share/locale/no/LC_MESSAGES/evince.mo share/locale/pa/LC_MESSAGES/evince.mo share/locale/pl/LC_MESSAGES/evince.mo +share/locale/pt/LC_MESSAGES/evince.mo share/locale/pt_BR/LC_MESSAGES/evince.mo +share/locale/ro/LC_MESSAGES/evince.mo share/locale/ru/LC_MESSAGES/evince.mo share/locale/rw/LC_MESSAGES/evince.mo share/locale/sk/LC_MESSAGES/evince.mo @@ -64,20 +84,26 @@ share/locale/sv/LC_MESSAGES/evince.mo share/locale/th/LC_MESSAGES/evince.mo share/locale/tr/LC_MESSAGES/evince.mo share/locale/uk/LC_MESSAGES/evince.mo +share/locale/vi/LC_MESSAGES/evince.mo share/locale/wa/LC_MESSAGES/evince.mo share/locale/zh_CN/LC_MESSAGES/evince.mo +share/locale/zh_HK/LC_MESSAGES/evince.mo share/locale/zh_TW/LC_MESSAGES/evince.mo -@dirrmtry share/locale/rw/LC_MESSAGES -@dirrmtry share/locale/rw @dirrm share/gnome/omf/evince @dirrm share/gnome/help/evince/uk/figures @dirrm share/gnome/help/evince/uk @dirrm share/gnome/help/evince/sr/figures @dirrm share/gnome/help/evince/sr +@dirrm share/gnome/help/evince/ru/figures +@dirrm share/gnome/help/evince/ru +@dirrm share/gnome/help/evince/nl/figures +@dirrm share/gnome/help/evince/nl @dirrm share/gnome/help/evince/es/figures @dirrm share/gnome/help/evince/es @dirrm share/gnome/help/evince/el/figures @dirrm share/gnome/help/evince/el +@dirrm share/gnome/help/evince/bg/figures +@dirrm share/gnome/help/evince/bg @dirrm share/gnome/help/evince/C/figures @dirrm share/gnome/help/evince/C @dirrm share/gnome/help/evince diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile index ad4281fd46f3..e0211433a81d 100644 --- a/graphics/libgnomecanvas/Makefile +++ b/graphics/libgnomecanvas/Makefile @@ -3,15 +3,14 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/libgnomecanvas/Makefile,v 1.48 2005/09/06 18:43:35 mezz Exp $ +# $MCom: ports/graphics/libgnomecanvas/Makefile,v 1.57 2006/04/13 07:52:35 bland Exp $ # PORTNAME= libgnomecanvas -PORTVERSION= 2.12.0 -PORTREVISION= 1 +PORTVERSION= 2.14.0 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -19,9 +18,10 @@ COMMENT= A graphics library for GNOME USE_BZIP2= yes USE_GMAKE= yes +USE_GETTEXT= yes USE_X_PREFIX= yes INSTALLS_SHLIB= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:15 USE_GNOME= gnomehack libglade2 libartlgpl2 ltverhack CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ --disable-gtk-doc diff --git a/graphics/libgnomecanvas/distinfo b/graphics/libgnomecanvas/distinfo index c15708ce6f96..cd3d87c1d1d5 100644 --- a/graphics/libgnomecanvas/distinfo +++ b/graphics/libgnomecanvas/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libgnomecanvas-2.12.0.tar.bz2) = 62c0edd3d27803d341662fd9088b2d9b -SHA256 (gnome2/libgnomecanvas-2.12.0.tar.bz2) = 77c57dab746a312cd188ce9fcf91bb99b9a7e06d164f438530d65d018afd35da -SIZE (gnome2/libgnomecanvas-2.12.0.tar.bz2) = 590010 +MD5 (gnome2/libgnomecanvas-2.14.0.tar.bz2) = 516c46fb4a1401b05cfef58c350fbd3d +SHA256 (gnome2/libgnomecanvas-2.14.0.tar.bz2) = 5ceadd704327c2967868b3c0c81b5e600e1c6fd4f8efcbaaf89f9b18aa8bb5cf +SIZE (gnome2/libgnomecanvas-2.14.0.tar.bz2) = 612330 diff --git a/graphics/libgnomecanvas/pkg-plist b/graphics/libgnomecanvas/pkg-plist index fe9b38e017cd..1567a0ba6e31 100644 --- a/graphics/libgnomecanvas/pkg-plist +++ b/graphics/libgnomecanvas/pkg-plist @@ -83,6 +83,7 @@ share/locale/it/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/ja/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/kn/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/ko/LC_MESSAGES/libgnomecanvas-2.0.mo +share/locale/ku/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/li/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/lt/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/lv/LC_MESSAGES/libgnomecanvas-2.0.mo @@ -111,15 +112,23 @@ share/locale/sr@ije/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/sv/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/ta/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/tr/LC_MESSAGES/libgnomecanvas-2.0.mo +share/locale/tt/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/uk/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/vi/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/wa/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/xh/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/yi/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/zh_CN/LC_MESSAGES/libgnomecanvas-2.0.mo +share/locale/zh_HK/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/zh_TW/LC_MESSAGES/libgnomecanvas-2.0.mo +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK @dirrmtry share/locale/xh/LC_MESSAGES @dirrmtry share/locale/xh +@dirrmtry share/locale/tt/LC_MESSAGES +@dirrmtry share/locale/tt +@dirrmtry share/locale/ku/LC_MESSAGES +@dirrmtry share/locale/ku @dirrmtry share/locale/ang/LC_MESSAGES @dirrmtry share/locale/ang @dirrm %%DOCSDIR%% diff --git a/graphics/libgnomecanvasmm26/Makefile b/graphics/libgnomecanvasmm26/Makefile index 856eb1202600..733518c0cbdb 100644 --- a/graphics/libgnomecanvasmm26/Makefile +++ b/graphics/libgnomecanvasmm26/Makefile @@ -3,15 +3,14 @@ # Whom: Alexander Nedotsukov <bland@mail.ru> # # $FreeBSD$ -# $MCom: ports/graphics/libgnomecanvasmm26/Makefile,v 1.9 2005/09/07 18:37:21 marcus Exp $ +# $MCom: ports/graphics/libgnomecanvasmm26/Makefile,v 1.12 2006/04/13 07:52:35 bland Exp $ # PORTNAME= libgnomecanvasmm -PORTVERSION= 2.12.0 -PORTREVISION= 1 +PORTVERSION= 2.14.0 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} +MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} DIST_SUBDIR= gnome2 MAINTAINER= bland@FreeBSD.org diff --git a/graphics/libgnomecanvasmm26/distinfo b/graphics/libgnomecanvasmm26/distinfo index a04a8940bcb3..f7e182efc6a4 100644 --- a/graphics/libgnomecanvasmm26/distinfo +++ b/graphics/libgnomecanvasmm26/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libgnomecanvasmm-2.12.0.tar.bz2) = b05bba03433745043ef0c781020d4738 -SHA256 (gnome2/libgnomecanvasmm-2.12.0.tar.bz2) = 830622e3d0f8cbeeed3c1aeb8ec0d399505edc319f97233f3c4a6088acea3c80 -SIZE (gnome2/libgnomecanvasmm-2.12.0.tar.bz2) = 353153 +MD5 (gnome2/libgnomecanvasmm-2.14.0.tar.bz2) = a4e5bf13a31e38b4f30b99153bc10aca +SHA256 (gnome2/libgnomecanvasmm-2.14.0.tar.bz2) = 93c22a04032163d5efe2d95b1b5e7b055221ad0246c64d0dd9584338f93cb4f8 +SIZE (gnome2/libgnomecanvasmm-2.14.0.tar.bz2) = 327771 diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile index f8e9ddbdf75a..298378998967 100644 --- a/graphics/librsvg2/Makefile +++ b/graphics/librsvg2/Makefile @@ -3,15 +3,14 @@ # Whom: Ade Lovett <ade@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/librsvg2/Makefile,v 1.73 2005/10/11 22:27:04 marcus Exp $ +# $MCom: ports/graphics/librsvg2/Makefile,v 1.98 2006/04/13 07:52:35 bland Exp $ # PORTNAME= librsvg2 -PORTVERSION= 2.12.7 -PORTREVISION= 4 +PORTVERSION= 2.14.3 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.12 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} DISTNAME= librsvg-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -28,16 +27,16 @@ USE_BZIP2= yes USE_GMAKE= yes USE_X_PREFIX= yes INSTALLS_SHLIB= yes -USE_AUTOTOOLS= libtool:15 -USE_REINPLACE= yes -USE_GNOME= gnomehack gnomeprefix libartlgpl2 libgsf gtk20 ltverhack +USE_AUTOTOOLS= libtool:15 +USE_GNOME= gnomehack gnomeprefix libgsf gtk20 ltverhack CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --with-svgz \ --disable-gtk-doc \ --without-gimp \ --with-croco \ - --disable-gnome-vfs + --disable-gnome-vfs \ + --enable-gtk-theme CROCO_VERSION= 0.6 GTK_VERSION= 2.4.0 @@ -50,23 +49,18 @@ OPTIONS= MOZILLA_PLUGIN "Enable the SVG browser plug-in" no .include <bsd.port.pre.mk> -.if ${OSVERSION} > 499999 .if defined(WITH_MOZILLA_PLUGIN) -USE_GECKO= firefox mozilla +USE_GECKO= firefox mozilla seamonkey xulrunner firefox-devel .include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk" CONFIGURE_ENV+= MOZILLA_CONFIG=no CONFIGURE_ARGS+=--enable-mozilla-plugin=yes PLIST_SUB+= PLUGIN="" .else - CONFIGURE_ARGS+=--enable-mozilla-plugin=no + PLIST_SUB+= PLUGIN="@comment " .endif -.else -PLIST_SUB+= PLUGIN="@comment " -CONFIGURE_ARGS+=--enable-mozilla-plugin=no -.endif post-patch: .if defined(WITH_MOZILLA_PLUGIN) diff --git a/graphics/librsvg2/distinfo b/graphics/librsvg2/distinfo index 480c6886be6e..ebf2518b6ee2 100644 --- a/graphics/librsvg2/distinfo +++ b/graphics/librsvg2/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/librsvg-2.12.7.tar.bz2) = 2113f01fbf228f3f8fc17c49966143fe -SHA256 (gnome2/librsvg-2.12.7.tar.bz2) = b2b351675547c9d4a33b8dd6d51063ce024bcdc834ff057bcb5d1c62ab0ed781 -SIZE (gnome2/librsvg-2.12.7.tar.bz2) = 396901 +MD5 (gnome2/librsvg-2.14.3.tar.bz2) = f926aa102ccc3ce99ddf257fcce8ebf4 +SHA256 (gnome2/librsvg-2.14.3.tar.bz2) = 1fe9d73067f6be070ca5fc0bc3b06e6439947b8037acbb9a2116bf94b3acd2e7 +SIZE (gnome2/librsvg-2.14.3.tar.bz2) = 415420 diff --git a/graphics/librsvg2/files/patch-configure b/graphics/librsvg2/files/patch-configure deleted file mode 100644 index 38c33bc6c06a..000000000000 --- a/graphics/librsvg2/files/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig Wed Jun 9 01:30:07 2004 -+++ configure Wed Jun 9 01:30:24 2004 -@@ -22052,7 +22052,7 @@ - if test "x$with_html_dir" = "x" ; then - HTML_DIR='${datadir}/doc/librsvg/html' - else -- HTML_DIR=$with_html_dir -+ HTML_DIR=${with_html_dir}/librsvg/html - fi - - diff --git a/graphics/librsvg2/files/patch-moz-plugin_Makefile.in b/graphics/librsvg2/files/patch-moz-plugin_Makefile.in index 835590afdfa7..e8c168429a7a 100644 --- a/graphics/librsvg2/files/patch-moz-plugin_Makefile.in +++ b/graphics/librsvg2/files/patch-moz-plugin_Makefile.in @@ -1,20 +1,20 @@ ---- moz-plugin/Makefile.in.orig Fri Sep 9 23:59:09 2005 -+++ moz-plugin/Makefile.in Sat Sep 10 00:01:22 2005 -@@ -204,7 +204,7 @@ +--- moz-plugin/Makefile.in.orig Sat Apr 1 15:25:20 2006 ++++ moz-plugin/Makefile.in Sat Apr 1 15:27:58 2006 +@@ -246,7 +246,7 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -plugindir = $(libdir)/mozilla/plugins/ +plugindir = $(libdir)/browser_plugins/ @WITH_MOZILLA_FALSE@plugin_LTLIBRARIES = - @WITH_MOZILLA_TRUE@plugin_LTLIBRARIES = libmozsvgdec.la -@@ -253,7 +253,7 @@ - pluginLTLIBRARIES_INSTALL = $(INSTALL) + INCLUDES = $(MOZILLA_CFLAGS) -DBINDIR=\"$(bindir)/\" $(GLIB_CFLAGS) $(GDK_X11_CFLAGS) +@@ -289,7 +289,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $( + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(plugindir) -+@WITH_MOZILLA_TRUE@ $(mkinstalldirs) $(DESTDIR)$(plugindir) +- test -z "$(plugindir)" || $(mkdir_p) "$(DESTDIR)$(plugindir)" ++@WITH_MOZILLA_TRUE@ test -z "$(plugindir)" || $(mkdir_p) "$(DESTDIR)$(plugindir)" @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ + f=$(am__strip_dir) \ diff --git a/graphics/librsvg2/pkg-plist b/graphics/librsvg2/pkg-plist index 8c2da3c3ec23..b7c27e69cacb 100644 --- a/graphics/librsvg2/pkg-plist +++ b/graphics/librsvg2/pkg-plist @@ -1,7 +1,9 @@ bin/rsvg +bin/rsvg-convert bin/rsvg-view include/librsvg-2/librsvg/librsvg-enum-types.h include/librsvg-2/librsvg/librsvg-features.h +include/librsvg-2/librsvg/rsvg-cairo.h include/librsvg-2/librsvg/rsvg.h %%PLUGIN%%lib/browser_plugins/libmozsvgdec.a %%PLUGIN%%lib/browser_plugins/libmozsvgdec.la @@ -17,26 +19,8 @@ lib/librsvg-2.la lib/librsvg-2.so lib/librsvg-2.so.2 libdata/pkgconfig/librsvg-2.0.pc -share/doc/librsvg/html/home.png -share/doc/librsvg/html/index.html -share/doc/librsvg/html/index.sgml -share/doc/librsvg/html/ix01.html -share/doc/librsvg/html/left.png -share/doc/librsvg/html/right.png -share/doc/librsvg/html/rn01.html -share/doc/librsvg/html/rn02.html -share/doc/librsvg/html/rn03.html -share/doc/librsvg/html/rsvg-Convenience-Functions.html -share/doc/librsvg/html/rsvg-Core-API.html -share/doc/librsvg/html/rsvg-Creating-a-SVGZ-reader.html -share/doc/librsvg/html/rsvg.devhelp -share/doc/librsvg/html/rsvg.html -share/doc/librsvg/html/up.png share/gnome/pixmaps/svg-viewer.svg -@dirrm share/doc/librsvg/html -@dirrm share/doc/librsvg @dirrm include/librsvg-2/librsvg @dirrm include/librsvg-2 @exec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/etc/gtk-2.0/gdk-pixbuf.loaders 2>/dev/null || /usr/bin/true @unexec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/etc/gtk-2.0/gdk-pixbuf.loaders 2>/dev/null || /usr/bin/true -%%PLUGIN%%@unexec rmdir %D/lib/browser_plugins 2>/dev/null || /usr/bin/true diff --git a/graphics/poppler-gtk/Makefile b/graphics/poppler-gtk/Makefile new file mode 100644 index 000000000000..50821380dfd9 --- /dev/null +++ b/graphics/poppler-gtk/Makefile @@ -0,0 +1,22 @@ +# New ports collection makefile for: poppler-gtk +# Date created: 2006-01-12 +# Whom: Michael Johnson <ahze@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/graphics/poppler-gtk/Makefile,v 1.3 2006/03/09 01:49:50 marcus Exp $ + +PORTREVISION= 0 +PKGNAMESUFFIX= -gtk + +MAINTAINER= gnome@FreeBSD.org +COMMENT= Gtk bindings to poppler + +MASTERDIR= ${.CURDIR}/../../graphics/poppler +SLAVEPORT= gtk +PLIST= ${.CURDIR}/pkg-plist + +pre-build: + cd ${WRKSRC}/poppler && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ + Makefile ${MAKE_ARGS} libpoppler-cairo.la + +.include "${MASTERDIR}/Makefile" diff --git a/graphics/poppler-gtk/pkg-plist b/graphics/poppler-gtk/pkg-plist new file mode 100644 index 000000000000..980f6301364d --- /dev/null +++ b/graphics/poppler-gtk/pkg-plist @@ -0,0 +1,28 @@ +include/poppler/glib/poppler-action.h +include/poppler/glib/poppler-attachment.h +include/poppler/glib/poppler-document.h +include/poppler/glib/poppler-enums.h +include/poppler/glib/poppler-page.h +include/poppler/glib/poppler.h +lib/libpoppler-glib.a +lib/libpoppler-glib.la +lib/libpoppler-glib.so +lib/libpoppler-glib.so.1 +libdata/pkgconfig/poppler-glib.pc +%%DOCSDIR%%/poppler/ch01.html +%%DOCSDIR%%/poppler/home.png +%%DOCSDIR%%/poppler/index.html +%%DOCSDIR%%/poppler/index.sgml +%%DOCSDIR%%/poppler/left.png +%%DOCSDIR%%/poppler/poppler-poppler-action.html +%%DOCSDIR%%/poppler/poppler-poppler-document.html +%%DOCSDIR%%/poppler/poppler-poppler-enums.html +%%DOCSDIR%%/poppler/poppler-poppler-page.html +%%DOCSDIR%%/poppler/poppler-poppler.html +%%DOCSDIR%%/poppler/poppler.devhelp +%%DOCSDIR%%/poppler/right.png +%%DOCSDIR%%/poppler/style.css +%%DOCSDIR%%/poppler/up.png +@dirrmtry %%DOCSDIR%%/poppler +@dirrmtry %%DOCSDIR%% +@dirrm include/poppler/glib diff --git a/graphics/poppler-qt/Makefile b/graphics/poppler-qt/Makefile new file mode 100644 index 000000000000..e61c2b20004a --- /dev/null +++ b/graphics/poppler-qt/Makefile @@ -0,0 +1,18 @@ +# 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.6 2006/04/12 17:10:20 ahze 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 new file mode 100644 index 000000000000..bc152aa05973 --- /dev/null +++ b/graphics/poppler-qt/pkg-plist @@ -0,0 +1,7 @@ +include/poppler/poppler-page-transition.h +include/poppler/poppler-qt.h +lib/libpoppler-qt.a +lib/libpoppler-qt.la +lib/libpoppler-qt.so +lib/libpoppler-qt.so.1 +libdata/pkgconfig/poppler-qt.pc diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile index 48275124af67..f12fb706614c 100644 --- a/graphics/poppler/Makefile +++ b/graphics/poppler/Makefile @@ -3,25 +3,71 @@ # Whom: marcus@FreeBSD.org # # $FreeBSD$ -# $MCom: ports/graphics/poppler/Makefile,v 1.14 2005/09/03 04:44:58 ahze Exp $ +# $MCom: ports/graphics/poppler/Makefile,v 1.23 2006/04/12 17:10:20 ahze Exp $ # PORTNAME= poppler -PORTVERSION= 0.4.5 +PORTVERSION= 0.5.1 +PORTREVISION?= 0 CATEGORIES= graphics print MASTER_SITES= http://poppler.freedesktop.org/ -MAINTAINER= gnome@FreeBSD.org -COMMENT= A PDF rendering library +MAINTAINER?= gnome@FreeBSD.org +COMMENT?= A PDF rendering library -USE_X_PREFIX= yes +LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo + +CONFLICTS= xpdf-[0-9]* USE_GMAKE= yes +USE_X_PREFIX= yes GNU_CONFIGURE= yes -USE_GNOME= gnomeprefix gnomehack gtk20 +USE_GNOME= gnomehack gnometarget INSTALLS_SHLIB= yes CONFIGURE_ARGS= --enable-zlib \ - --disable-poppler-qt -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2" \ - LDFLAGS="-L${LOCALBASE}/lib" + --enable-xpdf-headers \ + --with-html-dir=${DOCSDIR} +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 -I${X11BASE}/include ${PTHREAD_CFLAGS}" \ + LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" + +.include <bsd.port.pre.mk> + +.if defined(SLAVEPORT) +LIB_DEPENDS+= poppler.1:${PORTSDIR}/graphics/poppler +.if ${SLAVEPORT}=="gtk" +CONFIGURE_ARGS+=--enable-poppler-glib +USE_GNOME+= gtk20 +BUILD_WRKSRC= ${WRKSRC}/glib +INSTALL_WRKSRC= ${WRKSRC}/glib +.elif ${SLAVEPORT}=="qt" +CONFIGURE_ARGS+=--enable-poppler-qt +USE_QT_VER+= 3 +BUILD_WRKSRC= ${WRKSRC}/qt +INSTALL_WRKSRC= ${WRKSRC}/qt +# blah.. USE_QT_VER can't be defined after bsd.port.pre.mk +.include "${PORTSDIR}/Mk/bsd.kde.mk" +.endif +.else +CONFIGURE_ARGS+=--disable-poppler-glib --disable-poppler-qt \ + --disable-poppler-qt4 +MAN1= pdffonts.1 pdfimages.1 pdfinfo.1 \ + pdftohtml.1 pdftops.1 pdftotext.1 pdftoppm.1 +.endif + +post-patch: +.if defined(SLAVEPORT) && ${SLAVEPORT}=="qt" + @${REINPLACE_CMD} -e 's|/usr/local/qt/include|${X11BASE}/include|; \ + s|/usr/local/qt/lib|${X11BASE}/lib|' \ + ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|$$QTDIR|${X11BASE}|' ${WRKSRC}/configure +.endif + +post-install: +.if defined(SLAVEPORT) +.if ${SLAVEPORT}=="gtk" + ${INSTALL_DATA} ${WRKSRC}/poppler-glib.pc ${PREFIX}/libdata/pkgconfig +.elif ${SLAVEPORT}=="qt" + ${INSTALL_DATA} ${WRKSRC}/poppler-qt.pc ${PREFIX}/libdata/pkgconfig +.endif +.endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/graphics/poppler/distinfo b/graphics/poppler/distinfo index 288cfd4c1df4..ba73162585d8 100644 --- a/graphics/poppler/distinfo +++ b/graphics/poppler/distinfo @@ -1,3 +1,3 @@ -MD5 (poppler-0.4.5.tar.gz) = 2bb1c75aa3f9c42f0ba48b5492e6d32c -SHA256 (poppler-0.4.5.tar.gz) = e5094a7587e53744ade899394ff5679e1dab2438ee0c9db137b1220c439f0639 -SIZE (poppler-0.4.5.tar.gz) = 783752 +MD5 (poppler-0.5.1.tar.gz) = a136cd731892f4570933034ba97c8704 +SHA256 (poppler-0.5.1.tar.gz) = 2ee3f06d64dd703a2411428169fe21c17f6358950bb797d52ca8eebd1dcf1abe +SIZE (poppler-0.5.1.tar.gz) = 954930 diff --git a/graphics/poppler/files/patch-configure b/graphics/poppler/files/patch-configure new file mode 100644 index 000000000000..72b0d9459e11 --- /dev/null +++ b/graphics/poppler/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.orig Wed Apr 12 12:53:56 2006 ++++ configure Wed Apr 12 13:06:36 2006 +@@ -24849,7 +24849,7 @@ + fi + fi + +-if test "x$have_qt" == "xyes"; then ++if test "x$have_qt" = "xyes"; then + POPPLER_QT_CXXFLAGS="-I$qt_incdir" + POPPLER_QT_LIBS="$qt_libdir/$qt_test_library" + : diff --git a/graphics/poppler/files/patch-glib_Makefile.in b/graphics/poppler/files/patch-glib_Makefile.in new file mode 100644 index 000000000000..111a8521c47c --- /dev/null +++ b/graphics/poppler/files/patch-glib_Makefile.in @@ -0,0 +1,37 @@ +--- glib/Makefile.in.orig Wed Mar 8 20:40:26 2006 ++++ glib/Makefile.in Wed Mar 8 20:42:17 2006 +@@ -65,7 +65,6 @@ LTLIBRARIES = $(lib_LTLIBRARIES) + am__DEPENDENCIES_1 = + @BUILD_CAIRO_OUTPUT_TRUE@am__DEPENDENCIES_2 = $(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_2) +@@ -78,7 +77,7 @@ PROGRAMS = $(noinst_PROGRAMS) + am_test_poppler_glib_OBJECTS = test-poppler-glib.$(OBJEXT) + test_poppler_glib_OBJECTS = $(am_test_poppler_glib_OBJECTS) + test_poppler_glib_DEPENDENCIES = \ +- $(top_builddir)/poppler/libpoppler.la libpoppler-glib.la \ ++ $(top_builddir)/poppler/libpoppler-cairo.la libpoppler-glib.la \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_2) + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/poppler +@@ -306,7 +305,7 @@ libpoppler_glib_la_SOURCES = \ + poppler-private.h + + libpoppler_glib_la_LIBADD = \ +- $(top_builddir)/poppler/libpoppler.la \ ++ -lpoppler \ + $(top_builddir)/poppler/libpoppler-cairo.la \ + $(POPPLER_GLIB_LIBS) \ + $(FREETYPE_LIBS) \ +@@ -317,7 +316,7 @@ test_poppler_glib_SOURCES = \ + test-poppler-glib.c + + test_poppler_glib_LDADD = \ +- $(top_builddir)/poppler/libpoppler.la \ ++ -lpoppler \ + libpoppler-glib.la \ + $(POPPLER_GLIB_LIBS) \ + $(FREETYPE_LIBS) \ diff --git a/graphics/poppler/files/patch-qt_Makefile.in b/graphics/poppler/files/patch-qt_Makefile.in new file mode 100644 index 000000000000..29d9a5fa298f --- /dev/null +++ b/graphics/poppler/files/patch-qt_Makefile.in @@ -0,0 +1,39 @@ +--- qt/Makefile.in.orig Thu Jan 12 21:37:56 2006 ++++ qt/Makefile.in Thu Jan 12 21:38:47 2006 +@@ -63,16 +63,14 @@ + 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_libpoppler_qt_la_OBJECTS = poppler-document.lo poppler-fontinfo.lo \ + poppler-page.lo poppler-page-transition.lo + libpoppler_qt_la_OBJECTS = $(am_libpoppler_qt_la_OBJECTS) + 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 \ +- libpoppler-qt.la $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) ++test_poppler_qt_DEPENDENCIES = libpoppler-qt.la $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/poppler + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles +@@ -273,7 +271,7 @@ + poppler-private.h + + libpoppler_qt_la_LIBADD = \ +- $(top_builddir)/poppler/libpoppler.la \ ++ -lpoppler \ + $(POPPLER_QT_LIBS) \ + $(FREETYPE_LIBS) + +@@ -281,7 +279,7 @@ + test-poppler-qt.cpp + + test_poppler_qt_LDADD = \ +- $(top_builddir)/poppler/libpoppler.la \ ++ -lpoppler \ + libpoppler-qt.la \ + $(POPPLER_QT_LIBS) \ + $(FREETYPE_LIBS) diff --git a/graphics/poppler/pkg-plist b/graphics/poppler/pkg-plist index eafc607a97af..dde9794b6610 100644 --- a/graphics/poppler/pkg-plist +++ b/graphics/poppler/pkg-plist @@ -1,11 +1,16 @@ +bin/pdffonts +bin/pdfimages +bin/pdfinfo +bin/pdftohtml +bin/pdftoppm +bin/pdftops +bin/pdftotext include/poppler/Annot.h include/poppler/Array.h include/poppler/BaseFile.h include/poppler/BuiltinFont.h include/poppler/BuiltinFontTables.h include/poppler/CMap.h -include/poppler/CairoFontEngine.h -include/poppler/CairoOutputDev.h include/poppler/Catalog.h include/poppler/CharCodeToUnicode.h include/poppler/CharTypes.h @@ -38,25 +43,26 @@ include/poppler/PSOutputDev.h include/poppler/PSTokenizer.h include/poppler/Page.h include/poppler/Parser.h +include/poppler/ProfileData.h +include/poppler/SecurityHandler.h include/poppler/SplashOutputDev.h include/poppler/Stream-CCITT.h include/poppler/Stream.h include/poppler/TextOutputDev.h include/poppler/UTF8.h +include/poppler/UGooString.h include/poppler/UnicodeMap.h include/poppler/UnicodeMapTables.h include/poppler/UnicodeTypeTable.h include/poppler/XRef.h -include/poppler/glib/poppler-action.h -include/poppler/glib/poppler-document.h -include/poppler/glib/poppler-enums.h -include/poppler/glib/poppler-page.h -include/poppler/glib/poppler.h +include/poppler/XpdfPluginAPI.h +include/poppler/goo/FixedPoint.h include/poppler/goo/GooHash.h include/poppler/goo/GooList.h include/poppler/goo/GooMutex.h include/poppler/goo/GooString.h include/poppler/goo/GooTimer.h +include/poppler/goo/GooVector.h include/poppler/goo/gfile.h include/poppler/goo/gmem.h include/poppler/goo/gtypes.h @@ -84,19 +90,13 @@ include/poppler/splash/SplashT1FontFile.h include/poppler/splash/SplashTypes.h include/poppler/splash/SplashXPath.h include/poppler/splash/SplashXPathScanner.h -lib/libpoppler-glib.a -lib/libpoppler-glib.la -lib/libpoppler-glib.so -lib/libpoppler-glib.so.0 lib/libpoppler.a lib/libpoppler.la lib/libpoppler.so -lib/libpoppler.so.0 +lib/libpoppler.so.1 libdata/pkgconfig/poppler-cairo.pc -libdata/pkgconfig/poppler-glib.pc libdata/pkgconfig/poppler-splash.pc libdata/pkgconfig/poppler.pc @dirrm include/poppler/splash @dirrm include/poppler/goo -@dirrm include/poppler/glib @dirrm include/poppler |