Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (1981a4a18279dd95e52b7f4e60d06c14cd74afe3)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (1981a4a18279dd95e52b7f4e60d06c14cd74afe3)
  • Date: Wed, 24 Oct 2012 14:50:29 -0500

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

dev/null |binary
graphics-libs/ftgl/BUILD | 7 +----
graphics-libs/ftgl/DEPENDS | 8 ++++--
graphics-libs/ftgl/HISTORY | 4 +++
graphics/cinepaint/DEPENDS | 26
++++++++++++---------
graphics/cinepaint/DETAILS | 11 ++++----
graphics/cinepaint/HISTORY | 8 ++++++
graphics/cinepaint/PRE_BUILD | 6 +---
graphics/cinepaint/cinepaint-0.21-2.tar.gz.sig | 0
graphics/cinepaint/cinepaint-missing-include.patch | 11 ++++++++
kernels/linux/HISTORY | 5 ++++
kernels/linux/latest.defaults | 2 -
12 files changed, 61 insertions(+), 27 deletions(-)

New commits:
commit 1981a4a18279dd95e52b7f4e60d06c14cd74afe3
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

kernels/linux: set 3.6.1 as default version

3.6.2 and 3.6.3 contain a bug that may cause file system corruption on
ext4. cf. http://lwn.net/Articles/521024/

commit 63c99a9c596c22c936bfc14efa1c784485dcb6e0
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

graphics-libs/ftgl: add dependencies on bzip2, zlib, libxext

commit b626441b1dd9c2dd63d3fbf1e1a4eec98292d845
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

graphics/cinepaint: version 1.3

commit 9b6ca720ac3d058ab9b5496e88b91a7f53b55f77
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

graphics-libs/ftgl: fix build error

commit 7c84c1972724d68ad7203f63ec917f865f7a6a0a
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

graphics-libs/ftgl: add dependency on texlive

diff --git a/graphics-libs/ftgl/BUILD b/graphics-libs/ftgl/BUILD
old mode 100644
new mode 100755
index 40c2e21..7063ee5
--- a/graphics-libs/ftgl/BUILD
+++ b/graphics-libs/ftgl/BUILD
@@ -1,5 +1,2 @@
-cd docs &&
-tar xfz html.tar.gz -C ../unix/docs &&
-cd $SOURCE_DIRECTORY/unix &&
-sedit 's/ $(INSTALL)/\t$(INSTALL)/' src/Makefile &&
-default_build
+OPTS+=" --with-gl-inc=/usr/include" &&
+LIBS+=" -lm" default_build
diff --git a/graphics-libs/ftgl/DEPENDS b/graphics-libs/ftgl/DEPENDS
index 38d8618..0ae9e4c 100755
--- a/graphics-libs/ftgl/DEPENDS
+++ b/graphics-libs/ftgl/DEPENDS
@@ -1,3 +1,7 @@
-depends -sub CXX gcc &&
-depends freetype2 &&
+depends bzip2 &&
+depends -sub CXX gcc &&
+depends freetype2 &&
+depends libxext &&
+depends texlive &&
+depends zlib &&
optional_depends GLUT "" "" "for a demo program"
diff --git a/graphics-libs/ftgl/HISTORY b/graphics-libs/ftgl/HISTORY
index 7c12b9a..7a40daa 100644
--- a/graphics-libs/ftgl/HISTORY
+++ b/graphics-libs/ftgl/HISTORY
@@ -1,3 +1,7 @@
+2012-10-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: added dependency on texlive, bzip2, libxext, zlib
+ * BUILD: fix build error
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/graphics/cinepaint/DEPENDS b/graphics/cinepaint/DEPENDS
index 052f406..5a7a9bb 100755
--- a/graphics/cinepaint/DEPENDS
+++ b/graphics/cinepaint/DEPENDS
@@ -1,13 +1,19 @@
-depends zlib &&
-depends tiff &&
-depends JPEG &&
-if [[ $CINEPAINT_CVS = "y" ]]; then
- depends gtk+2 "--enable-gtk2"
-else
- depends gtk+
-fi &&
-depends lcms &&
-depends openexr &&
+depends autoconf &&
+depends automake &&
+depends flex &&
+depends fltk &&
+depends ftgl &&
+depends gtk+2 "--enable-gtk2" &&
+depends JPEG &&
+depends lcms &&
+depends libpng &&
+depends libtool &&
+depends libxmu &&
+depends libxpm &&
+depends libxxf86vm &&
+depends openexr &&
+depends tiff &&
+depends zlib &&

optional_depends gutenprint \
'--enable-print' \
diff --git a/graphics/cinepaint/DETAILS b/graphics/cinepaint/DETAILS
index e88ee5c..e75a1b2 100755
--- a/graphics/cinepaint/DETAILS
+++ b/graphics/cinepaint/DETAILS
@@ -11,11 +11,12 @@ if [[ "${CINEPAINT_CVS}" == "y" ]] ; then
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/cinepaint-cvs
FORCE_DOWNLOAD=on
else
- VERSION=0.21-2
- SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ VERSION=1.3
+ SOURCE=$SPELL-$VERSION.tgz
+
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/CinePaint/CinePaint-${VERSION}/$SOURCE
+# SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+
SOURCE_HASH=sha512:2f548af6d54ce246d4b6786d7d7aa6024d76c31b9d7ec2e073e780b3da8ec8c32fabc8efe50b3c640ca09a0302c1cc2e737b2013f4e07b6ba24d51c7a1c6c37d
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
fi
WEB_SITE=http://cinepaint.sourceforge.net/
ENTERED=20021031
diff --git a/graphics/cinepaint/HISTORY b/graphics/cinepaint/HISTORY
index 2361bc3..69f552c 100644
--- a/graphics/cinepaint/HISTORY
+++ b/graphics/cinepaint/HISTORY
@@ -1,3 +1,11 @@
+2012-10-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.3
+ * PRE_BUILD, cinepaint-missing-include.patch: add patch from
+ archlinux to prevent build error
+ * PRE_BUILD: always call autogen.sh
+ * DEPENDS: added missing dependencies on autoconf, automake,
+ flex, fltk, ftgl, libpng, libtool, libxmu, libxpm, libxxf86vm
+
2011-10-14 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed long description wrap (scripted)

diff --git a/graphics/cinepaint/PRE_BUILD b/graphics/cinepaint/PRE_BUILD
index 58c4885..dd5f366 100755
--- a/graphics/cinepaint/PRE_BUILD
+++ b/graphics/cinepaint/PRE_BUILD
@@ -1,6 +1,4 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
-if [[ $CINEPAINT_CVS = "y" ]]; then
- cd cinepaint &&
- sh autogen.sh
-fi
+patch -p1 < ${SPELL_DIRECTORY}/cinepaint-missing-include.patch &&
+sh autogen.sh
diff --git a/graphics/cinepaint/cinepaint-0.21-2.tar.gz.sig
b/graphics/cinepaint/cinepaint-0.21-2.tar.gz.sig
deleted file mode 100644
index 2e8a76a..0000000
Binary files a/graphics/cinepaint/cinepaint-0.21-2.tar.gz.sig and /dev/null
differ
diff --git a/graphics/cinepaint/cinepaint-missing-include.patch
b/graphics/cinepaint/cinepaint-missing-include.patch
new file mode 100644
index 0000000..ed15921
--- /dev/null
+++ b/graphics/cinepaint/cinepaint-missing-include.patch
@@ -0,0 +1,11 @@
+diff -Naur
cinepaint-orig/plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp
cinepaint/plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp
+--- cinepaint-orig/plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp
2012-04-20 18:51:10.625503826 -0400
++++ cinepaint/plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp
2012-04-20 18:52:04.478835055 -0400
+@@ -32,6 +32,7 @@
+
+ #include <list>
+ #include <string>
++#include <unistd.h>
+
+ #include "icc_modell_beobachter.h"
+
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index c97d836..b23f191 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,8 @@
+2012-10-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * latest_defaults: LATEST_maintenance_patches_3=patch-3.6.1
+ 3.6.2 and 3.6.3 contain a bug that may cause corruption on ext4
filesystems,
+ cf. http://lwn.net/Articles/521024/
+
2012-10-21 Ladislav Hagara <hgr AT vabo.cz>
* latest.defaults: LATEST_maintenance_patches_3=patch-3.6.3
* info/patches/maintenance_patches_3/patch-3.6.3: added
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index 3202fe5..d60bb85 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -2,7 +2,7 @@ LATEST_3=3.6
LATEST_2_6=2.6.39
LATEST_PRE_2_6=patch-2.6.39
LATEST_maintenance_patches=patch-2.6.39.4
-LATEST_maintenance_patches_3=patch-3.6.3
+LATEST_maintenance_patches_3=patch-3.6.1
LATEST_git_patches=patch-2.6.25-rc6-git7
LATEST_2_4=2.4.37.9
LATEST_PRE_2_4=patch-2.4.33-pre1



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (1981a4a18279dd95e52b7f4e60d06c14cd74afe3), Florian Franzmann, 10/24/2012

Archive powered by MHonArc 2.6.24.

Top of Page