Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (ce74cd22645e84315fe38d61b824e579d21e921d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Eric Sandall (ce74cd22645e84315fe38d61b824e579d21e921d)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (ce74cd22645e84315fe38d61b824e579d21e921d)
  • Date: Wed, 19 Sep 2012 18:50:15 -0500
GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

dev/null
|binary
gnome2-apps/gnumeric/BUILD |
2
gnome2-apps/gnumeric/DEPENDS |
11 ----
gnome2-apps/gnumeric/HISTORY |
4 +
gnome2-libs/libgsf/DEPENDS |
25 ++++++----
gnome2-libs/libgsf/DETAILS |
6 +-
gnome2-libs/libgsf/HISTORY |
11 ++++
gnome2-libs/libgsf/PRE_SUB_DEPENDS |
2
gnome2-libs/libgsf/REPAIR^0e91218b9f943c4259e977b24a7562dd^PRE_SUB_DEPENDS |
5 ++
gnome2-libs/libgsf/SUB_DEPENDS |
4 -
gnome2-libs/libgsf/libgsf-1.14.21.tar.bz2.sig |
0
gnome2-libs/libgsf/libgsf-1.14.24.tar.xz.sig
|binary
graphics-libs/vips/DEPENDS |
7 --
graphics-libs/vips/DETAILS |
5 +-
graphics-libs/vips/HISTORY |
10 ++++
graphics-libs/vips/vips-7.30.2.tar.gz.sig
|binary
graphics/nip2/DETAILS |
5 +-
graphics/nip2/HISTORY |
6 ++
graphics/nip2/PRE_BUILD |
3 +
graphics/nip2/nip2-7.30.1.tar.gz.sig
|binary
graphics/nip2/yyleng.patch |
13 +++++
21 files changed, 85 insertions(+), 34 deletions(-)

New commits:
commit ce74cd22645e84315fe38d61b824e579d21e921d
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

gnumeric: Disable GNOME support (see Bug #444)

commit 993bb7d50530d808622c8f0a7ef8e920e931c039
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

gnumeric: Depends on libglade2, intltool

commit 141853db1db10624fffa5741693dda875cfd8b90
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Revert "goffice: Updated to 0.9.6"

This reverts commit f27d43dd39dc98703b6220be645ad1258697f0e4.

gnumeric 1.10.x requires goffice 0.8.x (even though the site says >=
0.8.x).

gnumeric 1.12.x (currently 1.11.x devel) needs goffice 0.9.x.

commit 90f5688a8d41b26a95ba4bc6138b943324ad7a51
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

nip2: Updated to 7.30.1
Apply yyleng.patch to fix compilation with newer bison/flex
Fixes for 7.26.x as well

gcc -DHAVE_CONFIG_H -I. -I.. -pthread -fopenmp -I/usr/include/glib-2.0
-I/usr/lib/glib-2.0/include -I/usr/include/gtk-2.0
-I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo
-I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0
-I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12
-I/usr/include/libdrm -I/usr/include/libxml2 -I/usr/include/ImageMagick
-I/usr/include/orc-0.4 -I/usr/include/OpenEXR -DG_DISABLE_ASSERT
-DG_DISABLE_CHECKS -march=native -mtune=native -m32 -pipe -DPIC
-fPIC -O2 -MT nip2-lex.o -MD -MP -MF .deps/nip2-lex.Tpo -c -o nip2-lex.o
`test -f 'lex.c' || echo './'`lex.c
In file included from ip.h:488:0,
from lex.l:31:
parser.h:58:12: error: conflicting types for 'yyleng'
lex.c:275:11: note: previous declaration of 'yyleng' was here
make[3]: *** [nip2-lex.o] Error 1

commit 1b426482105676e4ba01b093c00ba325769558a1
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

vips: Updated to 7.30.2 (required for nips 7.30.x)
./configure doesn't know --with-openexr, --without-cimg, --with-liboil,
nor --with-lcms2 anymore
*-openexr -> *-OpenEXR
Removed cimg optional dependency
Removed liboil optional dependency
Removed lcms optional dependency (only supports lcms2 now)

commit f27d43dd39dc98703b6220be645ad1258697f0e4
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

goffice: Updated to 0.9.6
SOURCE matches upstream posted SHA256
.bz2 -> .xz

commit be01c2204ea4b57a9ae5509abebf817542d344d1
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

libgsf: Added optional dependency on gobject-introspection

commit 60c2b2615abdbbd0ac4ea344ef9b6982a61bc523
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

libgsf: Updated to 1.4.24
./configure does not understand --with-gnome-vfs, --with-bonobo, nor
--with-gnome-vfs
GNOME VFS swapped to GIO libraries a while ago
Added optional dependency on gdk-pixbuf2
Incorrect sub-dependency on poppler -> gio (should have been gnome-vfs2)

commit 3aff8cb2ca5084f16ad73a59921c7a7586114b83
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

libgsf: Remove stale GPG signature

diff --git a/gnome2-apps/gnumeric/BUILD b/gnome2-apps/gnumeric/BUILD
index 6b97b16..cb403c0 100755
--- a/gnome2-apps/gnumeric/BUILD
+++ b/gnome2-apps/gnumeric/BUILD
@@ -22,4 +22,6 @@ else
OPTS="$OPTS --without-long-double"
fi &&

+OPTS="$OPTS --without-gnome" &&
+
default_build
diff --git a/gnome2-apps/gnumeric/DEPENDS b/gnome2-apps/gnumeric/DEPENDS
index aeca41e..63a2440 100755
--- a/gnome2-apps/gnumeric/DEPENDS
+++ b/gnome2-apps/gnumeric/DEPENDS
@@ -1,6 +1,8 @@
. "$GRIMOIRE/FUNCTIONS" &&

+depends intltool &&
depends libole2-2 &&
+depends libglade2 &&
depends libgsf &&

depends goffice &&
@@ -18,15 +20,6 @@ optional_depends gtk+2 \
"--without-gtk" \
"Build UI?" &&

-optional_depends libgnomeui \
- "--with-gnome" \
- "--without-gnome" \
- "Build GNOME extensions?" &&
-
-if is_depends_enabled $SPELL libgnomeui; then
- depends -sub GNOME libgsf
-fi &&
-
optional_depends perl \
"--with-perl" \
"--without-perl" \
diff --git a/gnome2-apps/gnumeric/HISTORY b/gnome2-apps/gnumeric/HISTORY
index 723b8f8..ffd69db 100644
--- a/gnome2-apps/gnumeric/HISTORY
+++ b/gnome2-apps/gnumeric/HISTORY
@@ -1,3 +1,7 @@
+2012-09-19 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Depends on libglade2, intltool
+ Disable GNOME support (see Bug #444)
+
2011-08-02 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.10.17

diff --git a/gnome2-libs/libgsf/DEPENDS b/gnome2-libs/libgsf/DEPENDS
index 223086b..18ea3d6 100755
--- a/gnome2-libs/libgsf/DEPENDS
+++ b/gnome2-libs/libgsf/DEPENDS
@@ -11,10 +11,10 @@ optional_depends bzip2 \
"--without-bz2" \
"build additional wrappers for BZ2" &&

-optional_depends gnome-vfs2 \
- "--with-gnome-vfs" \
- "--without-gnome-vfs" \
- "build additional wrappers for GNOME-VFS" &&
+optional_depends gvfs \
+ "--with-gio" \
+ "--without-gio" \
+ "build additional wrappers for GIO" &&

optional_depends pygtk2 \
"--with-python" \
@@ -25,12 +25,17 @@ if is_depends_enabled $SPELL pygtk2; then
depends python
fi &&

-optional_depends libbonobo \
- "--with-bonobo" \
- "--without-bonobo" \
- "for use of bonobo" &&
-
optional_depends gtk-doc \
"--enable-gtk-doc" \
"--disable-gtk-doc" \
- "build documentation with gtk-doc"
+ "build documentation with gtk-doc" &&
+
+optional_depends gdk-pixbuf2 \
+ "--with-gdk-pixbuf" \
+ "--without-gdk-pixbuf" \
+ "to use GDK PixBuf image library" &&
+
+optional_depends gobject-introspection \
+ "--enable-introspection=yes" \
+ "--enable-introspection=no" \
+ "for GObject introspection"
diff --git a/gnome2-libs/libgsf/DETAILS b/gnome2-libs/libgsf/DETAILS
index 17a745d..1a97770 100755
--- a/gnome2-libs/libgsf/DETAILS
+++ b/gnome2-libs/libgsf/DETAILS
@@ -1,9 +1,9 @@
SPELL=libgsf
- VERSION=1.14.23
-
SOURCE_HASH=sha512:21c6f80fb242b3cd1482cef34126de963ffc566f909cbff656c67a20a179abcf1dcfcc2cf78f8aa56ec1b23eebf890262d31aef3709db635bab1432990ac451e
-# SOURCE_GPG=gurus.gpg:$SOURCE.sig
+ VERSION=1.14.24
+#
SOURCE_HASH=sha512:21c6f80fb242b3cd1482cef34126de963ffc566f909cbff656c67a20a179abcf1dcfcc2cf78f8aa56ec1b23eebf890262d31aef3709db635bab1432990ac451e
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.xz
+ SOURCE_GPG=gurus.gpg:$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
LICENSE[0]=GNU
diff --git a/gnome2-libs/libgsf/HISTORY b/gnome2-libs/libgsf/HISTORY
index 9081c98..97243bd 100644
--- a/gnome2-libs/libgsf/HISTORY
+++ b/gnome2-libs/libgsf/HISTORY
@@ -1,3 +1,14 @@
+2012-09-19 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.4.24
+ * DEPENDS: ./configure does not understand --with-gnome-vfs,
--with-bonobo,
+ nor --with-gnome-vfs
+ GNOME VFS swapped to GIO libraries a while ago
+ Added optional dependency on gdk-pixbuf2
+ Added optional dependency on gobject-introspection
+ * SUB_DEPENDS: gnome-vfs2 -> gio
+ Incorrect dependency on poppler -> gio (should have been gnome-vfs2)
+ * PRE_SUB_DEPENDS: gnome-vfs2 -> gio
+
2012-05-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.4.23

diff --git a/gnome2-libs/libgsf/PRE_SUB_DEPENDS
b/gnome2-libs/libgsf/PRE_SUB_DEPENDS
index cb85268..4fe1c0f 100755
--- a/gnome2-libs/libgsf/PRE_SUB_DEPENDS
+++ b/gnome2-libs/libgsf/PRE_SUB_DEPENDS
@@ -1,5 +1,5 @@
case $THIS_SUB_DEPENDS in
- GNOME) is_depends_enabled $SPELL gnome-vfs2;;
+ GNOME) is_depends_enabled $SPELL gvfs;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
return 1;;
esac
diff --git
a/gnome2-libs/libgsf/REPAIR^0e91218b9f943c4259e977b24a7562dd^PRE_SUB_DEPENDS
b/gnome2-libs/libgsf/REPAIR^0e91218b9f943c4259e977b24a7562dd^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..4fe1c0f
--- /dev/null
+++
b/gnome2-libs/libgsf/REPAIR^0e91218b9f943c4259e977b24a7562dd^PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+ GNOME) is_depends_enabled $SPELL gvfs;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+ return 1;;
+esac
diff --git a/gnome2-libs/libgsf/SUB_DEPENDS b/gnome2-libs/libgsf/SUB_DEPENDS
index 0d5d0a9..ded4210 100755
--- a/gnome2-libs/libgsf/SUB_DEPENDS
+++ b/gnome2-libs/libgsf/SUB_DEPENDS
@@ -1,6 +1,6 @@
case $THIS_SUB_DEPENDS in
-GNOME) message "Libgsf with GNOME support requested, forcing gnome-vfs2
dependency" &&
- depends poppler "--with-gnome-vfs";;
+GNOME) message "Libgsf with GNOME support requested, forcing
${SPELL_COLOR}gvfs${DEFAULT_COLOR} dependency" &&
+ depends gvfs "--with-gio";;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
return 1;;
esac
diff --git a/gnome2-libs/libgsf/libgsf-1.14.21.tar.bz2.sig
b/gnome2-libs/libgsf/libgsf-1.14.21.tar.bz2.sig
deleted file mode 100644
index 07ae633..0000000
Binary files a/gnome2-libs/libgsf/libgsf-1.14.21.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-libs/libgsf/libgsf-1.14.24.tar.xz.sig
b/gnome2-libs/libgsf/libgsf-1.14.24.tar.xz.sig
new file mode 100644
index 0000000..ed6dbfc
Binary files /dev/null and b/gnome2-libs/libgsf/libgsf-1.14.24.tar.xz.sig
differ
diff --git a/graphics-libs/vips/DEPENDS b/graphics-libs/vips/DEPENDS
index cc26876..482874a 100755
--- a/graphics-libs/vips/DEPENDS
+++ b/graphics-libs/vips/DEPENDS
@@ -11,16 +11,13 @@ optional_depends libexif "--with-libexif"
"--without-libexif" "For libex
optional_depends JPEG "--with-jpeg" "--without-jpeg" "For
JPEG support" &&
optional_depends libpng "--with-png" "--without-png" "For
PNG support" &&
optional_depends tiff "--with-tiff" "--without-tiff" "For
TIFF support" &&
-optional_depends openexr "--with-openexr" "--without-openexr" "For
openexr support" &&
+optional_depends openexr "--with-OpenEXR" "--without-OpenEXR" "For
openexr support" &&
optional_depends libv4l "--with-v4l" "--without-v4l" "For
v4l support" &&
optional_depends imagemagick "--with-magick" "--without-magick" "For
ImageMagic support" &&
-optional_depends lcms "--with-lcms" "--without-lcms" "For
LCMS support" &&
-optional_depends cimg "--with-cimg" "--without-cimg" "For
cimg support" &&
+optional_depends lcms2 "--with-lcms" "--without-lcms" "For
LCMS support" &&
optional_depends fftw "--with-fftw" "--without-fftw" "For
FFT support" &&
-optional_depends liboil "--with-liboil" "--without-liboil" "For
liboil support" &&
optional_depends zip "--with-zip" "--without-zip" "For
Zip support" &&
optional_depends python "--with-python" "--without-python" "For
python bindings" &&
optional_depends pango "--with-pangoft2" "--without-pangoft2" "For
pango support"
-optional_depends lcms2 "--with-lcms2" "--without-lcms2"
optional_depends cfitsio "--with-cfitsio" "--without-cfitsio"
optional_depends orc "--with-orc" "--without-orc"
diff --git a/graphics-libs/vips/DETAILS b/graphics-libs/vips/DETAILS
index 9a16e37..9c18e42 100755
--- a/graphics-libs/vips/DETAILS
+++ b/graphics-libs/vips/DETAILS
@@ -1,9 +1,10 @@
SPELL=vips
- VERSION=7.26.3
+ VERSION=7.30.2
SOURCE=${SPELL}-${VERSION}.tar.gz
+#
SOURCE_HASH=sha512:7f2a21e2fac863d2ac43dc4a90f33e34a84d27035050357dba599e8a368b013d04f8ca03155dfc882e77004399800ae35fd40fa1919478e0b6ad0ba970806cb2
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}

SOURCE_URL[0]=http://www.vips.ecs.soton.ac.uk/supported/${VERSION:0:4}/$SOURCE
-
SOURCE_HASH=sha512:7f2a21e2fac863d2ac43dc4a90f33e34a84d27035050357dba599e8a368b013d04f8ca03155dfc882e77004399800ae35fd40fa1919478e0b6ad0ba970806cb2
WEB_SITE=http://www.vips.ecs.soton.ac.uk/index.php
ENTERED=20041230
LICENSE[0]=LGPL
diff --git a/graphics-libs/vips/HISTORY b/graphics-libs/vips/HISTORY
index 15f97da..cfb5084 100644
--- a/graphics-libs/vips/HISTORY
+++ b/graphics-libs/vips/HISTORY
@@ -1,3 +1,13 @@
+2012-09-19 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 7.30.2 (required for nips 7.30.x)
+ * DEPENDS: ./configure doesn't know --with-openexr, --without-cimg,
+ --with-liboil, nor --with-lcms2 anymore
+ *-openexr -> *-OpenEXR
+ Removed cimg optional dependency
+ Removed liboil optional dependency
+ Removed lcms optional dependency (only supports lcms2 now)
+
+
2011-09-10 Robert Figura <template AT sourcemage.org>
* DETAILS: Updated to version 7.26.3
* DEPENDS: add optional_depends on lcms2 + cfitsio + orc
diff --git a/graphics-libs/vips/vips-7.30.2.tar.gz.sig
b/graphics-libs/vips/vips-7.30.2.tar.gz.sig
new file mode 100644
index 0000000..efdb16d
Binary files /dev/null and b/graphics-libs/vips/vips-7.30.2.tar.gz.sig differ
diff --git a/graphics/nip2/DETAILS b/graphics/nip2/DETAILS
index 2420b84..c1267f9 100755
--- a/graphics/nip2/DETAILS
+++ b/graphics/nip2/DETAILS
@@ -1,9 +1,10 @@
SPELL=nip2
- VERSION=7.26.3
+ VERSION=7.30.1
SOURCE=${SPELL}-${VERSION}.tar.gz
+#
SOURCE_HASH=sha512:cd20f82de44fc90acc17e5cd0cd76c39f96b86d9ec5a38805f4f92896dd33cde29ea3fcfffdac1e4e447a533c6b077104f5f768a80f58a05013f793f578b6336
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}

SOURCE_URL[0]=http://www.vips.ecs.soton.ac.uk/supported/${VERSION:0:4}/${SOURCE}
-
SOURCE_HASH=sha512:cd20f82de44fc90acc17e5cd0cd76c39f96b86d9ec5a38805f4f92896dd33cde29ea3fcfffdac1e4e447a533c6b077104f5f768a80f58a05013f793f578b6336
SOURCE_URL[1]=${SOURCEFORGE_URL}/vips/${SOURCE}
WEB_SITE=http://www.vips.ecs.soton.ac.uk/index.php
ENTERED=20041230
diff --git a/graphics/nip2/HISTORY b/graphics/nip2/HISTORY
index a4b10cb..08928b3 100644
--- a/graphics/nip2/HISTORY
+++ b/graphics/nip2/HISTORY
@@ -1,3 +1,9 @@
+2012-09-19 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 7.30.1
+ * PRE_BUILD: Apply yyleng.patch
+ * yyleng.patch: Fix compilation with newer bison/flex
+ Fixes for 7.26.x as well
+
2011-09-10 Robert Figura <template AT sourcemage.org>
* DETAILS: Updated to version 7.26.3

diff --git a/graphics/nip2/PRE_BUILD b/graphics/nip2/PRE_BUILD
new file mode 100755
index 0000000..d170c16
--- /dev/null
+++ b/graphics/nip2/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build
+patch "${SOURCE_DIRECTORY}"/src/parser.h \
+ "${SPELL_DIRECTORY}"/yyleng.patch \
diff --git a/graphics/nip2/nip2-7.30.1.tar.gz.sig
b/graphics/nip2/nip2-7.30.1.tar.gz.sig
new file mode 100644
index 0000000..8e17ad1
Binary files /dev/null and b/graphics/nip2/nip2-7.30.1.tar.gz.sig differ
diff --git a/graphics/nip2/yyleng.patch b/graphics/nip2/yyleng.patch
new file mode 100644
index 0000000..f468801
--- /dev/null
+++ b/graphics/nip2/yyleng.patch
@@ -0,0 +1,13 @@
+diff -Naur nip2-7.30.1.orig/src/parser.h nip2-7.30.1/src/parser.h
+--- nip2-7.30.1.orig/src/parser.h 2012-09-19 14:58:57.722847887 -0700
++++ nip2-7.30.1/src/parser.h 2012-09-19 15:10:53.300434547 -0700
+@@ -55,7 +55,8 @@
+ void nip2yyerror( const char *sub, ... )
+ __attribute__((format(printf, 1, 2)));
+ void yyerror( const char *msg );
+-extern int yyleng; /* lex stuff */
++typedef size_t yy_size_t;
++extern yy_size_t yyleng;
+
+ /* Lex gathers tokens here for workspace.c
+ */


  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (ce74cd22645e84315fe38d61b824e579d21e921d), Eric Sandall, 09/19/2012

Archive powered by MHonArc 2.6.24.

Top of Page