SF.net SVN: gar:[25934] csw/mgar/pkg/poppler/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Fri Sep 9 14:43:50 CEST 2016
Revision: 25934
http://sourceforge.net/p/gar/code/25934
Author: dmichelsen
Date: 2016-09-09 12:43:50 +0000 (Fri, 09 Sep 2016)
Log Message:
-----------
poppler/trunk: Update to 0.47.0
Modified Paths:
--------------
csw/mgar/pkg/poppler/trunk/Makefile
csw/mgar/pkg/poppler/trunk/checksums
Removed Paths:
-------------
csw/mgar/pkg/poppler/trunk/files/ltmain.patch
csw/mgar/pkg/poppler/trunk/files/old_libs_i386.tar.bz2
csw/mgar/pkg/poppler/trunk/files/old_libs_sparc.tar.bz2
Property Changed:
----------------
csw/mgar/pkg/poppler/trunk/
Index: csw/mgar/pkg/poppler/trunk
===================================================================
--- csw/mgar/pkg/poppler/trunk 2016-09-08 12:03:25 UTC (rev 25933)
+++ csw/mgar/pkg/poppler/trunk 2016-09-09 12:43:50 UTC (rev 25934)
Property changes on: csw/mgar/pkg/poppler/trunk
___________________________________________________________________
Modified: svn:ignore
## -1,4 +1 ##
-cookies
-download
work
-
Modified: csw/mgar/pkg/poppler/trunk/Makefile
===================================================================
--- csw/mgar/pkg/poppler/trunk/Makefile 2016-09-08 12:03:25 UTC (rev 25933)
+++ csw/mgar/pkg/poppler/trunk/Makefile 2016-09-09 12:43:50 UTC (rev 25934)
@@ -1,104 +1,66 @@
# $Id$
NAME = poppler
-VERSION = 0.26.0
+VERSION = 0.47.0
GARTYPE = v2
DESCRIPTION = Poppler is a PDF rendering library based on the xpdf-3.0 code base
- define BLURB
-endef
-SPKG_SOURCEURL = http://poppler.freedesktop.org/
MASTER_SITES = http://poppler.freedesktop.org/
-DISTFILES = $(NAME)-$(VERSION).tar.xz
-DISTFILES += old_libs_i386.tar.bz2
-DISTFILES += old_libs_sparc.tar.bz2
+DISTFILES += $(DISTNAME).tar.xz
-GARCOMPILER = GNU
-PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
+VENDOR_URL = http://poppler.freedesktop.org/
-PATCHFILES += ltmain.patch
-
-# UPSTREAM_MASTER_SITES =
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
-
-# BUILD64_LIBS_ONLY = 1
-BUILD64 = 1
-
PACKAGES += CSWlibpoppler-cpp0
-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 += CSWlibpoppler46
+PKGFILES_CSWlibpoppler-cpp0 += $(call pkgfiles_lib,libpoppler-cpp.so.0)
+RUNTIME_DEP_PKGS_CSWlibpoppler-cpp0 += CSWlibpoppler63
RUNTIME_DEP_PKGS_CSWlibpoppler-cpp0 += CSWlibiconv2
RUNTIME_DEP_PKGS_CSWlibpoppler-cpp0 += CSWlibgcc-s1
RUNTIME_DEP_PKGS_CSWlibpoppler-cpp0 += CSWlibstdc++6
-# Those dependencies are due to `ld -z ignore' has changed (patch 147147-26).
-RUNTIME_DEP_PKGS_CSWlibpoppler-cpp0 += CSWlibtiff5
-RUNTIME_DEP_PKGS_CSWlibpoppler-cpp0 += CSWlibpng15-15
-RUNTIME_DEP_PKGS_CSWlibpoppler-cpp0 += CSWlibfreetype6
-RUNTIME_DEP_PKGS_CSWlibpoppler-cpp0 += CSWliblcms2-2
-RUNTIME_DEP_PKGS_CSWlibpoppler-cpp0 += CSWlibfontconfig1
-RUNTIME_DEP_PKGS_CSWlibpoppler-cpp0 += CSWlibjpeg7
-# Those overrides are due to `ld -z ignore' has changed (patch 147147-26).
-CHECKPKG_OVERRIDES_CSWlibpoppler-cpp0 += surplus-dependency|CSWlibfontconfig1
-CHECKPKG_OVERRIDES_CSWlibpoppler-cpp0 += surplus-dependency|CSWlibtiff5
-CHECKPKG_OVERRIDES_CSWlibpoppler-cpp0 += surplus-dependency|CSWlibpng15-15
-CHECKPKG_OVERRIDES_CSWlibpoppler-cpp0 += surplus-dependency|CSWlibjpeg7
-CHECKPKG_OVERRIDES_CSWlibpoppler-cpp0 += surplus-dependency|CSWliblcms2-2
-CHECKPKG_OVERRIDES_CSWlibpoppler-cpp0 += surplus-dependency|CSWlibfreetype6
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
+PKGFILES_CSWlibpoppler-glib8 += $(call pkgfiles_lib,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 += CSWlibpoppler46
+RUNTIME_DEP_PKGS_CSWlibpoppler-glib8 += CSWlibpoppler63
RUNTIME_DEP_PKGS_CSWlibpoppler-glib8 += CSWlibgio2-0-0
RUNTIME_DEP_PKGS_CSWlibpoppler-glib8 += CSWlibgcc-s1
RUNTIME_DEP_PKGS_CSWlibpoppler-glib8 += CSWlibstdc++6
-# Those dependencies are due to `ld -z ignore' has changed (patch 147147-26).
-RUNTIME_DEP_PKGS_CSWlibpoppler-glib8 += CSWlibtiff5
-RUNTIME_DEP_PKGS_CSWlibpoppler-glib8 += CSWlibpng15-15
-RUNTIME_DEP_PKGS_CSWlibpoppler-glib8 += CSWlibjpeg7
-RUNTIME_DEP_PKGS_CSWlibpoppler-glib8 += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWlibpoppler-glib8 += CSWlibfontconfig1
-RUNTIME_DEP_PKGS_CSWlibpoppler-glib8 += CSWliblcms2-2
-# Those overrides are due to `ld -z ignore' has changed (patch 147147-26).
-CHECKPKG_OVERRIDES_CSWlibpoppler-glib8 += surplus-dependency|CSWlibfontconfig1
-CHECKPKG_OVERRIDES_CSWlibpoppler-glib8 += surplus-dependency|CSWlibintl8
-CHECKPKG_OVERRIDES_CSWlibpoppler-glib8 += surplus-dependency|CSWlibtiff5
-CHECKPKG_OVERRIDES_CSWlibpoppler-glib8 += surplus-dependency|CSWlibpng15-15
-CHECKPKG_OVERRIDES_CSWlibpoppler-glib8 += surplus-dependency|CSWlibjpeg7
-CHECKPKG_OVERRIDES_CSWlibpoppler-glib8 += surplus-dependency|CSWliblcms2-2
+RUNTIME_DEP_PKGS_CSWlibpoppler-glib8-sparc += CSWlibintl9
+RUNTIME_DEP_PKGS_CSWlibpoppler-glib8 += $(RUNTIME_DEP_PKGS_CSWlibpoppler-glib8-$(GARCH))
-PACKAGES += CSWlibpoppler46
-PKGFILES_CSWlibpoppler46 += $(call baseisadirs,$(libdir),libpoppler\.so\.46\.0\.0)
-PKGFILES_CSWlibpoppler46 += $(call baseisadirs,$(libdir),libpoppler\.so\.46(\.\d+)*)
-SPKG_DESC_CSWlibpoppler46 += $(DESCRIPTION), libpoppler.so.46
-RUNTIME_DEP_PKGS_CSWlibpoppler46 += CSWlibfreetype6
-RUNTIME_DEP_PKGS_CSWlibpoppler46 += CSWlibjpeg7
-RUNTIME_DEP_PKGS_CSWlibpoppler46 += CSWlibfontconfig1
-RUNTIME_DEP_PKGS_CSWlibpoppler46 += CSWliblcms2-2
-RUNTIME_DEP_PKGS_CSWlibpoppler46 += CSWlibpng15-15
-RUNTIME_DEP_PKGS_CSWlibpoppler46 += CSWlibtiff5
-RUNTIME_DEP_PKGS_CSWlibpoppler46 += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibpoppler46 += CSWlibstdc++6
+PACKAGES += CSWlibpoppler63
+SPKG_DESC_CSWlibpoppler63 += $(DESCRIPTION), libpoppler.so.63
+PKGFILES_CSWlibpoppler63 += $(call pkgfiles_lib,libpoppler.so.63)
+RUNTIME_DEP_PKGS_CSWlibpoppler63 += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWlibpoppler63 += CSWlibjpeg7
+RUNTIME_DEP_PKGS_CSWlibpoppler63 += CSWlibfontconfig1
+RUNTIME_DEP_PKGS_CSWlibpoppler63 += CSWliblcms2-2
+RUNTIME_DEP_PKGS_CSWlibpoppler63 += CSWlibtiff5
+RUNTIME_DEP_PKGS_CSWlibpoppler63 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibpoppler63 += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWlibpoppler63 += CSWlibsmime3
+RUNTIME_DEP_PKGS_CSWlibpoppler63 += CSWlibz1
+RUNTIME_DEP_PKGS_CSWlibpoppler63 += CSWlibcurl4
+RUNTIME_DEP_PKGS_CSWlibpoppler63 += CSWlibpng16-16
+RUNTIME_DEP_PKGS_CSWlibpoppler63 += CSWlibopenjp2-7
+RUNTIME_DEP_PKGS_CSWlibpoppler63 += CSWlibnss3
+RUNTIME_DEP_PKGS_CSWlibpoppler63 += CSWlibnspr4
PACKAGES += CSWpoppler-dev
SPKG_DESC_CSWpoppler-dev += $(DESCRIPTION), development files
PKGFILES_CSWpoppler-dev += $(PKGFILES_DEVEL)
-RUNTIME_DEP_PKGS_CSWpoppler-dev += CSWlibpoppler46
+RUNTIME_DEP_PKGS_CSWpoppler-dev += CSWlibpoppler63
RUNTIME_DEP_PKGS_CSWpoppler-dev += CSWlibpoppler-cpp0
RUNTIME_DEP_PKGS_CSWpoppler-dev += CSWlibpoppler-glib8
PACKAGES += CSWpoppler
SPKG_DESC_CSWpoppler += $(DESCRIPTION), utils
-PKGFILES_CSWpoppler += $(call baseisadirs,$(bindir),.*)
-PKGFILES_CSWpoppler += $(call baseisadirs,$(datadir)/man,.*)
+# PKGFILES is catchall
# CSWxpdf provides the same tools, but should use this package instead
# interims solution until rework xpdf
INCOMPATIBLE_PKGS_CSWpoppler = CSWxpdf
@@ -117,32 +79,37 @@
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 += CSWlibpoppler46
+RUNTIME_DEP_PKGS_CSWpoppler += CSWlibpoppler63
RUNTIME_DEP_PKGS_CSWpoppler += CSWlibfreetype6
RUNTIME_DEP_PKGS_CSWpoppler += CSWliblcms2-2
RUNTIME_DEP_PKGS_CSWpoppler += CSWlibcairo2
RUNTIME_DEP_PKGS_CSWpoppler += CSWlibgcc-s1
RUNTIME_DEP_PKGS_CSWpoppler += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWpoppler-sparc += CSWlibpng16-16
+RUNTIME_DEP_PKGS_CSWpoppler-sparc += CSWlibz1
+RUNTIME_DEP_PKGS_CSWpoppler += $(RUNTIME_DEP_PKGS_CSWpoppler-$(GARCH))
+OBSOLETED_BY_CSWpoppler += CSWlibpopplerdoc
+GARCOMPILER = GNU
+
+BUILD64 = 1
+
# Fix for making sure libtool doesn't pick up libpoppler.so from /opt/csw/lib
# when relinking libpoppler-glib during install phaze
EXTRA_LD_FLAGS += -L$(abspath $(WORKSRC)/poppler/.libs)
-# EXTRA_CXXFLAGS += -D__EXTENSIONS__
+
EXTRA_CFLAGS += -D_FILE_OFFSET_BITS=64
CONFIGURE_ARGS = $(DIRPATHS)
-### Install unsupported xpdf headers.
+
+# 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
+CONFIGURE_ARGS += --enable-libcurl
+
include gar/category.mk
-post-install-isa-sparcv8:
- (cd $(INSTALLISADIR)$(libdir);bzip2 -dc $(CURDIR)/$(DOWNLOADDIR)/old_libs_sparc.tar.bz2|tar xf -)
- $(MAKECOOKIE)
-
-post-install-isa-i386:
- (cd $(INSTALLISADIR)$(libdir);bzip2 -dc $(CURDIR)/$(DOWNLOADDIR)/old_libs_i386.tar.bz2|tar xf -)
- $(MAKECOOKIE)
Modified: csw/mgar/pkg/poppler/trunk/checksums
===================================================================
--- csw/mgar/pkg/poppler/trunk/checksums 2016-09-08 12:03:25 UTC (rev 25933)
+++ csw/mgar/pkg/poppler/trunk/checksums 2016-09-09 12:43:50 UTC (rev 25934)
@@ -1 +1 @@
-76c3b2f18002a0f1e2bbbc7cccd1b957 poppler-0.26.0.tar.xz
+669b195ff24173d35cacf1d20b6fe4fa poppler-0.47.0.tar.xz
Deleted: csw/mgar/pkg/poppler/trunk/files/ltmain.patch
===================================================================
--- csw/mgar/pkg/poppler/trunk/files/ltmain.patch 2016-09-08 12:03:25 UTC (rev 25933)
+++ csw/mgar/pkg/poppler/trunk/files/ltmain.patch 2016-09-09 12:43:50 UTC (rev 25934)
@@ -1,11 +0,0 @@
---- a/ltmain.sh
-+++ b/ltmain.sh
-@@ -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*|@*|-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"
- func_append compile_command " $arg"
Deleted: csw/mgar/pkg/poppler/trunk/files/old_libs_i386.tar.bz2
===================================================================
(Binary files differ)
Deleted: csw/mgar/pkg/poppler/trunk/files/old_libs_sparc.tar.bz2
===================================================================
(Binary files differ)
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