Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (cdc727fe51a14e0f37c4049c0d91dc2e573cb016)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (cdc727fe51a14e0f37c4049c0d91dc2e573cb016)
  • Date: Tue, 12 Jun 2012 15:51:36 -0500

GIT changes to devel-xorg-modular grimoire by Vlad Glagolev
<stealth AT sourcemage.org>:

ChangeLog | 3
audio-libs/libmusicbrainz5/BUILD | 4
audio-libs/libmusicbrainz5/DEPENDS | 4
audio-libs/libmusicbrainz5/DETAILS | 17 ++++
audio-libs/libmusicbrainz5/HISTORY | 3
audio-players/mpd/DEPENDS | 6 +
audio-players/mpd/HISTORY | 3
audio-players/mpg123/HISTORY | 2
database/sqlite/DETAILS | 6 -
database/sqlite/HISTORY | 3
devel/quazip/DETAILS | 4
devel/quazip/HISTORY | 3
devel/ragel/HISTORY | 5 +
devel/ragel/PRE_BUILD | 4
devel/ragel/gcc-4.7.patch | 125
++++++++++++++++++++++++++++++
gnome2-libs/pygobject/BUILD | 3
gnome2-libs/pygobject/DEPENDS | 14 ++-
gnome2-libs/pygobject/HISTORY | 9 ++
gnome2-libs/pygobject/PRE_BUILD | 4
gnome2-libs/pygobject/introspection.patch | 28 ++++++
gnome3-libs/pygobject3/HISTORY | 11 ++
gnome3-libs/pygobject3/UP_TRIGGERS | 5 +
graphics/libgphoto2/DEPENDS | 2
graphics/libgphoto2/HISTORY | 3
net/tor/DETAILS | 2
net/tor/HISTORY | 3
printer/gutenprint/DETAILS | 4
printer/gutenprint/HISTORY | 4
printer/gutenprint/PRE_BUILD | 6 -
shell-term-fm/eaglemode/DETAILS | 4
shell-term-fm/eaglemode/HISTORY | 3
utils/gnuplot/HISTORY | 5 +
utils/gnuplot/PRE_BUILD | 2
utils/gnuplot/automake-1.12.patch | 36 ++++++++
video/guvcview/DEPENDS | 12 ++
video/guvcview/HISTORY | 3
36 files changed, 331 insertions(+), 24 deletions(-)

New commits:
commit f96323b7b42ed363159a1d0d61b7e00eaaa20797
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

tor: => 0.2.2.37

commit 0d1fba8da31ed347a114af82d7021ae2c80c956b
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

sqlite: => 3.7.13

commit f59f26185eb3fbe0f3a47615772e154ec51c4c4d
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

gutenprint: => 5.2.8

commit a8bab8e653f456b4c5079be9cb6db19255c90106
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libgphoto2 - needs libusb-compat

commit 74d335990c0e6ea70612fc71b2cdcc2d23de639f
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

ragel: apply fix for gcc 4.7
still compiles with gcc 4.6

commit 1e1e56dbb7d92f8df3f6cd827cbd70e6f1c7a186
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

mpd: docs need doxygen

commit 075e265fe04fb3acfe50a2d682b38edfb1f6fc97
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

pygobject3: added UP_TRIGGERS - cast pygobject if pygobject has
gobject-introspection enabled, so it is built without it.
See https://bugzilla.gnome.org/show_bug.cgi?id=657054

It is not strictly necessary to for it to be recast since the conflicting
files are overwritten by pygobject3, but some files are left over which I
*assume* may lead to unintentional consequences. It is recommended that
pygobject2 be built without gobject-introspection if pygobect3 is installed
in either case.

commit 518f5051a4a5c7083060e0c12666c83f97fb289c
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

pygobject3: added UP_TRIGGERS - cast pygobject if pygobject has
gobject-introspection enabled, so it is built without it.
See https://bugzilla.gnome.org/show_bug.cgi?id=657054

It is not strictly necessary to for it to be recast since the conflicting
files are overwritten by pygobject3, but some files are left over which I
*assume* may lead to unintentional consequences. It is recommended that
pygobject2 be built without gobject-introspection if pygobect3 is installed
in either case.

commit 3f7e58fad3de8397e4a3e26b565a677ae14f556c
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

pygobject: fix build with gobject-introspection

BUILD: only build with introspection if pygobject3 does not have
introspection enabled.
see https://bugzilla.gnome.org/show_bug.cgi?id=657054
DEPENDS: only depend on gobject-introspection if pygobject3 does not have
introspection enabled.
PRE_BUILD: added, apply patch to fix introspection
introspection.patch: added, remove depreciated references

commit f31d056cf13f4edae864beb3a967370c0b3860ac
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

gnuplot: apply fix for automake-1.12
patch from upstream

commit e15bf64acc5190ee99f035e25d37f09dd09fc389
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

eaglemode 0.84.0

commit 0139d9aa336e96e83565bfb5d92eb6318b0472c7
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Ladislav Hagara <ladislav.hagara AT unob.cz>

mpg123: HISTORY fixed

commit 1eb5a2b8d3d8c0055fc1e44bfba28dada4b09e18
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

new spell - libmusicbrainz5 version 5.0.1

commit 46da5d80e7d23d20c23581f9702dcfc6cf557c19
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

quazip: => 0.4.4

commit 0db8595661e58d29eee941e2f7ad1e01b3f78cd7
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

guvcview: fixed infinite loop by adding flags for optional dependencies
during the configure stage

diff --git a/ChangeLog b/ChangeLog
index 1335ee3..e0bc099 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2012-06-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * audio-libs/libmusicbrainz5: new spell, new api for musicbrainz
+
2012-06-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* graphics/recoverjpeg: new spell, a tool for recovering lost jpeg
and mov
files
diff --git a/audio-libs/libmusicbrainz5/BUILD
b/audio-libs/libmusicbrainz5/BUILD
new file mode 100755
index 0000000..0c70da6
--- /dev/null
+++ b/audio-libs/libmusicbrainz5/BUILD
@@ -0,0 +1,4 @@
+# out of source build fails
+# cmake_build
+cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT/usr . &&
+make
diff --git a/audio-libs/libmusicbrainz5/DEPENDS
b/audio-libs/libmusicbrainz5/DEPENDS
new file mode 100755
index 0000000..3dc2f3a
--- /dev/null
+++ b/audio-libs/libmusicbrainz5/DEPENDS
@@ -0,0 +1,4 @@
+depends -sub CXX gcc &&
+depends cmake &&
+depends neon &&
+optional_depends doxygen '' '' 'build documentation'
diff --git a/audio-libs/libmusicbrainz5/DETAILS
b/audio-libs/libmusicbrainz5/DETAILS
new file mode 100755
index 0000000..2c32afb
--- /dev/null
+++ b/audio-libs/libmusicbrainz5/DETAILS
@@ -0,0 +1,17 @@
+ SPELL=libmusicbrainz5
+ SPELLX=${SPELL//5}
+ VERSION=5.0.1
+
SOURCE_HASH=sha512:9c6c69d54b0ad5a716ff2f8d7a17150aa98d57b6ee019d634b679dc09079646e4139fdfc47906db65226a2c25c963f1ad88e2290e6961f4576f6afd7777850ae
+ SOURCE=$SPELLX-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
+ SOURCE_URL[0]=https://github.com/downloads/metabrainz/$SPELLX/$SOURCE
+ WEB_SITE=http://www.musicbrainz.org
+ ENTERED=20120506
+ LICENSE[0]=LGPL
+ KEYWORDS="audio libs"
+ SHORT="library for adding MusicBrainz lookup capabilities"
+cat << EOF
+The MusicBrainz Client Library (libmusicbrainz), also known as mb_client,
+is a development library geared towards developers who wish to add
+MusicBrainz lookup capabilities to their applications
+EOF
diff --git a/audio-libs/libmusicbrainz5/HISTORY
b/audio-libs/libmusicbrainz5/HISTORY
new file mode 100644
index 0000000..2319bfc
--- /dev/null
+++ b/audio-libs/libmusicbrainz5/HISTORY
@@ -0,0 +1,3 @@
+2012-06-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.0.1
+ new spell - new API for libmusicbrainz
diff --git a/audio-players/mpd/DEPENDS b/audio-players/mpd/DEPENDS
index 9aa66f8..ea248ac 100755
--- a/audio-players/mpd/DEPENDS
+++ b/audio-players/mpd/DEPENDS
@@ -197,4 +197,8 @@ optional_depends avahi \
optional_depends xmlto \
"--enable-documentation" \
"--disable-documentation" \
- "to build documentation"
+ "to build documentation" &&
+# Xmlto is not enough.
+if is_depends_enabled $SPELL xmlto; then
+ depends doxygen
+fi
diff --git a/audio-players/mpd/HISTORY b/audio-players/mpd/HISTORY
index 3cfb22e..211fd4c 100644
--- a/audio-players/mpd/HISTORY
+++ b/audio-players/mpd/HISTORY
@@ -1,3 +1,6 @@
+2012-06-12 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: need doxygen for docs, too
+
2012-04-13 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.16.8

diff --git a/audio-players/mpg123/HISTORY b/audio-players/mpg123/HISTORY
index d6144b7..64ae241 100644
--- a/audio-players/mpg123/HISTORY
+++ b/audio-players/mpg123/HISTORY
@@ -1,4 +1,4 @@
-2012-65-08 Thomas Orgis <sobukus AT sourcemage.org>
+2012-06-08 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: Update to 1.14.2

2012-05-07 Thomas Orgis <sobukus AT sourcemage.org>
diff --git a/database/sqlite/DETAILS b/database/sqlite/DETAILS
index e71b631..055e241 100755
--- a/database/sqlite/DETAILS
+++ b/database/sqlite/DETAILS
@@ -1,7 +1,7 @@
SPELL=sqlite
- VERSION=3.7.12.1
- VERSIONX=autoconf-3071201
-
SOURCE_HASH=sha512:bd7eabc750e375b62e6ec79f77a218310b4fac958043389a5f4f0ef7e8aff8446ad2743d3f27ab66b86709902ba49fb4317fd4340011813c930e3c5828102afd
+ VERSION=3.7.13
+ VERSIONX=autoconf-3071300
+
SOURCE_HASH=sha512:206b107a8806ea6caccc08645777feb1b5421d35792e6075037c1646c424c66c0e1ebe5d146f2cf2e143359e960c1183ce742e8523cd9775f975d220fabb48cd
SOURCE_DIRECTORY="$BUILD_DIRECTORY/${SPELL}-${VERSIONX}"
SOURCE=${SPELL}-${VERSIONX}.tar.gz
SOURCE_URL[0]=http://sqlite.org/$SOURCE
diff --git a/database/sqlite/HISTORY b/database/sqlite/HISTORY
index 68038ee..7ce726b 100644
--- a/database/sqlite/HISTORY
+++ b/database/sqlite/HISTORY
@@ -1,3 +1,6 @@
+2012-06-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.7.13
+
2012-05-23 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 3.7.12.1

diff --git a/devel/quazip/DETAILS b/devel/quazip/DETAILS
index f2a28f8..3e1e39a 100755
--- a/devel/quazip/DETAILS
+++ b/devel/quazip/DETAILS
@@ -1,6 +1,6 @@
SPELL=quazip
- VERSION=0.4.3
-
SOURCE_HASH=sha512:e89dda78310238fbf5fe6dd5a82d6f86afea3ad1d92895f38bbb48ef296cb20c93261b8c364cabe01a20d849a69062a200f0f27204050ccb49699a0364f4503b
+ VERSION=0.4.4
+
SOURCE_HASH=sha512:c22a8898157030947a245a35d5e9463cb10941ccecfc5e5d2b4b0b75d43516df3740b0971642579db969658b2b305de13249f322f4cc4ed23ddeb4a105acddb6
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/devel/quazip/HISTORY b/devel/quazip/HISTORY
index 8cdfac4..ec0d591 100644
--- a/devel/quazip/HISTORY
+++ b/devel/quazip/HISTORY
@@ -1,3 +1,6 @@
+2012-06-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.4.4
+
2011-10-14 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed long description wrap (scripted)

diff --git a/devel/ragel/HISTORY b/devel/ragel/HISTORY
index 82dde7d..21219b3 100644
--- a/devel/ragel/HISTORY
+++ b/devel/ragel/HISTORY
@@ -1,3 +1,8 @@
+2012-06-12 Sukneet Basuta <sukneet AT sourcemage.org>
+ * PRE_BUILD: added, to apply patch
+ * gcc-4.7.patch: added, fix to compile with gcc 4.7
+ from debian
+
2011-12-17 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 6.7

diff --git a/devel/ragel/PRE_BUILD b/devel/ragel/PRE_BUILD
new file mode 100755
index 0000000..9327cb8
--- /dev/null
+++ b/devel/ragel/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+patch -p1 < $SPELL_DIRECTORY/gcc-4.7.patch
diff --git a/devel/ragel/gcc-4.7.patch b/devel/ragel/gcc-4.7.patch
new file mode 100644
index 0000000..caa0c67
--- /dev/null
+++ b/devel/ragel/gcc-4.7.patch
@@ -0,0 +1,125 @@
+--- ragel-6.7.orig/aapl/mergesort.h
++++ ragel-6.7/aapl/mergesort.h
+@@ -110,7 +110,7 @@
+ }
+ else {
+ /* Both upper and lower left. */
+- if ( compare(*lower, *upper) <= 0 )
++ if ( this->compare(*lower, *upper) <= 0 )
+ memcpy( dest++, lower++, sizeof(T) );
+ else
+ memcpy( dest++, upper++, sizeof(T) );
+--- ragel-6.7.orig/aapl/avlcommon.h
++++ ragel-6.7/aapl/avlcommon.h
+@@ -881,9 +881,9 @@
+ }
+
+ #ifdef AVL_BASIC
+- keyRelation = compare( *element, *curEl );
++ keyRelation = this->compare( *element, *curEl );
+ #else
+- keyRelation = compare( element->BASEKEY(getKey()),
++ keyRelation = this->compare( element->BASEKEY(getKey()),
+ curEl->BASEKEY(getKey()) );
+ #endif
+
+@@ -920,7 +920,7 @@
+ long keyRelation;
+
+ while (curEl) {
+- keyRelation = compare( *element, *curEl );
++ keyRelation = this->compare( *element, *curEl );
+
+ /* Do we go left? */
+ if ( keyRelation < 0 )
+@@ -969,7 +969,7 @@
+ return element;
+ }
+
+- keyRelation = compare( key, curEl->BASEKEY(getKey()) );
++ keyRelation = this->compare( key, curEl->BASEKEY(getKey()) );
+
+ /* Do we go left? */
+ if ( keyRelation < 0 ) {
+@@ -1023,7 +1023,7 @@
+ return element;
+ }
+
+- keyRelation = compare(key, curEl->getKey());
++ keyRelation = this->compare(key, curEl->getKey());
+
+ /* Do we go left? */
+ if ( keyRelation < 0 ) {
+@@ -1058,7 +1058,7 @@
+ long keyRelation;
+
+ while (curEl) {
+- keyRelation = compare( key, curEl->BASEKEY(getKey()) );
++ keyRelation = this->compare( key, curEl->BASEKEY(getKey()) );
+
+ /* Do we go left? */
+ if ( keyRelation < 0 )
+--- ragel-6.7.orig/aapl/bubblesort.h
++++ ragel-6.7/aapl/bubblesort.h
+@@ -72,7 +72,7 @@
+ changed = false;
+ for ( long i = 0; i < len-pass; i++ ) {
+ /* Do we swap pos with the next one? */
+- if ( compare( data[i], data[i+1] ) > 0 ) {
++ if ( this->compare( data[i], data[i+1] ) > 0 ) {
+ char tmp[sizeof(T)];
+
+ /* Swap the two items. */
+--- ragel-6.7.orig/aapl/bstcommon.h
++++ ragel-6.7/aapl/bstcommon.h
+@@ -361,7 +361,7 @@
+ }
+
+ mid = lower + ((upper-lower)>>1);
+- keyRelation = compare(key, GET_KEY(*mid));
++ keyRelation = this->compare(key, GET_KEY(*mid));
+
+ if ( keyRelation < 0 )
+ upper = mid - 1;
+@@ -373,12 +373,12 @@
+
+ lower = mid - 1;
+ while ( lower != lowEnd &&
+- compare(key, GET_KEY(*lower)) == 0 )
++ this->compare(key, GET_KEY(*lower))
== 0 )
+ lower--;
+
+ upper = mid + 1;
+ while ( upper != highEnd &&
+- compare(key, GET_KEY(*upper)) == 0 )
++ this->compare(key, GET_KEY(*upper))
== 0 )
+ upper++;
+
+ low = (Element*)lower + 1;
+@@ -419,7 +419,7 @@
+ }
+
+ mid = lower + ((upper-lower)>>1);
+- keyRelation = compare(key, GET_KEY(*mid));
++ keyRelation = this->compare(key, GET_KEY(*mid));
+
+ if ( keyRelation < 0 )
+ upper = mid - 1;
+@@ -457,7 +457,7 @@
+ }
+
+ mid = lower + ((upper-lower)>>1);
+- keyRelation = compare(key, GET_KEY(*mid));
++ keyRelation = this->compare(key, GET_KEY(*mid));
+
+ if ( keyRelation < 0 )
+ upper = mid - 1;
+@@ -662,7 +662,7 @@
+ }
+
+ mid = lower + ((upper-lower)>>1);
+- keyRelation = compare(GET_KEY(el), GET_KEY(*mid));
++ keyRelation = this->compare(GET_KEY(el), GET_KEY(*mid));
+
+ if ( keyRelation < 0 )
+ upper = mid - 1;
diff --git a/gnome2-libs/pygobject/BUILD b/gnome2-libs/pygobject/BUILD
index c7d76f3..ea5c468 100755
--- a/gnome2-libs/pygobject/BUILD
+++ b/gnome2-libs/pygobject/BUILD
@@ -1,2 +1,5 @@
+if spell_ok pygobject3; then
+ OPTS="$OPTS --disable-introspection"
+fi &&
OPTS="$OPTS --enable-thread" &&
default_build
diff --git a/gnome2-libs/pygobject/DEPENDS b/gnome2-libs/pygobject/DEPENDS
index 26683a7..d26c97a 100755
--- a/gnome2-libs/pygobject/DEPENDS
+++ b/gnome2-libs/pygobject/DEPENDS
@@ -2,10 +2,16 @@ depends python &&
depends glib2 &&
depends pycairo &&

-optional_depends gobject-introspection \
- "--enable-introspection" \
- "--disable-introspection" \
- "to enable introspection" &&
+# introspection in pygoject3 conflicts with introspection in pygobject
+# https://bugzilla.gnome.org/show_bug.cgi?id=657054
+#if ! spell_ok pygobject3; then
+
+ optional_depends gobject-introspection \
+ "--enable-introspection" \
+ "--disable-introspection" \
+ "to enable introspection"
+
+#fi &&

optional_depends libffi \
"--with-ffi" \
diff --git a/gnome2-libs/pygobject/HISTORY b/gnome2-libs/pygobject/HISTORY
index b681377..70b14e7 100644
--- a/gnome2-libs/pygobject/HISTORY
+++ b/gnome2-libs/pygobject/HISTORY
@@ -1,3 +1,12 @@
+2012-06-11 Sukneet Basuta <sukneet AT sourcemage.org>
+ * BUILD: only build with introspection if pygobject3
+ does not have introspection enabled.
+ see https://bugzilla.gnome.org/show_bug.cgi?id=657054
+ * DEPENDS: only depend on gobject-introspection if pygobject3
+ does not have introspection enabled.
+ * PRE_BUILD: added, apply patch to fix introspection
+ * introspection.patch: added, remove depreciated references
+
2012-05-18 Arjan Bouter <abouter AT sourcemage.org>
* DEPENDS: added missing optional dep on libffi

diff --git a/gnome2-libs/pygobject/PRE_BUILD b/gnome2-libs/pygobject/PRE_BUILD
new file mode 100755
index 0000000..9dafa11
--- /dev/null
+++ b/gnome2-libs/pygobject/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+patch -p0 < $SPELL_DIRECTORY/introspection.patch
diff --git a/gnome2-libs/pygobject/introspection.patch
b/gnome2-libs/pygobject/introspection.patch
new file mode 100644
index 0000000..0b63759
--- /dev/null
+++ b/gnome2-libs/pygobject/introspection.patch
@@ -0,0 +1,28 @@
+--- gi/pygi-info.c.orig 2011-06-13 16:30:25.000000000 +0000
++++ gi/pygi-info.c
+@@ -162,9 +162,6 @@ _pygi_info_new (GIBaseInfo *info)
+ case GI_INFO_TYPE_CONSTANT:
+ type = &PyGIConstantInfo_Type;
+ break;
+- case GI_INFO_TYPE_ERROR_DOMAIN:
+- type = &PyGIErrorDomainInfo_Type;
+- break;
+ case GI_INFO_TYPE_UNION:
+ type = &PyGIUnionInfo_Type;
+ break;
+@@ -481,7 +478,6 @@ _pygi_g_type_info_size (GITypeInfo *type
+ case GI_INFO_TYPE_INVALID:
+ case GI_INFO_TYPE_FUNCTION:
+ case GI_INFO_TYPE_CONSTANT:
+- case GI_INFO_TYPE_ERROR_DOMAIN:
+ case GI_INFO_TYPE_VALUE:
+ case GI_INFO_TYPE_SIGNAL:
+ case GI_INFO_TYPE_PROPERTY:
+@@ -860,7 +856,6 @@ pygi_g_struct_info_is_simple (GIStructIn
+ case GI_INFO_TYPE_INVALID:
+ case GI_INFO_TYPE_FUNCTION:
+ case GI_INFO_TYPE_CONSTANT:
+- case GI_INFO_TYPE_ERROR_DOMAIN:
+ case GI_INFO_TYPE_VALUE:
+ case GI_INFO_TYPE_SIGNAL:
+ case GI_INFO_TYPE_PROPERTY:
diff --git a/gnome3-libs/pygobject3/HISTORY b/gnome3-libs/pygobject3/HISTORY
index 1bc8e00..1fbfadc 100644
--- a/gnome3-libs/pygobject3/HISTORY
+++ b/gnome3-libs/pygobject3/HISTORY
@@ -1,3 +1,14 @@
+2012-06-11 Sukneet Basuta <sukneet AT sourcemage.org>
+ * UP_TRIGGERS: added, cast pygobject if pygobject
+ has gobject-introspection enabled, so it is built
+ without it. See https://bugzilla.gnome.org/show_bug.cgi?id=657054
+ It is not strictly necessary to for it to be recast since
+ the conflicting files are overwritten by pygobject3, but
+ some files are left over which I *assume* may lead to
+ unintentional consequences. It is recommended that pygobject2
+ be built without gobject-introspection if pygobect3 is
+ installed in either case.
+
2012-03-27 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.2.0

diff --git a/gnome3-libs/pygobject3/UP_TRIGGERS
b/gnome3-libs/pygobject3/UP_TRIGGERS
new file mode 100755
index 0000000..04704dc
--- /dev/null
+++ b/gnome3-libs/pygobject3/UP_TRIGGERS
@@ -0,0 +1,5 @@
+# introspection in pygoject3 conflicts with introspection in pygobject
+# https://bugzilla.gnome.org/show_bug.cgi?id=657054
+if is_depends_enabled pygobject gobject-introspection; then
+ up_trigger pygobject cast_self
+fi
diff --git a/graphics/libgphoto2/DEPENDS b/graphics/libgphoto2/DEPENDS
index b8a47ff..337c2bf 100755
--- a/graphics/libgphoto2/DEPENDS
+++ b/graphics/libgphoto2/DEPENDS
@@ -22,7 +22,7 @@ optional_depends gd "" "" "for GD conversion support" &&
optional_depends libtool "--with-ltdl" "--without-ltdl" \
"an alternative way of opening shared libraries" &&

-optional_depends LIBUSB "" "" "enable use of cameras connected though the
USB port" &&
+optional_depends libusb-compat "" "" "enable use of cameras connected though
the USB port" &&

optional_depends dbus "" "" "for dbus support" &&
optional_depends hal "" "" "for HAL support" &&
diff --git a/graphics/libgphoto2/HISTORY b/graphics/libgphoto2/HISTORY
index 2a9966f..63008c9 100644
--- a/graphics/libgphoto2/HISTORY
+++ b/graphics/libgphoto2/HISTORY
@@ -1,3 +1,6 @@
+2012-06-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: LIBUSB => libusb-compat
+
2012-05-09 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: libusb => LIBUSB
add optional lockdev
diff --git a/net/tor/DETAILS b/net/tor/DETAILS
index beca5c9..14a8828 100755
--- a/net/tor/DETAILS
+++ b/net/tor/DETAILS
@@ -4,7 +4,7 @@ if [ "$TOR_DEVEL" == "y" ]; then
VERSION=0.2.2.23-alpha
SECURITY_PATCH=4
else
- VERSION=0.2.2.36
+ VERSION=0.2.2.37
SECURITY_PATCH=7
fi

diff --git a/net/tor/HISTORY b/net/tor/HISTORY
index d363c54..ed207e8 100644
--- a/net/tor/HISTORY
+++ b/net/tor/HISTORY
@@ -1,3 +1,6 @@
+2012-06-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.2.2.37
+
2012-05-24 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.2.2.36; SECURITY_PATCH++ (several
security
fixes)
diff --git a/printer/gutenprint/DETAILS b/printer/gutenprint/DETAILS
index ec70277..8a98e30 100755
--- a/printer/gutenprint/DETAILS
+++ b/printer/gutenprint/DETAILS
@@ -5,8 +5,8 @@
# SOURCE=$SPELL$VERSION.tar.bz2
#SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL$VERSION"
#else
- VERSION=5.2.7
-
SOURCE_HASH=sha512:90158ea104ac88b7943068c2be84a72a70c7295e7957f78a5a8fa77644fe2efbdaccf8079d9adf9e245b90041be6b2a1d4fc8f74b6c17f7b033ca88b8c3bdeb4
+ VERSION=5.2.8
+
SOURCE_HASH=sha512:be9b4881f5c153c7f2d233591e5f07dfeae7381af0a8c2c9f3c7c1f06b59a924e566dfce3ca8f4092a00d26403b67b00b2ad7bfcaa4b6d932110619ddde3d2f2
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
#fi
diff --git a/printer/gutenprint/HISTORY b/printer/gutenprint/HISTORY
index 9e56fb3..6e8514a 100644
--- a/printer/gutenprint/HISTORY
+++ b/printer/gutenprint/HISTORY
@@ -1,3 +1,7 @@
+2012-06-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.2.8
+ * gutenprint: deleted
+
2011-11-04 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: make the dependency on gnutls via cups explicit

diff --git a/printer/gutenprint/PRE_BUILD b/printer/gutenprint/PRE_BUILD
deleted file mode 100755
index 24eb121..0000000
--- a/printer/gutenprint/PRE_BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-# fix build with gcc-4.6.1
-sed -i '/stdlib/i \
-#include <stdio.h>
-' src/cups/commandto*.c
diff --git a/shell-term-fm/eaglemode/DETAILS b/shell-term-fm/eaglemode/DETAILS
index 3739baa..b01e9c7 100755
--- a/shell-term-fm/eaglemode/DETAILS
+++ b/shell-term-fm/eaglemode/DETAILS
@@ -1,8 +1,8 @@
SPELL=eaglemode
- VERSION=0.83.0
+ VERSION=0.84.0
SOURCE="${SPELL}-${VERSION}.tar.bz2"
SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:9338c99a0d91bcd05f8318fa5ac4e0994c8a9e0400b91c431cd07513626d736857001fa98b243452ec0eda1aab6ffd701e3950237a8ebf335c2ce83b912a914a
+
SOURCE_HASH=sha512:7e5706bd883b812af5dc7fe1c8a1644ba6a68c17547275558a754c7afaedcbf296fc48ea8984df7bdc9699cc1a1fe8e4ea6567c6f949c99a6b496644136aac32
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://eaglemode.sourceforge.net/";
LICENSE[0]=GPLv3
diff --git a/shell-term-fm/eaglemode/HISTORY b/shell-term-fm/eaglemode/HISTORY
index 350c377..f777582 100644
--- a/shell-term-fm/eaglemode/HISTORY
+++ b/shell-term-fm/eaglemode/HISTORY
@@ -1,3 +1,6 @@
+2012-06-11 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.84.0
+
2011-11-14 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.83.0

diff --git a/utils/gnuplot/HISTORY b/utils/gnuplot/HISTORY
index a13ecd9..42d40d3 100644
--- a/utils/gnuplot/HISTORY
+++ b/utils/gnuplot/HISTORY
@@ -1,3 +1,8 @@
+2012-06-11 Sukneet Basuta <sukneet AT sourcemage.org>
+ * PRE_BUILD: apply fix for automake-1.12
+ * automake-1.12.patch: added, patch for automake 1.12.
+ From upstream. Remove on next update.
+
2012-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: update to 4.6
* PRE_BUILD, BUILD, crossbuild.patch, FINAL, INSTALL, POST_REMOVE:
diff --git a/utils/gnuplot/PRE_BUILD b/utils/gnuplot/PRE_BUILD
index af643b4..fa1663b 100755
--- a/utils/gnuplot/PRE_BUILD
+++ b/utils/gnuplot/PRE_BUILD
@@ -4,6 +4,8 @@ cd "$SOURCE_DIRECTORY" &&
# Hopefully fixed in gnuplot 4.7 .
patch -Np0 < "$SPELL_DIRECTORY/crossbuild.patch" &&

+patch -p0 < $SPELL_DIRECTORY/automake-1.12.patch &&
+
# remove the true when removing the patch above
if true || [[ $GNUPLOT_BRANCH == scm ]]; then
cd "$SOURCE_DIRECTORY" &&
diff --git a/utils/gnuplot/automake-1.12.patch
b/utils/gnuplot/automake-1.12.patch
new file mode 100644
index 0000000..30d976d
--- /dev/null
+++ b/utils/gnuplot/automake-1.12.patch
@@ -0,0 +1,36 @@
+--- Makefile.am 2012/01/14 08:18:00 1.20.2.1
++++ Makefile.am 2012/05/08 20:28:19 1.20.2.2
+@@ -1,5 +1,5 @@
+ ## Process this file with automake to produce Makefile.in -*-Makefile-*-
+-AUTOMAKE_OPTIONS = foreign 1.2h
++AUTOMAKE_OPTIONS = foreign
+
+ SUBDIRS = config m4 term src docs $(LISPDIR) man demo tutorial share
+
+--- src/Makefile.am 2012/01/19 07:03:27 1.86.2.3
++++ src/Makefile.am 2012/05/08 20:28:20 1.86.2.4
+@@ -1,5 +1,5 @@
+ ## Process this file with automake to produce Makefile.in -*-Makefile-*-
+-AUTOMAKE_OPTIONS = ansi2knr foreign 1.2h
++AUTOMAKE_OPTIONS = foreign
+
+ # in the spirit of automake ...
+ pkglibexecdir = $(libexecdir)/@PACKAGE@/@VERSION_MAJOR@
+--- configure.in 2012/04/26 22:53:11 1.297.2.14
++++ configure.in 2012/05/08 20:28:19 1.297.2.15
+@@ -20,11 +20,12 @@
+ dnl configure.in body
+
+ dnl Compiler characteristics
+-dnl Check for ANSI C prototypes, the const and inline keywords,
+-dnl and ANSI style stringification
++dnl Check for the const and inline keywords and ANSI style stringification
++dnl automake 1.12 dropped support for AM_C_PROTOTYPES and ansi2knr
++dnl But our code still tests for #ifdef PROTOTYPES, so define it here
++AC_DEFINE(PROTOTYPES,1,[Automake 1.12 dropped support for building without
prototypes])
+ AC_GNU_SOURCE
+ AC_PROG_CC
+-AM_C_PROTOTYPES
+ AC_PROG_CPP
+ AC_C_CONST
+ AC_C_INLINE
diff --git a/video/guvcview/DEPENDS b/video/guvcview/DEPENDS
index 96eabf8..304d751 100755
--- a/video/guvcview/DEPENDS
+++ b/video/guvcview/DEPENDS
@@ -4,4 +4,14 @@ depends udev &&
depends libpng &&
depends libv4l &&
depends portaudio19 &&
-depends LIBAVCODEC
+depends LIBAVCODEC &&
+
+optional_depends pulseaudio \
+ "--enable-pulse" \
+ "--disable-pulse" \
+ "for pulseaudio support" &&
+
+optional_depends gettext \
+ "--enable-nls" \
+ "--disable-nls" \
+ "for Native Language Support"
diff --git a/video/guvcview/HISTORY b/video/guvcview/HISTORY
index a82ce60..ea21d57 100644
--- a/video/guvcview/HISTORY
+++ b/video/guvcview/HISTORY
@@ -1,3 +1,6 @@
+2012-06-11 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: added missing optional deps
+
2012-06-08 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.6.0




  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (cdc727fe51a14e0f37c4049c0d91dc2e573cb016), Vlad Glagolev, 06/12/2012

Archive powered by MHonArc 2.6.24.

Top of Page