summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gnu/recutils/ChangeLog36
-rw-r--r--gnu/recutils/PKGBUILD42
-rw-r--r--gnu/recutils/recutils.install36
-rw-r--r--libre-testing/icedove-libre/PKGBUILD74
-rw-r--r--libre-testing/icedove-libre/channel-prefs.js9
-rw-r--r--libre-testing/icedove-libre/gcc47.patch44
-rw-r--r--libre-testing/icedove-libre/icedove.install12
-rw-r--r--libre-testing/icedove-libre/mozconfig47
-rw-r--r--libre-testing/icedove-libre/vendor.js12
-rw-r--r--libre/abiword-libre/PKGBUILD19
-rw-r--r--libre/abuse-libre/PKGBUILD40
-rw-r--r--libre/abuse-libre/abuse.install1
-rw-r--r--libre/abuse-libre/non-claudio.patch122
-rw-r--r--libre/aspell-pl-libre/PKGBUILD20
-rw-r--r--libre/atool-libre/PKGBUILD25
-rw-r--r--libre/audacious-plugins-libre/PKGBUILD71
-rw-r--r--libre/audacity-libre/.directory2
-rw-r--r--libre/audacity-libre/PKGBUILD40
-rw-r--r--libre/filesystem/PKGBUILD6
-rw-r--r--libre/filesystem/filesystem.install4
-rw-r--r--libre/foomatic/PKGBUILD45
-rw-r--r--libre/gnu-ghostscript/PKGBUILD78
-rw-r--r--libre/gnu-ghostscript/gnu-ghostscript-cups-rgbw.patch263
-rw-r--r--libre/gnu-ghostscript/libtool.patch14
-rw-r--r--libre/gnustep-base-libre/PKGBUILD9
-rw-r--r--libre/gnustep-make-libre/PKGBUILD11
-rw-r--r--libre/grub2/PKGBUILD16
-rw-r--r--libre/grub2/parabola_grub_mkconfig_fixes.patch150
-rw-r--r--libre/gstreamer0.10-bad-libre/PKGBUILD13
-rw-r--r--libre/hardinfo/.directory2
-rw-r--r--libre/hardinfo/PKGBUILD26
-rw-r--r--libre/kdebase-konqueror-libre/PKGBUILD6
-rw-r--r--libre/kdelibs-libre/PKGBUILD23
-rw-r--r--libre/kdenetwork-libre/PKGBUILD8
-rw-r--r--libre/kdeutils-ark-libre/PKGBUILD10
-rw-r--r--libre/kile-libre/PKGBUILD13
-rw-r--r--libre/lame-libre/PKGBUILD31
-rw-r--r--libre/libquicktime-libre/PKGBUILD9
-rw-r--r--libre/libui-sh/PKGBUILD11
-rw-r--r--libre/liferea-libre/PKGBUILD16
-rw-r--r--libre/liferea-libre/liferea.install1
-rw-r--r--libre/lilo/PKGBUILD44
-rw-r--r--libre/lilo/lilo.conf25
-rw-r--r--libre/lilo/lilo.install5
-rw-r--r--libre/linux-libre-lts/PKGBUILD4
-rw-r--r--libre/linux-libre-lts/linux-libre-lts.install2
-rw-r--r--libre/linux-libre-tools/PKGBUILD14
-rw-r--r--libre/linux-libre/.directory5
-rw-r--r--libre/linux-libre/ChangeLog9
-rw-r--r--libre/linux-libre/PKGBUILD47
-rw-r--r--libre/linux-libre/config.i686434
-rw-r--r--libre/linux-libre/config.x86_64383
-rw-r--r--libre/linux-libre/linux-libre.install2
-rw-r--r--libre/lsb-release-libre/PKGBUILD9
-rw-r--r--libre/luxrays-libre/PKGBUILD45
-rw-r--r--libre/luxrender-libre/PKGBUILD50
-rw-r--r--libre/psutils-libre/.directory2
-rw-r--r--libre/psutils-libre/PKGBUILD15
-rw-r--r--libre/psutils-libre/psutils-1.17.diff33
-rw-r--r--libre/seamonkey-libre/PKGBUILD8
-rw-r--r--libre/seamonkey-libre/gnuzilla-addons.patch14
-rw-r--r--libre/thunderbird-libre/PKGBUILD16
-rw-r--r--libre/thunderbird-libre/clrf.patch265
-rw-r--r--libre/thunderbird-libre/gcc47.patch63
-rw-r--r--libre/thunderbird-libre/mozconfig2
-rw-r--r--libre/unarchiver/PKGBUILD2
-rw-r--r--libre/virtualbox-libre/PKGBUILD35
-rw-r--r--libre/virtualbox-libre/virtualbox.install2
-rw-r--r--libre/virtualbox-modules/PKGBUILD8
-rw-r--r--libre/virtualbox-modules/virtualbox-libre-modules.install17
-rw-r--r--libre/xarchiver-libre/PKGBUILD7
-rw-r--r--libre/xarchiver-libre/xarchiver-0.5.2-fix_7z_support.patch1
-rw-r--r--libre/xarchiver-libre/xarchiver-0.5.2-rpm2cpio.patch1
-rw-r--r--libre/xarchiver-libre/xarchiver-0.5.2-segfault-open-with.patch1
-rw-r--r--libre/your-freedom/your-freedom.install2
-rw-r--r--social/hunspell-pt-br/.directory2
-rw-r--r--social/hunspell-pt-br/PKGBUILD27
-rwxr-xr-xsocial/mednafen-wip/PKGBUILD31
-rw-r--r--social/seeks/PKGBUILD7
-rw-r--r--social/tomb/PKGBUILD30
-rw-r--r--social/tomb/tomb.install13
-rw-r--r--~emulatorman/hunspell-pt-br/.directory2
-rw-r--r--~emulatorman/hunspell-pt-br/PKGBUILD4
-rwxr-xr-x~emulatorman/mednafen-wip/PKGBUILD9
-rw-r--r--~emulatorman/mednafen-wip/build.patch31
85 files changed, 2020 insertions, 1125 deletions
diff --git a/gnu/recutils/ChangeLog b/gnu/recutils/ChangeLog
new file mode 100644
index 000000000..02a3a418d
--- /dev/null
+++ b/gnu/recutils/ChangeLog
@@ -0,0 +1,36 @@
+recutils (1.5-1)
+
+ * New upstream release
+ - Version 1.5 (13 January 2012)
+ - The utilities will now ask interactively for a password
+ if it was not provided with the -s command line option.
+ This avoids security problems related to shell history files.
+ - Support for octal and hexadecimal numbers has been added.
+ They can be used in both the records and selection expressions.
+ - It is now possible to select a given number of random records
+ in many of the utilities using the -m command line option.
+ - The -n option now accepts a list of indexes, supporting ranges.
+ - The new -U (uniq) option for recsel removes duplicated fields
+ in the output records.
+ - The new -q option allows to quickly search for the desired record
+ without having to provide a complete selection expression.
+ - Auto generated fields are now considered integers by default.
+ This avoids repetitive patterns involving %auto and %type.
+ - Tab characters are now allowed in blank lines betwwen records.
+ - The API in rec.h is now better documented with comments, and improved.
+ - recfix now exits with an error status
+ if there is a parse error in some input file.
+ - The usage of the internal data structures has been _vastly_ improved,
+ resulting in a much faster operation.
+ - Internal cleanup and code factorization.
+ - Many, many, many bug fixes :D
+ * PKGBUILD
+ - commenting out "makedepends=(mdbtools)" for now
+ because the current "mdbtools" package from the AUR
+ is missing 'MDB_NOFLAGS' in the "mdbtools.h" file.
+ - all other dependencies to compile and run recutils
+ are already satisfied through the 'base' group.
+ * Added some examples
+
+ -- Sven Wick <sven.wick@gmx.de> Fri, 20 Jan 2012 16:04:02 +0100
+
diff --git a/gnu/recutils/PKGBUILD b/gnu/recutils/PKGBUILD
new file mode 100644
index 000000000..519c0fa6f
--- /dev/null
+++ b/gnu/recutils/PKGBUILD
@@ -0,0 +1,42 @@
+# Maintainer: Max Meyer <dev@fedux.org>
+# Contributor: Sven Wick <sven.wick@gmx.de>
+#
+# Please fork and send me a pull request for changes to package build file(s)
+# Url: https://github.com/maxmeyer/archlinux-recutils
+#
+
+pkgname=recutils
+pkgver=1.5
+pkgrel=1
+pkgdesc="GNU tools and libraries to access human-editable, text-based databases."
+arch=(i686 x86_64 mips64el)
+url="http://www.gnu.org/software/recutils/"
+license=('GPL3')
+depends=(libgcrypt curl)
+optdepends=("mdbtools: for processing M$ Access databases")
+#options=()
+install=recutils.install
+changelog=ChangeLog
+source=("http://ftp.gnu.org/gnu/recutils/$pkgname-$pkgver.tar.gz")
+sha256sums=('7ed67e74468084f52ad9341e4b11c44e5fd9d5325b93b7eb2cb230c839ff5dec')
+options=(!libtool)
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ ./configure --prefix=/usr
+ make
+}
+
+check() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make check
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ make DESTDIR="$pkgdir/" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/gnu/recutils/recutils.install b/gnu/recutils/recutils.install
new file mode 100644
index 000000000..245c7ae01
--- /dev/null
+++ b/gnu/recutils/recutils.install
@@ -0,0 +1,36 @@
+_infodir=/usr/share/info
+_infofiles=( recutils.info.gz )
+
+_mandir=/usr/share/man/man1
+_manfiles=( csv2rec.1.gz rec2csv.1.gz recdel.1.gz recfix.1.gz recfmt.1.gz recinf.1.gz recins.1.gz recsel.1.gz recset.1.gz)
+
+## arg 1: the new package version
+post_install() {
+ [ -x /usr/bin/mandb ] || return 0
+ for _file in ${_manfiles[@]}; do
+ mandb -f $_mandir/$_file
+ done
+
+ [ -x /usr/bin/install-info ] || return 0
+ for _file in ${_infofiles[@]}; do
+ install-info $_infodir/$_file $_infodir/dir #2> /dev/null
+ done
+}
+
+# arg 1: the new package version
+# arg 2: the old package version
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ [ -x /usr/bin/mandb ] || return 0
+ mandb
+
+ [ -x /usr/bin/install-info ] || return 0
+ for _file in ${_infofiles[@]}; do
+ install-info --delete $_infodir/$_file $_infodir/dir #2> /dev/null
+ done
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre-testing/icedove-libre/PKGBUILD b/libre-testing/icedove-libre/PKGBUILD
new file mode 100644
index 000000000..de86019a3
--- /dev/null
+++ b/libre-testing/icedove-libre/PKGBUILD
@@ -0,0 +1,74 @@
+# Maintainer : Márcio Silva <coadde@adinet.com.uy>
+# Maintainer : André Silva <andre.paulista@adinet.com.uy>
+
+# We're getting this from Debian Sid
+_debname=icedove
+_debver=10.0.3
+_debrel=3
+_debrepo=http://ftp.debian.org/debian/pool/main/
+debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
+
+_pkgname=$_debname
+pkgname=$_debname-libre
+pkgver=$_debver
+pkgrel=1
+pkgdesc="A libre version of Debian Icedove, the Standalone Mail/News reader based on Mozilla thunderbird."
+arch=('i586' 'i686' 'x86_64' 'mips64el')
+license=('GPL2' 'MPL' 'LGPL')
+depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'nss' 'sqlite3' 'startup-notification')
+makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt')
+optdepends=('libcanberra: for sound support')
+url="http://packages.debian.org/source/sid/$_pkgname"
+install=$_pkgname.install
+source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
+ "$_debrepo/`debfile $_debname`_$_debver-$_debrel.debian.tar.gz"
+ "$_debrepo/`debfile $_debname`_$_debver-$_debrel.dsc"
+ mozconfig
+ channel-prefs.js
+ vendor.js
+ gcc47.patch)
+md5sums=('3efe2ef4d5471aae3b79531ce8aee9dc'
+ 'cb3dba2916bdf2deb72248b0984c4302'
+ '57e21e997a75d85fcc0dcfe30b83f1ee'
+ '76e01cfd6de4d4289265882774d1ba7d'
+ '476ec205162340fb0679f522c9d31c3b'
+ '4eecc4fc5aafaf0da651a09eadc90bee'
+ '66376a8e934013078f0e646e49614937')
+
+build() {
+ export QUILT_PATCHES=debian/patches
+ export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
+ export QUILT_DIFF_ARGS='--no-timestamps'
+ export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname"
+ export PYTHON="/usr/bin/python2"
+
+ mv comm-esr10 "$srcdir/mozilla-build"
+ mv debian "$srcdir/mozilla-build"
+
+ cd "$srcdir/mozilla-build"
+ quilt push -a
+
+ cp "$srcdir/mozconfig" .mozconfig
+ patch -Np1 -i "$srcdir/gcc47.patch"
+ rm "$srcdir"/mozilla-build/mail/locales/en-US/searchplugins/{amazondotcom,aol-web-search,bing,twitter,yahoo}.xml
+
+ make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
+}
+
+package() {
+ cd "$srcdir/mozilla-build"
+ make -j1 -f client.mk DESTDIR="$pkgdir" install
+
+ install -m644 "$srcdir/vendor.js" "$pkgdir/usr/lib/$_pkgname/defaults/pref"
+ install -m644 "$srcdir/channel-prefs.js" "$pkgdir/usr/lib/$_pkgname/defaults/pref" # Recommend free addons
+
+ for i in 16x16 22x22 24x24 32x32 48x48 256x256; do
+ install -Dm644 "$debian/app-icons/$_pkgname${i/x*/}.png" "/usr/share/icons/hicolor/$i/apps/$_pkgname.png"
+ done
+ install -Dm644 "$debian/app-icons/$_pkgname_icon.svg" "/usr/share/icons/hicolor/scalable/apps/$_pkgname.svg"
+
+ rm -rf "$pkgdir"/usr/lib/$_pkgname/{dictionaries,hyphenation}
+ ln -sf /usr/share/hunspell "$pkgdir/usr/lib/$_pkgname/dictionaries"
+ ln -sf /usr/share/hyphen "$pkgdir/usr/lib/$_pkgname/hyphenation"
+ rm -r "$pkgdir"/usr/{include,lib/$_pkgname-devel,share/idl} # We don't want the development stuff
+}
diff --git a/libre-testing/icedove-libre/channel-prefs.js b/libre-testing/icedove-libre/channel-prefs.js
new file mode 100644
index 000000000..13b1ba388
--- /dev/null
+++ b/libre-testing/icedove-libre/channel-prefs.js
@@ -0,0 +1,9 @@
+//@line 2 "/build/src/comm-release/mail/app/profile/channel-prefs.js"
+pref("app.update.channel", "default");
+
+//Recommend free addons
+pref("extensions.getAddons.get.url", "http://www.gnu.org/software/gnuzilla/addons.html");
+pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html");
+pref("extensions.getAddons.search.url", "http://www.gnu.org/software/gnuzilla/addons.html");
+pref("extensions.getMoreThemesURL", "http://www.gnu.org/software/gnuzilla/addons.html");
+pref("extensions.webservice.discoverURL", "http://www.gnu.org/software/gnuzilla/addons.html");
diff --git a/libre-testing/icedove-libre/gcc47.patch b/libre-testing/icedove-libre/gcc47.patch
new file mode 100644
index 000000000..9824e6ab2
--- /dev/null
+++ b/libre-testing/icedove-libre/gcc47.patch
@@ -0,0 +1,44 @@
+--- mozilla-build.orig/mozilla/ipc/chromium/src/base/file_util.cc 2012-03-06 14:26:03.000000000 -0200
++++ mozilla-build/mozilla/ipc/chromium/src/base/file_util.cc 2012-04-04 18:50:02.094431651 -0300
+@@ -8,7 +8,7 @@
+ #include <io.h>
+ #endif
+ #include <stdio.h>
+-#if defined(ANDROID)
++#if defined(ANDROID) || defined(OS_POSIX)
+ #include <unistd.h>
+ #endif
+
+--- mozilla-build.orig/mozilla/ipc/chromium/src/base/message_pump_libevent.cc 2012-03-06 14:26:03.000000000 -0200
++++ mozilla-build/mozilla/ipc/chromium/src/base/message_pump_libevent.cc 2012-04-04 19:55:24.140455837 -0300
+@@ -6,6 +6,7 @@
+
+ #include <errno.h>
+ #include <fcntl.h>
++#include <unistd.h>
+
+ #include "eintr_wrapper.h"
+ #include "base/logging.h"
+
+--- mozilla-build.orig/mozilla/ipc/chromium/src/base/file_util_linux.cc 2012-03-06 14:26:03.000000000 -0200
++++ mozilla-build/mozilla/ipc/chromium/src/base/file_util_linux.cc 2012-04-04 20:49:49.756138306 -0300
+@@ -5,6 +5,7 @@
+ #include "base/file_util.h"
+
+ #include <fcntl.h>
++#include <unistd.h>
+
+ #include <string>
+ #include <vector>
+
+--- mozilla-build.orig/mozilla/ipc/chromium/src/base/time_posix.cc 2012-03-06 14:26:03.000000000 -0200
++++ mozilla-build/mozilla/ipc/chromium/src/base/time_posix.cc 2012-04-04 20:55:12.678037291 -0300
+@@ -8,6 +8,7 @@
+ #include <mach/mach_time.h>
+ #endif
+ #include <sys/time.h>
++#include <unistd.h>
+ #ifdef ANDROID
+ #include <time64.h>
+ #else
+
diff --git a/libre-testing/icedove-libre/icedove.install b/libre-testing/icedove-libre/icedove.install
new file mode 100644
index 000000000..4d4a283db
--- /dev/null
+++ b/libre-testing/icedove-libre/icedove.install
@@ -0,0 +1,12 @@
+post_install() {
+ 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/libre-testing/icedove-libre/mozconfig b/libre-testing/icedove-libre/mozconfig
new file mode 100644
index 000000000..4ad7c655c
--- /dev/null
+++ b/libre-testing/icedove-libre/mozconfig
@@ -0,0 +1,47 @@
+ac_add_options --prefix=/usr
+ac_add_options --libdir=/usr/lib
+
+# System libraries
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+ac_add_options --with-system-jpeg
+ac_add_options --with-system-zlib
+ac_add_options --with-system-bz2
+ac_add_options --with-system-png
+ac_add_options --with-system-libevent
+ac_add_options --with-system-libvpx
+ac_add_options --enable-system-hunspell
+ac_add_options --enable-system-sqlite
+ac_add_options --enable-system-ffi
+ac_add_options --enable-system-cairo
+ac_add_options --enable-system-pixman
+ac_add_options --with-pthreads
+
+# Features
+ac_add_options --enable-startup-notification
+ac_add_options --enable-gio
+
+ac_add_options --disable-gnomevfs
+ac_add_options --disable-crashreporter
+ac_add_options --disable-updater
+ac_add_options --disable-tests
+ac_add_options --disable-mochitest
+ac_add_options --disable-installer
+
+# Optimization
+ac_add_options --enable-optimize
+
+export MOZILLA_OFFICIAL=1
+mk_add_options MOZILLA_OFFICIAL=1
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-objdir
+
+# Icedove
+ac_add_options --disable-official-branding
+ac_add_options --with-branding=debian/icedove-branding
+
+# Parabola
+ac_add_options --disable-safe-browsing
+export BUILD_OFFICIAL=1
+mk_add_options BUILD_OFFICIAL=1
+
+# Build-generated
diff --git a/libre-testing/icedove-libre/vendor.js b/libre-testing/icedove-libre/vendor.js
new file mode 100644
index 000000000..279bdc158
--- /dev/null
+++ b/libre-testing/icedove-libre/vendor.js
@@ -0,0 +1,12 @@
+// Forbid application updates
+lockPref("app.update.enabled", false);
+
+// Use LANG environment variable to choose locale
+pref("intl.locale.matchOS", true);
+
+// Disable default mailer checking.
+pref("mail.shell.checkDefaultMail", false);
+
+// Don't disable our bundled extensions in the application directory
+pref("extensions.autoDisableScopes", 11);
+pref("extensions.shownSelectionUI", true);
diff --git a/libre/abiword-libre/PKGBUILD b/libre/abiword-libre/PKGBUILD
index 834b0a8b8..4286d258a 100644
--- a/libre/abiword-libre/PKGBUILD
+++ b/libre/abiword-libre/PKGBUILD
@@ -1,13 +1,13 @@
# $Id: PKGBUILD 146945 2012-01-19 14:58:28Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Maël Lavault <moimael@neuf.fr>
-# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
_pkgbase=abiword
pkgbase=abiword-libre
pkgname=('abiword-libre' 'abiword-libre-plugins')
pkgver=2.8.6
-pkgrel=7
+pkgrel=7.1
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
url="http://www.abisource.com"
@@ -24,9 +24,6 @@ md5sums=('f883b0a7f26229a9c66fd6a1a94381aa'
'42e2614b6e0aad457d91f6ce20b6f225'
'40e370e7e88c5437140ef18037abfbd3'
'880b17db6f249d977d2a7cd012d9ce02')
-conflicts=('abiword')
-replaces=('abiword')
-provides=("abiword=$pkgver")
build() {
cd "${srcdir}/${_pkgbase}-${pkgver}"
@@ -59,8 +56,10 @@ package_abiword-libre() {
pkgdesc="A fully-featured word processor that doesn't recommend unfree fonts"
depends=('fribidi' 'wv' 'goffice' 'librsvg' 'enchant' 'desktop-file-utils')
install=$pkgname.install
- optdepends=('abiword-plugins')
- conflicts=("abiword-plugins<${pkgver}-${pkgrel}")
+ optdepends=('abiword-libre-plugins')
+ conflicts=("abiword-libre-plugins<${pkgver}-${pkgrel}" 'abiword')
+ replaces=('abiword')
+ provides=("abiword=$pkgver")
cd "${srcdir}/${_pkgbase}-${pkgver}"
sed -i plugins/Makefile \
@@ -80,8 +79,12 @@ package_abiword-libre-plugins() {
pkgdesc="Additional plugins for Abiword"
depends=("abiword-libre=${pkgver}-${pkgrel}" 'loudmouth' 'libwpg' 'libwmf' 'link-grammar'
'gtkmathview' 'aiksaurus' 'libxslt' 'libsoup' 'libots' 'libgsf')
-
+ conflicts=('abiword-libre-plugins')
+ replaces=('abiword-libre-plugins')
+ provides=("abiword-libre-plugins=$pkgver")
+
cd "${srcdir}/${_pkgbase}-${pkgver}/plugins"
+
for dir in collab wpg wmf grammar mathview aiksaurus latex ots wordperfect; do
make -C ${dir} DESTDIR="${pkgdir}" install
done
diff --git a/libre/abuse-libre/PKGBUILD b/libre/abuse-libre/PKGBUILD
index d8e5d8e4f..829871791 100644
--- a/libre/abuse-libre/PKGBUILD
+++ b/libre/abuse-libre/PKGBUILD
@@ -1,50 +1,40 @@
-# $Id: PKGBUILD 46622 2011-05-10 10:00:25Z lfleischer $
+# $Id$
# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
# Contributor: jlvsimoes <jlvsimoes@oninet.pt>
# Contributor: kevin <kevin@archlinux.org>
+# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+_pkgname=abuse
pkgname=abuse-libre
pkgver=0.8
-pkgrel=1
+pkgrel=2
pkgdesc='A side-scroller action game that pits you against ruthless alien killers. Without unfree "Claudio"'
arch=('i686' 'x86_64')
url='http://abuse.zoy.org/'
-license=('GPL' 'custom:PublicDomain')
+license=('GPL' 'custom')
depends=('gcc-libs' 'libgl' 'sdl' 'sdl_mixer')
install='abuse.install'
-source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz")
-
-# Remove the unfree 'claudio' addon
-# $ source PKGBUILD
-# $ mksource
-mksource() {
- pushd /tmp >/dev/null
-
- wget http://abuse.zoy.org/raw-attachment/wiki/download/${pkgname%-libre}-${pkgver}.tar.gz \
- -O - | tar xzf -
-
- rm -rvf ./abuse-$pkgver/data/addon/claudio
- tar czvf ${pkgname}-${pkgver}.tar.gz ./abuse-$pkgver
-
- popd >/dev/null
-
- mv -v /tmp/${pkgname}-${pkgver}.tar.gz .
-}
+source=("http://abuse.zoy.org/raw-attachment/wiki/download/${_pkgname}-${pkgver}.tar.gz"
+ non-claudio.patch)
+md5sums=('ec678b8dc8d00e0382d8c805c6438489'
+ '4808c8be42f551bb3c611629a7833f09')
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd "${srcdir}/${_pkgname}-${pkgver}"
+
+# Remove the unfree 'claudio' addon
+ rm -rvf ./data/addon/claudio
+ patch -Np1 -i "$srcdir/non-claudio.patch"
./configure --prefix=/usr --with-assetdir=/usr/share/abuse/orig --with-x
make
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd "${srcdir}/${_pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
install -d "${pkgdir}/usr/share/licenses/abuse"
sed -n '1,/^$/p' src/view.cpp > "${pkgdir}/usr/share/licenses/abuse/orig.code.license"
}
-
-md5sums=('10cac59308bff0dadb8437eff8b4d87e')
diff --git a/libre/abuse-libre/abuse.install b/libre/abuse-libre/abuse.install
index ca888f196..4d28ebacd 100644
--- a/libre/abuse-libre/abuse.install
+++ b/libre/abuse-libre/abuse.install
@@ -11,4 +11,3 @@ post_upgrade() {
post_install
}
-
diff --git a/libre/abuse-libre/non-claudio.patch b/libre/abuse-libre/non-claudio.patch
new file mode 100644
index 000000000..2a29e53f0
--- /dev/null
+++ b/libre/abuse-libre/non-claudio.patch
@@ -0,0 +1,122 @@
+--- abuse-0.8/data/Makefile.in 2011-05-09 08:06:35.000000000 -0300
++++ abuse-0.8/data/Makefile.in 2012-04-11 15:03:02.854839102 -0300
+@@ -184,7 +184,6 @@
+ addon/aliens/objects.lsp addon/aliens/powerold.lsp \
+ addon/aliens/powerups.lsp addon/aliens/sfx.lsp \
+ addon/aliens/tiles.lsp addon/bong/bong.lsp \
+- addon/claudio/claudio.lsp addon/claudio/oldclaud.lsp \
+ addon/deathmat/cur_lev.lsp addon/deathmat/deathmat.lsp \
+ addon/deathmat/dstartup.lsp addon/deathmat/gamename.lsp \
+ addon/deathmat/large.lsp addon/deathmat/levelset.lsp \
+@@ -245,23 +244,6 @@
+ art/tints/guns/orange.spe art/tints/guns/redish.spe \
+ addon/aliens/aliens.spe addon/aliens/bactiles.spe \
+ addon/aliens/fortiles.spe addon/bong/bong.spe \
+- addon/claudio/antship.spe addon/claudio/bigexp.spe \
+- addon/claudio/deepw1.spe addon/claudio/deepw2.spe \
+- addon/claudio/droid.spe addon/claudio/extiles.spe \
+- addon/claudio/fire.spe addon/claudio/lamp.spe \
+- addon/claudio/lava2.spe addon/claudio/mypanels.spe \
+- addon/claudio/nplatfor.spe addon/claudio/pal21.spe \
+- addon/claudio/pal2.spe addon/claudio/pal5.spe \
+- addon/claudio/pal81f.spe addon/claudio/pal81.spe \
+- addon/claudio/pal82f.spe addon/claudio/pal82.spe \
+- addon/claudio/pal90.spe addon/claudio/rob2.spe \
+- addon/claudio/skull.spe addon/claudio/spaced.spe \
+- addon/claudio/spaceh.spe addon/claudio/spacymed.spe \
+- addon/claudio/spacytdm.spe addon/claudio/sswitch.spe \
+- addon/claudio/t_lamp.spe addon/claudio/trex1.spe \
+- addon/claudio/t_skull.spe addon/claudio/t_space.spe \
+- addon/claudio/t_trex.spe addon/claudio/t_water.spe \
+- addon/claudio/umbrel3.spe addon/claudio/watem.spe \
+ addon/example/example.spe addon/leon/gray.spe \
+ addon/leon/level00.spe addon/leon/level01.spe \
+ addon/leon/level02.spe addon/leon/lmisc.spe \
+@@ -333,7 +315,6 @@
+ doc = \
+ addon/aliens/aliens.txt \
+ addon/aliens/readme.txt \
+- addon/claudio/palettes.txt \
+ addon/leon/leon.txt \
+ addon/newart/tiledoc.txt \
+ addon/pong/pong.txt \
+@@ -414,17 +395,6 @@
+ @HAVE_NONFREE_TRUE@ addon/aliens/aslash01.wav \
+ @HAVE_NONFREE_TRUE@ addon/aliens/egghatch.wav \
+ @HAVE_NONFREE_TRUE@ addon/aliens/jarbreak.wav \
+-@HAVE_NONFREE_TRUE@ addon/claudio/aship.wav \
+-@HAVE_NONFREE_TRUE@ addon/claudio/drill.wav \
+-@HAVE_NONFREE_TRUE@ addon/claudio/fire.wav \
+-@HAVE_NONFREE_TRUE@ addon/claudio/glass1.wav \
+-@HAVE_NONFREE_TRUE@ addon/claudio/sewers.wav \
+-@HAVE_NONFREE_TRUE@ addon/claudio/skull.wav \
+-@HAVE_NONFREE_TRUE@ addon/claudio/spaceo.wav \
+-@HAVE_NONFREE_TRUE@ addon/claudio/trex1.wav \
+-@HAVE_NONFREE_TRUE@ addon/claudio/trex2.wav \
+-@HAVE_NONFREE_TRUE@ addon/claudio/unhealth.wav \
+-@HAVE_NONFREE_TRUE@ addon/claudio/wfall.wav \
+ @HAVE_NONFREE_TRUE@ addon/leon/sfx/ambship1.wav \
+ @HAVE_NONFREE_TRUE@ addon/leon/sfx/ambship2.wav \
+ @HAVE_NONFREE_TRUE@ addon/leon/sfx/gren5.wav \
+--- abuse-0.8/data/Makefile.am 2011-05-09 04:58:04.000000000 -0300
++++ abuse-0.8/data/Makefile.am 2012-04-11 15:03:50.282407491 -0300
+@@ -35,7 +35,6 @@
+ \
+ addon/bong/bong.lsp \
+ \
+- addon/claudio/claudio.lsp addon/claudio/oldclaud.lsp \
+ addon/deathmat/cur_lev.lsp addon/deathmat/deathmat.lsp \
+ addon/deathmat/dstartup.lsp addon/deathmat/gamename.lsp \
+ addon/deathmat/large.lsp addon/deathmat/levelset.lsp \
+@@ -113,21 +112,6 @@
+ \
+ addon/bong/bong.spe \
+ \
+- addon/claudio/antship.spe addon/claudio/bigexp.spe \
+- addon/claudio/deepw1.spe addon/claudio/deepw2.spe addon/claudio/droid.spe \
+- addon/claudio/extiles.spe addon/claudio/fire.spe addon/claudio/lamp.spe \
+- addon/claudio/lava2.spe addon/claudio/mypanels.spe \
+- addon/claudio/nplatfor.spe addon/claudio/pal21.spe addon/claudio/pal2.spe \
+- addon/claudio/pal5.spe addon/claudio/pal81f.spe addon/claudio/pal81.spe \
+- addon/claudio/pal82f.spe addon/claudio/pal82.spe addon/claudio/pal90.spe \
+- addon/claudio/rob2.spe addon/claudio/skull.spe addon/claudio/spaced.spe \
+- addon/claudio/spaceh.spe addon/claudio/spacymed.spe \
+- addon/claudio/spacytdm.spe addon/claudio/sswitch.spe \
+- addon/claudio/t_lamp.spe addon/claudio/trex1.spe \
+- addon/claudio/t_skull.spe addon/claudio/t_space.spe \
+- addon/claudio/t_trex.spe addon/claudio/t_water.spe \
+- addon/claudio/umbrel3.spe addon/claudio/watem.spe \
+- \
+ addon/example/example.spe \
+ \
+ addon/leon/gray.spe addon/leon/level00.spe addon/leon/level01.spe \
+@@ -214,7 +198,6 @@
+ doc = \
+ addon/aliens/aliens.txt \
+ addon/aliens/readme.txt \
+- addon/claudio/palettes.txt \
+ addon/leon/leon.txt \
+ addon/newart/tiledoc.txt \
+ addon/pong/pong.txt \
+@@ -267,11 +250,6 @@
+ addon/aliens/altaunt.wav addon/aliens/aslash01.wav \
+ addon/aliens/egghatch.wav addon/aliens/jarbreak.wav \
+ \
+- addon/claudio/aship.wav addon/claudio/drill.wav addon/claudio/fire.wav \
+- addon/claudio/glass1.wav addon/claudio/sewers.wav addon/claudio/skull.wav \
+- addon/claudio/spaceo.wav addon/claudio/trex1.wav addon/claudio/trex2.wav \
+- addon/claudio/unhealth.wav addon/claudio/wfall.wav \
+- \
+ addon/leon/sfx/ambship1.wav addon/leon/sfx/ambship2.wav \
+ addon/leon/sfx/gren5.wav addon/leon/sfx/gren6.wav \
+ addon/leon/sfx/rain2.wav addon/leon/sfx/rain3.wav \
+--- abuse-0.8/data/abuse.lsp 2011-05-09 04:58:04.000000000 -0300
++++ abuse-0.8/data/abuse.lsp 2012-04-11 15:04:15.637788215 -0300
+@@ -42,7 +42,6 @@
+ (load "addon/twist/f2chars.lsp")
+ (load "addon/twist/f2ai.lsp")
+ (load "addon/aliens/astartup.lsp")
+-(load "addon/claudio/claudio.lsp")
+ (load "addon/twist/lisp/dray.lsp")
+ (load "addon/twist/lisp/mario.lsp")
+ (load "addon/leon/4frabs.lsp")
diff --git a/libre/aspell-pl-libre/PKGBUILD b/libre/aspell-pl-libre/PKGBUILD
index f932a95d1..6da90e449 100644
--- a/libre/aspell-pl-libre/PKGBUILD
+++ b/libre/aspell-pl-libre/PKGBUILD
@@ -2,9 +2,11 @@
# $Id: PKGBUILD 43278 2011-03-24 13:25:37Z andrea $
# Maintainer: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
# Contributor: Arkadiusz Laczynski <alaczynski@gmail.com>
+# Contributor (Parabola): Jorge Lopez <jorginho@adinet.com.uy>
+_pkgname=aspell-pl
pkgname=aspell-pl-libre
-pkgver=20110907
+pkgver=20111117
pkgrel=1
pkgdesc="Polish dictionary for aspell"
arch=('i686' 'x86_64')
@@ -14,20 +16,18 @@ depends=('aspell')
replaces=('aspell-pl')
conflicts=('aspell-pl')
provides=('aspell-pl')
-_sourcename=sjp-aspell6-pl-6.0_$pkgver-0.tar.bz2
-source=("http://repo.parabolagnulinux.org/other/${_sourcename}")
-md5sums=('e1bb7627b553666ff6703bfbc3528c1a')
-
-# Upstream publishes only the newest daily snapshot of the source, so
-# we need to mirror it.
-mksource() {
- [ -f ${_sourcename} ] || wget http://sjp.pl/slownik/ort/${_sourcename}
-}
+source=("ftp://ftp.archlinux.org/other/community/$_pkgname/sjp-aspell6-pl-6.0_$pkgver-0.tar.bz2")
+md5sums=('27aa9ca734d7049238399c279c5417fb')
build() {
cd "$srcdir/aspell6-pl-6.0_$pkgver-0"
./configure
make
+}
+
+package() {
+ cd "$srcdir/aspell6-pl-6.0_$pkgver-0"
+
make DESTDIR="$pkgdir" install
}
diff --git a/libre/atool-libre/PKGBUILD b/libre/atool-libre/PKGBUILD
index 295e67725..7ec4d7c1e 100644
--- a/libre/atool-libre/PKGBUILD
+++ b/libre/atool-libre/PKGBUILD
@@ -1,13 +1,14 @@
-# $Id: PKGBUILD 10828 2010-02-02 18:05:28Z jlichtblau $
+# $Id$
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: leif_thande <leif.thande@gmail.com>
# Contributor: tranquility <trankas@gmail.com>
# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+# Contributor (Parabola): Márcio Silva <coadde@adinet.com.uy>
_pkgname=atool
pkgname=atool-libre
-pkgver=0.37.0
-pkgrel=4
+pkgver=0.38.0
+pkgrel=3
pkgdesc="A script for managing file archives of various types"
arch=('any')
url="http://www.nongnu.org/atool/"
@@ -20,25 +21,25 @@ optdepends=('bzip2: for using atool with bzip2 compressed archives'
'cpio: for using atool with cpio archives'
'gzip: for using atool with gzip compressed archives'
'lha: for using atool with lha, lharc and similar archives'
- 'lzma-utils: for using atool with lzma compressed archives'
+ 'xz: for using atool with lzma compressed archives'
'lzop: for using atool with lzop compressed archives'
'p7zip: for using atool with 7z archives'
'tar: for using atool with tar archives'
'zip: for using atool for creating zip archives'
- 'unzip: for using atool for unpacking archives')
-source=(http://savannah.nongnu.org/download/atool/atool-${pkgver}.tar.gz)
-md5sums=('2607e9b19518af4145be8a6bed454477')
+ 'unzip: for using atool for unpacking archives')
+
+source=(http://savannah.nongnu.org/download/$_pkgname/$_pkgname-$pkgver.tar.gz)
+sha256sums=('b967195facbe5e7c6535ac117aaa7f633b0eca174137c30c36a5200efb80047d')
build() {
- cd ${srcdir}/${_pkgname}-${pkgver}
+ cd ${srcdir}/${_pkgname}-${pkgver}
- ./configure --prefix=/usr
+ ./configure --prefix=/usr
}
package() {
- cd ${srcdir}/${_pkgname}-${pkgver}
+ cd ${srcdir}/${_pkgname}-${pkgver}
- make prefix=${pkgdir}/usr install || return 1
+ make prefix=${pkgdir}/usr install
}
-
diff --git a/libre/audacious-plugins-libre/PKGBUILD b/libre/audacious-plugins-libre/PKGBUILD
index 875f39a0e..1953c1764 100644
--- a/libre/audacious-plugins-libre/PKGBUILD
+++ b/libre/audacious-plugins-libre/PKGBUILD
@@ -3,10 +3,12 @@
# Arch Contributor: William Rea <sillywilly@gmail.com>
# Arch maintainer: Gaetan Bisson <bisson@archlinux.org>
# Parabola maintainer: Brendan Tildesley
+# Contributor (Parabola): Jorge Lopez <jorginho@adinet.com.uy>
+_pkgname=audacious-plugins
pkgname=audacious-plugins-libre
-pkgver=3.2
-pkgrel=1
+pkgver=3.2.2
+pkgrel=1.1
pkgdesc='Plugins for Audacious without unfree plugins'
url='http://audacious-media-player.org/'
arch=('i686' 'x86_64')
@@ -15,12 +17,12 @@ license=('GPL' 'GPL3' 'LGPL' 'custom')
# Licensing issues:
# The plugins 'scrobbler', stereoplugin', 'wavepack' and 'plugin_echo' have no license notice
# but I've been informed by an upstream dev, nenolod, that they are all GPL. I don't know what version
-#
+#
# The plugin 'psf' is currently (Nov 2011) BSD+noncommercial, but is apparently being changed to GPL.
# However, 'psf' is apparently an emulator for running non-free code, so I'm not rushing to fix it.
#
# All the other custom licensed plugins I think are mostly modified BSD or ISC.
-
+
provides=("audacious-plugins=$pkgver")
replaces=("${pkgname%-libre}")
conflicts=("${pkgname%-libre}")
@@ -57,47 +59,34 @@ optdepends=('oss: Open Sound System v4 output'
'libmms: libmms-based mms transport'
'libcue: CUE playlist format')
-source=("http://repo.parabolagnulinux.org/~brendan/src-libre/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('6375b65b975e2905a8ff1c0ddfaeee2a71bbef94')
-
-# Retrieve upstream & remove plugin 'psf' due to issues mentioned above. Repackage as -libre
-mksource(){
- [ -f ${pkgname%-libre}-$pkgver.tar.bz2 ] || wget http://distfiles.audacious-media-player.org/${pkgname%-libre}-$pkgver.tar.bz2
- tar xjf ${pkgname%-libre}-${pkgver}.tar.bz2
-
- rm -rvf ${pkgname%-libre}-$pkgver/src/psf/
- sed -i s/enable_psf=yes/enable_psf=no/ ${pkgname%-libre}-$pkgver/configure
-
- mv -v ${pkgname%-libre}-$pkgver ${pkgname}-$pkgver
- tar cJf ${pkgname}-${pkgver}.tar.xz ${pkgname}-${pkgver}/
- rm -rf ${pkgname}-${pkgver}
- echo "${pkgname}-${pkgver}.tar.xz is your new -libre source package."
-
-}
-
+source=("http://distfiles.audacious-media-player.org/${_pkgname}-${pkgver}.tar.bz2")
+sha1sums=('4518a6fdcba0c1b496e048b45ce5d87a46326c9b')
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ # Retrieve upstream & remove plugin 'psf' due to issues mentioned above.
+ sed -i s/enable_psf=yes/enable_psf=no/ ${_pkgname}-$pkgver/configure
+
+ cd "${srcdir}/${_pkgname}-${pkgver}"
# Get license notices out of custom-licensed packages
cd src
- tmpdir=$(mktemp -d /tmp/${pkgname}-${pkgver}-XXXX)
- head -n 18 albumart/albumart.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.albumart
- head -n 17 alsa/alsa.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.alsa
- head -n 17 audpl/audpl.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.audpl
+ tmpdir=$(mktemp -d /tmp/${_pkgname}-${pkgver}-XXXX)
+ head -n 18 albumart/albumart.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.albumart
+ head -n 17 alsa/alsa.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.alsa
+ head -n 17 audpl/audpl.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.audpl
head -n 18 cairo-spectrum/cairo-spectrum.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.cairo-spectrum
- head -n 17 compressor/compressor.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.compressor
- head -n 17 crossfade/crossfade.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.crossfade
- head -n 18 crystalizer/crystalizer.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.crystalizer
- head -n 18 lyricwiki/lyricwiki.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.lyricwiki
- head -n 19 mpg123/mpg123.c | cut -c 4- | tail -n 18 > ${tmpdir}/LICENSE.mpg123
- head -n 17 mpris2/plugin.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.mpris2
- head -n 17 resample/resample.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.resample
- head -n 17 unix-io/unix-io.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.unix-io
- head -n 18 voice_removal/voice_removal.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.voice_removal
- head -n 25 xsf/corlett.c | cut -c 2- | tail -n 23 > ${tmpdir}/LICENSE.xfs
- l=${pkgdir}/usr/share/licenses/${pkgname}/
+ head -n 17 compressor/compressor.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.compressor
+ head -n 17 crossfade/crossfade.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.crossfade
+ head -n 18 crystalizer/crystalizer.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.crystalizer
+ head -n 18 lyricwiki/lyricwiki.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.lyricwiki
+ head -n 19 mpg123/mpg123.c | cut -c 4- | tail -n 18 > ${tmpdir}/LICENSE.mpg123
+ head -n 17 mpris2/plugin.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.mpris2
+ head -n 17 resample/resample.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.resample
+ head -n 17 unix-io/unix-io.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.unix-io
+ head -n 18 voice_removal/voice_removal.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.voice_removal
+ head -n 25 xsf/corlett.c | cut -c 2- | tail -n 23 > ${tmpdir}/LICENSE.xfs
+ l=${pkgdir}/usr/share/licenses/${pkgname}/
install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
- cd ..
+ cd ..
pushd $tmpdir
install -m644 LICENSE.albumart $l
install -m644 LICENSE.alsa $l
@@ -118,12 +107,12 @@ build() {
./configure \
--prefix=/usr \
--enable-amidiplug \
- --disable-adplug
+ --disable-adplug \
make
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd "${srcdir}/${_pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
}
diff --git a/libre/audacity-libre/.directory b/libre/audacity-libre/.directory
new file mode 100644
index 000000000..a65007814
--- /dev/null
+++ b/libre/audacity-libre/.directory
@@ -0,0 +1,2 @@
+[Dolphin]
+Timestamp=2012,4,10,15,23,50
diff --git a/libre/audacity-libre/PKGBUILD b/libre/audacity-libre/PKGBUILD
index a0c1b154d..6d6f287b3 100644
--- a/libre/audacity-libre/PKGBUILD
+++ b/libre/audacity-libre/PKGBUILD
@@ -1,47 +1,42 @@
-# $Id$
-# Maintainer: Joseph Yaworski <jy@dervormund.info>
+# $Id: PKGBUILD 153455 2012-03-14 17:15:15Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+_pkgname=audacity
pkgname=audacity-libre
-pkgver=1.3.13
+pkgver=2.0.0
pkgrel=1
pkgdesc="A program that lets you manipulate digital audio waveforms, libre"
arch=('i686' 'x86_64')
url="http://audacity.sourceforge.net/"
license=('GPL')
-depends=('libvorbis' 'libmad' 'libid3tag' 'wxgtk' 'libsamplerate' 'lame' 'hicolor-icon-theme'
- 'shared-mime-info' 'desktop-file-utils' 'redland' 'jack' 'soundtouch')
-makedepends=('zip')
+depends=('libmad' 'libid3tag' 'wxgtk' 'lame-libre' 'hicolor-icon-theme'
+ 'desktop-file-utils' 'jack' 'soundtouch' 'ffmpeg')
options=('!makeflags')
install=audacity-libre.install
-source=(http://repo.parabolagnulinux.org/other/${pkgname}-minsrc-${pkgver}-beta.tar.bz2
+source=(http://audacity.googlecode.com/files/${_pkgname}-minsrc-${pkgver}.tar.bz2
remove-unfree-nyquist.patch
audacity-libre.install)
+sha1sums=('0175474e63c51aaa97df9b45574f7f307f1d3bc8'
+ 'cda4587458aecf15c41102f86c3b466f80acd0f3'
+ '59e511af919f62b07dd62bab251c56bef6344d70')
provides=("audacity=$pkgver")
replaces=('audacity')
conflicts=('audacity')
-# source PKGBUILD; mksource
-mksource() {
- wget http://audacity.googlecode.com/files/audacity-minsrc-${pkgver}-beta.tar.bz2 -O - | \
- tar -jxvf -
+build() {
+ cd "${srcdir}/${_pkgname}-src-${pkgver}"
- pushd audacity-src-${pkgver}-beta/
+# Removing nyquist
rm -rfv {,lib-src/lib}nyquist
find -iname '*nyquist*' -print0 | xargs -0 \
rm -rfv
patch -Np0 -i ../remove-unfree-nyquist.patch || return 1
- popd
-
- mv audacity-src-${pkgver}-beta/ ${pkgname}-src-${pkgver}-beta/
- tar -cjf ${pkgname}-minsrc-${pkgver}-beta.tar.bz2 ${pkgname}-src-${pkgver}-beta/
-}
-build() {
- cd "${srcdir}/${pkgname}-src-${pkgver}-beta"
WX_CONFIG=/usr/bin/wx-config ./configure --prefix=/usr \
--with-portaudio --with-libsamplerate \
--without-libresample --with-libmad \
- --with-id3tag --with-libflac \
+ --with-ffmpeg --with-id3tag --with-libflac \
--with-vorbis --with-libexpat \
--with-libsndfile --with-soundtouch \
--enable-unicode --without-taglib \
@@ -50,9 +45,6 @@ build() {
}
package() {
- cd "${srcdir}/${pkgname}-src-${pkgver}-beta"
+ cd "${srcdir}/${_pkgname}-src-${pkgver}"
make DESTDIR="${pkgdir}" install
}
-md5sums=('0dca3e9b337ff1357b0580bd6de4e3b1'
- '7c49dbe048d1f0f1706fd84bbea2fee4'
- 'd1942ad63ff1ef27cae2531ee914d5c8')
diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD
index e9282b5aa..90b39d121 100644
--- a/libre/filesystem/PKGBUILD
+++ b/libre/filesystem/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 150594 2012-02-18 18:25:33Z tomegun $
+# $Id: PKGBUILD 155345 2012-04-01 23:43:12Z tomegun $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
pkgname=filesystem
pkgver=2012.2
-pkgrel=2
+pkgrel=4
pkgdesc='Base filesystem for Parabola'
arch=('any')
license=('GPL')
@@ -62,7 +62,7 @@ package() {
install -m600 ${srcdir}/${f} etc/
done
touch etc/arch-release
- install -D -m644 ${srcdir}/modprobe.d.usb-load-ehci-first lib/modprobe.d/usb-load-ehci-first.conf
+ install -D -m644 ${srcdir}/modprobe.d.usb-load-ehci-first usr/lib/modprobe.d/usb-load-ehci-first.conf
# setup /var
for d in cache/man local opt log/old lib/misc empty run; do
diff --git a/libre/filesystem/filesystem.install b/libre/filesystem/filesystem.install
index 38d21a85b..8cef64bb6 100644
--- a/libre/filesystem/filesystem.install
+++ b/libre/filesystem/filesystem.install
@@ -10,14 +10,14 @@ post_install() {
# args: <group> [options]
_addgroup() {
- if ! getent group "$1"; then
+ if ! getent group "$1" >/dev/null; then
groupadd "$@" >/dev/null
fi
}
# args: <group> [options]
_adduser() {
- if ! getent passwd "$1"; then
+ if ! getent passwd "$1" >/dev/null; then
useradd "$@" >/dev/null
fi
}
diff --git a/libre/foomatic/PKGBUILD b/libre/foomatic/PKGBUILD
index c83ef667b..bd5f8da17 100644
--- a/libre/foomatic/PKGBUILD
+++ b/libre/foomatic/PKGBUILD
@@ -1,38 +1,34 @@
-# $Id: PKGBUILD 130674 2011-07-07 16:52:03Z andyrtr $
+# $Id: PKGBUILD 155771 2012-04-06 10:09:10Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgbase="foomatic"
pkgname=('foomatic-db' 'foomatic-filters-libre' 'foomatic-db-engine')
-arch=('i686' 'x86_64') # needs to be changed in the subpackages when makepkg will support it
-_snapdate=20110707
-_relver=4.0.7
-pkgver=${_relver}_${_snapdate}
+arch=('i686' 'x86_64' 'mips64el') # needs to be changed in the subpackages when makepkg will support it
+_snapdate=20120406
+_filtersver=4.0.15
+_enginever=4.0.8
+pkgver=${_filtersver}_${_snapdate}
pkgrel=1
epoch=1
-makedepends=('cups>=1.4.7' 'perl' 'libxml2' 'enscript' 'perl' 'net-snmp' 'bash')
-source=(http://www.linuxprinting.org/download/foomatic/$pkgbase-db-engine-${_relver}.tar.gz
- http://www.linuxprinting.org/download/foomatic/$pkgbase-db-4.0-${_snapdate}.tar.gz
- http://repo.parabolagnulinux.org/other/$pkgbase-filters-libre-${_relver}.tar.gz)
+makedepends=('cups' 'perl' 'libxml2' 'enscript' 'perl' 'net-snmp' 'bash')
+#_url=http://www.openprinting.org/download/foomatic/ # switch after build
+_url=ftp://ftp.archlinux.org/other/foomatic/
+source=(https://repo.parabolagnulinux.org/other/${pkgbase}-filters-libre-${_filtersver}.tar.gz
+ ${_url}/$pkgbase-db-engine-${_enginever}.tar.gz
+ ${_url}/$pkgbase-db-4.0-${_snapdate}.tar.gz)
url="http://www.linuxprinting.org/foomatic.html"
options=('!emptydirs')
-md5sums=('fcfa8eb9ce5494b81b58ae983fc2aeb5'
- '88d467d9099188b170185564bd33d7b7'
- 'ffda5eb8ab36564e5b28190e6c5406b2')
mksource() {
- if [ ! -d ${pkgbase}-filters-libre-${_relver}/ ]; then
- wget -O - http://www.linuxprinting.org/download/foomatic/$pkgbase-filters-${_relver}.tar.gz | \
+ if [ ! -d ${pkgbase}-filters-libre-${_filtersver}/ ]; then
+ wget -O - http://www.openprinting.org/download/foomatic/foomatic-filters-${_filtersver}.tar.gz | \
bsdtar xzf -
- mv ${pkgbase}-filters{,-libre}-${_relver}/
+ mv ${pkgbase}-filters{,-libre}-${_filtersver}/
fi
- rm -rfv ${pkgbase}-filters-libre-${_relver}/test/{lsbfuncs,shfuncs,tcm,tetapi}.sh
- bsdtar cvzf ${pkgbase}-filters-libre-${_relver}.tar.gz ${pkgbase}-filters-libre-${_relver}/
-}
-
-build() {
- /bin/true
+ rm -rfv ${pkgbase}-filters-libre-${_filtersver}/test/{lsbfuncs,shfuncs,tcm,tetapi}.sh
+ bsdtar cvzf ${pkgbase}-filters-libre-${_filtersver}.tar.gz ${pkgbase}-filters-libre-${_filtersver}/
}
package_foomatic-db() {
@@ -64,8 +60,7 @@ package_foomatic-filters-libre() {
optdepends=('perl: for the "beh" Backend End Handler used by cups'
'net-snmp: certain (mostly HP) printers need it to work')
-# cd ${srcdir}/${pkgname}-${pkgver}
- cd ${srcdir}/foomatic-filters-libre-${_relver}
+ cd ${srcdir}/foomatic-filters-${_filtersver}
./configure --prefix=/usr --sysconfdir=/etc
make
make DESTDIR=${pkgdir} install
@@ -78,8 +73,7 @@ package_foomatic-db-engine() {
license=('GPL')
depends=('perl' 'libxml2' 'foomatic-filters' 'bash')
-# cd ${srcdir}/${pkgname}-${pkgver}
- cd ${srcdir}/foomatic-db-engine-${_relver}
+ cd ${srcdir}/foomatic-db-engine-${_enginever}
./configure --prefix=/usr
make
eval `perl -V:archname`
@@ -92,3 +86,4 @@ package_foomatic-db-engine() {
chmod 755 ${pkgdir}/usr/lib{,/perl5,/perl5/vendor_perl}
}
+
diff --git a/libre/gnu-ghostscript/PKGBUILD b/libre/gnu-ghostscript/PKGBUILD
new file mode 100644
index 000000000..c7f952833
--- /dev/null
+++ b/libre/gnu-ghostscript/PKGBUILD
@@ -0,0 +1,78 @@
+# Maintainer: André Silva <andre.paulista@adinet.com.uy>
+
+pkgname=gnu-ghostscript
+_pkgver=9.04
+pkgver=9.04.1
+pkgrel=1
+pkgdesc="An interpreter for the PostScript language from FSF"
+arch=('i686' 'x86_64')
+license=('GPL3')
+depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng>=1.5.7' 'libjpeg' 'libtiff>=4.0.0' 'lcms') # 'lcms2' won't get used) # move in libpaper from community?
+makedepends=('gtk2' 'gnutls')
+optdepends=('texlive-core: needed for dvipdf'
+ 'gtk2: needed for gsx')
+conflicts=('ghostscript')
+replaces=('ghostscript-lrpng' 'ghostscript')
+provides=('ghostscript-lprng' "ghostscript=$pkgver")
+url="https://www.gnu.org/software/ghostscript/"
+source=(ftp://ftp.gnu.org/gnu/ghostscript/${pkgname}-${pkgver}.tar.xz
+ ${pkgname}-cups-rgbw.patch
+ libtool.patch)
+options=('!libtool' '!makeflags')
+md5sums=('aba639a5102afbd2ee30c67831692c27'
+ '5a78af559d44a7502978fd09f840e3aa'
+ '5bd5d4966007b460deed866a30a0b3c8')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+
+ # fix broken color printing https://bugs.archlinux.org/task/25519
+ patch -Np1 -i ${srcdir}/${pkgname}-cups-rgbw.patch
+
+ # fix libtool version
+ patch -Np1 -i ${srcdir}/libtool.patch
+
+ # force it to use system-libs
+ rm -rf jpeg libpng zlib jasper expat tiff lcms freetype
+
+LIBS=-lfreetype ./configure --prefix=/usr \
+ --enable-dynamic \
+ --with-ijs \
+ --with-jbig2dec \
+ --with-omni \
+ --with-x \
+ --with-drivers=ALL\
+ --with-fontpath=/usr/share/fonts/Type1:/usr/share/fonts \
+ --with-install-cups \
+ --enable-fontconfig \
+ --enable-freetype \
+ --without-luratech \
+ --disable-compile-inits #--help # needed for linking with system-zlib
+ make
+
+ # Build IJS
+ cd ${srcdir}/${pkgname}-${pkgver}/ijs
+ ./autogen.sh
+ ./configure --prefix=/usr --enable-shared --disable-static
+ make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} \
+ cups_serverroot=${pkgdir}/etc/cups \
+ cups_serverbin=${pkgdir}/usr/lib/cups install soinstall
+
+ # install missing doc files # http://bugs.archlinux.org/task/18023
+ install -m 644 ${srcdir}/${pkgname}-${pkgver}/doc/{Ps2ps2.htm,gs-vms.hlp,gsdoc.el,pscet_status.txt} ${pkgdir}/usr/share/ghostscript/$_pkgver/doc/
+
+ mkdir -p ${pkgdir}/usr/share/licenses/ghostscript
+ install -m644 LICENSE ${pkgdir}/usr/share/licenses/${_pkgname}/
+
+ # remove unwanted localized man-pages
+ rm -rf $pkgdir/usr/share/man/[^man1]*
+
+ # install IJS
+ cd ${srcdir}/${pkgname}-${pkgver}/ijs
+ make DESTDIR=${pkgdir} install
+}
diff --git a/libre/gnu-ghostscript/gnu-ghostscript-cups-rgbw.patch b/libre/gnu-ghostscript/gnu-ghostscript-cups-rgbw.patch
new file mode 100644
index 000000000..81b52a2e6
--- /dev/null
+++ b/libre/gnu-ghostscript/gnu-ghostscript-cups-rgbw.patch
@@ -0,0 +1,263 @@
+diff -up gnu-ghostscript-9.04.1/cups/gdevcups.c.cups-rgbw ghostscript-9.04/cups/gdevcups.c
+--- gnu-ghostscript-9.04.1/cups/gdevcups.c.cups-rgbw 2011-08-05 12:12:21.000000000 +0100
++++ gnu-ghostscript-9.04.1/cups/gdevcups.c 2011-08-22 10:54:24.614010581 +0100
+@@ -225,6 +225,7 @@ typedef struct gx_device_cups_s
+ unsigned short EncodeLUT[gx_max_color_value + 1];/* RGB value to output color LUT */
+ int Density[CUPS_MAX_VALUE + 1];/* Density LUT */
+ int Matrix[3][3][CUPS_MAX_VALUE + 1];/* Color transform matrix LUT */
++ int user_icc;
+ int cupsRasterVersion;
+
+ /* Used by cups_put_params(): */
+@@ -426,6 +427,7 @@ gx_device_cups gs_cups_device =
+ {0x00}, /* EncodeLUT */
+ {0x00}, /* Density */
+ {0x00}, /* Matrix */
++ 0,
+ 3 /* cupsRasterVersion */
+ };
+
+@@ -1182,15 +1184,18 @@ cups_map_cmyk(gx_device *pdev, /* I - D
+
+ case CUPS_CSPACE_RGB :
+ case CUPS_CSPACE_RGBW :
++ c0 = c + k;
++ c1 = m + k;
++ c2 = y + k;
+ if (cups->header.cupsColorSpace == CUPS_CSPACE_RGBW) {
+- c0 = c;
+- c1 = m;
+- c2 = y;
+- c3 = k;
+- } else {
+- c0 = c + k;
+- c1 = m + k;
+- c2 = y + k;
++ if ((k >= frac_1 - 1) ||
++ ((c0 >= frac_1) && (c1 >= frac_1) && (c2 >= frac_1))) {
++ c0 = frac_1;
++ c1 = frac_1;
++ c2 = frac_1;
++ c3 = frac_1;
++ } else
++ c3 = 0;
+ }
+
+ if (c0 < 0)
+@@ -1212,11 +1217,12 @@ cups_map_cmyk(gx_device *pdev, /* I - D
+ out[2] = frac_1 - (frac)cups->Density[c2];
+
+ if (cups->header.cupsColorSpace == CUPS_CSPACE_RGBW) {
+- if (c3 < 0)
+- c3 = 0;
+- else if (c3 > frac_1)
+- c3 = frac_1;
+- out[3] = frac_1 - (frac)cups->Density[c3];
++ if (c3 == 0)
++ out[3] = frac_1;
++ else if (c3 == frac_1)
++ out[3] = 0;
++ else
++ out[3] = frac_1;
+ }
+ break;
+
+@@ -2034,10 +2040,15 @@ cups_map_color_rgb(gx_device *pdev,
+ * cups->DecodeLUT actually maps to RGBW, not CMYK...
+ */
+
+- k = cups->DecodeLUT[c3];
+- c = cups->DecodeLUT[c0] + k - gx_max_color_value;
+- m = cups->DecodeLUT[c1] + k - gx_max_color_value;
+- y = cups->DecodeLUT[c2] + k - gx_max_color_value;
++ if (c3 == 0) {
++ c = 0;
++ m = 0;
++ y = 0;
++ } else {
++ c = cups->DecodeLUT[c0];
++ m = cups->DecodeLUT[c1];
++ y = cups->DecodeLUT[c2];
++ }
+
+ if (c > gx_max_color_value)
+ prgb[0] = gx_max_color_value;
+@@ -2282,20 +2293,20 @@ cups_map_rgb_color(gx_device *pdev,
+ switch (cups->header.cupsBitsPerColor)
+ {
+ default :
+- i = 0x0e;
++ i = 0x00;
+ break;
+ case 2 :
+- i = 0xfc;
++ i = 0x00;
+ break;
+ case 4 :
+- i = 0xfff0;
++ i = 0x0000;
+ break;
+ case 8 :
+- i = 0xffffff00;
++ i = 0x00000000;
+ break;
+ #ifdef GX_COLOR_INDEX_TYPE
+ case 16 :
+- i = 0xffffffffffff0000;
++ i = 0x0000000000000000;
+ break;
+ #endif /* GX_COLOR_INDEX_TYPE */
+ }
+@@ -2929,7 +2940,10 @@ cups_put_params(gx_device *pdev, /*
+ int xflip = 0,
+ yflip = 0;
+ int found = 0;
+-
++ gs_param_string icc_pro_dummy;
++ int old_cmps = cups->color_info.num_components;
++ int old_depth = cups->color_info.depth;
++
+ #ifdef DEBUG
+ dprintf2("DEBUG2: cups_put_params(%p, %p)\n", pdev, plist);
+ #endif /* DEBUG */
+@@ -3024,6 +3038,11 @@ cups_put_params(gx_device *pdev, /*
+ margins_set = param_read_float_array(plist, "Margins", &arrayval) == 0;
+ color_set = param_read_int(plist, "cupsColorSpace", &intval) == 0 ||
+ param_read_int(plist, "cupsBitsPerColor", &intval) == 0;
++
++ if (!cups->user_icc) {
++ cups->user_icc = param_read_string(plist, "OutputICCProfile", &icc_pro_dummy) == 0;
++ }
++
+ /* We set the old dimensions to 1 if we have a color depth change, so
+ that memory reallocation gets forced. This is perhaps not the correct
+ approach to prevent crashes like in bug 690435. We keep it for the
+@@ -3134,12 +3153,20 @@ cups_put_params(gx_device *pdev, /*
+ if ((code = gdev_prn_put_params(pdev, plist)) < 0)
+ return (code);
+
++ /* If cups_set_color_info() changed the color model of the device we want to
++ * force the raster memory to be recreated/reinitialized
++ */
++ if (cups->color_info.num_components != old_cmps || cups->color_info.depth != old_depth) {
++ width_old = 0;
++ height_old = 0;
++ }
++ else {
+ /* pdev->width/height may have been changed by the call to
+ * gdev_prn_put_params()
+ */
+- width_old = pdev->width;
+- height_old = pdev->height;
+-
++ width_old = pdev->width;
++ height_old = pdev->height;
++ }
+ /*
+ * Update margins/sizes as needed...
+ */
+@@ -4044,22 +4071,88 @@ cups_set_color_info(gx_device *pdev) /*
+ for (k = 0; k <= CUPS_MAX_VALUE; k ++)
+ cups->Density[k] = k;
+ }
+- /* Set up the ICC profile for ghostscript to use based upon the color space.
+- This is different than the PPD profile above which appears to be some sort
+- of matrix based TRC profile */
+- switch (cups->header.cupsColorSpace) {
+- /* Use RGB profile for this */
+- case CUPS_CSPACE_RGBW:
+- if (pdev->icc_struct == NULL) {
+- pdev->icc_struct = gsicc_new_device_profile_array(pdev->memory);
+- }
+- if (pdev->icc_struct->device_profile[gsDEFAULTPROFILE] == NULL) {
+- code = gsicc_set_device_profile(pdev, pdev->memory,
+- DEFAULT_RGB_ICC, gsDEFAULTPROFILE);
+- }
+- break;
+- default:
+- break;
++ if (!cups->user_icc) {
++ /* Set up the ICC profile for ghostscript to use based upon the color space.
++ This is different than the PPD profile above which appears to be some sort
++ of matrix based TRC profile */
++ switch (cups->header.cupsColorSpace)
++ {
++ default :
++ case CUPS_CSPACE_RGBW :
++ case CUPS_CSPACE_RGB :
++ case CUPS_CSPACE_RGBA :
++ case CUPS_CSPACE_CMY :
++ case CUPS_CSPACE_YMC :
++# ifdef CUPS_RASTER_HAVE_COLORIMETRIC
++ case CUPS_CSPACE_CIELab :
++ case CUPS_CSPACE_ICC1 :
++ case CUPS_CSPACE_ICC2 :
++ case CUPS_CSPACE_ICC3 :
++ case CUPS_CSPACE_ICC4 :
++ case CUPS_CSPACE_ICC5 :
++ case CUPS_CSPACE_ICC6 :
++ case CUPS_CSPACE_ICC7 :
++ case CUPS_CSPACE_ICC8 :
++ case CUPS_CSPACE_ICC9 :
++ case CUPS_CSPACE_ICCA :
++ case CUPS_CSPACE_ICCB :
++ case CUPS_CSPACE_ICCC :
++ case CUPS_CSPACE_ICCD :
++ case CUPS_CSPACE_ICCE :
++ case CUPS_CSPACE_ICCF :
++# endif /* CUPS_RASTER_HAVE_COLORIMETRIC */
++ if (!pdev->icc_struct || (pdev->icc_struct &&
++ pdev->icc_struct->device_profile[gsDEFAULTPROFILE]->data_cs != gsRGB)) {
++
++ if (pdev->icc_struct) {
++ rc_decrement(pdev->icc_struct, "cups_set_color_info");
++ }
++ pdev->icc_struct = gsicc_new_device_profile_array(pdev->memory);
++
++ code = gsicc_set_device_profile(pdev, pdev->memory,
++ (char *)DEFAULT_RGB_ICC, gsDEFAULTPROFILE);
++ }
++ break;
++
++ case CUPS_CSPACE_W :
++ case CUPS_CSPACE_WHITE :
++ case CUPS_CSPACE_K :
++ case CUPS_CSPACE_GOLD :
++ case CUPS_CSPACE_SILVER :
++ if (!pdev->icc_struct || (pdev->icc_struct &&
++ pdev->icc_struct->device_profile[gsDEFAULTPROFILE]->data_cs != gsGRAY)) {
++
++ if (pdev->icc_struct) {
++ rc_decrement(pdev->icc_struct, "cups_set_color_info");
++ }
++ pdev->icc_struct = gsicc_new_device_profile_array(pdev->memory);
++
++ code = gsicc_set_device_profile(pdev, pdev->memory->non_gc_memory,
++ (char *)DEFAULT_GRAY_ICC, gsDEFAULTPROFILE);
++ }
++ break;
++ case CUPS_CSPACE_KCMYcm :
++# ifdef CUPS_RASTER_HAVE_COLORIMETRIC
++ case CUPS_CSPACE_CIEXYZ :
++#endif
++ case CUPS_CSPACE_CMYK :
++ case CUPS_CSPACE_YMCK :
++ case CUPS_CSPACE_KCMY :
++ case CUPS_CSPACE_GMCK :
++ case CUPS_CSPACE_GMCS :
++ if (!pdev->icc_struct || (pdev->icc_struct &&
++ pdev->icc_struct->device_profile[gsDEFAULTPROFILE]->data_cs != gsCMYK)) {
++
++ if (pdev->icc_struct) {
++ rc_decrement(pdev->icc_struct, "cups_set_color_info");
++ }
++ pdev->icc_struct = gsicc_new_device_profile_array(pdev->memory);
++
++ code = gsicc_set_device_profile(pdev, pdev->memory,
++ (char *)DEFAULT_CMYK_ICC, gsDEFAULTPROFILE);
++ }
++ break;
++ }
+ }
+ }
+
diff --git a/libre/gnu-ghostscript/libtool.patch b/libre/gnu-ghostscript/libtool.patch
new file mode 100644
index 000000000..4271ce69b
--- /dev/null
+++ b/libre/gnu-ghostscript/libtool.patch
@@ -0,0 +1,14 @@
+--- gnu-ghostscript-9.04.1/ltmain.sh 2011-12-31 08:26:26.000000000 -0200
++++ gnu-ghostscript-9.04.1/ltmain.sh 2012-04-10 05:08:19.253341477 -0300
+@@ -79,9 +79,9 @@
+
+ PROGRAM=libtool
+ PACKAGE=libtool
+-VERSION=2.4
++VERSION=2.4.2
+ TIMESTAMP=""
+-package_revision=1.3293
++package_revision=1.3337
+
+ # Be Bourne compatible
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
diff --git a/libre/gnustep-base-libre/PKGBUILD b/libre/gnustep-base-libre/PKGBUILD
index 9017c71b4..4b5fa1731 100644
--- a/libre/gnustep-base-libre/PKGBUILD
+++ b/libre/gnustep-base-libre/PKGBUILD
@@ -1,13 +1,14 @@
# Parabola maintainer: Michał Masłowski <mtjm@mtjm.eu>
-# $Id: PKGBUILD 56058 2011-09-29 17:45:33Z spupykin $
+# Parabola contributor: André Silva <andre.paulista@adinet.com.uy>
+# $Id$
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
# Contributor: Sebastian Sareyko <public@nooms.de>
_pkgname=gnustep-base
pkgname=gnustep-base-libre
-pkgver=1.23.0
-pkgrel=1
+pkgver=1.24.0
+pkgrel=2
pkgdesc="The GNUstep base package with exceptions enabled"
arch=('i686' 'x86_64')
url="http://www.gnustep.org/"
@@ -19,7 +20,7 @@ provides=('gnustep-base')
groups=('gnustep-core')
options=('!emptydirs' '!makeflags')
source=(ftp://ftp.gnustep.org/pub/gnustep/core/$_pkgname-$pkgver.tar.gz)
-md5sums=('c898a1b6cdc98e83639f319876bdbba6')
+md5sums=('53cd117e9f64729870e906b66d2314ba')
build() {
cd "$srcdir/$_pkgname-$pkgver"
diff --git a/libre/gnustep-make-libre/PKGBUILD b/libre/gnustep-make-libre/PKGBUILD
index dedf944a3..7abc014c6 100644
--- a/libre/gnustep-make-libre/PKGBUILD
+++ b/libre/gnustep-make-libre/PKGBUILD
@@ -1,11 +1,12 @@
# Parabola maintainer: Michał Masłowski <mtjm@mtjm.eu>
-# $Id: PKGBUILD 56053 2011-09-29 17:24:54Z spupykin $
+# Parabola contributor: André Silva <andre.paulista@adinet.com.uy>
+# $Id$
# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
# Contributor: Sebastian Sareyko <public@nooms.de>
_pkgname=gnustep-make
pkgname=gnustep-make-libre
-pkgver=2.6.1
+pkgver=2.6.2
pkgrel=1
pkgdesc="The GNUstep make package with exceptions enabled"
arch=('any')
@@ -15,11 +16,11 @@ depends=('glibc')
conflicts=('gnustep-make-svn' 'gnustep-make')
provides=('gnustep-make')
groups=('gnustep-core')
-source=(ftp://ftp.gnustep.org/pub/gnustep/core/${_pkgname}-$pkgver.tar.gz)
-md5sums=('071b3a807ca3ec93cda75ac210adc263')
+source=(ftp://ftp.gnustep.org/pub/gnustep/core/$_pkgname-$pkgver.tar.gz)
+md5sums=('b926d142debc9f38d75b11019c31889f')
build() {
- cd $srcdir/${_pkgname}-$pkgver
+ cd $srcdir/$_pkgname-$pkgver
# The option is not needed, but makes clear why we rebuild this.
./configure --prefix=/usr --sysconfdir=/etc/GNUstep \
--enable-native-objc-exceptions
diff --git a/libre/grub2/PKGBUILD b/libre/grub2/PKGBUILD
index d84f8a62c..df7449cba 100644
--- a/libre/grub2/PKGBUILD
+++ b/libre/grub2/PKGBUILD
@@ -3,7 +3,7 @@
# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
_grub_bzr_rev="4169"
-_pkgver="2.00~beta2"
+_pkgver="2.00~beta3"
_grub_lua_ver=24
_grub_gpxe_ver=12
@@ -12,8 +12,8 @@ _grub_915_ver=9
pkgname=('grub2-common' 'grub2-bios' 'grub2-efi-i386')
pkgbase=grub2
-pkgver=2.00beta2
-pkgrel=3
+pkgver=2.00beta3
+pkgrel=1.1
url="http://www.gnu.org/software/grub/"
arch=('i686' 'x86_64')
license=('GPL3')
@@ -27,7 +27,7 @@ source=("http://alpha.gnu.org/gnu/grub/grub-${_pkgver}".tar.xz
"ftp://ftp.archlinux.org/other/grub2/grub2_extras_gpxe_r${_grub_gpxe_ver}.tar.xz"
"ftp://ftp.archlinux.org/other/grub2/grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz"
"ftp://ftp.archlinux.org/other/grub2/grub2_extras_915resolution_r${_grub_915_ver}.tar.xz"
- 'archlinux_grub_mkconfig_fixes.patch'
+ 'parabola_grub_mkconfig_fixes.patch'
'grub.default'
'grub.cfg'
'20_memtest86+')
@@ -37,12 +37,12 @@ noextract=("grub2_extras_lua_r${_grub_lua_ver}.tar.xz"
"grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz"
"grub2_extras_915resolution_r${_grub_915_ver}.tar.xz")
-sha1sums=('2ba583f9466fb676b0ae3d7a9a82d1299b153a98'
+sha1sums=('96bfdf4d53767faaf2c744ee82d4d703e4b672a2'
'89290031b974780c6df76893836d2477d4add895'
'b04994c005910b4bf123f034b30109d5c8d6fd86'
'eb4b35b4c36b64f9405cbcbc538cb205171c1c0a'
'd5ae2efec25616028a9d89e98b6e454f1c4c415f'
- 'cdace8067562fab04aaacac8d99a4ea612fa0c5b'
+ 'bf8e692c3920f0cf125ee77f14b8432133cae84d'
'348b148d5183825f31a3d24a7ebf2d6a709f4e6a'
'6f0870673b9f994163326a416432aee7eacdbfc5'
'ce35d7ae75cd1b5b677e894e528f96add40e77b9')
@@ -53,8 +53,8 @@ _build_grub2-common_and_bios() {
cp -r "${srcdir}/grub-${_pkgver}" "${srcdir}/grub_bios-${_pkgver}"
cd "${srcdir}/grub_bios-${_pkgver}"
- ## Apply Archlinux specific fixes to enable grub-mkconfig detect Arch kernels and initramfs
- patch -Np1 -i "${srcdir}/archlinux_grub_mkconfig_fixes.patch"
+ ## Apply Parabola specific fixes to enable grub-mkconfig detect Libre kernels and initramfs
+ patch -Np1 -i "${srcdir}/parabola_grub_mkconfig_fixes.patch"
echo
## add the grub-extra sources
diff --git a/libre/grub2/parabola_grub_mkconfig_fixes.patch b/libre/grub2/parabola_grub_mkconfig_fixes.patch
new file mode 100644
index 000000000..d199dc86a
--- /dev/null
+++ b/libre/grub2/parabola_grub_mkconfig_fixes.patch
@@ -0,0 +1,150 @@
+diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
+index df3b733..65a7fff 100644
+--- a/util/grub-mkconfig.in
++++ b/util/grub-mkconfig.in
+@@ -213,6 +213,8 @@ export GRUB_DEFAULT \
+ GRUB_THEME \
+ GRUB_GFXPAYLOAD_LINUX \
+ GRUB_DISABLE_OS_PROBER \
++ GRUB_COLOR_NORMAL \
++ GRUB_COLOR_HIGHLIGHT \
+ GRUB_INIT_TUNE \
+ GRUB_SAVEDEFAULT \
+ GRUB_ENABLE_CRYPTODISK \
+diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
+index 765bfdc..b148558 100644
+--- a/util/grub.d/00_header.in
++++ b/util/grub.d/00_header.in
+@@ -115,6 +115,14 @@ cat <<EOF
+
+ EOF
+
++if [ x$GRUB_COLOR_NORMAL != x ] && [ x$GRUB_COLOR_HIGHLIGHT != x ] ; then
++ cat << EOF
++set menu_color_normal=$GRUB_COLOR_NORMAL
++set menu_color_highlight=$GRUB_COLOR_HIGHLIGHT
++
++EOF
++fi
++
+ serial=0;
+ gfxterm=0;
+ for x in ${GRUB_TERMINAL_INPUT} ${GRUB_TERMINAL_OUTPUT}; do
+diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
+index 8c75fab..0d4a137 100644
+--- a/util/grub.d/10_linux.in
++++ b/util/grub.d/10_linux.in
+@@ -31,7 +31,7 @@
+ if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
+ OS=GNU/Linux
+ else
+- OS="${GRUB_DISTRIBUTOR} GNU/Linux"
++ OS="${GRUB_DISTRIBUTOR}"
+ CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) ${CLASS}"
+ fi
+
+@@ -87,6 +87,8 @@ linux_entry ()
+ case $type in
+ recovery)
+ title="$(gettext_printf "%s, with Linux %s (recovery mode)" "${os}" "${version}")" ;;
++ fallback)
++ title="$(gettext_printf "%s, with Linux %s (Fallback initramfs)" "${os}" "${version}")" ;;
+ *)
+ title="$(gettext_printf "%s, with Linux %s" "${os}" "${version}")" ;;
+ esac
+@@ -100,7 +102,7 @@ linux_entry ()
+ else
+ echo "menuentry '$(echo "$os" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
+ fi
+- if [ x$type != xrecovery ] ; then
++ if [ x$type != xrecovery ] && [ x$type != xfallback ] ; then
+ save_default_entry | sed -e "s/^/\t/"
+ fi
+
+@@ -132,7 +134,8 @@ linux_entry ()
+ fi
+ printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/"
+ fi
+- message="$(gettext_printf "Loading Linux %s ..." ${version})"
++
++ message="$(gettext_printf "Loading Linux %s ..." "${version}")"
+ sed "s/^/$submenu_indentation/" << EOF
+ echo '$message'
+ linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
+@@ -181,13 +184,29 @@ while [ "x$list" != "x" ] ; do
+ alt_version=`echo $version | sed -e "s,\.old$,,g"`
+ linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
+
++ if test -e "/etc/arch-release" ; then
++ if echo "${basename}" | grep -q 'vmlinuz-linux' ; then
++ version="`echo "${basename}" | sed -e 's,vmlinuz-linux,,g'`"
++
++ if [ "x${version}" = "x" ] ; then
++ version="core repo kernel"
++ else
++ version="`echo "${version}" | sed -e 's,-,,g'`"
++ version="${version} kernel"
++ fi
++ fi
++ fi
++
+ initrd=
++ initrd_arch="`echo "${basename}" | sed -e 's,vmlinuz,initramfs,g'`"
++
+ for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \
+ "initrd-${version}" "initramfs-${version}.img" \
+ "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
+ "initrd-${alt_version}" "initramfs-${alt_version}.img" \
+ "initramfs-genkernel-${version}" \
+- "initramfs-genkernel-${alt_version}"; do
++ "initramfs-genkernel-${alt_version}" \
++ "${initrd_arch}.img" ; do
+ if test -e "${dirname}/${i}" ; then
+ initrd="$i"
+ break
+@@ -215,6 +234,22 @@ while [ "x$list" != "x" ] ; do
+ linux_root_device_thisversion=${GRUB_DEVICE}
+ fi
+
++ if test -e "/etc/arch-release" ; then
++ is_first_entry="false"
++
++ linux_entry "${OS}" "${version}" true \
++ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
++
++ for i in "${initrd_arch}-fallback.img" "initramfs-${version}-fallback.img" ; do
++ if test -e "${dirname}/${i}" ; then
++ initrd="${i}"
++ linux_entry "${OS}" "${version}" fallback \
++ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
++ break
++ fi
++ done
++ fi
++
+ if [ "x$is_first_entry" = xtrue ]; then
+ linux_entry "${OS}" "${version}" simple \
+ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
+@@ -228,8 +263,11 @@ while [ "x$list" != "x" ] ; do
+ echo "submenu '$(gettext_printf "Advanced options for %s" "${OS}" | grub_quote)' \$menuentry_id_option 'gnulinux-advanced-$boot_device_id' {"
+ fi
+
++ if ! test -e "/etc/arch-release" ; then
+ linux_entry "${OS}" "${version}" advanced \
+ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
++ fi
++
+ if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then
+ linux_entry "${OS}" "${version}" recovery \
+ "single ${GRUB_CMDLINE_LINUX}"
+@@ -241,8 +279,10 @@ done
+
+ # If at least one kernel was found, then we need to
+ # add a closing '}' for the submenu command.
++if ! test -e "/etc/arch-release" ; then
+ if [ x"$is_first_entry" != xtrue ]; then
+ echo '}'
+ fi
++fi
+
+ echo "$title_correction_code"
diff --git a/libre/gstreamer0.10-bad-libre/PKGBUILD b/libre/gstreamer0.10-bad-libre/PKGBUILD
index 59fbf021b..71e834c3d 100644
--- a/libre/gstreamer0.10-bad-libre/PKGBUILD
+++ b/libre/gstreamer0.10-bad-libre/PKGBUILD
@@ -1,17 +1,19 @@
-# $Id$
+# $Id: PKGBUILD 153262 2012-03-12 17:29:57Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
+# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
pkgbase=gstreamer0.10-bad-libre
pkgname=('gstreamer0.10-bad-libre' 'gstreamer0.10-bad-libre-plugins')
-pkgver=0.10.22
+pkgver=0.10.23
pkgrel=1
arch=('i686' 'x86_64')
license=('LGPL' 'GPL')
-makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'xvidcore' 'libdca' 'bzip2' 'libdc1394' 'neon' 'musicbrainz' 'faad2' 'libmms' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav' 'libmodplug' 'jasper' 'liblrdf' 'libofa' 'soundtouch' 'libvdpau' 'schroedinger' 'libass' 'libvpx' 'gsm' 'libgme' 'rtmpdump' 'libsndfile' 'librsvg')
+makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.36' 'xvidcore' 'libdca' 'bzip2' 'libdc1394' 'neon' 'musicbrainz' 'faad2' 'libmms' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav' 'libmodplug' 'jasper' 'liblrdf' 'libofa' 'soundtouch' 'libvdpau' 'schroedinger' 'libass' 'libvpx' 'gsm' 'libgme' 'rtmpdump' 'libsndfile' 'librsvg')
url="http://gstreamer.freedesktop.org/"
options=(!libtool !emptydirs)
-source=(${url}/src/gst-plugins-bad/gst-plugins-bad-${pkgver}.tar.bz2)
+source=(${url}/src/gst-plugins-bad/gst-plugins-bad-${pkgver}.tar.xz)
+md5sums=('e4822fa2cc933768e2998311a1565979')
build() {
cd "${srcdir}/gst-plugins-bad-${pkgver}"
@@ -20,7 +22,7 @@ build() {
--with-package-name="GStreamer Bad Plugins (Parabola)" \
--with-package-origin="http://parabolagnulinux.org/"
- make || return 1
+ make
sed -e 's/gst sys ext/gst/' -i Makefile
}
@@ -51,4 +53,3 @@ package_gstreamer0.10-bad-libre-plugins() {
make -C sys DESTDIR="${pkgdir}" install
make -C gst-libs DESTDIR="${pkgdir}" uninstall
}
-md5sums=('9a2acee1f386f71247003d0d7090fb1c')
diff --git a/libre/hardinfo/.directory b/libre/hardinfo/.directory
new file mode 100644
index 000000000..725259ee6
--- /dev/null
+++ b/libre/hardinfo/.directory
@@ -0,0 +1,2 @@
+[Dolphin]
+Timestamp=2012,4,11,16,57,42
diff --git a/libre/hardinfo/PKGBUILD b/libre/hardinfo/PKGBUILD
index 869d2f52a..47f4c1330 100644
--- a/libre/hardinfo/PKGBUILD
+++ b/libre/hardinfo/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 17993 2010-05-29 04:49:43Z ebelanger $
-# Maintainer: Eric Belanger <eric@archlinux.org>
+# $Id$
+# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgname=hardinfo
pkgver=0.5.1
-pkgrel=2.1
+pkgrel=4
pkgdesc="A system information and benchmark tool."
arch=('i686' 'x86_64')
url="http://hardinfo.berlios.de/wiki/index.php/Main_Page"
license=('GPL2')
-depends=('gtk2' 'libsoup' 'gnutls')
+depends=('gtk2' 'libsoup')
options=('!emptydirs')
source=(http://download.berlios.de/hardinfo/${pkgname}-${pkgver}.tar.bz2 \
fixsensors.patch hardinfo.distro)
@@ -21,18 +21,18 @@ sha1sums=('983f0445aa60e02156bc5a5eaedeffb30b8e4d64'
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p1 < ../fixsensors.patch
- sed -i 's|/usr/lib64|/usr/lib|' configure
- ./configure --prefix=/usr
- sed -i 's|lib64|lib|' binreloc.c
- sed -i 's|/sbin/lsmod|/bin/lsmod|g' arch/linux/{parisc,ppc,m68k,x86,common,mips,sparc,x86_64}/modules.h
- sed -i 's|/sbin/lsmod|/bin/lsmod|g' arch/this/modules.h
+ patch -p1 < ../fixsensors.patch
+ sed -i 's|/usr/lib64|/usr/lib|' configure
+ ./configure --prefix=/usr
+ sed -i 's|lib64|lib|' binreloc.c
+ sed -i 's|/sbin/lsmod|/bin/lsmod|g' arch/linux/{parisc,ppc,m68k,x86,common,mips,sparc,x86_64}/modules.h
+ sed -i 's|/sbin/lsmod|/bin/lsmod|g' arch/this/modules.h
sed -i 's|{ DB_PREFIX "debian_version", "deb" },|{ DB_PREFIX "hardinfo.distro", "parabola" },{ DB_PREFIX "debian_version", "deb" },|' computer.h
- make
+ make
}
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
- install -D -m644 ../hardinfo.distro "${pkgdir}/etc/hardinfo.distro"
+ make DESTDIR="${pkgdir}" install
+ install -D -m644 ../hardinfo.distro "${pkgdir}/etc/hardinfo.distro"
}
diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD
index f3f344e30..719cd3a4f 100644
--- a/libre/kdebase-konqueror-libre/PKGBUILD
+++ b/libre/kdebase-konqueror-libre/PKGBUILD
@@ -6,16 +6,16 @@
_pkgname='kdebase-konqueror'
pkgname='kdebase-konqueror-libre'
-pkgver=4.8.1
+pkgver=4.8.2
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url="http://kde.org/applications/internet/konqueror/"
license=('GPL' 'LGPL' 'FDL')
groups=('kde' 'kdebase')
makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml')
-source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.bz2"
+source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz"
"konq-about-fsdg.diff")
-sha1sums=('7df527a537b5431ab551339338ea289c32ec43be'
+sha1sums=('13dc2e6c8639feadc9a5a334d0720a60b1e3ccb6'
'f41541371414dcbe5e76687835e648112b3ff364')
pkgdesc='KDE File Manager & Web Browser'
depends=('kdebase-dolphin' 'kdebase-keditbookmarks')
diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD
index e792acf9f..aa2a51ddb 100644
--- a/libre/kdelibs-libre/PKGBUILD
+++ b/libre/kdelibs-libre/PKGBUILD
@@ -1,33 +1,31 @@
-# $Id: PKGBUILD 153517 2012-03-15 13:55:48Z andrea $
+# $Id: PKGBUILD 155359 2012-04-02 12:16:32Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org
# Contributor: Pierre Schmitz <pierre@archlinux.de>
-# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
_pkgname=kdelibs
pkgname=kdelibs-libre
-pkgver=4.8.1
-pkgrel=2
+pkgver=4.8.2
+pkgrel=1
pkgdesc="KDE Core Libraries"
arch=('i686' 'x86_64' 'mips64el')
url='http://www.kde.org'
license=('GPL' 'LGPL' 'FDL')
-depends=('strigi' 'attica' 'libxss' 'xz' 'soprano' 'krb5' 'grantlee'
+depends=('strigi' 'attica' 'libxss' 'soprano' 'krb5' 'grantlee'
'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt'
- 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'docbook-xsl'
- 'upower' 'udisks' 'libxcursor' 'phonon' 'qtwebkit')
+ 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr'
+ 'docbook-xsl' 'upower' 'udisks' 'libxcursor' 'phonon' 'qtwebkit')
makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell')
provides=("kdelibs=$pkgver")
replaces=('kdelibs-experimental' 'kdelibs')
conflicts=('kdelibs')
install=${_pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2"
+source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
'kde-applications-menu.patch'
- 'fix-kmail-crash.patch'
'use-pythondontwritebytecode.patch'
'khtml-fsdg.diff')
-sha1sums=('ec393b096003f1dd57c5e2987381b086ba1b363e'
+sha1sums=('f844ae0877880563361144d9577706064c3483e7'
'86ee8c8660f19de8141ac99cd6943964d97a1ed7'
- '081b0663480568359120b573d26abb91e1a348c0'
'a1e35760d5b4e29471ad357c963a343c67200f32'
'a1502a964081ad583a00cf90c56e74bf60121830')
@@ -37,9 +35,6 @@ build() {
# avoid file conflict with gnome-menus
patch -p1 -i "${srcdir}"/kde-applications-menu.patch
- # Upstream (FS#28907)
- patch -p1 -i "${srcdir}"/fix-kmail-crash.patch
-
# Set PYTHONDONTWRITEBYTECODE (KDEBUG#276151)
patch -p0 -i "${srcdir}"/use-pythondontwritebytecode.patch
diff --git a/libre/kdenetwork-libre/PKGBUILD b/libre/kdenetwork-libre/PKGBUILD
index 640370d42..6e231389d 100644
--- a/libre/kdenetwork-libre/PKGBUILD
+++ b/libre/kdenetwork-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 152429 2012-03-06 21:02:38Z andrea $
+# $Id: PKGBUILD 154726 2012-03-30 16:15:21Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
@@ -12,8 +12,8 @@ pkgname=('kdenetwork-filesharing'
'kdenetwork-kppp'
'kdenetwork-krdc'
'kdenetwork-krfb')
-pkgver=4.8.1
-pkgrel=2.1
+pkgver=4.8.2
+pkgrel=1
arch=('i686' 'x86_64')
url='http://www.kde.org'
license=('GPL' 'LGPL' 'FDL')
@@ -23,7 +23,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' 'ppp'
'v4l-utils' 'libidn' 'rdesktop' 'qimageblitz' 'libxdamage' 'libgadu'
'libktorrent' 'libmms' 'mediastreamer')
source=("http://download.kde.org/stable/${pkgver}/src/${_pkgbase}-${pkgver}.tar.xz")
-sha1sums=('e914a1d990ff42ec88cf37ffc897ae9df9b1fa45')
+sha1sums=('a899a9ef1637612a5ec14bb3ff950f3ed565d60e')
build() {
cd "${srcdir}"
diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD
index d5e9fb378..8f3ff312b 100644
--- a/libre/kdeutils-ark-libre/PKGBUILD
+++ b/libre/kdeutils-ark-libre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 152399 2012-03-06 18:32:16Z andrea $
+# $Id: PKGBUILD 154731 2012-03-30 16:15:36Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
_pkgname=kdeutils-ark
pkgname=kdeutils-ark-libre
-pkgver=4.8.1
+pkgver=4.8.2
pkgrel=1
pkgdesc='Archiving Tool'
url='http://kde.org/applications/utilities/ark/'
@@ -18,8 +18,8 @@ provides=("kdeutils-ark=$pkgver")
replaces=('kdeutils-ark')
conflicts=('kdeutils-ark')
install=${_pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.bz2")
-sha1sums=('403622ede8e28ed417c677ac8d71b1221582cff5')
+source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.xz")
+sha1sums=('d39be864ed818dd49aeba84ca4c02c0e5813eadf')
build() {
cd "${srcdir}"
diff --git a/libre/kile-libre/PKGBUILD b/libre/kile-libre/PKGBUILD
index abef16537..d41e129b3 100644
--- a/libre/kile-libre/PKGBUILD
+++ b/libre/kile-libre/PKGBUILD
@@ -6,7 +6,7 @@
_pkgname=kile
pkgname=kile-libre
pkgver=2.1.1
-pkgrel=2
+pkgrel=1.1
pkgdesc="A user friendly TeX/LaTeX frontend for KDE"
arch=("i686" "x86_64")
license=('GPL2')
@@ -17,16 +17,11 @@ conflicts=('kile')
replaces=('kile')
provides=('kile')
install=${_pkgname}.install
-source=("http://downloads.sourceforge.net/$_pkgname/$_pkgname-$pkgver.tar.bz2"
- "no-acroread.patch")
-sha1sums=('36987669dd9db05b063a0b4650ef3589dc79f711'
- '9bbe5d1b0e2a78b13667fcf4e5e21f801447f9d6')
+source=("http://downloads.sourceforge.net/$_pkgname/$_pkgname-$pkgver.tar.bz2")
+sha1sums=('36987669dd9db05b063a0b4650ef3589dc79f711')
build() {
- cd "${srcdir}/${_pkgname}-${pkgver}"
- # Don't recommend a nonfree PDF viewer.
- patch -Np1 -i "${srcdir}/no-acroread.patch"
- cd ..
+ cd "${srcdir}"
mkdir build
cd build
cmake ../${_pkgname}-${pkgver} \
diff --git a/libre/lame-libre/PKGBUILD b/libre/lame-libre/PKGBUILD
index 205d81c1f..65ec64426 100644
--- a/libre/lame-libre/PKGBUILD
+++ b/libre/lame-libre/PKGBUILD
@@ -1,11 +1,15 @@
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
+# $Id: PKGBUILD 151867 2012-03-03 15:53:13Z schiv $
+# Maintainer: Ray Rashif <schiv@archlinux.org>
+# Contributor: Ionut Biru <ibiru@archlinux.org>
# Contributor: Hugo Doria <hugo@archlinux.org>
# Maintainer: Henry Jensen <hjensen@connochaetos.org>
+# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+_pkgname=lame
pkgname=lame-libre
-pkgver=3.98.4
-pkgrel=3
-pkgdesc="An MP3 encoder and graphical frame analyzer"
+pkgver=3.99.5
+pkgrel=1
+pkgdesc="A high quality MPEG Audio Layer III (MP3) encoder"
arch=('i686' 'x86_64')
url="http://lame.sourceforge.net/"
depends=('ncurses')
@@ -14,17 +18,24 @@ replaces=('lame')
provides=("lame=${pkgver}")
conflicts=('lame')
license=('LGPL')
-options=('!libtool' '!distcc')
-source=(http://repo.parabolagnulinux.org/other/lame-3.98.4-libre.tar.gz)
-md5sums=('761a8629378974163b98f0b1c91d13e1')
+options=('!libtool')
+source=("http://downloads.sourceforge.net/$_pkgname/$_pkgname-$pkgver.tar.gz")
+md5sums=('84835b313d4a8b68f5349816d33e07ce')
build() {
- cd "${srcdir}/lame-${pkgver}-libre"
+ cd "$srcdir/$_pkgname-$pkgver"
./configure --prefix=/usr \
--enable-nasm \
- --enable-shared --disable-frontend
+ --enable-shared
make
- make DESTDIR="${pkgdir}" install
+}
+
+package() {
+ cd "$srcdir/$_pkgname-$pkgver"
+
+ make DESTDIR="$pkgdir" install
rm -rf ${pkgdir}/usr/share/man
}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/libquicktime-libre/PKGBUILD b/libre/libquicktime-libre/PKGBUILD
index c6e4ab588..2b3c84263 100644
--- a/libre/libquicktime-libre/PKGBUILD
+++ b/libre/libquicktime-libre/PKGBUILD
@@ -1,18 +1,19 @@
# $Id$
# Maintainer: Mateusz Herych <heniekk@gmail.com>
+# Contributor (Parabola): Jorge Lopez <jorginho@adinet.com.uy>
pkgname=libquicktime-libre
_pkgname=libquicktime
-pkgver=1.2.2
-pkgrel=3
+pkgver=1.2.4
+pkgrel=1
pkgdesc="A library for reading and writing quicktime files (no unfree faac support)."
arch=('i686' 'x86_64')
license=('GPL')
url="http://libquicktime.sourceforge.net/"
-depends=('gtk2' 'ffmpeg' 'alsa-lib' 'libxv' 'libgl' 'libxaw' 'x264' 'faad2')
+depends=('gtk2' 'ffmpeg' 'libxv' 'libgl' 'libxaw' 'x264' 'faad2')
options=('!libtool')
source=(http://downloads.sourceforge.net/sourceforge/$_pkgname/$_pkgname-$pkgver.tar.gz)
-sha256sums=('a83ddaaeaf98231d9f224190dcb8810ebdabd3edb5c8cebe2fb083d25edb7436')
+sha256sums=('1c53359c33b31347b4d7b00d3611463fe5e942cae3ec0fefe0d2fd413fd47368')
provides=("$_pkgname=$pkgver")
conflicts=($_pkgname)
replaces=($_pkgname)
diff --git a/libre/libui-sh/PKGBUILD b/libre/libui-sh/PKGBUILD
index 5792f88de..075d8c0a6 100644
--- a/libre/libui-sh/PKGBUILD
+++ b/libre/libui-sh/PKGBUILD
@@ -2,16 +2,16 @@
# Maintainer: Dieter Plaetinck <dieter@plaetinck.be>
pkgname=libui-sh
-pkgver=2011.08.31
-pkgrel=1
+pkgver=2011.10.09
+pkgrel=2
pkgdesc="a shell library providing useful UI functions"
arch=('any')
-url="https://projects.parabolagnulinux.org/libui-sh.git"
+url="http://github.com/Dieterbe/libui-sh/"
license=('GPL3')
depends=('bash')
optdepends=('dialog: for ncurses support')
-source=($url/snapshot/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('79daf01e4cd5b7fb186d1127d3334092')
+source=(ftp://ftp.archlinux.org/other/libui-sh/libui-sh-$pkgver.tar.gz)
+md5sums=('6f855b407d791ab66b78f839835ed915')
build() {
@@ -22,3 +22,4 @@ build() {
}
# vim:set ts=2 sw=2 et:
+
diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD
index b3ee94095..5f0c234e2 100644
--- a/libre/liferea-libre/PKGBUILD
+++ b/libre/liferea-libre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 144935 2011-12-11 03:21:39Z eric $
+# $Id: PKGBUILD 154470 2012-03-28 23:15:22Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
# Contributor (Parabola): bitlord
# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
-pkgbasename=liferea
+_pkgname=liferea
pkgname=liferea-libre
-pkgver=1.8.1b
+pkgver=1.8.4
pkgrel=1
pkgdesc="A desktop news aggregator for online news feeds and weblogs"
arch=('i686' 'x86_64')
@@ -18,20 +18,20 @@ depends=('gconf' 'libwebkit' 'libnotify' 'libunique' 'json-glib' 'hicolor-icon-t
makedepends=('intltool')
options=('!libtool' '!emptydirs')
install=liferea.install
-source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.gz
+source=(http://downloads.sourceforge.net/sourceforge/${_pkgname}/${_pkgname}-${pkgver}.tar.gz
remove-non-free-suggestions.patch)
-md5sums=('70f27bfda41ff5b3b4e49c49c9dc88af'
- 'e2fdcbc485ce6ff7956c8527be152ca6')
+sha1sums=('f887a3928116f56e1b68719c150d40bd1c3c6dff'
+ '0d68c567c3d37932a49709c58c37c3f138fd19cb')
build() {
- cd "${srcdir}/liferea-${pkgver}"
+ cd "${srcdir}/${_pkgname}-${pkgver}"
patch -Np1 -i "$srcdir/remove-non-free-suggestions.patch"
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-schemas-install
make
}
package() {
- cd "${srcdir}/liferea-${pkgver}"
+ cd "${srcdir}/${_pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
install -d "${pkgdir}/usr/share/gconf/schemas"
diff --git a/libre/liferea-libre/liferea.install b/libre/liferea-libre/liferea.install
index 369a55727..5ad87f7f6 100644
--- a/libre/liferea-libre/liferea.install
+++ b/libre/liferea-libre/liferea.install
@@ -1,4 +1,5 @@
pkgname=liferea-libre
+
post_install() {
usr/sbin/gconfpkg --install ${pkgname}
gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
diff --git a/libre/lilo/PKGBUILD b/libre/lilo/PKGBUILD
new file mode 100644
index 000000000..169037bc2
--- /dev/null
+++ b/libre/lilo/PKGBUILD
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Eric Belanger <eric@archlinux.org>
+# Contributor: judd <jvinet@zeroflux.org>
+# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+
+pkgname=lilo
+pkgver=23.2
+pkgrel=3
+pkgdesc="A bootloader for Linux (Parabola rebranded)"
+arch=('i686' 'x86_64')
+url="https://alioth.debian.org/projects/lilo/"
+license=('BSD')
+# While lilo should stay in the base category,
+# it usually makes no sense if it is installed
+# with pacman -S base, therefore, don't add
+# the base group here.
+#groups=('base')
+backup=('etc/lilo.conf')
+depends=('device-mapper' 'coreutils')
+makedepends=('bin86' 'sharutils')
+optdepends=('perl: to use keytab-lilo')
+replaces=('lilo')
+conflicts=('lilo')
+provides=("lilo=$pkgver")
+install=lilo.install
+options=('!makeflags')
+source=("http://lilo.alioth.debian.org/ftp/sources/${pkgname}-${pkgver}.tar.gz"
+ 'lilo.conf')
+md5sums=('51b9b9db665d3b8724919e3d46054d12'
+ 'bab0a13b749690ce5e4f61bb1c10c065')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ export LC_ALL=C
+ make all
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+
+ install -D -m644 "${srcdir}/lilo.conf" "${pkgdir}/etc/lilo.conf"
+ install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
diff --git a/libre/lilo/lilo.conf b/libre/lilo/lilo.conf
new file mode 100644
index 000000000..dea0dbe58
--- /dev/null
+++ b/libre/lilo/lilo.conf
@@ -0,0 +1,25 @@
+#
+# /etc/lilo.conf
+#
+
+boot=/dev/sda
+# This line often fixes L40 errors on bootup
+# disk=/dev/sda bios=0x80
+
+default=libre
+timeout=50
+lba32
+prompt
+
+image=/boot/vmlinuz-linux-libre
+ label=libre
+ root=/dev/sda3
+ initrd=/boot/initramfs-linux-libre.img
+ read-only
+
+image=/boot/vmlinuz-linux-libre
+ label=libre-fallback
+ root=/dev/sda3
+ initrd=/boot/initramfs-linux-libre-fallback.img
+ read-only
+
diff --git a/libre/lilo/lilo.install b/libre/lilo/lilo.install
new file mode 100644
index 000000000..7375fddf8
--- /dev/null
+++ b/libre/lilo/lilo.install
@@ -0,0 +1,5 @@
+post_upgrade() {
+ echo
+ echo "If you use the LILO bootloader, you should run 'lilo' after upgrading."
+ echo
+}
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 63ad0f242..790ea5e0b 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=('linux-libre-lts' 'linux-libre-lts-headers') # Build stock -LIBRE kerne
# pkgname=linux-custom # Build kernel with a different name
_kernelname=-LIBRE-LTS
_basekernel=3.0
-_sublevel=26
+_sublevel=27
pkgver=${_basekernel}.${_sublevel}
_lxopkgver=${_basekernel}.26 # nearly always the same as pkgver
pkgrel=1
@@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'ext4-options.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
md5sums=('5f64180fe7df4e574dac5911b78f5067'
- 'eb6cc5ce7bc5186e4f0c80efec390680'
+ '365d490f97b1960c8880eb22257d5ef0'
'c7acde811ca6808b294dc06480048c61'
'792766d6d403cc967977f6a46aa95d1d'
'd2c0701480bce49fd4b40dc46b9863f1'
diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install
index 44ba29a78..acb2b71f5 100644
--- a/libre/linux-libre-lts/linux-libre-lts.install
+++ b/libre/linux-libre-lts/linux-libre-lts.install
@@ -2,7 +2,7 @@
# arg 2: the old package version
KERNEL_NAME=-lts
-KERNEL_VERSION=3.0.26-1-LIBRE-LTS
+KERNEL_VERSION=3.0.27-1-LIBRE-LTS
post_install () {
# updating module dependencies
diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index e87e9ceb2..d30a61137 100644
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -6,7 +6,7 @@ pkgbase=linux-libre-tools
pkgname=('perf-libre' 'cpupower-libre')
pkgver=3.3
kernver=${pkgver}
-pkgrel=1.1
+pkgrel=2
license=('GPL2')
arch=('i686' 'x86_64' 'mips64el')
url='http://linux-libre.fsfla.org/'
@@ -56,18 +56,18 @@ package_cpupower-libre() {
conflicts=('cpupower' 'cpufrequtils')
provides=("cpupower=$pkgver")
- # install rc.d script
- install -D -m 755 cpupower.rc "$pkgdir/etc/rc.d/cpupower"
- install -D -m 644 cpupower.conf "$pkgdir/etc/conf.d/cpupower"
- install -D -m 644 cpupower.service "$pkgdir/lib/systemd/system/cpupower.service"
-
cd linux-$kernver/tools/power/cpupower
make \
DESTDIR="$pkgdir" \
- INSTALL='/bin/install -c' \
mandir='/usr/share/man' \
docdir='/usr/share/doc/cpupower' \
install install-man
+ # install rc.d script
+ cd "$srcdir"
+ install -D -m 755 cpupower.rc "$pkgdir/etc/rc.d/cpupower"
+ install -D -m 644 cpupower.conf "$pkgdir/etc/conf.d/cpupower"
+ install -D -m 644 cpupower.service "$pkgdir/usr/lib/systemd/system/cpupower.service"
+
}
# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/linux-libre/.directory b/libre/linux-libre/.directory
index 73b1767da..f39ceed05 100644
--- a/libre/linux-libre/.directory
+++ b/libre/linux-libre/.directory
@@ -1,2 +1,5 @@
[Dolphin]
-Timestamp=2012,3,19,13,36,16
+Timestamp=2012,4,8,18,21,16
+
+[Settings]
+HiddenFilesShown=true
diff --git a/libre/linux-libre/ChangeLog b/libre/linux-libre/ChangeLog
new file mode 100644
index 000000000..173a6c3cd
--- /dev/null
+++ b/libre/linux-libre/ChangeLog
@@ -0,0 +1,9 @@
+2012-04-08 André Silva <andre.paulista@adinet.com.uy>
+
+ * linux-libre 3.3.1-1.1
+ * Disable CONFIG_IPW2100 and CONFIG_IPW2200 modules https://labs.parabola.nu/issues/47
+
+2012-03-03 André Silva <andre.paulista@adinet.com.uy>
+
+ * linux-libre-2.3.9-2
+ * Enable CONFIG_FB_VT8623 module https://labs.parabola.nu/issues/14
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 67e0f252c..8dff63ec7 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -12,18 +12,17 @@ pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock -
# pkgname=linux-custom # Build kernel with a different name
_kernelname=-LIBRE
_basekernel=3.3
-#_sublevel=11
-#pkgver=${_basekernel}.${_sublevel}
-pkgver=${_basekernel}
-#_lxopkgver=${_basekernel}.11 # nearly always the same as pkgver
-pkgrel=1
+_sublevel=1
+pkgver=${_basekernel}.${_sublevel}
+_lxopkgver=${_basekernel}.0 # nearly always the same as pkgver
+pkgrel=1.1
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
makedepends=('xmlto' 'docbook-xsl')
options=('!strip')
source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz"
- #"http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-libre/patch-${_basekernel}-libre-${pkgver}-libre.xz"
+ "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz"
# the main kernel config files
'config.i686' 'config.x86_64'
# standard config files for mkinitcpio ramdisk
@@ -33,40 +32,36 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'boot-logo.patch'
'change-default-console-loglevel.patch'
'i915-fix-ghost-tv-output.patch'
- 'i915-gpu-finish.patch'
- 'ext4-options.patch')
- #"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-libre-lemote_0lxo_mipsel.tar.bz2")
+ 'ext4-options.patch'
+ "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
md5sums=('5487da14ca81715a469c7594d39722fa'
- '20cd44a8bc4056cfa0b9ce2cc659dd30'
- 'aaf85ef4f4c87959c07a5cef7c216788'
+ '58799da6f62daf1e54a256d02792b91f'
+ '559487f3e438ad95f1c80aa11abf2ed0'
+ 'f3749180b53d042091a483300ef04f8d'
'a8a3843046926eb7ab81312cd438c5c5'
'2967cecc3af9f954ccc822fd63dca6ff'
'8267264d9a8966e57fdacd1fa1fc65c4'
'04b21c79df0a952c22d681dd4f4562df'
'9d3c56a4b999c8bfbd4018089a62f662'
'263725f20c0b9eb9c353040792d644e5'
- '4cd79aa147825837dc8bc9f6b736c0a0'
- 'bb7fd1aa23016c8057046b84fd4eb528')
-#if [ "$CARCH" != "mips64el" ]; then
-# # Don't use the Loongson-specific patches on non-mips64el arches.
-# unset source[${#source[@]}-1]
-# unset md5sums[${#md5sums[@]}-1]
-#fi
+ 'bb7fd1aa23016c8057046b84fd4eb528'
+ 'acdce5260b0fb711cb9a0fbce984f0ef')
+if [ "$CARCH" != "mips64el" ]; then
+ # Don't use the Loongson-specific patches on non-mips64el arches.
+ unset source[${#source[@]}-1]
+ unset md5sums[${#md5sums[@]}-1]
+fi
build() {
cd "${srcdir}/linux-${_basekernel}"
-# if [ "${_basekernel}" != "${pkgver}" ]; then
-# patch -Np1 -i "${srcdir}/patch-${_basekernel}-libre-${pkgver}-libre"
-# fi
+ if [ "${_basekernel}" != "${pkgver}" ]; then
+ patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu"
+ fi
# Add freedo as boot logo
patch -Np1 -i "${srcdir}/boot-logo.patch"
- # fix FS#27883
- # drm/i915: Only clear the GPU domains upon a successful finish
- patch -Np1 -i "${srcdir}/i915-gpu-finish.patch"
-
# Some chips detect a ghost TV output
# mailing list discussion: http://lists.freedesktop.org/archives/intel-gfx/2011-April/010371.html
# Arch Linux bug report: FS#19234
@@ -245,7 +240,7 @@ package_linux-libre-headers() {
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include"
for i in acpi asm-generic config crypto drm generated linux math-emu \
- media net pcmcia scsi sound trace video xen; do
+ media mtd net pcmcia scsi sound trace video xen; do
cp -a include/${i} "${pkgdir}/usr/src/linux-${_kernver}/include/"
done
diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686
index 6003887c9..718c4f3b6 100644
--- a/libre/linux-libre/config.i686
+++ b/libre/linux-libre/config.i686
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.3.0 Kernel Configuration
+# Linux/i386 3.3.0-1 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -97,7 +97,6 @@ CONFIG_HAVE_SPARSE_IRQ=y
CONFIG_GENERIC_IRQ_PROBE=y
CONFIG_GENERIC_IRQ_SHOW=y
CONFIG_GENERIC_PENDING_IRQ=y
-CONFIG_GENERIC_IRQ_CHIP=y
CONFIG_IRQ_FORCED_THREADING=y
CONFIG_SPARSE_IRQ=y
@@ -636,7 +635,7 @@ CONFIG_OLPC_XO1_PM=y
CONFIG_OLPC_XO1_RTC=y
CONFIG_OLPC_XO1_SCI=y
CONFIG_OLPC_XO15_SCI=y
-CONFIG_ALIX=y
+# CONFIG_ALIX is not set
CONFIG_AMD_NB=y
CONFIG_PCCARD=m
CONFIG_PCMCIA=m
@@ -1296,7 +1295,6 @@ CONFIG_WIMAX_DEBUG_LEVEL=8
CONFIG_RFKILL=m
CONFIG_RFKILL_LEDS=y
CONFIG_RFKILL_INPUT=y
-CONFIG_RFKILL_REGULATOR=m
CONFIG_NET_9P=m
CONFIG_NET_9P_VIRTIO=m
# CONFIG_NET_9P_DEBUG is not set
@@ -1339,8 +1337,6 @@ CONFIG_EXTRA_FIRMWARE=""
# CONFIG_GENERIC_CPU_DEVICES is not set
CONFIG_REGMAP=y
CONFIG_REGMAP_I2C=m
-CONFIG_REGMAP_SPI=y
-CONFIG_REGMAP_IRQ=y
# CONFIG_DMA_SHARED_BUFFER is not set
CONFIG_CONNECTOR=y
CONFIG_PROC_EVENTS=y
@@ -1425,9 +1421,6 @@ CONFIG_MTD_PLATRAM=m
CONFIG_MTD_PMC551=m
# CONFIG_MTD_PMC551_BUGFIX is not set
# CONFIG_MTD_PMC551_DEBUG is not set
-# CONFIG_MTD_DATAFLASH is not set
-# CONFIG_MTD_M25P80 is not set
-# CONFIG_MTD_SST25L is not set
# CONFIG_MTD_SLRAM is not set
CONFIG_MTD_PHRAM=m
CONFIG_MTD_MTDRAM=m
@@ -1489,7 +1482,6 @@ CONFIG_OF_DEVICE=y
CONFIG_OF_GPIO=y
CONFIG_OF_I2C=m
CONFIG_OF_NET=y
-CONFIG_OF_SPI=y
CONFIG_OF_MDIO=m
CONFIG_OF_PCI=y
CONFIG_OF_PCI_IRQ=y
@@ -1551,7 +1543,6 @@ CONFIG_BLK_DEV_RBD=m
CONFIG_SENSORS_LIS3LV02D=m
CONFIG_AD525X_DPOT=m
CONFIG_AD525X_DPOT_I2C=m
-CONFIG_AD525X_DPOT_SPI=m
# CONFIG_IBM_ASM is not set
CONFIG_PHANTOM=m
CONFIG_INTEL_MID_PTI=m
@@ -1573,7 +1564,6 @@ CONFIG_SENSORS_BH1770=m
CONFIG_SENSORS_APDS990X=m
CONFIG_HMC6352=m
CONFIG_DS1682=m
-CONFIG_TI_DAC7512=m
CONFIG_VMWARE_BALLOON=m
CONFIG_BMP085=m
# CONFIG_PCH_PHUB is not set
@@ -1585,11 +1575,9 @@ CONFIG_C2PORT_DURAMAR_2150=m
# EEPROM support
#
CONFIG_EEPROM_AT24=m
-CONFIG_EEPROM_AT25=m
CONFIG_EEPROM_LEGACY=m
CONFIG_EEPROM_MAX6875=m
CONFIG_EEPROM_93CX6=m
-CONFIG_EEPROM_93XX46=m
CONFIG_CB710_CORE=m
# CONFIG_CB710_DEBUG is not set
CONFIG_CB710_DEBUG_ASSUMPTIONS=y
@@ -2120,12 +2108,8 @@ CONFIG_MLX4_CORE=m
CONFIG_MLX4_DEBUG=y
CONFIG_NET_VENDOR_MICREL=y
CONFIG_KS8842=m
-CONFIG_KS8851=m
CONFIG_KS8851_MLL=m
CONFIG_KSZ884X_PCI=m
-CONFIG_NET_VENDOR_MICROCHIP=y
-CONFIG_ENC28J60=m
-# CONFIG_ENC28J60_WRITEVERIFY is not set
CONFIG_NET_VENDOR_MYRI=y
CONFIG_MYRI10GE=m
CONFIG_MYRI10GE_DCA=y
@@ -2230,7 +2214,6 @@ CONFIG_STE10XP=m
CONFIG_LSI_ET1011C_PHY=m
CONFIG_MICREL_PHY=m
# CONFIG_MDIO_BITBANG is not set
-CONFIG_MICREL_KS8995MA=m
CONFIG_PLIP=m
CONFIG_PPP=m
CONFIG_PPP_BSDCOMP=m
@@ -2368,17 +2351,8 @@ CONFIG_HOSTAP_FIRMWARE=y
CONFIG_HOSTAP_PLX=m
CONFIG_HOSTAP_PCI=m
CONFIG_HOSTAP_CS=m
-CONFIG_IPW2100=m
-CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW2100_DEBUG is not set
-CONFIG_IPW2200=m
-CONFIG_IPW2200_MONITOR=y
-CONFIG_IPW2200_RADIOTAP=y
-CONFIG_IPW2200_PROMISCUOUS=y
-CONFIG_IPW2200_QOS=y
-# CONFIG_IPW2200_DEBUG is not set
-CONFIG_LIBIPW=m
-# CONFIG_LIBIPW_DEBUG is not set
+# CONFIG_IPW2100 is not set
+# CONFIG_IPW2200 is not set
CONFIG_IWLWIFI=m
#
@@ -2403,7 +2377,6 @@ CONFIG_LIBERTAS=m
CONFIG_LIBERTAS_USB=m
CONFIG_LIBERTAS_CS=m
CONFIG_LIBERTAS_SDIO=m
-CONFIG_LIBERTAS_SPI=m
# CONFIG_LIBERTAS_DEBUG is not set
CONFIG_LIBERTAS_MESH=y
CONFIG_HERMES=m
@@ -2419,8 +2392,6 @@ CONFIG_ORINOCO_USB=m
CONFIG_P54_COMMON=m
CONFIG_P54_USB=m
CONFIG_P54_PCI=m
-CONFIG_P54_SPI=m
-CONFIG_P54_SPI_DEFAULT_EEPROM=y
CONFIG_P54_LEDS=y
CONFIG_RT2X00=m
CONFIG_RT2400PCI=m
@@ -2452,11 +2423,9 @@ CONFIG_RTL8192CU=m
CONFIG_RTLWIFI=m
CONFIG_RTL8192C_COMMON=m
CONFIG_WL1251=m
-CONFIG_WL1251_SPI=m
CONFIG_WL1251_SDIO=m
CONFIG_WL12XX_MENU=m
CONFIG_WL12XX=m
-CONFIG_WL12XX_SPI=m
CONFIG_WL12XX_SDIO=m
CONFIG_WL12XX_PLATFORM_DATA=y
CONFIG_ZD1211RW=m
@@ -2653,8 +2622,8 @@ CONFIG_KEYBOARD_ATKBD=y
CONFIG_KEYBOARD_QT1070=m
CONFIG_KEYBOARD_QT2160=m
# CONFIG_KEYBOARD_LKKBD is not set
-CONFIG_KEYBOARD_GPIO=m
-CONFIG_KEYBOARD_GPIO_POLLED=m
+# CONFIG_KEYBOARD_GPIO is not set
+# CONFIG_KEYBOARD_GPIO_POLLED is not set
CONFIG_KEYBOARD_TCA6416=m
CONFIG_KEYBOARD_TCA8418=m
CONFIG_KEYBOARD_MATRIX=m
@@ -2666,7 +2635,6 @@ CONFIG_KEYBOARD_MPR121=m
# CONFIG_KEYBOARD_OPENCORES is not set
# CONFIG_KEYBOARD_STOWAWAY is not set
# CONFIG_KEYBOARD_SUNKBD is not set
-CONFIG_KEYBOARD_STMPE=m
# CONFIG_KEYBOARD_XTKBD is not set
CONFIG_INPUT_MOUSE=y
CONFIG_MOUSE_PS2=m
@@ -2687,7 +2655,7 @@ CONFIG_MOUSE_INPORT=m
CONFIG_MOUSE_LOGIBM=m
CONFIG_MOUSE_PC110PAD=m
CONFIG_MOUSE_VSXXXAA=m
-CONFIG_MOUSE_GPIO=m
+# CONFIG_MOUSE_GPIO is not set
CONFIG_MOUSE_SYNAPTICS_I2C=m
CONFIG_INPUT_JOYSTICK=y
CONFIG_JOYSTICK_ANALOG=m
@@ -2728,11 +2696,8 @@ CONFIG_TABLET_USB_HANWANG=m
CONFIG_TABLET_USB_KBTAB=m
CONFIG_TABLET_USB_WACOM=m
CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_ADS7846=m
-CONFIG_TOUCHSCREEN_AD7877=m
CONFIG_TOUCHSCREEN_AD7879=m
CONFIG_TOUCHSCREEN_AD7879_I2C=m
-CONFIG_TOUCHSCREEN_AD7879_SPI=m
CONFIG_TOUCHSCREEN_ATMEL_MXT=m
CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
CONFIG_TOUCHSCREEN_BU21013=m
@@ -2756,13 +2721,11 @@ CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
CONFIG_TOUCHSCREEN_TOUCHWIN=m
CONFIG_TOUCHSCREEN_UCB1400=m
CONFIG_TOUCHSCREEN_PIXCIR=m
-CONFIG_TOUCHSCREEN_WM831X=m
CONFIG_TOUCHSCREEN_WM97XX=m
CONFIG_TOUCHSCREEN_WM9705=y
CONFIG_TOUCHSCREEN_WM9712=y
CONFIG_TOUCHSCREEN_WM9713=y
CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
-CONFIG_TOUCHSCREEN_MC13783=m
CONFIG_TOUCHSCREEN_USB_EGALAX=y
CONFIG_TOUCHSCREEN_USB_PANJIT=y
CONFIG_TOUCHSCREEN_USB_3M=y
@@ -2782,25 +2745,20 @@ CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
CONFIG_TOUCHSCREEN_USB_NEXIO=y
CONFIG_TOUCHSCREEN_TOUCHIT213=m
CONFIG_TOUCHSCREEN_TSC_SERIO=m
-CONFIG_TOUCHSCREEN_TSC2005=m
CONFIG_TOUCHSCREEN_TSC2007=m
-CONFIG_TOUCHSCREEN_PCAP=m
CONFIG_TOUCHSCREEN_ST1232=m
-CONFIG_TOUCHSCREEN_STMPE=m
CONFIG_TOUCHSCREEN_TPS6507X=m
CONFIG_INPUT_MISC=y
CONFIG_INPUT_AB8500_PONKEY=m
CONFIG_INPUT_AD714X=m
CONFIG_INPUT_AD714X_I2C=m
-CONFIG_INPUT_AD714X_SPI=m
CONFIG_INPUT_BMA150=m
CONFIG_INPUT_PCSPKR=m
-CONFIG_INPUT_MC13783_PWRBUTTON=m
CONFIG_INPUT_MMA8450=m
CONFIG_INPUT_MPU3050=m
CONFIG_INPUT_APANEL=m
CONFIG_INPUT_GP2A=m
-CONFIG_INPUT_GPIO_TILT_POLLED=m
+# CONFIG_INPUT_GPIO_TILT_POLLED is not set
CONFIG_INPUT_WISTRON_BTNS=m
CONFIG_INPUT_ATLAS_BTNS=m
CONFIG_INPUT_ATI_REMOTE2=m
@@ -2814,11 +2772,8 @@ CONFIG_INPUT_UINPUT=m
CONFIG_INPUT_PCF50633_PMU=m
CONFIG_INPUT_PCF8574=m
CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
-CONFIG_INPUT_WM831X_ON=m
-# CONFIG_INPUT_PCAP is not set
CONFIG_INPUT_ADXL34X=m
CONFIG_INPUT_ADXL34X_I2C=m
-CONFIG_INPUT_ADXL34X_SPI=m
CONFIG_INPUT_CMA3000=m
CONFIG_INPUT_CMA3000_I2C=m
@@ -2888,20 +2843,16 @@ CONFIG_SERIAL_8250_DW=m
#
# Non-8250 serial port support
#
-CONFIG_SERIAL_MAX3100=m
-CONFIG_SERIAL_MAX3107=m
CONFIG_SERIAL_MFD_HSU=m
-CONFIG_SERIAL_UARTLITE=m
CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y
CONFIG_SERIAL_JSM=m
CONFIG_SERIAL_OF_PLATFORM=m
-CONFIG_SERIAL_TIMBERDALE=m
+# CONFIG_SERIAL_TIMBERDALE is not set
CONFIG_SERIAL_ALTERA_JTAGUART=m
CONFIG_SERIAL_ALTERA_UART=m
CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
-CONFIG_SERIAL_IFX6X60=m
CONFIG_SERIAL_PCH_UART=m
CONFIG_SERIAL_XILINX_PS_UART=m
CONFIG_PRINTER=m
@@ -2954,14 +2905,7 @@ CONFIG_I2C=m
CONFIG_I2C_BOARDINFO=y
CONFIG_I2C_COMPAT=y
CONFIG_I2C_CHARDEV=m
-CONFIG_I2C_MUX=m
-
-#
-# Multiplexer I2C Chip support
-#
-CONFIG_I2C_MUX_GPIO=m
-CONFIG_I2C_MUX_PCA9541=m
-CONFIG_I2C_MUX_PCA954x=m
+# CONFIG_I2C_MUX is not set
CONFIG_I2C_HELPER_AUTO=y
CONFIG_I2C_SMBUS=m
CONFIG_I2C_ALGOBIT=m
@@ -3000,7 +2944,7 @@ CONFIG_I2C_SCMI=m
# I2C system bus drivers (mostly embedded / system-on-chip)
#
CONFIG_I2C_DESIGNWARE_PCI=m
-CONFIG_I2C_GPIO=m
+# CONFIG_I2C_GPIO is not set
CONFIG_I2C_INTEL_MID=m
CONFIG_I2C_OCORES=m
CONFIG_I2C_PCA_PLATFORM=m
@@ -3028,30 +2972,7 @@ CONFIG_SCx200_ACB=m
# CONFIG_I2C_DEBUG_CORE is not set
# CONFIG_I2C_DEBUG_ALGO is not set
# CONFIG_I2C_DEBUG_BUS is not set
-CONFIG_SPI=y
-# CONFIG_SPI_DEBUG is not set
-CONFIG_SPI_MASTER=y
-
-#
-# SPI Master Controller Drivers
-#
-CONFIG_SPI_ALTERA=m
-CONFIG_SPI_BITBANG=m
-CONFIG_SPI_BUTTERFLY=m
-CONFIG_SPI_GPIO=m
-CONFIG_SPI_LM70_LLP=m
-CONFIG_SPI_OC_TINY=m
-CONFIG_SPI_PXA2XX=m
-CONFIG_SPI_PXA2XX_PCI=y
-CONFIG_SPI_TOPCLIFF_PCH=m
-CONFIG_SPI_XILINX=m
-# CONFIG_SPI_DESIGNWARE is not set
-
-#
-# SPI Protocol Masters
-#
-CONFIG_SPI_SPIDEV=m
-CONFIG_SPI_TLE62X0=m
+# CONFIG_SPI is not set
#
# PPS support
@@ -3080,46 +3001,37 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
CONFIG_GPIOLIB=y
# CONFIG_DEBUG_GPIO is not set
CONFIG_GPIO_SYSFS=y
-CONFIG_GPIO_GENERIC=m
-CONFIG_GPIO_MAX730X=m
#
# Memory mapped GPIO drivers:
#
-CONFIG_GPIO_GENERIC_PLATFORM=m
-CONFIG_GPIO_IT8761E=m
+# CONFIG_GPIO_GENERIC_PLATFORM is not set
+# CONFIG_GPIO_IT8761E is not set
CONFIG_GPIO_SCH=m
-CONFIG_GPIO_VX855=m
+# CONFIG_GPIO_VX855 is not set
#
# I2C GPIO expanders:
#
-CONFIG_GPIO_MAX7300=m
-CONFIG_GPIO_MAX732X=m
-CONFIG_GPIO_PCA953X=m
-CONFIG_GPIO_PCF857X=m
-CONFIG_GPIO_STMPE=y
-CONFIG_GPIO_TPS65912=m
-CONFIG_GPIO_WM831X=m
-CONFIG_GPIO_ADP5588=m
+# CONFIG_GPIO_MAX7300 is not set
+# CONFIG_GPIO_MAX732X is not set
+# CONFIG_GPIO_PCA953X is not set
+# CONFIG_GPIO_PCF857X is not set
+# CONFIG_GPIO_ADP5588 is not set
#
# PCI GPIO expanders:
#
CONFIG_GPIO_CS5535=y
-CONFIG_GPIO_LANGWELL=y
-CONFIG_GPIO_PCH=m
-CONFIG_GPIO_ML_IOH=m
-CONFIG_GPIO_TIMBERDALE=y
-CONFIG_GPIO_RDC321X=m
+# CONFIG_GPIO_LANGWELL is not set
+# CONFIG_GPIO_PCH is not set
+# CONFIG_GPIO_ML_IOH is not set
+# CONFIG_GPIO_RDC321X is not set
#
# SPI GPIO expanders:
#
-CONFIG_GPIO_MAX7301=m
-CONFIG_GPIO_MCP23S08=m
-CONFIG_GPIO_MC33880=m
-CONFIG_GPIO_74X164=m
+# CONFIG_GPIO_MCP23S08 is not set
#
# AC97 GPIO expanders:
@@ -3129,54 +3041,23 @@ CONFIG_GPIO_UCB1400=y
#
# MODULbus GPIO expanders:
#
-CONFIG_GPIO_JANZ_TTL=m
-CONFIG_W1=m
-CONFIG_W1_CON=y
-
-#
-# 1-wire Bus Masters
-#
-CONFIG_W1_MASTER_MATROX=m
-CONFIG_W1_MASTER_DS2490=m
-CONFIG_W1_MASTER_DS2482=m
-CONFIG_W1_MASTER_DS1WM=m
-CONFIG_W1_MASTER_GPIO=m
-
-#
-# 1-wire Slaves
-#
-CONFIG_W1_SLAVE_THERM=m
-CONFIG_W1_SLAVE_SMEM=m
-CONFIG_W1_SLAVE_DS2408=m
-CONFIG_W1_SLAVE_DS2423=m
-CONFIG_W1_SLAVE_DS2431=m
-CONFIG_W1_SLAVE_DS2433=m
-# CONFIG_W1_SLAVE_DS2433_CRC is not set
-CONFIG_W1_SLAVE_DS2760=m
-CONFIG_W1_SLAVE_DS2780=m
-CONFIG_W1_SLAVE_BQ27000=m
+# CONFIG_W1 is not set
CONFIG_POWER_SUPPLY=y
# CONFIG_POWER_SUPPLY_DEBUG is not set
CONFIG_PDA_POWER=m
-CONFIG_WM831X_BACKUP=m
-CONFIG_WM831X_POWER=m
CONFIG_TEST_POWER=m
-CONFIG_BATTERY_DS2760=m
-CONFIG_BATTERY_DS2780=m
-CONFIG_BATTERY_DS2782=m
+# CONFIG_BATTERY_DS2780 is not set
+# CONFIG_BATTERY_DS2782 is not set
CONFIG_BATTERY_OLPC=m
-CONFIG_BATTERY_SBS=m
-CONFIG_BATTERY_BQ27x00=m
-CONFIG_BATTERY_BQ27X00_I2C=y
-CONFIG_BATTERY_BQ27X00_PLATFORM=y
-CONFIG_BATTERY_MAX17040=m
-CONFIG_BATTERY_MAX17042=m
-CONFIG_CHARGER_PCF50633=m
-CONFIG_CHARGER_ISP1704=m
-CONFIG_CHARGER_MAX8903=m
-CONFIG_CHARGER_LP8727=m
-CONFIG_CHARGER_GPIO=m
-# CONFIG_CHARGER_MANAGER is not set
+# CONFIG_BATTERY_SBS is not set
+# CONFIG_BATTERY_BQ27x00 is not set
+# CONFIG_BATTERY_MAX17040 is not set
+# CONFIG_BATTERY_MAX17042 is not set
+# CONFIG_CHARGER_PCF50633 is not set
+# CONFIG_CHARGER_ISP1704 is not set
+# CONFIG_CHARGER_MAX8903 is not set
+# CONFIG_CHARGER_LP8727 is not set
+# CONFIG_CHARGER_GPIO is not set
CONFIG_HWMON=y
CONFIG_HWMON_VID=m
# CONFIG_HWMON_DEBUG_CHIP is not set
@@ -3186,10 +3067,8 @@ CONFIG_HWMON_VID=m
#
CONFIG_SENSORS_ABITUGURU=m
CONFIG_SENSORS_ABITUGURU3=m
-CONFIG_SENSORS_AD7314=m
CONFIG_SENSORS_AD7414=m
CONFIG_SENSORS_AD7418=m
-CONFIG_SENSORS_ADCXX=m
CONFIG_SENSORS_ADM1021=m
CONFIG_SENSORS_ADM1025=m
CONFIG_SENSORS_ADM1026=m
@@ -3216,7 +3095,7 @@ CONFIG_SENSORS_FSCHMD=m
CONFIG_SENSORS_G760A=m
CONFIG_SENSORS_GL518SM=m
CONFIG_SENSORS_GL520SM=m
-CONFIG_SENSORS_GPIO_FAN=m
+# CONFIG_SENSORS_GPIO_FAN is not set
CONFIG_SENSORS_CORETEMP=m
CONFIG_SENSORS_IBMAEM=m
CONFIG_SENSORS_IBMPEX=m
@@ -3224,7 +3103,6 @@ CONFIG_SENSORS_IT87=m
CONFIG_SENSORS_JC42=m
CONFIG_SENSORS_LINEAGE=m
CONFIG_SENSORS_LM63=m
-CONFIG_SENSORS_LM70=m
CONFIG_SENSORS_LM73=m
CONFIG_SENSORS_LM75=m
CONFIG_SENSORS_LM77=m
@@ -3242,7 +3120,6 @@ CONFIG_SENSORS_LTC4245=m
CONFIG_SENSORS_LTC4261=m
CONFIG_SENSORS_LM95241=m
CONFIG_SENSORS_LM95245=m
-CONFIG_SENSORS_MAX1111=m
CONFIG_SENSORS_MAX16065=m
CONFIG_SENSORS_MAX1619=m
CONFIG_SENSORS_MAX1668=m
@@ -3280,7 +3157,6 @@ CONFIG_SENSORS_SCH5627=m
CONFIG_SENSORS_SCH5636=m
CONFIG_SENSORS_ADS1015=m
CONFIG_SENSORS_ADS7828=m
-CONFIG_SENSORS_ADS7871=m
CONFIG_SENSORS_AMC6821=m
CONFIG_SENSORS_THMC50=m
CONFIG_SENSORS_TMP102=m
@@ -3300,9 +3176,7 @@ CONFIG_SENSORS_W83L785TS=m
CONFIG_SENSORS_W83L786NG=m
CONFIG_SENSORS_W83627HF=m
CONFIG_SENSORS_W83627EHF=m
-CONFIG_SENSORS_WM831X=m
CONFIG_SENSORS_APPLESMC=m
-CONFIG_SENSORS_MC13783_ADC=m
#
# ACPI drivers
@@ -3319,7 +3193,6 @@ CONFIG_WATCHDOG_CORE=y
# Watchdog Device Drivers
#
CONFIG_SOFT_WATCHDOG=m
-CONFIG_WM831X_WATCHDOG=m
CONFIG_ACQUIRE_WDT=m
CONFIG_ADVANTECH_WDT=m
CONFIG_ALIM1535_WDT=m
@@ -3412,70 +3285,25 @@ CONFIG_MFD_SM501=m
CONFIG_MFD_SM501_GPIO=y
CONFIG_HTC_PASIC3=m
CONFIG_UCB1400_CORE=m
-CONFIG_TPS6105X=m
+# CONFIG_TPS6105X is not set
CONFIG_TPS65010=m
CONFIG_TPS6507X=m
-CONFIG_MFD_TPS65912=y
-CONFIG_MFD_TPS65912_SPI=y
-CONFIG_MFD_STMPE=y
-
-#
-# STMPE Interface Drivers
-#
-CONFIG_STMPE_SPI=y
# CONFIG_MFD_TMIO is not set
-CONFIG_PMIC_DA9052=y
-CONFIG_MFD_DA9052_SPI=y
CONFIG_MFD_WM8400=m
-CONFIG_MFD_WM831X=y
-CONFIG_MFD_WM831X_SPI=y
CONFIG_MFD_PCF50633=m
CONFIG_PCF50633_ADC=m
CONFIG_PCF50633_GPIO=m
-CONFIG_MFD_MC13783=m
-CONFIG_MFD_MC13XXX=m
CONFIG_ABX500_CORE=y
-CONFIG_EZX_PCAP=y
CONFIG_AB8500_CORE=y
# CONFIG_AB8500_DEBUG is not set
-CONFIG_AB8500_GPADC=y
CONFIG_MFD_CS5535=m
-CONFIG_MFD_TIMBERDALE=m
+# CONFIG_MFD_TIMBERDALE is not set
CONFIG_LPC_SCH=m
CONFIG_MFD_RDC321X=m
-CONFIG_MFD_JANZ_CMODIO=m
+# CONFIG_MFD_JANZ_CMODIO is not set
CONFIG_MFD_VX855=m
CONFIG_MFD_WL1273_CORE=m
-CONFIG_REGULATOR=y
-# CONFIG_REGULATOR_DEBUG is not set
-CONFIG_REGULATOR_DUMMY=y
-CONFIG_REGULATOR_FIXED_VOLTAGE=m
-CONFIG_REGULATOR_VIRTUAL_CONSUMER=m
-CONFIG_REGULATOR_USERSPACE_CONSUMER=m
-CONFIG_REGULATOR_GPIO=m
-CONFIG_REGULATOR_BQ24022=m
-CONFIG_REGULATOR_MAX1586=m
-CONFIG_REGULATOR_MAX8649=m
-CONFIG_REGULATOR_MAX8660=m
-CONFIG_REGULATOR_MAX8952=m
-CONFIG_REGULATOR_WM831X=m
-CONFIG_REGULATOR_WM8400=m
-CONFIG_REGULATOR_DA9052=m
-CONFIG_REGULATOR_PCF50633=m
-CONFIG_REGULATOR_LP3971=m
-CONFIG_REGULATOR_LP3972=m
-CONFIG_REGULATOR_PCAP=m
-CONFIG_REGULATOR_MC13XXX_CORE=m
-CONFIG_REGULATOR_MC13783=m
-CONFIG_REGULATOR_MC13892=m
-CONFIG_REGULATOR_TPS6105X=m
-CONFIG_REGULATOR_TPS65023=m
-CONFIG_REGULATOR_TPS6507X=m
-CONFIG_REGULATOR_TPS65912=m
-CONFIG_REGULATOR_ISL6271A=m
-CONFIG_REGULATOR_AD5398=m
-CONFIG_REGULATOR_AB8500=y
-CONFIG_REGULATOR_TPS6524X=m
+# CONFIG_REGULATOR is not set
CONFIG_MEDIA_SUPPORT=m
#
@@ -3782,7 +3610,6 @@ CONFIG_RADIO_SI4713=m
CONFIG_RADIO_TEA5764=m
CONFIG_RADIO_SAA7706H=m
CONFIG_RADIO_TEF6862=m
-CONFIG_RADIO_TIMBERDALE=m
CONFIG_RADIO_WL1273=m
#
@@ -4139,24 +3966,14 @@ CONFIG_FB_VIRTUAL=m
# CONFIG_FB_BROADSHEET is not set
CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_LCD_CLASS_DEVICE=m
-CONFIG_LCD_L4F00242T03=m
-CONFIG_LCD_LMS283GF05=m
-CONFIG_LCD_LTV350QV=m
-CONFIG_LCD_ILI9320=m
-CONFIG_LCD_TDO24M=m
-CONFIG_LCD_VGG2432A4=m
CONFIG_LCD_PLATFORM=m
-CONFIG_LCD_S6E63M0=m
-CONFIG_LCD_LD9040=m
-CONFIG_LCD_AMS369FG06=m
CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_GENERIC=m
+# CONFIG_BACKLIGHT_GENERIC is not set
CONFIG_BACKLIGHT_PROGEAR=m
CONFIG_BACKLIGHT_APPLE=m
-CONFIG_BACKLIGHT_SAHARA=m
-CONFIG_BACKLIGHT_WM831X=m
-CONFIG_BACKLIGHT_ADP8860=m
-CONFIG_BACKLIGHT_ADP8870=m
+# CONFIG_BACKLIGHT_SAHARA is not set
+# CONFIG_BACKLIGHT_ADP8860 is not set
+# CONFIG_BACKLIGHT_ADP8870 is not set
CONFIG_BACKLIGHT_PCF50633=m
#
@@ -4365,7 +4182,6 @@ CONFIG_SND_VIA82XX_MODEM=m
CONFIG_SND_VIRTUOSO=m
CONFIG_SND_VX222=m
CONFIG_SND_YMFPCI=m
-CONFIG_SND_SPI=y
CONFIG_SND_USB=y
CONFIG_SND_USB_AUDIO=m
CONFIG_SND_USB_UA101=m
@@ -4381,9 +4197,7 @@ CONFIG_SND_ISIGHT=m
CONFIG_SND_PCMCIA=y
CONFIG_SND_VXPOCKET=m
CONFIG_SND_PDAUDIOCF=m
-CONFIG_SND_SOC=m
-CONFIG_SND_SOC_I2C_AND_SPI=m
-# CONFIG_SND_SOC_ALL_CODECS is not set
+# CONFIG_SND_SOC is not set
# CONFIG_SOUND_PRIME is not set
CONFIG_AC97_BUS=m
CONFIG_HID_SUPPORT=y
@@ -4783,21 +4597,17 @@ CONFIG_LEDS_CLASS=y
CONFIG_LEDS_LM3530=m
CONFIG_LEDS_NET5501=m
CONFIG_LEDS_PCA9532=m
-CONFIG_LEDS_PCA9532_GPIO=y
-CONFIG_LEDS_GPIO=m
+# CONFIG_LEDS_PCA9532_GPIO is not set
+# CONFIG_LEDS_GPIO is not set
CONFIG_LEDS_LP3944=m
CONFIG_LEDS_LP5521=m
CONFIG_LEDS_LP5523=m
CONFIG_LEDS_CLEVO_MAIL=m
CONFIG_LEDS_PCA955X=m
-CONFIG_LEDS_WM831X_STATUS=m
-CONFIG_LEDS_DAC124S085=m
-CONFIG_LEDS_REGULATOR=m
CONFIG_LEDS_BD2802=m
CONFIG_LEDS_INTEL_SS4200=m
CONFIG_LEDS_LT3593=m
CONFIG_LEDS_DELL_NETBOOKS=m
-CONFIG_LEDS_MC13783=m
CONFIG_LEDS_TCA6507=m
CONFIG_LEDS_OT200=m
CONFIG_LEDS_TRIGGERS=y
@@ -4883,15 +4693,6 @@ CONFIG_RTC_DRV_RV3029C2=m
#
# SPI RTC drivers
#
-CONFIG_RTC_DRV_M41T93=m
-CONFIG_RTC_DRV_M41T94=m
-CONFIG_RTC_DRV_DS1305=m
-CONFIG_RTC_DRV_DS1390=m
-CONFIG_RTC_DRV_MAX6902=m
-CONFIG_RTC_DRV_R9701=m
-CONFIG_RTC_DRV_RS5C348=m
-CONFIG_RTC_DRV_DS3234=m
-CONFIG_RTC_DRV_PCF2123=m
#
# Platform RTC drivers
@@ -4909,15 +4710,12 @@ CONFIG_RTC_DRV_MSM6242=m
CONFIG_RTC_DRV_BQ4802=m
CONFIG_RTC_DRV_RP5C01=m
CONFIG_RTC_DRV_V3020=m
-CONFIG_RTC_DRV_WM831X=m
CONFIG_RTC_DRV_PCF50633=m
CONFIG_RTC_DRV_AB8500=m
#
# on-CPU RTC drivers
#
-# CONFIG_RTC_DRV_PCAP is not set
-CONFIG_RTC_DRV_MC13XXX=m
CONFIG_DMADEVICES=y
# CONFIG_DMADEVICES_DEBUG is not set
@@ -4976,138 +4774,8 @@ CONFIG_USBIP_HOST=m
CONFIG_W35UND=m
CONFIG_PRISM2_USB=m
CONFIG_ECHO=m
-CONFIG_COMEDI=m
-# CONFIG_COMEDI_DEBUG is not set
-CONFIG_COMEDI_MISC_DRIVERS=m
-CONFIG_COMEDI_KCOMEDILIB=m
-CONFIG_COMEDI_BOND=m
-CONFIG_COMEDI_TEST=m
-CONFIG_COMEDI_PARPORT=m
-CONFIG_COMEDI_SERIAL2002=m
-CONFIG_COMEDI_SKEL=m
-CONFIG_COMEDI_ISA_DRIVERS=m
-CONFIG_COMEDI_ACL7225B=m
-CONFIG_COMEDI_PCL711=m
-CONFIG_COMEDI_PCL724=m
-CONFIG_COMEDI_PCL725=m
-CONFIG_COMEDI_PCL726=m
-CONFIG_COMEDI_PCL730=m
-CONFIG_COMEDI_PCL812=m
-CONFIG_COMEDI_PCL816=m
-CONFIG_COMEDI_PCL818=m
-CONFIG_COMEDI_PCM3724=m
-CONFIG_COMEDI_PCM3730=m
-CONFIG_COMEDI_RTI800=m
-CONFIG_COMEDI_RTI802=m
-CONFIG_COMEDI_DAS16M1=m
-CONFIG_COMEDI_DAS16=m
-CONFIG_COMEDI_DAS800=m
-CONFIG_COMEDI_DAS1800=m
-CONFIG_COMEDI_DAS6402=m
-CONFIG_COMEDI_DT2801=m
-CONFIG_COMEDI_DT2811=m
-CONFIG_COMEDI_DT2814=m
-CONFIG_COMEDI_DT2815=m
-CONFIG_COMEDI_DT2817=m
-CONFIG_COMEDI_DT282X=m
-CONFIG_COMEDI_DMM32AT=m
-CONFIG_COMEDI_FL512=m
-CONFIG_COMEDI_AIO_AIO12_8=m
-CONFIG_COMEDI_AIO_IIRO_16=m
-CONFIG_COMEDI_C6XDIGIO=m
-CONFIG_COMEDI_MPC624=m
-CONFIG_COMEDI_ADQ12B=m
-CONFIG_COMEDI_NI_AT_A2150=m
-CONFIG_COMEDI_NI_AT_AO=m
-CONFIG_COMEDI_NI_ATMIO=m
-CONFIG_COMEDI_NI_ATMIO16D=m
-CONFIG_COMEDI_PCMAD=m
-CONFIG_COMEDI_PCMDA12=m
-CONFIG_COMEDI_PCMMIO=m
-CONFIG_COMEDI_PCMUIO=m
-CONFIG_COMEDI_MULTIQ3=m
-CONFIG_COMEDI_POC=m
-CONFIG_COMEDI_PCI_DRIVERS=m
-CONFIG_COMEDI_ADDI_APCI_035=m
-CONFIG_COMEDI_ADDI_APCI_1032=m
-CONFIG_COMEDI_ADDI_APCI_1500=m
-CONFIG_COMEDI_ADDI_APCI_1516=m
-CONFIG_COMEDI_ADDI_APCI_1564=m
-CONFIG_COMEDI_ADDI_APCI_16XX=m
-CONFIG_COMEDI_ADDI_APCI_2016=m
-CONFIG_COMEDI_ADDI_APCI_2032=m
-CONFIG_COMEDI_ADDI_APCI_2200=m
-CONFIG_COMEDI_ADDI_APCI_3001=m
-CONFIG_COMEDI_ADDI_APCI_3120=m
-CONFIG_COMEDI_ADDI_APCI_3501=m
-CONFIG_COMEDI_ADDI_APCI_3XXX=m
-CONFIG_COMEDI_ADL_PCI6208=m
-CONFIG_COMEDI_ADL_PCI7230=m
-CONFIG_COMEDI_ADL_PCI7296=m
-CONFIG_COMEDI_ADL_PCI7432=m
-CONFIG_COMEDI_ADL_PCI8164=m
-CONFIG_COMEDI_ADL_PCI9111=m
-CONFIG_COMEDI_ADL_PCI9118=m
-CONFIG_COMEDI_ADV_PCI1710=m
-CONFIG_COMEDI_ADV_PCI1723=m
-CONFIG_COMEDI_ADV_PCI_DIO=m
-CONFIG_COMEDI_AMPLC_DIO200=m
-CONFIG_COMEDI_AMPLC_PC236=m
-CONFIG_COMEDI_AMPLC_PC263=m
-CONFIG_COMEDI_AMPLC_PCI224=m
-CONFIG_COMEDI_AMPLC_PCI230=m
-CONFIG_COMEDI_CONTEC_PCI_DIO=m
-CONFIG_COMEDI_DT3000=m
-CONFIG_COMEDI_DYNA_PCI10XX=m
-CONFIG_COMEDI_UNIOXX5=m
-CONFIG_COMEDI_GSC_HPDI=m
-CONFIG_COMEDI_ICP_MULTI=m
-CONFIG_COMEDI_II_PCI20KC=m
-CONFIG_COMEDI_DAQBOARD2000=m
-CONFIG_COMEDI_JR3_PCI=m
-CONFIG_COMEDI_KE_COUNTER=m
-CONFIG_COMEDI_CB_PCIDAS64=m
-CONFIG_COMEDI_CB_PCIDAS=m
-CONFIG_COMEDI_CB_PCIDDA=m
-CONFIG_COMEDI_CB_PCIDIO=m
-# CONFIG_COMEDI_CB_PCIMDAS is not set
-CONFIG_COMEDI_CB_PCIMDDA=m
-CONFIG_COMEDI_ME4000=m
-CONFIG_COMEDI_ME_DAQ=m
-CONFIG_COMEDI_NI_6527=m
-CONFIG_COMEDI_NI_65XX=m
-CONFIG_COMEDI_NI_660X=m
-CONFIG_COMEDI_NI_670X=m
-CONFIG_COMEDI_NI_PCIDIO=m
-CONFIG_COMEDI_NI_PCIMIO=m
-CONFIG_COMEDI_RTD520=m
-CONFIG_COMEDI_S526=m
-CONFIG_COMEDI_S626=m
-CONFIG_COMEDI_SSV_DNP=m
-CONFIG_COMEDI_PCMCIA_DRIVERS=m
-CONFIG_COMEDI_CB_DAS16_CS=m
-CONFIG_COMEDI_DAS08_CS=m
-CONFIG_COMEDI_NI_DAQ_700_CS=m
-CONFIG_COMEDI_NI_DAQ_DIO24_CS=m
-CONFIG_COMEDI_NI_LABPC_CS=m
-CONFIG_COMEDI_NI_MIO_CS=m
-CONFIG_COMEDI_QUATECH_DAQP_CS=m
-CONFIG_COMEDI_USB_DRIVERS=m
-CONFIG_COMEDI_DT9812=m
-CONFIG_COMEDI_USBDUX=m
-CONFIG_COMEDI_USBDUXFAST=m
-CONFIG_COMEDI_USBDUXSIGMA=m
-CONFIG_COMEDI_VMK80XX=m
-CONFIG_COMEDI_NI_COMMON=m
-CONFIG_COMEDI_MITE=m
-CONFIG_COMEDI_NI_TIO=m
-CONFIG_COMEDI_NI_LABPC=m
-CONFIG_COMEDI_8255=m
-CONFIG_COMEDI_DAS08=m
-CONFIG_COMEDI_FC=m
-CONFIG_FB_OLPC_DCON=m
-CONFIG_FB_OLPC_DCON_1=y
-CONFIG_FB_OLPC_DCON_1_5=y
+# CONFIG_COMEDI is not set
+# CONFIG_FB_OLPC_DCON is not set
CONFIG_ASUS_OLED=m
# CONFIG_PANEL is not set
CONFIG_R8187SE=m
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64
index 083e0e977..454a61b84 100644
--- a/libre/linux-libre/config.x86_64
+++ b/libre/linux-libre/config.x86_64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.3.0 Kernel Configuration
+# Linux/x86_64 3.3.0-1 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@@ -99,7 +99,6 @@ CONFIG_HAVE_SPARSE_IRQ=y
CONFIG_GENERIC_IRQ_PROBE=y
CONFIG_GENERIC_IRQ_SHOW=y
CONFIG_GENERIC_PENDING_IRQ=y
-CONFIG_GENERIC_IRQ_CHIP=y
CONFIG_IRQ_FORCED_THREADING=y
CONFIG_SPARSE_IRQ=y
@@ -1255,7 +1254,6 @@ CONFIG_WIMAX_DEBUG_LEVEL=8
CONFIG_RFKILL=m
CONFIG_RFKILL_LEDS=y
CONFIG_RFKILL_INPUT=y
-CONFIG_RFKILL_REGULATOR=m
CONFIG_NET_9P=m
CONFIG_NET_9P_VIRTIO=m
# CONFIG_NET_9P_DEBUG is not set
@@ -1298,8 +1296,6 @@ CONFIG_SYS_HYPERVISOR=y
# CONFIG_GENERIC_CPU_DEVICES is not set
CONFIG_REGMAP=y
CONFIG_REGMAP_I2C=m
-CONFIG_REGMAP_SPI=y
-CONFIG_REGMAP_IRQ=y
# CONFIG_DMA_SHARED_BUFFER is not set
CONFIG_CONNECTOR=y
CONFIG_PROC_EVENTS=y
@@ -1382,9 +1378,6 @@ CONFIG_MTD_PLATRAM=m
CONFIG_MTD_PMC551=m
# CONFIG_MTD_PMC551_BUGFIX is not set
# CONFIG_MTD_PMC551_DEBUG is not set
-# CONFIG_MTD_DATAFLASH is not set
-# CONFIG_MTD_M25P80 is not set
-# CONFIG_MTD_SST25L is not set
# CONFIG_MTD_SLRAM is not set
CONFIG_MTD_PHRAM=m
CONFIG_MTD_MTDRAM=m
@@ -1488,7 +1481,6 @@ CONFIG_BLK_DEV_RBD=m
CONFIG_SENSORS_LIS3LV02D=m
CONFIG_AD525X_DPOT=m
CONFIG_AD525X_DPOT_I2C=m
-CONFIG_AD525X_DPOT_SPI=m
# CONFIG_IBM_ASM is not set
CONFIG_PHANTOM=m
CONFIG_INTEL_MID_PTI=m
@@ -1510,7 +1502,6 @@ CONFIG_SENSORS_BH1770=m
CONFIG_SENSORS_APDS990X=m
CONFIG_HMC6352=m
CONFIG_DS1682=m
-CONFIG_TI_DAC7512=m
CONFIG_VMWARE_BALLOON=m
CONFIG_BMP085=m
CONFIG_PCH_PHUB=m
@@ -1522,11 +1513,9 @@ CONFIG_C2PORT_DURAMAR_2150=m
# EEPROM support
#
CONFIG_EEPROM_AT24=m
-CONFIG_EEPROM_AT25=m
CONFIG_EEPROM_LEGACY=m
CONFIG_EEPROM_MAX6875=m
CONFIG_EEPROM_93CX6=m
-CONFIG_EEPROM_93XX46=m
CONFIG_CB710_CORE=m
# CONFIG_CB710_DEBUG is not set
CONFIG_CB710_DEBUG_ASSUMPTIONS=y
@@ -2015,12 +2004,8 @@ CONFIG_MLX4_CORE=m
CONFIG_MLX4_DEBUG=y
CONFIG_NET_VENDOR_MICREL=y
CONFIG_KS8842=m
-CONFIG_KS8851=m
CONFIG_KS8851_MLL=m
CONFIG_KSZ884X_PCI=m
-CONFIG_NET_VENDOR_MICROCHIP=y
-CONFIG_ENC28J60=m
-# CONFIG_ENC28J60_WRITEVERIFY is not set
CONFIG_NET_VENDOR_MYRI=y
CONFIG_MYRI10GE=m
CONFIG_MYRI10GE_DCA=y
@@ -2115,7 +2100,6 @@ CONFIG_STE10XP=m
CONFIG_LSI_ET1011C_PHY=m
CONFIG_MICREL_PHY=m
# CONFIG_MDIO_BITBANG is not set
-CONFIG_MICREL_KS8995MA=m
CONFIG_PLIP=m
CONFIG_PPP=m
CONFIG_PPP_BSDCOMP=m
@@ -2253,17 +2237,8 @@ CONFIG_HOSTAP_FIRMWARE=y
CONFIG_HOSTAP_PLX=m
CONFIG_HOSTAP_PCI=m
CONFIG_HOSTAP_CS=m
-CONFIG_IPW2100=m
-CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW2100_DEBUG is not set
-CONFIG_IPW2200=m
-CONFIG_IPW2200_MONITOR=y
-CONFIG_IPW2200_RADIOTAP=y
-CONFIG_IPW2200_PROMISCUOUS=y
-CONFIG_IPW2200_QOS=y
-# CONFIG_IPW2200_DEBUG is not set
-CONFIG_LIBIPW=m
-# CONFIG_LIBIPW_DEBUG is not set
+# CONFIG_IPW2100 is not set
+# CONFIG_IPW2200 is not set
CONFIG_IWLWIFI=m
#
@@ -2288,7 +2263,6 @@ CONFIG_LIBERTAS=m
CONFIG_LIBERTAS_USB=m
CONFIG_LIBERTAS_CS=m
CONFIG_LIBERTAS_SDIO=m
-CONFIG_LIBERTAS_SPI=m
# CONFIG_LIBERTAS_DEBUG is not set
CONFIG_LIBERTAS_MESH=y
CONFIG_HERMES=m
@@ -2304,8 +2278,6 @@ CONFIG_ORINOCO_USB=m
CONFIG_P54_COMMON=m
CONFIG_P54_USB=m
CONFIG_P54_PCI=m
-CONFIG_P54_SPI=m
-CONFIG_P54_SPI_DEFAULT_EEPROM=y
CONFIG_P54_LEDS=y
CONFIG_RT2X00=m
CONFIG_RT2400PCI=m
@@ -2337,11 +2309,9 @@ CONFIG_RTL8192CU=m
CONFIG_RTLWIFI=m
CONFIG_RTL8192C_COMMON=m
CONFIG_WL1251=m
-CONFIG_WL1251_SPI=m
CONFIG_WL1251_SDIO=m
CONFIG_WL12XX_MENU=m
CONFIG_WL12XX=m
-CONFIG_WL12XX_SPI=m
CONFIG_WL12XX_SDIO=m
CONFIG_WL12XX_PLATFORM_DATA=y
CONFIG_ZD1211RW=m
@@ -2524,8 +2494,8 @@ CONFIG_KEYBOARD_ATKBD=y
CONFIG_KEYBOARD_QT1070=m
CONFIG_KEYBOARD_QT2160=m
# CONFIG_KEYBOARD_LKKBD is not set
-CONFIG_KEYBOARD_GPIO=m
-CONFIG_KEYBOARD_GPIO_POLLED=m
+# CONFIG_KEYBOARD_GPIO is not set
+# CONFIG_KEYBOARD_GPIO_POLLED is not set
CONFIG_KEYBOARD_TCA6416=m
CONFIG_KEYBOARD_TCA8418=m
CONFIG_KEYBOARD_MATRIX=m
@@ -2537,7 +2507,6 @@ CONFIG_KEYBOARD_MPR121=m
# CONFIG_KEYBOARD_OPENCORES is not set
# CONFIG_KEYBOARD_STOWAWAY is not set
# CONFIG_KEYBOARD_SUNKBD is not set
-CONFIG_KEYBOARD_STMPE=m
# CONFIG_KEYBOARD_XTKBD is not set
CONFIG_INPUT_MOUSE=y
CONFIG_MOUSE_PS2=m
@@ -2553,7 +2522,7 @@ CONFIG_MOUSE_SERIAL=y
CONFIG_MOUSE_APPLETOUCH=m
CONFIG_MOUSE_BCM5974=m
CONFIG_MOUSE_VSXXXAA=m
-CONFIG_MOUSE_GPIO=m
+# CONFIG_MOUSE_GPIO is not set
CONFIG_MOUSE_SYNAPTICS_I2C=m
CONFIG_INPUT_JOYSTICK=y
CONFIG_JOYSTICK_ANALOG=m
@@ -2594,11 +2563,8 @@ CONFIG_TABLET_USB_HANWANG=m
CONFIG_TABLET_USB_KBTAB=m
CONFIG_TABLET_USB_WACOM=m
CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_ADS7846=m
-CONFIG_TOUCHSCREEN_AD7877=m
CONFIG_TOUCHSCREEN_AD7879=m
CONFIG_TOUCHSCREEN_AD7879_I2C=m
-CONFIG_TOUCHSCREEN_AD7879_SPI=m
CONFIG_TOUCHSCREEN_ATMEL_MXT=m
CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
CONFIG_TOUCHSCREEN_BU21013=m
@@ -2621,13 +2587,11 @@ CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
CONFIG_TOUCHSCREEN_TOUCHWIN=m
CONFIG_TOUCHSCREEN_UCB1400=m
CONFIG_TOUCHSCREEN_PIXCIR=m
-CONFIG_TOUCHSCREEN_WM831X=m
CONFIG_TOUCHSCREEN_WM97XX=m
CONFIG_TOUCHSCREEN_WM9705=y
CONFIG_TOUCHSCREEN_WM9712=y
CONFIG_TOUCHSCREEN_WM9713=y
CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
-CONFIG_TOUCHSCREEN_MC13783=m
CONFIG_TOUCHSCREEN_USB_EGALAX=y
CONFIG_TOUCHSCREEN_USB_PANJIT=y
CONFIG_TOUCHSCREEN_USB_3M=y
@@ -2647,25 +2611,20 @@ CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
CONFIG_TOUCHSCREEN_USB_NEXIO=y
CONFIG_TOUCHSCREEN_TOUCHIT213=m
CONFIG_TOUCHSCREEN_TSC_SERIO=m
-CONFIG_TOUCHSCREEN_TSC2005=m
CONFIG_TOUCHSCREEN_TSC2007=m
-CONFIG_TOUCHSCREEN_PCAP=m
CONFIG_TOUCHSCREEN_ST1232=m
-CONFIG_TOUCHSCREEN_STMPE=m
CONFIG_TOUCHSCREEN_TPS6507X=m
CONFIG_INPUT_MISC=y
CONFIG_INPUT_AB8500_PONKEY=m
CONFIG_INPUT_AD714X=m
CONFIG_INPUT_AD714X_I2C=m
-CONFIG_INPUT_AD714X_SPI=m
CONFIG_INPUT_BMA150=m
CONFIG_INPUT_PCSPKR=m
-CONFIG_INPUT_MC13783_PWRBUTTON=m
CONFIG_INPUT_MMA8450=m
CONFIG_INPUT_MPU3050=m
CONFIG_INPUT_APANEL=m
CONFIG_INPUT_GP2A=m
-CONFIG_INPUT_GPIO_TILT_POLLED=m
+# CONFIG_INPUT_GPIO_TILT_POLLED is not set
CONFIG_INPUT_ATLAS_BTNS=m
CONFIG_INPUT_ATI_REMOTE2=m
CONFIG_INPUT_KEYSPAN_REMOTE=m
@@ -2678,11 +2637,8 @@ CONFIG_INPUT_UINPUT=m
CONFIG_INPUT_PCF50633_PMU=m
CONFIG_INPUT_PCF8574=m
CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
-CONFIG_INPUT_WM831X_ON=m
-# CONFIG_INPUT_PCAP is not set
CONFIG_INPUT_ADXL34X=m
CONFIG_INPUT_ADXL34X_I2C=m
-CONFIG_INPUT_ADXL34X_SPI=m
CONFIG_INPUT_CMA3000=m
CONFIG_INPUT_CMA3000_I2C=m
CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m
@@ -2752,19 +2708,15 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
#
# Non-8250 serial port support
#
-CONFIG_SERIAL_MAX3100=m
-CONFIG_SERIAL_MAX3107=m
CONFIG_SERIAL_MFD_HSU=m
-CONFIG_SERIAL_UARTLITE=m
CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y
CONFIG_SERIAL_JSM=m
-CONFIG_SERIAL_TIMBERDALE=m
+# CONFIG_SERIAL_TIMBERDALE is not set
CONFIG_SERIAL_ALTERA_JTAGUART=m
CONFIG_SERIAL_ALTERA_UART=m
CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
-CONFIG_SERIAL_IFX6X60=m
CONFIG_SERIAL_PCH_UART=m
CONFIG_SERIAL_XILINX_PS_UART=m
CONFIG_PRINTER=m
@@ -2814,14 +2766,7 @@ CONFIG_I2C=m
CONFIG_I2C_BOARDINFO=y
CONFIG_I2C_COMPAT=y
CONFIG_I2C_CHARDEV=m
-CONFIG_I2C_MUX=m
-
-#
-# Multiplexer I2C Chip support
-#
-CONFIG_I2C_MUX_GPIO=m
-CONFIG_I2C_MUX_PCA9541=m
-CONFIG_I2C_MUX_PCA954x=m
+# CONFIG_I2C_MUX is not set
CONFIG_I2C_HELPER_AUTO=y
CONFIG_I2C_SMBUS=m
CONFIG_I2C_ALGOBIT=m
@@ -2860,7 +2805,7 @@ CONFIG_I2C_SCMI=m
# I2C system bus drivers (mostly embedded / system-on-chip)
#
CONFIG_I2C_DESIGNWARE_PCI=m
-CONFIG_I2C_GPIO=m
+# CONFIG_I2C_GPIO is not set
CONFIG_I2C_INTEL_MID=m
CONFIG_I2C_OCORES=m
CONFIG_I2C_PCA_PLATFORM=m
@@ -2885,29 +2830,7 @@ CONFIG_I2C_TINY_USB=m
# CONFIG_I2C_DEBUG_CORE is not set
# CONFIG_I2C_DEBUG_ALGO is not set
# CONFIG_I2C_DEBUG_BUS is not set
-CONFIG_SPI=y
-# CONFIG_SPI_DEBUG is not set
-CONFIG_SPI_MASTER=y
-
-#
-# SPI Master Controller Drivers
-#
-CONFIG_SPI_ALTERA=m
-CONFIG_SPI_BITBANG=m
-CONFIG_SPI_BUTTERFLY=m
-CONFIG_SPI_GPIO=m
-CONFIG_SPI_LM70_LLP=m
-CONFIG_SPI_OC_TINY=m
-# CONFIG_SPI_PXA2XX_PCI is not set
-CONFIG_SPI_TOPCLIFF_PCH=m
-CONFIG_SPI_XILINX=m
-# CONFIG_SPI_DESIGNWARE is not set
-
-#
-# SPI Protocol Masters
-#
-CONFIG_SPI_SPIDEV=m
-CONFIG_SPI_TLE62X0=m
+# CONFIG_SPI is not set
#
# PPS support
@@ -2936,46 +2859,37 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
CONFIG_GPIOLIB=y
# CONFIG_DEBUG_GPIO is not set
CONFIG_GPIO_SYSFS=y
-CONFIG_GPIO_GENERIC=m
-CONFIG_GPIO_MAX730X=m
#
# Memory mapped GPIO drivers:
#
-CONFIG_GPIO_GENERIC_PLATFORM=m
-CONFIG_GPIO_IT8761E=m
+# CONFIG_GPIO_GENERIC_PLATFORM is not set
+# CONFIG_GPIO_IT8761E is not set
CONFIG_GPIO_SCH=m
-CONFIG_GPIO_VX855=m
+# CONFIG_GPIO_VX855 is not set
#
# I2C GPIO expanders:
#
-CONFIG_GPIO_MAX7300=m
-CONFIG_GPIO_MAX732X=m
-CONFIG_GPIO_PCA953X=m
-CONFIG_GPIO_PCF857X=m
-CONFIG_GPIO_STMPE=y
-CONFIG_GPIO_TPS65912=m
-CONFIG_GPIO_WM831X=m
-CONFIG_GPIO_ADP5588=m
+# CONFIG_GPIO_MAX7300 is not set
+# CONFIG_GPIO_MAX732X is not set
+# CONFIG_GPIO_PCA953X is not set
+# CONFIG_GPIO_PCF857X is not set
+# CONFIG_GPIO_ADP5588 is not set
#
# PCI GPIO expanders:
#
CONFIG_GPIO_CS5535=m
CONFIG_GPIO_LANGWELL=y
-CONFIG_GPIO_PCH=m
-CONFIG_GPIO_ML_IOH=m
-CONFIG_GPIO_TIMBERDALE=y
-CONFIG_GPIO_RDC321X=m
+# CONFIG_GPIO_PCH is not set
+# CONFIG_GPIO_ML_IOH is not set
+# CONFIG_GPIO_RDC321X is not set
#
# SPI GPIO expanders:
#
-CONFIG_GPIO_MAX7301=m
-CONFIG_GPIO_MCP23S08=m
-CONFIG_GPIO_MC33880=m
-CONFIG_GPIO_74X164=m
+# CONFIG_GPIO_MCP23S08 is not set
#
# AC97 GPIO expanders:
@@ -2985,53 +2899,22 @@ CONFIG_GPIO_UCB1400=y
#
# MODULbus GPIO expanders:
#
-CONFIG_GPIO_JANZ_TTL=m
-CONFIG_W1=m
-CONFIG_W1_CON=y
-
-#
-# 1-wire Bus Masters
-#
-CONFIG_W1_MASTER_MATROX=m
-CONFIG_W1_MASTER_DS2490=m
-CONFIG_W1_MASTER_DS2482=m
-CONFIG_W1_MASTER_DS1WM=m
-CONFIG_W1_MASTER_GPIO=m
-
-#
-# 1-wire Slaves
-#
-CONFIG_W1_SLAVE_THERM=m
-CONFIG_W1_SLAVE_SMEM=m
-CONFIG_W1_SLAVE_DS2408=m
-CONFIG_W1_SLAVE_DS2423=m
-CONFIG_W1_SLAVE_DS2431=m
-CONFIG_W1_SLAVE_DS2433=m
-# CONFIG_W1_SLAVE_DS2433_CRC is not set
-CONFIG_W1_SLAVE_DS2760=m
-CONFIG_W1_SLAVE_DS2780=m
-CONFIG_W1_SLAVE_BQ27000=m
+# CONFIG_W1 is not set
CONFIG_POWER_SUPPLY=y
# CONFIG_POWER_SUPPLY_DEBUG is not set
CONFIG_PDA_POWER=m
-CONFIG_WM831X_BACKUP=m
-CONFIG_WM831X_POWER=m
CONFIG_TEST_POWER=m
-CONFIG_BATTERY_DS2760=m
-CONFIG_BATTERY_DS2780=m
-CONFIG_BATTERY_DS2782=m
-CONFIG_BATTERY_SBS=m
-CONFIG_BATTERY_BQ27x00=m
-CONFIG_BATTERY_BQ27X00_I2C=y
-CONFIG_BATTERY_BQ27X00_PLATFORM=y
-CONFIG_BATTERY_MAX17040=m
-CONFIG_BATTERY_MAX17042=m
-CONFIG_CHARGER_PCF50633=m
-CONFIG_CHARGER_ISP1704=m
-CONFIG_CHARGER_MAX8903=m
-CONFIG_CHARGER_LP8727=m
-CONFIG_CHARGER_GPIO=m
-# CONFIG_CHARGER_MANAGER is not set
+# CONFIG_BATTERY_DS2780 is not set
+# CONFIG_BATTERY_DS2782 is not set
+# CONFIG_BATTERY_SBS is not set
+# CONFIG_BATTERY_BQ27x00 is not set
+# CONFIG_BATTERY_MAX17040 is not set
+# CONFIG_BATTERY_MAX17042 is not set
+# CONFIG_CHARGER_PCF50633 is not set
+# CONFIG_CHARGER_ISP1704 is not set
+# CONFIG_CHARGER_MAX8903 is not set
+# CONFIG_CHARGER_LP8727 is not set
+# CONFIG_CHARGER_GPIO is not set
CONFIG_HWMON=y
CONFIG_HWMON_VID=m
# CONFIG_HWMON_DEBUG_CHIP is not set
@@ -3041,10 +2924,8 @@ CONFIG_HWMON_VID=m
#
CONFIG_SENSORS_ABITUGURU=m
CONFIG_SENSORS_ABITUGURU3=m
-CONFIG_SENSORS_AD7314=m
CONFIG_SENSORS_AD7414=m
CONFIG_SENSORS_AD7418=m
-CONFIG_SENSORS_ADCXX=m
CONFIG_SENSORS_ADM1021=m
CONFIG_SENSORS_ADM1025=m
CONFIG_SENSORS_ADM1026=m
@@ -3071,7 +2952,7 @@ CONFIG_SENSORS_FSCHMD=m
CONFIG_SENSORS_G760A=m
CONFIG_SENSORS_GL518SM=m
CONFIG_SENSORS_GL520SM=m
-CONFIG_SENSORS_GPIO_FAN=m
+# CONFIG_SENSORS_GPIO_FAN is not set
CONFIG_SENSORS_CORETEMP=m
CONFIG_SENSORS_IBMAEM=m
CONFIG_SENSORS_IBMPEX=m
@@ -3079,7 +2960,6 @@ CONFIG_SENSORS_IT87=m
CONFIG_SENSORS_JC42=m
CONFIG_SENSORS_LINEAGE=m
CONFIG_SENSORS_LM63=m
-CONFIG_SENSORS_LM70=m
CONFIG_SENSORS_LM73=m
CONFIG_SENSORS_LM75=m
CONFIG_SENSORS_LM77=m
@@ -3097,7 +2977,6 @@ CONFIG_SENSORS_LTC4245=m
CONFIG_SENSORS_LTC4261=m
CONFIG_SENSORS_LM95241=m
CONFIG_SENSORS_LM95245=m
-CONFIG_SENSORS_MAX1111=m
CONFIG_SENSORS_MAX16065=m
CONFIG_SENSORS_MAX1619=m
CONFIG_SENSORS_MAX1668=m
@@ -3135,7 +3014,6 @@ CONFIG_SENSORS_SCH5627=m
CONFIG_SENSORS_SCH5636=m
CONFIG_SENSORS_ADS1015=m
CONFIG_SENSORS_ADS7828=m
-CONFIG_SENSORS_ADS7871=m
CONFIG_SENSORS_AMC6821=m
CONFIG_SENSORS_THMC50=m
CONFIG_SENSORS_TMP102=m
@@ -3155,9 +3033,7 @@ CONFIG_SENSORS_W83L785TS=m
CONFIG_SENSORS_W83L786NG=m
CONFIG_SENSORS_W83627HF=m
CONFIG_SENSORS_W83627EHF=m
-CONFIG_SENSORS_WM831X=m
CONFIG_SENSORS_APPLESMC=m
-CONFIG_SENSORS_MC13783_ADC=m
#
# ACPI drivers
@@ -3174,7 +3050,6 @@ CONFIG_WATCHDOG_CORE=y
# Watchdog Device Drivers
#
CONFIG_SOFT_WATCHDOG=m
-CONFIG_WM831X_WATCHDOG=m
CONFIG_ACQUIRE_WDT=m
CONFIG_ADVANTECH_WDT=m
CONFIG_ALIM1535_WDT=m
@@ -3260,70 +3135,25 @@ CONFIG_MFD_SM501=m
CONFIG_MFD_SM501_GPIO=y
CONFIG_HTC_PASIC3=m
CONFIG_UCB1400_CORE=m
-CONFIG_TPS6105X=m
+# CONFIG_TPS6105X is not set
CONFIG_TPS65010=m
CONFIG_TPS6507X=m
-CONFIG_MFD_TPS65912=y
-CONFIG_MFD_TPS65912_SPI=y
-CONFIG_MFD_STMPE=y
-
-#
-# STMPE Interface Drivers
-#
-CONFIG_STMPE_SPI=y
# CONFIG_MFD_TMIO is not set
-CONFIG_PMIC_DA9052=y
-CONFIG_MFD_DA9052_SPI=y
CONFIG_MFD_WM8400=m
-CONFIG_MFD_WM831X=y
-CONFIG_MFD_WM831X_SPI=y
CONFIG_MFD_PCF50633=m
CONFIG_PCF50633_ADC=m
CONFIG_PCF50633_GPIO=m
-CONFIG_MFD_MC13783=m
-CONFIG_MFD_MC13XXX=m
CONFIG_ABX500_CORE=y
-CONFIG_EZX_PCAP=y
CONFIG_AB8500_CORE=y
# CONFIG_AB8500_DEBUG is not set
-CONFIG_AB8500_GPADC=y
CONFIG_MFD_CS5535=m
-CONFIG_MFD_TIMBERDALE=m
+# CONFIG_MFD_TIMBERDALE is not set
CONFIG_LPC_SCH=m
CONFIG_MFD_RDC321X=m
-CONFIG_MFD_JANZ_CMODIO=m
+# CONFIG_MFD_JANZ_CMODIO is not set
CONFIG_MFD_VX855=m
CONFIG_MFD_WL1273_CORE=m
-CONFIG_REGULATOR=y
-# CONFIG_REGULATOR_DEBUG is not set
-CONFIG_REGULATOR_DUMMY=y
-CONFIG_REGULATOR_FIXED_VOLTAGE=m
-CONFIG_REGULATOR_VIRTUAL_CONSUMER=m
-CONFIG_REGULATOR_USERSPACE_CONSUMER=m
-CONFIG_REGULATOR_GPIO=m
-CONFIG_REGULATOR_BQ24022=m
-CONFIG_REGULATOR_MAX1586=m
-CONFIG_REGULATOR_MAX8649=m
-CONFIG_REGULATOR_MAX8660=m
-CONFIG_REGULATOR_MAX8952=m
-CONFIG_REGULATOR_WM831X=m
-CONFIG_REGULATOR_WM8400=m
-CONFIG_REGULATOR_DA9052=m
-CONFIG_REGULATOR_PCF50633=m
-CONFIG_REGULATOR_LP3971=m
-CONFIG_REGULATOR_LP3972=m
-CONFIG_REGULATOR_PCAP=m
-CONFIG_REGULATOR_MC13XXX_CORE=m
-CONFIG_REGULATOR_MC13783=m
-CONFIG_REGULATOR_MC13892=m
-CONFIG_REGULATOR_TPS6105X=m
-CONFIG_REGULATOR_TPS65023=m
-CONFIG_REGULATOR_TPS6507X=m
-CONFIG_REGULATOR_TPS65912=m
-CONFIG_REGULATOR_ISL6271A=m
-CONFIG_REGULATOR_AD5398=m
-CONFIG_REGULATOR_AB8500=y
-CONFIG_REGULATOR_TPS6524X=m
+# CONFIG_REGULATOR is not set
CONFIG_MEDIA_SUPPORT=m
#
@@ -3630,7 +3460,6 @@ CONFIG_RADIO_SI4713=m
CONFIG_RADIO_TEA5764=m
CONFIG_RADIO_SAA7706H=m
CONFIG_RADIO_TEF6862=m
-CONFIG_RADIO_TIMBERDALE=m
CONFIG_RADIO_WL1273=m
#
@@ -3978,24 +3807,14 @@ CONFIG_XEN_FBDEV_FRONTEND=m
# CONFIG_FB_BROADSHEET is not set
CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_LCD_CLASS_DEVICE=m
-CONFIG_LCD_L4F00242T03=m
-CONFIG_LCD_LMS283GF05=m
-CONFIG_LCD_LTV350QV=m
-CONFIG_LCD_ILI9320=m
-CONFIG_LCD_TDO24M=m
-CONFIG_LCD_VGG2432A4=m
CONFIG_LCD_PLATFORM=m
-CONFIG_LCD_S6E63M0=m
-CONFIG_LCD_LD9040=m
-CONFIG_LCD_AMS369FG06=m
CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_GENERIC=m
+# CONFIG_BACKLIGHT_GENERIC is not set
CONFIG_BACKLIGHT_PROGEAR=m
CONFIG_BACKLIGHT_APPLE=m
-CONFIG_BACKLIGHT_SAHARA=m
-CONFIG_BACKLIGHT_WM831X=m
-CONFIG_BACKLIGHT_ADP8860=m
-CONFIG_BACKLIGHT_ADP8870=m
+# CONFIG_BACKLIGHT_SAHARA is not set
+# CONFIG_BACKLIGHT_ADP8860 is not set
+# CONFIG_BACKLIGHT_ADP8870 is not set
CONFIG_BACKLIGHT_PCF50633=m
#
@@ -4166,7 +3985,6 @@ CONFIG_SND_VIA82XX_MODEM=m
CONFIG_SND_VIRTUOSO=m
CONFIG_SND_VX222=m
CONFIG_SND_YMFPCI=m
-CONFIG_SND_SPI=y
CONFIG_SND_USB=y
CONFIG_SND_USB_AUDIO=m
CONFIG_SND_USB_UA101=m
@@ -4182,9 +4000,7 @@ CONFIG_SND_ISIGHT=m
CONFIG_SND_PCMCIA=y
CONFIG_SND_VXPOCKET=m
CONFIG_SND_PDAUDIOCF=m
-CONFIG_SND_SOC=m
-CONFIG_SND_SOC_I2C_AND_SPI=m
-# CONFIG_SND_SOC_ALL_CODECS is not set
+# CONFIG_SND_SOC is not set
# CONFIG_SOUND_PRIME is not set
CONFIG_AC97_BUS=m
CONFIG_HID_SUPPORT=y
@@ -4553,7 +4369,6 @@ CONFIG_MMC_RICOH_MMC=y
CONFIG_MMC_SDHCI_PLTFM=m
CONFIG_MMC_WBSD=m
CONFIG_MMC_TIFM_SD=m
-CONFIG_MMC_SPI=m
CONFIG_MMC_SDRICOH_CS=m
CONFIG_MMC_CB710=m
CONFIG_MMC_VIA_SDMMC=m
@@ -4583,21 +4398,17 @@ CONFIG_LEDS_CLASS=y
CONFIG_LEDS_LM3530=m
CONFIG_LEDS_NET5501=m
CONFIG_LEDS_PCA9532=m
-CONFIG_LEDS_PCA9532_GPIO=y
-CONFIG_LEDS_GPIO=m
+# CONFIG_LEDS_PCA9532_GPIO is not set
+# CONFIG_LEDS_GPIO is not set
CONFIG_LEDS_LP3944=m
CONFIG_LEDS_LP5521=m
CONFIG_LEDS_LP5523=m
CONFIG_LEDS_CLEVO_MAIL=m
CONFIG_LEDS_PCA955X=m
-CONFIG_LEDS_WM831X_STATUS=m
-CONFIG_LEDS_DAC124S085=m
-CONFIG_LEDS_REGULATOR=m
CONFIG_LEDS_BD2802=m
CONFIG_LEDS_INTEL_SS4200=m
CONFIG_LEDS_LT3593=m
CONFIG_LEDS_DELL_NETBOOKS=m
-CONFIG_LEDS_MC13783=m
CONFIG_LEDS_TCA6507=m
CONFIG_LEDS_OT200=m
CONFIG_LEDS_TRIGGERS=y
@@ -4681,15 +4492,6 @@ CONFIG_RTC_DRV_RV3029C2=m
#
# SPI RTC drivers
#
-CONFIG_RTC_DRV_M41T93=m
-CONFIG_RTC_DRV_M41T94=m
-CONFIG_RTC_DRV_DS1305=m
-CONFIG_RTC_DRV_DS1390=m
-CONFIG_RTC_DRV_MAX6902=m
-CONFIG_RTC_DRV_R9701=m
-CONFIG_RTC_DRV_RS5C348=m
-CONFIG_RTC_DRV_DS3234=m
-CONFIG_RTC_DRV_PCF2123=m
#
# Platform RTC drivers
@@ -4707,15 +4509,12 @@ CONFIG_RTC_DRV_MSM6242=m
CONFIG_RTC_DRV_BQ4802=m
CONFIG_RTC_DRV_RP5C01=m
CONFIG_RTC_DRV_V3020=m
-CONFIG_RTC_DRV_WM831X=m
CONFIG_RTC_DRV_PCF50633=m
CONFIG_RTC_DRV_AB8500=m
#
# on-CPU RTC drivers
#
-# CONFIG_RTC_DRV_PCAP is not set
-CONFIG_RTC_DRV_MC13XXX=m
CONFIG_DMADEVICES=y
# CONFIG_DMADEVICES_DEBUG is not set
@@ -4794,93 +4593,7 @@ CONFIG_USBIP_HOST=m
CONFIG_W35UND=m
CONFIG_PRISM2_USB=m
CONFIG_ECHO=m
-CONFIG_COMEDI=m
-# CONFIG_COMEDI_DEBUG is not set
-CONFIG_COMEDI_MISC_DRIVERS=m
-CONFIG_COMEDI_KCOMEDILIB=m
-CONFIG_COMEDI_BOND=m
-CONFIG_COMEDI_TEST=m
-CONFIG_COMEDI_PARPORT=m
-CONFIG_COMEDI_SERIAL2002=m
-CONFIG_COMEDI_SKEL=m
-CONFIG_COMEDI_PCI_DRIVERS=m
-CONFIG_COMEDI_ADDI_APCI_035=m
-CONFIG_COMEDI_ADDI_APCI_1032=m
-CONFIG_COMEDI_ADDI_APCI_1500=m
-CONFIG_COMEDI_ADDI_APCI_1516=m
-CONFIG_COMEDI_ADDI_APCI_1564=m
-CONFIG_COMEDI_ADDI_APCI_16XX=m
-CONFIG_COMEDI_ADDI_APCI_2016=m
-CONFIG_COMEDI_ADDI_APCI_2032=m
-CONFIG_COMEDI_ADDI_APCI_2200=m
-CONFIG_COMEDI_ADDI_APCI_3001=m
-CONFIG_COMEDI_ADDI_APCI_3120=m
-CONFIG_COMEDI_ADDI_APCI_3501=m
-CONFIG_COMEDI_ADDI_APCI_3XXX=m
-CONFIG_COMEDI_ADL_PCI6208=m
-CONFIG_COMEDI_ADL_PCI7230=m
-CONFIG_COMEDI_ADL_PCI7296=m
-CONFIG_COMEDI_ADL_PCI7432=m
-CONFIG_COMEDI_ADL_PCI8164=m
-CONFIG_COMEDI_ADL_PCI9111=m
-CONFIG_COMEDI_ADL_PCI9118=m
-CONFIG_COMEDI_ADV_PCI1710=m
-CONFIG_COMEDI_ADV_PCI1723=m
-CONFIG_COMEDI_ADV_PCI_DIO=m
-CONFIG_COMEDI_AMPLC_DIO200=m
-CONFIG_COMEDI_AMPLC_PC236=m
-CONFIG_COMEDI_AMPLC_PC263=m
-CONFIG_COMEDI_AMPLC_PCI224=m
-CONFIG_COMEDI_AMPLC_PCI230=m
-CONFIG_COMEDI_CONTEC_PCI_DIO=m
-CONFIG_COMEDI_DT3000=m
-CONFIG_COMEDI_DYNA_PCI10XX=m
-CONFIG_COMEDI_UNIOXX5=m
-CONFIG_COMEDI_GSC_HPDI=m
-CONFIG_COMEDI_ICP_MULTI=m
-CONFIG_COMEDI_II_PCI20KC=m
-CONFIG_COMEDI_DAQBOARD2000=m
-CONFIG_COMEDI_JR3_PCI=m
-CONFIG_COMEDI_KE_COUNTER=m
-CONFIG_COMEDI_CB_PCIDAS64=m
-CONFIG_COMEDI_CB_PCIDAS=m
-CONFIG_COMEDI_CB_PCIDDA=m
-CONFIG_COMEDI_CB_PCIDIO=m
-CONFIG_COMEDI_CB_PCIMDAS=m
-CONFIG_COMEDI_CB_PCIMDDA=m
-CONFIG_COMEDI_ME4000=m
-CONFIG_COMEDI_ME_DAQ=m
-CONFIG_COMEDI_NI_6527=m
-CONFIG_COMEDI_NI_65XX=m
-CONFIG_COMEDI_NI_660X=m
-CONFIG_COMEDI_NI_670X=m
-CONFIG_COMEDI_NI_PCIDIO=m
-CONFIG_COMEDI_NI_PCIMIO=m
-CONFIG_COMEDI_RTD520=m
-CONFIG_COMEDI_S526=m
-CONFIG_COMEDI_S626=m
-CONFIG_COMEDI_SSV_DNP=m
-CONFIG_COMEDI_PCMCIA_DRIVERS=m
-CONFIG_COMEDI_CB_DAS16_CS=m
-CONFIG_COMEDI_DAS08_CS=m
-CONFIG_COMEDI_NI_DAQ_700_CS=m
-CONFIG_COMEDI_NI_DAQ_DIO24_CS=m
-CONFIG_COMEDI_NI_LABPC_CS=m
-CONFIG_COMEDI_NI_MIO_CS=m
-CONFIG_COMEDI_QUATECH_DAQP_CS=m
-CONFIG_COMEDI_USB_DRIVERS=m
-CONFIG_COMEDI_DT9812=m
-CONFIG_COMEDI_USBDUX=m
-CONFIG_COMEDI_USBDUXFAST=m
-CONFIG_COMEDI_USBDUXSIGMA=m
-CONFIG_COMEDI_VMK80XX=m
-CONFIG_COMEDI_NI_COMMON=m
-CONFIG_COMEDI_MITE=m
-CONFIG_COMEDI_NI_TIO=m
-CONFIG_COMEDI_NI_LABPC=m
-CONFIG_COMEDI_8255=m
-CONFIG_COMEDI_DAS08=m
-CONFIG_COMEDI_FC=m
+# CONFIG_COMEDI is not set
CONFIG_ASUS_OLED=m
# CONFIG_PANEL is not set
CONFIG_R8187SE=m
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index 4b8d1dccb..6f0d7a347 100644
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -2,7 +2,7 @@
# arg 2: the old package version
KERNEL_NAME=
-KERNEL_VERSION=3.3.0-1-LIBRE
+KERNEL_VERSION=3.3.1-1.1-LIBRE
post_install () {
# updating module dependencies
diff --git a/libre/lsb-release-libre/PKGBUILD b/libre/lsb-release-libre/PKGBUILD
index 06521d21d..51ec79bea 100644
--- a/libre/lsb-release-libre/PKGBUILD
+++ b/libre/lsb-release-libre/PKGBUILD
@@ -1,4 +1,5 @@
# Parabola maintainer: Michał Masłowski <mtjm@mtjm.eu>
+# Parabola contributor: André Silva <andre.paulista@adinet.com.uy>
# $Id: PKGBUILD 22635 2010-07-25 20:05:28Z svenstaro $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Malte Rabenseifner <malte@zearan.de>
@@ -7,7 +8,7 @@
_pkgname=lsb-release
pkgname=lsb-release-libre
pkgver=1.4
-pkgrel=10.1
+pkgrel=12
pkgdesc="LSB version query program with Parabola name"
arch=('any')
url="http://www.linuxbase.org/"
@@ -21,13 +22,17 @@ md5sums=('30537ef5a01e0ca94b7b8eb6a36bb1e4')
build() {
cd "$srcdir/$_pkgname-$pkgver"
+
make
}
package() {
cd "$srcdir/$_pkgname-$pkgver"
+
install -dm755 "$pkgdir/etc"
- echo "DISTRIB_DESCRIPTION=\"Parabola GNU/Linux-libre\"" > "$pkgdir/etc/lsb-release"
+ echo "DISTRIB_ID=parabola" > "$pkgdir/etc/lsb-release"
+ echo "DISTRIB_RELEASE=rolling" >> "$pkgdir/etc/lsb-release"
+ echo "DISTRIB_DESCRIPTION=\"Parabola GNU/Linux-libre\"" >> "$pkgdir/etc/lsb-release"
install -Dm 644 lsb_release.1.gz "$pkgdir/usr/share/man/man1/lsb_release.1.gz"
install -Dm 755 lsb_release "$pkgdir/usr/bin/lsb_release"
diff --git a/libre/luxrays-libre/PKGBUILD b/libre/luxrays-libre/PKGBUILD
new file mode 100644
index 000000000..c813946c7
--- /dev/null
+++ b/libre/luxrays-libre/PKGBUILD
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
+# Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy>
+_pkgname=luxrays
+pkgname=luxrays-libre
+pkgver=0.8
+_pkgver=ed424ec77571
+pkgrel=7
+epoch=0
+pkgdesc="Accelerate the ray intersection process by using CPUs (without OpenCL)"
+arch=('i686' 'x86_64')
+url="http://www.luxrender.net/"
+license=('GPL')
+depends=('freeimage' 'freeglut' 'glew')
+makedepends=('cmake' 'boost')
+replaces=('luxrays')
+conflicts=('luxrays')
+provides=("luxrays=$pkgver")
+source=(https://bitbucket.org/luxrender/luxrays/get/$_pkgver.tar.bz2)
+md5sums=('2ac9c588675c5971c57f473ef10ac67d')
+
+build() {
+ cd "$srcdir/luxrender-$_pkgname-$_pkgver"
+
+ # fix the break caused by the change of the name of the namespace 'detail' to 'ipcdetail'
+ sed -i 's|::detail|::ipcdetail|' include/luxrays/utils/core/atomic.h
+
+ export CXXFLAGS="$CXXFLAGS -lpthread"
+ cmake -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DLUXRAYS_DISABLE_OPENCL=ON \
+ .
+ make
+}
+
+package() {
+ cd "$srcdir/luxrender-$_pkgname-$_pkgver"
+
+ install -d -m755 "$pkgdir"/usr/{bin,include,lib}
+ install -m755 bin/* "$pkgdir"/usr/bin
+ install -m644 lib/* "$pkgdir"/usr/lib
+ cp -a include/luxrays "$pkgdir"/usr/include
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/luxrender-libre/PKGBUILD b/libre/luxrender-libre/PKGBUILD
new file mode 100644
index 000000000..38021313d
--- /dev/null
+++ b/libre/luxrender-libre/PKGBUILD
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
+# Initial contributor: flixie <69one@gmx.net>
+# Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org>
+# Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy>
+pkgname=luxrender-libre
+pkgver=0.8
+_pkgver=45d3e13eb94c
+pkgrel=13
+pkgdesc="Rendering system for physically correct, unbiased image synthesis (without OpenGL)"
+arch=('i686' 'x86_64')
+url="http://www.luxrender.net/"
+license=('GPL')
+depends=('boost-libs' 'freeimage' 'openexr')
+optdepends=('luxblend25: Blender exporter' 'qt: Qt GUI' \
+ 'python: Python interface (pylux)')
+makedepends=('cmake' 'boost' 'qt' 'luxrays-libre' 'python')
+replaces=('luxrender')
+conflicts=('luxrender')
+provides=("luxrender=$pkgver")
+source=(ftp://ftp.archlinux.org/other/community/luxrender/lux-"$pkgver".tar.bz2)
+md5sums=('0f2d856385db72131f51e44a7ee527fa')
+
+build() {
+ cd "$srcdir"/luxrender-lux-$_pkgver
+
+ sed -i 's/FIND_PACKAGE(Boost 1.43 COMPONENTS python REQUIRED)/FIND_PACKAGE(Boost 1.43 COMPONENTS python3 REQUIRED)/' CMakeLists.txt
+
+ export CXXFLAGS="$CXXFLAGS -lpthread"
+ cmake -DCMAKE_INSTALL_PREFIX=/usr \
+ -DLUXRAYS_DISABLE_OPENCL=ON \
+ -DPYTHON_CUSTOM=ON \
+ -DPYTHON_LIBRARIES=/usr/lib/libpython3.2mu.so \
+ -DPYTHON_INCLUDE_PATH=/usr/include/python3.2mu/ \
+ .
+ make
+}
+
+package() {
+ cd "$srcdir"/luxrender-lux-$_pkgver
+ make DESTDIR="$pkgdir" install
+
+ # fix library path on x86_64
+ [ "$CARCH" = "x86_64" ] && mv "$pkgdir"/usr/lib64 "$pkgdir"/usr/lib
+
+ #install pylux
+ install -D -m644 pylux.so "$pkgdir"/usr/lib/python3.2/pylux.so
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/psutils-libre/.directory b/libre/psutils-libre/.directory
new file mode 100644
index 000000000..60ed4bded
--- /dev/null
+++ b/libre/psutils-libre/.directory
@@ -0,0 +1,2 @@
+[Dolphin]
+Timestamp=2012,4,11,16,24,1
diff --git a/libre/psutils-libre/PKGBUILD b/libre/psutils-libre/PKGBUILD
index 4cb5ac014..25e88f492 100644
--- a/libre/psutils-libre/PKGBUILD
+++ b/libre/psutils-libre/PKGBUILD
@@ -4,6 +4,7 @@
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
# Contributor: xihh <hahj87@gmail.com>
+_pkgname=psutils
pkgname=psutils-libre
pkgver=1.17
pkgrel=3
@@ -11,18 +12,18 @@ arch=('i686' 'x86_64' 'mips64el')
pkgdesc="A set of postscript utilities"
url="http://www.tardis.ed.ac.uk/~ajcd/psutils/index.html"
license=('custom')
-depends=('glibc' 'ghostscript-libre')
+depends=('glibc' 'gnu-ghostscript')
provides=('psutils-lprng' 'psutils')
replaces=('psutils-lprng' 'psutils')
conflicts=('psutils-lprng' 'psutils')
options=('!makeflags')
-source=(http://www.connochaetos.org/misc/${pkgname}-${pkgver}.tar.gz
+source=("ftp://ftp.archlinux.org/other/psutils/${_pkgname}-${pkgver}.tar.gz"
'psutils-1.17.diff')
-md5sums=('5553b70be2484cef7a76d741a26f24d5'
+md5sums=('b161522f3bd1507655326afa7db4a0ad'
'2b49e9e796000b42f42804d4b50a2be1')
build() {
- cd "${srcdir}/${pkgname}"
+ cd "${srcdir}/${_pkgname}"
patch -Np1 -i "${srcdir}/psutils-1.17.diff"
make -f Makefile.unix BINDIR="${pkgdir}/usr/bin" \
INCLUDEDIR="${pkgdir}/usr/include/psutils" PERL=/usr/bin/perl \
@@ -32,12 +33,12 @@ build() {
}
package() {
- cd "${srcdir}/${pkgname}"
+ cd "${srcdir}/${_pkgname}"
install -d -m755 "${pkgdir}/usr/include"
install -d -m755 "${pkgdir}/usr/share/man"
make -f Makefile.unix BINDIR="${pkgdir}/usr/bin" \
INCLUDEDIR="${pkgdir}/usr/include/psutils" PERL=/usr/bin/perl \
MANDIR="${pkgdir}/usr/share/man/man1" install
- install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
- install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/"
+ install -m755 -d "${pkgdir}/usr/share/licenses/${_pkgname}"
+ install -m644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/"
}
diff --git a/libre/psutils-libre/psutils-1.17.diff b/libre/psutils-libre/psutils-1.17.diff
new file mode 100644
index 000000000..4af32bd7f
--- /dev/null
+++ b/libre/psutils-libre/psutils-1.17.diff
@@ -0,0 +1,33 @@
+diff -u -r --new-file psutils.orig/Makefile.unix psutils/Makefile.unix
+--- psutils.orig/Makefile.unix Tue Mar 11 14:52:59 1997
++++ psutils/Makefile.unix Thu Jan 18 20:53:36 2001
+@@ -19,16 +19,16 @@
+ # psnup puts multiple logical pages on one physical page
+ # psresize scales and moves pages to fit on different paper sizes
+
+-PAPER=a4
++PAPER=letter
+
+ # Makefile for PSUtils under Unix
+
+ OS = UNIX
+
+-BINDIR = /usr/local/bin
++BINDIR = /usr/bin
+ SCRIPTDIR = $(BINDIR)
+-INCLUDEDIR = /usr/local/share/psutils
+-PERL = /usr/local/bin/perl
++INCLUDEDIR = /usr/share/psutils
++PERL = /usr/bin/perl
+
+ BINMODE = 0755
+ MANMODE = 0644
+@@ -36,7 +36,7 @@
+ INSTALL = install -c -m $(BINMODE)
+ INSTALLMAN = install -c -m $(MANMODE)
+ MANEXT = 1
+-MANDIR = /usr/local/share/man/man$(MANEXT)
++MANDIR = /usr/man/man$(MANEXT)
+
+ CC = gcc
+ CFLAGS = -DPAPER=\"$(PAPER)\" -DUNIX -O -Wall
diff --git a/libre/seamonkey-libre/PKGBUILD b/libre/seamonkey-libre/PKGBUILD
index 41cd99b4c..8acde2590 100644
--- a/libre/seamonkey-libre/PKGBUILD
+++ b/libre/seamonkey-libre/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 149871 2012-02-11 11:12:41Z ibiru $
+# $Id: PKGBUILD 153522 2012-03-15 14:43:42Z ibiru $
# Maintainer: Jan de Groot <jgc@archlinux.org>
_pkgname=seamonkey
pkgname=seamonkey-libre
-pkgver=2.7.1
+pkgver=2.8
pkgrel=1
pkgdesc="SeaMonkey internet suite, with GNUZilla addons"
arch=('i686' 'x86_64')
@@ -20,12 +20,12 @@ source=(ftp://releases.mozilla.org/pub/mozilla.org/$_pkgname/releases/$pkgver/so
seamonkey-2.0-lang.patch
libvpx.patch
gnuzilla-addons.patch)
-md5sums=('a16764e55ef8e59c469dc44b63459ad6'
+md5sums=('a7128f6bcd16bebed4a7c3487b69c38f'
'd02b5f002a7cdf8d15dccd2548d09256'
'6119a2254716752c9d08e366f8d4c048'
'25b6fe16ac24cd5c852213e5c1adb272'
'5b2aaff7dfe7f1f94ad965905b20e782'
- '4347c7be7e48a9987765552f4f6362bc')
+ 'f7beeb1f94390957259212dd1dbc171f')
build() {
cd "$srcdir/comm-release"
diff --git a/libre/seamonkey-libre/gnuzilla-addons.patch b/libre/seamonkey-libre/gnuzilla-addons.patch
index ae95052c5..32a28b3e4 100644
--- a/libre/seamonkey-libre/gnuzilla-addons.patch
+++ b/libre/seamonkey-libre/gnuzilla-addons.patch
@@ -1,11 +1,12 @@
-diff -ru comm-release.orig/suite/browser/browser-prefs.js comm-release/suite/browser/browser-prefs.js
---- comm-release.orig/suite/browser/browser-prefs.js 2012-02-12 21:59:22.006597211 +0100
-+++ comm-release/suite/browser/browser-prefs.js 2012-02-12 22:03:37.727232650 +0100
-@@ -587,10 +587,10 @@
+diff -Naur comm-release.orig/suite/browser/browser-prefs.js comm-release/suite/browser/browser-prefs.js
+--- comm-release.orig/suite/browser/browser-prefs.js 2012-03-13 02:23:17.000000000 -0300
++++ comm-release/suite/browser/browser-prefs.js 2012-04-11 01:57:44.005731215 -0300
+@@ -587,11 +587,10 @@
// Preferences for AMO integration
pref("extensions.getAddons.cache.enabled", true); // also toggles personalized recommendations
pref("extensions.getAddons.maxResults", 15);
--pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/guid:%IDS%?src=seamonkey&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
+-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/guid:%IDS%?src=seamonkey&appOS=%OS%&appVersion=%VERSION%");
+-pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/guid:%IDS%?src=seamonkey&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/%APP%/search?q=%TERMS%");
-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=seamonkey");
-pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/%APP%/discovery/pane/%VERSION%/%OS%");
@@ -16,7 +17,7 @@ diff -ru comm-release.orig/suite/browser/browser-prefs.js comm-release/suite/bro
// getMoreThemes is used by our UI under our switch theme menu
pref("extensions.getMoreThemesURL", "chrome://branding/locale/brand.properties");
-@@ -715,7 +715,7 @@
+@@ -716,7 +715,7 @@
#endif
// plugin finder service url
@@ -25,4 +26,3 @@ diff -ru comm-release.orig/suite/browser/browser-prefs.js comm-release/suite/bro
pref("plugins.update.url", "http://www.mozilla.com/%LOCALE%/plugincheck/");
pref("plugins.update.notifyUser", false);
pref("plugins.hide_infobar_for_outdated_plugin", false);
-Tylko w comm-release/suite/browser: browser-prefs.js~
diff --git a/libre/thunderbird-libre/PKGBUILD b/libre/thunderbird-libre/PKGBUILD
index 21e0f4cec..c27851dcd 100644
--- a/libre/thunderbird-libre/PKGBUILD
+++ b/libre/thunderbird-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 153450 2012-03-14 16:21:51Z ibiru $
+# $Id: PKGBUILD 155759 2012-04-06 07:48:34Z ibiru $
# Maintainer : Ionut Biru <ibiru@archlinux.org>
# Contributor: Alexander Baldeck <alexander@archlinux.org>
# Contributor: Dale Blount <dale@archlinux.org>
@@ -7,7 +7,7 @@
pkgname=thunderbird-libre
pkgver=11.0.1
-pkgrel=1
+pkgrel=2
pkgdesc="Standalone Mail/News reader"
arch=('i686' 'x86_64')
license=('MPL' 'GPL')
@@ -25,19 +25,25 @@ source=(ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/sourc
thunderbird-install-dir.patch
channel-prefs.js
vendor.js
- libvpx.patch)
+ libvpx.patch
+ gcc47.patch
+ clrf.patch)
md5sums=('b500560a006cb10194281263c78841f2'
- 'ca98c2bf1017b33e19dae22fdcef2e73'
+ '41511a6bcdd04cf56706218e4670e631'
'af3e5b344d2edf1c7d61bb0a5a96de9a'
'aea906acf72c43dd82ead2fabcc1c6db'
'476ec205162340fb0679f522c9d31c3b'
'5a53179d14ae9631b7afe5e4d0fc0b25'
- '5b2aaff7dfe7f1f94ad965905b20e782')
+ '5b2aaff7dfe7f1f94ad965905b20e782'
+ '07b255039a2ffbcab5b5be7986245e36'
+ '5c8d79a9f1ecadffa818205ce1c23f2f')
build() {
cd "$srcdir/comm-release"
patch -Np1 -i "$srcdir/thunderbird-install-dir.patch"
patch -Np1 -i "$srcdir/libvpx.patch"
+ patch -Np1 -i "$srcdir/gcc47.patch"
+ patch -Np2 -i "$srcdir/clrf.patch"
cp "$srcdir/mozconfig" .mozconfig
diff --git a/libre/thunderbird-libre/clrf.patch b/libre/thunderbird-libre/clrf.patch
new file mode 100644
index 000000000..9b6fcb8fb
--- /dev/null
+++ b/libre/thunderbird-libre/clrf.patch
@@ -0,0 +1,265 @@
+diff -up thunderbird-11.0/comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp.733867 thunderbird-11.0/comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp
+--- thunderbird-11.0/comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp.733867 2012-03-13 03:37:12.000000000 +0100
++++ thunderbird-11.0/comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp 2012-03-16 07:20:29.299342799 +0100
+@@ -688,7 +688,7 @@ nsresult nsMsgSearchAdapter::EncodeImapV
+ PL_strcat(encoding, "{");
+ lengthStr.AppendInt((PRInt32) strlen(value));
+ PL_strcat(encoding, lengthStr.get());
+- PL_strcat(encoding, "}"CRLF);
++ PL_strcat(encoding, "}" CRLF);
+ PL_strcat(encoding, value);
+ return NS_OK;
+ }
+diff -up thunderbird-11.0/comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp.733867 thunderbird-11.0/comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp
+--- thunderbird-11.0/comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp.733867 2012-03-13 03:37:13.000000000 +0100
++++ thunderbird-11.0/comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp 2012-03-16 07:20:29.300342735 +0100
+@@ -753,7 +753,7 @@ nsFolderCompactState::OnDataAvailable(ns
+ }
+ }
+ }
+-#define EXTRA_KEYWORD_HDR " "MSG_LINEBREAK
++#define EXTRA_KEYWORD_HDR " " MSG_LINEBREAK
+
+ // if status offset isn't in the first block, this code won't work. There's no good reason
+ // for the status offset not to be at the beginning of the message anyway.
+@@ -1203,7 +1203,7 @@ nsOfflineStoreCompactState::OnDataAvaila
+ // check if there's an envelope header; if not, write one.
+ if (strncmp(m_dataBuffer, "From ", 5))
+ {
+- m_fileStream->Write("From "CRLF, 7, &bytesWritten);
++ m_fileStream->Write("From " CRLF, 7, &bytesWritten);
+ m_offlineMsgSize += bytesWritten;
+ }
+ }
+diff -up thunderbird-11.0/comm-release/mailnews/compose/src/nsSmtpProtocol.cpp.733867 thunderbird-11.0/comm-release/mailnews/compose/src/nsSmtpProtocol.cpp
+--- thunderbird-11.0/comm-release/mailnews/compose/src/nsSmtpProtocol.cpp.733867 2012-03-13 03:37:13.000000000 +0100
++++ thunderbird-11.0/comm-release/mailnews/compose/src/nsSmtpProtocol.cpp 2012-03-16 07:23:01.225877457 +0100
+@@ -1722,7 +1722,7 @@ PRInt32 nsSmtpProtocol::SendQuit()
+ {
+ m_sendDone = PR_TRUE;
+ nsCOMPtr<nsIURI> url = do_QueryInterface(m_runningURL);
+- SendData(url, "QUIT"CRLF); // send a quit command to close the connection with the server.
++ SendData(url, "QUIT" CRLF); // send a quit command to close the connection with the server.
+ m_nextState = SMTP_RESPONSE;
+ m_nextStateAfterResponse = SMTP_DONE;
+ return(0);
+@@ -1969,7 +1969,7 @@ nsresult nsSmtpProtocol::LoadUrl(nsIURI
+ {
+ nsCOMPtr<nsIURI> url = do_QueryInterface(m_runningURL);
+ // send a quit command to close the connection with the server.
+- if (SendData(url, "QUIT"CRLF) == NS_OK)
++ if (SendData(url, "QUIT" CRLF) == NS_OK)
+ {
+ m_nextState = SMTP_RESPONSE;
+ m_nextStateAfterResponse = SMTP_ERROR_DONE;
+@@ -2118,4 +2118,3 @@ nsSmtpProtocol::GetUsernamePassword(nsAC
+ NS_ENSURE_SUCCESS(rv,rv);
+ return rv;
+ }
+-
+diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapMailFolder.cpp.733867 thunderbird-11.0/comm-release/mailnews/imap/src/nsImapMailFolder.cpp
+--- thunderbird-11.0/comm-release/mailnews/imap/src/nsImapMailFolder.cpp.733867 2012-03-13 03:37:13.000000000 +0100
++++ thunderbird-11.0/comm-release/mailnews/imap/src/nsImapMailFolder.cpp 2012-03-16 07:20:29.309342162 +0100
+@@ -8298,7 +8298,7 @@ nsImapMailFolder::CopyFileToOfflineStore
+ bool needMoreData = false;
+ char * newLine = nsnull;
+ PRUint32 numBytesInLine = 0;
+- const char *envelope = "From "CRLF;
++ const char *envelope = "From " CRLF;
+ offlineStore->Write(envelope, strlen(envelope), &bytesWritten);
+ fileSize += bytesWritten;
+ do
+diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp.733867 thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp
+--- thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp.733867 2012-03-13 03:37:13.000000000 +0100
++++ thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp 2012-03-16 07:20:29.314341844 +0100
+@@ -1410,7 +1410,7 @@ void nsImapProtocol::HandleIdleResponses
+ {
+ // PRInt32 oldRecent = GetServerStateParser().NumberOfRecentMessages();
+ nsCAutoString commandBuffer(GetServerCommandTag());
+- commandBuffer.Append(" IDLE"CRLF);
++ commandBuffer.Append(" IDLE" CRLF);
+
+ do
+ {
+@@ -3290,7 +3290,7 @@ void nsImapProtocol::FetchMsgAttribute(c
+ commandString.Append(messageIds);
+ commandString.Append(" (");
+ commandString.Append(attribute);
+- commandString.Append(")"CRLF);
++ commandString.Append(")" CRLF);
+ nsresult rv = SendData(commandString.get());
+
+ if (NS_SUCCEEDED(rv))
+@@ -5283,7 +5283,7 @@ nsImapProtocol::Expunge()
+
+ IncrementCommandTagNumber();
+ nsCAutoString command(GetServerCommandTag());
+- command.Append(" expunge"CRLF);
++ command.Append(" expunge" CRLF);
+
+ nsresult rv = SendData(command.get());
+ if (NS_SUCCEEDED(rv))
+@@ -5359,7 +5359,7 @@ void nsImapProtocol::ID()
+ command.Append(gAppName);
+ command.Append("\" \"version\" \"");
+ command.Append(gAppVersion);
+- command.Append("\")"CRLF);
++ command.Append("\")" CRLF);
+
+ nsresult rv = SendData(command.get());
+ if (NS_SUCCEEDED(rv))
+@@ -5816,7 +5816,7 @@ nsresult nsImapProtocol::AuthLogin(const
+ nsCAutoString correctedPassword;
+ EscapeUserNamePasswordString(password.get(), &correctedPassword);
+ command.Append(correctedPassword);
+- command.Append("\""CRLF);
++ command.Append("\"" CRLF);
+ rv = SendData(command.get(), PR_TRUE /* suppress logging */);
+ NS_ENSURE_SUCCESS(rv, rv);
+ ParseIMAPandCheckForNewMail();
+@@ -7446,7 +7446,7 @@ void nsImapProtocol::CreateMailbox(const
+ nsCString command(GetServerCommandTag());
+ command += " create \"";
+ command += escapedName;
+- command += "\""CRLF;
++ command += "\"" CRLF;
+
+ nsresult rv = SendData(command.get());
+ if(NS_SUCCEEDED(rv))
+@@ -7549,7 +7549,7 @@ void nsImapProtocol::Lsub(const char *ma
+ nsCString command (GetServerCommandTag());
+ command += " lsub \"\" \"";
+ command += escapedPattern;
+- command += "\""CRLF;
++ command += "\"" CRLF;
+
+ PR_Free(boxnameWithOnlineDirectory);
+
+@@ -7578,7 +7578,7 @@ void nsImapProtocol::List(const char *ma
+ command += useXLIST ?
+ " xlist \"\" \"" : " list \"\" \"";
+ command += escapedPattern;
+- command += "\""CRLF;
++ command += "\"" CRLF;
+
+ PR_Free(boxnameWithOnlineDirectory);
+
+@@ -7599,7 +7599,7 @@ void nsImapProtocol::Subscribe(const cha
+ nsCString command (GetServerCommandTag());
+ command += " subscribe \"";
+ command += escapedName;
+- command += "\""CRLF;
++ command += "\"" CRLF;
+
+ nsresult rv = SendData(command.get());
+ if (NS_SUCCEEDED(rv))
+@@ -7617,7 +7617,7 @@ void nsImapProtocol::Unsubscribe(const c
+ nsCString command (GetServerCommandTag());
+ command += " unsubscribe \"";
+ command += escapedName;
+- command += "\""CRLF;
++ command += "\"" CRLF;
+
+ nsresult rv = SendData(command.get());
+ if (NS_SUCCEEDED(rv))
+@@ -7631,7 +7631,7 @@ void nsImapProtocol::Idle()
+ if (m_urlInProgress)
+ return;
+ nsCAutoString command (GetServerCommandTag());
+- command += " IDLE"CRLF;
++ command += " IDLE" CRLF;
+ nsresult rv = SendData(command.get());
+ if (NS_SUCCEEDED(rv))
+ {
+@@ -7658,7 +7658,7 @@ void nsImapProtocol::EndIdle(bool waitFo
+ nsCOMPtr <nsIAsyncInputStream> asyncInputStream = do_QueryInterface(m_inputStream);
+ if (asyncInputStream)
+ asyncInputStream->AsyncWait(nsnull, 0, 0, nsnull);
+- nsresult rv = SendData("DONE"CRLF);
++ nsresult rv = SendData("DONE" CRLF);
+ // set a short timeout if we don't want to wait for a response
+ if (m_transport && !waitForResponse)
+ m_transport->SetTimeout(nsISocketTransport::TIMEOUT_READ_WRITE, 5);
+@@ -7727,8 +7727,8 @@ void nsImapProtocol::Copy(const char * m
+ PRUint32 msgsHandled = 0;
+ const char *formatString;
+ formatString = (idsAreUid)
+- ? "%s uid store %s %s"CRLF
+- : "%s store %s %s"CRLF;
++ ? "%s uid store %s %s" CRLF
++ : "%s store %s %s" CRLF;
+
+ do
+ {
+diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp.733867 thunderbird-11.0/comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp
+--- thunderbird-11.0/comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp.733867 2012-03-13 03:37:13.000000000 +0100
++++ thunderbird-11.0/comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp 2012-03-16 07:20:29.316341717 +0100
+@@ -185,7 +185,7 @@ void nsImapServerResponseParser::ParseIM
+
+ NS_ASSERTION(aCurrentCommand && *aCurrentCommand != '\r' &&
+ *aCurrentCommand != '\n' && *aCurrentCommand != ' ', "Invailid command string");
+- bool sendingIdleDone = !strcmp(aCurrentCommand, "DONE"CRLF);
++ bool sendingIdleDone = !strcmp(aCurrentCommand, "DONE" CRLF);
+ if (sendingIdleDone)
+ fWaitingForMoreClientInput = PR_FALSE;
+
+diff -up thunderbird-11.0/comm-release/mailnews/local/src/nsPop3Protocol.cpp.733867 thunderbird-11.0/comm-release/mailnews/local/src/nsPop3Protocol.cpp
+--- thunderbird-11.0/comm-release/mailnews/local/src/nsPop3Protocol.cpp.733867 2012-03-13 03:37:13.000000000 +0100
++++ thunderbird-11.0/comm-release/mailnews/local/src/nsPop3Protocol.cpp 2012-03-16 07:23:38.980300990 +0100
+@@ -2483,7 +2483,7 @@ PRInt32 nsPop3Protocol::SendList()
+ return(MK_OUT_OF_MEMORY);
+ m_pop3ConData->next_state_after_response = POP3_GET_LIST;
+ m_listpos = 0;
+- return SendData(m_url, "LIST"CRLF);
++ return SendData(m_url, "LIST" CRLF);
+ }
+
+
+diff -up thunderbird-11.0/comm-release/mailnews/mime/src/mimedrft.cpp.733867 thunderbird-11.0/comm-release/mailnews/mime/src/mimedrft.cpp
+--- thunderbird-11.0/comm-release/mailnews/mime/src/mimedrft.cpp.733867 2012-03-13 03:37:13.000000000 +0100
++++ thunderbird-11.0/comm-release/mailnews/mime/src/mimedrft.cpp 2012-03-16 07:20:29.320341461 +0100
+@@ -1473,7 +1473,7 @@ mime_parse_stream_complete (nsMIMESessio
+ *newbody = 0;
+ PL_strcatn(newbody, newbodylen, "<PRE>");
+ PL_strcatn(newbody, newbodylen, body);
+- PL_strcatn(newbody, newbodylen, "</PRE>"CRLF);
++ PL_strcatn(newbody, newbodylen, "</PRE>" CRLF);
+ PR_Free(body);
+ body = newbody;
+ }
+diff -up thunderbird-11.0/comm-release/mailnews/mime/src/mimemult.cpp.733867 thunderbird-11.0/comm-release/mailnews/mime/src/mimemult.cpp
+--- thunderbird-11.0/comm-release/mailnews/mime/src/mimemult.cpp.733867 2012-03-13 03:37:13.000000000 +0100
++++ thunderbird-11.0/comm-release/mailnews/mime/src/mimemult.cpp 2012-03-16 07:20:29.321341397 +0100
+@@ -280,7 +280,7 @@ MimeMultipart_parse_line (const char *li
+ MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK));
+ MimeWriteAString(obj, NS_LITERAL_CSTRING("Content-Disposition: attachment; filename=\""));
+ MimeWriteAString(obj, fileName);
+- MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK));
++ MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK));
+ MimeWriteAString(obj, NS_LITERAL_CSTRING("X-Mozilla-External-Attachment-URL: "));
+ MimeWriteAString(obj, obj->options->state->detachedFilePath);
+ MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK));
+@@ -293,10 +293,10 @@ MimeMultipart_parse_line (const char *li
+ status = MimeWriteAString(obj, header);
+ if (status < 0)
+ return status;
+- status = MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK"Content-Transfer-Encoding: 8bit"MSG_LINEBREAK));
++ status = MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK "Content-Transfer-Encoding: 8bit" MSG_LINEBREAK));
+ MimeWriteAString(obj, NS_LITERAL_CSTRING("Content-Disposition: inline; filename=\"Deleted: "));
+ MimeWriteAString(obj, fileName);
+- MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK"X-Mozilla-Altered: AttachmentDeleted; date=\""));
++ MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK "X-Mozilla-Altered: AttachmentDeleted; date=\""));
+ }
+ nsCString result;
+ char timeBuffer[128];
+@@ -306,8 +306,8 @@ MimeMultipart_parse_line (const char *li
+ "%a %b %d %H:%M:%S %Y",
+ &now);
+ MimeWriteAString(obj, nsDependentCString(timeBuffer));
+- MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK));
+- MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK"You deleted an attachment from this message. The original MIME headers for the attachment were:"MSG_LINEBREAK));
++ MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK));
++ MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK "You deleted an attachment from this message. The original MIME headers for the attachment were:" MSG_LINEBREAK));
+ MimeHeaders_write_raw_headers(mult->hdrs, obj->options, PR_FALSE);
+ }
+ PRInt32 old_nchildren = container->nchildren;
diff --git a/libre/thunderbird-libre/gcc47.patch b/libre/thunderbird-libre/gcc47.patch
new file mode 100644
index 000000000..3e1e9b98a
--- /dev/null
+++ b/libre/thunderbird-libre/gcc47.patch
@@ -0,0 +1,63 @@
+diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/file_util.cc comm-release/mozilla/ipc/chromium/src/base/file_util.cc
+--- comm-release.orig/mozilla/ipc/chromium/src/base/file_util.cc 2012-04-03 18:38:11.474783536 +0000
++++ comm-release/mozilla/ipc/chromium/src/base/file_util.cc 2012-04-03 18:43:29.218995578 +0000
+@@ -8,7 +8,7 @@
+ #include <io.h>
+ #endif
+ #include <stdio.h>
+-#if defined(ANDROID)
++#if defined(ANDROID) || defined(OS_POSIX)
+ #include <unistd.h>
+ #endif
+
+diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/file_util_linux.cc comm-release/mozilla/ipc/chromium/src/base/file_util_linux.cc
+--- comm-release.orig/mozilla/ipc/chromium/src/base/file_util_linux.cc 2012-04-03 18:38:11.381450924 +0000
++++ comm-release/mozilla/ipc/chromium/src/base/file_util_linux.cc 2012-04-03 18:43:29.218995578 +0000
+@@ -5,6 +5,9 @@
+ #include "base/file_util.h"
+
+ #include <fcntl.h>
++#if defined(ANDROID) || defined(OS_POSIX)
++#include <unistd.h>
++#endif
+
+ #include <string>
+ #include <vector>
+diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/message_pump_libevent.cc comm-release/mozilla/ipc/chromium/src/base/message_pump_libevent.cc
+--- comm-release.orig/mozilla/ipc/chromium/src/base/message_pump_libevent.cc 2012-04-03 18:38:11.438117153 +0000
++++ comm-release/mozilla/ipc/chromium/src/base/message_pump_libevent.cc 2012-04-03 18:43:29.218995578 +0000
+@@ -6,6 +6,9 @@
+
+ #include <errno.h>
+ #include <fcntl.h>
++#if defined(ANDROID) || defined(OS_POSIX)
++#include <unistd.h>
++#endif
+
+ #include "eintr_wrapper.h"
+ #include "base/logging.h"
+diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/time_posix.cc comm-release/mozilla/ipc/chromium/src/base/time_posix.cc
+--- comm-release.orig/mozilla/ipc/chromium/src/base/time_posix.cc 2012-04-03 18:38:11.418117308 +0000
++++ comm-release/mozilla/ipc/chromium/src/base/time_posix.cc 2012-04-03 18:43:29.218995578 +0000
+@@ -14,6 +14,8 @@
+ #include <time.h>
+ #endif
+
++#include <unistd.h>
++
+ #include <limits>
+
+ #include "base/basictypes.h"
+diff -Nur comm-release.orig/mozilla/toolkit/crashreporter/client/Makefile.in comm-release/mozilla/toolkit/crashreporter/client/Makefile.in
+--- comm-release.orig/mozilla/toolkit/crashreporter/client/Makefile.in 2012-04-03 18:38:56.101105510 +0000
++++ comm-release/mozilla/toolkit/crashreporter/client/Makefile.in 2012-04-03 18:43:29.218995578 +0000
+@@ -69,6 +69,9 @@
+ $(STDCXX_COMPAT) \
+ $(NULL)
+
++# Needed for moz_free
++LIBS += -L$(LIBXUL_DIST)/lib -lmozalloc
++
+ ifeq ($(OS_ARCH),WINNT)
+ CPPSRCS += crashreporter_win.cpp
+ LIBS += \
diff --git a/libre/thunderbird-libre/mozconfig b/libre/thunderbird-libre/mozconfig
index 85ed8a648..8950db703 100644
--- a/libre/thunderbird-libre/mozconfig
+++ b/libre/thunderbird-libre/mozconfig
@@ -16,7 +16,7 @@ ac_add_options --with-system-libvpx
ac_add_options --enable-system-hunspell
ac_add_options --enable-system-sqlite
ac_add_options --enable-system-ffi
-ac_add_options --enable-system-cairo
+#ac_add_options --enable-system-cairo
ac_add_options --enable-system-pixman
ac_add_options --with-pthreads
diff --git a/libre/unarchiver/PKGBUILD b/libre/unarchiver/PKGBUILD
index f0a08e8d1..9c0cf3978 100644
--- a/libre/unarchiver/PKGBUILD
+++ b/libre/unarchiver/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=unarchiver
pkgver=3.0
-pkgrel=1
+pkgrel=1.1
pkgdesc="An Objective-C application for uncompressing archive files"
arch=('x86_64' 'i686')
url="http://wakaba.c3.cx/s/apps/unarchiver.html"
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index 9384e9c1e..82bf28b8b 100644
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 63763 2012-02-05 12:13:00Z ibiru $
+# $Id$
# Maintainer (Parabola): Nicolas Reynolds <fauno@kiwwwi.com.ar>
# Maintainer (Parabola): Jorge López <jorginho@adinet.com.uy>
# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
@@ -11,8 +11,8 @@
#Maintainer: Ionut Biru <ibiru@archlinux.org>
pkgbase=virtualbox-libre
pkgname=('virtualbox-libre' 'virtualbox-parabola-additions' 'virtualbox-sdk' 'virtualbox-source')
-pkgver=4.1.10
-pkgrel=1.1
+pkgver=4.1.12
+pkgrel=1
arch=('i686' 'x86_64')
url='http://virtualbox.org'
license=('GPL' 'custom')
@@ -21,22 +21,10 @@ makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libxcursor
#'xorg-server-devel' 'xf86driproto' 'libxcomposite')
[[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc')
source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2
- 10-vboxdrv.rules vboxdrv-reference.patch gsoap.patch LocalConfig.kmk vboxbuild
+ 10-vboxdrv.rules vboxdrv-reference.patch LocalConfig.kmk vboxbuild
change_default_driver_dir.patch vbox-service.conf vbox-service.rc
vboxweb.conf vboxweb.rc)
-md5sums=('263e495ef3a7ab75943af28d446ee702'
- '5f85710e0b8606de967716ded7b2d351'
- '755ab0dd9bcacf2c00d2275b1ca69547'
- 'b9f4da759d23b60b69b12005213c3aa7'
- 'a1ff1d1b4423556887e48a32978226a6'
- '3c96faa76894c182c1bb56bb30d9a17e'
- '97e193f050574dd272a38e5ee5ebe62b'
- '3c08ad30b89add47d3f45121200a5360'
- '208cf5f842eb2e3a5b6dcfc59080d26c'
- '3ac185709bfe688bb753c46e170d0546'
- 'c159d683ba1947290fc2ad2c64194150')
-
_extramodules=extramodules-3.3-LIBRE
_kernver="$(cat /lib/modules/${_extramodules}/version)"
@@ -45,7 +33,6 @@ build() {
patch -Np1 -i "$srcdir/vboxdrv-reference.patch"
patch -Np1 -i "$srcdir/change_default_driver_dir.patch"
- patch -Np0 -i "$srcdir//gsoap.patch"
cp "$srcdir/LocalConfig.kmk" .
@@ -66,7 +53,8 @@ package_virtualbox-libre() {
optdepends=('qt: for VirtualBox GUI'
'vde2: Virtual Distributed Ethernet support'
'virtualbox-sdk: developer kit'
- 'virtualbox-source: host kernel source modules for non-stock kernels')
+ 'virtualbox-source: host kernel source modules for non-stock kernels'
+ 'net-tools: for host-only or bridged networking')
backup=('etc/vbox/vbox.cfg')
replaces=('virtualbox' 'virtualbox-ose')
@@ -206,4 +194,13 @@ package_virtualbox-parabola-additions(){
# install sample config
install -D -m644 "$srcdir/vbox-service.conf" "$pkgdir/etc/conf.d/vbox-service"
}
-
+md5sums=('4e385d2333e1a4832e5618b982fddee5'
+ '5f85710e0b8606de967716ded7b2d351'
+ '755ab0dd9bcacf2c00d2275b1ca69547'
+ 'a1ff1d1b4423556887e48a32978226a6'
+ '3c96faa76894c182c1bb56bb30d9a17e'
+ '97e193f050574dd272a38e5ee5ebe62b'
+ '3c08ad30b89add47d3f45121200a5360'
+ '208cf5f842eb2e3a5b6dcfc59080d26c'
+ '3ac185709bfe688bb753c46e170d0546'
+ 'c159d683ba1947290fc2ad2c64194150')
diff --git a/libre/virtualbox-libre/virtualbox.install b/libre/virtualbox-libre/virtualbox.install
index 6c9baa21e..29646e973 100644
--- a/libre/virtualbox-libre/virtualbox.install
+++ b/libre/virtualbox-libre/virtualbox.install
@@ -20,7 +20,7 @@ post_install() {
post_upgrade() {
getent group vboxusers >> /dev/null || usr/sbin/groupadd -g 108 vboxusers
utils
- if [ "$(vercmp $2 4.1.10-1)" -lt 0 ]; then
+ if [ "$(vercmp $2 4.1.6-1)" -lt 0 ]; then
/bin/cat << EOF
===> Starting with virtualbox version 4.1.6-1, kernel modules handling is done by virtualbox-modules.
===> Use virtualbox-source package if you don't use our stock linux-libre package.
diff --git a/libre/virtualbox-modules/PKGBUILD b/libre/virtualbox-modules/PKGBUILD
index cd27b74a8..60a903615 100644
--- a/libre/virtualbox-modules/PKGBUILD
+++ b/libre/virtualbox-modules/PKGBUILD
@@ -5,19 +5,19 @@
pkgbase=virtualbox-modules
pkgname=('virtualbox-modules' 'virtualbox-parabola-modules')
-pkgver=4.1.10
-pkgrel=2.1
+pkgver=4.1.12
+pkgrel=2
arch=('i686' 'x86_64')
url='http://virtualbox.org'
license=('GPL')
+makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libpng' 'libidl2' 'xalan-c' 'sdl' 'linux-libre-headers')
replaces=('virtualbox-modules')
conflicts=('virtualbox-modules')
provides=("virtualbox-modules=$pkgver")
-makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libpng' 'libidl2' 'xalan-c' 'sdl' 'linux-libre-headers')
[[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc')
source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2
LocalConfig.kmk 60-vboxguest.rules)
-md5sums=('263e495ef3a7ab75943af28d446ee702'
+md5sums=('4e385d2333e1a4832e5618b982fddee5'
'4c88bd122677a35f68abd76eb01b378b'
'ed1341881437455d9735875ddf455fbe')
diff --git a/libre/virtualbox-modules/virtualbox-libre-modules.install b/libre/virtualbox-modules/virtualbox-libre-modules.install
deleted file mode 100644
index b542db1ca..000000000
--- a/libre/virtualbox-modules/virtualbox-libre-modules.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install() {
-cat << EOF
-===> You may want to load vboxguest, vboxsf and vboxvideo
-EOF
- EXTRAMODULES='extramodules-3.2-LIBRE'
- depmod $(cat /lib/modules/$EXTRAMODULES/version)
-}
-
-post_upgrade() {
- EXTRAMODULES='extramodules-3.2-LIBRE'
- depmod $(cat /lib/modules/$EXTRAMODULES/version)
-}
-
-post_remove() {
- EXTRAMODULES='extramodules-3.2-LIBRE'
- depmod $(cat /lib/modules/$EXTRAMODULES/version)
-}
diff --git a/libre/xarchiver-libre/PKGBUILD b/libre/xarchiver-libre/PKGBUILD
index 001873ad3..87d775d4e 100644
--- a/libre/xarchiver-libre/PKGBUILD
+++ b/libre/xarchiver-libre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 121261 2011-04-29 22:06:13Z andyrtr $
+# $Id: PKGBUILD 154769 2012-03-30 16:45:24Z pierre $
# Maintainer: Alexander Fehr <pizzapunk gmail com>
# Contributor: Andrew Simmons <andrew.simmons@gmail.com>
_pkgname=xarchiver
pkgname=xarchiver-libre
pkgver=0.5.2
-pkgrel=4
+pkgrel=5
pkgdesc="GTK+ frontend to various command line archivers"
arch=('i686' 'x86_64')
url="http://xarchiver.sourceforge.net"
@@ -21,10 +21,11 @@ optdepends=('tar: TAR support'
'bzip2: BZIP2 support'
'zip: ZIP support'
'unzip: ZIP support'
+ 'ununrar: RAR support'
'p7zip: 7z support'
'arj: ARJ support'
'lha: LHA support'
- 'lzma-utils: LZMA support'
+ 'xz: LZMA support'
'lzop: LZOP support')
options=('!libtool')
install=xarchiver.install
diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-fix_7z_support.patch b/libre/xarchiver-libre/xarchiver-0.5.2-fix_7z_support.patch
index ad5b51b59..f7ff098c0 100644
--- a/libre/xarchiver-libre/xarchiver-0.5.2-fix_7z_support.patch
+++ b/libre/xarchiver-libre/xarchiver-0.5.2-fix_7z_support.patch
@@ -108,4 +108,3 @@ diff -Nur xarchiver-0.5.2.orig/src/7zip.c xarchiver-0.5.2/src/7zip.c
entry = xa_set_archive_entries_for_each_row (archive,filename,item);
g_free(filename);
}
-
diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-rpm2cpio.patch b/libre/xarchiver-libre/xarchiver-0.5.2-rpm2cpio.patch
index bd6df9731..d962a44af 100644
--- a/libre/xarchiver-libre/xarchiver-0.5.2-rpm2cpio.patch
+++ b/libre/xarchiver-libre/xarchiver-0.5.2-rpm2cpio.patch
@@ -82,4 +82,3 @@ diff -up ./src/rpm.c.rpm2cpio ./src/rpm.c
list = NULL;
list = g_slist_append(list,command);
result = xa_run_command (archive,list);
-
diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-segfault-open-with.patch b/libre/xarchiver-libre/xarchiver-0.5.2-segfault-open-with.patch
index ab907419d..e29d40c41 100644
--- a/libre/xarchiver-libre/xarchiver-0.5.2-segfault-open-with.patch
+++ b/libre/xarchiver-libre/xarchiver-0.5.2-segfault-open-with.patch
@@ -13,4 +13,3 @@ diff -pur xarchiver-0.5.2/src/open-with-dlg.c xarchiver-0.5.2.new/src/open-with-
gtk_tree_model_get(model,&iter,2,&exec,-1);
gtk_entry_set_text(GTK_ENTRY(data->custom_command_entry),exec);
-
diff --git a/libre/your-freedom/your-freedom.install b/libre/your-freedom/your-freedom.install
index 49ae04510..50988f587 100644
--- a/libre/your-freedom/your-freedom.install
+++ b/libre/your-freedom/your-freedom.install
@@ -19,7 +19,7 @@ pre_install() {
* Etc.
Please report back to the Parabola Project on the usual channels:
- * http://bugs.parabolagnulinux.org
+ * https://bugs.parabolagnulinux.org
* irc://freenode.net/#parabola
* mailto:dev@list.parabolagnulinux.org
EOM
diff --git a/social/hunspell-pt-br/.directory b/social/hunspell-pt-br/.directory
new file mode 100644
index 000000000..dcad2ff51
--- /dev/null
+++ b/social/hunspell-pt-br/.directory
@@ -0,0 +1,2 @@
+[Dolphin]
+Timestamp=2012,4,7,5,22,50
diff --git a/social/hunspell-pt-br/PKGBUILD b/social/hunspell-pt-br/PKGBUILD
new file mode 100644
index 000000000..35e1dc887
--- /dev/null
+++ b/social/hunspell-pt-br/PKGBUILD
@@ -0,0 +1,27 @@
+# Maintainer: Daniel Felipe Reis Apolinario <dapolinario@gmail.com>
+# Contributor: Bernardo Barros <bernardobarros@NOSPAM.gmail.com>
+# Contributor: Robson R S Peixoto <robsonpeixoto@gmail.com>
+# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+
+pkgname=hunspell-pt-br
+pkgver=2.0.9
+pkgrel=1
+pkgdesc="Portuguese (Brazil) hunspell dictionary"
+arch=(any)
+url="http://www.broffice.org/verortografico/"
+license=('LGPL-2.1')
+optdepends=('hunspell: the spell checking libraries and apps')
+source=(http://www.broffice.org/files/Vero_pt_BR_V209AOC.oxt)
+
+build() {
+ cd ${srcdir}
+ install -D -m644 pt_BR.dic $pkgdir/usr/share/hunspell/pt_BR.dic
+ install -D -m644 pt_BR.aff $pkgdir/usr/share/hunspell/pt_BR.aff
+ mkdir -p $pkgdir/usr/share/myspell/dicts
+ cd $pkgdir/usr/share/myspell/dicts
+
+ ln -s /usr/share/hunspell/pt_BR.dic pt_BR.dic
+ ln -s /usr/share/hunspell/pt_BR.aff pt_BR.aff
+}
+
+md5sums=('47313490f1a21c87b6d5fb5655042e22')
diff --git a/social/mednafen-wip/PKGBUILD b/social/mednafen-wip/PKGBUILD
new file mode 100755
index 000000000..a405d2ceb
--- /dev/null
+++ b/social/mednafen-wip/PKGBUILD
@@ -0,0 +1,31 @@
+# Maintainer: Hans-Kristian Arntzen <maister@archlinux.us>
+# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
+# Contributor: kagan <juanynie@mi.madritel.es>
+# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+
+pkgname=mednafen-wip
+pkgver=0.9.21
+pkgrel=1
+pkgdesc="A command-line multi-system gaming emulator, WIP version"
+url="http://mednafen.sourceforge.net/"
+license=(GPL)
+arch=('i686' 'x86_64')
+depends=('libcdio>=0.82' 'libsamplerate' 'libogg' 'libvorbis' 'sdl' 'sdl_net' 'libsndfile' 'zlib')
+makedepends=('pkgconfig' 'mesa')
+conflicts=('mednafen')
+provides=('mednafen')
+source=('http://forum.fobby.net/index.php?t=getfile&id=358&')
+sha1sums=('983c349ca991190363b713ac8abf7ae78b081a21')
+
+build()
+{
+ cd $srcdir/mednafen
+ ./configure --prefix=/usr
+ make
+}
+
+package()
+{
+ cd $srcdir/mednafen
+ make DESTDIR=$pkgdir install
+}
diff --git a/social/seeks/PKGBUILD b/social/seeks/PKGBUILD
index 2997e1be6..09da52060 100644
--- a/social/seeks/PKGBUILD
+++ b/social/seeks/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=seeks
pkgver=0.4.0
-pkgrel=1
+pkgrel=2
pkgdesc="An open decentralized platform for collaborative search content"
arch=('i686' 'x86_64')
url="http://www.seeks-project.info"
@@ -55,11 +55,6 @@ package() {
install -D -m644 ../seeks.conf.d "${pkgdir}"/etc/conf.d/seeks
install -D -m600 ../seeks.logrotate "${pkgdir}"/etc/logrotate.d/seeks
}
-md5sums=('dd80c832f80c34c392be5872239a8d9f'
- '33e6da05cca492019e6aff39684aed26'
- '52e7e06a28974547041012a1cf3207f3'
- 'd1aba6739972239c6cd09178807e196f'
- 'e352306f5396a1af4dfc81a18bfc5a71')
md5sums=('a2d0b6e7b91036883c0b327ead5e93c0'
'33e6da05cca492019e6aff39684aed26'
'52e7e06a28974547041012a1cf3207f3'
diff --git a/social/tomb/PKGBUILD b/social/tomb/PKGBUILD
new file mode 100644
index 000000000..a0ac0334f
--- /dev/null
+++ b/social/tomb/PKGBUILD
@@ -0,0 +1,30 @@
+## PKGBUILD [bash]
+# Maintainer: nignux <nignux@freaknet.org>
+
+pkgname=tomb
+pkgver=1.2
+pkgrel=1
+pkgdesc="Crypto Undertaker, simple tool to manage encrypted storage, from the hashes of the dyne:bolic nesting mechanism."
+arch=('i686' 'x86_64' 'mips64el')
+url="http://tomb.dyne.org"
+license=('GPL3')
+depends=('bc' 'cryptsetup' 'gnupg' 'gtk2' 'libnotify' 'sudo' 'zsh' 'steghide'
+ 'dcfldd' 'wipe')
+makedepends=('autoconf')
+provides=('tomb')
+install=${pkgname}.install
+source=(https://github.com/dyne/Tomb/tarball/v1.2)
+md5sums=('30fb11ef26355a1828933b13ee265924')
+
+build() {
+ cd ${srcdir}/dyne-Tomb-ddd9331
+ autoreconf -i
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd ${srcdir}/dyne-Tomb-ddd9331
+ make DESTDIR=${pkgdir} install
+}
+
diff --git a/social/tomb/tomb.install b/social/tomb/tomb.install
new file mode 100644
index 000000000..c1ee8b339
--- /dev/null
+++ b/social/tomb/tomb.install
@@ -0,0 +1,13 @@
+post_install() {
+ update-desktop-database -q
+ update-mime-database usr/share/mime
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ post_install $1
+}
+
diff --git a/~emulatorman/hunspell-pt-br/.directory b/~emulatorman/hunspell-pt-br/.directory
new file mode 100644
index 000000000..e59814917
--- /dev/null
+++ b/~emulatorman/hunspell-pt-br/.directory
@@ -0,0 +1,2 @@
+[Dolphin]
+Timestamp=2012,4,7,5,26,29
diff --git a/~emulatorman/hunspell-pt-br/PKGBUILD b/~emulatorman/hunspell-pt-br/PKGBUILD
index c7124503b..35e1dc887 100644
--- a/~emulatorman/hunspell-pt-br/PKGBUILD
+++ b/~emulatorman/hunspell-pt-br/PKGBUILD
@@ -1,12 +1,12 @@
# Maintainer: Daniel Felipe Reis Apolinario <dapolinario@gmail.com>
# Contributor: Bernardo Barros <bernardobarros@NOSPAM.gmail.com>
# Contributor: Robson R S Peixoto <robsonpeixoto@gmail.com>
-# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
pkgname=hunspell-pt-br
pkgver=2.0.9
pkgrel=1
-pkgdesc="Portuguese (Brazil) dictionary"
+pkgdesc="Portuguese (Brazil) hunspell dictionary"
arch=(any)
url="http://www.broffice.org/verortografico/"
license=('LGPL-2.1')
diff --git a/~emulatorman/mednafen-wip/PKGBUILD b/~emulatorman/mednafen-wip/PKGBUILD
index 93893684e..a405d2ceb 100755
--- a/~emulatorman/mednafen-wip/PKGBUILD
+++ b/~emulatorman/mednafen-wip/PKGBUILD
@@ -4,7 +4,7 @@
# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
pkgname=mednafen-wip
-pkgver=0.9.19
+pkgver=0.9.21
pkgrel=1
pkgdesc="A command-line multi-system gaming emulator, WIP version"
url="http://mednafen.sourceforge.net/"
@@ -14,14 +14,12 @@ depends=('libcdio>=0.82' 'libsamplerate' 'libogg' 'libvorbis' 'sdl' 'sdl_net' 'l
makedepends=('pkgconfig' 'mesa')
conflicts=('mednafen')
provides=('mednafen')
-source=('http://forum.fobby.net/index.php?t=getfile&id=345&' 'build.patch')
-md5sums=('64be12196aa02828539af677b0e2a66c'
- 'aac8957fa5274f00feed6a462fa8b7ad')
+source=('http://forum.fobby.net/index.php?t=getfile&id=358&')
+sha1sums=('983c349ca991190363b713ac8abf7ae78b081a21')
build()
{
cd $srcdir/mednafen
- patch -p1 < $srcdir/build.patch
./configure --prefix=/usr
make
}
@@ -31,4 +29,3 @@ package()
cd $srcdir/mednafen
make DESTDIR=$pkgdir install
}
-
diff --git a/~emulatorman/mednafen-wip/build.patch b/~emulatorman/mednafen-wip/build.patch
deleted file mode 100644
index 7985a19ed..000000000
--- a/~emulatorman/mednafen-wip/build.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/src/file.cpp b/src/file.cpp
-index 57f4e13..ec1181c 100644
---- a/src/file.cpp
-+++ b/src/file.cpp
-@@ -293,7 +293,7 @@ bool MDFNFILE::MakeMemWrapAndClose(void *tz, int type)
- goto doret;
- }
-
-- while((howmany = gzread(tz, f_data + cur_size, cur_alloced - cur_size)) > 0)
-+ while((howmany = gzread((gzFile)tz, f_data + cur_size, cur_alloced - cur_size)) > 0)
- {
- cur_size += howmany;
- cur_alloced <<= 1;
-@@ -320,7 +320,7 @@ bool MDFNFILE::MakeMemWrapAndClose(void *tz, int type)
- {
- int gzerrnum = 0;
- const char *gzerrstring;
-- if((gzerrstring = gzerror(tz, &gzerrnum)) && gzerrnum != Z_OK && gzerrnum != Z_STREAM_END)
-+ if((gzerrstring = gzerror((gzFile)tz, &gzerrnum)) && gzerrnum != Z_OK && gzerrnum != Z_STREAM_END)
- {
- if(gzerrnum != Z_ERRNO)
- {
-@@ -365,7 +365,7 @@ bool MDFNFILE::MakeMemWrapAndClose(void *tz, int type)
- }
- else if(type == MDFN_FILETYPE_GZIP)
- {
-- gzclose(tz);
-+ gzclose((gzFile)tz);
- }
- else if(type == MDFN_FILETYPE_ZIP)
- {