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

6 files changed, 36 insertions, 10 deletions

diff --git a/libre/atool-libre/PKGBUILD b/libre/atool-libre/PKGBUILD
index 7ec4d7c1e..ea1dfec52 100644
--- a/libre/atool-libre/PKGBUILD
+++ b/libre/atool-libre/PKGBUILD
@@ -3,12 +3,12 @@
 # Contributor: leif_thande <leif.thande@gmail.com>
 # Contributor: tranquility <trankas@gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Contributor (Parabola): Márcio Silva <coadde@adinet.com.uy>
+# Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
 
 _pkgname=atool
 pkgname=atool-libre
-pkgver=0.38.0
-pkgrel=3
+pkgver=0.39.0
+pkgrel=1
 pkgdesc="A script for managing file archives of various types"
 arch=('any')
 url="http://www.nongnu.org/atool/"
@@ -29,7 +29,7 @@ optdepends=('bzip2: for using atool with bzip2 compressed archives'
             'unzip: for using atool for unpacking archives')
 
 source=(http://savannah.nongnu.org/download/$_pkgname/$_pkgname-$pkgver.tar.gz)
-sha256sums=('b967195facbe5e7c6535ac117aaa7f633b0eca174137c30c36a5200efb80047d')
+sha256sums=('aaf60095884abb872e25f8e919a8a63d0dabaeca46faeba87d12812d6efc703b')
 
 
 build() {
diff --git a/libre/atool-libre/ChangeLog b/libre/atool-libre/atool.changelog
index aec63e70f..ce0b12c2b 100644
--- a/libre/atool-libre/ChangeLog
+++ b/libre/atool-libre/atool.changelog
@@ -1,3 +1,13 @@
+2012-04-19 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* atool 0.39.0-1
+
+2012-02-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* atool 0.38.0-2
+	* signing package
+
+2011-08-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* Updated to major version 0.38.0
+
 2009-08-16 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* Updated to major version 0.37.0
 
@@ -6,4 +16,3 @@
 
 2008-10-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* Moved to [community] repo
-
diff --git a/libre/crosstool-ng/PKGBUILD b/libre/crosstool-ng/PKGBUILD
index 2aa38fca6..425e3d9e4 100644
--- a/libre/crosstool-ng/PKGBUILD
+++ b/libre/crosstool-ng/PKGBUILD
@@ -1,8 +1,9 @@
 # Contributor: jwwolf <jwwolf+arch@gmail.com>
 # Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
+# Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
 
 pkgname=crosstool-ng
-pkgver=1.15.2
+pkgver=1.15.3
 pkgrel=1
 pkgdesc="A versatile cross toolchain generator (eglibc addons patch)"
 arch=('i686' 'x86_64')
@@ -26,4 +27,4 @@ package() {
   cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
 }
-md5sums=('0d03314debb73de37a72014632bf1ab3')
+md5sums=('a56d55f7173161b5200c144cdff6f564')
diff --git a/libre/dvdrip-libre/PKGBUILD b/libre/dvdrip-libre/PKGBUILD
index b9cd0c8ff..2069f1c8a 100644
--- a/libre/dvdrip-libre/PKGBUILD
+++ b/libre/dvdrip-libre/PKGBUILD
@@ -1,12 +1,12 @@
 # $Id$
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Fredrik Hammar <Horney_C86@Hotmail.com>
-# Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
 _pkgname=dvdrip
 pkgname=dvdrip-libre
 pkgver=0.98.11
-pkgrel=10
+pkgrel=10.1
 pkgdesc="A Gtk frontend for transcode writen in Perl, without opcional hal and unfree rar dependencies"
 arch=('i686' 'x86_64')
 license=('custom')
diff --git a/libre/epdfview-libre/PKGBUILD b/libre/epdfview-libre/PKGBUILD
index 9923ad1cf..28c77eed8 100644
--- a/libre/epdfview-libre/PKGBUILD
+++ b/libre/epdfview-libre/PKGBUILD
@@ -3,11 +3,12 @@
 # Maintainer: schuay <jakob.gruber@gmail.com>
 # Contributor: Tom K <tomk@runbox.com>
 # Contributor: Thayer Williams <thayer@archlinux.org>
+# Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy>
 
 pkgname=epdfview-libre
 _pkgname=epdfview
 pkgver=0.1.8
-pkgrel=3
+pkgrel=4
 pkgdesc="A free lightweight PDF document viewer."
 url="http://www.emma-soft.com/projects/epdfview/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -20,9 +21,11 @@ replaces=('epdfview')
 install='epdfview.install'
 source=("http://www.emma-soft.com/projects/${_pkgname}/chrome/site/releases/${_pkgname}-${pkgver}.tar.bz2"
         "${_pkgname}.desktop.patch"
+        "glib2_headers.patch"
         "0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch")
 md5sums=('e50285b01612169b2594fea375f53ae4'
          'fbf22bbabdbb7544db615ac5775d57e2'
+         '41b30f53f20472cbc2fcd4eae161125e'
          '7f9ea101a41f5b4e999fd024f423d41f')
 
 build() {
@@ -30,6 +33,7 @@ build() {
 
   patch -Np0 -i "${srcdir}/${_pkgname}.desktop.patch"
   patch -Np1 -i "${srcdir}/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch"
+  patch -Np1 -i "${srcdir}/glib2_headers.patch" # FS#30116
 
   # Use xdg-open as default browser.
   sed -r '/DEFAULT_EXTERNAL_BROWSER_COMMAND_LINE/s/firefox[^ ]*/xdg-open/' -i src/Config.cxx
diff --git a/libre/epdfview-libre/glib2_headers.patch b/libre/epdfview-libre/glib2_headers.patch
new file mode 100644
index 000000000..b5bc5c211
--- /dev/null
+++ b/libre/epdfview-libre/glib2_headers.patch
@@ -0,0 +1,12 @@
+diff --git a/src/gtk/StockIcons.h b/src/gtk/StockIcons.h
+index c142a7a..58fcf2e 100644
+--- a/src/gtk/StockIcons.h
++++ b/src/gtk/StockIcons.h
+@@ -18,7 +18,7 @@
+ #if !defined (__STOCK_ICONS_H__)
+ #define __STOCK_ICONS_H__
+
+-#include <glib/gmacros.h>
++#include <glib.h>
+
+ G_BEGIN_DECLS