[csw-devel] SF.net SVN: gar:[11026] csw/mgar/pkg/gtk2/trunk/Makefile

[dmichelsen at users.sourceforge.net]

Revision: 11026
          http://gar.svn.sourceforge.net/gar/?rev=11026&view=rev
Author:   dmichelsen
Date:     2010-09-20 11:49:53 +0000 (Mon, 20 Sep 2010)

Log Message:
-----------
gtk2: Updated dependencies and enabled CUPS

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

Modified: csw/mgar/pkg/gtk2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gtk2/trunk/Makefile	2010-09-20 01:57:21 UTC (rev 11025)
+++ csw/mgar/pkg/gtk2/trunk/Makefile	2010-09-20 11:49:53 UTC (rev 11026)
@@ -23,6 +23,8 @@
 DISTFILES = $(DISTNAME).tar.bz2
 DISTFILES += CSWgtk2.postinstall
 
+PATCHFILES = gdkdnd-x11.c.diff
+
 PACKAGES = CSWgtk2 CSWgtk2devel CSWgtk2doc
 
 CATALOGNAME_CSWgtk2 = gtk2
@@ -35,11 +37,15 @@
 
 BUILD_DEP_PKGS = CSWbash
 RUNTIME_DEP_PKGS_CSWgtk2 = CSWfconfig CSWftype2 CSWggettextrt CSWglib2 CSWjpeg CSWlibatk
-RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibcairo CSWlibx11 CSWlibxrender CSWpango CSWpng CSWtiff
-RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibxcomposite CSWlibxcursor CSWlibxdamage CSWlibxext CSWlibxfixes CSWlibxinerama CSWlibxrandr
-RUNTIME_DEP_PKGS_CSWgtk2devel  = CSWgtk2 CSWglib2devel CSWatkdevel
-RUNTIME_DEP_PKGS_CSWgtk2devel += CSWlibcairodevel CSWlibx11devel CSWlibxrenderdevel CSWpangodevel
+RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibcairo CSWlibxrender CSWpango CSWpng CSWtiff
+RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibcups
+RUNTIME_DEP_PKGS_CSWgtk2 += CSWgnutls
+RUNTIME_DEP_PKGS_CSWgtk2 += CSWzlib
+RUNTIME_DEP_PKGS_CSWgtk2 += CSWkrb5lib
 
+RUNTIME_DEP_PKGS_CSWgtk2devel  = CSWgtk2 CSWglib2devel CSWlibatkdevel
+RUNTIME_DEP_PKGS_CSWgtk2devel += CSWlibcairodevel CSWlibxrenderdevel CSWpangodevel
+
 SPKG_SOURCEURL = http://www.gtk.org/
 
 NOISAEXEC = 1
@@ -47,8 +53,11 @@
 BUILD64 = 1
 
 CONFIGURE_ARGS  = $(DIRPATHS)
-CONFIGURE_ARGS += --disable-cups
 
+CONFIGURE_ARGS-32 += --enable-cups
+CONFIGURE_ARGS-64 += --disable-cups
+CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL))
+
 STRIP_LIBTOOL = 1
 
 #TEST_TARGET = check
@@ -64,6 +73,13 @@
 
 ARCHALL_CSWgtk2doc = 1
 
-PATCHFILES = gdkdnd-x11.c.diff
+CHECKPKG_OVERRIDES_CSWgtk2 += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/gtk-2.0/2.10.0/printbackends/libprintbackend-cups.so
 
+CHECKPKG_OVERRIDES_CSWgtk2devel += surplus-dependency|CSWglib2devel
+CHECKPKG_OVERRIDES_CSWgtk2devel += surplus-dependency|CSWpangodevel
+CHECKPKG_OVERRIDES_CSWgtk2devel += surplus-dependency|CSWlibatkdevel
+CHECKPKG_OVERRIDES_CSWgtk2devel += surplus-dependency|CSWgtk2
+CHECKPKG_OVERRIDES_CSWgtk2devel += surplus-dependency|CSWlibxrenderdevel
+CHECKPKG_OVERRIDES_CSWgtk2devel += surplus-dependency|CSWlibcairodevel
+
 include gar/category.mk


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