Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (3dbac1b2280c7c44956f2634b09d579241877701)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (3dbac1b2280c7c44956f2634b09d579241877701)
  • Date: Sat, 13 Feb 2016 10:04:29 +0000

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

audio-creation/audacity/BUILD | 5 -
audio-creation/audacity/CONFIGURE | 7 -
audio-creation/audacity/DEPENDS | 51 ++++-------
audio-creation/audacity/HISTORY | 6 +
audio-drivers/libffado/BUILD | 9 --
audio-drivers/libffado/DEPENDS | 3
audio-drivers/libffado/HISTORY | 7 +
audio-drivers/libffado/PRE_BUILD | 6 -
audio-drivers/libffado/ffado-tests-errno.patch | 91 ++++++++++++++++++++
audio-drivers/libffado/libffado-atomic_ops.patch | 101
-----------------------
devel/python3/HISTORY | 4
devel/python3/INSTALL | 4
gnome2-libs/atkmm/DETAILS | 6 -
gnome2-libs/atkmm/HISTORY | 3
gnome2-libs/pangomm/DETAILS | 4
gnome2-libs/pangomm/HISTORY | 3
libs/libxml++/DETAILS | 4
libs/libxml++/HISTORY | 4
utils/dbus-c++/BUILD | 2
utils/dbus-c++/DEPENDS | 11 +-
utils/dbus-c++/HISTORY | 4
x11-toolkits/gtkmm2/BUILD | 2
x11-toolkits/gtkmm2/HISTORY | 3
23 files changed, 174 insertions(+), 166 deletions(-)

New commits:
commit 3dbac1b2280c7c44956f2634b09d579241877701
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

python3: fix python3-config symlink

commit 67cda44093befd78bbccdf197d117718824328a7
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

pagnomm: updateto 2.38.1 to make it build again with C++11

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

libxml++: update to 2.40.1, which buils with current C++11 setup and is
still API-compatible (3.0.0 is not)

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

libffado: build fixes, C++11, dropping Alpha hacks

commit 3852780b2aae136d8bd94bb89a0de87f41bfced4
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

gtkmm2: fix build, needs C++11

commit 562bc9d8983f7d6983f19357b619e24986ffdedb
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

dbus-c++: fix C++11 build and some depends

commit 2610efc871d13757bffaaa6d8351d95fa16c808e
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

audacity: dependency fixup, more reliance on bundled versions

commit 375bb0231f6c0caf0863709a52eb3a8f6961ff0c
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

atkmm: necessary update to 2.24.2

diff --git a/audio-creation/audacity/BUILD b/audio-creation/audacity/BUILD
index c3b1be8..fd3dd8f 100755
--- a/audio-creation/audacity/BUILD
+++ b/audio-creation/audacity/BUILD
@@ -4,7 +4,8 @@ fi &&

OPTS="$AUDACITY_LADSPA $OPTS" &&
OPTS="$AUDACITY_PORTMIXER $OPTS" &&
-OPTS="$AUDACITY_NYQUIST $OPTS"
-OPTS="--with-lib-preferences=system $OPTS" &&
+OPTS="$AUDACITY_NYQUIST $OPTS" &&
+# Things are too fragile for that.
+#OPTS="--with-lib-preferences=system $OPTS" &&

default_build
diff --git a/audio-creation/audacity/CONFIGURE
b/audio-creation/audacity/CONFIGURE
index 713644c..f4212bdf9 100755
--- a/audio-creation/audacity/CONFIGURE
+++ b/audio-creation/audacity/CONFIGURE
@@ -2,7 +2,8 @@ config_query_option AUDACITY_NYQUIST "Compile with Nyquist
plug-in support?"
"--enable-nyquist" "--disable-nyquist" &&

config_query_option AUDACITY_LADSPA "Compile with LADSPA plug-in support?"
y \
- "--enable-ladspa" "--disable-ladspa" &&
+ "--enable-ladspa" "--disable-ladspa"

-config_query_option AUDACITY_PORTMIXER "Compile with PortMixer?" y \
- "--with-portmixer" "--without-portmixer"
+# Breaks horribly without.
+#config_query_option AUDACITY_PORTMIXER "Compile with PortMixer?" y \
+# "--with-portmixer" "--without-portmixer"
diff --git a/audio-creation/audacity/DEPENDS b/audio-creation/audacity/DEPENDS
index 7303c32..3f8b868 100755
--- a/audio-creation/audacity/DEPENDS
+++ b/audio-creation/audacity/DEPENDS
@@ -10,14 +10,11 @@ fi &&
optional_depends lame "--with-lame" \
"--without-lame" \
"for mp3 import/export support" &&
-if [[ "$AUDACITY_BRANCH" != "current" ]]; then
- depends libsndfile
-else
- optional_depends libsndfile \
- "--with-libsndfile=system" \
- "--with-libsndfile=local" \
- "to use system libsndfile"
-fi &&
+
+optional_depends libsndfile \
+ "--with-libsndfile=system" \
+ "--with-libsndfile=local" \
+ "to use system libsndfile" &&
if [[ "$AUDACITY_BRANCH" == "scm" ]]; then
depends CVS
fi &&
@@ -53,21 +50,17 @@ optional_depends JACK-DRIVER \
message "${PROBLEM_COLOR}Do not use libsamplerate in conjunction with VST
plug-in support!${DEFAULT_COLOR}" &&

optional_depends libsamplerate \
- "--with-libsamplerate" \
- "--without-libsamplerate" \
+ "--with-libsamplerate=system" \
+ "--with-libsamplerate=local" \
"to use external libsamplerate" &&

-if [[ "$AUDACITY_BRANCH" == "current" ]]; then
optional_depends soundtouch \
"--with-soundtouch=system" \
- "--with-soundtouch=local" \
- "to use external soundtouch for editing"
-fi &&
+ "--with-soundtouch=no" \
+ "to use external soundtouch for editing" &&

-case "$AUDACITY_BRANCH" in beta|scm)
- optional_depends vamp-plugin-sdk "--enable-vamp" "--disable-vamp" \
- "Compile with vamp plug-in support?"
-;; esac &&
+optional_depends vamp-plugin-sdk "--with-libvamp=system"
"--with-libvamp=local" \
+ "Compile with external vamp plug-in support?"

optional_depends LIBAVCODEC \
"--with-ffmpeg" \
@@ -86,24 +79,16 @@ optional_depends redland \
"for reading RDF data" &&

optional_depends slv2 \
- "--with-slv2" \
- "--without-slv2" \
- "for loading LV2 plugins" &&
+ "--with-lv2=system" \
+ "--with-lv2=local" \
+ "for system LV2 loader" &&

optional_depends liblrdf \
"--with-liblrdf" \
"--without-liblrdf" \
"for categorisation of LADSPA plugins" &&

-
-case "$AUDACITY_BRANCH" in
- beta|scm)
- optional_depends soundtouch \
- "--with-soundtouch" "--without-soundtouch" \
- "SoundTouch for pitch and tempo changing?" &&
-
- optional_depends portaudio19 \
- "--with-portaudio" "--without-portaudio" \
- "Compile with portaudio v19?"
-esac
-
+optional_depends portaudio19 \
+ "--with-portaudio=system" \
+ "--with-portaudio=local" \
+ "to use external portaudio"
diff --git a/audio-creation/audacity/HISTORY b/audio-creation/audacity/HISTORY
index 099d777..31af7ec 100644
--- a/audio-creation/audacity/HISTORY
+++ b/audio-creation/audacity/HISTORY
@@ -1,3 +1,9 @@
+2016-02-10 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: a bit of cleanup, more needed; important: portaudio19
required
+ Generally, things are complicated with possible choices about
dependencies.
+ Defaulting to system versions of libraries is fragile. If in doubt,
choose
+ the bundled libs, even just to get it built at all.
+
2015-01-01 Thomas Orgis <sobukus AT sourcemage.org>
* DEPENDS: add comment to warn about wxgtk version
* DETAILS: bump to 2.1.1, change website, note about outdated
diff --git a/audio-drivers/libffado/BUILD b/audio-drivers/libffado/BUILD
index 292b5b8..c87b2c9 100755
--- a/audio-drivers/libffado/BUILD
+++ b/audio-drivers/libffado/BUILD
@@ -1,7 +1,4 @@
cd "$SOURCE_DIRECTORY" &&
-if [[ ${SMGL_COMPAT_ARCHS[1]} == alpha ]]; then
- scons PREFIX=/usr DEBUG=no ENABLE_OPTIMIZATIONS=yes DIST_TARGET=none
-else
- # note: this always compiles for current cpu
- scons PREFIX=/usr DEBUG=no ENABLE_OPTIMIZATIONS=yes
-fi
+# note: this always compiles for current cpu
+scons COMPILE_FLAGS="$CXXFLAGS -std=gnu++11" \
+ PREFIX=/usr DEBUG=no ENABLE_OPTIMIZATIONS=yes
diff --git a/audio-drivers/libffado/DEPENDS b/audio-drivers/libffado/DEPENDS
index 7e85a8b..6164a36 100755
--- a/audio-drivers/libffado/DEPENDS
+++ b/audio-drivers/libffado/DEPENDS
@@ -1,7 +1,4 @@
depends scons &&
-if [[ ${SMGL_COMPAT_ARCHS[1]} == alpha ]]; then
- depends libatomic_ops
-fi &&
depends expat &&
depends libxml++ &&
depends libraw1394 &&
diff --git a/audio-drivers/libffado/HISTORY b/audio-drivers/libffado/HISTORY
index b54b043..2c901de 100644
--- a/audio-drivers/libffado/HISTORY
+++ b/audio-drivers/libffado/HISTORY
@@ -1,3 +1,10 @@
+2016-02-11 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: C++11 mode because of libxml++, but the gnu++11 variant
because
+ plain c++11 breaks dbus-c++ usage in horrible ways
+ * DEPENDS, BUILD, PRE_BUILD: drop alpha, was a fun thing back then
+ * libffado-atomic_ops.patch: gone
+ * PRE_BUILD, ffado-tests-errno.patch: fix errno usage (breaks
nowadays)
+
2015-02-13 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: version 2.2.1

diff --git a/audio-drivers/libffado/PRE_BUILD
b/audio-drivers/libffado/PRE_BUILD
index 67a8686..6e09512 100755
--- a/audio-drivers/libffado/PRE_BUILD
+++ b/audio-drivers/libffado/PRE_BUILD
@@ -1,6 +1,4 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
-if [[ ${SMGL_COMPAT_ARCHS[1]} == alpha ]]; then
- message "${MESSAGE_COLOR}Aptching for portable atomic
operations...$DEFAULT_COLOR" &&
- patch -p0 < "$SCRIPT_DIRECTORY/libffado-atomic_ops.patch"
-fi
+# See https://lists.debian.org/debian-sparc/2015/11/msg00051.html .
+patch -p1 < "$SCRIPT_DIRECTORY/ffado-tests-errno.patch"
diff --git a/audio-drivers/libffado/ffado-tests-errno.patch
b/audio-drivers/libffado/ffado-tests-errno.patch
new file mode 100644
index 0000000..0596678
--- /dev/null
+++ b/audio-drivers/libffado/ffado-tests-errno.patch
@@ -0,0 +1,91 @@
+Nur in libffado-2.2.1.fixed/admin: dbus.pyc.
+Nur in libffado-2.2.1.fixed/admin: doxygen.pyc.
+Nur in libffado-2.2.1.fixed/admin: pkgconfig.pyc.
+Nur in libffado-2.2.1.fixed/admin: pyuic4.pyc.
+Nur in libffado-2.2.1.fixed/admin: pyuic.pyc.
+Nur in libffado-2.2.1.fixed/admin: scanreplace.pyc.
+Nur in libffado-2.2.1.fixed: cache.
+Nur in libffado-2.2.1.fixed: .sconsign.dblite.
+Nur in libffado-2.2.1.fixed/support/tools: ffado_diag_helpers.pyc.
+diff -ru libffado-2.2.1/tests/test-enhanced-mixer.cpp
libffado-2.2.1.fixed/tests/test-enhanced-mixer.cpp
+--- libffado-2.2.1/tests/test-enhanced-mixer.cpp 2008-05-29
10:24:21.000000000 +0200
++++ libffado-2.2.1.fixed/tests/test-enhanced-mixer.cpp 2016-02-11
10:12:40.929018609 +0100
+@@ -27,6 +27,7 @@
+ #include "libieee1394/ieee1394service.h"
+ #include <cstdlib>
+ #include <cstring>
++#include <cerrno>
+
+ using namespace AVC;
+
+@@ -77,7 +78,7 @@
+ exit(0);
+ }
+
+- int errno = 0;
++ errno = 0;
+ char* tail;
+ int node_id = strtol( argv[1], &tail, 0 );
+ int fb_id = strtol( argv[2], &tail, 0 );
+diff -ru libffado-2.2.1/tests/test-mixer.cpp
libffado-2.2.1.fixed/tests/test-mixer.cpp
+--- libffado-2.2.1/tests/test-mixer.cpp 2008-03-23 11:32:19.000000000
+0100
++++ libffado-2.2.1.fixed/tests/test-mixer.cpp 2016-02-11 10:10:46.236452463
+0100
+@@ -28,6 +28,7 @@
+
+ #include "libieee1394/ieee1394service.h"
+ #include <string.h>
++#include <cerrno>
+
+ DECLARE_GLOBAL_DEBUG_MODULE;
+
+@@ -227,7 +228,7 @@
+ exit(0);
+ }
+
+- int errno = 0;
++ errno = 0;
+ char* tail;
+ int port = strtol( argv[1], &tail, 0 );
+ int node_id = strtol( argv[2], &tail, 0 );
+diff -ru libffado-2.2.1/tests/test-pan.cpp
libffado-2.2.1.fixed/tests/test-pan.cpp
+--- libffado-2.2.1/tests/test-pan.cpp 2008-09-23 23:51:42.000000000 +0200
++++ libffado-2.2.1.fixed/tests/test-pan.cpp 2016-02-11 10:10:07.618935249
+0100
+@@ -27,6 +27,8 @@
+
+ #include "libieee1394/ieee1394service.h"
+
++#include <cerrno>
++
+ const bool bVerbose = false;
+
+ using namespace AVC;
+@@ -131,7 +133,7 @@
+ exit(0);
+ }
+
+- int errno = 0;
++ errno = 0;
+ char* tail;
+ int node_id = strtol( argv[1], &tail, 0 );
+ int fb_id = strtol( argv[2], &tail, 0 );
+diff -ru libffado-2.2.1/tests/test-volume.cpp
libffado-2.2.1.fixed/tests/test-volume.cpp
+--- libffado-2.2.1/tests/test-volume.cpp 2008-05-05 23:29:40.000000000
+0200
++++ libffado-2.2.1.fixed/tests/test-volume.cpp 2016-02-11 10:11:13.669109508
+0100
+@@ -27,6 +27,8 @@
+
+ #include "libieee1394/ieee1394service.h"
+
++#include <cerrno>
++
+ const bool bVerbose = false;
+
+ using namespace AVC;
+@@ -127,7 +129,7 @@
+ exit(0);
+ }
+
+- int errno = 0;
++ errno = 0;
+ char* tail;
+ int node_id = strtol( argv[1], &tail, 0 );
+ int fb_id = strtol( argv[2], &tail, 0 );
diff --git a/audio-drivers/libffado/libffado-atomic_ops.patch
b/audio-drivers/libffado/libffado-atomic_ops.patch
deleted file mode 100644
index f195119..0000000
--- a/audio-drivers/libffado/libffado-atomic_ops.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-Index: src/libieee1394/CycleTimerHelper.cpp
-===================================================================
---- src/libieee1394/CycleTimerHelper.cpp (Revision 1319)
-+++ src/libieee1394/CycleTimerHelper.cpp (Arbeitskopie)
-@@ -27,7 +27,6 @@
- #include "ieee1394service.h"
- #include "libutil/PosixThread.h"
- #include "libutil/PosixMutex.h"
--#include "libutil/Atomic.h"
- #include "libutil/Watchdog.h"
-
- #define DLL_PI (3.141592653589793238)
-Index: src/libieee1394/IsoHandlerManager.cpp
-===================================================================
---- src/libieee1394/IsoHandlerManager.cpp (Revision 1319)
-+++ src/libieee1394/IsoHandlerManager.cpp (Arbeitskopie)
-@@ -27,7 +27,7 @@
- #include "cycletimer.h"
- #include "libstreaming/generic/StreamProcessor.h"
-
--#include "libutil/Atomic.h"
-+#include <atomic_ops.h>
- #include "libutil/PosixThread.h"
- #include "libutil/SystemTimeSource.h"
- #include "libutil/Watchdog.h"
-@@ -82,7 +82,7 @@
- IsoTask::requestShadowMapUpdate()
- {
- debugOutput(DEBUG_LEVEL_VERBOSE, "(%p) enter\n", this);
-- INC_ATOMIC(&request_update);
-+ AO_fetch_and_add1(&request_update);
-
- // get the thread going again
- signalActivity();
-@@ -227,7 +227,7 @@
- // if some other thread requested a shadow map update, do it
- if(request_update) {
- updateShadowMapHelper();
-- DEC_ATOMIC(&request_update); // ack the update
-+ AO_fetch_and_sub1(&request_update); // ack the update
- assert(request_update >= 0);
- }
-
-Index: src/libieee1394/IsoHandlerManager.h
-===================================================================
---- src/libieee1394/IsoHandlerManager.h (Revision 1319)
-+++ src/libieee1394/IsoHandlerManager.h (Arbeitskopie)
-@@ -31,6 +31,7 @@
-
- #include "IsoHandler.h"
-
-+#include <atomic_ops.h>
- #include <sys/poll.h>
- #include <errno.h>
- #include <vector>
-@@ -94,7 +95,7 @@
- IsoHandlerManager& m_manager;
-
- // the event request structure
-- int32_t request_update;
-+ AO_t request_update;
-
- // static allocation due to RT constraints
- // this is the map used by the actual thread
-Index: src/libstreaming/generic/StreamProcessor.cpp
-===================================================================
---- src/libstreaming/generic/StreamProcessor.cpp (Revision 1319)
-+++ src/libstreaming/generic/StreamProcessor.cpp (Arbeitskopie)
-@@ -34,8 +34,6 @@
-
- #include "libutil/Time.h"
-
--#include "libutil/Atomic.h"
--
- #include <assert.h>
- #include <math.h>
-
-Index: src/libutil/Thread.h
-===================================================================
---- src/libutil/Thread.h (Revision 1319)
-+++ src/libutil/Thread.h (Arbeitskopie)
-@@ -53,7 +53,6 @@
-
- #include "../debugmodule/debugmodule.h"
-
--#include "Atomic.h"
- #include <pthread.h>
- #include <string>
-
-Index: src/libutil/TimestampedBuffer.cpp
-===================================================================
---- src/libutil/TimestampedBuffer.cpp (Revision 1319)
-+++ src/libutil/TimestampedBuffer.cpp (Arbeitskopie)
-@@ -23,7 +23,6 @@
-
- #include "config.h"
-
--#include "libutil/Atomic.h"
- #include "libieee1394/cycletimer.h"
-
- #include "TimestampedBuffer.h"
diff --git a/devel/python3/HISTORY b/devel/python3/HISTORY
index 2e9945a..c128eaa 100644
--- a/devel/python3/HISTORY
+++ b/devel/python3/HISTORY
@@ -1,3 +1,7 @@
+2016-02-11 Thomas Orgis <sobukus AT sourcemage.org>
+ * INSTALL: Add another symlink to python3.5m-config to make the
+ python3-config one to python3.5-config not danging.
+
2015-12-07 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: updated spell to 3.5.1
* PRE_BUILD: added to force gcc's builtin atomics
diff --git a/devel/python3/INSTALL b/devel/python3/INSTALL
index 852c1f0..7895fda 100755
--- a/devel/python3/INSTALL
+++ b/devel/python3/INSTALL
@@ -10,6 +10,10 @@ local PV=`echo ${VERSION}|cut -d . -f 1,2` &&
# symlinks, as they are not created with altinstall.
# See https://mail.python.org/pipermail/python-dev/2011-March/108971.html
# and the surrounding thread for fun.
+# Sometimes you got python3.5m-config, but not python3.5-config.
+if test -e "$INSTALL_ROOT/usr/bin/python${PV}m-config"; then
+ ln -sf python${PV}m-config "$INSTALL_ROOT/usr/bin/python$PV-config"
+fi &&
ln -sf python$PV "$INSTALL_ROOT/usr/bin/python3" &&
ln -sf python$PV-config "$INSTALL_ROOT/usr/bin/python3-config" &&

diff --git a/gnome2-libs/atkmm/DETAILS b/gnome2-libs/atkmm/DETAILS
index 95957a9..0cc9ee4 100755
--- a/gnome2-libs/atkmm/DETAILS
+++ b/gnome2-libs/atkmm/DETAILS
@@ -1,10 +1,10 @@
SPELL=atkmm
- VERSION=2.22.6
+ VERSION=2.24.2
BRANCH=`echo $VERSION|cut -d . -f 1,2`
- SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
- SOURCE_GPG=gurus.gpg:$SOURCE.sig
+
SOURCE_HASH=sha512:427714cdf3b10e3f9bc36df09c4b05608d295f5895fb1e079b9bd84afdf7bf1cfdec6794ced7f1e35bd430b76f87792df4ee63c515071a2ea6e3e51e672cdbe2
LICENSE[0]=LGPL
WEB_SITE=http://library.gnome.org/devel/atkmm/
ENTERED=20101022
diff --git a/gnome2-libs/atkmm/HISTORY b/gnome2-libs/atkmm/HISTORY
index fe3b45f..ca3971d 100644
--- a/gnome2-libs/atkmm/HISTORY
+++ b/gnome2-libs/atkmm/HISTORY
@@ -1,3 +1,6 @@
+2016-02-11 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: update to 2.24.2 (old one fails with modern C++)
+
2011-10-29 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.22.6

diff --git a/gnome2-libs/pangomm/DETAILS b/gnome2-libs/pangomm/DETAILS
index c012af6..3fc22f8 100755
--- a/gnome2-libs/pangomm/DETAILS
+++ b/gnome2-libs/pangomm/DETAILS
@@ -1,8 +1,8 @@
SPELL=pangomm
- VERSION=2.34.0
+ VERSION=2.38.1
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/${VERSION%.*}/$SOURCE
-
SOURCE_HASH=sha512:d8fddf52189da99a56289e3e1aa0579da2b48a62ffd00981db9da505ebc03a734c67151d8f4f3ca85dcd47c79218cdf503f23b8e69074fe99c052596320c8309
+
SOURCE_HASH=sha512:0f25df2df46f4ec4c3dc2c82f6f26bf1a21928eef3dac8ccf314294eaf0bc68d1a8a2cd8e82a0466f1130212365a852b1aabede576a2e75417bc8acdbb7bb286
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.gtkmm.org/
LICENSE[0]=LGPL
diff --git a/gnome2-libs/pangomm/HISTORY b/gnome2-libs/pangomm/HISTORY
index 33bc1e7..968409b 100644
--- a/gnome2-libs/pangomm/HISTORY
+++ b/gnome2-libs/pangomm/HISTORY
@@ -1,3 +1,6 @@
+2016-02-10 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: version 2.38.1 (to make it build again …)
+
2015-01-09 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 2.34.0

diff --git a/libs/libxml++/DETAILS b/libs/libxml++/DETAILS
index 8803e46..c27368b 100755
--- a/libs/libxml++/DETAILS
+++ b/libs/libxml++/DETAILS
@@ -1,6 +1,6 @@
SPELL=libxml++
- VERSION=2.38.1
-
SOURCE_HASH=sha512:d60f283ca2a056bf81fd6083c10dd9d469bb62dcb06ded9ea3549bc1d0053ed14f47bd86394761825f69d9d0f3a02781f1fd121244b9ce8f9637ad21e0d177f8
+ VERSION=2.40.1
+
SOURCE_HASH=sha256:4ad4abdd3258874f61c2e2a41d08e9930677976d303653cd1670d3e9f35463e9:UPSTREAM_HASH
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/libs/libxml++/HISTORY b/libs/libxml++/HISTORY
index b36158d..17def81 100644
--- a/libs/libxml++/HISTORY
+++ b/libs/libxml++/HISTORY
@@ -1,3 +1,7 @@
+2016-02-11 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: version 2.40.1, C++11-aware
+ (current 3.0.0 breaks API for dependent spells)
+
2015-06-16 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.38.1

diff --git a/utils/dbus-c++/BUILD b/utils/dbus-c++/BUILD
new file mode 100755
index 0000000..e6fd0a7
--- /dev/null
+++ b/utils/dbus-c++/BUILD
@@ -0,0 +1,2 @@
+CXXFLAGS+=" -std=c++11" &&
+default_build
diff --git a/utils/dbus-c++/DEPENDS b/utils/dbus-c++/DEPENDS
index 663c953..e485c05 100755
--- a/utils/dbus-c++/DEPENDS
+++ b/utils/dbus-c++/DEPENDS
@@ -1,7 +1,3 @@
-# Sorcery tells me that I please install git ...
-# why doesn't it just do it?
-# I need to discuss with SMGL folks.
-depends git &&
depends -sub CXX gcc &&
depends dbus &&
depends expat &&
@@ -11,8 +7,11 @@ optional_depends glib2 \
"--disable-glib" \
"Enable glib support?" &&

-# Not optional anymore, I presume? The configure bails out without.
-#depends ecore &&
+if is_depends_enabled $SPELL glib2; then
+ optional_depends gtkmm2 "" "" \
+ "also bind to gtkmm2 -- will be used if found anyway"
+fi &&
+
optional_depends ecore \
"--enable-ecore" \
"--disable-ecore" \
diff --git a/utils/dbus-c++/HISTORY b/utils/dbus-c++/HISTORY
index 8b49926..c76fdc0 100644
--- a/utils/dbus-c++/HISTORY
+++ b/utils/dbus-c++/HISTORY
@@ -1,3 +1,7 @@
+2016-02-11 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: C++11 mode needed for glibmm
+ * DEPENDS: cleanup, mention gtkmm2
+
2015-08-20 Thomas Orgis <sobukus AT sourcemage.org>
* PRE_BUILD, 05_fix_glibmm_ftbfs.patch: another patch from debian,
fixing build with glibmm
diff --git a/x11-toolkits/gtkmm2/BUILD b/x11-toolkits/gtkmm2/BUILD
index b8dcbcd..5ca9d8c 100755
--- a/x11-toolkits/gtkmm2/BUILD
+++ b/x11-toolkits/gtkmm2/BUILD
@@ -1,3 +1,3 @@
OPTS="$GTKMM2_OPTS $OPTS" &&
-
+CXXFLAGS+=" -std=c++11" &&
default_build
diff --git a/x11-toolkits/gtkmm2/HISTORY b/x11-toolkits/gtkmm2/HISTORY
index ee62ec7..62ac58a 100644
--- a/x11-toolkits/gtkmm2/HISTORY
+++ b/x11-toolkits/gtkmm2/HISTORY
@@ -1,3 +1,6 @@
+2016-02-10 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: fix build with recent glibmm, needs C++11
+
2013-07-02 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 2.24.4 (fixes bugged 2.24.3 release)
See https://bugs.launchpad.net/inkscape/+bug/1171147



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (3dbac1b2280c7c44956f2634b09d579241877701), Thomas Orgis, 02/13/2016

Archive powered by MHonArc 2.6.24.

Top of Page