Skip to Content.
Sympa Menu

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

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 (1bdd795dcea24e3c35dc1124184756a84f1dcc87)
  • Date: Tue, 10 Apr 2012 08:09:23 -0500

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

dev/null |binary
gnome2-libs/gdk-pixbuf2/DEPENDS | 5 +++++
gnome2-libs/gdk-pixbuf2/HISTORY | 3 +++
windowmanagers/icewm/DETAILS | 2 +-
windowmanagers/icewm/HISTORY | 3 +++
windowmanagers/icewm/icewm-1.3.6.tar.gz.sig | 0
windowmanagers/icewm/icewm-1.3.7.tar.gz.sig |binary
windowmanagers/wmfs/BUILD | 8 +++++---
windowmanagers/wmfs/DEPENDS | 4 ++--
windowmanagers/wmfs/HISTORY | 4 ++++
windowmanagers/wmii/PRE_BUILD | 6 ++++--
11 files changed, 27 insertions(+), 8 deletions(-)

New commits:
commit 00731c825d90f0882e30b9e1d3983820661210bf
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

gdk-pixbuf2: added missing dep on x11 libraries...

commit 1b2f2ef84952f67a22a6c261f5d5fb60ada2884b
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

icewm: test version 1.3.7

commit 7a8d3112a7b1cca713935e87914df23dc7292146
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

wmfs: upstream switched build system, no longer uses cmake

commit 8896cf266af0d4dc92a5aaa06a20c2ccfbb0592b
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

wmii: remove a faisafe from mk/hdr.mk which breaks build

diff --git a/gnome2-libs/gdk-pixbuf2/DEPENDS b/gnome2-libs/gdk-pixbuf2/DEPENDS
index 0754135..26dee89 100755
--- a/gnome2-libs/gdk-pixbuf2/DEPENDS
+++ b/gnome2-libs/gdk-pixbuf2/DEPENDS
@@ -4,6 +4,11 @@ depends zlib &&
depends JPEG &&
depends tiff &&

+optional_depends xorg-libs \
+ '--with-x11' \
+ '--without-x11' \
+ 'enable X11 support' &&
+
optional_depends gobject-introspection \
"--enable-introspection" \
"--disable-introspection" \
diff --git a/gnome2-libs/gdk-pixbuf2/HISTORY b/gnome2-libs/gdk-pixbuf2/HISTORY
index 1c96bf0..eef88cc 100644
--- a/gnome2-libs/gdk-pixbuf2/HISTORY
+++ b/gnome2-libs/gdk-pixbuf2/HISTORY
@@ -1,3 +1,6 @@
+2012-04-10 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS: added missing dep on x11
+
2012-03-27 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.26.0
* PRE_BUILD: removed
diff --git a/windowmanagers/icewm/DETAILS b/windowmanagers/icewm/DETAILS
index 2fcd006..d251c96 100755
--- a/windowmanagers/icewm/DETAILS
+++ b/windowmanagers/icewm/DETAILS
@@ -1,6 +1,6 @@
SPELL=icewm
if [[ "${ICEWM_TEST}" = 'y' ]] ; then
- VERSION=1.3.6
+ VERSION=1.3.7
else
VERSION=1.2.37
fi
diff --git a/windowmanagers/icewm/HISTORY b/windowmanagers/icewm/HISTORY
index d76d51d..a2317df 100644
--- a/windowmanagers/icewm/HISTORY
+++ b/windowmanagers/icewm/HISTORY
@@ -1,3 +1,6 @@
+2012-04-10 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: test version 1.3.7
+
2010-07-15 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: test version 1.3.6

diff --git a/windowmanagers/icewm/icewm-1.3.6.tar.gz.sig
b/windowmanagers/icewm/icewm-1.3.6.tar.gz.sig
deleted file mode 100644
index 32ff736..0000000
Binary files a/windowmanagers/icewm/icewm-1.3.6.tar.gz.sig and /dev/null
differ
diff --git a/windowmanagers/icewm/icewm-1.3.7.tar.gz.sig
b/windowmanagers/icewm/icewm-1.3.7.tar.gz.sig
new file mode 100644
index 0000000..9db1323
Binary files /dev/null and b/windowmanagers/icewm/icewm-1.3.7.tar.gz.sig
differ
diff --git a/windowmanagers/wmfs/BUILD b/windowmanagers/wmfs/BUILD
index 209cd97..5ed3908 100755
--- a/windowmanagers/wmfs/BUILD
+++ b/windowmanagers/wmfs/BUILD
@@ -1,5 +1,7 @@
cd ${SOURCE_DIRECTORY} &&
-mkdir build &&
-cd build &&
-cmake -DPREFIX=/usr -DCMAKE_CXX_FLAGS="${CXXFLAGS}"
-DCMAKE_C_FLAGS="${CFLAGS}" .. &&
+
+./configure --prefix /usr \
+ --man-prefix /usr/share/man \
+ --xdg-config-dir /etc/xdg \
+ $OPTS
make
diff --git a/windowmanagers/wmfs/DEPENDS b/windowmanagers/wmfs/DEPENDS
index 0fc2ae9..324c1f9 100755
--- a/windowmanagers/wmfs/DEPENDS
+++ b/windowmanagers/wmfs/DEPENDS
@@ -1,8 +1,8 @@
depends confuse &&
depends freetype2 &&
-depends libxinerama &&
depends libxrandr &&
depends libxft &&
depends libx11 &&
-depends cmake &&
+optional_depends imlib2 '' '--without-imlib2' &&
+optional_depends libxinerama '' '--without-xinerama' &&
optional_depends doxygen "" "" "to enable doxygen documentation"
diff --git a/windowmanagers/wmfs/HISTORY b/windowmanagers/wmfs/HISTORY
index 4f16611..a6d9719 100644
--- a/windowmanagers/wmfs/HISTORY
+++ b/windowmanagers/wmfs/HISTORY
@@ -1,2 +1,6 @@
+2012-04-10 Arjan Bouter <abouter AT sourcemage.org>
+ * BUILD: no longer uses cmake
+ * DEPENDS: removed cmake, added imlib2 and made xinerama optional
+
2009-08-24 Quentin Rameau <quinq AT sourcemage.org>
* DEPENDS, DETAILS, BUILD, HISTORY: spell created
diff --git a/windowmanagers/wmii/PRE_BUILD b/windowmanagers/wmii/PRE_BUILD
index 7556ad8..069fad9 100755
--- a/windowmanagers/wmii/PRE_BUILD
+++ b/windowmanagers/wmii/PRE_BUILD
@@ -3,5 +3,7 @@ cd ${SOURCE_DIRECTORY} &&

#right install paths
sedit "s:/usr/local:${INSTALL_ROOT}/usr:" config.mk &&
-sedit "s:\$(PREFIX)/etc:${INSTALL_ROOT}/etc:" config.mk
-sedit 's:INCLUDES = :INCLUDES = -I${INCLUDE}/freetype2 :' config.mk
+sedit "s:\$(PREFIX)/etc:${INSTALL_ROOT}/etc:" config.mk &&
+sedit 's:INCLUDES = :INCLUDES = -I${INCLUDE}/freetype2 :' config.mk &&
+# delete an unused failsafe line which breaks the build
+sedit 47d mk/hdr.mk




Archive powered by MHonArc 2.6.24.

Top of Page