summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@lavabit.com>2013-06-23 23:07:45 -0300
committerAndré Fabian Silva Delgado <emulatorman@lavabit.com>2013-06-23 23:07:45 -0300
commit1b7b8b9133c1fecb34682ad72f0d0ba1c0afa720 (patch)
treea09d42ef335c654413b19f1e9b5e4c92f8055a8f
parent0d193f3f30dfbd4383e99ccb0e6d7efd00164214 (diff)
parent1b12a27b7cde814fe192ab47307a259fc21ce009 (diff)
Merge branch 'master' of ssh://projects.parabolagnulinux.org:1863/srv/git/abslibre
-rw-r--r--java/antlr2/PKGBUILD39
-rw-r--r--java/apache-ant/PKGBUILD18
-rw-r--r--java/java-asm2/PKGBUILD4
-rw-r--r--java/java-asm2/PKGBUILD.common.sh (renamed from java/java-asm2/common.sh)0
-rw-r--r--java/java-asm3/PKGBUILD4
l---------java/java-asm3/PKGBUILD.common.sh1
-rw-r--r--java/java-commons-bsf/PKGBUILD59
-rw-r--r--java/javacc/PKGBUILD47
-rw-r--r--java/jh/PKGBUILD4
-rw-r--r--java/junit/PKGBUILD4
-rw-r--r--libre/gloobus-preview-libre/PKGBUILD90
-rw-r--r--libre/gloobus-preview-libre/fix-gtksource-include.patch39
-rw-r--r--libre/gloobus-preview-libre/fix-unoconv.patch46
-rw-r--r--libre/gloobus-preview-libre/gloobus-preview-usr-bsdtar-for-rar.patch57
-rw-r--r--libre/gloobus-preview-libre/gloobus-preview.install12
-rw-r--r--libre/gloobus-preview-libre/use-xdg-open.patch20
-rw-r--r--libre/libretools/PKGBUILD22
-rw-r--r--pcr/perl-geo-ipfree/PKGBUILD28
-rw-r--r--pcr/shocco/PKGBUILD30
19 files changed, 483 insertions, 41 deletions
diff --git a/java/antlr2/PKGBUILD b/java/antlr2/PKGBUILD
index 4269d30c7..3468e25fc 100644
--- a/java/antlr2/PKGBUILD
+++ b/java/antlr2/PKGBUILD
@@ -1,17 +1,22 @@
-# $Id: PKGBUILD 167380 2012-10-01 19:24:15Z guillaume $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Maintainer: luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer (Arch): Andrea Scarpino <andrea@archlinux.org>
# Contributor: George Giorgidze <giorgidze (at) gmail.com>
# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
+# FIXME: antlr2-sharp doesn't build with mono 3.
+
pkgbase=antlr2
-pkgname=(antlr2 antlr2-{java,python2,cxx,sharp})
+#MONO pkgname=(antlr2 antlr2-{java,python2,cxx,sharp})
+pkgname=(antlr2 antlr2-{java,python2,cxx})
pkgver=2.7.7
+pkgdesc="ANother Tool for Language Recognition (formerly PCCTS)"
url="http://www.antlr2.org/"
license=('custom:Public Domain')
-pkgrel=3
+pkgrel=3.1
arch=('i686' 'x86_64')
-makedepends=('java-environment' 'python2' 'sh' 'nant' 'jh')
+#MONO makedepends=('java-environment' 'python2' 'sh' 'nant' 'jh')
+makedepends=('java-environment' 'python2' 'sh' 'jh')
source=("http://www.antlr2.org/download/antlr-${pkgver}.tar.gz"
"http://repo.maven.apache.org/maven2/antlr/antlr/$pkgver/antlr-$pkgver.pom"
'runantlr2.sh' 'gcc4.4.patch' 'mono.patch')
@@ -25,8 +30,8 @@ build() {
./configure --prefix=/usr --disable-examples
make -j1
- cd lib/csharp
- nant release
+ #MONO cd lib/csharp
+ #MONO nant release
}
_install_license() {
@@ -35,7 +40,6 @@ _install_license() {
}
package_antlr2() {
- pkgdesc="ANother Tool for Language Recognition (formerly PCCTS)"
depends=('sh' 'antlr2-java')
install -Dm755 "$srcdir"/runantlr2.sh "$pkgdir"/usr/bin/runantlr2
@@ -43,7 +47,7 @@ package_antlr2() {
}
package_antlr2-java() {
- pkgdesc="ANother Tool for Language Recognition (formerly PCCTS) (Java version)"
+ pkgdesc+=" (Java version)"
depends=('java-runtime')
provides=("java-antlr2=$pkgver")
@@ -51,16 +55,16 @@ package_antlr2-java() {
replaces=("java-antlr2")
DESTDIR="$pkgdir" jh mvn-install antlr antlr $pkgver \
- "$srcdir"/antlr-${pkgver}.pom \
- "$srcdir"/antlr-${pkgver}/antlr/antlr.jar \
- antlr2.jar
+ "$srcdir"/antlr-${pkgver}.pom \
+ "$srcdir"/antlr-${pkgver}/antlr/antlr.jar \
+ antlr2.jar
_install_license
}
package_antlr2-python2() {
- pkgdesc="ANother Tool for Language Recognition (formerly PCCTS) (Python version)"
- depends=('antlr2' 'python2')
+ pkgdesc+=" (Python version)"
+ depends=('python2')
provides=("python2-antlr2=$pkgver")
conflicts=("python2-antlr2")
@@ -73,8 +77,7 @@ package_antlr2-python2() {
}
package_antlr2-cxx() {
- pkgdesc="ANother Tool for Language Recognition (formerly PCCTS) (C++ version)"
- depends=('java-runtime')
+ pkgdesc+=" (C++ version)"
cd "$srcdir"/antlr-${pkgver}/lib/cpp
make -j1 prefix="${pkgdir}/usr" install
@@ -83,8 +86,8 @@ package_antlr2-cxx() {
}
package_antlr2-sharp() {
- pkgdesc="ANother Tool for Language Recognition (formerly PCCTS) (C Sharp version)"
- depends=('antlr2' 'mono')
+ pkgdesc+=" (C Sharp version)"
+ depends=('mono')
cd "$srcdir"/antlr-${pkgver}/lib/csharp
install -d "$pkgdir"/usr/share
diff --git a/java/apache-ant/PKGBUILD b/java/apache-ant/PKGBUILD
index 80a75335e..9f9c77c28 100644
--- a/java/apache-ant/PKGBUILD
+++ b/java/apache-ant/PKGBUILD
@@ -12,7 +12,7 @@ provides=("apache-ant-libre=$pkgver")
replaces=("apache-ant-libre")
conflicts=("apache-ant-libre")
-pkgrel=1
+pkgrel=2
arch=('any')
depends=('java-environment')
@@ -25,26 +25,26 @@ declare -A _opts
_opts[junit]='to have JUnit on the classpath in javac tasks;/usr/share/java/junit.jar'
_opts[xalan-java]='<junitreport> task;/usr/share/java/xalan.jar'
_opts[java-antlr2]='<antlr> task;/usr/share/java/antlr2.jar::antlr.jar'
-#_opts[java-bsf]='<script> task;/usr/share/java/bsf.jar'
+_opts[java-commons-bsf2]='<script> task;/usr/share/java/bsf2.jar::bsf.jar'
#_opts[groovy]='Groovy with <script> and <scriptdef> tasks;/usr/share/java/groovy.jar'
_opts[java-asm2]='Groovy with <script> and <scriptdef> tasks;/usr/share/java/asm-2.jar::asm.jar /usr/share/java/asm-util-2.jar::asm-util.jar'
#_opts[netrexx]='<netrexx> task, Rexx with <script> task;/usr/share/java/netrexx.jar'
-_opts[rhino]='Javascript with <script> task;/usr/share/java/js.jar'
+_opts[java-rhino]='Javascript with <script> task;/usr/share/java/js.jar'
_opts[jython]='Python with <script> task;/opt/jython/jython.jar'
#_opts[jacl]='TCL with <script> task;/usr/share/java/jacl.jar'
#_opts[tcljava]='TCL with <script> task;/usr/share/java/tcljava.jar'
_opts[beanshell>=1.3]='BeanShell with <script> task;/usr/share/java/bsh.jar::beanshell.jar'
-#_opts[jruby]='Ruby with <script> task;/usr/share/java/jruby.jar'
+_opts[jruby]='Ruby with <script> task;/opt/jruby/lib/jruby.jar'
#_opts[judo]='Judoscript with <script> task;/usr/share/java/judo.jar'
_opts[java-commons-logging]='CommonsLoggingListener;/usr/share/java/commons-logging/commons-logging.jar'
#_opts[java-log4j]='Log4jListener;/usr/share/java/log4j.jar'
-#_opts[java-commons-net>=1.4.0]='<ftp>, <rexec> and <telnet> tasks;/usr/share/java/commons-net.jar'
-#_opts[java-bcel]="'classfileset' data type, JavaClassHelper for ClassConstants filter reader;/usr/share/java/bcel.jar"
+_opts[java-commons-net1>=1.4.0]='<ftp>, <rexec> and <telnet> tasks;/usr/share/java/commons-net.jar'
+_opts[java-bcel]="'classfileset' data type, JavaClassHelper for ClassConstants filter reader;/usr/share/java/bcel.jar"
#_opts[java-mail]='<mimemail> task, mime encoding with <mail>;/usr/share/java/mail.jar'
-#_opts[java-activation]='<mimemail> task, mime encoding with <mail>;/usr/share/java/activation.jar'
-#_opts[jdepend]='<jdepend> task;/usr/share/java/jdepend.jar'
+_opts[java-activation-gnu]='<mimemail> task, mime encoding with <mail>;/usr/share/java/activation.jar'
+_opts[java-jdepend]='<jdepend> task;/usr/share/java/jdepend.jar'
#_opts[java-xmlcommons-resolver>=1.1beta]="external files for 'xmlcatalog' datatype;/usr/share/java/resolver.jar"
-#_opts[java-jsch>=0.1.42]='<sshexec> and <scp> tasks;/usr/share/java/jsch.jar'
+_opts[java-jsch>=0.1.42]='<sshexec> and <scp> tasks;/usr/share/java/jsch.jar'
#_opts[java-advanced-imaging]='<image> task/usr/share/java/jai/*.jar'
for pkg in "${!_opts[@]}"; do
diff --git a/java/java-asm2/PKGBUILD b/java/java-asm2/PKGBUILD
index 71bc0f303..8860ef86f 100644
--- a/java/java-asm2/PKGBUILD
+++ b/java/java-asm2/PKGBUILD
@@ -1,11 +1,11 @@
# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
pkgver=2.2.3
-. common.sh
+. PKGBUILD.common.sh
####
-pkgrel=6
+pkgrel=7
mksource() {
cd "$srcdir/$_pkgname-$pkgver"
diff --git a/java/java-asm2/common.sh b/java/java-asm2/PKGBUILD.common.sh
index ef4547696..ef4547696 100644
--- a/java/java-asm2/common.sh
+++ b/java/java-asm2/PKGBUILD.common.sh
diff --git a/java/java-asm3/PKGBUILD b/java/java-asm3/PKGBUILD
index 345c83edf..9c9928766 100644
--- a/java/java-asm3/PKGBUILD
+++ b/java/java-asm3/PKGBUILD
@@ -1,11 +1,11 @@
# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
pkgver=3.3.1
-. ../java-asm2/common.sh
+. PKGBUILD.common.sh
####
-pkgrel=6
+pkgrel=7
mksource() {
cd "$srcdir/$_pkgname-$pkgver"
diff --git a/java/java-asm3/PKGBUILD.common.sh b/java/java-asm3/PKGBUILD.common.sh
new file mode 120000
index 000000000..e76a92ae0
--- /dev/null
+++ b/java/java-asm3/PKGBUILD.common.sh
@@ -0,0 +1 @@
+../java-asm2/PKGBUILD.common.sh \ No newline at end of file
diff --git a/java/java-commons-bsf/PKGBUILD b/java/java-commons-bsf/PKGBUILD
new file mode 100644
index 000000000..57a9dfc1a
--- /dev/null
+++ b/java/java-commons-bsf/PKGBUILD
@@ -0,0 +1,59 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+pkgname=java-commons-bsf2
+pkgver=2.4.0
+url="https://commons.apache.org/proper/commons-bsf/"
+license=('Apache')
+pkgdesc="Bean Scripting Framework"
+
+pkgrel=1
+arch=('any')
+depends=('java-commons-logging')
+makedepends=('apache-ant')
+
+_mirror=http://archive.apache.org/dist
+source=($_mirror/commons/bsf/source/bsf-src-$pkgver.tar.gz
+ build-properties.xml::"https://svn.apache.org/viewvc/commons/proper/bsf/tags/bsf-2.4.0/build-properties.xml?view=co&content-type=text%2Fplain"
+)
+
+declare -A _opts
+#_opts[jacl]="/usr/share/java/jacl.jar"
+_opts[jython]="/opt/jython/jython.jar"
+#_opts[nexrexx]="/usr/share/java/nexrexx.jar"
+_opts[java-rhino]="/usr/share/java/js.jar"
+_opts[xalan-java]="/usr/share/java/xalan.jar"
+_opts[junit]="/usr/share/java/junit.jar"
+
+for pkg in "${!_opts[@]}"; do
+ optdepends+=("$pkg")
+ makedepends+=("$pkg")
+ _jars+="${_opts[$pkg]} "
+done
+
+prepare() {
+ cd "${srcdir}/bsf-${pkgver}"
+ rm lib/*.jar
+}
+
+build() {
+ cd "${srcdir}/bsf-${pkgver}"
+
+ for jar in $_jars; do
+ ln -s "$jar" lib/
+ done
+
+ # Adjust it to work with jython 2.5+
+ sed -i 's/PyJavaInstance/PyJavaType/g' src/org/apache/bsf/engines/jython/*
+
+ ln -sf ../build-properties.xml ./
+ ant jar
+}
+
+package() {
+ cd "${srcdir}/bsf-${pkgver}"
+ install -Dm644 build/lib/bsf.jar "$pkgdir"/usr/share/java/bsf-$pkgver.jar
+ ln -s bsf-$pkgver.jar "$pkgdir"/usr/share/java/bsf2.jar
+}
+
+md5sums=('7e58b2a009c0f70ab36bbef420b25c07'
+ 'd7180c2b95f1a5424f785a2482260eaa')
diff --git a/java/javacc/PKGBUILD b/java/javacc/PKGBUILD
new file mode 100644
index 000000000..032fd7b25
--- /dev/null
+++ b/java/javacc/PKGBUILD
@@ -0,0 +1,47 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+pkgname=javacc
+pkgver=5.0
+pkgdesc="Java Compiler Compiler; a parser generator"
+url="http://javacc.java.net/"
+license=('BSD3')
+
+arch=('any')
+pkgrel=2.1
+depends=('java-runtime')
+makedepends=('apache-ant' 'junit' 'jh')
+source=("http://java.net/projects/${pkgname}/downloads/download/${pkgname}-${pkgver}src.tar.gz")
+
+prepare() {
+ cd "$srcdir/$pkgname"
+ rm lib/junit3.8.1/junit.jar
+ ln -s /usr/share/java/junit.jar lib/junit3.8.1
+ #rm bootstrap/javacc.jar
+}
+
+build() {
+ cd "$srcdir/$pkgname"
+
+ sed -i \
+ -e 's|<modelVersion>.*</modelVersion>|<modelVersion>4.0.0</modelVersion>|' \
+ -e "s|<version>.*</version>|<version>$pkgver</version>|" \
+ pom.xml
+
+ for prog in javacc jjdoc jjtree; do
+ sed -i 's|JAR=.*|JAR=/usr/share/java/javacc.jar|' bin/$prog
+ done
+
+ CLASSPATH=/usr/share/java/junit.jar ant
+}
+
+package() {
+ cd "$srcdir/$pkgname"
+
+ for prog in javacc jjdoc jjrun jjtree; do
+ install -Dm755 bin/$prog "$pkgdir"/usr/bin/$prog
+ done
+ install -Dm644 bin/lib/javacc.jar "$pkgdir"/usr/share/java/javacc.jar
+ install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
+
+md5sums=('871d78a2a5859c2eebc712c1f8135be5')
diff --git a/java/jh/PKGBUILD b/java/jh/PKGBUILD
index 4c1dee6f3..5638adbce 100644
--- a/java/jh/PKGBUILD
+++ b/java/jh/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
pkgname=jh
-pkgver=0.5
+pkgver=0.5.1
pkgdesc="Java helpers for PKGBUILDs"
url="https://projects.parabolagnulinux.org/packages/jh.git/"
license=('custom:WTFPL')
@@ -24,4 +24,4 @@ package() {
install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
}
-md5sums=('5fe2279fbada213eb8df38875450c4d2')
+md5sums=('051d39c5dac14e86b755bab9ec1d0d5d')
diff --git a/java/junit/PKGBUILD b/java/junit/PKGBUILD
index 35ad23101..5e466a029 100644
--- a/java/junit/PKGBUILD
+++ b/java/junit/PKGBUILD
@@ -7,7 +7,7 @@ pkgdesc="Automated testing framework for Java"
url="http://www.junit.org/"
license=('CPL')
-pkgrel=1
+pkgrel=3.1
arch=('any')
depends=('java-runtime' 'java-hamcrest')
makedepends=('apache-ant' 'jakarta-oro' 'jh')
@@ -49,5 +49,5 @@ package() {
export DESTDIR="$pkgdir"
jh mvn-install $pkgname junit $pkgver junit-$pkgver.{pom,jar} junit-$pkgver.jar
jh mvn-install $pkgname junit-dep $pkgver junit-dep-$pkgver.pom
- ln -s ${pkgname}/${pkgname}-${pkgver}.jar ${pkgdir}/usr/share/java/${pkgname}.jar
+ ln -s ${pkgname}-${pkgver}.jar ${pkgdir}/usr/share/java/${pkgname}.jar
}
diff --git a/libre/gloobus-preview-libre/PKGBUILD b/libre/gloobus-preview-libre/PKGBUILD
new file mode 100644
index 000000000..12bff5f1d
--- /dev/null
+++ b/libre/gloobus-preview-libre/PKGBUILD
@@ -0,0 +1,90 @@
+# $Id: PKGBUILD 91027 2013-05-18 11:44:36Z bgyorgy $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+
+_pkgname=gloobus-preview
+pkgname=gloobus-preview-libre
+pkgver=0.4.5.290
+_pkgver=0.4.5-ubuntu11~ppa290
+pkgrel=1
+pkgdesc="Gnome application designed to enable a full screen preview of any kind of file (using bsdtar to preview RAR archives)"
+arch=('i686' 'x86_64')
+url="http://gloobus.net/"
+license=('GPL')
+depends=('gstreamer0.10-base-plugins' 'gtksourceview3' 'poppler-glib' 'python2-dbus' 'python2-gconf' 'taglib' 'xdg-utils')
+makedepends=('boost' 'bzr' 'djvulibre' 'libspectre')
+optdepends=('djvulibre: Preview DjVu documents'
+ 'gstreamer0.10-bad-plugins: Extra media codecs'
+ 'gstreamer0.10-good-plugins: Extra media codecs'
+ 'gstreamer0.10-ffmpeg: Extra media codecs'
+ 'gstreamer0.10-ugly-plugins: Extra media codecs'
+ 'libspectre: Preview PostScript documents'
+ 'p7zip: View content of 7z archives'
+ 'unoconv: Preview LibreOffice compatible documents'
+ 'unzip: View content of .ZIP archives')
+options=('!libtool')
+install=$_pkgname.install
+source=(https://launchpad.net/~gloobus-dev/+archive/$_pkgname/+files/${_pkgname}_$_pkgver.orig.tar.xz
+ gloobus-sushi::bzr+http://bazaar.launchpad.net/~gloobus-dev/gloobus-sushi/gloobus-sushi
+ fix-gtksource-include.patch
+ fix-unoconv.patch
+ use-xdg-open.patch
+ gloobus-preview-usr-bsdtar-for-rar.patch)
+md5sums=('27b3db2043ecaf47fa928940bbb4f32a'
+ 'SKIP'
+ 'ca15a3e31cec01d3d4fc5a4e1720f692'
+ '03379c173e67ad1b6804bc609336451d'
+ 'd6d9e2b3e001f0ea8440cccdf90480af'
+ 'eeab61846c861540bb16ca00fa14cdb6')
+
+prepare() {
+ cd "$srcdir/$_pkgname-$_pkgver"
+
+ # Python2 fix
+ sed -i 's@^#!.*python$@#!/usr/bin/python2@' src/gloobus-preview-configuration
+
+ # Fix build
+ patch -Np1 -i "$srcdir/fix-gtksource-include.patch"
+ sed -i 's/-Werror//' configure.ac src/Makefile.am
+
+ # Fix unoconv support
+ patch -Np1 -i "$srcdir/fix-unoconv.patch"
+
+ # Use xdg-open
+ patch -Np1 -i "$srcdir/use-xdg-open.patch"
+
+ # Use bsdtar if unrar is not found.
+ patch -Np0 -i "$srcdir/gloobus-preview-usr-bsdtar-for-rar.patch"
+
+ ### Prepare gloobus-sushi
+ cd "$srcdir/gloobus-sushi"
+
+ # Python2 fix
+ sed -i 's/python /python2 /' src/gloobus-sushi.in
+}
+
+
+build() {
+ cd "$srcdir/$_pkgname-$_pkgver"
+
+ ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+ --disable-static
+ make
+
+ ### Build gloobus-sushi
+ cd "$srcdir/gloobus-sushi"
+
+ ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+ make
+}
+
+package() {
+ cd "$srcdir/$_pkgname-$_pkgver"
+ make DESTDIR="$pkgdir" install
+
+ ### Install gloobus-sushi
+ cd "$srcdir/gloobus-sushi"
+ make DESTDIR="$pkgdir" install
+
+ # Rename service file to avoid conflict with sushi
+ mv "$pkgdir"/usr/share/dbus-1/services/{org.gnome.Sushi.service,net.gloobus.Sushi.service}
+}
diff --git a/libre/gloobus-preview-libre/fix-gtksource-include.patch b/libre/gloobus-preview-libre/fix-gtksource-include.patch
new file mode 100644
index 000000000..053169a43
--- /dev/null
+++ b/libre/gloobus-preview-libre/fix-gtksource-include.patch
@@ -0,0 +1,39 @@
+diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-interface-text.h gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-interface-text.h
+--- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-interface-text.h 2012-04-06 15:07:29.000000000 +0200
++++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-interface-text.h 2013-05-17 06:27:37.833360264 +0200
+@@ -1,8 +1,7 @@
+ #ifndef _ITEXT_
+ #define _ITEXT_
+
+-#include <gtksourceview/gtksourceview.h>
+-#include <gtksourceview/gtksourcelanguagemanager.h>
++#include <gtksourceview/gtksource.h>
+ //sudo ln -s /usr/include/gtksourceview-2.0/gtksourceview/ /usr/include/gtksourceview
+
+ #include "gloobus-preview-interface-main.h"
+diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-plugin-manager.cpp gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-plugin-manager.cpp
+--- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-plugin-manager.cpp 2012-04-06 15:07:29.000000000 +0200
++++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-plugin-manager.cpp 2013-05-17 06:28:19.300984059 +0200
+@@ -1,6 +1,6 @@
+ #include "gloobus-preview-plugin-manager.h"
+ #include <dlfcn.h>
+-#include <gtksourceview/gtksourcelanguagemanager.h>
++#include <gtksourceview/gtksource.h>
+
+ vector<gp_plugin_container*> PluginManager::plugins;
+ map<string, int> PluginManager::filetypes;
+diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-text/plugin-text.h gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-text/plugin-text.h
+--- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-text/plugin-text.h 2012-04-06 15:07:29.000000000 +0200
++++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-text/plugin-text.h 2013-05-17 06:26:26.788384315 +0200
+@@ -3,10 +3,7 @@
+
+ #ifndef PLUGIN_LOADER
+
+-#include <gtksourceview/gtksourceview.h>
+-#include <gtksourceview/gtksourcelanguagemanager.h>
+-#include <gtksourceview/gtksourcestylescheme.h>
+-#include <gtksourceview/gtksourcestyleschememanager.h>
++#include <gtksourceview/gtksource.h>
+ #include <gio/gio.h>
+
+ #include "../gloobus-preview-config.h"
diff --git a/libre/gloobus-preview-libre/fix-unoconv.patch b/libre/gloobus-preview-libre/fix-unoconv.patch
new file mode 100644
index 000000000..f918f3019
--- /dev/null
+++ b/libre/gloobus-preview-libre/fix-unoconv.patch
@@ -0,0 +1,46 @@
+diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-pdf/office-loader.cpp gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-pdf/office-loader.cpp
+--- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-pdf/office-loader.cpp 2012-04-06 15:07:29.000000000 +0200
++++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-pdf/office-loader.cpp 2013-05-18 10:24:33.558221788 +0200
+@@ -87,7 +87,7 @@
+
+ if( NULL == uri && Utils::isProgramAvailable("unoconv") ) {
+ gchar *path = g_file_get_path(file);
+- gchar *cmd = g_strdup_printf("unoconv --stdout \"%s\" > \"%s\"", path, tmp);
++ gchar *cmd = g_strdup_printf("unoconv -f pdf -o \"%s\" \"%s\"", tmp, path);
+
+ if( system(cmd) == 0) {
+ uri = pathToUri(tmp);
+@@ -123,4 +123,4 @@
+ {
+ path = "file://" + path;
+ return g_uri_escape_string(path.c_str(), G_URI_RESERVED_CHARS_ALLOWED_IN_PATH, false);
+-}
+\ No newline at end of file
++}
+diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-pdf/office-plugin.h gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-pdf/office-plugin.h
+--- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-pdf/office-plugin.h 2012-04-06 15:07:29.000000000 +0200
++++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-pdf/office-plugin.h 2013-05-18 10:33:02.352806550 +0200
+@@ -6,15 +6,21 @@
+ PluginManager::register_plugin("office");
+
+ PluginManager::register_filetype("application/vnd.oasis.opendocument.text", 1);
++PluginManager::register_filetype("application/vnd.openxmlformats-officedocument.wordprocessingml.document", 1);
+ PluginManager::register_filetype("application/msword", 1);
+ PluginManager::register_filetype("application/rtf", 1);
+ PluginManager::register_filetype("application/vnd.ms-excel", 1);
+ PluginManager::register_filetype("application/vnd.oasis.opendocument.spreadsheet", 1);
++PluginManager::register_filetype("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", 1);
+ PluginManager::register_filetype("application/vnd.ms-powerpoint", 1);
++PluginManager::register_filetype("application/vnd.oasis.opendocument.presentation", 1);
++PluginManager::register_filetype("application/vnd.openxmlformats-officedocument.presentationml.presentation", 1);
+ PluginManager::register_filetype("application/vnd.sun.xml.calc", 1);
++PluginManager::register_filetype("application/vnd.oasis.opendocument.graphics", 1);
++
+
+ // TODO: add more filetypes supported by abiword and/or OpenOffice
+
+ #endif
+
+-#endif /* OFFICE_PLUGIN_H */
+\ No newline at end of file
++#endif /* OFFICE_PLUGIN_H */
diff --git a/libre/gloobus-preview-libre/gloobus-preview-usr-bsdtar-for-rar.patch b/libre/gloobus-preview-libre/gloobus-preview-usr-bsdtar-for-rar.patch
new file mode 100644
index 000000000..f5b7c8e00
--- /dev/null
+++ b/libre/gloobus-preview-libre/gloobus-preview-usr-bsdtar-for-rar.patch
@@ -0,0 +1,57 @@
+------------------------------------------------------------
+revno: 291
+committer: Michał Masłowski <mtjm@mtjm.eu>
+branch nick: gloobus-preview
+timestamp: Sun 2013-06-23 14:43:35 +0200
+message:
+ Use bsdtar to open RAR archives if unrar is not available.
+
+ Needs bsdtar from libarchive 3.0 or newer, not tested with older
+ versions nor checking for them.
+diff:
+=== modified file 'src/plugin-compressed/plugin-compressed.cpp'
+--- src/plugin-compressed/plugin-compressed.cpp 2012-04-06 11:25:47 +0000
++++ src/plugin-compressed/plugin-compressed.cpp 2013-06-23 12:43:35 +0000
+@@ -52,8 +52,9 @@
+ cmd_args.push_back("--");
+ line_parser = &iCompressed::parse_line_7z;
+ }
+- else if ( type == GP_COMPRESSED_RAR
+- || type == GP_COMPRESSED_RAR_X )
++ else if ( (type == GP_COMPRESSED_RAR
++ || type == GP_COMPRESSED_RAR_X)
++ && interface::is_program_available("unrar") )
+ {
+ cmd_args.push_back("unrar");
+ cmd_args.push_back("vb");
+@@ -70,9 +71,15 @@
+ || type == GP_COMPRESSED_TAR_LZOP
+ || type == GP_COMPRESSED_TAR_X
+ || type == GP_COMPRESSED_TAR_XZ
+- || type == GP_COMPRESSED_TAR_Z )
++ || type == GP_COMPRESSED_TAR_Z
++ || type == GP_COMPRESSED_RAR
++ || type == GP_COMPRESSED_RAR_X )
+ {
+- cmd_args.push_back("tar");
++ if ( type == GP_COMPRESSED_RAR
++ || type == GP_COMPRESSED_RAR_X )
++ cmd_args.push_back("bsdtar");
++ else
++ cmd_args.push_back("tar");
+ cmd_args.push_back("-tf");
+ line_parser = &iCompressed::parse_line_rar;
+ }
+
+=== modified file 'src/plugin-compressed/plugin-compressed.h'
+--- src/plugin-compressed/plugin-compressed.h 2010-03-27 15:55:08 +0000
++++ src/plugin-compressed/plugin-compressed.h 2013-06-23 12:43:35 +0000
+@@ -102,7 +102,7 @@
+ PluginManager::register_filetype(GP_COMPRESSED_7Z, 1);
+ }
+
+-if(interface::is_program_available("unrar")) {
++if(interface::is_program_available("unrar") || interface::is_program_available("bsdtar")) {
+ PluginManager::register_filetype(GP_COMPRESSED_RAR, 1);
+ PluginManager::register_filetype(GP_COMPRESSED_RAR_X, 1);
+ }
diff --git a/libre/gloobus-preview-libre/gloobus-preview.install b/libre/gloobus-preview-libre/gloobus-preview.install
new file mode 100644
index 000000000..16ad7278f
--- /dev/null
+++ b/libre/gloobus-preview-libre/gloobus-preview.install
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate
+ gdk-pixbuf-query-loaders --update-cache
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ post_install $1
+}
diff --git a/libre/gloobus-preview-libre/use-xdg-open.patch b/libre/gloobus-preview-libre/use-xdg-open.patch
new file mode 100644
index 000000000..68e219e6a
--- /dev/null
+++ b/libre/gloobus-preview-libre/use-xdg-open.patch
@@ -0,0 +1,20 @@
+diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-window.cpp gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-window.cpp
+--- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-window.cpp 2012-04-06 15:07:29.000000000 +0200
++++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-window.cpp 2013-05-18 09:49:24.833574800 +0200
+@@ -560,12 +560,12 @@
+ string label(gtk_menu_item_get_label(item));
+ if(label == _("Settings"))
+ cmd = "gloobus-preview-configuration";
+- else if(label == _("Report a Bug"))
+- cmd = "gnome-open \"https://bugs.launchpad.net/gloobus-preview/\"";
++ else if(label == _("Report a Problem"))
++ cmd = "xdg-open \"https://bugs.launchpad.net/gloobus-preview/\"";
+ else if(label == _("Blog"))
+- cmd = "gnome-open \"http://gloobus.wordpress.com\"" ;
++ cmd = "xdg-open \"http://gloobus.wordpress.com\"" ;
+ else if(label == _("Donate"))
+- cmd = "gnome-open \"https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=guitarboy000%40gmail%2ecom&item_name=Gloobus%2c%20A%20Quicklook%20for%20linux&no_shipping=0&no_note=1&tax=0&currency_code=EUR&lc=US&bn=PP%2dDonationsBF&chars\"" ;
++ cmd = "xdg-open \"https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=guitarboy000%40gmail%2ecom&item_name=Gloobus%2c%20A%20Quicklook%20for%20linux&no_shipping=0&no_note=1&tax=0&currency_code=EUR&lc=US&bn=PP%2dDonationsBF&chars\"" ;
+ else if(label == _("About"))
+ ui->create_about();
+ else if(label == _("Quit"))
diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD
index 49dc7feb2..dcf59bda4 100644
--- a/libre/libretools/PKGBUILD
+++ b/libre/libretools/PKGBUILD
@@ -4,13 +4,13 @@
# Contributor: Márcio Silva <coadde@lavabit.com>
pkgbase=libretools
-pkgname=(libretools libretools-mips64el)
+pkgname=(libretools libretools-mips64el librelib)
pkgdesc="Programs for Parabola development"
url="https://projects.parabolagnulinux.org/packages/libretools.git/"
license=('GPL3' 'GPL2')
-pkgver=20130611
-_libretools_commit=e6944bc03f587ad177c6b825e3f4c116fb9b9b12
+pkgver=20130622
+_libretools_commit=5dd6e17100a86b79a3fd6fedc8cce49dcc298356
_devtools_commit=bf8513ae631484a0c292ad085ea7ede9859f8e0f
_packages_url=https://projects.parabolagnulinux.org/packages
@@ -26,7 +26,7 @@ build() {
cd "$srcdir"
ln -sf devtools-par-$_devtools_commit devtools-par
cd "$srcdir/$pkgbase-$_libretools_commit"
- make build-libretools build-libretools-mips64el build-doc
+ make build-libretools build-libretools-mips64el build-librelib build-doc
}
check() {
@@ -35,6 +35,16 @@ check() {
make check TESTENVFLAGS='--no-network --no-sudo'
}
+package_librelib() {
+ pkgdesc="Shell library portion of libretools"
+ depends=(
+ wget # `aur` and `lib/blacklist.sh`
+ )
+
+ cd "$srcdir/$pkgbase-$_libretools_commit"
+ make install-librelib DESTDIR="$pkgdir"
+}
+
package_libretools() {
backup=(etc/libretools.conf etc/libretools.d/chroot.conf etc/libretools.d/librefetch.conf)
install=libretools.install
@@ -42,13 +52,13 @@ package_libretools() {
conflicts=(devtools)
depends=(
+ "librelib=$pkgver"
arch-install-scripts # `archroot` uses `pacstrap`
git # `createworkdir` (also mips-add in -mips64el)
openssh # `librerelease`
rsync # `librerelease` and `makechrootpkg.sh`
subversion # `diff-unfree`
tokyocabinet # `treepkg`
- wget # `aur` and `lib/blacklist.sh`
)
optdepends=('namcap: to check package files')
@@ -64,5 +74,5 @@ package_libretools-mips64el() {
make install-libretools-mips64el DESTDIR="$pkgdir"
}
-md5sums=('3d5645488481fab48954e194274f70ac'
+md5sums=('a5a5029740cef767b8e731ab8c48890b'
'b28b1492fda205be7c577fc03cbc3399')
diff --git a/pcr/perl-geo-ipfree/PKGBUILD b/pcr/perl-geo-ipfree/PKGBUILD
new file mode 100644
index 000000000..394e38ca1
--- /dev/null
+++ b/pcr/perl-geo-ipfree/PKGBUILD
@@ -0,0 +1,28 @@
+_author=bricas
+_perlmod=Geo-IPfree
+pkgname=perl-geo-ipfree
+pkgver=1.131650
+pkgrel=1
+pkgdesc="An IPv4 to country lookup database"
+arch=('any')
+url="http://search.cpan.org/~$_author/$_perlmod-$pkgver/"
+license=('GPL' 'PerlArtistic')
+depends=('perl>=5.10.0')
+options=(!emptydirs)
+source=(http://search.cpan.org/CPAN/authors/id/B/BR/BRICAS/$_perlmod-$pkgver.tar.gz)
+md5sums=('23d71e4f9a872184d9b4c6903c5a2b98')
+
+build() {
+ cd "$srcdir/$_perlmod-$pkgver"
+
+ # Install module in vendor directories.
+ PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+ make
+}
+
+package() {
+ cd "$srcdir/$_perlmod-$pkgver"
+ make install DESTDIR="$pkgdir/"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/shocco/PKGBUILD b/pcr/shocco/PKGBUILD
new file mode 100644
index 000000000..32baa6d2d
--- /dev/null
+++ b/pcr/shocco/PKGBUILD
@@ -0,0 +1,30 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+pkgname="shocco"
+pkgver=1.0
+pkgdesc="Docco-like documentation generator for POSIX shell"
+url="http://rtomayko.github.com/shocco/"
+license=('custom:MIT')
+
+pkgrel=1
+arch=('any')
+depends=('markdown' 'python2-pygments')
+optdepends=('ronn: builds man pages')
+
+source=("libre://$pkgname-$pkgver.tar.gz")
+md5sums=('edaed31d14a2c16e6303c07e24e7bc9a')
+
+mksource=("git://github.com/rtomayko/shocco.git#tag=${pkgver}")
+mkmd5sums=('SKIP')
+
+build() {
+ cd "$srcdir/$pkgname"
+ ./configure --prefix="$pkgdir"/usr
+ make -j1
+}
+
+package() {
+ cd "$srcdir/$pkgname"
+ make -j1 install
+ install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}