summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libre-testing/libretools/PKGBUILD15
-rw-r--r--libre/abiword-libre/PKGBUILD6
-rw-r--r--libre/blender-libre/PKGBUILD4
-rw-r--r--libre/chroottools/PKGBUILD28
-rw-r--r--libre/cups-filters-libre/PKGBUILD4
-rw-r--r--libre/ghostscript-libre/PKGBUILD29
-rw-r--r--libre/gnu-ghostscript/PKGBUILD2
-rw-r--r--libre/gstreamer0.10-bad-libre/PKGBUILD4
-rw-r--r--libre/iceape-libre/PKGBUILD2
-rw-r--r--libre/icecat/PKGBUILD5
-rw-r--r--libre/icedove-libre/PKGBUILD2
-rw-r--r--libre/iceweasel-libre/PKGBUILD2
-rw-r--r--libre/iceweasel-libre/mozconfig4
-rw-r--r--libre/kdelibs-libre/PKGBUILD2
-rw-r--r--libre/mplayer-libre/PKGBUILD8
-rw-r--r--libre/soundkonverter-libre/PKGBUILD6
-rw-r--r--libre/texlive-bin-libre/PKGBUILD4
-rw-r--r--libre/virtualbox-libre/PKGBUILD4
-rw-r--r--pcr/jitsi/PKGBUILD48
-rw-r--r--pcr/jitsi/jitsi.desktop (renamed from ~emulatorman/jitsi/jitsi.desktop)0
-rw-r--r--pcr/jitsi/jitsi.sh17
-rw-r--r--~emulatorman/jitsi/PKGBUILD47
-rw-r--r--~emulatorman/jitsi/jitsi.sh20
23 files changed, 115 insertions, 148 deletions
diff --git a/libre-testing/libretools/PKGBUILD b/libre-testing/libretools/PKGBUILD
index 88960ddba..4974e0dad 100644
--- a/libre-testing/libretools/PKGBUILD
+++ b/libre-testing/libretools/PKGBUILD
@@ -8,17 +8,18 @@ pkgdesc="Programs for Parabola development"
url="https://projects.parabolagnulinux.org/packages/libretools.git/"
license=('GPL3+' 'GPL2')
-pkgver=20130503
-_libretools_commit=0db5eebebe64db0d8c3b29b629b066a3909aa61d
+pkgver=20130507
+_libretools_commit=4ce4e426012375a9b44df012a143139645880c0d
_devtools_commit=a1a79ff77bb19166bd5631953a71e3d3222e5f1c
-pkgrel=1
-arch=('any')
-
_packages_url=https://projects.parabolagnulinux.org/packages
source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.tar.bz2
$_packages_url/devtools-par.git/snapshot/devtools-par-$_devtools_commit.tar.bz2)
+pkgrel=1
+arch=('any')
+makedepends=(emacs) # emacs --batch is used during the build to process text
+
build() {
cd "$srcdir"
ln -sf devtools-par-$_devtools_commit devtools-par
@@ -30,6 +31,7 @@ package_libretools() {
backup=(etc/libretools.conf etc/libretools.d/chroot.conf etc/libretools.d/librefetch.conf)
install=libretools.install
groups=(base-devel)
+ replaces=(chroottools)
depends=(
arch-install-scripts # `archroot` uses `pacstrap`
@@ -41,7 +43,6 @@ package_libretools() {
wget # `aur` and `pkgbuild-check-nonfree`
)
optdepends=('namcap: to check package files')
- makedepends=(emacs) # emacs --batch is used during the build to process text
cd "$srcdir/$pkgbase-$_libretools_commit"
make install-libretools install-doc DESTDIR="$pkgdir"
@@ -56,5 +57,5 @@ package_libretools-mips64el() {
make install-libretools-mips64el DESTDIR="$pkgdir"
}
-md5sums=('dabae9bb6040431e8e2b84871a027237'
+md5sums=('84fc56b35cca1a05a434d31218dbb891'
'c5cd04723119762701db766cb8f6e5ef')
diff --git a/libre/abiword-libre/PKGBUILD b/libre/abiword-libre/PKGBUILD
index dce707766..248da54c7 100644
--- a/libre/abiword-libre/PKGBUILD
+++ b/libre/abiword-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 173824 2012-12-24 15:08:34Z jgc $
+# $Id: PKGBUILD 183900 2013-04-29 15:40:28Z bpiotrowski $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Maël Lavault <moimael@neuf.fr>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -7,7 +7,7 @@ _pkgbase=abiword
pkgbase=abiword-libre
pkgname=('abiword-libre' 'abiword-libre-plugins')
pkgver=2.8.6
-pkgrel=8.1
+pkgrel=9
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
url="http://www.abisource.com"
@@ -60,7 +60,7 @@ build() {
}
package_abiword-libre() {
- pkgdesc="A fully-featured word processor that doesn't recommend unfree fonts"
+ pkgdesc="A fully-featured word processor that doesn't recommend nonfree fonts"
depends=('fribidi' 'wv' 'goffice0.8' 'librsvg' 'enchant' 'desktop-file-utils')
install=$pkgname.install
optdepends=('abiword-libre-plugins')
diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD
index e303d8d2b..7e591dcee 100644
--- a/libre/blender-libre/PKGBUILD
+++ b/libre/blender-libre/PKGBUILD
@@ -13,7 +13,7 @@ fi
epoch=7
pkgver=2.66a
_pyver=3.3
-pkgrel=4
+pkgrel=5
pkgdesc="Fully integrated 3D graphics creation suite, without nonfree povray and cuda support$_spndesc"
arch=(
i686
@@ -30,7 +30,7 @@ depends=(
hicolor-icon-theme
'ilmbase=2.0.0'
jack
- libpng #1.5.15
+ 'libpng=1.6.2'
libtiff #4.0.3
openal #1.15.1
'openexr=2.0.0'
diff --git a/libre/chroottools/PKGBUILD b/libre/chroottools/PKGBUILD
deleted file mode 100644
index 55a7e165f..000000000
--- a/libre/chroottools/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-pkgname=chroottools
-pkgver=20121202
-pkgdesc='Chroot tools for Arch and Parabola package maintainers'
-url='https://projects.parabolagnulinux.org/packages/chroottools.git/'
-license=('GPL')
-
-pkgrel=2
-arch=('any')
-conflicts=(devtools)
-depends=(
- 'arch-install-scripts' # for pacstrap, used to make chroots
- 'curl' # used by checkpkg
-)
-source=("https://projects.parabolagnulinux.org/packages/${pkgname}.git/snapshot/${pkgname}-${pkgver}.tar")
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make PREFIX=/usr
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make PREFIX=/usr DESTDIR=${pkgdir} install
-}
-
-md5sums=('68bb7fb792c55031ad68a970b65ab793')
diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD
index 789a3fdd9..14af90cc6 100644
--- a/libre/cups-filters-libre/PKGBUILD
+++ b/libre/cups-filters-libre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 182682 2013-04-12 14:56:52Z andyrtr $
+# $Id: PKGBUILD 183882 2013-04-29 10:46:59Z foutrelis $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgname=cups-filters-libre
_pkgname=cups-filters
pkgver=1.0.34
-pkgrel=2
+pkgrel=3
pkgdesc="OpenPrinting CUPS Filters, without foomatic-db-nonfree recommendation"
arch=('i686' 'x86_64')
url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting"
diff --git a/libre/ghostscript-libre/PKGBUILD b/libre/ghostscript-libre/PKGBUILD
index cf00963b8..9aceaadd1 100644
--- a/libre/ghostscript-libre/PKGBUILD
+++ b/libre/ghostscript-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 178158 2013-02-17 10:57:03Z andyrtr $
+# $Id: PKGBUILD 183802 2013-04-28 00:51:13Z eric $
# Maintainer: AndyRTR <andyrtr@archlinux.org>
# Maintainer (Parabola): Joshua Haase <hahj87@gmail.com>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -6,8 +6,8 @@
_pkgname=ghostscript
pkgname=ghostscript-libre
pkgver=9.07
-pkgrel=1 # rebuild for mips64el -march
-pkgdesc="An interpreter for the PostScript language without non-free files"
+pkgrel=2
+pkgdesc="An interpreter for the PostScript language without nonfree files"
arch=('i686' 'x86_64' 'mips64el')
license=('AGPL') #non free files removed
depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng>=1.5.7' 'libjpeg'
@@ -24,7 +24,7 @@ options=('!libtool')
md5sums=('eea27befc1e85bef6d4768202f6b03a5')
build() {
- cd ${srcdir}/ghostscript-${pkgver}
+ cd ghostscript-${pkgver}
# delete non-free packages
grep -l "are not altered" Resource/CMap/* | xargs rm -fv
@@ -51,7 +51,7 @@ build() {
make
# Build IJS
- cd ${srcdir}/ghostscript-${pkgver}/ijs
+ cd ijs
sed -i "s:AM_PROG_CC_STDC:AC_PROG_CC:g" configure.ac
./autogen.sh
./configure --prefix=/usr --enable-shared --disable-static
@@ -59,21 +59,20 @@ build() {
}
package() {
- cd ${srcdir}/ghostscript-${pkgver}
- make -j1 DESTDIR=${pkgdir} \
- cups_serverroot=${pkgdir}/etc/cups \
- cups_serverbin=${pkgdir}/usr/lib/cups install soinstall
+ cd ghostscript-${pkgver}
+ make -j1 DESTDIR="${pkgdir}" \
+ cups_serverroot="${pkgdir}"/etc/cups \
+ cups_serverbin="${pkgdir}"/usr/lib/cups install soinstall
# install missing doc files # http://bugs.archlinux.org/task/18023
- install -m 644 ${srcdir}/ghostscript-${pkgver}/doc/{Ps2ps2.htm,gs-vms.hlp,gsdoc.el,pscet_status.txt} ${pkgdir}/usr/share/ghostscript/$pkgver/doc/
+ install -m 644 "${srcdir}"/ghostscript-${pkgver}/doc/{Ps2ps2.htm,gs-vms.hlp,gsdoc.el,pscet_status.txt} "${pkgdir}"/usr/share/ghostscript/$pkgver/doc/
- mkdir -p ${pkgdir}/usr/share/licenses/${_pkgname}
- install -m644 LICENSE ${pkgdir}/usr/share/licenses/${_pkgname}/
+ install -D -m644 LICENSE "${pkgdir}"/usr/share/licenses/${_pkgname}/LICENSE
# remove unwanted localized man-pages
- rm -rf $pkgdir/usr/share/man/[^man1]*
+ rm -rf "$pkgdir"/usr/share/man/[^man1]*
# install IJS
- cd ${srcdir}/ghostscript-${pkgver}/ijs
- make -j1 DESTDIR=${pkgdir} install
+ cd ijs
+ make -j1 DESTDIR="${pkgdir}" install
}
diff --git a/libre/gnu-ghostscript/PKGBUILD b/libre/gnu-ghostscript/PKGBUILD
index 18d64ea9c..827222b39 100644
--- a/libre/gnu-ghostscript/PKGBUILD
+++ b/libre/gnu-ghostscript/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gnu-ghostscript
_gspkgver=9.07 # ghostscript package version
_pkgver=9.06
pkgver=9.06.0
-pkgrel=2
+pkgrel=3
pkgdesc="An interpreter for the PostScript language maintained by a team of GNU programmers"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL3')
diff --git a/libre/gstreamer0.10-bad-libre/PKGBUILD b/libre/gstreamer0.10-bad-libre/PKGBUILD
index 1fddeb016..686f41e06 100644
--- a/libre/gstreamer0.10-bad-libre/PKGBUILD
+++ b/libre/gstreamer0.10-bad-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 168313 2012-10-08 14:04:19Z heftig $
+# $Id: PKGBUILD 183943 2013-04-29 17:33:53Z bpiotrowski $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -6,7 +6,7 @@
pkgbase=gstreamer0.10-bad-libre
pkgname=('gstreamer0.10-bad-libre' 'gstreamer0.10-bad-libre-plugins')
pkgver=0.10.23
-pkgrel=3.2
+pkgrel=4
arch=('i686' 'x86_64' 'mips64el')
license=('LGPL' 'GPL')
makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.36' 'xvidcore' 'libdca' 'bzip2' 'libdc1394' 'neon' 'musicbrainz' 'faad2' 'libmms' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav' 'libmodplug' 'jasper' 'liblrdf' 'libofa' 'soundtouch' 'libvdpau' 'schroedinger' 'libass' 'libvpx' 'gsm' 'libgme' 'rtmpdump' 'libsndfile' 'librsvg' 'wildmidi' 'opus')
diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD
index aeb4d528f..09cceb4db 100644
--- a/libre/iceape-libre/PKGBUILD
+++ b/libre/iceape-libre/PKGBUILD
@@ -11,7 +11,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
_pkgname=${_debname}
pkgname=${_debname}-libre
pkgver=${_debver}.${_debrel}
-pkgrel=6
+pkgrel=7
pkgdesc="A libre version of Debian Iceape, the internet suite based on SeaMonkey."
arch=('i686' 'x86_64' 'mips64el')
license=('MPL' 'GPL' 'LGPL')
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index d32a96d52..23749dafd 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -14,7 +14,7 @@ _pgo=true
pkgname=icecat
pkgver=17.0.1
-pkgrel=7
+pkgrel=8
pkgdesc='GNU IceCat, the standalone web browser based on Mozilla Firefox.'
arch=(i686 x86_64 mips64el)
license=(MPL GPL LGPL)
@@ -99,8 +99,7 @@ prepare() {
# configure script misdetects the preprocessor without an optimization level
# https://bugs.archlinux.org/task/34644
- # TODO: re-enable when we're building with GCC >= 4.8 again
- #sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure
+ sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure
}
build() {
diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD
index b16e32620..f440369e1 100644
--- a/libre/icedove-libre/PKGBUILD
+++ b/libre/icedove-libre/PKGBUILD
@@ -11,7 +11,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
_pkgname=${_debname}
pkgname=${_debname}-libre
pkgver=${_debver}.${_debrel}
-pkgrel=1
+pkgrel=2
pkgdesc="A libre version of Debian Icedove, the standalone mail/news reader based on Mozilla Thunderbird."
arch=('i686' 'x86_64' 'mips64el')
license=('MPL' 'GPL' 'LGPL')
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 314d5ca6d..b3c907179 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -54,7 +54,7 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch)
md5sums=('22daa24b6490c654f131550cbf20fad3'
'0c70ab52f35701558081df3d360361a2'
- '01f56b3ccbead0f665ed82fae0b8f290'
+ 'f90c6a70d0a6d0a9e7f9a0eed6aeffd3'
'383e8e2a97a8b13fe56d153adb6878b6'
'5addd418bf32b673fdfe80c8fefbea1a'
'7b9e5996dd9fe0b186a43a297db1c6b5'
diff --git a/libre/iceweasel-libre/mozconfig b/libre/iceweasel-libre/mozconfig
index d7961bf41..c929b8972 100644
--- a/libre/iceweasel-libre/mozconfig
+++ b/libre/iceweasel-libre/mozconfig
@@ -13,9 +13,7 @@ ac_add_options --with-system-nss
ac_add_options --with-system-jpeg
ac_add_options --with-system-zlib
ac_add_options --with-system-bz2
-# Build with bundled libpng to avoid flickering tab loading icon
-# https://bugzilla.mozilla.org/show_bug.cgi?id=841734
-#ac_add_options --with-system-png
+ac_add_options --with-system-png
ac_add_options --with-system-libevent
ac_add_options --with-system-libvpx
ac_add_options --enable-system-hunspell
diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD
index 86d209821..5f91616a0 100644
--- a/libre/kdelibs-libre/PKGBUILD
+++ b/libre/kdelibs-libre/PKGBUILD
@@ -6,7 +6,7 @@
_pkgname=kdelibs
pkgname=kdelibs-libre
pkgver=4.10.2
-pkgrel=3
+pkgrel=4
pkgdesc="KDE Core Libraries"
arch=('i686' 'x86_64' 'mips64el')
url='https://projects.kde.org/projects/kde/kdelibs'
diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD
index e5023f3cb..5ad383873 100644
--- a/libre/mplayer-libre/PKGBUILD
+++ b/libre/mplayer-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 178232 2013-02-18 16:28:11Z ioni $
+# $Id: PKGBUILD 183981 2013-04-30 09:11:10Z bpiotrowski $
# Maintainer : Ionut Biru <ibiru@archlinux.org>
# Contributor: Hugo Doria <hugo@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -8,7 +8,7 @@ _pkgbase=mplayer
pkgbase=mplayer-libre
pkgname=('mplayer-libre' 'mencoder-libre')
pkgver=35920
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64' 'mips64el')
makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient'
'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx'
@@ -49,7 +49,7 @@ build() {
}
package_mplayer-libre() {
- pkgdesc="A movie player for GNU/Linux (without unfree faac support)"
+ pkgdesc="A movie player for GNU/Linux, without nonfree faac support"
install=mplayer.install
backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
depends=('desktop-file-utils' 'ttf-dejavu' 'enca' 'libxss' 'a52dec' 'libvpx' 'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig' 'libgl'
@@ -72,7 +72,7 @@ package_mplayer-libre() {
}
package_mencoder-libre() {
- pkgdesc="Free command line video decoding, encoding and filtering tool (without unfree faac support)"
+ pkgdesc="Free command line video decoding, encoding and filtering tool, without nonfree faac support"
depends=('enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' 'opencore-amr'
'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faad2' 'schroedinger' 'mpg123' 'libass' 'libbluray' 'libcdio-paranoia' 'libvorbis')
provides=("mencoder=$pkgver")
diff --git a/libre/soundkonverter-libre/PKGBUILD b/libre/soundkonverter-libre/PKGBUILD
index b37ef217c..a5c04bec4 100644
--- a/libre/soundkonverter-libre/PKGBUILD
+++ b/libre/soundkonverter-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: PKGBUILD 90159 2013-05-07 13:40:35Z stativ $
# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
# Contributor: Mateusz Herych <heniekk@gmail.com>
# Contributor: Eric Belanger <eric@archlinux.org>
@@ -7,7 +7,7 @@
_pkgname=soundkonverter
pkgname=soundkonverter-libre
-pkgver=2.0.1
+pkgver=2.0.2
pkgrel=1
pkgdesc="Front-end to various audio converters, without nonfree faac and mac recommendation"
arch=('i686' 'x86_64')
@@ -36,7 +36,7 @@ conflicts=$_pkgname
provides=$_pkgname=$pkgver
install=$_pkgname.install
source=("http://kde-apps.org/CONTENT/content-files/29024-${_pkgname}-${pkgver}.tar.gz")
-md5sums=('d4f039003954c5279e56113237f608ca')
+md5sums=('08076f9d8c017d8c31f18b94bc9e6878')
build() {
cd "$srcdir"/$_pkgname-$pkgver
diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD
index 1f8199a48..c5843d4e7 100644
--- a/libre/texlive-bin-libre/PKGBUILD
+++ b/libre/texlive-bin-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 183235 2013-04-18 23:55:16Z remy $
+# $Id: PKGBUILD 183993 2013-04-30 14:22:00Z foutrelis $
# Maintainer: Rémy Oudompheng <remy@archlinux.org>
# Contributor: francois <francois.archlinux.org>
# Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
@@ -6,7 +6,7 @@
pkgname=texlive-bin-libre
pkgver=2012.0
-pkgrel=10
+pkgrel=11
pkgdesc="TeX Live binaries, without biber binaries (Parabola rebranded)"
license=('GPL')
arch=('i686' 'x86_64' 'mips64el')
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index 709edc49e..2810d1266 100644
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: PKGBUILD 89632 2013-04-30 16:22:22Z foutrelis $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
# Maintainer (Parabola): Nicolas Reynolds <fauno@kiwwwi.com.ar>
@@ -13,7 +13,7 @@ pkgname=('virtualbox-libre'
'virtualbox-libre-sdk'
'virtualbox-libre-guest-utils')
pkgver=4.2.12
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url='http://virtualbox.org'
license=('GPL' 'custom')
diff --git a/pcr/jitsi/PKGBUILD b/pcr/jitsi/PKGBUILD
new file mode 100644
index 000000000..788d4f435
--- /dev/null
+++ b/pcr/jitsi/PKGBUILD
@@ -0,0 +1,48 @@
+# Maintainer: Xavier Devlamynck <magicrhesus@ouranos.be>
+# Contributors: Keshav P R, atommix aka Aleks Lifey, Xavion, Ananda Samaddar, Dan Serban, Xyne
+
+pkgname=jitsi
+pkgver=2.0.4506.10553
+pkgrel=6
+pkgdesc="An audio/video SIP VoIP phone and instant messenger written in Java (formerly SIP-Communicator)"
+arch=('i686' 'x86_64')
+url="http://jitsi.org"
+license=('LGPL')
+depends=('java-runtime')
+makedepends=('apache-ant' 'java-environment')
+options=(!strip !emptydirs zipman !libtool docs)
+source=("http://download.jitsi.org/jitsi/src/jitsi-src-${pkgver}.zip"
+ jitsi.desktop
+ jitsi.sh)
+sha256sums=('939adbda52b5aa19592bcd5edf5c77e1bcbbcaa4d0fcdb59c6b5c9e4a10b1e7d'
+ '61e3bec3470790fa067f87d978016ec4452a6fd3dfba2c9afa5245b58d3cb19d'
+ '529722efc3bae6cb8923680363a4d778ccf78db9caf20bee90a110d34181d9f5')
+
+build()
+{
+ cd "${srcdir}/${pkgname}"
+ # append the build revision to the jitsi version
+ sed -i "s/0\.build\.by\.SVN/build.${pkgver}/" src/net/java/sip/communicator/impl/version/NightlyBuildID.java
+ . /etc/profile.d/apache-ant.sh
+ ant rebuild
+}
+
+package() {
+ cd "${srcdir}/${pkgname}"
+ find lib/ lib/bundle/ -maxdepth 1 -type f \
+ -exec install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/"{} \;
+ find lib/os-specific/linux/ -maxdepth 1 -type f \
+ -execdir install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/lib/"{} \;
+ shopt -sq extglob
+ find lib/native/linux$(sed 's/_/-/g' <<<${CARCH/#*(i?86|x86)/})/ -maxdepth 1 -type f \
+ -execdir install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/lib/native/"{} \;
+ find sc-bundles/{,os-specific/linux/} -maxdepth 1 -type f \
+ -execdir install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/sc-bundles/"{} \;
+ install -Dm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
+ install -Dm644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+
+ cd "resources/install/debian/"
+ for _file in *.{svg,xpm}; do
+ install -Dm644 "$_file" "${pkgdir}/usr/share/pixmaps/${_file}"
+ done
+}
diff --git a/~emulatorman/jitsi/jitsi.desktop b/pcr/jitsi/jitsi.desktop
index dd4de82a6..dd4de82a6 100644
--- a/~emulatorman/jitsi/jitsi.desktop
+++ b/pcr/jitsi/jitsi.desktop
diff --git a/pcr/jitsi/jitsi.sh b/pcr/jitsi/jitsi.sh
new file mode 100644
index 000000000..6e53cdbf5
--- /dev/null
+++ b/pcr/jitsi/jitsi.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+CLIENTARGS=""
+uname -m | grep i686 && CLIENTARGS="-client -Xmx256m"
+
+SCDIR=/usr/lib/jitsi
+LIBPATH="$SCDIR/lib"
+CLASSPATH="$LIBPATH/jdic_stub.jar:$LIBPATH/jdic-all.jar:$LIBPATH/felix.jar:$LIBPATH/bcprovider.jar:$SCDIR/sc-bundles/sc-launcher.jar:$SCDIR/sc-bundles/util.jar"
+FELIX_CONFIG="$LIBPATH/felix.client.run.properties"
+LOG_CONFIG="$LIBPATH/logging.properties"
+COMMAND=("$JAVA_HOME/bin/java" $CLIENTARGS -classpath "$CLASSPATH" -Djna.library.path="$LIBPATH/native" -Dfelix.config.properties="file:$FELIX_CONFIG" -Djava.util.logging.config.file="$LOG_CONFIG" net.java.sip.communicator.launcher.SIPCommunicator)
+
+export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIBPATH/native"
+
+cd "$SCDIR"
+
+exec "${COMMAND[@]}" "$@"
diff --git a/~emulatorman/jitsi/PKGBUILD b/~emulatorman/jitsi/PKGBUILD
deleted file mode 100644
index 61460bd5c..000000000
--- a/~emulatorman/jitsi/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# Maintainer: Xavier Devlamynck <magicrhesus@ouranos.be>
-# Contributors: Keshav P R, atommix aka Aleks Lifey, Xavion, Ananda Samaddar, Dan Serban
-
-pkgname=jitsi
-pkgver=1.0.3967
-pkgrel=3
-pkgdesc="An audio/video SIP VoIP phone and instant messenger written in Java (formerly SIP-Communicator)"
-arch=('i686' 'x86_64')
-url="http://jitsi.org"
-license=('LGPL')
-depends=('java-runtime')
-makedepends=('apache-ant' 'java-environment')
-options=(!strip !emptydirs zipman !libtool docs)
-source=("http://download.jitsi.org/jitsi/src/jitsi-src-1.0-build.${pkgver##*.}.zip"
- jitsi.desktop
- jitsi.sh)
-md5sums=('0fb7aaaad551177c3037ae570ca2f2e1'
- 'aad7cf1fb18ff5d7c964834ecc38aed8'
- 'b36c119d2005507e38cd5cb68f4ba31a')
-
-build()
-{
- cd ${srcdir}/${pkgname}
- # append the build revision to the jitsi version
- sed -i "s/0\.build\.by\.SVN/build.${pkgver##*.}/" src/net/java/sip/communicator/impl/version/NightlyBuildID.java
- . /etc/profile.d/apache-ant.sh
- ant rebuild
-}
-
-package() {
- cd ${srcdir}/${pkgname}
- find lib/ lib/bundle/ -maxdepth 1 -type f \
- -exec install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/"{} \;
- find lib/os-specific/linux/ -maxdepth 1 -type f \
- -execdir install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/lib/"{} \;
- shopt -sq extglob
- find lib/native/linux$(sed 's/_/-/g' <<<${CARCH/#*(i?86|x86)/})/ -maxdepth 1 -type f \
- -execdir install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/lib/native/"{} \;
- find sc-bundles/{,os-specific/linux/} -maxdepth 1 -type f \
- -execdir install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/sc-bundles/"{} \;
- install -Dm755 "$srcdir/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
- install -Dm644 "$srcdir/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
- local _file
- for _file in resources/install/debian/*.{svg,xpm}; do
- install -Dm644 "$_file" "${pkgdir}/usr/share/pixmaps/${pkgname}${_file/*sip-communicator/}"
- done
-}
diff --git a/~emulatorman/jitsi/jitsi.sh b/~emulatorman/jitsi/jitsi.sh
deleted file mode 100644
index 71dba6a36..000000000
--- a/~emulatorman/jitsi/jitsi.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-CLIENTARGS=""
-uname -m | grep i686 && CLIENTARGS="-client -Xmx256m"
-
-javabin=/usr/bin/java
-
-SCDIR=/usr/lib/jitsi
-LIBPATH=$SCDIR/lib
-CLASSPATH=$LIBPATH/jdic_stub.jar:$LIBPATH/jdic-all.jar:$LIBPATH/felix.jar:$LIBPATH/bcprovider.jar:$SCDIR/sc-bundles/sc-launcher.jar:$SCDIR/sc-bundles/util.jar
-FELIX_CONFIG=$LIBPATH/felix.client.run.properties
-LOG_CONFIG=$LIBPATH/logging.properties
-COMMAND="$javabin $CLIENTARGS -classpath $CLASSPATH -Djna.library.path=$LIBPATH/native -Dfelix.config.properties=file:$FELIX_CONFIG -Djava.util.logging.config.file=$LOG_CONFIG net.java.sip.communicator.launcher.SIPCommunicator"
-
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LIBPATH/native
-
-cd $SCDIR
-
-exec $COMMAND $*
-