Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Thomas Orgis (1eb219791b2e53c7516dfb548e3edf086ab5bdca)

Chronological Thread  
    < 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 (1eb219791b2e53c7516dfb548e3edf086ab5bdca)
  • Date: Fri, 29 Aug 2014 02:56:45 -0500
GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

audio-drivers/jack2/DEPENDS | 1
audio-drivers/jack2/DETAILS | 6 +-
audio-drivers/jack2/HISTORY | 4 +
collab/subversion/DETAILS | 4 -
collab/subversion/HISTORY | 3 +
devel/pkgconfig/BUILD | 5 +
devel/pkgconfig/DEPENDS | 3 -
devel/pkgconfig/DETAILS | 7 --
devel/pkgconfig/HISTORY | 6 ++
gnome2-libs/glib2/DEPENDS | 5 -
gnome2-libs/glib2/HISTORY | 5 +
http/firefox/HISTORY | 3 +
http/firefox/PRE_BUILD | 5 +
http/firefox/bug999496_change1f10a8067853.patch | 67
++++++++++++++++++++++++
net/whois/DETAILS | 4 -
net/whois/HISTORY | 3 +
x11-libs/cairo/DEPENDS | 1
x11-libs/cairo/HISTORY | 3 +
18 files changed, 113 insertions(+), 22 deletions(-)

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

glib2: hard-depends on PYTHON to avoid the situation without any glib2
when INSTALL fails after removing old one ...

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

pkgconfig: Remove glib2 dependency, fixing things to version 0.28.

This duplicates a bit of binary code because pkgconfig now relies on
internal glib2, but this is necessary because glib2 itself depends
on pkgconfig to be built. At least, the pkg-config command should be
working if present. It does not if, because of another bug, the glib2
install fails and the glib2 .so is missing. You cannot install glib2
after that. Pkgconfig is basic enough to warrant some extra care with
external dependencies (which is why they include a copy of glib2 to
begin with, mind).

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

cairo: needs xextproto

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

whois: bump to 5.1.5 (source for 5.1.4 already pulled by upstream)

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

firefox: fix build with gcc-4.9 (on a core2 64 bit machine with PIC
CFLAGS, if
that matters ... did not need that on an Athlon II X3 machine
with
"native" archspecs)

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

jack2: depends on libsamplerate, also change scm option to git

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

subversion: bump to 1.8.10 (1.8.9 source already unavailable)

diff --git a/audio-drivers/jack2/DEPENDS b/audio-drivers/jack2/DEPENDS
index d3a94f7..ee59b70 100755
--- a/audio-drivers/jack2/DEPENDS
+++ b/audio-drivers/jack2/DEPENDS
@@ -2,6 +2,7 @@ depends pkgconfig &&
depends expat &&
depends -sub CXX gcc &&
depends python &&
+depends libsamplerate &&

if [[ $JACK2_BRANCH == scm ]]; then
depends subversion
diff --git a/audio-drivers/jack2/DETAILS b/audio-drivers/jack2/DETAILS
index e82467a..d6d4f22 100755
--- a/audio-drivers/jack2/DETAILS
+++ b/audio-drivers/jack2/DETAILS
@@ -4,11 +4,11 @@
WEB_SITE=http://jackaudio.org/
if [[ $JACK2_BRANCH == scm ]]; then
VERSION=$(get_scm_version)
- SOURCE=$SPELL-svn.tar.bz2
-
SOURCE_URL[0]=svn_http://subversion.jackaudio.org/jack/jack2/trunk/jackmp:jackdmp
+ SOURCE=$SPELL-git.tar.bz2
+ SOURCE_URL[0]=git://github.com/jackaudio/jack2.git
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=1
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
else
VERSION=1.9.10
SOURCE=$SPELLX-$VERSION.tar.bz2
diff --git a/audio-drivers/jack2/HISTORY b/audio-drivers/jack2/HISTORY
index 9549c96..db1667b 100644
--- a/audio-drivers/jack2/HISTORY
+++ b/audio-drivers/jack2/HISTORY
@@ -1,3 +1,7 @@
+2014-08-26 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: needs libsamplerate
+ * DETAILS: scm=git
+
2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: updated spell to 1.9.10

diff --git a/collab/subversion/DETAILS b/collab/subversion/DETAILS
index 121b2d6..684c209 100755
--- a/collab/subversion/DETAILS
+++ b/collab/subversion/DETAILS
@@ -1,6 +1,6 @@
SPELL=subversion
- VERSION=1.8.9
- SECURITY_PATCH=6
+ VERSION=1.8.10
+ SECURITY_PATCH=7
if [[ "$SVN_HEAD" == y ]]; then VERSION=${VERSION%.*}-HEAD; fi
SOURCE=$SPELL-$VERSION.tar.bz2
if [[ "$SVN_HEAD" == y ]]; then
diff --git a/collab/subversion/HISTORY b/collab/subversion/HISTORY
index 6039b82..fa042c1 100644
--- a/collab/subversion/HISTORY
+++ b/collab/subversion/HISTORY
@@ -1,3 +1,6 @@
+2014-08-27 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: version 1.8.10 ... They pulled the tarball already!
+
2014-05-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.8.9

diff --git a/devel/pkgconfig/BUILD b/devel/pkgconfig/BUILD
new file mode 100755
index 0000000..344ab34
--- /dev/null
+++ b/devel/pkgconfig/BUILD
@@ -0,0 +1,5 @@
+# Keep dependencies minimal: If for some reason glib2 is broken, it cannot
+# subsequently be built when pkg-config is also broken due to linking to
+# system glib2.
+OPTS="$OPTS --with-internal-glib" &&
+default_build
diff --git a/devel/pkgconfig/DEPENDS b/devel/pkgconfig/DEPENDS
deleted file mode 100755
index 329e0ab..0000000
--- a/devel/pkgconfig/DEPENDS
+++ /dev/null
@@ -1,3 +0,0 @@
-if [[ "$VERSION" != "0.25" ]]; then
- depends glib2
-fi
diff --git a/devel/pkgconfig/DETAILS b/devel/pkgconfig/DETAILS
index ff7cfdd..402a75f 100755
--- a/devel/pkgconfig/DETAILS
+++ b/devel/pkgconfig/DETAILS
@@ -1,13 +1,6 @@
SPELL=pkgconfig
-
-if spell_ok glib2; then
VERSION=0.28

SOURCE_HASH=sha512:6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320
- else
- VERSION=0.25
-
SOURCE_HASH=sha512:6c50ca542733feeb10301097ade32075c5417ada5bdd195957de8521a28b20e0e7a54ed553fa3e022b24969e9deb97d72e289192cb2a3afc2c86241dc6cafa02
-fi
-
SOURCE=pkg-config-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/pkg-config-$VERSION
SOURCE_URL[0]=http://www.freedesktop.org/software/$SPELL/releases/$SOURCE
diff --git a/devel/pkgconfig/HISTORY b/devel/pkgconfig/HISTORY
index c6d2105..bf759d5 100644
--- a/devel/pkgconfig/HISTORY
+++ b/devel/pkgconfig/HISTORY
@@ -1,3 +1,9 @@
+2014-08-27 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: fixed to version 0.28 now
+ * DEPENDS: gone, see below
+ * BUILD: enforcing use of internal glib2 to avoid vicious dependency
+ circle with such a basic tool (which is required to build glib2)
+
2013-07-24 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.28

diff --git a/gnome2-libs/glib2/DEPENDS b/gnome2-libs/glib2/DEPENDS
index 603c114..c2cb174 100755
--- a/gnome2-libs/glib2/DEPENDS
+++ b/gnome2-libs/glib2/DEPENDS
@@ -14,10 +14,7 @@ if ! spell_installed pkgconfig; then
fi &&

depends perl &&
-optional_depends PYTHON \
- "--enable-modular-tests" \
- "--disable-modular-tests" \
- "Perform post-build testing" &&
+depends PYTHON &&

if spell_ok $SPELL; then
optional_depends FAM \
diff --git a/gnome2-libs/glib2/HISTORY b/gnome2-libs/glib2/HISTORY
index 1212d78..324f1eb 100644
--- a/gnome2-libs/glib2/HISTORY
+++ b/gnome2-libs/glib2/HISTORY
@@ -1,3 +1,8 @@
+2014-08-28 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: some PYTHON is always needed now to avoid failure during
+ INSTALL (for a dbus codegen tool, also the modular-tests option
+ doesn't exist anymore)
+
2014-08-13 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: 2.41.2

diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index ecd97be..12e74b1 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,6 @@
+2014-08-28 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD, bug999496_change1f10a8067853.patch: fix build with gcc
4.9
+
2014-07-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS, BUILD, CONFIGURE, PRE_BUILD, Makefile.in-pgo.patch:
add option for profiled build
diff --git a/http/firefox/PRE_BUILD b/http/firefox/PRE_BUILD
index db7ca75..bb6aa37 100755
--- a/http/firefox/PRE_BUILD
+++ b/http/firefox/PRE_BUILD
@@ -27,4 +27,7 @@ fi &&
if [[ $FIREFOX_PGO == y ]]; then
echo "mk_add_options PROFILE_GEN_SCRIPT='\$(PYTHON)
\$(OBJDIR)/_profile/pgo/profileserver.py'" >> .mozconfig &&
patch -p0 < ${SPELL_DIRECTORY}/Makefile.in-pgo.patch
-fi
+fi &&
+# Fix from mozilla scm for gcc 4.9 build (weird missing symbol
+# / relocation error). Probably to be removed for version 32.
+patch -p1 < "$SCRIPT_DIRECTORY/bug999496_change1f10a8067853.patch"
diff --git a/http/firefox/bug999496_change1f10a8067853.patch
b/http/firefox/bug999496_change1f10a8067853.patch
new file mode 100644
index 0000000..abb9671
--- /dev/null
+++ b/http/firefox/bug999496_change1f10a8067853.patch
@@ -0,0 +1,67 @@
+
+# HG changeset patch
+# User Simon Wilper <sxw AT cpan.org>
+# Date 1400002680 -43200
+# Node ID 1f10a80678532ff186f314bb98050fd81f22a7fe
+# Parent a54ace627db8f12a9b2c5d3b60a675576887c445
+Bug 999496 - Move AudioData::SizeOfIncludingThis to MediaData.cpp. r=kinetik
+
+diff --git a/content/media/MediaData.cpp b/content/media/MediaData.cpp
+--- a/content/media/MediaData.cpp
++++ b/content/media/MediaData.cpp
+@@ -33,16 +33,26 @@ AudioData::EnsureAudioBuffer()
+ AudioDataValue* data = static_cast<AudioDataValue*>(mAudioBuffer->Data());
+ for (uint32_t i = 0; i < mFrames; ++i) {
+ for (uint32_t j = 0; j < mChannels; ++j) {
+ data[j*mFrames + i] = mAudioData[i*mChannels + j];
+ }
+ }
+ }
+
++size_t
++AudioData::SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const
++{
++ size_t size = aMallocSizeOf(this) + aMallocSizeOf(mAudioData);
++ if (mAudioBuffer) {
++ size += mAudioBuffer->SizeOfIncludingThis(aMallocSizeOf);
++ }
++ return size;
++}
++
+ static bool
+ ValidatePlane(const VideoData::YCbCrBuffer::Plane& aPlane)
+ {
+ return aPlane.mWidth <= PlanarYCbCrImage::MAX_DIMENSION &&
+ aPlane.mHeight <= PlanarYCbCrImage::MAX_DIMENSION &&
+ aPlane.mWidth * aPlane.mHeight < MAX_VIDEO_WIDTH *
MAX_VIDEO_HEIGHT &&
+ aPlane.mStride > 0;
+ }
+diff --git a/content/media/MediaData.h b/content/media/MediaData.h
+--- a/content/media/MediaData.h
++++ b/content/media/MediaData.h
+@@ -75,23 +75,17 @@ public:
+ MOZ_COUNT_CTOR(AudioData);
+ }
+
+ ~AudioData()
+ {
+ MOZ_COUNT_DTOR(AudioData);
+ }
+
+- size_t SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const {
+- size_t size = aMallocSizeOf(this) + aMallocSizeOf(mAudioData);
+- if (mAudioBuffer) {
+- size += mAudioBuffer->SizeOfIncludingThis(aMallocSizeOf);
+- }
+- return size;
+- }
++ size_t SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const;
+
+ // If mAudioBuffer is null, creates it from mAudioData.
+ void EnsureAudioBuffer();
+
+ const uint32_t mFrames;
+ const uint32_t mChannels;
+ // At least one of mAudioBuffer/mAudioData must be non-null.
+ // mChannels channels, each with mFrames frames
+
diff --git a/net/whois/DETAILS b/net/whois/DETAILS
index 73bc6da..38effc2 100755
--- a/net/whois/DETAILS
+++ b/net/whois/DETAILS
@@ -1,9 +1,9 @@
SPELL=whois
- VERSION=5.1.4
+ VERSION=5.1.5
SOURCE=${SPELL}_$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://ftp.debian.org/debian/pool/main/w/whois/$SOURCE
-
SOURCE_HASH=sha512:4eae6abb0a8bf2327e309797befebd0e306e0d96270d409e858e33441ce1ddbd63e75247240df92e6a9b5d03e4fc06329edb97a03821b8023884783b50e3b580
+
SOURCE_HASH=sha512:99fb43494aa7ff809055e31679eecb1d8a2a1276c54e550a9559cbca84c4ed7044953bf86f9f155e28f4a3c9d78f7c87ec28188f971c8f30e07d4ca5ef03c8eb
WEB_SITE=http://www.linux.it/~md/software/
ENTERED=20011228
LICENSE[0]=GPL
diff --git a/net/whois/HISTORY b/net/whois/HISTORY
index fccaf41..2e208f3 100644
--- a/net/whois/HISTORY
+++ b/net/whois/HISTORY
@@ -1,3 +1,6 @@
+2014-08-28 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: updated spell to 5.1.5
+
2014-07-10 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 5.1.4

diff --git a/x11-libs/cairo/DEPENDS b/x11-libs/cairo/DEPENDS
index b3063c6..2aed2de 100755
--- a/x11-libs/cairo/DEPENDS
+++ b/x11-libs/cairo/DEPENDS
@@ -36,6 +36,7 @@ optional_depends libx11 \
"for Xlib surface backend feature" &&

if is_depends_enabled $SPELL libx11; then
+ depends xextproto &&
optional_depends libxrender \
"--enable-xlib-xrender" \
"--disable-xlib-xrender" \
diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY
index 895ceb6..1b4b380 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -1,3 +1,6 @@
+2014-08-26 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: xextproto
+
2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
* PRE_BUILD, cairo-broken-lto-build.patch: a build fix, bad relocation



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (1eb219791b2e53c7516dfb548e3edf086ab5bdca), Thomas Orgis, 08/29/2014

Archive powered by MHonArc 2.6.24.

Top of Page