Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (cf5f25f72399a547581485424a51131b727787f3)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (cf5f25f72399a547581485424a51131b727787f3)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (cf5f25f72399a547581485424a51131b727787f3)
  • Date: Tue, 24 Mar 2015 11:30:49 -0500
GIT changes to stable-0.62 grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

crypto/cryptsetup-luks/BUILD
| 13 +
crypto/cryptsetup-luks/HISTORY
| 8 +

mail/thunderbird/0001-remove-version-number-from-thunderbird-s-installatio.patch
| 59 ++------
mail/thunderbird/0002-1f10a8067853.patch
| 67 ++++++++++
mail/thunderbird/BUILD
| 4
mail/thunderbird/DEPENDS
| 17 +-
mail/thunderbird/DETAILS
| 2
mail/thunderbird/HISTORY
| 4
mail/thunderbird/PRE_BUILD
| 3
perl-cpan/term-readline-gnu/DETAILS
| 4
perl-cpan/term-readline-gnu/HISTORY
| 3
11 files changed, 132 insertions(+), 52 deletions(-)

New commits:
commit cf5f25f72399a547581485424a51131b727787f3
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

cryptsetup-luks: no exporting

(cherry picked from commit 06b8d029588cb4161d1b94798fe6f771e167f2b0)

commit b44bbaaff9e3270aacd5146e2cf96465126c8828
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

cryptsetup-luks: hotfix for -lpthread

(cherry picked from commit 18abefec0e2d1f8b192ce0fb55b1f53f6d3bdf01)

commit 31a549dc9edc055aa2d41d0f03ae8b547dd3f576
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

term-readline-gnu: update to 1.26

(cherry picked from commit 24cc00a5c683738ae0730f87a414477c4b0593a6)

commit fffde514695c76e612725fac0f25489350f55099
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

thunderbird: bump to 31.2.0

(cherry picked from commit 6c1d6d93d7566d3186eaf9cd43d39aaf90bdd405)

diff --git a/crypto/cryptsetup-luks/BUILD b/crypto/cryptsetup-luks/BUILD
index e12c3c3..0ee74e3 100755
--- a/crypto/cryptsetup-luks/BUILD
+++ b/crypto/cryptsetup-luks/BUILD
@@ -1,3 +1,16 @@
# Installs both dynamic and static binaries.
OPTS="$OPTS --enable-static-cryptsetup" &&
+# Kindof a hotfix: Open question if rather libgcrypt or libgpg-error should
+# pull in libpthread. Really not sure, as it's not always needed.
+# Or is it a gcc issue?
+# /usr/src/gcc-4.9.2.bld/x86_64-pc-linux-gnu/libgcc/./gthr-default.h:778:
undefined reference to `pthread_mutex_unlock'
+#
/usr/lib/gcc/x86_64-pc-linux-gnu/4.9.2/libgcc_eh.a(unwind-dw2-fde-dip.o):/usr/src/gcc-4.9.2.bld/x86_64-pc-linux-gnu/libgcc/./gthr-default.h:778:
more undefined references to `pthread_mutex_unlock' follow
+# /usr/lib/libgcrypt.a(libgcrypt_la-ath.o): In function
`_gcry_ath_mutex_lock':
+# /usr/src/libgcrypt-1.6.3/src/ath.c:338: undefined reference to
`pthread_mutex_lock'
+# /usr/lib/libgcrypt.a(libgcrypt_la-ath.o): In function
`_gcry_ath_mutex_unlock':
+# /usr/src/libgcrypt-1.6.3/src/ath.c:385: undefined reference to
`pthread_mutex_unlock'
+# collect2: error: ld returned 1 exit status
+# Makefile:625: recipe for target 'cryptsetup.static' failed
+# Having this essential tool build is so important that a hotfix is
justified.
+LIBS="$LIBS -lpthread" \
default_build
diff --git a/crypto/cryptsetup-luks/HISTORY b/crypto/cryptsetup-luks/HISTORY
index a32877e..a7c5dfd 100644
--- a/crypto/cryptsetup-luks/HISTORY
+++ b/crypto/cryptsetup-luks/HISTORY
@@ -1,3 +1,11 @@
+2015-03-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: Do not export LIBS to the world.
+
+2015-03-21 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: Ensure that libpthread is linked in. This is a dirty hotfix,
+ as I do not know yet what circumstance really triggers this. A
suspect
+ is as-needed.
+
2015-02-09 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: update to 1.6.6, from kernel.org now
Hash is out of autosigned upstream file. Not using the upstream
diff --git
a/mail/thunderbird/0001-remove-version-number-from-thunderbird-s-installatio.patch

b/mail/thunderbird/0001-remove-version-number-from-thunderbird-s-installatio.patch
index 5b1b2ae..d78340c 100644
---
a/mail/thunderbird/0001-remove-version-number-from-thunderbird-s-installatio.patch
+++
b/mail/thunderbird/0001-remove-version-number-from-thunderbird-s-installatio.patch
@@ -1,21 +1,7 @@
-From 3509f66d1881194da6dacfba7bb592ee7d13b5f0 Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
-Date: Thu, 12 Dec 2013 23:27:13 +0100
-Subject: [PATCH] remove version number from thunderbird's installation path
-
----
- config/baseconfig.mk | 8 ++++----
- mozilla/config/baseconfig.mk | 8 ++++----
- mozilla/js/src/config/baseconfig.mk | 4 ++--
- 3 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/config/baseconfig.mk b/config/baseconfig.mk
-index 636b9aa..fe36c48 100644
---- a/config/baseconfig.mk
-+++ b/config/baseconfig.mk
-@@ -1,9 +1,9 @@
- INCLUDED_AUTOCONF_MK = 1
-
+diff -ruN comm-esr31.orig/config/baseconfig.mk
comm-esr31/config/baseconfig.mk
+--- comm-esr31.orig/config/baseconfig.mk 2014-10-12 21:23:01.000000000
+0200
++++ comm-esr31/config/baseconfig.mk 2014-10-15 13:56:25.169485845 +0200
+@@ -1,7 +1,7 @@
-includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
@@ -27,13 +13,13 @@ index 636b9aa..fe36c48 100644
MOZILLA_SRCDIR = $(topsrcdir)/mozilla
MOZDEPTH = $(DEPTH)/mozilla
DIST = $(MOZDEPTH)/dist
-diff --git a/mozilla/config/baseconfig.mk b/mozilla/config/baseconfig.mk
-index ae69bae..c452e84 100644
---- a/mozilla/config/baseconfig.mk
-+++ b/mozilla/config/baseconfig.mk
-@@ -1,9 +1,9 @@
- INCLUDED_AUTOCONF_MK = 1
-
+diff -ruN comm-esr31.orig/mozilla/config/baseconfig.mk
comm-esr31/mozilla/config/baseconfig.mk
+--- comm-esr31.orig/mozilla/config/baseconfig.mk 2014-10-12
21:30:42.000000000 +0200
++++ comm-esr31/mozilla/config/baseconfig.mk 2014-10-15 13:56:54.937487157
+0200
+@@ -2,10 +2,10 @@
+ # directly in python/mozbuild/mozbuild/base.py for gmake validation.
+ # We thus use INCLUDED_AUTOCONF_MK to enable/disable some parts depending
+ # whether a normal build is happening or whether the check is running.
-includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
@@ -42,23 +28,6 @@ index ae69bae..c452e84 100644
+idldir = $(datadir)/idl/$(MOZ_APP_NAME)
+installdir = $(libdir)/$(MOZ_APP_NAME)
+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
- DIST = $(DEPTH)/dist
-
- # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
-diff --git a/mozilla/js/src/config/baseconfig.mk
b/mozilla/js/src/config/baseconfig.mk
-index 6ca9f60..9262ac1 100644
---- a/mozilla/js/src/config/baseconfig.mk
-+++ b/mozilla/js/src/config/baseconfig.mk
-@@ -1,7 +1,7 @@
- INCLUDED_AUTOCONF_MK = 1
-
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+installdir = $(libdir)/$(MOZ_APP_NAME)
-+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
-
- ifneq (,$(filter /%,$(TOP_DIST)))
- DIST = $(TOP_DIST)
---
-1.8.5.1
-
+ ifndef TOP_DIST
+ TOP_DIST = dist
+ endif
diff --git a/mail/thunderbird/0002-1f10a8067853.patch
b/mail/thunderbird/0002-1f10a8067853.patch
new file mode 100644
index 0000000..abb9671
--- /dev/null
+++ b/mail/thunderbird/0002-1f10a8067853.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/mail/thunderbird/BUILD b/mail/thunderbird/BUILD
index 50f9798..9720651 100755
--- a/mail/thunderbird/BUILD
+++ b/mail/thunderbird/BUILD
@@ -29,5 +29,9 @@ for option in $OPTS; do
done &&

make_single &&
+# A frivolous hack to fix that:
+# OSError: [Errno 2] No such file or
+# directory:
'/usr/src/thunderbird-31.2.0/comm-esr31/mozilla/thunderbird-build'
+ln -sf ../thunderbird-build mozilla/
make -f client.mk build &&
make_normal
diff --git a/mail/thunderbird/DEPENDS b/mail/thunderbird/DEPENDS
index b88876f..a8c929f 100755
--- a/mail/thunderbird/DEPENDS
+++ b/mail/thunderbird/DEPENDS
@@ -25,11 +25,12 @@ depends zip &&
depends zlib '--with-system-zlib' &&

# LDAP support doesn't work (fails to build)
+# Let's try again.
#
-#optional_depends openldap \
-# "--enable-ldap" \
-# "--disable-ldap" \
-# "for LDAP support" &&
+optional_depends openldap \
+ "--enable-ldap" \
+ "--disable-ldap" \
+ "for LDAP support" &&

optional_depends gnome-vfs2 \
"--enable-gnomevfs" \
@@ -91,3 +92,11 @@ optional_depends gstreamer \
'--enable-gstreamer' \
'--disable-gstreamer' \
'for gstreamer based AV support'
+
+# Auto detection now means: Unless you explicitly specified
+# --disable-pulseaudio when it's not present, the configure script will
+# place a burning dog turd on your doorstep.
+optional_depends pulseaudio \
+ --enable-pulseaudio \
+ --disable-pulseaudio \
+ 'for pulseaudio support'
diff --git a/mail/thunderbird/DETAILS b/mail/thunderbird/DETAILS
index 609f0c7..0e20ec9 100755
--- a/mail/thunderbird/DETAILS
+++ b/mail/thunderbird/DETAILS
@@ -1,5 +1,5 @@
SPELL=thunderbird
- VERSION=24.5.0
+ VERSION=31.2.0
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG="mozilla.gpg:${SOURCE2}:UPSTREAM_HASH"
diff --git a/mail/thunderbird/HISTORY b/mail/thunderbird/HISTORY
index 726b773..df866f7 100644
--- a/mail/thunderbird/HISTORY
+++ b/mail/thunderbird/HISTORY
@@ -1,3 +1,7 @@
+2014-10-15 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: version 31.2.0
+ * 0001*.patch: adapted (no js/src/baseconfig.mk anymore)
+
2014-09-25 Remko van der Vossen <wich AT sourcemage.org>
* DEPENDS: missing depends

diff --git a/mail/thunderbird/PRE_BUILD b/mail/thunderbird/PRE_BUILD
index 130bf54..63c259e 100755
--- a/mail/thunderbird/PRE_BUILD
+++ b/mail/thunderbird/PRE_BUILD
@@ -14,3 +14,6 @@ fi &&
if [[ $THUNDERBIRD_OFFICIAL == y ]]; then
sed -i '27iac_add_options --enable-official-branding' .mozconfig || return
1
fi
+
+cd mozilla &&
+patch -p1 < $SPELL_DIRECTORY/0002-1f10a8067853.patch
diff --git a/perl-cpan/term-readline-gnu/DETAILS
b/perl-cpan/term-readline-gnu/DETAILS
index 4207b85e..5a55ff9 100755
--- a/perl-cpan/term-readline-gnu/DETAILS
+++ b/perl-cpan/term-readline-gnu/DETAILS
@@ -1,6 +1,6 @@
SPELL=term-readline-gnu
- VERSION=1.19
-
SOURCE_HASH=sha512:1cee742616d4aad21aed3b20aac46dfdf3adf77e18a30269f84074cf1394381dac1dc620347e99ee7430345597806cac4561e394a6a1ce83e89ec70cf7c99ac8
+ VERSION=1.26
+
SOURCE_HASH=sha512:80fe97f857b585d96b3a888d0a49d777a5b9865cc2101e43dd5916d09343d0964710c49d94b4533cce8a4a2b0770ebc4ce3c2e36fd0624b7d9ccf2318240dfed
SOURCE=Term-ReadLine-Gnu-$VERSION.tar.gz
# Check that on next update again!
SOURCE_DIRECTORY=$BUILD_DIRECTORY/Term-ReadLine-Gnu-$VERSION
diff --git a/perl-cpan/term-readline-gnu/HISTORY
b/perl-cpan/term-readline-gnu/HISTORY
index dc70116..04e8ebb 100644
--- a/perl-cpan/term-readline-gnu/HISTORY
+++ b/perl-cpan/term-readline-gnu/HISTORY
@@ -1,3 +1,6 @@
+2015-02-09 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: updated spell to 1.26
+
2009-06-10 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.19



  • [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (cf5f25f72399a547581485424a51131b727787f3), Vlad Glagolev, 03/24/2015

Archive powered by MHonArc 2.6.24.

Top of Page