summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMárcio Alexandre Silva Delgado <coadde@lavabit.com>2013-05-31 16:42:29 -0300
committerMárcio Alexandre Silva Delgado <coadde@lavabit.com>2013-05-31 16:42:29 -0300
commit09f44b6c97a0331ed69393de9d682b79d5d2620e (patch)
tree86741a3672a6de75fbeed1bbf19f1c0c5734c0a5
parent2d065a8d237bbc04912ac803a886f566406ce273 (diff)
parent2ac25104895a9f912a953b50900ddbc7427603af (diff)
downloadabslibre-09f44b6c97a0331ed69393de9d682b79d5d2620e.tar.gz
abslibre-09f44b6c97a0331ed69393de9d682b79d5d2620e.tar.bz2
abslibre-09f44b6c97a0331ed69393de9d682b79d5d2620e.zip
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
-rw-r--r--libre/iceweasel-l10n/PKGBUILD2
-rw-r--r--pcr/sword-svn/PKGBUILD39
-rw-r--r--pcr/sword-svn/automake.patch52
3 files changed, 92 insertions, 1 deletions
diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD
index 3c3d957a4..298d740cc 100644
--- a/libre/iceweasel-l10n/PKGBUILD
+++ b/libre/iceweasel-l10n/PKGBUILD
@@ -23,7 +23,7 @@ pkgname=($(for lang in ${_langpacks[@]}
do echo $pkgbase-$lang | tr A-Z a-z
done))
pkgver=$_debver.$_debrel
-pkgrel=1
+pkgrel=2
pkgdesc="Language packs for Debian Iceweasel."
arch=('any')
diff --git a/pcr/sword-svn/PKGBUILD b/pcr/sword-svn/PKGBUILD
new file mode 100644
index 000000000..8e29cdab8
--- /dev/null
+++ b/pcr/sword-svn/PKGBUILD
@@ -0,0 +1,39 @@
+# Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
+pkgname=sword-svn
+pkgver=2793
+pkgrel=1
+pkgdesc="Libraries for Bible programs - svn -version"
+arch=('i686' 'x86_64')
+url="http://www.crosswire.org/sword/"
+license=('GPL')
+depends=('curl' 'clucene' 'swig')
+makedepends=('subversion')
+provides=('sword')
+conflicts=('sword')
+source=('sword::svn+https://www.crosswire.org/svn/sword/trunk/' 'automake.patch')
+md5sums=('SKIP' '24a4821088da78725b9374807d0d3508')
+options=('!makeflags')
+_svnmod=sword
+
+pkgver() {
+ cd $SRCDEST/${_svnmod}
+ svnversion
+}
+
+prepare() {
+ cd "$srcdir/$_svnmod"
+ patch -p1 < $srcdir/automake.patch
+}
+
+build() {
+ cd "$srcdir/$_svnmod"
+ ./autogen.sh
+ CPPFLAGS+="-fpermissive" ./configure --prefix=/usr --libdir=/usr/lib --sysconfdir=/etc
+ make
+}
+
+package() {
+ cd "$srcdir/$_svnmod"
+ make DESTDIR="$pkgdir/" install
+ make DESTDIR="$pkgdir/" install_config
+}
diff --git a/pcr/sword-svn/automake.patch b/pcr/sword-svn/automake.patch
new file mode 100644
index 000000000..3cfd5eb44
--- /dev/null
+++ b/pcr/sword-svn/automake.patch
@@ -0,0 +1,52 @@
+diff -Naur sword.orig/configure.ac sword.new/configure.ac
+--- sword.orig/configure.ac 2013-01-13 12:46:13.000000000 +0100
++++ sword.new/configure.ac 2013-01-13 12:47:34.000000000 +0100
+@@ -13,7 +13,7 @@
+ AC_CANONICAL_TARGET
+ AM_INIT_AUTOMAKE
+
+-AM_CONFIG_HEADER(include/config.h)
++AC_CONFIG_HEADERS(include/config.h)
+
+ AC_CONFIG_MACRO_DIR([m4])
+
+diff -Naur sword.orig/examples/cmdline/Makefile.am sword.new/examples/cmdline/Makefile.am
+--- sword.orig/examples/cmdline/Makefile.am 2013-01-13 12:46:13.000000000 +0100
++++ sword.new/examples/cmdline/Makefile.am 2013-01-13 12:53:55.000000000 +0100
+@@ -1,7 +1,7 @@
+ AUTOMAKE_OPTIONS = 1.6
+-INCLUDES = -I $(top_srcdir)/include
++AM_CPPFLAGS = -I $(top_srcdir)/include
+ if USE_INTERNAL_REGEX
+-INCLUDES += -I$(top_srcdir)/include/internal/regex
++AM_CPPFLAGS += -I$(top_srcdir)/include/internal/regex
+ endif
+ LDADD = $(top_builddir)/lib/libsword.la
+
+diff -Naur sword.orig/tests/Makefile.am sword.new/tests/Makefile.am
+--- sword.orig/tests/Makefile.am 2013-01-13 12:46:14.000000000 +0100
++++ sword.new/tests/Makefile.am 2013-01-13 12:54:33.000000000 +0100
+@@ -1,7 +1,7 @@
+ AUTOMAKE_OPTIONS = 1.6
+-INCLUDES = -I $(top_srcdir)/include
++AM_CPPFLAGS = -I $(top_srcdir)/include
+ if USE_INTERNAL_REGEX
+-INCLUDES += -I$(top_srcdir)/include/internal/regex
++AM_CPPFLAGS += -I$(top_srcdir)/include/internal/regex
+ endif
+ LDADD = $(top_builddir)/lib/libsword.la
+
+diff -Naur sword.orig/utilities/Makefile.am sword.new/utilities/Makefile.am
+--- sword.orig/utilities/Makefile.am 2013-01-13 12:46:13.000000000 +0100
++++ sword.new/utilities/Makefile.am 2013-01-13 12:56:12.000000000 +0100
+@@ -1,8 +1,8 @@
+ AUTOMAKE_OPTIONS = 1.6
+ SUBDIRS = diatheke
+-INCLUDES = -I $(top_srcdir)/include
++AM_CPPFLAGS = -I $(top_srcdir)/include
+ if USE_INTERNAL_REGEX
+-INCLUDES += -I$(top_srcdir)/include/internal/regex
++AM_CPPFLAGS += -I$(top_srcdir)/include/internal/regex
+ endif
+ LDADD = $(top_builddir)/lib/libsword.la
+ noinst_PROGRAMS = cipherraw lexdump \