SF.net SVN: gar:[22419] csw/mgar/pkg/pango/trunk/Makefile

[guengel at users.sourceforge.net]

Revision: 22419
          http://gar.svn.sourceforge.net/gar/?rev=22419&view=rev
Author:   guengel
Date:     2013-11-06 14:18:42 +0000 (Wed, 06 Nov 2013)
Log Message:
-----------
pango/trunk: Updated dependencies and overrides.

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

Modified: csw/mgar/pkg/pango/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pango/trunk/Makefile	2013-11-06 12:53:33 UTC (rev 22418)
+++ csw/mgar/pkg/pango/trunk/Makefile	2013-11-06 14:18:42 UTC (rev 22419)
@@ -23,7 +23,6 @@
 SPKG_DESC_CSWpango = Pango, $(DESCRIPTION)
 # Catch all
 RUNTIME_DEP_PKGS_CSWpango += CSWlibxft2
-RUNTIME_DEP_PKGS_CSWpango += CSWlibxrender
 RUNTIME_DEP_PKGS_CSWpango += CSWlibcairo2
 RUNTIME_DEP_PKGS_CSWpango += CSWlibgmodule2-0-0
 RUNTIME_DEP_PKGS_CSWpango += CSWlibgobject2-0-0
@@ -33,20 +32,51 @@
 RUNTIME_DEP_PKGS_CSWpango += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWpango += CSWlibpango1-0-0
 RUNTIME_DEP_PKGS_CSWpango += CSWlibpangocairo1-0-0
-RUNTIME_DEP_PKGS_CSWpango += CSWlibpangoft21-0-0
+RUNTIME_DEP_PKGS_CSWpango += CSWlibpangoft2-1-0-0
 RUNTIME_DEP_PKGS_CSWpango += CSWlibpangoxft1-0-0
+RUNTIME_DEP_PKGS_CSWpango += CSWlibthai0
+RUNTIME_DEP_PKGS_CSWpango += CSWlibharfbuzz0
+CHECKPKG_OVERRIDES_CSWpango += surplus-dependency|CSWlibintl8
 
 PACKAGES += CSWlibpango1-0-0
 SPKG_DESC_CSWlibpango1-0-0 = $(DESCRIPTION), libpango-1.0.so.0
 PKGFILES_CSWlibpango1-0-0 = $(call pkgfiles_lib,libpango-1.0.so.0)
+RUNTIME_DEP_PKGS_CSWlibpango1-0-0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibpango1-0-0 += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWlibpango1-0-0 += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWlibpango1-0-0 += CSWlibgmodule2-0-0
+CHECKPKG_OVERRIDES_CSWlibpango1-0-0 += surplus-dependency|CSWlibintl8
 
 PACKAGES += CSWlibpangocairo1-0-0
 SPKG_DESC_CSWlibpangocairo1-0-0 = Cairo bindings for Pango, libpangocairo-1.0.so.0
 PKGFILES_CSWlibpangocairo1-0-0 = $(call pkgfiles_lib,libpangocairo-1.0.so.0)
+RUNTIME_DEP_PKGS_CSWlibpangocairo1-0-0 += CSWlibpango1-0-0
+RUNTIME_DEP_PKGS_CSWlibpangocairo1-0-0 += CSWlibgmodule2-0-0
+RUNTIME_DEP_PKGS_CSWlibpangocairo1-0-0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibpangocairo1-0-0 += CSWlibharfbuzz0
+RUNTIME_DEP_PKGS_CSWlibpangocairo1-0-0 += CSWlibcairo2
+RUNTIME_DEP_PKGS_CSWlibpangocairo1-0-0 += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWlibpangocairo1-0-0 += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWlibpangocairo1-0-0 += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWlibpangocairo1-0-0 += CSWlibfontconfig1
+RUNTIME_DEP_PKGS_CSWlibpangocairo1-0-0 += CSWlibpangoft2-1-0-0
+CHECKPKG_OVERRIDES_CSWlibpangocairo1-0-0 += surplus-dependency|CSWlibgmodule2-0-0
+CHECKPKG_OVERRIDES_CSWlibpangocairo1-0-0 += surplus-dependency|CSWlibintl8
+CHECKPKG_OVERRIDES_CSWlibpangocairo1-0-0 += surplus-dependency|CSWlibharfbuzz0
 
-PACKAGES += CSWlibpangoft21-0-0
-SPKG_DESC_CSWlibpangoft21-0-0 = Freetype bindings for Pango, libpangoft2-1.0.so.0
-PKGFILES_CSWlibpangoft21-0-0 = $(call pkgfiles_lib,libpangoft2-1.0.so.0)
+PACKAGES += CSWlibpangoft2-1-0-0
+SPKG_DESC_CSWlibpangoft2-1-0-0 = Freetype bindings for Pango, libpangoft2-1.0.so.0
+PKGFILES_CSWlibpangoft2-1-0-0 = $(call pkgfiles_lib,libpangoft2-1.0.so.0)
+RUNTIME_DEP_PKGS_CSWlibpangoft2-1-0-0 += CSWlibpango1-0-0
+RUNTIME_DEP_PKGS_CSWlibpangoft2-1-0-0 += CSWlibgmodule2-0-0
+RUNTIME_DEP_PKGS_CSWlibpangoft2-1-0-0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibpangoft2-1-0-0 += CSWlibharfbuzz0
+RUNTIME_DEP_PKGS_CSWlibpangoft2-1-0-0 += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWlibpangoft2-1-0-0 += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWlibpangoft2-1-0-0 += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWlibpangoft2-1-0-0 += CSWlibfontconfig1
+CHECKPKG_OVERRIDES_CSWlibpangoft2-1-0-0 += surplus-dependency|CSWlibgmodule2-0-0
+CHECKPKG_OVERRIDES_CSWlibpangoft2-1-0-0 += surplus-dependency|CSWlibintl8
 
 # I wonder where this has gone...
 #PACKAGES += CSWlibpangox1-0-0
@@ -56,15 +86,34 @@
 PACKAGES += CSWlibpangoxft1-0-0
 SPKG_DESC_CSWlibpangoxft1-0-0 = XFT bindings for Pango, libpangoxft-1.0.so.0
 PKGFILES_CSWlibpangoxft1-0-0 = $(call pkgfiles_lib,libpangoxft-1.0.so.0)
+RUNTIME_DEP_PKGS_CSWlibpangoxft1-0-0 += CSWlibpango1-0-0
+RUNTIME_DEP_PKGS_CSWlibpangoxft1-0-0 += CSWlibgmodule2-0-0
+RUNTIME_DEP_PKGS_CSWlibpangoxft1-0-0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibpangoxft1-0-0 += CSWlibharfbuzz0
+RUNTIME_DEP_PKGS_CSWlibpangoxft1-0-0 += CSWlibxft2
+RUNTIME_DEP_PKGS_CSWlibpangoxft1-0-0 += CSWlibxrender
+RUNTIME_DEP_PKGS_CSWlibpangoxft1-0-0 += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWlibpangoxft1-0-0 += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWlibpangoxft1-0-0 += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWlibpangoxft1-0-0 += CSWlibfontconfig1
+RUNTIME_DEP_PKGS_CSWlibpangoxft1-0-0 += CSWlibpangoft2-1-0-0
+CHECKPKG_OVERRIDES_CSWlibpangoxft1-0-0 += surplus-dependency|CSWlibfreetype6
+CHECKPKG_OVERRIDES_CSWlibpangoxft1-0-0 += surplus-dependency|CSWlibgmodule2-0-0
+CHECKPKG_OVERRIDES_CSWlibpangoxft1-0-0 += surplus-dependency|CSWlibintl8
+CHECKPKG_OVERRIDES_CSWlibpangoxft1-0-0 += surplus-dependency|CSWlibharfbuzz0
 
 PACKAGES += CSWlibpango-dev
 OBSOLETED_BY_CSWlibpango-dev += CSWpangodevel
 CATALOGNAME_CSWpangodevel = libpangodevel_stub
 SPKG_DESC_CSWlibpango-dev = Developer files for libpango-1.0.so.0 and assorted libs
 PKGFILES_CSWlibpango-dev = $(PKGFILES_DEVEL)
-# CSWpango pulls in all libraries
+# To make sure pango-querymodules will be called
 RUNTIME_DEP_PKGS_CSWlibpango-dev += CSWpango
 RUNTIME_DEP_PKGS_CSWlibpango-dev += CSWlibcairo-dev
+RUNTIME_DEP_PKGS_CSWlibpango-dev += CSWlibpango1-0-0
+RUNTIME_DEP_PKGS_CSWlibpango-dev += CSWlibpangoft2-1-0-0
+RUNTIME_DEP_PKGS_CSWlibpango-dev += CSWlibpangoxft1-0-0
+RUNTIME_DEP_PKGS_CSWlibpango-dev += CSWlibpangocairo1-0-0
 
 PACKAGES += CSWpango-doc
 ARCHALL_CSWpango-doc = 1
@@ -97,6 +146,7 @@
 CONFIGURE_ARGS += --enable-gtk-doc
 CONFIGURE_ARGS += --with-xft
 CONFIGURE_ARGS += --disable-static
+CONFIGURE_ARGS += --disable-introspection
 
 STRIP_LIBTOOL = 1
 

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