Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (d0cb583a7d3d057186d5dc3a34f2986a21fc0066)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (d0cb583a7d3d057186d5dc3a34f2986a21fc0066)
  • Date: Mon, 11 Apr 2011 01:11:04 -0500

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

dev/null |binary
windowmanagers/fluxbox/DEPENDS | 6 -
windowmanagers/fluxbox/DETAILS | 4 -
windowmanagers/fluxbox/HISTORY | 11 +++
windowmanagers/fluxbox/PREPARE | 2
windowmanagers/fluxbox/PRE_BUILD | 3
windowmanagers/fluxbox/fluxbox-1.1.1.tar.bz2.sig | 0
windowmanagers/fluxbox/gcc43.patch | 10 ---
windowmanagers/fluxbox/size_t.patch | 70
+++++++++++++++++++++++
9 files changed, 85 insertions(+), 21 deletions(-)

New commits:
commit 457674d1f5f849a74377fb7c5b338f4fb3cd1a46
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

fluxbox: delete obsolete devel version

commit d8e02eb3beee95595b59bbfac2d53dcbda4fd598
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

fluxbox: Fix build of stable version with patch that brings size_t.

Note that I did not test the "development version" 1.1.1 ... this should
go, as it is outdated.

commit c896cbc6d4ed6a81eae15c9fd79b30cc4613b943
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

fluxbox: That was my change...

commit 35e56b32bdcb1e14ac66dd5c45d5c87d47b51cc5
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

fluxbox: remove outdated patch

diff --git a/windowmanagers/fluxbox/DEPENDS b/windowmanagers/fluxbox/DEPENDS
index accf890..0d9aeb1 100755
--- a/windowmanagers/fluxbox/DEPENDS
+++ b/windowmanagers/fluxbox/DEPENDS
@@ -47,12 +47,10 @@ optional_depends libxrandr \
"--disable-randr" \
"for X Randr extension support" &&

-if [[ $FLUXBOX_DEVEL == n ]]; then
- optional_depends fribidi \
+optional_depends fribidi \
"--enable-fribidi" \
"--disable-fribidi" \
- "for FRIBIDI support"
-fi &&
+ "for FRIBIDI support" &&

suggest_depends feh "" "" "for setting wallpapers with feh" &&
suggest_depends xmessage "" "" "needed for fbsetbg -l"
diff --git a/windowmanagers/fluxbox/DETAILS b/windowmanagers/fluxbox/DETAILS
index 7e7a13d..e1bd97a 100755
--- a/windowmanagers/fluxbox/DETAILS
+++ b/windowmanagers/fluxbox/DETAILS
@@ -11,11 +11,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=on
else
- if [[ $FLUXBOX_DEVEL == y ]]; then
- VERSION=1.1.1
- else
VERSION=1.3.1
- fi
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE_GPG=gurus.gpg:$SOURCE.sig
diff --git a/windowmanagers/fluxbox/HISTORY b/windowmanagers/fluxbox/HISTORY
index fa5b71f..b45ec1b 100644
--- a/windowmanagers/fluxbox/HISTORY
+++ b/windowmanagers/fluxbox/HISTORY
@@ -1,3 +1,14 @@
+2011-04-11 Thomas Orgis <sobukus AT sourcemage.org>
+ * PREPARE, DETAILS, DEPENDS, fluxbox-1.1.1.tar.bz2.sig:
+ remove outdated development release
+
+2011-04-11 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD, size_t.patch: adding a new patch to fix size_t
+ availability -- to be removed on next release, likely.
+
+2011-04-10 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD, gcc43.patch: removed obsolete patch
+
2011-02-27 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.3.1

diff --git a/windowmanagers/fluxbox/PREPARE b/windowmanagers/fluxbox/PREPARE
index 4042b12..ccb5188 100755
--- a/windowmanagers/fluxbox/PREPARE
+++ b/windowmanagers/fluxbox/PREPARE
@@ -2,6 +2,4 @@ config_query FLUXBOX_GIT "Build the GIT version?" n

if [[ $FLUXBOX_GIT == y ]]; then
config_query FLUXBOX_GIT_AUTOUPDATE "Update git repo on every update?" n
-else
- config_query FLUXBOX_DEVEL "Use development branch?" n
fi
diff --git a/windowmanagers/fluxbox/PRE_BUILD
b/windowmanagers/fluxbox/PRE_BUILD
index 09d86a3..e8ae4ba 100755
--- a/windowmanagers/fluxbox/PRE_BUILD
+++ b/windowmanagers/fluxbox/PRE_BUILD
@@ -1,7 +1,8 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-patch -p0 < "$SPELL_DIRECTORY/gcc43.patch" &&
+# Version 1.3.1 needs this patch, git not anymore.
+[[ $FLUXBOX_GIT == y ]] || patch -p0 < "$SPELL_DIRECTORY/size_t.patch" &&

if is_depends_enabled $SPELL fribidi && [[ $(installed_version fribidi) <
0.19 ]]; then
patch -p0 < "$SPELL_DIRECTORY/fribidi.patch" &&
diff --git a/windowmanagers/fluxbox/fluxbox-1.1.1.tar.bz2.sig
b/windowmanagers/fluxbox/fluxbox-1.1.1.tar.bz2.sig
deleted file mode 100644
index 496aaff..0000000
Binary files a/windowmanagers/fluxbox/fluxbox-1.1.1.tar.bz2.sig and /dev/null
differ
diff --git a/windowmanagers/fluxbox/gcc43.patch
b/windowmanagers/fluxbox/gcc43.patch
deleted file mode 100644
index 1acb68e..0000000
--- a/windowmanagers/fluxbox/gcc43.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/main.cc.orig 2007-08-11 22:22:20.000000000 +0400
-+++ src/main.cc 2008-04-17 13:31:33.656147310 +0400
-@@ -49,6 +49,7 @@
- #include <fstream>
- #include <stdexcept>
- #include <typeinfo>
-+#include <cstring>
-
- using std::cout;
- using std::cerr;
diff --git a/windowmanagers/fluxbox/size_t.patch
b/windowmanagers/fluxbox/size_t.patch
new file mode 100644
index 0000000..cca7cd0
--- /dev/null
+++ b/windowmanagers/fluxbox/size_t.patch
@@ -0,0 +1,70 @@
+diff -ru src/FbTk/LayerItem.hh ../fluxbox-1.3.1-size_t/src/FbTk/LayerItem.hh
+--- src/FbTk/LayerItem.hh 2011-02-24 17:00:37.000000000 +0100
++++ ../fluxbox-1.3.1-size_t/src/FbTk/LayerItem.hh 2011-04-11
07:37:09.000000000 +0200
+@@ -25,6 +25,7 @@
+
+ #include "Layer.hh"
+ #include "NotCopyable.hh"
++#include <sys/types.h>
+ #include <vector>
+
+ namespace FbTk {
+diff -ru src/FbTk/MacroCommand.hh
../fluxbox-1.3.1-size_t/src/FbTk/MacroCommand.hh
+--- src/FbTk/MacroCommand.hh 2009-10-04 21:45:38.000000000 +0200
++++ ../fluxbox-1.3.1-size_t/src/FbTk/MacroCommand.hh 2011-04-11
07:35:02.000000000 +0200
+@@ -25,6 +25,7 @@
+ #include "Command.hh"
+ #include "RefCount.hh"
+
++#include <sys/types.h>
+ #include <vector>
+
+ namespace FbTk {
+diff -ru src/FbTk/Makefile.in ../fluxbox-1.3.1-size_t/src/FbTk/Makefile.in
+--- src/FbTk/Makefile.in 2011-02-27 18:40:24.000000000 +0100
++++ ../fluxbox-1.3.1-size_t/src/FbTk/Makefile.in 2011-04-10
23:35:33.000000000 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+diff -ru src/FbTk/MultLayers.hh
../fluxbox-1.3.1-size_t/src/FbTk/MultLayers.hh
+--- src/FbTk/MultLayers.hh 2011-02-24 17:00:37.000000000 +0100
++++ ../fluxbox-1.3.1-size_t/src/FbTk/MultLayers.hh 2011-04-11
07:36:19.000000000 +0200
+@@ -23,6 +23,7 @@
+ #ifndef FBTK_MULTLAYERS_HH
+ #define FBTK_MULTLAYERS_HH
+
++#include <sys/types.h>
+ #include <vector>
+
+ namespace FbTk {
+diff -ru src/Makefile.in ../fluxbox-1.3.1-size_t/src/Makefile.in
+--- src/Makefile.in 2011-02-27 18:40:24.000000000 +0100
++++ ../fluxbox-1.3.1-size_t/src/Makefile.in 2011-04-10 23:35:33.000000000
+0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -569,7 +569,7 @@
+ # (which will cause the Makefiles to be regenerated when you run
`make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @fail= failcom='exit 1'; \
++ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -594,7 +594,7 @@
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @fail= failcom='exit 1'; \
++ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+Only in ../fluxbox-1.3.1-size_t/src/: defaults.cc



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (d0cb583a7d3d057186d5dc3a34f2986a21fc0066), Thomas Orgis, 04/11/2011

Archive powered by MHonArc 2.6.24.

Top of Page