Skip to Content.
Sympa Menu

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

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 (fcb2b347190c17d7ecc4e6677c8aecd03de5788a)
  • Date: Sun, 21 Jul 2013 16:17:30 -0500

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

dev/null |binary
graphics/argyllcms/04_CVE-2012-4405.diff | 14 --------------
graphics/argyllcms/DETAILS | 4 ++--
graphics/argyllcms/HISTORY | 23 +++++++++++++++++++++++
graphics/argyllcms/PRE_BUILD | 2 --
graphics/argyllcms/argyllcms-1.4.0-jpeg.patch | 21 ---------------------
graphics/enblend/DEPENDS | 4 +++-
graphics/enblend/DETAILS | 9 ++++-----
graphics/enblend/HISTORY | 4 ++++
graphics/imagemagick/DETAILS | 4 ++--
graphics/imagemagick/HISTORY | 3 +++
x11-toolkits/wxgtk/DEPENDS | 2 ++
x11-toolkits/wxgtk/DETAILS | 14 ++++++--------
x11-toolkits/wxgtk/HISTORY | 5 +++++
14 files changed, 54 insertions(+), 55 deletions(-)

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

graphics/argyllcms: version 1.5.1

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

graphics/imagemagick: version 6.8.6-5

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

x11-toolkits/wxgtk: version 2.8.12.1

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

graphics/enblend: version 4.1.1

diff --git a/graphics/argyllcms/04_CVE-2012-4405.diff
b/graphics/argyllcms/04_CVE-2012-4405.diff
deleted file mode 100644
index af1157d..0000000
--- a/graphics/argyllcms/04_CVE-2012-4405.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/icc/icc.c
-+++ b/icc/icc.c
-@@ -6065,6 +6065,11 @@ static int icmLut_read(
- p->clutPoints = read_UInt8Number(bp+10);
-
- /* Sanity check */
-+ if (p->inputChan < 1) {
-+ sprintf(icp->err,"icmLut_read: No input channels!");
-+ return icp->errc = 1;
-+ }
-+
- if (p->inputChan > MAX_CHAN) {
- sprintf(icp->err,"icmLut_read: Can't handle > %d input
channels\n",MAX_CHAN);
- return icp->errc = 1;
diff --git a/graphics/argyllcms/DETAILS b/graphics/argyllcms/DETAILS
index fe66b99..f87c062 100755
--- a/graphics/argyllcms/DETAILS
+++ b/graphics/argyllcms/DETAILS
@@ -1,8 +1,8 @@
SPELL=argyllcms
- VERSION=1.4.0
+ VERSION=1.5.1
SOURCE="Argyll_V${VERSION}_src.zip"
SOURCE_URL[0]=http://www.${SPELL}.com/${SOURCE}
-
SOURCE_HASH=sha512:edb9ff1b0a965e79a26c0138afe16472fd18236b55b7262135d70bfc7405001a55d2ada4251111fcbaa0b6f73a3fa2faa2cfe07b3413c8a5ecea04c87e5646ae
+
SOURCE_HASH=sha512:c21cd676edd6415a866fb2a7b122eac18e7596f265a0f2dc8d1f7ca761f64be9fd64ead1430e36eff8767672e73bd93de61398ff588e94a0e121d848afd8bb96
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/Argyll_V${VERSION}"
WEB_SITE="http://www.argyllcms.com/";
LICENSE[0]=GPL
diff --git a/graphics/argyllcms/HISTORY b/graphics/argyllcms/HISTORY
index 8bed4e0..0f06964 100644
--- a/graphics/argyllcms/HISTORY
+++ b/graphics/argyllcms/HISTORY
@@ -1,3 +1,26 @@
+
+# On branch master
+# Your branch is ahead of 'origin/master' by 5 commits.
+# (use "git push" to publish your local commits)
+#
+# Changes to be committed:
+# (use "git reset HEAD <file>..." to unstage)
+#
+# deleted: 04_CVE-2012-4405.diff
+# modified: DETAILS
+# modified: PRE_BUILD
+# deleted: argyllcms-1.4.0-jpeg.patch
+#
+# Untracked files:
+# (use "git add <file>..." to include in what will be committed)
+#
+# .HISTORY.swp
+
+2013-07-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.5.1
+ * 04_CVE-2012-4405.diff, argyllcms-1.4.0-jpeg.patch, PRE_BUILD:
+ removed patches
+
2012-11-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* 04_CVE-2012-4405.diff, argyllcms-1.4.0-jpeg.patch, BUILD,
DEPENDS, DETAILS, INSTALL, PRE_BUILD: spell created
diff --git a/graphics/argyllcms/PRE_BUILD b/graphics/argyllcms/PRE_BUILD
index 2a388f7..9dccd38 100755
--- a/graphics/argyllcms/PRE_BUILD
+++ b/graphics/argyllcms/PRE_BUILD
@@ -1,6 +1,4 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
-patch -p1 < $SCRIPT_DIRECTORY/04_CVE-2012-4405.diff &&
-patch -p1 < $SCRIPT_DIRECTORY/argyllcms-1.4.0-jpeg.patch &&
echo "LINKFLAGS += ${LDFLAGS} ;" >> Jamtop &&
echo "STDLIBS += -ldl -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau
-lXdmcp -lXss -ltiff -ljpeg ;" >> Jamtop
diff --git a/graphics/argyllcms/argyllcms-1.4.0-jpeg.patch
b/graphics/argyllcms/argyllcms-1.4.0-jpeg.patch
deleted file mode 100644
index d523481..0000000
--- a/graphics/argyllcms/argyllcms-1.4.0-jpeg.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ruN Argyll_V1.4.0.orig/Jamtop Argyll_V1.4.0/Jamtop
---- Argyll_V1.4.0.orig/Jamtop 2012-04-19 09:50:31.000000000 +0200
-+++ Argyll_V1.4.0/Jamtop 2012-05-07 02:18:37.000000000 +0200
-@@ -113,13 +113,13 @@
- # See if we have a system JPEG library.
- if ! $(BUILTIN_JPEG) && $(UNIX) {
- if [ GLOB /usr/include : jpeglib.h ] {
-- if ! $(HOST64) && ( [ GLOB /usr/lib : libjpg.so ] || [ GLOB
/usr/lib : libjpg.a ] )
-- || $(HOST64) && ( [ GLOB /usr/lib64 : libjpg.so ] || [
GLOB /usr/lib64 : libjpg.a ] )
-- || $(HOST64) && ( [ GLOB /usr/lib/x86_64-linux-gnu :
libjpg.so ] || [ GLOB /usr/lib/x86_64-linux-gnu : libjpg.a ] ) {
-+ if ! $(HOST64) && ( [ GLOB /usr/lib : libjpeg.so ] || [ GLOB
/usr/lib : libjpeg.a ] )
-+ || $(HOST64) && ( [ GLOB /usr/lib64 : libjpeg.so ] || [
GLOB /usr/lib64 : libjpeg.a ] )
-+ || $(HOST64) && ( [ GLOB /usr/lib/x86_64-linux-gnu :
libjpeg.so ] || [ GLOB /usr/lib/x86_64-linux-gnu : libjpeg.a ] ) {
- echo "Using system JPEG library" ;
- JPEGLIB = ;
- JPEGINC = ;
-- LINKFLAGS += $(LINKFLAG)tiff ;
-+ LINKFLAGS += $(LINKFLAG)jpeg ;
- HAVE_JPEG = true ;
- }
- }
diff --git a/graphics/enblend/DEPENDS b/graphics/enblend/DEPENDS
index a353126..e6b920c 100755
--- a/graphics/enblend/DEPENDS
+++ b/graphics/enblend/DEPENDS
@@ -3,4 +3,6 @@ depends -sub THREAD boost &&
depends lcms &&
depends libxmi &&
depends -sub CXX gcc &&
-depends tiff
+depends tiff &&
+depends vigra &&
+depends gsl
diff --git a/graphics/enblend/DETAILS b/graphics/enblend/DETAILS
index 049956a..b9b4d13 100755
--- a/graphics/enblend/DETAILS
+++ b/graphics/enblend/DETAILS
@@ -1,10 +1,9 @@
SPELL=enblend
- VERSION=4.0
- XVERSION=${VERSION}-753b534c819d
+ VERSION=4.1.1
SOURCE="$SPELL-enfuse-$VERSION.tar.gz"
- SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:486173907a07dad64848d0de12a7f91238ed8aa477f51c4929a153d1943ca3d14990df9d23b52a28937b127edbfff1723bbef1064402dda60f3ccbdbd78dd14d
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-enfuse-$XVERSION"
+
SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SPELL}-enfuse/${SPELL}-enfuse-${VERSION%.*}/${SOURCE}
+
SOURCE_HASH=sha512:dd4c8f205986beef1268210a8ccad10107125fc15a45b2e7266f250d36a294356f557d577b80e923e04b5f14ed5f6070201793c067cc3a2e7d6020cf5669a61f
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-enfuse-$VERSION"
WEB_SITE="http://enblend.sourceforge.net/";
LICENSE[0]=GPL
ENTERED=20080711
diff --git a/graphics/enblend/HISTORY b/graphics/enblend/HISTORY
index 2a42560..c59c1a2 100644
--- a/graphics/enblend/HISTORY
+++ b/graphics/enblend/HISTORY
@@ -1,3 +1,7 @@
+2013-07-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlagnen.de>
+ * DETAILS: version 4.1.1
+ * DEPENDS: add dependencies on vigra and gsl
+
2012-10-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlagnen.de>
* BUILD: added missing library to LIBS

diff --git a/graphics/imagemagick/DETAILS b/graphics/imagemagick/DETAILS
index f89de26..a4c6c16 100755
--- a/graphics/imagemagick/DETAILS
+++ b/graphics/imagemagick/DETAILS
@@ -1,5 +1,5 @@
SPELL=imagemagick
- VERSION=6.8.6-3
+ VERSION=6.8.6-5
SECURITY_PATCH=1
SOURCE=ImageMagick-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/ImageMagick-${VERSION}
@@ -7,7 +7,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/ImageMagick-${VERSION}
SOURCE_URL[1]=ftp://ftp.surfnet.nl/pub/ImageMagick/$SOURCE
SOURCE_URL[2]=ftp://ftp.nluug.nl/pub/ImageMagick/$SOURCE
SOURCE_URL[3]=http://image_magick.veidrodis.com/image_magick/$SOURCE
-
SOURCE_HASH=sha512:77b71ce81452ec8538020fd4785eba4b55488d770863cec151d1a20b1f0a5c8afde8b2c952766544e87de730b564bc28a92a97c13675a8e506d9ba3d19f78109
+
SOURCE_HASH=sha512:f9fb09ef7da8760160f73915ff4d408c42039b09a459b4a83abd29514d2492545b3381eaad217072e1549f081c1a0eb5b6d7b0407461ca46159529372ca98f76
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
CCACHE="off"
WEB_SITE=http://www.imagemagick.org/
diff --git a/graphics/imagemagick/HISTORY b/graphics/imagemagick/HISTORY
index dd813e7..33e6a9a 100644
--- a/graphics/imagemagick/HISTORY
+++ b/graphics/imagemagick/HISTORY
@@ -1,3 +1,6 @@
+2013-07-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 6.8.6-5
+
2013-07-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 6.8.6-3

diff --git a/x11-toolkits/wxgtk/DEPENDS b/x11-toolkits/wxgtk/DEPENDS
index 3aaba26..002ef6a 100755
--- a/x11-toolkits/wxgtk/DEPENDS
+++ b/x11-toolkits/wxgtk/DEPENDS
@@ -11,6 +11,8 @@ depends zlib '--with-zlib' &&
depends libpng '--with-libpng' &&
depends JPEG '--with-libjpeg' &&
depends tiff '--with-libtiff' &&
+depends libsm &&
+depends libxinerama &&

optional_depends pcre '--with-regex=sys' \
'--with-regex=builtin' \
diff --git a/x11-toolkits/wxgtk/DETAILS b/x11-toolkits/wxgtk/DETAILS
index cad9504..b78cbd0 100755
--- a/x11-toolkits/wxgtk/DETAILS
+++ b/x11-toolkits/wxgtk/DETAILS
@@ -1,12 +1,10 @@
SPELL=wxgtk
- SPELLX=wxGTK
- VERSION=2.8.12
-#
SOURCE_HASH=sha512:53b3a1a111288910b18e3743d8e389398bf7e60cddbf0ad609cd72fa4fbd5da2bb9b3b94427ba7ec9d695fb1cbca5fa79a1836a15c652aebf2ae605b1f93f4c5
- SOURCE=$SPELLX-$VERSION.tar.bz2
- SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-${VERSION}
- SOURCE_URL[0]=$SOURCEFORGE_URL/wxwindows/$SOURCE
- SOURCE_URL[1]=ftp://biolpc22.york.ac.uk/pub/$VERSION/$SOURCE
+ SPELLX=wxPython
+ VERSION=2.8.12.1
+
SOURCE_HASH=sha512:4f826ccb57d5f4fc03fe7cae67499be70c727a99aebf9d153ea1060a21641642606d44d079ba897c38b176846336aeaebc21d30d5c7a0abec3934d65cf4529f3
+ SOURCE=$SPELLX-src-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-src-${VERSION}
+ SOURCE_URL[0]=$SOURCEFORGE_URL/wxpython/$SPELLX/$VERSION/$SOURCE
LICENSE[0]=http://www.wxwidgets.org/licence3.txt
WEB_SITE=http://www.wxwidgets.org/
ENTERED=20011217
diff --git a/x11-toolkits/wxgtk/HISTORY b/x11-toolkits/wxgtk/HISTORY
index 7df678e..ff3d10a 100644
--- a/x11-toolkits/wxgtk/HISTORY
+++ b/x11-toolkits/wxgtk/HISTORY
@@ -1,3 +1,8 @@
+2013-07-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS, DEPENDS: version 2.8.12.1, add dependencies on libsm and
libxinerama,
+ use wxPython sources as these are more recent and contain the
complete
+ wxgtk source
+
2011-11-10 Eric Sandall <sandalle AT sourcemage.org>
* PREPARE: Default to stable (2.8) branch
* DETAILS: 2.8.12 is latest stable, 2.9.2 is unstable and is in
wxgtk-new
diff --git a/x11-toolkits/wxgtk/wxGTK-2.8.12.tar.bz2.sig
b/x11-toolkits/wxgtk/wxGTK-2.8.12.tar.bz2.sig
deleted file mode 100644
index e181412..0000000
Binary files a/x11-toolkits/wxgtk/wxGTK-2.8.12.tar.bz2.sig and /dev/null
differ




Archive powered by MHonArc 2.6.24.

Top of Page