From 53db844f5c8c3d0a6752bb40f65c613020084541 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Mon, 30 Dec 2013 03:34:59 +0000 Subject: Mon Dec 30 03:31:50 UTC 2013 --- community/mpv/PKGBUILD | 25 +- community/qiv/PKGBUILD | 28 +- community/qiv/qiv.install | 11 + community/rubinius/PKGBUILD | 16 +- extra/ffmpeg-compat/PKGBUILD | 15 +- extra/ffmpeg-compat/ffmpeg-0.10.10-freetype2.patch | 50 ++ extra/ffmpeg/PKGBUILD | 4 +- extra/libmtp/PKGBUILD | 34 - extra/rasqal/PKGBUILD | 34 - extra/rtmpdump/PKGBUILD | 26 +- libre/angband-libre/PKGBUILD | 44 +- libre/angband-libre/libre.patch | 814 ++++++++++++++++++ libre/angband-libre/sound.patch | 154 ---- libre/doublecmd-libre/PKGBUILD | 11 +- libre/gummiboot/PKGBUILD | 19 +- libre/gummiboot/splash-parabola.bmp | Bin 0 -> 470410 bytes libre/iceweasel-libre/PKGBUILD | 4 +- libre/iceweasel-libre/libre.patch | 22 +- libre/iceweasel-libre/libre.patch.goal | 935 --------------------- nonprism/sylpheed-nonprism/PKGBUILD | 6 +- pcr/gnome-boxes-libre/PKGBUILD | 44 + pcr/gnome-boxes-libre/free-distros.patch | 11 + pcr/gnome-boxes-libre/gnome-boxes.install | 17 + pcr/gnome-boxes-libre/logos.patch | 39 + pcr/gnome-boxes/PKGBUILD | 33 - pcr/gnome-boxes/gnome-boxes.install | 13 - pcr/libosinfo-libre/PKGBUILD | 63 ++ pcr/libosinfo-libre/data.patch | 137 +++ pcr/libosinfo-libre/free-distros.patch | 123 +++ pcr/libosinfo-libre/po.patch | 34 + pcr/libosinfo-libre/test.patch | 87 ++ pcr/qemu-usbredir/65-kvm.rules | 2 + pcr/qemu-usbredir/PKGBUILD | 77 ++ pcr/qemu-usbredir/qemu.install | 23 + 34 files changed, 1655 insertions(+), 1300 deletions(-) create mode 100644 community/qiv/qiv.install create mode 100644 extra/ffmpeg-compat/ffmpeg-0.10.10-freetype2.patch delete mode 100644 extra/libmtp/PKGBUILD delete mode 100644 extra/rasqal/PKGBUILD create mode 100644 libre/angband-libre/libre.patch delete mode 100644 libre/angband-libre/sound.patch create mode 100644 libre/gummiboot/splash-parabola.bmp delete mode 100644 libre/iceweasel-libre/libre.patch.goal create mode 100644 pcr/gnome-boxes-libre/PKGBUILD create mode 100644 pcr/gnome-boxes-libre/free-distros.patch create mode 100644 pcr/gnome-boxes-libre/gnome-boxes.install create mode 100644 pcr/gnome-boxes-libre/logos.patch delete mode 100644 pcr/gnome-boxes/PKGBUILD delete mode 100644 pcr/gnome-boxes/gnome-boxes.install create mode 100644 pcr/libosinfo-libre/PKGBUILD create mode 100644 pcr/libosinfo-libre/data.patch create mode 100644 pcr/libosinfo-libre/free-distros.patch create mode 100644 pcr/libosinfo-libre/po.patch create mode 100644 pcr/libosinfo-libre/test.patch create mode 100644 pcr/qemu-usbredir/65-kvm.rules create mode 100644 pcr/qemu-usbredir/PKGBUILD create mode 100644 pcr/qemu-usbredir/qemu.install diff --git a/community/mpv/PKGBUILD b/community/mpv/PKGBUILD index a6683683b..ba55e1e7a 100644 --- a/community/mpv/PKGBUILD +++ b/community/mpv/PKGBUILD @@ -1,50 +1,49 @@ -# $Id: PKGBUILD 103161 2013-12-28 10:21:00Z bpiotrowski $ +# $Id: PKGBUILD 103194 2013-12-29 19:04:18Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski # Contributor: Eivind Uggedal pkgname=mpv -pkgver=0.2.4 -pkgrel=4 +pkgver=0.3.0 +pkgrel=1 pkgdesc='Video player based on MPlayer/mplayer2' arch=('i686' 'x86_64') license=('GPL') url='http://mpv.io' depends=( - 'portaudio' 'ffmpeg' 'lcms2' 'libdvdread' 'libcdio-paranoia' 'libxinerama' - 'libquvi' 'mpg123' 'libxv' 'libxkbcommon' 'libva' 'lirc-utils' - 'desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils' 'lua' + 'portaudio' 'ffmpeg' 'lcms2' 'libdvdread' 'libcdio-paranoia' 'libquvi' + 'libxinerama' 'mpg123' 'libxv' 'libxkbcommon' 'libva' 'lirc-utils' + 'desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils' 'lua' 'libdvdnav' ) -makedepends=('mesa' 'python-docutils') +makedepends=('mesa' 'python-docutils' 'waf') options=('!emptydirs' '!buildflags') install=mpv.install source=(https://github.com/mpv-player/$pkgname/archive/v$pkgver.tar.gz) -md5sums=('465e99ed24478f3a2afe5ae1c4fdd7f4') +md5sums=('47c9ea5fc8cf0c15cc6a15631bfbc770') build() { cd $pkgname-$pkgver - ./configure --prefix=/usr \ + waf configure --prefix=/usr \ --confdir=/etc/mpv \ --enable-joystick \ --enable-wayland \ --disable-radio \ --disable-radio-capture \ --disable-radio-v4l2 \ - --disable-rpath \ --disable-libbs2b \ --disable-direct3d \ --disable-corevideo \ --disable-cocoa \ --disable-coreaudio - make + waf build } package() { cd $pkgname-$pkgver - make -j1 DESTDIR="$pkgdir" install + waf install --destdir="$pkgdir" install -d "$pkgdir"/usr/share/doc/mpv/examples - install -m644 etc/{input,example,encoding-example-profiles}.conf \ + install -m644 etc/{input,example}.conf \ "$pkgdir"/usr/share/doc/mpv/examples install -m644 DOCS/{encoding.rst,tech-overview.txt} \ "$pkgdir"/usr/share/doc/mpv diff --git a/community/qiv/PKGBUILD b/community/qiv/PKGBUILD index 2e6c7c963..80772b1db 100644 --- a/community/qiv/PKGBUILD +++ b/community/qiv/PKGBUILD @@ -1,25 +1,37 @@ -# $Id: PKGBUILD 83178 2013-01-27 16:25:48Z pierre $ +# $Id: PKGBUILD 103185 2013-12-29 03:26:56Z kkeen $ +# Maintainer: Kyle Keen # Contributor: Tom Newsom -# Maintainer: Paul Mattal +# Contributor: Paul Mattal pkgname=qiv -pkgver=2.2.4 -pkgrel=2 +pkgver=2.3.1 +pkgrel=1 pkgdesc="Quick Image Viewer (qiv) is a very small and fast GDK/Imlib image viewer" arch=('i686' 'x86_64') url="http://spiegl.de/qiv/" license=('GPL2') -depends=('file' 'gtk2' 'imlib2') +depends=('file' 'gtk2' 'imlib2' 'libexif' 'lcms2' 'desktop-file-utils') +install=qiv.install source=(http://spiegl.de/qiv/download/$pkgname-$pkgver.tgz) -md5sums=('1425f89c90f9c045858fccf24d894c97') +md5sums=('93aea7469be64ebd35277a6dac079fc8') build() { cd "$srcdir/$pkgname-$pkgver" + sed -i "s|^PREFIX = .*|PREFIX = /usr|" Makefile + sed -i "s|\./qiv|echo &|" Makefile # nuke test + sed -i "s|/man/|/share&|" Makefile make } package() { cd "$srcdir/$pkgname-$pkgver" - install -D -m 0755 qiv "$pkgdir/usr/bin/qiv" - install -D -m 0644 qiv.1 "$pkgdir/usr/share/man/man1/qiv.1" + sed -i "s|^PREFIX = .*|PREFIX = $pkgdir/usr|" Makefile + make install + + install -D -m 0644 README "$pkgdir/usr/share/doc/qiv/README" + install -d "$pkgdir/usr/share/doc/qiv/contrib" + cp contrib/* "$pkgdir/usr/share/doc/qiv/contrib" + #install -D -m 0755 contrib/gps2url.py "$pkgdir/usr/share/doc/qiv/contrib/gps2url.py" + #install -D -m 0755 contrib/qiv-command.example "$pkgdir/usr/share/doc/qiv/contrib/qiv-command.example" } + diff --git a/community/qiv/qiv.install b/community/qiv/qiv.install new file mode 100644 index 000000000..660593cf5 --- /dev/null +++ b/community/qiv/qiv.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/rubinius/PKGBUILD b/community/rubinius/PKGBUILD index 593febc0a..1d4d24942 100644 --- a/community/rubinius/PKGBUILD +++ b/community/rubinius/PKGBUILD @@ -1,25 +1,25 @@ -# $Id: PKGBUILD 102860 2013-12-22 14:20:57Z heftig $ +# $Id: PKGBUILD 103201 2013-12-29 21:58:18Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) pkgbase=rubinius pkgname=(rubinius rubinius-ruby) -pkgver=2.2.2 +pkgver=2.2.3 pkgrel=1 pkgdesc="Ruby runtime written in Ruby, designed for concurrency" arch=(i686 x86_64) url="http://rubini.us" license=(custom) depends=(llvm-libs libffi openssl libyaml) -makedepends=(llvm ruby) +makedepends=(llvm rubinius-ruby) options=(!emptydirs) source=(http://releases.rubini.us/${pkgbase}-${pkgver}.tar.bz2 gemrc dirs.patch) -sha256sums=('a49d596f889405e4fc511da64b8afe5eccfafdcee5ea99be15d3ad36290ec2ba' +sha256sums=('b3426aa6996420f1d9d8a7926a94160b84d8bdf725793c64462b27b74f2f2acf' '4bb7eb2fe66e396ed16b589cdb656831407b39ad4e138d88536754c0448ac614' '93f3918dc2a5679e281e724f9b3cb712ffa784c1e52e6fa7ce75f74ce6655a66') prepare() { - export GEM_HOME="$srcdir/gemdir" + export GEM_HOME="$srcdir/gemdir" LANG="en_US.UTF-8" cd $pkgbase-$pkgver patch -Np1 -i ../dirs.patch @@ -31,7 +31,7 @@ prepare() { } build() { - export GEM_HOME="$srcdir/gemdir" + export GEM_HOME="$srcdir/gemdir" LANG="en_US.UTF-8" cd $pkgbase-$pkgver ./configure --prefix=/usr \ @@ -46,7 +46,7 @@ build() { } check() { - export GEM_HOME="$srcdir/gemdir" + export GEM_HOME="$srcdir/gemdir" LANG="en_US.UTF-8" cd $pkgbase-$pkgver rake vm:test || : @@ -55,7 +55,7 @@ check() { package_rubinius() { optdepends=('ruby-docs: Ruby documentation') - export GEM_HOME="$srcdir/gemdir" + export GEM_HOME="$srcdir/gemdir" LANG="en_US.UTF-8" cd $pkgbase-$pkgver DESTDIR="$pkgdir" rake install diff --git a/extra/ffmpeg-compat/PKGBUILD b/extra/ffmpeg-compat/PKGBUILD index 588e55dc9..5231f60fc 100644 --- a/extra/ffmpeg-compat/PKGBUILD +++ b/extra/ffmpeg-compat/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 200640 2013-11-30 13:28:00Z bpiotrowski $ +# $Id: PKGBUILD 202972 2013-12-29 17:17:30Z bpiotrowski $ # Maintainer: Sergej Pupykin # Maintainer: Bartłomiej Piotrowski # Contributor: Ionut Biru @@ -7,7 +7,7 @@ pkgname=ffmpeg-compat pkgver=0.10.10 -pkgrel=1 +pkgrel=2 epoch=1 pkgdesc='Complete and free Internet live audio and video broadcasting solution' arch=('i686' 'x86_64') @@ -20,8 +20,15 @@ depends=( 'v4l-utils' 'x264' 'xvidcore' 'zlib' ) makedepends=('libvdpau' 'yasm') -source=(http://ffmpeg.org/releases/ffmpeg-$pkgver.tar.bz2) -sha256sums=('936058d7579bfc431b13d47c3f63ee25a0160d4c73cc0fa04fef97cd2394cb91') +source=(http://ffmpeg.org/releases/ffmpeg-$pkgver.tar.bz2 + ffmpeg-0.10.10-freetype2.patch) +sha256sums=('936058d7579bfc431b13d47c3f63ee25a0160d4c73cc0fa04fef97cd2394cb91' + '05cf516b292c3815ecaaf72f12c0c73891b62b47d83f5d81f09380949e691988') + +prepare() { + cd ffmpeg-$pkgver + patch -p1 -i ../ffmpeg-0.10.10-freetype2.patch +} build() { cd ffmpeg-$pkgver diff --git a/extra/ffmpeg-compat/ffmpeg-0.10.10-freetype2.patch b/extra/ffmpeg-compat/ffmpeg-0.10.10-freetype2.patch new file mode 100644 index 000000000..1e8cc6547 --- /dev/null +++ b/extra/ffmpeg-compat/ffmpeg-0.10.10-freetype2.patch @@ -0,0 +1,50 @@ +diff -rupN a/configure b/configure +--- a/configure 2013-11-06 00:55:13.000000000 +0000 ++++ b/configure 2013-12-28 22:06:00.925551644 +0000 +@@ -943,6 +943,26 @@ require_pkg_config(){ + add_extralibs $(get_safe ${pkg}_libs) + } + ++require_libfreetype(){ ++ log require_libfreetype "$@" ++ pkg="freetype2" ++ check_cmd $pkg_config --exists --print-errors $pkg \ ++ || die "ERROR: $pkg not found" ++ pkg_cflags=$($pkg_config --cflags $pkg) ++ pkg_libs=$($pkg_config --libs $pkg) ++ { ++ echo "#include " ++ echo "#include FT_FREETYPE_H" ++ echo "long check_func(void) { return (long) FT_Init_FreeType; }" ++ echo "int main(void) { return 0; }" ++ } | check_ld "cc" $pkg_cflags $pkg_libs \ ++ && set_safe ${pkg}_cflags $pkg_cflags \ ++ && set_safe ${pkg}_libs $pkg_libs \ ++ || die "ERROR: $pkg not found" ++ add_cflags $(get_safe ${pkg}_cflags) ++ add_extralibs $(get_safe ${pkg}_libs) ++} ++ + check_host_cc(){ + log check_host_cc "$@" + cat > $TMPC +@@ -3134,7 +3154,7 @@ enabled libdirac && require_pkg_config + "libdirac_decoder/dirac_parser.h libdirac_encoder/dirac_encoder.h" \ + "dirac_decoder_init dirac_encoder_init" + enabled libfaac && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac +-enabled libfreetype && require_pkg_config freetype2 "ft2build.h freetype/freetype.h" FT_Init_FreeType ++enabled libfreetype && require_libfreetype + enabled libgsm && require libgsm gsm/gsm.h gsm_create -lgsm + enabled libmodplug && require libmodplug libmodplug/modplug.h ModPlug_Load -lmodplug + enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame +diff -rupN a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c +--- a/libavfilter/vf_drawtext.c 2013-11-06 00:55:16.000000000 +0000 ++++ b/libavfilter/vf_drawtext.c 2013-12-28 22:06:16.495450750 +0000 +@@ -47,7 +47,6 @@ + #undef time + + #include +-#include + #include FT_FREETYPE_H + #include FT_GLYPH_H + diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index 0c548149f..eec7de9aa 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 201402 2013-12-10 17:38:51Z bpiotrowski $ +# $Id: PKGBUILD 202971 2013-12-29 17:17:29Z bpiotrowski $ # Maintainer: Ionut Biru # Maintainer: Bartłomiej Piotrowski # Contributor: Tom Newsom @@ -6,7 +6,7 @@ pkgname=ffmpeg pkgver=2.1.1 -pkgrel=2 +pkgrel=3 epoch=1 pkgdesc='Complete and free Internet live audio and video broadcasting solution' arch=('i686' 'x86_64') diff --git a/extra/libmtp/PKGBUILD b/extra/libmtp/PKGBUILD deleted file mode 100644 index 6a8d51a77..000000000 --- a/extra/libmtp/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 198802 2013-11-04 17:57:04Z andyrtr $ -# Maintainer: Tom Gundersen -# Contributor: damir -# Contributor: Kevin Edmonds - -pkgname=libmtp -pkgver=1.1.6 -pkgrel=3 -pkgdesc="Library implementation of the Media Transfer Protocol" -arch=("i686" "x86_64") -url="http://libmtp.sourceforge.net" -license=('LGPL') -depends=('libusb' 'libgcrypt') -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('87835626dbcf39e62bfcdd4ae6da2063') - -build() { - cd ${pkgname}-${pkgver} - ./configure --prefix=/usr --with-udev=/usr/lib/udev - make -} - -check() { - cd $pkgname-$pkgver - make -k check -} - -package() { - cd ${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install - - # fix broken udev rule - sed -i "/^Unable to open/d" ${pkgdir}/usr/lib/udev/rules.d/69-libmtp.rules -} diff --git a/extra/rasqal/PKGBUILD b/extra/rasqal/PKGBUILD deleted file mode 100644 index f6713531d..000000000 --- a/extra/rasqal/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 198396 2013-10-30 14:37:02Z allan $ -# Maintainer: Tom Gundersen -# Contributor: AndyRTR -# Contributor: Lawrence Lee - -pkgname=rasqal -epoch=1 -pkgver=0.9.30 -pkgrel=1 -pkgdesc="A free C library that handles Resource Description Framework (RDF) query syntaxes, query construction and query execution returning result bindings" -url="http://librdf.org/rasqal" -license=('GPL' 'LGPL') -arch=('i686' 'x86_64') -depends=('raptor' 'mpfr' 'util-linux') -source=(http://download.librdf.org/source/${pkgname}-${pkgver}.tar.gz) - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr \ - --disable-static \ - --enable-release - make -} - -check() { - cd ${srcdir}/${pkgname}-${pkgver} - make -k check || true # still fails some checks -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install -} -md5sums=('b12c5f9cfdb6b04efce5a4a186b8416b') diff --git a/extra/rtmpdump/PKGBUILD b/extra/rtmpdump/PKGBUILD index d88e4fe08..615219801 100644 --- a/extra/rtmpdump/PKGBUILD +++ b/extra/rtmpdump/PKGBUILD @@ -1,27 +1,29 @@ -# $Id: PKGBUILD 197306 2013-10-25 02:06:12Z bisson $ -# Maintainer: +# $Id: PKGBUILD 202973 2013-12-29 17:17:31Z bpiotrowski $ +# Maintainer: Bartłomiej Piotrowski # Contributor: xduugu # Contributor: Elis Hughes pkgname=rtmpdump -pkgver=20121230 -pkgrel=3 -pkgdesc="A tool to download rtmp streams" +pkgver=20131205 +pkgrel=1 +pkgdesc='Tool to download rtmp streams' arch=('i686' 'x86_64') -url="http://rtmpdump.mplayerhq.hu/" +url='http://rtmpdump.mplayerhq.hu/' license=('GPL2' 'LGPL2.1') depends=('openssl') +makedepends=('git') options=('!makeflags') -#git://git.ffmpeg.org/rtmpdump -source=(ftp://ftp.archlinux.org/other/packages/$pkgname/$pkgname-git-$pkgver.tar.xz) -sha256sums=('2612ccbc041281c90d1fa59d20aec783fa3ef29de952323d8d89699fc3d5c4d2') +source=(git://git.ffmpeg.org/rtmpdump#commit=dc76f0a8) +md5sums=('SKIP') build() { - cd $pkgname-$pkgver + cd $pkgname make } package() { - cd $pkgname-$pkgver - make prefix=/usr sbindir=/usr/bin mandir=/usr/share/man DESTDIR="$pkgdir" install + cd $pkgname + make prefix=/usr sbindir=/usr/bin \ + mandir=/usr/share/man DESTDIR="$pkgdir" \ + install } diff --git a/libre/angband-libre/PKGBUILD b/libre/angband-libre/PKGBUILD index 21bde2beb..e463637a8 100644 --- a/libre/angband-libre/PKGBUILD +++ b/libre/angband-libre/PKGBUILD @@ -1,32 +1,38 @@ -# Maintainer: Israfel -# Original Maintainer: schuay -# Original Maintainer: Mike Sampson +# Maintainer: schuay +# Contributor: Mike Sampson # Contributor: Adrian Stratulat # Contributor: Anton Bazhenov # Contributor: KillaB # Contributor: Callan Barrett # Contributor: Christian Schmidt # Contributor: Sebastian Sareyko +# Maintainer (Parabola): André Silva _pkgname=angband pkgname=angband-libre -pkgver=3.4.1 -pkgrel=1 -pkgdesc="A roguelike dungeon exploration game based on the writings of JRR Tolkien, without nonfree sound effects" -arch=('i686' 'x86_64') +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' 'libglade') -source=("http://rephial.org/downloads/${pkgver:0:3}/angband-v${pkgver}.tar.gz" "sound.patch") +depends=('sdl_image' 'sdl_ttf' 'sdl_mixer' 'ncurses') +source=("http://rephial.org/downloads/${pkgver:0:3}/${_pkgname}-v${pkgver}.tar.gz" 'libre.patch') -build() { +prepare() { + 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 +} - cd "${srcdir}/angband-v${pkgver}" - - patch -Np1 -i ../sound.patch +build() { + cd "${srcdir}/${_pkgname}-v${pkgver}" ./configure \ --prefix=/usr \ @@ -39,18 +45,16 @@ build() { --enable-sdl-mixer make - } package() { - - cd "${srcdir}/angband-v${pkgver}" + 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/angband/COPYING" - + install -Dm644 copying.txt "${pkgdir}/usr/share/licenses/${_pkgname}/COPYING" } -sha512sums=('76099c8fa999e88ea1324bb70b4dee5df1faccd1fa256cc0c460ce2c5ddae9634fdef876bd0d826e99e6dcc54a9f9cf619d82552dc658d0115b97e0e644c19d3' - 'fb3795f7ef5a266e36ef51c9275e65613eeba04fc4283646f21e77ca571b1562c1ad9a11782fe8f1052cefc48b0f3fa1f162bfff88fe8cf62c39e142878d3251') + +md5sums=('4f6ee37abdb411285deb1685ddecba6a' + '3ac39f377bea2e208308d01f4213310f') diff --git a/libre/angband-libre/libre.patch b/libre/angband-libre/libre.patch new file mode 100644 index 000000000..a044bc6fe --- /dev/null +++ b/libre/angband-libre/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 = + diff --git a/libre/angband-libre/sound.patch b/libre/angband-libre/sound.patch deleted file mode 100644 index e70373b72..000000000 --- a/libre/angband-libre/sound.patch +++ /dev/null @@ -1,154 +0,0 @@ -# Removes nonfree sounds -# Made by Israfel -diff -Nur angband-v3.4.1/copying.txt angband-v3.4.1-libre/copying.txt ---- angband-v3.4.1/copying.txt 2012-10-19 15:47:23.000000000 -0400 -+++ angband-v3.4.1-libre/copying.txt 2013-06-29 20:07:03.250510548 -0400 -@@ -27,8 +27,6 @@ - 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 freeware, whatever that means. -- - * 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. -Binary files angband-v3.4.1/lib/xtra/sound/breath.wav and angband-v3.4.1-libre/lib/xtra/sound/breath.wav differ -Binary files angband-v3.4.1/lib/xtra/sound/clunk.wav and angband-v3.4.1-libre/lib/xtra/sound/clunk.wav differ -Binary files angband-v3.4.1/lib/xtra/sound/death.wav and angband-v3.4.1-libre/lib/xtra/sound/death.wav differ -Binary files angband-v3.4.1/lib/xtra/sound/destroy.wav and angband-v3.4.1-libre/lib/xtra/sound/destroy.wav differ -Binary files angband-v3.4.1/lib/xtra/sound/drop.wav and angband-v3.4.1-libre/lib/xtra/sound/drop.wav differ -Binary files angband-v3.4.1/lib/xtra/sound/eat.wav and angband-v3.4.1-libre/lib/xtra/sound/eat.wav differ -Binary files angband-v3.4.1/lib/xtra/sound/flee.wav and angband-v3.4.1-libre/lib/xtra/sound/flee.wav differ -Binary files angband-v3.4.1/lib/xtra/sound/hallu.wav and angband-v3.4.1-libre/lib/xtra/sound/hallu.wav differ -Binary files angband-v3.4.1/lib/xtra/sound/hit1.wav and angband-v3.4.1-libre/lib/xtra/sound/hit1.wav differ -Binary files angband-v3.4.1/lib/xtra/sound/hit.wav and angband-v3.4.1-libre/lib/xtra/sound/hit.wav differ -Binary files angband-v3.4.1/lib/xtra/sound/kill1.wav and angband-v3.4.1-libre/lib/xtra/sound/kill1.wav differ -Binary files angband-v3.4.1/lib/xtra/sound/kill.wav and angband-v3.4.1-libre/lib/xtra/sound/kill.wav differ -Binary files angband-v3.4.1/lib/xtra/sound/level.wav and angband-v3.4.1-libre/lib/xtra/sound/level.wav differ -diff -Nur angband-v3.4.1/lib/xtra/sound/Makefile angband-v3.4.1-libre/lib/xtra/sound/Makefile ---- angband-v3.4.1/lib/xtra/sound/Makefile 2012-10-19 15:47:23.000000000 -0400 -+++ angband-v3.4.1-libre/lib/xtra/sound/Makefile 2013-06-29 20:05:33.734131933 -0400 -@@ -1,9 +1,6 @@ - MKPATH=../../../mk/ - include $(MKPATH)buildsys.mk - --DATA = sound.cfg breath.wav clunk.wav death.wav destroy.wav drop.wav eat.wav \ -- flee.wav hallu.wav hit.wav hit1.wav kill.wav kill1.wav level.wav \ -- miss.wav miss1.wav money.wav opendoor.wav shutdoor.wav thump.wav \ -- vomit.wav -+DATA = sound.cfg - PACKAGE = xtra/sound - -Binary files angband-v3.4.1/lib/xtra/sound/miss1.wav and angband-v3.4.1-libre/lib/xtra/sound/miss1.wav differ -Binary files angband-v3.4.1/lib/xtra/sound/miss.wav and angband-v3.4.1-libre/lib/xtra/sound/miss.wav differ -Binary files angband-v3.4.1/lib/xtra/sound/money.wav and angband-v3.4.1-libre/lib/xtra/sound/money.wav differ -Binary files angband-v3.4.1/lib/xtra/sound/opendoor.wav and angband-v3.4.1-libre/lib/xtra/sound/opendoor.wav differ -Binary files angband-v3.4.1/lib/xtra/sound/shutdoor.wav and angband-v3.4.1-libre/lib/xtra/sound/shutdoor.wav differ -diff -Nur angband-v3.4.1/lib/xtra/sound/sound.cfg angband-v3.4.1-libre/lib/xtra/sound/sound.cfg ---- angband-v3.4.1/lib/xtra/sound/sound.cfg 2012-10-19 15:47:23.000000000 -0400 -+++ angband-v3.4.1-libre/lib/xtra/sound/sound.cfg 2013-06-29 20:06:41.344730009 -0400 -@@ -41,19 +41,19 @@ - # - - # The shopkeep bought a worthless item. --store1 = money.wav -+store1 = - - # The shopkeep paid too much for an item. --store2 = money.wav -+store2 = - - # The shopkeep got away with a good bargain. --store3 = money.wav -+store3 = - - # The shopkeep got away with a great bargain. --store4 = money.wav -+store4 = - - # You make a normal transaction (buying or selling). --store5 = money.wav -+store5 = - - # You enter a store. - store_enter = -@@ -69,7 +69,7 @@ - # - - # You succeed in a melee attack against a monster. --hit = hit.wav drop.wav hit1.wav -+hit = - - # It was a good hit! - hit_good = -@@ -87,7 +87,7 @@ - hit_hi_superb = - - # You miss a melee attack against a monster. --miss = miss.wav miss1.wav -+miss = - - # You fire a missile. - shoot = -@@ -99,7 +99,7 @@ - hitpoint_warn = - - # You die. --death = death.wav -+death = - - # - # Player sounds - status changes -@@ -200,10 +200,10 @@ - money3 = - - # You (or a monster) drop something on the ground. --drop = clunk.wav -+drop = - - # You gain (or regain) a level. --level = level.wav -+level = - - # You successfully study a spell or prayer. - study = -@@ -227,19 +227,19 @@ - hitwall = - - # You eat something. --eat = eat.wav -+eat = - - # You successfully dig through something. --dig = thump.wav -+dig = - - # You open a door. --opendoor = opendoor.wav -+opendoor = - - # You shut a door. --shutdoor = shutdoor.wav -+shutdoor = - - # You teleport from a level (including via recall). --tplevel = teleport.wav -+tplevel = - - # Default "bell" sound for system messages. - bell = -@@ -294,10 +294,10 @@ - # - - # A monster flees in terror. --flee = flee.wav -+flee = - - # A monster is killed. --kill = kill.wav destroy.wav kill1.wav -+kill = - - # A unique is killed. - kill_unique = -Binary files angband-v3.4.1/lib/xtra/sound/thump.wav and angband-v3.4.1-libre/lib/xtra/sound/thump.wav differ -Binary files angband-v3.4.1/lib/xtra/sound/vomit.wav and angband-v3.4.1-libre/lib/xtra/sound/vomit.wav differ diff --git a/libre/doublecmd-libre/PKGBUILD b/libre/doublecmd-libre/PKGBUILD index 522204000..c08273344 100644 --- a/libre/doublecmd-libre/PKGBUILD +++ b/libre/doublecmd-libre/PKGBUILD @@ -1,14 +1,14 @@ # vim:set ft=sh: -# $Id: PKGBUILD 99027 2013-10-22 19:14:23Z idevolder $ +# $Id: PKGBUILD 103163 2013-12-28 11:01:37Z idevolder $ # Maintainer: BlackIkeEagle # Contributor: (sirocco AT ngs.ru) _pkgbase=doublecmd pkgbase=doublecmd-libre pkgname=('doublecmd-libre-gtk2' 'doublecmd-libre-qt') -pkgver=0.5.7 +pkgver=0.5.8 _helpver=0.5.5 -pkgrel=2 +pkgrel=1 url="http://doublecmd.sourceforge.net/" arch=('i686' 'x86_64') license=('GPL') @@ -24,8 +24,6 @@ source=( "http://downloads.sourceforge.net/project/$_pkgbase/Double%20Commander%20Source/$_pkgbase-$pkgver-src.tar.gz" "http://downloads.sourceforge.net/project/$_pkgbase/Double%20Commander%20Source/$_pkgbase-help-$_helpver-src.tar.gz" ) -sha256sums=('8e2059f986fff26da5d7b98af95be64b12c5cef6b50fe3cacd9a2805947aa343' - '5c5d00187df811df0734bf751a581bce7e1bdd4cf4639b2a1101f1da8743daaf') build() { cp -a $_pkgbase-$pkgver $_pkgbase-gtk @@ -76,3 +74,6 @@ package_doublecmd-libre-qt() { cd "$srcdir/$_pkgbase-help-$_helpver" cp -a * "$pkgdir/usr/share/$_pkgbase/doc/" } + +sha256sums=('bfa85693b6cc06b7fd28ec8bd443ad9fb9d79d27a541e4f4d54bb9da2fb052ea' + '5c5d00187df811df0734bf751a581bce7e1bdd4cf4639b2a1101f1da8743daaf') diff --git a/libre/gummiboot/PKGBUILD b/libre/gummiboot/PKGBUILD index 9e56d810c..bd697b3f6 100644 --- a/libre/gummiboot/PKGBUILD +++ b/libre/gummiboot/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 200583 2013-11-29 11:48:46Z tpowa $ +# $Id: PKGBUILD 202399 2013-12-21 16:55:19Z tomegun $ # Maintainer: Tom Gundersen # Contributor: Tobias Powalowski # Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> @@ -6,7 +6,7 @@ # Maintainer (Parabola): André Silva pkgname="gummiboot" -pkgver="39" +pkgver="41" pkgrel="1" pkgdesc="Simple text-mode UEFI Boot Manager (Parabola rebranded)" url="http://freedesktop.org/wiki/Software/gummiboot" @@ -18,10 +18,15 @@ conflicts=('gummiboot-efi') provides=('gummiboot-efi') replaces=('gummiboot-efi') options=('!strip' '!makeflags') -source=("git://anongit.freedesktop.org/${pkgname}#tag=${pkgver}" +source=("git://anongit.freedesktop.org/${pkgname}#commit=ba731cee" 'loader.conf' - 'parabola.conf') + 'parabola.conf' + 'splash-parabola.bmp') install="gummiboot.install" +md5sums=('SKIP' + '3d700d13aec5ab1b78a921eaf22e5bfa' + '36ee74767ac8734dede1cbd0f4f275d7' + 'c146ea0e16fff867164e113c48c91fff') build() { cd ${srcdir}/${pkgname} @@ -37,10 +42,10 @@ package() { install -D -m0644 "${srcdir}/loader.conf" "${pkgdir}/usr/lib/gummiboot/loader/loader.conf" install -D -m0644 "${srcdir}/parabola.conf" "${pkgdir}/usr/lib/gummiboot/loader/entries/parabola.conf" + ## ship an Parabola GNU/Linux-libre boot splash (still has to be dropped in manually to take effect) + install -D -m0644 "${srcdir}/splash-parabola.bmp" "${pkgdir}/usr/lib/gummiboot/splash-parabola.bmp" + cd ${srcdir}/${pkgname} make DESTDIR="${pkgdir}" install } -md5sums=('SKIP' - '3d700d13aec5ab1b78a921eaf22e5bfa' - '36ee74767ac8734dede1cbd0f4f275d7') diff --git a/libre/gummiboot/splash-parabola.bmp b/libre/gummiboot/splash-parabola.bmp new file mode 100644 index 000000000..11ceeff28 Binary files /dev/null and b/libre/gummiboot/splash-parabola.bmp differ diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 043e68da8..ad6233f39 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -23,7 +23,7 @@ _pkgname=iceweasel pkgname=iceweasel-libre epoch=1 pkgver=$_debver.$_debrel -pkgrel=1 +pkgrel=2 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox." arch=(i686 x86_64 mips64el) @@ -64,7 +64,7 @@ md5sums=('219cf21e0642e8a364365286f23d0624' '2001d0477bcefd0eeaab584402133691' '023120a970670dc85cea19393f0b94b6' 'df08eaa1ac3bc6c2356be4fbf8ec8932' - '6df26fc131b88c9ec894757681e7f6a6' + 'fea121a94737ec8641b39e7120a048d3' 'b03a979a78484503ba8dddad4f2c96d1' '7b9e5996dd9fe0b186a43a297db1c6b5' '6620e724ec9a1be74e65089d81d802f7' diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch index ced25fcc5..2384818b4 100644 --- a/libre/iceweasel-libre/libre.patch +++ b/libre/iceweasel-libre/libre.patch @@ -28,10 +28,10 @@ index 331edc8..226508d 100644 pref("dom.identity.enabled", false); diff --git a/browser/base/content/abouthome/aboutHome.css b/browser/base/content/abouthome/aboutHome.css -index c270318..d4ecde0 100644 +index c270318..049fe6e 100644 --- a/browser/base/content/abouthome/aboutHome.css +++ b/browser/base/content/abouthome/aboutHome.css -@@ -49,15 +49,6 @@ a { +@@ -49,11 +49,6 @@ a { background-repeat: no-repeat; } @@ -40,14 +40,10 @@ index c270318..d4ecde0 100644 - width: 470px; -} - --#searchForm { -- display: -moz-box; --} -- - #searchLogoContainer { + #searchForm { display: -moz-box; - -moz-box-align: center; -@@ -72,8 +63,7 @@ a { + } +@@ -72,8 +67,7 @@ a { #searchEngineLogo { display: inline-block; height: 28px; @@ -57,7 +53,7 @@ index c270318..d4ecde0 100644 } #searchText { -@@ -145,48 +135,6 @@ a { +@@ -145,48 +139,6 @@ a { transition-duration: 0ms; } @@ -106,7 +102,7 @@ index c270318..d4ecde0 100644 #launcher { display: -moz-box; -moz-box-align: center; -@@ -335,26 +283,25 @@ body[narrow] #restorePreviousSession::before { +@@ -335,26 +287,25 @@ body[narrow] #restorePreviousSession::before { width: 32px; } @@ -139,7 +135,7 @@ index c270318..d4ecde0 100644 } /* [HiDPI] -@@ -366,26 +313,6 @@ body[narrow] #restorePreviousSession::before { +@@ -366,26 +317,6 @@ body[narrow] #restorePreviousSession::before { background-image: url("chrome://branding/content/about-logo@2x.png"); } @@ -166,7 +162,7 @@ index c270318..d4ecde0 100644 #downloads::before { content: url("chrome://browser/content/abouthome/downloads@2x.png"); } -@@ -421,9 +348,5 @@ body[narrow] #restorePreviousSession::before { +@@ -421,9 +352,5 @@ body[narrow] #restorePreviousSession::before { body[narrow] #restorePreviousSession::before { content: url("chrome://browser/content/abouthome/restore@2x.png"); } diff --git a/libre/iceweasel-libre/libre.patch.goal b/libre/iceweasel-libre/libre.patch.goal deleted file mode 100644 index 5d4bca224..000000000 --- a/libre/iceweasel-libre/libre.patch.goal +++ /dev/null @@ -1,935 +0,0 @@ -diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js -index 331edc8..226508d 100644 ---- a/browser/app/profile/firefox.js -+++ b/browser/app/profile/firefox.js -@@ -242,11 +242,6 @@ pref("browser.slowStartup.notificationDisabled", false); - pref("browser.slowStartup.timeThreshold", 60000); - pref("browser.slowStartup.maxSamples", 5); - --// This url, if changed, MUST continue to point to an https url. Pulling arbitrary content to inject into --// this page over http opens us up to a man-in-the-middle attack that we'd rather not face. If you are a downstream --// repackager of this code using an alternate snippet url, please keep your users safe --pref("browser.aboutHomeSnippets.updateUrl", "https://snippets.mozilla.com/%STARTPAGE_VERSION%/%NAME%/%VERSION%/%APPBUILDID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/"); -- - pref("browser.enable_automatic_image_resizing", true); - pref("browser.chrome.site_icons", true); - pref("browser.chrome.favicons", true); -@@ -1283,11 +1278,7 @@ pref("pdfjs.previousHandler.alwaysAskBeforeHandling", false); - // (This is intentionally on the high side; see bug 746055.) - pref("image.mem.max_decoded_image_kb", 256000); - --// Default social providers --pref("social.manifest.facebook", "{\"origin\":\"https://www.facebook.com\",\"name\":\"Facebook Messenger\",\"workerURL\":\"https://www.facebook.com/desktop/fbdesktop2/socialfox/fbworker.js.php\",\"shareURL\":\"https://www.facebook.com/sharer/sharer.php?u=%{url}\",\"iconURL\":\"data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8%2F9hAAAAX0lEQVQ4jWP4%2F%2F8%2FAyUYTFhHzjgDxP9JxGeQDSBVMxgTbUBCxer%2Fr999%2BQ8DJBuArJksA9A10s8AXIBoA0B%2BR%2FY%2FjD%2BEwoBoA1yT5v3PbdmCE8MAshhID%2FUMoDgzUYIBj0Cgi7ar4coAAAAASUVORK5CYII%3D\",\"sidebarURL\":\"https://www.facebook.com/desktop/fbdesktop2/?socialfox=true\",\"icon32URL\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAAAsTAAALEwEAmpwYAAADbklEQVRYCc1Xv08UQRj99tctexAuCEFjRE0kGBEtLDSGqIWNxkYKbTAxNlY2JhaGWltNtNFeKgsKKxITK43/gCYW+IsoRhA4D47bH7fn9+bcvdm5JR7sefolC3Ozu9978+bNN7PayUv3HN3umdY0Y6IWBtSJ0HSTarXqTOiuTep6Lj+tdxAcA8RAgSmwdd2aCDs0clldYALb/FvgYVhjmfliVA2XpjEgWo0Attn42Z6WH1RFor5ehwo9XQIUZMoVn4qlCoVMSo62EvD8Kh0b3U2Xz43R2PBO6mUCGDlAf65V6MadZzT/rUimoccc2kYA4BfPHqJb105RzjJigKhRq9kEJUBIjgYVuXeL7SAI6eD+Abp5dTwVHOmEHxT50d8WBYJqSOdPj5BjW8gZR8UNqFR2xagx/65XFYaMH+BGWwiYpi4UkBPPLxTp9v1Z+lHc4DWvCQXWmIy6EjITgKowVd5Jjv7N3Hd6y5esigoOwpkJIAmMpZpLJGdiaaC4F0UmAj6bD84GCEwmB/qxMmRilmnwb/mpjAocHh4UEoNAt5NLZB7oy9OJo0PxqkAtePdhiSqunyC1LQUwWMPQaOr6GRre258Ajn4cP7KHcEXhsxpXbj+lT19X2TMNGTLVAcjcalS8gDwsQ2UOMhH4k8FkcrEn5E5ub2sKohxLK2VR77Hl9RUcsrgeRIEiVOT6z+tDbIeLy+vk+kGTCbXxycet6xhl//3f6bJEkdHYhA+mLtDIvoH4ieev5+juoxdk5+pjhALYEdXIpEB5w+NlSKSzqVQ/+H7IO6BLtl3fngGMiqhGJgIwlM6qpyUGFjySdk8m0Zg0ubeD7X9OIDEFajltRQgUJaUKx69tdgaQa0FMADuahZPMFtcEwNPm2hA7ZI5sK4aoE2NvYI+o8hkCIe7CwTv68zS0q9Dk5vpbm/8FXxitSzmMFHpsGj0wyLUheTwD2Y9fVgh1Ae0EPUgD9241ZEnld+v5kgnVZ/8fE0brVh5BK+1oCqKKF72Dk7HwBsssB/pklU1dfChy3S659H5+uelgIb+8WRv1/uGTV9Sdb5wJFlfW6fPCalMhwhSU1j2xKwKbP838GcOwJja4TqO0bjdmXxYTy1EYjFdCWoCEYZhseH/GDL3yJPHnuW6YmT7P1SlIA4768Hke4vOcsX8BE346lLHhDUQAAAAASUVORK5CYII=\", \"icon64URL\":\"data:image/png;base64,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\", \"description\":\"Keep up with friends wherever you go on the web.\",\"author\":\"Facebook\",\"homepageURL\":\"https://www.facebook.com/about/messenger-for-firefox\",\"builtin\":\"true\"}"); -- --pref("social.sidebar.open", true); --pref("social.sidebar.unload_timeout_ms", 10000); -+// removed facebook sidebar with Iceweasel. - - pref("dom.identity.enabled", false); - -diff --git a/browser/base/content/abouthome/aboutHome.css b/browser/base/content/abouthome/aboutHome.css -index c270318..d4ecde0 100644 ---- a/browser/base/content/abouthome/aboutHome.css -+++ b/browser/base/content/abouthome/aboutHome.css -@@ -49,15 +49,6 @@ a { - background-repeat: no-repeat; - } - --#searchForm, --#snippets { -- width: 470px; --} -- --#searchForm { -- display: -moz-box; --} -- - #searchLogoContainer { - display: -moz-box; - -moz-box-align: center; -@@ -72,8 +63,7 @@ a { - #searchEngineLogo { - display: inline-block; - height: 28px; -- width: 70px; -- min-width: 70px; -+ width: 47px; - } - - #searchText { -@@ -145,48 +135,6 @@ a { - transition-duration: 0ms; - } - --#defaultSnippet1, --#defaultSnippet2, --#rightsSnippet { -- display: block; -- min-height: 38px; -- background: 30px center no-repeat; -- padding: 6px 0; -- -moz-padding-start: 79px; --} -- --#rightsSnippet[hidden] { -- display: none; --} -- --#defaultSnippet1:-moz-dir(rtl), --#defaultSnippet2:-moz-dir(rtl), --#rightsSnippet:-moz-dir(rtl) { -- background-position: right 30px center; --} -- --#defaultSnippet1 { -- background-image: url("chrome://browser/content/abouthome/snippet1.png"); --} -- --#defaultSnippet2 { -- background-image: url("chrome://browser/content/abouthome/snippet2.png"); --} -- --#snippets { -- display: inline-block; -- text-align: start; -- margin: 12px 0; -- color: #3c3c3c; -- font-size: 75%; -- /* 12px is the computed font size, 15px the computed line height of the snippets -- with Segoe UI on a default Windows 7 setup. The 15/12 multiplier approximately -- converts em from units of font-size to units of line-height. The goal is to -- preset the height of a three-line snippet to avoid visual moving/flickering as -- the snippets load. */ -- min-height: calc(15/12 * 3em); --} -- - #launcher { - display: -moz-box; - -moz-box-align: center; -@@ -335,26 +283,25 @@ body[narrow] #restorePreviousSession::before { - width: 32px; - } - --#aboutMozilla { -+#aboutGNU { - display: block; -- position: relative; /* pin wordmark to edge of document, not of viewport */ - -moz-box-ordinal-group: 0; - opacity: .5; - transition: opacity 150ms; - } - --#aboutMozilla:hover { -+#aboutGNU:hover { - opacity: 1; - } - --#aboutMozilla::before { -- content: url("chrome://browser/content/abouthome/mozilla.png"); -+#aboutGNU::before { -+ content: url("chrome://browser/content/abouthome/gnu_headshadow.png"); - display: block; - position: absolute; - top: 12px; - right: 12px; -- width: 69px; -- height: 19px; -+ width: 200px; -+ height: 110px; - } - - /* [HiDPI] -@@ -366,26 +313,6 @@ body[narrow] #restorePreviousSession::before { - background-image: url("chrome://branding/content/about-logo@2x.png"); - } - -- #defaultSnippet1, -- #defaultSnippet2, -- #rightsSnippet { -- background-size: 40px; -- } -- -- #defaultSnippet1 { -- background-image: url("chrome://browser/content/abouthome/snippet1@2x.png"); -- } -- -- #defaultSnippet2 { -- background-image: url("chrome://browser/content/abouthome/snippet2@2x.png"); -- } -- -- .launchButton::before, -- #aboutMozilla::before { -- transform: scale(.5); -- transform-origin: 0 0; -- } -- - #downloads::before { - content: url("chrome://browser/content/abouthome/downloads@2x.png"); - } -@@ -421,9 +348,5 @@ body[narrow] #restorePreviousSession::before { - body[narrow] #restorePreviousSession::before { - content: url("chrome://browser/content/abouthome/restore@2x.png"); - } -- -- #aboutMozilla::before { -- content: url("chrome://browser/content/abouthome/mozilla@2x.png"); -- } - } - -diff --git a/browser/base/content/abouthome/aboutHome.js b/browser/base/content/abouthome/aboutHome.js -index 432fcdc..0d81017 100644 ---- a/browser/base/content/abouthome/aboutHome.js -+++ b/browser/base/content/abouthome/aboutHome.js -@@ -3,152 +3,44 @@ - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - - const SEARCH_ENGINES = { -- "Google": { -- // This is the "2x" image designed for OS X retina resolution, Windows at 192dpi, etc.; -- // it will be scaled down as necessary on lower-dpi displays. -+ "DuckDuckGo HTML": { - image: "data:image/png;base64," + -- "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" - } - }; - --// The process of adding a new default snippet involves: --// * add a new entity to aboutHome.dtd --// * add a for it in aboutHome.xhtml --// * add an entry here in the proper ordering (based on spans) --// The part of the snippet will be linked to the corresponding url. --const DEFAULT_SNIPPETS_URLS = [ -- "https://www.mozilla.org/firefox/features/?utm_source=snippet&utm_medium=snippet&utm_campaign=default+feature+snippet" --, "https://addons.mozilla.org/firefox/?utm_source=snippet&utm_medium=snippet&utm_campaign=addons" --]; -- --const SNIPPETS_UPDATE_INTERVAL_MS = 86400000; // 1 Day. -- --// IndexedDB storage constants. --const DATABASE_NAME = "abouthome"; --const DATABASE_VERSION = 1; --const SNIPPETS_OBJECTSTORE_NAME = "snippets"; -- - // This global tracks if the page has been set up before, to prevent double inits - let gInitialized = false; - let gObserver = new MutationObserver(function (mutations) { -@@ -156,7 +48,6 @@ let gObserver = new MutationObserver(function (mutations) { - if (mutation.attributeName == "searchEngineName") { - setupSearchEngine(); - if (!gInitialized) { -- ensureSnippetsMapThen(loadSnippets); - gInitialized = true; - } - return; -@@ -170,10 +61,6 @@ window.addEventListener("pageshow", function () { - window.gObserver.observe(document.documentElement, { attributes: true }); - fitToWidth(); - window.addEventListener("resize", fitToWidth); -- -- // Ask chrome to update snippets. -- var event = new CustomEvent("AboutHomeLoad", {bubbles:true}); -- document.dispatchEvent(event); - }); - - window.addEventListener("pagehide", function() { -@@ -181,117 +68,6 @@ window.addEventListener("pagehide", function() { - window.removeEventListener("resize", fitToWidth); - }); - --// This object has the same interface as Map and is used to store and retrieve --// the snippets data. It is lazily initialized by ensureSnippetsMapThen(), so --// be sure its callback returned before trying to use it. --let gSnippetsMap; --let gSnippetsMapCallbacks = []; -- --/** -- * Ensure the snippets map is properly initialized. -- * -- * @param aCallback -- * Invoked once the map has been initialized, gets the map as argument. -- * @note Snippets should never directly manage the underlying storage, since -- * it may change inadvertently. -- */ --function ensureSnippetsMapThen(aCallback) --{ -- if (gSnippetsMap) { -- aCallback(gSnippetsMap); -- return; -- } -- -- // Handle multiple requests during the async initialization. -- gSnippetsMapCallbacks.push(aCallback); -- if (gSnippetsMapCallbacks.length > 1) { -- // We are already updating, the callbacks will be invoked when done. -- return; -- } -- -- let invokeCallbacks = function () { -- if (!gSnippetsMap) { -- gSnippetsMap = Object.freeze(new Map()); -- } -- -- for (let callback of gSnippetsMapCallbacks) { -- callback(gSnippetsMap); -- } -- gSnippetsMapCallbacks.length = 0; -- } -- -- let openRequest = indexedDB.open(DATABASE_NAME, DATABASE_VERSION); -- -- openRequest.onerror = function (event) { -- // Try to delete the old database so that we can start this process over -- // next time. -- indexedDB.deleteDatabase(DATABASE_NAME); -- invokeCallbacks(); -- }; -- -- openRequest.onupgradeneeded = function (event) { -- let db = event.target.result; -- if (!db.objectStoreNames.contains(SNIPPETS_OBJECTSTORE_NAME)) { -- db.createObjectStore(SNIPPETS_OBJECTSTORE_NAME); -- } -- } -- -- openRequest.onsuccess = function (event) { -- let db = event.target.result; -- -- db.onerror = function (event) { -- invokeCallbacks(); -- } -- -- db.onversionchange = function (event) { -- event.target.close(); -- invokeCallbacks(); -- } -- -- let cache = new Map(); -- let cursorRequest = db.transaction(SNIPPETS_OBJECTSTORE_NAME) -- .objectStore(SNIPPETS_OBJECTSTORE_NAME).openCursor(); -- cursorRequest.onerror = function (event) { -- invokeCallbacks(); -- } -- -- cursorRequest.onsuccess = function(event) { -- let cursor = event.target.result; -- -- // Populate the cache from the persistent storage. -- if (cursor) { -- cache.set(cursor.key, cursor.value); -- cursor.continue(); -- return; -- } -- -- // The cache has been filled up, create the snippets map. -- gSnippetsMap = Object.freeze({ -- get: function (aKey) cache.get(aKey), -- set: function (aKey, aValue) { -- db.transaction(SNIPPETS_OBJECTSTORE_NAME, "readwrite") -- .objectStore(SNIPPETS_OBJECTSTORE_NAME).put(aValue, aKey); -- return cache.set(aKey, aValue); -- }, -- has: function (aKey) cache.has(aKey), -- delete: function (aKey) { -- db.transaction(SNIPPETS_OBJECTSTORE_NAME, "readwrite") -- .objectStore(SNIPPETS_OBJECTSTORE_NAME).delete(aKey); -- return cache.delete(aKey); -- }, -- clear: function () { -- db.transaction(SNIPPETS_OBJECTSTORE_NAME, "readwrite") -- .objectStore(SNIPPETS_OBJECTSTORE_NAME).clear(); -- return cache.clear(); -- }, -- get size() cache.size -- }); -- -- setTimeout(invokeCallbacks, 0); -- } -- } --} -- - function onSearchSubmit(aEvent) - { - let searchTerms = document.getElementById("searchText").value; -@@ -341,156 +117,6 @@ function setupSearchEngine() - - } - --/** -- * Inform the test harness that we're done loading the page. -- */ --function loadSucceeded() --{ -- var event = new CustomEvent("AboutHomeLoadSnippetsSucceeded", {bubbles:true}); -- document.dispatchEvent(event); --} -- --/** -- * Update the local snippets from the remote storage, then show them through -- * showSnippets. -- */ --function loadSnippets() --{ -- if (!gSnippetsMap) -- throw new Error("Snippets map has not properly been initialized"); -- -- // Allow tests to modify the snippets map before using it. -- var event = new CustomEvent("AboutHomeLoadSnippets", {bubbles:true}); -- document.dispatchEvent(event); -- -- // Check cached snippets version. -- let cachedVersion = gSnippetsMap.get("snippets-cached-version") || 0; -- let currentVersion = document.documentElement.getAttribute("snippetsVersion"); -- if (cachedVersion < currentVersion) { -- // The cached snippets are old and unsupported, restart from scratch. -- gSnippetsMap.clear(); -- } -- -- // Check last snippets update. -- let lastUpdate = gSnippetsMap.get("snippets-last-update"); -- let updateURL = document.documentElement.getAttribute("snippetsURL"); -- let shouldUpdate = !lastUpdate || -- Date.now() - lastUpdate > SNIPPETS_UPDATE_INTERVAL_MS; -- if (updateURL && shouldUpdate) { -- // Try to update from network. -- let xhr = new XMLHttpRequest(); -- try { -- xhr.open("GET", updateURL, true); -- } catch (ex) { -- showSnippets(); -- loadSucceeded(); -- return; -- } -- // Even if fetching should fail we don't want to spam the server, thus -- // set the last update time regardless its results. Will retry tomorrow. -- gSnippetsMap.set("snippets-last-update", Date.now()); -- xhr.onerror = function (event) { -- showSnippets(); -- }; -- xhr.onload = function (event) -- { -- if (xhr.status == 200) { -- gSnippetsMap.set("snippets", xhr.responseText); -- gSnippetsMap.set("snippets-cached-version", currentVersion); -- } -- showSnippets(); -- loadSucceeded(); -- }; -- xhr.send(null); -- } else { -- showSnippets(); -- loadSucceeded(); -- } --} -- --/** -- * Shows locally cached remote snippets, or default ones when not available. -- * -- * @note: snippets should never invoke showSnippets(), or they may cause -- * a "too much recursion" exception. -- */ --let _snippetsShown = false; --function showSnippets() --{ -- let snippetsElt = document.getElementById("snippets"); -- -- // Show about:rights notification, if needed. -- let showRights = document.documentElement.getAttribute("showKnowYourRights"); -- if (showRights) { -- let rightsElt = document.getElementById("rightsSnippet"); -- let anchor = rightsElt.getElementsByTagName("a")[0]; -- anchor.href = "about:rights"; -- snippetsElt.appendChild(rightsElt); -- rightsElt.removeAttribute("hidden"); -- return; -- } -- -- if (!gSnippetsMap) -- throw new Error("Snippets map has not properly been initialized"); -- if (_snippetsShown) { -- // There's something wrong with the remote snippets, just in case fall back -- // to the default snippets. -- showDefaultSnippets(); -- throw new Error("showSnippets should never be invoked multiple times"); -- } -- _snippetsShown = true; -- -- let snippets = gSnippetsMap.get("snippets"); -- // If there are remotely fetched snippets, try to to show them. -- if (snippets) { -- // Injecting snippets can throw if they're invalid XML. -- try { -- snippetsElt.innerHTML = snippets; -- // Scripts injected by innerHTML are inactive, so we have to relocate them -- // through DOM manipulation to activate their contents. -- Array.forEach(snippetsElt.getElementsByTagName("script"), function(elt) { -- let relocatedScript = document.createElement("script"); -- relocatedScript.type = "text/javascript;version=1.8"; -- relocatedScript.text = elt.text; -- elt.parentNode.replaceChild(relocatedScript, elt); -- }); -- return; -- } catch (ex) { -- // Bad content, continue to show default snippets. -- } -- } -- -- showDefaultSnippets(); --} -- --/** -- * Clear snippets element contents and show default snippets. -- */ --function showDefaultSnippets() --{ -- // Clear eventual contents... -- let snippetsElt = document.getElementById("snippets"); -- snippetsElt.innerHTML = ""; -- -- // ...then show default snippets. -- let defaultSnippetsElt = document.getElementById("defaultSnippets"); -- let entries = defaultSnippetsElt.querySelectorAll("span"); -- // Choose a random snippet. Assume there is always at least one. -- let randIndex = Math.floor(Math.random() * entries.length); -- let entry = entries[randIndex]; -- // Inject url in the eventual link. -- if (DEFAULT_SNIPPETS_URLS[randIndex]) { -- let links = entry.getElementsByTagName("a"); -- // Default snippets can have only one link, otherwise something is messed -- // up in the translation. -- if (links.length == 1) { -- links[0].href = DEFAULT_SNIPPETS_URLS[randIndex]; -- } -- } -- // Move the default snippet to the snippets element. -- snippetsElt.appendChild(entry); --} -- - function fitToWidth() { - if (window.scrollMaxX) { - document.body.setAttribute("narrow", "true"); -diff --git a/browser/base/content/abouthome/aboutHome.xhtml b/browser/base/content/abouthome/aboutHome.xhtml -index 1d03d38..4f9b6b2 100644 ---- a/browser/base/content/abouthome/aboutHome.xhtml -+++ b/browser/base/content/abouthome/aboutHome.xhtml -@@ -43,15 +43,6 @@ - - - -- --
-- -- --
--
-
-
- -@@ -66,7 +57,6 @@ -
- -
-- -- -+ - - -diff --git a/browser/base/content/content.js b/browser/base/content/content.js -index 9428613..ba010f3 100644 ---- a/browser/base/content/content.js -+++ b/browser/base/content/content.js -@@ -80,14 +80,8 @@ let AboutHomeListener = { - if (aData.showRestoreLastSession && !PrivateBrowsingUtils.isWindowPrivate(content)) - doc.getElementById("launcher").setAttribute("session", "true"); - -- // Inject search engine and snippets URL. -+ // Inject search engine. - let docElt = doc.documentElement; -- // set the following attributes BEFORE searchEngineName, which triggers to -- // show the snippets when it's set. -- docElt.setAttribute("snippetsURL", aData.snippetsURL); -- if (aData.showKnowYourRights) -- docElt.setAttribute("showKnowYourRights", "true"); -- docElt.setAttribute("snippetsVersion", aData.snippetsVersion); - docElt.setAttribute("searchEngineName", Services.search.defaultEngine.name); - }, - -diff --git a/browser/base/jar.mn b/browser/base/jar.mn -index f2a820c..9478039 100644 ---- a/browser/base/jar.mn -+++ b/browser/base/jar.mn -@@ -33,7 +33,7 @@ browser.jar: - content/browser/abouthome/settings.png (content/abouthome/settings.png) - content/browser/abouthome/restore.png (content/abouthome/restore.png) - content/browser/abouthome/restore-large.png (content/abouthome/restore-large.png) -- content/browser/abouthome/mozilla.png (content/abouthome/mozilla.png) -+ content/browser/abouthome/gnu_headshadow.png (content/abouthome/gnu_headshadow.png) - content/browser/abouthome/snippet1@2x.png (content/abouthome/snippet1@2x.png) - content/browser/abouthome/snippet2@2x.png (content/abouthome/snippet2@2x.png) - content/browser/abouthome/downloads@2x.png (content/abouthome/downloads@2x.png) -@@ -45,7 +45,6 @@ browser.jar: - content/browser/abouthome/settings@2x.png (content/abouthome/settings@2x.png) - content/browser/abouthome/restore@2x.png (content/abouthome/restore@2x.png) - content/browser/abouthome/restore-large@2x.png (content/abouthome/restore-large@2x.png) -- content/browser/abouthome/mozilla@2x.png (content/abouthome/mozilla@2x.png) - #ifdef MOZ_SERVICES_HEALTHREPORT - content/browser/abouthealthreport/abouthealth.xhtml (content/abouthealthreport/abouthealth.xhtml) - content/browser/abouthealthreport/abouthealth.js (content/abouthealthreport/abouthealth.js) -diff --git a/browser/locales/en-US/chrome/browser/aboutHome.dtd b/browser/locales/en-US/chrome/browser/aboutHome.dtd -index e84341f..5476d32 100644 ---- a/browser/locales/en-US/chrome/browser/aboutHome.dtd -+++ b/browser/locales/en-US/chrome/browser/aboutHome.dtd -@@ -13,17 +13,6 @@ - - - -- --latest features."> -- --Choose from thousands of add-ons."> -- --Know your rights…"> -- - - - -diff --git a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties -index 087cc50..5654eb9 100644 ---- a/browser/locales/en-US/chrome/browser-region/region.properties -+++ b/browser/locales/en-US/chrome/browser-region/region.properties -@@ -3,17 +3,12 @@ - # file, You can obtain one at http://mozilla.org/MPL/2.0/. - - # Default search engine --browser.search.defaultenginename=Google -+browser.search.defaultenginename=DuckDuckGo HTML - - # Search engine order (order displayed in the search bar dropdown)s --browser.search.order.1=Google --browser.search.order.2=Yahoo --browser.search.order.3=Bing -- --# This is the default set of web based feed handlers shown in the reader --# selection UI --browser.contentHandlers.types.0.title=My Yahoo! --browser.contentHandlers.types.0.uri=http://add.my.yahoo.com/rss?url=%s -+browser.search.order.1=DuckDuckGo HTML -+browser.search.order.2=DuckDuckGo Lite -+browser.search.order.3=Seeks Search - - # increment this number when anything gets changed in the list below. This will - # cause Firefox to re-read these prefs and inject any new handlers into the -@@ -22,20 +17,10 @@ browser.contentHandlers.types.0.uri=http://add.my.yahoo.com/rss?url=%s - # don't make any spelling errors here. - gecko.handlerService.defaultHandlersVersion=4 - --# The default set of protocol handlers for webcal: --gecko.handlerService.schemes.webcal.0.name=30 Boxes --gecko.handlerService.schemes.webcal.0.uriTemplate=https://30boxes.com/external/widget?refer=ff&url=%s -- --# The default set of protocol handlers for mailto: --gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail --gecko.handlerService.schemes.mailto.0.uriTemplate=https://compose.mail.yahoo.com/?To=%s --gecko.handlerService.schemes.mailto.1.name=Gmail --gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s -- - # The default set of protocol handlers for irc: --gecko.handlerService.schemes.irc.0.name=Mibbit --gecko.handlerService.schemes.irc.0.uriTemplate=https://www.mibbit.com/?url=%s -+gecko.handlerService.schemes.irc.0.name=Freenode Web IRC -+gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net - - # The default set of protocol handlers for ircs: --gecko.handlerService.schemes.ircs.0.name=Mibbit --gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s -+gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC -+gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net -diff --git a/browser/locales/generic/profile/bookmarks.html.in b/browser/locales/generic/profile/bookmarks.html.in -index e925c1e..5101035 100644 ---- a/browser/locales/generic/profile/bookmarks.html.in -+++ b/browser/locales/generic/profile/bookmarks.html.in -@@ -15,13 +15,20 @@ -

@bookmarks_toolbarfolder@

-
@bookmarks_toolbarfolder_description@ -

--

@getting_started@ -+
Parabola GNU/Linux-libre -

--

@firefox_heading@

-+

Parabola GNU/Linux-libre

-

--

@firefox_help@ --
@firefox_customize@ --
@firefox_community@ --
@firefox_about@ -+
Parabola GNU/Linux-libre -+
Parabola GNU/Linux-libre Packages -+
Parabola GNU/Linux-libre Wiki -+
Parabola GNU/Linux-libre Labs -+

-+

Free Software Foundation

-+

-+

Free Software Foundation -+
LibrePlanet -+
Free addons -+
h-node -

-

-diff --git a/browser/modules/AboutHome.jsm b/browser/modules/AboutHome.jsm -index 98c443d..0173762 100644 ---- a/browser/modules/AboutHome.jsm -+++ b/browser/modules/AboutHome.jsm -@@ -8,7 +8,7 @@ let Cc = Components.classes; - let Ci = Components.interfaces; - let Cu = Components.utils; - --this.EXPORTED_SYMBOLS = [ "AboutHomeUtils", "AboutHome" ]; -+this.EXPORTED_SYMBOLS = [ "AboutHome" ]; - - Components.utils.import("resource://gre/modules/XPCOMUtils.jsm"); - Components.utils.import("resource://gre/modules/Services.jsm"); -@@ -16,66 +16,6 @@ Components.utils.import("resource://gre/modules/Services.jsm"); - XPCOMUtils.defineLazyModuleGetter(this, "PrivateBrowsingUtils", - "resource://gre/modules/PrivateBrowsingUtils.jsm"); - --// Url to fetch snippets, in the urlFormatter service format. --const SNIPPETS_URL_PREF = "browser.aboutHomeSnippets.updateUrl"; -- --// Should be bumped up if the snippets content format changes. --const STARTPAGE_VERSION = 4; -- --this.AboutHomeUtils = { -- get snippetsVersion() STARTPAGE_VERSION, -- -- /* -- * showKnowYourRights - Determines if the user should be shown the -- * about:rights notification. The notification should *not* be shown if -- * we've already shown the current version, or if the override pref says to -- * never show it. The notification *should* be shown if it's never been seen -- * before, if a newer version is available, or if the override pref says to -- * always show it. -- */ -- get showKnowYourRights() { -- // Look for an unconditional override pref. If set, do what it says. -- // (true --> never show, false --> always show) -- try { -- return !Services.prefs.getBoolPref("browser.rights.override"); -- } catch (e) { } -- // Ditto, for the legacy EULA pref. -- try { -- return !Services.prefs.getBoolPref("browser.EULA.override"); -- } catch (e) { } -- --#ifndef MOZILLA_OFFICIAL -- // Non-official builds shouldn't show the notification. -- return false; --#endif -- -- // Look to see if the user has seen the current version or not. -- var currentVersion = Services.prefs.getIntPref("browser.rights.version"); -- try { -- return !Services.prefs.getBoolPref("browser.rights." + currentVersion + ".shown"); -- } catch (e) { } -- -- // Legacy: If the user accepted a EULA, we won't annoy them with the -- // equivalent about:rights page until the version changes. -- try { -- return !Services.prefs.getBoolPref("browser.EULA." + currentVersion + ".accepted"); -- } catch (e) { } -- -- // We haven't shown the notification before, so do so now. -- return true; -- } --}; -- --/** -- * Returns the URL to fetch snippets from, in the urlFormatter service format. -- */ --XPCOMUtils.defineLazyGetter(AboutHomeUtils, "snippetsURL", function() { -- let updateURL = Services.prefs -- .getCharPref(SNIPPETS_URL_PREF) -- .replace("%STARTPAGE_VERSION%", STARTPAGE_VERSION); -- return Services.urlFormatter.formatURL(updateURL); --}); -- - /** - * This code provides services to the about:home page. Whenever - * about:home needs to do something chrome-privileged, it sends a -@@ -185,17 +125,8 @@ let AboutHome = { - ss.promiseInitialized.then(function() { - let data = { - showRestoreLastSession: ss.canRestoreLastSession, -- snippetsURL: AboutHomeUtils.snippetsURL, -- showKnowYourRights: AboutHomeUtils.showKnowYourRights, -- snippetsVersion: AboutHomeUtils.snippetsVersion - }; - -- if (AboutHomeUtils.showKnowYourRights) { -- // Set pref to indicate we've shown the notification. -- let currentVersion = Services.prefs.getIntPref("browser.rights.version"); -- Services.prefs.setBoolPref("browser.rights." + currentVersion + ".shown", true); -- } -- - if (target) { - target.messageManager.sendAsyncMessage("AboutHome:Update", data); - } else { diff --git a/nonprism/sylpheed-nonprism/PKGBUILD b/nonprism/sylpheed-nonprism/PKGBUILD index 34d15ce73..08b0b3c13 100644 --- a/nonprism/sylpheed-nonprism/PKGBUILD +++ b/nonprism/sylpheed-nonprism/PKGBUILD @@ -8,13 +8,13 @@ _pkgname=sylpheed pkgname=sylpheed-nonprism pkgver=3.3.0 -pkgrel=1 +pkgrel=1.1 pkgdesc="Lightweight and user-friendly e-mail client, without Gmail support" arch=('i686' 'x86_64') url="http://sylpheed.sraoss.jp/en/" license=('GPL') -depends=('gpgme' 'gtkspell' 'desktop-file-utils') -makedepends=('compface' 'openssl') +depends=('gpgme' 'gtkspell' 'desktop-file-utils' 'compface') +makedepends=('openssl') options=('!libtool') replaces=$_pkgname conflicts=$_pkgname diff --git a/pcr/gnome-boxes-libre/PKGBUILD b/pcr/gnome-boxes-libre/PKGBUILD new file mode 100644 index 000000000..91a3b41be --- /dev/null +++ b/pcr/gnome-boxes-libre/PKGBUILD @@ -0,0 +1,44 @@ +# Contributor: Daniel Milewski + +_pkgname='gnome-boxes' +pkgname="$_pkgname-libre" +pkgver='3.10.2' +pkgrel='1' +pkgdesc='A simple GNOME 3 application to access remote or virtual systems, without nonfree system logos' +arch=('i686' 'x86_64') +url='https://wiki.gnome.org/Apps/Boxes' +license=('LGPL') +depends=('clutter-gtk' 'desktop-file-utils' 'gtk-vnc' 'libosinfo' 'libsoup' 'libtracker-sparql' 'libvirt-glib' + 'spice-gtk3') +makedepends=('gobject-introspection' 'intltool' 'itstool' 'spice-protocol' 'vala') +optdepends=('qemu-usbredir: virtual machines support') +provides=("$_pkgname=$pkgver") +conflicts=("$_pkgname") +replaces=("$_pkgname") +install='gnome-boxes.install' +source=("http://ftp.gnome.org/pub/GNOME/sources/$_pkgname/${pkgver:0:4}/$_pkgname-$pkgver.tar.xz" 'logos.patch' + 'free-distros.patch') +sha256sums=('9e055627cff5f59323bc95ad65ab361fc26328854d5a421bd09c899c466f2ec4' + '63d8a7fb5e0d6260d56bd92e9d11f39e9f37c323a261bc822a589b85f760b254' + '025e56fff5ae3659abc867ef1b5739a4632c91fa7f10d54d0853e9905355a15f') + +prepare() { + cd "$srcdir/$_pkgname-$pkgver" + + patch -Np1 -i "$srcdir/logos.patch" + + patch -Np1 -i "$srcdir/free-distros.patch" +} + +build() { + cd "$srcdir/$_pkgname-$pkgver" + + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$_pkgname-$pkgver" + + make DESTDIR="$pkgdir/" install +} diff --git a/pcr/gnome-boxes-libre/free-distros.patch b/pcr/gnome-boxes-libre/free-distros.patch new file mode 100644 index 000000000..d83d2ca4b --- /dev/null +++ b/pcr/gnome-boxes-libre/free-distros.patch @@ -0,0 +1,11 @@ +--- gnome-boxes-3.10.0/data/gnome-boxes-logos-db.xml.original 2013-11-23 13:26:20.013010981 +0100 ++++ gnome-boxes-3.10.0/data/gnome-boxes-logos-db.xml 2013-11-23 14:29:33.237567173 +0100 +@@ -2,4 +2,8 @@ + + + ++ ++ https://projects.parabolagnulinux.org/artwork.git/plain/official-2013/optimized-text/logo.svg ++ ++ + diff --git a/pcr/gnome-boxes-libre/gnome-boxes.install b/pcr/gnome-boxes-libre/gnome-boxes.install new file mode 100644 index 000000000..2ceb2ac08 --- /dev/null +++ b/pcr/gnome-boxes-libre/gnome-boxes.install @@ -0,0 +1,17 @@ +update() { + glib-compile-schemas /usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor +} + +post_install() { + update +} + +post_upgrade() { + update +} + +post_remove() { + update +} diff --git a/pcr/gnome-boxes-libre/logos.patch b/pcr/gnome-boxes-libre/logos.patch new file mode 100644 index 000000000..6fe80a2eb --- /dev/null +++ b/pcr/gnome-boxes-libre/logos.patch @@ -0,0 +1,39 @@ +--- gnome-boxes-3.10.0/data/gnome-boxes-logos-db.xml.original 2013-11-16 22:30:08.198540527 +0100 ++++ gnome-boxes-3.10.0/data/gnome-boxes-logos-db.xml 2013-11-16 22:30:12.135269885 +0100 +@@ -2,36 +2,4 @@ + + + +- +- http://www.debian.org/logos/openlogo-nd.svg +- +- +- +- http://people.gnome.org/~zeeshanak/logos/fedora.svg +- +- +- +- http://people.gnome.org/~zeeshanak/logos/opensuse.svg +- +- +- +- http://people.gnome.org/~zeeshanak/logos/ubuntu.svg +- +- +- +- http://people.gnome.org/~zeeshanak/logos/gnome-logo.svg +- +- +- +- http://people.gnome.org/~zeeshanak/logos/shadownman-pill.svg +- +- +- +- http://people.gnome.org/~zeeshanak/logos/shadownman-pill.svg +- +- +- +- http://people.gnome.org/~zeeshanak/logos/shadownman-pill.svg +- +- + diff --git a/pcr/gnome-boxes/PKGBUILD b/pcr/gnome-boxes/PKGBUILD deleted file mode 100644 index 0ac23a06b..000000000 --- a/pcr/gnome-boxes/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# Contributor: Stefano Facchini -# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres - -pkgname=gnome-boxes -pkgver=3.6.1 -pkgrel=2 -pkgdesc="A simple GNOME 3 application to access remote or virtual systems" -arch=('i686' 'x86_64') -url="http://live.gnome.org/Boxes" -license=('LGPL2.1') -depends=('gtk3' 'clutter-gtk' 'spice-gtk3' 'libvirt-glib' 'tracker' - 'gtk-vnc' 'udev' 'libosinfo' 'dconf' 'hicolor-icon-theme' - 'desktop-file-utils' 'shared-mime-info') -optdepends=('qemu-kvm-spice: to create new VMs') -makedepends=('intltool') -install=gnome-boxes.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('fc6ffd0b3886e2da917abdb63470ab9869eef168c002461b9f02ce5aec5383ba') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - ./configure --prefix=/usr --libexec=/usr/lib/gnome-boxes - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install -} - -# vim:set ts=2 sw=2 et: -sha256sums=('fc6ffd0b3886e2da917abdb63470ab9869eef168c002461b9f02ce5aec5383ba') diff --git a/pcr/gnome-boxes/gnome-boxes.install b/pcr/gnome-boxes/gnome-boxes.install deleted file mode 100644 index 2b172e29c..000000000 --- a/pcr/gnome-boxes/gnome-boxes.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - glib-compile-schemas usr/share/glib-2.0/schemas - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/pcr/libosinfo-libre/PKGBUILD b/pcr/libosinfo-libre/PKGBUILD new file mode 100644 index 000000000..8400558c0 --- /dev/null +++ b/pcr/libosinfo-libre/PKGBUILD @@ -0,0 +1,63 @@ +# Contributor: Daniel Milewski + +_pkgname='libosinfo' +pkgname="$_pkgname-libre" +pkgver='0.2.8' +pkgrel='1' +pkgdesc='A GObject based library API for managing information about operating systems, hypervisors and the (virtual) hardware devices they can support, without support for nonfree systems' +arch=('i686' 'x86_64') +url='http://libosinfo.org' +license=('LGPL') +depends=('glib2' 'libxslt') +makedepends=('intltool' 'libsoup') +checkdepends=('check') +provides=("$_pkgname=$pkgver") +conflicts=("$_pkgname") +replaces=("$_pkgname") +source=("https://fedorahosted.org/releases/l/i/$_pkgname/$_pkgname-$pkgver.tar.gz" 'data.patch' 'po.patch' 'test.patch' + 'free-distros.patch') +sha256sums=('50cbfcff4548f37b5b7d3328cbc6e96fe6c2a48696e31eec0c819d161e38c643' + 'fdfb0753a7cf7865ac2ea5b17145f90d27d70e18c69fba0d60dfb43629ea0dac' + 'aab885d2b3a7f91a79efd7ab6f12fe1d4b264afa0fbc200268838b353600b338' + 'c4b328f36973931abd71a10a62ec590ef3ba1177486179bc96aa47a22a6d0a42' + 'f4b79c44ae4a39325480c2b0af4aa7ed086cc1cab7c9ba1119f50967a9a5f4ca') + +prepare() { + cd "$srcdir/$_pkgname-$pkgver" + + rm data/datamaps/windows-lang.xml \ + data/hypervisors/rhel-xen.xml{,.in} \ + data/install-scripts/*.xml \ + data/oses/*.xml{,.in} + rm -r test/isodata/* + + patch -Np1 -i "$srcdir/data.patch" + patch -Np1 -i "$srcdir/po.patch" + patch -Np1 -i "$srcdir/test.patch" + + cd "$srcdir/$_pkgname-$pkgver/po" + intltool-update pl + intltool-update uk + cd "$srcdir/$_pkgname-$pkgver" + + patch -Np1 -i "$srcdir/free-distros.patch" +} + +build() { + cd "$srcdir/$_pkgname-$pkgver" + + ./configure --prefix=/usr + make +} + +check() { + cd "$srcdir/$_pkgname-$pkgver" + + make -k check +} + +package() { + cd "$srcdir/$_pkgname-$pkgver" + + make DESTDIR="$pkgdir/" install +} diff --git a/pcr/libosinfo-libre/data.patch b/pcr/libosinfo-libre/data.patch new file mode 100644 index 000000000..d37d30671 --- /dev/null +++ b/pcr/libosinfo-libre/data.patch @@ -0,0 +1,137 @@ +diff -ruN libosinfo-0.2.8/data/datamaps/Makefile.am libosinfo-0.2.8-libre/data/datamaps/Makefile.am +--- libosinfo-0.2.8/data/datamaps/Makefile.am 2013-01-09 00:01:25.000000000 +0100 ++++ libosinfo-0.2.8-libre/data/datamaps/Makefile.am 2013-12-01 12:15:00.261131308 +0100 +@@ -1,7 +1,6 @@ + + datamapdir = $(pkgdatadir)/db/datamaps/ + datamap_DATA = \ +- windows-lang.xml \ + x11-keyboard.xml \ + $(NULL) + +diff -ruN libosinfo-0.2.8/data/datamaps/Makefile.in libosinfo-0.2.8-libre/data/datamaps/Makefile.in +--- libosinfo-0.2.8/data/datamaps/Makefile.in 2013-09-16 18:45:26.000000000 +0200 ++++ libosinfo-0.2.8-libre/data/datamaps/Makefile.in 2013-12-01 12:15:07.561496625 +0100 +@@ -326,7 +326,6 @@ + top_srcdir = @top_srcdir@ + datamapdir = $(pkgdatadir)/db/datamaps/ + datamap_DATA = \ +- windows-lang.xml \ + x11-keyboard.xml \ + $(NULL) + +diff -ruN libosinfo-0.2.8/data/hypervisors/Makefile.am libosinfo-0.2.8-libre/data/hypervisors/Makefile.am +--- libosinfo-0.2.8/data/hypervisors/Makefile.am 2013-02-14 02:39:37.000000000 +0100 ++++ libosinfo-0.2.8-libre/data/hypervisors/Makefile.am 2013-12-01 12:18:54.718635301 +0100 +@@ -1,6 +1,6 @@ + + databasedir = $(pkgdatadir)/db/hypervisors/ +-database_in_files = kvm.xml.in qemu.xml.in rhel-xen.xml.in xen.xml.in ++database_in_files = kvm.xml.in qemu.xml.in xen.xml.in + + database_DATA = $(database_in_files:.xml.in=.xml) + +diff -ruN libosinfo-0.2.8/data/hypervisors/Makefile.in libosinfo-0.2.8-libre/data/hypervisors/Makefile.in +--- libosinfo-0.2.8/data/hypervisors/Makefile.in 2013-09-16 18:45:26.000000000 +0200 ++++ libosinfo-0.2.8-libre/data/hypervisors/Makefile.in 2013-12-01 12:20:01.822560286 +0100 +@@ -325,7 +325,7 @@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + databasedir = $(pkgdatadir)/db/hypervisors/ +-database_in_files = kvm.xml.in qemu.xml.in rhel-xen.xml.in xen.xml.in ++database_in_files = kvm.xml.in qemu.xml.in xen.xml.in + database_DATA = $(database_in_files:.xml.in=.xml) + EXTRA_DIST = $(database_in_files) $(database_DATA) + all: all-am +diff -ruN libosinfo-0.2.8/data/install-scripts/Makefile.am libosinfo-0.2.8-libre/data/install-scripts/Makefile.am +--- libosinfo-0.2.8/data/install-scripts/Makefile.am 2013-03-27 23:03:14.000000000 +0100 ++++ libosinfo-0.2.8-libre/data/install-scripts/Makefile.am 2013-12-01 12:24:10.160616083 +0100 +@@ -1,12 +1,6 @@ + + databasedir = $(pkgdatadir)/db/install-scripts/ + database_DATA = \ +- fedora.xml \ +- rhel.xml \ +- windows-sif.xml \ +- windows-cmd.xml \ +- windows-reg.xml \ +- windows-unattend.xml \ + $(NULL) + + EXTRA_DIST = $(database_DATA) +diff -ruN libosinfo-0.2.8/data/install-scripts/Makefile.in libosinfo-0.2.8-libre/data/install-scripts/Makefile.in +--- libosinfo-0.2.8/data/install-scripts/Makefile.in 2013-09-16 18:45:26.000000000 +0200 ++++ libosinfo-0.2.8-libre/data/install-scripts/Makefile.in 2013-12-01 12:24:20.500882542 +0100 +@@ -326,12 +326,6 @@ + top_srcdir = @top_srcdir@ + databasedir = $(pkgdatadir)/db/install-scripts/ + database_DATA = \ +- fedora.xml \ +- rhel.xml \ +- windows-sif.xml \ +- windows-cmd.xml \ +- windows-reg.xml \ +- windows-unattend.xml \ + $(NULL) + + EXTRA_DIST = $(database_DATA) +diff -ruN libosinfo-0.2.8/data/oses/Makefile.am libosinfo-0.2.8-libre/data/oses/Makefile.am +--- libosinfo-0.2.8/data/oses/Makefile.am 2013-09-10 15:22:50.000000000 +0200 ++++ libosinfo-0.2.8-libre/data/oses/Makefile.am 2013-12-01 12:26:24.797757509 +0100 +@@ -1,26 +1,6 @@ + + databasedir = $(pkgdatadir)/db/oses/ + database_in_files = \ +- altlinux.xml.in \ +- centos.xml.in \ +- debian.xml.in \ +- dos.xml.in \ +- fedora.xml.in \ +- freebsd.xml.in \ +- gnome.xml.in \ +- mandriva.xml.in \ +- mandrake.xml.in \ +- netbsd.xml.in \ +- netware.xml.in \ +- macos.xml.in \ +- openbsd.xml.in \ +- opensuse.xml.in \ +- rhl.xml.in \ +- rhel.xml.in \ +- solaris.xml.in \ +- suse.xml.in \ +- ubuntu.xml.in \ +- windows.xml.in \ + $(NULL) + + database_DATA = $(database_in_files:.xml.in=.xml) +diff -ruN libosinfo-0.2.8/data/oses/Makefile.in libosinfo-0.2.8-libre/data/oses/Makefile.in +--- libosinfo-0.2.8/data/oses/Makefile.in 2013-09-16 18:45:26.000000000 +0200 ++++ libosinfo-0.2.8-libre/data/oses/Makefile.in 2013-12-01 12:26:32.557686417 +0100 +@@ -326,26 +326,6 @@ + top_srcdir = @top_srcdir@ + databasedir = $(pkgdatadir)/db/oses/ + database_in_files = \ +- altlinux.xml.in \ +- centos.xml.in \ +- debian.xml.in \ +- dos.xml.in \ +- fedora.xml.in \ +- freebsd.xml.in \ +- gnome.xml.in \ +- mandriva.xml.in \ +- mandrake.xml.in \ +- netbsd.xml.in \ +- netware.xml.in \ +- macos.xml.in \ +- openbsd.xml.in \ +- opensuse.xml.in \ +- rhl.xml.in \ +- rhel.xml.in \ +- solaris.xml.in \ +- suse.xml.in \ +- ubuntu.xml.in \ +- windows.xml.in \ + $(NULL) + + database_DATA = $(database_in_files:.xml.in=.xml) diff --git a/pcr/libosinfo-libre/free-distros.patch b/pcr/libosinfo-libre/free-distros.patch new file mode 100644 index 000000000..c69cd3fed --- /dev/null +++ b/pcr/libosinfo-libre/free-distros.patch @@ -0,0 +1,123 @@ +diff -ruN libosinfo-0.2.8-libre/data/oses/Makefile.am libosinfo-0.2.8-libre-free-distros/data/oses/Makefile.am +--- libosinfo-0.2.8-libre/data/oses/Makefile.am 2013-12-01 13:14:07.267023100 +0100 ++++ libosinfo-0.2.8-libre-free-distros/data/oses/Makefile.am 2013-12-01 13:18:29.183029813 +0100 +@@ -1,6 +1,7 @@ + + databasedir = $(pkgdatadir)/db/oses/ + database_in_files = \ ++ parabola.xml.in \ + $(NULL) + + database_DATA = $(database_in_files:.xml.in=.xml) +diff -ruN libosinfo-0.2.8-libre/data/oses/Makefile.in libosinfo-0.2.8-libre-free-distros/data/oses/Makefile.in +--- libosinfo-0.2.8-libre/data/oses/Makefile.in 2013-12-01 13:14:07.267023100 +0100 ++++ libosinfo-0.2.8-libre-free-distros/data/oses/Makefile.in 2013-12-01 13:18:48.053708302 +0100 +@@ -326,6 +326,7 @@ + top_srcdir = @top_srcdir@ + databasedir = $(pkgdatadir)/db/oses/ + database_in_files = \ ++ parabola.xml.in \ + $(NULL) + + database_DATA = $(database_in_files:.xml.in=.xml) +diff -ruN libosinfo-0.2.8-libre/data/oses/parabola.xml libosinfo-0.2.8-libre-free-distros/data/oses/parabola.xml +--- libosinfo-0.2.8-libre/data/oses/parabola.xml 1970-01-01 01:00:00.000000000 +0100 ++++ libosinfo-0.2.8-libre-free-distros/data/oses/parabola.xml 2013-12-01 13:26:26.128660679 +0100 +@@ -0,0 +1,42 @@ ++ ++ ++ ++ ++ parabola ++ Parabola GNU/Linux-libre ++ Parabola Project ++ gnu/linux ++ ++ ++ ++ 1000000000 ++ 1 ++ 67108864 ++ 524288000 ++ ++ ++ 1000000000 ++ 67108864 ++ 524288000 ++ ++ ++ ++ ++ https://repo.parabolagnulinux.org/iso/2013.09.01/parabola-2013.09.01-dual.iso ++ ++ PARA_201309 ++ ++ parabola/boot/x86_64/vmlinuz ++ parabola/boot/x86_64/parabolaiso.img ++ ++ ++ https://repo.parabolagnulinux.org/iso/2013.09.01/parabola-2013.09.01-dual.iso ++ ++ PARA_201309 ++ ++ parabola/boot/i686/vmlinuz ++ parabola/boot/i686/parabolaiso.img ++ ++ ++ ++ +\ No newline at end of file +diff -ruN libosinfo-0.2.8-libre/data/oses/parabola.xml.in libosinfo-0.2.8-libre-free-distros/data/oses/parabola.xml.in +--- libosinfo-0.2.8-libre/data/oses/parabola.xml.in 1970-01-01 01:00:00.000000000 +0100 ++++ libosinfo-0.2.8-libre-free-distros/data/oses/parabola.xml.in 2013-12-01 13:17:12.086931332 +0100 +@@ -0,0 +1,42 @@ ++ ++ ++ ++ ++ parabola ++ <_name>Parabola GNU/Linux-libre ++ <_vendor>Parabola Project ++ gnu/linux ++ ++ ++ ++ 1000000000 ++ 1 ++ 67108864 ++ 524288000 ++ ++ ++ 1000000000 ++ 67108864 ++ 524288000 ++ ++ ++ ++ ++ https://repo.parabolagnulinux.org/iso/2013.09.01/parabola-2013.09.01-dual.iso ++ ++ PARA_201309 ++ ++ parabola/boot/x86_64/vmlinuz ++ parabola/boot/x86_64/parabolaiso.img ++ ++ ++ https://repo.parabolagnulinux.org/iso/2013.09.01/parabola-2013.09.01-dual.iso ++ ++ PARA_201309 ++ ++ parabola/boot/i686/vmlinuz ++ parabola/boot/i686/parabolaiso.img ++ ++ ++ ++ +diff -ruN libosinfo-0.2.8-libre/po/POTFILES.in libosinfo-0.2.8-libre-free-distros/po/POTFILES.in +--- libosinfo-0.2.8-libre/po/POTFILES.in 2013-12-01 13:14:10.297130169 +0100 ++++ libosinfo-0.2.8-libre-free-distros/po/POTFILES.in 2013-12-01 13:23:01.616209485 +0100 +@@ -1,3 +1,4 @@ ++data/oses/parabola.xml.in + data/devices/qemu-ps2.xml.in + data/devices/qemu-pci.xml.in + data/devices/virtio-pci.xml.in diff --git a/pcr/libosinfo-libre/po.patch b/pcr/libosinfo-libre/po.patch new file mode 100644 index 000000000..abd11cb71 --- /dev/null +++ b/pcr/libosinfo-libre/po.patch @@ -0,0 +1,34 @@ +diff -ruN libosinfo-0.2.8/po/POTFILES.in libosinfo-0.2.8-libre/po/POTFILES.in +--- libosinfo-0.2.8/po/POTFILES.in 2013-09-10 15:22:50.000000000 +0200 ++++ libosinfo-0.2.8-libre/po/POTFILES.in 2013-12-01 11:54:50.441912252 +0100 +@@ -1,30 +1,9 @@ +-data/oses/netware.xml.in +-data/oses/solaris.xml.in +-data/oses/dos.xml.in +-data/oses/mandrake.xml.in +-data/oses/mandriva.xml.in +-data/oses/suse.xml.in +-data/oses/gnome.xml.in +-data/oses/rhel.xml.in +-data/oses/fedora.xml.in +-data/oses/windows.xml.in +-data/oses/opensuse.xml.in +-data/oses/macos.xml.in +-data/oses/debian.xml.in +-data/oses/ubuntu.xml.in +-data/oses/centos.xml.in +-data/oses/openbsd.xml.in +-data/oses/freebsd.xml.in +-data/oses/rhl.xml.in +-data/oses/netbsd.xml.in +-data/oses/altlinux.xml.in + data/devices/qemu-ps2.xml.in + data/devices/qemu-pci.xml.in + data/devices/virtio-pci.xml.in + data/devices/qemu-usb.xml.in + data/hypervisors/kvm.xml.in + data/hypervisors/qemu.xml.in +-data/hypervisors/rhel-xen.xml.in + data/hypervisors/xen.xml.in + osinfo/osinfo_avatar_format.c + osinfo/osinfo_deployment.c diff --git a/pcr/libosinfo-libre/test.patch b/pcr/libosinfo-libre/test.patch new file mode 100644 index 000000000..413deb1c0 --- /dev/null +++ b/pcr/libosinfo-libre/test.patch @@ -0,0 +1,87 @@ +diff -ruN libosinfo-0.2.8/test/test-isodetect.c libosinfo-0.2.8-libre/test/test-isodetect.c +--- libosinfo-0.2.8/test/test-isodetect.c 2013-09-10 15:22:50.000000000 +0200 ++++ libosinfo-0.2.8-libre/test/test-isodetect.c 2013-12-01 11:44:32.830411240 +0100 +@@ -342,66 +342,6 @@ + g_object_unref(loader); + } + +-START_TEST(test_fedora) +-{ +- test_one("fedora"); +-} +-END_TEST +- +-START_TEST(test_rhel) +-{ +- test_one("rhel"); +-} +-END_TEST +- +-START_TEST(test_ubuntu) +-{ +- test_one("ubuntu"); +-} +-END_TEST +- +-START_TEST(test_debian) +-{ +- test_one("debian"); +-} +-END_TEST +- +-START_TEST(test_windows) +-{ +- test_one("windows"); +-} +-END_TEST +- +-START_TEST(test_openbsd) +-{ +- test_one("openbsd"); +-} +-END_TEST +- +-START_TEST(test_opensuse) +-{ +- test_one("opensuse"); +-} +-END_TEST +- +-START_TEST(test_centos) +-{ +- test_one("centos"); +-} +-END_TEST +- +-START_TEST(test_gnome) +-{ +- test_one("gnome"); +-} +-END_TEST +- +-START_TEST(test_altlinux) +-{ +- test_one("altlinux"); +-} +-END_TEST +- + static Suite * + list_suite(void) + { +@@ -409,16 +349,6 @@ + TCase *tc = tcase_create("Core"); + tcase_set_timeout(tc, 20); + +- tcase_add_test(tc, test_fedora); +- tcase_add_test(tc, test_rhel); +- tcase_add_test(tc, test_ubuntu); +- tcase_add_test(tc, test_debian); +- tcase_add_test(tc, test_windows); +- tcase_add_test(tc, test_openbsd); +- tcase_add_test(tc, test_opensuse); +- tcase_add_test(tc, test_centos); +- tcase_add_test(tc, test_gnome); +- tcase_add_test(tc, test_altlinux); + suite_add_tcase(s, tc); + return s; + } diff --git a/pcr/qemu-usbredir/65-kvm.rules b/pcr/qemu-usbredir/65-kvm.rules new file mode 100644 index 000000000..569ded9f9 --- /dev/null +++ b/pcr/qemu-usbredir/65-kvm.rules @@ -0,0 +1,2 @@ +KERNEL=="kvm", GROUP="kvm", MODE="0660" +KERNEL=="vhost-net", GROUP="kvm", MODE="0660", TAG+="uaccess", OPTIONS+="static_node=vhost-net" diff --git a/pcr/qemu-usbredir/PKGBUILD b/pcr/qemu-usbredir/PKGBUILD new file mode 100644 index 000000000..35f945d0e --- /dev/null +++ b/pcr/qemu-usbredir/PKGBUILD @@ -0,0 +1,77 @@ +# $Id$ +# Maintainer (Arch GNU/Linux): Tobias Powalowski +_pkgname=qemu +pkgname=qemu-usbredir +pkgver=1.7.0 +pkgrel=1 +pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." +arch=('i686' 'x86_64') +license=('GPL2' 'LGPL2.1') +url="http://wiki.qemu.org/Index.html" +makedepends=('texi2html' 'perl' 'python2' 'spice-protocol') +depends=('pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' + 'gnutls>=2.4.1' 'bluez-libs' 'vde2' 'util-linux' 'curl' 'libsasl' + 'libgl' 'libpulse' 'seabios' 'libcap-ng' 'libaio' 'libseccomp' + 'libiscsi' 'libcacard' 'spice' 'usbredir') +backup=('etc/qemu/target-x86_64.conf') +install=qemu.install +source=(http://wiki.qemu.org/download/${_pkgname}-${pkgver}.tar.bz2 + 65-kvm.rules) +makedepends=('pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' + 'gnutls>=2.4.1' 'bluez-libs' 'vde2' 'util-linux' 'curl' 'libsasl' + 'libgl' 'libpulse' 'seabios' 'libcap-ng' 'libaio' 'libseccomp' + 'libiscsi' 'libcacard' 'spice' 'spice-protocol' 'python2' + 'usbredir') +provides=("$_pkgname=$pkgver") +conflicts=("$_pkgname") +replaces=('qemu-kvm') +options=(!strip) + +build () +{ + cd "${srcdir}/${_pkgname}-${pkgver}" + # qemu vs. make 4 == bad + export ARFLAGS="rv" + # http://permalink.gmane.org/gmane.comp.emulators.qemu/238740 + # gtk gui breaks keymappings at the moment + ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list='pa alsa sdl' \ + --python=/usr/bin/python2 --smbd=/usr/bin/smbd \ + --enable-docs --libexecdir=/usr/lib/qemu \ + --disable-gtk --enable-linux-aio --enable-seccomp \ + --enable-spice --localstatedir=/var --enable-usb-redir + make V=99 +} + +package () +{ + cd "${srcdir}/${_pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" libexecdir="/usr/lib/qemu" install + # provided by seabios package + rm "${pkgdir}/usr/share/qemu/bios.bin" + rm "${pkgdir}/usr/share/qemu/acpi-dsdt.aml" + rm "${pkgdir}/usr/share/qemu/q35-acpi-dsdt.aml" + # remove conflicting /var/run directory + rm -r "${pkgdir}/var" + install -D -m644 "${srcdir}/65-kvm.rules" \ + "${pkgdir}/usr/lib/udev/rules.d/65-kvm.rules" + # bridge_helper needs suid + # https://bugs.archlinux.org/task/32565 + chmod u+s "${pkgdir}/usr/lib/qemu/qemu-bridge-helper" + # add sample config + echo "allow br0" > ${pkgdir}/etc/qemu/bridge.conf.sample + # strip scripts directory + find "${pkgdir}/usr/src/linux-${_kernver}/scripts" -type f -perm -u+w 2>/dev/null | while read binary ; do + case "$(file -bi "$binary")" in + *application/x-executable*) # Binaries + /usr/bin/strip $STRIP_BINARIES "$binary";; + esac + done + # remove libcacard files + rm -rf ${pkgdir}/usr/include/cacard + rm -rf ${pkgdir}/usr/lib/libcacard* + rm -rf ${pkgdir}/usr/lib/pkgconfig/libcacard.pc + rm -rf ${pkgdir}/usr/bin/vscclient +} + +md5sums=('32893941d40d052a5e649efcf06aca06' + '33ab286a20242dda7743a900f369d68a') diff --git a/pcr/qemu-usbredir/qemu.install b/pcr/qemu-usbredir/qemu.install new file mode 100644 index 000000000..79ee83536 --- /dev/null +++ b/pcr/qemu-usbredir/qemu.install @@ -0,0 +1,23 @@ +# kvm: the new package version +post_install() { + # + groupadd kvm -f -g 78 +} + +post_upgrade() { + if [ "$(vercmp $2 0.11)" -lt 0 ]; then + echo "With the release of qemu and qemu-kvm 0.12.X, the kqemu kernel module" + echo "is no longer supported and will be removed from the repositories. You" + echo "can safely uninstall it from your system." + fi + if [ "$(vercmp $2 1.3.1)" -lt 0 ]; then + echo "With the release of qemu 1.3.0, qemu-kvm binary is removed." + echo "You need to change the emulator path, if you use libvirt by using:" + echo "'virsh edit '" + fi +} + +post_remove() { + # + groupdel kvm +} -- cgit v1.2.3-54-g00ecf