Merge branch 'master' of ssh://projects.parabola.nu/~git/abslibre/abslibre

4 files changed, 138 insertions, 0 deletions

diff --git a/pcr/beast2/PKGBUILD b/pcr/beast2/PKGBUILD
new file mode 100644
index 000000000..52720625c
--- /dev/null
+++ b/pcr/beast2/PKGBUILD
@@ -0,0 +1,27 @@
+# Maintainer : Aurelien Desbrieres <aurelien@hackers.camp>
+# Maintainer: Christian Krause ("wookietreiber") <kizkizzbangbang@googlemail.com>
+
+pkgname=beast2
+pkgver=2.1.3
+pkgrel=1
+pkgdesc='Bayesian Evolutionary Analysis by Sampling Trees'
+arch=(any)
+url="http://www.beast2.org/"
+license=('GPL2')
+depends=('bash' 'java-runtime')
+source=(https://github.com/CompEvol/beast2/releases/download/v$pkgver/BEAST.v$pkgver.tgz)
+
+package() {
+  cd $srcdir
+
+  mkdir -p $pkgdir/usr/bin
+  mkdir -p $pkgdir/usr/share
+
+  cp -r BEAST $pkgdir/usr/share/beast2
+
+  cd $pkgdir/usr/bin
+
+  for i in ../share/beast2/bin/* ; do
+    ln -s $i
+  done
+}
diff --git a/pcr/lxappearance-gtk3/0001-Substitute-the-correct-GTK-version-in-pkgconfig-file.patch b/pcr/lxappearance-gtk3/0001-Substitute-the-correct-GTK-version-in-pkgconfig-file.patch
new file mode 100644
index 000000000..f196036e6
--- /dev/null
+++ b/pcr/lxappearance-gtk3/0001-Substitute-the-correct-GTK-version-in-pkgconfig-file.patch
@@ -0,0 +1,37 @@
+From 88739b20109dc775fe152daeac7fff38d23420e4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Mon, 15 Dec 2014 17:27:09 +0100
+Subject: [PATCH] Substitute the correct GTK+ version in pkgconfig file
+
+This fixes the build of GTK+ 3 version of lxappearance-obconf.
+---
+ configure.ac            | 1 +
+ data/lxappearance.pc.in | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index a91c34b..2ba5d34 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -88,6 +88,7 @@ gmodule_modules="gmodule-export-2.0"
+ PKG_CHECK_MODULES(GMODULE, [$gmodule_modules])
+ AC_SUBST(GMODULE_CFLAGS)
+ AC_SUBST(GMODULE_LIBS)
++AC_SUBST(gtk_modules)
+ 
+ # gio_modules="gthread-2.0 gio-unix-2.0 glib-2.0 >= 2.18.0"
+ # PKG_CHECK_MODULES(GIO, [$gio_modules])
+diff --git a/data/lxappearance.pc.in b/data/lxappearance.pc.in
+index 9abd35e..e711a31 100644
+--- a/data/lxappearance.pc.in
++++ b/data/lxappearance.pc.in
+@@ -6,5 +6,5 @@ datadir=@datadir@
+ 
+ Name: lxappearance
+ Description: Tool used to customize look and feel of gtk+ applications.
+-Requires: gtk+-2.0 >= 2.12
++Requires: @gtk_modules@
+ Version: @VERSION@
+-- 
+2.1.3
+
diff --git a/pcr/lxappearance-gtk3/0002-Fix-About-dialog-for-GTK-3.patch b/pcr/lxappearance-gtk3/0002-Fix-About-dialog-for-GTK-3.patch
new file mode 100644
index 000000000..04cacfbdd
--- /dev/null
+++ b/pcr/lxappearance-gtk3/0002-Fix-About-dialog-for-GTK-3.patch
@@ -0,0 +1,27 @@
+From a29d071de300708dc27cc3fa6cc1f3993824a954 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Thu, 18 Dec 2014 13:27:20 +0100
+Subject: [PATCH 2/2] Fix About dialog for GTK+ 3
+
+---
+ data/ui/about.glade.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/ui/about.glade.in b/data/ui/about.glade.in
+index e1b1975..04f09f8 100644
+--- a/data/ui/about.glade.in
++++ b/data/ui/about.glade.in
+@@ -4,9 +4,9 @@
+     <property name="border_width">5</property>
+     <property name="window_position">center-on-parent</property>
+     <property name="type_hint">dialog</property>
+-    <property name="has_separator">False</property>
+     <property name="program_name">LXAppearance</property>
+     <property name="version">@VERSION@</property>
++    <property name="logo_icon_name">preferences-desktop-theme</property>
+     <property name="copyright" translatable="yes">Copyright (C) 2008-2014 LXDE Project</property>
+     <property name="comments" translatable="yes">Customizes look and feel of your desktop</property>
+     <property name="website">http://lxde.org/</property>
+-- 
+2.1.3
+
diff --git a/pcr/lxappearance-gtk3/PKGBUILD b/pcr/lxappearance-gtk3/PKGBUILD
new file mode 100644
index 000000000..210037f22
--- /dev/null
+++ b/pcr/lxappearance-gtk3/PKGBUILD
@@ -0,0 +1,47 @@
+#$Id$
+# Maintainer : Aurelien Desbrieres <aurelien@hackers.camp>
+# Contributor: Balló György <ballogyor+arch at gmail dot com>
+# Contributor:  Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
+# Contributor: Angel Velasquez <angvp@archlinux.org>
+# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
+
+pkgname=lxappearance-gtk3
+_pkgname=lxappearance
+pkgver=0.6.1
+pkgrel=1
+pkgdesc='Feature-rich GTK+ theme switcher of the LXDE Desktop (GTK+ 3 version)'
+arch=('i686' 'x86_64')
+license=('GPL2')
+url='http://lxde.org/'
+groups=('lxde-gtk3')
+depends=('gtk3')
+makedepends=('intltool' 'dbus-glib')
+conflicts=($_pkgname)
+provides=($_pkgname)
+source=(http://downloads.sourceforge.net/lxde/$_pkgname-$pkgver.tar.xz
+        0001-Substitute-the-correct-GTK-version-in-pkgconfig-file.patch
+        0002-Fix-About-dialog-for-GTK-3.patch)
+
+prepare() {
+  cd $_pkgname-$pkgver
+
+  # Substitute the correct GTK+ version in pkgconfig file
+  patch -Np1 -i ../0001-Substitute-the-correct-GTK-version-in-pkgconfig-file.patch
+
+  # Fix About dialog for GTK+ 3
+  patch -Np1 -i ../0002-Fix-About-dialog-for-GTK-3.patch
+
+  autoreconf -fi
+}
+
+build() {
+  cd $_pkgname-$pkgver
+  ./configure --sysconfdir=/etc --prefix=/usr \
+    --enable-dbus --enable-gtk3
+  make
+}
+
+package() {
+  cd $_pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}