[csw-devel] SF.net SVN: gar:[18714] csw/mgar/pkg/libming/trunk

pfelecan at users.sourceforge.net pfelecan at users.sourceforge.net
Thu Jul 12 15:52:46 CEST 2012


Revision: 18714
          http://gar.svn.sourceforge.net/gar/?rev=18714&view=rev
Author:   pfelecan
Date:     2012-07-12 13:52:45 +0000 (Thu, 12 Jul 2012)
Log Message:
-----------
libming/trunk:
- verified and validated overrideds
- patch the include path for makeswf utility

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

Added Paths:
-----------
    csw/mgar/pkg/libming/trunk/files/0002-makeswf-include-path.patch

Modified: csw/mgar/pkg/libming/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libming/trunk/Makefile	2012-07-12 13:31:25 UTC (rev 18713)
+++ csw/mgar/pkg/libming/trunk/Makefile	2012-07-12 13:52:45 UTC (rev 18714)
@@ -19,6 +19,7 @@
 DISTNAME		=	$(SF_PROJ)-$(VERSION)
 DISTFILES		=	$(DISTNAME).tar.bz2
 PATCHFILES		+=	0001-PrintGifError-to-GifErrorString.patch
+PATCHFILES		+=	0002-makeswf-include-path.patch
 
 GARCOMPILER		=	GNU
 
@@ -44,6 +45,11 @@
 OBSOLETED_BY_CSWlibming-utils		=	CSWlibming
 CATALOGNAME_CSWlibming				=	libming_stub
 RUNTIME_DEP_PKGS_CSWlibming-utils	+=	CSWlibming1
+# transitivity:
+CHECKPKG_OVERRIDES_CSWlibming-utils	+=	missing-dependency|CSWlibbz2-1-0
+CHECKPKG_OVERRIDES_CSWlibming-utils	+=	missing-dependency|CSWlibfreetype6
+CHECKPKG_OVERRIDES_CSWlibming-utils	+=	missing-dependency|CSWlibpng12-0
+CHECKPKG_OVERRIDES_CSWlibming-utils	+=	missing-dependency|CSWlibz1
 
 SPKG_DESC_CSWlibming-utils		=	$(DESCRIPTION), utilities
 
@@ -58,18 +64,20 @@
 RUNTIME_DEP_PKGS_CSWlibming1	+=	CSWlibfreetype6
 RUNTIME_DEP_PKGS_CSWlibming1	+=	CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibming1	+=	CSWlibgif4
+CHECKPKG_OVERRIDES_CSWlibming1	+=	surplus-dependency|CSWlibgif4
 RUNTIME_DEP_PKGS_CSWlibming1	+=	CSWlibpng12-0
 RUNTIME_DEP_PKGS_CSWlibming1	+=	CSWlibz1
 
-PACKAGES						+=	CSWlibming-dev
-CATALOGNAME_CSWlibming-dev		=	libming_dev
-SPKG_DESC_CSWlibming-dev		+=	$(DESCRIPTION), development files
-PKGFILES_CSWlibming-dev			+=	/opt/csw/lib/libming.so
-PKGFILES_CSWlibming-dev			+=	$(PKGFILES_DEVEL)
-OBSOLETED_BY_CSWlibming-dev		=	CSWlibmingdevel
-CATALOGNAME_CSWlibmingdevel		=	libming_devel_stub
-RUNTIME_DEP_PKGS_CSWlibming-dev	+=	CSWlibming1
-ARCHALL_CSWlibming-dev			=	1
+PACKAGES							+=	CSWlibming-dev
+CATALOGNAME_CSWlibming-dev			=	libming_dev
+SPKG_DESC_CSWlibming-dev			+=	$(DESCRIPTION), development files
+PKGFILES_CSWlibming-dev				+=	/opt/csw/lib/libming.so
+PKGFILES_CSWlibming-dev				+=	$(PKGFILES_DEVEL)
+OBSOLETED_BY_CSWlibming-dev			=	CSWlibmingdevel
+CATALOGNAME_CSWlibmingdevel			=	libming_devel_stub
+RUNTIME_DEP_PKGS_CSWlibming-dev		+=	CSWlibming1
+ARCHALL_CSWlibming-dev				=	1
+CHECKPKG_OVERRIDES_CSWlibming-dev	+=	archall-devel-package
 
 include gar/category.mk
 

Added: csw/mgar/pkg/libming/trunk/files/0002-makeswf-include-path.patch
===================================================================
--- csw/mgar/pkg/libming/trunk/files/0002-makeswf-include-path.patch	                        (rev 0)
+++ csw/mgar/pkg/libming/trunk/files/0002-makeswf-include-path.patch	2012-07-12 13:52:45 UTC (rev 18714)
@@ -0,0 +1,25 @@
+From 63746bd44306c533f1d8d83e999589f84d39fdbf Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Thu, 12 Jul 2012 15:49:48 +0200
+Subject: [PATCH] makeswf include path
+
+---
+ util/makeswf.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/util/makeswf.h b/util/makeswf.h
+index cf3500a..a7211a2 100644
+--- a/util/makeswf.h
++++ b/util/makeswf.h
+@@ -19,7 +19,7 @@
+  ***************************************************************************/
+ 
+ /* Set this to the default include path */
+-#define DEFAULT_FLAGS "-I/usr/share/actionscript -I/usr/local/share/actionscript -I."
++#define DEFAULT_FLAGS "-I/opt/csw/share/actionscript -I."
+ 
+ /**
+  * Use a value of 0 to skip the preprocessing phase (unreccommended)
+-- 
+1.7.10.3
+

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