SF.net SVN: gar:[22476] csw/mgar/pkg/poppler

[guengel at users.sourceforge.net]

Revision: 22476
          http://gar.svn.sourceforge.net/gar/?rev=22476&view=rev
Author:   guengel
Date:     2013-11-12 17:56:53 +0000 (Tue, 12 Nov 2013)
Log Message:
-----------
Merge branches/poppler-gcc to trunk. Removed branches/poppler-gcc.

Modified Paths:
--------------
    csw/mgar/pkg/poppler/trunk/Makefile

Removed Paths:
-------------
    csw/mgar/pkg/poppler/branches/poppler-gcc/

Property Changed:
----------------
    csw/mgar/pkg/poppler/trunk/


Property changes on: csw/mgar/pkg/poppler/trunk
___________________________________________________________________
Added: svn:mergeinfo
   + /csw/mgar/pkg/poppler/branches/poppler-gcc:22458-22475

Modified: csw/mgar/pkg/poppler/trunk/Makefile
===================================================================
--- csw/mgar/pkg/poppler/trunk/Makefile	2013-11-12 09:27:06 UTC (rev 22475)
+++ csw/mgar/pkg/poppler/trunk/Makefile	2013-11-12 17:56:53 UTC (rev 22476)
@@ -14,7 +14,7 @@
 DISTFILES += old_libs_i386.tar.bz2
 DISTFILES += old_libs_sparc.tar.bz2
 
-GARCOMPILER = SOS12U3
+GARCOMPILER = GNU
 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
 
 PATCHFILES += ltmain.patch
@@ -31,6 +31,22 @@
 SPKG_DESC_CSWlibpoppler-cpp0 += $(DESCRIPTION), libpoppler-cpp.so.0
 RUNTIME_DEP_PKGS_CSWlibpoppler-cpp0 += CSWlibpoppler43
 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)
@@ -42,6 +58,22 @@
 RUNTIME_DEP_PKGS_CSWlibpoppler-glib8 += CSWlibglib2-0-0
 RUNTIME_DEP_PKGS_CSWlibpoppler-glib8 += CSWlibpoppler43
 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
 
 PACKAGES += CSWlibpoppler43
 PKGFILES_CSWlibpoppler43 += $(call baseisadirs,$(libdir),libpoppler\.so\.43\.0\.0)
@@ -53,6 +85,8 @@
 RUNTIME_DEP_PKGS_CSWlibpoppler43 += CSWliblcms2-2
 RUNTIME_DEP_PKGS_CSWlibpoppler43 += CSWlibpng15-15
 RUNTIME_DEP_PKGS_CSWlibpoppler43 += CSWlibtiff5
+RUNTIME_DEP_PKGS_CSWlibpoppler43 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibpoppler43 += CSWlibstdc++6
 
 PACKAGES += CSWpoppler-dev
 SPKG_DESC_CSWpoppler-dev += $(DESCRIPTION), development files
@@ -87,12 +121,13 @@
 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
 
 # Fix for making sure libtool doesn't pick up libpoppler.so from /opt/csw/lib
 # when relinking libpoppler-glib during install phaze
 EXTRA_SOS_LD_FLAGS += -L$(abspath $(WORKSRC)/poppler/.libs)
 # EXTRA_CXXFLAGS += -D__EXTENSIONS__
-EXTRA_LINKER_FLAGS = -norunpath -xnorunpath
 
 CONFIGURE_ARGS = $(DIRPATHS)
 ### Install unsupported xpdf headers.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.