Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (2e2c77292065858e787f129bfd88b7f1d63c5f46)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (2e2c77292065858e787f129bfd88b7f1d63c5f46)
  • Date: Sun, 10 Feb 2013 17:11:46 -0600

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

dev/null |binary
windowmanagers/fluxbox/BUILD | 6 +
windowmanagers/fluxbox/CONFIGURE | 22 +++++--
windowmanagers/fluxbox/DEPENDS | 6 -
windowmanagers/fluxbox/DETAILS | 2
windowmanagers/fluxbox/HISTORY | 12 +++
windowmanagers/fluxbox/PRE_BUILD | 5 -
windowmanagers/fluxbox/fluxbox-1.3.2.tar.bz2.sig | 0
windowmanagers/fluxbox/fluxbox-1.3.4.tar.bz2.sig |binary
windowmanagers/fluxbox/fribidi.patch | 8 +-
windowmanagers/fluxbox/size_t.patch | 70
-----------------------
11 files changed, 40 insertions(+), 91 deletions(-)

New commits:
commit 2e2c77292065858e787f129bfd88b7f1d63c5f46
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

fluxbox: => 1.3.4

commit 6bdff0f7535d547447223fb2db4fa14424a725f8
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

Revert "Revert "fluxbox: fixed fribidi detection, when built with glib
support""

This reverts commit 1e09c9d8a9583dcecf71359e443bf1bec493976f.

commit 938728b58115d6b5d78ed5bad41532b862eed83c
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

Revert "Revert "fluxbox: => 1.3.3""

This reverts commit 60e712464e0fdceb08529d690435a7cf1158ebd7.

diff --git a/windowmanagers/fluxbox/BUILD b/windowmanagers/fluxbox/BUILD
index 3d8e291..c3bf9b1 100755
--- a/windowmanagers/fluxbox/BUILD
+++ b/windowmanagers/fluxbox/BUILD
@@ -2,6 +2,12 @@ if [[ $FLUXBOX_BRANCH == scm ]]; then
./autogen.sh
fi &&

+if is_depends_enabled $SPELL fribidi && is_depends_enabled fribidi glib2;
then
+ CXXFLAGS="-I$INSTALL_ROOT/usr/include/glib-2.0 \
+ -I$INSTALL_ROOT/usr/lib/glib-2.0/include \
+ $CXXFLAGS"
+fi &&
+
OPTS="$FLUXBOX_OPTS $OPTS" &&

default_build
diff --git a/windowmanagers/fluxbox/CONFIGURE
b/windowmanagers/fluxbox/CONFIGURE
index b0a0dcc..8dc6a74 100755
--- a/windowmanagers/fluxbox/CONFIGURE
+++ b/windowmanagers/fluxbox/CONFIGURE
@@ -3,8 +3,14 @@ list_remove FLUXBOX_OPTS '--disable-ordered-pseudo' &&
list_remove FLUXBOX_OPTS '--enable-ordered-pseudo' &&
list_remove FLUXBOX_OPTS '--enable-gnome' &&
list_remove FLUXBOX_OPTS '--disable-gnome' &&
+list_remove FLUXBOX_OPTS '--enable-randr1.2' &&
+list_remove FLUXBOX_OPTS '--disable-randr1.2' &&
+list_remove FLUXBOX_OPTS '--enable-newwmspec' &&
+list_remove FLUXBOX_OPTS '--disable-newwmspec' &&
+list_remove FLUXBOX_OPTS '--enable-timed-cache' &&
+list_remove FLUXBOX_OPTS '--disable-timed-cache' &&

-config_query FLUXBOX_CONF "Go through all (8) configuration options?" n
+config_query FLUXBOX_CONF "Go through all (9) configuration options?" n &&

if [[ $FLUXBOX_CONF == y ]]; then
config_query_option FLUXBOX_OPTS "include code for the Slit?" y \
@@ -23,17 +29,21 @@ if [[ $FLUXBOX_CONF == y ]]; then
"--enable-regexp" \
"--disable-regexp" &&

- config_query_option FLUXBOX_OPTS "include code for new WM Spec?" y \
- "--enable-newwmspec" \
- "--disable-newwmspec" &&
+ config_query_option FLUXBOX_OPTS "enable support for Extended Window
Manager Hints?" y \
+ "--enable-ewmh" \
+ "--disable-ewmh" &&

config_query_option FLUXBOX_OPTS "include verbose debugging code?" n \
"--enable-debug" \
"--disable-debug" &&

+ config_query_option FLUXBOX_OPTS "build programs used in testing fluxbox?"
n \
+ "--enable-test" \
+ "--disable-test" &&
+
config_query_option FLUXBOX_OPTS "use new timed pixmap cache?" y \
- "--enable-timed-cache" \
- "--disable-timed-cache" &&
+ "--enable-timedcache" \
+ "--disable-timedcache" &&

config_query_option FLUXBOX_OPTS "include Xmb (multibyte font, utf-8)
support?" y \
"--enable-xmb" \
diff --git a/windowmanagers/fluxbox/DEPENDS b/windowmanagers/fluxbox/DEPENDS
index da8aae5..fd3a5d0 100755
--- a/windowmanagers/fluxbox/DEPENDS
+++ b/windowmanagers/fluxbox/DEPENDS
@@ -47,12 +47,6 @@ optional_depends libxrandr \
"--disable-randr" \
"for X Randr extension support" &&

-if is_depends_enabled $SPELL libxrandr; then
- config_query_option FLUXBOX_OPTS "enable RANDR 1.2 support?" y \
- "--enable-randr1.2" \
- "--disable-randr1.2"
-fi &&
-
optional_depends fribidi \
"--enable-fribidi" \
"--disable-fribidi" \
diff --git a/windowmanagers/fluxbox/DETAILS b/windowmanagers/fluxbox/DETAILS
index 6008d69..fda3a02 100755
--- a/windowmanagers/fluxbox/DETAILS
+++ b/windowmanagers/fluxbox/DETAILS
@@ -11,7 +11,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=on
else
- VERSION=1.3.2
+ VERSION=1.3.4
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 c40622a..0b31753 100644
--- a/windowmanagers/fluxbox/HISTORY
+++ b/windowmanagers/fluxbox/HISTORY
@@ -1,3 +1,15 @@
+2013-02-11 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.3.4
+ * PRE_BUILD: force autoreconf when needed
+ * fribidi.patch: updated for new release
+
+2012-12-31 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.3.3
+ * CONFIGURE: dropped deprecated randr1.2 flags; fixed timedcache
flags;
+ added test flags; swapped deprecated flags with ewmh support
+ * BUILD: fixed fribidi detection, when built with glib support
+ * size_t.patch: dropped, fixed by upstream
+
2011-10-30 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.3.2
* DEPENDS, CONFIGURE: renewed optional flags
diff --git a/windowmanagers/fluxbox/PRE_BUILD
b/windowmanagers/fluxbox/PRE_BUILD
index 6f597d5..78e13e8 100755
--- a/windowmanagers/fluxbox/PRE_BUILD
+++ b/windowmanagers/fluxbox/PRE_BUILD
@@ -3,10 +3,7 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-# Version 1.3.2 needs this patch, git not anymore.
-[[ $FLUXBOX_GIT == y ]] || patch -p0 < "$SPELL_DIRECTORY/size_t.patch" &&
-
if is_depends_enabled $SPELL fribidi && is_version_less $(installed_version
fribidi) 0.19; then
patch -p0 < "$SPELL_DIRECTORY/fribidi.patch" &&
- autoreconf -i
+ autoreconf -fi
fi
diff --git a/windowmanagers/fluxbox/fluxbox-1.3.2.tar.bz2.sig
b/windowmanagers/fluxbox/fluxbox-1.3.2.tar.bz2.sig
deleted file mode 100644
index b3d3f00..0000000
Binary files a/windowmanagers/fluxbox/fluxbox-1.3.2.tar.bz2.sig and /dev/null
differ
diff --git a/windowmanagers/fluxbox/fluxbox-1.3.4.tar.bz2.sig
b/windowmanagers/fluxbox/fluxbox-1.3.4.tar.bz2.sig
new file mode 100644
index 0000000..323e1f8
Binary files /dev/null and b/windowmanagers/fluxbox/fluxbox-1.3.4.tar.bz2.sig
differ
diff --git a/windowmanagers/fluxbox/fribidi.patch
b/windowmanagers/fluxbox/fribidi.patch
index 088269b..dcebbbd 100644
--- a/windowmanagers/fluxbox/fribidi.patch
+++ b/windowmanagers/fluxbox/fribidi.patch
@@ -1,6 +1,6 @@
---- configure.in.orig 2011-02-19 15:09:14.000000000 +0300
-+++ configure.in 2011-02-20 01:07:55.763381637 +0300
-@@ -613,7 +613,7 @@
+--- configure.ac.orig 2013-02-10 20:14:25.000000000 +0400
++++ configure.ac 2013-02-11 02:11:54.065894982 +0400
+@@ -517,7 +517,7 @@
AC_MSG_CHECKING([for fribidi/fribidi.h])
AC_TRY_COMPILE(
#include <fribidi/fribidi.h>
@@ -8,4 +8,4 @@
+ , FRIBIDI_VERSION,
AC_MSG_RESULT([yes])
AC_DEFINE(HAVE_FRIBIDI, [1], [Define to 1 if you have
FRIBIDI])
- LIBS="$LIBS -lfribidi",
+ LIBS="-lfribidi $LIBS",
diff --git a/windowmanagers/fluxbox/size_t.patch
b/windowmanagers/fluxbox/size_t.patch
deleted file mode 100644
index cca7cd0..0000000
--- a/windowmanagers/fluxbox/size_t.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-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 Vlad Glagolev (2e2c77292065858e787f129bfd88b7f1d63c5f46), Vlad Glagolev, 02/10/2013

Archive powered by MHonArc 2.6.24.

Top of Page