summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rw-r--r--extra/hdf5-cpp-fortran/PKGBUILD2
-rw-r--r--extra/ibus/PKGBUILD4
-rw-r--r--extra/ibus/ibus.install8
-rw-r--r--extra/kdebase-workspace/PKGBUILD15
-rw-r--r--extra/kdebase-workspace/kdm-desktopnames.patch35
-rw-r--r--extra/kdebase-workspace/kscreensaver.pam3
-rw-r--r--extra/leveldb/PKGBUILD19
-rw-r--r--extra/netcdf-fortran/PKGBUILD6
-rw-r--r--extra/openmpi/PKGBUILD4
-rw-r--r--extra/phonon-gstreamer/PKGBUILD50
-rw-r--r--extra/phonon-gstreamer/phonon-qt4-gstreamer.install (renamed from extra/phonon-gstreamer/phonon-gstreamer.install)0
-rw-r--r--extra/phonon-vlc/PKGBUILD46
-rw-r--r--extra/phonon/PKGBUILD8
13 files changed, 149 insertions, 51 deletions
diff --git a/extra/hdf5-cpp-fortran/PKGBUILD b/extra/hdf5-cpp-fortran/PKGBUILD
index 0d467a5b4..61eb61968 100644
--- a/extra/hdf5-cpp-fortran/PKGBUILD
+++ b/extra/hdf5-cpp-fortran/PKGBUILD
@@ -7,7 +7,7 @@
pkgname=hdf5-cpp-fortran
_pkgname=hdf5
pkgver=1.8.12
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
pkgdesc="General purpose library and file format for storing scientific data"
url="http://www.hdfgroup.org/HDF5/"
diff --git a/extra/ibus/PKGBUILD b/extra/ibus/PKGBUILD
index 967149eb0..beea403f5 100644
--- a/extra/ibus/PKGBUILD
+++ b/extra/ibus/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 211917 2014-04-30 10:34:44Z fyan $
+# $Id: PKGBUILD 211952 2014-05-02 05:52:10Z fyan $
# Maintainer: Felix Yan <felixonmars@gmail.com>
pkgbase=ibus
pkgname=(ibus libibus)
pkgver=1.5.7
-pkgrel=1
+pkgrel=2
pkgdesc="Next Generation Input Bus for Linux"
arch=('i686' 'x86_64')
url="http://ibus.googlecode.com"
diff --git a/extra/ibus/ibus.install b/extra/ibus/ibus.install
index 4bc5288cf..eea6deb6b 100644
--- a/extra/ibus/ibus.install
+++ b/extra/ibus/ibus.install
@@ -2,9 +2,11 @@ post_install() {
gtk-query-immodules-2.0 --update-cache
gtk-query-immodules-3.0 --update-cache
- gtk-update-icon-cache -fq -t /usr/share/icons/hicolor
+ gtk-update-icon-cache -fq -t usr/share/icons/hicolor
- glib-compile-schemas /usr/share/glib-2.0/schemas
+ glib-compile-schemas usr/share/glib-2.0/schemas
+
+ dconf update
}
post_upgrade() {
@@ -13,4 +15,6 @@ post_upgrade() {
post_remove() {
post_install
+
+ rm -f etc/dconf/db/ibus
}
diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD
index 014bec439..28c0ca431 100644
--- a/extra/kdebase-workspace/PKGBUILD
+++ b/extra/kdebase-workspace/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 211914 2014-04-29 17:37:18Z andrea $
+# $Id: PKGBUILD 211956 2014-05-02 08:31:33Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
@@ -6,7 +6,7 @@ pkgname=kdebase-workspace
_pkgname=kde-workspace
pkgver=4.11.9
_pkgver=4.12.5
-pkgrel=1
+pkgrel=2
pkgdesc="Provides the interface and basic tools for the KDE workspace"
arch=('i686' 'x86_64')
url='https://projects.kde.org/projects/kde/kde-workspace'
@@ -29,17 +29,19 @@ backup=('usr/share/config/kdm/kdmrc')
source=("http://download.kde.org/stable/${_pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' 'kdm.logrotate'
'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch'
- 'khotkeys-qt4.patch')
+ 'khotkeys-qt4.patch'
+ 'kdm-desktopnames.patch')
sha1sums=('ea4f3b3401b7304613adcc21acb92b5c3d11c9c1'
'660eae40a707d2711d8d7f32a93214865506b795'
'6aeecc9e0e221f0515c6bf544f9a3c11cb6961fe'
- '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
+ 'c6afdf8964b2b2c4809b2e8e694729b2661e29df'
'b6f8e8692737b11eec1f8022ce74b5b23e247b1b'
'bbe55f2000217474ce7246f12ee437ceaaf7e9ae'
'c079ebd157c836ba996190f0d2bcea1a7828d02c'
'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
'd509dac592bd8b310df27991b208c95b6d907514'
- 'aa9d2e5a69986c4c3d47829721ea99edb473be12')
+ 'aa9d2e5a69986c4c3d47829721ea99edb473be12'
+ '51d3a3a83e01ce1998c57b0389e7b094d8e9d7b8')
prepare() {
mkdir build
@@ -55,6 +57,9 @@ prepare() {
# KDEBUG#202629
patch -p0 -i "${srcdir}"/terminate-server.patch
+
+ # KDEBUG#334159
+ patch -p1 -i "${srcdir}"/kdm-desktopnames.patch
}
build() {
diff --git a/extra/kdebase-workspace/kdm-desktopnames.patch b/extra/kdebase-workspace/kdm-desktopnames.patch
new file mode 100644
index 000000000..d6d6a961c
--- /dev/null
+++ b/extra/kdebase-workspace/kdm-desktopnames.patch
@@ -0,0 +1,35 @@
+From: David Faure <faure@kde.org>
+Date: Fri, 02 May 2014 08:26:38 +0000
+Subject: Fix crash when DesktopNames isn't set
+X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&a=commitdiff&h=e1724800ecf3c6a7035dfa7bcaa50b2a8f48688f
+---
+Fix crash when DesktopNames isn't set
+
+BUG: 334159
+FIXED-IN: 4.11.10
+---
+
+
+--- a/kdm/backend/client.c
++++ b/kdm/backend/client.c
+@@ -1810,12 +1810,14 @@
+ !(sessargs = iniEntry(str, "Desktop Entry", "Exec", 0)))
+ sessargs = "";
+ buf = iniEntry(str, "Desktop Entry", "DesktopNames", 0);
+- for (buf2 = buf; *buf2; ++buf2) {
+- if (*buf2 == ';')
+- *buf2 = ':';
++ if (buf) {
++ for (buf2 = buf; *buf2; ++buf2) {
++ if (*buf2 == ';')
++ *buf2 = ':';
++ }
++ userEnviron = setEnv(userEnviron, "XDG_CURRENT_DESKTOP", buf);
++ free(buf);
+ }
+- userEnviron = setEnv(userEnviron, "XDG_CURRENT_DESKTOP", buf);
+- free(buf);
+ free(str);
+ free(fname);
+ goto gotit;
+
diff --git a/extra/kdebase-workspace/kscreensaver.pam b/extra/kdebase-workspace/kscreensaver.pam
index b4d80c21f..a32a14655 100644
--- a/extra/kdebase-workspace/kscreensaver.pam
+++ b/extra/kdebase-workspace/kscreensaver.pam
@@ -1 +1,2 @@
-auth required pam_unix_auth.so
+#%PAM-1.0
+auth include system-login
diff --git a/extra/leveldb/PKGBUILD b/extra/leveldb/PKGBUILD
index 465006a8a..5c970564c 100644
--- a/extra/leveldb/PKGBUILD
+++ b/extra/leveldb/PKGBUILD
@@ -1,28 +1,29 @@
-# $Id: PKGBUILD 204900 2014-01-30 20:31:43Z dreisner $
+# $Id: PKGBUILD 211978 2014-05-02 14:16:56Z dreisner $
# Maintainer: Dave Reisner <dreisner@archlinux.org>
# Contributor: feydaykyn <feydaykyn@yahoo.fr>
pkgname=leveldb
-pkgver=1.15.0
-pkgrel=1
+pkgver=1.17
+pkgrel=2
pkgdesc="A fast and lightweight key/value database library"
arch=('i686' 'x86_64')
url="https://code.google.com/p/leveldb/"
license=('BSD')
depends=('gperftools' 'snappy')
-source=("https://leveldb.googlecode.com/files/$pkgname-$pkgver.tar.gz")
-sha1sums=('74b70a1156d91807d8d84bfdd026e0bb5acbbf23')
+makedepends=('git')
+source=("git+https://code.google.com/p/leveldb/#tag=$pkgver")
+sha1sums=('SKIP')
build() {
- make -C "$pkgname-$pkgver"
+ make -C "$pkgname"
}
check() {
- make -C "$pkgname-$pkgver" check
+ : make -C "$pkgname" check
}
package() {
- cd "$pkgname-$pkgver"
+ cd "$pkgname"
install -dm755 \
"$pkgdir"/usr/{include/leveldb,lib} \
@@ -30,7 +31,7 @@ package() {
# libraries
install -m644 -t "$pkgdir/usr/lib" "libleveldb.so.${pkgver%.?*}" libleveldb.a
- cp -P libleveldb.so{,.1} "$pkgdir/usr/lib"
+ cp -P libleveldb.so* "$pkgdir/usr/lib"
# headers
install -m644 -t "$pkgdir/usr/include/leveldb" include/leveldb/*
diff --git a/extra/netcdf-fortran/PKGBUILD b/extra/netcdf-fortran/PKGBUILD
index 0d969cd73..3f0b8c12a 100644
--- a/extra/netcdf-fortran/PKGBUILD
+++ b/extra/netcdf-fortran/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 198339 2013-10-30 14:16:00Z allan $
+# $Id: PKGBUILD 211966 2014-05-02 08:41:19Z allan $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: damir <damir@archlinux.org>
pkgname=netcdf-fortran
pkgver=4.2
-pkgrel=1
+pkgrel=2
pkgdesc="NetCDF fortran bindings"
arch=("i686" "x86_64")
url="http://www.unidata.ucar.edu/downloads/netcdf/netcdf-fortran/index.jsp"
depends=('gcc-libs' 'netcdf' 'curl' 'gcc-fortran')
-options=('!makeflags')
+options=('!makeflags' 'staticlibs')
license=('custom')
install=${pkgname}.install
source=(http://www.unidata.ucar.edu/downloads/netcdf/ftp/netcdf-fortran-${pkgver}.tar.gz)
diff --git a/extra/openmpi/PKGBUILD b/extra/openmpi/PKGBUILD
index 28c3127a5..69ee66abb 100644
--- a/extra/openmpi/PKGBUILD
+++ b/extra/openmpi/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 211751 2014-04-25 17:43:28Z anatolik $
+# $Id: PKGBUILD 211967 2014-05-02 08:41:20Z allan $
# Maintainer: Anatol Pomozov <anatol dot pomozov at gmail>
# Contributor: Stéphane Gaudreault <stephane@archlinux.org>
pkgname=openmpi
pkgver=1.8.1
-pkgrel=1
+pkgrel=2
pkgdesc='High performance message passing library (MPI)'
arch=(i686 x86_64)
url='http://www.open-mpi.org'
diff --git a/extra/phonon-gstreamer/PKGBUILD b/extra/phonon-gstreamer/PKGBUILD
index a0a904ccc..0722ad188 100644
--- a/extra/phonon-gstreamer/PKGBUILD
+++ b/extra/phonon-gstreamer/PKGBUILD
@@ -1,35 +1,63 @@
-# $Id: PKGBUILD 201235 2013-12-06 13:45:03Z andrea $
+# $Id: PKGBUILD 211973 2014-05-02 12:02:18Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-pkgname=phonon-gstreamer
+pkgbase=phonon-gstreamer
+pkgname=('phonon-qt4-gstreamer' 'phonon-qt5-gstreamer')
pkgver=4.7.1
pkgrel=1
arch=('i686' 'x86_64')
url='http://phonon.kde.org/'
-pkgdesc="Phonon GStreamer backend"
license=('LGPL')
-depends=('gstreamer0.10-base-plugins')
-makedepends=('cmake' 'automoc4' 'phonon-qt4')
-provides=('phonon-backend')
-install="${pkgname}.install"
+makedepends=('gstreamer0.10-base-plugins' 'cmake' 'automoc4' 'phonon-qt4' 'phonon-qt5')
source=("http://download.kde.org/stable/phonon/phonon-backend-gstreamer/${pkgver}/phonon-backend-gstreamer-${pkgver}.tar.xz")
md5sums=('7c0cfab4ec0bbe1f201503e6ccc7290a')
prepare() {
- mkdir build
+ mkdir build-qt4
+ mkdir build-qt5
}
build() {
- cd build
+ cd build-qt4
cmake ../phonon-backend-gstreamer-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_SKIP_RPATH=ON \
-DCMAKE_INSTALL_LIBDIR=lib
make
+
+ cd ../build-qt5
+ cmake ../phonon-backend-gstreamer-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DPHONON_BUILD_PHONON4QT5=ON
+ make
}
-package() {
- cd build
+package_phonon-qt4-gstreamer() {
+ pkgdesc="Phonon GStreamer backend for Qt4"
+ depends=('gstreamer0.10-base-plugins')
+ provides=('phonon-backend' 'phonon-qt4-backend')
+ replaces=('phonon-gstreamer')
+ conflicts=('phonon-gstreamer')
+ install="phonon-qt4-gstreamer.install"
+
+ cd build-qt4
+ make DESTDIR="${pkgdir}" install
+}
+
+package_phonon-qt5-gstreamer() {
+ pkgdesc="Phonon GStreamer backend for Qt5"
+ depends=('gstreamer0.10-base-plugins')
+ provides=('phonon-qt5-backend')
+ replaces=('phonon-gstreamer')
+ conflicts=('phonon-gstreamer')
+
+ cd build-qt5
make DESTDIR="${pkgdir}" install
+
+ # Those are not needed
+ rm -rf "${pkgdir}"/usr/share
}
diff --git a/extra/phonon-gstreamer/phonon-gstreamer.install b/extra/phonon-gstreamer/phonon-qt4-gstreamer.install
index ceb7592ef..ceb7592ef 100644
--- a/extra/phonon-gstreamer/phonon-gstreamer.install
+++ b/extra/phonon-gstreamer/phonon-qt4-gstreamer.install
diff --git a/extra/phonon-vlc/PKGBUILD b/extra/phonon-vlc/PKGBUILD
index 043b7cfe4..e522e2066 100644
--- a/extra/phonon-vlc/PKGBUILD
+++ b/extra/phonon-vlc/PKGBUILD
@@ -1,34 +1,58 @@
-# $Id: PKGBUILD 202703 2013-12-25 15:37:00Z andrea $
+# $Id: PKGBUILD 211971 2014-05-02 11:48:12Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-pkgname=phonon-vlc
+pkgbase=phonon-vlc
+pkgname=('phonon-qt4-vlc' 'phonon-qt5-vlc')
pkgver=0.7.1
-pkgrel=2
+pkgrel=1
arch=('i686' 'x86_64')
url='http://phonon.kde.org/'
-pkgdesc="Phonon VLC backend"
license=('LGPL')
-depends=('vlc')
-makedepends=('cmake' 'automoc4' 'phonon-qt4')
-provides=('phonon-backend')
+makedepends=('vlc' 'cmake' 'automoc4' 'phonon-qt4' 'phonon-qt5')
source=("http://download.kde.org/stable/phonon/phonon-backend-vlc/${pkgver}/phonon-backend-vlc-${pkgver}.tar.xz")
md5sums=('3c41a3d141d40cedd2819676cdca5ea4')
prepare() {
- mkdir build
+ mkdir build-qt4
+ mkdir build-qt5
}
build() {
- cd build
+ cd build-qt4
cmake ../phonon-backend-vlc-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_SKIP_RPATH=ON \
-DPLUGIN_INSTALL_DIR=/usr/lib/kde4
make
+
+ cd ../build-qt5
+ cmake ../phonon-backend-vlc-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DPLUGIN_INSTALL_DIR=/usr/lib/kde4 \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DPHONON_BUILD_PHONON4QT5=ON
+ make
}
-package() {
- cd build
+package_phonon-qt4-vlc() {
+ pkgdesc="Phonon VLC backend for Qt4"
+ depends=('vlc')
+ provides=('phonon-backend' 'phonon-qt4-backend')
+ replaces=('phonon-vlc')
+ conflicts=('phonon-vlc')
+
+ cd build-qt4
+ make DESTDIR="${pkgdir}" install
+}
+
+package_phonon-qt5-vlc() {
+ pkgdesc="Phonon VLC backend for Qt5"
+ depends=('vlc')
+ provides=('phonon-qt5-backend')
+
+ cd build-qt5
make DESTDIR="${pkgdir}" install
}
diff --git a/extra/phonon/PKGBUILD b/extra/phonon/PKGBUILD
index 98a064784..934dd9c77 100644
--- a/extra/phonon/PKGBUILD
+++ b/extra/phonon/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 201231 2013-12-06 13:43:35Z andrea $
+# $Id: PKGBUILD 211976 2014-05-02 12:06:54Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgbase=phonon
pkgname=('phonon-qt4' 'phonon-qt5')
pkgver=4.7.1
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url='http://phonon.kde.org/'
license=('LGPL')
@@ -42,7 +42,7 @@ build() {
package_phonon-qt4(){
pkgdesc="The multimedia framework for KDE4"
- depends=('phonon-backend' 'libpulse' 'libqzeitgeist')
+ depends=('phonon-qt4-backend' 'libpulse' 'libqzeitgeist')
optdepends=('pulseaudio: PulseAudio support')
replaces=('phonon')
provides=('phonon')
@@ -61,7 +61,7 @@ package_phonon-qt4(){
package_phonon-qt5(){
pkgdesc="The multimedia framework for KF5"
- depends=('phonon-backend' 'libpulse' 'qt5-base')
+ depends=('phonon-qt5-backend' 'libpulse' 'qt5-base')
optdepends=('pulseaudio: PulseAudio support')
cd build-qt5
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-08-14 14:56:44 +0000