Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (4fbe6e4c586cfb2d2041b8e0066c2d676d956b2f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (4fbe6e4c586cfb2d2041b8e0066c2d676d956b2f)
  • Date: Wed, 6 May 2015 10:35:04 -0500

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

ChangeLog | 4 ++++
dev/null |binary
net/libnice/DETAILS | 4 ++--
net/libnice/HISTORY | 3 +++
telephony/farstream/DEPENDS | 12 +-----------
telephony/farstream/DETAILS | 2 +-
telephony/farstream/HISTORY | 5 +++++
telephony/telepathy-farstream/DEPENDS | 5 ++++-
telephony/telepathy-farstream/DETAILS | 2 +-
telephony/telepathy-farstream/HISTORY | 4 ++++
telephony/telepathy-qt/BUILD | 6 ++++--
telephony/telepathy-qt/DEPENDS | 24 +++++++++++++++++-------
telephony/telepathy-qt/DETAILS | 17 ++++++++---------
telephony/telepathy-qt/HISTORY | 10 ++++++++++
telephony/telepathy-qt/PRE_BUILD | 9 ++++++---
telephony/telepathy-qt/qt55.diff | 12 ++++++++++++
telephony/telepathy.gpg |binary
17 files changed, 82 insertions(+), 37 deletions(-)

New commits:
commit 4fbe6e4c586cfb2d2041b8e0066c2d676d956b2f
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

update telepathy/telepathy.gpg

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

telepathy-farstream: => 0.6.2

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

farstream: => 0.2.7

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

libnice: => 0.1.13

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

telepathy-qt: => 0.9.5

diff --git a/ChangeLog b/ChangeLog
index 2c2d4e0..67bdd5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,10 @@
2015-04-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* graphics-libs/glfw: new spell, an event loop for OpenGL contexts

+2015-04-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * telepathy/telepathy.gpg: update
+ add C74E02CF "David Edmundson" <davidedmundson AT kde.org>
+
2015-04-29 Treeve Jelbert <treeve AT sourcemage.org>
* FUNCTIONS: fix qt5_build

diff --git a/net/libnice/DETAILS b/net/libnice/DETAILS
index f10923c..bcffb4c 100755
--- a/net/libnice/DETAILS
+++ b/net/libnice/DETAILS
@@ -1,8 +1,8 @@
SPELL=libnice
- VERSION=0.1.3
+ VERSION=0.1.13
+
SOURCE_HASH=sha512:c9bb81e8cd0b4e3673dba07ce08a16dd8821831339b44f1006510cdc09f9ae4c6eb7d43230711a2509867acb8d7df71821c411830dbf71c5a5d7e802f14a32c1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
SOURCE_URL[0]=http://nice.freedesktop.org/releases/$SOURCE
WEB_SITE=http://nice.freedesktop.org/
LICENSE[0]=GPL
diff --git a/net/libnice/HISTORY b/net/libnice/HISTORY
index 7b5942e..4e59018 100644
--- a/net/libnice/HISTORY
+++ b/net/libnice/HISTORY
@@ -1,3 +1,6 @@
+2015/05-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.1.13
+
2013-02-17 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 0.1.3

diff --git a/net/libnice/libnice-0.1.3.tar.gz.sig
b/net/libnice/libnice-0.1.3.tar.gz.sig
deleted file mode 100644
index 2206152..0000000
Binary files a/net/libnice/libnice-0.1.3.tar.gz.sig and /dev/null differ
diff --git a/telephony/farstream/DEPENDS b/telephony/farstream/DEPENDS
index 79b5587..f6d08ca 100755
--- a/telephony/farstream/DEPENDS
+++ b/telephony/farstream/DEPENDS
@@ -1,16 +1,6 @@
-depends gstreamer &&
+depends gstreamer-1.0 &&
depends libnice &&

-optional_depends python \
- "--enable-python" \
- "--disable-python" \
- "for Python bindings" &&
-
-if is_depends_enabled $SPELL python; then
- depends pygobject &&
- depends gst-python
-fi &&
-
optional_depends gobject-introspection \
"--enable-introspection --enable-gobject-cast-checks" \
"--disable-introspection --disable-gobject-cast-checks" \
diff --git a/telephony/farstream/DETAILS b/telephony/farstream/DETAILS
index a49b772..a370c5a 100755
--- a/telephony/farstream/DETAILS
+++ b/telephony/farstream/DETAILS
@@ -1,5 +1,5 @@
SPELL=farstream
- VERSION=0.2.2
+ VERSION=0.2.7
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
WEB_SITE=http://www.freedesktop.org/wiki/Software/Farstream
diff --git a/telephony/farstream/HISTORY b/telephony/farstream/HISTORY
index a5dd153..8ff4669 100644
--- a/telephony/farstream/HISTORY
+++ b/telephony/farstream/HISTORY
@@ -1,3 +1,8 @@
+2015-05-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.2.7
+ * DEPENDS: use gstreamer-1.0
+ delete python stuff
+
2013-02-17 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 0.2.2
* DEPENDS: added new optional depends
diff --git a/telephony/telepathy-farstream/DEPENDS
b/telephony/telepathy-farstream/DEPENDS
index 2c10f68..a16f5fd 100755
--- a/telephony/telepathy-farstream/DEPENDS
+++ b/telephony/telepathy-farstream/DEPENDS
@@ -1,4 +1,7 @@
-depends farstream
+depends dbus &&
+depends farstream &&
+depends glib2 &&
+depends telepathy-glib &&

optional_depends gobject-introspection \
"--enable-introspection" \
diff --git a/telephony/telepathy-farstream/DETAILS
b/telephony/telepathy-farstream/DETAILS
index 78beb1a..2543b35 100755
--- a/telephony/telepathy-farstream/DETAILS
+++ b/telephony/telepathy-farstream/DETAILS
@@ -1,5 +1,5 @@
SPELL=telepathy-farstream
- VERSION=0.6.0
+ VERSION=0.6.2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/telephony/telepathy-farstream/HISTORY
b/telephony/telepathy-farstream/HISTORY
index b23abc5..8cf3717 100644
--- a/telephony/telepathy-farstream/HISTORY
+++ b/telephony/telepathy-farstream/HISTORY
@@ -1,3 +1,7 @@
+2015-05-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.6.2
+ * DEPEDNS: add telepathy-glib, dbus, glib2
+
2013-02-17 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 0.6.0
* DEPENDS: added new optional depends
diff --git a/telephony/telepathy-qt/BUILD b/telephony/telepathy-qt/BUILD
index 23b8f8e..935797b 100755
--- a/telephony/telepathy-qt/BUILD
+++ b/telephony/telepathy-qt/BUILD
@@ -1,2 +1,4 @@
-PATH=/usr/bin/qt4/:$PATH &&
-default_build
+CXXFLAGS+=' -Wno-cpp' &&
+OPTS+=" -DENABLE_EXAMPLES=0 -DENABLE_TESTS=0" &&
+PYTHON=/usr/bin/python2.7 &&
+qt5_cmake_build
diff --git a/telephony/telepathy-qt/DEPENDS b/telephony/telepathy-qt/DEPENDS
index 7932e84..0de7d26 100755
--- a/telephony/telepathy-qt/DEPENDS
+++ b/telephony/telepathy-qt/DEPENDS
@@ -1,11 +1,21 @@
if [[ $TELQT_SVN == y ]];then
- depends git &&
- depends libtool
+ depends git
fi &&
depends pkgconfig &&
-depends -sub DBUS qt4 &&
-depends python &&
+depends cmake &&
+depends qtbase &&
+depends qttools &&
+depends python &&
depends SSL &&
-optional_depends telepathy-glib '' '' 'glib integration' &&
-optional_depends telepathy-farsight '' '' 'for the VOIP UI' &&
-optional_depends gstreamer '' '' 'for the VOIP UI'
+optional_depends telepathy-farstream '' '-DENABLE_FARSTREAM=0' 'for the VOIP
UI' &&
+if is_depends_enabled $SPELL telepathy-farstream;then
+ depends dbus &&
+ depends farstream &&
+ depends glib2 &&
+ depends gstreamer-1.0 &&
+ depends libxml2 &&
+ depends telepathy-glib
+
+fi &&
+optional_depends doxygen '' '' 'build documentation' &&
+optional_depends dbus-python '' '' ''
diff --git a/telephony/telepathy-qt/DETAILS b/telephony/telepathy-qt/DETAILS
index 6b7e66d..ac3fa68 100755
--- a/telephony/telepathy-qt/DETAILS
+++ b/telephony/telepathy-qt/DETAILS
@@ -1,27 +1,26 @@
SPELL=telepathy-qt
- SPELLX=telepathy-qt4
WEB_SITE=http://telepathy.freedesktop.org
if [[ $TELQT_SVN == y ]];then
VERSION=git
SOURCE_IGNORE=volatile
- SOURCE=$SPELLX-$VERSION.tar.bz2
- SOURCE_URL[0]=git://git.collabora.co.uk/git/$SPELLX.git
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE_URL[0]=git://anongit.freedesktop.org/telepathy/telepathy-qt
FORCE_DOWNLOAD=on
else
- VERSION=0.3.7
- SOURCE=$SPELLX-$VERSION.tar.gz
+ VERSION=0.9.5
+ SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
- SOURCE_URL[0]=$WEB_SITE/releases/$SPELLX/$SOURCE
+ SOURCE_URL[0]=$WEB_SITE/releases/$SPELL/$SOURCE
SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
SOURCE_GPG=telepathy.gpg:$SOURCE.asc:UPSTREAM_KEY
SOURCE2_IGNORE=signature
fi
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
LICENSE[0]=LGPL
ENTERED=20070307
KEYWORDS="telepathy"
- SHORT="Qt4 connection managers"
+ SHORT="Qt connection managers"
cat << EOF
-telepathy-qt is a Qt4 package containing base classes for use in connection
+telepathy-qt is a Qt package containing base classes for use in connection
managers, and proxy classes for use in clients.
EOF
diff --git a/telephony/telepathy-qt/HISTORY b/telephony/telepathy-qt/HISTORY
index 97de1cb..d37c629 100644
--- a/telephony/telepathy-qt/HISTORY
+++ b/telephony/telepathy-qt/HISTORY
@@ -1,3 +1,13 @@
+2015-05-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.9.5
+ new git url
+ * DEPENDS: major rewrite
+ * BUILD: use qt5_cmake_build, disable examples & tests
+ * PRE_BUILD: added, fix find python2.7
+ apply patch for qt5.5
+ * qt55.diff:added
+ spell is now qt5 based
+
2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: openssl => SSL

diff --git a/telephony/telepathy-qt/PRE_BUILD
b/telephony/telepathy-qt/PRE_BUILD
index ab81d6d..5b81894 100755
--- a/telephony/telepathy-qt/PRE_BUILD
+++ b/telephony/telepathy-qt/PRE_BUILD
@@ -1,5 +1,8 @@
-default_pre_build &&
+default_pre_build &&
cd $SOURCE_DIRECTORY &&
-if [[ $TELQT_SVN == y ]];then
-./autogen.sh --no-configure
+sed -i -e '/cmake_min/s/2.6/3.0/;/find/s/PythonLibrary/PythonInterp 2.7/' \
+ -e '/REQUIRED_PY/,/SHORT/D' CMakeLists.txt
+# upstream patch for qt5.5
+if [[ $TELQT_SVN == n ]];then
+ patch -p1 < $SPELL_DIRECTORY/qt55.diff
fi
diff --git a/telephony/telepathy-qt/qt55.diff
b/telephony/telepathy-qt/qt55.diff
new file mode 100644
index 0000000..5cc048a
--- /dev/null
+++ b/telephony/telepathy-qt/qt55.diff
@@ -0,0 +1,12 @@
+diff --git a/TelepathyQt/readiness-helper.h b/TelepathyQt/readiness-helper.h
+index d570d17..fea4538 100644
+--- a/TelepathyQt/readiness-helper.h
++++ b/TelepathyQt/readiness-helper.h
+@@ -33,6 +33,7 @@
+ #include <QSet>
+ #include <QSharedDataPointer>
+ #include <QStringList>
++#include <QObject>
+
+ class QDBusError;
+
diff --git a/telephony/telepathy.gpg b/telephony/telepathy.gpg
index 54261dd..c61936e 100644
Binary files a/telephony/telepathy.gpg and b/telephony/telepathy.gpg differ



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (4fbe6e4c586cfb2d2041b8e0066c2d676d956b2f), Treeve Jelbert, 05/06/2015

Archive powered by MHonArc 2.6.24.

Top of Page