Merge branch 'master' of ssh://projects.parabolagnulinux.org:1863/srv/git/abslibre

3 files changed, 76 insertions, 2 deletions

diff --git a/pcr/twinkle/PKGBUILD b/pcr/twinkle/PKGBUILD
new file mode 100644
index 000000000..5a8a0430c
--- /dev/null
+++ b/pcr/twinkle/PKGBUILD
@@ -0,0 +1,50 @@
+# $Id: PKGBUILD 68598 2012-03-29 08:03:13Z arodseth $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Jeff Mickey <jeff@archlinux.org>
+# Contributor: Alexander Baldeck <alexander@archlinux.org>
+# Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com>
+# Contributor: Alexander Rødseth <rodseth@gmail.com>
+
+pkgname=twinkle
+pkgver=1.4.2
+pkgrel=19
+pkgdesc="Softphone for voice over IP and IM communication using SIP"
+arch=('x86_64' 'i686')
+url="http://www.twinklephone.com/"
+license=('GPL')
+depends=('file' 'speex' 'boost-libs' 'libsndfile' 'qt3' 'libzrtpcpp' 
+'commoncpp2' 'libxml2')
+makedepends=('pkg-config' 'boost')
+source=("http://www.xs4all.nl/~mfnboer/$pkgname/download/$pkgname-$pkgver.tar.gz"
+ twinkle-1.4.2-ccrtp.patch)
+md5sums=('d70c8972f296ffd998c7fb698774705b'
+         '934f59ff60a8ae29a152feb8bf131ae2')
+
+build() {
+  cd "$srcdir"
+  patch -p0 < ./twinkle-1.4.2-ccrtp.patch || return 1
+
+  cd "$pkgname-$pkgver"
+  aclocal
+  autoconf
+  automake -a
+  export QTDIR=/usr/lib/qt3
+  export PATH=$QTDIR/bin:$PATH
+  CPPFLAGS="$CPPFLAGS -I/usr/include/qt3" \
+  ./configure --prefix=/usr \
+	--without-kde \
+	--with-speex \
+	--without-ilbc \
+	--mandir=/usr/share/man
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+  install -Dm644 "$pkgdir/usr/share/twinkle/twinkle48.png" \
+    "$pkgdir/usr/share/pixmaps/twinkle.png"
+  install -Dm644 twinkle.desktop \
+    "$pkgdir/usr/share/applications/twinkle.desktop"
+}
diff --git a/pcr/twinkle/twinkle-1.4.2-ccrtp.patch b/pcr/twinkle/twinkle-1.4.2-ccrtp.patch
new file mode 100644
index 000000000..fdb5f6260
--- /dev/null
+++ b/pcr/twinkle/twinkle-1.4.2-ccrtp.patch
@@ -0,0 +1,24 @@
+diff -pruN twinkle-1.4.2-o/configure.in twinkle-1.4.2/configure.in
+--- twinkle-1.4.2-o/configure.in	2009-02-24 11:49:20.000000000 -0800
++++ twinkle-1.4.2/configure.in	2012-05-19 09:20:51.151778516 -0700
+@@ -66,7 +66,7 @@ fi
+ 
+ export PKG_CONFIG_PATH
+ 
+-PKG_CHECK_MODULES(CCRTP, libccrtp1 >= 1.6.0)
++PKG_CHECK_MODULES(CCRTP, libccrtp >= 2.0.0)
+ 
+ PKG_CHECK_MODULES(XML2, libxml-2.0)
+ # AC_CHECK_HEADER(libxml/tree.h, [],
+diff -pruN twinkle-1.4.2-o/src/log.cpp twinkle-1.4.2/src/log.cpp
+--- twinkle-1.4.2-o/src/log.cpp	2009-01-18 06:35:28.000000000 -0800
++++ twinkle-1.4.2/src/log.cpp	2012-05-19 09:21:11.071594114 -0700
+@@ -161,7 +161,7 @@ void t_log::write_header(const string &f
+ 
+ 	gettimeofday(&t, NULL);
+ 	date = t.tv_sec;
+-	localtime_r(&date, &tm);
++	::localtime_r(&date, &tm);
+ 
+ 	*log_stream << "+++ ";
+ 	*log_stream << tm.tm_mday;
diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD
index 75e4d2bd6..e1eb3fc8a 100644
--- a/pcr/youtube-dl-current/PKGBUILD
+++ b/pcr/youtube-dl-current/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=youtube-dl-current
 _pkgname=youtube-dl
 provides=(youtube-dl)
-pkgver=2013.11.15.1
+pkgver=2013.11.24.1
 pkgrel=1
 pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites"
 arch=('any')
@@ -27,5 +27,5 @@ package() {
     "${pkgdir}/usr/share/bash-completion/completions/youtube-dl"
   install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
 }
-md5sums=('eb60e8a818fca584cbb3f43cae321d83'
+md5sums=('76b8a95cccfb5bab782cee42c7891d44'
          'SKIP')