summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rw-r--r--extra/ffmpeg/PKGBUILD6
-rw-r--r--extra/graphviz/PKGBUILD4
-rw-r--r--extra/gtkhtml4/PKGBUILD11
-rw-r--r--extra/gtkhtml4/fix-selection-behaviour-in-iframe.patch35
-rw-r--r--extra/kdebase-workspace/PKGBUILD12
-rw-r--r--extra/kdebase-workspace/fix-krunner-crash.patch13
-rw-r--r--extra/openconnect/PKGBUILD12
-rw-r--r--extra/php-apc/PKGBUILD4
-rw-r--r--extra/php-xcache/PKGBUILD40
-rw-r--r--extra/php-xcache/xcache.ini3
-rw-r--r--extra/php/PKGBUILD63
-rw-r--r--extra/php/php-fpm.conf.in.patch4
-rw-r--r--extra/php/php.ini.patch16
-rw-r--r--extra/telepathy-rakia/0001-Check-for-gio-to-avoid-linking-issue.patch29
-rw-r--r--extra/telepathy-rakia/PKGBUILD18
15 files changed, 185 insertions, 85 deletions
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD
index b3a701783..458bfa5e4 100644
--- a/extra/ffmpeg/PKGBUILD
+++ b/extra/ffmpeg/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 153659 2012-03-17 13:50:07Z ibiru $
+# $Id: PKGBUILD 158782 2012-05-09 17:58:43Z ibiru $
# Maintainer : Ionut Biru <ibiru@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
# Contributor: Paul Mattal <paul@archlinux.org>
pkgname=ffmpeg
-pkgver=20120317
+pkgver=20120509
pkgrel=1
pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ depends=(alsa-lib bzip2 gsm lame libpulse libtheora libva libvorbis libvpx openc
makedepends=('yasm' 'git' 'libvdpau')
#git clone git://git.videolan.org/ffmpeg.git
source=(ftp://ftp.archlinux.org/other/ffmpeg/$pkgname-$pkgver.tar.xz)
-md5sums=('2a2ef83ae73713fcef6bba8c430665ce')
+md5sums=('a35359e424608f369d380f03e4dc9966')
build() {
cd "$pkgname"
diff --git a/extra/graphviz/PKGBUILD b/extra/graphviz/PKGBUILD
index 3dfefeadc..f0640f068 100644
--- a/extra/graphviz/PKGBUILD
+++ b/extra/graphviz/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 150341 2012-02-17 03:33:20Z bisson $
+# $Id: PKGBUILD 158786 2012-05-09 18:48:24Z pierre $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: kevin <kevin@archlinux.org>
# Contributor: John Proctor <jproctor@prium.net>
pkgname=graphviz
pkgver=2.28.0
-pkgrel=8
+pkgrel=9
pkgdesc='Graph visualization software'
url='http://www.graphviz.org/'
license=('custom:EPL')
diff --git a/extra/gtkhtml4/PKGBUILD b/extra/gtkhtml4/PKGBUILD
index 12c5d4e62..f917c0682 100644
--- a/extra/gtkhtml4/PKGBUILD
+++ b/extra/gtkhtml4/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 156876 2012-04-23 09:08:07Z ibiru $
+# $Id: PKGBUILD 158752 2012-05-09 07:43:11Z jgc $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
pkgname=gtkhtml4
_pkgbasename=gtkhtml
pkgver=4.4.1
-pkgrel=1
+pkgrel=2
pkgdesc="A lightweight HTML renderer/editor widget for GTK3"
arch=(i686 x86_64)
license=('GPL')
@@ -12,11 +12,14 @@ depends=('gtk3' 'enchant' 'iso-codes' 'gnome-icon-theme' 'libsoup')
makedepends=('intltool')
url="http://www.gnome.org"
options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz)
-sha256sums=('2fb3286c5ab8b6349a694156f803e1162c5a234d30548eb0afdf82e139923236')
+source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz
+ fix-selection-behaviour-in-iframe.patch)
+sha256sums=('2fb3286c5ab8b6349a694156f803e1162c5a234d30548eb0afdf82e139923236'
+ 'ed1d9a4515f9137aaa94511f421b610af04091c56573ff9b74ba104a2ca1b207')
build() {
cd "$_pkgbasename-$pkgver"
+ patch -Np1 -i "${srcdir}/fix-selection-behaviour-in-iframe.patch"
./configure --prefix=/usr --sysconfdir=/etc \
--libexecdir=/usr/lib/gtkhtml4 \
--localstatedir=/var --disable-static
diff --git a/extra/gtkhtml4/fix-selection-behaviour-in-iframe.patch b/extra/gtkhtml4/fix-selection-behaviour-in-iframe.patch
new file mode 100644
index 000000000..06bce4a0f
--- /dev/null
+++ b/extra/gtkhtml4/fix-selection-behaviour-in-iframe.patch
@@ -0,0 +1,35 @@
+From 9ec36544203d4c1b98aa843c2c3ff0a4f725da68 Mon Sep 17 00:00:00 2001
+From: Sam Thursfield <sam.thursfield@codethink.co.uk>
+Date: Thu, 03 May 2012 19:04:20 +0000
+Subject: Bug 672582 - Fix selection behavior inside <iframe>
+
+Since kinetic scrolling was introduced in Gtk+, GtkScrolledWindow
+has had its own GdkWindow. This means we need to use the allocation
+of the GtkScrolledWindow rather than its child GtkHTML widget when we
+want to translate pointer coordinates relative to the iframe, because
+a widget's GtkAllocation is relative to the parent GdkWindow.
+
+(cherry picked from commit 7b7b37745d2f46914be314e4d7aef7a575529345)
+---
+diff --git a/gtkhtml/gtkhtml.c b/gtkhtml/gtkhtml.c
+index 697b16e..6284855 100644
+--- a/gtkhtml/gtkhtml.c
++++ b/gtkhtml/gtkhtml.c
+@@ -1823,9 +1823,14 @@ shift_to_iframe_parent (GtkWidget *widget,
+ gint *y)
+ {
+ while (GTK_HTML (widget)->iframe_parent) {
++ GtkWidget *scrolled_window;
+ GtkAllocation allocation;
+
+- gtk_widget_get_allocation (widget, &allocation);
++ scrolled_window = gtk_widget_get_parent (widget);
++
++ g_return_val_if_fail (GTK_IS_SCROLLED_WINDOW (scrolled_window), widget);
++
++ gtk_widget_get_allocation (scrolled_window, &allocation);
+
+ if (x)
+ *x += allocation.x - GTK_HTML (widget)->engine->x_offset;
+--
+cgit v0.9.0.2
diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD
index 54cc5e066..96d585512 100644
--- a/extra/kdebase-workspace/PKGBUILD
+++ b/extra/kdebase-workspace/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 158377 2012-05-03 22:30:58Z andrea $
+# $Id: PKGBUILD 158761 2012-05-09 08:46:41Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
pkgname=kdebase-workspace
_pkgname=kde-workspace
pkgver=4.8.3
-pkgrel=1
+pkgrel=2
pkgdesc="KDE Base Workspace"
arch=('i686' 'x86_64')
url='http://www.kde.org'
@@ -29,7 +29,8 @@ backup=('usr/share/config/kdm/kdmrc'
options=('emptydirs')
source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
- 'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch')
+ 'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch'
+ 'fix-krunner-crash.patch')
sha1sums=('23dbd023f76769ba6ea77dbc11314eca504ad3d2'
'5db3a245201bd4a50e65aa2ef583cf5490e4f646'
'712a90999bd429883dcef5dcaf288aace332ced8'
@@ -37,13 +38,16 @@ sha1sums=('23dbd023f76769ba6ea77dbc11314eca504ad3d2'
'106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
'd7b5883f7e65c6839b1f65f94d58026673dd0226'
'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
- 'd509dac592bd8b310df27991b208c95b6d907514')
+ 'd509dac592bd8b310df27991b208c95b6d907514'
+ 'f898561d2b32dead8195f0610141edf7d423d46c')
build() {
cd "${srcdir}"/${_pkgname}-${pkgver}
patch -p1 -i "${srcdir}"/kdm-xinitrd.patch
patch -p0 -i "${srcdir}"/fixpath.patch
patch -p0 -i "${srcdir}"/terminate-server.patch
+
+ patch -p1 -i "${srcdir}"/fix-krunner-crash.patch
cd "${srcdir}"
mkdir build
diff --git a/extra/kdebase-workspace/fix-krunner-crash.patch b/extra/kdebase-workspace/fix-krunner-crash.patch
new file mode 100644
index 000000000..2bdf0b512
--- /dev/null
+++ b/extra/kdebase-workspace/fix-krunner-crash.patch
@@ -0,0 +1,13 @@
+diff --git a/libs/plasmagenericshell/panelshadows.cpp b/libs/plasmagenericshell/panelshadows.cpp
+index ee55571..2f45153 100644
+--- a/libs/plasmagenericshell/panelshadows.cpp
++++ b/libs/plasmagenericshell/panelshadows.cpp
+@@ -122,7 +122,7 @@ void PanelShadows::Private::initPixmap(const QString &element)
+ {
+ #ifdef Q_WS_X11
+ QPixmap pix = q->pixmap(element);
+- if (pix.handle() == 0) {
++ if (!pix.isNull() && pix.handle() == 0) {
+ Pixmap xPix = XCreatePixmap(QX11Info::display(), QX11Info::appRootWindow(), pix.width(), pix.height(), 32);
+ QPixmap tempPix = QPixmap::fromX11Pixmap(xPix, QPixmap::ExplicitlyShared);
+ tempPix.fill(Qt::transparent);
diff --git a/extra/openconnect/PKGBUILD b/extra/openconnect/PKGBUILD
index f794241d6..b696ee786 100644
--- a/extra/openconnect/PKGBUILD
+++ b/extra/openconnect/PKGBUILD
@@ -1,28 +1,28 @@
-# $Id: PKGBUILD 145723 2011-12-28 18:31:54Z ibiru $
+# $Id: PKGBUILD 158780 2012-05-09 17:43:27Z ibiru $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
pkgname=openconnect
-pkgver=3.15
+pkgver=3.18
pkgrel=1
epoch=1
pkgdesc="Open client for Cisco AnyConnect VPN"
arch=('i686' 'x86_64')
license=('GPL')
url="http://www.infradead.org/openconnect.html"
-depends=('libxml2' 'openssl' 'libproxy')
+depends=('libxml2' 'openssl' 'libproxy' 'vpnc')
makedepends=('intltool')
options=('!libtool' '!emptydirs')
source=(ftp://ftp.infradead.org/pub/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('94245f4bac42a288100becab0b4ca29a')
+md5sums=('5a440ad946cfec0f1ee7ee5519081cf1')
build() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd "$pkgname-$pkgver"
./configure --prefix=/usr \
--disable-static
make
}
package() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd "$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
}
diff --git a/extra/php-apc/PKGBUILD b/extra/php-apc/PKGBUILD
index 61f57f82e..337e14ec0 100644
--- a/extra/php-apc/PKGBUILD
+++ b/extra/php-apc/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 156069 2012-04-12 18:41:47Z pierre $
+# $Id: PKGBUILD 158790 2012-05-09 18:48:32Z pierre $
# Maintainer: Pierre Schmitz <pierre@archlinux.de>
pkgname=php-apc
pkgver=3.1.10
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
pkgdesc='A free, open, and robust framework for caching and optimizing PHP intermediate code'
url='http://pecl.php.net/package/APC'
diff --git a/extra/php-xcache/PKGBUILD b/extra/php-xcache/PKGBUILD
new file mode 100644
index 000000000..12c602b92
--- /dev/null
+++ b/extra/php-xcache/PKGBUILD
@@ -0,0 +1,40 @@
+# $Id: $
+# Maintainer: Pierre Schmitz <pierre@archlinux.de>
+
+pkgname=php-xcache
+pkgver=2.0.0
+pkgrel=3
+arch=('i686' 'x86_64')
+pkgdesc='A PHP opcode cacher'
+url='http://xcache.lighttpd.net/'
+depends=('php')
+license=('custom')
+source=("http://xcache.lighttpd.net/pub/Releases/${pkgver}/xcache-${pkgver}.tar.bz2"
+ 'xcache.ini')
+backup=('etc/php/conf.d/xcache.ini')
+md5sums=('0e30cdff075c635e475d70a5c37d0252'
+ 'bba7ead3e592a7980aa91a8600973587')
+
+build() {
+ cd $srcdir/xcache-$pkgver
+ phpize
+ ./configure --prefix=/usr
+ make
+}
+
+# check() {
+# cd $srcdir/xcache-$pkgver
+# make test
+# }
+
+package() {
+ cd $srcdir/xcache-$pkgver
+ make INSTALL_ROOT=$pkgdir install
+
+ install -Dm644 $srcdir/xcache.ini $pkgdir/etc/php/conf.d/xcache.ini
+
+ install -dm755 $pkgdir/usr/share/php-xcache/admin
+ install -m644 admin/* $pkgdir/usr/share/php-xcache/admin/
+
+ install -Dm644 COPYING $pkgdir/usr/share/licenses/php-xcache/COPYING
+}
diff --git a/extra/php-xcache/xcache.ini b/extra/php-xcache/xcache.ini
new file mode 100644
index 000000000..c2677a5ca
--- /dev/null
+++ b/extra/php-xcache/xcache.ini
@@ -0,0 +1,3 @@
+;zend_extension=/usr/lib/php/modules/xcache.so
+xcache.size=64M
+xcache.var_size=64M
diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD
index 8fa916144..35039e75b 100644
--- a/extra/php/PKGBUILD
+++ b/extra/php/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 158740 2012-05-08 17:02:36Z pierre $
+# $Id: PKGBUILD 158788 2012-05-09 18:48:29Z pierre $
# Maintainer: Pierre Schmitz <pierre@archlinux.de>
pkgbase=php
@@ -21,44 +21,35 @@ pkgname=('php'
'php-sqlite'
'php-tidy'
'php-xsl')
-pkgver=5.3.13
-_suhosinver=5.3.9-0.9.10
+pkgver=5.4.3
pkgrel=1
arch=('i686' 'x86_64')
license=('PHP')
url='http://www.php.net'
-makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix'
+makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'libvpx'
'sqlite' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds'
'libmcrypt' 'tidyhtml' 'aspell' 'libltdl' 'libpng' 'libjpeg' 'icu'
'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2')
source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2"
- "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz"
- "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz.sig"
'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch'
- 'logrotate.d.php-fpm' 'suhosin.patch')
-md5sums=('370be99c5cdc2e756c82c44d774933c8'
- 'c099b3d7eac95018ababd41ded7f3066'
- 'c15d18f846be1d69144a5d0056ee6506'
- 'ffc338e8ce2a990f6f2a486355bbab65'
+ 'logrotate.d.php-fpm')
+md5sums=('51f9488bf8682399b802c48656315cac'
+ '0b0bc7a917fc592bdf11dcd3c5c255e9'
'dec2cbaad64e3abf4f0ec70e1de4e8e9'
'b01be5f816988fcee7e78225836e5e27'
- '740ec5fe2ecfd9d7febd4081c90ec65b'
- '07c4e412909ac65a44ec90e7a2c4bade'
- '07ca7da608553b4cb92797e655eb94f1')
+ '59b3a25f9eb3afc02f1adf9ee699808c'
+ '07c4e412909ac65a44ec90e7a2c4bade')
build() {
phpconfig="--srcdir=../${pkgbase}-${pkgver} \
+ --config-cache \
--prefix=/usr \
--sysconfdir=/etc/php \
--localstatedir=/var \
--with-layout=GNU \
--with-config-file-path=/etc/php \
--with-config-file-scan-dir=/etc/php/conf.d \
- --enable-inline-optimization \
- --disable-debug \
--disable-rpath \
- --disable-static \
- --enable-shared \
--mandir=/usr/share/man \
--without-pear \
"
@@ -70,36 +61,31 @@ build() {
--enable-ftp=shared \
--enable-gd-native-ttf \
--enable-intl=shared \
- --enable-json=shared \
- --enable-mbregex \
--enable-mbstring \
- --enable-pdo \
--enable-phar=shared \
--enable-posix=shared \
- --enable-session \
--enable-shmop=shared \
--enable-soap=shared \
--enable-sockets=shared \
- --enable-sqlite-utf8 \
--enable-sysvmsg=shared \
--enable-sysvsem=shared \
--enable-sysvshm=shared \
- --enable-xml \
--enable-zip=shared \
--with-bz2=shared \
--with-curl=shared \
--with-db4=/usr \
--with-enchant=shared,/usr \
- --with-freetype-dir=shared,/usr \
+ --with-freetype-dir=/usr \
--with-gd=shared \
- --with-gdbm=shared \
+ --with-gdbm \
--with-gettext=shared \
--with-gmp=shared \
--with-iconv=shared \
--with-icu-dir=/usr \
- --with-imap-ssl=shared \
+ --with-imap-ssl \
--with-imap=shared \
- --with-jpeg-dir=shared,/usr \
+ --with-jpeg-dir=/usr \
+ --with-vpx-dir=/usr \
--with-ldap=shared \
--with-ldap-sasl \
--with-mcrypt=shared \
@@ -115,19 +101,15 @@ build() {
--with-pdo-pgsql=shared \
--with-pdo-sqlite=shared,/usr \
--with-pgsql=shared \
- --with-png-dir=shared,/usr \
+ --with-png-dir=/usr \
--with-pspell=shared \
- --with-regex=php \
--with-snmp=shared \
--with-sqlite3=shared,/usr \
- --with-sqlite=shared \
--with-tidy=shared \
--with-unixODBC=shared,/usr \
--with-xmlrpc=shared \
--with-xsl=shared \
--with-zlib \
- --without-db2 \
- --without-db3 \
"
EXTENSION_DIR=/usr/lib/php/modules
@@ -135,14 +117,8 @@ build() {
PEAR_INSTALLDIR=/usr/share/pear
export PEAR_INSTALLDIR
- # fix the suhosin patch
- patch -i ${srcdir}/suhosin.patch
-
cd ${srcdir}/${pkgbase}-${pkgver}
- # apply suhosin patch
- patch -F3 -p1 -i ${srcdir}/suhosin-patch-${_suhosinver}.patch
-
# adjust paths
patch -p0 -i ${srcdir}/php.ini.patch
patch -p0 -i ${srcdir}/php-fpm.conf.in.patch
@@ -280,11 +256,8 @@ package_php-pear() {
backup=('etc/php/pear.conf')
cd ${srcdir}/build-pear
- make -j1 install-pear INSTALL_ROOT=${pkgdir}
- local i
- while read i; do
- [ ! -e "$i" ] || rm -rf "$i"
- done < <(find ${pkgdir} -name '.*')
+ make install-pear INSTALL_ROOT=${pkgdir}
+ rm -rf ${pkgdir}/usr/share/pear/.{channels,depdb,depdblock,filemap,lock,registry}
}
package_php-enchant() {
@@ -294,7 +267,7 @@ package_php-enchant() {
}
package_php-gd() {
- depends=('php' 'libpng' 'libjpeg' 'freetype2')
+ depends=('php' 'libpng' 'libjpeg' 'freetype2' 'libvpx')
pkgdesc='gd module for PHP'
install -D -m755 ${srcdir}/build-php/modules/gd.so ${pkgdir}/usr/lib/php/modules/gd.so
}
diff --git a/extra/php/php-fpm.conf.in.patch b/extra/php/php-fpm.conf.in.patch
index b923edb38..4e0f4a888 100644
--- a/extra/php/php-fpm.conf.in.patch
+++ b/extra/php/php-fpm.conf.in.patch
@@ -1,5 +1,5 @@
--- sapi/fpm/php-fpm.conf.in 2011-10-08 23:04:10.000000000 +0200
-+++ sapi/fpm/php-fpm.conf.in 2012-01-11 10:50:14.905161442 +0100
++++ sapi/fpm/php-fpm.conf.in 2012-03-01 19:50:48.549947258 +0100
@@ -12,7 +12,7 @@
; Relative path can also be used. They will be prefixed by:
; - the global prefix if it's been set (-p arguement)
@@ -26,7 +26,7 @@
+;listen = 127.0.0.1:9000
+listen = /var/run/php-fpm/php-fpm.sock
- ; Set listen(2) backlog. A value of '-1' means unlimited.
+ ; Set listen(2) backlog.
; Default Value: 128 (-1 on FreeBSD and OpenBSD)
@@ -151,9 +152,9 @@
; BSD-derived systems allow connections regardless of permissions.
diff --git a/extra/php/php.ini.patch b/extra/php/php.ini.patch
index 3dc5b6560..bbaae2152 100644
--- a/extra/php/php.ini.patch
+++ b/extra/php/php.ini.patch
@@ -1,6 +1,6 @@
---- php.ini-production 2011-12-15 11:31:02.000000000 +0100
-+++ php.ini-production 2012-01-11 10:43:02.069936043 +0100
-@@ -376,7 +376,7 @@
+--- php.ini-production 2012-03-29 06:17:59.000000000 +0200
++++ php.ini-production 2012-03-30 10:46:21.181340861 +0200
+@@ -305,7 +305,7 @@
; or per-virtualhost web server configuration file. This directive is
; *NOT* affected by whether Safe Mode is turned On or Off.
; http://php.net/open-basedir
@@ -9,7 +9,7 @@
; This directive allows you to disable certain functions for security reasons.
; It receives a comma-delimited list of function names. This directive is
-@@ -793,7 +793,7 @@
+@@ -702,7 +702,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;
; UNIX: "/path1:/path2"
@@ -18,7 +18,7 @@
;
; Windows: "\path1;\path2"
;include_path = ".;c:\php\includes"
-@@ -816,7 +816,7 @@
+@@ -725,7 +725,7 @@
; Directory in which the loadable extensions (modules) reside.
; http://php.net/extension-dir
@@ -27,7 +27,7 @@
; On windows:
; extension_dir = "ext"
-@@ -950,53 +950,49 @@
+@@ -859,51 +859,47 @@
; If you only provide the name of the extension, PHP will look for it in its
; default extension directory.
;
@@ -55,7 +55,6 @@
-;extension=php_oci8_11g.dll ; Use with Oracle 11gR2 Instant Client
-;extension=php_openssl.dll
-;extension=php_pdo_firebird.dll
--;extension=php_pdo_mssql.dll
-;extension=php_pdo_mysql.dll
-;extension=php_pdo_oci.dll
-;extension=php_pdo_odbc.dll
@@ -71,7 +70,6 @@
-
-;extension=php_soap.dll
-;extension=php_sockets.dll
--;extension=php_sqlite.dll
-;extension=php_sqlite3.dll
-;extension=php_sybase_ct.dll
-;extension=php_tidy.dll
@@ -92,7 +90,6 @@
+;extension=iconv.so
+;extension=imap.so
+;extension=intl.so
-+extension=json.so
+;extension=ldap.so
+;extension=mcrypt.so
+;extension=mssql.so
@@ -113,7 +110,6 @@
+;extension=soap.so
+;extension=sockets.so
+;extension=sqlite3.so
-+;extension=sqlite.so
+;extension=sysvmsg.so
+;extension=sysvsem.so
+;extension=sysvshm.so
diff --git a/extra/telepathy-rakia/0001-Check-for-gio-to-avoid-linking-issue.patch b/extra/telepathy-rakia/0001-Check-for-gio-to-avoid-linking-issue.patch
new file mode 100644
index 000000000..7f3b033bd
--- /dev/null
+++ b/extra/telepathy-rakia/0001-Check-for-gio-to-avoid-linking-issue.patch
@@ -0,0 +1,29 @@
+From 797d2b3792a0d4c4260075c2b05a1aba63715363 Mon Sep 17 00:00:00 2001
+From: Ionut Biru <ibiru@archlinux.org>
+Date: Wed, 9 May 2012 17:34:10 +0000
+Subject: [PATCH] Check for gio to avoid linking issue
+
+/usr/bin/ld: note: 'g_inet_address_new_from_string' is defined in DSO
+/usr/lib/libgio-2.0.so.0 so try adding it to the linker command line
+
+Signed-off-by: Ionut Biru <ibiru@archlinux.org>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2a6cb2a..461d464 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -62,7 +62,7 @@ dnl GTK docs
+ GTK_DOC_CHECK
+
+ dnl Check for Glib
+-PKG_CHECK_MODULES(GLIB, gobject-2.0 >= 2.30, have_glib=yes, have_glib=no)
++PKG_CHECK_MODULES(GLIB, [gobject-2.0 >= 2.30, gio-2.0 >= 2.30], have_glib=yes, have_glib=no)
+
+ if test x$have_glib = xno ; then
+ AC_MSG_ERROR([GLib development libraries not found])
+--
+1.7.10.1
+
diff --git a/extra/telepathy-rakia/PKGBUILD b/extra/telepathy-rakia/PKGBUILD
index 991422eeb..300aaa381 100644
--- a/extra/telepathy-rakia/PKGBUILD
+++ b/extra/telepathy-rakia/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 151254 2012-02-25 10:06:13Z ibiru $
+# $Id: PKGBUILD 158778 2012-05-09 17:40:49Z ibiru $
# Maintainer : Ionut Biru <ibiru@archlinux.org>
pkgname=telepathy-rakia
-pkgver=0.7.3
+pkgver=0.7.4
pkgrel=1
pkgdesc="SIP connection manager for Telepathy"
arch=('i686' 'x86_64')
@@ -13,16 +13,20 @@ makedepends=('libxslt' 'python2')
install=telepathy-rakia.install
groups=('telepathy')
replaces=('telepathy-sofiasip')
-source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('dea76f93fe6234d18c6c7746c9ce0d6e')
+source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz
+ 0001-Check-for-gio-to-avoid-linking-issue.patch)
+md5sums=('f9f47f18db033afe29fd6963c7748e37'
+ '6d0372c4c8a22bf9682e4b45ee614d5c')
build() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd "$pkgname-$pkgver"
+ patch -Np1 -i $srcdir/0001-Check-for-gio-to-avoid-linking-issue.patch
+ autoreconf -fi
./configure --prefix=/usr --libexecdir=/usr/lib/telepathy
make
}
package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="${pkgdir}" install
+ cd "$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
}
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-08-13 16:05:27 +0000