summaryrefslogtreecommitdiffstats
path: root/telephony
diff options
context:
space:
mode:
authorTreeve Jelbert2015-06-13 16:15:45 +0200
committerTreeve Jelbert2015-06-13 16:15:45 +0200
commitc1f96a3105869163fbefd769dfcc3addb84c8767 (patch)
tree5fe1e2c4589ba52663aa8214687ac4a162edcac9 /telephony
parentee8f8d4214da218cc4226f79b58162294577562e (diff)
telepathy-qt: => 0.9.6.1
Diffstat (limited to 'telephony')
-rwxr-xr-xtelephony/telepathy-qt/BUILD1
-rwxr-xr-xtelephony/telepathy-qt/DETAILS2
-rw-r--r--telephony/telepathy-qt/HISTORY5
-rwxr-xr-xtelephony/telepathy-qt/PRE_BUILD8
-rw-r--r--telephony/telepathy-qt/qt55.diff12
5 files changed, 7 insertions, 21 deletions
diff --git a/telephony/telepathy-qt/BUILD b/telephony/telepathy-qt/BUILD
index 935797bb28..b8ee5efad0 100755
--- a/telephony/telepathy-qt/BUILD
+++ b/telephony/telepathy-qt/BUILD
@@ -1,3 +1,4 @@
+CFLAGS+=' -Wno-cpp' &&
CXXFLAGS+=' -Wno-cpp' &&
OPTS+=" -DENABLE_EXAMPLES=0 -DENABLE_TESTS=0" &&
PYTHON=/usr/bin/python2.7 &&
diff --git a/telephony/telepathy-qt/DETAILS b/telephony/telepathy-qt/DETAILS
index ac3fa6812f..e760658629 100755
--- a/telephony/telepathy-qt/DETAILS
+++ b/telephony/telepathy-qt/DETAILS
@@ -7,7 +7,7 @@ if [[ $TELQT_SVN == y ]];then
SOURCE_URL[0]=git://anongit.freedesktop.org/telepathy/telepathy-qt
FORCE_DOWNLOAD=on
else
- VERSION=0.9.5
+ VERSION=0.9.6.1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
SOURCE_URL[0]=$WEB_SITE/releases/$SPELL/$SOURCE
diff --git a/telephony/telepathy-qt/HISTORY b/telephony/telepathy-qt/HISTORY
index fd7272e314..5df771461c 100644
--- a/telephony/telepathy-qt/HISTORY
+++ b/telephony/telepathy-qt/HISTORY
@@ -1,3 +1,8 @@
+2015-06-13 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 0.9.6.1
+ * PRE_BUILD, qt55.diff: deleted
+ * BUILD: prevent errors
+
2015-05-25 Thomas Orgis <sobukus@sourcemage.org>
* DEPENDS: depends -sub CXX gcc (half-automated)
diff --git a/telephony/telepathy-qt/PRE_BUILD b/telephony/telepathy-qt/PRE_BUILD
deleted file mode 100755
index 5b81894a8d..0000000000
--- a/telephony/telepathy-qt/PRE_BUILD
+++ /dev/null
@@ -1,8 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-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
deleted file mode 100644
index 5cc048a228..0000000000
--- a/telephony/telepathy-qt/qt55.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-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;
-