[csw-devel] SF.net SVN: gar:[21321] csw/mgar/pkg/poppler/trunk
slowfranklin at users.sourceforge.net
slowfranklin at users.sourceforge.net
Tue Jun 11 17:26:29 CEST 2013
Revision: 21321
http://gar.svn.sourceforge.net/gar/?rev=21321&view=rev
Author: slowfranklin
Date: 2013-06-11 15:26:27 +0000 (Tue, 11 Jun 2013)
Log Message:
-----------
poppler/trunk: Update to latest version
Modified Paths:
--------------
csw/mgar/pkg/poppler/trunk/Makefile
csw/mgar/pkg/poppler/trunk/checksums
csw/mgar/pkg/poppler/trunk/files/ltmain.patch
Modified: csw/mgar/pkg/poppler/trunk/Makefile
===================================================================
--- csw/mgar/pkg/poppler/trunk/Makefile 2013-06-11 10:15:51 UTC (rev 21320)
+++ csw/mgar/pkg/poppler/trunk/Makefile 2013-06-11 15:26:27 UTC (rev 21321)
@@ -1,7 +1,7 @@
# $Id$
NAME = poppler
-VERSION = 0.14.4
+VERSION = 0.22.4
GARTYPE = v2
DESCRIPTION = Poppler is a PDF rendering library based on the xpdf-3.0 code base
@@ -17,60 +17,50 @@
GARCOMPILER = SOS12U3
PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
-PATCHFILES += missing-includes.patch
+# PATCHFILES += missing-includes.patch
PATCHFILES += ltmain.patch
# UPSTREAM_MASTER_SITES =
UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
# BUILD64_LIBS_ONLY = 1
-BUILD64 = 1
+# BUILD64 = 1
PACKAGES += CSWlibpoppler-cpp0
-CATALOGNAME_CSWlibpoppler-cpp0 = libpoppler_cpp0
-PKGFILES_CSWlibpoppler-cpp0 += $(call baseisadirs,$(libdir),libpoppler-cpp\.so\.0\.1\.0)
+PKGFILES_CSWlibpoppler-cpp0 += $(call baseisadirs,$(libdir),libpoppler-cpp\.so\.0\.2\.0)
PKGFILES_CSWlibpoppler-cpp0 += $(call baseisadirs,$(libdir),libpoppler-cpp\.so\.0(\.\d+)*)
SPKG_DESC_CSWlibpoppler-cpp0 += $(DESCRIPTION), libpoppler-cpp.so.0
-RUNTIME_DEP_PKGS_CSWlibpoppler-cpp0 += CSWlibpoppler7
+RUNTIME_DEP_PKGS_CSWlibpoppler-cpp0 += CSWlibpoppler37
RUNTIME_DEP_PKGS_CSWlibpoppler-cpp0 += CSWlibiconv2
-PACKAGES += CSWlibpoppler-glib5
-CATALOGNAME_CSWlibpoppler-glib5 = libpoppler_glib5
-PKGFILES_CSWlibpoppler-glib5 += $(call baseisadirs,$(libdir),libpoppler-glib\.so\.5\.0\.0)
-PKGFILES_CSWlibpoppler-glib5 += $(call baseisadirs,$(libdir),libpoppler-glib\.so\.5(\.\d+)*)
-SPKG_DESC_CSWlibpoppler-glib5 += $(DESCRIPTION), libpoppler-glib.so.5
-RUNTIME_DEP_PKGS_CSWlibpoppler-glib5 += CSWlibgthread2-0-0
-RUNTIME_DEP_PKGS_CSWlibpoppler-glib5 += CSWlibgmodule2-0-0
-RUNTIME_DEP_PKGS_CSWlibpoppler-glib5 += CSWlibgdk-x11-2-0-0
-RUNTIME_DEP_PKGS_CSWlibpoppler-glib5 += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWlibpoppler-glib5 += CSWlibgdk-pixbuf2-0-0
-RUNTIME_DEP_PKGS_CSWlibpoppler-glib5 += CSWlibcairo2
-RUNTIME_DEP_PKGS_CSWlibpoppler-glib5 += CSWlibfreetype6
-RUNTIME_DEP_PKGS_CSWlibpoppler-glib5 += CSWlibgobject2-0-0
-RUNTIME_DEP_PKGS_CSWlibpoppler-glib5 += CSWlibglib2-0-0
-RUNTIME_DEP_PKGS_CSWlibpoppler-glib5 += CSWpango
-RUNTIME_DEP_PKGS_CSWlibpoppler-glib5 += CSWlibpoppler7
-RUNTIME_DEP_PKGS_CSWlibpoppler-glib5 += CSWlibfontconfig1
+PACKAGES += CSWlibpoppler-glib8
+PKGFILES_CSWlibpoppler-glib8 += $(call baseisadirs,$(libdir),libpoppler-glib\.so\.8\.6\.0)
+PKGFILES_CSWlibpoppler-glib8 += $(call baseisadirs,$(libdir),libpoppler-glib\.so\.8(\.\d+)*)
+SPKG_DESC_CSWlibpoppler-glib8 += $(DESCRIPTION), libpoppler-glib.so.8
+RUNTIME_DEP_PKGS_CSWlibpoppler-glib8 += CSWlibcairo2
+RUNTIME_DEP_PKGS_CSWlibpoppler-glib8 += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWlibpoppler-glib8 += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWlibpoppler-glib8 += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWlibpoppler-glib8 += CSWlibpoppler37
+RUNTIME_DEP_PKGS_CSWlibpoppler-glib8 += CSWlibgio2-0-0
-PACKAGES += CSWlibpoppler7
-CATALOGNAME_CSWlibpoppler7 = libpoppler7
-PKGFILES_CSWlibpoppler7 += $(call baseisadirs,$(libdir),libpoppler\.so\.7\.0\.0)
-PKGFILES_CSWlibpoppler7 += $(call baseisadirs,$(libdir),libpoppler\.so\.7(\.\d+)*)
-SPKG_DESC_CSWlibpoppler7 += $(DESCRIPTION), libpoppler.so.7
-RUNTIME_DEP_PKGS_CSWlibpoppler7 += CSWlibpng12-0
-RUNTIME_DEP_PKGS_CSWlibpoppler7 += CSWlibfreetype6
-RUNTIME_DEP_PKGS_CSWlibpoppler7 += CSWlibxml2-2
-RUNTIME_DEP_PKGS_CSWlibpoppler7 += CSWlibjpeg7
-RUNTIME_DEP_PKGS_CSWlibpoppler7 += CSWlibfontconfig1
-RUNTIME_DEP_PKGS_CSWlibpoppler7 += CSWliblcms1
+PACKAGES += CSWlibpoppler37
+PKGFILES_CSWlibpoppler37 += $(call baseisadirs,$(libdir),libpoppler\.so\.37\.0\.0)
+PKGFILES_CSWlibpoppler37 += $(call baseisadirs,$(libdir),libpoppler\.so\.37(\.\d+)*)
+SPKG_DESC_CSWlibpoppler37 += $(DESCRIPTION), libpoppler.so.37
+RUNTIME_DEP_PKGS_CSWlibpoppler37 += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWlibpoppler37 += CSWlibjpeg7
+RUNTIME_DEP_PKGS_CSWlibpoppler37 += CSWlibfontconfig1
+RUNTIME_DEP_PKGS_CSWlibpoppler37 += CSWliblcms2-2
+RUNTIME_DEP_PKGS_CSWlibpoppler37 += CSWlibpng15-15
+RUNTIME_DEP_PKGS_CSWlibpoppler37 += CSWlibtiff3
PACKAGES += CSWpoppler-dev
-CATALOGNAME_CSWpoppler-dev = poppler_dev
SPKG_DESC_CSWpoppler-dev += $(DESCRIPTION), development files
PKGFILES_CSWpoppler-dev += $(PKGFILES_DEVEL)
-RUNTIME_DEP_PKGS_CSWpoppler-dev += CSWlibpoppler7
+RUNTIME_DEP_PKGS_CSWpoppler-dev += CSWlibpoppler37
RUNTIME_DEP_PKGS_CSWpoppler-dev += CSWlibpoppler-cpp0
-RUNTIME_DEP_PKGS_CSWpoppler-dev += CSWlibpoppler-glib5
+RUNTIME_DEP_PKGS_CSWpoppler-dev += CSWlibpoppler-glib8
PACKAGES += CSWpoppler
SPKG_DESC_CSWpoppler += $(DESCRIPTION), utils
@@ -94,13 +84,10 @@
CHECKPKG_OVERRIDES_CSWpoppler += file-collision|/opt/csw/share/man/man1/pdftotext.1|CSWpoppler|CSWxpdf
CHECKPKG_OVERRIDES_CSWpoppler += file-collision|/opt/csw/share/man/man1/pdffonts.1|CSWpoppler|CSWxpdf
CHECKPKG_OVERRIDES_CSWpoppler += file-collision|/opt/csw/share/man/man1/pdftohtml.1|CSWpdftohtml|CSWpoppler
-RUNTIME_DEP_PKGS_CSWpoppler += CSWlibpoppler7
-RUNTIME_DEP_PKGS_CSWpoppler += CSWlibpng12-0
+RUNTIME_DEP_PKGS_CSWpoppler += CSWlibpoppler37
RUNTIME_DEP_PKGS_CSWpoppler += CSWlibfreetype6
-RUNTIME_DEP_PKGS_CSWpoppler += CSWlibxml2-2
-RUNTIME_DEP_PKGS_CSWpoppler += CSWlibjpeg7
-RUNTIME_DEP_PKGS_CSWpoppler += CSWlibfontconfig1
-RUNTIME_DEP_PKGS_CSWpoppler += CSWliblcms1
+RUNTIME_DEP_PKGS_CSWpoppler += CSWliblcms2-2
+RUNTIME_DEP_PKGS_CSWpoppler += CSWlibcairo2
# Fix for making sure libtool doesn't pick up libpoppler.so from /opt/csw/lib
# when relinking libpoppler-glib during install phaze
@@ -111,6 +98,9 @@
CONFIGURE_ARGS = $(DIRPATHS)
### Install unsupported xpdf headers.
CONFIGURE_ARGS += --enable-xpdf-headers
+CONFIGURE_ARGS += --disable-poppler-qt4
+# FIXME: introspection doesn't build on amd64, couldn't figure out why
+CONFIGURE_ARGS += --enable-introspection=no
include gar/category.mk
Modified: csw/mgar/pkg/poppler/trunk/checksums
===================================================================
--- csw/mgar/pkg/poppler/trunk/checksums 2013-06-11 10:15:51 UTC (rev 21320)
+++ csw/mgar/pkg/poppler/trunk/checksums 2013-06-11 15:26:27 UTC (rev 21321)
@@ -1 +1 @@
-a40fe96e1115f648ce4689e667743530 poppler-0.14.4.tar.gz
+49d55921ce795778c7231fe9f2fe923b poppler-0.22.4.tar.gz
Modified: csw/mgar/pkg/poppler/trunk/files/ltmain.patch
===================================================================
--- csw/mgar/pkg/poppler/trunk/files/ltmain.patch 2013-06-11 10:15:51 UTC (rev 21320)
+++ csw/mgar/pkg/poppler/trunk/files/ltmain.patch 2013-06-11 15:26:27 UTC (rev 21321)
@@ -1,11 +1,11 @@
--- a/ltmain.sh
+++ b/ltmain.sh
-@@ -4765,7 +4765,7 @@ func_mode_link ()
- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
- # @file GCC response files
+@@ -5853,7 +5853,7 @@ func_mode_link ()
+ # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-xnorunpath|-norunpath)
+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
+- -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
++ -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-xnorunpath|-norunpath)
func_quote_for_eval "$arg"
- arg="$func_quote_for_eval_result"
+ arg="$func_quote_for_eval_result"
func_append compile_command " $arg"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list