Merge branch 'master' of vparabola:abslibre

14 files changed, 121 insertions, 25 deletions

diff --git a/libre/claws-mail-libre/PKGBUILD b/libre/claws-mail-libre/PKGBUILD
index 5ee1fec05..723f4c5d2 100644
--- a/libre/claws-mail-libre/PKGBUILD
+++ b/libre/claws-mail-libre/PKGBUILD
@@ -4,14 +4,14 @@
 
 _pkgname=claws-mail
 pkgname=$_pkgname-libre
-pkgver=3.9.1
+pkgver=3.9.2
 pkgrel=3
 pkgdesc='A GTK+ based e-mail client, without nonfree PalmOS handheld devices support'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
 url="http://www.$_pkgname.org"
 depends=('gtk2' 'gnutls' 'startup-notification' 'enchant'
-         'gpgme' 'libetpan>=1.1' 'libsm' 'db' 'dbus-glib' 'hicolor-icon-theme' 'desktop-file-utils')
+         'gpgme' 'libetpan>=1.1-4' 'libsm' 'dbus-glib' 'hicolor-icon-theme' 'desktop-file-utils')
 makedepends=('compface' 'spamassassin' 'bogofilter' 'valgrind' 
              # dependencies for plugins
              'libsoup' 'libgdata' 'webkitgtk2' 'libnotify' 'libcanberra' 'poppler-glib' 'pygtk') 
@@ -38,7 +38,7 @@ provides=("$_pkgname=$pkgver" 'claws')
 options=(!libtool)
 install=$_pkgname.install
 source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/$_pkgname-$pkgver.tar.bz2{,.asc})
-md5sums=('8adc734912ff1b83545cb12850100473'
+md5sums=('90de2a265e65fbd9dffdbf428bb0ee28'
          'SKIP')
 
 build() {
diff --git a/libre/file-roller-libre/PKGBUILD b/libre/file-roller-libre/PKGBUILD
index 6ea777a16..5c6865833 100644
--- a/libre/file-roller-libre/PKGBUILD
+++ b/libre/file-roller-libre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 189275 2013-07-02 07:37:30Z heftig $
+# $Id: PKGBUILD 193443 2013-08-20 09:36:30Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 _pkgname=file-roller
 pkgname=file-roller-libre
-pkgver=3.8.3
+pkgver=3.8.4
 pkgrel=1
 pkgdesc="Create and modify archives, with unar recommendation included and nonfree unace recommendation removed"
 arch=('i686' 'x86_64' 'mips64el')
@@ -23,7 +23,7 @@ options=('!libtool' '!emptydirs')
 install=file-roller.install
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver::3}/$_pkgname-$pkgver.tar.xz)
-sha256sums=('55caac832ed0bab89085fdf7a3c3fa1afaf8ae6fb05aeb2a872e42cb6c52894e')
+sha256sums=('3615bc41bbe28030d16ee414a8f5f9a3e37f745733c39032ef1559a06be3eea8')
 
 build() {
   cd $_pkgname-$pkgver
diff --git a/libre/mcomix-libre/PKGBUILD b/libre/mcomix-libre/PKGBUILD
index aba53582b..97e796231 100644
--- a/libre/mcomix-libre/PKGBUILD
+++ b/libre/mcomix-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 91436 2013-05-22 14:15:00Z schuay $
+# $Id: PKGBUILD 95818 2013-08-17 10:12:09Z schuay $
 # Maintainer: schuay <jakob.gruber@gmail.com>
 # Contributor: Ray Powell <ray_al@xphoniexx.net>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -6,13 +6,13 @@
 _pkgname=mcomix
 pkgname=mcomix-libre
 pkgver=1.00
-pkgrel=3
+pkgrel=4
 pkgdesc="A user-friendly, customizable image viewer specifically designed to handle comic books, with unar recommendation"
 arch=('any')
 url="http://sourceforge.net/projects/mcomix/"
 license=('GPL')
 depends=('pygtk' 'python-imaging' 'xdg-utils' 'python2' \
-         'desktop-file-utils' 'hicolor-icon-theme' 'python2-distribute')
+         'desktop-file-utils' 'hicolor-icon-theme' 'python2-setuptools')
 makedepends=('gettext' 'intltool')
 optdepends=('unar: for rar compressed comics')
 conflicts=('mcomix' 'comix')
diff --git a/libre/tp_smapi-libre-lts/PKGBUILD b/libre/tp_smapi-libre-lts/PKGBUILD
index 23900636f..f726d9a8c 100644
--- a/libre/tp_smapi-libre-lts/PKGBUILD
+++ b/libre/tp_smapi-libre-lts/PKGBUILD
@@ -12,7 +12,7 @@ pkgname=tp_smapi-libre-lts
 _pkgname=tp_smapi
 _extramodules=/usr/lib/modules/extramodules-3.0-LIBRE-LTS
 pkgver=0.41
-pkgrel=11
+pkgrel=12
 pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre-lts kernel package)"
 arch=('i686' 'x86_64' 'mips64el')
 url='https://github.com/evgeni/tp_smapi'
diff --git a/libre/unar/PKGBUILD b/libre/unar/PKGBUILD
index 2fa84cdf1..1ca533b9b 100644
--- a/libre/unar/PKGBUILD
+++ b/libre/unar/PKGBUILD
@@ -3,8 +3,8 @@
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgname=unar
-pkgver=1.6
-pkgrel=3
+pkgver=1.7
+pkgrel=1
 pkgdesc="An Objective-C application for uncompressing archive files"
 arch=('x86_64' 'i686' 'mips64el')
 url="http://unarchiver.c3.cx/"
@@ -39,5 +39,5 @@ package() {
 }
 
 # vim:set ts=2 sw=2 et:
-md5sums=('bab77e196569f8f571f29c14e2d78daa'
+md5sums=('c714bbd0b51f5c1d27044c229528c286'
          '4fa4ecc6e4ba14d3b6952d064e728511')
diff --git a/libre/usermin/PKGBUILD b/libre/usermin/PKGBUILD
index 9225de264..6f7eab297 100644
--- a/libre/usermin/PKGBUILD
+++ b/libre/usermin/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 185710 2013-05-17 13:08:03Z tpowa $
+# $Id: PKGBUILD 193449 2013-08-20 10:13:15Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=usermin
-pkgver=1.550
+pkgver=1.560
 pkgrel=1
 pkgdesc="a web interface that can be used to easily perform tasks like reading mail, setting up SSH or configuring mail forwarding (Parabola rebranded)"
 arch=(i686 x86_64 mips64el)
@@ -124,6 +124,6 @@ package() {
   #install license
   install -m 644 -D "$srcdir"/$pkgname-$pkgver/LICENCE "$pkgdir"/usr/share/licenses/usermin/LICENCE
 }
-md5sums=('ba764af4b40a7e11be69985e19a81562'
+md5sums=('155af20dc957aca8a05bfd69d7ccf23a'
          'a5bd5e5ee779f8a3cf3d776ca77ee36e'
          'ec37a79f948f778224550930d2a7ca07')
diff --git a/libre/webmin/PKGBUILD b/libre/webmin/PKGBUILD
index 0c46c87ea..cd16179bc 100644
--- a/libre/webmin/PKGBUILD
+++ b/libre/webmin/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 192511 2013-08-13 11:01:17Z tpowa $
+# $Id: PKGBUILD 193451 2013-08-20 10:13:52Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=webmin
-pkgver=1.640
+pkgver=1.650
 pkgrel=1
 pkgdesc="a web-based interface for system administration (Parabola rebranded)"
 arch=(i686 x86_64 mips64el)
@@ -210,7 +210,7 @@ package() {
   # install license
   install -m 644 -D "$srcdir"/$pkgname-$pkgver/LICENCE "$pkgdir"/usr/share/licenses/webmin/LICENCE
 }
-md5sums=('d1d26e2df24be907e36bd1e63c1f41bf'
+md5sums=('b4d6370698fdd5e9ba930583ba0d10a3'
          'b0b3e3fb231a12e60165b6b4d604dcfa'
          'c86518037449e0fc0c60fc24537ea038'
          'fc29ecb6a5cd8c278abe054e60381095')
diff --git a/nonprism/bitlbee-nonprism/PKGBUILD b/nonprism/bitlbee-nonprism/PKGBUILD
index 58a6b9d14..d181f3b9f 100644
--- a/nonprism/bitlbee-nonprism/PKGBUILD
+++ b/nonprism/bitlbee-nonprism/PKGBUILD
@@ -1,8 +1,16 @@
+# $Id: PKGBUILD 186656 2013-05-30 12:19:35Z dreisner $
+
+# Contributor: FUBAR <mrfubar@gmail.com>
+# Contributor: simo <simo@archlinux.org>
+# Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+# Contributor: Gaetan Bisson <bisson@archlinux.org>
+# Maintainer: Dave Reisner <dreisner@archlinux.org>
 
 _pkgname=bitlbee
 pkgname=bitlbee-nonprism
 pkgver=3.2
-pkgrel=1
+pkgrel=3
 pkgdesc='Brings XMPP to IRC, without support for unsafe and dangerous for privacy protocols'
 url='http://www.bitlbee.org/'
 license=('GPL')
diff --git a/nonprism/choqok-nonprism/PKGBUILD b/nonprism/choqok-nonprism/PKGBUILD
new file mode 100644
index 000000000..abbb4073a
--- /dev/null
+++ b/nonprism/choqok-nonprism/PKGBUILD
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Peter Richard Lewis <plewis@aur.archlinux.org>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Emanuele Rossi <newdna1510@yahoo.it>
+# Contributor: Bram Schoenmakers <me@bramschoenmakers.nl>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+
+_pkgname=choqok
+pkgname=choqok-nonprism
+pkgver=1.3
+pkgrel=4.2
+pkgdesc="A status.net client for KDE, without Twitter support"
+url='http://choqok.gnufolks.org/'
+license=('GPL')
+arch=('i686' 'x86_64' 'mips64el')
+depends=('kdebase-runtime' 'qjson' 'qoauth' 'qca-ossl')
+makedepends=('cmake' 'automoc4')
+optdepends=('kdebase-konqueror-libre: proxy support')
+provides=("$_pkgname=$pkgver")
+conflicts=$_pkgname
+replaces=$_pkgname
+install="${_pkgname}.install"
+source=("http://downloads.sourceforge.net/${_pkgname}/${_pkgname}-${pkgver}.tar.bz2")
+md5sums=('87eea4f2c23467fb021e3e6b794eb37d')
+
+prepare() {
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+
+  # remove twitter service and keep only twitterapi (choqok software) for status.net and open collaboration services
+  sed -i '\|add_subdirectory(twitter)|d' microblogs/CMakeLists.txt
+  sed -i 's|twitter[.]com|status.net|' microblogs/laconica/laconicamicroblog.cpp
+  sed -i 's|twitter[.]com|status.net|' microblogs/laconica/laconicasearch.cpp
+
+  # remove uploaders plugin (with only nonprivacy services)
+  sed -i '\|add_subdirectory(uploaders)|d' plugins/CMakeLists.txt
+  sed -i 's|Comment||' plugins/searchaction/choqok_searchaction.desktop
+
+  # remove twitter on docbook
+  sed -i 's| and Twitter.com||
+          s| and another with the alias|.</para>|
+          s|while a post using Twitter is called a tweet||
+          \|Twitter|d;\|twitter|d' doc/index.docbook
+}
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../${_pkgname}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+
+  # This is already installed by kdepimlibs >= 4.9.80
+  rm "${pkgdir}"/usr/share/apps/cmake/modules/FindQtOAuth.cmake
+}
diff --git a/nonprism/choqok-nonprism/choqok.install b/nonprism/choqok-nonprism/choqok.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/nonprism/choqok-nonprism/choqok.install
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/nonprism/claws-mail-libre-nonprism/PKGBUILD b/nonprism/claws-mail-libre-nonprism/PKGBUILD
index 871526a56..099b6e1a0 100644
--- a/nonprism/claws-mail-libre-nonprism/PKGBUILD
+++ b/nonprism/claws-mail-libre-nonprism/PKGBUILD
@@ -4,14 +4,14 @@
 
 _pkgname=claws-mail
 pkgname=$_pkgname-libre-nonprism
-pkgver=3.9.1
+pkgver=3.9.2
 pkgrel=3.1
 pkgdesc='A GTK+ based e-mail client, without nonfree PalmOS handheld devices and libgdata support'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
 url="http://www.$_pkgname.org"
 depends=('gtk2' 'gnutls' 'startup-notification' 'enchant'
-         'gpgme' 'libetpan>=1.1' 'libsm' 'db' 'dbus-glib' 'hicolor-icon-theme' 'desktop-file-utils')
+         'gpgme' 'libetpan>=1.1-4' 'libsm' 'dbus-glib' 'hicolor-icon-theme' 'desktop-file-utils')
 makedepends=('compface' 'spamassassin' 'bogofilter' 'valgrind' 
              # dependencies for plugins
              'libsoup' 'webkitgtk2' 'libnotify' 'libcanberra' 'poppler-glib' 'pygtk') 
@@ -37,7 +37,7 @@ provides=("$_pkgname=$pkgver" 'claws')
 options=(!libtool)
 install=$_pkgname.install
 source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/$_pkgname-$pkgver.tar.bz2{,.asc})
-md5sums=('8adc734912ff1b83545cb12850100473'
+md5sums=('90de2a265e65fbd9dffdbf428bb0ee28'
          'SKIP')
 
 build() {
diff --git a/nonprism/claws-mail-libre-nonprism/claws-mail.install b/nonprism/claws-mail-libre-nonprism/claws-mail.install
new file mode 100644
index 000000000..4d2f155d4
--- /dev/null
+++ b/nonprism/claws-mail-libre-nonprism/claws-mail.install
@@ -0,0 +1,16 @@
+post_install() {
+  echo "install \"html2ps\" from AUR to add support for printing html mails with fancy plugin"
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
+}
+
+post_remove() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
+}
+
diff --git a/pcr/python2-qrencode/PKGBUILD b/pcr/python2-qrencode/PKGBUILD
index 9661db1bc..dd58c1885 100644
--- a/pcr/python2-qrencode/PKGBUILD
+++ b/pcr/python2-qrencode/PKGBUILD
@@ -9,7 +9,7 @@ pkgname="${_python}-${_name}"
 pkgver=1.01
 pkgrel=4
 pkgdesc="Encodes QR-codes."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://pypi.python.org/pypi/${_name}"
 license=('Apache')
 depends=("${_python}" 'qrencode')
diff --git a/pcr/zbar/PKGBUILD b/pcr/zbar/PKGBUILD
index 120161a11..199fc2bb8 100644
--- a/pcr/zbar/PKGBUILD
+++ b/pcr/zbar/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=zbar
 pkgver=0.10
 pkgrel=3
 pkgdesc="Application and library for reading bar codes from various sources"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://zbar.sourceforge.net/"
 license=('LGPL')
 depends=('imagemagick' 'libxv')