[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (d5398191dd673338953d87c06639335f1a3244f0)

Vlad Glagolev scm at sourcemage.org
Sat Feb 19 17:49:18 EST 2011


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

 windowmanagers/fluxbox/BUILD         |    2 --
 windowmanagers/fluxbox/CONFIGURE     |   12 ++++--------
 windowmanagers/fluxbox/DEPENDS       |    5 +++++
 windowmanagers/fluxbox/DETAILS       |    1 +
 windowmanagers/fluxbox/HISTORY       |    8 ++++++++
 windowmanagers/fluxbox/PRE_BUILD     |    5 ++++-
 windowmanagers/fluxbox/fribidi.patch |   11 +++++++++++
 7 files changed, 33 insertions(+), 11 deletions(-)

New commits:
commit d5398191dd673338953d87c06639335f1a3244f0
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    fluxbox: post-update fixes

diff --git a/windowmanagers/fluxbox/BUILD b/windowmanagers/fluxbox/BUILD
index fa19e18..2e16e4b 100755
--- a/windowmanagers/fluxbox/BUILD
+++ b/windowmanagers/fluxbox/BUILD
@@ -1,5 +1,3 @@
-CPPFLAGS="-I/usr/include/freetype2 $CPPFLAGS" &&
-
 if [[ $FLUXBOX_GIT == y ]]; then
   ./autogen.sh
 fi &&
diff --git a/windowmanagers/fluxbox/CONFIGURE b/windowmanagers/fluxbox/CONFIGURE
index 27cf0e2..0662678 100755
--- a/windowmanagers/fluxbox/CONFIGURE
+++ b/windowmanagers/fluxbox/CONFIGURE
@@ -1,4 +1,4 @@
-config_query FLUXBOX_CONF "Go through all (10) 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 \
@@ -13,7 +13,7 @@ if [[ $FLUXBOX_CONF == y ]]; then
                                    "--enable-toolbar" \
                                    "--disable-toolbar" &&
 
-  config_query_option FLUXBOX_OPTS "regular expression support?" y \
+  config_query_option FLUXBOX_OPTS "use regular expression support?" y \
                                    "--enable-regexp" \
                                    "--disable-regexp" &&
 
@@ -25,19 +25,15 @@ if [[ $FLUXBOX_CONF == y ]]; then
                                    "--enable-debug" \
                                    "--disable-debug" &&
 
-  config_query_option FLUXBOX_OPTS "include native language support?" n \
-                                   "--enable-nls" \
-                                   "--disable-nls" &&
-
   config_query_option FLUXBOX_OPTS "use new timed pixmap cache?" y \
                                    "--enable-timed-cache" \
                                    "--disable-timed-cache" &&
 
-  config_query_option FLUXBOX_OPTS "GNOME support?" n \
+  config_query_option FLUXBOX_OPTS "use GNOME window manager hints?" n \
                                    "--enable-gnome" \
                                    "--disable-gnome" &&
 
-  config_query_option FLUXBOX_OPTS "Xmb (multibyte font, utf-8) support?" y \
+  config_query_option FLUXBOX_OPTS "include Xmb (multibyte font, utf-8) support?" y \
                                    "--enable-xmb" \
                                    "--disable-xmb"
 fi
diff --git a/windowmanagers/fluxbox/DEPENDS b/windowmanagers/fluxbox/DEPENDS
index 2795ff2..accf890 100755
--- a/windowmanagers/fluxbox/DEPENDS
+++ b/windowmanagers/fluxbox/DEPENDS
@@ -7,6 +7,11 @@ if [[ $FLUXBOX_GIT == y ]]; then
   depends git
 fi &&
 
+optional_depends gettext \
+                 "--enable-nls" \
+                 "--disable-nls" \
+                 "for native language support" &&
+
 optional_depends imlib2 \
                  "--enable-imlib2" \
                  "--disable-imlib2" \
diff --git a/windowmanagers/fluxbox/DETAILS b/windowmanagers/fluxbox/DETAILS
index 405d048..c196097 100755
--- a/windowmanagers/fluxbox/DETAILS
+++ b/windowmanagers/fluxbox/DETAILS
@@ -24,6 +24,7 @@ fi
         WEB_SITE=http://www.fluxbox.org/
          ENTERED=20011210
       LICENSE[0]=MIT
+     GATHER_DOCS=off
         KEYWORDS="windowmanagers"
            SHORT="lightweight window manager"
 cat << EOF
diff --git a/windowmanagers/fluxbox/HISTORY b/windowmanagers/fluxbox/HISTORY
index 0d1d01a..d7f6760 100644
--- a/windowmanagers/fluxbox/HISTORY
+++ b/windowmanagers/fluxbox/HISTORY
@@ -1,3 +1,11 @@
+2011-02-20 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: GATHER_DOCS=off
+	* BUILD: removed deprecated definitions
+	* DEPENDS: moved nls from CONFIGURE
+	* CONFIGURE: corrected some questions
+	* PRE_BUILD: apply the patch and do autoconf
+	* fribidi.patch: added, to fix configure for fribidi support
+
 2011-02-19 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 1.3.0
 	* DEPENDS: added fribidi support
diff --git a/windowmanagers/fluxbox/PRE_BUILD b/windowmanagers/fluxbox/PRE_BUILD
index 1a07953..26ca318 100755
--- a/windowmanagers/fluxbox/PRE_BUILD
+++ b/windowmanagers/fluxbox/PRE_BUILD
@@ -1,4 +1,7 @@
 default_pre_build &&
 cd "$SOURCE_DIRECTORY" &&
 
-patch -p0 < "$SPELL_DIRECTORY/gcc43.patch"
+patch -p0 < "$SPELL_DIRECTORY/gcc43.patch" &&
+patch -p0 < "$SPELL_DIRECTORY/fribidi.patch" &&
+
+autoreconf -i
diff --git a/windowmanagers/fluxbox/fribidi.patch b/windowmanagers/fluxbox/fribidi.patch
new file mode 100644
index 0000000..088269b
--- /dev/null
+++ b/windowmanagers/fluxbox/fribidi.patch
@@ -0,0 +1,11 @@
+--- 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 @@
+ 		AC_MSG_CHECKING([for fribidi/fribidi.h])
+ 		AC_TRY_COMPILE(
+ #include <fribidi/fribidi.h>
+-      , fribidi_version_info,
++      , FRIBIDI_VERSION,
+ 			AC_MSG_RESULT([yes])
+ 			AC_DEFINE(HAVE_FRIBIDI, [1], [Define to 1 if you have FRIBIDI])
+ 			LIBS="$LIBS -lfribidi",



More information about the SM-Commit mailing list