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

8 files changed, 209 insertions, 4 deletions

diff --git a/pcr/cairo-compmgr/PKGBUILD b/pcr/cairo-compmgr/PKGBUILD
new file mode 100644
index 000000000..92e2f77bd
--- /dev/null
+++ b/pcr/cairo-compmgr/PKGBUILD
@@ -0,0 +1,59 @@
+# Maintainer (Arch): Cedric Girard <girard.cedric@gmail.com>
+# Contributor (Arch): Florian Pritz <flo@xinu.at>
+# Contributor (Arch): Adam Hani Schakaki (krzd) <krzd@krzd.net>
+# Contributor (Arch): Det <nimetonmaili at gmail a-dot com>
+# Contributor (Arch): catalyst <catalyst@xaker.ru>
+# Contributor (Arch): Devin Cofer <ranguvar{AT]archlinux[DOT}us>
+# Contributor (Arch): jackobw
+# Contributor (Arch): Gianni Vialetto <g dot vialetto at gmail dot com>
+
+pkgname=cairo-compmgr
+pkgver=0.3.1
+pkgrel=9
+epoch=2
+pkgdesc="A Cairo based composite manager"
+arch=(i686 x86_64)
+url="https://github.com/gandalfn/Cairo-Composite-Manager"
+license=(LGPL)
+makedepends=(gettext gtk-doc "intltool>=0.41" git)
+depends=("gtk2>=2.16.0" "vala>=0.26" libsm libgl gconf)
+install=cairo-compmgr.install
+options=(!libtool)
+source=(https://github.com/downloads/gandalfn/Cairo-Composite-Manager/$pkgname-$pkgver.tar.bz2
+        'https://github.com/gandalfn/Cairo-Composite-Manager/pull/4.diff'
+        'bfd_ansidecl.patch'
+)
+md5sums=('4ef285e0735b1a61b5db2205a2d8f8b3'
+         '011074cd9687475ebf9ac93fc1f535aa'
+         'b316779ffe9f86ada7ed601ae433789b')
+
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  #patch for compatibility with vala 0.26
+  sed -i 's!libvala-0.16!libvala-0.26!' configure.ac
+  sed -i 's!libvala-0.16!libvala-0.26!' vapi/cairo-compmgr.deps
+
+  #patch needed to build with newer deps version
+  patch -p1 < ../4.diff
+
+  #bfd.h should include ansidecl.h
+  patch -p2 < ../bfd_ansidecl.patch
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./autogen.sh --prefix=/usr LIBS="-ldl -lgmodule-2.0 -lz"
+  make
+
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+  mkdir -p "$pkgdir/usr/share/gconf/schemas/"
+  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/cairo-compmgr.schemas" "$pkgdir/etc/gconf/schemas/*.schemas"
+  rm -rf "$pkgdir/etc/gconf/schemas/"
+}
diff --git a/pcr/cairo-compmgr/bfd_ansidecl.patch b/pcr/cairo-compmgr/bfd_ansidecl.patch
new file mode 100644
index 000000000..17a902826
--- /dev/null
+++ b/pcr/cairo-compmgr/bfd_ansidecl.patch
@@ -0,0 +1,14 @@
+diff -Naur src/cairocompmgr/src/ccm-debug.c src/cairocompmgr-patched/src/ccm-debug.c
+--- src/cairocompmgr/src/ccm-debug.c	2014-05-30 14:08:02.434448854 +0200
++++ src/cairocompmgr-patched/src/ccm-debug.c	2014-05-30 14:13:57.447482643 +0200
+@@ -55,8 +55,9 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <execinfo.h>
+-#include <bfd.h>
+ #include <libiberty/libiberty.h>
++#include <libiberty/ansidecl.h>
++#include <bfd.h>
+ #include <dlfcn.h>
+ #include <link.h>
+ #endif /* HAVE_EDEBUG */
diff --git a/pcr/cairo-compmgr/cairo-compmgr.install b/pcr/cairo-compmgr/cairo-compmgr.install
new file mode 100644
index 000000000..21c829413
--- /dev/null
+++ b/pcr/cairo-compmgr/cairo-compmgr.install
@@ -0,0 +1,17 @@
+post_install() {
+  gconfpkg --install cairo-compmgr
+}
+
+pre_upgrade() {
+  gconfpkg --uninstall cairo-compmgr
+}
+
+post_upgrade() {
+  gconfpkg --install cairo-compmgr
+}
+
+pre_remove() {
+  gconfpkg --uninstall cairo-compmgr
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/idjc/PKGBUILD b/pcr/idjc/PKGBUILD
index 4596ad841..83455fc24 100644
--- a/pcr/idjc/PKGBUILD
+++ b/pcr/idjc/PKGBUILD
@@ -4,8 +4,8 @@
 # Contributor (Arch): Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=idjc
-pkgver=0.8.9
-pkgrel=2
+pkgver=0.8.14
+pkgrel=1
 pkgdesc='Powerful yet easy-to-use source-client for individuals interested in streaming live radio shows over the Internet'
 url='http://idjc.sourceforge.net/'
 license=('GPL2')
@@ -39,3 +39,4 @@ package() {
 }
 
 md5sums=('99abfe98f13170ab6b1ed17a8f1632e1')
+md5sums=('0b1068b5be415a73288f8f9bd449c69c')
diff --git a/pcr/libshout-idjc/PKGBUILD b/pcr/libshout-idjc/PKGBUILD
index 51578c420..f0bf2c4c5 100644
--- a/pcr/libshout-idjc/PKGBUILD
+++ b/pcr/libshout-idjc/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: fauno, based on the git version from
 # Mantainer: M0Rf30
 pkgname=libshout-idjc
-pkgver=2.3.0
+pkgver=2.3.1
 pkgrel=1
 pkgdesc="Libshout-idjc is libshout plus some extensions for IDJC."
 arch=(i686 x86_64)
@@ -10,7 +10,6 @@ depends=('libvorbis' 'libtheora' 'speex')
 options=('!libtool' '!emptydirs')
 source=("http://downloads.sourceforge.net/project/idjc/${pkgname}/${pkgname}-${pkgver}.tar.gz")
 license=('LGPL')
-md5sums=('1b92ee05f42a957169a74a911cd94afc')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver/"
@@ -23,3 +22,4 @@ package() {
   make DESTDIR="${pkgdir}" install
 }
 
+md5sums=('7b2cb89f1e7863522597b1e27fd4a2b7')
diff --git a/pcr/xombrero/LICENSE b/pcr/xombrero/LICENSE
new file mode 100644
index 000000000..f3cc75ccd
--- /dev/null
+++ b/pcr/xombrero/LICENSE
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2010 Marco Peereboom <marco@peereboom.us>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
diff --git a/pcr/xombrero/PKGBUILD b/pcr/xombrero/PKGBUILD
new file mode 100644
index 000000000..d2257a643
--- /dev/null
+++ b/pcr/xombrero/PKGBUILD
@@ -0,0 +1,86 @@
+# Maintainer (Arch): Kyle Keen <keenerd@gmail.com>
+
+pkgbase=xombrero
+#pkgname=('xombrero' 'xombrero3')
+pkgname=xombrero
+#pkgname=xombrero3  # uncomment to package the gtk3 version instead
+pkgver=1.6.3
+pkgrel=2
+pkgdesc="A minimalists web browser, vi-like but with traditional web browser behavior."
+arch=('i686' 'x86_64')
+url="https://opensource.conformal.com/wiki/xombrero"
+_watch="https://opensource.conformal.com/snapshots/xombrero/"
+license=('custom:ISC')
+depends=('webkitgtk2' 'libbsd' 'desktop-file-utils')
+if [[ "$pkgname" == "xombrero3" ]]; then
+    depends=('webkitgtk3' 'libbsd' 'desktop-file-utils')
+fi
+install=$pkgbase.install
+replaces=('xxxterm')
+conflicts=('xxxterm')
+options=('!emptydirs')
+source=(http://opensource.conformal.com/snapshots/$pkgname/$pkgbase-$pkgver.tgz \
+        LICENSE)
+md5sums=('11248a0f40542265022e8dfe692644da'
+         'f3eeb6e8b70a3dcccb8ee57daf584c9e')
+
+build() {
+    cd "$srcdir/$pkgbase-$pkgver"
+    # no spam
+    sed -i 's|https://www.cyphertite.com|https://archlinux.org|' xombrero.{c,conf,h}
+    # relocations
+    sed -i 's|/etc/ssl/cert.pem|/etc/ssl/certs/ca-certificates.crt|' xombrero.conf
+    #sed -i 's|/usr/local/share/xombrero/style.css|/usr/share/xombrero/style.css|' xombrero.conf
+    sed -i 's|/usr/local/share/|/usr/share/|' {unix.c,xombrero.conf,xombrero.h}
+    cd ..
+
+    mkdir -p build-gtk{2,3}
+    if [[ "$pkgname" == "xombrero" ]]; then
+        cp -R "$srcdir/$pkgbase-$pkgver" build-gtk2
+        pushd "build-gtk2/$pkgbase-$pkgver"
+        make PREFIX="/usr" -C linux GTK_VERSION=gtk2
+        popd
+    fi
+
+    if [[ "$pkgname" == "xombrero3" ]]; then
+        cp -R "$srcdir/$pkgbase-$pkgver" build-gtk3
+        pushd "build-gtk3/$pkgbase-$pkgver"
+        make PREFIX="/usr" -C linux GTK_VERSION=gtk3
+        popd
+    fi
+}
+
+# non-split aur compatibility function (remove for real split pkg)
+package() {
+    if [[ "$pkgname" == "xombrero" ]]; then
+        package_xombrero
+    elif [[ "$pkgname" == "xombrero3" ]]; then
+        package_xombrero3
+    fi
+}
+
+package_xombrero() {
+    depends=('webkitgtk2' 'libbsd' 'desktop-file-utils')
+    conflicts=('xxxterm' 'xombrero3')
+
+    cd "$srcdir/build-gtk2/$pkgbase-$pkgver"
+    mkdir -p "$pkgdir/usr/share/applications/"  # buggy makefile
+    make PREFIX="/usr" DESTDIR="$pkgdir" install -C linux GTK_VERSION=gtk2
+    install -Dm644 xombrero.conf     "$pkgdir/etc/skel/.xombrero.conf"
+    install -Dm644 xombrero.desktop  "$pkgdir/usr/share/applications/xombrero.desktop"
+    install -Dm755 config-checker.pl "$pkgdir/usr/bin/config-checker.pl"
+    install -Dm644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+package_xombrero3() {
+    depends=('webkitgtk3' 'libbsd' 'desktop-file-utils')
+    conflicts=('xombrero')
+
+    cd "$srcdir/build-gtk3/$pkgbase-$pkgver"
+    mkdir -p "$pkgdir/usr/share/applications/"  # buggy makefile
+    make PREFIX="/usr" DESTDIR="$pkgdir" install -C linux GTK_VERSION=gtk3
+    install -Dm644 xombrero.conf     "$pkgdir/etc/skel/.xombrero.conf"
+    install -Dm644 xombrero.desktop  "$pkgdir/usr/share/applications/xombrero.desktop"
+    install -Dm755 config-checker.pl "$pkgdir/usr/bin/config-checker.pl"
+    install -Dm644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
diff --git a/pcr/xombrero/xombrero.install b/pcr/xombrero/xombrero.install
new file mode 100644
index 000000000..d3289ab64
--- /dev/null
+++ b/pcr/xombrero/xombrero.install
@@ -0,0 +1,12 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
+