summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libre/netsurf/PKGBUILD (renamed from libre/netsurf-libre/PKGBUILD)47
-rw-r--r--libre/netsurf/netsurf.install (renamed from libre/netsurf-libre/netsurf.install)0
-rw-r--r--libre/netsurf/netsurf.sh (renamed from libre/netsurf-libre/netsurf.sh)0
-rw-r--r--libre/ogre/PKGBUILD (renamed from libre/ogre-libre/PKGBUILD)17
-rw-r--r--libre/ogre/libre.patch (renamed from libre/ogre-libre/libre.patch)0
-rw-r--r--libre/p7zip/7zFM.desktop (renamed from libre/p7zip-libre/7zFM.desktop)0
-rw-r--r--libre/p7zip/PKGBUILD (renamed from libre/p7zip-libre/PKGBUILD)23
-rw-r--r--libre/p7zip/install (renamed from libre/p7zip-libre/install)0
-rw-r--r--libre/p7zip/libre.patch (renamed from libre/p7zip-libre/libre.patch)0
-rw-r--r--libre/ponysay/PKGBUILD (renamed from libre/ponysay-libre/PKGBUILD)9
-rw-r--r--libre/povray/PKGBUILD (renamed from libre/povray-libre/PKGBUILD)23
-rw-r--r--libre/povray/povray3.7.0_rc3-user-conf.patch (renamed from libre/povray-libre/povray3.7.0_rc3-user-conf.patch)0
12 files changed, 55 insertions, 64 deletions
diff --git a/libre/netsurf-libre/PKGBUILD b/libre/netsurf/PKGBUILD
index 70ed26c7e..0a912302a 100644
--- a/libre/netsurf-libre/PKGBUILD
+++ b/libre/netsurf/PKGBUILD
@@ -1,33 +1,31 @@
-# $Id: PKGBUILD 117980 2014-08-27 19:40:10Z arodseth $
+# $Id: PKGBUILD 118143 2014-09-01 16:06:05Z arodseth $
# Maintainer (Arch): Alexander Rødseth <rodseth@gmail.com>
# Contributor (Arch): Paulo Matias <matiasΘarchlinux-br·org>
# Contributor (Arch): Georgij Kondratjev <smpuj@bk.ru>
# Contributor (Arch): Daniel J Griffiths <ghost1227@archlinux.us>
# Maintainer: André Silva <emulatorman@parabola.nu>
-_pkgname=netsurf
-pkgname=netsurf-libre
-pkgver=3.1
-pkgrel=2
+pkgname=netsurf
+pkgver=3.2
+pkgrel=1.parabola1
pkgdesc='Lightweight and fast web browser, without non-privacy search providers'
arch=('x86_64' 'i686' 'mips64el')
url='http://www.netsurf-browser.org/'
license=('MIT' 'GPL2')
-replaces=($_pkgname)
-conflicts=($_pkgname)
-provides=($_pkgname=$pkgver)
-depends=('libmng' 'librsvg' 'libwebp' 'curl' 'lcms' 'desktop-file-utils' 'libnsbmp>=0.1.1' 'libnsgif>=0.1.1' 'libcss>=0.3.0' 'libdom>=0.1.0' 'gtk2') # gtk3
+replaces=(${pkgname}-libre)
+conflicts=(${pkgname}-libre)
+depends=('libmng' 'librsvg' 'libwebp' 'curl' 'lcms' 'desktop-file-utils' 'libnsbmp>=0.1.1' 'libnsgif>=0.1.1' 'libcss>=0.4.0' 'libdom>=0.1.1' 'gtk2') # gtk3
makedepends=('re2c' 'gendesk' 'netsurf-buildsystem' 'perl-html-parser' 'nsgenbind' 'inetutils')
-install="$_pkgname.install"
+install="$pkgname.install"
source=("netsurf.png::http://ubuntu.allmyapps.com/data/n/e/netsurf-netsurf-web-browser/icon_48x48_netsurf.png"
- "http://download.$_pkgname-browser.org/$_pkgname/releases/source/$_pkgname-$pkgver-src.tar.gz"
+ "http://download.$pkgname-browser.org/$pkgname/releases/source/$pkgname-$pkgver-src.tar.gz"
'netsurf.sh')
sha256sums=('f0dbcc5d80bf03d706aa8b28a322aa7f169a40813848c2d1505691f6e2c7ef00'
- '1ef12b2e2bc68f9eff8465646b7359e3cb483e1042aed750cc283a70dd4c540c'
+ '04ffeb8335c59cbc23371b79ae3b178002e6e95c35225ef62db4b155ecc7e213'
'70310682d1612457d7bb3096549110b6ec127f50e97853259fada6be0c52924b')
prepare() {
- cd "$_pkgname-$pkgver"
+ cd "$pkgname-$pkgver"
# remove non-privacy search providers
sed -i '\|Google|d
@@ -96,13 +94,13 @@ prepare() {
cd ..
- gendesk -f --pkgname "$_pkgname" --pkgdesc "$pkgdesc" --exec 'netsurf %U' \
+ gendesk -f --pkgname "$pkgname" --pkgdesc "$pkgdesc" --exec 'netsurf %U' \
--genericname 'Web Browser' --comment 'Lightweight web browser' \
--mimetypes 'text/html;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/geo'
}
build() {
- make -C "$_pkgname-$pkgver" \
+ make -C "$pkgname-$pkgver" \
PREFIX=/usr \
TARGET=gtk \
NETSURF_USE_WEBP=YES \
@@ -112,17 +110,14 @@ build() {
}
package() {
- make -C "$_pkgname-$pkgver" install PREFIX=/usr DESTDIR="$pkgdir"
- mv "$pkgdir/usr/bin/$_pkgname" "$pkgdir/usr/bin/$_pkgname.elf"
- install -Dm755 "$_pkgname.sh" "$pkgdir/usr/bin/$_pkgname"
- install -Dm644 "$_pkgname.png" "$pkgdir/usr/share/pixmaps/$_pkgname.png"
- install -Dm644 "$_pkgname.desktop" \
- "$pkgdir/usr/share/applications/$_pkgname.desktop"
- install -Dm644 "$_pkgname-$pkgver/COPYING" \
- "$pkgdir/usr/share/licenses/$_pkgname/LICENSE"
- # use softlinks instead of hardlinks
- rm -r "$pkgdir/usr/share/netsurf/C"
- ln -s '/usr/share/netsurf/en' "$pkgdir/usr/share/netsurf/C"
+ make -C "$pkgname-$pkgver" install PREFIX=/usr DESTDIR="$pkgdir"
+ mv "$pkgdir/usr/bin/$pkgname" "$pkgdir/usr/bin/$pkgname.elf"
+ install -Dm755 "$pkgname.sh" "$pkgdir/usr/bin/$pkgname"
+ install -Dm644 "$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png"
+ install -Dm644 "$pkgname.desktop" \
+ "$pkgdir/usr/share/applications/$pkgname.desktop"
+ install -Dm644 "$pkgname-$pkgver/COPYING" \
+ "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
}
# vim:set ts=2 sw=2 et:
diff --git a/libre/netsurf-libre/netsurf.install b/libre/netsurf/netsurf.install
index ad97d7bab..ad97d7bab 100644
--- a/libre/netsurf-libre/netsurf.install
+++ b/libre/netsurf/netsurf.install
diff --git a/libre/netsurf-libre/netsurf.sh b/libre/netsurf/netsurf.sh
index 01ff68450..01ff68450 100644
--- a/libre/netsurf-libre/netsurf.sh
+++ b/libre/netsurf/netsurf.sh
diff --git a/libre/ogre-libre/PKGBUILD b/libre/ogre/PKGBUILD
index 890b46163..99804ea63 100644
--- a/libre/ogre-libre/PKGBUILD
+++ b/libre/ogre/PKGBUILD
@@ -10,11 +10,11 @@ _addrel=1
pkgbase=ogre
pkgname=(
- $pkgbase-libre
+ $pkgbase
#$_bldname-addon-$pkgbase # package unstable
)
pkgver=1.9.0
-pkgrel=6
+pkgrel=6.parabola1
pkgdesc='Scene-oriented, flexible 3D engine written in C++, without nonfree software support and files'
arch=(
mips64el
@@ -132,14 +132,13 @@ build() {
make
}
-package_ogre-libre() {
+package_ogre() {
optdepends=(
"boost: for developing using $pkgbase"
"$pkgbase-docs: documentation"
)
- provides=($pkgbase=$pkgver)
- conflicts=$pkgbase
- replaces=$pkgbase
+ conflicts=(${pkgbase}-libre)
+ replaces=(${pkgbase}-libre)
cd ${pkgbase}/build
@@ -154,11 +153,11 @@ package_ogre-libre() {
}
package_blender-addon-ogre() {
- pkgdesc="${pkgbase^} Mesh Exporter: A addon for the ${_bldname^} which allows export mesh and (skeletal/morph/pose) animations to ${pkgbase^}3D format (built for the $_bldname-libre package)"
+ pkgdesc="${pkgbase^} Mesh Exporter: A addon for the ${_bldname^} which allows export mesh and (skeletal/morph/pose) animations to ${pkgbase^}3D format (built for the $_bldname package)"
arch=any
depends=(
- "$_bldname-libre>=$(($_bldep-1)):$_bldver"
- "$_bldname-libre<$_bldep:${_bldver::2}$((${_bldver:2:4}+1))"
+ "$_bldname>=$(($_bldep-1)):$_bldver"
+ "$_bldname<$_bldep:${_bldver::2}$((${_bldver:2:4}+1))"
)
_pkgver=$pkgver
pkgver=$_addver.v$_bldver
diff --git a/libre/ogre-libre/libre.patch b/libre/ogre/libre.patch
index e9a1846b1..e9a1846b1 100644
--- a/libre/ogre-libre/libre.patch
+++ b/libre/ogre/libre.patch
diff --git a/libre/p7zip-libre/7zFM.desktop b/libre/p7zip/7zFM.desktop
index 62b8e8562..62b8e8562 100644
--- a/libre/p7zip-libre/7zFM.desktop
+++ b/libre/p7zip/7zFM.desktop
diff --git a/libre/p7zip-libre/PKGBUILD b/libre/p7zip/PKGBUILD
index 98c91718e..b34262451 100644
--- a/libre/p7zip-libre/PKGBUILD
+++ b/libre/p7zip/PKGBUILD
@@ -5,23 +5,22 @@
# Contributor (Arch): Daniel J Griffiths <ghost1227@archlinux.us>
# Maintainer (Arch): Gaetan Bisson <bisson@archlinux.org>
-pkgname=p7zip-libre
-_pkgname=${pkgname%-libre}
+_pkgname=p7zip-libre
+pkgname=p7zip
pkgver=9.20.1
-pkgrel=9.4
+pkgrel=9.parabola1
pkgdesc='Command-line version of the 7zip compressed file archiver, without nonfree decompression engine for RAR archives'
url='http://p7zip.sourceforge.net/'
license=('GPL')
arch=('i686' 'x86_64' 'mips64el')
-provides=("p7zip=$pkgver")
-conflicts=('p7zip')
-replaces=('p7zip')
+conflicts=('p7zip-libre')
+replaces=('p7zip-libre')
depends=('gcc-libs' 'bash')
optdepends=('wxgtk2.8: GUI'
'desktop-file-utils: desktop entries')
makedepends=('yasm' 'nasm' 'wxgtk2.8')
-mksource=("http://downloads.sourceforge.net/project/${_pkgname}/${_pkgname}/${pkgver}/${_pkgname}_${pkgver}_src_all.tar.bz2")
-source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}_${pkgver}_src_all.tar.bz2"
+mksource=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}_${pkgver}_src_all.tar.bz2")
+source=("https://repo.parabolagnulinux.org/other/${_pkgname}/${_pkgname}_${pkgver}_src_all.tar.bz2"
'7zFM.desktop' 'libre.patch')
mksha1sums=('1cd567e043ee054bf08244ce15f32cb3258306b7')
sha1sums=('4e5ba097a90f3e00ad072023030c87f0707733b8'
@@ -32,7 +31,7 @@ options=('!makeflags')
install=install
mksource() {
- cd "${srcdir}/${_pkgname}_${pkgver}"
+ cd "${srcdir}/${pkgname}_${pkgver}"
# Remove nonfree unRAR utility files from the source
rm -rv CPP/7zip/{Archive,Compress}/Rar
@@ -45,7 +44,7 @@ mksource() {
}
prepare() {
- cd "${srcdir}/${_pkgname}_${pkgver}"
+ cd "${srcdir}/${pkgname}_${pkgver}"
# remove rar and parent folder icon references
patch -Np1 -i ../libre.patch
@@ -60,12 +59,12 @@ prepare() {
}
build() {
- cd "${srcdir}/${_pkgname}_${pkgver}"
+ cd "${srcdir}/${pkgname}_${pkgver}"
make all4 OPTFLAGS="${CXXFLAGS}"
}
package() {
- cd "${srcdir}/${_pkgname}_${pkgver}"
+ cd "${srcdir}/${pkgname}_${pkgver}"
make install \
DEST_DIR="${pkgdir}" \
DEST_HOME="/usr" \
diff --git a/libre/p7zip-libre/install b/libre/p7zip/install
index 7f3cc4358..7f3cc4358 100644
--- a/libre/p7zip-libre/install
+++ b/libre/p7zip/install
diff --git a/libre/p7zip-libre/libre.patch b/libre/p7zip/libre.patch
index 86b2caebc..86b2caebc 100644
--- a/libre/p7zip-libre/libre.patch
+++ b/libre/p7zip/libre.patch
diff --git a/libre/ponysay-libre/PKGBUILD b/libre/ponysay/PKGBUILD
index 8b68ab0fd..3248ea577 100644
--- a/libre/ponysay-libre/PKGBUILD
+++ b/libre/ponysay/PKGBUILD
@@ -3,21 +3,20 @@
# Maintainer: André Silva <emulatorman@parabola.nu>
# Contributor: Márcio Silva <coadde@parabola.nu>
-_pkgname=ponysay
-pkgname=ponysay-libre
+_pkgname=ponysay-libre
+pkgname=ponysay
pkgver=3.0.2
-pkgrel=1
+pkgrel=1.parabola1
pkgdesc="cowsay reimplemention for ponies, without nonfree pony graphics"
url="http://erkin.github.com/ponysay/"
arch=('any')
license=('GPL3')
replaces=($_pkgname)
conflicts=($_pkgname)
-provides=($_pkgname=$pkgver)
depends=('python' 'bash')
makedepends=('git')
mksource=("ponysay-$pkgver.tar.gz::https://github.com/erkin/ponysay/tarball/$pkgver")
-source=("https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz")
+source=("https://repo.parabolagnulinux.org/other/$_pkgname/$_pkgname-$pkgver.tar.gz")
mkmd5sums=('84b04705a0a57b2f43327ac6b7952013')
md5sums=('0cf3f97b30a374f448747b7594179081')
diff --git a/libre/povray-libre/PKGBUILD b/libre/povray/PKGBUILD
index e68afa864..281405cdb 100644
--- a/libre/povray-libre/PKGBUILD
+++ b/libre/povray/PKGBUILD
@@ -8,10 +8,10 @@
# Maintainer: Márcio Silva <coadde@parabola.nu>
# Don't build povray before 3.7 version (that ones are nonfree software)
-_pkgname=povray
-pkgname=$_pkgname-libre
+_pkgname=povray-libre
+pkgname=povray
pkgver=3.7
-pkgrel=4
+pkgrel=4.parabola1
epoch=1
pkgdesc='Script based raytracer for creating 3D graphics, without nonfree documentation'
arch=('x86_64' 'i686' 'mips64el')
@@ -19,27 +19,26 @@ license=('AGPL3')
url='http://povray.org/'
depends=('libtiff' 'libpng' 'boost-libs')
makedepends=('boost')
-provides=("$_pkgname=$pkgver")
conflicts=("$_pkgname")
replaces=("$_pkgname")
backup=("etc/povray/$pkgver/povray.conf"
"etc/povray/$pkgver/povray.ini")
-mksource=("https://github.com/POV-Ray/$_pkgname/archive/$pkgver-stable.zip")
-source=("https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver-stable.tar.xz"
+mksource=("https://github.com/POV-Ray/$pkgname/archive/$pkgver-stable.zip")
+source=("https://repo.parabolagnulinux.org/other/$_pkgname/$_pkgname-$pkgver-stable.tar.xz"
'povray3.7.0_rc3-user-conf.patch')
mksha256sums=('1261d963327a4b04c09d56bbd7436d0062e6bf8363674e3fb4e240beefb5b5cb')
sha256sums=('ba2a867b8593689067143b23ebdccb8f8f46487244802d24d873517287b924f1'
'95b04ec4973e6e8a80fc83df2e3caff0b4d6699c4154144f3017d42cab7236e0')
mksource() {
- cd "$_pkgname-$pkgver-stable"
+ cd "$pkgname-$pkgver-stable"
# remove nonfree documentation
rm -rv doc
}
prepare() {
- cd "$_pkgname-$pkgver-stable"
+ cd "$pkgname-$pkgver-stable"
cd unix
sed 's/automake --w/automake --add-missing --w/g' -i prebuild.sh
@@ -51,7 +50,7 @@ prepare() {
}
build() {
- cd "$_pkgname-$pkgver-stable"
+ cd "$pkgname-$pkgver-stable"
./configure LIBS="-lboost_system -lboost_thread" COMPILED_BY='Parabola GNU/Linux-libre' \
--prefix=/usr --sysconfdir=/etc
@@ -60,10 +59,10 @@ build() {
}
package() {
- cd "$_pkgname-$pkgver-stable"
+ cd "$pkgname-$pkgver-stable"
- install -d "$pkgdir/usr/share/$_pkgname-$pkgver"
- cp -r icons include ini scenes scripts "$pkgdir/usr/share/$_pkgname-$pkgver"
+ install -d "$pkgdir/usr/share/$pkgname-$pkgver"
+ cp -r icons include ini scenes scripts "$pkgdir/usr/share/$pkgname-$pkgver"
install -Dm755 unix/povray "$pkgdir/usr/bin/povray"
install -Dm644 povray.conf "$pkgdir/etc/povray/$pkgver/povray.conf"
install -Dm644 povray.ini "$pkgdir/etc/povray/$pkgver/povray.ini"
diff --git a/libre/povray-libre/povray3.7.0_rc3-user-conf.patch b/libre/povray/povray3.7.0_rc3-user-conf.patch
index f20d9b506..f20d9b506 100644
--- a/libre/povray-libre/povray3.7.0_rc3-user-conf.patch
+++ b/libre/povray/povray3.7.0_rc3-user-conf.patch