sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to devel-merge-kde4+plasma5+kde5 grimoire by Treeve Jelbert (8beb65518b1e100ee2ad127c12eae91930ed58c5)
- From: Treeve Jelbert <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to devel-merge-kde4+plasma5+kde5 grimoire by Treeve Jelbert (8beb65518b1e100ee2ad127c12eae91930ed58c5)
- Date: Thu, 7 May 2015 05:43:50 -0500
GIT changes to devel-merge-kde4+plasma5+kde5 grimoire by Treeve Jelbert
<treeve AT sourcemage.org>:
ChangeLog | 17 +++++
crypto/gnutls/DETAILS | 5 -
crypto/gnutls/HISTORY | 4 +
crypto/gnutls/PRE_BUILD | 6 -
crypto/gnutls/buildfix.diff | 27 --------
dev/null |binary
devel/bokken/BUILD | 1
devel/bokken/DEPENDS | 2
devel/bokken/DETAILS | 17 +++++
devel/bokken/HISTORY | 2
devel/bokken/INSTALL | 11 +++
kernels/linux/HISTORY | 4 +
kernels/linux/info/patches/maintenance_patches_4/patch-4.0.2 | 5 +
kernels/linux/latest.defaults | 2
libs/libdrm/DETAILS | 4 -
libs/libdrm/HISTORY | 3
net/libnice/DETAILS | 4 -
net/libnice/HISTORY | 3
net/monit/DETAILS | 4 -
net/monit/HISTORY | 3
perl-cpan/mail-internet/BUILD | 1
perl-cpan/mail-internet/CONFLICTS | 1
perl-cpan/mail-internet/DEPENDS | 1
perl-cpan/mail-internet/DETAILS | 7 --
perl-cpan/mail-internet/HISTORY | 5 +
perl-cpan/mail-internet/INSTALL | 1
perl-cpan/mail-internet/PRE_BUILD | 1
perl-cpan/mail-internet/UP_TRIGGERS | 2
perl-cpan/mailtools/DETAILS | 16 ++--
perl-cpan/mailtools/HISTORY | 4 +
perl-cpan/weakref/BUILD | 1
perl-cpan/weakref/CONFLICTS | 1
perl-cpan/weakref/DEPENDS | 1
perl-cpan/weakref/DETAILS | 6 -
perl-cpan/weakref/HISTORY | 4 +
perl-cpan/weakref/INSTALL | 1
perl-cpan/weakref/PRE_BUILD | 1
perl-cpan/weakref/UP_TRIGGERS | 2
perl-cpan/xml-parser-expat/DETAILS | 36
+++++------
perl-cpan/xml-parser-expat/HISTORY | 5 -
plasma/plasma-workspace/DEPENDS | 1
plasma/plasma-workspace/HISTORY | 3
python-pypi/python-html2text/DEPENDS | 1
python-pypi/python-html2text/DETAILS | 16 ++++
python-pypi/python-html2text/HISTORY | 3
python-pypi/python-html2text/PRE_BUILD | 4 +
python-pypi/python-html2text/setup.patch | 11 +++
python-pypi/tzlocal/DEPENDS | 3
python-pypi/tzlocal/DETAILS | 15 ++++
python-pypi/tzlocal/HISTORY | 2
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 +++
62 files changed, 273 insertions(+), 115 deletions(-)
New commits:
commit 1025ee482543e230dbbec241ee6267c5f9dbaf05
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
plasma-workspace - depends kdbusaddons
commit ffa1678120fab424dbe7e424b099380fbbfea39f
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
update telepathy/telepathy.gpg
commit fea1a5e84f3a64313ea424880ceaa0d3bf6a160a
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
telepathy-farstream: => 0.6.2
commit fe6e76280e90c309a6a38d3ebf37ff0593944220
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
farstream: => 0.2.7
commit e4a449ea56eecdb6112b083feab65d425b6baf96
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
libnice: => 0.1.13
commit 63bdf3ed72e8f44effb576a41e3352876030da5f
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
telepathy-qt: => 0.9.5
commit 9502d98190c963b9ad00a4c86319642fff4fd940
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
bokken: new spell, GUI for the Pyew and Radare projects
commit cf38e0387dc7ca8baf8fb91822ea73dc1ce57b26
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
xml-parser-expat: => 2.44
commit f6537df60383d2219c63deaee9d14595457cc2e4
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
Revert "xml-parser-expat: => 2.42_01"
This reverts commit 14e34f6f0f4a3138aaaab516b268abbcf0c21959.
Reason: we do not force development versions/branches.
commit 115e38ccf9007e6e95fdd42d1b04243b5c9d18d6
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
gnutls 3.4.1, SECURITY_PATCH++, GNUTLS-SA-2015-2
commit 3d4cf46f8296f4b862b7ed1886357b12a312a617
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
linux 4.0.2
commit ea79e80c9a1486f67a42a94720d11ce9a286f215
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
libdrm: => 2.4.61
commit 051de82ce4f3f997269978c5d5429038bb5da125
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
monit: => 5.13
commit e93a4a78abdb3d7b8c09ed7d06a0b9ecc7294a42
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
python-html2text: new spell, convert HTML to Markdown-formatted text
commit 698692bcd1e1c42794c5d6b906b4f00554a268b7
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
tzlocal: new spell, tzinfo object for the local timezone
commit 700a03778e4d0b7b41d299796946c3c2f67dddd2
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
mail-internet: added missing CONFLICTS
commit fa5989c720fee86c292ad3f48d8c909c431125dc
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
weakref: added missing CONFLICTS
commit 2a107d430640e07630196ed1641f0d8b508904f5
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
mailtools: => 2.14
(cherry picked from commit 0bfdf53e90023ce3574fb00903ab23b35d7a0c18)
commit b26cc86acb66dddec42090865cf8e14022819204
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
mail-internet: spell deprecated, it's a part of mailtools now
commit d98374b2f64c1f6aa91775f4ca64500027cd4e98
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
weakref: spell deprecated, it's a part of perl now
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
commit 5469168074e49a88d6bedcaaabf5d50c56289d36
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
bokken: new spell, GUI for the Pyew and Radare projects
commit 82e046d690915dfe563d811ba8c11971486d5897
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
xml-parser-expat: => 2.44
commit b62600937f924d0c2cc9cacc39432a0289037086
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
Revert "xml-parser-expat: => 2.42_01"
This reverts commit 14e34f6f0f4a3138aaaab516b268abbcf0c21959.
Reason: we do not force development versions/branches.
diff --git a/ChangeLog b/ChangeLog
index 5cdfbcf..4f4d6a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2015-05-07 Vlad Glagolev <stealth AT sourcemage.org>
+ * python-pypi/python-html2text: new spell, convert HTML to
+ Markdown-formatted text
+
+2015-05-06 Vlad Glagolev <stealth AT sourcemage.org>
+ * perl-cpan/weakref: spell deprecated, it's a part of perl now
+ * perl-cpan/mail-internet: spell deprecated, it's a part of mailtools
+ now
+ * python-pypi/tzlocal: new spell, tzinfo object for the local timezone
+
+2015-05-06 Ismael Luceno <ismael AT sourcemage.org>
+ * devel/bokken: new spell, GUI for the Pyew and Radare projects
+
2015-05-05 Thomas Orgis <sobukus AT sourcemage.org>
* glselect.function: Call out to smgl-gl_select to avoid
code duplication; spells having to depend on that
@@ -39,6 +52,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/crypto/gnutls/DETAILS b/crypto/gnutls/DETAILS
index ae7e6dd..6088af7 100755
--- a/crypto/gnutls/DETAILS
+++ b/crypto/gnutls/DETAILS
@@ -6,15 +6,16 @@ fi
case $GNUTLS_BRANCH in
stable)
- VERSION=3.4.0
+ VERSION=3.4.1
+ SECURITY_PATCH=14
;;
stable-old)
VERSION=3.1.28
+ SECURITY_PATCH=13
;;
esac
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE2=$SOURCE.sig
- SECURITY_PATCH=13
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://ftp.gnutls.org/gcrypt/gnutls/v${VERSION%.*}/$SOURCE
SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
diff --git a/crypto/gnutls/HISTORY b/crypto/gnutls/HISTORY
index 1cad514..ab08d44 100644
--- a/crypto/gnutls/HISTORY
+++ b/crypto/gnutls/HISTORY
@@ -1,3 +1,7 @@
+2015-05-07 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.4.1, SECURITY_PATCH++, GNUTLS-SA-2015-2
+ * PRE_BUILD, buildfix.diff: removed
+
2015-04-24 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS, PREPARE: resurrected migration procedure which was killed
more than a year ago by commit (e743363)
diff --git a/crypto/gnutls/PRE_BUILD b/crypto/gnutls/PRE_BUILD
deleted file mode 100755
index d08434a..0000000
--- a/crypto/gnutls/PRE_BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-
-if [[ "$GNUTLS_BRANCH" == "stable" ]]; then
- patch -p1 < $SPELL_DIRECTORY/buildfix.diff
-fi
diff --git a/crypto/gnutls/buildfix.diff b/crypto/gnutls/buildfix.diff
deleted file mode 100644
index 48ed2da..0000000
--- a/crypto/gnutls/buildfix.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am
-index 8e793d3..68de757 100644
---- a/doc/manpages/Makefile.am
-+++ b/doc/manpages/Makefile.am
-@@ -134,11 +134,8 @@ APIMANS += gnutls_certificate_get_peers.3
- APIMANS += gnutls_certificate_get_peers_subkey_id.3
- APIMANS += gnutls_certificate_get_trust_list.3
- APIMANS += gnutls_certificate_get_verify_flags.3
--APIMANS += gnutls_certificate_get_verify_flags.3
--APIMANS += gnutls_certificate_get_x509_crt.3
- APIMANS += gnutls_certificate_get_x509_crt.3
- APIMANS += gnutls_certificate_get_x509_key.3
--APIMANS += gnutls_certificate_get_x509_key.3
- APIMANS += gnutls_certificate_send_x509_rdn_sequence.3
- APIMANS += gnutls_certificate_server_set_request.3
- APIMANS += gnutls_certificate_set_dh_params.3
-@@ -1101,7 +1098,7 @@ compare-makefile:
- @echo
"******************************************************************************"
- @echo "If the following step fails copy
$(srcdir)/doc/manpages/tmp-compare-makefile to doc/manpages/Makefile.am"
- @echo
"******************************************************************************"
-- FUNCS=`cat $(top_srcdir)/lib/includes/gnutls/*.h |
$(top_srcdir)/doc/scripts/getfuncs.pl|sort -d`; \
-+ FUNCS=`cat $(top_srcdir)/lib/includes/gnutls/*.h |
$(top_srcdir)/doc/scripts/getfuncs.pl|sort -d|uniq`; \
- MANS=""; \
- for i in $$FUNCS; do \
- MANS="$$MANS\nAPIMANS += $$i.3"; \
---
-libgit2 0.21.4
diff --git a/devel/bokken/BUILD b/devel/bokken/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/devel/bokken/BUILD
@@ -0,0 +1 @@
+true
diff --git a/devel/bokken/DEPENDS b/devel/bokken/DEPENDS
new file mode 100755
index 0000000..2d35f5a
--- /dev/null
+++ b/devel/bokken/DEPENDS
@@ -0,0 +1,2 @@
+depends python &&
+depends radare2
diff --git a/devel/bokken/DETAILS b/devel/bokken/DETAILS
new file mode 100755
index 0000000..f51c34d
--- /dev/null
+++ b/devel/bokken/DETAILS
@@ -0,0 +1,17 @@
+ SPELL=bokken
+ VERSION=1.7
+ SOURCE="$SPELL-$VERSION.tar.gz"
+ SOURCE_URL[0]=https://inguma.eu/attachments/download/209/$SOURCE
+
SOURCE_HASH=sha512:369b493c83870dad243e5faa7b5cc5afa0c2879d33025cfe8d2776af06ab581052b5939586a29ad0697b0008d03e45d098229da0f184ca288a368ab52da4b6d9
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ DOCS="LICENSE README* TODO Changelog"
+ WEB_SITE="http://www.bokken.re/";
+ LICENSE[0]="GPL"
+ ENTERED=20150505
+ KEYWORDS=""
+ SHORT="GUI for the Pyew and Radare projects"
+cat << EOF
+Bokken is a GUI for the Pyew and Radare projects so it offers almost all the
+same features that Pyew has and and some of the Radare's ones. It's intended
+to be a basic disassembler, mainly, to analyze malware and vulnerabilities.
+EOF
diff --git a/devel/bokken/HISTORY b/devel/bokken/HISTORY
new file mode 100644
index 0000000..8dabeb4
--- /dev/null
+++ b/devel/bokken/HISTORY
@@ -0,0 +1,2 @@
+2015-05-05 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DEPENDS, DETAILS, INSTALL: spell created
diff --git a/devel/bokken/INSTALL b/devel/bokken/INSTALL
new file mode 100755
index 0000000..afe369a
--- /dev/null
+++ b/devel/bokken/INSTALL
@@ -0,0 +1,11 @@
+destdir="$INSTALL_ROOT/usr/share/$SPELL-$VERSION" &&
+mkdir -p "$destdir" &&
+cd "$SOURCE_DIRECTORY" &&
+cp -r */ *.py bokken "$destdir" &&
+
+wrapper="$INSTALL_ROOT/usr/bin/bokken" &&
+cat > "$wrapper" <<EOF &&
+#!/bin/sh
+exec "$destdir/bokken" "\$@"
+EOF
+chmod 755 "$wrapper"
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index 9c2f3b6..691d3e5 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,7 @@
+2015-05-07 Ladislav Hagara <hgr AT vabo.cz>
+ * latest.defaults: LATEST_maintenance_patches_4=4.0.2
+ * info/patches/maintenance_patches_4/patch-4.0.2: added
+
2015-05-05 Vlad Glagolev <stealth AT sourcemage.org>
* info/patches/maintenance_patches_3/patch-3.12.42: added
diff --git a/kernels/linux/info/patches/maintenance_patches_4/patch-4.0.2
b/kernels/linux/info/patches/maintenance_patches_4/patch-4.0.2
new file mode 100755
index 0000000..027c51b
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_4/patch-4.0.2
@@ -0,0 +1,5 @@
+appliedkernels="4.0"
+patchversion="${appliedkernels}.2"
+source="patch-${patchversion}.xz"
+source_url="${KERNEL_URL}/pub/linux/kernel/v4.x/${source}"
+sha1sum="a0306edfa9ecb87d1701eb1b29230c99bcfb1bbc"
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index 45e3a75..bd04723 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -4,7 +4,7 @@ LATEST_2_6=2.6.39
LATEST_PRE_2_6=patch-2.6.39
LATEST_maintenance_patches=patch-2.6.39.4
LATEST_maintenance_patches_3=patch-3.19.3
-LATEST_maintenance_patches_4=patch-4.0.1
+LATEST_maintenance_patches_4=patch-4.0.2
LATEST_git_patches=patch-2.6.25-rc6-git7
LATEST_2_4=2.4.37.9
LATEST_PRE_2_4=patch-2.4.33-pre1
diff --git a/libs/libdrm/DETAILS b/libs/libdrm/DETAILS
index 97d97f3..81ffcac 100755
--- a/libs/libdrm/DETAILS
+++ b/libs/libdrm/DETAILS
@@ -8,8 +8,8 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/drm-git"
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=1
else
- VERSION=2.4.60
-
SOURCE_HASH=sha512:d0cee293c222e9b45cb12999b45bec1d94f7faf662f011f70252df7efdda95706fb2da6805e0957f4e4c12c79974cf21233f1109a607c67cd27aab5fde27e801
+ VERSION=2.4.61
+
SOURCE_HASH=sha512:ee6e6d6a5e713acfefbb973892dde0c8fca2ec52580d783bf8fcc81e4834357a6119b08f15e555fbffe9219afd8802b340180f77afc7f07ddd5c0a8c6cd7dff7
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_URL[0]=http://dri.freedesktop.org/${SPELL}/${SOURCE}
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/libs/libdrm/HISTORY b/libs/libdrm/HISTORY
index fe5ed63..44c87ff 100644
--- a/libs/libdrm/HISTORY
+++ b/libs/libdrm/HISTORY
@@ -1,3 +1,6 @@
+2015-05-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: 2.4.61
+
2015-03-20 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: 2.4.60
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/net/monit/DETAILS b/net/monit/DETAILS
index ee3b72a..cf58dba 100755
--- a/net/monit/DETAILS
+++ b/net/monit/DETAILS
@@ -1,8 +1,8 @@
SPELL=monit
- VERSION=5.12.2
+ VERSION=5.13
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]="http://mmonit.com/${SPELL}/dist/${SOURCE}";
-
SOURCE_HASH=sha512:086f9af2c6d155c5375e7de5641025707f34577d4f2a4a76d1a104361b5d5793a4f04313cafb5d6884a01aba59f1bbb405b37294ba133d9a93c05e484e5933ff
+
SOURCE_HASH=sha512:257fc9d5ece7b39973107adef51b437941c944909efa03949f53067a0811ab8929ea57e98cbf06a22dd6d69aaa0aadd65a22788165819ede8316dcd1894ad546
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://mmonit.com/monit/";
LICENSE[0]=GPL
diff --git a/net/monit/HISTORY b/net/monit/HISTORY
index 438b9a4..a04bed4 100644
--- a/net/monit/HISTORY
+++ b/net/monit/HISTORY
@@ -1,3 +1,6 @@
+2015-05-07 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 5.13
+
2015-03-29 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 5.12.2
diff --git a/perl-cpan/mail-internet/BUILD b/perl-cpan/mail-internet/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/perl-cpan/mail-internet/BUILD
@@ -0,0 +1 @@
+true
diff --git a/perl-cpan/mail-internet/CONFLICTS
b/perl-cpan/mail-internet/CONFLICTS
new file mode 100755
index 0000000..4e15779
--- /dev/null
+++ b/perl-cpan/mail-internet/CONFLICTS
@@ -0,0 +1 @@
+conflicts mailtools y
diff --git a/perl-cpan/mail-internet/DEPENDS b/perl-cpan/mail-internet/DEPENDS
deleted file mode 100755
index 6826bc7..0000000
--- a/perl-cpan/mail-internet/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends perl
diff --git a/perl-cpan/mail-internet/DETAILS b/perl-cpan/mail-internet/DETAILS
index c487e7a..a066ff5 100755
--- a/perl-cpan/mail-internet/DETAILS
+++ b/perl-cpan/mail-internet/DETAILS
@@ -1,12 +1,11 @@
SPELL=mail-internet
VERSION=2.08
- SOURCE=MailTools-$VERSION.tar.gz
+ PATCHLEVEL=1
SOURCE_DIRECTORY=$BUILD_DIRECTORY/MailTools-$VERSION
- SOURCE_URL[0]=http://www.cpan.org/authors/id/M/MA/MARKOV/$SOURCE
-
SOURCE_HASH=sha512:8899b560a60e69b22795cd564fc23c3f88faafa63beb56e04799d9d52fbc439ee6b5d317f5ad0a9c0943be12ff8bdfa75ab8b15f9a2366c17bb393d3b908fe90
+ GATHER_DOCS=off
+ ARCHIVE=off
WEB_SITE="http://search.cpan.org/search?module=Mail::Internet";
ENTERED=20020312
- UPDATED=20050420
LICENSE[0]=ART
KEYWORDS="perl"
SHORT="Functions for RFC822 address manipulations"
diff --git a/perl-cpan/mail-internet/HISTORY b/perl-cpan/mail-internet/HISTORY
index 95ab44f..2144155 100644
--- a/perl-cpan/mail-internet/HISTORY
+++ b/perl-cpan/mail-internet/HISTORY
@@ -1,3 +1,8 @@
+2015-05-06 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: deprecated in favour of mailtools
+ * {PRE_,}BUILD, INSTALL, UP_TRIGGERS: added
+ * DEPENDS: removed
+
2011-08-29 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: removed unneeded dependencies
diff --git a/perl-cpan/mail-internet/INSTALL b/perl-cpan/mail-internet/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/perl-cpan/mail-internet/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/perl-cpan/mail-internet/PRE_BUILD
b/perl-cpan/mail-internet/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/perl-cpan/mail-internet/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/perl-cpan/mail-internet/UP_TRIGGERS
b/perl-cpan/mail-internet/UP_TRIGGERS
new file mode 100755
index 0000000..4e66a4c
--- /dev/null
+++ b/perl-cpan/mail-internet/UP_TRIGGERS
@@ -0,0 +1,2 @@
+up_trigger mail-internet dispel_self &&
+up_trigger mailtools cast_self
diff --git a/perl-cpan/mailtools/DETAILS b/perl-cpan/mailtools/DETAILS
index e451278..807a742 100755
--- a/perl-cpan/mailtools/DETAILS
+++ b/perl-cpan/mailtools/DETAILS
@@ -1,12 +1,12 @@
SPELL=mailtools
- NAME=MailTools
- VERSION=2.03
- SOURCE=$NAME-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$NAME-$VERSION
- SOURCE_URL[0]=http://search.cpan.org/CPAN/authors/id/M/MA/MARKOV/$SOURCE
-
SOURCE_HASH=sha512:82314be0fa863fed8fbb600325eff462cf3cb3ea468616b2f9089c919c575f2a9ba0a4c07c73ddb2826d1e11770cfa8c1dbbb218579c0eb22065f03cb4f6069a
- LICENSE=UNKNOWN
- WEB_SITE="http://search.cpan.org/search?dist=$NAME";
+ SPELLX=MailTools
+ VERSION=2.14
+ SOURCE=${SPELLX}-${VERSION}.tar.gz
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLX}-${VERSION}"
+ SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/M/MA/MARKOV/${SOURCE}
+
SOURCE_HASH=sha512:1df9da8394fe2a5b3243069a867b5eb4b5d4cbe3528bdbc4fe8118a3488c652c1ffc6eb8d5ba01802d74384a42d87ef67f8f3397640aab69471ae90ad0a79092
+ LICENSE=ART
+ WEB_SITE=http://search.cpan.org/dist/MailTools/
ENTERED=20050114
KEYWORDS="mail perl"
SHORT="A collection of mail tools"
diff --git a/perl-cpan/mailtools/HISTORY b/perl-cpan/mailtools/HISTORY
index 76c7f91..b8e9341 100644
--- a/perl-cpan/mailtools/HISTORY
+++ b/perl-cpan/mailtools/HISTORY
@@ -1,3 +1,7 @@
+2015-05-06 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.14; NAME -> SPELLX; updated website,
+ source url, license (UNKNOWN -> ART); quoting paths
+
2009-10-09 David Kowis <dkowis AT shlrm.org>
* DEPENDS: fixed timedate dependency
diff --git a/perl-cpan/weakref/BUILD b/perl-cpan/weakref/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/perl-cpan/weakref/BUILD
@@ -0,0 +1 @@
+true
diff --git a/perl-cpan/weakref/CONFLICTS b/perl-cpan/weakref/CONFLICTS
new file mode 100755
index 0000000..9ae5303
--- /dev/null
+++ b/perl-cpan/weakref/CONFLICTS
@@ -0,0 +1 @@
+conflicts perl y
diff --git a/perl-cpan/weakref/DEPENDS b/perl-cpan/weakref/DEPENDS
deleted file mode 100755
index 6826bc7..0000000
--- a/perl-cpan/weakref/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends perl
diff --git a/perl-cpan/weakref/DETAILS b/perl-cpan/weakref/DETAILS
index 701afc4..71b2adc 100755
--- a/perl-cpan/weakref/DETAILS
+++ b/perl-cpan/weakref/DETAILS
@@ -1,9 +1,9 @@
SPELL=weakref
VERSION=0.01
- SOURCE=WeakRef-$VERSION.tar.gz
+ PATCHLEVEL=1
SOURCE_DIRECTORY=$BUILD_DIRECTORY/WeakRef-$VERSION
- SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/LUKKA/$SOURCE
-
SOURCE_HASH=sha512:5167cc624a41ec0a92219be0d2788ad404a61c192f980df67afe3e6259004e7f97e1c0e4d756582b7e1ec6f82346fb85be4806ecd093825442946841b8922599
+ GATHER_DOCS=off
+ ARCHIVE=off
LICENSE=ART
WEB_SITE=http://search.cpan.org/~lukka/WeakRef/
ENTERED=20020405
diff --git a/perl-cpan/weakref/HISTORY b/perl-cpan/weakref/HISTORY
index 452adb4..17a75bd 100644
--- a/perl-cpan/weakref/HISTORY
+++ b/perl-cpan/weakref/HISTORY
@@ -1,3 +1,7 @@
+2015-05-06 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: deprecated in favour of perl
+ * {PRE_,}BUILD, INSTALL, UP_TRIGGERS: added
+
2008-01-07 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: cleaned up
* BUILD: useless
diff --git a/perl-cpan/weakref/INSTALL b/perl-cpan/weakref/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/perl-cpan/weakref/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/perl-cpan/weakref/PRE_BUILD b/perl-cpan/weakref/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/perl-cpan/weakref/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/perl-cpan/weakref/UP_TRIGGERS b/perl-cpan/weakref/UP_TRIGGERS
new file mode 100755
index 0000000..ef7ae47
--- /dev/null
+++ b/perl-cpan/weakref/UP_TRIGGERS
@@ -0,0 +1,2 @@
+up_trigger weakref dispel_self &&
+up_trigger perl cast_self
diff --git a/perl-cpan/xml-parser-expat/DETAILS
b/perl-cpan/xml-parser-expat/DETAILS
index 83a5b5c..d46c9a7 100755
--- a/perl-cpan/xml-parser-expat/DETAILS
+++ b/perl-cpan/xml-parser-expat/DETAILS
@@ -1,24 +1,22 @@
SPELL=xml-parser-expat
- VERSION=2.42_01
-
SOURCE_HASH=sha512:cd351a9c3e857fc1e8e742924d10b83917da5ce5e3f1c7168a6447c0bd27b2a878f301e3bfa927eb4a977b71e93c7d7bd4536e7837000f7b45ce6a31ae7d9390
- SOURCE=XML-Parser-$VERSION.tar.gz
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/XML-Parser-$VERSION"
- SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/T/TO/TODDR/$SOURCE
+ SPELLX=XML-Parser
+ VERSION=2.44
+ SOURCE=${SPELLX}-${VERSION}.tar.gz
+ SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/T/TO/TODDR/${SOURCE}
+
SOURCE_HASH=sha512:4790d20d89478880b18255679727e5b2fb2860bb4de67d5032c805fd44c9f90697a240a612aba51255325192253aa578b346d658b29f631a4e92ad96e7d65b61
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLX}-${VERSION}"
LICENSE=ART
- WEB_SITE=http://search.cpan.org/~toddr/XML-Parser/
+ WEB_SITE=http://search.cpan.org/~dist/XML-Parser/
ENTERED=20020314
- KEYWORDS="parser perl"
- SHORT="Flexible fast parser with plug-in styles"
+ KEYWORDS="parser perl xml"
+ SHORT="flexible fast parser with plug-in styles"
cat << EOF
-This module provides ways to parse XML documents. It is
-built on top of the XML::Parser::Expat manpage, which is a
-lower level interface to James Clark's expat library. Each
-call to one of the parsing methods creates a new instance
-of XML::Parser::Expat which is then used to parse the doc�
-ument. Expat options may be provided when the XML::Parser
-object is created. These options are then passed on to
-the Expat object on each parse call. They can also be
-given as extra arguments to the parse methods, in which
-case they override options given at XML::Parser creation
-time.
+This module provides ways to parse XML documents. It is built on top of the
+XML::Parser::Expat manpage, which is a lower level interface to James Clark's
+expat library. Each call to one of the parsing methods creates a new
instance of
+XML::Parser::Expat which is then used to parse the document. Expat options
may
+be provided when the XML::Parser object is created. These options are then
+passed on to the Expat object on each parse call. They can also be given as
+extra arguments to the parse methods, in which case they override options
given
+at XML::Parser creation time.
EOF
diff --git a/perl-cpan/xml-parser-expat/HISTORY
b/perl-cpan/xml-parser-expat/HISTORY
index 698d3e2..7bb7723 100644
--- a/perl-cpan/xml-parser-expat/HISTORY
+++ b/perl-cpan/xml-parser-expat/HISTORY
@@ -1,5 +1,6 @@
-2013-12-20 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 2.42_01
+2015-05-06 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.44; use SPELLX; updated website,
+ descriptions, keywords
2012-05-25 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.41; renewed source url
diff --git a/plasma/plasma-workspace/DEPENDS b/plasma/plasma-workspace/DEPENDS
index 9ed5430..c51828c 100755
--- a/plasma/plasma-workspace/DEPENDS
+++ b/plasma/plasma-workspace/DEPENDS
@@ -5,6 +5,7 @@ depends qtscript &&
depends kactivities5 &&
depends kcmutils &&
+depends kdbusaddons &&
depends kdelibs4support &&
depends kdeclarative &&
depends kdesu &&
diff --git a/plasma/plasma-workspace/HISTORY b/plasma/plasma-workspace/HISTORY
index 73357ea..91cc922 100644
--- a/plasma/plasma-workspace/HISTORY
+++ b/plasma/plasma-workspace/HISTORY
@@ -1,3 +1,6 @@
+2015-05-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: add kdbusaddons
+
2015-04-28 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.3.0
PATCHLEVEL=1
diff --git a/python-pypi/python-html2text/DEPENDS
b/python-pypi/python-html2text/DEPENDS
new file mode 100755
index 0000000..e4ea57a
--- /dev/null
+++ b/python-pypi/python-html2text/DEPENDS
@@ -0,0 +1 @@
+depends PYTHON
diff --git a/python-pypi/python-html2text/DETAILS
b/python-pypi/python-html2text/DETAILS
new file mode 100755
index 0000000..dc41a53
--- /dev/null
+++ b/python-pypi/python-html2text/DETAILS
@@ -0,0 +1,16 @@
+ SPELL=python-html2text
+ SPELLX=html2text
+ VERSION=2015.4.14
+ SOURCE=${SPELLX}-${VERSION}.tar.gz
+
SOURCE_URL[0]=https://pypi.python.org/packages/source/h/${SPELLX}/${SOURCE}
+
SOURCE_HASH=sha512:d9d29f98f0f9f65a8d9e7f5c9fb74d8b28453185a8ba16f457a061edba12205efca8a16aa01e8fb4273ccbce84dc7416fa2a9b2b6f2713e5221f067f0ac112a0
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLX}-${VERSION}"
+ WEB_SITE=https://github.com/Alir3z4/html2text
+ LICENSE[0]=GPL
+ ENTERED=20150507
+ SHORT="convert HTML to Markdown-formatted text"
+cat << EOF
+html2text is a Python script that converts a page of HTML into clean,
+easy-to-read plain ASCII text. Better yet, that ASCII also happens to be
valid
+Markdown (a text-to-HTML format).
+EOF
diff --git a/python-pypi/python-html2text/HISTORY
b/python-pypi/python-html2text/HISTORY
new file mode 100644
index 0000000..de3b177
--- /dev/null
+++ b/python-pypi/python-html2text/HISTORY
@@ -0,0 +1,3 @@
+2015-05-06 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS, DEPENDS, PRE_BUILD, setup.patch: created spell, version
+ 2015.4.14
diff --git a/python-pypi/python-html2text/PRE_BUILD
b/python-pypi/python-html2text/PRE_BUILD
new file mode 100755
index 0000000..46a91b3
--- /dev/null
+++ b/python-pypi/python-html2text/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/setup.patch"
diff --git a/python-pypi/python-html2text/setup.patch
b/python-pypi/python-html2text/setup.patch
new file mode 100644
index 0000000..5509df3
--- /dev/null
+++ b/python-pypi/python-html2text/setup.patch
@@ -0,0 +1,11 @@
+--- setup.py.orig 2015-04-14 20:08:44.000000000 +0300
++++ setup.py 2015-05-07 00:45:09.223916951 +0300
+@@ -62,7 +62,7 @@
+ ],
+ entry_points="""
+ [console_scripts]
+- html2text=html2text.cli:main
++ pyhtml2text=html2text.cli:main
+ """,
+ license='GNU GPL 3',
+ requires=requires_list,
diff --git a/python-pypi/tzlocal/DEPENDS b/python-pypi/tzlocal/DEPENDS
new file mode 100755
index 0000000..fbc7239
--- /dev/null
+++ b/python-pypi/tzlocal/DEPENDS
@@ -0,0 +1,3 @@
+depends PYTHON &&
+depends SETUPTOOLS &&
+depends pytz
diff --git a/python-pypi/tzlocal/DETAILS b/python-pypi/tzlocal/DETAILS
new file mode 100755
index 0000000..004983e
--- /dev/null
+++ b/python-pypi/tzlocal/DETAILS
@@ -0,0 +1,15 @@
+ SPELL=tzlocal
+ VERSION=1.1.3
+ SOURCE=${SPELL}-${VERSION}.tar.gz
+ SOURCE_URL[0]=https://pypi.python.org/packages/source/t/${SPELL}/${SOURCE}
+
SOURCE_HASH=sha512:bb144c3762e7a5ce81c122b3ae71b26d7618326d08e434c0f2f940c6364ba4c31bee370e2e63c3693fb19b13cfca0b1f1cccd874fcf50ed2c1d96cf1cbc35f0d
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE=https://github.com/regebro/tzlocal
+ LICENSE[0]=PD
+ ENTERED=20150506
+ SHORT="tzinfo object for the local timezone"
+cat << EOF
+This module attempts to fix a glaring hole in pytz, that there is no way to
get
+the local timezone information, unless you know the zoneinfo name, and under
+several Linux distros that's hard or impossible to figure out.
+EOF
diff --git a/python-pypi/tzlocal/HISTORY b/python-pypi/tzlocal/HISTORY
new file mode 100644
index 0000000..33a4434
--- /dev/null
+++ b/python-pypi/tzlocal/HISTORY
@@ -0,0 +1,2 @@
+2015-05-06 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS, DEPENDS: created spell, version 1.1.3
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;
+
- [SM-Commit] GIT changes to devel-merge-kde4+plasma5+kde5 grimoire by Treeve Jelbert (8beb65518b1e100ee2ad127c12eae91930ed58c5), Treeve Jelbert, 05/07/2015
Archive powered by MHonArc 2.6.24.