Skip to Content.
Sympa Menu

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

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 (83e4a4bc43c28010fa019b883c06510ee4a423e4)
  • Date: Thu, 16 Jul 2009 07:18:33 -0500

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

kde4-support/soprano/DETAILS | 4 ++--
kde4-support/soprano/HISTORY | 3 +++
telephony/telepathy-glib/DETAILS | 2 +-
telephony/telepathy-glib/HISTORY | 4 ++++
telephony/telepathy-qt/BUILD | 4 ++--
telephony/telepathy-qt/DEPENDS | 12 +++++++++---
telephony/telepathy-qt/DETAILS | 25 ++++++++++++++-----------
telephony/telepathy-qt/HISTORY | 15 +++++++++++++++
telephony/telepathy-qt/PREPARE | 2 +-
telephony/telepathy-qt/PRE_BUILD | 5 +++++
telephony/telepathy.gpg |binary
x11-toolkits/qt4/DETAILS | 1 +
x11-toolkits/qt4/HISTORY | 5 +++++
x11-toolkits/qt4/POST_INSTALL | 2 ++
14 files changed, 64 insertions(+), 20 deletions(-)

New commits:
commit 83e4a4bc43c28010fa019b883c06510ee4a423e4
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

qt4 - fix bug #15296

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

telepathy-qt-0.1.8

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

soprano: => 2.3.0

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

telepathy-glib: => 0.7.33

diff --git a/kde4-support/soprano/DETAILS b/kde4-support/soprano/DETAILS
index ad8fb51..4fecd28 100755
--- a/kde4-support/soprano/DETAILS
+++ b/kde4-support/soprano/DETAILS
@@ -11,8 +11,8 @@ else

SOURCE_HASH=sha512:93fbd277fe76cc94afd443810bcd3e39e0fa8769b8b30af66dad4fd4f298c330ec9e76945c68fcec4e035247727fd21cb6856e36bdb4e8ead050891a3f6e260b
SOURCE=$SPELL-$VERSION.tar.bz2
else
- VERSION=2.2.4
-
SOURCE_HASH=sha512:453dff50090f1a60d791c1af0134c5379c7adba97a8551daa4fc5712347a0cdde05d4aa60b38d61a1fbbad448195f35de3031e85576716b065c0ce58e86121ff
+ VERSION=2.3.0
+
SOURCE_HASH=sha512:92a9e1130a77531e6ce0eb254d7fbf4f367b020bbe46ee13211d98c385c554e78ec4aea947b515f40e0c87cd18b41be5a9f6d874c78c3969837b21d6527a5ad4
SOURCE=$SPELL-$VERSION.tar.bz2
fi
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/kde4-support/soprano/HISTORY b/kde4-support/soprano/HISTORY
index 3d008d1..b83edec 100644
--- a/kde4-support/soprano/HISTORY
+++ b/kde4-support/soprano/HISTORY
@@ -1,3 +1,6 @@
+2009-07-15 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.3.0 (stable)
+
2009-06-24 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.2.4 /2.2.69

diff --git a/telephony/telepathy-glib/DETAILS
b/telephony/telepathy-glib/DETAILS
index 737b362..bb9bf7a 100755
--- a/telephony/telepathy-glib/DETAILS
+++ b/telephony/telepathy-glib/DETAILS
@@ -1,5 +1,5 @@
SPELL=telepathy-glib
- VERSION=0.7.26
+ VERSION=0.7.33
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
WEB_SITE=http://telepathy.freedesktop.org
diff --git a/telephony/telepathy-glib/HISTORY
b/telephony/telepathy-glib/HISTORY
index 007f9ca..0ca4b77 100644
--- a/telephony/telepathy-glib/HISTORY
+++ b/telephony/telepathy-glib/HISTORY
@@ -1,3 +1,7 @@
+2009-07-15 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.7.33
+ * ../telepathy.gpg: add key 63C7CC90
+
2009-02-20 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.7.26

diff --git a/telephony/telepathy-qt/BUILD b/telephony/telepathy-qt/BUILD
index 7ed0e9d..23b8f8e 100755
--- a/telephony/telepathy-qt/BUILD
+++ b/telephony/telepathy-qt/BUILD
@@ -1,2 +1,2 @@
-qt4_cmake_build
-
+PATH=/usr/bin/qt4/:$PATH &&
+default_build
diff --git a/telephony/telepathy-qt/DEPENDS b/telephony/telepathy-qt/DEPENDS
index df6660c..c1b5e03 100755
--- a/telephony/telepathy-qt/DEPENDS
+++ b/telephony/telepathy-qt/DEPENDS
@@ -1,3 +1,9 @@
-depends cmake &&
-depends qt4 &&
-depends openssl
+if [[ $TELQT_SVN == y ]];then
+ depends git &&
+ depends libtool
+fi &&
+depends pkgconfig &&
+depends -sub DBUS qt4 &&
+depends python &&
+depends openssl &&
+optional_depends telepathy-glib '' '' 'glib integration'
diff --git a/telephony/telepathy-qt/DETAILS b/telephony/telepathy-qt/DETAILS
index d2ed18f..5efcfab 100755
--- a/telephony/telepathy-qt/DETAILS
+++ b/telephony/telepathy-qt/DETAILS
@@ -1,19 +1,22 @@
SPELL=telepathy-qt
+ SPELLX=telepathy-qt4
+ WEB_SITE=http://telepathy.freedesktop.org
if [[ $TELQT_SVN == y ]];then
- VERSION=svn
+ VERSION=git
SOURCE_IGNORE=volatile
- SOURCE=$SPELL-$VERSION.tar.bz2
-
SOURCE_URL[0]=svn://anonsvn.kde.org/home/kde/trunk/kdesupport/$SPELL:$SPELL
-#
SOURCE_URL[0]=svn_http://svn.sourceforge.net/svnroot/tapioca-voip/trunk/${SPELL}:${SPELL}
+ SOURCE=$SPELLX-$VERSION.tar.bz2
+ SOURCE_URL[0]=git://git.collabora.co.uk/git/$SPELLX.git
FORCE_DOWNLOAD=on
else
- VERSION=0.14.1
-
SOURCE_HASH=sha512:d40787b369255e3d4aa9a979f754edabd9bbbf89f9ed13df7f1bd94c5765122003be228d91d953b9ff138faf361a258e7e908b693a764b2d4e30b34f909a8926
- SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE_URL[0]=$SOURCEFORGE_URL/tapioca-voip/$SOURCE
-fi;
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- WEB_SITE=http://tapioca-voip.sourceforge.net
+ VERSION=0.1.8
+ SOURCE=$SPELLX-$VERSION.tar.gz
+ SOURCE2=$SOURCE.asc
+ SOURCE_URL[0]=$WEB_SITE/releases/$SPELLX/$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
LICENSE[0]=LGPL
ENTERED=20070307
KEYWORDS="telepathy"
diff --git a/telephony/telepathy-qt/HISTORY b/telephony/telepathy-qt/HISTORY
index f6aff08..fe4393d 100644
--- a/telephony/telepathy-qt/HISTORY
+++ b/telephony/telepathy-qt/HISTORY
@@ -1,3 +1,18 @@
+2009-07-15 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.1.8
+ new url & website
+ use upstream key
+ svn -> git
+ * DEPENDS: add pkgconfig & python, remove cmake
+ add '-sub DBUS' for qt4
+ add optional telepathy-glib
+ svn -> git
+ add libtool
+ * BUILD: use default_build
+ * PRE_BUILD: added, for git version
+ * PREPARE: change query text
+ * telepathy.gpg: add key 4F1BF3ED
+
2009-04-12 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: svn now at kde
* DEPENDS: add cmake, openssl
diff --git a/telephony/telepathy-qt/PREPARE b/telephony/telepathy-qt/PREPARE
index 0d010aa..93dd60b 100755
--- a/telephony/telepathy-qt/PREPARE
+++ b/telephony/telepathy-qt/PREPARE
@@ -1 +1 @@
-config_query TELQT_SVN 'Do you want the SVN version?' n
+config_query TELQT_SVN 'Do you want the GIT version?' n
diff --git a/telephony/telepathy-qt/PRE_BUILD
b/telephony/telepathy-qt/PRE_BUILD
new file mode 100755
index 0000000..ab81d6d
--- /dev/null
+++ b/telephony/telepathy-qt/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+if [[ $TELQT_SVN == y ]];then
+./autogen.sh --no-configure
+fi
diff --git a/telephony/telepathy.gpg b/telephony/telepathy.gpg
index 573cb99..d122022 100644
Binary files a/telephony/telepathy.gpg and b/telephony/telepathy.gpg differ
diff --git a/x11-toolkits/qt4/DETAILS b/x11-toolkits/qt4/DETAILS
index b0d1e94..e10b49d 100755
--- a/x11-toolkits/qt4/DETAILS
+++ b/x11-toolkits/qt4/DETAILS
@@ -19,6 +19,7 @@ persistent_remove QT_VER
# ;;
# *) #stable
VERSION=4.5.2
+ PATCHLEVEL=1

SOURCE_HASH=sha512:385f4a30959a67864f05e6192fbd05755a12319dfbf30507d8757b9cf515cb70eba063e0eb356c583bbd90538434c41ab08336daf10b3ce43016b85f1e462735
SOURCE=$SPELLX-$VERSION.tar.bz2
URI=qt/source/$SOURCE
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index 9b67c39..164e56a 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,8 @@
+2009-07-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * POST_INSTALL: added, fix bad pkgconfig files
+ * DETAILS: PATCHLEVEL=1
+ fixes bug #15296
+
2009-06-25 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.5.2 (prerelease & stable)
* 0279-svg-rendering-regression.diff, odbc.patch: deleted
diff --git a/x11-toolkits/qt4/POST_INSTALL b/x11-toolkits/qt4/POST_INSTALL
new file mode 100755
index 0000000..5248462
--- /dev/null
+++ b/x11-toolkits/qt4/POST_INSTALL
@@ -0,0 +1,2 @@
+sed -i "/location/s|/src/qt-x11-opensource-src-${VERSION}/bin|/bin/qt4|" \
+ ${INSTALL_ROOT}/usr/lib/pkgconfig/Qt*.pc



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (83e4a4bc43c28010fa019b883c06510ee4a423e4), Treeve Jelbert, 07/16/2009

Archive powered by MHonArc 2.6.24.

Top of Page