Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arjan Bouter (5dde308ab0fb7afc1b3196e34cd6e0118b256443)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arjan Bouter <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arjan Bouter (5dde308ab0fb7afc1b3196e34cd6e0118b256443)
  • Date: Tue, 30 Aug 2011 05:42:30 -0500

GIT changes to master grimoire by Arjan Bouter <abouter AT sourcemage.org>:

dev/null |binary
windowmanagers/fvwm/CONFIGURE | 6 -
windowmanagers/fvwm/DEPENDS | 96
+++++++++++---------
windowmanagers/fvwm/DETAILS | 15 +--
windowmanagers/fvwm/FlatSeparators-2.5.26.patch.bz2 | 0
windowmanagers/fvwm/HISTORY | 8 +
windowmanagers/fvwm/PREPARE | 3
windowmanagers/fvwm/PRE_BUILD | 10 --
8 files changed, 69 insertions(+), 69 deletions(-)

New commits:
commit 5dde308ab0fb7afc1b3196e34cd6e0118b256443
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

fvwm: versions 2.6.2 and 2.7.0, completed DEPENDS, removed patch for 2.5

diff --git a/windowmanagers/fvwm/CONFIGURE b/windowmanagers/fvwm/CONFIGURE
deleted file mode 100755
index 81e2817..0000000
--- a/windowmanagers/fvwm/CONFIGURE
+++ /dev/null
@@ -1,6 +0,0 @@
-if [ ! "${FVWM_RELEASE}" = "stable" ]; then
- config_query_option FVWM_OPTS \
- "Enable NLS?" y \
- "--enable-nls" \
- "--disable-nls"
-fi
diff --git a/windowmanagers/fvwm/DEPENDS b/windowmanagers/fvwm/DEPENDS
index 46cf666..aee80f0 100755
--- a/windowmanagers/fvwm/DEPENDS
+++ b/windowmanagers/fvwm/DEPENDS
@@ -1,6 +1,57 @@
depends xorg-libs &&
depends zlib &&
depends netpbm &&
+# please keep optional_depends in the same order as configure --help
+# to help spot future changes
+optional_depends dmalloc \
+ "--enable-dmalloc" \
+ "--disable-dmalloc" \
+ "for dmalloc debugging (don't)" &&
+optional_depends electricfence \
+ "--enable-efence" \
+ "--disable-efemce" \
+ "for electric fence debugging (don't)" &&
+
+optional_depends libsm \
+ "--enable-sm" \
+ "--disable-sm" \
+ "Enable session Managment?" &&
+optional_depends libxext \
+ "--enable-shape --enable-shm" \
+ "--disable-shape --disable-shm" \
+ "Enable shaped window and shared memory support?" &&
+optional_depends libxinerama \
+ "--enable-xinerama" \
+ "--disable-xinerama" \
+ "Enable xinerama support?" &&
+optional_depends libxrender \
+ "--enable-xrender" \
+ "--disable-xrender" \
+ "Enable Xrender alpha-blend rendering?" &&
+optional_depends libxcursor \
+ "--enable-xcursor" \
+ "--disable-xcursor" \
+ "Enable XCursor support" &&
+optional_depends libxft \
+ "--enable-xft" \
+ "--disable-xft" \
+ "XFT Support" &&
+optional_depends librsvg2 \
+ "--enable-rsvg" \
+ "--disable-rsvg" \
+ "SVG Support" &&
+optional_depends fribidi \
+ "--enable-bidi" \
+ "--disable-bidi" \
+ "bidirectional writing support (currently broken?)" &&
+optional_depends perl \
+ "--enable-perllib" \
+ "--disable-perllib" \
+ "install the fvwm perl library?" &&
+optional_depends gettext \
+ "--enable-nls" \
+ "--disable-nls" \
+ "enable native language support?" &&
optional_depends libstroke \
"" \
"" \
@@ -9,6 +60,10 @@ optional_depends gtk+ \
"" \
"--disable-gtk" \
"With GTK support for FvwmGtk?" &&
+if is_depends_enabled $SPELL gtk+ ; then
+ depends imlib
+fi &&
+
optional_depends gnome-libs \
"--with-gnome" \
"--with-gnome=no" \
@@ -17,53 +72,14 @@ optional_depends readline \
"--with-readline-library --without-termcap-library" \
"--without-readline-library" \
"line editing/history" &&
-optional_depends libsm \
- "--enable-sm" \
- "--disable-sm" \
- "Enable session Managment?" &&
-optional_depends libxext \
- "--enable-shape" \
- "--disable-shape" \
- "Enable shaped window support?" &&
-optional_depends libxinerama \
- "--enable-xinerama" \
- "--disable-xinerama" \
- "Enable xinerama support?" &&
-optional_depends libxrender \
- "--enable-xrender" \
- "--disable-xrender" \
- "Enable Xrender alpha-blend rendering?" &&
optional_depends rplay \
"--enable-rplay" \
"--without-rplay-library" \
"support sound" &&
-
-if [ ! "${FVWM_RELEASE}" = "stable" ]; then
- optional_depends libxcursor \
- "--enable-xcursor" \
- "--disable-xcursor" \
- "Enable XCursor support" &&
- optional_depends librsvg2 \
- "--enable-rsvg" \
- "--disable-rsvg" \
- "SVG Support" &&
- optional_depends libxft \
- "--enable-xft" \
- "--disable-xft" \
- "XFT Support" &&
- optional_depends perl \
- "--enable-perllib" \
- "--disable-perllib" \
- "install perl bindings" &&
- optional_depends fribidi \
- "--enable-bidi" \
- "--disable-bidi" \
- "bidirectional writing support" &&
- optional_depends libpng \
+optional_depends libpng \
"" \
"--without-png-library" \
"png image support"
-fi &&

if [ "${FVWM_RELEASE}" = "cvs" ]; then
depends CVS &&
diff --git a/windowmanagers/fvwm/DETAILS b/windowmanagers/fvwm/DETAILS
index 571c844..cb1ec73 100755
--- a/windowmanagers/fvwm/DETAILS
+++ b/windowmanagers/fvwm/DETAILS
@@ -1,9 +1,4 @@
SPELL=fvwm
-
-# first test tree sets versions and hashes, different for each version
-# second test tree sets sources, directories and urls, same for devel and
stable
-# different for cvs
-
if [[ "${FVWM_RELEASE}" == "cvs" ]] ; then

if [[ "${FVWM_CVS_AUTOUPDATE}" == "y" ]] ; then
@@ -17,15 +12,15 @@ if [[ "${FVWM_RELEASE}" == "cvs" ]] ; then
FORCE_DOWNLOAD=on

elif [[ "${FVWM_RELEASE}" == "unstable" ]] ; then
- VERSION=2.5.30
-
SOURCE_HASH=sha512:246a6ba0e9088771ef7d33edb5b77d2969e09ddea60666fb6f3b08b76e856e1ceca5e3511108893466dd633e958227f9af263ae9b52f2907dcc2e3efe1fce679
+ VERSION=2.7.0
+
SOURCE_HASH=sha512:45ca6ff8c4303e11a916aeeedbef070066e216804be165a6fc36129314927818efe720024b69eb248a0a7884ca869cf47854a4ecfad7bdfaeb9b392c0bd2d6a1
else
- VERSION=2.4.20
-
SOURCE_HASH=sha512:6704f3204a9850628da2bf53acd8afca64368d0a744a91a4200fe17212deaecc92f1616457f8a43bcc8f01a5d6a2159928526eac3d66af7c00a4f39a2c875501
+ VERSION=2.6.2
+
SOURCE_HASH=sha512:25cce9d4081be91f97b60e5bb15cda856adb9081b19e8d9746e5618ecb2579b80656cca3e3eb0ea07ce2401e4c9386cae4ad62029f4df84968933d4203cf6c7b
fi

if [[ "${FVWM_RELEASE}" != "cvs" ]] ; then
- SOURCE=fvwm-${VERSION}.tar.gz
+ SOURCE=fvwm-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/fvwm-${VERSION}
SOURCE_URL[0]=ftp://ftp.fvwm.org/pub/fvwm/version-2/${SOURCE}
else
diff --git a/windowmanagers/fvwm/FlatSeparators-2.5.26.patch.bz2
b/windowmanagers/fvwm/FlatSeparators-2.5.26.patch.bz2
deleted file mode 100644
index 43692bb..0000000
Binary files a/windowmanagers/fvwm/FlatSeparators-2.5.26.patch.bz2 and
/dev/null differ
diff --git a/windowmanagers/fvwm/HISTORY b/windowmanagers/fvwm/HISTORY
index ce99376..6b1c798 100644
--- a/windowmanagers/fvwm/HISTORY
+++ b/windowmanagers/fvwm/HISTORY
@@ -1,3 +1,11 @@
+2011-08-30 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: versions 2.6.2 and 2.7.0
+ * DEPENDS: added perl, depend on imlib when gtk is enabled,
+ added a warning about fribidi being broken.
+ * PREPARE: removed patch for 2.5.x
+ * PRE_BUILD: removed, obsolete
+ * CONFIGURE: removed, NLS support (through gettext) is an optional
dep,
+
2010-07-15 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: unstable 2.5.30, removed png configure option when
it's enabled (no longer valid)
diff --git a/windowmanagers/fvwm/PREPARE b/windowmanagers/fvwm/PREPARE
index c1576ef..7fffbee 100755
--- a/windowmanagers/fvwm/PREPARE
+++ b/windowmanagers/fvwm/PREPARE
@@ -6,6 +6,3 @@ config_query_list FVWM_RELEASE "Which release would you like
to build?" stable u
if [[ "${FVWM_RELEASE}" == "cvs" ]]
then config_query FVWM_CVS_AUTOUPDATE "Update on every system update?" n
fi
-if [[ "$FVWM_RELEASE" == "unstable" ]]; then
- config_query FVWM_PATCHSET "apply the flat separators patch?" n
-fi
diff --git a/windowmanagers/fvwm/PRE_BUILD b/windowmanagers/fvwm/PRE_BUILD
deleted file mode 100755
index 8884143..0000000
--- a/windowmanagers/fvwm/PRE_BUILD
+++ /dev/null
@@ -1,10 +0,0 @@
-Patch() {
- message "${MESSAGE_COLOR}applying ${FILE_COLOR}$1${DEFAULT_COLOR}" &&
- patch -p0 < "$1" || return 1
-}
-default_pre_build &&
-if [[ "$FVWM_RELEASE" == "unstable" ]] &&
- [[ "$FVWM_PATCHSET" == "y" ]]; then
- cd ${SOURCE_DIRECTORY} &&
- bzcat ${SCRIPT_DIRECTORY}/FlatSeparators-2.5.26.patch.bz2 | patch -p0
-fi



  • [SM-Commit] GIT changes to master grimoire by Arjan Bouter (5dde308ab0fb7afc1b3196e34cd6e0118b256443), Arjan Bouter, 08/30/2011

Archive powered by MHonArc 2.6.24.

Top of Page