From 272d8546acd8cce70852359bc1fee429d3fa5dc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?coadde=20=5BM=C3=A1rcio=20Alexandre=20Silva=20Delgado=5D?= Date: Wed, 3 Sep 2014 18:33:55 -0300 Subject: rename to abuse-libre --- libre/abuse-libre/PKGBUILD | 79 ----------------------- libre/abuse-libre/abuse.install | 13 ---- libre/abuse-libre/abuse.sh | 15 ----- libre/abuse-libre/default.abuserc | 37 ----------- libre/abuse-libre/default.gamma.lsp | 1 - libre/abuse-libre/non-claudio.patch | 122 ------------------------------------ libre/abuse/PKGBUILD | 79 +++++++++++++++++++++++ libre/abuse/abuse.install | 13 ++++ libre/abuse/abuse.sh | 15 +++++ libre/abuse/default.abuserc | 37 +++++++++++ libre/abuse/default.gamma.lsp | 1 + libre/abuse/non-claudio.patch | 122 ++++++++++++++++++++++++++++++++++++ 12 files changed, 267 insertions(+), 267 deletions(-) delete mode 100644 libre/abuse-libre/PKGBUILD delete mode 100644 libre/abuse-libre/abuse.install delete mode 100644 libre/abuse-libre/abuse.sh delete mode 100644 libre/abuse-libre/default.abuserc delete mode 100644 libre/abuse-libre/default.gamma.lsp delete mode 100644 libre/abuse-libre/non-claudio.patch create mode 100644 libre/abuse/PKGBUILD create mode 100644 libre/abuse/abuse.install create mode 100644 libre/abuse/abuse.sh create mode 100644 libre/abuse/default.abuserc create mode 100644 libre/abuse/default.gamma.lsp create mode 100644 libre/abuse/non-claudio.patch diff --git a/libre/abuse-libre/PKGBUILD b/libre/abuse-libre/PKGBUILD deleted file mode 100644 index dfffa4947..000000000 --- a/libre/abuse-libre/PKGBUILD +++ /dev/null @@ -1,79 +0,0 @@ -# $Id: PKGBUILD 101370 2013-11-23 19:00:48Z arodseth $ -# Maintainer (Arch): Alexander Rødseth -# Contributor (Arch): Lukas Fleischer -# Contributor (Arch): jlvsimoes -# Contributor (Arch): kevin -# Contributor: André Silva - -_pkgname=abuse -pkgname=abuse-libre -pkgver=0.8 -pkgrel=4 -pkgdesc='Side-scroller action game that pits you against ruthless alien killers, without nonfree claudio support' -arch=('x86_64' 'i686' 'mips64el') -url='http://abuse.zoy.org/' -license=('GPL' 'custom') -provides=($_pkgname=$pkgver) -replaces=($_pkgname) -conflicts=($_pkgname) -depends=('gcc-libs' 'libgl' 'sdl_mixer' 'glu' 'desktop-file-utils') -makedepends=('gendesk' 'mesa-libgl' 'glu') -install="$_pkgname.install" -mksource=("http://abuse.zoy.org/raw-attachment/wiki/download/$_pkgname-$pkgver.tar.gz" - 'non-claudio.patch') -source=("https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz" - 'abuse.sh' - 'default.abuserc' - 'default.gamma.lsp') -mksha256sums=('0104db5fd2695c9518583783f7aaa7e5c0355e27c5a803840a05aef97f9d3488' - '017cb58acf5ba8cdb889f97a758318cb66ab4947b860a77ab16b932c3f21b98f') -sha256sums=('ff7018b3ddcc6d2e702bc14eb2884622677ac5141c36e1fc0cdd127df3017f7d' - 'a5ddac71ca9b8c4bb42bdf91393a5fbe3d839ab9a9e9a6362a75dafc2aab122e' - '6ea2fa9e65c10bbcab4432f40d0c7284cb3970835c40c5c00ced14b39ce1b00f' - '13df83fea60918d29d5141cdfbd8d56147c053e88d3701209ae676f46447c2f6') - -mksource() { - cd "abuse-$pkgver" - - # Remove the nonfree claudio addon - rm -rvf ./data/addon/claudio - patch -Np1 -i "$srcdir/non-claudio.patch" -} - -prepare() { - cd "abuse-$pkgver" - - gendesk -n -f --pkgname "$_pkgname" --pkgdesc "$pkgdesc" -} - -build() { - cd "abuse-$pkgver" - - ./configure --prefix=/usr --with-assetdir="/usr/share/$_pkgname/orig" --with-x - make -} - -package() { - cd "abuse-$pkgver" - - make DESTDIR="$pkgdir" install - - # Desktop shortcut and icon - install -Dm644 "$_pkgname.desktop" \ - "$pkgdir/usr/share/applications/$_pkgname.desktop" - install -Dm644 "doc/$_pkgname.png" "$pkgdir/usr/share/pixmaps/$_pkgname.png" - - # Sane defaults - mv "$pkgdir/usr/bin/$_pkgname" "$pkgdir/usr/bin/$_pkgname.elf" - install -Dm755 "$srcdir/$_pkgname.sh" "$pkgdir/usr/bin/$_pkgname" - install -Dm644 "$srcdir/default.${_pkgname}rc" \ - "$pkgdir/usr/share/$_pkgname/default.${_pkgname}rc" - install -Dm644 "$srcdir/default.gamma.lsp" \ - "$pkgdir/usr/share/$_pkgname/default.gamma.lsp" - - # License (for the original source code) - install -d "$pkgdir/usr/share/licenses/abuse" - sed -n '1,/^$/p' src/view.cpp > "$pkgdir/usr/share/licenses/abuse/original" -} - -# vim:set ts=2 sw=2 et: diff --git a/libre/abuse-libre/abuse.install b/libre/abuse-libre/abuse.install deleted file mode 100644 index ad97d7bab..000000000 --- a/libre/abuse-libre/abuse.install +++ /dev/null @@ -1,13 +0,0 @@ -post_upgrade() { - update-desktop-database -q -} - -post_install() { - post_upgrade -} - -post_remove() { - post_upgrade -} - -# vim:set ts=2 sw=2 et: diff --git a/libre/abuse-libre/abuse.sh b/libre/abuse-libre/abuse.sh deleted file mode 100644 index 228bb6f7b..000000000 --- a/libre/abuse-libre/abuse.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -# Use sane configuration files, unless they already exists - -if [ ! -d $HOME/.abuse ]; then - mkdir -p $HOME/.abuse -fi -if [ ! -f $HOME/.abuse/abuserc ]; then - cp /usr/share/abuse/default.abuserc $HOME/.abuse/abuserc -fi -if [ ! -f $HOME/.abuse/gamma.lsp ]; then - cp /usr/share/abuse/default.gamma.lsp $HOME/.abuse/gamma.lsp -fi - -exec /usr/bin/abuse.elf diff --git a/libre/abuse-libre/default.abuserc b/libre/abuse-libre/default.abuserc deleted file mode 100644 index ff116819f..000000000 --- a/libre/abuse-libre/default.abuserc +++ /dev/null @@ -1,37 +0,0 @@ -; Abuse-SDL Configuration file - -; Startup fullscreen -fullscreen=0 - -; Use DoubleBuffering -doublebuf=1 - -; Use OpenGL -gl=1 - -; Location of the datafiles -datadir=/usr/share/abuse/orig - -; Use mono audio only -mono=0 - -; Grab the mouse to the window -grabmouse=0 - -; Set the scale factor -scale=2 - -; Use anti-aliasing (with gl=1 only) -antialias=0 - -; Disable the SDL parachute in the case of a crash -nosdlparachute=0 - -; Key mappings -left=a -right=d -up=w -down=s -fire=Space -weapprev=q -weapnext=e diff --git a/libre/abuse-libre/default.gamma.lsp b/libre/abuse-libre/default.gamma.lsp deleted file mode 100644 index 9a77afa27..000000000 --- a/libre/abuse-libre/default.gamma.lsp +++ /dev/null @@ -1 +0,0 @@ -(setq darkest_gray 20) diff --git a/libre/abuse-libre/non-claudio.patch b/libre/abuse-libre/non-claudio.patch deleted file mode 100644 index 2a29e53f0..000000000 --- a/libre/abuse-libre/non-claudio.patch +++ /dev/null @@ -1,122 +0,0 @@ ---- abuse-0.8/data/Makefile.in 2011-05-09 08:06:35.000000000 -0300 -+++ abuse-0.8/data/Makefile.in 2012-04-11 15:03:02.854839102 -0300 -@@ -184,7 +184,6 @@ - addon/aliens/objects.lsp addon/aliens/powerold.lsp \ - addon/aliens/powerups.lsp addon/aliens/sfx.lsp \ - addon/aliens/tiles.lsp addon/bong/bong.lsp \ -- addon/claudio/claudio.lsp addon/claudio/oldclaud.lsp \ - addon/deathmat/cur_lev.lsp addon/deathmat/deathmat.lsp \ - addon/deathmat/dstartup.lsp addon/deathmat/gamename.lsp \ - addon/deathmat/large.lsp addon/deathmat/levelset.lsp \ -@@ -245,23 +244,6 @@ - art/tints/guns/orange.spe art/tints/guns/redish.spe \ - addon/aliens/aliens.spe addon/aliens/bactiles.spe \ - addon/aliens/fortiles.spe addon/bong/bong.spe \ -- addon/claudio/antship.spe addon/claudio/bigexp.spe \ -- addon/claudio/deepw1.spe addon/claudio/deepw2.spe \ -- addon/claudio/droid.spe addon/claudio/extiles.spe \ -- addon/claudio/fire.spe addon/claudio/lamp.spe \ -- addon/claudio/lava2.spe addon/claudio/mypanels.spe \ -- addon/claudio/nplatfor.spe addon/claudio/pal21.spe \ -- addon/claudio/pal2.spe addon/claudio/pal5.spe \ -- addon/claudio/pal81f.spe addon/claudio/pal81.spe \ -- addon/claudio/pal82f.spe addon/claudio/pal82.spe \ -- addon/claudio/pal90.spe addon/claudio/rob2.spe \ -- addon/claudio/skull.spe addon/claudio/spaced.spe \ -- addon/claudio/spaceh.spe addon/claudio/spacymed.spe \ -- addon/claudio/spacytdm.spe addon/claudio/sswitch.spe \ -- addon/claudio/t_lamp.spe addon/claudio/trex1.spe \ -- addon/claudio/t_skull.spe addon/claudio/t_space.spe \ -- addon/claudio/t_trex.spe addon/claudio/t_water.spe \ -- addon/claudio/umbrel3.spe addon/claudio/watem.spe \ - addon/example/example.spe addon/leon/gray.spe \ - addon/leon/level00.spe addon/leon/level01.spe \ - addon/leon/level02.spe addon/leon/lmisc.spe \ -@@ -333,7 +315,6 @@ - doc = \ - addon/aliens/aliens.txt \ - addon/aliens/readme.txt \ -- addon/claudio/palettes.txt \ - addon/leon/leon.txt \ - addon/newart/tiledoc.txt \ - addon/pong/pong.txt \ -@@ -414,17 +395,6 @@ - @HAVE_NONFREE_TRUE@ addon/aliens/aslash01.wav \ - @HAVE_NONFREE_TRUE@ addon/aliens/egghatch.wav \ - @HAVE_NONFREE_TRUE@ addon/aliens/jarbreak.wav \ --@HAVE_NONFREE_TRUE@ addon/claudio/aship.wav \ --@HAVE_NONFREE_TRUE@ addon/claudio/drill.wav \ --@HAVE_NONFREE_TRUE@ addon/claudio/fire.wav \ --@HAVE_NONFREE_TRUE@ addon/claudio/glass1.wav \ --@HAVE_NONFREE_TRUE@ addon/claudio/sewers.wav \ --@HAVE_NONFREE_TRUE@ addon/claudio/skull.wav \ --@HAVE_NONFREE_TRUE@ addon/claudio/spaceo.wav \ --@HAVE_NONFREE_TRUE@ addon/claudio/trex1.wav \ --@HAVE_NONFREE_TRUE@ addon/claudio/trex2.wav \ --@HAVE_NONFREE_TRUE@ addon/claudio/unhealth.wav \ --@HAVE_NONFREE_TRUE@ addon/claudio/wfall.wav \ - @HAVE_NONFREE_TRUE@ addon/leon/sfx/ambship1.wav \ - @HAVE_NONFREE_TRUE@ addon/leon/sfx/ambship2.wav \ - @HAVE_NONFREE_TRUE@ addon/leon/sfx/gren5.wav \ ---- abuse-0.8/data/Makefile.am 2011-05-09 04:58:04.000000000 -0300 -+++ abuse-0.8/data/Makefile.am 2012-04-11 15:03:50.282407491 -0300 -@@ -35,7 +35,6 @@ - \ - addon/bong/bong.lsp \ - \ -- addon/claudio/claudio.lsp addon/claudio/oldclaud.lsp \ - addon/deathmat/cur_lev.lsp addon/deathmat/deathmat.lsp \ - addon/deathmat/dstartup.lsp addon/deathmat/gamename.lsp \ - addon/deathmat/large.lsp addon/deathmat/levelset.lsp \ -@@ -113,21 +112,6 @@ - \ - addon/bong/bong.spe \ - \ -- addon/claudio/antship.spe addon/claudio/bigexp.spe \ -- addon/claudio/deepw1.spe addon/claudio/deepw2.spe addon/claudio/droid.spe \ -- addon/claudio/extiles.spe addon/claudio/fire.spe addon/claudio/lamp.spe \ -- addon/claudio/lava2.spe addon/claudio/mypanels.spe \ -- addon/claudio/nplatfor.spe addon/claudio/pal21.spe addon/claudio/pal2.spe \ -- addon/claudio/pal5.spe addon/claudio/pal81f.spe addon/claudio/pal81.spe \ -- addon/claudio/pal82f.spe addon/claudio/pal82.spe addon/claudio/pal90.spe \ -- addon/claudio/rob2.spe addon/claudio/skull.spe addon/claudio/spaced.spe \ -- addon/claudio/spaceh.spe addon/claudio/spacymed.spe \ -- addon/claudio/spacytdm.spe addon/claudio/sswitch.spe \ -- addon/claudio/t_lamp.spe addon/claudio/trex1.spe \ -- addon/claudio/t_skull.spe addon/claudio/t_space.spe \ -- addon/claudio/t_trex.spe addon/claudio/t_water.spe \ -- addon/claudio/umbrel3.spe addon/claudio/watem.spe \ -- \ - addon/example/example.spe \ - \ - addon/leon/gray.spe addon/leon/level00.spe addon/leon/level01.spe \ -@@ -214,7 +198,6 @@ - doc = \ - addon/aliens/aliens.txt \ - addon/aliens/readme.txt \ -- addon/claudio/palettes.txt \ - addon/leon/leon.txt \ - addon/newart/tiledoc.txt \ - addon/pong/pong.txt \ -@@ -267,11 +250,6 @@ - addon/aliens/altaunt.wav addon/aliens/aslash01.wav \ - addon/aliens/egghatch.wav addon/aliens/jarbreak.wav \ - \ -- addon/claudio/aship.wav addon/claudio/drill.wav addon/claudio/fire.wav \ -- addon/claudio/glass1.wav addon/claudio/sewers.wav addon/claudio/skull.wav \ -- addon/claudio/spaceo.wav addon/claudio/trex1.wav addon/claudio/trex2.wav \ -- addon/claudio/unhealth.wav addon/claudio/wfall.wav \ -- \ - addon/leon/sfx/ambship1.wav addon/leon/sfx/ambship2.wav \ - addon/leon/sfx/gren5.wav addon/leon/sfx/gren6.wav \ - addon/leon/sfx/rain2.wav addon/leon/sfx/rain3.wav \ ---- abuse-0.8/data/abuse.lsp 2011-05-09 04:58:04.000000000 -0300 -+++ abuse-0.8/data/abuse.lsp 2012-04-11 15:04:15.637788215 -0300 -@@ -42,7 +42,6 @@ - (load "addon/twist/f2chars.lsp") - (load "addon/twist/f2ai.lsp") - (load "addon/aliens/astartup.lsp") --(load "addon/claudio/claudio.lsp") - (load "addon/twist/lisp/dray.lsp") - (load "addon/twist/lisp/mario.lsp") - (load "addon/leon/4frabs.lsp") diff --git a/libre/abuse/PKGBUILD b/libre/abuse/PKGBUILD new file mode 100644 index 000000000..6734cce30 --- /dev/null +++ b/libre/abuse/PKGBUILD @@ -0,0 +1,79 @@ +# $Id: PKGBUILD 101370 2013-11-23 19:00:48Z arodseth $ +# Maintainer (Arch): Alexander Rødseth +# Contributor (Arch): Lukas Fleischer +# Contributor (Arch): jlvsimoes +# Contributor (Arch): kevin +# Contributor: André Silva +# Contributor: Márcio Silva + +pkgname=abuse +_pkgname=$pkgname-libre +pkgver=0.8 +pkgrel=4 +pkgdesc='Side-scroller action game that pits you against ruthless alien killers, without nonfree claudio support' +arch=('x86_64' 'i686' 'mips64el') +url="http://$pkgname.zoy.org/" +license=('GPL' 'custom') +replaces=($_pkgname) +conflicts=($_pkgname) +depends=('gcc-libs' 'libgl' 'sdl_mixer' 'glu' 'desktop-file-utils') +makedepends=('gendesk' 'mesa-libgl' 'glu') +install="$pkgname.install" +mksource=("http://$pkgname.zoy.org/raw-attachment/wiki/download/$_pkgname-$pkgver.tar.gz" + 'non-claudio.patch') +source=("https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz" + "$pkgname.sh" + "default.${pkgname}rc" + 'default.gamma.lsp') +mksha256sums=('0104db5fd2695c9518583783f7aaa7e5c0355e27c5a803840a05aef97f9d3488' + '017cb58acf5ba8cdb889f97a758318cb66ab4947b860a77ab16b932c3f21b98f') +sha256sums=('ff7018b3ddcc6d2e702bc14eb2884622677ac5141c36e1fc0cdd127df3017f7d' + 'a5ddac71ca9b8c4bb42bdf91393a5fbe3d839ab9a9e9a6362a75dafc2aab122e' + '6ea2fa9e65c10bbcab4432f40d0c7284cb3970835c40c5c00ced14b39ce1b00f' + '13df83fea60918d29d5141cdfbd8d56147c053e88d3701209ae676f46447c2f6') + +mksource() { + cd "$pkgname-$pkgver" + + # Remove the nonfree claudio addon + rm -rvf ./data/addon/claudio + patch -Np1 -i "$srcdir/non-claudio.patch" +} + +prepare() { + cd "$pkgname-$pkgver" + + gendesk -n -f --pkgname "$pkgname" --pkgdesc "$pkgdesc" +} + +build() { + cd "$pkgname-$pkgver" + + ./configure --prefix=/usr --with-assetdir="/usr/share/$pkgname/orig" --with-x + make +} + +package() { + cd "$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + + # Desktop shortcut and icon + install -Dm644 "$pkgname.desktop" \ + "$pkgdir/usr/share/applications/$pkgname.desktop" + install -Dm644 "doc/$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png" + + # Sane defaults + mv "$pkgdir/usr/bin/$pkgname" "$pkgdir/usr/bin/$pkgname.elf" + install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/usr/bin/$pkgname" + install -Dm644 "$srcdir/default.${pkgname}rc" \ + "$pkgdir/usr/share/$pkgname/default.${pkgname}rc" + install -Dm644 "$srcdir/default.gamma.lsp" \ + "$pkgdir/usr/share/$pkgname/default.gamma.lsp" + + # License (for the original source code) + install -d "$pkgdir/usr/share/licenses/$pkgname" + sed -n '1,/^$/p' src/view.cpp > "$pkgdir/usr/share/licenses/$pkgname/original" +} + +# vim:set ts=2 sw=2 et: diff --git a/libre/abuse/abuse.install b/libre/abuse/abuse.install new file mode 100644 index 000000000..ad97d7bab --- /dev/null +++ b/libre/abuse/abuse.install @@ -0,0 +1,13 @@ +post_upgrade() { + update-desktop-database -q +} + +post_install() { + post_upgrade +} + +post_remove() { + post_upgrade +} + +# vim:set ts=2 sw=2 et: diff --git a/libre/abuse/abuse.sh b/libre/abuse/abuse.sh new file mode 100644 index 000000000..228bb6f7b --- /dev/null +++ b/libre/abuse/abuse.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +# Use sane configuration files, unless they already exists + +if [ ! -d $HOME/.abuse ]; then + mkdir -p $HOME/.abuse +fi +if [ ! -f $HOME/.abuse/abuserc ]; then + cp /usr/share/abuse/default.abuserc $HOME/.abuse/abuserc +fi +if [ ! -f $HOME/.abuse/gamma.lsp ]; then + cp /usr/share/abuse/default.gamma.lsp $HOME/.abuse/gamma.lsp +fi + +exec /usr/bin/abuse.elf diff --git a/libre/abuse/default.abuserc b/libre/abuse/default.abuserc new file mode 100644 index 000000000..ff116819f --- /dev/null +++ b/libre/abuse/default.abuserc @@ -0,0 +1,37 @@ +; Abuse-SDL Configuration file + +; Startup fullscreen +fullscreen=0 + +; Use DoubleBuffering +doublebuf=1 + +; Use OpenGL +gl=1 + +; Location of the datafiles +datadir=/usr/share/abuse/orig + +; Use mono audio only +mono=0 + +; Grab the mouse to the window +grabmouse=0 + +; Set the scale factor +scale=2 + +; Use anti-aliasing (with gl=1 only) +antialias=0 + +; Disable the SDL parachute in the case of a crash +nosdlparachute=0 + +; Key mappings +left=a +right=d +up=w +down=s +fire=Space +weapprev=q +weapnext=e diff --git a/libre/abuse/default.gamma.lsp b/libre/abuse/default.gamma.lsp new file mode 100644 index 000000000..9a77afa27 --- /dev/null +++ b/libre/abuse/default.gamma.lsp @@ -0,0 +1 @@ +(setq darkest_gray 20) diff --git a/libre/abuse/non-claudio.patch b/libre/abuse/non-claudio.patch new file mode 100644 index 000000000..2a29e53f0 --- /dev/null +++ b/libre/abuse/non-claudio.patch @@ -0,0 +1,122 @@ +--- abuse-0.8/data/Makefile.in 2011-05-09 08:06:35.000000000 -0300 ++++ abuse-0.8/data/Makefile.in 2012-04-11 15:03:02.854839102 -0300 +@@ -184,7 +184,6 @@ + addon/aliens/objects.lsp addon/aliens/powerold.lsp \ + addon/aliens/powerups.lsp addon/aliens/sfx.lsp \ + addon/aliens/tiles.lsp addon/bong/bong.lsp \ +- addon/claudio/claudio.lsp addon/claudio/oldclaud.lsp \ + addon/deathmat/cur_lev.lsp addon/deathmat/deathmat.lsp \ + addon/deathmat/dstartup.lsp addon/deathmat/gamename.lsp \ + addon/deathmat/large.lsp addon/deathmat/levelset.lsp \ +@@ -245,23 +244,6 @@ + art/tints/guns/orange.spe art/tints/guns/redish.spe \ + addon/aliens/aliens.spe addon/aliens/bactiles.spe \ + addon/aliens/fortiles.spe addon/bong/bong.spe \ +- addon/claudio/antship.spe addon/claudio/bigexp.spe \ +- addon/claudio/deepw1.spe addon/claudio/deepw2.spe \ +- addon/claudio/droid.spe addon/claudio/extiles.spe \ +- addon/claudio/fire.spe addon/claudio/lamp.spe \ +- addon/claudio/lava2.spe addon/claudio/mypanels.spe \ +- addon/claudio/nplatfor.spe addon/claudio/pal21.spe \ +- addon/claudio/pal2.spe addon/claudio/pal5.spe \ +- addon/claudio/pal81f.spe addon/claudio/pal81.spe \ +- addon/claudio/pal82f.spe addon/claudio/pal82.spe \ +- addon/claudio/pal90.spe addon/claudio/rob2.spe \ +- addon/claudio/skull.spe addon/claudio/spaced.spe \ +- addon/claudio/spaceh.spe addon/claudio/spacymed.spe \ +- addon/claudio/spacytdm.spe addon/claudio/sswitch.spe \ +- addon/claudio/t_lamp.spe addon/claudio/trex1.spe \ +- addon/claudio/t_skull.spe addon/claudio/t_space.spe \ +- addon/claudio/t_trex.spe addon/claudio/t_water.spe \ +- addon/claudio/umbrel3.spe addon/claudio/watem.spe \ + addon/example/example.spe addon/leon/gray.spe \ + addon/leon/level00.spe addon/leon/level01.spe \ + addon/leon/level02.spe addon/leon/lmisc.spe \ +@@ -333,7 +315,6 @@ + doc = \ + addon/aliens/aliens.txt \ + addon/aliens/readme.txt \ +- addon/claudio/palettes.txt \ + addon/leon/leon.txt \ + addon/newart/tiledoc.txt \ + addon/pong/pong.txt \ +@@ -414,17 +395,6 @@ + @HAVE_NONFREE_TRUE@ addon/aliens/aslash01.wav \ + @HAVE_NONFREE_TRUE@ addon/aliens/egghatch.wav \ + @HAVE_NONFREE_TRUE@ addon/aliens/jarbreak.wav \ +-@HAVE_NONFREE_TRUE@ addon/claudio/aship.wav \ +-@HAVE_NONFREE_TRUE@ addon/claudio/drill.wav \ +-@HAVE_NONFREE_TRUE@ addon/claudio/fire.wav \ +-@HAVE_NONFREE_TRUE@ addon/claudio/glass1.wav \ +-@HAVE_NONFREE_TRUE@ addon/claudio/sewers.wav \ +-@HAVE_NONFREE_TRUE@ addon/claudio/skull.wav \ +-@HAVE_NONFREE_TRUE@ addon/claudio/spaceo.wav \ +-@HAVE_NONFREE_TRUE@ addon/claudio/trex1.wav \ +-@HAVE_NONFREE_TRUE@ addon/claudio/trex2.wav \ +-@HAVE_NONFREE_TRUE@ addon/claudio/unhealth.wav \ +-@HAVE_NONFREE_TRUE@ addon/claudio/wfall.wav \ + @HAVE_NONFREE_TRUE@ addon/leon/sfx/ambship1.wav \ + @HAVE_NONFREE_TRUE@ addon/leon/sfx/ambship2.wav \ + @HAVE_NONFREE_TRUE@ addon/leon/sfx/gren5.wav \ +--- abuse-0.8/data/Makefile.am 2011-05-09 04:58:04.000000000 -0300 ++++ abuse-0.8/data/Makefile.am 2012-04-11 15:03:50.282407491 -0300 +@@ -35,7 +35,6 @@ + \ + addon/bong/bong.lsp \ + \ +- addon/claudio/claudio.lsp addon/claudio/oldclaud.lsp \ + addon/deathmat/cur_lev.lsp addon/deathmat/deathmat.lsp \ + addon/deathmat/dstartup.lsp addon/deathmat/gamename.lsp \ + addon/deathmat/large.lsp addon/deathmat/levelset.lsp \ +@@ -113,21 +112,6 @@ + \ + addon/bong/bong.spe \ + \ +- addon/claudio/antship.spe addon/claudio/bigexp.spe \ +- addon/claudio/deepw1.spe addon/claudio/deepw2.spe addon/claudio/droid.spe \ +- addon/claudio/extiles.spe addon/claudio/fire.spe addon/claudio/lamp.spe \ +- addon/claudio/lava2.spe addon/claudio/mypanels.spe \ +- addon/claudio/nplatfor.spe addon/claudio/pal21.spe addon/claudio/pal2.spe \ +- addon/claudio/pal5.spe addon/claudio/pal81f.spe addon/claudio/pal81.spe \ +- addon/claudio/pal82f.spe addon/claudio/pal82.spe addon/claudio/pal90.spe \ +- addon/claudio/rob2.spe addon/claudio/skull.spe addon/claudio/spaced.spe \ +- addon/claudio/spaceh.spe addon/claudio/spacymed.spe \ +- addon/claudio/spacytdm.spe addon/claudio/sswitch.spe \ +- addon/claudio/t_lamp.spe addon/claudio/trex1.spe \ +- addon/claudio/t_skull.spe addon/claudio/t_space.spe \ +- addon/claudio/t_trex.spe addon/claudio/t_water.spe \ +- addon/claudio/umbrel3.spe addon/claudio/watem.spe \ +- \ + addon/example/example.spe \ + \ + addon/leon/gray.spe addon/leon/level00.spe addon/leon/level01.spe \ +@@ -214,7 +198,6 @@ + doc = \ + addon/aliens/aliens.txt \ + addon/aliens/readme.txt \ +- addon/claudio/palettes.txt \ + addon/leon/leon.txt \ + addon/newart/tiledoc.txt \ + addon/pong/pong.txt \ +@@ -267,11 +250,6 @@ + addon/aliens/altaunt.wav addon/aliens/aslash01.wav \ + addon/aliens/egghatch.wav addon/aliens/jarbreak.wav \ + \ +- addon/claudio/aship.wav addon/claudio/drill.wav addon/claudio/fire.wav \ +- addon/claudio/glass1.wav addon/claudio/sewers.wav addon/claudio/skull.wav \ +- addon/claudio/spaceo.wav addon/claudio/trex1.wav addon/claudio/trex2.wav \ +- addon/claudio/unhealth.wav addon/claudio/wfall.wav \ +- \ + addon/leon/sfx/ambship1.wav addon/leon/sfx/ambship2.wav \ + addon/leon/sfx/gren5.wav addon/leon/sfx/gren6.wav \ + addon/leon/sfx/rain2.wav addon/leon/sfx/rain3.wav \ +--- abuse-0.8/data/abuse.lsp 2011-05-09 04:58:04.000000000 -0300 ++++ abuse-0.8/data/abuse.lsp 2012-04-11 15:04:15.637788215 -0300 +@@ -42,7 +42,6 @@ + (load "addon/twist/f2chars.lsp") + (load "addon/twist/f2ai.lsp") + (load "addon/aliens/astartup.lsp") +-(load "addon/claudio/claudio.lsp") + (load "addon/twist/lisp/dray.lsp") + (load "addon/twist/lisp/mario.lsp") + (load "addon/leon/4frabs.lsp") -- cgit v1.1-4-g5e80 From e9c6f9c8280ca9487aeba861bcdad93b04ba3e36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?coadde=20=5BM=C3=A1rcio=20Alexandre=20Silva=20Delgado=5D?= Date: Wed, 3 Sep 2014 18:37:54 -0300 Subject: fixing openexr-libre source --- libre/openexr/InterpretingDeepPixels.docx | Bin 0 -> 63757 bytes libre/openexr/MultiViewOpenEXR.odt | Bin 0 -> 19808 bytes libre/openexr/OpenEXRFileLayout.odt | Bin 0 -> 32724 bytes libre/openexr/PKGBUILD | 7 ++++--- libre/openexr/ReadingAndWritingImageFiles.odt | Bin 0 -> 137521 bytes libre/openexr/TechnicalIntroduction.odt | Bin 0 -> 1841204 bytes 6 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 libre/openexr/InterpretingDeepPixels.docx create mode 100644 libre/openexr/MultiViewOpenEXR.odt create mode 100644 libre/openexr/OpenEXRFileLayout.odt create mode 100644 libre/openexr/ReadingAndWritingImageFiles.odt create mode 100644 libre/openexr/TechnicalIntroduction.odt diff --git a/libre/openexr/InterpretingDeepPixels.docx b/libre/openexr/InterpretingDeepPixels.docx new file mode 100644 index 000000000..03d6fcdb0 Binary files /dev/null and b/libre/openexr/InterpretingDeepPixels.docx differ diff --git a/libre/openexr/MultiViewOpenEXR.odt b/libre/openexr/MultiViewOpenEXR.odt new file mode 100644 index 000000000..ace41168b Binary files /dev/null and b/libre/openexr/MultiViewOpenEXR.odt differ diff --git a/libre/openexr/OpenEXRFileLayout.odt b/libre/openexr/OpenEXRFileLayout.odt new file mode 100644 index 000000000..cc969b551 Binary files /dev/null and b/libre/openexr/OpenEXRFileLayout.odt differ diff --git a/libre/openexr/PKGBUILD b/libre/openexr/PKGBUILD index a2a2ba472..b0adad8c5 100644 --- a/libre/openexr/PKGBUILD +++ b/libre/openexr/PKGBUILD @@ -3,6 +3,7 @@ # Maintainer: André Silva pkgname=openexr +_pkgname=$pkgname pkgver=2.1.0 pkgrel=1.parabola1 pkgdesc="An high dynamic-range image file format library, without embedded nonfree fonts in the documentation" @@ -11,15 +12,15 @@ arch=('i686' 'x86_64' 'mips64el') license=('BSD') depends=('zlib' 'ilmbase') makedepends=('jre7-openjdk-headless' 'libcups' 'libreoffice-writer' 'libxinerama') -replaces=("$pkgname-libre") -conflicts=("$pkgname-libre") +replaces=("$_pkgname") +conflicts=("$_pkgname") mksource=("http://download.savannah.nongnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz" "https://github.com/${pkgname}/${pkgname}/raw/master/OpenEXR/doc/InterpretingDeepPixels.docx" "https://github.com/${pkgname}/${pkgname}/raw/master/OpenEXR/doc/MultiViewOpenEXR.odt" "https://github.com/${pkgname}/${pkgname}/raw/master/OpenEXR/doc/OpenEXRFileLayout.odt" "https://github.com/${pkgname}/${pkgname}/raw/master/OpenEXR/doc/ReadingAndWritingImageFiles.odt" "https://github.com/${pkgname}/${pkgname}/raw/master/OpenEXR/doc/TechnicalIntroduction.odt") -source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz") +source=("https://repo.parabolagnulinux.org/other/${pkgname}/${_pkgname}-${pkgver}.tar.gz") noextract=(InterpretingDeepPixels.docx MultiViewOpenEXR.odt OpenEXRFileLayout.odt ReadingAndWritingImageFiles.odt TechnicalIntroduction.odt) mksource() { diff --git a/libre/openexr/ReadingAndWritingImageFiles.odt b/libre/openexr/ReadingAndWritingImageFiles.odt new file mode 100644 index 000000000..d8c1fd44a Binary files /dev/null and b/libre/openexr/ReadingAndWritingImageFiles.odt differ diff --git a/libre/openexr/TechnicalIntroduction.odt b/libre/openexr/TechnicalIntroduction.odt new file mode 100644 index 000000000..d728128cc Binary files /dev/null and b/libre/openexr/TechnicalIntroduction.odt differ -- cgit v1.1-4-g5e80 From 8f7c6e1fdd030baab226dff387eb003f6f0a7356 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?coadde=20=5BM=C3=A1rcio=20Alexandre=20Silva=20Delgado=5D?= Date: Wed, 3 Sep 2014 18:43:00 -0300 Subject: rename to angband --- libre/angband-libre/PKGBUILD | 62 --- libre/angband-libre/libre.patch | 814 ---------------------------------------- libre/angband/PKGBUILD | 62 +++ libre/angband/libre.patch | 814 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 876 insertions(+), 876 deletions(-) delete mode 100644 libre/angband-libre/PKGBUILD delete mode 100644 libre/angband-libre/libre.patch create mode 100644 libre/angband/PKGBUILD create mode 100644 libre/angband/libre.patch diff --git a/libre/angband-libre/PKGBUILD b/libre/angband-libre/PKGBUILD deleted file mode 100644 index e8a827150..000000000 --- a/libre/angband-libre/PKGBUILD +++ /dev/null @@ -1,62 +0,0 @@ -# Maintainer (Arch): schuay -# Contributor (Arch): Mike Sampson -# Contributor (Arch): Adrian Stratulat -# Contributor (Arch): Anton Bazhenov -# Contributor (Arch): KillaB -# Contributor (Arch): Callan Barrett -# Contributor (Arch): Christian Schmidt -# Contributor (Arch): Sebastian Sareyko -# Maintainer: André Silva - -_pkgname=angband -pkgname=angband-libre -pkgver=3.5.0 -pkgrel=2 -pkgdesc="A roguelike dungeon exploration game based on the writings of JRR Tolkien, without nonfree artwork and sound effects" -arch=('i686' 'x86_64' 'mips64el') -url="http://rephial.org/" -license=('GPL2' 'custom') -replaces=($_pkgname) -conflicts=($_pkgname) -provides=($_pkgname=$pkgver) -depends=('sdl_image' 'sdl_ttf' 'sdl_mixer' 'ncurses') -mksource=("http://rephial.org/downloads/${pkgver:0:3}/${_pkgname}-v${pkgver}.tar.gz" 'libre.patch') -source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-v${pkgver}.tar.gz") - -mksource() { - cd "${srcdir}/${_pkgname}-v${pkgver}" - - # remove nonfree parts from source code - patch -Np1 -i ../libre.patch - rm -v lib/xtra/sound/*.mp3 - rm -v lib/xtra/graf/64x64.png -} - -build() { - cd "${srcdir}/${_pkgname}-v${pkgver}" - - ./configure \ - --prefix=/usr \ - --bindir=/usr/bin \ - --sysconfdir=/usr/share/angband \ - --with-configpath=/usr/share/angband \ - --with-libpath=/usr/share/angband \ - --enable-gtk \ - --enable-sdl \ - --enable-sdl-mixer - - make -} - -package() { - cd "${srcdir}/${_pkgname}-v${pkgver}" - - make DESTDIR="${pkgdir}" install - - rm -f "${pkgdir}/usr/share/angband/*/delete.me" - install -Dm644 copying.txt "${pkgdir}/usr/share/licenses/${_pkgname}/COPYING" -} - -mkmd5sums=('4f6ee37abdb411285deb1685ddecba6a' - '3ac39f377bea2e208308d01f4213310f') -md5sums=('82c98af3bc6e5b61787ca09e584a4e78') diff --git a/libre/angband-libre/libre.patch b/libre/angband-libre/libre.patch deleted file mode 100644 index a044bc6fe..000000000 --- a/libre/angband-libre/libre.patch +++ /dev/null @@ -1,814 +0,0 @@ -diff --git a/copying.txt b/copying.txt -index fe1f289..82263b1 100644 ---- a/copying.txt -+++ b/copying.txt -@@ -23,14 +23,6 @@ exceptions: - only under the terms of the Creative Commons Attribution 3.0 licence: - http://creativecommons.org/licenses/by/3.0/ - -- * Shockbolt's (64x64) graphics are distributed under the licence at the end -- of this file. Currently some of the tiles in the 64x64.png tilesheet were -- resized from tiles made by David Gervais for the 32x32 set. -- -- * The sounds are licenced under the Creative Commons Attribution-NonCommercial- -- Sharealike licence. They were created by Dubtrain . -- You can find them in Wave format at http://www.dubtrain.com/angband/. -- - * The font files are all by Leon Marrick and/or Sheldon Simms III and/or Nick - McConnell, all of whom have agreed to their Angband work being released - under the GPL. -@@ -393,25 +385,3 @@ proprietary programs. If your program is a subroutine library, you may - consider it more useful to permit linking proprietary applications with the - library. If this is what you want to do, use the GNU Lesser General - Public License instead of this License. -- -------------------------------------------------------------------------------- -- --The Shockbolt Angband 64x64/128x64 tileset is copyright (C) Raymond Gaustadnes --2012. It can be found in the file lib/xtra/graf/128x128.png. -- --Permission is granted to: --* use the tileset with in-development and released versions of Angband --* distribute and make copies of the tileset with in-development and released -- versions of Angband, as long as no fee is charged for it --* incorporate tiles designed by the author for variants of Angband and use and -- distribute them with Angband under the terms above -- --Permission is not granted to: --* modify the tileset without the author's permission. --* incorporate tiles designed for ToME that do not appear in the Angband tileset. --* use or distribute the tileset with other games or projects. If you want to -- use and distribute the tileset with other games or projects, you must obtain -- explicit permission from the author. Non-commercial games or projects may -- be granted permission to use them, and if so, use will be allowed as long -- as the game or project remains non-commercial. To use them in commercial -- games, a non-exclusive licence must be acquired from the author. -diff --git a/lib/xtra/graf/Makefile b/lib/xtra/graf/Makefile -index e1e9111..ec54051 100644 ---- a/lib/xtra/graf/Makefile -+++ b/lib/xtra/graf/Makefile -@@ -1,6 +1,6 @@ - MKPATH=../../../mk/ - include $(MKPATH)buildsys.mk - --DATA = 8x8.png 8x16.png 16x16.png 32x32.png 64x64.png mr_att.png graphics.txt -+DATA = 8x8.png 8x16.png 16x16.png 32x32.png mr_att.png graphics.txt - PACKAGE = xtra/graf - -diff --git a/lib/xtra/graf/graphics.txt b/lib/xtra/graf/graphics.txt -index 28078fc..02f32ab 100644 ---- a/lib/xtra/graf/graphics.txt -+++ b/lib/xtra/graf/graphics.txt -@@ -47,8 +47,3 @@ N:4:Nomad's tiles - I:16:16:8x16.png - P:nomad - X:0:0:0 -- --N:5:Shockbolt's tiles --I:64:64:64x64.png --P:shock --X:1:29:31 -diff --git a/lib/xtra/sound/Makefile b/lib/xtra/sound/Makefile -index 0fb522b..a4337fd 100644 ---- a/lib/xtra/sound/Makefile -+++ b/lib/xtra/sound/Makefile -@@ -1,78 +1,7 @@ - MKPATH=../../../mk/ - include $(MKPATH)buildsys.mk - --DATA = sound.cfg \ -- amb_bell_metal1.mp3 mco_scurry_dry.mp3 plm_drop_boot.mp3 \ -- amb_bell_metal2.mp3 mco_shake_roll.mp3 plm_eat_bite.mp3 \ -- amb_bell_tibet1.mp3 mco_snarl_short.mp3 plm_floor_creak.mp3 \ -- amb_bell_tibet2.mp3 mco_spray_long.mp3 plm_floor_creak2.mp3 \ -- amb_bell_tibet3.mp3 mco_squish_hit.mp3 plm_glass_break.mp3 \ -- amb_door_doom.mp3 mco_squish_snap.mp3 plm_glass_breaking.mp3 \ -- amb_door_iron.mp3 mco_strange_music.mp3 plm_glass_smashing.mp3 \ -- amb_dungeon_echo.mp3 mco_strange_thwoink.mp3 plm_jar_ding.mp3 \ -- amb_dungeon_echowet.mp3 mco_thoing_backwards.mp3 plm_levelup.mp3 \ -- amb_gong_chinese.mp3 mco_thoing_deep.mp3 plm_lock_case.mp3 \ -- amb_gong_low.mp3 mco_thud_crash.mp3 plm_lock_distant.mp3 \ -- amb_gong_strike.mp3 mco_tube_hit.mp3 plm_metal_clank.mp3 \ -- amb_gong_undertone.mp3 plc_bell_warn.mp3 plm_metal_sharpen.mp3 \ -- amb_guitar_chord.mp3 plc_die_laugh.mp3 plm_open_case.mp3 \ -- amb_pulse_low.mp3 plc_hit_anvil.mp3 plm_spell1.mp3 \ -- amb_thunder_rain.mp3 plc_hit_anvil2.mp3 plm_spell2.mp3 \ -- amb_thunder_roll.mp3 plc_hit_arrow.mp3 plm_spell3.mp3 \ -- id_bad_aww.mp3 plc_hit_body.mp3 plm_use_staff.mp3 \ -- id_bad_dang.mp3 plc_hit_groan.mp3 plm_wood_thud.mp3 \ -- id_bad_hmm.mp3 plc_hit_grunt.mp3 plm_zap_rod.mp3 \ -- id_bad_hmph.mp3 plc_hit_grunt2.mp3 pls_bell_bowl.mp3 \ -- id_bad_ohh.mp3 plc_hit_hay.mp3 pls_bell_chime_new.mp3 \ -- id_ego_whoa.mp3 plc_miss_arrow.mp3 pls_bell_glass.mp3 \ -- id_ego_woohoo.mp3 plc_miss_arrow2.mp3 pls_bell_hibell_soft.mp3 \ -- id_ego_yeah.mp3 plc_miss_swish.mp3 pls_bell_mute.mp3 \ -- id_ego_yeah2.mp3 plm_aim_wand.mp3 pls_bell_sustain.mp3 \ -- id_ego_yes.mp3 plm_bang_ceramic.mp3 pls_breathe_in.mp3 \ -- id_good_hey.mp3 plm_bang_dumpster.mp3 pls_man_argoh.mp3 \ -- id_good_hey2.mp3 plm_bang_metal.mp3 pls_man_gulp_new.mp3 \ -- id_good_hmm.mp3 plm_book_pageturn.mp3 pls_man_oooh.mp3 \ -- id_good_huh.mp3 plm_bottle_clinks.mp3 pls_man_scream2.mp3 \ -- id_good_ooh.mp3 plm_break_canister.mp3 pls_man_sigh.mp3 \ -- id_good_ooo.mp3 plm_break_glass.mp3 pls_man_sniff.mp3 \ -- id_good_wow.mp3 plm_break_glass2.mp3 pls_man_sob.mp3 \ -- mco_attack_breath.mp3 plm_break_plates.mp3 pls_man_spit.mp3 \ -- mco_attack_spray.mp3 plm_break_shatter.mp3 pls_man_ugh.mp3 \ -- mco_bite_chew.mp3 plm_break_smash.mp3 pls_man_yell.mp3 \ -- mco_bite_chomp.mp3 plm_break_wood.mp3 pls_tone_blurk.mp3 \ -- mco_bite_dainty.mp3 plm_cabinet_open.mp3 pls_tone_clave6.mp3 \ -- mco_bite_gnash.mp3 plm_cabinet_shut.mp3 pls_tone_clavelo8.mp3 \ -- mco_bite_hard.mp3 plm_chain_light.mp3 pls_tone_conk.mp3 \ -- mco_bite_long.mp3 plm_chest_latch.mp3 pls_tone_elec.mp3 \ -- mco_bite_munch.mp3 plm_chest_unlatch.mp3 pls_tone_goblet.mp3 \ -- mco_bite_regular.mp3 plm_chimes_jangle.mp3 pls_tone_guiro.mp3 \ -- mco_bite_short.mp3 plm_click_dry.mp3 pls_tone_headstock.mp3 \ -- mco_bite_small.mp3 plm_click_switch.mp3 pls_tone_scrape.mp3 \ -- mco_bite_soft.mp3 plm_click_switch2.mp3 pls_tone_stick.mp3 \ -- mco_card_shuffle.mp3 plm_click_switch3.mp3 sto_bell_desk.mp3 \ -- mco_castanet_trill.mp3 plm_click_wood.mp3 sto_bell_ding.mp3 \ -- mco_ceramic_trill.mp3 plm_close_hatch.mp3 sto_bell_dingaling.mp3 \ -- mco_click_vibra.mp3 plm_coins_dump.mp3 sto_bell_jingles.mp3 \ -- mco_creature_choking.mp3 plm_coins_light.mp3 sto_bell_register1.mp3 \ -- mco_creature_groan.mp3 plm_coins_pour.mp3 sto_bell_register2.mp3 \ -- mco_creature_yelp.mp3 plm_coins_shake.mp3 sto_bell_ringing.mp3 \ -- mco_cuica_rubbing.mp3 plm_cork_pop.mp3 sto_bell_shop.mp3 \ -- mco_dino_low.mp3 plm_cork_squeak.mp3 sto_coins_countertop.mp3 \ -- mco_dino_slur.mp3 plm_door_bolt.mp3 sto_man_haha.mp3 \ -- mco_dino_talk.mp3 plm_door_creak.mp3 sto_man_hey.mp3 \ -- mco_dino_yawn.mp3 plm_door_creakshut.mp3 sto_man_whoohaha.mp3 \ -- mco_dub_wobble.mp3 plm_door_dungeon.mp3 sum_angel_song.mp3 \ -- mco_frog_trill.mp3 plm_door_echolock.mp3 sum_bell_crystal.mp3 \ -- mco_hit_whip.mp3 plm_door_entrance.mp3 sum_bell_hand.mp3 \ -- mco_howl_croak.mp3 plm_door_knob.mp3 sum_bell_tone.mp3 \ -- mco_howl_deep.mp3 plm_door_latch.mp3 sum_chime_jangle.mp3 \ -- mco_howl_distressed.mp3 plm_door_open.mp3 sum_ghost_moan.mp3 \ -- mco_howl_high.mp3 plm_door_opening.mp3 sum_ghost_oooo.mp3 \ -- mco_howl_long.mp3 plm_door_rusty.mp3 sum_ghost_wail.mp3 \ -- mco_liquid_squirt.mp3 plm_door_shut.mp3 sum_gong_temple.mp3 \ -- mco_man_mumble.mp3 plm_door_slam.mp3 sum_laugh_evil2.mp3 \ -- mco_mouse_squeaks.mp3 plm_door_squeaky.mp3 sum_lion_growl.mp3 \ -- mco_rubber_thud.mp3 plm_door_wooden.mp3 sum_piano_scrape.mp3 -+DATA = sound.cfg - - PACKAGE = xtra/sound - -diff --git a/lib/xtra/sound/sound.cfg b/lib/xtra/sound/sound.cfg -index a3f483f..41de805 100644 ---- a/lib/xtra/sound/sound.cfg -+++ b/lib/xtra/sound/sound.cfg -@@ -9,21 +9,6 @@ - # hit = hit.mp3 hit1.mp3 - # - --# --# This is the Dubtrain Angband Sound config list, v.3.1.0 - February 24th, 2009 --# --# Licensed under a Creative Commons non-commercial agreement --# --# Inspired by the original Craig's Angband Sound Patch. --# --# But with all new sounds. --# --# contact angband@dubtrain.com --# --# download zipped archive at www.dubtrain.com/angband --# --# -- - [Sound] - - # -@@ -31,484 +16,484 @@ - # - - # Town during the day. --ambient_day = amb_thunder_rain.mp3 -+ambient_day = - - # Town during the night. --ambient_nite = amb_guitar_chord.mp3 amb_thunder_roll.mp3 -+ambient_nite = - - # Dungeon levels 1-20 (50'-1000') --ambient_dng1 = amb_door_iron.mp3 amb_bell_metal1.mp3 -+ambient_dng1 = - - # Dungeon levels 21-40 (1050'-2000') --ambient_dng2 = amb_bell_tibet1.mp3 amb_bell_metal2.mp3 amb_gong_strike.mp3 -+ambient_dng2 = - - # Dungeon levels 41-60 (2050'-3000') --ambient_dng3 = amb_bell_tibet2.mp3 amb_dungeon_echo.mp3 amb_pulse_low.mp3 -+ambient_dng3 = - - # Dungeon levels 61-80 (3050'-4000') --ambient_dng4 = amb_bell_tibet3.mp3 amb_dungeon_echowet.mp3 amb_gong_undertone.mp3 -+ambient_dng4 = - - # Dungeon levels 81 and beyond (4050'-) --ambient_dng5 = amb_door_doom.mp3 amb_gong_chinese.mp3 amb_gong_low.mp3 -+ambient_dng5 = - - # - # Store sounds - # - - # The shopkeep bought a worthless item. --store1 = sto_man_hey.mp3 -+store1 = - - # The shopkeep paid too much for an item. --store2 = id_bad_dang.mp3 -+store2 = - - # The shopkeep got away with a good bargain. --store3 = sto_man_haha.mp3 -+store3 = - - # The shopkeep got away with a great bargain. --store4 = sto_man_whoohaha.mp3 -+store4 = - - # You make a normal transaction (buying or selling). --store5 = sto_coins_countertop.mp3 sto_bell_register1.mp3 sto_bell_register2.mp3 -+store5 = - - # You enter a store. --store_enter = sto_bell_desk.mp3 sto_bell_ding.mp3 sto_bell_dingaling.mp3 sto_bell_jingles.mp3 sto_bell_ringing.mp3 sto_bell_shop.mp3 -+store_enter = - - # You enter your home. --store_home = plm_door_entrance.mp3 -+store_home = - - # You leave a store. --store_leave = plm_door_bolt.mp3 -+store_leave = - - # - # Player sounds - combat - # - - # You succeed in a melee attack against a monster. --hit = plc_hit_hay.mp3 plc_hit_body.mp3 -+hit = - - # It was a good hit! --hit_good = plc_hit_anvil.mp3 -+hit_good = - - # It was a great hit! --hit_great = plc_hit_groan.mp3 -+hit_great = - - # It was a superb hit! --hit_superb = plc_hit_grunt.mp3 -+hit_superb = - - # It was a *GREAT* hit! --hit_hi_great = plc_hit_grunt2.mp3 -+hit_hi_great = - - # It was a *SUPERB* hit! --hit_hi_superb = plc_hit_anvil2.mp3 -+hit_hi_superb = - - # You miss a melee attack against a monster. --miss = plc_miss_arrow2.mp3 -+miss = - - # You fire a missile. --shoot = plc_miss_swish.mp3 plc_miss_arrow.mp3 -+shoot = - - # You hit something with a missile. --shoot_hit = plc_hit_arrow.mp3 -+shoot_hit = - - # You receive a hitpoint warning. --hitpoint_warn = plc_bell_warn.mp3 -+hitpoint_warn = - - # You die. --death = plc_die_laugh.mp3 -+death = - - # - # Player sounds - status changes - # - - # You become blind. --blind = pls_tone_conk.mp3 -+blind = - - # You become confused. --confused = pls_man_ugh.mp3 -+confused = - - # You become poisoned. --poisoned = pls_tone_guiro.mp3 -+poisoned = - - # You become afraid. --afraid = pls_man_yell.mp3 -+afraid = - - # You become paralyzed. --paralyzed = pls_man_gulp_new.mp3 -+paralyzed = - - # You feel drugged (chaos effects). --drugged = pls_breathe_in.mp3 -+drugged = - - # You become slower. --slow = pls_man_sigh.mp3 -+slow = - - # You become stunned. --stun = pls_bell_mute.mp3 -+stun = - - # You suffer a cut. --cut = pls_man_argoh.mp3 -+cut = - - # A stat is drained --drain_stat = pls_tone_headstock.mp3 -+drain_stat = - - # You recover from a condition (blind, confused, etc.) --recover = pls_bell_chime_new.mp3 -+recover = - - # You become faster. --speed = pls_bell_sustain.mp3 -+speed = - - # You attain a mystic shield. --shield = pls_bell_bowl.mp3 -+shield = - - # You become blessed. --blessed = sum_angel_song.mp3 -+blessed = - - # You feel heroic. --hero = pls_tone_goblet.mp3 -+hero = - - # You are bold. --bold = pls_bell_hibell_soft.mp3 -+bold = - - # You become berserk. --berserk = pls_man_scream2.mp3 -+berserk = - - # You feel protected from evil. --prot_evil = pls_bell_glass.mp3 -+prot_evil = - - # You feel invulnerable. (does any item/spell do this anymore?) --invuln = pls_tone_blurk.mp3 -+invuln = - - # You can see invisible things. --see_invis = pls_tone_clave6.mp3 -+see_invis = - - # You can see the infrared spectrum --infrared = pls_tone_clavelo8.mp3 -+infrared = - - # You become resistant to acid. --res_acid = pls_man_sniff.mp3 -+res_acid = - - # You become resistant to electricity. --res_elec = pls_tone_elec.mp3 -+res_elec = - - # You become resistant to fire. --res_fire = pls_tone_scrape.mp3 -+res_fire = - - # You become resistant to cold. --res_cold = pls_tone_stick.mp3 -+res_cold = - - # You become resistant to poison. --res_pois = pls_man_spit.mp3 -+res_pois = - - # You become hungry. --hungry = pls_man_sob.mp3 -+hungry = - - # - # Player sounds - misc. - # - - # You pick up money worth less than 200 au. --money1 = plm_coins_light.mp3 plm_coins_shake.mp3 -+money1 = - - # You pick up money worth between 200 and 600 au. --money2 = plm_chain_light.mp3 plm_coins_pour.mp3 -+money2 = - - # You pick up money worth 600 au or more. --money3 = plm_coins_dump.mp3 -+money3 = - - # You (or a monster) drop something on the ground. --drop = plm_drop_boot.mp3 -+drop = - - # You gain (or regain) a level. --level = plm_levelup.mp3 -+level = - - # You successfully study a spell or prayer. --study = plm_book_pageturn.mp3 -+study = - - # You teleport or phase door. --teleport = plm_chimes_jangle.mp3 -+teleport = - - # You quaff a potion. --quaff = plm_bottle_clinks.mp3 plm_cork_pop.mp3 plm_cork_squeak.mp3 -+quaff = - - # You zap a rod. --zap_rod = plm_zap_rod.mp3 -+zap_rod = - - # You take a step. (unimplemented) - walk = - - # You teleport someone else away. --tpother = plm_chimes_jangle.mp3 -+tpother = - - # You bump into a wall or door. --hitwall = plm_wood_thud.mp3 -+hitwall = - - # You eat something. --eat = plm_eat_bite.mp3 -+eat = - - # You successfully dig through something. --dig = plm_metal_clank.mp3 -+dig = - - # You open a door. --opendoor = plm_door_bolt.mp3 plm_door_creak.mp3 plm_door_dungeon.mp3 plm_door_entrance.mp3 plm_door_open.mp3 plm_door_opening.mp3 plm_door_rusty.mp3 plm_door_squeaky.mp3 -+opendoor = - - # You shut a door. --shutdoor = plm_bang_dumpster.mp3 plm_cabinet_shut.mp3 plm_close_hatch.mp3 plm_door_creakshut.mp3 plm_door_latch.mp3 plm_door_shut.mp3 plm_door_slam.mp3 -+shutdoor = - - # You teleport from a level (including via recall). --tplevel = sum_bell_crystal.mp3 -+tplevel = - - # Default "bell" sound for system messages. --bell = plm_jar_ding.mp3 -+bell = - - # You try to open something that's not a door. --nothing_to_open = plm_click_switch2.mp3 plm_door_knob.mp3 -+nothing_to_open = - - # You fail to pick a lock. --lockpick_fail = plm_click_dry.mp3 plm_click_switch.mp3 plm_click_wood.mp3 plm_door_echolock.mp3 plm_door_wooden.mp3 -+lockpick_fail = - - # You pick a lock. --lockpick = plm_break_wood.mp3 plm_cabinet_open.mp3 plm_chest_unlatch.mp3 plm_lock_case.mp3 plm_lock_distant.mp3 plm_open_case.mp3 -+lockpick = - - # You disarm a trap. --disarm = plm_bang_ceramic.mp3 plm_chest_latch.mp3 plm_click_switch3.mp3 -+disarm = - - # You go up stairs. --stairs_up = plm_floor_creak2.mp3 -+stairs_up = - - # You go down stairs. --stairs_down = plm_floor_creak.mp3 -+stairs_down = - - # You activate an artifact. --act_artifact = plm_aim_wand.mp3 -+act_artifact = - - # You use a staff. --use_staff = plm_use_staff.mp3 -+use_staff = - - # An object is destroyed. --destroy = plm_bang_metal.mp3 plm_break_canister.mp3 plm_break_glass.mp3 plm_break_glass2.mp3 plm_break_plates.mp3 plm_break_shatter.mp3 plm_break_smash.mp3 plm_glass_breaking.mp3 plm_glass_break.mp3 plm_glass_smashing.mp3 -+destroy = - - # You wield or take off something. --wield = plm_metal_sharpen.mp3 -+wield = - - # You wield a cursed item. --cursed = pls_man_oooh.mp3 -+cursed = - - # You notice something (generic notice) --notice = id_bad_hmm.mp3 -+notice = - - # You notice something about your equipment or inventory. --pseudo_id = id_good_hmm.mp3 -+pseudo_id = - - # You successfully cast a spell. --cast_spell = plm_spell1.mp3 plm_spell2.mp3 plm_spell3.mp3 -+cast_spell = - - # You successfully pray a prayer. --pray_prayer = sum_angel_song.mp3 -+pray_prayer = - - # - # Monster Sounds - combat - # - - # A monster flees in terror. --flee = mco_creature_yelp.mp3 -+flee = - - # A monster is killed. --kill = mco_howl_croak.mp3 mco_howl_deep.mp3 mco_howl_distressed.mp3 mco_howl_high.mp3 mco_howl_long.mp3 -+kill = - - # A unique is killed. --kill_unique = sum_ghost_wail.mp3 -+kill_unique = - - # Morgoth, Lord of Darkness is killed. --kill_king = amb_guitar_chord.mp3 -+kill_king = - - # Attack - hit --mon_hit = mco_hit_whip.mp3 -+mon_hit = - - # Attack - touch --mon_touch = mco_click_vibra.mp3 -+mon_touch = - - # Attack - punch --mon_punch = mco_squish_snap.mp3 -+mon_punch = - - # Attack - kick --mon_kick = mco_rubber_thud.mp3 -+mon_kick = - - # Attack - claw --mon_claw = mco_ceramic_trill.mp3 mco_scurry_dry.mp3 -+mon_claw = - - # Attack - bite --mon_bite = mco_snarl_short.mp3 mco_bite_soft.mp3 mco_bite_munch.mp3 mco_bite_long.mp3 mco_bite_short.mp3 mco_bite_gnash.mp3 mco_bite_chomp.mp3 mco_bite_regular.mp3 mco_bite_small.mp3 mco_bite_dainty.mp3 mco_bite_hard.mp3 mco_bite_chew.mp3 -+mon_bite = - - # Attack - sting --mon_sting = mco_castanet_trill.mp3 mco_tube_hit.mp3 -+mon_sting = - - # Attack - butt --mon_butt = mco_cuica_rubbing.mp3 mco_thud_crash.mp3 -+mon_butt = - - # Attack - crush --mon_crush = mco_dino_low.mp3 mco_squish_hit.mp3 -+mon_crush = - - # Attack - engulf --mon_engulf = mco_dino_talk.mp3 mco_dino_yawn.mp3 -+mon_engulf = - - # Attack - crawl --mon_crawl = mco_card_shuffle.mp3 mco_shake_roll.mp3 -+mon_crawl = - - # Attack - drool --mon_drool = mco_creature_choking.mp3 mco_liquid_squirt.mp3 -+mon_drool = - - # Attack - spit --mon_spit = mco_attack_spray.mp3 -+mon_spit = - - # Attack - gaze --mon_gaze = mco_thoing_backwards.mp3 -+mon_gaze = - - # Attack - wail --mon_wail = mco_dino_low.mp3 -+mon_wail = - - # Attack - release spores --mon_spore = mco_dub_wobble.mp3 mco_spray_long.mp3 -+mon_spore = - - # Attack - beg for money --mon_beg = mco_man_mumble.mp3 -+mon_beg = - - # Attack - insult --mon_insult = mco_strange_thwoink.mp3 -+mon_insult = - - # Attack - moan --mon_moan = mco_strange_music.mp3 -+mon_moan = - - # Attack - shriek --mon_shriek = mco_mouse_squeaks.mp3 -+mon_shriek = - - # Spell - create traps --mon_create_trap = mco_thoing_deep.mp3 -+mon_create_trap = - - # Spell - cause fear --mon_cast_fear = mco_creature_groan.mp3 mco_dino_slur.mp3 -+mon_cast_fear = - - # Multiply (breed explosively) --multiply = mco_frog_trill.mp3 -+multiply = - - # - # Summons - # - - # Summon one or more monsters. --summon_monster = sum_chime_jangle.mp3 -+summon_monster = - - # Summon angels. --summon_ainu = sum_angel_song.mp3 -+summon_ainu = - - # Summon undead. --summon_undead = sum_ghost_oooo.mp3 -+summon_undead = - - # Summon animals. --summon_animal = sum_lion_growl.mp3 -+summon_animal = - - # Summon spiders. --summon_spider = sum_piano_scrape.mp3 -+summon_spider = - - # Summon hounds. --summon_hound = sum_lion_growl.mp3 -+summon_hound = - - # Summon hydras. --summon_hydra = sum_piano_scrape.mp3 -+summon_hydra = - - # Summon demons. --summon_demon = sum_ghost_wail.mp3 sum_laugh_evil2.mp3 -+summon_demon = - - # Summon dragon. --summon_dragon = sum_piano_scrape.mp3 -+summon_dragon = - - # Summon greater undead. --summon_gr_undead = sum_ghost_moan.mp3 -+summon_gr_undead = - - # Summon greater dragons. --summon_gr_dragon = sum_gong_temple.mp3 -+summon_gr_dragon = - - # Summon greater demons. --summon_gr_demon = sum_ghost_moan.mp3 -+summon_gr_demon = - - # Summon Ringwraiths. --summon_ringwraith = sum_bell_hand.mp3 -+summon_ringwraith = - - # Summon uniques. --summon_unique = sum_bell_tone.mp3 -+summon_unique = - - # - # Breath weapons - # - - # Breathe frost. --breathe_frost = mco_attack_breath.mp3 -+breathe_frost = - - # Breathe electricity. --breathe_elec = mco_attack_breath.mp3 -+breathe_elec = - - # Breathe acid. --breathe_acid = mco_attack_breath.mp3 -+breathe_acid = - - # Breathe gas. --breathe_gas = mco_attack_breath.mp3 -+breathe_gas = - - # Breathe fire. --breathe_fire = mco_attack_breath.mp3 -+breathe_fire = - - # Breathe confusion. --breathe_confusion = mco_attack_breath.mp3 -+breathe_confusion = - - # Breathe disenchantment. --breathe_disenchant = mco_attack_breath.mp3 -+breathe_disenchant = - - # Breathe chaos. --breathe_chaos = mco_attack_breath.mp3 -+breathe_chaos = - - # Breathe shards. --breathe_shards = mco_attack_breath.mp3 -+breathe_shards = - - # Breathe sound. --breathe_sound = mco_attack_breath.mp3 -+breathe_sound = - - # Breathe light. --breathe_light = mco_attack_breath.mp3 -+breathe_light = - - # Breathe darkness. --breathe_dark = mco_attack_breath.mp3 -+breathe_dark = - - # Breathe nether. --breathe_nether = mco_attack_breath.mp3 -+breathe_nether = - - # Breathe nexus. --breathe_nexus = mco_attack_breath.mp3 -+breathe_nexus = - - # Breathe time. --breathe_time = mco_attack_breath.mp3 -+breathe_time = - - # Breathe inertia. --breathe_inertia = mco_attack_breath.mp3 -+breathe_inertia = - - # Breathe gravity. --breathe_gravity = mco_attack_breath.mp3 -+breathe_gravity = - - # Breathe plasma. --breathe_plasma = mco_attack_breath.mp3 -+breathe_plasma = - - # Breathe force. --breathe_force = mco_attack_breath.mp3 -+breathe_force = - - # Breathe the elements (power dragon scale mail). --breathe_elements = mco_attack_breath.mp3 -+breathe_elements = - - # - # Identifying Items - # - - # Identify a bad item (including bad ego items and artifacts). --identify_bad = id_bad_aww.mp3 id_bad_dang.mp3 id_bad_hmm.mp3 id_bad_hmph.mp3 id_bad_ohh.mp3 -+identify_bad = - - # Identify a good ego item. --identify_ego = id_ego_whoa.mp3 id_ego_woohoo.mp3 id_ego_yeah.mp3 id_ego_yeah2.mp3 id_ego_yes.mp3 -+identify_ego = - - # Identify a good artifact. --identify_art = id_good_hey.mp3 id_good_hey2.mp3 id_good_hmm.mp3 id_good_huh.mp3 id_good_ooh.mp3 id_good_ooo.mp3 id_good_wow.mp3 -+identify_art = - diff --git a/libre/angband/PKGBUILD b/libre/angband/PKGBUILD new file mode 100644 index 000000000..96f200832 --- /dev/null +++ b/libre/angband/PKGBUILD @@ -0,0 +1,62 @@ +# Maintainer (Arch): schuay +# Contributor (Arch): Mike Sampson +# Contributor (Arch): Adrian Stratulat +# Contributor (Arch): Anton Bazhenov +# Contributor (Arch): KillaB +# Contributor (Arch): Callan Barrett +# Contributor (Arch): Christian Schmidt +# Contributor (Arch): Sebastian Sareyko +# Maintainer: André Silva +# Contributor: Márcio Silva + +pkgname=angband +_pkgname=$pkgname-libre +pkgver=3.5.0 +pkgrel=2 +pkgdesc="A roguelike dungeon exploration game based on the writings of JRR Tolkien, without nonfree artwork and sound effects" +arch=('i686' 'x86_64' 'mips64el') +url="http://rephial.org/" +license=('GPL2' 'custom') +replaces=($_pkgname) +conflicts=($_pkgname) +depends=('sdl_image' 'sdl_ttf' 'sdl_mixer' 'ncurses') +mksource=("http://rephial.org/downloads/${pkgver:0:3}/${pkgname}-v${pkgver}.tar.gz" 'libre.patch') +source=("https://repo.parabolagnulinux.org/other/${_pkgname}/${_pkgname}-v${pkgver}.tar.gz") + +mksource() { + cd "${srcdir}/${pkgname}-v${pkgver}" + + # remove nonfree parts from source code + patch -Np1 -i ../libre.patch + rm -v lib/xtra/sound/*.mp3 + rm -v lib/xtra/graf/64x64.png +} + +build() { + cd "${srcdir}/${pkgname}-v${pkgver}" + + ./configure \ + --prefix=/usr \ + --bindir=/usr/bin \ + --sysconfdir=/usr/share/$pkgname \ + --with-configpath=/usr/share/$pkgname \ + --with-libpath=/usr/share/$pkgname \ + --enable-gtk \ + --enable-sdl \ + --enable-sdl-mixer + + make +} + +package() { + cd "${srcdir}/${pkgname}-v${pkgver}" + + make DESTDIR="${pkgdir}" install + + rm -f "${pkgdir}/usr/share/$pkgname/*/delete.me" + install -Dm644 copying.txt "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" +} + +mkmd5sums=('4f6ee37abdb411285deb1685ddecba6a' + '3ac39f377bea2e208308d01f4213310f') +md5sums=('82c98af3bc6e5b61787ca09e584a4e78') diff --git a/libre/angband/libre.patch b/libre/angband/libre.patch new file mode 100644 index 000000000..a044bc6fe --- /dev/null +++ b/libre/angband/libre.patch @@ -0,0 +1,814 @@ +diff --git a/copying.txt b/copying.txt +index fe1f289..82263b1 100644 +--- a/copying.txt ++++ b/copying.txt +@@ -23,14 +23,6 @@ exceptions: + only under the terms of the Creative Commons Attribution 3.0 licence: + http://creativecommons.org/licenses/by/3.0/ + +- * Shockbolt's (64x64) graphics are distributed under the licence at the end +- of this file. Currently some of the tiles in the 64x64.png tilesheet were +- resized from tiles made by David Gervais for the 32x32 set. +- +- * The sounds are licenced under the Creative Commons Attribution-NonCommercial- +- Sharealike licence. They were created by Dubtrain . +- You can find them in Wave format at http://www.dubtrain.com/angband/. +- + * The font files are all by Leon Marrick and/or Sheldon Simms III and/or Nick + McConnell, all of whom have agreed to their Angband work being released + under the GPL. +@@ -393,25 +385,3 @@ proprietary programs. If your program is a subroutine library, you may + consider it more useful to permit linking proprietary applications with the + library. If this is what you want to do, use the GNU Lesser General + Public License instead of this License. +- +------------------------------------------------------------------------------- +- +-The Shockbolt Angband 64x64/128x64 tileset is copyright (C) Raymond Gaustadnes +-2012. It can be found in the file lib/xtra/graf/128x128.png. +- +-Permission is granted to: +-* use the tileset with in-development and released versions of Angband +-* distribute and make copies of the tileset with in-development and released +- versions of Angband, as long as no fee is charged for it +-* incorporate tiles designed by the author for variants of Angband and use and +- distribute them with Angband under the terms above +- +-Permission is not granted to: +-* modify the tileset without the author's permission. +-* incorporate tiles designed for ToME that do not appear in the Angband tileset. +-* use or distribute the tileset with other games or projects. If you want to +- use and distribute the tileset with other games or projects, you must obtain +- explicit permission from the author. Non-commercial games or projects may +- be granted permission to use them, and if so, use will be allowed as long +- as the game or project remains non-commercial. To use them in commercial +- games, a non-exclusive licence must be acquired from the author. +diff --git a/lib/xtra/graf/Makefile b/lib/xtra/graf/Makefile +index e1e9111..ec54051 100644 +--- a/lib/xtra/graf/Makefile ++++ b/lib/xtra/graf/Makefile +@@ -1,6 +1,6 @@ + MKPATH=../../../mk/ + include $(MKPATH)buildsys.mk + +-DATA = 8x8.png 8x16.png 16x16.png 32x32.png 64x64.png mr_att.png graphics.txt ++DATA = 8x8.png 8x16.png 16x16.png 32x32.png mr_att.png graphics.txt + PACKAGE = xtra/graf + +diff --git a/lib/xtra/graf/graphics.txt b/lib/xtra/graf/graphics.txt +index 28078fc..02f32ab 100644 +--- a/lib/xtra/graf/graphics.txt ++++ b/lib/xtra/graf/graphics.txt +@@ -47,8 +47,3 @@ N:4:Nomad's tiles + I:16:16:8x16.png + P:nomad + X:0:0:0 +- +-N:5:Shockbolt's tiles +-I:64:64:64x64.png +-P:shock +-X:1:29:31 +diff --git a/lib/xtra/sound/Makefile b/lib/xtra/sound/Makefile +index 0fb522b..a4337fd 100644 +--- a/lib/xtra/sound/Makefile ++++ b/lib/xtra/sound/Makefile +@@ -1,78 +1,7 @@ + MKPATH=../../../mk/ + include $(MKPATH)buildsys.mk + +-DATA = sound.cfg \ +- amb_bell_metal1.mp3 mco_scurry_dry.mp3 plm_drop_boot.mp3 \ +- amb_bell_metal2.mp3 mco_shake_roll.mp3 plm_eat_bite.mp3 \ +- amb_bell_tibet1.mp3 mco_snarl_short.mp3 plm_floor_creak.mp3 \ +- amb_bell_tibet2.mp3 mco_spray_long.mp3 plm_floor_creak2.mp3 \ +- amb_bell_tibet3.mp3 mco_squish_hit.mp3 plm_glass_break.mp3 \ +- amb_door_doom.mp3 mco_squish_snap.mp3 plm_glass_breaking.mp3 \ +- amb_door_iron.mp3 mco_strange_music.mp3 plm_glass_smashing.mp3 \ +- amb_dungeon_echo.mp3 mco_strange_thwoink.mp3 plm_jar_ding.mp3 \ +- amb_dungeon_echowet.mp3 mco_thoing_backwards.mp3 plm_levelup.mp3 \ +- amb_gong_chinese.mp3 mco_thoing_deep.mp3 plm_lock_case.mp3 \ +- amb_gong_low.mp3 mco_thud_crash.mp3 plm_lock_distant.mp3 \ +- amb_gong_strike.mp3 mco_tube_hit.mp3 plm_metal_clank.mp3 \ +- amb_gong_undertone.mp3 plc_bell_warn.mp3 plm_metal_sharpen.mp3 \ +- amb_guitar_chord.mp3 plc_die_laugh.mp3 plm_open_case.mp3 \ +- amb_pulse_low.mp3 plc_hit_anvil.mp3 plm_spell1.mp3 \ +- amb_thunder_rain.mp3 plc_hit_anvil2.mp3 plm_spell2.mp3 \ +- amb_thunder_roll.mp3 plc_hit_arrow.mp3 plm_spell3.mp3 \ +- id_bad_aww.mp3 plc_hit_body.mp3 plm_use_staff.mp3 \ +- id_bad_dang.mp3 plc_hit_groan.mp3 plm_wood_thud.mp3 \ +- id_bad_hmm.mp3 plc_hit_grunt.mp3 plm_zap_rod.mp3 \ +- id_bad_hmph.mp3 plc_hit_grunt2.mp3 pls_bell_bowl.mp3 \ +- id_bad_ohh.mp3 plc_hit_hay.mp3 pls_bell_chime_new.mp3 \ +- id_ego_whoa.mp3 plc_miss_arrow.mp3 pls_bell_glass.mp3 \ +- id_ego_woohoo.mp3 plc_miss_arrow2.mp3 pls_bell_hibell_soft.mp3 \ +- id_ego_yeah.mp3 plc_miss_swish.mp3 pls_bell_mute.mp3 \ +- id_ego_yeah2.mp3 plm_aim_wand.mp3 pls_bell_sustain.mp3 \ +- id_ego_yes.mp3 plm_bang_ceramic.mp3 pls_breathe_in.mp3 \ +- id_good_hey.mp3 plm_bang_dumpster.mp3 pls_man_argoh.mp3 \ +- id_good_hey2.mp3 plm_bang_metal.mp3 pls_man_gulp_new.mp3 \ +- id_good_hmm.mp3 plm_book_pageturn.mp3 pls_man_oooh.mp3 \ +- id_good_huh.mp3 plm_bottle_clinks.mp3 pls_man_scream2.mp3 \ +- id_good_ooh.mp3 plm_break_canister.mp3 pls_man_sigh.mp3 \ +- id_good_ooo.mp3 plm_break_glass.mp3 pls_man_sniff.mp3 \ +- id_good_wow.mp3 plm_break_glass2.mp3 pls_man_sob.mp3 \ +- mco_attack_breath.mp3 plm_break_plates.mp3 pls_man_spit.mp3 \ +- mco_attack_spray.mp3 plm_break_shatter.mp3 pls_man_ugh.mp3 \ +- mco_bite_chew.mp3 plm_break_smash.mp3 pls_man_yell.mp3 \ +- mco_bite_chomp.mp3 plm_break_wood.mp3 pls_tone_blurk.mp3 \ +- mco_bite_dainty.mp3 plm_cabinet_open.mp3 pls_tone_clave6.mp3 \ +- mco_bite_gnash.mp3 plm_cabinet_shut.mp3 pls_tone_clavelo8.mp3 \ +- mco_bite_hard.mp3 plm_chain_light.mp3 pls_tone_conk.mp3 \ +- mco_bite_long.mp3 plm_chest_latch.mp3 pls_tone_elec.mp3 \ +- mco_bite_munch.mp3 plm_chest_unlatch.mp3 pls_tone_goblet.mp3 \ +- mco_bite_regular.mp3 plm_chimes_jangle.mp3 pls_tone_guiro.mp3 \ +- mco_bite_short.mp3 plm_click_dry.mp3 pls_tone_headstock.mp3 \ +- mco_bite_small.mp3 plm_click_switch.mp3 pls_tone_scrape.mp3 \ +- mco_bite_soft.mp3 plm_click_switch2.mp3 pls_tone_stick.mp3 \ +- mco_card_shuffle.mp3 plm_click_switch3.mp3 sto_bell_desk.mp3 \ +- mco_castanet_trill.mp3 plm_click_wood.mp3 sto_bell_ding.mp3 \ +- mco_ceramic_trill.mp3 plm_close_hatch.mp3 sto_bell_dingaling.mp3 \ +- mco_click_vibra.mp3 plm_coins_dump.mp3 sto_bell_jingles.mp3 \ +- mco_creature_choking.mp3 plm_coins_light.mp3 sto_bell_register1.mp3 \ +- mco_creature_groan.mp3 plm_coins_pour.mp3 sto_bell_register2.mp3 \ +- mco_creature_yelp.mp3 plm_coins_shake.mp3 sto_bell_ringing.mp3 \ +- mco_cuica_rubbing.mp3 plm_cork_pop.mp3 sto_bell_shop.mp3 \ +- mco_dino_low.mp3 plm_cork_squeak.mp3 sto_coins_countertop.mp3 \ +- mco_dino_slur.mp3 plm_door_bolt.mp3 sto_man_haha.mp3 \ +- mco_dino_talk.mp3 plm_door_creak.mp3 sto_man_hey.mp3 \ +- mco_dino_yawn.mp3 plm_door_creakshut.mp3 sto_man_whoohaha.mp3 \ +- mco_dub_wobble.mp3 plm_door_dungeon.mp3 sum_angel_song.mp3 \ +- mco_frog_trill.mp3 plm_door_echolock.mp3 sum_bell_crystal.mp3 \ +- mco_hit_whip.mp3 plm_door_entrance.mp3 sum_bell_hand.mp3 \ +- mco_howl_croak.mp3 plm_door_knob.mp3 sum_bell_tone.mp3 \ +- mco_howl_deep.mp3 plm_door_latch.mp3 sum_chime_jangle.mp3 \ +- mco_howl_distressed.mp3 plm_door_open.mp3 sum_ghost_moan.mp3 \ +- mco_howl_high.mp3 plm_door_opening.mp3 sum_ghost_oooo.mp3 \ +- mco_howl_long.mp3 plm_door_rusty.mp3 sum_ghost_wail.mp3 \ +- mco_liquid_squirt.mp3 plm_door_shut.mp3 sum_gong_temple.mp3 \ +- mco_man_mumble.mp3 plm_door_slam.mp3 sum_laugh_evil2.mp3 \ +- mco_mouse_squeaks.mp3 plm_door_squeaky.mp3 sum_lion_growl.mp3 \ +- mco_rubber_thud.mp3 plm_door_wooden.mp3 sum_piano_scrape.mp3 ++DATA = sound.cfg + + PACKAGE = xtra/sound + +diff --git a/lib/xtra/sound/sound.cfg b/lib/xtra/sound/sound.cfg +index a3f483f..41de805 100644 +--- a/lib/xtra/sound/sound.cfg ++++ b/lib/xtra/sound/sound.cfg +@@ -9,21 +9,6 @@ + # hit = hit.mp3 hit1.mp3 + # + +-# +-# This is the Dubtrain Angband Sound config list, v.3.1.0 - February 24th, 2009 +-# +-# Licensed under a Creative Commons non-commercial agreement +-# +-# Inspired by the original Craig's Angband Sound Patch. +-# +-# But with all new sounds. +-# +-# contact angband@dubtrain.com +-# +-# download zipped archive at www.dubtrain.com/angband +-# +-# +- + [Sound] + + # +@@ -31,484 +16,484 @@ + # + + # Town during the day. +-ambient_day = amb_thunder_rain.mp3 ++ambient_day = + + # Town during the night. +-ambient_nite = amb_guitar_chord.mp3 amb_thunder_roll.mp3 ++ambient_nite = + + # Dungeon levels 1-20 (50'-1000') +-ambient_dng1 = amb_door_iron.mp3 amb_bell_metal1.mp3 ++ambient_dng1 = + + # Dungeon levels 21-40 (1050'-2000') +-ambient_dng2 = amb_bell_tibet1.mp3 amb_bell_metal2.mp3 amb_gong_strike.mp3 ++ambient_dng2 = + + # Dungeon levels 41-60 (2050'-3000') +-ambient_dng3 = amb_bell_tibet2.mp3 amb_dungeon_echo.mp3 amb_pulse_low.mp3 ++ambient_dng3 = + + # Dungeon levels 61-80 (3050'-4000') +-ambient_dng4 = amb_bell_tibet3.mp3 amb_dungeon_echowet.mp3 amb_gong_undertone.mp3 ++ambient_dng4 = + + # Dungeon levels 81 and beyond (4050'-) +-ambient_dng5 = amb_door_doom.mp3 amb_gong_chinese.mp3 amb_gong_low.mp3 ++ambient_dng5 = + + # + # Store sounds + # + + # The shopkeep bought a worthless item. +-store1 = sto_man_hey.mp3 ++store1 = + + # The shopkeep paid too much for an item. +-store2 = id_bad_dang.mp3 ++store2 = + + # The shopkeep got away with a good bargain. +-store3 = sto_man_haha.mp3 ++store3 = + + # The shopkeep got away with a great bargain. +-store4 = sto_man_whoohaha.mp3 ++store4 = + + # You make a normal transaction (buying or selling). +-store5 = sto_coins_countertop.mp3 sto_bell_register1.mp3 sto_bell_register2.mp3 ++store5 = + + # You enter a store. +-store_enter = sto_bell_desk.mp3 sto_bell_ding.mp3 sto_bell_dingaling.mp3 sto_bell_jingles.mp3 sto_bell_ringing.mp3 sto_bell_shop.mp3 ++store_enter = + + # You enter your home. +-store_home = plm_door_entrance.mp3 ++store_home = + + # You leave a store. +-store_leave = plm_door_bolt.mp3 ++store_leave = + + # + # Player sounds - combat + # + + # You succeed in a melee attack against a monster. +-hit = plc_hit_hay.mp3 plc_hit_body.mp3 ++hit = + + # It was a good hit! +-hit_good = plc_hit_anvil.mp3 ++hit_good = + + # It was a great hit! +-hit_great = plc_hit_groan.mp3 ++hit_great = + + # It was a superb hit! +-hit_superb = plc_hit_grunt.mp3 ++hit_superb = + + # It was a *GREAT* hit! +-hit_hi_great = plc_hit_grunt2.mp3 ++hit_hi_great = + + # It was a *SUPERB* hit! +-hit_hi_superb = plc_hit_anvil2.mp3 ++hit_hi_superb = + + # You miss a melee attack against a monster. +-miss = plc_miss_arrow2.mp3 ++miss = + + # You fire a missile. +-shoot = plc_miss_swish.mp3 plc_miss_arrow.mp3 ++shoot = + + # You hit something with a missile. +-shoot_hit = plc_hit_arrow.mp3 ++shoot_hit = + + # You receive a hitpoint warning. +-hitpoint_warn = plc_bell_warn.mp3 ++hitpoint_warn = + + # You die. +-death = plc_die_laugh.mp3 ++death = + + # + # Player sounds - status changes + # + + # You become blind. +-blind = pls_tone_conk.mp3 ++blind = + + # You become confused. +-confused = pls_man_ugh.mp3 ++confused = + + # You become poisoned. +-poisoned = pls_tone_guiro.mp3 ++poisoned = + + # You become afraid. +-afraid = pls_man_yell.mp3 ++afraid = + + # You become paralyzed. +-paralyzed = pls_man_gulp_new.mp3 ++paralyzed = + + # You feel drugged (chaos effects). +-drugged = pls_breathe_in.mp3 ++drugged = + + # You become slower. +-slow = pls_man_sigh.mp3 ++slow = + + # You become stunned. +-stun = pls_bell_mute.mp3 ++stun = + + # You suffer a cut. +-cut = pls_man_argoh.mp3 ++cut = + + # A stat is drained +-drain_stat = pls_tone_headstock.mp3 ++drain_stat = + + # You recover from a condition (blind, confused, etc.) +-recover = pls_bell_chime_new.mp3 ++recover = + + # You become faster. +-speed = pls_bell_sustain.mp3 ++speed = + + # You attain a mystic shield. +-shield = pls_bell_bowl.mp3 ++shield = + + # You become blessed. +-blessed = sum_angel_song.mp3 ++blessed = + + # You feel heroic. +-hero = pls_tone_goblet.mp3 ++hero = + + # You are bold. +-bold = pls_bell_hibell_soft.mp3 ++bold = + + # You become berserk. +-berserk = pls_man_scream2.mp3 ++berserk = + + # You feel protected from evil. +-prot_evil = pls_bell_glass.mp3 ++prot_evil = + + # You feel invulnerable. (does any item/spell do this anymore?) +-invuln = pls_tone_blurk.mp3 ++invuln = + + # You can see invisible things. +-see_invis = pls_tone_clave6.mp3 ++see_invis = + + # You can see the infrared spectrum +-infrared = pls_tone_clavelo8.mp3 ++infrared = + + # You become resistant to acid. +-res_acid = pls_man_sniff.mp3 ++res_acid = + + # You become resistant to electricity. +-res_elec = pls_tone_elec.mp3 ++res_elec = + + # You become resistant to fire. +-res_fire = pls_tone_scrape.mp3 ++res_fire = + + # You become resistant to cold. +-res_cold = pls_tone_stick.mp3 ++res_cold = + + # You become resistant to poison. +-res_pois = pls_man_spit.mp3 ++res_pois = + + # You become hungry. +-hungry = pls_man_sob.mp3 ++hungry = + + # + # Player sounds - misc. + # + + # You pick up money worth less than 200 au. +-money1 = plm_coins_light.mp3 plm_coins_shake.mp3 ++money1 = + + # You pick up money worth between 200 and 600 au. +-money2 = plm_chain_light.mp3 plm_coins_pour.mp3 ++money2 = + + # You pick up money worth 600 au or more. +-money3 = plm_coins_dump.mp3 ++money3 = + + # You (or a monster) drop something on the ground. +-drop = plm_drop_boot.mp3 ++drop = + + # You gain (or regain) a level. +-level = plm_levelup.mp3 ++level = + + # You successfully study a spell or prayer. +-study = plm_book_pageturn.mp3 ++study = + + # You teleport or phase door. +-teleport = plm_chimes_jangle.mp3 ++teleport = + + # You quaff a potion. +-quaff = plm_bottle_clinks.mp3 plm_cork_pop.mp3 plm_cork_squeak.mp3 ++quaff = + + # You zap a rod. +-zap_rod = plm_zap_rod.mp3 ++zap_rod = + + # You take a step. (unimplemented) + walk = + + # You teleport someone else away. +-tpother = plm_chimes_jangle.mp3 ++tpother = + + # You bump into a wall or door. +-hitwall = plm_wood_thud.mp3 ++hitwall = + + # You eat something. +-eat = plm_eat_bite.mp3 ++eat = + + # You successfully dig through something. +-dig = plm_metal_clank.mp3 ++dig = + + # You open a door. +-opendoor = plm_door_bolt.mp3 plm_door_creak.mp3 plm_door_dungeon.mp3 plm_door_entrance.mp3 plm_door_open.mp3 plm_door_opening.mp3 plm_door_rusty.mp3 plm_door_squeaky.mp3 ++opendoor = + + # You shut a door. +-shutdoor = plm_bang_dumpster.mp3 plm_cabinet_shut.mp3 plm_close_hatch.mp3 plm_door_creakshut.mp3 plm_door_latch.mp3 plm_door_shut.mp3 plm_door_slam.mp3 ++shutdoor = + + # You teleport from a level (including via recall). +-tplevel = sum_bell_crystal.mp3 ++tplevel = + + # Default "bell" sound for system messages. +-bell = plm_jar_ding.mp3 ++bell = + + # You try to open something that's not a door. +-nothing_to_open = plm_click_switch2.mp3 plm_door_knob.mp3 ++nothing_to_open = + + # You fail to pick a lock. +-lockpick_fail = plm_click_dry.mp3 plm_click_switch.mp3 plm_click_wood.mp3 plm_door_echolock.mp3 plm_door_wooden.mp3 ++lockpick_fail = + + # You pick a lock. +-lockpick = plm_break_wood.mp3 plm_cabinet_open.mp3 plm_chest_unlatch.mp3 plm_lock_case.mp3 plm_lock_distant.mp3 plm_open_case.mp3 ++lockpick = + + # You disarm a trap. +-disarm = plm_bang_ceramic.mp3 plm_chest_latch.mp3 plm_click_switch3.mp3 ++disarm = + + # You go up stairs. +-stairs_up = plm_floor_creak2.mp3 ++stairs_up = + + # You go down stairs. +-stairs_down = plm_floor_creak.mp3 ++stairs_down = + + # You activate an artifact. +-act_artifact = plm_aim_wand.mp3 ++act_artifact = + + # You use a staff. +-use_staff = plm_use_staff.mp3 ++use_staff = + + # An object is destroyed. +-destroy = plm_bang_metal.mp3 plm_break_canister.mp3 plm_break_glass.mp3 plm_break_glass2.mp3 plm_break_plates.mp3 plm_break_shatter.mp3 plm_break_smash.mp3 plm_glass_breaking.mp3 plm_glass_break.mp3 plm_glass_smashing.mp3 ++destroy = + + # You wield or take off something. +-wield = plm_metal_sharpen.mp3 ++wield = + + # You wield a cursed item. +-cursed = pls_man_oooh.mp3 ++cursed = + + # You notice something (generic notice) +-notice = id_bad_hmm.mp3 ++notice = + + # You notice something about your equipment or inventory. +-pseudo_id = id_good_hmm.mp3 ++pseudo_id = + + # You successfully cast a spell. +-cast_spell = plm_spell1.mp3 plm_spell2.mp3 plm_spell3.mp3 ++cast_spell = + + # You successfully pray a prayer. +-pray_prayer = sum_angel_song.mp3 ++pray_prayer = + + # + # Monster Sounds - combat + # + + # A monster flees in terror. +-flee = mco_creature_yelp.mp3 ++flee = + + # A monster is killed. +-kill = mco_howl_croak.mp3 mco_howl_deep.mp3 mco_howl_distressed.mp3 mco_howl_high.mp3 mco_howl_long.mp3 ++kill = + + # A unique is killed. +-kill_unique = sum_ghost_wail.mp3 ++kill_unique = + + # Morgoth, Lord of Darkness is killed. +-kill_king = amb_guitar_chord.mp3 ++kill_king = + + # Attack - hit +-mon_hit = mco_hit_whip.mp3 ++mon_hit = + + # Attack - touch +-mon_touch = mco_click_vibra.mp3 ++mon_touch = + + # Attack - punch +-mon_punch = mco_squish_snap.mp3 ++mon_punch = + + # Attack - kick +-mon_kick = mco_rubber_thud.mp3 ++mon_kick = + + # Attack - claw +-mon_claw = mco_ceramic_trill.mp3 mco_scurry_dry.mp3 ++mon_claw = + + # Attack - bite +-mon_bite = mco_snarl_short.mp3 mco_bite_soft.mp3 mco_bite_munch.mp3 mco_bite_long.mp3 mco_bite_short.mp3 mco_bite_gnash.mp3 mco_bite_chomp.mp3 mco_bite_regular.mp3 mco_bite_small.mp3 mco_bite_dainty.mp3 mco_bite_hard.mp3 mco_bite_chew.mp3 ++mon_bite = + + # Attack - sting +-mon_sting = mco_castanet_trill.mp3 mco_tube_hit.mp3 ++mon_sting = + + # Attack - butt +-mon_butt = mco_cuica_rubbing.mp3 mco_thud_crash.mp3 ++mon_butt = + + # Attack - crush +-mon_crush = mco_dino_low.mp3 mco_squish_hit.mp3 ++mon_crush = + + # Attack - engulf +-mon_engulf = mco_dino_talk.mp3 mco_dino_yawn.mp3 ++mon_engulf = + + # Attack - crawl +-mon_crawl = mco_card_shuffle.mp3 mco_shake_roll.mp3 ++mon_crawl = + + # Attack - drool +-mon_drool = mco_creature_choking.mp3 mco_liquid_squirt.mp3 ++mon_drool = + + # Attack - spit +-mon_spit = mco_attack_spray.mp3 ++mon_spit = + + # Attack - gaze +-mon_gaze = mco_thoing_backwards.mp3 ++mon_gaze = + + # Attack - wail +-mon_wail = mco_dino_low.mp3 ++mon_wail = + + # Attack - release spores +-mon_spore = mco_dub_wobble.mp3 mco_spray_long.mp3 ++mon_spore = + + # Attack - beg for money +-mon_beg = mco_man_mumble.mp3 ++mon_beg = + + # Attack - insult +-mon_insult = mco_strange_thwoink.mp3 ++mon_insult = + + # Attack - moan +-mon_moan = mco_strange_music.mp3 ++mon_moan = + + # Attack - shriek +-mon_shriek = mco_mouse_squeaks.mp3 ++mon_shriek = + + # Spell - create traps +-mon_create_trap = mco_thoing_deep.mp3 ++mon_create_trap = + + # Spell - cause fear +-mon_cast_fear = mco_creature_groan.mp3 mco_dino_slur.mp3 ++mon_cast_fear = + + # Multiply (breed explosively) +-multiply = mco_frog_trill.mp3 ++multiply = + + # + # Summons + # + + # Summon one or more monsters. +-summon_monster = sum_chime_jangle.mp3 ++summon_monster = + + # Summon angels. +-summon_ainu = sum_angel_song.mp3 ++summon_ainu = + + # Summon undead. +-summon_undead = sum_ghost_oooo.mp3 ++summon_undead = + + # Summon animals. +-summon_animal = sum_lion_growl.mp3 ++summon_animal = + + # Summon spiders. +-summon_spider = sum_piano_scrape.mp3 ++summon_spider = + + # Summon hounds. +-summon_hound = sum_lion_growl.mp3 ++summon_hound = + + # Summon hydras. +-summon_hydra = sum_piano_scrape.mp3 ++summon_hydra = + + # Summon demons. +-summon_demon = sum_ghost_wail.mp3 sum_laugh_evil2.mp3 ++summon_demon = + + # Summon dragon. +-summon_dragon = sum_piano_scrape.mp3 ++summon_dragon = + + # Summon greater undead. +-summon_gr_undead = sum_ghost_moan.mp3 ++summon_gr_undead = + + # Summon greater dragons. +-summon_gr_dragon = sum_gong_temple.mp3 ++summon_gr_dragon = + + # Summon greater demons. +-summon_gr_demon = sum_ghost_moan.mp3 ++summon_gr_demon = + + # Summon Ringwraiths. +-summon_ringwraith = sum_bell_hand.mp3 ++summon_ringwraith = + + # Summon uniques. +-summon_unique = sum_bell_tone.mp3 ++summon_unique = + + # + # Breath weapons + # + + # Breathe frost. +-breathe_frost = mco_attack_breath.mp3 ++breathe_frost = + + # Breathe electricity. +-breathe_elec = mco_attack_breath.mp3 ++breathe_elec = + + # Breathe acid. +-breathe_acid = mco_attack_breath.mp3 ++breathe_acid = + + # Breathe gas. +-breathe_gas = mco_attack_breath.mp3 ++breathe_gas = + + # Breathe fire. +-breathe_fire = mco_attack_breath.mp3 ++breathe_fire = + + # Breathe confusion. +-breathe_confusion = mco_attack_breath.mp3 ++breathe_confusion = + + # Breathe disenchantment. +-breathe_disenchant = mco_attack_breath.mp3 ++breathe_disenchant = + + # Breathe chaos. +-breathe_chaos = mco_attack_breath.mp3 ++breathe_chaos = + + # Breathe shards. +-breathe_shards = mco_attack_breath.mp3 ++breathe_shards = + + # Breathe sound. +-breathe_sound = mco_attack_breath.mp3 ++breathe_sound = + + # Breathe light. +-breathe_light = mco_attack_breath.mp3 ++breathe_light = + + # Breathe darkness. +-breathe_dark = mco_attack_breath.mp3 ++breathe_dark = + + # Breathe nether. +-breathe_nether = mco_attack_breath.mp3 ++breathe_nether = + + # Breathe nexus. +-breathe_nexus = mco_attack_breath.mp3 ++breathe_nexus = + + # Breathe time. +-breathe_time = mco_attack_breath.mp3 ++breathe_time = + + # Breathe inertia. +-breathe_inertia = mco_attack_breath.mp3 ++breathe_inertia = + + # Breathe gravity. +-breathe_gravity = mco_attack_breath.mp3 ++breathe_gravity = + + # Breathe plasma. +-breathe_plasma = mco_attack_breath.mp3 ++breathe_plasma = + + # Breathe force. +-breathe_force = mco_attack_breath.mp3 ++breathe_force = + + # Breathe the elements (power dragon scale mail). +-breathe_elements = mco_attack_breath.mp3 ++breathe_elements = + + # + # Identifying Items + # + + # Identify a bad item (including bad ego items and artifacts). +-identify_bad = id_bad_aww.mp3 id_bad_dang.mp3 id_bad_hmm.mp3 id_bad_hmph.mp3 id_bad_ohh.mp3 ++identify_bad = + + # Identify a good ego item. +-identify_ego = id_ego_whoa.mp3 id_ego_woohoo.mp3 id_ego_yeah.mp3 id_ego_yeah2.mp3 id_ego_yes.mp3 ++identify_ego = + + # Identify a good artifact. +-identify_art = id_good_hey.mp3 id_good_hey2.mp3 id_good_hmm.mp3 id_good_huh.mp3 id_good_ooh.mp3 id_good_ooo.mp3 id_good_wow.mp3 ++identify_art = + -- cgit v1.1-4-g5e80 From d2d3c7a1a927f6f87a557f1e8ed7bef15efa349d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?coadde=20=5BM=C3=A1rcio=20Alexandre=20Silva=20Delgado=5D?= Date: Wed, 3 Sep 2014 18:44:15 -0300 Subject: fixing abuse-libre source --- libre/abuse/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libre/abuse/PKGBUILD b/libre/abuse/PKGBUILD index 6734cce30..ad68610e2 100644 --- a/libre/abuse/PKGBUILD +++ b/libre/abuse/PKGBUILD @@ -19,9 +19,9 @@ conflicts=($_pkgname) depends=('gcc-libs' 'libgl' 'sdl_mixer' 'glu' 'desktop-file-utils') makedepends=('gendesk' 'mesa-libgl' 'glu') install="$pkgname.install" -mksource=("http://$pkgname.zoy.org/raw-attachment/wiki/download/$_pkgname-$pkgver.tar.gz" +mksource=("http://$pkgname.zoy.org/raw-attachment/wiki/download/$pkgname-$pkgver.tar.gz" 'non-claudio.patch') -source=("https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz" +source=("https://repo.parabolagnulinux.org/other/$_pkgname/$_pkgname-$pkgver.tar.gz" "$pkgname.sh" "default.${pkgname}rc" 'default.gamma.lsp') -- cgit v1.1-4-g5e80 From 24be8e4172cce63a5c80d7eff4c076892ab949b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?coadde=20=5BM=C3=A1rcio=20Alexandre=20Silva=20Delgado=5D?= Date: Wed, 3 Sep 2014 18:47:35 -0300 Subject: fixing openexr-libre source --- libre/openexr/PKGBUILD | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libre/openexr/PKGBUILD b/libre/openexr/PKGBUILD index b0adad8c5..2eb99b439 100644 --- a/libre/openexr/PKGBUILD +++ b/libre/openexr/PKGBUILD @@ -20,7 +20,7 @@ mksource=("http://download.savannah.nongnu.org/releases/${pkgname}/${pkgname}-${ "https://github.com/${pkgname}/${pkgname}/raw/master/OpenEXR/doc/OpenEXRFileLayout.odt" "https://github.com/${pkgname}/${pkgname}/raw/master/OpenEXR/doc/ReadingAndWritingImageFiles.odt" "https://github.com/${pkgname}/${pkgname}/raw/master/OpenEXR/doc/TechnicalIntroduction.odt") -source=("https://repo.parabolagnulinux.org/other/${pkgname}/${_pkgname}-${pkgver}.tar.gz") +source=("https://repo.parabolagnulinux.org/other/${_pkgname}/${_pkgname}-${pkgver}.tar.gz") noextract=(InterpretingDeepPixels.docx MultiViewOpenEXR.odt OpenEXRFileLayout.odt ReadingAndWritingImageFiles.odt TechnicalIntroduction.odt) mksource() { @@ -44,19 +44,19 @@ prepare() { # remove TheoryDeepPixels.pdf reference sed -i '\|TheoryDeepPixels[.]pdf|d \|InterpretingDeepPixels[.]pdf| s| [\]|| - ' "${srcdir}/${pkgname}-${pkgver}/doc/Makefile."{am,in} + ' "${srcdir}/${_pkgname}-${pkgver}/doc/Makefile."{am,in} } build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${_pkgname}-${pkgver}" ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${_pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE" install -m644 "doc/"{InterpretingDeepPixels.docx,{MultiViewOpenEXR,OpenEXRFileLayout,ReadingAndWritingImageFiles,TechnicalIntroduction}.odt} "${pkgdir}/usr/share/doc/OpenEXR-${pkgver}" } mkmd5sums=('33735d37d2ee01c6d8fbd0df94fb8b43' -- cgit v1.1-4-g5e80 From 23c8631029ce57a125d792609831558c8780f887 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?coadde=20=5BM=C3=A1rcio=20Alexandre=20Silva=20Delgado=5D?= Date: Wed, 3 Sep 2014 18:49:21 -0300 Subject: fixing angband-libre source dir --- libre/angband/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libre/angband/PKGBUILD b/libre/angband/PKGBUILD index 96f200832..8177e815c 100644 --- a/libre/angband/PKGBUILD +++ b/libre/angband/PKGBUILD @@ -33,7 +33,7 @@ mksource() { } build() { - cd "${srcdir}/${pkgname}-v${pkgver}" + cd "${srcdir}/${_pkgname}-v${pkgver}" ./configure \ --prefix=/usr \ @@ -49,7 +49,7 @@ build() { } package() { - cd "${srcdir}/${pkgname}-v${pkgver}" + cd "${srcdir}/${_pkgname}-v${pkgver}" make DESTDIR="${pkgdir}" install -- cgit v1.1-4-g5e80 From f4ad8840b1675f8313f3efda3b114c4db297f2db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?coadde=20=5BM=C3=A1rcio=20Alexandre=20Silva=20Delgado=5D?= Date: Wed, 3 Sep 2014 18:51:06 -0300 Subject: fixing abuse-libre source dir --- libre/abuse/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libre/abuse/PKGBUILD b/libre/abuse/PKGBUILD index ad68610e2..06e24605c 100644 --- a/libre/abuse/PKGBUILD +++ b/libre/abuse/PKGBUILD @@ -41,20 +41,20 @@ mksource() { } prepare() { - cd "$pkgname-$pkgver" + cd "$_pkgname-$pkgver" gendesk -n -f --pkgname "$pkgname" --pkgdesc "$pkgdesc" } build() { - cd "$pkgname-$pkgver" + cd "$_pkgname-$pkgver" ./configure --prefix=/usr --with-assetdir="/usr/share/$pkgname/orig" --with-x make } package() { - cd "$pkgname-$pkgver" + cd "$_pkgname-$pkgver" make DESTDIR="$pkgdir" install -- cgit v1.1-4-g5e80 From 1bce741574f7113f568cd6e29f69d4186dd6d61b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?coadde=20=5BM=C3=A1rcio=20Alexandre=20Silva=20Delgado=5D?= Date: Wed, 3 Sep 2014 18:58:31 -0300 Subject: rename to atool --- libre/atool-libre/PKGBUILD | 54 ------- libre/atool-libre/atool.changelog | 21 --- libre/atool-libre/libre.patch | 309 -------------------------------------- libre/atool/PKGBUILD | 52 +++++++ libre/atool/atool.changelog | 21 +++ libre/atool/libre.patch | 309 ++++++++++++++++++++++++++++++++++++++ 6 files changed, 382 insertions(+), 384 deletions(-) delete mode 100644 libre/atool-libre/PKGBUILD delete mode 100644 libre/atool-libre/atool.changelog delete mode 100644 libre/atool-libre/libre.patch create mode 100644 libre/atool/PKGBUILD create mode 100644 libre/atool/atool.changelog create mode 100644 libre/atool/libre.patch diff --git a/libre/atool-libre/PKGBUILD b/libre/atool-libre/PKGBUILD deleted file mode 100644 index 3cf76f09a..000000000 --- a/libre/atool-libre/PKGBUILD +++ /dev/null @@ -1,54 +0,0 @@ -# $Id: PKGBUILD 115146 2014-07-05 17:57:54Z jlichtblau $ -# Maintainer (Arch): Jaroslav Lichtblau -# Contributor (Arch): leif_thande -# Contributor (Arch): tranquility -# Contributor (Arch): Daniel J Griffiths -# Maintainer: Márcio Silva -# Contributor: André Silva - -_pkgname=atool -pkgname=atool-libre -pkgver=0.39.0 -pkgrel=3 -pkgdesc="A script for managing file archives of various types, without nonfree unace and unrar support" -arch=('any') -url="http://www.nongnu.org/atool/" -license=('GPL3') -depends=('file' 'perl') -provides=("$_pkgname=$pkgver") -replaces=("$_pkgname") -conflicts=("$_pkgname") -optdepends=('bzip2: for using atool with bzip2 compressed archives' - 'cpio: for using atool with cpio archives' - 'gzip: for using atool with gzip compressed archives' - 'lha: for using atool with lha, lharc and similar archives' - 'xz: for using atool with lzma compressed archives' - 'lzop: for using atool with lzop compressed archives' - 'p7zip: for using atool with 7z archives' - 'tar: for using atool with tar archives' - 'zip: for using atool for creating zip archives' - 'unzip: for using atool for unpacking archives') -changelog=$_pkgname.changelog -source=(http://savannah.nongnu.org/download/$_pkgname/$_pkgname-$pkgver.tar.gz - libre.patch) -sha256sums=('aaf60095884abb872e25f8e919a8a63d0dabaeca46faeba87d12812d6efc703b' - 'c9aa3c72e4c979d236dd659f16cc1eb6841f0860e6ef4d2c90f021d6e5aca578') - -prepare() { - cd ${srcdir}/${_pkgname}-${pkgver} - - # remove nonfree unace and unrar support - patch -Np1 -i ../libre.patch -} - -build() { - cd "${srcdir}"/${_pkgname}-${pkgver} - - ./configure --prefix=/usr -} - -package() { - cd "${srcdir}"/${_pkgname}-${pkgver} - - make prefix="${pkgdir}"/usr install -} diff --git a/libre/atool-libre/atool.changelog b/libre/atool-libre/atool.changelog deleted file mode 100644 index c61925fb0..000000000 --- a/libre/atool-libre/atool.changelog +++ /dev/null @@ -1,21 +0,0 @@ -2014-07-05 Jaroslav Lichtblau - * atool 0.39.0-3 mtree rebuild - -2012-04-19 Jaroslav Lichtblau - * atool 0.39.0-1 - -2012-02-21 Jaroslav Lichtblau - * atool 0.38.0-2 - * signing package - -2011-08-20 Jaroslav Lichtblau - * Updated to major version 0.38.0 - -2009-08-16 Jaroslav Lichtblau - * Updated to major version 0.37.0 - -2008-10-05 Jaroslav Lichtblau - * Updated to major version 0.36.0 - -2008-10-05 Jaroslav Lichtblau - * Moved to [community] repo diff --git a/libre/atool-libre/libre.patch b/libre/atool-libre/libre.patch deleted file mode 100644 index 11f3b3cb8..000000000 --- a/libre/atool-libre/libre.patch +++ /dev/null @@ -1,309 +0,0 @@ -diff -Nur atool-0.39.0.orig/atool atool-0.39.0/atool ---- atool-0.39.0.orig/atool 2012-04-02 15:09:10.000000000 -0300 -+++ atool-0.39.0/atool 2014-05-06 04:33:46.263005816 -0300 -@@ -111,16 +111,13 @@ - $::cfg_path_pbzip2 = 'pbzip2'; # pbzip2 program - $::cfg_path_pigz = 'pigz'; # pigz program - $::cfg_path_plzip = 'plzip'; # plzip program --$::cfg_path_rar = 'rar'; # rar program - $::cfg_path_rpm = 'rpm'; # rpm program - $::cfg_path_rpm2cpio = 'rpm2cpio'; # rpm2cpio program - $::cfg_path_rzip = 'rzip'; # rzip program - $::cfg_path_syscfg = File::Spec->catfile($::SYSCONFDIR, $::PROGRAM.'.conf'); # system-wide configuration file - $::cfg_path_tar = 'tar'; # tar program --$::cfg_path_unace = 'unace'; # unace program - $::cfg_path_unalz = 'unalz'; # unalz program - $::cfg_path_unarj = 'unarj'; # unarj program --$::cfg_path_unrar = 'unrar'; # unrar program - $::cfg_path_unzip = 'unzip'; # unzip program - $::cfg_path_usercfg = '.'.$::PROGRAM.'rc'; # user configuration file - $::cfg_path_xargs = 'xargs'; # xargs program -@@ -141,7 +138,6 @@ - $::cfg_use_pbzip2 = 0; # use pbzip2 instead of bzip2 - $::cfg_use_pigz = 0; # use pigz instead of gzip - $::cfg_use_plzip = 0; # use plzip instead of lzip --$::cfg_use_rar_for_unpack = 0; # use rar to unpack rar files? - $::cfg_use_tar_bzip2_option = 1; # does tar support --bzip2? - $::cfg_use_tar_lzma_option = 1; # does tar support --lzma? - $::cfg_use_tar_lzip_option = 0; # does tar support --lzip? -@@ -592,26 +588,6 @@ - @cmd = handle_empty_add(@cmd) if ($mode eq 'add' && @args == 0); - return multiarchivecmd($archive, $outdir, $mode, 0, 0, \@args, @cmd); - } -- elsif ($format eq 'rar') { -- return undef if ($mode eq 'extract' && !defined ($outdir = makeoutdir())); -- if ($mode eq 'add' || $::cfg_use_rar_for_unpack) { -- push @cmd, $::cfg_path_rar; -- } else { -- push @cmd, $::cfg_path_unrar; -- } -- push @cmd, 'a' if $mode eq 'add'; -- push @cmd, 'vt' if $mode eq 'list' && $::opt_verbosity >= 3; -- push @cmd, 'v' if $mode eq 'list' && $::opt_verbosity == 2; -- push @cmd, 'l' if $mode eq 'list' && $::opt_verbosity <= 1; -- push @cmd, 'x' if ($mode eq 'extract' || $mode eq 'extract-to'); -- push @cmd, '-ierr', 'p' if $mode eq 'cat'; -- push @cmd, '-r0' if ($mode eq 'add'); -- push @cmd, $archive, @args; -- push @cmd, tailslash($outdir) if $mode eq 'extract'; -- push @cmd, tailslash($::opt_cmd_extract_to) if $mode eq 'extract-to'; -- @cmd = handle_empty_add(@cmd) if ($mode eq 'add' && @args == 0); -- return multiarchivecmd($archive, $outdir, $mode, 0, 0, \@args, @cmd); -- } - elsif ($format eq '7z') { - # 7z has the -so option for writing data to stdout, but it doesn't - # write data to terminal even if the file is designed to be -@@ -673,23 +649,6 @@ - @cmd = handle_empty_add(@cmd) if ($mode eq 'add' && @args == 0); - return multiarchivecmd($archive, $outdir, $mode, 0, 0, \@args, @cmd); - } -- elsif ($format eq 'ace') { -- return undef if ($mode eq 'extract' && !defined ($outdir = makeoutdir())); -- push @cmd, $::cfg_path_unace; -- if ($mode eq 'add' || $mode eq 'cat') { -- warn "$::basename: ".quote($archive).": $mode command not supported for $format archives\n"; -- return undef; -- } -- push @cmd, 'v', '-c' if $mode eq 'list' && $::opt_verbosity >= 3; -- push @cmd, 'v' if $mode eq 'list' && $::opt_verbosity == 2; -- push @cmd, 'l' if $mode eq 'list' && $::opt_verbosity <= 1; -- push @cmd, 'x' if ($mode eq 'extract' || $mode eq 'extract-to'); -- push @cmd, $archive, @args; -- push @cmd, tailslash($outdir) if $mode eq 'extract'; -- push @cmd, tailslash($::opt_cmd_extract_to) if $mode eq 'extract-to'; -- @cmd = handle_empty_add(@cmd) if ($mode eq 'add' && @args == 0); -- return multiarchivecmd($archive, $outdir, $mode, 0, 0, \@args, @cmd); -- } - elsif ($format eq 'arj') { - return undef if ($mode eq 'extract' && !defined ($outdir = makeoutdir())); - if ($mode eq 'cat') { -@@ -1321,9 +1280,7 @@ - return $file if ($file =~ s/\.jar$//); - return $file if ($file =~ s/\.war$//); - return $file if ($file =~ s/\.Z$//); -- return $file if ($file =~ s/\.rar$//); - return $file if ($file =~ s/\.(lha|lzh)$//); -- return $file if ($file =~ s/\.ace$//); - return $file if ($file =~ s/\.arj$//); - return $file if ($file =~ s/\.a$//); - return $file if ($file =~ s/\.lzma$//); -@@ -1363,8 +1320,6 @@ - return '.zip' if $format eq 'zip'; - return '.jar' if $format eq 'jar'; - return '.Z' if $format eq 'compress'; -- return '.rar' if $format eq 'rar'; -- return '.ace' if $format eq 'ace'; - return '.a' if $format eq 'ar'; - return '.arj' if $format eq 'arj'; - return '.lha' if $format eq 'lha'; -@@ -1411,7 +1366,6 @@ - ['zip', qr/ \(Zip archive data[^)]*\)$/], - ['zip', qr/^Zip archive data(\W|$)/], - ['zip', qr/^MS-DOS executable (.*), ZIP self-extracting archive(\W|$)/], -- ['rar', qr/^RAR archive data(\W|$)/], - ['lha', qr/^LHa \(2\.x\) archive data /], - ['lha', qr/^LHa 2\.x\? archive data /], - ['lha', qr/^LHarc 1\.x archive data /], -@@ -1453,7 +1407,6 @@ - ['tar+xz', qr/(\.tar\.xz|\.txz)$/], - - ['7z', qr/\.7z$/], -- ['ace', qr/\.ace$/], - ['alzip', qr/\.alz$/], - ['ar', qr/\.a$/], - ['arc', qr/\.arc$/], -@@ -1471,7 +1424,6 @@ - ['lzip', qr/\.lz$/], - ['lzma', qr/\.lzma$/], - ['lzop', qr/\.lzo$/], -- ['rar', qr/\.rar$/], - ['rpm', qr/\.rpm$/], - ['rzip', qr/\.rz$/], - ['tar', qr/\.tar$/], -@@ -1620,15 +1572,12 @@ - 'path_pbzip2' => [ 'option', \$::cfg_path_pbzip2, qr/.*/ ], - 'path_pigz' => [ 'option', \$::cfg_path_pigz, qr/.*/ ], - 'path_plzip' => [ 'option', \$::cfg_path_plzip, qr/.*/ ], -- 'path_rar' => [ 'option', \$::cfg_path_rar, qr/.*/ ], - 'path_rpm' => [ 'option', \$::cfg_path_rpm, qr/.*/ ], - 'path_rpm2cpio' => [ 'option', \$::cfg_path_rpm2cpio, qr/.*/ ], - 'path_rzip' => [ 'option', \$::cfg_path_rzip, qr/.*/ ], - 'path_tar' => [ 'option', \$::cfg_path_tar, qr/.*/ ], -- 'path_unace' => [ 'option', \$::cfg_path_unace, qr/.*/ ], - 'path_unalz' => [ 'option', \$::cfg_path_unalz, qr/.*/ ], - 'path_unarj' => [ 'option', \$::cfg_path_unarj, qr/.*/ ], -- 'path_unrar' => [ 'option', \$::cfg_path_unrar, qr/.*/ ], - 'path_unzip' => [ 'option', \$::cfg_path_unzip, qr/.*/ ], - 'path_usercfg' => [ 'option', \$::cfg_path_usercfg, qr/.*/ ], - 'path_xargs' => [ 'option', \$::cfg_path_xargs, qr/.*/ ], -@@ -1649,8 +1598,6 @@ - 'use_pbzip2' => [ 'option', \$::cfg_use_pbzip2, qr/^(0|1)$/ ], - 'use_pigz' => [ 'option', \$::cfg_use_pigz, qr/^(0|1)$/ ], - 'use_plzip' => [ 'option', \$::cfg_use_plzip, qr/^(0|1)$/ ], -- 'use_rar_for_unpack' => [ 'option', \$::cfg_use_rar_for_unpack, qr/^(0|1)$/ ], -- 'use_rar_for_unrar' => [ 'obsolete', 'use_rar_for_unpack' ], - 'use_tar_bzip2_option' => [ 'option', \$::cfg_use_tar_bzip2_option, qr/^(0|1)$/ ], - 'use_tar_lzma_option' => [ 'option', \$::cfg_use_tar_lzma_option, qr/^(0|1)$/ ], - 'use_tar_lzop_option' => [ 'option', \$::cfg_use_tar_lzop_option, qr/^(0|1)$/ ], -diff -Nur atool-0.39.0.orig/atool.1 atool-0.39.0/atool.1 ---- atool-0.39.0.orig/atool.1 2012-03-15 04:31:41.000000000 -0300 -+++ atool-0.39.0/atool.1 2014-05-06 04:34:36.830099616 -0300 -@@ -146,7 +146,7 @@ - When extracting from files, allow overwriting of local files. - When creating an archive, allow the archive file to be overwritten - if it already exists. Note that it is possible to add files to --existing RAR and Zip archives (this is not possible for many -+existing Zip archives (this is not possible for many - other formats). - .TP - .B \-D, \-\-subdir -@@ -262,9 +262,6 @@ - List, extract, and add commands are supported. - Cat is supported if use_jar_program is disabled. - .TP --.RI \fBrar\fP " " ( .rar ) --All commands are supported. --.TP - .RI \fBlha\fP " " ( .lha ", " .lzh ) - All commands are supported. - .TP -@@ -274,9 +271,6 @@ - .RI \fBalzip\fP " " ( .alz ) - Extract command is supported. - .TP --.RI \fBace\fP " " ( .ace ) --Extract and list commands are supported. --.TP - .RI \fBar\fP " " ( .a ) - All commands are supported. - .TP -@@ -406,11 +400,6 @@ - Enable this if you want to use gzip instead of uncompress when - decompressing compress'ed files (`.Z' files). - .TP --.B use_rar_for_unpack \fR(default: 0)\fR --Enable this if you want to always use rar instead of unrar --when possible. This makes atool use the rar command --(path_rar) even when listing and extracting RAR files. --.TP - .B use_arc_for_unpack \fR(default: 0)\fR - Enable this if you want to always use arc instead of nomarch - when possible. This makes atool use the arc command -@@ -530,10 +519,6 @@ - .TP - .B path_lzip \fR(default: lzip)\fR - .TP --.B path_rar \fR(default: rar)\fR --.TP --.B path_unrar \fR(default: unrar)\fR --.TP - .B path_lbzip2 \fR(default: lbzip2)\fR - .TP - .B path_pigz \fR(default: pigz)\fR -@@ -546,8 +531,6 @@ - .TP - .B path_lha \fR(default: lha)\fR - .TP --.B path_unace \fR(default: unace)\fR --.TP - .B path_ar \fR(default: ar)\fR - .TP - .B path_arj \fR(default: arj)\fR -@@ -661,10 +644,6 @@ - .br - \fBacat \-p myarchive.zip baz\fP - .PP --To list contents of the rar archive `stuff.rar': --.br -- \fBals stuff.rar\fP --.PP - To create three archives, `dir1.tar.gz', `dir2.tar.gz' and `dir3.tar.gz', - so that the first one contains all files in dir1, the second all - in dir2 and the third all dir3: -diff -Nur atool-0.39.0.orig/atool.1.in atool-0.39.0/atool.1.in ---- atool-0.39.0.orig/atool.1.in 2012-03-15 04:31:39.000000000 -0300 -+++ atool-0.39.0/atool.1.in 2014-05-06 04:35:30.100547318 -0300 -@@ -146,7 +146,7 @@ - When extracting from files, allow overwriting of local files. - When creating an archive, allow the archive file to be overwritten - if it already exists. Note that it is possible to add files to --existing RAR and Zip archives (this is not possible for many -+existing Zip archives (this is not possible for many - other formats). - .TP - .B \-D, \-\-subdir -@@ -262,9 +262,6 @@ - List, extract, and add commands are supported. - Cat is supported if use_jar_program is disabled. - .TP --.RI \fBrar\fP " " ( .rar ) --All commands are supported. --.TP - .RI \fBlha\fP " " ( .lha ", " .lzh ) - All commands are supported. - .TP -@@ -274,9 +271,6 @@ - .RI \fBalzip\fP " " ( .alz ) - Extract command is supported. - .TP --.RI \fBace\fP " " ( .ace ) --Extract and list commands are supported. --.TP - .RI \fBar\fP " " ( .a ) - All commands are supported. - .TP -@@ -406,11 +400,6 @@ - Enable this if you want to use gzip instead of uncompress when - decompressing compress'ed files (`.Z' files). - .TP --.B use_rar_for_unpack \fR(default: 0)\fR --Enable this if you want to always use rar instead of unrar --when possible. This makes atool use the rar command --(path_rar) even when listing and extracting RAR files. --.TP - .B use_arc_for_unpack \fR(default: 0)\fR - Enable this if you want to always use arc instead of nomarch - when possible. This makes atool use the arc command -@@ -530,10 +519,6 @@ - .TP - .B path_lzip \fR(default: lzip)\fR - .TP --.B path_rar \fR(default: rar)\fR --.TP --.B path_unrar \fR(default: unrar)\fR --.TP - .B path_lbzip2 \fR(default: lbzip2)\fR - .TP - .B path_pigz \fR(default: pigz)\fR -@@ -546,8 +531,6 @@ - .TP - .B path_lha \fR(default: lha)\fR - .TP --.B path_unace \fR(default: unace)\fR --.TP - .B path_ar \fR(default: ar)\fR - .TP - .B path_arj \fR(default: arj)\fR -@@ -661,10 +644,6 @@ - .br - \fBacat \-p myarchive.zip baz\fP - .PP --To list contents of the rar archive `stuff.rar': --.br -- \fBals stuff.rar\fP --.PP - To create three archives, `dir1.tar.gz', `dir2.tar.gz' and `dir3.tar.gz', - so that the first one contains all files in dir1, the second all - in dir2 and the third all dir3: -diff -Nur atool-0.39.0.orig/extra/bash-completion-atool_0.1-1 atool-0.39.0/extra/bash-completion-atool_0.1-1 ---- atool-0.39.0.orig/extra/bash-completion-atool_0.1-1 2007-12-10 20:01:38.000000000 -0200 -+++ atool-0.39.0/extra/bash-completion-atool_0.1-1 2014-05-06 04:36:01.504143499 -0300 -@@ -15,7 +15,7 @@ - --quiet --verbose --page --null --explain --simulate --config=' -- $cur ) ) - ;; - *) -- _filedir '@(rar|RAR|zip|ZIP|tar.gz|tgz|tar.bz|tbz|tar.Z|tZ|tar.lzo|tzo|tar.7z|t7z|tar|jar|JAR|war|lha|lzh|7z|ace|ACE|arj|ARJ|a|arc|ARC|rpm|deb|gz|bz|bz2|Z|lzo|cpio)' -+ _filedir '@(zip|ZIP|tar.gz|tgz|tar.bz|tbz|tar.Z|tZ|tar.lzo|tzo|tar.7z|t7z|tar|jar|JAR|war|lha|lzh|7z|arj|ARJ|a|arc|ARC|rpm|deb|gz|bz|bz2|Z|lzo|cpio)' - ;; - esac - diff --git a/libre/atool/PKGBUILD b/libre/atool/PKGBUILD new file mode 100644 index 000000000..dca366b88 --- /dev/null +++ b/libre/atool/PKGBUILD @@ -0,0 +1,52 @@ +# $Id: PKGBUILD 115146 2014-07-05 17:57:54Z jlichtblau $ +# Maintainer (Arch): Jaroslav Lichtblau +# Contributor (Arch): leif_thande +# Contributor (Arch): tranquility +# Contributor (Arch): Daniel J Griffiths +# Maintainer: Márcio Silva +# Contributor: André Silva + +pkgname=atool +pkgver=0.39.0 +pkgrel=3.parabola1 +pkgdesc="A script for managing file archives of various types, without nonfree unace and unrar support" +arch=('any') +url="http://www.nongnu.org/$pkgname/" +license=('GPL3') +depends=('file' 'perl') +replaces=("$pkgname-libre") +conflicts=("$pkgname-libre") +optdepends=("bzip2: for using $pkgname with bzip2 compressed archives" + "cpio: for using $pkgname with cpio archives" + "gzip: for using $pkgname with gzip compressed archives" + "lha: for using $pkgname with lha, lharc and similar archives" + "xz: for using $pkgname with lzma compressed archives" + "lzop: for using $pkgname with lzop compressed archives" + "p7zip: for using $pkgname with 7z archives" + "tar: for using $pkgname with tar archives" + "zip: for using $pkgname for creating zip archives" + "unzip: for using $pkgname for unpacking archives") +changelog=$pkgname.changelog +source=(http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz + libre.patch) +sha256sums=('aaf60095884abb872e25f8e919a8a63d0dabaeca46faeba87d12812d6efc703b' + 'c9aa3c72e4c979d236dd659f16cc1eb6841f0860e6ef4d2c90f021d6e5aca578') + +prepare() { + cd ${srcdir}/${pkgname}-${pkgver} + + # remove nonfree unace and unrar support + patch -Np1 -i ../libre.patch +} + +build() { + cd "${srcdir}"/${pkgname}-${pkgver} + + ./configure --prefix=/usr +} + +package() { + cd "${srcdir}"/${pkgname}-${pkgver} + + make prefix="${pkgdir}"/usr install +} diff --git a/libre/atool/atool.changelog b/libre/atool/atool.changelog new file mode 100644 index 000000000..c61925fb0 --- /dev/null +++ b/libre/atool/atool.changelog @@ -0,0 +1,21 @@ +2014-07-05 Jaroslav Lichtblau + * atool 0.39.0-3 mtree rebuild + +2012-04-19 Jaroslav Lichtblau + * atool 0.39.0-1 + +2012-02-21 Jaroslav Lichtblau + * atool 0.38.0-2 + * signing package + +2011-08-20 Jaroslav Lichtblau + * Updated to major version 0.38.0 + +2009-08-16 Jaroslav Lichtblau + * Updated to major version 0.37.0 + +2008-10-05 Jaroslav Lichtblau + * Updated to major version 0.36.0 + +2008-10-05 Jaroslav Lichtblau + * Moved to [community] repo diff --git a/libre/atool/libre.patch b/libre/atool/libre.patch new file mode 100644 index 000000000..11f3b3cb8 --- /dev/null +++ b/libre/atool/libre.patch @@ -0,0 +1,309 @@ +diff -Nur atool-0.39.0.orig/atool atool-0.39.0/atool +--- atool-0.39.0.orig/atool 2012-04-02 15:09:10.000000000 -0300 ++++ atool-0.39.0/atool 2014-05-06 04:33:46.263005816 -0300 +@@ -111,16 +111,13 @@ + $::cfg_path_pbzip2 = 'pbzip2'; # pbzip2 program + $::cfg_path_pigz = 'pigz'; # pigz program + $::cfg_path_plzip = 'plzip'; # plzip program +-$::cfg_path_rar = 'rar'; # rar program + $::cfg_path_rpm = 'rpm'; # rpm program + $::cfg_path_rpm2cpio = 'rpm2cpio'; # rpm2cpio program + $::cfg_path_rzip = 'rzip'; # rzip program + $::cfg_path_syscfg = File::Spec->catfile($::SYSCONFDIR, $::PROGRAM.'.conf'); # system-wide configuration file + $::cfg_path_tar = 'tar'; # tar program +-$::cfg_path_unace = 'unace'; # unace program + $::cfg_path_unalz = 'unalz'; # unalz program + $::cfg_path_unarj = 'unarj'; # unarj program +-$::cfg_path_unrar = 'unrar'; # unrar program + $::cfg_path_unzip = 'unzip'; # unzip program + $::cfg_path_usercfg = '.'.$::PROGRAM.'rc'; # user configuration file + $::cfg_path_xargs = 'xargs'; # xargs program +@@ -141,7 +138,6 @@ + $::cfg_use_pbzip2 = 0; # use pbzip2 instead of bzip2 + $::cfg_use_pigz = 0; # use pigz instead of gzip + $::cfg_use_plzip = 0; # use plzip instead of lzip +-$::cfg_use_rar_for_unpack = 0; # use rar to unpack rar files? + $::cfg_use_tar_bzip2_option = 1; # does tar support --bzip2? + $::cfg_use_tar_lzma_option = 1; # does tar support --lzma? + $::cfg_use_tar_lzip_option = 0; # does tar support --lzip? +@@ -592,26 +588,6 @@ + @cmd = handle_empty_add(@cmd) if ($mode eq 'add' && @args == 0); + return multiarchivecmd($archive, $outdir, $mode, 0, 0, \@args, @cmd); + } +- elsif ($format eq 'rar') { +- return undef if ($mode eq 'extract' && !defined ($outdir = makeoutdir())); +- if ($mode eq 'add' || $::cfg_use_rar_for_unpack) { +- push @cmd, $::cfg_path_rar; +- } else { +- push @cmd, $::cfg_path_unrar; +- } +- push @cmd, 'a' if $mode eq 'add'; +- push @cmd, 'vt' if $mode eq 'list' && $::opt_verbosity >= 3; +- push @cmd, 'v' if $mode eq 'list' && $::opt_verbosity == 2; +- push @cmd, 'l' if $mode eq 'list' && $::opt_verbosity <= 1; +- push @cmd, 'x' if ($mode eq 'extract' || $mode eq 'extract-to'); +- push @cmd, '-ierr', 'p' if $mode eq 'cat'; +- push @cmd, '-r0' if ($mode eq 'add'); +- push @cmd, $archive, @args; +- push @cmd, tailslash($outdir) if $mode eq 'extract'; +- push @cmd, tailslash($::opt_cmd_extract_to) if $mode eq 'extract-to'; +- @cmd = handle_empty_add(@cmd) if ($mode eq 'add' && @args == 0); +- return multiarchivecmd($archive, $outdir, $mode, 0, 0, \@args, @cmd); +- } + elsif ($format eq '7z') { + # 7z has the -so option for writing data to stdout, but it doesn't + # write data to terminal even if the file is designed to be +@@ -673,23 +649,6 @@ + @cmd = handle_empty_add(@cmd) if ($mode eq 'add' && @args == 0); + return multiarchivecmd($archive, $outdir, $mode, 0, 0, \@args, @cmd); + } +- elsif ($format eq 'ace') { +- return undef if ($mode eq 'extract' && !defined ($outdir = makeoutdir())); +- push @cmd, $::cfg_path_unace; +- if ($mode eq 'add' || $mode eq 'cat') { +- warn "$::basename: ".quote($archive).": $mode command not supported for $format archives\n"; +- return undef; +- } +- push @cmd, 'v', '-c' if $mode eq 'list' && $::opt_verbosity >= 3; +- push @cmd, 'v' if $mode eq 'list' && $::opt_verbosity == 2; +- push @cmd, 'l' if $mode eq 'list' && $::opt_verbosity <= 1; +- push @cmd, 'x' if ($mode eq 'extract' || $mode eq 'extract-to'); +- push @cmd, $archive, @args; +- push @cmd, tailslash($outdir) if $mode eq 'extract'; +- push @cmd, tailslash($::opt_cmd_extract_to) if $mode eq 'extract-to'; +- @cmd = handle_empty_add(@cmd) if ($mode eq 'add' && @args == 0); +- return multiarchivecmd($archive, $outdir, $mode, 0, 0, \@args, @cmd); +- } + elsif ($format eq 'arj') { + return undef if ($mode eq 'extract' && !defined ($outdir = makeoutdir())); + if ($mode eq 'cat') { +@@ -1321,9 +1280,7 @@ + return $file if ($file =~ s/\.jar$//); + return $file if ($file =~ s/\.war$//); + return $file if ($file =~ s/\.Z$//); +- return $file if ($file =~ s/\.rar$//); + return $file if ($file =~ s/\.(lha|lzh)$//); +- return $file if ($file =~ s/\.ace$//); + return $file if ($file =~ s/\.arj$//); + return $file if ($file =~ s/\.a$//); + return $file if ($file =~ s/\.lzma$//); +@@ -1363,8 +1320,6 @@ + return '.zip' if $format eq 'zip'; + return '.jar' if $format eq 'jar'; + return '.Z' if $format eq 'compress'; +- return '.rar' if $format eq 'rar'; +- return '.ace' if $format eq 'ace'; + return '.a' if $format eq 'ar'; + return '.arj' if $format eq 'arj'; + return '.lha' if $format eq 'lha'; +@@ -1411,7 +1366,6 @@ + ['zip', qr/ \(Zip archive data[^)]*\)$/], + ['zip', qr/^Zip archive data(\W|$)/], + ['zip', qr/^MS-DOS executable (.*), ZIP self-extracting archive(\W|$)/], +- ['rar', qr/^RAR archive data(\W|$)/], + ['lha', qr/^LHa \(2\.x\) archive data /], + ['lha', qr/^LHa 2\.x\? archive data /], + ['lha', qr/^LHarc 1\.x archive data /], +@@ -1453,7 +1407,6 @@ + ['tar+xz', qr/(\.tar\.xz|\.txz)$/], + + ['7z', qr/\.7z$/], +- ['ace', qr/\.ace$/], + ['alzip', qr/\.alz$/], + ['ar', qr/\.a$/], + ['arc', qr/\.arc$/], +@@ -1471,7 +1424,6 @@ + ['lzip', qr/\.lz$/], + ['lzma', qr/\.lzma$/], + ['lzop', qr/\.lzo$/], +- ['rar', qr/\.rar$/], + ['rpm', qr/\.rpm$/], + ['rzip', qr/\.rz$/], + ['tar', qr/\.tar$/], +@@ -1620,15 +1572,12 @@ + 'path_pbzip2' => [ 'option', \$::cfg_path_pbzip2, qr/.*/ ], + 'path_pigz' => [ 'option', \$::cfg_path_pigz, qr/.*/ ], + 'path_plzip' => [ 'option', \$::cfg_path_plzip, qr/.*/ ], +- 'path_rar' => [ 'option', \$::cfg_path_rar, qr/.*/ ], + 'path_rpm' => [ 'option', \$::cfg_path_rpm, qr/.*/ ], + 'path_rpm2cpio' => [ 'option', \$::cfg_path_rpm2cpio, qr/.*/ ], + 'path_rzip' => [ 'option', \$::cfg_path_rzip, qr/.*/ ], + 'path_tar' => [ 'option', \$::cfg_path_tar, qr/.*/ ], +- 'path_unace' => [ 'option', \$::cfg_path_unace, qr/.*/ ], + 'path_unalz' => [ 'option', \$::cfg_path_unalz, qr/.*/ ], + 'path_unarj' => [ 'option', \$::cfg_path_unarj, qr/.*/ ], +- 'path_unrar' => [ 'option', \$::cfg_path_unrar, qr/.*/ ], + 'path_unzip' => [ 'option', \$::cfg_path_unzip, qr/.*/ ], + 'path_usercfg' => [ 'option', \$::cfg_path_usercfg, qr/.*/ ], + 'path_xargs' => [ 'option', \$::cfg_path_xargs, qr/.*/ ], +@@ -1649,8 +1598,6 @@ + 'use_pbzip2' => [ 'option', \$::cfg_use_pbzip2, qr/^(0|1)$/ ], + 'use_pigz' => [ 'option', \$::cfg_use_pigz, qr/^(0|1)$/ ], + 'use_plzip' => [ 'option', \$::cfg_use_plzip, qr/^(0|1)$/ ], +- 'use_rar_for_unpack' => [ 'option', \$::cfg_use_rar_for_unpack, qr/^(0|1)$/ ], +- 'use_rar_for_unrar' => [ 'obsolete', 'use_rar_for_unpack' ], + 'use_tar_bzip2_option' => [ 'option', \$::cfg_use_tar_bzip2_option, qr/^(0|1)$/ ], + 'use_tar_lzma_option' => [ 'option', \$::cfg_use_tar_lzma_option, qr/^(0|1)$/ ], + 'use_tar_lzop_option' => [ 'option', \$::cfg_use_tar_lzop_option, qr/^(0|1)$/ ], +diff -Nur atool-0.39.0.orig/atool.1 atool-0.39.0/atool.1 +--- atool-0.39.0.orig/atool.1 2012-03-15 04:31:41.000000000 -0300 ++++ atool-0.39.0/atool.1 2014-05-06 04:34:36.830099616 -0300 +@@ -146,7 +146,7 @@ + When extracting from files, allow overwriting of local files. + When creating an archive, allow the archive file to be overwritten + if it already exists. Note that it is possible to add files to +-existing RAR and Zip archives (this is not possible for many ++existing Zip archives (this is not possible for many + other formats). + .TP + .B \-D, \-\-subdir +@@ -262,9 +262,6 @@ + List, extract, and add commands are supported. + Cat is supported if use_jar_program is disabled. + .TP +-.RI \fBrar\fP " " ( .rar ) +-All commands are supported. +-.TP + .RI \fBlha\fP " " ( .lha ", " .lzh ) + All commands are supported. + .TP +@@ -274,9 +271,6 @@ + .RI \fBalzip\fP " " ( .alz ) + Extract command is supported. + .TP +-.RI \fBace\fP " " ( .ace ) +-Extract and list commands are supported. +-.TP + .RI \fBar\fP " " ( .a ) + All commands are supported. + .TP +@@ -406,11 +400,6 @@ + Enable this if you want to use gzip instead of uncompress when + decompressing compress'ed files (`.Z' files). + .TP +-.B use_rar_for_unpack \fR(default: 0)\fR +-Enable this if you want to always use rar instead of unrar +-when possible. This makes atool use the rar command +-(path_rar) even when listing and extracting RAR files. +-.TP + .B use_arc_for_unpack \fR(default: 0)\fR + Enable this if you want to always use arc instead of nomarch + when possible. This makes atool use the arc command +@@ -530,10 +519,6 @@ + .TP + .B path_lzip \fR(default: lzip)\fR + .TP +-.B path_rar \fR(default: rar)\fR +-.TP +-.B path_unrar \fR(default: unrar)\fR +-.TP + .B path_lbzip2 \fR(default: lbzip2)\fR + .TP + .B path_pigz \fR(default: pigz)\fR +@@ -546,8 +531,6 @@ + .TP + .B path_lha \fR(default: lha)\fR + .TP +-.B path_unace \fR(default: unace)\fR +-.TP + .B path_ar \fR(default: ar)\fR + .TP + .B path_arj \fR(default: arj)\fR +@@ -661,10 +644,6 @@ + .br + \fBacat \-p myarchive.zip baz\fP + .PP +-To list contents of the rar archive `stuff.rar': +-.br +- \fBals stuff.rar\fP +-.PP + To create three archives, `dir1.tar.gz', `dir2.tar.gz' and `dir3.tar.gz', + so that the first one contains all files in dir1, the second all + in dir2 and the third all dir3: +diff -Nur atool-0.39.0.orig/atool.1.in atool-0.39.0/atool.1.in +--- atool-0.39.0.orig/atool.1.in 2012-03-15 04:31:39.000000000 -0300 ++++ atool-0.39.0/atool.1.in 2014-05-06 04:35:30.100547318 -0300 +@@ -146,7 +146,7 @@ + When extracting from files, allow overwriting of local files. + When creating an archive, allow the archive file to be overwritten + if it already exists. Note that it is possible to add files to +-existing RAR and Zip archives (this is not possible for many ++existing Zip archives (this is not possible for many + other formats). + .TP + .B \-D, \-\-subdir +@@ -262,9 +262,6 @@ + List, extract, and add commands are supported. + Cat is supported if use_jar_program is disabled. + .TP +-.RI \fBrar\fP " " ( .rar ) +-All commands are supported. +-.TP + .RI \fBlha\fP " " ( .lha ", " .lzh ) + All commands are supported. + .TP +@@ -274,9 +271,6 @@ + .RI \fBalzip\fP " " ( .alz ) + Extract command is supported. + .TP +-.RI \fBace\fP " " ( .ace ) +-Extract and list commands are supported. +-.TP + .RI \fBar\fP " " ( .a ) + All commands are supported. + .TP +@@ -406,11 +400,6 @@ + Enable this if you want to use gzip instead of uncompress when + decompressing compress'ed files (`.Z' files). + .TP +-.B use_rar_for_unpack \fR(default: 0)\fR +-Enable this if you want to always use rar instead of unrar +-when possible. This makes atool use the rar command +-(path_rar) even when listing and extracting RAR files. +-.TP + .B use_arc_for_unpack \fR(default: 0)\fR + Enable this if you want to always use arc instead of nomarch + when possible. This makes atool use the arc command +@@ -530,10 +519,6 @@ + .TP + .B path_lzip \fR(default: lzip)\fR + .TP +-.B path_rar \fR(default: rar)\fR +-.TP +-.B path_unrar \fR(default: unrar)\fR +-.TP + .B path_lbzip2 \fR(default: lbzip2)\fR + .TP + .B path_pigz \fR(default: pigz)\fR +@@ -546,8 +531,6 @@ + .TP + .B path_lha \fR(default: lha)\fR + .TP +-.B path_unace \fR(default: unace)\fR +-.TP + .B path_ar \fR(default: ar)\fR + .TP + .B path_arj \fR(default: arj)\fR +@@ -661,10 +644,6 @@ + .br + \fBacat \-p myarchive.zip baz\fP + .PP +-To list contents of the rar archive `stuff.rar': +-.br +- \fBals stuff.rar\fP +-.PP + To create three archives, `dir1.tar.gz', `dir2.tar.gz' and `dir3.tar.gz', + so that the first one contains all files in dir1, the second all + in dir2 and the third all dir3: +diff -Nur atool-0.39.0.orig/extra/bash-completion-atool_0.1-1 atool-0.39.0/extra/bash-completion-atool_0.1-1 +--- atool-0.39.0.orig/extra/bash-completion-atool_0.1-1 2007-12-10 20:01:38.000000000 -0200 ++++ atool-0.39.0/extra/bash-completion-atool_0.1-1 2014-05-06 04:36:01.504143499 -0300 +@@ -15,7 +15,7 @@ + --quiet --verbose --page --null --explain --simulate --config=' -- $cur ) ) + ;; + *) +- _filedir '@(rar|RAR|zip|ZIP|tar.gz|tgz|tar.bz|tbz|tar.Z|tZ|tar.lzo|tzo|tar.7z|t7z|tar|jar|JAR|war|lha|lzh|7z|ace|ACE|arj|ARJ|a|arc|ARC|rpm|deb|gz|bz|bz2|Z|lzo|cpio)' ++ _filedir '@(zip|ZIP|tar.gz|tgz|tar.bz|tbz|tar.Z|tZ|tar.lzo|tzo|tar.7z|t7z|tar|jar|JAR|war|lha|lzh|7z|arj|ARJ|a|arc|ARC|rpm|deb|gz|bz|bz2|Z|lzo|cpio)' + ;; + esac + -- cgit v1.1-4-g5e80 From c2775ae80fc3122d1284308fa3fa5ac5822f3e5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?coadde=20=5BM=C3=A1rcio=20Alexandre=20Silva=20Delgado=5D?= Date: Wed, 3 Sep 2014 18:59:15 -0300 Subject: fixing pkgrel on abuse --- libre/abuse/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libre/abuse/PKGBUILD b/libre/abuse/PKGBUILD index 06e24605c..c91b24f76 100644 --- a/libre/abuse/PKGBUILD +++ b/libre/abuse/PKGBUILD @@ -9,7 +9,7 @@ pkgname=abuse _pkgname=$pkgname-libre pkgver=0.8 -pkgrel=4 +pkgrel=4.parabola1 pkgdesc='Side-scroller action game that pits you against ruthless alien killers, without nonfree claudio support' arch=('x86_64' 'i686' 'mips64el') url="http://$pkgname.zoy.org/" -- cgit v1.1-4-g5e80 From 6fbbd0ff4c469ca66b42ba8ddea50d24e08a0610 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?coadde=20=5BM=C3=A1rcio=20Alexandre=20Silva=20Delgado=5D?= Date: Wed, 3 Sep 2014 18:59:54 -0300 Subject: fixing pkgrel on angband --- libre/angband/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libre/angband/PKGBUILD b/libre/angband/PKGBUILD index 8177e815c..85fcdb2db 100644 --- a/libre/angband/PKGBUILD +++ b/libre/angband/PKGBUILD @@ -12,7 +12,7 @@ pkgname=angband _pkgname=$pkgname-libre pkgver=3.5.0 -pkgrel=2 +pkgrel=2.parabola1 pkgdesc="A roguelike dungeon exploration game based on the writings of JRR Tolkien, without nonfree artwork and sound effects" arch=('i686' 'x86_64' 'mips64el') url="http://rephial.org/" -- cgit v1.1-4-g5e80 From 369dde3f21cde189d173c347d92276dad2a8bab4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?coadde=20=5BM=C3=A1rcio=20Alexandre=20Silva=20Delgado=5D?= Date: Wed, 3 Sep 2014 19:04:59 -0300 Subject: rename to atril --- libre/atril-libre/PKGBUILD | 62 -------------------------- libre/atril-libre/atril.install | 13 ------ libre/atril-libre/libarchive.patch | 91 -------------------------------------- libre/atril/PKGBUILD | 62 ++++++++++++++++++++++++++ libre/atril/atril.install | 13 ++++++ libre/atril/libarchive.patch | 91 ++++++++++++++++++++++++++++++++++++++ 6 files changed, 166 insertions(+), 166 deletions(-) delete mode 100644 libre/atril-libre/PKGBUILD delete mode 100644 libre/atril-libre/atril.install delete mode 100644 libre/atril-libre/libarchive.patch create mode 100644 libre/atril/PKGBUILD create mode 100644 libre/atril/atril.install create mode 100644 libre/atril/libarchive.patch diff --git a/libre/atril-libre/PKGBUILD b/libre/atril-libre/PKGBUILD deleted file mode 100644 index a082a1bce..000000000 --- a/libre/atril-libre/PKGBUILD +++ /dev/null @@ -1,62 +0,0 @@ -# $Id: PKGBUILD 106531 2014-03-05 20:16:04Z flexiondotorg $ -# Maintainer (Arch): Martin Wimpress -# Maintainer: André Silva - -_pkgname=atril -pkgname=atril-libre -pkgver=1.8.0 -pkgrel=1.1 -pkgdesc="Simply a document viewer, with libarchive support" -url="http://mate-desktop.org" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -depends=('dconf' 'dbus' 'desktop-file-utils' 'gtk2' 'libsm' 'libspectre' - 'mate-desktop' 'mate-icon-theme' 'poppler-glib' 'zlib') -makedepends=('caja' 'djvulibre' 'gobject-introspection' 'libgxps' 'mate-common' - 'perl-xml-parser' 'texlive-bin' 'yelp-tools') -optdepends=('caja: Document Properties extension' - 'djvulibre: DjVu support' - 'libgxps: XPS support' - 'p7zip: cbz and cb7 compressed comic books' - 'texlive-bin: DVI support' - 'libarchive: cbr compressed comic books' - 'yelp: for reading MATE help documents') -replaces=('mate-document-viewer' "$_pkgname") -provides=('mate-document-viewer' "$_pkgname=$pkgver") -conflicts=('mate-document-viewer' "$_pkgname") -options=('!emptydirs') -groups=('mate-extra') -source=("http://pub.mate-desktop.org/releases/1.8/${_pkgname}-${pkgver}.tar.xz" - 'libarchive.patch') -sha1sums=('8327437ba12df61326b83342cea746d1764727d0' - 'e88168d61b18ce8e340ef3db9c6df6bb66c65d14') -install=${_pkgname}.install - -prepare() { - cd "${srcdir}/${_pkgname}-${pkgver}" - NOCONFIGURE=1 ./autogen.sh - patch -Np1 -i ../libarchive.patch -} - -build() { - cd "${srcdir}/${_pkgname}-${pkgver}" - ./configure \ - --prefix=/usr \ - --libexecdir=/usr/lib/${_pkgname} \ - --with-gtk=2.0 \ - --enable-gtk-doc \ - --enable-djvu \ - --enable-dvi \ - --enable-t1lib \ - --enable-pixbuf \ - --enable-comics \ - --enable-xps \ - --enable-introspection \ - --disable-static - make -} - -package() { - cd "${srcdir}/${_pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/libre/atril-libre/atril.install b/libre/atril-libre/atril.install deleted file mode 100644 index bf6781f93..000000000 --- a/libre/atril-libre/atril.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - glib-compile-schemas /usr/share/glib-2.0/schemas/ - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/libre/atril-libre/libarchive.patch b/libre/atril-libre/libarchive.patch deleted file mode 100644 index f86908267..000000000 --- a/libre/atril-libre/libarchive.patch +++ /dev/null @@ -1,91 +0,0 @@ -diff --git a/backend/comics/comics-document.c b/backend/comics/comics-document.c -index a135a74..380cb54 100644 ---- a/backend/comics/comics-document.c -+++ b/backend/comics/comics-document.c -@@ -54,8 +54,7 @@ - - typedef enum - { -- RARLABS, -- GNAUNRAR, -+ LIBARCHIVE, - UNZIP, - P7ZIP, - TAR -@@ -107,11 +106,8 @@ typedef struct { - } ComicBookDecompressCommand; - - static const ComicBookDecompressCommand command_usage_def[] = { -- /* RARLABS unrar */ -- {"%s p -c- -ierr --", "%s vb -c- -- %s", NULL , FALSE, NO_OFFSET}, -- -- /* GNA! unrar */ -- {NULL , "%s t %s" , "%s -xf %s %s" , FALSE, NO_OFFSET}, -+ /* libarchive */ -+ {NULL , "%s tf %s" , "%s xf %s %s" , FALSE, NO_OFFSET}, - - /* unzip */ - {"%s -p -C --" , "%s %s" , NULL , TRUE , OFFSET_ZIP}, -@@ -282,7 +278,7 @@ comics_generate_command_lines (ComicsDocument *comics_document, - if (comics_document->dir == NULL) - return FALSE; - -- /* unrar-free can't create directories, but ev_mkdtemp already created the dir */ -+ /* libarchive can't create directories on rar support, but ev_mkdtemp already created the dir */ - - comics_document->decompress_tmp = - g_strdup_printf (command_usage_def[type].decompress_tmp, -@@ -321,51 +317,10 @@ comics_check_decompress_command (gchar *mime_type, - - if (!strcmp (mime_type, "application/x-cbr") || - !strcmp (mime_type, "application/x-rar")) { -- /* The RARLAB provides a no-charge proprietary (freeware) -- * decompress-only client for Linux called unrar. Another -- * option is a GPLv2-licensed command-line tool developed by -- * the Gna! project. Confusingly enough, the free software RAR -- * decoder is also named unrar. For this reason we need to add -- * some lines for disambiguation. Sorry for the added the -- * complexity but it's life :) -- * Finally, some distributions, like Debian, rename this free -- * option as unrar-free. -- * */ -- comics_document->selected_command = -- g_find_program_in_path ("unrar"); -- if (comics_document->selected_command) { -- /* We only use std_err to avoid printing useless error -- * messages on the terminal */ -- success = -- g_spawn_command_line_sync ( -- comics_document->selected_command, -- &std_out, &std_err, -- &retval, &err); -- if (!success) { -- g_propagate_error (error, err); -- g_error_free (err); -- return FALSE; -- /* I don't check retval status because RARLAB unrar -- * doesn't have a way to return 0 without involving an -- * operation with a file*/ -- } else if (WIFEXITED (retval)) { -- if (g_strrstr (std_out,"freeware") != NULL) -- /* The RARLAB freeware client */ -- comics_document->command_usage = RARLABS; -- else -- /* The Gna! free software client */ -- comics_document->command_usage = GNAUNRAR; -- -- g_free (std_out); -- g_free (std_err); -- return TRUE; -- } -- } -- /* The Gna! free software client with Debian naming convention */ - comics_document->selected_command = -- g_find_program_in_path ("unrar-free"); -+ g_find_program_in_path ("bsdtar"); - if (comics_document->selected_command) { -- comics_document->command_usage = GNAUNRAR; -+ comics_document->command_usage = LIBARCHIVE; - return TRUE; - } - diff --git a/libre/atril/PKGBUILD b/libre/atril/PKGBUILD new file mode 100644 index 000000000..fba4d0775 --- /dev/null +++ b/libre/atril/PKGBUILD @@ -0,0 +1,62 @@ +# $Id: PKGBUILD 106531 2014-03-05 20:16:04Z flexiondotorg $ +# Maintainer (Arch): Martin Wimpress +# Maintainer: André Silva + +pkgname=atril +_pkgname=$pkgname-libre +pkgver=1.8.0 +pkgrel=1.1.parabola1 +pkgdesc="Simply a document viewer, with libarchive support" +url="http://mate-desktop.org" +arch=('i686' 'x86_64' 'mips64el') +license=('GPL') +depends=('dconf' 'dbus' 'desktop-file-utils' 'gtk2' 'libsm' 'libspectre' + 'mate-desktop' 'mate-icon-theme' 'poppler-glib' 'zlib') +makedepends=('caja' 'djvulibre' 'gobject-introspection' 'libgxps' 'mate-common' + 'perl-xml-parser' 'texlive-bin' 'yelp-tools') +optdepends=('caja: Document Properties extension' + 'djvulibre: DjVu support' + 'libgxps: XPS support' + 'p7zip: cbz and cb7 compressed comic books' + 'texlive-bin: DVI support' + 'libarchive: cbr compressed comic books' + 'yelp: for reading MATE help documents') +replaces=('mate-document-viewer' "$_pkgname") +provides=('mate-document-viewer') +conflicts=('mate-document-viewer' "$_pkgname") +options=('!emptydirs') +groups=('mate-extra') +source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz" + 'libarchive.patch') +sha1sums=('8327437ba12df61326b83342cea746d1764727d0' + 'e88168d61b18ce8e340ef3db9c6df6bb66c65d14') +install=${pkgname}.install + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + NOCONFIGURE=1 ./autogen.sh + patch -Np1 -i ../libarchive.patch +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib/${pkgname} \ + --with-gtk=2.0 \ + --enable-gtk-doc \ + --enable-djvu \ + --enable-dvi \ + --enable-t1lib \ + --enable-pixbuf \ + --enable-comics \ + --enable-xps \ + --enable-introspection \ + --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/libre/atril/atril.install b/libre/atril/atril.install new file mode 100644 index 000000000..bf6781f93 --- /dev/null +++ b/libre/atril/atril.install @@ -0,0 +1,13 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas/ + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/libre/atril/libarchive.patch b/libre/atril/libarchive.patch new file mode 100644 index 000000000..f86908267 --- /dev/null +++ b/libre/atril/libarchive.patch @@ -0,0 +1,91 @@ +diff --git a/backend/comics/comics-document.c b/backend/comics/comics-document.c +index a135a74..380cb54 100644 +--- a/backend/comics/comics-document.c ++++ b/backend/comics/comics-document.c +@@ -54,8 +54,7 @@ + + typedef enum + { +- RARLABS, +- GNAUNRAR, ++ LIBARCHIVE, + UNZIP, + P7ZIP, + TAR +@@ -107,11 +106,8 @@ typedef struct { + } ComicBookDecompressCommand; + + static const ComicBookDecompressCommand command_usage_def[] = { +- /* RARLABS unrar */ +- {"%s p -c- -ierr --", "%s vb -c- -- %s", NULL , FALSE, NO_OFFSET}, +- +- /* GNA! unrar */ +- {NULL , "%s t %s" , "%s -xf %s %s" , FALSE, NO_OFFSET}, ++ /* libarchive */ ++ {NULL , "%s tf %s" , "%s xf %s %s" , FALSE, NO_OFFSET}, + + /* unzip */ + {"%s -p -C --" , "%s %s" , NULL , TRUE , OFFSET_ZIP}, +@@ -282,7 +278,7 @@ comics_generate_command_lines (ComicsDocument *comics_document, + if (comics_document->dir == NULL) + return FALSE; + +- /* unrar-free can't create directories, but ev_mkdtemp already created the dir */ ++ /* libarchive can't create directories on rar support, but ev_mkdtemp already created the dir */ + + comics_document->decompress_tmp = + g_strdup_printf (command_usage_def[type].decompress_tmp, +@@ -321,51 +317,10 @@ comics_check_decompress_command (gchar *mime_type, + + if (!strcmp (mime_type, "application/x-cbr") || + !strcmp (mime_type, "application/x-rar")) { +- /* The RARLAB provides a no-charge proprietary (freeware) +- * decompress-only client for Linux called unrar. Another +- * option is a GPLv2-licensed command-line tool developed by +- * the Gna! project. Confusingly enough, the free software RAR +- * decoder is also named unrar. For this reason we need to add +- * some lines for disambiguation. Sorry for the added the +- * complexity but it's life :) +- * Finally, some distributions, like Debian, rename this free +- * option as unrar-free. +- * */ +- comics_document->selected_command = +- g_find_program_in_path ("unrar"); +- if (comics_document->selected_command) { +- /* We only use std_err to avoid printing useless error +- * messages on the terminal */ +- success = +- g_spawn_command_line_sync ( +- comics_document->selected_command, +- &std_out, &std_err, +- &retval, &err); +- if (!success) { +- g_propagate_error (error, err); +- g_error_free (err); +- return FALSE; +- /* I don't check retval status because RARLAB unrar +- * doesn't have a way to return 0 without involving an +- * operation with a file*/ +- } else if (WIFEXITED (retval)) { +- if (g_strrstr (std_out,"freeware") != NULL) +- /* The RARLAB freeware client */ +- comics_document->command_usage = RARLABS; +- else +- /* The Gna! free software client */ +- comics_document->command_usage = GNAUNRAR; +- +- g_free (std_out); +- g_free (std_err); +- return TRUE; +- } +- } +- /* The Gna! free software client with Debian naming convention */ + comics_document->selected_command = +- g_find_program_in_path ("unrar-free"); ++ g_find_program_in_path ("bsdtar"); + if (comics_document->selected_command) { +- comics_document->command_usage = GNAUNRAR; ++ comics_document->command_usage = LIBARCHIVE; + return TRUE; + } + -- cgit v1.1-4-g5e80 From 4ae7bcc01726f4da6d3a7d34ca37813ecd9ca209 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?coadde=20=5BM=C3=A1rcio=20Alexandre=20Silva=20Delgado=5D?= Date: Wed, 3 Sep 2014 19:08:01 -0300 Subject: rename to audacious-plugins --- libre/audacious-plugins-libre/PKGBUILD | 127 --------------------------------- libre/audacious-plugins/PKGBUILD | 125 ++++++++++++++++++++++++++++++++ 2 files changed, 125 insertions(+), 127 deletions(-) delete mode 100644 libre/audacious-plugins-libre/PKGBUILD create mode 100644 libre/audacious-plugins/PKGBUILD diff --git a/libre/audacious-plugins-libre/PKGBUILD b/libre/audacious-plugins-libre/PKGBUILD deleted file mode 100644 index 323eee1c4..000000000 --- a/libre/audacious-plugins-libre/PKGBUILD +++ /dev/null @@ -1,127 +0,0 @@ -# $Id: PKGBUILD 217506 2014-07-20 21:57:27Z bisson $ -# Maintainer (Arch): Gaetan Bisson -# Contributor (Arch): Alexander Fehr -# Contributor (Arch): William Rea -# Maintainer (Arch): Gaetan Bisson -# Maintainer: Brendan Tildesley -# Contributor: Jorge Lopez - -_pkgname=audacious-plugins -pkgname=audacious-plugins-libre -pkgver=3.5.1 -pkgrel=1 -pkgdesc='Plugins for Audacious, without nonfree plugins' -url='http://audacious-media-player.org/' -license=('GPL' 'GPL3' 'LGPL' 'custom:BSD') -arch=('i686' 'x86_64' 'mips64el') - -# Licensing issues: -# The plugins 'scrobbler', stereoplugin', 'wavepack' and 'plugin_echo' have no license notice -# but I've been informed by an upstream dev, nenolod, that they are all GPL. I don't know what version -# -# The plugin 'psf' is under BSD license, mostly, but it uses code from PeOPS, so it's probably GPL. -# However, 'psf' is apparently an emulator for running nonfree code, so I'm not rushing to fix it. -# -# All the other custom licensed plugins I think are mostly modified BSD or ISC. - -replaces=($_pkgname) -conflicts=($_pkgname) -provides=($_pkgname=$pkgver) - -makedepends=("audacious>=${pkgver}" - 'glib2' 'python2' # for gdbus-codegen - 'alsa-lib' 'pulseaudio' 'jack2' 'lame' 'libvorbis' 'flac' - 'mpg123' 'faad2' 'ffmpeg' 'libmodplug' 'fluidsynth' 'libcdio-paranoia' 'libsidplayfp' 'wavpack' - 'dbus-glib' 'libnotify' 'lirc-utils' 'curl' 'libmtp' - 'neon' 'libmms' 'libcue') - -optdepends=('alsa-lib: Advanced Linux Sound Arch. output' - 'pulseaudio: PulseAudio output' - 'jack2: Jack Audio Connection Kit output' - 'lame: FileWriter MP3 output' - 'libvorbis: Vorbis input, FileWriter Vorbis output' - 'flac: FLAC input, FileWriter FLAC output' - - 'mpg123: MP3 input' - 'faad2: AAC input' - 'ffmpeg: ffaudio input' - 'libmodplug: modplug input' - 'fluidsynth: MIDI FluidSynth backend input' - 'libcdio-paranoia: CD Digital Audio input' - 'libsidplayfp: Commodore 64 audio input' - 'wavpack: WavPack input' - - 'dbus-glib: Gnome Shortcuts Plugin' - 'libnotify: libnotify OSD' - 'lirc-utils: LIRC' - 'curl: AudioScrobbler Client' - 'libmtp: Upload to MTP device' - - 'neon: neon-based http transport' - 'libmms: libmms-based mms transport' - 'libcue: CUE playlist format') - -source=("http://distfiles.audacious-media-player.org/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('c066f79ca1f213c998b651250d02a84982556946') - -prepare() { - cd "${srcdir}/${_pkgname}-${pkgver}" - - # Retrieve upstream & remove plugin 'psf' due to issues mentioned above. - rm -rv src/psf - sed -i s/enable_psf=yes/enable_psf=no/ configure - - # Get license notices out of custom-licensed packages - cd src - tmpdir=$(mktemp -d /tmp/${_pkgname}-${pkgver}-XXXX) - head -n 18 albumart/albumart.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.albumart - head -n 17 alsa/alsa.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.alsa - head -n 17 audpl/audpl.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.audpl - head -n 18 cairo-spectrum/cairo-spectrum.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.cairo-spectrum - head -n 17 compressor/compressor.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.compressor - head -n 17 crossfade/crossfade.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.crossfade - head -n 18 crystalizer/crystalizer.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.crystalizer - head -n 18 lyricwiki/lyricwiki.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.lyricwiki - head -n 19 mpg123/mpg123.c | cut -c 4- | tail -n 18 > ${tmpdir}/LICENSE.mpg123 - head -n 17 mpris2/plugin.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.mpris2 - head -n 17 resample/resample.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.resample - head -n 17 unix-io/unix-io.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.unix-io - head -n 18 voice_removal/voice_removal.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.voice_removal - head -n 25 xsf/corlett.c | cut -c 2- | tail -n 23 > ${tmpdir}/LICENSE.xfs - l=${pkgdir}/usr/share/licenses/${pkgname}/ - install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname} - cd .. - pushd $tmpdir - install -m644 LICENSE.albumart $l - install -m644 LICENSE.alsa $l - install -m644 LICENSE.audpl $l - install -m644 LICENSE.cairo-spectrum $l - install -m644 LICENSE.compressor $l - install -m644 LICENSE.crossfade $l - install -m644 LICENSE.crystalizer $l - install -m644 LICENSE.lyricwiki $l - install -m644 LICENSE.mpg123 $l - install -m644 LICENSE.mpris2 $l - install -m644 LICENSE.resample $l - install -m644 LICENSE.unix-io $l - install -m644 LICENSE.voice_removal $l - install -m644 LICENSE.xfs $l - popd -} - -build() { - cd "${srcdir}/${_pkgname}-${pkgver}" - - ./configure \ - --prefix=/usr \ - --enable-amidiplug \ - --disable-adplug \ - - make -} - -package() { - cd "${srcdir}/${_pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/libre/audacious-plugins/PKGBUILD b/libre/audacious-plugins/PKGBUILD new file mode 100644 index 000000000..ac2bdacea --- /dev/null +++ b/libre/audacious-plugins/PKGBUILD @@ -0,0 +1,125 @@ +# $Id: PKGBUILD 217506 2014-07-20 21:57:27Z bisson $ +# Maintainer (Arch): Gaetan Bisson +# Contributor (Arch): Alexander Fehr +# Contributor (Arch): William Rea +# Maintainer (Arch): Gaetan Bisson +# Maintainer: Brendan Tildesley +# Contributor: Jorge Lopez + +pkgname=audacious-plugins +pkgver=3.5.1 +pkgrel=1.parabola1 +pkgdesc='Plugins for Audacious, without nonfree plugins' +url='http://audacious-media-player.org/' +license=('GPL' 'GPL3' 'LGPL' 'custom:BSD') +arch=('i686' 'x86_64' 'mips64el') + +# Licensing issues: +# The plugins 'scrobbler', stereoplugin', 'wavepack' and 'plugin_echo' have no license notice +# but I've been informed by an upstream dev, nenolod, that they are all GPL. I don't know what version +# +# The plugin 'psf' is under BSD license, mostly, but it uses code from PeOPS, so it's probably GPL. +# However, 'psf' is apparently an emulator for running nonfree code, so I'm not rushing to fix it. +# +# All the other custom licensed plugins I think are mostly modified BSD or ISC. + +replaces=($pkgname-libre) +conflicts=($pkgname-libre) + +makedepends=("audacious>=${pkgver}" + 'glib2' 'python2' # for gdbus-codegen + 'alsa-lib' 'pulseaudio' 'jack2' 'lame' 'libvorbis' 'flac' + 'mpg123' 'faad2' 'ffmpeg' 'libmodplug' 'fluidsynth' 'libcdio-paranoia' 'libsidplayfp' 'wavpack' + 'dbus-glib' 'libnotify' 'lirc-utils' 'curl' 'libmtp' + 'neon' 'libmms' 'libcue') + +optdepends=('alsa-lib: Advanced Linux Sound Arch. output' + 'pulseaudio: PulseAudio output' + 'jack2: Jack Audio Connection Kit output' + 'lame: FileWriter MP3 output' + 'libvorbis: Vorbis input, FileWriter Vorbis output' + 'flac: FLAC input, FileWriter FLAC output' + + 'mpg123: MP3 input' + 'faad2: AAC input' + 'ffmpeg: ffaudio input' + 'libmodplug: modplug input' + 'fluidsynth: MIDI FluidSynth backend input' + 'libcdio-paranoia: CD Digital Audio input' + 'libsidplayfp: Commodore 64 audio input' + 'wavpack: WavPack input' + + 'dbus-glib: Gnome Shortcuts Plugin' + 'libnotify: libnotify OSD' + 'lirc-utils: LIRC' + 'curl: AudioScrobbler Client' + 'libmtp: Upload to MTP device' + + 'neon: neon-based http transport' + 'libmms: libmms-based mms transport' + 'libcue: CUE playlist format') + +source=("http://distfiles.audacious-media-player.org/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('c066f79ca1f213c998b651250d02a84982556946') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # Retrieve upstream & remove plugin 'psf' due to issues mentioned above. + rm -rv src/psf + sed -i s/enable_psf=yes/enable_psf=no/ configure + + # Get license notices out of custom-licensed packages + cd src + tmpdir=$(mktemp -d /tmp/${pkgname}-${pkgver}-XXXX) + head -n 18 albumart/albumart.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.albumart + head -n 17 alsa/alsa.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.alsa + head -n 17 audpl/audpl.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.audpl + head -n 18 cairo-spectrum/cairo-spectrum.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.cairo-spectrum + head -n 17 compressor/compressor.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.compressor + head -n 17 crossfade/crossfade.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.crossfade + head -n 18 crystalizer/crystalizer.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.crystalizer + head -n 18 lyricwiki/lyricwiki.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.lyricwiki + head -n 19 mpg123/mpg123.c | cut -c 4- | tail -n 18 > ${tmpdir}/LICENSE.mpg123 + head -n 17 mpris2/plugin.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.mpris2 + head -n 17 resample/resample.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.resample + head -n 17 unix-io/unix-io.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.unix-io + head -n 18 voice_removal/voice_removal.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.voice_removal + head -n 25 xsf/corlett.c | cut -c 2- | tail -n 23 > ${tmpdir}/LICENSE.xfs + l=${pkgdir}/usr/share/licenses/${pkgname}/ + install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname} + cd .. + pushd $tmpdir + install -m644 LICENSE.albumart $l + install -m644 LICENSE.alsa $l + install -m644 LICENSE.audpl $l + install -m644 LICENSE.cairo-spectrum $l + install -m644 LICENSE.compressor $l + install -m644 LICENSE.crossfade $l + install -m644 LICENSE.crystalizer $l + install -m644 LICENSE.lyricwiki $l + install -m644 LICENSE.mpg123 $l + install -m644 LICENSE.mpris2 $l + install -m644 LICENSE.resample $l + install -m644 LICENSE.unix-io $l + install -m644 LICENSE.voice_removal $l + install -m644 LICENSE.xfs $l + popd +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure \ + --prefix=/usr \ + --enable-amidiplug \ + --disable-adplug \ + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} -- cgit v1.1-4-g5e80 From 4598d752a74937355fce8241d39470541ae39cd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?coadde=20=5BM=C3=A1rcio=20Alexandre=20Silva=20Delgado=5D?= Date: Wed, 3 Sep 2014 19:10:11 -0300 Subject: atril: remove _pkgname --- libre/atril/PKGBUILD | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libre/atril/PKGBUILD b/libre/atril/PKGBUILD index fba4d0775..b67182f09 100644 --- a/libre/atril/PKGBUILD +++ b/libre/atril/PKGBUILD @@ -3,7 +3,6 @@ # Maintainer: André Silva pkgname=atril -_pkgname=$pkgname-libre pkgver=1.8.0 pkgrel=1.1.parabola1 pkgdesc="Simply a document viewer, with libarchive support" @@ -21,9 +20,9 @@ optdepends=('caja: Document Properties extension' 'texlive-bin: DVI support' 'libarchive: cbr compressed comic books' 'yelp: for reading MATE help documents') -replaces=('mate-document-viewer' "$_pkgname") +replaces=('mate-document-viewer' "$pkgname-libre") provides=('mate-document-viewer') -conflicts=('mate-document-viewer' "$_pkgname") +conflicts=('mate-document-viewer' "$pkgname-libre") options=('!emptydirs') groups=('mate-extra') source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz" -- cgit v1.1-4-g5e80 From 07625166ab46f6fe5dc88d27ec77987fdd7be9dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?coadde=20=5BM=C3=A1rcio=20Alexandre=20Silva=20Delgado=5D?= Date: Wed, 3 Sep 2014 19:14:22 -0300 Subject: rename to blackbox --- libre/blackbox-libre/PKGBUILD | 49 --------- libre/blackbox-libre/bbdock.patch | 16 --- libre/blackbox-libre/bsetbg-feh.patch | 23 ----- libre/blackbox-libre/gcc4.3.patch | 111 -------------------- libre/blackbox-libre/menu | 112 --------------------- .../textpropertytostring-unconditional.patch | 28 ------ libre/blackbox/PKGBUILD | 47 +++++++++ libre/blackbox/bbdock.patch | 16 +++ libre/blackbox/bsetbg-feh.patch | 23 +++++ libre/blackbox/gcc4.3.patch | 111 ++++++++++++++++++++ libre/blackbox/menu | 112 +++++++++++++++++++++ .../textpropertytostring-unconditional.patch | 28 ++++++ 12 files changed, 337 insertions(+), 339 deletions(-) delete mode 100644 libre/blackbox-libre/PKGBUILD delete mode 100644 libre/blackbox-libre/bbdock.patch delete mode 100644 libre/blackbox-libre/bsetbg-feh.patch delete mode 100644 libre/blackbox-libre/gcc4.3.patch delete mode 100644 libre/blackbox-libre/menu delete mode 100644 libre/blackbox-libre/textpropertytostring-unconditional.patch create mode 100644 libre/blackbox/PKGBUILD create mode 100644 libre/blackbox/bbdock.patch create mode 100644 libre/blackbox/bsetbg-feh.patch create mode 100644 libre/blackbox/gcc4.3.patch create mode 100644 libre/blackbox/menu create mode 100644 libre/blackbox/textpropertytostring-unconditional.patch diff --git a/libre/blackbox-libre/PKGBUILD b/libre/blackbox-libre/PKGBUILD deleted file mode 100644 index 94f07ee2e..000000000 --- a/libre/blackbox-libre/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# $Id: PKGBUILD 100133 2013-11-01 20:20:45Z spupykin $ -# Maintainer (Arch): Sergej Pupykin -# Contributor (Arch): durbatuluk -# Contributor (Arch): Steve Ponsford -# Maintainer: Márcio Silva - -_pkgname=blackbox -pkgname=${_pkgname}-libre -pkgver=0.70.1 -pkgrel=11 -pkgdesc="A window manager for X11, without nonfree programs on the menu" -url="http://blackboxwm.sourceforge.net/" -arch=('i686' 'x86_64' 'mips64el') -depends=('gcc-libs' 'libxft' 'libxext' 'libx11' 'libxt') -replaces=($_pkgname) -conflicts=($_pkgname) -provides=($_pkgname=$pkgver) -license=('MIT') -source=(http://downloads.sourceforge.net/blackboxwm/$_pkgname-$pkgver.tar.gz - gcc4.3.patch - bbdock.patch - bsetbg-feh.patch - textpropertytostring-unconditional.patch - menu) -md5sums=('2d173b95ca5e64ef478c6a5d2deee9df' - 'bc7a1335d77cdeb6f85cba4d01e68e63' - '69c5a5e981b087b2d8267cab996b48dd' - 'e7fb0d5bfd95820c0194ec73df66dadc' - '3b92ad246f07126dd55ae9634d6e875e' - 'f4fefa5f25c65c5d9a601e9c14646757') - -build() { - cd $srcdir/$_pkgname-$pkgver - - patch -Np1 -i ../gcc4.3.patch - patch -Np0 -i ../bbdock.patch - patch -Np0 -i ../bsetbg-feh.patch - patch -Np1 -i ../textpropertytostring-unconditional.patch - - ./configure --prefix=/usr --mandir=/usr/share/man - make -} - -package() { - cd $srcdir/$_pkgname-$pkgver - make DESTDIR=$pkgdir install - install -D -m644 LICENSE $pkgdir/usr/share/licenses/$_pkgname/LICENSE - install -D -m644 $srcdir/menu $pkgdir/usr/share/$_pkgname/menu -} diff --git a/libre/blackbox-libre/bbdock.patch b/libre/blackbox-libre/bbdock.patch deleted file mode 100644 index 709b6cfe1..000000000 --- a/libre/blackbox-libre/bbdock.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- src/Slit.cc 2005-01-04 05:58:33.000000000 -0700 -+++ /root/tmp/Slit.cc 2007-12-29 11:13:09.000000000 -0700 -@@ -248,6 +248,13 @@ - bt::PixmapCache::find(screen->screenNumber(), texture, - frame.rect.width(), frame.rect.height(), - frame.pixmap); -+/*** START: BBDOCK PATCH FOR DOCK APPS THAT USE ParentRelative **************/ -+ if ((texture.texture() & bt::Texture::Gradient) && frame.pixmap) -+ XSetWindowBackgroundPixmap(display, frame.window, frame.pixmap); -+ else if ((texture.texture() & bt::Texture::Solid)) -+ XSetWindowBackground(display, frame.window, -+ texture.color1().pixel(screen->screenNumber())); -+/*** STOP: BBDOCK PATCH FOR DOCK APPS THAT USE ParentRelative ***************/ - XClearArea(display, frame.window, 0, 0, - frame.rect.width(), frame.rect.height(), True); - diff --git a/libre/blackbox-libre/bsetbg-feh.patch b/libre/blackbox-libre/bsetbg-feh.patch deleted file mode 100644 index 17a612ff0..000000000 --- a/libre/blackbox-libre/bsetbg-feh.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- util/bsetbg.orig 2008-03-26 21:17:04.000000000 -0700 -+++ util/bsetbg 2008-03-26 21:21:57.000000000 -0700 -@@ -22,7 +22,7 @@ - - PATH=$PATH:/usr/bin:/usr/local/bin:/usr/X11R6/bin - --img_apps="display xli xsetbg Esetroot qiv wmsetbg xv" -+img_apps="display xli xsetbg Esetroot qiv wmsetbg xv feh" - - display_full_cmd="display -geometry 800x600 -window root" - display_tile_cmd="display -window root" -@@ -59,6 +59,11 @@ - xsetbg_center_cmd="xsetbg -center" - xsetbg_default_cmd="$xsetbg_center_cmd" - -+feh_full_cmd="feh --bg-scale" -+feh_tile_cmd="feh --bg-tile" -+feh_center_cmd="feh --bg-center" -+feh_default_cmd="$feh_center_cmd" -+ - ################################## - - me=`basename $0` diff --git a/libre/blackbox-libre/gcc4.3.patch b/libre/blackbox-libre/gcc4.3.patch deleted file mode 100644 index 40a9dcdef..000000000 --- a/libre/blackbox-libre/gcc4.3.patch +++ /dev/null @@ -1,111 +0,0 @@ -diff -Nur blackbox-0.70.1/lib/Image.cc blackbox-0.70.1-new/lib/Image.cc ---- blackbox-0.70.1/lib/Image.cc 2005-04-08 08:41:09.000000000 -0700 -+++ blackbox-0.70.1-new/lib/Image.cc 2008-05-21 20:52:44.000000000 -0700 -@@ -45,6 +45,8 @@ - #include - #include - -+#include -+ - // #define COLORTABLE_DEBUG - // #define MITSHM_DEBUG - -diff -Nur blackbox-0.70.1/lib/Resource.cc blackbox-0.70.1-new/lib/Resource.cc ---- blackbox-0.70.1/lib/Resource.cc 2005-04-06 14:16:50.000000000 -0700 -+++ blackbox-0.70.1-new/lib/Resource.cc 2008-05-21 20:52:44.000000000 -0700 -@@ -30,6 +30,8 @@ - - #include - -+#include -+ - - bt::Resource::Resource(void) - : db(NULL) -diff -Nur blackbox-0.70.1/lib/XDG.cc blackbox-0.70.1-new/lib/XDG.cc ---- blackbox-0.70.1/lib/XDG.cc 2005-04-06 07:04:38.000000000 -0700 -+++ blackbox-0.70.1-new/lib/XDG.cc 2008-05-21 20:52:44.000000000 -0700 -@@ -26,7 +26,7 @@ - #include "XDG.hh" - - #include -- -+#include - - // make sure directory names end with a slash - static std::string terminateDir(const std::string &string) -diff -Nur blackbox-0.70.1/src/BlackboxResource.cc blackbox-0.70.1-new/src/BlackboxResource.cc ---- blackbox-0.70.1/src/BlackboxResource.cc 2005-10-18 00:34:46.000000000 -0700 -+++ blackbox-0.70.1-new/src/BlackboxResource.cc 2008-05-21 20:52:44.000000000 -0700 -@@ -33,6 +33,8 @@ - #include - #include - -+#include -+ - - BlackboxResource::BlackboxResource(const std::string& rc): rc_file(rc) { - screen_resources = 0; -diff -Nur blackbox-0.70.1/src/Screen.cc blackbox-0.70.1-new/src/Screen.cc ---- blackbox-0.70.1/src/Screen.cc 2005-10-18 01:07:22.000000000 -0700 -+++ blackbox-0.70.1-new/src/Screen.cc 2008-05-21 20:52:44.000000000 -0700 -@@ -48,6 +48,8 @@ - #include - #include - -+#include -+ - - static bool running = true; - static int anotherWMRunning(Display *, XErrorEvent *) { -diff -Nur blackbox-0.70.1/src/ScreenResource.cc blackbox-0.70.1-new/src/ScreenResource.cc ---- blackbox-0.70.1/src/ScreenResource.cc 2005-04-12 22:54:08.000000000 -0700 -+++ blackbox-0.70.1-new/src/ScreenResource.cc 2008-05-21 20:52:44.000000000 -0700 -@@ -33,6 +33,8 @@ - - #include - -+#include -+ - - static const int iconify_width = 9; - static const int iconify_height = 9; -diff -Nur blackbox-0.70.1/src/main.cc blackbox-0.70.1-new/src/main.cc ---- blackbox-0.70.1/src/main.cc 2005-01-03 02:42:57.000000000 -0700 -+++ blackbox-0.70.1-new/src/main.cc 2008-05-21 20:52:44.000000000 -0700 -@@ -36,6 +36,8 @@ - - #include - -+#include -+ - - static void showHelp(int exitval) { - // print version - this should not be localized! -diff -Nur blackbox-0.70.1/util/bsetbg blackbox-0.70.1-new/util/bsetbg ---- blackbox-0.70.1/util/bsetbg 2004-12-22 02:40:18.000000000 -0700 -+++ blackbox-0.70.1-new/util/bsetbg 2008-05-21 20:52:44.000000000 -0700 -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/bin/bash - - # Copyright (c) 2000-2002 Timothy M. King (tmk@lordzork.com) - # -diff -Nur blackbox-0.70.1/util/bsetroot.cc blackbox-0.70.1-new/util/bsetroot.cc ---- blackbox-0.70.1/util/bsetroot.cc 2005-03-15 00:01:37.000000000 -0700 -+++ blackbox-0.70.1-new/util/bsetroot.cc 2008-05-21 20:52:44.000000000 -0700 -@@ -27,11 +27,14 @@ - #include - #include - -+#include - #include - - #include - #include - -+#include -+ - - // ignore all X errors - static int x11_error(::Display *, XErrorEvent *) diff --git a/libre/blackbox-libre/menu b/libre/blackbox-libre/menu deleted file mode 100644 index 9cba27d16..000000000 --- a/libre/blackbox-libre/menu +++ /dev/null @@ -1,112 +0,0 @@ -# This is the default menu file for Blackbox 0.33.0 and up -# -# Lines beginning with the '#' character are ignored. -# -# The new syntax is simpler than the old X resource format... -# Each menu item consists of 2 or 3 fields: -# -# [command] (label) {data} -# -# where [command] is one of: -# -# [begin] [end] [exec] [exit] [reconfig] [restart] [submenu] -# [style] [stylesdir] [include] [workspaces] [config] -# -# [begin] is used for the top level menu -# [submenu] is used for submenus -# [end] must be used with BOTH [begin] and [submenu] to tell the parser to stop -# reading from the file. -# -# [exec] (label) {string} -# This will insert an item that runs a program. -# -# [exit] (label) -# This will insert an item that exits the window manager. -# -# [reconfig] (label) {string} -# This will insert an item that tells blackbox to re-read it's configuration -# files. {string} is optional, and if supplied, will execute the string with -# /bin/sh -c before the reconfiguration is performed. (this is helpful for -# writing multiple config files and switching between them) -# -# [restart] (label) {string} -# This will insert an item to restart the window manager. {string} is -# optional, and if omitted, blackbox will restart itself. If {string} is -# specified, then a different window manager will be started. -# -# [style] (filename) -# This will insert an item to reconfigure blackbox with the new style. This -# change is saved when blackbox exits or restarts. -# -# [include] (filename) -# This will read more menu items from the file "filename". The file cannot -# contain a [begin] or [end], except for the [end] needed for submenus. -# -# [workspaces] (label) -# This tells Blackbox to insert a "link" to the workspaces menu directly -# into your menu. -# -# [config] (label) -# This tells Blackbox to insert the ConfigMenu into your menu. The ConfigMenu -# allows you to change several options found in your ~/.blackboxrc file on the -# fly. -# -# example: - -[begin] (Blackbox) - [exec] (xterm) {xterm -ls} - [exec] (rxvt) {rxvt} - - [exec] (LibreOffice) {soffice} - [exec] (XEmacs) {xemacs} - [exec] (XPDF) {xpdf} - - [submenu] (Graphics) - [exec] (The GIMP) {gimp} - [exec] (Image Magick) {display} - [end] - - [submenu] (Internet) - [exec] (Icecat) {icecat} - [exec] (Iceweasel libre) {iceweasel} - [submenu] (Icedove libre) - [exec] (Icedove libre Mail) {icedove -mail} - [exec] (Icedove libre News) {icedove -news} - [end] - [submenu] (Iceape libre) - [exec] (Iceape libre Mail) {icedove -mail} - [exec] (Iceape libre News) {icedove -news} - [exec] (Iceape libre Composer) {icedove -edit} - [end] - [end] - - [submenu] (X Utilities) - [exec] (Xfontsel) {xfontsel} - [exec] (Xman) {xman} - [exec] (Xcalc) {xcalc} - [exec] (Xload) {xload} - [end] - - [submenu] (Styles) {Choose a style...} - [stylesdir] (/usr/share/blackbox/styles) - [end] - - [workspaces] (Workspace List) - [config] (Configuration) - - [reconfig] (Reconfigure) - [restart] (Restart) - [submenu] (Others) {Other Window Managers} - [restart] (Start FVWM) {fvwm} - [restart] (Start WindowMaker) {wmaker} - [restart] (Start Afterstep) {afterstep} - [restart] (Start Enlightenment) {enlightenment} - [restart] (Start TWM) {twm} - [restart] (Start KWIM) {kwim} - [end] - - [exit] (Exit) -[end] - -# End of example menu. - diff --git a/libre/blackbox-libre/textpropertytostring-unconditional.patch b/libre/blackbox-libre/textpropertytostring-unconditional.patch deleted file mode 100644 index ed320388a..000000000 --- a/libre/blackbox-libre/textpropertytostring-unconditional.patch +++ /dev/null @@ -1,28 +0,0 @@ -Description: Declare bt::textPropertyToString unconditionally. -Author: Jakub Wilk -Forwarded: no -Bug-Debian: http://bugs.debian.org/614468 -Last-Update: 2011-03-12 - ---- a/lib/Util.hh -+++ b/lib/Util.hh -@@ -25,6 +25,8 @@ - #ifndef __Util_hh - #define __Util_hh - -+#include -+ - #include - #include - -@@ -94,10 +96,8 @@ - - std::string tolower(const std::string &string); - --#ifdef _XUTIL_H_ - std::string textPropertyToString(::Display *display, - ::XTextProperty& text_prop); --#endif - - } // namespace bt - diff --git a/libre/blackbox/PKGBUILD b/libre/blackbox/PKGBUILD new file mode 100644 index 000000000..cca418a9f --- /dev/null +++ b/libre/blackbox/PKGBUILD @@ -0,0 +1,47 @@ +# $Id: PKGBUILD 100133 2013-11-01 20:20:45Z spupykin $ +# Maintainer (Arch): Sergej Pupykin +# Contributor (Arch): durbatuluk +# Contributor (Arch): Steve Ponsford +# Maintainer: Márcio Silva + +pkgname=blackbox +pkgver=0.70.1 +pkgrel=11.parabola1 +pkgdesc="A window manager for X11, without nonfree programs on the menu" +url="http://${pkgname}wm.sourceforge.net/" +arch=('i686' 'x86_64' 'mips64el') +depends=('gcc-libs' 'libxft' 'libxext' 'libx11' 'libxt') +replaces=($pkgname-libre) +conflicts=($pkgname-libre) +license=('MIT') +source=(http://downloads.sourceforge.net/${pkgname}wm/$pkgname-$pkgver.tar.gz + gcc4.3.patch + bbdock.patch + bsetbg-feh.patch + textpropertytostring-unconditional.patch + menu) +md5sums=('2d173b95ca5e64ef478c6a5d2deee9df' + 'bc7a1335d77cdeb6f85cba4d01e68e63' + '69c5a5e981b087b2d8267cab996b48dd' + 'e7fb0d5bfd95820c0194ec73df66dadc' + '3b92ad246f07126dd55ae9634d6e875e' + 'f4fefa5f25c65c5d9a601e9c14646757') + +build() { + cd $srcdir/$pkgname-$pkgver + + patch -Np1 -i ../gcc4.3.patch + patch -Np0 -i ../bbdock.patch + patch -Np0 -i ../bsetbg-feh.patch + patch -Np1 -i ../textpropertytostring-unconditional.patch + + ./configure --prefix=/usr --mandir=/usr/share/man + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install + install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE + install -D -m644 $srcdir/menu $pkgdir/usr/share/$pkgname/menu +} diff --git a/libre/blackbox/bbdock.patch b/libre/blackbox/bbdock.patch new file mode 100644 index 000000000..709b6cfe1 --- /dev/null +++ b/libre/blackbox/bbdock.patch @@ -0,0 +1,16 @@ +--- src/Slit.cc 2005-01-04 05:58:33.000000000 -0700 ++++ /root/tmp/Slit.cc 2007-12-29 11:13:09.000000000 -0700 +@@ -248,6 +248,13 @@ + bt::PixmapCache::find(screen->screenNumber(), texture, + frame.rect.width(), frame.rect.height(), + frame.pixmap); ++/*** START: BBDOCK PATCH FOR DOCK APPS THAT USE ParentRelative **************/ ++ if ((texture.texture() & bt::Texture::Gradient) && frame.pixmap) ++ XSetWindowBackgroundPixmap(display, frame.window, frame.pixmap); ++ else if ((texture.texture() & bt::Texture::Solid)) ++ XSetWindowBackground(display, frame.window, ++ texture.color1().pixel(screen->screenNumber())); ++/*** STOP: BBDOCK PATCH FOR DOCK APPS THAT USE ParentRelative ***************/ + XClearArea(display, frame.window, 0, 0, + frame.rect.width(), frame.rect.height(), True); + diff --git a/libre/blackbox/bsetbg-feh.patch b/libre/blackbox/bsetbg-feh.patch new file mode 100644 index 000000000..17a612ff0 --- /dev/null +++ b/libre/blackbox/bsetbg-feh.patch @@ -0,0 +1,23 @@ +--- util/bsetbg.orig 2008-03-26 21:17:04.000000000 -0700 ++++ util/bsetbg 2008-03-26 21:21:57.000000000 -0700 +@@ -22,7 +22,7 @@ + + PATH=$PATH:/usr/bin:/usr/local/bin:/usr/X11R6/bin + +-img_apps="display xli xsetbg Esetroot qiv wmsetbg xv" ++img_apps="display xli xsetbg Esetroot qiv wmsetbg xv feh" + + display_full_cmd="display -geometry 800x600 -window root" + display_tile_cmd="display -window root" +@@ -59,6 +59,11 @@ + xsetbg_center_cmd="xsetbg -center" + xsetbg_default_cmd="$xsetbg_center_cmd" + ++feh_full_cmd="feh --bg-scale" ++feh_tile_cmd="feh --bg-tile" ++feh_center_cmd="feh --bg-center" ++feh_default_cmd="$feh_center_cmd" ++ + ################################## + + me=`basename $0` diff --git a/libre/blackbox/gcc4.3.patch b/libre/blackbox/gcc4.3.patch new file mode 100644 index 000000000..40a9dcdef --- /dev/null +++ b/libre/blackbox/gcc4.3.patch @@ -0,0 +1,111 @@ +diff -Nur blackbox-0.70.1/lib/Image.cc blackbox-0.70.1-new/lib/Image.cc +--- blackbox-0.70.1/lib/Image.cc 2005-04-08 08:41:09.000000000 -0700 ++++ blackbox-0.70.1-new/lib/Image.cc 2008-05-21 20:52:44.000000000 -0700 +@@ -45,6 +45,8 @@ + #include + #include + ++#include ++ + // #define COLORTABLE_DEBUG + // #define MITSHM_DEBUG + +diff -Nur blackbox-0.70.1/lib/Resource.cc blackbox-0.70.1-new/lib/Resource.cc +--- blackbox-0.70.1/lib/Resource.cc 2005-04-06 14:16:50.000000000 -0700 ++++ blackbox-0.70.1-new/lib/Resource.cc 2008-05-21 20:52:44.000000000 -0700 +@@ -30,6 +30,8 @@ + + #include + ++#include ++ + + bt::Resource::Resource(void) + : db(NULL) +diff -Nur blackbox-0.70.1/lib/XDG.cc blackbox-0.70.1-new/lib/XDG.cc +--- blackbox-0.70.1/lib/XDG.cc 2005-04-06 07:04:38.000000000 -0700 ++++ blackbox-0.70.1-new/lib/XDG.cc 2008-05-21 20:52:44.000000000 -0700 +@@ -26,7 +26,7 @@ + #include "XDG.hh" + + #include +- ++#include + + // make sure directory names end with a slash + static std::string terminateDir(const std::string &string) +diff -Nur blackbox-0.70.1/src/BlackboxResource.cc blackbox-0.70.1-new/src/BlackboxResource.cc +--- blackbox-0.70.1/src/BlackboxResource.cc 2005-10-18 00:34:46.000000000 -0700 ++++ blackbox-0.70.1-new/src/BlackboxResource.cc 2008-05-21 20:52:44.000000000 -0700 +@@ -33,6 +33,8 @@ + #include + #include + ++#include ++ + + BlackboxResource::BlackboxResource(const std::string& rc): rc_file(rc) { + screen_resources = 0; +diff -Nur blackbox-0.70.1/src/Screen.cc blackbox-0.70.1-new/src/Screen.cc +--- blackbox-0.70.1/src/Screen.cc 2005-10-18 01:07:22.000000000 -0700 ++++ blackbox-0.70.1-new/src/Screen.cc 2008-05-21 20:52:44.000000000 -0700 +@@ -48,6 +48,8 @@ + #include + #include + ++#include ++ + + static bool running = true; + static int anotherWMRunning(Display *, XErrorEvent *) { +diff -Nur blackbox-0.70.1/src/ScreenResource.cc blackbox-0.70.1-new/src/ScreenResource.cc +--- blackbox-0.70.1/src/ScreenResource.cc 2005-04-12 22:54:08.000000000 -0700 ++++ blackbox-0.70.1-new/src/ScreenResource.cc 2008-05-21 20:52:44.000000000 -0700 +@@ -33,6 +33,8 @@ + + #include + ++#include ++ + + static const int iconify_width = 9; + static const int iconify_height = 9; +diff -Nur blackbox-0.70.1/src/main.cc blackbox-0.70.1-new/src/main.cc +--- blackbox-0.70.1/src/main.cc 2005-01-03 02:42:57.000000000 -0700 ++++ blackbox-0.70.1-new/src/main.cc 2008-05-21 20:52:44.000000000 -0700 +@@ -36,6 +36,8 @@ + + #include + ++#include ++ + + static void showHelp(int exitval) { + // print version - this should not be localized! +diff -Nur blackbox-0.70.1/util/bsetbg blackbox-0.70.1-new/util/bsetbg +--- blackbox-0.70.1/util/bsetbg 2004-12-22 02:40:18.000000000 -0700 ++++ blackbox-0.70.1-new/util/bsetbg 2008-05-21 20:52:44.000000000 -0700 +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + + # Copyright (c) 2000-2002 Timothy M. King (tmk@lordzork.com) + # +diff -Nur blackbox-0.70.1/util/bsetroot.cc blackbox-0.70.1-new/util/bsetroot.cc +--- blackbox-0.70.1/util/bsetroot.cc 2005-03-15 00:01:37.000000000 -0700 ++++ blackbox-0.70.1-new/util/bsetroot.cc 2008-05-21 20:52:44.000000000 -0700 +@@ -27,11 +27,14 @@ + #include + #include + ++#include + #include + + #include + #include + ++#include ++ + + // ignore all X errors + static int x11_error(::Display *, XErrorEvent *) diff --git a/libre/blackbox/menu b/libre/blackbox/menu new file mode 100644 index 000000000..9cba27d16 --- /dev/null +++ b/libre/blackbox/menu @@ -0,0 +1,112 @@ +# This is the default menu file for Blackbox 0.33.0 and up +# +# Lines beginning with the '#' character are ignored. +# +# The new syntax is simpler than the old X resource format... +# Each menu item consists of 2 or 3 fields: +# +# [command] (label) {data} +# +# where [command] is one of: +# +# [begin] [end] [exec] [exit] [reconfig] [restart] [submenu] +# [style] [stylesdir] [include] [workspaces] [config] +# +# [begin] is used for the top level menu +# [submenu] is used for submenus +# [end] must be used with BOTH [begin] and [submenu] to tell the parser to stop +# reading from the file. +# +# [exec] (label) {string} +# This will insert an item that runs a program. +# +# [exit] (label) +# This will insert an item that exits the window manager. +# +# [reconfig] (label) {string} +# This will insert an item that tells blackbox to re-read it's configuration +# files. {string} is optional, and if supplied, will execute the string with +# /bin/sh -c before the reconfiguration is performed. (this is helpful for +# writing multiple config files and switching between them) +# +# [restart] (label) {string} +# This will insert an item to restart the window manager. {string} is +# optional, and if omitted, blackbox will restart itself. If {string} is +# specified, then a different window manager will be started. +# +# [style] (filename) +# This will insert an item to reconfigure blackbox with the new style. This +# change is saved when blackbox exits or restarts. +# +# [include] (filename) +# This will read more menu items from the file "filename". The file cannot +# contain a [begin] or [end], except for the [end] needed for submenus. +# +# [workspaces] (label) +# This tells Blackbox to insert a "link" to the workspaces menu directly +# into your menu. +# +# [config] (label) +# This tells Blackbox to insert the ConfigMenu into your menu. The ConfigMenu +# allows you to change several options found in your ~/.blackboxrc file on the +# fly. +# +# example: + +[begin] (Blackbox) + [exec] (xterm) {xterm -ls} + [exec] (rxvt) {rxvt} + + [exec] (LibreOffice) {soffice} + [exec] (XEmacs) {xemacs} + [exec] (XPDF) {xpdf} + + [submenu] (Graphics) + [exec] (The GIMP) {gimp} + [exec] (Image Magick) {display} + [end] + + [submenu] (Internet) + [exec] (Icecat) {icecat} + [exec] (Iceweasel libre) {iceweasel} + [submenu] (Icedove libre) + [exec] (Icedove libre Mail) {icedove -mail} + [exec] (Icedove libre News) {icedove -news} + [end] + [submenu] (Iceape libre) + [exec] (Iceape libre Mail) {icedove -mail} + [exec] (Iceape libre News) {icedove -news} + [exec] (Iceape libre Composer) {icedove -edit} + [end] + [end] + + [submenu] (X Utilities) + [exec] (Xfontsel) {xfontsel} + [exec] (Xman) {xman} + [exec] (Xcalc) {xcalc} + [exec] (Xload) {xload} + [end] + + [submenu] (Styles) {Choose a style...} + [stylesdir] (/usr/share/blackbox/styles) + [end] + + [workspaces] (Workspace List) + [config] (Configuration) + + [reconfig] (Reconfigure) + [restart] (Restart) + [submenu] (Others) {Other Window Managers} + [restart] (Start FVWM) {fvwm} + [restart] (Start WindowMaker) {wmaker} + [restart] (Start Afterstep) {afterstep} + [restart] (Start Enlightenment) {enlightenment} + [restart] (Start TWM) {twm} + [restart] (Start KWIM) {kwim} + [end] + + [exit] (Exit) +[end] + +# End of example menu. + diff --git a/libre/blackbox/textpropertytostring-unconditional.patch b/libre/blackbox/textpropertytostring-unconditional.patch new file mode 100644 index 000000000..ed320388a --- /dev/null +++ b/libre/blackbox/textpropertytostring-unconditional.patch @@ -0,0 +1,28 @@ +Description: Declare bt::textPropertyToString unconditionally. +Author: Jakub Wilk +Forwarded: no +Bug-Debian: http://bugs.debian.org/614468 +Last-Update: 2011-03-12 + +--- a/lib/Util.hh ++++ b/lib/Util.hh +@@ -25,6 +25,8 @@ + #ifndef __Util_hh + #define __Util_hh + ++#include ++ + #include + #include + +@@ -94,10 +96,8 @@ + + std::string tolower(const std::string &string); + +-#ifdef _XUTIL_H_ + std::string textPropertyToString(::Display *display, + ::XTextProperty& text_prop); +-#endif + + } // namespace bt + -- cgit v1.1-4-g5e80 From ee568468630d48fc3ee0657c91477cbb97517a02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?coadde=20=5BM=C3=A1rcio=20Alexandre=20Silva=20Delgado=5D?= Date: Wed, 3 Sep 2014 19:24:29 -0300 Subject: rename to bogofilter --- libre/bogofilter-libre/PKGBUILD | 49 ----------------------------------------- libre/bogofilter/PKGBUILD | 49 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 49 deletions(-) delete mode 100644 libre/bogofilter-libre/PKGBUILD create mode 100644 libre/bogofilter/PKGBUILD diff --git a/libre/bogofilter-libre/PKGBUILD b/libre/bogofilter-libre/PKGBUILD deleted file mode 100644 index c9f0c0d6a..000000000 --- a/libre/bogofilter-libre/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# $Id: PKGBUILD 196818 2013-10-20 08:27:26Z andyrtr $ -# Maintainer (Arch): AndyRTR -# Contributor (Arch): tobias -# Contributor (Arch): Low Kian Seong - -_pkgname=bogofilter -pkgname=bogofilter-libre -pkgver=1.2.4 -pkgrel=1 -pkgdesc="A fast Bayesian spam filtering tool, without noncommercial files" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL3') -url="http://bogofilter.sourceforge.net" -depends=('db' 'perl' 'gsl') -backup=('etc/bogofilter/bogofilter.cf') -mksource=(http://sourceforge.net/projects/${_pkgname}/files/${_pkgname}-current/${_pkgname}-${pkgver}/${_pkgname}-${pkgver}.tar.bz2) -source=(https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -mkmd5sums=('d0a5eebb3274b23ceabe766a6443a1c5') -md5sums=('cce573e059d39a68cf78097dbfaa5b2d') -provides=("${_pkgname}=${pkgver}") -replaces=("${_pkgname}") -conflicts=("${_pkgname}") - -mksource() { - cd ${_pkgname}-${pkgver} - - # Remove noncommercial files. - rm doc/bogofilter-SA-{2005-0{1,2},2010-01} -} - -build() { - cd ${_pkgname}-${pkgver} - - ./configure --prefix=/usr \ - --sysconfdir=/etc/bogofilter \ - --localstatedir=/var \ - --enable-transactions - make -} - -package() { - cd ${_pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install - - mv "${pkgdir}/etc/bogofilter/bogofilter.cf.example" "${pkgdir}/etc/bogofilter/bogofilter.cf" - - install -dm755 "${pkgdir}/usr/share/${_pkgname}/contrib" - install -m644 contrib/* "${pkgdir}/usr/share/${_pkgname}/contrib/" -} diff --git a/libre/bogofilter/PKGBUILD b/libre/bogofilter/PKGBUILD new file mode 100644 index 000000000..4ab5f7c66 --- /dev/null +++ b/libre/bogofilter/PKGBUILD @@ -0,0 +1,49 @@ +# $Id: PKGBUILD 196818 2013-10-20 08:27:26Z andyrtr $ +# Maintainer (Arch): AndyRTR +# Contributor (Arch): tobias +# Contributor (Arch): Low Kian Seong +# Maintainer: Márcio Silva + +pkgname=bogofilter +_pkgname=$pkgname-libre +pkgver=1.2.4 +pkgrel=1.parabola1 +pkgdesc="A fast Bayesian spam filtering tool, without noncommercial files" +arch=('i686' 'x86_64' 'mips64el') +license=('GPL3') +url="http://$pkgname.sourceforge.net" +depends=('db' 'perl' 'gsl') +backup=("etc/$pkgname/$pkgname.cf") +mksource=(http://sourceforge.net/projects/${pkgname}/files/${pkgname}-current/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2) +source=(https://repo.parabolagnulinux.org/other/${_pkgname}/${_pkgname}-${pkgver}.tar.bz2) +mkmd5sums=('d0a5eebb3274b23ceabe766a6443a1c5') +md5sums=('cce573e059d39a68cf78097dbfaa5b2d') +replaces=("${_pkgname}") +conflicts=("${_pkgname}") + +mksource() { + cd ${pkgname}-${pkgver} + + # Remove noncommercial files. + rm doc/$pkgname-SA-{2005-0{1,2},2010-01} +} + +build() { + cd ${_pkgname}-${pkgver} + + ./configure --prefix=/usr \ + --sysconfdir=/etc/$pkgname \ + --localstatedir=/var \ + --enable-transactions + make +} + +package() { + cd ${_pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install + + mv "${pkgdir}/etc/$pkgname/$pkgname.cf.example" "${pkgdir}/etc/$pkgname/$pkgname.cf" + + install -dm755 "${pkgdir}/usr/share/${pkgname}/contrib" + install -m644 contrib/* "${pkgdir}/usr/share/${pkgname}/contrib/" +} -- cgit v1.1-4-g5e80 From f0904a8ec337c31e3ca052660db0930e0b212358 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?coadde=20=5BM=C3=A1rcio=20Alexandre=20Silva=20Delgado=5D?= Date: Wed, 3 Sep 2014 19:26:15 -0300 Subject: fixing blender-addon-luxrender --- libre/blender-addon-luxrender/PKGBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libre/blender-addon-luxrender/PKGBUILD b/libre/blender-addon-luxrender/PKGBUILD index bbd7fe9d6..ab0aac2f1 100644 --- a/libre/blender-addon-luxrender/PKGBUILD +++ b/libre/blender-addon-luxrender/PKGBUILD @@ -4,21 +4,21 @@ _srcname=luxrender _pkgver=1.3.1 _bldname=blender _bldver=2.71 -_bldep=12 +_bldep=14 _pkgname=${_srcname::3}${_bldname::5}25 _srcver=ad6536b0dda8 pkgname=$_bldname-addon-$_srcname pkgver=$_pkgver.v$_bldver pkgrel=1 -pkgdesc="$_pkgname: A addon for the ${_bldname^} which allows render and export with LuxRender (built for the $_bldname-libre package)" +pkgdesc="$_pkgname: A addon for the ${_bldname^} which allows render and export with LuxRender (built for the $_bldname package)" arch=any url=http://www.$_srcname.net/ license=GPL depends=( $_srcname=$_pkgver - "$_bldname-libre>=$_bldep:$_bldver" - "$_bldname-libre<$(($_bldep+1)):${_bldver::2}$((${_bldver:2:4}+1))" + "$_bldname>=$_bldep:$_bldver" + "$_bldname<$(($_bldep+1)):${_bldver::2}$((${_bldver:2:4}+1))" ) provides=($_pkgname=$_pkgver) conflicts=($_pkgname) -- cgit v1.1-4-g5e80 From e3a7dc162f12e6bf80f7a7ac34987627aa7940cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?coadde=20=5BM=C3=A1rcio=20Alexandre=20Silva=20Delgado=5D?= Date: Wed, 3 Sep 2014 19:33:30 -0300 Subject: rename to bumblebee --- libre/bumblebee-libre/PKGBUILD | 68 -------------- libre/bumblebee-libre/bumblebee.install | 16 ---- libre/bumblebee-libre/libre.patch | 154 -------------------------------- libre/bumblebee/PKGBUILD | 67 ++++++++++++++ libre/bumblebee/bumblebee.install | 16 ++++ libre/bumblebee/libre.patch | 154 ++++++++++++++++++++++++++++++++ 6 files changed, 237 insertions(+), 238 deletions(-) delete mode 100644 libre/bumblebee-libre/PKGBUILD delete mode 100644 libre/bumblebee-libre/bumblebee.install delete mode 100644 libre/bumblebee-libre/libre.patch create mode 100644 libre/bumblebee/PKGBUILD create mode 100644 libre/bumblebee/bumblebee.install create mode 100644 libre/bumblebee/libre.patch diff --git a/libre/bumblebee-libre/PKGBUILD b/libre/bumblebee-libre/PKGBUILD deleted file mode 100644 index 82bfbca1d..000000000 --- a/libre/bumblebee-libre/PKGBUILD +++ /dev/null @@ -1,68 +0,0 @@ -# Maintainer (Arch): Sven-Hendrik Haase -# Maintainer: André Silva - -_pkgname=bumblebee -pkgname=bumblebee-libre -pkgver=3.2.1 -pkgrel=3 -pkgdesc="NVIDIA Optimus support for GNU/Linux through VirtualGL, without nonfree nvidia driver support" -arch=('i686' 'x86_64' 'mips64el') -depends=('virtualgl' 'glib2' 'mesa-libgl') -makedepends=('help2man') -optdepends=('xf86-video-nouveau: nouveau driver' - 'nouveau-dri: 3D acceleration features of nouveau' - 'bbswitch: switch on/off discrete card' - 'primus: faster back-end for optirun') -if [ "$CARCH" = "x86_64" ]; then - optdepends[${#optdepends[@]}]='lib32-virtualgl: run 32bit applications with optirun' - optdepends[${#optdepends[@]}]='lib32-primus: faster back-end for optirun' -fi -replaces=('bumblebee' 'nvidia-libgl') -conflicts=('bumblebee' 'nvidia-libgl') -provides=("bumblebee=$pkgver" 'nvidia-libgl') -url="http://www.bumblebee-project.org" -license=("GPL3") -install='bumblebee.install' -backup=('etc/bumblebee/bumblebee.conf' - 'etc/bumblebee/xorg.conf.nouveau') -source=("http://www.bumblebee-project.org/${_pkgname}-${pkgver}.tar.gz" - 'libre.patch') -md5sums=('30974e677bb13e8a3825fd6f3e7d3b24' - '1daed1e00f74538add6c435dfa0569d1') - -prepare() { - cd "${srcdir}/${_pkgname}-${pkgver}" - - # Remove nonfree references to nonfree nvidia driver and unnecessaries files - rm -rv "README.markdown" - rm -rv "conf/"{99-bumblebee-nvidia-dev.rules,xorg.conf.nvidia} - rm -rv "doc" - rm -rv "scripts/bumblebee-bugreport.in" - patch -Np1 -i "${srcdir}/libre.patch" -} - -build() { - cd "${srcdir}/${_pkgname}-${pkgver}" - - ./configure \ - CONF_DRIVER=nouveau \ - --prefix=/usr \ - --sbindir=/usr/bin \ - --sysconfdir=/etc \ - --without-pidfile - - make -} - -package() { - cd "${srcdir}/${_pkgname}-${pkgver}" - - make install DESTDIR="$pkgdir" - - # Install systemd unit - install -D -m644 "scripts/systemd/bumblebeed.service" "${pkgdir}/usr/lib/systemd/system/bumblebeed.service" - sed -i "s/sbin/bin/" "${pkgdir}/usr/lib/systemd/system/bumblebeed.service" - - # Make bash_completion work - mv -v "${pkgdir}/etc/bash_completion.d/bumblebee" "${pkgdir}/etc/bash_completion.d/optirun" -} diff --git a/libre/bumblebee-libre/bumblebee.install b/libre/bumblebee-libre/bumblebee.install deleted file mode 100644 index 57aed6cc5..000000000 --- a/libre/bumblebee-libre/bumblebee.install +++ /dev/null @@ -1,16 +0,0 @@ -_notice() { - echo "Don't forget to add yourself to the 'bumblebee' group to use Bumblebee" -} - -post_upgrade() { - getent group "bumblebee" &>/dev/null || groupadd -r bumblebee -} - -post_remove() { - getent group "bumblebee" &>/dev/null && groupdel bumblebee 1>/dev/null -} - -post_install() { - post_upgrade - _notice -} diff --git a/libre/bumblebee-libre/libre.patch b/libre/bumblebee-libre/libre.patch deleted file mode 100644 index 81d49ca33..000000000 --- a/libre/bumblebee-libre/libre.patch +++ /dev/null @@ -1,154 +0,0 @@ -diff -Nur bumblebee-3.2.1.orig/Makefile.am bumblebee-3.2.1/Makefile.am ---- bumblebee-3.2.1.orig/Makefile.am 2013-04-26 12:49:03.022174178 -0300 -+++ bumblebee-3.2.1/Makefile.am 2013-04-28 17:08:11.719589284 -0300 -@@ -1,7 +1,6 @@ - # -*- Makefile -*- - - GITVERSION = $(shell "$(top_srcdir)/version.sh" "$(top_srcdir)") --relnotes = doc/RELEASE_NOTES_3_2_1 - - bumblebeedconfdir=$(sysconfdir)/bumblebee - -@@ -20,23 +19,16 @@ - noinst_SCRIPTS += scripts/sysvinit/bumblebeed - endif - --bin_SCRIPTS = scripts/bumblebee-bugreport -- - xconfddir = $(bumblebeedconfdir)/xorg.conf.d - xconfd_DATA = conf/xorg.conf.d/10-dummy.conf - - CLEANFILES = $(noinst_SCRIPTS) conf/bumblebee.conf $(bin_SCRIPTS) - EXTRA_DIST = scripts/systemd/bumblebeed.service.in \ - scripts/upstart/bumblebeed.conf.in \ -- conf/99-bumblebee-nvidia-dev.rules \ - conf/bumblebee.conf.in \ -- conf/xorg.conf.nvidia \ - conf/xorg.conf.nouveau \ - $(xconfd_DATA) \ -- README.markdown \ - scripts/bash_completion/bumblebee \ -- scripts/bumblebee-bugreport.in \ -- $(relnotes) \ - version.sh - # for laziness include all headers found - EXTRA_DIST += src/*.h src/*/switching.h -@@ -57,17 +49,11 @@ - src/driver.c src/bumblebeed.c - bin_bumblebeed_LDADD = ${x11_LIBS} ${libbsd_LIBS} ${glib_LIBS} -lrt - --dist_doc_DATA = $(relnotes) README.markdown --bumblebeedconf_DATA = conf/bumblebee.conf conf/xorg.conf.nouveau conf/xorg.conf.nvidia -+bumblebeedconf_DATA = conf/bumblebee.conf conf/xorg.conf.nouveau - - completiondir = $(sysconfdir)/bash_completion.d - completion_DATA = scripts/bash_completion/bumblebee - --if WITH_UDEV_RULES --udevrulesdir = $(UDEV_RULES_DIR) --udevrules_DATA = conf/99-bumblebee-nvidia-dev.rules --endif -- - do_subst = sed -e 's|[@]GITVERSION[@]|$(GITVERSION)|g' \ - -e 's|[@]CONF_XDISP[@]|$(CONF_XDISP)|g' \ - -e 's|[@]CONF_SOCKPATH[@]|$(CONF_SOCKPATH)|g' \ -@@ -97,10 +83,6 @@ - mkdir -p scripts/systemd - $(do_subst) < $< > $@ - --scripts/bumblebee-bugreport: $(srcdir)/scripts/bumblebee-bugreport.in -- mkdir -p scripts -- $(do_subst) < $< > $@ -- - if WITH_PIDFILE - scripts/sysvinit/bumblebeed: $(srcdir)/scripts/sysvinit/bumblebeed.in - mkdir -p scripts/sysvinit -diff -Nur bumblebee-3.2.1.orig/Makefile.in bumblebee-3.2.1/Makefile.in ---- bumblebee-3.2.1.orig/Makefile.in 2013-04-26 12:49:11.306174579 -0300 -+++ bumblebee-3.2.1/Makefile.in 2013-04-28 17:21:38.698898621 -0300 -@@ -220,7 +220,6 @@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ --UDEV_RULES_DIR = @UDEV_RULES_DIR@ - VERSION = @VERSION@ - abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ -@@ -273,7 +272,6 @@ - x11_CFLAGS = @x11_CFLAGS@ - x11_LIBS = @x11_LIBS@ - GITVERSION = $(shell "$(top_srcdir)/version.sh" "$(top_srcdir)") --relnotes = doc/RELEASE_NOTES_3_2_1 - bumblebeedconfdir = $(sysconfdir)/bumblebee - AM_CPPFLAGS = ${regular_CPPFLAGS} \ - -DCONFIG_FILE='"$(bumblebeedconfdir)/bumblebee.conf"' \ -@@ -286,7 +284,6 @@ - - noinst_SCRIPTS = scripts/systemd/bumblebeed.service \ - scripts/upstart/bumblebeed.conf $(am__append_1) --bin_SCRIPTS = scripts/bumblebee-bugreport - xconfddir = $(bumblebeedconfdir)/xorg.conf.d - xconfd_DATA = conf/xorg.conf.d/10-dummy.conf - CLEANFILES = $(noinst_SCRIPTS) conf/bumblebee.conf $(bin_SCRIPTS) \ -@@ -294,10 +291,10 @@ - # for laziness include all headers found - EXTRA_DIST = scripts/systemd/bumblebeed.service.in \ - scripts/upstart/bumblebeed.conf.in \ -- conf/99-bumblebee-nvidia-dev.rules conf/bumblebee.conf.in \ -- conf/xorg.conf.nvidia conf/xorg.conf.nouveau $(xconfd_DATA) \ -- README.markdown scripts/bash_completion/bumblebee \ -- scripts/bumblebee-bugreport.in $(relnotes) version.sh src/*.h \ -+ conf/bumblebee.conf.in \ -+ conf/xorg.conf.nouveau $(xconfd_DATA) \ -+ scripts/bash_completion/bumblebee \ -+ version.sh src/*.h \ - src/*/switching.h $(am__append_2) - bin_optirun_SOURCES = src/module.c src/bbconfig.c src/bblogger.c src/bbrun.c \ - src/bbsocket.c src/driver.c src/optirun.c src/bbsocketclient.c -@@ -309,12 +306,9 @@ - src/driver.c src/bumblebeed.c - - bin_bumblebeed_LDADD = ${x11_LIBS} ${libbsd_LIBS} ${glib_LIBS} -lrt --dist_doc_DATA = $(relnotes) README.markdown --bumblebeedconf_DATA = conf/bumblebee.conf conf/xorg.conf.nouveau conf/xorg.conf.nvidia -+bumblebeedconf_DATA = conf/bumblebee.conf conf/xorg.conf.nouveau - completiondir = $(sysconfdir)/bash_completion.d - completion_DATA = scripts/bash_completion/bumblebee --@WITH_UDEV_RULES_TRUE@udevrulesdir = $(UDEV_RULES_DIR) --@WITH_UDEV_RULES_TRUE@udevrules_DATA = conf/99-bumblebee-nvidia-dev.rules - do_subst = sed -e 's|[@]GITVERSION[@]|$(GITVERSION)|g' \ - -e 's|[@]CONF_XDISP[@]|$(CONF_XDISP)|g' \ - -e 's|[@]CONF_SOCKPATH[@]|$(CONF_SOCKPATH)|g' \ -diff -Nur bumblebee-3.1.orig/conf/bumblebee.conf.in bumblebee-3.1/conf/bumblebee.conf.in ---- bumblebee-3.1.orig/conf/bumblebee.conf.in 2013-02-21 17:03:35.526542613 -0200 -+++ bumblebee-3.1/conf/bumblebee.conf.in 2013-04-06 06:28:48.124159386 -0300 -@@ -17,8 +17,8 @@ - # be ignored. - NoEcoModeOverride=false - # The Driver used by Bumblebee server. If this value is not set (or empty), --# auto-detection is performed. The available drivers are nvidia and nouveau --# (See also the driver-specific sections below) -+# auto-detection is performed. The available driver is nouveau -+# (See also the driver-specific section below) - Driver=@CONF_DRIVER@ - - ## Client options. Will take effect on the next optirun executed. -@@ -44,18 +44,6 @@ - # none - disable PM completely - # https://github.com/Bumblebee-Project/Bumblebee/wiki/Comparison-of-PM-methods - --## Section with nvidia driver specific options, only parsed if Driver=nvidia --[driver-nvidia] --# Module name to load, defaults to Driver if empty or unset --KernelDriver=@CONF_DRIVER_MODULE_NVIDIA@ --PMMethod=@CONF_PM_METHOD@ --# colon-separated path to the nvidia libraries --LibraryPath=@CONF_LDPATH_NVIDIA@ --# comma-separated path of the directory containing nvidia_drv.so and the --# default Xorg modules path --XorgModulePath=@CONF_MODPATH_NVIDIA@ --XorgConfFile=@BBCONFDIR@/xorg.conf.nvidia -- - ## Section with nouveau driver specific options, only parsed if Driver=nouveau - [driver-nouveau] - KernelDriver=nouveau diff --git a/libre/bumblebee/PKGBUILD b/libre/bumblebee/PKGBUILD new file mode 100644 index 000000000..964fcf020 --- /dev/null +++ b/libre/bumblebee/PKGBUILD @@ -0,0 +1,67 @@ +# Maintainer (Arch): Sven-Hendrik Haase +# Maintainer: André Silva + +pkgname=bumblebee +pkgver=3.2.1 +pkgrel=3.parabola1 +pkgdesc="NVIDIA Optimus support for GNU/Linux through VirtualGL, without nonfree nvidia driver support" +arch=('i686' 'x86_64' 'mips64el') +depends=('virtualgl' 'glib2' 'mesa-libgl') +makedepends=('help2man') +optdepends=('xf86-video-nouveau: nouveau driver' + 'nouveau-dri: 3D acceleration features of nouveau' + 'bbswitch: switch on/off discrete card' + 'primus: faster back-end for optirun') +if [ "$CARCH" = "x86_64" ]; then + optdepends[${#optdepends[@]}]='lib32-virtualgl: run 32bit applications with optirun' + optdepends[${#optdepends[@]}]='lib32-primus: faster back-end for optirun' +fi +replaces=("$pkgname-libre" 'nvidia-libgl') +conflicts=("$pkgname-libre" 'nvidia-libgl') +provides=('nvidia-libgl') +url="http://www.$pkgname-project.org" +license=("GPL3") +install="$pkgname.install" +backup=("etc/$pkgname/$pkgname.conf" + "etc/$pkgname/xorg.conf.nouveau") +source=("http://www.$pkgname-project.org/${pkgname}-${pkgver}.tar.gz" + 'libre.patch') +md5sums=('30974e677bb13e8a3825fd6f3e7d3b24' + '1daed1e00f74538add6c435dfa0569d1') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # Remove nonfree references to nonfree nvidia driver and unnecessaries files + rm -rv "README.markdown" + rm -rv "conf/"{99-$pkgname-nvidia-dev.rules,xorg.conf.nvidia} + rm -rv "doc" + rm -rv "scripts/$pkgname-bugreport.in" + patch -Np1 -i "${srcdir}/libre.patch" +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure \ + CONF_DRIVER=nouveau \ + --prefix=/usr \ + --sbindir=/usr/bin \ + --sysconfdir=/etc \ + --without-pidfile + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make install DESTDIR="$pkgdir" + + # Install systemd unit + install -D -m644 "scripts/systemd/${pkgname}d.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}d.service" + sed -i "s/sbin/bin/" "${pkgdir}/usr/lib/systemd/system/${pkgname}d.service" + + # Make bash_completion work + mv -v "${pkgdir}/etc/bash_completion.d/$pkgname" "${pkgdir}/etc/bash_completion.d/optirun" +} diff --git a/libre/bumblebee/bumblebee.install b/libre/bumblebee/bumblebee.install new file mode 100644 index 000000000..57aed6cc5 --- /dev/null +++ b/libre/bumblebee/bumblebee.install @@ -0,0 +1,16 @@ +_notice() { + echo "Don't forget to add yourself to the 'bumblebee' group to use Bumblebee" +} + +post_upgrade() { + getent group "bumblebee" &>/dev/null || groupadd -r bumblebee +} + +post_remove() { + getent group "bumblebee" &>/dev/null && groupdel bumblebee 1>/dev/null +} + +post_install() { + post_upgrade + _notice +} diff --git a/libre/bumblebee/libre.patch b/libre/bumblebee/libre.patch new file mode 100644 index 000000000..81d49ca33 --- /dev/null +++ b/libre/bumblebee/libre.patch @@ -0,0 +1,154 @@ +diff -Nur bumblebee-3.2.1.orig/Makefile.am bumblebee-3.2.1/Makefile.am +--- bumblebee-3.2.1.orig/Makefile.am 2013-04-26 12:49:03.022174178 -0300 ++++ bumblebee-3.2.1/Makefile.am 2013-04-28 17:08:11.719589284 -0300 +@@ -1,7 +1,6 @@ + # -*- Makefile -*- + + GITVERSION = $(shell "$(top_srcdir)/version.sh" "$(top_srcdir)") +-relnotes = doc/RELEASE_NOTES_3_2_1 + + bumblebeedconfdir=$(sysconfdir)/bumblebee + +@@ -20,23 +19,16 @@ + noinst_SCRIPTS += scripts/sysvinit/bumblebeed + endif + +-bin_SCRIPTS = scripts/bumblebee-bugreport +- + xconfddir = $(bumblebeedconfdir)/xorg.conf.d + xconfd_DATA = conf/xorg.conf.d/10-dummy.conf + + CLEANFILES = $(noinst_SCRIPTS) conf/bumblebee.conf $(bin_SCRIPTS) + EXTRA_DIST = scripts/systemd/bumblebeed.service.in \ + scripts/upstart/bumblebeed.conf.in \ +- conf/99-bumblebee-nvidia-dev.rules \ + conf/bumblebee.conf.in \ +- conf/xorg.conf.nvidia \ + conf/xorg.conf.nouveau \ + $(xconfd_DATA) \ +- README.markdown \ + scripts/bash_completion/bumblebee \ +- scripts/bumblebee-bugreport.in \ +- $(relnotes) \ + version.sh + # for laziness include all headers found + EXTRA_DIST += src/*.h src/*/switching.h +@@ -57,17 +49,11 @@ + src/driver.c src/bumblebeed.c + bin_bumblebeed_LDADD = ${x11_LIBS} ${libbsd_LIBS} ${glib_LIBS} -lrt + +-dist_doc_DATA = $(relnotes) README.markdown +-bumblebeedconf_DATA = conf/bumblebee.conf conf/xorg.conf.nouveau conf/xorg.conf.nvidia ++bumblebeedconf_DATA = conf/bumblebee.conf conf/xorg.conf.nouveau + + completiondir = $(sysconfdir)/bash_completion.d + completion_DATA = scripts/bash_completion/bumblebee + +-if WITH_UDEV_RULES +-udevrulesdir = $(UDEV_RULES_DIR) +-udevrules_DATA = conf/99-bumblebee-nvidia-dev.rules +-endif +- + do_subst = sed -e 's|[@]GITVERSION[@]|$(GITVERSION)|g' \ + -e 's|[@]CONF_XDISP[@]|$(CONF_XDISP)|g' \ + -e 's|[@]CONF_SOCKPATH[@]|$(CONF_SOCKPATH)|g' \ +@@ -97,10 +83,6 @@ + mkdir -p scripts/systemd + $(do_subst) < $< > $@ + +-scripts/bumblebee-bugreport: $(srcdir)/scripts/bumblebee-bugreport.in +- mkdir -p scripts +- $(do_subst) < $< > $@ +- + if WITH_PIDFILE + scripts/sysvinit/bumblebeed: $(srcdir)/scripts/sysvinit/bumblebeed.in + mkdir -p scripts/sysvinit +diff -Nur bumblebee-3.2.1.orig/Makefile.in bumblebee-3.2.1/Makefile.in +--- bumblebee-3.2.1.orig/Makefile.in 2013-04-26 12:49:11.306174579 -0300 ++++ bumblebee-3.2.1/Makefile.in 2013-04-28 17:21:38.698898621 -0300 +@@ -220,7 +220,6 @@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-UDEV_RULES_DIR = @UDEV_RULES_DIR@ + VERSION = @VERSION@ + abs_builddir = @abs_builddir@ + abs_srcdir = @abs_srcdir@ +@@ -273,7 +272,6 @@ + x11_CFLAGS = @x11_CFLAGS@ + x11_LIBS = @x11_LIBS@ + GITVERSION = $(shell "$(top_srcdir)/version.sh" "$(top_srcdir)") +-relnotes = doc/RELEASE_NOTES_3_2_1 + bumblebeedconfdir = $(sysconfdir)/bumblebee + AM_CPPFLAGS = ${regular_CPPFLAGS} \ + -DCONFIG_FILE='"$(bumblebeedconfdir)/bumblebee.conf"' \ +@@ -286,7 +284,6 @@ + + noinst_SCRIPTS = scripts/systemd/bumblebeed.service \ + scripts/upstart/bumblebeed.conf $(am__append_1) +-bin_SCRIPTS = scripts/bumblebee-bugreport + xconfddir = $(bumblebeedconfdir)/xorg.conf.d + xconfd_DATA = conf/xorg.conf.d/10-dummy.conf + CLEANFILES = $(noinst_SCRIPTS) conf/bumblebee.conf $(bin_SCRIPTS) \ +@@ -294,10 +291,10 @@ + # for laziness include all headers found + EXTRA_DIST = scripts/systemd/bumblebeed.service.in \ + scripts/upstart/bumblebeed.conf.in \ +- conf/99-bumblebee-nvidia-dev.rules conf/bumblebee.conf.in \ +- conf/xorg.conf.nvidia conf/xorg.conf.nouveau $(xconfd_DATA) \ +- README.markdown scripts/bash_completion/bumblebee \ +- scripts/bumblebee-bugreport.in $(relnotes) version.sh src/*.h \ ++ conf/bumblebee.conf.in \ ++ conf/xorg.conf.nouveau $(xconfd_DATA) \ ++ scripts/bash_completion/bumblebee \ ++ version.sh src/*.h \ + src/*/switching.h $(am__append_2) + bin_optirun_SOURCES = src/module.c src/bbconfig.c src/bblogger.c src/bbrun.c \ + src/bbsocket.c src/driver.c src/optirun.c src/bbsocketclient.c +@@ -309,12 +306,9 @@ + src/driver.c src/bumblebeed.c + + bin_bumblebeed_LDADD = ${x11_LIBS} ${libbsd_LIBS} ${glib_LIBS} -lrt +-dist_doc_DATA = $(relnotes) README.markdown +-bumblebeedconf_DATA = conf/bumblebee.conf conf/xorg.conf.nouveau conf/xorg.conf.nvidia ++bumblebeedconf_DATA = conf/bumblebee.conf conf/xorg.conf.nouveau + completiondir = $(sysconfdir)/bash_completion.d + completion_DATA = scripts/bash_completion/bumblebee +-@WITH_UDEV_RULES_TRUE@udevrulesdir = $(UDEV_RULES_DIR) +-@WITH_UDEV_RULES_TRUE@udevrules_DATA = conf/99-bumblebee-nvidia-dev.rules + do_subst = sed -e 's|[@]GITVERSION[@]|$(GITVERSION)|g' \ + -e 's|[@]CONF_XDISP[@]|$(CONF_XDISP)|g' \ + -e 's|[@]CONF_SOCKPATH[@]|$(CONF_SOCKPATH)|g' \ +diff -Nur bumblebee-3.1.orig/conf/bumblebee.conf.in bumblebee-3.1/conf/bumblebee.conf.in +--- bumblebee-3.1.orig/conf/bumblebee.conf.in 2013-02-21 17:03:35.526542613 -0200 ++++ bumblebee-3.1/conf/bumblebee.conf.in 2013-04-06 06:28:48.124159386 -0300 +@@ -17,8 +17,8 @@ + # be ignored. + NoEcoModeOverride=false + # The Driver used by Bumblebee server. If this value is not set (or empty), +-# auto-detection is performed. The available drivers are nvidia and nouveau +-# (See also the driver-specific sections below) ++# auto-detection is performed. The available driver is nouveau ++# (See also the driver-specific section below) + Driver=@CONF_DRIVER@ + + ## Client options. Will take effect on the next optirun executed. +@@ -44,18 +44,6 @@ + # none - disable PM completely + # https://github.com/Bumblebee-Project/Bumblebee/wiki/Comparison-of-PM-methods + +-## Section with nvidia driver specific options, only parsed if Driver=nvidia +-[driver-nvidia] +-# Module name to load, defaults to Driver if empty or unset +-KernelDriver=@CONF_DRIVER_MODULE_NVIDIA@ +-PMMethod=@CONF_PM_METHOD@ +-# colon-separated path to the nvidia libraries +-LibraryPath=@CONF_LDPATH_NVIDIA@ +-# comma-separated path of the directory containing nvidia_drv.so and the +-# default Xorg modules path +-XorgModulePath=@CONF_MODPATH_NVIDIA@ +-XorgConfFile=@BBCONFDIR@/xorg.conf.nvidia +- + ## Section with nouveau driver specific options, only parsed if Driver=nouveau + [driver-nouveau] + KernelDriver=nouveau -- cgit v1.1-4-g5e80 From df2ade532a433c084058ba06df2f18785f3844d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?coadde=20=5BM=C3=A1rcio=20Alexandre=20Silva=20Delgado=5D?= Date: Wed, 3 Sep 2014 19:50:54 -0300 Subject: rename to calibre --- libre/calibre-libre/PKGBUILD | 111 ------ libre/calibre-libre/calibre.install | 12 - libre/calibre-libre/libre.patch | 728 ------------------------------------ libre/calibre/PKGBUILD | 110 ++++++ libre/calibre/calibre.install | 12 + libre/calibre/libre.patch | 728 ++++++++++++++++++++++++++++++++++++ 6 files changed, 850 insertions(+), 851 deletions(-) delete mode 100644 libre/calibre-libre/PKGBUILD delete mode 100644 libre/calibre-libre/calibre.install delete mode 100644 libre/calibre-libre/libre.patch create mode 100644 libre/calibre/PKGBUILD create mode 100644 libre/calibre/calibre.install create mode 100644 libre/calibre/libre.patch diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD deleted file mode 100644 index c3fb79ade..000000000 --- a/libre/calibre-libre/PKGBUILD +++ /dev/null @@ -1,111 +0,0 @@ -# $Id: PKGBUILD 118049 2014-08-29 11:58:21Z jelle $ -# Maintainer (Arch): Jelle van der Waa -# Maintainer (Arch): Daniel Wallace -# Contributor (Arch): Giovanni Scafora -# Contributor (Arch): Petrov Roman -# Contributor (Arch): Andrea Fagiani -# Contributor (Arch): Larry Hajali -# Maintainer: André Silva - -_pkgname=calibre -pkgname=calibre-libre -pkgver=2.1.0 -pkgrel=1 -pkgdesc="Ebook management application, without nonfree decompression engine for RAR archives" -arch=('i686' 'x86_64' 'mips64el') -url="http://calibre-ebook.com/" -license=('GPL3') -depends=('python2-six' 'python2-dateutil' 'python2-cssutils' 'python2-cherrypy' - 'python2-mechanize' 'podofo' 'libwmf' - 'imagemagick' 'chmlib' 'python2-lxml' 'libusbx' - 'python2-pillow' 'shared-mime-info' 'python2-dnspython' - 'python2-pyqt5' 'python2-psutil' 'icu' 'libmtp' - 'python2-netifaces' 'python2-cssselect' 'python2-apsw' 'qt5-webkit' - 'qt5-svg' 'python2-chardet' 'python2-html5lib') -makedepends=('python2-pycountry' 'qt5-x11extras' ) -optdepends=('ipython2: to use calibre-debug') -replaces=($_pkgname) -conflicts=($_pkgname) -provides=($_pkgname=$pkgver) -install=calibre.install -mksource=("http://download.calibre-ebook.com/${pkgver}/calibre-${pkgver}.tar.xz") -source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz" - 'libre.patch') -mkmd5sums=('db212364419212846719a9d392878c16') -md5sums=('9c7c1c246d558a08c9a1f064ba7681f5' - '343162b9d1c97c0463d4919a8b9ac500') - -mksource(){ - cd "${srcdir}/${_pkgname}-${pkgver}" - - # Remove nonfree unRAR utility files from the source - rm -rv src/unrar -} - -prepare(){ - cd "${srcdir}/${_pkgname}-${pkgver}" - - # Remove nonfree rar/cbr support and references - rm -v src/calibre/{ebooks/metadata/rar.py,utils/unrar.{cpp,py}} - rm -v resources/images/mimetypes/{cbr,rar}.png - rm -v imgsrc/mimetypes/rar.svg - patch -Np1 -i "${srcdir}/libre.patch" - - # Remove unneeded files and libs - rm -rf resources/${_pkgname}-portable.* \ - src/six.py \ - src/cherrypy \ - src/html5lib \ - src/chardet - - sed -i "s/shlex.split(ldflags)/& + ['-fPIC']/" setup/extensions.py - #sed -i -e "s/ldflags = shlex.split(ldflags)/ldflags = shlex.split(ldflags) + ['-fPIC']/" setup/extensions.py - - # Use python2 - sed -i 's:\(env[ ]\+python$\|/usr/bin/python$\):\12:g' $(find . -regex ".*\.py\|.*\.recipe") - sed -i "/pyqt_sip_dir/ s:=.*:= '/usr/share/sip/Py2-PyQt5':" setup/build_environment.py - - # Desktop integration (e.g. enforce arch defaults) - sed -e "/self.create_uninstaller()/,/os.rmdir(config_dir)/d" \ - -e "/\(cc('xdg-icon-resource\|self.icon_resources.append\|'128'))\)/d" \ - -e "/render_img/ s/\('calibre-.*\.png'\)/os.path.join(dir, \1)/g" \ - -e "/dir, 'calibre-lrf.png'/i \ -\ dir = os.path.join(self.opts.staging_sharedir,'../pixmaps')\n\ -\ os.mkdir(dir)" \ - -e "/f = open/ s/\('calibre-.*\.desktop'\)/os.path.join(dir, \1)/g" \ - -e "/dir, 'calibre-lrfviewer.desktop'/i \ -\ dir = os.path.join(self.opts.staging_sharedir,'../applications')\n\ -\ os.mkdir(dir)" \ - -e "s/'ctc-posml'/'text' not in mt and 'pdf' not in mt and 'xhtml'/" \ - -e "s/^Name=calibre/Name=Calibre/g" \ - -i src/calibre/linux.py -} - -build() { - cd "${srcdir}/${_pkgname}-${pkgver}" - - LANG='en_US.UTF-8' python2 setup.py build - # LANG='en_US.UTF-8' python2 setup.py resources - - # Don't build translations since building them is broken badly - #LANG='en_US.UTF-8' python2 setup.py translations -} - -package() { - cd "${srcdir}/${_pkgname}-${pkgver}" - - # Fix the environment module location - sed -i -e "s|(prefix=.*)|(prefix='$pkgdir/usr')|g" setup/install.py - - install -d "${pkgdir}/usr/lib/python2.7/site-packages" \ - "${pkgdir}/usr/share/zsh/site-functions" - - LANG='en_US.UTF-8' python2 setup.py install --root="${pkgdir}" --prefix=/usr \ - --staging-bindir="${pkgdir}/usr/bin" \ - --staging-libdir="${pkgdir}/usr/lib" \ - --staging-sharedir="${pkgdir}/usr/share" - - # Compiling bytecode FS#33392 - python2 -m compileall "${pkgdir}/usr/lib/calibre/" - python2 -O -m compileall "${pkgdir}/usr/lib/calibre/" -} diff --git a/libre/calibre-libre/calibre.install b/libre/calibre-libre/calibre.install deleted file mode 100644 index 6210bd0ab..000000000 --- a/libre/calibre-libre/calibre.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - update-desktop-database -q - update-mime-database usr/share/mime &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/libre/calibre-libre/libre.patch b/libre/calibre-libre/libre.patch deleted file mode 100644 index 7f1bdb6ee..000000000 --- a/libre/calibre-libre/libre.patch +++ /dev/null @@ -1,728 +0,0 @@ -diff -Nur calibre-1.204.1.orig/resources/images.qrc calibre-1.204.1/resources/images.qrc ---- calibre-1.204.1.orig/resources/images.qrc 1989-12-31 22:00:00.000000000 -0200 -+++ calibre-1.204.1/resources/images.qrc 2014-08-03 19:38:32.047600280 -0300 -@@ -193,8 +193,6 @@ - images/mimetypes/svg.png - images/mimetypes/odt.png - images/mimetypes/epub.png --images/mimetypes/cbr.png --images/mimetypes/rar.png - images/mimetypes/tpz.png - images/mimetypes/djvu.png - images/mimetypes/computer.png -@@ -214,4 +212,4 @@ - images/mimetypes/html.png - images/mimetypes/lrx.png - -- -\ No newline at end of file -+ -diff -Nur calibre-1.204.1.orig/resources/mime.types calibre-1.204.1/resources/mime.types ---- calibre-1.204.1.orig/resources/mime.types 1989-12-31 22:00:00.000000000 -0200 -+++ calibre-1.204.1/resources/mime.types 2014-08-03 19:37:20.290255565 -0300 -@@ -137,7 +137,6 @@ - application/prs.nprend - application/prs.plucker - application/qsig --application/rar rar - application/rdf+xml rdf - application/reginfo+xml rif - application/relax-ng-compact-syntax rnc -@@ -849,7 +848,6 @@ - application/x-pkcs7-crl crl - application/x-python-code pyc pyo - application/x-quicktimeplayer qtl --application/x-rar-compressed rar - application/x-redhat-package-manager rpm - application/x-sh sh - application/x-shar shar -@@ -1372,7 +1370,6 @@ - application/x-kindle-application azw2 - application/x-mobi8-ebook azw3 - application/x-cbz cbz --application/x-cbr cbr - application/x-cb7 cb7 - application/x-koboreader-ebook kobo - image/wmf wmf -diff -Nur calibre-1.204.1.orig/session.vim calibre-1.204.1/session.vim ---- calibre-1.204.1.orig/session.vim 1989-12-31 22:00:00.000000000 -0200 -+++ calibre-1.204.1/session.vim 2014-08-03 19:37:20.290255565 -0300 -@@ -11,7 +11,6 @@ - \'/usr/include/freetype2', - \'/usr/include/fontconfig', - \'src/qtcurve/common', 'src/qtcurve', -- \'src/unrar', - \'src/qt-harfbuzz/src', - \'/usr/include/ImageMagick', - \] -diff -Nur calibre-1.204.1.orig/setup/extensions.py calibre-1.204.1/setup/extensions.py ---- calibre-1.204.1.orig/setup/extensions.py 1989-12-31 22:00:00.000000000 -0200 -+++ calibre-1.204.1/setup/extensions.py 2014-08-03 19:37:20.290255565 -0300 -@@ -229,24 +229,6 @@ - sip_files=['calibre/ebooks/pdf/render/qt_hack.sip'] - ), - -- Extension('unrar', -- ['unrar/%s.cpp'%(x.partition('.')[0]) for x in ''' -- rar.o strlist.o strfn.o pathfn.o savepos.o smallfn.o global.o file.o -- filefn.o filcreat.o archive.o arcread.o unicode.o system.o -- isnt.o crypt.o crc.o rawread.o encname.o resource.o match.o -- timefn.o rdwrfn.o consio.o options.o ulinks.o errhnd.o rarvm.o -- secpassword.o rijndael.o getbits.o sha1.o extinfo.o extract.o -- volume.o list.o find.o unpack.o cmddata.o filestr.o scantree.o -- '''.split()] + ['calibre/utils/unrar.cpp'], -- inc_dirs=['unrar'], -- cflags=[('/' if iswindows else '-') + x for x in ( -- 'DSILENT', 'DRARDLL', 'DUNRAR')] + ( -- [] if iswindows else ['-D_FILE_OFFSET_BITS=64', -- '-D_LARGEFILE_SOURCE']), -- optimize_level=2, -- libraries=['User32', 'Advapi32', 'kernel32', 'Shell32'] if iswindows else [] -- ), -- - ] - - -diff -Nur calibre-1.204.1.orig/setup/installer/windows/freeze.py calibre-1.204.1/setup/installer/windows/freeze.py ---- calibre-1.204.1.orig/setup/installer/windows/freeze.py 1989-12-31 22:00:00.000000000 -0200 -+++ calibre-1.204.1/setup/installer/windows/freeze.py 2014-08-03 19:37:20.290255565 -0300 -@@ -672,7 +672,7 @@ - # Because of https://github.com/fancycode/MemoryModule/issues/4 - # any extensions that use C++ exceptions must be loaded - # from files -- 'unrar.pyd', 'wpd.pyd', 'podofo.pyd', -+ 'wpd.pyd', 'podofo.pyd', - 'progress_indicator.pyd', 'hunspell.pyd', - # As per this https://bugs.launchpad.net/bugs/1087816 - # on some systems magick.pyd fails to load from memory -diff -Nur calibre-1.204.1.orig/setup/resources.py calibre-1.204.1/setup/resources.py ---- calibre-1.204.1.orig/setup/resources.py 1989-12-31 22:00:00.000000000 -0200 -+++ calibre-1.204.1/setup/resources.py 2014-08-03 19:37:20.290255565 -0300 -@@ -280,7 +280,7 @@ - log = Log() - # log.outputs = [] - for inf in supported_input_formats(): -- if inf in ('zip', 'rar', 'oebzip'): -+ if inf in ('zip', 'oebzip'): - continue - for ouf in available_output_formats(): - of = ouf if ouf == 'oeb' else 'dummy.'+ouf -diff -Nur calibre-1.204.1.orig/src/calibre/__init__.py calibre-1.204.1/src/calibre/__init__.py ---- calibre-1.204.1.orig/src/calibre/__init__.py 1989-12-31 22:00:00.000000000 -0200 -+++ calibre-1.204.1/src/calibre/__init__.py 2014-08-03 19:37:20.290255565 -0300 -@@ -271,10 +271,7 @@ - # First use the file header to identify its type - with open(path, 'rb') as f: - id_ = f.read(3) -- if id_ == b'Rar': -- from calibre.utils.unrar import extract as rarextract -- extractor = rarextract -- elif id_.startswith(b'PK'): -+ if id_.startswith(b'PK'): - from calibre.libunzip import extract as zipextract - extractor = zipextract - if extractor is None: -@@ -283,9 +280,6 @@ - if ext in ['zip', 'cbz', 'epub', 'oebzip']: - from calibre.libunzip import extract as zipextract - extractor = zipextract -- elif ext in ['cbr', 'rar']: -- from calibre.utils.unrar import extract as rarextract -- extractor = rarextract - if extractor is None: - raise Exception('Unknown archive type') - extractor(path, dir) -diff -Nur calibre-1.204.1.orig/src/calibre/constants.py calibre-1.204.1/src/calibre/constants.py ---- calibre-1.204.1.orig/src/calibre/constants.py 1989-12-31 22:00:00.000000000 -0200 -+++ calibre-1.204.1/src/calibre/constants.py 2014-08-03 19:37:20.290255565 -0300 -@@ -138,7 +138,6 @@ - 'html', - 'freetype', - 'woff', -- 'unrar', - 'qt_hack', - '_regex', - 'hunspell', -diff -Nur calibre-1.204.1.orig/src/calibre/customize/builtins.py calibre-1.204.1/src/calibre/customize/builtins.py ---- calibre-1.204.1.orig/src/calibre/customize/builtins.py 1989-12-31 22:00:00.000000000 -0200 -+++ calibre-1.204.1/src/calibre/customize/builtins.py 2014-08-03 19:37:20.290255565 -0300 -@@ -127,7 +127,7 @@ - class ComicMetadataReader(MetadataReaderPlugin): - - name = 'Read comic metadata' -- file_types = set(['cbr', 'cbz']) -+ file_types = set(['cbz']) - description = _('Extract cover from comic files') - - def customization_help(self, gui=False): -@@ -138,14 +138,8 @@ - pos = stream.tell() - id_ = stream.read(3) - stream.seek(pos) -- if id_ == b'Rar': -- ftype = 'cbr' -- elif id_.startswith(b'PK'): -+ if id_.startswith(b'PK'): - ftype = 'cbz' -- if ftype == 'cbr': -- from calibre.utils.unrar import extract_first_alphabetically as extract_first -- extract_first -- else: - from calibre.libunzip import extract_member - extract_first = functools.partial(extract_member, - sort_alphabetically=True) -@@ -153,7 +147,7 @@ - ret = extract_first(stream) - mi = MetaInformation(None, None) - stream.seek(0) -- if ftype in {'cbr', 'cbz'}: -+ if ftype in {'cbz'}: - series_index = self.site_customization - if series_index not in {'volume', 'issue'}: - series_index = 'volume' -@@ -336,16 +330,6 @@ - from calibre.ebooks.metadata.pml import get_metadata - return get_metadata(stream) - --class RARMetadataReader(MetadataReaderPlugin): -- -- name = 'Read RAR metadata' -- file_types = set(['rar']) -- description = _('Read metadata from ebooks in RAR archives') -- -- def get_metadata(self, stream, ftype): -- from calibre.ebooks.metadata.rar import get_metadata -- return get_metadata(stream) -- - class RBMetadataReader(MetadataReaderPlugin): - - name = 'Read RB metadata' -diff -Nur calibre-1.204.1.orig/src/calibre/customize/ui.py calibre-1.204.1/src/calibre/customize/ui.py ---- calibre-1.204.1.orig/src/calibre/customize/ui.py 1989-12-31 22:00:00.000000000 -0200 -+++ calibre-1.204.1/src/calibre/customize/ui.py 2014-08-03 19:37:20.290255565 -0300 -@@ -440,7 +440,7 @@ - if not is_disabled(plugin): - for format in plugin.file_types: - formats.add(format) -- formats.add('zip'), formats.add('rar') -+ formats.add('zip') - return formats - - -diff -Nur calibre-1.204.1.orig/src/calibre/devices/kobo/driver.py calibre-1.204.1/src/calibre/devices/kobo/driver.py ---- calibre-1.204.1.orig/src/calibre/devices/kobo/driver.py 1989-12-31 22:00:00.000000000 -0200 -+++ calibre-1.204.1/src/calibre/devices/kobo/driver.py 2014-08-03 19:37:20.290255565 -0300 -@@ -77,7 +77,7 @@ - book_class = Book - - # Ordered list of supported formats -- FORMATS = ['kepub', 'epub', 'pdf', 'txt', 'cbz', 'cbr'] -+ FORMATS = ['kepub', 'epub', 'pdf', 'txt', 'cbz'] - CAN_SET_METADATA = ['collections'] - - VENDOR_ID = [0x2237] -diff -Nur calibre-1.204.1.orig/src/calibre/devices/mtp/filesystem_cache.py calibre-1.204.1/src/calibre/devices/mtp/filesystem_cache.py ---- calibre-1.204.1.orig/src/calibre/devices/mtp/filesystem_cache.py 1989-12-31 22:00:00.000000000 -0200 -+++ calibre-1.204.1/src/calibre/devices/mtp/filesystem_cache.py 2014-08-03 19:37:20.290255565 -0300 -@@ -18,7 +18,7 @@ - from calibre.utils.icu import sort_key, lower - from calibre.ebooks import BOOK_EXTENSIONS - --bexts = frozenset(BOOK_EXTENSIONS) - {'mbp', 'tan', 'rar', 'zip', 'xml'} -+bexts = frozenset(BOOK_EXTENSIONS) - {'mbp', 'tan', 'zip', 'xml'} - - class FileOrFolder(object): - -diff -Nur calibre-1.204.1.orig/src/calibre/ebooks/__init__.py calibre-1.204.1/src/calibre/ebooks/__init__.py ---- calibre-1.204.1.orig/src/calibre/ebooks/__init__.py 1989-12-31 22:00:00.000000000 -0200 -+++ calibre-1.204.1/src/calibre/ebooks/__init__.py 2014-08-03 19:37:20.290255565 -0300 -@@ -26,9 +26,9 @@ - class ParserError(ValueError): - pass - --BOOK_EXTENSIONS = ['lrf', 'rar', 'zip', 'rtf', 'lit', 'txt', 'txtz', 'text', 'htm', 'xhtm', -+BOOK_EXTENSIONS = ['lrf', 'zip', 'rtf', 'lit', 'txt', 'txtz', 'text', 'htm', 'xhtm', - 'html', 'htmlz', 'xhtml', 'pdf', 'pdb', 'updb', 'pdr', 'prc', 'mobi', 'azw', 'doc', -- 'epub', 'fb2', 'djv', 'djvu', 'lrx', 'cbr', 'cbz', 'cbc', 'oebzip', -+ 'epub', 'fb2', 'djv', 'djvu', 'lrx', 'cbz', 'cbc', 'oebzip', - 'rb', 'imp', 'odt', 'chm', 'tpz', 'azw1', 'pml', 'pmlz', 'mbp', 'tan', 'snb', - 'xps', 'oxps', 'azw4', 'book', 'zbf', 'pobi', 'docx', 'docm', 'md', - 'textile', 'markdown', 'ibook', 'ibooks', 'iba', 'azw3', 'ps', 'kepub'] -diff -Nur calibre-1.204.1.orig/src/calibre/ebooks/conversion/plugins/comic_input.py calibre-1.204.1/src/calibre/ebooks/conversion/plugins/comic_input.py ---- calibre-1.204.1.orig/src/calibre/ebooks/conversion/plugins/comic_input.py 1989-12-31 22:00:00.000000000 -0200 -+++ calibre-1.204.1/src/calibre/ebooks/conversion/plugins/comic_input.py 2014-08-03 19:37:20.290255565 -0300 -@@ -17,8 +17,8 @@ - - name = 'Comic Input' - author = 'Kovid Goyal' -- description = 'Optimize comic files (.cbz, .cbr, .cbc) for viewing on portable devices' -- file_types = set(['cbz', 'cbr', 'cbc']) -+ description = 'Optimize comic files (.cbz, .cbc) for viewing on portable devices' -+ file_types = set(['cbz', 'cbc']) - is_image_collection = True - core_usage = -1 - -diff -Nur calibre-1.204.1.orig/src/calibre/ebooks/conversion/plumber.py calibre-1.204.1/src/calibre/ebooks/conversion/plumber.py ---- calibre-1.204.1.orig/src/calibre/ebooks/conversion/plumber.py 1989-12-31 22:00:00.000000000 -0200 -+++ calibre-1.204.1/src/calibre/ebooks/conversion/plumber.py 2014-08-03 19:37:20.290255565 -0300 -@@ -42,7 +42,7 @@ - - def supported_input_formats(): - fmts = available_input_formats() -- for x in ('zip', 'rar', 'oebzip'): -+ for x in ('zip', 'oebzip'): - fmts.add(x) - return fmts - -@@ -60,7 +60,7 @@ - (self.global_max - self.global_min) - self.global_reporter(global_frac, msg) - --ARCHIVE_FMTS = ('zip', 'rar', 'oebzip') -+ARCHIVE_FMTS = ('zip', 'oebzip') - - class Plumber(object): - ''' -diff -Nur calibre-1.204.1.orig/src/calibre/ebooks/metadata/archive.py calibre-1.204.1/src/calibre/ebooks/metadata/archive.py ---- calibre-1.204.1.orig/src/calibre/ebooks/metadata/archive.py 1989-12-31 22:00:00.000000000 -0200 -+++ calibre-1.204.1/src/calibre/ebooks/metadata/archive.py 2014-08-03 19:37:20.290255565 -0300 -@@ -27,8 +27,6 @@ - ans = None - if id_ == stringFileHeader: - ans = 'zip' -- elif id_.startswith('Rar'): -- ans = 'rar' - try: - stream.seek(pos) - except: -@@ -40,29 +38,20 @@ - name = 'Archive Extract' - author = 'Kovid Goyal' - description = _('Extract common e-book formats from archives ' -- '(zip/rar) files. Also try to autodetect if they are actually ' -- 'cbz/cbr files.') -- file_types = set(['zip', 'rar']) -+ 'zip files. Also try to autodetect if they are actually ' -+ 'cbz files.') -+ file_types = set(['zip']) - supported_platforms = ['windows', 'osx', 'linux'] - on_import = True - - def run(self, archive): - from calibre.utils.zipfile import ZipFile -- is_rar = archive.lower().endswith('.rar') -- if is_rar: -- from calibre.utils.unrar import extract_member, names -- else: -- zf = ZipFile(archive, 'r') -- -- if is_rar: -- with open(archive, 'rb') as rf: -- fnames = list(names(rf)) -- else: -- fnames = zf.namelist() -+ zf = ZipFile(archive, 'r') -+ fnames = zf.namelist() - - fnames = [x for x in fnames if '.' in x and x.lower().rpartition('/')[-1] != 'thumbs.db'] - if is_comic(fnames): -- ext = '.cbr' if is_rar else '.cbz' -+ ext = '.cbz' - of = self.temporary_file('_archive_extract'+ext) - with open(archive, 'rb') as f: - of.write(f.read()) -@@ -78,12 +67,7 @@ - - of = self.temporary_file('_archive_extract.'+ext) - with closing(of): -- if is_rar: -- with open(archive, 'rb') as f: -- data = extract_member(f, match=None, name=fname)[1] -- of.write(data) -- else: -- of.write(zf.read(fname)) -+ of.write(zf.read(fname)) - return of.name - - def get_comic_book_info(d, mi, series_index='volume'): -@@ -141,10 +125,6 @@ - from calibre.utils.zipfile import ZipFile - zf = ZipFile(stream) - comment = zf.comment -- elif stream_type == 'cbr': -- from calibre.utils.unrar import RARFile -- f = RARFile(stream, get_comment=True) -- comment = f.comment - - if comment: - import json -diff -Nur calibre-1.204.1.orig/src/calibre/ebooks/oeb/iterator/book.py calibre-1.204.1/src/calibre/ebooks/oeb/iterator/book.py ---- calibre-1.204.1.orig/src/calibre/ebooks/oeb/iterator/book.py 1989-12-31 22:00:00.000000000 -0200 -+++ calibre-1.204.1/src/calibre/ebooks/oeb/iterator/book.py 2014-08-03 19:37:20.290255565 -0300 -@@ -126,7 +126,7 @@ - self.spine = [] - Spiny = partial(SpineItem, read_anchor_map=read_anchor_map, - run_char_count=run_char_count, from_epub=self.book_format == 'EPUB') -- is_comic = plumber.input_fmt.lower() in {'cbc', 'cbz', 'cbr', 'cb7'} -+ is_comic = plumber.input_fmt.lower() in {'cbc', 'cbz', 'cb7'} - for i in ordered: - spath = i.path - mt = None -diff -Nur calibre-1.204.1.orig/src/calibre/gui2/__init__.py calibre-1.204.1/src/calibre/gui2/__init__.py ---- calibre-1.204.1.orig/src/calibre/gui2/__init__.py 1989-12-31 22:00:00.000000000 -0200 -+++ calibre-1.204.1/src/calibre/gui2/__init__.py 2014-08-03 19:37:20.290255565 -0300 -@@ -497,7 +497,6 @@ - 'png' : 'png', - 'bmp' : 'bmp', - 'cbz' : 'cbz', -- 'cbr' : 'cbr', - 'svg' : 'svg', - 'html' : 'html', - 'htmlz' : 'html', -@@ -509,7 +508,6 @@ - 'lrx' : 'lrx', - 'pdf' : 'pdf', - 'pdr' : 'zero', -- 'rar' : 'rar', - 'zip' : 'zip', - 'txt' : 'txt', - 'text' : 'txt', -diff -Nur calibre-1.204.1.orig/src/calibre/gui2/actions/add.py calibre-1.204.1/src/calibre/gui2/actions/add.py ---- calibre-1.204.1.orig/src/calibre/gui2/actions/add.py 1989-12-31 22:00:00.000000000 -0200 -+++ calibre-1.204.1/src/calibre/gui2/actions/add.py 2014-08-03 19:37:20.293588940 -0300 -@@ -39,8 +39,8 @@ - (_('Text books'), ['txt', 'text', 'rtf']), - (_('PDF Books'), ['pdf', 'azw4']), - (_('SNB Books'), ['snb']), -- (_('Comics'), ['cbz', 'cbr', 'cbc']), -- (_('Archives'), ['zip', 'rar']), -+ (_('Comics'), ['cbz', 'cbc']), -+ (_('Archives'), ['zip']), - (_('Wordprocessor files'), ['odt', 'doc', 'docx']), - ] - -@@ -67,7 +67,7 @@ - 'sub directories (Multiple books per directory, assumes every ' - 'ebook file is a different book)')).triggered.connect( - self.add_recursive_multiple) -- arm = self.add_archive_menu = self.add_menu.addMenu(_('Add multiple books from archive (ZIP/RAR)')) -+ arm = self.add_archive_menu = self.add_menu.addMenu(_('Add multiple books from archive (ZIP)')) - self.create_menu_action(arm, 'recursive-single-archive', _( - 'One book per directory in the archive')).triggered.connect(partial(self.add_archive, True)) - self.create_menu_action(arm, 'recursive-multiple-archive', _( -@@ -145,7 +145,7 @@ - def add_archive(self, single): - paths = choose_files( - self.gui, 'recursive-archive-add', _('Choose archive file'), -- filters=[(_('Archives'), ('zip', 'rar'))], all_files=False, select_only_single_file=True) -+ filters=[(_('Archives'), ('zip'))], all_files=False, select_only_single_file=True) - if paths: - self.do_add_recursive(paths[0], single) - -diff -Nur calibre-1.204.1.orig/src/calibre/gui2/add.py calibre-1.204.1/src/calibre/gui2/add.py ---- calibre-1.204.1.orig/src/calibre/gui2/add.py 1989-12-31 22:00:00.000000000 -0200 -+++ calibre-1.204.1/src/calibre/gui2/add.py 2014-08-03 19:37:20.293588940 -0300 -@@ -84,11 +84,8 @@ - prints('Corrupt ZIP file, trying to use local headers') - from calibre.utils.localunzip import extractall - extractall(self.path, self.tdir) -- elif self.path.lower().endswith('.rar'): -- from calibre.utils.unrar import extract -- extract(self.path, self.tdir) - else: -- raise ValueError('Can only process ZIP or RAR archives') -+ raise ValueError('Can only process ZIP archives') - - def run(self): - if self.tdir is not None: -@@ -292,7 +289,7 @@ - self.pd.canceled_signal.connect(self.canceled) - - def add_recursive(self, root, single=True): -- if os.path.exists(root) and os.path.isfile(root) and root.lower().rpartition('.')[-1] in {'zip', 'rar'}: -+ if os.path.exists(root) and os.path.isfile(root) and root.lower().rpartition('.')[-1] in {'zip'}: - self.path = tdir = PersistentTemporaryDirectory('_arcv_') - else: - self.path = root -diff -Nur calibre-1.204.1.orig/src/calibre/library/server/opds.py calibre-1.204.1/src/calibre/library/server/opds.py ---- calibre-1.204.1.orig/src/calibre/library/server/opds.py 1989-12-31 22:00:00.000000000 -0200 -+++ calibre-1.204.1/src/calibre/library/server/opds.py 2014-08-03 19:37:20.293588940 -0300 -@@ -29,7 +29,7 @@ - 1 : '/opds', - } - --STANZA_FORMATS = frozenset(['epub', 'pdb', 'pdf', 'cbr', 'cbz', 'djvu']) -+STANZA_FORMATS = frozenset(['epub', 'pdb', 'pdf', 'cbz', 'djvu']) - - def url_for(name, version, **kwargs): - if not name.endswith('_'): -diff -Nur calibre-1.204.1.orig/src/calibre/linux.py calibre-1.204.1/src/calibre/linux.py ---- calibre-1.204.1.orig/src/calibre/linux.py 1989-12-31 22:00:00.000000000 -0200 -+++ calibre-1.204.1/src/calibre/linux.py 2014-08-03 19:37:20.293588940 -0300 -@@ -316,7 +316,7 @@ - ): - for fmt in fmts: - is_input = group_title == input_group -- if is_input and fmt in {'rar', 'zip', 'oebzip'}: -+ if is_input and fmt in {'zip', 'oebzip'}: - continue - p = (get_parser(input_fmt=fmt) if is_input - else get_parser(output_fmt=fmt)) -diff -Nur calibre-1.204.1.orig/src/calibre/test_build.py calibre-1.204.1/src/calibre/test_build.py ---- calibre-1.204.1.orig/src/calibre/test_build.py 1989-12-31 22:00:00.000000000 -0200 -+++ calibre-1.204.1/src/calibre/test_build.py 2014-08-03 19:37:20.293588940 -0300 -@@ -139,11 +139,6 @@ - raise RuntimeError('PIL choked!') - print ('PIL OK!') - --def test_unrar(): -- from calibre.utils.unrar import test_basic -- test_basic() -- print ('Unrar OK!') -- - def test_ssl(): - import ssl - ssl -@@ -217,7 +212,6 @@ - test_sqlite() - test_apsw() - test_imaging() -- test_unrar() - test_icu() - test_woff() - test_qt() -diff -Nur calibre-1.204.1.orig/src/calibre/utils/search_query_parser.py calibre-1.204.1/src/calibre/utils/search_query_parser.py ---- calibre-1.204.1.orig/src/calibre/utils/search_query_parser.py 1989-12-31 22:00:00.000000000 -0200 -+++ calibre-1.204.1/src/calibre/utils/search_query_parser.py 2014-08-03 19:37:20.296922310 -0300 -@@ -445,16 +445,16 @@ - u'Tor Books', - u'lrf'], - 8: [u'Stalky and Co.', u'Rudyard Kipling', u'manybooks.net', u'lrf'], -- 9: [u'A Game of Thrones', u'George R. R. Martin', None, u'lrf,rar'], -- 10: [u'A Clash of Kings', u'George R. R. Martin', None, u'lrf,rar'], -- 11: [u'A Storm of Swords', u'George R. R. Martin', None, u'lrf,rar'], -+ 9: [u'A Game of Thrones', u'George R. R. Martin', None, u'lrf'], -+ 10: [u'A Clash of Kings', u'George R. R. Martin', None, u'lrf'], -+ 11: [u'A Storm of Swords', u'George R. R. Martin', None, u'lrf'], - 12: [u'Biggles - Pioneer Air Fighter', u'W. E. Johns', None, u'lrf,rtf'], - 13: [u'Biggles of the Camel Squadron', - u'W. E. Johns', - u'London:Thames, (1977)', - u'lrf,rtf'], -- 14: [u'A Feast for Crows', u'George R. R. Martin', None, u'lrf,rar'], -- 15: [u'Cryptonomicon', u'Neal Stephenson', None, u'lrf,rar'], -+ 14: [u'A Feast for Crows', u'George R. R. Martin', None, u'lrf'], -+ 15: [u'Cryptonomicon', u'Neal Stephenson', None, u'lrf'], - 16: [u'Quicksilver', u'Neal Stephenson', None, u'lrf,zip'], - 17: [u'The Comedies of William Shakespeare', - u'William Shakespeare', -@@ -469,15 +469,15 @@ - None, - u'lrf'], - 20: [u'An Ideal Husband', u'Oscar Wilde', u'manybooks.net', u'lrf'], -- 21: [u'Flight of the Nighthawks', u'Raymond E. Feist', None, u'lrf,rar'], -- 22: [u'Into a Dark Realm', u'Raymond E. Feist', None, u'lrf,rar'], -- 23: [u'The Sundering', u'Walter Jon Williams', None, u'lrf,rar'], -- 24: [u'The Praxis', u'Walter Jon Williams', None, u'lrf,rar'], -- 25: [u'Conventions of War', u'Walter Jon Williams', None, u'lrf,rar'], -- 26: [u'Banewreaker', u'Jacqueline Carey', None, u'lrf,rar'], -- 27: [u'Godslayer', u'Jacqueline Carey', None, u'lrf,rar'], -- 28: [u"Kushiel's Scion", u'Jacqueline Carey', None, u'lrf,rar'], -- 29: [u'Underworld', u'Don DeLillo', None, u'lrf,rar'], -+ 21: [u'Flight of the Nighthawks', u'Raymond E. Feist', None, u'lrf'], -+ 22: [u'Into a Dark Realm', u'Raymond E. Feist', None, u'lrf'], -+ 23: [u'The Sundering', u'Walter Jon Williams', None, u'lrf'], -+ 24: [u'The Praxis', u'Walter Jon Williams', None, u'lrf'], -+ 25: [u'Conventions of War', u'Walter Jon Williams', None, u'lrf'], -+ 26: [u'Banewreaker', u'Jacqueline Carey', None, u'lrf'], -+ 27: [u'Godslayer', u'Jacqueline Carey', None, u'lrf'], -+ 28: [u"Kushiel's Scion", u'Jacqueline Carey', None, u'lrf'], -+ 29: [u'Underworld', u'Don DeLillo', None, u'lrf'], - 30: [u'Genghis Khan and The Making of the Modern World', - u'Jack Weatherford Orc', - u'Three Rivers Press', -@@ -488,9 +488,9 @@ - u'lrf,zip'], - 32: [u'The Killer Angels', u'Michael Shaara', None, u'html,lrf'], - 33: [u'Band Of Brothers', u'Stephen E Ambrose', None, u'lrf,txt'], -- 34: [u'The Gates of Rome', u'Conn Iggulden', None, u'lrf,rar'], -+ 34: [u'The Gates of Rome', u'Conn Iggulden', None, u'lrf'], - 35: [u'The Death of Kings', u'Conn Iggulden', u'Bantam Dell', u'lit,lrf'], -- 36: [u'The Field of Swords', u'Conn Iggulden', None, u'lrf,rar'], -+ 36: [u'The Field of Swords', u'Conn Iggulden', None, u'lrf'], - 37: [u'Masterman Ready', u'Marryat, Captain Frederick', None, u'lrf'], - 38: [u'With the Lightnings', - u'David Drake', -@@ -503,16 +503,16 @@ - 40: [u'The Far Side of The Stars', - u'David Drake', - u'Baen Publishing Enterprises', -- u'lrf,rar'], -+ u'lrf'], - 41: [u'The Way to Glory', - u'David Drake', - u'Baen Publishing Enterprises', -- u'lrf,rar'], -- 42: [u'Some Golden Harbor', u'David Drake', u'Baen Books', u'lrf,rar'], -+ u'lrf'], -+ 42: [u'Some Golden Harbor', u'David Drake', u'Baen Books', u'lrf'], - 43: [u'Harry Potter And The Half-Blood Prince', - u'J. K. Rowling', - None, -- u'lrf,rar'], -+ u'lrf'], - 44: [u'Harry Potter and the Order of the Phoenix', - u'J. K. Rowling', - None, -@@ -521,12 +521,12 @@ - 46: [u'The Stars at War II', - u'Steve White', - u'Baen Publishing Enterprises', -- u'lrf,rar'], -- 47: [u'Exodus', u'Steve White,Shirley Meier', u'Baen Books', u'lrf,rar'], -+ u'lrf'], -+ 47: [u'Exodus', u'Steve White,Shirley Meier', u'Baen Books', u'lrf'], - 48: [u'Harry Potter and the Goblet of Fire', - u'J. K. Rowling', - None, -- u'lrf,rar'], -+ u'lrf'], - 49: [u'Harry Potter and the Prisoner of Azkaban', - u'J. K. Rowling', - None, -@@ -539,20 +539,20 @@ - u'J.K. Rowling', - None, - u'lit,lrf,pdf'], -- 52: [u"His Majesty's Dragon", u'Naomi Novik', None, u'lrf,rar'], -+ 52: [u"His Majesty's Dragon", u'Naomi Novik', None, u'lrf'], - 53: [u'Throne of Jade', u'Naomi Novik', u'Del Rey', u'lit,lrf'], -- 54: [u'Black Powder War', u'Naomi Novik', u'Del Rey', u'lrf,rar'], -+ 54: [u'Black Powder War', u'Naomi Novik', u'Del Rey', u'lrf'], - 55: [u'War and Peace', u'Leo Tolstoy', u'gutenberg.org', u'lrf,txt'], - 56: [u'Anna Karenina', u'Leo Tolstoy', u'gutenberg.org', u'lrf,txt'], - 57: [u'A Shorter History of Rome', - u'Eugene Lawrence,Sir William Smith', - u'gutenberg.org', - u'lrf,zip'], -- 58: [u'The Name of the Rose', u'Umberto Eco', None, u'lrf,rar'], -+ 58: [u'The Name of the Rose', u'Umberto Eco', None, u'lrf'], - 71: [u"Wind Rider's Oath", u'David Weber', u'Baen', u'lrf'], - 74: [u'Rally Cry', u'William R Forstchen', None, u'htm,lrf'], -- 86: [u'Empire of Ivory', u'Naomi Novik', None, u'lrf,rar'], -- 87: [u"Renegade's Magic", u'Robin Hobb', None, u'lrf,rar'], -+ 86: [u'Empire of Ivory', u'Naomi Novik', None, u'lrf'], -+ 87: [u"Renegade's Magic", u'Robin Hobb', None, u'lrf'], - 89: [u'Master and commander', - u"Patrick O'Brian", - u'Fontana,\n1971', -@@ -560,7 +560,7 @@ - 91: [u'A Companion to Wolves', - u'Sarah Monette,Elizabeth Beär', - None, -- u'lrf,rar'], -+ u'lrf'], - 92: [u'The Lions of al-Rassan', u'Guy Gavriel Kay', u'Eos', u'lit,lrf'], - 93: [u'Gardens of the Moon', u'Steven Erikson', u'Tor Fantasy', u'lit,lrf'], - 95: [u'The Master and Margarita', -@@ -584,7 +584,7 @@ - 144: [u'Atonement', - u'Ian McEwan', - u'New York : Nan A. Talese/Doubleday, 2002.', -- u'lrf,rar'], -+ u'lrf'], - 146: [u'1632', u'Eric Flint', u'Baen Books', u'lit,lrf'], - 147: [u'1633', u'David Weber,Eric Flint,Dru Blair', u'Baen', u'lit,lrf'], - 148: [u'1634: The Baltic War', -@@ -637,7 +637,7 @@ - 253: [u"Hunter's Run", - u'George R. R. Martin,Gardner Dozois,Daniel Abraham', - u'Eos', -- u'lrf,rar'], -+ u'lrf'], - 257: [u'Knife of Dreams', u'Robert Jordan', None, u'lit,lrf'], - 258: [u'Saturday', - u'Ian McEwan', -@@ -657,7 +657,7 @@ - u'New York : Random House, 2005.', - u'lit,lrf'], - 269: [u'Reap the Whirlwind', u'David Mack', u'Star Trek', u'lit,lrf'], -- 272: [u'Mistborn', u'Brandon Sanderson', u'Tor Fantasy', u'lrf,rar'], -+ 272: [u'Mistborn', u'Brandon Sanderson', u'Tor Fantasy', u'lrf'], - 273: [u'The Thousandfold Thought', - u'R. Scott Bakker', - u'Overlook TP', -@@ -665,17 +665,17 @@ - 276: [u'Elantris', - u'Brandon Sanderson', - u'New York : Tor, 2005.', -- u'lrf,rar'], -+ u'lrf'], - 291: [u'Sundiver', - u'David Brin', - u'New York : Bantam Books, 1995.', - u'lit,lrf'], -- 299: [u'Imperium', u'Robert Harris', u'Arrow', u'lrf,rar'], -+ 299: [u'Imperium', u'Robert Harris', u'Arrow', u'lrf'], - 300: [u'Startide Rising', u'David Brin', u'Bantam', u'htm,lrf'], - 301: [u'The Uplift War', u'David Brin', u'Spectra', u'lit,lrf'], -- 304: [u'Brightness Reef', u'David Brin', u'Orbit', u'lrf,rar'], -+ 304: [u'Brightness Reef', u'David Brin', u'Orbit', u'lrf'], - 305: [u"Infinity's Shore", u'David Brin', u'Spectra', u'txt'], -- 306: [u"Heaven's Reach", u'David Brin', u'Spectra', u'lrf,rar'], -+ 306: [u"Heaven's Reach", u'David Brin', u'Spectra', u'lrf'], - 325: [u"Foundation's Triumph", u'David Brin', u'Easton Press', u'lit,lrf'], - 327: [u'I am Charlotte Simmons', u'Tom Wolfe', u'Vintage', u'htm,lrf'], - 335: [u'The Currents of Space', u'Isaac Asimov', None, u'lit,lrf'], -@@ -705,15 +705,15 @@ - u'Aspect', - u'lit,lrf'], - 356: [u'The Naked God', u'Peter F. Hamilton', u'Aspect', u'lit,lrf'], -- 421: [u'A Shadow in Summer', u'Daniel Abraham', u'Tor Fantasy', u'lrf,rar'], -+ 421: [u'A Shadow in Summer', u'Daniel Abraham', u'Tor Fantasy', u'lrf'], - 427: [u'Lonesome Dove', u'Larry M\\cMurtry', None, u'lit,lrf'], - 440: [u'Ghost', u'John Ringo', u'Baen', u'lit,lrf'], - 441: [u'Kildar', u'John Ringo', u'Baen', u'lit,lrf'], -- 443: [u'Hidden Empire ', u'Kevin J. Anderson', u'Aspect', u'lrf,rar'], -+ 443: [u'Hidden Empire ', u'Kevin J. Anderson', u'Aspect', u'lrf'], - 444: [u'The Gun Seller', - u'Hugh Laurie', - u'Washington Square Press', -- u'lrf,rar'] -+ u'lrf'] - } - - tests = { -diff -Nur calibre-1.204.1.orig/src/calibre/web/feeds/feedparser.py calibre-1.204.1/src/calibre/web/feeds/feedparser.py ---- calibre-1.204.1.orig/src/calibre/web/feeds/feedparser.py 1989-12-31 22:00:00.000000000 -0200 -+++ calibre-1.204.1/src/calibre/web/feeds/feedparser.py 2014-08-03 19:37:20.296922310 -0300 -@@ -2081,7 +2081,7 @@ - EMAIL = 5 - - known_xfn_relationships = set(['contact', 'acquaintance', 'friend', 'met', 'co-worker', 'coworker', 'colleague', 'co-resident', 'coresident', 'neighbor', 'child', 'parent', 'sibling', 'brother', 'sister', 'spouse', 'wife', 'husband', 'kin', 'relative', 'muse', 'crush', 'date', 'sweetheart', 'me']) -- known_binary_extensions = set(['zip','rar','exe','gz','tar','tgz','tbz2','bz2','z','7z','dmg','img','sit','sitx','hqx','deb','rpm','bz2','jar','rar','iso','bin','msi','mp2','mp3','ogg','ogm','mp4','m4v','m4a','avi','wma','wmv']) -+ known_binary_extensions = set(['zip','exe','gz','tar','tgz','tbz2','bz2','z','7z','dmg','img','sit','sitx','hqx','deb','rpm','bz2','jar','iso','bin','msi','mp2','mp3','ogg','ogm','mp4','m4v','m4a','avi','wma','wmv']) - - def __init__(self, data, baseuri, encoding): - self.document = BeautifulSoup.BeautifulSoup(data) -diff -Nur calibre-1.204.1.orig/translations/calibre/main.pot calibre-1.204.1/translations/calibre/main.pot ---- calibre-1.204.1.orig/translations/calibre/main.pot 1989-12-31 22:00:00.000000000 -0200 -+++ calibre-1.204.1/translations/calibre/main.pot 2014-08-03 19:37:20.296922310 -0300 -@@ -3906,7 +3906,7 @@ - msgstr "" - - #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:42 --msgid "Extract common e-book formats from archives (zip/rar) files. Also try to autodetect if they are actually cbz/cbr files." -+msgid "Extract common e-book formats from archives (zip) files. Also try to autodetect if they are actually cbz files." - msgstr "" - - #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:644 -@@ -11087,7 +11087,7 @@ - msgstr "" - - #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:33 --msgid "Set defaults for conversion of comics (CBR/CBZ files)" -+msgid "Set defaults for conversion of comics (CBZ files)" - msgstr "" - - #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48 diff --git a/libre/calibre/PKGBUILD b/libre/calibre/PKGBUILD new file mode 100644 index 000000000..31c49b5e4 --- /dev/null +++ b/libre/calibre/PKGBUILD @@ -0,0 +1,110 @@ +# $Id: PKGBUILD 118049 2014-08-29 11:58:21Z jelle $ +# Maintainer (Arch): Jelle van der Waa +# Maintainer (Arch): Daniel Wallace +# Contributor (Arch): Giovanni Scafora +# Contributor (Arch): Petrov Roman +# Contributor (Arch): Andrea Fagiani +# Contributor (Arch): Larry Hajali +# Maintainer: André Silva + +pkgname=calibre +_pkgname=$pkgname-libre +pkgver=2.1.0 +pkgrel=1 +pkgdesc="Ebook management application, without nonfree decompression engine for RAR archives" +arch=('i686' 'x86_64' 'mips64el') +url="http://$pkgname-ebook.com/" +license=('GPL3') +depends=('python2-six' 'python2-dateutil' 'python2-cssutils' 'python2-cherrypy' + 'python2-mechanize' 'podofo' 'libwmf' + 'imagemagick' 'chmlib' 'python2-lxml' 'libusbx' + 'python2-pillow' 'shared-mime-info' 'python2-dnspython' + 'python2-pyqt5' 'python2-psutil' 'icu' 'libmtp' + 'python2-netifaces' 'python2-cssselect' 'python2-apsw' 'qt5-webkit' + 'qt5-svg' 'python2-chardet' 'python2-html5lib') +makedepends=('python2-pycountry' 'qt5-x11extras' ) +optdepends=("ipython2: to use $pkgname-debug") +replaces=($_pkgname) +conflicts=($_pkgname) +install=$pkgname.install +mksource=("http://download.$pkgname-ebook.com/${pkgver}/$pkgname-${pkgver}.tar.xz") +source=("https://repo.parabolagnulinux.org/other/${_pkgname}/${_pkgname}-${pkgver}.tar.xz" + 'libre.patch') +mkmd5sums=('db212364419212846719a9d392878c16') +md5sums=('9c7c1c246d558a08c9a1f064ba7681f5' + '343162b9d1c97c0463d4919a8b9ac500') + +mksource(){ + cd "${srcdir}/${pkgname}-${pkgver}" + + # Remove nonfree unRAR utility files from the source + rm -rv src/unrar +} + +prepare(){ + cd "${srcdir}/${_pkgname}-${pkgver}" + + # Remove nonfree rar/cbr support and references + rm -v src/$pkgname/{ebooks/metadata/rar.py,utils/unrar.{cpp,py}} + rm -v resources/images/mimetypes/{cbr,rar}.png + rm -v imgsrc/mimetypes/rar.svg + patch -Np1 -i "${srcdir}/libre.patch" + + # Remove unneeded files and libs + rm -rf resources/${pkgname}-portable.* \ + src/six.py \ + src/cherrypy \ + src/html5lib \ + src/chardet + + sed -i "s/shlex.split(ldflags)/& + ['-fPIC']/" setup/extensions.py + #sed -i -e "s/ldflags = shlex.split(ldflags)/ldflags = shlex.split(ldflags) + ['-fPIC']/" setup/extensions.py + + # Use python2 + sed -i 's:\(env[ ]\+python$\|/usr/bin/python$\):\12:g' $(find . -regex ".*\.py\|.*\.recipe") + sed -i "/pyqt_sip_dir/ s:=.*:= '/usr/share/sip/Py2-PyQt5':" setup/build_environment.py + + # Desktop integration (e.g. enforce arch defaults) + sed -e "/self.create_uninstaller()/,/os.rmdir(config_dir)/d" \ + -e "/\(cc('xdg-icon-resource\|self.icon_resources.append\|'128'))\)/d" \ + -e "/render_img/ s/\('calibre-.*\.png'\)/os.path.join(dir, \1)/g" \ + -e "/dir, 'calibre-lrf.png'/i \ +\ dir = os.path.join(self.opts.staging_sharedir,'../pixmaps')\n\ +\ os.mkdir(dir)" \ + -e "/f = open/ s/\('calibre-.*\.desktop'\)/os.path.join(dir, \1)/g" \ + -e "/dir, 'calibre-lrfviewer.desktop'/i \ +\ dir = os.path.join(self.opts.staging_sharedir,'../applications')\n\ +\ os.mkdir(dir)" \ + -e "s/'ctc-posml'/'text' not in mt and 'pdf' not in mt and 'xhtml'/" \ + -e "s/^Name=calibre/Name=Calibre/g" \ + -i src/$pkgname/linux.py +} + +build() { + cd "${srcdir}/${_pkgname}-${pkgver}" + + LANG='en_US.UTF-8' python2 setup.py build + # LANG='en_US.UTF-8' python2 setup.py resources + + # Don't build translations since building them is broken badly + #LANG='en_US.UTF-8' python2 setup.py translations +} + +package() { + cd "${srcdir}/${_pkgname}-${pkgver}" + + # Fix the environment module location + sed -i -e "s|(prefix=.*)|(prefix='$pkgdir/usr')|g" setup/install.py + + install -d "${pkgdir}/usr/lib/python2.7/site-packages" \ + "${pkgdir}/usr/share/zsh/site-functions" + + LANG='en_US.UTF-8' python2 setup.py install --root="${pkgdir}" --prefix=/usr \ + --staging-bindir="${pkgdir}/usr/bin" \ + --staging-libdir="${pkgdir}/usr/lib" \ + --staging-sharedir="${pkgdir}/usr/share" + + # Compiling bytecode FS#33392 + python2 -m compileall "${pkgdir}/usr/lib/$pkgname/" + python2 -O -m compileall "${pkgdir}/usr/lib/$pkgname/" +} diff --git a/libre/calibre/calibre.install b/libre/calibre/calibre.install new file mode 100644 index 000000000..6210bd0ab --- /dev/null +++ b/libre/calibre/calibre.install @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/libre/calibre/libre.patch b/libre/calibre/libre.patch new file mode 100644 index 000000000..7f1bdb6ee --- /dev/null +++ b/libre/calibre/libre.patch @@ -0,0 +1,728 @@ +diff -Nur calibre-1.204.1.orig/resources/images.qrc calibre-1.204.1/resources/images.qrc +--- calibre-1.204.1.orig/resources/images.qrc 1989-12-31 22:00:00.000000000 -0200 ++++ calibre-1.204.1/resources/images.qrc 2014-08-03 19:38:32.047600280 -0300 +@@ -193,8 +193,6 @@ + images/mimetypes/svg.png + images/mimetypes/odt.png + images/mimetypes/epub.png +-images/mimetypes/cbr.png +-images/mimetypes/rar.png + images/mimetypes/tpz.png + images/mimetypes/djvu.png + images/mimetypes/computer.png +@@ -214,4 +212,4 @@ + images/mimetypes/html.png + images/mimetypes/lrx.png + +- +\ No newline at end of file ++ +diff -Nur calibre-1.204.1.orig/resources/mime.types calibre-1.204.1/resources/mime.types +--- calibre-1.204.1.orig/resources/mime.types 1989-12-31 22:00:00.000000000 -0200 ++++ calibre-1.204.1/resources/mime.types 2014-08-03 19:37:20.290255565 -0300 +@@ -137,7 +137,6 @@ + application/prs.nprend + application/prs.plucker + application/qsig +-application/rar rar + application/rdf+xml rdf + application/reginfo+xml rif + application/relax-ng-compact-syntax rnc +@@ -849,7 +848,6 @@ + application/x-pkcs7-crl crl + application/x-python-code pyc pyo + application/x-quicktimeplayer qtl +-application/x-rar-compressed rar + application/x-redhat-package-manager rpm + application/x-sh sh + application/x-shar shar +@@ -1372,7 +1370,6 @@ + application/x-kindle-application azw2 + application/x-mobi8-ebook azw3 + application/x-cbz cbz +-application/x-cbr cbr + application/x-cb7 cb7 + application/x-koboreader-ebook kobo + image/wmf wmf +diff -Nur calibre-1.204.1.orig/session.vim calibre-1.204.1/session.vim +--- calibre-1.204.1.orig/session.vim 1989-12-31 22:00:00.000000000 -0200 ++++ calibre-1.204.1/session.vim 2014-08-03 19:37:20.290255565 -0300 +@@ -11,7 +11,6 @@ + \'/usr/include/freetype2', + \'/usr/include/fontconfig', + \'src/qtcurve/common', 'src/qtcurve', +- \'src/unrar', + \'src/qt-harfbuzz/src', + \'/usr/include/ImageMagick', + \] +diff -Nur calibre-1.204.1.orig/setup/extensions.py calibre-1.204.1/setup/extensions.py +--- calibre-1.204.1.orig/setup/extensions.py 1989-12-31 22:00:00.000000000 -0200 ++++ calibre-1.204.1/setup/extensions.py 2014-08-03 19:37:20.290255565 -0300 +@@ -229,24 +229,6 @@ + sip_files=['calibre/ebooks/pdf/render/qt_hack.sip'] + ), + +- Extension('unrar', +- ['unrar/%s.cpp'%(x.partition('.')[0]) for x in ''' +- rar.o strlist.o strfn.o pathfn.o savepos.o smallfn.o global.o file.o +- filefn.o filcreat.o archive.o arcread.o unicode.o system.o +- isnt.o crypt.o crc.o rawread.o encname.o resource.o match.o +- timefn.o rdwrfn.o consio.o options.o ulinks.o errhnd.o rarvm.o +- secpassword.o rijndael.o getbits.o sha1.o extinfo.o extract.o +- volume.o list.o find.o unpack.o cmddata.o filestr.o scantree.o +- '''.split()] + ['calibre/utils/unrar.cpp'], +- inc_dirs=['unrar'], +- cflags=[('/' if iswindows else '-') + x for x in ( +- 'DSILENT', 'DRARDLL', 'DUNRAR')] + ( +- [] if iswindows else ['-D_FILE_OFFSET_BITS=64', +- '-D_LARGEFILE_SOURCE']), +- optimize_level=2, +- libraries=['User32', 'Advapi32', 'kernel32', 'Shell32'] if iswindows else [] +- ), +- + ] + + +diff -Nur calibre-1.204.1.orig/setup/installer/windows/freeze.py calibre-1.204.1/setup/installer/windows/freeze.py +--- calibre-1.204.1.orig/setup/installer/windows/freeze.py 1989-12-31 22:00:00.000000000 -0200 ++++ calibre-1.204.1/setup/installer/windows/freeze.py 2014-08-03 19:37:20.290255565 -0300 +@@ -672,7 +672,7 @@ + # Because of https://github.com/fancycode/MemoryModule/issues/4 + # any extensions that use C++ exceptions must be loaded + # from files +- 'unrar.pyd', 'wpd.pyd', 'podofo.pyd', ++ 'wpd.pyd', 'podofo.pyd', + 'progress_indicator.pyd', 'hunspell.pyd', + # As per this https://bugs.launchpad.net/bugs/1087816 + # on some systems magick.pyd fails to load from memory +diff -Nur calibre-1.204.1.orig/setup/resources.py calibre-1.204.1/setup/resources.py +--- calibre-1.204.1.orig/setup/resources.py 1989-12-31 22:00:00.000000000 -0200 ++++ calibre-1.204.1/setup/resources.py 2014-08-03 19:37:20.290255565 -0300 +@@ -280,7 +280,7 @@ + log = Log() + # log.outputs = [] + for inf in supported_input_formats(): +- if inf in ('zip', 'rar', 'oebzip'): ++ if inf in ('zip', 'oebzip'): + continue + for ouf in available_output_formats(): + of = ouf if ouf == 'oeb' else 'dummy.'+ouf +diff -Nur calibre-1.204.1.orig/src/calibre/__init__.py calibre-1.204.1/src/calibre/__init__.py +--- calibre-1.204.1.orig/src/calibre/__init__.py 1989-12-31 22:00:00.000000000 -0200 ++++ calibre-1.204.1/src/calibre/__init__.py 2014-08-03 19:37:20.290255565 -0300 +@@ -271,10 +271,7 @@ + # First use the file header to identify its type + with open(path, 'rb') as f: + id_ = f.read(3) +- if id_ == b'Rar': +- from calibre.utils.unrar import extract as rarextract +- extractor = rarextract +- elif id_.startswith(b'PK'): ++ if id_.startswith(b'PK'): + from calibre.libunzip import extract as zipextract + extractor = zipextract + if extractor is None: +@@ -283,9 +280,6 @@ + if ext in ['zip', 'cbz', 'epub', 'oebzip']: + from calibre.libunzip import extract as zipextract + extractor = zipextract +- elif ext in ['cbr', 'rar']: +- from calibre.utils.unrar import extract as rarextract +- extractor = rarextract + if extractor is None: + raise Exception('Unknown archive type') + extractor(path, dir) +diff -Nur calibre-1.204.1.orig/src/calibre/constants.py calibre-1.204.1/src/calibre/constants.py +--- calibre-1.204.1.orig/src/calibre/constants.py 1989-12-31 22:00:00.000000000 -0200 ++++ calibre-1.204.1/src/calibre/constants.py 2014-08-03 19:37:20.290255565 -0300 +@@ -138,7 +138,6 @@ + 'html', + 'freetype', + 'woff', +- 'unrar', + 'qt_hack', + '_regex', + 'hunspell', +diff -Nur calibre-1.204.1.orig/src/calibre/customize/builtins.py calibre-1.204.1/src/calibre/customize/builtins.py +--- calibre-1.204.1.orig/src/calibre/customize/builtins.py 1989-12-31 22:00:00.000000000 -0200 ++++ calibre-1.204.1/src/calibre/customize/builtins.py 2014-08-03 19:37:20.290255565 -0300 +@@ -127,7 +127,7 @@ + class ComicMetadataReader(MetadataReaderPlugin): + + name = 'Read comic metadata' +- file_types = set(['cbr', 'cbz']) ++ file_types = set(['cbz']) + description = _('Extract cover from comic files') + + def customization_help(self, gui=False): +@@ -138,14 +138,8 @@ + pos = stream.tell() + id_ = stream.read(3) + stream.seek(pos) +- if id_ == b'Rar': +- ftype = 'cbr' +- elif id_.startswith(b'PK'): ++ if id_.startswith(b'PK'): + ftype = 'cbz' +- if ftype == 'cbr': +- from calibre.utils.unrar import extract_first_alphabetically as extract_first +- extract_first +- else: + from calibre.libunzip import extract_member + extract_first = functools.partial(extract_member, + sort_alphabetically=True) +@@ -153,7 +147,7 @@ + ret = extract_first(stream) + mi = MetaInformation(None, None) + stream.seek(0) +- if ftype in {'cbr', 'cbz'}: ++ if ftype in {'cbz'}: + series_index = self.site_customization + if series_index not in {'volume', 'issue'}: + series_index = 'volume' +@@ -336,16 +330,6 @@ + from calibre.ebooks.metadata.pml import get_metadata + return get_metadata(stream) + +-class RARMetadataReader(MetadataReaderPlugin): +- +- name = 'Read RAR metadata' +- file_types = set(['rar']) +- description = _('Read metadata from ebooks in RAR archives') +- +- def get_metadata(self, stream, ftype): +- from calibre.ebooks.metadata.rar import get_metadata +- return get_metadata(stream) +- + class RBMetadataReader(MetadataReaderPlugin): + + name = 'Read RB metadata' +diff -Nur calibre-1.204.1.orig/src/calibre/customize/ui.py calibre-1.204.1/src/calibre/customize/ui.py +--- calibre-1.204.1.orig/src/calibre/customize/ui.py 1989-12-31 22:00:00.000000000 -0200 ++++ calibre-1.204.1/src/calibre/customize/ui.py 2014-08-03 19:37:20.290255565 -0300 +@@ -440,7 +440,7 @@ + if not is_disabled(plugin): + for format in plugin.file_types: + formats.add(format) +- formats.add('zip'), formats.add('rar') ++ formats.add('zip') + return formats + + +diff -Nur calibre-1.204.1.orig/src/calibre/devices/kobo/driver.py calibre-1.204.1/src/calibre/devices/kobo/driver.py +--- calibre-1.204.1.orig/src/calibre/devices/kobo/driver.py 1989-12-31 22:00:00.000000000 -0200 ++++ calibre-1.204.1/src/calibre/devices/kobo/driver.py 2014-08-03 19:37:20.290255565 -0300 +@@ -77,7 +77,7 @@ + book_class = Book + + # Ordered list of supported formats +- FORMATS = ['kepub', 'epub', 'pdf', 'txt', 'cbz', 'cbr'] ++ FORMATS = ['kepub', 'epub', 'pdf', 'txt', 'cbz'] + CAN_SET_METADATA = ['collections'] + + VENDOR_ID = [0x2237] +diff -Nur calibre-1.204.1.orig/src/calibre/devices/mtp/filesystem_cache.py calibre-1.204.1/src/calibre/devices/mtp/filesystem_cache.py +--- calibre-1.204.1.orig/src/calibre/devices/mtp/filesystem_cache.py 1989-12-31 22:00:00.000000000 -0200 ++++ calibre-1.204.1/src/calibre/devices/mtp/filesystem_cache.py 2014-08-03 19:37:20.290255565 -0300 +@@ -18,7 +18,7 @@ + from calibre.utils.icu import sort_key, lower + from calibre.ebooks import BOOK_EXTENSIONS + +-bexts = frozenset(BOOK_EXTENSIONS) - {'mbp', 'tan', 'rar', 'zip', 'xml'} ++bexts = frozenset(BOOK_EXTENSIONS) - {'mbp', 'tan', 'zip', 'xml'} + + class FileOrFolder(object): + +diff -Nur calibre-1.204.1.orig/src/calibre/ebooks/__init__.py calibre-1.204.1/src/calibre/ebooks/__init__.py +--- calibre-1.204.1.orig/src/calibre/ebooks/__init__.py 1989-12-31 22:00:00.000000000 -0200 ++++ calibre-1.204.1/src/calibre/ebooks/__init__.py 2014-08-03 19:37:20.290255565 -0300 +@@ -26,9 +26,9 @@ + class ParserError(ValueError): + pass + +-BOOK_EXTENSIONS = ['lrf', 'rar', 'zip', 'rtf', 'lit', 'txt', 'txtz', 'text', 'htm', 'xhtm', ++BOOK_EXTENSIONS = ['lrf', 'zip', 'rtf', 'lit', 'txt', 'txtz', 'text', 'htm', 'xhtm', + 'html', 'htmlz', 'xhtml', 'pdf', 'pdb', 'updb', 'pdr', 'prc', 'mobi', 'azw', 'doc', +- 'epub', 'fb2', 'djv', 'djvu', 'lrx', 'cbr', 'cbz', 'cbc', 'oebzip', ++ 'epub', 'fb2', 'djv', 'djvu', 'lrx', 'cbz', 'cbc', 'oebzip', + 'rb', 'imp', 'odt', 'chm', 'tpz', 'azw1', 'pml', 'pmlz', 'mbp', 'tan', 'snb', + 'xps', 'oxps', 'azw4', 'book', 'zbf', 'pobi', 'docx', 'docm', 'md', + 'textile', 'markdown', 'ibook', 'ibooks', 'iba', 'azw3', 'ps', 'kepub'] +diff -Nur calibre-1.204.1.orig/src/calibre/ebooks/conversion/plugins/comic_input.py calibre-1.204.1/src/calibre/ebooks/conversion/plugins/comic_input.py +--- calibre-1.204.1.orig/src/calibre/ebooks/conversion/plugins/comic_input.py 1989-12-31 22:00:00.000000000 -0200 ++++ calibre-1.204.1/src/calibre/ebooks/conversion/plugins/comic_input.py 2014-08-03 19:37:20.290255565 -0300 +@@ -17,8 +17,8 @@ + + name = 'Comic Input' + author = 'Kovid Goyal' +- description = 'Optimize comic files (.cbz, .cbr, .cbc) for viewing on portable devices' +- file_types = set(['cbz', 'cbr', 'cbc']) ++ description = 'Optimize comic files (.cbz, .cbc) for viewing on portable devices' ++ file_types = set(['cbz', 'cbc']) + is_image_collection = True + core_usage = -1 + +diff -Nur calibre-1.204.1.orig/src/calibre/ebooks/conversion/plumber.py calibre-1.204.1/src/calibre/ebooks/conversion/plumber.py +--- calibre-1.204.1.orig/src/calibre/ebooks/conversion/plumber.py 1989-12-31 22:00:00.000000000 -0200 ++++ calibre-1.204.1/src/calibre/ebooks/conversion/plumber.py 2014-08-03 19:37:20.290255565 -0300 +@@ -42,7 +42,7 @@ + + def supported_input_formats(): + fmts = available_input_formats() +- for x in ('zip', 'rar', 'oebzip'): ++ for x in ('zip', 'oebzip'): + fmts.add(x) + return fmts + +@@ -60,7 +60,7 @@ + (self.global_max - self.global_min) + self.global_reporter(global_frac, msg) + +-ARCHIVE_FMTS = ('zip', 'rar', 'oebzip') ++ARCHIVE_FMTS = ('zip', 'oebzip') + + class Plumber(object): + ''' +diff -Nur calibre-1.204.1.orig/src/calibre/ebooks/metadata/archive.py calibre-1.204.1/src/calibre/ebooks/metadata/archive.py +--- calibre-1.204.1.orig/src/calibre/ebooks/metadata/archive.py 1989-12-31 22:00:00.000000000 -0200 ++++ calibre-1.204.1/src/calibre/ebooks/metadata/archive.py 2014-08-03 19:37:20.290255565 -0300 +@@ -27,8 +27,6 @@ + ans = None + if id_ == stringFileHeader: + ans = 'zip' +- elif id_.startswith('Rar'): +- ans = 'rar' + try: + stream.seek(pos) + except: +@@ -40,29 +38,20 @@ + name = 'Archive Extract' + author = 'Kovid Goyal' + description = _('Extract common e-book formats from archives ' +- '(zip/rar) files. Also try to autodetect if they are actually ' +- 'cbz/cbr files.') +- file_types = set(['zip', 'rar']) ++ 'zip files. Also try to autodetect if they are actually ' ++ 'cbz files.') ++ file_types = set(['zip']) + supported_platforms = ['windows', 'osx', 'linux'] + on_import = True + + def run(self, archive): + from calibre.utils.zipfile import ZipFile +- is_rar = archive.lower().endswith('.rar') +- if is_rar: +- from calibre.utils.unrar import extract_member, names +- else: +- zf = ZipFile(archive, 'r') +- +- if is_rar: +- with open(archive, 'rb') as rf: +- fnames = list(names(rf)) +- else: +- fnames = zf.namelist() ++ zf = ZipFile(archive, 'r') ++ fnames = zf.namelist() + + fnames = [x for x in fnames if '.' in x and x.lower().rpartition('/')[-1] != 'thumbs.db'] + if is_comic(fnames): +- ext = '.cbr' if is_rar else '.cbz' ++ ext = '.cbz' + of = self.temporary_file('_archive_extract'+ext) + with open(archive, 'rb') as f: + of.write(f.read()) +@@ -78,12 +67,7 @@ + + of = self.temporary_file('_archive_extract.'+ext) + with closing(of): +- if is_rar: +- with open(archive, 'rb') as f: +- data = extract_member(f, match=None, name=fname)[1] +- of.write(data) +- else: +- of.write(zf.read(fname)) ++ of.write(zf.read(fname)) + return of.name + + def get_comic_book_info(d, mi, series_index='volume'): +@@ -141,10 +125,6 @@ + from calibre.utils.zipfile import ZipFile + zf = ZipFile(stream) + comment = zf.comment +- elif stream_type == 'cbr': +- from calibre.utils.unrar import RARFile +- f = RARFile(stream, get_comment=True) +- comment = f.comment + + if comment: + import json +diff -Nur calibre-1.204.1.orig/src/calibre/ebooks/oeb/iterator/book.py calibre-1.204.1/src/calibre/ebooks/oeb/iterator/book.py +--- calibre-1.204.1.orig/src/calibre/ebooks/oeb/iterator/book.py 1989-12-31 22:00:00.000000000 -0200 ++++ calibre-1.204.1/src/calibre/ebooks/oeb/iterator/book.py 2014-08-03 19:37:20.290255565 -0300 +@@ -126,7 +126,7 @@ + self.spine = [] + Spiny = partial(SpineItem, read_anchor_map=read_anchor_map, + run_char_count=run_char_count, from_epub=self.book_format == 'EPUB') +- is_comic = plumber.input_fmt.lower() in {'cbc', 'cbz', 'cbr', 'cb7'} ++ is_comic = plumber.input_fmt.lower() in {'cbc', 'cbz', 'cb7'} + for i in ordered: + spath = i.path + mt = None +diff -Nur calibre-1.204.1.orig/src/calibre/gui2/__init__.py calibre-1.204.1/src/calibre/gui2/__init__.py +--- calibre-1.204.1.orig/src/calibre/gui2/__init__.py 1989-12-31 22:00:00.000000000 -0200 ++++ calibre-1.204.1/src/calibre/gui2/__init__.py 2014-08-03 19:37:20.290255565 -0300 +@@ -497,7 +497,6 @@ + 'png' : 'png', + 'bmp' : 'bmp', + 'cbz' : 'cbz', +- 'cbr' : 'cbr', + 'svg' : 'svg', + 'html' : 'html', + 'htmlz' : 'html', +@@ -509,7 +508,6 @@ + 'lrx' : 'lrx', + 'pdf' : 'pdf', + 'pdr' : 'zero', +- 'rar' : 'rar', + 'zip' : 'zip', + 'txt' : 'txt', + 'text' : 'txt', +diff -Nur calibre-1.204.1.orig/src/calibre/gui2/actions/add.py calibre-1.204.1/src/calibre/gui2/actions/add.py +--- calibre-1.204.1.orig/src/calibre/gui2/actions/add.py 1989-12-31 22:00:00.000000000 -0200 ++++ calibre-1.204.1/src/calibre/gui2/actions/add.py 2014-08-03 19:37:20.293588940 -0300 +@@ -39,8 +39,8 @@ + (_('Text books'), ['txt', 'text', 'rtf']), + (_('PDF Books'), ['pdf', 'azw4']), + (_('SNB Books'), ['snb']), +- (_('Comics'), ['cbz', 'cbr', 'cbc']), +- (_('Archives'), ['zip', 'rar']), ++ (_('Comics'), ['cbz', 'cbc']), ++ (_('Archives'), ['zip']), + (_('Wordprocessor files'), ['odt', 'doc', 'docx']), + ] + +@@ -67,7 +67,7 @@ + 'sub directories (Multiple books per directory, assumes every ' + 'ebook file is a different book)')).triggered.connect( + self.add_recursive_multiple) +- arm = self.add_archive_menu = self.add_menu.addMenu(_('Add multiple books from archive (ZIP/RAR)')) ++ arm = self.add_archive_menu = self.add_menu.addMenu(_('Add multiple books from archive (ZIP)')) + self.create_menu_action(arm, 'recursive-single-archive', _( + 'One book per directory in the archive')).triggered.connect(partial(self.add_archive, True)) + self.create_menu_action(arm, 'recursive-multiple-archive', _( +@@ -145,7 +145,7 @@ + def add_archive(self, single): + paths = choose_files( + self.gui, 'recursive-archive-add', _('Choose archive file'), +- filters=[(_('Archives'), ('zip', 'rar'))], all_files=False, select_only_single_file=True) ++ filters=[(_('Archives'), ('zip'))], all_files=False, select_only_single_file=True) + if paths: + self.do_add_recursive(paths[0], single) + +diff -Nur calibre-1.204.1.orig/src/calibre/gui2/add.py calibre-1.204.1/src/calibre/gui2/add.py +--- calibre-1.204.1.orig/src/calibre/gui2/add.py 1989-12-31 22:00:00.000000000 -0200 ++++ calibre-1.204.1/src/calibre/gui2/add.py 2014-08-03 19:37:20.293588940 -0300 +@@ -84,11 +84,8 @@ + prints('Corrupt ZIP file, trying to use local headers') + from calibre.utils.localunzip import extractall + extractall(self.path, self.tdir) +- elif self.path.lower().endswith('.rar'): +- from calibre.utils.unrar import extract +- extract(self.path, self.tdir) + else: +- raise ValueError('Can only process ZIP or RAR archives') ++ raise ValueError('Can only process ZIP archives') + + def run(self): + if self.tdir is not None: +@@ -292,7 +289,7 @@ + self.pd.canceled_signal.connect(self.canceled) + + def add_recursive(self, root, single=True): +- if os.path.exists(root) and os.path.isfile(root) and root.lower().rpartition('.')[-1] in {'zip', 'rar'}: ++ if os.path.exists(root) and os.path.isfile(root) and root.lower().rpartition('.')[-1] in {'zip'}: + self.path = tdir = PersistentTemporaryDirectory('_arcv_') + else: + self.path = root +diff -Nur calibre-1.204.1.orig/src/calibre/library/server/opds.py calibre-1.204.1/src/calibre/library/server/opds.py +--- calibre-1.204.1.orig/src/calibre/library/server/opds.py 1989-12-31 22:00:00.000000000 -0200 ++++ calibre-1.204.1/src/calibre/library/server/opds.py 2014-08-03 19:37:20.293588940 -0300 +@@ -29,7 +29,7 @@ + 1 : '/opds', + } + +-STANZA_FORMATS = frozenset(['epub', 'pdb', 'pdf', 'cbr', 'cbz', 'djvu']) ++STANZA_FORMATS = frozenset(['epub', 'pdb', 'pdf', 'cbz', 'djvu']) + + def url_for(name, version, **kwargs): + if not name.endswith('_'): +diff -Nur calibre-1.204.1.orig/src/calibre/linux.py calibre-1.204.1/src/calibre/linux.py +--- calibre-1.204.1.orig/src/calibre/linux.py 1989-12-31 22:00:00.000000000 -0200 ++++ calibre-1.204.1/src/calibre/linux.py 2014-08-03 19:37:20.293588940 -0300 +@@ -316,7 +316,7 @@ + ): + for fmt in fmts: + is_input = group_title == input_group +- if is_input and fmt in {'rar', 'zip', 'oebzip'}: ++ if is_input and fmt in {'zip', 'oebzip'}: + continue + p = (get_parser(input_fmt=fmt) if is_input + else get_parser(output_fmt=fmt)) +diff -Nur calibre-1.204.1.orig/src/calibre/test_build.py calibre-1.204.1/src/calibre/test_build.py +--- calibre-1.204.1.orig/src/calibre/test_build.py 1989-12-31 22:00:00.000000000 -0200 ++++ calibre-1.204.1/src/calibre/test_build.py 2014-08-03 19:37:20.293588940 -0300 +@@ -139,11 +139,6 @@ + raise RuntimeError('PIL choked!') + print ('PIL OK!') + +-def test_unrar(): +- from calibre.utils.unrar import test_basic +- test_basic() +- print ('Unrar OK!') +- + def test_ssl(): + import ssl + ssl +@@ -217,7 +212,6 @@ + test_sqlite() + test_apsw() + test_imaging() +- test_unrar() + test_icu() + test_woff() + test_qt() +diff -Nur calibre-1.204.1.orig/src/calibre/utils/search_query_parser.py calibre-1.204.1/src/calibre/utils/search_query_parser.py +--- calibre-1.204.1.orig/src/calibre/utils/search_query_parser.py 1989-12-31 22:00:00.000000000 -0200 ++++ calibre-1.204.1/src/calibre/utils/search_query_parser.py 2014-08-03 19:37:20.296922310 -0300 +@@ -445,16 +445,16 @@ + u'Tor Books', + u'lrf'], + 8: [u'Stalky and Co.', u'Rudyard Kipling', u'manybooks.net', u'lrf'], +- 9: [u'A Game of Thrones', u'George R. R. Martin', None, u'lrf,rar'], +- 10: [u'A Clash of Kings', u'George R. R. Martin', None, u'lrf,rar'], +- 11: [u'A Storm of Swords', u'George R. R. Martin', None, u'lrf,rar'], ++ 9: [u'A Game of Thrones', u'George R. R. Martin', None, u'lrf'], ++ 10: [u'A Clash of Kings', u'George R. R. Martin', None, u'lrf'], ++ 11: [u'A Storm of Swords', u'George R. R. Martin', None, u'lrf'], + 12: [u'Biggles - Pioneer Air Fighter', u'W. E. Johns', None, u'lrf,rtf'], + 13: [u'Biggles of the Camel Squadron', + u'W. E. Johns', + u'London:Thames, (1977)', + u'lrf,rtf'], +- 14: [u'A Feast for Crows', u'George R. R. Martin', None, u'lrf,rar'], +- 15: [u'Cryptonomicon', u'Neal Stephenson', None, u'lrf,rar'], ++ 14: [u'A Feast for Crows', u'George R. R. Martin', None, u'lrf'], ++ 15: [u'Cryptonomicon', u'Neal Stephenson', None, u'lrf'], + 16: [u'Quicksilver', u'Neal Stephenson', None, u'lrf,zip'], + 17: [u'The Comedies of William Shakespeare', + u'William Shakespeare', +@@ -469,15 +469,15 @@ + None, + u'lrf'], + 20: [u'An Ideal Husband', u'Oscar Wilde', u'manybooks.net', u'lrf'], +- 21: [u'Flight of the Nighthawks', u'Raymond E. Feist', None, u'lrf,rar'], +- 22: [u'Into a Dark Realm', u'Raymond E. Feist', None, u'lrf,rar'], +- 23: [u'The Sundering', u'Walter Jon Williams', None, u'lrf,rar'], +- 24: [u'The Praxis', u'Walter Jon Williams', None, u'lrf,rar'], +- 25: [u'Conventions of War', u'Walter Jon Williams', None, u'lrf,rar'], +- 26: [u'Banewreaker', u'Jacqueline Carey', None, u'lrf,rar'], +- 27: [u'Godslayer', u'Jacqueline Carey', None, u'lrf,rar'], +- 28: [u"Kushiel's Scion", u'Jacqueline Carey', None, u'lrf,rar'], +- 29: [u'Underworld', u'Don DeLillo', None, u'lrf,rar'], ++ 21: [u'Flight of the Nighthawks', u'Raymond E. Feist', None, u'lrf'], ++ 22: [u'Into a Dark Realm', u'Raymond E. Feist', None, u'lrf'], ++ 23: [u'The Sundering', u'Walter Jon Williams', None, u'lrf'], ++ 24: [u'The Praxis', u'Walter Jon Williams', None, u'lrf'], ++ 25: [u'Conventions of War', u'Walter Jon Williams', None, u'lrf'], ++ 26: [u'Banewreaker', u'Jacqueline Carey', None, u'lrf'], ++ 27: [u'Godslayer', u'Jacqueline Carey', None, u'lrf'], ++ 28: [u"Kushiel's Scion", u'Jacqueline Carey', None, u'lrf'], ++ 29: [u'Underworld', u'Don DeLillo', None, u'lrf'], + 30: [u'Genghis Khan and The Making of the Modern World', + u'Jack Weatherford Orc', + u'Three Rivers Press', +@@ -488,9 +488,9 @@ + u'lrf,zip'], + 32: [u'The Killer Angels', u'Michael Shaara', None, u'html,lrf'], + 33: [u'Band Of Brothers', u'Stephen E Ambrose', None, u'lrf,txt'], +- 34: [u'The Gates of Rome', u'Conn Iggulden', None, u'lrf,rar'], ++ 34: [u'The Gates of Rome', u'Conn Iggulden', None, u'lrf'], + 35: [u'The Death of Kings', u'Conn Iggulden', u'Bantam Dell', u'lit,lrf'], +- 36: [u'The Field of Swords', u'Conn Iggulden', None, u'lrf,rar'], ++ 36: [u'The Field of Swords', u'Conn Iggulden', None, u'lrf'], + 37: [u'Masterman Ready', u'Marryat, Captain Frederick', None, u'lrf'], + 38: [u'With the Lightnings', + u'David Drake', +@@ -503,16 +503,16 @@ + 40: [u'The Far Side of The Stars', + u'David Drake', + u'Baen Publishing Enterprises', +- u'lrf,rar'], ++ u'lrf'], + 41: [u'The Way to Glory', + u'David Drake', + u'Baen Publishing Enterprises', +- u'lrf,rar'], +- 42: [u'Some Golden Harbor', u'David Drake', u'Baen Books', u'lrf,rar'], ++ u'lrf'], ++ 42: [u'Some Golden Harbor', u'David Drake', u'Baen Books', u'lrf'], + 43: [u'Harry Potter And The Half-Blood Prince', + u'J. K. Rowling', + None, +- u'lrf,rar'], ++ u'lrf'], + 44: [u'Harry Potter and the Order of the Phoenix', + u'J. K. Rowling', + None, +@@ -521,12 +521,12 @@ + 46: [u'The Stars at War II', + u'Steve White', + u'Baen Publishing Enterprises', +- u'lrf,rar'], +- 47: [u'Exodus', u'Steve White,Shirley Meier', u'Baen Books', u'lrf,rar'], ++ u'lrf'], ++ 47: [u'Exodus', u'Steve White,Shirley Meier', u'Baen Books', u'lrf'], + 48: [u'Harry Potter and the Goblet of Fire', + u'J. K. Rowling', + None, +- u'lrf,rar'], ++ u'lrf'], + 49: [u'Harry Potter and the Prisoner of Azkaban', + u'J. K. Rowling', + None, +@@ -539,20 +539,20 @@ + u'J.K. Rowling', + None, + u'lit,lrf,pdf'], +- 52: [u"His Majesty's Dragon", u'Naomi Novik', None, u'lrf,rar'], ++ 52: [u"His Majesty's Dragon", u'Naomi Novik', None, u'lrf'], + 53: [u'Throne of Jade', u'Naomi Novik', u'Del Rey', u'lit,lrf'], +- 54: [u'Black Powder War', u'Naomi Novik', u'Del Rey', u'lrf,rar'], ++ 54: [u'Black Powder War', u'Naomi Novik', u'Del Rey', u'lrf'], + 55: [u'War and Peace', u'Leo Tolstoy', u'gutenberg.org', u'lrf,txt'], + 56: [u'Anna Karenina', u'Leo Tolstoy', u'gutenberg.org', u'lrf,txt'], + 57: [u'A Shorter History of Rome', + u'Eugene Lawrence,Sir William Smith', + u'gutenberg.org', + u'lrf,zip'], +- 58: [u'The Name of the Rose', u'Umberto Eco', None, u'lrf,rar'], ++ 58: [u'The Name of the Rose', u'Umberto Eco', None, u'lrf'], + 71: [u"Wind Rider's Oath", u'David Weber', u'Baen', u'lrf'], + 74: [u'Rally Cry', u'William R Forstchen', None, u'htm,lrf'], +- 86: [u'Empire of Ivory', u'Naomi Novik', None, u'lrf,rar'], +- 87: [u"Renegade's Magic", u'Robin Hobb', None, u'lrf,rar'], ++ 86: [u'Empire of Ivory', u'Naomi Novik', None, u'lrf'], ++ 87: [u"Renegade's Magic", u'Robin Hobb', None, u'lrf'], + 89: [u'Master and commander', + u"Patrick O'Brian", + u'Fontana,\n1971', +@@ -560,7 +560,7 @@ + 91: [u'A Companion to Wolves', + u'Sarah Monette,Elizabeth Beär', + None, +- u'lrf,rar'], ++ u'lrf'], + 92: [u'The Lions of al-Rassan', u'Guy Gavriel Kay', u'Eos', u'lit,lrf'], + 93: [u'Gardens of the Moon', u'Steven Erikson', u'Tor Fantasy', u'lit,lrf'], + 95: [u'The Master and Margarita', +@@ -584,7 +584,7 @@ + 144: [u'Atonement', + u'Ian McEwan', + u'New York : Nan A. Talese/Doubleday, 2002.', +- u'lrf,rar'], ++ u'lrf'], + 146: [u'1632', u'Eric Flint', u'Baen Books', u'lit,lrf'], + 147: [u'1633', u'David Weber,Eric Flint,Dru Blair', u'Baen', u'lit,lrf'], + 148: [u'1634: The Baltic War', +@@ -637,7 +637,7 @@ + 253: [u"Hunter's Run", + u'George R. R. Martin,Gardner Dozois,Daniel Abraham', + u'Eos', +- u'lrf,rar'], ++ u'lrf'], + 257: [u'Knife of Dreams', u'Robert Jordan', None, u'lit,lrf'], + 258: [u'Saturday', + u'Ian McEwan', +@@ -657,7 +657,7 @@ + u'New York : Random House, 2005.', + u'lit,lrf'], + 269: [u'Reap the Whirlwind', u'David Mack', u'Star Trek', u'lit,lrf'], +- 272: [u'Mistborn', u'Brandon Sanderson', u'Tor Fantasy', u'lrf,rar'], ++ 272: [u'Mistborn', u'Brandon Sanderson', u'Tor Fantasy', u'lrf'], + 273: [u'The Thousandfold Thought', + u'R. Scott Bakker', + u'Overlook TP', +@@ -665,17 +665,17 @@ + 276: [u'Elantris', + u'Brandon Sanderson', + u'New York : Tor, 2005.', +- u'lrf,rar'], ++ u'lrf'], + 291: [u'Sundiver', + u'David Brin', + u'New York : Bantam Books, 1995.', + u'lit,lrf'], +- 299: [u'Imperium', u'Robert Harris', u'Arrow', u'lrf,rar'], ++ 299: [u'Imperium', u'Robert Harris', u'Arrow', u'lrf'], + 300: [u'Startide Rising', u'David Brin', u'Bantam', u'htm,lrf'], + 301: [u'The Uplift War', u'David Brin', u'Spectra', u'lit,lrf'], +- 304: [u'Brightness Reef', u'David Brin', u'Orbit', u'lrf,rar'], ++ 304: [u'Brightness Reef', u'David Brin', u'Orbit', u'lrf'], + 305: [u"Infinity's Shore", u'David Brin', u'Spectra', u'txt'], +- 306: [u"Heaven's Reach", u'David Brin', u'Spectra', u'lrf,rar'], ++ 306: [u"Heaven's Reach", u'David Brin', u'Spectra', u'lrf'], + 325: [u"Foundation's Triumph", u'David Brin', u'Easton Press', u'lit,lrf'], + 327: [u'I am Charlotte Simmons', u'Tom Wolfe', u'Vintage', u'htm,lrf'], + 335: [u'The Currents of Space', u'Isaac Asimov', None, u'lit,lrf'], +@@ -705,15 +705,15 @@ + u'Aspect', + u'lit,lrf'], + 356: [u'The Naked God', u'Peter F. Hamilton', u'Aspect', u'lit,lrf'], +- 421: [u'A Shadow in Summer', u'Daniel Abraham', u'Tor Fantasy', u'lrf,rar'], ++ 421: [u'A Shadow in Summer', u'Daniel Abraham', u'Tor Fantasy', u'lrf'], + 427: [u'Lonesome Dove', u'Larry M\\cMurtry', None, u'lit,lrf'], + 440: [u'Ghost', u'John Ringo', u'Baen', u'lit,lrf'], + 441: [u'Kildar', u'John Ringo', u'Baen', u'lit,lrf'], +- 443: [u'Hidden Empire ', u'Kevin J. Anderson', u'Aspect', u'lrf,rar'], ++ 443: [u'Hidden Empire ', u'Kevin J. Anderson', u'Aspect', u'lrf'], + 444: [u'The Gun Seller', + u'Hugh Laurie', + u'Washington Square Press', +- u'lrf,rar'] ++ u'lrf'] + } + + tests = { +diff -Nur calibre-1.204.1.orig/src/calibre/web/feeds/feedparser.py calibre-1.204.1/src/calibre/web/feeds/feedparser.py +--- calibre-1.204.1.orig/src/calibre/web/feeds/feedparser.py 1989-12-31 22:00:00.000000000 -0200 ++++ calibre-1.204.1/src/calibre/web/feeds/feedparser.py 2014-08-03 19:37:20.296922310 -0300 +@@ -2081,7 +2081,7 @@ + EMAIL = 5 + + known_xfn_relationships = set(['contact', 'acquaintance', 'friend', 'met', 'co-worker', 'coworker', 'colleague', 'co-resident', 'coresident', 'neighbor', 'child', 'parent', 'sibling', 'brother', 'sister', 'spouse', 'wife', 'husband', 'kin', 'relative', 'muse', 'crush', 'date', 'sweetheart', 'me']) +- known_binary_extensions = set(['zip','rar','exe','gz','tar','tgz','tbz2','bz2','z','7z','dmg','img','sit','sitx','hqx','deb','rpm','bz2','jar','rar','iso','bin','msi','mp2','mp3','ogg','ogm','mp4','m4v','m4a','avi','wma','wmv']) ++ known_binary_extensions = set(['zip','exe','gz','tar','tgz','tbz2','bz2','z','7z','dmg','img','sit','sitx','hqx','deb','rpm','bz2','jar','iso','bin','msi','mp2','mp3','ogg','ogm','mp4','m4v','m4a','avi','wma','wmv']) + + def __init__(self, data, baseuri, encoding): + self.document = BeautifulSoup.BeautifulSoup(data) +diff -Nur calibre-1.204.1.orig/translations/calibre/main.pot calibre-1.204.1/translations/calibre/main.pot +--- calibre-1.204.1.orig/translations/calibre/main.pot 1989-12-31 22:00:00.000000000 -0200 ++++ calibre-1.204.1/translations/calibre/main.pot 2014-08-03 19:37:20.296922310 -0300 +@@ -3906,7 +3906,7 @@ + msgstr "" + + #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:42 +-msgid "Extract common e-book formats from archives (zip/rar) files. Also try to autodetect if they are actually cbz/cbr files." ++msgid "Extract common e-book formats from archives (zip) files. Also try to autodetect if they are actually cbz files." + msgstr "" + + #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:644 +@@ -11087,7 +11087,7 @@ + msgstr "" + + #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:33 +-msgid "Set defaults for conversion of comics (CBR/CBZ files)" ++msgid "Set defaults for conversion of comics (CBZ files)" + msgstr "" + + #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48 -- cgit v1.1-4-g5e80 From 7d308d8af88fd57f11952e423caec844e6a401e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?coadde=20=5BM=C3=A1rcio=20Alexandre=20Silva=20Delgado=5D?= Date: Thu, 4 Sep 2014 01:20:38 -0300 Subject: rename to cdrkit --- libre/cdrkit-libre/PKGBUILD | 59 --------------------------------------------- libre/cdrkit/PKGBUILD | 59 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 59 deletions(-) delete mode 100644 libre/cdrkit-libre/PKGBUILD create mode 100644 libre/cdrkit/PKGBUILD diff --git a/libre/cdrkit-libre/PKGBUILD b/libre/cdrkit-libre/PKGBUILD deleted file mode 100644 index d64f0018e..000000000 --- a/libre/cdrkit-libre/PKGBUILD +++ /dev/null @@ -1,59 +0,0 @@ -# $Id: PKGBUILD 186761 2013-05-31 04:50:41Z allan $ -# Maintainer (Arch): Andrea Scarpino -# Contributor (Arch): Alexander Fehr - -_pkgname=cdrkit -pkgname=cdrkit-libre -pkgver=1.1.11 -pkgrel=3.2 -pkgdesc="Suite of programs for CD/DVD recording, ISO image creation, and audio CD extraction, without nonfree apple_driver utility" -arch=('i686' 'x86_64' 'mips64el') -url="http://cdrkit.org/" -license=('GPL2') -provides=("cdrkit=${pkgver}" 'cdrtools') -conflicts=('cdrkit' 'cdrtools') -replaces=('cdrkit' 'cdrtools') -depends=('file' 'bzip2') -optdepends=('perl: for dirsplit') -makedepends=('cmake') -mksource=(http://cdrkit.org/releases/$_pkgname-$pkgver.tar.gz) -source=(https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz) -mkmd5sums=('efe08e2f3ca478486037b053acd512e9') -md5sums=('SKIP') - -mksource() { - cd "$srcdir/$_pkgname-$pkgver" - - # Remove nonfree apple_driver utility - rm -rvf {doc/genisoimage/README.hfs_boot,genisoimage/apple_driver.{8,c}} -} - -prepare() { - cd "$srcdir/$_pkgname-$pkgver" - sed -i "s#sbin#bin#" netscsid/CMakeLists.txt -} - -build() { - cd "$srcdir/$_pkgname-$pkgver" - make -} - -package() { - cd "$srcdir/$_pkgname-$pkgver" - make PREFIX="$pkgdir/usr" install - - # Make symlinks for cdrtools compatibility - cd "$pkgdir/usr/bin" - ln -s wodim cdrecord - ln -s readom readcd - ln -s genisoimage mkisofs - ln -s genisoimage mkhybrid - ln -s icedax cdda2wav - - cd "$pkgdir/usr/share/man/man1" - ln -s wodim.1 cdrecord.1 - ln -s readom.1 readcd.1 - ln -s genisoimage.1 mkisofs.1 - ln -s genisoimage.1 mkhybrid.1 - ln -s icedax.1 cdda2wav.1 -} diff --git a/libre/cdrkit/PKGBUILD b/libre/cdrkit/PKGBUILD new file mode 100644 index 000000000..aaa47f6ce --- /dev/null +++ b/libre/cdrkit/PKGBUILD @@ -0,0 +1,59 @@ +# $Id: PKGBUILD 186761 2013-05-31 04:50:41Z allan $ +# Maintainer (Arch): Andrea Scarpino +# Contributor (Arch): Alexander Fehr + +pkgname=cdrkit +_pkgname=$pkgname-libre +pkgver=1.1.11 +pkgrel=3.parabola1 +pkgdesc="Suite of programs for CD/DVD recording, ISO image creation, and audio CD extraction, without nonfree apple_driver utility" +arch=('i686' 'x86_64' 'mips64el') +url="http://$pkgname.org/" +license=('GPL2') +provides=('cdrtools') +conflicts=("$_pkgname" 'cdrtools') +replaces=("$_pkgname" 'cdrtools') +depends=('file' 'bzip2') +optdepends=('perl: for dirsplit') +makedepends=('cmake') +mksource=(http://$pkgname.org/releases/$pkgname-$pkgver.tar.gz) +source=(https://repo.parabolagnulinux.org/other/$_pkgname/$_pkgname-$pkgver.tar.gz) +mkmd5sums=('efe08e2f3ca478486037b053acd512e9') +md5sums=('SKIP') + +mksource() { + cd "$srcdir/$pkgname-$pkgver" + + # Remove nonfree apple_driver utility + rm -rvf {doc/genisoimage/README.hfs_boot,genisoimage/apple_driver.{8,c}} +} + +prepare() { + cd "$srcdir/$_pkgname-$pkgver" + sed -i "s#sbin#bin#" netscsid/CMakeLists.txt +} + +build() { + cd "$srcdir/$_pkgname-$pkgver" + make +} + +package() { + cd "$srcdir/$_pkgname-$pkgver" + make PREFIX="$pkgdir/usr" install + + # Make symlinks for cdrtools compatibility + cd "$pkgdir/usr/bin" + ln -s wodim cdrecord + ln -s readom readcd + ln -s genisoimage mkisofs + ln -s genisoimage mkhybrid + ln -s icedax cdda2wav + + cd "$pkgdir/usr/share/man/man1" + ln -s wodim.1 cdrecord.1 + ln -s readom.1 readcd.1 + ln -s genisoimage.1 mkisofs.1 + ln -s genisoimage.1 mkhybrid.1 + ln -s icedax.1 cdda2wav.1 +} -- cgit v1.1-4-g5e80 From e928731ca6857b69ad7325f8d44e72105900b917 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?coadde=20=5BM=C3=A1rcio=20Alexandre=20Silva=20Delgado=5D?= Date: Thu, 4 Sep 2014 01:22:07 -0300 Subject: atril: fixing pkgrel --- libre/atril/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libre/atril/PKGBUILD b/libre/atril/PKGBUILD index b67182f09..9cf1c2fed 100644 --- a/libre/atril/PKGBUILD +++ b/libre/atril/PKGBUILD @@ -4,7 +4,7 @@ pkgname=atril pkgver=1.8.0 -pkgrel=1.1.parabola1 +pkgrel=1.parabola1 pkgdesc="Simply a document viewer, with libarchive support" url="http://mate-desktop.org" arch=('i686' 'x86_64' 'mips64el') -- cgit v1.1-4-g5e80 From ddc7aa765fba06b37096454456dac4a25e62a97b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?coadde=20=5BM=C3=A1rcio=20Alexandre=20Silva=20Delgado=5D?= Date: Thu, 4 Sep 2014 01:24:51 -0300 Subject: rename to arora --- libre/arora-libre/PKGBUILD | 56 ----------------------------------- libre/arora-libre/duckduckgo-html.xml | 8 ----- libre/arora-libre/install | 12 -------- libre/arora-libre/libre.patch | 30 ------------------- libre/arora-libre/searchengines.qrc | 8 ----- libre/arora-libre/seeks-search.xml | 11 ------- libre/arora-libre/wikipedia-en.xml | 1 - libre/arora-libre/yacy.xml | 28 ------------------ libre/arora/PKGBUILD | 54 +++++++++++++++++++++++++++++++++ libre/arora/duckduckgo-html.xml | 8 +++++ libre/arora/install | 12 ++++++++ libre/arora/libre.patch | 30 +++++++++++++++++++ libre/arora/searchengines.qrc | 8 +++++ libre/arora/seeks-search.xml | 11 +++++++ libre/arora/wikipedia-en.xml | 1 + libre/arora/yacy.xml | 28 ++++++++++++++++++ 16 files changed, 152 insertions(+), 154 deletions(-) delete mode 100644 libre/arora-libre/PKGBUILD delete mode 100644 libre/arora-libre/duckduckgo-html.xml delete mode 100644 libre/arora-libre/install delete mode 100644 libre/arora-libre/libre.patch delete mode 100644 libre/arora-libre/searchengines.qrc delete mode 100644 libre/arora-libre/seeks-search.xml delete mode 100644 libre/arora-libre/wikipedia-en.xml delete mode 100644 libre/arora-libre/yacy.xml create mode 100644 libre/arora/PKGBUILD create mode 100644 libre/arora/duckduckgo-html.xml create mode 100644 libre/arora/install create mode 100644 libre/arora/libre.patch create mode 100644 libre/arora/searchengines.qrc create mode 100644 libre/arora/seeks-search.xml create mode 100644 libre/arora/wikipedia-en.xml create mode 100644 libre/arora/yacy.xml diff --git a/libre/arora-libre/PKGBUILD b/libre/arora-libre/PKGBUILD deleted file mode 100644 index d10fb8ade..000000000 --- a/libre/arora-libre/PKGBUILD +++ /dev/null @@ -1,56 +0,0 @@ -# $Id: PKGBUILD 188496 2013-06-15 04:38:11Z bisson $ -# Maintainer (Arch): Gaetan Bisson -# Contributor (Arch): Pierre Schmitz -# Contributor (Arch): Daniel J Griffiths -# Maintainer: André Silva - -_pkgname=arora -pkgname=arora-libre -pkgver=0.11.0 -pkgrel=4 -pkgdesc='Lightweight cross-platform Web browser, without nonfree flash recommendation and non-privacy search providers' -url='http://code.google.com/p/arora/' -license=('GPL') -arch=('i686' 'x86_64' 'mips64el') -replaces=($_pkgname) -conflicts=($_pkgname) -provides=($_pkgname=$pkgver) -depends=('qtwebkit' 'desktop-file-utils') -source=("http://${_pkgname}.googlecode.com/files/${_pkgname}-${pkgver}.tar.gz" - 'searchengines.qrc' - 'libre.patch' - 'duckduckgo-html.xml' - 'seeks-search.xml' - 'wikipedia-en.xml' - 'yacy.xml') -sha1sums=('480cfd7482cccbb7ece866fa10afe9acace29b31' - 'd64bdfe9022f8b4b0745a0d9cc1094ee80bbc897' - '3982032d669077644d485f4d04d4ae4891bdb0e3' - 'e96f2d92b24daad0cfa28d02a003b92042651de0' - '07bc208fbc3bf3d08192b2c07e550525953fc0b2' - '3eea200350f7436bb2d744f8b6af1b5bbb758e51' - '2d515947a8cbeea831490727e88c89ebee17c313') - -install=install - -prepare() { - cd "${srcdir}/${_pkgname}-${pkgver}" - # remove non-privacy search providers - rm -r src/data/searchengines/* - install -m644 $srcdir/searchengines.qrc src/data/searchengines - install -m644 "$srcdir/"{duckduckgo-html,seeks-search,wikipedia-en,yacy}.xml src/data/searchengines - # remove nonfree flash recommendation - patch -Np1 -i $srcdir/libre.patch - sed -i '\|Flash|d' src/settings.cpp -} - -build() { - cd "${srcdir}/${_pkgname}-${pkgver}" - qmake-qt4 PREFIX='/usr' 'CONFIG-=debug' -r - make -} - -package() { - cd "${srcdir}/${_pkgname}-${pkgver}" - make INSTALL_ROOT="${pkgdir}" install -} diff --git a/libre/arora-libre/duckduckgo-html.xml b/libre/arora-libre/duckduckgo-html.xml deleted file mode 100644 index 9b979fa31..000000000 --- a/libre/arora-libre/duckduckgo-html.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - DuckDuckGo HTML - Search DuckDuckGo HTML - UTF-8 - http://duckduckgo.com/favicon.ico - - diff --git a/libre/arora-libre/install b/libre/arora-libre/install deleted file mode 100644 index b0409600c..000000000 --- a/libre/arora-libre/install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null || true - update-desktop-database -q || true -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/libre/arora-libre/libre.patch b/libre/arora-libre/libre.patch deleted file mode 100644 index 6bb6c6b43..000000000 --- a/libre/arora-libre/libre.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/src/settings.ui b/src/settings.ui -index 7d4f66e..758beb3 100644 ---- a/src/settings.ui -+++ b/src/settings.ui -@@ -413,25 +413,6 @@ - - - -- -- -- -- -- 0 -- 0 -- -- -- -- If you enable this option, no flash objects will be loaded by default. Instead, each will be replaced by a button, allowing you to control which objects to load, and which not. -- -- -- Use ClickToFlash on flash plugins -- -- -- true -- -- -- - - - diff --git a/libre/arora-libre/searchengines.qrc b/libre/arora-libre/searchengines.qrc deleted file mode 100644 index 93cd9b80d..000000000 --- a/libre/arora-libre/searchengines.qrc +++ /dev/null @@ -1,8 +0,0 @@ - - - duckduckgo-html.xml - seeks-search.xml - wikipedia-en.xml - yacy.xml - - diff --git a/libre/arora-libre/seeks-search.xml b/libre/arora-libre/seeks-search.xml deleted file mode 100644 index f79d87047..000000000 --- a/libre/arora-libre/seeks-search.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - Seeks Search - Seeks - Real-time p2p pattern matching network for social websearch. - ebenazer@seeks-project.info - UTF-8 - open - http://www.seeks.fr/public/images/seek_icon_16x16_transparent.png - - diff --git a/libre/arora-libre/wikipedia-en.xml b/libre/arora-libre/wikipedia-en.xml deleted file mode 100644 index ea590759f..000000000 --- a/libre/arora-libre/wikipedia-en.xml +++ /dev/null @@ -1 +0,0 @@ -Wikipedia (en)Wikipedia (en)http://bits.wikimedia.org/favicon/wikipedia.icohttp://en.wikipedia.org/wiki/Special:Search \ No newline at end of file diff --git a/libre/arora-libre/yacy.xml b/libre/arora-libre/yacy.xml deleted file mode 100644 index 9c97f16cc..000000000 --- a/libre/arora-libre/yacy.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - YaCy - YaCy.net - P2P Web Search - http://search.ipredator.se/env/grafics/yacy.png - data:image/x-icon;base64,AAABAAEAEBAAAAAAGABoAwAAFgAAACgAAAAQAAAAIAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD////////Chiu+fBm+fRq+fRq+fRq+fRq+fRq8ehXMmk////////////////////////////++exjUqGfZsnjYsXbYsXbYsXbZsnjTp2W+fBr///////////////////////////+9exfs2r/69/L58+z58+z58+z59e/z59bChSn///////////////////////////+9fBnnz638+fX69O369e748un38Ob59O3Ll0fVrGz////////////////////////Jk0HJlUjXuYrWt4jVtYPr28T58+r59OzPn1fPnlX////////////////////////Rolu8eRXCiTPEjTvCijbNnlj169359e7Zs3vLlkf////////////////////////UqmrAgSLt3MP27eH1693169327+T59Ozo0rG/gB////////////////////////////+/gCDv4Mn48+v38Of59Oz58+v48+vr2b2+fRv///////////////////////////+9ehXr17n58+z48ejo0bDp07T48+zx49DBhCj///////////////////////////+/fhzjyJ/59Oz59OzQoVvNmU759Oz58+vKlUbXrnH////////////////////////LlkfUqmn59Oz48+vZtHzNm1D48+v59OzPoFjOnlX////////////////////////OnVPOnFL59e348+vq1rnEiC7u38j69vDXsHTIkT3////////////////////////UqWjIkD327+T58+3s2bzAgSLp07T79/Pmzqq+fBn///////////////////////////+/fx7v4Mr7+PTx5NDHkD3kyqP8+vjs2r+9exf///////////////////////////++fBjQoFnVq2zTp2bGjTjJk0LWrW7SpWC+exf////////////////////////////Nm1C6dQy7eBG8eBK9exe8ehS7dxC6dQzLlkj////////////AH///wB8x+sAf///AD/+PwA///8AP///AD///4A9PU+APoz/gB///4AdxvOAHoz/gB3368AfjU/AHT1PwB/+P - - en-us - UTF-8 - UTF-8 - true - YaCy is an open-source GPL-licensed software that can be used for stand-alone search engine installations or as a client for a multi-user P2P-based web indexing cluster. This is the access to peer '_anonufe-29422893-0'. - - - - - - - - See https://gitorious.org/+yacy-developers - - YaCy Open Source P2P Web Search - See http://search.ipredator.se/ViewProfile.html?hash=localhash - YaCy Software &copy; 2004-2012 by Michael Christen et al., YaCy.net; Content: ask peer owner - open - diff --git a/libre/arora/PKGBUILD b/libre/arora/PKGBUILD new file mode 100644 index 000000000..dae62bbf5 --- /dev/null +++ b/libre/arora/PKGBUILD @@ -0,0 +1,54 @@ +# $Id: PKGBUILD 188496 2013-06-15 04:38:11Z bisson $ +# Maintainer (Arch): Gaetan Bisson +# Contributor (Arch): Pierre Schmitz +# Contributor (Arch): Daniel J Griffiths +# Maintainer: André Silva + +pkgname=arora +pkgver=0.11.0 +pkgrel=4.parabola1 +pkgdesc='Lightweight cross-platform Web browser, without nonfree flash recommendation and non-privacy search providers' +url="http://code.google.com/p/$pkgname/" +license=('GPL') +arch=('i686' 'x86_64' 'mips64el') +replaces=($pkgname-libre) +conflicts=($pkgname-libre) +depends=('qtwebkit' 'desktop-file-utils') +source=("http://${_pkgname}.googlecode.com/files/${_pkgname}-${pkgver}.tar.gz" + 'searchengines.qrc' + 'libre.patch' + 'duckduckgo-html.xml' + 'seeks-search.xml' + 'wikipedia-en.xml' + 'yacy.xml') +sha1sums=('480cfd7482cccbb7ece866fa10afe9acace29b31' + 'd64bdfe9022f8b4b0745a0d9cc1094ee80bbc897' + '3982032d669077644d485f4d04d4ae4891bdb0e3' + 'e96f2d92b24daad0cfa28d02a003b92042651de0' + '07bc208fbc3bf3d08192b2c07e550525953fc0b2' + '3eea200350f7436bb2d744f8b6af1b5bbb758e51' + '2d515947a8cbeea831490727e88c89ebee17c313') + +install=install + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + # remove non-privacy search providers + rm -r src/data/searchengines/* + install -m644 $srcdir/searchengines.qrc src/data/searchengines + install -m644 "$srcdir/"{duckduckgo-html,seeks-search,wikipedia-en,yacy}.xml src/data/searchengines + # remove nonfree flash recommendation + patch -Np1 -i $srcdir/libre.patch + sed -i '\|Flash|d' src/settings.cpp +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + qmake-qt4 PREFIX='/usr' 'CONFIG-=debug' -r + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make INSTALL_ROOT="${pkgdir}" install +} diff --git a/libre/arora/duckduckgo-html.xml b/libre/arora/duckduckgo-html.xml new file mode 100644 index 000000000..9b979fa31 --- /dev/null +++ b/libre/arora/duckduckgo-html.xml @@ -0,0 +1,8 @@ + + + DuckDuckGo HTML + Search DuckDuckGo HTML + UTF-8 + http://duckduckgo.com/favicon.ico + + diff --git a/libre/arora/install b/libre/arora/install new file mode 100644 index 000000000..b0409600c --- /dev/null +++ b/libre/arora/install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null || true + update-desktop-database -q || true +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/libre/arora/libre.patch b/libre/arora/libre.patch new file mode 100644 index 000000000..6bb6c6b43 --- /dev/null +++ b/libre/arora/libre.patch @@ -0,0 +1,30 @@ +diff --git a/src/settings.ui b/src/settings.ui +index 7d4f66e..758beb3 100644 +--- a/src/settings.ui ++++ b/src/settings.ui +@@ -413,25 +413,6 @@ + + + +- +- +- +- +- 0 +- 0 +- +- +- +- If you enable this option, no flash objects will be loaded by default. Instead, each will be replaced by a button, allowing you to control which objects to load, and which not. +- +- +- Use ClickToFlash on flash plugins +- +- +- true +- +- +- + + + diff --git a/libre/arora/searchengines.qrc b/libre/arora/searchengines.qrc new file mode 100644 index 000000000..93cd9b80d --- /dev/null +++ b/libre/arora/searchengines.qrc @@ -0,0 +1,8 @@ + + + duckduckgo-html.xml + seeks-search.xml + wikipedia-en.xml + yacy.xml + + diff --git a/libre/arora/seeks-search.xml b/libre/arora/seeks-search.xml new file mode 100644 index 000000000..f79d87047 --- /dev/null +++ b/libre/arora/seeks-search.xml @@ -0,0 +1,11 @@ + + + Seeks Search + Seeks + Real-time p2p pattern matching network for social websearch. + ebenazer@seeks-project.info + UTF-8 + open + http://www.seeks.fr/public/images/seek_icon_16x16_transparent.png + + diff --git a/libre/arora/wikipedia-en.xml b/libre/arora/wikipedia-en.xml new file mode 100644 index 000000000..ea590759f --- /dev/null +++ b/libre/arora/wikipedia-en.xml @@ -0,0 +1 @@ +Wikipedia (en)Wikipedia (en)http://bits.wikimedia.org/favicon/wikipedia.icohttp://en.wikipedia.org/wiki/Special:Search \ No newline at end of file diff --git a/libre/arora/yacy.xml b/libre/arora/yacy.xml new file mode 100644 index 000000000..9c97f16cc --- /dev/null +++ b/libre/arora/yacy.xml @@ -0,0 +1,28 @@ + + + YaCy + YaCy.net - P2P Web Search + http://search.ipredator.se/env/grafics/yacy.png + data:image/x-icon;base64,AAABAAEAEBAAAAAAGABoAwAAFgAAACgAAAAQAAAAIAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD////////Chiu+fBm+fRq+fRq+fRq+fRq+fRq8ehXMmk////////////////////////////++exjUqGfZsnjYsXbYsXbYsXbZsnjTp2W+fBr///////////////////////////+9exfs2r/69/L58+z58+z58+z59e/z59bChSn///////////////////////////+9fBnnz638+fX69O369e748un38Ob59O3Ll0fVrGz////////////////////////Jk0HJlUjXuYrWt4jVtYPr28T58+r59OzPn1fPnlX////////////////////////Rolu8eRXCiTPEjTvCijbNnlj169359e7Zs3vLlkf////////////////////////UqmrAgSLt3MP27eH1693169327+T59Ozo0rG/gB////////////////////////////+/gCDv4Mn48+v38Of59Oz58+v48+vr2b2+fRv///////////////////////////+9ehXr17n58+z48ejo0bDp07T48+zx49DBhCj///////////////////////////+/fhzjyJ/59Oz59OzQoVvNmU759Oz58+vKlUbXrnH////////////////////////LlkfUqmn59Oz48+vZtHzNm1D48+v59OzPoFjOnlX////////////////////////OnVPOnFL59e348+vq1rnEiC7u38j69vDXsHTIkT3////////////////////////UqWjIkD327+T58+3s2bzAgSLp07T79/Pmzqq+fBn///////////////////////////+/fx7v4Mr7+PTx5NDHkD3kyqP8+vjs2r+9exf///////////////////////////++fBjQoFnVq2zTp2bGjTjJk0LWrW7SpWC+exf////////////////////////////Nm1C6dQy7eBG8eBK9exe8ehS7dxC6dQzLlkj////////////AH///wB8x+sAf///AD/+PwA///8AP///AD///4A9PU+APoz/gB///4AdxvOAHoz/gB3368AfjU/AHT1PwB/+P + + en-us + UTF-8 + UTF-8 + true + YaCy is an open-source GPL-licensed software that can be used for stand-alone search engine installations or as a client for a multi-user P2P-based web indexing cluster. This is the access to peer '_anonufe-29422893-0'. + + + + + + + + See https://gitorious.org/+yacy-developers + + YaCy Open Source P2P Web Search + See http://search.ipredator.se/ViewProfile.html?hash=localhash + YaCy Software &copy; 2004-2012 by Michael Christen et al., YaCy.net; Content: ask peer owner + open + -- cgit v1.1-4-g5e80 From d05c9de7fe02243bdb9b76ada3d888f4f0fcf05f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?coadde=20=5BM=C3=A1rcio=20Alexandre=20Silva=20Delgado=5D?= Date: Thu, 4 Sep 2014 01:27:02 -0300 Subject: blender-addon-luxrender: fix pkgrel --- libre/blender-addon-luxrender/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libre/blender-addon-luxrender/PKGBUILD b/libre/blender-addon-luxrender/PKGBUILD index ab0aac2f1..0956d9645 100644 --- a/libre/blender-addon-luxrender/PKGBUILD +++ b/libre/blender-addon-luxrender/PKGBUILD @@ -10,7 +10,7 @@ _srcver=ad6536b0dda8 pkgname=$_bldname-addon-$_srcname pkgver=$_pkgver.v$_bldver -pkgrel=1 +pkgrel=2 pkgdesc="$_pkgname: A addon for the ${_bldname^} which allows render and export with LuxRender (built for the $_bldname package)" arch=any url=http://www.$_srcname.net/ -- cgit v1.1-4-g5e80 From ab339da9245bbbc89d8fff20a1c114f2e2c226d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?coadde=20=5BM=C3=A1rcio=20Alexandre=20Silva=20Delgado=5D?= Date: Thu, 4 Sep 2014 01:28:38 -0300 Subject: calibre: fix pkgrel --- libre/calibre/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libre/calibre/PKGBUILD b/libre/calibre/PKGBUILD index 31c49b5e4..038ddb174 100644 --- a/libre/calibre/PKGBUILD +++ b/libre/calibre/PKGBUILD @@ -10,7 +10,7 @@ pkgname=calibre _pkgname=$pkgname-libre pkgver=2.1.0 -pkgrel=1 +pkgrel=1.parabola1 pkgdesc="Ebook management application, without nonfree decompression engine for RAR archives" arch=('i686' 'x86_64' 'mips64el') url="http://$pkgname-ebook.com/" -- cgit v1.1-4-g5e80 From 035f2fd609cd247ac0430f15cad3af94ce79f5f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?coadde=20=5BM=C3=A1rcio=20Alexandre=20Silva=20Delgado=5D?= Date: Thu, 4 Sep 2014 01:39:21 -0300 Subject: rename to clementine --- libre/clementine-libre/PKGBUILD | 90 --- libre/clementine-libre/clementine.install | 15 - libre/clementine-libre/moognu.png | Bin 610 -> 0 bytes .../remove-nonfree-artwork-and-spotify.patch | 655 --------------------- libre/clementine-libre/udisks-namespace.patch | 38 -- libre/clementine/PKGBUILD | 89 +++ libre/clementine/clementine.install | 15 + libre/clementine/moognu.png | Bin 0 -> 610 bytes .../remove-nonfree-artwork-and-spotify.patch | 655 +++++++++++++++++++++ libre/clementine/udisks-namespace.patch | 38 ++ 10 files changed, 797 insertions(+), 798 deletions(-) delete mode 100644 libre/clementine-libre/PKGBUILD delete mode 100644 libre/clementine-libre/clementine.install delete mode 100644 libre/clementine-libre/moognu.png delete mode 100644 libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch delete mode 100644 libre/clementine-libre/udisks-namespace.patch create mode 100644 libre/clementine/PKGBUILD create mode 100644 libre/clementine/clementine.install create mode 100644 libre/clementine/moognu.png create mode 100644 libre/clementine/remove-nonfree-artwork-and-spotify.patch create mode 100644 libre/clementine/udisks-namespace.patch diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD deleted file mode 100644 index f34f648cb..000000000 --- a/libre/clementine-libre/PKGBUILD +++ /dev/null @@ -1,90 +0,0 @@ -# $Id: PKGBUILD 117584 2014-08-18 23:42:44Z alucryd $ -# Maintainer (Arch): Maxime Gauduin -# Contributor (Arch): Stéphane Gaudreault -# Contributor (Arch): BlackEagle -# Contributor (Arch): Dany Martineau -# Maintainer: André Silva -# Contributor: Kete -# Contributor: Márcio Silva - -_pkgname=clementine -pkgname=clementine-libre -pkgver=1.2.3 -pkgrel=2 -pkgdesc='A modern music player and library organizer, without nonfree artwork and Spotify support' -url='http://www.clementine-player.org/' -license=('GPL') -arch=('i686' 'x86_64' 'mips64el') -replaces=('clementine') -conflicts=('clementine') -provides=("clementine=$pkgver") -depends=('chromaprint' 'glew' 'gstreamer0.10-base' 'libcdio' 'libgpod' 'liblastfm' 'libmtp' 'libmygpo-qt' 'protobuf' 'qca-ossl' 'taglib') -makedepends=('cmake' 'boost' 'mesa' 'sparsehash') -optdepends=('gstreamer0.10-base-plugins: "Base" plugin libraries' - 'gstreamer0.10-good-plugins: "Good" plugin libraries' - 'gstreamer0.10-bad-plugins: "Bad" plugin libraries' - 'gstreamer0.10-ugly-plugins: "Ugly" plugin libraries' - 'gvfs: Various devices support') -install="${_pkgname}.install" -mksource=("${_pkgname}-${pkgver}.tar.gz::https://github.com/clementine-player/Clementine/archive/${pkgver}.tar.gz" - 'remove-nonfree-artwork-and-spotify.patch' - 'moognu.png') -source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'udisks-namespace.patch') -mksha256sums=('7df5650445a005c09f5f0e1a1b0d077037c37ecbe4ee77baf9d45f121308a1bf' - '48bfbf42c84ac1891021638627c10780194fcc59eda1c69e157be3aebe8ee10b' - 'c6918617769152f3617c61f721819e69d03f671b85760b11cfe45abd53955bc4') -sha256sums=('c68275373b839b5b256b813b5bed85d501f94e12bef3dd8ed69e90094af3f769' - 'a7c2764576cee303a57e4efe6a5dbd583a66de8a15aee738bd92d4bb21786008') - -mksource() { - cd Clementine-${pkgver} - - # remove nonfree nonfree artwork and spotify references on files - patch -Np1 -i ../remove-nonfree-artwork-and-spotify.patch - - # remove nonfree spotifyblob folders - rm -rv ext/{clementine-spotifyblob,libclementine-spotifyblob} - - # remove nonfree spotify files - rm -v cmake/SpotifyVersion.cmake - rm -v data/spotify-attribution.png - rm -v data/icons/svg/spotify.svg - rm -v data/schema/schema-30.sql - rm -v src/{globalsearch/spotifysearchprovider.{cpp,h},internet/spotify{blobdownloader.{cpp,h},server.{cpp,h},service.{cpp,h},settingspage.{cpp,h,ui}}} - - ## remove nonfree nyancat.png - rm -v data/nyancat.png - - ## rut moognu.png to the source code - install -m644 -v ../moognu.png data - - # create a blank file due which is a dependency for clementine - touch data/schema/schema-30.sql -} - -prepare() { - cd Clementine-${pkgver} - - patch -Np1 -i ../udisks-namespace.patch -} - -build() { - cd Clementine-${pkgver} - - if [[ -d build ]]; then - rm -rf build - fi - mkdir build && cd build - - cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_BUILD_TYPE='Release' - make -} - -package() { - cd Clementine-${pkgver}/build - - make DESTDIR="${pkgdir}" install -} - -# vim: ts=2 sw=2 et: diff --git a/libre/clementine-libre/clementine.install b/libre/clementine-libre/clementine.install deleted file mode 100644 index 927a10258..000000000 --- a/libre/clementine-libre/clementine.install +++ /dev/null @@ -1,15 +0,0 @@ -post_install() { - gtk-update-icon-cache -ftq usr/share/icons/hicolor - update-desktop-database -q -} - -post_upgrade() { - post_install -} - - -post_remove() { - post_install -} - -# vim: ts=2 sw=2 et: diff --git a/libre/clementine-libre/moognu.png b/libre/clementine-libre/moognu.png deleted file mode 100644 index 177041886..000000000 Binary files a/libre/clementine-libre/moognu.png and /dev/null differ diff --git a/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch b/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch deleted file mode 100644 index 8c1b9aafd..000000000 --- a/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch +++ /dev/null @@ -1,655 +0,0 @@ -diff --git a/3rdparty/SPMediaKeyTap/SPMediaKeyTap.m b/3rdparty/SPMediaKeyTap/SPMediaKeyTap.m -index a349f59..c418e0b 100644 ---- a/3rdparty/SPMediaKeyTap/SPMediaKeyTap.m -+++ b/3rdparty/SPMediaKeyTap/SPMediaKeyTap.m -@@ -98,7 +98,6 @@ static CGEventRef tapEventCallback(CGEventTapProxy proxy, CGEventType type, CGEv - { - return [NSArray arrayWithObjects: - [[NSBundle mainBundle] bundleIdentifier], // your app -- @"com.spotify.client", - @"com.apple.iTunes", - @"com.apple.QuickTimePlayerX", - @"com.apple.quicktimeplayer", -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 47f1693..986351b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -7,7 +7,6 @@ include(cmake/Summary.cmake) - include(cmake/Version.cmake) - include(cmake/Deb.cmake) - include(cmake/Rpm.cmake) --include(cmake/SpotifyVersion.cmake) - include(cmake/OptionalSource.cmake) - set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) - -@@ -78,7 +77,6 @@ pkg_check_modules(LIBMYGPO_QT libmygpo-qt>=1.0.7) - pkg_check_modules(LIBXML libxml-2.0) - pkg_check_modules(QCA qca2) - pkg_check_modules(QJSON REQUIRED QJson) --pkg_check_modules(SPOTIFY libspotify>=12.1.45) - pkg_check_modules(TAGLIB REQUIRED taglib>=1.6) - - if (WIN32) -@@ -124,13 +122,6 @@ if (APPLE) - find_library(GROWL Growl) - find_library(SPARKLE Sparkle) - -- find_library(SPOTIFY libspotify) -- if (SPOTIFY) -- set (SPOTIFY_FOUND ON) -- set (SPOTIFY_INCLUDE_DIRS ${SPOTIFY}) -- set (SPOTIFY_LIBRARIES ${SPOTIFY}) -- endif (SPOTIFY) -- - add_subdirectory(3rdparty/SPMediaKeyTap) - set(SPMEDIAKEYTAP_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/SPMediaKeyTap) - set(SPMEDIAKEYTAP_LIBRARIES SPMediaKeyTap) -@@ -254,7 +245,7 @@ optional_component(DEVICEKIT ON "Devices: DeviceKit backend" - DEPENDS "D-Bus support" HAVE_DBUS - ) - --optional_component(SPOTIFY_BLOB ON "Spotify support: non-GPL binary helper" -+optional_component(SPOTIFY_BLOB OFF "Spotify support: non-GPL binary helper" - DEPENDS "protobuf" PROTOBUF_FOUND PROTOBUF_PROTOC_EXECUTABLE - DEPENDS "libspotify" SPOTIFY_FOUND - ) -@@ -270,13 +261,6 @@ optional_component(SPARKLE ON "Sparkle integration" - - optional_component(VISUALISATIONS ON "Visualisations") - --if(NOT HAVE_SPOTIFY_BLOB AND NOT QCA_FOUND) -- message(FATAL_ERROR "Either QCA must be available or the non-GPL Spotify " -- "code must be compiled in") --elseif(QCA_FOUND) -- set(HAVE_SPOTIFY_DOWNLOADER ON) --endif() -- - # Find DBus if it's enabled - if (HAVE_DBUS) - find_package(Qt4 REQUIRED QtDbus) -@@ -440,7 +424,6 @@ add_subdirectory(ext/libclementine-common) - add_subdirectory(ext/libclementine-tagreader) - add_subdirectory(ext/clementine-tagreader) - add_subdirectory(ext/libclementine-remote) --add_subdirectory(ext/libclementine-spotifyblob) - - option(WITH_DEBIAN OFF) - if(WITH_DEBIAN) -@@ -451,10 +434,6 @@ if(HAVE_BREAKPAD) - add_subdirectory(3rdparty/google-breakpad) - endif(HAVE_BREAKPAD) - --if(HAVE_SPOTIFY_BLOB) -- add_subdirectory(ext/clementine-spotifyblob) --endif(HAVE_SPOTIFY_BLOB) -- - if(HAVE_MOODBAR) - add_subdirectory(gst/moodbar) - endif() -diff --git a/data/data.qrc b/data/data.qrc -index 4c5473f..bd5fe2d 100644 ---- a/data/data.qrc -+++ b/data/data.qrc -@@ -2,7 +2,6 @@ - - blank.ttf - clementine_remote_qr.png -- clementine-spotify-public.pem - currenttrack_bar_left.png - currenttrack_bar_mid.png - currenttrack_bar_right.png -@@ -77,7 +76,6 @@ - icons/22x22/phone-nokia-n900.png - icons/22x22/phone-palm-pre.png - icons/22x22/phone.png -- icons/22x22/spotify.png - icons/22x22/user-away.png - icons/22x22/view-choose.png - icons/22x22/view-fullscreen.png -@@ -154,7 +152,6 @@ - icons/32x32/phone-palm-pre.png - icons/32x32/phone.png - icons/32x32/search.png -- icons/32x32/spotify.png - icons/32x32/tools-wizard.png - icons/32x32/view-choose.png - icons/32x32/view-fullscreen.png -@@ -230,7 +227,6 @@ - icons/48x48/phone-nokia-n900.png - icons/48x48/phone-palm-pre.png - icons/48x48/phone.png -- icons/48x48/spotify.png - icons/48x48/view-choose.png - icons/48x48/view-fullscreen.png - icons/48x48/view-media-equalizer.png -@@ -262,10 +258,10 @@ - lumberjacksong.txt - lyrics/ultimate_providers.xml - mainwindow.css -+ moognu.png - nocover.png - nomusic.png - now_playing_tooltip.txt -- nyancat.png - oauthsuccess.html - osd_background.png - osd_shadow_corner.png -@@ -391,7 +387,6 @@ - smartplaylistsearchterm.css - songinfo.css - spinner.gif -- spotify-attribution.png - star-off.png - star-on.png - tiny-pause.png -diff --git a/dist/macdeploy.py b/dist/macdeploy.py -index e054619..3568a6f 100755 ---- a/dist/macdeploy.py -+++ b/dist/macdeploy.py -@@ -398,10 +398,7 @@ def main(): - FixPlugin(FindGioModule('libgiolibproxy.so'), 'gio-modules') - - try: -- FixPlugin('clementine-spotifyblob', '.') - FixPlugin('clementine-tagreader', '.') -- except: -- print 'Failed to find blob: %s' % traceback.format_exc() - - for plugin in QT_PLUGINS: - FixPlugin(FindQtPlugin(plugin), os.path.dirname(plugin)) -diff --git a/dist/windows/clementine.nsi.in b/dist/windows/clementine.nsi.in -index 750b332..6bf47ff 100644 ---- a/dist/windows/clementine.nsi.in -+++ b/dist/windows/clementine.nsi.in -@@ -97,9 +97,6 @@ Section "Delete old files" oldfiles - Delete "$INSTDIR\gstreamer-plugins\libgstqueue2.dll" - Delete "$INSTDIR\gstreamer-plugins\libgstsoup.dll" - -- ; 1.0 prerelease -- Delete "$INSTDIR\spotify.dll" -- - ; 1.0 - Delete "$INSTDIR\libofa.dll" - Delete "$INSTDIR\gstreamer-plugins\libgstofa.dll" -@@ -128,7 +125,6 @@ Section "Clementine" Clementine - File "avutil-51.dll" - File "clementine.exe" - File "clementine-tagreader.exe" -- File "clementine-spotifyblob.exe" - File "clementine.ico" - File "glew32.dll" - File "intl.dll" -@@ -181,7 +177,6 @@ Section "Clementine" Clementine - File "libqjson.dll" - File "libsoup-2.4-1.dll" - File "libspeex-1.dll" -- File "libspotify.dll" - File "libstdc++-6.dll" - File "libtag.dll" - File "libtasn1-3.dll" -@@ -939,7 +934,6 @@ Section "Uninstall" - Delete "$INSTDIR\clementine.ico" - Delete "$INSTDIR\clementine.exe" - Delete "$INSTDIR\clementine-tagreader.exe" -- Delete "$INSTDIR\clementine-spotifyblob.exe" - Delete "$INSTDIR\glew32.dll" - Delete "$INSTDIR\intl.dll" - Delete "$INSTDIR\libcdio-14.dll" -@@ -992,7 +986,6 @@ Section "Uninstall" - Delete "$INSTDIR\libqjson.dll" - Delete "$INSTDIR\libsoup-2.4-1.dll" - Delete "$INSTDIR\libspeex-1.dll" -- Delete "$INSTDIR\libspotify.dll" - Delete "$INSTDIR\libstdc++-6.dll" - Delete "$INSTDIR\libtag.dll" - Delete "$INSTDIR\libtasn1-3.dll" -diff --git a/ext/libclementine-common/core/logging.cpp b/ext/libclementine-common/core/logging.cpp -index 3c53d7a..49dd8cf 100644 ---- a/ext/libclementine-common/core/logging.cpp -+++ b/ext/libclementine-common/core/logging.cpp -@@ -14,10 +14,6 @@ - limitations under the License. - */ - --// Note: this file is licensed under the Apache License instead of GPL because --// it is used by the Spotify blob which links against libspotify and is not GPL --// compatible. -- - #include - - #include -diff --git a/ext/libclementine-common/core/logging.h b/ext/libclementine-common/core/logging.h -index 3c582cf..4a3cea8 100644 ---- a/ext/libclementine-common/core/logging.h -+++ b/ext/libclementine-common/core/logging.h -@@ -14,11 +14,6 @@ - limitations under the License. - */ - --// Note: this file is licensed under the Apache License instead of GPL because --// it is used by the Spotify blob which links against libspotify and is not GPL --// compatible. -- -- - #ifndef LOGGING_H - #define LOGGING_H - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 1104542..e7a8032 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -60,8 +60,6 @@ include_directories(${CMAKE_SOURCE_DIR}/ext/libclementine-tagreader) - include_directories(${CMAKE_BINARY_DIR}/ext/libclementine-tagreader) - include_directories(${CMAKE_SOURCE_DIR}/ext/libclementine-remote) - include_directories(${CMAKE_BINARY_DIR}/ext/libclementine-remote) --include_directories(${CMAKE_SOURCE_DIR}/ext/libclementine-spotifyblob) --include_directories(${CMAKE_BINARY_DIR}/ext/libclementine-spotifyblob) - - cmake_policy(SET CMP0011 NEW) - include(../cmake/ParseArguments.cmake) -@@ -157,7 +155,6 @@ set(SOURCES - globalsearch/simplesearchprovider.cpp - globalsearch/somafmsearchprovider.cpp - globalsearch/soundcloudsearchprovider.cpp -- globalsearch/spotifysearchprovider.cpp - globalsearch/suggestionwidget.cpp - globalsearch/urlsearchprovider.cpp - -@@ -195,9 +192,6 @@ set(SOURCES - internet/somafmservice.cpp - internet/somafmurlhandler.cpp - internet/soundcloudservice.cpp -- internet/spotifyserver.cpp -- internet/spotifyservice.cpp -- internet/spotifysettingspage.cpp - internet/subsonicservice.cpp - internet/subsonicsettingspage.cpp - internet/subsonicurlhandler.cpp -@@ -461,7 +455,6 @@ set(HEADERS - globalsearch/searchprovider.h - globalsearch/simplesearchprovider.h - globalsearch/soundcloudsearchprovider.h -- globalsearch/spotifysearchprovider.h - globalsearch/suggestionwidget.h - - internet/cloudfileservice.h -@@ -494,9 +487,6 @@ set(HEADERS - internet/somafmservice.h - internet/somafmurlhandler.h - internet/soundcloudservice.h -- internet/spotifyserver.h -- internet/spotifyservice.h -- internet/spotifysettingspage.h - internet/subsonicservice.h - internet/subsonicsettingspage.h - internet/subsonicurlhandler.h -@@ -685,7 +675,6 @@ set(UI - internet/magnatunedownloaddialog.ui - internet/magnatunesettingspage.ui - internet/searchboxwidget.ui -- internet/spotifysettingspage.ui - internet/subsonicsettingspage.ui - - library/groupbydialog.ui -@@ -836,15 +825,6 @@ optional_source(HAVE_LIBLASTFM - ) - - --optional_source(HAVE_SPOTIFY_DOWNLOADER -- SOURCES -- internet/spotifyblobdownloader.cpp -- HEADERS -- internet/spotifyblobdownloader.h -- INCLUDE_DIRECTORIES -- ${QCA_INCLUDE_DIRS} --) -- - # Platform specific - OS X - optional_source(APPLE - INCLUDE_DIRECTORIES -@@ -1171,7 +1151,6 @@ add_dependencies(clementine_lib pot) - - - target_link_libraries(clementine_lib -- clementine-spotifyblob-messages - libclementine-common - libclementine-tagreader - libclementine-remote -@@ -1240,13 +1219,6 @@ if(HAVE_BREAKPAD) - endif (LINUX) - endif(HAVE_BREAKPAD) - --if(HAVE_SPOTIFY_DOWNLOADER) -- target_link_libraries(clementine_lib -- ${QCA_LIBRARIES} -- ) -- link_directories(${QCA_LIBRARY_DIRS}) --endif(HAVE_SPOTIFY_DOWNLOADER) -- - if (APPLE) - target_link_libraries(clementine_lib - ${GROWL} -@@ -1328,16 +1300,6 @@ target_link_libraries(clementine - clementine_lib - ) - --# macdeploy.py relies on the blob being built first. --if(HAVE_SPOTIFY_BLOB) -- add_dependencies(clementine clementine-spotifyblob) --endif(HAVE_SPOTIFY_BLOB) --add_dependencies(clementine clementine-tagreader) -- --set_target_properties(clementine PROPERTIES -- MACOSX_BUNDLE_INFO_PLIST "../dist/Info.plist" --) -- - if (APPLE) - install(FILES ../dist/clementine.icns - DESTINATION "${CMAKE_BINARY_DIR}/clementine.app/Contents/Resources") -diff --git a/src/analyzers/nyancatanalyzer.cpp b/src/analyzers/nyancatanalyzer.cpp -index 39ea101..ab19341 100644 ---- a/src/analyzers/nyancatanalyzer.cpp -+++ b/src/analyzers/nyancatanalyzer.cpp -@@ -23,13 +23,13 @@ - #include - #include - --const char* NyanCatAnalyzer::kName = "Nyanalyzer cat"; -+const char* NyanCatAnalyzer::kName = "MooGNU"; - const float NyanCatAnalyzer::kPixelScale = 0.02f; - - - NyanCatAnalyzer::NyanCatAnalyzer(QWidget* parent) - : Analyzer::Base(parent, 9), -- cat_(":/nyancat.png"), -+ cat_(":/moognu.png"), - timer_id_(startTimer(kFrameIntervalMs)), - frame_(0), - current_buffer_(0), -diff --git a/src/config.h.in b/src/config.h.in -index 6cac97e..90e4ee2 100644 ---- a/src/config.h.in -+++ b/src/config.h.in -@@ -39,7 +39,6 @@ - #cmakedefine HAVE_QCA - #cmakedefine HAVE_SKYDRIVE - #cmakedefine HAVE_SPARKLE --#cmakedefine HAVE_SPOTIFY_DOWNLOADER - #cmakedefine HAVE_STATIC_SQLITE - #cmakedefine HAVE_UBUNTU_ONE - #cmakedefine HAVE_WIIMOTEDEV -diff --git a/src/core/backgroundstreams.cpp b/src/core/backgroundstreams.cpp -index 347b959..b00cb87 100644 ---- a/src/core/backgroundstreams.cpp -+++ b/src/core/backgroundstreams.cpp -@@ -9,7 +9,6 @@ - - const char* BackgroundStreams::kSettingsGroup = "BackgroundStreams"; - const char* BackgroundStreams::kHypnotoadUrl = "hypnotoad:///"; --const char* BackgroundStreams::kRainUrl = "http://data.clementine-player.org/rainymood"; - const char* BackgroundStreams::kEnterpriseUrl = "enterprise:///"; - - BackgroundStreams::BackgroundStreams(EngineBase* engine, QObject* parent) -@@ -28,7 +27,6 @@ void BackgroundStreams::LoadStreams() { - int version = s.value("version", 0).toInt(); - if (version < 1) { - AddStream(QT_TR_NOOP("Hypnotoad"), QUrl(kHypnotoadUrl)); -- AddStream(QT_TR_NOOP("Rain"), QUrl(kRainUrl)); - } - - if (version < kVersion) { -diff --git a/src/core/timeconstants.h b/src/core/timeconstants.h -index 96242d6..69196bd 100644 ---- a/src/core/timeconstants.h -+++ b/src/core/timeconstants.h -@@ -14,10 +14,6 @@ - limitations under the License. - */ - --// Note: this file is licensed under the Apache License instead of GPL because --// it is used by the Spotify blob which links against libspotify and is not GPL --// compatible. -- - #ifndef TIMECONSTANTS_H - #define TIMECONSTANTS_H - -diff --git a/src/core/utilities.cpp b/src/core/utilities.cpp -index 3fdc6be..e6a109f 100644 ---- a/src/core/utilities.cpp -+++ b/src/core/utilities.cpp -@@ -340,9 +340,6 @@ QString GetConfigPath(ConfigPath config) { - return QDir::homePath(); - #endif - -- case Path_LocalSpotifyBlob: -- return GetConfigPath(Path_Root) + "/spotifyblob"; -- - default: - qFatal("%s", Q_FUNC_INFO); - return QString::null; -diff --git a/src/core/utilities.h b/src/core/utilities.h -index edaa545..ad2138c 100644 ---- a/src/core/utilities.h -+++ b/src/core/utilities.h -@@ -111,7 +111,6 @@ namespace Utilities { - Path_NetworkCache, - Path_GstreamerRegistry, - Path_DefaultMusicLibrary, -- Path_LocalSpotifyBlob, - Path_MoodbarCache, - Path_CacheRoot, - }; -diff --git a/src/covers/albumcoverloader.cpp b/src/covers/albumcoverloader.cpp -index a4c4241..39dd101 100644 ---- a/src/covers/albumcoverloader.cpp -+++ b/src/covers/albumcoverloader.cpp -@@ -30,7 +30,6 @@ - #include "core/tagreaderclient.h" - #include "core/utilities.h" - #include "internet/internetmodel.h" --#include "internet/spotifyservice.h" - - - -@@ -38,8 +37,7 @@ AlbumCoverLoader::AlbumCoverLoader(QObject* parent) - : QObject(parent), - stop_requested_(false), - next_id_(1), -- network_(new NetworkAccessManager(this)), -- connected_spotify_(false) -+ network_(new NetworkAccessManager(this)) - { - } - -@@ -169,26 +167,6 @@ AlbumCoverLoader::TryLoadResult AlbumCoverLoader::TryLoadImage( - - remote_tasks_.insert(reply, task); - return TryLoadResult(true, false, QImage()); -- } else if (filename.toLower().startsWith("spotify://image/")) { -- // HACK: we should add generic image URL handlers -- SpotifyService* spotify = InternetModel::Service(); -- -- if (!connected_spotify_) { -- connect(spotify, SIGNAL(ImageLoaded(QString,QImage)), -- SLOT(SpotifyImageLoaded(QString,QImage))); -- connected_spotify_ = true; -- } -- -- QString id = QUrl(filename).path(); -- if (id.startsWith('/')) { -- id.remove(0, 1); -- } -- remote_spotify_tasks_.insert(id, task); -- -- // Need to schedule this in the spotify service's thread -- QMetaObject::invokeMethod(spotify, "LoadImage", Qt::QueuedConnection, -- Q_ARG(QString, id)); -- return TryLoadResult(true, false, QImage()); - } - - QImage image(filename); -@@ -196,16 +174,6 @@ AlbumCoverLoader::TryLoadResult AlbumCoverLoader::TryLoadImage( - image.isNull() ? task.options.default_output_image_: image); - } - --void AlbumCoverLoader::SpotifyImageLoaded(const QString& id, const QImage& image) { -- if (!remote_spotify_tasks_.contains(id)) -- return; -- -- Task task = remote_spotify_tasks_.take(id); -- QImage scaled = ScaleAndPad(task.options, image); -- emit ImageLoaded(task.id, scaled); -- emit ImageLoaded(task.id, scaled, image); --} -- - void AlbumCoverLoader::RemoteFetchFinished(QNetworkReply* reply) { - reply->deleteLater(); - -diff --git a/src/covers/albumcoverloader.h b/src/covers/albumcoverloader.h -index 987be66..5214e14 100644 ---- a/src/covers/albumcoverloader.h -+++ b/src/covers/albumcoverloader.h -@@ -62,7 +62,6 @@ class AlbumCoverLoader : public QObject { - protected slots: - void ProcessTasks(); - void RemoteFetchFinished(QNetworkReply* reply); -- void SpotifyImageLoaded(const QString& url, const QImage& image); - - protected: - enum State { -@@ -102,13 +101,10 @@ class AlbumCoverLoader : public QObject { - QMutex mutex_; - QQueue tasks_; - QMap remote_tasks_; -- QMap remote_spotify_tasks_; - quint64 next_id_; - - NetworkAccessManager* network_; - -- bool connected_spotify_; -- - static const int kMaxRedirects = 3; - }; - -diff --git a/src/engines/gstenginepipeline.cpp b/src/engines/gstenginepipeline.cpp -index 94f77a3..37c1cdf 100644 ---- a/src/engines/gstenginepipeline.cpp -+++ b/src/engines/gstenginepipeline.cpp -@@ -29,8 +29,6 @@ - #include "core/signalchecker.h" - #include "core/utilities.h" - #include "internet/internetmodel.h" --#include "internet/spotifyserver.h" --#include "internet/spotifyservice.h" - - - const int GstEnginePipeline::kGstStateTimeoutNanosecs = 10000000; -@@ -141,37 +139,11 @@ bool GstEnginePipeline::ReplaceDecodeBin(GstElement* new_bin) { - bool GstEnginePipeline::ReplaceDecodeBin(const QUrl& url) { - GstElement* new_bin = NULL; - -- if (url.scheme() == "spotify") { -- new_bin = gst_bin_new("spotify_bin"); -- -- // Create elements -- GstElement* src = engine_->CreateElement("tcpserversrc", new_bin); -- GstElement* gdp = engine_->CreateElement("gdpdepay", new_bin); -- if (!src || !gdp) -- return false; -- -- // Pick a port number -- const int port = Utilities::PickUnusedPort(); -- g_object_set(G_OBJECT(src), "host", "127.0.0.1", NULL); -- g_object_set(G_OBJECT(src), "port", port, NULL); -- -- // Link the elements -- gst_element_link(src, gdp); -- -- // Add a ghost pad -- GstPad* pad = gst_element_get_static_pad(gdp, "src"); -- gst_element_add_pad(GST_ELEMENT(new_bin), gst_ghost_pad_new("src", pad)); -- gst_object_unref(GST_OBJECT(pad)); -- -- // Tell spotify to start sending data to us. -- InternetModel::Service()->server()->StartPlaybackLater(url.toString(), port); -- } else { - new_bin = engine_->CreateElement("uridecodebin"); - g_object_set(G_OBJECT(new_bin), "uri", url.toEncoded().constData(), NULL); - CHECKED_GCONNECT(G_OBJECT(new_bin), "drained", &SourceDrainedCallback, this); - CHECKED_GCONNECT(G_OBJECT(new_bin), "pad-added", &NewPadCallback, this); - CHECKED_GCONNECT(G_OBJECT(new_bin), "notify::source", &SourceSetupCallback, this); -- } - - return ReplaceDecodeBin(new_bin); - } -diff --git a/src/internet/internetmodel.cpp b/src/internet/internetmodel.cpp -index 289f591..ac9e3e0 100644 ---- a/src/internet/internetmodel.cpp -+++ b/src/internet/internetmodel.cpp -@@ -30,7 +30,6 @@ - #include "savedradio.h" - #include "somafmservice.h" - #include "soundcloudservice.h" --#include "spotifyservice.h" - #include "subsonicservice.h" - #include "core/closure.h" - #include "core/logging.h" -@@ -94,7 +93,6 @@ InternetModel::InternetModel(Application* app, QObject* parent) - AddService(new SkyFmService(app, this)); - AddService(new SomaFMService(app, this)); - AddService(new SoundCloudService(app, this)); -- AddService(new SpotifyService(app, this)); - AddService(new SubsonicService(app, this)); - #ifdef HAVE_UBUNTU_ONE - AddService(new UbuntuOneService(app, this)); -diff --git a/src/ui/about.cpp b/src/ui/about.cpp -index 53e42bd..49e7714 100644 ---- a/src/ui/about.cpp -+++ b/src/ui/about.cpp -@@ -76,14 +76,9 @@ QString About::MakeHtml() const { - - ret += QString("
%1

").arg(tr("...and all the Amarok contributors")); - ret += QString("

%1").arg(tr("And:")); -- ret += QString("
Rainy Mood"); - ret += QString("
Scott Smitelli"); - ret += QString("
Allie Brosh

"); - -- ret += "

This product uses Music by Spotify but is not endorsed, certified " -- "or otherwise approved in any way by Spotify. Spotify is the registered " -- "trade mark of the Spotify Group.

"; -- - return ret; - } - -diff --git a/src/ui/settingsdialog.cpp b/src/ui/settingsdialog.cpp -index dc0d84f..4a9335d 100644 ---- a/src/ui/settingsdialog.cpp -+++ b/src/ui/settingsdialog.cpp -@@ -38,7 +38,6 @@ - #include "internet/digitallyimportedsettingspage.h" - #include "internet/groovesharksettingspage.h" - #include "internet/magnatunesettingspage.h" --#include "internet/spotifysettingspage.h" - #include "internet/subsonicsettingspage.h" - #include "internet/ubuntuonesettingspage.h" - #include "library/librarysettingspage.h" -@@ -174,7 +173,6 @@ SettingsDialog::SettingsDialog(Application* app, BackgroundStreams* streams, QWi - AddPage(Page_Box, new BoxSettingsPage(this), providers); - #endif - -- AddPage(Page_Spotify, new SpotifySettingsPage(this), providers); - AddPage(Page_Magnatune, new MagnatuneSettingsPage(this), providers); - AddPage(Page_DigitallyImported, new DigitallyImportedSettingsPage(this), providers); - AddPage(Page_BackgroundStreams, new BackgroundStreamsSettingsPage(this), providers); -diff --git a/src/ui/settingsdialog.h b/src/ui/settingsdialog.h -index e9e709a..5485a37 100644 ---- a/src/ui/settingsdialog.h -+++ b/src/ui/settingsdialog.h -@@ -69,7 +69,6 @@ public: - Page_Library, - Page_Lastfm, - Page_Grooveshark, -- Page_Spotify, - Page_Magnatune, - Page_DigitallyImported, - Page_BackgroundStreams, diff --git a/libre/clementine-libre/udisks-namespace.patch b/libre/clementine-libre/udisks-namespace.patch deleted file mode 100644 index e74889e78..000000000 --- a/libre/clementine-libre/udisks-namespace.patch +++ /dev/null @@ -1,38 +0,0 @@ -From ec580cb815c16ec1ab43a469d5af7d51d8d03082 Mon Sep 17 00:00:00 2001 -From: Chocobozzz -Date: Wed, 16 Jul 2014 15:57:25 +0200 -Subject: [PATCH] No namespaces for DBus interfaces. Fixes #4401 - ---- - src/CMakeLists.txt | 9 ++++----- - 1 file changed, 4 insertions(+), 5 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 650fa74..775b0a5 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -892,11 +892,6 @@ optional_source(LINUX SOURCES widgets/osd_x11.cpp) - if(HAVE_DBUS) - file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dbus) - -- # Hack to get it to generate interfaces without namespaces - required -- # because otherwise org::freedesktop::UDisks and -- # org::freedesktop::UDisks::Device conflict. -- list(APPEND QT_DBUSXML2CPP_EXECUTABLE -N) -- - # MPRIS DBUS interfaces - qt4_add_dbus_adaptor(SOURCES - dbus/org.freedesktop.MediaPlayer.player.xml -@@ -964,6 +959,10 @@ if(HAVE_DBUS) - - # DeviceKit DBUS interfaces - if(HAVE_DEVICEKIT) -+ set_source_files_properties(dbus/org.freedesktop.UDisks.xml -+ PROPERTIES NO_NAMESPACE dbus/udisks) -+ set_source_files_properties(dbus/org.freedesktop.UDisks.Device.xml -+ PROPERTIES NO_NAMESPACE dbus/udisksdevice) - qt4_add_dbus_interface(SOURCES - dbus/org.freedesktop.UDisks.xml - dbus/udisks) --- -2.0.3 diff --git a/libre/clementine/PKGBUILD b/libre/clementine/PKGBUILD new file mode 100644 index 000000000..cfa05ad10 --- /dev/null +++ b/libre/clementine/PKGBUILD @@ -0,0 +1,89 @@ +# $Id: PKGBUILD 117584 2014-08-18 23:42:44Z alucryd $ +# Maintainer (Arch): Maxime Gauduin +# Contributor (Arch): Stéphane Gaudreault +# Contributor (Arch): BlackEagle +# Contributor (Arch): Dany Martineau +# Maintainer: André Silva +# Contributor: Kete +# Contributor: Márcio Silva + +pkgname=clementine +_pkgname=$pkgname-libre +pkgver=1.2.3 +pkgrel=2.parabola1 +pkgdesc='A modern music player and library organizer, without nonfree artwork and Spotify support' +url="http://www.$pkgname-player.org/" +license=('GPL') +arch=('i686' 'x86_64' 'mips64el') +replaces=("$_pkgname") +conflicts=("$_pkgname") +depends=('chromaprint' 'glew' 'gstreamer0.10-base' 'libcdio' 'libgpod' 'liblastfm' 'libmtp' 'libmygpo-qt' 'protobuf' 'qca-ossl' 'taglib') +makedepends=('cmake' 'boost' 'mesa' 'sparsehash') +optdepends=('gstreamer0.10-base-plugins: "Base" plugin libraries' + 'gstreamer0.10-good-plugins: "Good" plugin libraries' + 'gstreamer0.10-bad-plugins: "Bad" plugin libraries' + 'gstreamer0.10-ugly-plugins: "Ugly" plugin libraries' + 'gvfs: Various devices support') +install="${pkgname}.install" +mksource=("${pkgname}-${pkgver}.tar.gz::https://github.com/$pkgname-player/${pkgname^}/archive/${pkgver}.tar.gz" + 'remove-nonfree-artwork-and-spotify.patch' + 'moognu.png') +source=("https://repo.parabolagnulinux.org/other/${_pkgname}/${_pkgname}-${pkgver}.tar.gz" + 'udisks-namespace.patch') +mksha256sums=('7df5650445a005c09f5f0e1a1b0d077037c37ecbe4ee77baf9d45f121308a1bf' + '48bfbf42c84ac1891021638627c10780194fcc59eda1c69e157be3aebe8ee10b' + 'c6918617769152f3617c61f721819e69d03f671b85760b11cfe45abd53955bc4') +sha256sums=('c68275373b839b5b256b813b5bed85d501f94e12bef3dd8ed69e90094af3f769' + 'a7c2764576cee303a57e4efe6a5dbd583a66de8a15aee738bd92d4bb21786008') + +mksource() { + cd ${pkgname^}-${pkgver} + + # remove nonfree nonfree artwork and spotify references on files + patch -Np1 -i ../remove-nonfree-artwork-and-spotify.patch + + # remove nonfree spotifyblob folders + rm -rv ext/{$pkgname-spotifyblob,lib${pkgname}-spotifyblob} + + # remove nonfree spotify files + rm -v cmake/SpotifyVersion.cmake + rm -v data/spotify-attribution.png + rm -v data/icons/svg/spotify.svg + rm -v data/schema/schema-30.sql + rm -v src/{globalsearch/spotifysearchprovider.{cpp,h},internet/spotify{blobdownloader.{cpp,h},server.{cpp,h},service.{cpp,h},settingspage.{cpp,h,ui}}} + + ## remove nonfree nyancat.png + rm -v data/nyancat.png + + ## rut moognu.png to the source code + install -m644 -v ../moognu.png data + + # create a blank file due which is a dependency for clementine + touch data/schema/schema-30.sql +} + +prepare() { + cd ${_pkgname}-${pkgver} + + patch -Np1 -i ../udisks-namespace.patch +} + +build() { + cd ${_pkgname}-${pkgver} + + if [[ -d build ]]; then + rm -rf build + fi + mkdir build && cd build + + cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_BUILD_TYPE='Release' + make +} + +package() { + cd ${_pkgname}-${pkgver}/build + + make DESTDIR="${pkgdir}" install +} + +# vim: ts=2 sw=2 et: diff --git a/libre/clementine/clementine.install b/libre/clementine/clementine.install new file mode 100644 index 000000000..927a10258 --- /dev/null +++ b/libre/clementine/clementine.install @@ -0,0 +1,15 @@ +post_install() { + gtk-update-icon-cache -ftq usr/share/icons/hicolor + update-desktop-database -q +} + +post_upgrade() { + post_install +} + + +post_remove() { + post_install +} + +# vim: ts=2 sw=2 et: diff --git a/libre/clementine/moognu.png b/libre/clementine/moognu.png new file mode 100644 index 000000000..177041886 Binary files /dev/null and b/libre/clementine/moognu.png differ diff --git a/libre/clementine/remove-nonfree-artwork-and-spotify.patch b/libre/clementine/remove-nonfree-artwork-and-spotify.patch new file mode 100644 index 000000000..8c1b9aafd --- /dev/null +++ b/libre/clementine/remove-nonfree-artwork-and-spotify.patch @@ -0,0 +1,655 @@ +diff --git a/3rdparty/SPMediaKeyTap/SPMediaKeyTap.m b/3rdparty/SPMediaKeyTap/SPMediaKeyTap.m +index a349f59..c418e0b 100644 +--- a/3rdparty/SPMediaKeyTap/SPMediaKeyTap.m ++++ b/3rdparty/SPMediaKeyTap/SPMediaKeyTap.m +@@ -98,7 +98,6 @@ static CGEventRef tapEventCallback(CGEventTapProxy proxy, CGEventType type, CGEv + { + return [NSArray arrayWithObjects: + [[NSBundle mainBundle] bundleIdentifier], // your app +- @"com.spotify.client", + @"com.apple.iTunes", + @"com.apple.QuickTimePlayerX", + @"com.apple.quicktimeplayer", +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 47f1693..986351b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -7,7 +7,6 @@ include(cmake/Summary.cmake) + include(cmake/Version.cmake) + include(cmake/Deb.cmake) + include(cmake/Rpm.cmake) +-include(cmake/SpotifyVersion.cmake) + include(cmake/OptionalSource.cmake) + set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) + +@@ -78,7 +77,6 @@ pkg_check_modules(LIBMYGPO_QT libmygpo-qt>=1.0.7) + pkg_check_modules(LIBXML libxml-2.0) + pkg_check_modules(QCA qca2) + pkg_check_modules(QJSON REQUIRED QJson) +-pkg_check_modules(SPOTIFY libspotify>=12.1.45) + pkg_check_modules(TAGLIB REQUIRED taglib>=1.6) + + if (WIN32) +@@ -124,13 +122,6 @@ if (APPLE) + find_library(GROWL Growl) + find_library(SPARKLE Sparkle) + +- find_library(SPOTIFY libspotify) +- if (SPOTIFY) +- set (SPOTIFY_FOUND ON) +- set (SPOTIFY_INCLUDE_DIRS ${SPOTIFY}) +- set (SPOTIFY_LIBRARIES ${SPOTIFY}) +- endif (SPOTIFY) +- + add_subdirectory(3rdparty/SPMediaKeyTap) + set(SPMEDIAKEYTAP_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/SPMediaKeyTap) + set(SPMEDIAKEYTAP_LIBRARIES SPMediaKeyTap) +@@ -254,7 +245,7 @@ optional_component(DEVICEKIT ON "Devices: DeviceKit backend" + DEPENDS "D-Bus support" HAVE_DBUS + ) + +-optional_component(SPOTIFY_BLOB ON "Spotify support: non-GPL binary helper" ++optional_component(SPOTIFY_BLOB OFF "Spotify support: non-GPL binary helper" + DEPENDS "protobuf" PROTOBUF_FOUND PROTOBUF_PROTOC_EXECUTABLE + DEPENDS "libspotify" SPOTIFY_FOUND + ) +@@ -270,13 +261,6 @@ optional_component(SPARKLE ON "Sparkle integration" + + optional_component(VISUALISATIONS ON "Visualisations") + +-if(NOT HAVE_SPOTIFY_BLOB AND NOT QCA_FOUND) +- message(FATAL_ERROR "Either QCA must be available or the non-GPL Spotify " +- "code must be compiled in") +-elseif(QCA_FOUND) +- set(HAVE_SPOTIFY_DOWNLOADER ON) +-endif() +- + # Find DBus if it's enabled + if (HAVE_DBUS) + find_package(Qt4 REQUIRED QtDbus) +@@ -440,7 +424,6 @@ add_subdirectory(ext/libclementine-common) + add_subdirectory(ext/libclementine-tagreader) + add_subdirectory(ext/clementine-tagreader) + add_subdirectory(ext/libclementine-remote) +-add_subdirectory(ext/libclementine-spotifyblob) + + option(WITH_DEBIAN OFF) + if(WITH_DEBIAN) +@@ -451,10 +434,6 @@ if(HAVE_BREAKPAD) + add_subdirectory(3rdparty/google-breakpad) + endif(HAVE_BREAKPAD) + +-if(HAVE_SPOTIFY_BLOB) +- add_subdirectory(ext/clementine-spotifyblob) +-endif(HAVE_SPOTIFY_BLOB) +- + if(HAVE_MOODBAR) + add_subdirectory(gst/moodbar) + endif() +diff --git a/data/data.qrc b/data/data.qrc +index 4c5473f..bd5fe2d 100644 +--- a/data/data.qrc ++++ b/data/data.qrc +@@ -2,7 +2,6 @@ + + blank.ttf + clementine_remote_qr.png +- clementine-spotify-public.pem + currenttrack_bar_left.png + currenttrack_bar_mid.png + currenttrack_bar_right.png +@@ -77,7 +76,6 @@ + icons/22x22/phone-nokia-n900.png + icons/22x22/phone-palm-pre.png + icons/22x22/phone.png +- icons/22x22/spotify.png + icons/22x22/user-away.png + icons/22x22/view-choose.png + icons/22x22/view-fullscreen.png +@@ -154,7 +152,6 @@ + icons/32x32/phone-palm-pre.png + icons/32x32/phone.png + icons/32x32/search.png +- icons/32x32/spotify.png + icons/32x32/tools-wizard.png + icons/32x32/view-choose.png + icons/32x32/view-fullscreen.png +@@ -230,7 +227,6 @@ + icons/48x48/phone-nokia-n900.png + icons/48x48/phone-palm-pre.png + icons/48x48/phone.png +- icons/48x48/spotify.png + icons/48x48/view-choose.png + icons/48x48/view-fullscreen.png + icons/48x48/view-media-equalizer.png +@@ -262,10 +258,10 @@ + lumberjacksong.txt + lyrics/ultimate_providers.xml + mainwindow.css ++ moognu.png + nocover.png + nomusic.png + now_playing_tooltip.txt +- nyancat.png + oauthsuccess.html + osd_background.png + osd_shadow_corner.png +@@ -391,7 +387,6 @@ + smartplaylistsearchterm.css + songinfo.css + spinner.gif +- spotify-attribution.png + star-off.png + star-on.png + tiny-pause.png +diff --git a/dist/macdeploy.py b/dist/macdeploy.py +index e054619..3568a6f 100755 +--- a/dist/macdeploy.py ++++ b/dist/macdeploy.py +@@ -398,10 +398,7 @@ def main(): + FixPlugin(FindGioModule('libgiolibproxy.so'), 'gio-modules') + + try: +- FixPlugin('clementine-spotifyblob', '.') + FixPlugin('clementine-tagreader', '.') +- except: +- print 'Failed to find blob: %s' % traceback.format_exc() + + for plugin in QT_PLUGINS: + FixPlugin(FindQtPlugin(plugin), os.path.dirname(plugin)) +diff --git a/dist/windows/clementine.nsi.in b/dist/windows/clementine.nsi.in +index 750b332..6bf47ff 100644 +--- a/dist/windows/clementine.nsi.in ++++ b/dist/windows/clementine.nsi.in +@@ -97,9 +97,6 @@ Section "Delete old files" oldfiles + Delete "$INSTDIR\gstreamer-plugins\libgstqueue2.dll" + Delete "$INSTDIR\gstreamer-plugins\libgstsoup.dll" + +- ; 1.0 prerelease +- Delete "$INSTDIR\spotify.dll" +- + ; 1.0 + Delete "$INSTDIR\libofa.dll" + Delete "$INSTDIR\gstreamer-plugins\libgstofa.dll" +@@ -128,7 +125,6 @@ Section "Clementine" Clementine + File "avutil-51.dll" + File "clementine.exe" + File "clementine-tagreader.exe" +- File "clementine-spotifyblob.exe" + File "clementine.ico" + File "glew32.dll" + File "intl.dll" +@@ -181,7 +177,6 @@ Section "Clementine" Clementine + File "libqjson.dll" + File "libsoup-2.4-1.dll" + File "libspeex-1.dll" +- File "libspotify.dll" + File "libstdc++-6.dll" + File "libtag.dll" + File "libtasn1-3.dll" +@@ -939,7 +934,6 @@ Section "Uninstall" + Delete "$INSTDIR\clementine.ico" + Delete "$INSTDIR\clementine.exe" + Delete "$INSTDIR\clementine-tagreader.exe" +- Delete "$INSTDIR\clementine-spotifyblob.exe" + Delete "$INSTDIR\glew32.dll" + Delete "$INSTDIR\intl.dll" + Delete "$INSTDIR\libcdio-14.dll" +@@ -992,7 +986,6 @@ Section "Uninstall" + Delete "$INSTDIR\libqjson.dll" + Delete "$INSTDIR\libsoup-2.4-1.dll" + Delete "$INSTDIR\libspeex-1.dll" +- Delete "$INSTDIR\libspotify.dll" + Delete "$INSTDIR\libstdc++-6.dll" + Delete "$INSTDIR\libtag.dll" + Delete "$INSTDIR\libtasn1-3.dll" +diff --git a/ext/libclementine-common/core/logging.cpp b/ext/libclementine-common/core/logging.cpp +index 3c53d7a..49dd8cf 100644 +--- a/ext/libclementine-common/core/logging.cpp ++++ b/ext/libclementine-common/core/logging.cpp +@@ -14,10 +14,6 @@ + limitations under the License. + */ + +-// Note: this file is licensed under the Apache License instead of GPL because +-// it is used by the Spotify blob which links against libspotify and is not GPL +-// compatible. +- + #include + + #include +diff --git a/ext/libclementine-common/core/logging.h b/ext/libclementine-common/core/logging.h +index 3c582cf..4a3cea8 100644 +--- a/ext/libclementine-common/core/logging.h ++++ b/ext/libclementine-common/core/logging.h +@@ -14,11 +14,6 @@ + limitations under the License. + */ + +-// Note: this file is licensed under the Apache License instead of GPL because +-// it is used by the Spotify blob which links against libspotify and is not GPL +-// compatible. +- +- + #ifndef LOGGING_H + #define LOGGING_H + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 1104542..e7a8032 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -60,8 +60,6 @@ include_directories(${CMAKE_SOURCE_DIR}/ext/libclementine-tagreader) + include_directories(${CMAKE_BINARY_DIR}/ext/libclementine-tagreader) + include_directories(${CMAKE_SOURCE_DIR}/ext/libclementine-remote) + include_directories(${CMAKE_BINARY_DIR}/ext/libclementine-remote) +-include_directories(${CMAKE_SOURCE_DIR}/ext/libclementine-spotifyblob) +-include_directories(${CMAKE_BINARY_DIR}/ext/libclementine-spotifyblob) + + cmake_policy(SET CMP0011 NEW) + include(../cmake/ParseArguments.cmake) +@@ -157,7 +155,6 @@ set(SOURCES + globalsearch/simplesearchprovider.cpp + globalsearch/somafmsearchprovider.cpp + globalsearch/soundcloudsearchprovider.cpp +- globalsearch/spotifysearchprovider.cpp + globalsearch/suggestionwidget.cpp + globalsearch/urlsearchprovider.cpp + +@@ -195,9 +192,6 @@ set(SOURCES + internet/somafmservice.cpp + internet/somafmurlhandler.cpp + internet/soundcloudservice.cpp +- internet/spotifyserver.cpp +- internet/spotifyservice.cpp +- internet/spotifysettingspage.cpp + internet/subsonicservice.cpp + internet/subsonicsettingspage.cpp + internet/subsonicurlhandler.cpp +@@ -461,7 +455,6 @@ set(HEADERS + globalsearch/searchprovider.h + globalsearch/simplesearchprovider.h + globalsearch/soundcloudsearchprovider.h +- globalsearch/spotifysearchprovider.h + globalsearch/suggestionwidget.h + + internet/cloudfileservice.h +@@ -494,9 +487,6 @@ set(HEADERS + internet/somafmservice.h + internet/somafmurlhandler.h + internet/soundcloudservice.h +- internet/spotifyserver.h +- internet/spotifyservice.h +- internet/spotifysettingspage.h + internet/subsonicservice.h + internet/subsonicsettingspage.h + internet/subsonicurlhandler.h +@@ -685,7 +675,6 @@ set(UI + internet/magnatunedownloaddialog.ui + internet/magnatunesettingspage.ui + internet/searchboxwidget.ui +- internet/spotifysettingspage.ui + internet/subsonicsettingspage.ui + + library/groupbydialog.ui +@@ -836,15 +825,6 @@ optional_source(HAVE_LIBLASTFM + ) + + +-optional_source(HAVE_SPOTIFY_DOWNLOADER +- SOURCES +- internet/spotifyblobdownloader.cpp +- HEADERS +- internet/spotifyblobdownloader.h +- INCLUDE_DIRECTORIES +- ${QCA_INCLUDE_DIRS} +-) +- + # Platform specific - OS X + optional_source(APPLE + INCLUDE_DIRECTORIES +@@ -1171,7 +1151,6 @@ add_dependencies(clementine_lib pot) + + + target_link_libraries(clementine_lib +- clementine-spotifyblob-messages + libclementine-common + libclementine-tagreader + libclementine-remote +@@ -1240,13 +1219,6 @@ if(HAVE_BREAKPAD) + endif (LINUX) + endif(HAVE_BREAKPAD) + +-if(HAVE_SPOTIFY_DOWNLOADER) +- target_link_libraries(clementine_lib +- ${QCA_LIBRARIES} +- ) +- link_directories(${QCA_LIBRARY_DIRS}) +-endif(HAVE_SPOTIFY_DOWNLOADER) +- + if (APPLE) + target_link_libraries(clementine_lib + ${GROWL} +@@ -1328,16 +1300,6 @@ target_link_libraries(clementine + clementine_lib + ) + +-# macdeploy.py relies on the blob being built first. +-if(HAVE_SPOTIFY_BLOB) +- add_dependencies(clementine clementine-spotifyblob) +-endif(HAVE_SPOTIFY_BLOB) +-add_dependencies(clementine clementine-tagreader) +- +-set_target_properties(clementine PROPERTIES +- MACOSX_BUNDLE_INFO_PLIST "../dist/Info.plist" +-) +- + if (APPLE) + install(FILES ../dist/clementine.icns + DESTINATION "${CMAKE_BINARY_DIR}/clementine.app/Contents/Resources") +diff --git a/src/analyzers/nyancatanalyzer.cpp b/src/analyzers/nyancatanalyzer.cpp +index 39ea101..ab19341 100644 +--- a/src/analyzers/nyancatanalyzer.cpp ++++ b/src/analyzers/nyancatanalyzer.cpp +@@ -23,13 +23,13 @@ + #include + #include + +-const char* NyanCatAnalyzer::kName = "Nyanalyzer cat"; ++const char* NyanCatAnalyzer::kName = "MooGNU"; + const float NyanCatAnalyzer::kPixelScale = 0.02f; + + + NyanCatAnalyzer::NyanCatAnalyzer(QWidget* parent) + : Analyzer::Base(parent, 9), +- cat_(":/nyancat.png"), ++ cat_(":/moognu.png"), + timer_id_(startTimer(kFrameIntervalMs)), + frame_(0), + current_buffer_(0), +diff --git a/src/config.h.in b/src/config.h.in +index 6cac97e..90e4ee2 100644 +--- a/src/config.h.in ++++ b/src/config.h.in +@@ -39,7 +39,6 @@ + #cmakedefine HAVE_QCA + #cmakedefine HAVE_SKYDRIVE + #cmakedefine HAVE_SPARKLE +-#cmakedefine HAVE_SPOTIFY_DOWNLOADER + #cmakedefine HAVE_STATIC_SQLITE + #cmakedefine HAVE_UBUNTU_ONE + #cmakedefine HAVE_WIIMOTEDEV +diff --git a/src/core/backgroundstreams.cpp b/src/core/backgroundstreams.cpp +index 347b959..b00cb87 100644 +--- a/src/core/backgroundstreams.cpp ++++ b/src/core/backgroundstreams.cpp +@@ -9,7 +9,6 @@ + + const char* BackgroundStreams::kSettingsGroup = "BackgroundStreams"; + const char* BackgroundStreams::kHypnotoadUrl = "hypnotoad:///"; +-const char* BackgroundStreams::kRainUrl = "http://data.clementine-player.org/rainymood"; + const char* BackgroundStreams::kEnterpriseUrl = "enterprise:///"; + + BackgroundStreams::BackgroundStreams(EngineBase* engine, QObject* parent) +@@ -28,7 +27,6 @@ void BackgroundStreams::LoadStreams() { + int version = s.value("version", 0).toInt(); + if (version < 1) { + AddStream(QT_TR_NOOP("Hypnotoad"), QUrl(kHypnotoadUrl)); +- AddStream(QT_TR_NOOP("Rain"), QUrl(kRainUrl)); + } + + if (version < kVersion) { +diff --git a/src/core/timeconstants.h b/src/core/timeconstants.h +index 96242d6..69196bd 100644 +--- a/src/core/timeconstants.h ++++ b/src/core/timeconstants.h +@@ -14,10 +14,6 @@ + limitations under the License. + */ + +-// Note: this file is licensed under the Apache License instead of GPL because +-// it is used by the Spotify blob which links against libspotify and is not GPL +-// compatible. +- + #ifndef TIMECONSTANTS_H + #define TIMECONSTANTS_H + +diff --git a/src/core/utilities.cpp b/src/core/utilities.cpp +index 3fdc6be..e6a109f 100644 +--- a/src/core/utilities.cpp ++++ b/src/core/utilities.cpp +@@ -340,9 +340,6 @@ QString GetConfigPath(ConfigPath config) { + return QDir::homePath(); + #endif + +- case Path_LocalSpotifyBlob: +- return GetConfigPath(Path_Root) + "/spotifyblob"; +- + default: + qFatal("%s", Q_FUNC_INFO); + return QString::null; +diff --git a/src/core/utilities.h b/src/core/utilities.h +index edaa545..ad2138c 100644 +--- a/src/core/utilities.h ++++ b/src/core/utilities.h +@@ -111,7 +111,6 @@ namespace Utilities { + Path_NetworkCache, + Path_GstreamerRegistry, + Path_DefaultMusicLibrary, +- Path_LocalSpotifyBlob, + Path_MoodbarCache, + Path_CacheRoot, + }; +diff --git a/src/covers/albumcoverloader.cpp b/src/covers/albumcoverloader.cpp +index a4c4241..39dd101 100644 +--- a/src/covers/albumcoverloader.cpp ++++ b/src/covers/albumcoverloader.cpp +@@ -30,7 +30,6 @@ + #include "core/tagreaderclient.h" + #include "core/utilities.h" + #include "internet/internetmodel.h" +-#include "internet/spotifyservice.h" + + + +@@ -38,8 +37,7 @@ AlbumCoverLoader::AlbumCoverLoader(QObject* parent) + : QObject(parent), + stop_requested_(false), + next_id_(1), +- network_(new NetworkAccessManager(this)), +- connected_spotify_(false) ++ network_(new NetworkAccessManager(this)) + { + } + +@@ -169,26 +167,6 @@ AlbumCoverLoader::TryLoadResult AlbumCoverLoader::TryLoadImage( + + remote_tasks_.insert(reply, task); + return TryLoadResult(true, false, QImage()); +- } else if (filename.toLower().startsWith("spotify://image/")) { +- // HACK: we should add generic image URL handlers +- SpotifyService* spotify = InternetModel::Service(); +- +- if (!connected_spotify_) { +- connect(spotify, SIGNAL(ImageLoaded(QString,QImage)), +- SLOT(SpotifyImageLoaded(QString,QImage))); +- connected_spotify_ = true; +- } +- +- QString id = QUrl(filename).path(); +- if (id.startsWith('/')) { +- id.remove(0, 1); +- } +- remote_spotify_tasks_.insert(id, task); +- +- // Need to schedule this in the spotify service's thread +- QMetaObject::invokeMethod(spotify, "LoadImage", Qt::QueuedConnection, +- Q_ARG(QString, id)); +- return TryLoadResult(true, false, QImage()); + } + + QImage image(filename); +@@ -196,16 +174,6 @@ AlbumCoverLoader::TryLoadResult AlbumCoverLoader::TryLoadImage( + image.isNull() ? task.options.default_output_image_: image); + } + +-void AlbumCoverLoader::SpotifyImageLoaded(const QString& id, const QImage& image) { +- if (!remote_spotify_tasks_.contains(id)) +- return; +- +- Task task = remote_spotify_tasks_.take(id); +- QImage scaled = ScaleAndPad(task.options, image); +- emit ImageLoaded(task.id, scaled); +- emit ImageLoaded(task.id, scaled, image); +-} +- + void AlbumCoverLoader::RemoteFetchFinished(QNetworkReply* reply) { + reply->deleteLater(); + +diff --git a/src/covers/albumcoverloader.h b/src/covers/albumcoverloader.h +index 987be66..5214e14 100644 +--- a/src/covers/albumcoverloader.h ++++ b/src/covers/albumcoverloader.h +@@ -62,7 +62,6 @@ class AlbumCoverLoader : public QObject { + protected slots: + void ProcessTasks(); + void RemoteFetchFinished(QNetworkReply* reply); +- void SpotifyImageLoaded(const QString& url, const QImage& image); + + protected: + enum State { +@@ -102,13 +101,10 @@ class AlbumCoverLoader : public QObject { + QMutex mutex_; + QQueue tasks_; + QMap remote_tasks_; +- QMap remote_spotify_tasks_; + quint64 next_id_; + + NetworkAccessManager* network_; + +- bool connected_spotify_; +- + static const int kMaxRedirects = 3; + }; + +diff --git a/src/engines/gstenginepipeline.cpp b/src/engines/gstenginepipeline.cpp +index 94f77a3..37c1cdf 100644 +--- a/src/engines/gstenginepipeline.cpp ++++ b/src/engines/gstenginepipeline.cpp +@@ -29,8 +29,6 @@ + #include "core/signalchecker.h" + #include "core/utilities.h" + #include "internet/internetmodel.h" +-#include "internet/spotifyserver.h" +-#include "internet/spotifyservice.h" + + + const int GstEnginePipeline::kGstStateTimeoutNanosecs = 10000000; +@@ -141,37 +139,11 @@ bool GstEnginePipeline::ReplaceDecodeBin(GstElement* new_bin) { + bool GstEnginePipeline::ReplaceDecodeBin(const QUrl& url) { + GstElement* new_bin = NULL; + +- if (url.scheme() == "spotify") { +- new_bin = gst_bin_new("spotify_bin"); +- +- // Create elements +- GstElement* src = engine_->CreateElement("tcpserversrc", new_bin); +- GstElement* gdp = engine_->CreateElement("gdpdepay", new_bin); +- if (!src || !gdp) +- return false; +- +- // Pick a port number +- const int port = Utilities::PickUnusedPort(); +- g_object_set(G_OBJECT(src), "host", "127.0.0.1", NULL); +- g_object_set(G_OBJECT(src), "port", port, NULL); +- +- // Link the elements +- gst_element_link(src, gdp); +- +- // Add a ghost pad +- GstPad* pad = gst_element_get_static_pad(gdp, "src"); +- gst_element_add_pad(GST_ELEMENT(new_bin), gst_ghost_pad_new("src", pad)); +- gst_object_unref(GST_OBJECT(pad)); +- +- // Tell spotify to start sending data to us. +- InternetModel::Service()->server()->StartPlaybackLater(url.toString(), port); +- } else { + new_bin = engine_->CreateElement("uridecodebin"); + g_object_set(G_OBJECT(new_bin), "uri", url.toEncoded().constData(), NULL); + CHECKED_GCONNECT(G_OBJECT(new_bin), "drained", &SourceDrainedCallback, this); + CHECKED_GCONNECT(G_OBJECT(new_bin), "pad-added", &NewPadCallback, this); + CHECKED_GCONNECT(G_OBJECT(new_bin), "notify::source", &SourceSetupCallback, this); +- } + + return ReplaceDecodeBin(new_bin); + } +diff --git a/src/internet/internetmodel.cpp b/src/internet/internetmodel.cpp +index 289f591..ac9e3e0 100644 +--- a/src/internet/internetmodel.cpp ++++ b/src/internet/internetmodel.cpp +@@ -30,7 +30,6 @@ + #include "savedradio.h" + #include "somafmservice.h" + #include "soundcloudservice.h" +-#include "spotifyservice.h" + #include "subsonicservice.h" + #include "core/closure.h" + #include "core/logging.h" +@@ -94,7 +93,6 @@ InternetModel::InternetModel(Application* app, QObject* parent) + AddService(new SkyFmService(app, this)); + AddService(new SomaFMService(app, this)); + AddService(new SoundCloudService(app, this)); +- AddService(new SpotifyService(app, this)); + AddService(new SubsonicService(app, this)); + #ifdef HAVE_UBUNTU_ONE + AddService(new UbuntuOneService(app, this)); +diff --git a/src/ui/about.cpp b/src/ui/about.cpp +index 53e42bd..49e7714 100644 +--- a/src/ui/about.cpp ++++ b/src/ui/about.cpp +@@ -76,14 +76,9 @@ QString About::MakeHtml() const { + + ret += QString("
%1

").arg(tr("...and all the Amarok contributors")); + ret += QString("

%1").arg(tr("And:")); +- ret += QString("
Rainy Mood"); + ret += QString("
Scott Smitelli"); + ret += QString("
Allie Brosh

"); + +- ret += "

This product uses Music by Spotify but is not endorsed, certified " +- "or otherwise approved in any way by Spotify. Spotify is the registered " +- "trade mark of the Spotify Group.

"; +- + return ret; + } + +diff --git a/src/ui/settingsdialog.cpp b/src/ui/settingsdialog.cpp +index dc0d84f..4a9335d 100644 +--- a/src/ui/settingsdialog.cpp ++++ b/src/ui/settingsdialog.cpp +@@ -38,7 +38,6 @@ + #include "internet/digitallyimportedsettingspage.h" + #include "internet/groovesharksettingspage.h" + #include "internet/magnatunesettingspage.h" +-#include "internet/spotifysettingspage.h" + #include "internet/subsonicsettingspage.h" + #include "internet/ubuntuonesettingspage.h" + #include "library/librarysettingspage.h" +@@ -174,7 +173,6 @@ SettingsDialog::SettingsDialog(Application* app, BackgroundStreams* streams, QWi + AddPage(Page_Box, new BoxSettingsPage(this), providers); + #endif + +- AddPage(Page_Spotify, new SpotifySettingsPage(this), providers); + AddPage(Page_Magnatune, new MagnatuneSettingsPage(this), providers); + AddPage(Page_DigitallyImported, new DigitallyImportedSettingsPage(this), providers); + AddPage(Page_BackgroundStreams, new BackgroundStreamsSettingsPage(this), providers); +diff --git a/src/ui/settingsdialog.h b/src/ui/settingsdialog.h +index e9e709a..5485a37 100644 +--- a/src/ui/settingsdialog.h ++++ b/src/ui/settingsdialog.h +@@ -69,7 +69,6 @@ public: + Page_Library, + Page_Lastfm, + Page_Grooveshark, +- Page_Spotify, + Page_Magnatune, + Page_DigitallyImported, + Page_BackgroundStreams, diff --git a/libre/clementine/udisks-namespace.patch b/libre/clementine/udisks-namespace.patch new file mode 100644 index 000000000..e74889e78 --- /dev/null +++ b/libre/clementine/udisks-namespace.patch @@ -0,0 +1,38 @@ +From ec580cb815c16ec1ab43a469d5af7d51d8d03082 Mon Sep 17 00:00:00 2001 +From: Chocobozzz +Date: Wed, 16 Jul 2014 15:57:25 +0200 +Subject: [PATCH] No namespaces for DBus interfaces. Fixes #4401 + +--- + src/CMakeLists.txt | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 650fa74..775b0a5 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -892,11 +892,6 @@ optional_source(LINUX SOURCES widgets/osd_x11.cpp) + if(HAVE_DBUS) + file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dbus) + +- # Hack to get it to generate interfaces without namespaces - required +- # because otherwise org::freedesktop::UDisks and +- # org::freedesktop::UDisks::Device conflict. +- list(APPEND QT_DBUSXML2CPP_EXECUTABLE -N) +- + # MPRIS DBUS interfaces + qt4_add_dbus_adaptor(SOURCES + dbus/org.freedesktop.MediaPlayer.player.xml +@@ -964,6 +959,10 @@ if(HAVE_DBUS) + + # DeviceKit DBUS interfaces + if(HAVE_DEVICEKIT) ++ set_source_files_properties(dbus/org.freedesktop.UDisks.xml ++ PROPERTIES NO_NAMESPACE dbus/udisks) ++ set_source_files_properties(dbus/org.freedesktop.UDisks.Device.xml ++ PROPERTIES NO_NAMESPACE dbus/udisksdevice) + qt4_add_dbus_interface(SOURCES + dbus/org.freedesktop.UDisks.xml + dbus/udisks) +-- +2.0.3 -- cgit v1.1-4-g5e80