[csw-devel] SF.net SVN: gar:[22000] csw/mgar/pkg/libxfce4util/trunk

[pfelecan at users.sourceforge.net]

Revision: 22000
          http://gar.svn.sourceforge.net/gar/?rev=22000&view=rev
Author:   pfelecan
Date:     2013-09-25 09:25:17 +0000 (Wed, 25 Sep 2013)
Log Message:
-----------
libxfce4util/trunk:
- fine tune dependencies
- correct fallback directory when searching pixmaps

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

Added Paths:
-----------
    csw/mgar/pkg/libxfce4util/trunk/files/0001-search-fallback-for-pixmaps.patch

Modified: csw/mgar/pkg/libxfce4util/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libxfce4util/trunk/Makefile	2013-09-25 09:19:55 UTC (rev 21999)
+++ csw/mgar/pkg/libxfce4util/trunk/Makefile	2013-09-25 09:25:17 UTC (rev 22000)
@@ -11,6 +11,7 @@
 
 MASTER_SITES	=	http://archive.xfce.org/xfce/4.10/src/
 DISTFILES 		=	$(DISTNAME).tar.bz2
+PATCHFILES		+=	0001-search-fallback-for-pixmaps.patch
 
 BUILD_DEP_PKGS	+=	CSWgtk-doc
 BUILD_DEP_PKGS	+=	CSWvim
@@ -26,22 +27,26 @@
 CATALOGNAME_CSWlibxfce4util			=	libxfce4util
 SPKG_DESC_CSWlibxfce4util			+=	$(DESCRIPTION)
 RUNTIME_DEP_PKGS_CSWlibxfce4util	+=	CSWlibxfce4util6
-RUNTIME_DEP_PKGS_CSWlibxfce4util	+=	CSWlibintl8
-RUNTIME_DEP_PKGS_CSWlibxfce4util	+=	CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibxfce4util	+=	CSWlibglib2-0-0
 
-PACKAGES						+=	CSWlibxfce4util6
-CATALOGNAME_CSWlibxfce4util6	=	libxfce4util6
-PKGFILES_CSWlibxfce4util6		+=	$(call baseisadirs,$(libdir),libxfce4util\.so\.6\.0\.0)
-PKGFILES_CSWlibxfce4util6		+=	$(call baseisadirs,$(libdir),libxfce4util\.so\.6(\.\d+)*)
-SPKG_DESC_CSWlibxfce4util6		+=	$(DESCRIPTION), libxfce4util.so.6
+PACKAGES							+=	CSWlibxfce4util6
+CATALOGNAME_CSWlibxfce4util6		=	libxfce4util6
+PKGFILES_CSWlibxfce4util6			+=	$(call baseisadirs,$(libdir),libxfce4util\.so\.6\.0\.0)
+PKGFILES_CSWlibxfce4util6			+=	$(call baseisadirs,$(libdir),libxfce4util\.so\.6(\.\d+)*)
+SPKG_DESC_CSWlibxfce4util6			+=	$(DESCRIPTION), libxfce4util.so.6
+RUNTIME_DEP_PKGS_CSWlibxfce4util6	+=	CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibxfce4util6	+=	CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibxfce4util6	+=	CSWlibglib2-0-0
+CHECKPKG_OVERRIDES_CSWlibxfce4util6	+=	file-with-bad-content|/usr/local|root/opt/csw/lib/libxfce4util.so.6.0.0
+CHECKPKG_OVERRIDES_CSWlibxfce4util6	+=	file-with-bad-content|/usr/share|root/opt/csw/lib/libxfce4util.so.6.0.0
 
-PACKAGES						+=	CSWlibxfce4util-dev
-CATALOGNAME_CSWlibxfce4util-dev	=	libxfce4util_dev
-SPKG_DESC_CSWlibxfce4util-dev	+=	$(DESCRIPTION), development files
-PKGFILES_CSWlibxfce4util-dev	+=	/opt/csw/lib/libxfce4util.so
-PKGFILES_CSWlibxfce4util-dev	+=	$(PKGFILES_DEVEL)
-ARCHALL_CSWlibxfce4util-dev		=	1
+PACKAGES								+=	CSWlibxfce4util-dev
+CATALOGNAME_CSWlibxfce4util-dev			=	libxfce4util_dev
+SPKG_DESC_CSWlibxfce4util-dev			+=	$(DESCRIPTION), development files
+PKGFILES_CSWlibxfce4util-dev			+=	/opt/csw/lib/libxfce4util.so
+PKGFILES_CSWlibxfce4util-dev			+=	$(PKGFILES_DEVEL)
+RUNTIME_DEP_PKGS_CSWlibxfce4util-dev	+=	CSWlibxfce4util6
+ARCHALL_CSWlibxfce4util-dev				=	1
+CHECKPKG_OVERRIDES_CSWlibxfce4util-dev	+=	archall-devel-package
 
 PACKAGES						+=	CSWlibxfce4util-doc
 CATALOGNAME_CSWlibxfce4util-doc	=	libxfce4util_doc

Added: csw/mgar/pkg/libxfce4util/trunk/files/0001-search-fallback-for-pixmaps.patch
===================================================================
--- csw/mgar/pkg/libxfce4util/trunk/files/0001-search-fallback-for-pixmaps.patch	                        (rev 0)
+++ csw/mgar/pkg/libxfce4util/trunk/files/0001-search-fallback-for-pixmaps.patch	2013-09-25 09:25:17 UTC (rev 22000)
@@ -0,0 +1,25 @@
+From aac5b289ecb8f46d8fc71ecd4c1501422e3c3bad Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Wed, 25 Sep 2013 11:13:43 +0200
+Subject: [PATCH] search fallback for pixmaps
+
+---
+ libxfce4util/xfce-resource.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libxfce4util/xfce-resource.c b/libxfce4util/xfce-resource.c
+index d39e6ad..92d6e9e 100644
+--- a/libxfce4util/xfce-resource.c
++++ b/libxfce4util/xfce-resource.c
+@@ -243,7 +243,7 @@ _res_init (void)
+   _list[XFCE_RESOURCE_ICONS] = g_slist_append (_list[XFCE_RESOURCE_ICONS], "/usr/share/pixmaps");
+ 
+   /* fallback for system which that don't install everything in /usr */
+-  _list[XFCE_RESOURCE_ICONS] = g_slist_append (_list[XFCE_RESOURCE_ICONS], "/usr/local/share/pixmaps");
++  _list[XFCE_RESOURCE_ICONS] = g_slist_append (_list[XFCE_RESOURCE_ICONS], "/opt/csw/share/pixmaps");
+   _list[XFCE_RESOURCE_ICONS] = g_slist_append (_list[XFCE_RESOURCE_ICONS], DATADIR "/share/pixmaps");
+ 
+   /*
+-- 
+1.8.3.4
+

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