[csw-devel] SF.net SVN: gar:[21143] csw/mgar/pkg/fluxbox/trunk
wahwah at users.sourceforge.net
wahwah at users.sourceforge.net
Sun May 19 16:01:06 CEST 2013
Revision: 21143
http://gar.svn.sourceforge.net/gar/?rev=21143&view=rev
Author: wahwah
Date: 2013-05-19 14:01:06 +0000 (Sun, 19 May 2013)
Log Message:
-----------
fluxbox/trunk: version upgrade, a couple patches
Modified Paths:
--------------
csw/mgar/pkg/fluxbox/trunk/Makefile
csw/mgar/pkg/fluxbox/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/fluxbox/trunk/files/0001-Solaris-userland-OpenCSW-bash.patch
csw/mgar/pkg/fluxbox/trunk/files/0002-Workaround-the-double-EXEEXT-substitution.patch
csw/mgar/pkg/fluxbox/trunk/files/0003-The-italian-NLS-part-is-broken.patch
csw/mgar/pkg/fluxbox/trunk/files/0004-Use-the-fluxbox-command-that-was-just-built.patch
csw/mgar/pkg/fluxbox/trunk/files/0006-fluxbox-generate_menu-Use-CSWbash.patch
Removed Paths:
-------------
csw/mgar/pkg/fluxbox/trunk/files/0001-Solaris-userland-port-grep-whoami.patch
csw/mgar/pkg/fluxbox/trunk/files/0001-Use-gwhoami-from-CSWcoreutils.patch
Modified: csw/mgar/pkg/fluxbox/trunk/Makefile
===================================================================
--- csw/mgar/pkg/fluxbox/trunk/Makefile 2013-05-19 11:12:27 UTC (rev 21142)
+++ csw/mgar/pkg/fluxbox/trunk/Makefile 2013-05-19 14:01:06 UTC (rev 21143)
@@ -2,7 +2,7 @@
# TODO (release-critical prefixed with !, non release-critical with *)
#
NAME = fluxbox
-VERSION = 1.3.2
+VERSION = 1.3.5
GARTYPE = v2
DESCRIPTION = Brief description
@@ -14,30 +14,28 @@
MASTER_SITES = $(SF_MIRROR)
DISTFILES = $(DISTNAME).tar.bz2
-PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
-
EXTRA_CPPFLAGS = -features=extensions -D__FUNCTION__=__func__
EXTRA_LINKER_FLAGS = -norunpath
-# PATCHFILES += 0001-Use-gwhoami-from-CSWcoreutils.patch
-PATCHFILES += 0001-Solaris-userland-port-grep-whoami.patch
+PATCHFILES += 0001-Solaris-userland-OpenCSW-bash.patch
+PATCHFILES += 0002-Workaround-the-double-EXEEXT-substitution.patch
+PATCHFILES += 0003-The-italian-NLS-part-is-broken.patch
+PATCHFILES += 0004-Use-the-fluxbox-command-that-was-just-built.patch
+PATCHFILES += 0006-fluxbox-generate_menu-Use-CSWbash.patch
CONFIGURE_ARGS = $(DIRPATHS)
-RUNTIME_DEP_PKGS_CSWfluxbox += CSWimlib2
-RUNTIME_DEP_PKGS_CSWfluxbox += CSWlibfontconfig1
-RUNTIME_DEP_PKGS_CSWfluxbox += CSWlibfreetype6
-RUNTIME_DEP_PKGS_CSWfluxbox += CSWlibfribidi0
+RUNTIME_DEP_PKGS_CSWfluxbox += CSWbash
+RUNTIME_DEP_PKGS_CSWfluxbox += CSWlibxpm4
RUNTIME_DEP_PKGS_CSWfluxbox += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWfluxbox += CSWlibxft2
RUNTIME_DEP_PKGS_CSWfluxbox += CSWlibxrender
-RUNTIME_DEP_PKGS_CSWfluxbox += CSWlibz1
-RUNTIME_DEP_PKGS_CSWfluxbox += CSWxpm
-CHECKPKG_OVERRIDES_CSWfluxbox += file-with-bad-content|/usr/share|root/opt/csw/share/man/man5/fluxbox-style.5
-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
+RUNTIME_DEP_PKGS_CSWfluxbox += CSWlibimlib2-1
+RUNTIME_DEP_PKGS_CSWfluxbox += CSWlibfribidi0
+CHECKPKG_OVERRIDES_CSWfluxbox += file-with-bad-content
+# checkpkg doesn't detect this dependency
+CHECKPKG_OVERRIDES_CSWfluxbox += surplus-dependency|CSWbash
+
include gar/category.mk
PATH := /opt/csw/gnu:$(PATH)
Modified: csw/mgar/pkg/fluxbox/trunk/checksums
===================================================================
--- csw/mgar/pkg/fluxbox/trunk/checksums 2013-05-19 11:12:27 UTC (rev 21142)
+++ csw/mgar/pkg/fluxbox/trunk/checksums 2013-05-19 14:01:06 UTC (rev 21143)
@@ -1 +1 @@
-f95b0bdb9ee41bfac124bd0fc601f248 fluxbox-1.3.2.tar.bz2
+9d9e183424a0934e20417ff20775a570 fluxbox-1.3.5.tar.bz2
Added: csw/mgar/pkg/fluxbox/trunk/files/0001-Solaris-userland-OpenCSW-bash.patch
===================================================================
--- csw/mgar/pkg/fluxbox/trunk/files/0001-Solaris-userland-OpenCSW-bash.patch (rev 0)
+++ csw/mgar/pkg/fluxbox/trunk/files/0001-Solaris-userland-OpenCSW-bash.patch 2013-05-19 14:01:06 UTC (rev 21143)
@@ -0,0 +1,61 @@
+From 31c823ba3a38a920e46a7c32718e61dcec6467b8 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Sun, 19 May 2013 13:01:14 +0200
+Subject: [PATCH] Solaris userland, OpenCSW bash
+
+---
+ util/fbsetbg | 5 +++--
+ util/fluxbox-generate_menu.in | 7 ++++---
+ 2 files changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/util/fbsetbg b/util/fbsetbg
+index e277317..f3ad444 100644
+--- a/util/fbsetbg
++++ b/util/fbsetbg
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/opt/csw/bin/bash
+ #
+ # Set wallpaper for fluxbox.
+ #
+@@ -48,7 +48,8 @@ wpsetters="${wpsetters:=Esetroot wmsetbg feh hsetroot chbg display qiv xv xsri x
+ 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 bc01062..897da0b 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
+ printf "\"${entry_exec}\" \t <${entry_icon}>\n" >> $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@@EXEEXT@ -info 2> /dev/null | grep -q "^IMLIB"; then
++if @pkgprefix at fluxbox@pkgsuffix@@EXEEXT@ -info 2> /dev/null | grep "^IMLIB"; then
+ PNG_ICONS="yes"
+ else
+ # better assume to assume "no"
+--
+1.8.1.4
+
Deleted: 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 2013-05-19 11:12:27 UTC (rev 21142)
+++ csw/mgar/pkg/fluxbox/trunk/files/0001-Solaris-userland-port-grep-whoami.patch 2013-05-19 14:01:06 UTC (rev 21143)
@@ -1,56 +0,0 @@
-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
-
Deleted: csw/mgar/pkg/fluxbox/trunk/files/0001-Use-gwhoami-from-CSWcoreutils.patch
===================================================================
--- csw/mgar/pkg/fluxbox/trunk/files/0001-Use-gwhoami-from-CSWcoreutils.patch 2013-05-19 11:12:27 UTC (rev 21142)
+++ csw/mgar/pkg/fluxbox/trunk/files/0001-Use-gwhoami-from-CSWcoreutils.patch 2013-05-19 14:01:06 UTC (rev 21143)
@@ -1,25 +0,0 @@
-From 9ad03afab9348046c24a45e0eecda76568f778a9 Mon Sep 17 00:00:00 2001
-From: Maciej Blizinski <maciej at opencsw.org>
-Date: Mon, 4 Jun 2012 21:14:44 +0200
-Subject: [PATCH] Use gwhoami from CSWcoreutils
-
----
- util/fbsetbg | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/util/fbsetbg b/util/fbsetbg
-index 0bdb804..cf888e7 100644
---- a/util/fbsetbg
-+++ b/util/fbsetbg
-@@ -48,7 +48,7 @@ wpsetters="${wpsetters:=Esetroot wmsetbg feh hsetroot chbg display qiv xv xsri x
- lastwallpaper="${HOME}/.fluxbox/lastwallpaper"
-
-
--WHOAMI=`whoami`
-+WHOAMI=`gwhoami`
- [ "$WHOAMI" = root ] && PATH=/bin:/usr/bin/:/usr/local/bin:/usr/X11R6/bin
-
- command="`basename \"$0\"`"
---
-1.7.10
-
Added: csw/mgar/pkg/fluxbox/trunk/files/0002-Workaround-the-double-EXEEXT-substitution.patch
===================================================================
--- csw/mgar/pkg/fluxbox/trunk/files/0002-Workaround-the-double-EXEEXT-substitution.patch (rev 0)
+++ csw/mgar/pkg/fluxbox/trunk/files/0002-Workaround-the-double-EXEEXT-substitution.patch 2013-05-19 14:01:06 UTC (rev 21143)
@@ -0,0 +1,34 @@
+From 30d052b3ce0aed292756a08b8377a36e4d7c9819 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Sun, 19 May 2013 13:54:46 +0200
+Subject: [PATCH] Workaround the double EXEEXT substitution
+
+---
+ util/Makefile.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/util/Makefile.in b/util/Makefile.in
+index 4b809b6..f315b94 100644
+--- a/util/Makefile.in
++++ b/util/Makefile.in
+@@ -780,7 +780,7 @@ startfluxbox: startfluxbox.in
+ -e "s, at pkgbindir@,$(bindir),g" \
+ -e "s, at pkgprefix@,$(PROGRAM_PREFIX:NONE=),g" \
+ -e "s, at pkgsuffix@,$(PROGRAM_SUFFIX:NONE=),g" \
+- -e "s, at EXEEXT@,$(EXEEXT),g" \
++ -e "s, at EXE\{2\}XT@,$(EXEEXT),g" \
+ $(srcdir)/startfluxbox.in > startfluxbox
+ -chmod 755 startfluxbox
+
+@@ -788,7 +788,7 @@ fluxbox-generate_menu: fluxbox-generate_menu.in
+ @regex_cmd@ -e "s, at PREFIX@,$(prefix),g" \
+ -e "s, at pkgprefix@,$(PROGRAM_PREFIX:NONE=),g" \
+ -e "s, at pkgsuffix@,$(PROGRAM_SUFFIX:NONE=),g" \
+- -e "s, at EXEEXT@,$(EXEEXT),g" \
++ -e "s, at EXE\{2\}XT@,$(EXEEXT),g" \
+ $(srcdir)/fluxbox-generate_menu.in \
+ > fluxbox-generate_menu
+ -chmod 755 fluxbox-generate_menu
+--
+1.8.1.4
+
Added: csw/mgar/pkg/fluxbox/trunk/files/0003-The-italian-NLS-part-is-broken.patch
===================================================================
--- csw/mgar/pkg/fluxbox/trunk/files/0003-The-italian-NLS-part-is-broken.patch (rev 0)
+++ csw/mgar/pkg/fluxbox/trunk/files/0003-The-italian-NLS-part-is-broken.patch 2013-05-19 14:01:06 UTC (rev 21143)
@@ -0,0 +1,25 @@
+From 1c583e3d7125f89e53138417263e9bd3f4149017 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Sun, 19 May 2013 13:57:49 +0200
+Subject: [PATCH] The italian NLS part is broken
+
+---
+ nls/Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/nls/Makefile.in b/nls/Makefile.in
+index 27eee7a..2071bbe 100644
+--- a/nls/Makefile.in
++++ b/nls/Makefile.in
+@@ -225,7 +225,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ NLSTEST = @NLS@
+ SUBDIRS = C cs_CZ da_DK es_AR es_ES et_EE fr_FR pt_BR ru_RU \
+- sv_SE tr_TR it_IT pt_PT bg_BG ja_JP ko_KR \
++ sv_SE tr_TR pt_PT bg_BG ja_JP ko_KR \
+ lv_LV de_DE nl_NL no_NO sl_SI pl_PL vi_VN be_BY \
+ uk_UA el_GR nb_NO zh_CN fi_FI en_US en_GB de_CH \
+ de_AT fr_CH sk_SK zh_TW mk_MK he_IL
+--
+1.8.1.4
+
Added: csw/mgar/pkg/fluxbox/trunk/files/0004-Use-the-fluxbox-command-that-was-just-built.patch
===================================================================
--- csw/mgar/pkg/fluxbox/trunk/files/0004-Use-the-fluxbox-command-that-was-just-built.patch (rev 0)
+++ csw/mgar/pkg/fluxbox/trunk/files/0004-Use-the-fluxbox-command-that-was-just-built.patch 2013-05-19 14:01:06 UTC (rev 21143)
@@ -0,0 +1,40 @@
+From 69f34ff8f71dc588e1b0bc0f2901aa05d8b6f54b Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Sun, 19 May 2013 14:54:17 +0200
+Subject: [PATCH] Use the 'fluxbox' command that was just built
+
+Not the one from somewhere in PATH.
+---
+ data/Makefile.am | 2 +-
+ data/Makefile.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/Makefile.am b/data/Makefile.am
+index c71f820..912cb6a 100644
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -55,7 +55,7 @@ menu: ../util/fluxbox-generate_menu
+ PREFIX="${prefix}" \
+ MENUTITLE="Fluxbox-${VERSION}" \
+ INSTALL=Yes \
+- PATH="${PATH}:../util:../util/fbrun" \
++ PATH="../src:${PATH}:../util:../util/fbrun" \
+ ../util/fluxbox-generate_menu
+
+ ../util/fluxbox-generate_menu:
+diff --git a/data/Makefile.in b/data/Makefile.in
+index 58070b8..80f2021 100644
+--- a/data/Makefile.in
++++ b/data/Makefile.in
+@@ -653,7 +653,7 @@ menu: ../util/fluxbox-generate_menu
+ PREFIX="${prefix}" \
+ MENUTITLE="Fluxbox-${VERSION}" \
+ INSTALL=Yes \
+- PATH="${PATH}:../util:../util/fbrun" \
++ PATH="../src:${PATH}:../util:../util/fbrun" \
+ ../util/fluxbox-generate_menu
+
+ ../util/fluxbox-generate_menu:
+--
+1.8.1.4
+
Added: csw/mgar/pkg/fluxbox/trunk/files/0006-fluxbox-generate_menu-Use-CSWbash.patch
===================================================================
--- csw/mgar/pkg/fluxbox/trunk/files/0006-fluxbox-generate_menu-Use-CSWbash.patch (rev 0)
+++ csw/mgar/pkg/fluxbox/trunk/files/0006-fluxbox-generate_menu-Use-CSWbash.patch 2013-05-19 14:01:06 UTC (rev 21143)
@@ -0,0 +1,23 @@
+From b464eac98a65b9d3c0dbd39765d23f87b29a5902 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Sun, 19 May 2013 15:48:01 +0200
+Subject: [PATCH] fluxbox-generate_menu: Use CSWbash
+
+The script is not compatible with /bin/sh on Solaris.
+---
+ util/fluxbox-generate_menu.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/util/fluxbox-generate_menu.in b/util/fluxbox-generate_menu.in
+index 1b8e976..2c62650 100755
+--- a/util/fluxbox-generate_menu.in
++++ b/util/fluxbox-generate_menu.in
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/opt/csw/bin/bash
+ #
+ # generate_menu for Fluxbox
+ #
+--
+1.8.1.4
+
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