[csw-devel] SF.net SVN: gar:[18243] csw/mgar/pkg/fluxbox/trunk

wahwah at users.sourceforge.net wahwah at users.sourceforge.net
Thu Jun 7 10:26:45 CEST 2012


Revision: 18243
          http://gar.svn.sourceforge.net/gar/?rev=18243&view=rev
Author:   wahwah
Date:     2012-06-07 08:26:45 +0000 (Thu, 07 Jun 2012)
Log Message:
-----------
fluxbox/trunk: Include patches from Phil

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

Added Paths:
-----------
    csw/mgar/pkg/fluxbox/trunk/files/0001-Solaris-userland-port-grep-whoami.patch

Modified: csw/mgar/pkg/fluxbox/trunk/Makefile
===================================================================
--- csw/mgar/pkg/fluxbox/trunk/Makefile	2012-06-07 07:13:31 UTC (rev 18242)
+++ csw/mgar/pkg/fluxbox/trunk/Makefile	2012-06-07 08:26:45 UTC (rev 18243)
@@ -20,11 +20,11 @@
 EXTRA_CPPFLAGS = -features=extensions -D__FUNCTION__=__func__
 EXTRA_LINKER_FLAGS = -norunpath
 
-PATCHFILES += 0001-Use-gwhoami-from-CSWcoreutils.patch
+# PATCHFILES += 0001-Use-gwhoami-from-CSWcoreutils.patch
+PATCHFILES += 0001-Solaris-userland-port-grep-whoami.patch
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
-RUNTIME_DEP_PKGS_CSWfluxbox += CSWcoreutils
 RUNTIME_DEP_PKGS_CSWfluxbox += CSWimlib2
 RUNTIME_DEP_PKGS_CSWfluxbox += CSWlibfontconfig1
 RUNTIME_DEP_PKGS_CSWfluxbox += CSWlibfreetype6
@@ -38,7 +38,6 @@
 CHECKPKG_OVERRIDES_CSWfluxbox += file-with-bad-content|/usr/share|root/opt/csw/bin/fluxbox-generate_menu
 CHECKPKG_OVERRIDES_CSWfluxbox += file-with-bad-content|/usr/local|root/opt/csw/bin/fluxbox-generate_menu
 CHECKPKG_OVERRIDES_CSWfluxbox += file-with-bad-content|/usr/local|root/opt/csw/bin/fbsetbg
-CHECKPKG_OVERRIDES_CSWfluxbox += surplus-dependency|CSWcoreutils
 
 include gar/category.mk
 

Added: csw/mgar/pkg/fluxbox/trunk/files/0001-Solaris-userland-port-grep-whoami.patch
===================================================================
--- csw/mgar/pkg/fluxbox/trunk/files/0001-Solaris-userland-port-grep-whoami.patch	                        (rev 0)
+++ csw/mgar/pkg/fluxbox/trunk/files/0001-Solaris-userland-port-grep-whoami.patch	2012-06-07 08:26:45 UTC (rev 18243)
@@ -0,0 +1,56 @@
+From f9e400a3cf8517ab4417dbe117a588b2e0669d4c Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Thu, 7 Jun 2012 10:23:16 +0200
+Subject: [PATCH] Solaris userland port: grep, whoami
+
+---
+ util/fbsetbg                  |    4 ++--
+ util/fluxbox-generate_menu.in |    7 ++++---
+ 2 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/util/fbsetbg b/util/fbsetbg
+index 0bdb804..bb96f7f 100644
+--- a/util/fbsetbg
++++ b/util/fbsetbg
+@@ -47,8 +47,8 @@
+ wpsetters="${wpsetters:=Esetroot wmsetbg feh hsetroot chbg display qiv xv xsri xli xsetbg}" # broken icewmbg'
+ lastwallpaper="${HOME}/.fluxbox/lastwallpaper"
+ 
+-
+-WHOAMI=`whoami`
++PATH=/usr/xpg4/bin:$PATH  # just for xpg4 'id'. Sol11 is fine with /bin/id
++WHOAMI=`id -u -n`
+ [ "$WHOAMI" = root ] && PATH=/bin:/usr/bin/:/usr/local/bin:/usr/X11R6/bin
+ 
+ command="`basename \"$0\"`"
+diff --git a/util/fluxbox-generate_menu.in b/util/fluxbox-generate_menu.in
+index cecc3fe..54fd959 100755
+--- a/util/fluxbox-generate_menu.in
++++ b/util/fluxbox-generate_menu.in
+@@ -330,7 +330,7 @@ searchForIcon(){
+     # echo "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" 
+     if [ -f "$entry_icon" ]; then
+     # if icon exists and entry does not already exists, add it
+-        if ! grep -q -m 1 "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" $ICONMAPPING 2> /dev/null; then
++        if ! grep -m 1 "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" $ICONMAPPING 2> /dev/null; then
+             echo -e "\"${entry_exec}\" \t <${entry_icon}>" >> $ICONMAPPING
+         else 
+             : echo "#    mapping already exists for ${entry_exec}" >> $ICONMAPPING
+@@ -557,11 +557,12 @@ rm -f ${MENUFILENAME}.tmp
+ # End functions
+ 
+ 
+-WHOAMI=`whoami`
++PATH=/usr/xpg4/bin:$PATH  # just for xpg4 'id'. Sol11 is fine with /bin/id
++WHOAMI=`id -u -n`
+ [ "$WHOAMI" = root ] && PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin
+ 
+ # Check for Imlib2-support
+-if @pkgprefix at fluxbox@pkgsuffix@ -info 2> /dev/null | grep -q "^IMLIB"; then
++if @pkgprefix at fluxbox@pkgsuffix@ -info 2> /dev/null | grep "^IMLIB"; then
+     PNG_ICONS="yes"
+ else
+     # better assume to assume "no"
+-- 
+1.7.10
+

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