diff options
Diffstat (limited to 'libre')
454 files changed, 4202 insertions, 2473 deletions
diff --git a/libre/abiword-libre/PKGBUILD b/libre/abiword-libre/PKGBUILD index 4286d258a..4286d258a 100755..100644 --- a/libre/abiword-libre/PKGBUILD +++ b/libre/abiword-libre/PKGBUILD diff --git a/libre/abiword-libre/abiword-2.8.6-libpng15.patch b/libre/abiword-libre/abiword-2.8.6-libpng15.patch index 7eded4c83..7eded4c83 100755..100644 --- a/libre/abiword-libre/abiword-2.8.6-libpng15.patch +++ b/libre/abiword-libre/abiword-2.8.6-libpng15.patch diff --git a/libre/abiword-libre/abiword-2.8.6-no-undefined.patch b/libre/abiword-libre/abiword-2.8.6-no-undefined.patch index c07000edb..c07000edb 100755..100644 --- a/libre/abiword-libre/abiword-2.8.6-no-undefined.patch +++ b/libre/abiword-libre/abiword-2.8.6-no-undefined.patch diff --git a/libre/abiword-libre/abiword-libre.install b/libre/abiword-libre/abiword-libre.install index 2eaa60550..2eaa60550 100755..100644 --- a/libre/abiword-libre/abiword-libre.install +++ b/libre/abiword-libre/abiword-libre.install diff --git a/libre/abiword-libre/compat_libwpg_0_9.patch b/libre/abiword-libre/compat_libwpg_0_9.patch index cf36e188e..cf36e188e 100755..100644 --- a/libre/abiword-libre/compat_libwpg_0_9.patch +++ b/libre/abiword-libre/compat_libwpg_0_9.patch diff --git a/libre/abiword-libre/liberation-fonts.patch b/libre/abiword-libre/liberation-fonts.patch index a009b18f5..a009b18f5 100755..100644 --- a/libre/abiword-libre/liberation-fonts.patch +++ b/libre/abiword-libre/liberation-fonts.patch diff --git a/libre/abs-libre/PKGBUILD b/libre/abs-libre/PKGBUILD index 1abcd02dc..1abcd02dc 100755..100644 --- a/libre/abs-libre/PKGBUILD +++ b/libre/abs-libre/PKGBUILD diff --git a/libre/abs-libre/abs.install b/libre/abs-libre/abs.install index ac814c2fc..ac814c2fc 100755..100644 --- a/libre/abs-libre/abs.install +++ b/libre/abs-libre/abs.install diff --git a/libre/abuse-libre/PKGBUILD b/libre/abuse-libre/PKGBUILD index 196fb2c85..196fb2c85 100755..100644 --- a/libre/abuse-libre/PKGBUILD +++ b/libre/abuse-libre/PKGBUILD diff --git a/libre/abuse-libre/abuse.install b/libre/abuse-libre/abuse.install index 4d28ebacd..4d28ebacd 100755..100644 --- a/libre/abuse-libre/abuse.install +++ b/libre/abuse-libre/abuse.install diff --git a/libre/abuse-libre/non-claudio.patch b/libre/abuse-libre/non-claudio.patch index 2a29e53f0..2a29e53f0 100755..100644 --- a/libre/abuse-libre/non-claudio.patch +++ b/libre/abuse-libre/non-claudio.patch diff --git a/libre/abuse-libre/rePKGBUILD b/libre/abuse-libre/rePKGBUILD index 3c9a0082d..3c9a0082d 100755..100644 --- a/libre/abuse-libre/rePKGBUILD +++ b/libre/abuse-libre/rePKGBUILD diff --git a/libre/aif-libre/PKGBUILD b/libre/aif-libre/PKGBUILD index 7decd9531..7decd9531 100755..100644 --- a/libre/aif-libre/PKGBUILD +++ b/libre/aif-libre/PKGBUILD diff --git a/libre/atool-libre/PKGBUILD b/libre/atool-libre/PKGBUILD index ea1dfec52..ea1dfec52 100755..100644 --- a/libre/atool-libre/PKGBUILD +++ b/libre/atool-libre/PKGBUILD diff --git a/libre/atool-libre/atool.changelog b/libre/atool-libre/atool.changelog index ce0b12c2b..ce0b12c2b 100755..100644 --- a/libre/atool-libre/atool.changelog +++ b/libre/atool-libre/atool.changelog diff --git a/libre/atool-libre/rePKGBUILD b/libre/atool-libre/rePKGBUILD index e684320d0..e684320d0 100755..100644 --- a/libre/atool-libre/rePKGBUILD +++ b/libre/atool-libre/rePKGBUILD diff --git a/libre/audacious-plugins-libre/PKGBUILD b/libre/audacious-plugins-libre/PKGBUILD index c59052f0d..c59052f0d 100755..100644 --- a/libre/audacious-plugins-libre/PKGBUILD +++ b/libre/audacious-plugins-libre/PKGBUILD diff --git a/libre/audacity-libre/.directory b/libre/audacity-libre/.directory deleted file mode 100755 index a65007814..000000000 --- a/libre/audacity-libre/.directory +++ /dev/null @@ -1,2 +0,0 @@ -[Dolphin] -Timestamp=2012,4,10,15,23,50 diff --git a/libre/audacity-libre/PKGBUILD b/libre/audacity-libre/PKGBUILD index 6d6f287b3..6d6f287b3 100755..100644 --- a/libre/audacity-libre/PKGBUILD +++ b/libre/audacity-libre/PKGBUILD diff --git a/libre/audacity-libre/audacity-libre.install b/libre/audacity-libre/audacity-libre.install index 028c9f62a..028c9f62a 100755..100644 --- a/libre/audacity-libre/audacity-libre.install +++ b/libre/audacity-libre/audacity-libre.install diff --git a/libre/audacity-libre/remove-unfree-nyquist.patch b/libre/audacity-libre/remove-unfree-nyquist.patch index b2f9f31e3..b2f9f31e3 100755..100644 --- a/libre/audacity-libre/remove-unfree-nyquist.patch +++ b/libre/audacity-libre/remove-unfree-nyquist.patch diff --git a/libre/blackbox-libre/PKGBUILD b/libre/blackbox-libre/PKGBUILD index c76d7cba5..c76d7cba5 100755..100644 --- a/libre/blackbox-libre/PKGBUILD +++ b/libre/blackbox-libre/PKGBUILD diff --git a/libre/blackbox-libre/bbdock.patch b/libre/blackbox-libre/bbdock.patch index 709b6cfe1..709b6cfe1 100755..100644 --- a/libre/blackbox-libre/bbdock.patch +++ b/libre/blackbox-libre/bbdock.patch diff --git a/libre/blackbox-libre/bsetbg-feh.patch b/libre/blackbox-libre/bsetbg-feh.patch index 17a612ff0..17a612ff0 100755..100644 --- a/libre/blackbox-libre/bsetbg-feh.patch +++ b/libre/blackbox-libre/bsetbg-feh.patch diff --git a/libre/blackbox-libre/gcc4.3.patch b/libre/blackbox-libre/gcc4.3.patch index 40a9dcdef..40a9dcdef 100755..100644 --- a/libre/blackbox-libre/gcc4.3.patch +++ b/libre/blackbox-libre/gcc4.3.patch diff --git a/libre/blackbox-libre/menu b/libre/blackbox-libre/menu index 9cba27d16..9cba27d16 100755..100644 --- a/libre/blackbox-libre/menu +++ b/libre/blackbox-libre/menu diff --git a/libre/blackbox-libre/textpropertytostring-unconditional.patch b/libre/blackbox-libre/textpropertytostring-unconditional.patch index ed320388a..ed320388a 100755..100644 --- a/libre/blackbox-libre/textpropertytostring-unconditional.patch +++ b/libre/blackbox-libre/textpropertytostring-unconditional.patch diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD index e6c684b1e..95a121a57 100644 --- a/libre/blender-libre/PKGBUILD +++ b/libre/blender-libre/PKGBUILD @@ -1,7 +1,7 @@ # $Id$ # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> -spacenav=false +spacenav=true pkgbase=blender-libre pkgflag=-libre if [ $spacenav == true ]; then @@ -16,9 +16,9 @@ else spndesc='' fi pkgdesc="Fully integrated 3D graphics creation suite, without nonfree cuda-toolkit and redcode image format support$spndesc" -pkgver=2.65 +pkgver=2.65a pkgrel=1 -pkgaev=5 +pkgaev=6 arch=( i686 x86_64 @@ -137,7 +137,7 @@ source=( "http://download.${pkgbase%$pkgflag}.org/source/${pkgbase%$pkgflag}-$pkgver.tar.gz" ) sha512sums=( - 92488691c25d390eabf35569cb37ec62437dd42f57e096334a6ed804b3265efe6f81871eba15dad67399ff4e6bf4262d4043298a3ceb90e5dc57586eb9f2870f + 02d493a7395160047b39dcfb48dbd45c285fbeaec741d4248bef62a8da8743e6bf59bba4ecc401e35c0f21a8db4e883c9b29d620be6c4dd6d4852ae53e7c978f ) build() { @@ -148,27 +148,28 @@ build() { [[ $CARCH == i686 ]] && DSUPPORT_SSE2_BUILD='-DSUPPORT_SSE2_BUILD=OFF' - setarch $CARCH cmake .. \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DPYTHON_INCLUDE_DIRS=/usr/include/python3.3m \ - -DPYTHON_LIBPATH=/usr/lib \ - -DPYTHON_LIBRARY=python3.3m \ - -DPYTHON_VERSION=3.3 \ - $DSUPPORT_SSE2_BUILD \ - -DWITH_CODEC_FFMPEG=ON \ - -DWITH_CODEC_SNDFILE=ON \ - -DWITH_CYCLES=ON \ - -DWITH_CYCLES_CUDA_BINARIES=OFF \ - -DWITH_FFTW3=ON \ - -DWITH_GAMEENGINE=ON \ - -DWITH_IMAGE_REDCODE=OFF \ - -DWITH_INSTALL_PORTABLE=OFF \ - -DWITH_JACK=ON \ - -DWITH_MOD_OCEANSIM=ON \ - -DWITH_OPENCOLLADA=ON \ - -DWITH_PLAYER=ON \ - -DWITH_PYTHON_INSTALL=OFF \ + setarch $CARCH cmake ..\ + -DCMAKE_BUILD_TYPE=Release\ + -DCMAKE_INSTALL_PREFIX=/usr\ + -DOPENIMAGEIO_ROOT_DIR=/usr\ + -DPYTHON_INCLUDE_DIRS=/usr/include/python3.3m\ + -DPYTHON_LIBPATH=/usr/lib\ + -DPYTHON_LIBRARY=python3.3m\ + -DPYTHON_VERSION=3.3\ + $DSUPPORT_SSE2_BUILD\ + -DWITH_CODEC_FFMPEG=ON\ + -DWITH_CODEC_SNDFILE=ON\ + -DWITH_CYCLES=ON\ + -DWITH_CYCLES_CUDA_BINARIES=OFF\ + -DWITH_FFTW3=ON\ + -DWITH_GAMEENGINE=ON\ + -DWITH_IMAGE_REDCODE=OFF\ + -DWITH_INSTALL_PORTABLE=OFF\ + -DWITH_JACK=ON\ + -DWITH_MOD_OCEANSIM=ON\ + -DWITH_OPENCOLLADA=ON\ + -DWITH_PLAYER=ON\ + -DWITH_PYTHON_INSTALL=OFF\ -DWITH_SYSTEM_GLEW=ON setarch $CARCH make $MAKEFLAGS diff --git a/libre/blender-libre/blender-libre.install b/libre/blender-libre/blender-libre.install index 724bfce00..724bfce00 100755..100644 --- a/libre/blender-libre/blender-libre.install +++ b/libre/blender-libre/blender-libre.install diff --git a/libre/blender-libre/blender.install b/libre/blender-libre/blender.install index 724bfce00..724bfce00 100755..100644 --- a/libre/blender-libre/blender.install +++ b/libre/blender-libre/blender.install diff --git a/libre/blender-libre/boost-1.50.patch b/libre/blender-libre/boost-1.50.patch index fa698a3a6..fa698a3a6 100755..100644 --- a/libre/blender-libre/boost-1.50.patch +++ b/libre/blender-libre/boost-1.50.patch diff --git a/libre/blender-libre/ffmpeg-0.11.patch b/libre/blender-libre/ffmpeg-0.11.patch index 45144140c..45144140c 100755..100644 --- a/libre/blender-libre/ffmpeg-0.11.patch +++ b/libre/blender-libre/ffmpeg-0.11.patch diff --git a/libre/bogofilter-libre/PKGBUILD b/libre/bogofilter-libre/PKGBUILD index c5718a9fd..c5718a9fd 100755..100644 --- a/libre/bogofilter-libre/PKGBUILD +++ b/libre/bogofilter-libre/PKGBUILD diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD new file mode 100644 index 000000000..ac3046760 --- /dev/null +++ b/libre/calibre-libre/PKGBUILD @@ -0,0 +1,85 @@ +# $Id$ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Petrov Roman <nwhisper@gmail.com> +# Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> + +_pkgname=calibre +pkgname=calibre-libre +pkgver=0.9.14 +pkgrel=1 +pkgdesc="Ebook management application (unar support included instead of libunrar and without nonfree fonts)" +arch=('i686' 'x86_64') +url="http://calibre-ebook.com/" +license=('GPL3') +depends=('python2-dateutil' 'python2-cssutils' 'python2-cherrypy' + 'python2-mechanize' 'podofo' 'libwmf' 'python2-beautifulsoup3' + 'imagemagick' 'poppler-qt' 'chmlib' 'python2-lxml' 'libusbx' + 'python2-imaging' 'shared-mime-info' 'python2-dnspython' + 'unar' 'python2-pyqt' 'python2-psutil' 'icu' 'libmtp' + 'python2-netifaces' 'python2-cssselect') +makedepends=('python2-pycountry' 'qt-private-headers') +optdepends=('ipython2: to use calibre-debug') +replaces=$_pkgname +conflicts=$_pkgname +provides=$_pkgname=$pkgver +install=calibre.install +source=("http://calibre-ebook.googlecode.com/files/${_pkgname}-${pkgver}.tar.xz" + 'desktop_integration.patch' + 'calibre-mount-helper') +md5sums=('0a809b1c1378f95a69337b9bc8207493' + '42c07b43d575b5e7e7524bd7b9528f0e' + '675cd87d41342119827ef706055491e7') + +build() { + cd "${srcdir}/${_pkgname}" + + #rm -rf src/{cherrypy,pyPdf} + rm -rf src/cherrypy + sed -i -e "s/ldflags = shlex.split(ldflags)/ldflags = shlex.split(ldflags) + ['-fPIC']/" setup/extensions.py + + # Fix for calibre-0.8.58 + sed -i -e "s:#!usr:#!/usr:g" src/calibre/ebooks/markdown/extensions/meta.py + + sed -i -e 's:\(#!/usr/bin/env[ ]\+python$\|#![ ]/usr/bin/env[ ]\+python$\|#!/usr/bin/python$\):\12:g' \ + $(find . -regex ".*.py\|.*.recipe") + + # Remove nonfree fonts + cd resources/fonts; \ + rm prs500/tt0003m_.ttf; ln -s ../liberation/LiberationSans-Regular.ttf prs500/tt0003m_.ttf; \ + rm prs500/tt0011m_.ttf; ln -s ../liberation/LiberationSerif-Regular.ttf prs500/tt0011m_.ttf; \ + rm prs500/tt0419m_.ttf; ln -s ../liberation/LiberationMono-Regular.ttf prs500/tt0419m_.ttf; \ + cd ../.. + + LANG='en_US.UTF-8' python2 setup.py build + # LANG='en_US.UTF-8' python2 setup.py resources + LANG='en_US.UTF-8' python2 setup.py translations +} + +package() { + cd "${srcdir}/${_pkgname}" + + patch -Np1 -i "${srcdir}/desktop_integration.patch" + + # More on desktop integration (e.g. enforce arch defaults) + sed -i -e "/self.create_uninstaller()/,/os.rmdir(config_dir)/d" \ + -e "s|self.opts.staging_sharedir, 'man/man1'|self.opts.staging_root, 'usr/share/man/man1'|" \ + -e "s|manpath, prog+'.1'+__appname__+'.bz2'|manpath, prog+'.1'+'.bz2'|" \ + -e "s|old_udev = '/etc|old_udev = '${pkgdir}/etc|" \ + -e "s/^Name=calibre/Name=Calibre/g" src/calibre/linux.py + + # Fix the environment module location + sed -i -e "s|(prefix=.*)|(prefix='$pkgdir/usr')|g" setup/install.py + + install -d "${pkgdir}/usr/lib/python2.7/site-packages" + LANG='en_US.UTF-8' python2 setup.py install --root="${pkgdir}" --prefix=/usr \ + --staging-bindir="${pkgdir}/usr/bin" \ + --staging-libdir="${pkgdir}/usr/lib" \ + --staging-sharedir="${pkgdir}/usr/share" + + find "${pkgdir}" -type d -empty -delete + + # See http://lwn.net/SubscriberLink/465311/7c299471a5399167/ + rm -rf "${pkgdir}/usr/bin/calibre-mount-helper" + install -m 755 "${srcdir}/calibre-mount-helper" "${pkgdir}/usr/bin" +} diff --git a/libre/calibre-libre/calibre-mount-helper b/libre/calibre-libre/calibre-mount-helper new file mode 100644 index 000000000..00cac4270 --- /dev/null +++ b/libre/calibre-libre/calibre-mount-helper @@ -0,0 +1,28 @@ +#!/bin/sh -e +# Replacement for upstream mount helper using udisks/eject +# (C) 2010 Martin Pitt <mpitt@debian.org> + +ACTION="$1" +DEV="$2" + +case "$ACTION" in + mount) + udisks --mount "$DEV" + + # check if mount worked. If not, fail + # udisks does return 0 even if mount failed + mount | grep -q "$DEV" || exit 0 + ;; + + eject) + eject "$DEV" + ;; + + cleanup) + ;; + + *) + echo "unknown action" >&2 + exit 1 +esac + diff --git a/libre/calibre-libre/calibre.install b/libre/calibre-libre/calibre.install new file mode 100644 index 000000000..6210bd0ab --- /dev/null +++ b/libre/calibre-libre/calibre.install @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/libre/calibre-libre/desktop_integration.patch b/libre/calibre-libre/desktop_integration.patch new file mode 100644 index 000000000..4c756f5d4 --- /dev/null +++ b/libre/calibre-libre/desktop_integration.patch @@ -0,0 +1,109 @@ +--- a/src/calibre/linux.py 2012-09-21 06:56:20.000000000 +0200 ++++ b/src/calibre/linux.py 2012-09-22 18:51:12.000000000 +0200 +@@ -179,19 +179,6 @@ + self.setup_completion() + if islinux or isbsd: + self.setup_desktop_integration() +- self.create_uninstaller() +- +- from calibre.utils.config import config_dir +- if os.path.exists(config_dir): +- os.chdir(config_dir) +- if islinux or isbsd: +- for f in os.listdir('.'): +- if os.stat(f).st_uid == 0: +- import shutil +- shutil.rmtree(f) if os.path.isdir(f) else os.unlink(f) +- if os.stat(config_dir).st_uid == 0: +- os.rmdir(config_dir) +- + if warn is None and self.warnings: + self.info('There were %d warnings'%len(self.warnings)) + for args, kwargs in self.warnings: +@@ -237,7 +224,7 @@ + if isnetbsd: + f = os.path.join(self.opts.staging_root, 'share/bash_completion.d/calibre') + else: +- f = os.path.join(self.opts.staging_etc, 'bash_completion.d/calibre') ++ f = os.path.join(self.opts.staging_root, 'usr/share/bash-completion/completions/calibre') + if not os.path.exists(os.path.dirname(f)): + os.makedirs(os.path.dirname(f)) + self.manifest.append(f) +@@ -357,63 +344,39 @@ + + with TemporaryDirectory() as tdir, CurrentDir(tdir), \ + PreserveMIMEDefaults(): +- render_img('mimetypes/lrf.png', 'calibre-lrf.png') +- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png application-lrf', shell=True) +- self.icon_resources.append(('mimetypes', 'application-lrf', '128')) +- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png text-lrs', shell=True) +- self.icon_resources.append(('mimetypes', 'application-lrs', +- '128')) +- render_img('mimetypes/mobi.png', 'calibre-mobi.png') +- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-mobi.png application-x-mobipocket-ebook', shell=True) +- self.icon_resources.append(('mimetypes', 'application-x-mobipocket-ebook', '128')) +- render_img('mimetypes/tpz.png', 'calibre-tpz.png') +- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-tpz.png application-x-topaz-ebook', shell=True) +- self.icon_resources.append(('mimetypes', 'application-x-topaz-ebook', '128')) +- render_img('mimetypes/azw2.png', 'calibre-azw2.png') +- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-azw2.png application-x-kindle-application', shell=True) +- self.icon_resources.append(('mimetypes', 'application-x-kindle-application', '128')) +- render_img('mimetypes/azw3.png', 'calibre-azw3.png') +- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-azw3.png application-x-mobi8-ebook', shell=True) +- self.icon_resources.append(('mimetypes', 'application-x-mobi8-ebook', '128')) +- render_img('lt.png', 'calibre-gui.png', width=256, height=256) +- cc('xdg-icon-resource install --noupdate --size 256 calibre-gui.png calibre-gui', shell=True) +- self.icon_resources.append(('apps', 'calibre-gui', '128')) +- render_img('viewer.png', 'calibre-viewer.png') +- cc('xdg-icon-resource install --size 128 calibre-viewer.png calibre-viewer', shell=True) +- self.icon_resources.append(('apps', 'calibre-viewer', '128')) ++ dir = os.path.join(self.opts.staging_sharedir,'../pixmaps') ++ os.mkdir(dir) ++ render_img('mimetypes/lrf.png', os.path.join(dir,'calibre-lrf.png')) ++ render_img('lt.png', os.path.join(dir, 'calibre-gui.png')) ++ render_img('viewer.png', os.path.join(dir, 'calibre-viewer.png')) + + mimetypes = set([]) + for x in all_input_formats(): + mt = guess_type('dummy.'+x)[0] +- if mt and 'chemical' not in mt and 'ctc-posml' not in mt: ++ if mt and 'chemical' not in mt and 'text' not in mt and 'pdf' not in mt and 'xhtml' not in mt: + mimetypes.add(mt) + + def write_mimetypes(f): + f.write('MimeType=%s;\n'%';'.join(mimetypes)) + +- f = open('calibre-lrfviewer.desktop', 'wb') ++ dir = os.path.join(self.opts.staging_sharedir,'../applications') ++ os.mkdir(dir) ++ f = open(os.path.join(dir, 'calibre-lrfviewer.desktop'), 'wb') + f.write(VIEWER) + f.close() +- f = open('calibre-ebook-viewer.desktop', 'wb') ++ f = open(os.path.join(dir, 'calibre-ebook-viewer.desktop'), 'wb') + f.write(EVIEWER) + write_mimetypes(f) + f.close() +- f = open('calibre-gui.desktop', 'wb') ++ f = open(os.path.join(dir, 'calibre-gui.desktop'), 'wb') + f.write(GUI) + write_mimetypes(f) + f.close() +- des = ('calibre-gui.desktop', 'calibre-lrfviewer.desktop', +- 'calibre-ebook-viewer.desktop') +- for x in des: +- cmd = ['xdg-desktop-menu', 'install', '--noupdate', './'+x] +- cc(' '.join(cmd), shell=True) +- self.menu_resources.append(x) +- cc(['xdg-desktop-menu', 'forceupdate']) +- f = open('calibre-mimetypes.xml', 'wb') ++ dir = os.path.join(self.opts.staging_sharedir,'../mime/packages/') ++ os.makedirs(dir) ++ f = open(os.path.join(dir, 'calibre.xml'), 'wb') + f.write(MIME) + f.close() +- self.mime_resources.append('calibre-mimetypes.xml') +- cc('xdg-mime install ./calibre-mimetypes.xml', shell=True) + except Exception: + if self.opts.fatal_errors: + raise diff --git a/libre/cdfs-libre/PKGBUILD b/libre/cdfs-libre/PKGBUILD index e39dfc88a..7cd18bb6a 100644 --- a/libre/cdfs-libre/PKGBUILD +++ b/libre/cdfs-libre/PKGBUILD @@ -6,9 +6,9 @@ _pkgname=cdfs pkgname=cdfs-libre pkgver=2.6.27 -pkgrel=33 -pkgdesc="File system module libre that 'exports' all tracks and boot images on a CD as normal files." -arch=(i686 x86_64) +pkgrel=34.1 +pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files (built for the linux-libre kernel package)" +arch=(i686 x86_64 mips64el) url="http://www.elis.UGent.be/~ronsse/cdfs/" license=('GPL') makedepends=('linux-libre-headers') diff --git a/libre/cdfs-libre/cdfs.install b/libre/cdfs-libre/cdfs.install index aa71a92ac..3847b8b14 100644 --- a/libre/cdfs-libre/cdfs.install +++ b/libre/cdfs-libre/cdfs.install @@ -1,14 +1,14 @@ post_install() { - EXTRAMODULES='extramodules-3.6-LIBRE' + EXTRAMODULES='extramodules-3.7-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_upgrade() { - EXTRAMODULES='extramodules-3.6-LIBRE' + EXTRAMODULES='extramodules-3.7-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_remove() { - EXTRAMODULES='extramodules-3.6-LIBRE' + EXTRAMODULES='extramodules-3.7-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } diff --git a/libre/cdrkit-libre/PKGBUILD b/libre/cdrkit-libre/PKGBUILD index 5e71171f9..5e71171f9 100755..100644 --- a/libre/cdrkit-libre/PKGBUILD +++ b/libre/cdrkit-libre/PKGBUILD diff --git a/libre/claws-mail-libre/PKGBUILD b/libre/claws-mail-libre/PKGBUILD index 38533f59b..7a093b29a 100644 --- a/libre/claws-mail-libre/PKGBUILD +++ b/libre/claws-mail-libre/PKGBUILD @@ -6,7 +6,7 @@ pkgbase=claws-mail pkgname=claws-mail-libre pkgflag=-libre pkgver=3.9.0 -pkgrel=1 +pkgrel=2 pkgdesc='A GTK+ based e-mail client, without nonfree PalmOS handheld devices support' arch=( i686 @@ -42,7 +42,7 @@ optdepends=( ) provides=( claws - $pkgbase + $pkgbase=$pkgver ) conflicts=( $pkgbase diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD index fb7beb4f6..2bfa111f8 100755..100644 --- a/libre/clementine-libre/PKGBUILD +++ b/libre/clementine-libre/PKGBUILD @@ -4,18 +4,19 @@ #Contributor: Dany Martineau <dany.luc.martineau@gmail.com> #Maintainer (Parabola): André Silva <emulatorman@lavabit.com> #Contributor (Parabola): Kete <kete@ninthfloor.org> +#Contributor (Parabola): Márcio Silva <coadde@lavabit.com> _pkgname=clementine pkgname=clementine-libre pkgver=1.1.1 -pkgrel=2 +pkgrel=3 pkgdesc="A music player and library organizer, without spotify support" url="http://www.clementine-player.org/" license=('GPL') arch=('i686' 'x86_64') depends=('gstreamer0.10-base' 'taglib' 'glew' 'liblastfm' 'libgpod' 'libmtp' 'libplist' 'hicolor-icon-theme' 'qt' 'libimobiledevice' - 'sparsehash' 'qjson' 'libcdio' 'protobuf' 'qca' 'qca-ossl' 'gvfs') + 'sparsehash' 'qjson' 'libcdio-paranoia' 'protobuf' 'qca' 'qca-ossl' 'gvfs') makedepends=('cmake' 'boost' 'mesa') optdepends=('gstreamer0.10-base-plugins: for more open formats' 'gstreamer0.10-good-plugins: for use with "Good" plugin libraries' diff --git a/libre/clementine-libre/clementine.install b/libre/clementine-libre/clementine.install index 2f0338d8a..2f0338d8a 100755..100644 --- a/libre/clementine-libre/clementine.install +++ b/libre/clementine-libre/clementine.install diff --git a/libre/clementine-libre/remove-and-disable-spotify.patch b/libre/clementine-libre/remove-and-disable-spotify.patch index a9352b275..a9352b275 100755..100644 --- a/libre/clementine-libre/remove-and-disable-spotify.patch +++ b/libre/clementine-libre/remove-and-disable-spotify.patch diff --git a/libre/crosstool-ng/PKGBUILD b/libre/crosstool-ng/PKGBUILD index 6cfb023cb..6cfb023cb 100755..100644 --- a/libre/crosstool-ng/PKGBUILD +++ b/libre/crosstool-ng/PKGBUILD diff --git a/libre/crosstool-ng/libc_ports_short_name.patch b/libre/crosstool-ng/libc_ports_short_name.patch index b511fa183..b511fa183 100755..100644 --- a/libre/crosstool-ng/libc_ports_short_name.patch +++ b/libre/crosstool-ng/libc_ports_short_name.patch diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD index 84b4d0cd1..597b2f855 100755..100644 --- a/libre/cups-filters-libre/PKGBUILD +++ b/libre/cups-filters-libre/PKGBUILD @@ -1,38 +1,48 @@ -# $Id: PKGBUILD 172123 2012-11-29 18:28:53Z andyrtr $ +# $Id: PKGBUILD 174970 2013-01-09 16:29:59Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=cups-filters-libre _pkgname=cups-filters -pkgver=1.0.25 -pkgrel=1 +pkgver=1.0.29 +pkgrel=3 pkgdesc="OpenPrinting CUPS Filters" arch=('i686' 'x86_64') url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting" license=('GPL') -depends=('lcms2' 'poppler>=0.20.5' 'qpdf') +depends=('lcms2' 'poppler>=0.22.0' 'qpdf>=4.0.0') makedepends=('ghostscript' 'ttf-dejavu') # ttf-dejavu for make check optdepends=('ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images' 'foomatic-db: drivers use Ghostscript to convert PostScript to a printable form directly' 'foomatic-db-engine: drivers use Ghostscript to convert PostScript to a printable form directly') backup=(etc/fonts/conf.d/99pdftoopvp.conf) options=(!libtool) -source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.gz) -md5sums=('9690028c5e312b086e7572ae1899a33c') +source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.gz + cups-browsed.service + poppler_buildfix.diff) +md5sums=('0640a02a3fb88d3dbdb224e3becd400d' + '4c9f97eae201798000483c4e7109e690' + 'bd97d1d9dbd4feec3a0330fd9fb7a03c') replaces=("${_pkgname}") conflicts=("${_pkgname}") provides=("${_pkgname}=${pkgver}") build() { cd "$srcdir/$_pkgname-$pkgver" + + # fix build with poppler 0.22 + patch -Np0 -i ${srcdir}/poppler_buildfix.diff + ./configure --prefix=/usr \ --sysconfdir=/etc \ + --with-rcdir=no \ + --enable-avahi \ --with-test-font-path=/usr/share/fonts/TTF/DejaVuSans.ttf make } check() { cd "$srcdir/$_pkgname-$pkgver" - make -k check + make -j1 -k check } package() { @@ -40,4 +50,7 @@ package() { make DESTDIR="$pkgdir/" install # drop static lib rm -f ${pkgdir}/usr/lib/*.a + + # add missing systemd support + install -Dm644 ${srcdir}/cups-browsed.service ${pkgdir}/usr/lib/systemd/system/cups-browsed.service } diff --git a/libre/cups-filters-libre/cups-browsed.service b/libre/cups-filters-libre/cups-browsed.service new file mode 100644 index 000000000..144956c7f --- /dev/null +++ b/libre/cups-filters-libre/cups-browsed.service @@ -0,0 +1,10 @@ +[Unit] +Description=Make remote CUPS printers available locally +After=cups.service avahi-daemon.service +Wants=cups.service avahi-daemon.service + +[Service] +ExecStart=/usr/sbin/cups-browsed + +[Install] +WantedBy=multi-user.target diff --git a/libre/cups-filters-libre/poppler_buildfix.diff b/libre/cups-filters-libre/poppler_buildfix.diff new file mode 100644 index 000000000..b646efd6b --- /dev/null +++ b/libre/cups-filters-libre/poppler_buildfix.diff @@ -0,0 +1,61 @@ +=== modified file 'NEWS' +--- NEWS 2013-01-02 18:23:25 +0000 ++++ NEWS 2013-01-09 10:42:32 +0000 +@@ -1,6 +1,11 @@ + NEWS - OpenPrinting CUPS Filters v1.0.29 - 2013-01-02 + ----------------------------------------------------- + ++CHANGES IN V1.0.30 ++ ++ - pdftoopvp: Let it build with Poppler 0.22.x. Thanks to Koji Otani ++ from BBR Inc. (Bug #1089). ++ + CHANGES IN V1.0.29 + + - Fixed ./configure option "--with-rcdir=no". Thanks to Jiri + +=== modified file 'filter/pdftoopvp/OPVPOutputDev.cxx' +--- filter/pdftoopvp/OPVPOutputDev.cxx 2012-07-20 08:32:55 +0000 ++++ filter/pdftoopvp/OPVPOutputDev.cxx 2013-01-09 10:42:32 +0000 +@@ -1804,8 +1804,14 @@ + maskSplash = new Splash(maskBitmap, gFalse); + maskColor[0] = 0; + maskSplash->clear(maskColor); ++#if POPPLER_VERSION_MAJOR <= 0 && (POPPLER_VERSION_MINOR <= 20 || (POPPLER_VERSION_MINOR == 21 && POPPLER_VERSION_MICRO <= 2)) + maskSplash->drawImage(&imageSrc, &imgMaskData, + splashModeMono8, gFalse, maskWidth, maskHeight, mat); ++#else ++ maskSplash->drawImage(&imageSrc, &imgMaskData, ++ splashModeMono8, gFalse, maskWidth, maskHeight, ++ mat,gFalse); ++#endif + delete imgMaskData.imgStr; + maskStr->close(); + gfree(imgMaskData.lookup); + +=== modified file 'filter/pdftoopvp/oprs/OPRS.cxx' +--- filter/pdftoopvp/oprs/OPRS.cxx 2012-09-10 19:56:59 +0000 ++++ filter/pdftoopvp/oprs/OPRS.cxx 2013-01-09 10:42:32 +0000 +@@ -5,6 +5,9 @@ + //======================================================================== + + #include <config.h> ++#ifdef HAVE_CPP_POPPLER_VERSION_H ++#include "cpp/poppler-version.h" ++#endif + + #ifdef USE_GCC_PRAGMAS + #pragma implementation +@@ -235,7 +238,11 @@ + SplashColorMode srcMode, GBool srcAlpha, + int w, int h, SplashCoord *mat) { + if (rasterMode) { ++#if POPPLER_VERSION_MAJOR <= 0 && (POPPLER_VERSION_MINOR <= 20 || (POPPLER_VERSION_MINOR == 21 && POPPLER_VERSION_MICRO <= 2)) + return splash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat); ++#else ++ return splash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat,gFalse); ++#endif + } else { + return opvpSplash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat); + } + diff --git a/libre/debhelper/PKGBUILD b/libre/debhelper/PKGBUILD deleted file mode 100755 index 60ff8f267..000000000 --- a/libre/debhelper/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# Maintainer (AUR): Antoine Lubineau <antoine@lubignon.info> -# Contributor (AUR): Andrei "Garoth" Thorp <garoth@gmail.com> -# Contributor (Parabola): Luke Shumaker <lukeshu@sbcglobal.net> - -_debrepo=http://ftp.debian.org/debian/pool/main/ # Debian Sid -debfile() { echo -n "$_debrepo"; echo -n "$@"|sed -r 's@(.).*@\1/&@'; } - -pkgname=debhelper -pkgver=9.20120322 -pkgrel=1 -pkgdesc="A collection of programs that can be used in a debian/rules file to automate common tasks" -arch=('any') -url="http://packages.debian.org/${pkgname}" -license='GPL3' -depends=('binutils' 'dpkg' 'file' 'html2text' 'man-db' 'perl') -makedepends=('po4a') -source=(`debfile ${pkgname}`/${pkgname}_$pkgver.tar.gz) - -build() { - cd "$srcdir/$pkgname" - make -} - -package() { - cd "$srcdir/$pkgname" - make DESTDIR="$pkgdir" install -} - -md5sums=('9ea56782e6396a59ec49f45f9c4a603f') diff --git a/libre/dpkg/PKGBUILD b/libre/dpkg/PKGBUILD index 175b80610..5d7534534 100755..100644 --- a/libre/dpkg/PKGBUILD +++ b/libre/dpkg/PKGBUILD @@ -1,49 +1,127 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> # Maintainer (AUR): Jochen Schalanda <jochen+aur@schalanda.name> +# Contributor (AUR): Pierre Carrier <pierre@spotify.com> # Contributor (AUR): Thomas Dziedzic <gostrc@gmail> # Contributor (AUR): Chris Giles <Chris.G.27@gmail.com> # Contributor (AUR): seblu <seblu+arch@seblu.net> # Contributor (AUR): squiddo <squiddo@intheocean.net> -# Contributor (Parabola): Luke Shumaker <lukeshu@sbcglobal.net> - -_debrepo=http://ftp.debian.org/debian/pool/main/ # Debian Sid -debfile() { echo -n "$_debrepo"; echo -n "$@"|sed -r 's@(.).*@\1/&@'; } - -# TODO: split into (dpkg dpkg-devtools dselect dpkg-perl) -pkgname=dpkg -pkgver=1.16.2 -pkgrel=1 -pkgdesc="The Debian Package Manager and utilities. Don't use it instead of 'pacman'." -arch=('i686' 'x86_64') -url="http://packages.debian.org/${pkgname}" + +pkgbase=dpkg +#pkgname=(dpkg dpkg-devtools dselect libdpkg perl-dpkg) +pkgname=(dpkg-devtools perl-dpkg) +pkgdesc="Debian Package manager and utilities" license=('GPL2') -depends=('bzip2' 'perl-timedate') -makedepends=('gcc' 'make' 'patch') -optdepends=('fakeroot') -replaces=(dpkg-ubuntu) -conflits=(dpkg-ubuntu) -source=(`debfile ${pkgname}`/${pkgname}_${pkgver}.tar.bz2 - dpkg-rsyncable.patch dpkg-arch.patch) + +pkgver=1.16.9 +url="http://packages.debian.org/source/sid/dpkg" +_debrepo=http://ftp.debian.org/debian/pool/main # Debian Sid + +pkgrel=1.2 +debfile() { echo "${_debrepo}/${1:0:1}/${1}/${1}_${2}"; } +arch=('i686' 'x86_64' 'mips64el') +depends=('bzip2' 'xz' 'zlib' 'ncurses') +checkdepends=('perl-test-pod') +makedepends=('perl-io-string' 'perl-timedate') +source=("$(debfile ${pkgbase} ${pkgver}).tar.xz" + dpkg-gzip-rsyncable.patch dpkg-gpg2.patch) + +###################################################################### + +# This is really gross. +# It uses the debian control files to help us split the package. +# Shame on the dpkg developers for not putting that logic into the build system. +_destdir="$srcdir/$pkgbase-$pkgver/debian/pkg-makepkg" +_debhelper_install() { + local debname=$1 + cd "$_destdir" + + # main files + sed -e '/^\s*$/d' -e 's|usr/share/perl5/|&vendor_perl/|g' ../$debname.install \ + | while read pattern dest; do + if [[ -z $dest ]]; then + for file in $pattern; do + install -d "$pkgdir/${file%/*}" + cp -a "$file" "$pkgdir/$file" || true + done + else + install -d "$pkgdir/$dest/" + cp -a "$pattern" "$pkgdir/$dest/" || true + fi + done + + # manpages + sed -e 's|^debian/tmp/||' -e '/^\s*$/d' ../$debname.manpages 2>/dev/null \ + | while read pattern; do + for file in $pattern; do + install -d "$pkgdir/${file%/*}" + cp -a "$file" "$pkgdir/$file" || true + done + done + + # other documentation + install -d "$pkgdir/usr/share/doc/$pkgname/" + sed '/^\s*$/d' ../$debname.docs 2>/dev/null \ + | while read file; do + gzip \ + < "$srcdir/$pkgbase-$pkgver/$file" \ + > "$pkgdir/usr/share/doc/$pkgname/${file##*/}.gz" + done + + # symlinks + sed '/^\s*$/d' ../$debname.links 2>/dev/null \ + | while read file link; do + ln -s "/$file" "$pkgdir/$link" + done +} + +###################################################################### build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgbase}-${pkgver}" - patch -p1 -i "${srcdir}/dpkg-rsyncable.patch" - patch -p1 -i "${srcdir}/dpkg-arch.patch" # Architecture detection + patch -Np0 -i "${srcdir}/dpkg-gzip-rsyncable.patch" + patch -Np1 -i "${srcdir}/dpkg-gpg2.patch" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --without-start-stop-daemon + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --with-zlib --with-bz2 --with-liblzma make + make DESTDIR="$_destdir" install +} + +check() { + cd "${srcdir}/${pkgbase}-${pkgver}" + make check +} + +package_dpkg() { + pkgdesc="Debian Package manager" + provides+=(start-stop-daemon) + conflicts+=(start-stop-daemon) + _debhelper_install dpkg } -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install +package_dpkg-devtools() { + pkgdesc="Debian Package development tools" + arch=(any) + depends+=(perl-dpkg) + _debhelper_install dpkg-dev +} + +package_dselect() { + pkgdesc="Debian Package manager high-level interface" + _debhelper_install dselect +} + +package_libdpkg() { + pkgdesc="Debian Package manager library (static)" + _debhelper_install libdpkg-dev +} - # Variables - install -d "${pkgdir}/var/${pkgname}/updates/" - touch "${pkgdir}/var/lib/${pkgname}/{status,available}" +package_perl-dpkg() { + pkgdesc="Debian Package perl modules" + arch=(any) + _debhelper_install libdpkg-perl } -md5sums=('629ba7ee2024e6a5c0ff807aa2db02f8' - 'bc36609f6191c5b509fae58c21966c95' - '24ab12e79989a2e7f31653fb1dd3cdf9') +md5sums=('4df9319b2d17e19cdb6fe94dacee44da' + '5ab63758999e9bb10f84bce79a0307b2' + '74b7ce3045690a8fc290104f10cf8d42') diff --git a/libre/dpkg/compare b/libre/dpkg/compare new file mode 100755 index 000000000..4556440a5 --- /dev/null +++ b/libre/dpkg/compare @@ -0,0 +1,26 @@ +#!/bin/bash +# compare the packages extracted in pkg/ to the packages from debian + +_check() { + local pacpkg=$1 + local debpkg=$2 + + libremessages msg "dpkg:$debpkg -> pacman:$pacpkg" + + make -f compare.mk tmp/$pacpkg.pacman.filelist tmp/$debpkg.debian.filelist &>/dev/null + + echo -e 'pacman\tdpkg' + comm -3 \ + <(sed -e 's|\.gz$||' tmp/$pacpkg.pacman.filelist|sort) \ + <(sed -e 's|\.gz$||' -e '/^usr\/share\/man\/..\/man.\//d' -e 's|usr/share/perl5/|&vendor_perl/|' -e "s|$debpkg|$pacpkg|g" tmp/$debpkg.debian.filelist|sort) +} + +mkdir -p tmp + +_check dpkg dpkg +_check dpkg-devtools dpkg-dev +_check dselect dselect +_check libdpkg libdpkg-dev +_check perl-dpkg libdpkg-perl + +rm -rf tmp diff --git a/libre/dpkg/compare.mk b/libre/dpkg/compare.mk new file mode 100644 index 000000000..88219f283 --- /dev/null +++ b/libre/dpkg/compare.mk @@ -0,0 +1,8 @@ +#!/usr/bin/make -f +# Assist file for ./compare + +tmp/%.debian.filelist: + curl http://packages.debian.org/sid/all/$*/filelist|sed -n "/<pre>/,/<\/pre>/{ s|.*<pre>||; s|</pre>.*||; /./p }"|sed 's|/||'|sort > $@ + +tmp/%.pacman.filelist: + ( cd pkg/$* && find * -not -type d; ) | sort > $@ diff --git a/libre/dpkg/dpkg-arch.patch b/libre/dpkg/dpkg-arch.patch deleted file mode 100755 index 66e7a2ef2..000000000 --- a/libre/dpkg/dpkg-arch.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -ru dpkg-1.16.2.orig/scripts/Dpkg/Arch.pm dpkg-1.16.2/scripts/Dpkg/Arch.pm ---- dpkg-1.16.2.orig/scripts/Dpkg/Arch.pm 2012-03-19 02:40:08.000000000 -0400 -+++ dpkg-1.16.2/scripts/Dpkg/Arch.pm 2012-04-02 16:14:55.000000000 -0400 -@@ -49,12 +49,7 @@ - { - return $build_arch if defined $build_arch; - -- # Note: We *always* require an installed dpkg when inferring the -- # build architecture. The bootstrapping case is handled by -- # dpkg-architecture itself, by avoiding computing the DEB_BUILD_ -- # variables when they are not requested. -- -- my $build_arch = `dpkg --print-architecture`; -+ my $build_arch = `uname -m`; - syserr("dpkg --print-architecture failed") if $? >> 8; - - chomp $build_arch; diff --git a/libre/dpkg/dpkg-gpg2.patch b/libre/dpkg/dpkg-gpg2.patch new file mode 100644 index 000000000..28671c484 --- /dev/null +++ b/libre/dpkg/dpkg-gpg2.patch @@ -0,0 +1,11 @@ +--- dpkg-1.16.9/scripts/Dpkg/Source/Package.pm.orig 2013-01-09 01:28:47.000000000 -0500 ++++ dpkg-1.16.9/scripts/Dpkg/Source/Package.pm 2013-01-09 01:30:51.000000000 -0500 +@@ -344,7 +344,7 @@ + my $dsc = $self->get_filename(); + my @exec; + if (find_command('gpgv')) { +- push @exec, "gpgv"; ++ push @exec, "gpgv", "--verify"; + } elsif (find_command('gpg')) { + push @exec, "gpg", "--no-default-keyring", "-q", "--verify"; + } diff --git a/libre/dpkg/dpkg-gzip-rsyncable.patch b/libre/dpkg/dpkg-gzip-rsyncable.patch new file mode 100644 index 000000000..3daf6d76e --- /dev/null +++ b/libre/dpkg/dpkg-gzip-rsyncable.patch @@ -0,0 +1,11 @@ +--- ./scripts/Dpkg/Compression.pm.orig 2012-04-27 04:49:02.000000000 +0200 ++++ ./scripts/Dpkg/Compression.pm 2012-05-27 22:23:18.530628795 +0200 +@@ -52,7 +52,7 @@ + my $COMP = { + "gzip" => { + "file_ext" => "gz", +- "comp_prog" => [ "gzip", "--no-name", "--rsyncable" ], ++ "comp_prog" => [ "gzip", "--no-name" ], + "decomp_prog" => [ "gunzip" ], + "default_level" => 9, + }, diff --git a/libre/dpkg/dpkg-rsyncable.patch b/libre/dpkg/dpkg-rsyncable.patch deleted file mode 100755 index e7e58dfdf..000000000 --- a/libre/dpkg/dpkg-rsyncable.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru dpkg-1.16.2.orig/scripts/Dpkg/Compression.pm dpkg-1.16.2/scripts/Dpkg/Compression.pm ---- dpkg-1.16.2.orig/scripts/Dpkg/Compression.pm 2012-03-19 02:40:08.000000000 -0400 -+++ dpkg-1.16.2/scripts/Dpkg/Compression.pm 2012-04-02 16:26:27.000000000 -0400 -@@ -52,7 +52,7 @@ - my $COMP = { - "gzip" => { - "file_ext" => "gz", -- "comp_prog" => [ "gzip", "--no-name", "--rsyncable" ], -+ "comp_prog" => [ "gzip", "--no-name"], - "decomp_prog" => [ "gunzip" ], - "default_level" => 9, - }, diff --git a/libre/dvdrip-libre/PKGBUILD b/libre/dvdrip-libre/PKGBUILD index 2069f1c8a..2069f1c8a 100755..100644 --- a/libre/dvdrip-libre/PKGBUILD +++ b/libre/dvdrip-libre/PKGBUILD diff --git a/libre/dvdrip-libre/dvdrip.desktop b/libre/dvdrip-libre/dvdrip.desktop index dd19b4aae..dd19b4aae 100755..100644 --- a/libre/dvdrip-libre/dvdrip.desktop +++ b/libre/dvdrip-libre/dvdrip.desktop diff --git a/libre/dvdrip-libre/dvdrip.install b/libre/dvdrip-libre/dvdrip.install index e111ef946..e111ef946 100755..100644 --- a/libre/dvdrip-libre/dvdrip.install +++ b/libre/dvdrip-libre/dvdrip.install diff --git a/libre/dvdrip-libre/libre.patch b/libre/dvdrip-libre/libre.patch index cc24ef467..cc24ef467 100755..100644 --- a/libre/dvdrip-libre/libre.patch +++ b/libre/dvdrip-libre/libre.patch diff --git a/libre/epdfview-libre/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch b/libre/epdfview-libre/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch index e077a15cf..e077a15cf 100755..100644 --- a/libre/epdfview-libre/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch +++ b/libre/epdfview-libre/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch diff --git a/libre/epdfview-libre/PKGBUILD b/libre/epdfview-libre/PKGBUILD index 28c77eed8..28c77eed8 100755..100644 --- a/libre/epdfview-libre/PKGBUILD +++ b/libre/epdfview-libre/PKGBUILD diff --git a/libre/epdfview-libre/epdfview.desktop.patch b/libre/epdfview-libre/epdfview.desktop.patch index d86fc3088..d86fc3088 100755..100644 --- a/libre/epdfview-libre/epdfview.desktop.patch +++ b/libre/epdfview-libre/epdfview.desktop.patch diff --git a/libre/epdfview-libre/epdfview.install b/libre/epdfview-libre/epdfview.install index c317fbaca..c317fbaca 100755..100644 --- a/libre/epdfview-libre/epdfview.install +++ b/libre/epdfview-libre/epdfview.install diff --git a/libre/epdfview-libre/glib2_headers.patch b/libre/epdfview-libre/glib2_headers.patch index b5bc5c211..b5bc5c211 100755..100644 --- a/libre/epdfview-libre/glib2_headers.patch +++ b/libre/epdfview-libre/glib2_headers.patch diff --git a/libre/file-roller-libre/PKGBUILD b/libre/file-roller-libre/PKGBUILD index eae98446f..eae98446f 100755..100644 --- a/libre/file-roller-libre/PKGBUILD +++ b/libre/file-roller-libre/PKGBUILD diff --git a/libre/file-roller-libre/file-roller.install b/libre/file-roller-libre/file-roller.install index 8b17fa3d4..8b17fa3d4 100755..100644 --- a/libre/file-roller-libre/file-roller.install +++ b/libre/file-roller-libre/file-roller.install diff --git a/libre/file-roller-libre/rePKGBUILD b/libre/file-roller-libre/rePKGBUILD index a83d218f1..a83d218f1 100755..100644 --- a/libre/file-roller-libre/rePKGBUILD +++ b/libre/file-roller-libre/rePKGBUILD diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD index fb422594c..fb422594c 100755..100644 --- a/libre/filesystem/PKGBUILD +++ b/libre/filesystem/PKGBUILD diff --git a/libre/filesystem/crypttab b/libre/filesystem/crypttab index 195945a74..195945a74 100755..100644 --- a/libre/filesystem/crypttab +++ b/libre/filesystem/crypttab diff --git a/libre/filesystem/filesystem.install b/libre/filesystem/filesystem.install index 12e59b01b..12e59b01b 100755..100644 --- a/libre/filesystem/filesystem.install +++ b/libre/filesystem/filesystem.install diff --git a/libre/filesystem/fstab b/libre/filesystem/fstab index b6716c14a..b6716c14a 100755..100644 --- a/libre/filesystem/fstab +++ b/libre/filesystem/fstab diff --git a/libre/filesystem/group b/libre/filesystem/group index 3e6645c83..3e6645c83 100755..100644 --- a/libre/filesystem/group +++ b/libre/filesystem/group diff --git a/libre/filesystem/gshadow b/libre/filesystem/gshadow index 253f35838..253f35838 100755..100644 --- a/libre/filesystem/gshadow +++ b/libre/filesystem/gshadow diff --git a/libre/filesystem/host.conf b/libre/filesystem/host.conf index cf52fe561..cf52fe561 100755..100644 --- a/libre/filesystem/host.conf +++ b/libre/filesystem/host.conf diff --git a/libre/filesystem/hosts b/libre/filesystem/hosts index 1747f9196..1747f9196 100755..100644 --- a/libre/filesystem/hosts +++ b/libre/filesystem/hosts diff --git a/libre/filesystem/issue b/libre/filesystem/issue index b001c55dd..b001c55dd 100755..100644 --- a/libre/filesystem/issue +++ b/libre/filesystem/issue diff --git a/libre/filesystem/ld.so.conf b/libre/filesystem/ld.so.conf index dfac45683..dfac45683 100755..100644 --- a/libre/filesystem/ld.so.conf +++ b/libre/filesystem/ld.so.conf diff --git a/libre/filesystem/modprobe.d.usb-load-ehci-first b/libre/filesystem/modprobe.d.usb-load-ehci-first index 947379411..947379411 100755..100644 --- a/libre/filesystem/modprobe.d.usb-load-ehci-first +++ b/libre/filesystem/modprobe.d.usb-load-ehci-first diff --git a/libre/filesystem/motd b/libre/filesystem/motd index e69de29bb..e69de29bb 100755..100644 --- a/libre/filesystem/motd +++ b/libre/filesystem/motd diff --git a/libre/filesystem/nsswitch.conf b/libre/filesystem/nsswitch.conf index 4a4f5770d..4a4f5770d 100755..100644 --- a/libre/filesystem/nsswitch.conf +++ b/libre/filesystem/nsswitch.conf diff --git a/libre/filesystem/os-release b/libre/filesystem/os-release index fe5f20b4f..fe5f20b4f 100755..100644 --- a/libre/filesystem/os-release +++ b/libre/filesystem/os-release diff --git a/libre/filesystem/passwd b/libre/filesystem/passwd index 671fc486e..671fc486e 100755..100644 --- a/libre/filesystem/passwd +++ b/libre/filesystem/passwd diff --git a/libre/filesystem/profile b/libre/filesystem/profile index 3bc22db9f..3bc22db9f 100755..100644 --- a/libre/filesystem/profile +++ b/libre/filesystem/profile diff --git a/libre/filesystem/resolv.conf b/libre/filesystem/resolv.conf index cecafba03..cecafba03 100755..100644 --- a/libre/filesystem/resolv.conf +++ b/libre/filesystem/resolv.conf diff --git a/libre/filesystem/securetty b/libre/filesystem/securetty index 5a2235ce7..5a2235ce7 100755..100644 --- a/libre/filesystem/securetty +++ b/libre/filesystem/securetty diff --git a/libre/filesystem/shadow b/libre/filesystem/shadow index 39ebb13c7..39ebb13c7 100755..100644 --- a/libre/filesystem/shadow +++ b/libre/filesystem/shadow diff --git a/libre/filesystem/shells b/libre/filesystem/shells index 18c1aeffa..18c1aeffa 100755..100644 --- a/libre/filesystem/shells +++ b/libre/filesystem/shells diff --git a/libre/foomatic-filters-libre/PKGBUILD b/libre/foomatic-filters-libre/PKGBUILD index 73a7af6c4..73a7af6c4 100755..100644 --- a/libre/foomatic-filters-libre/PKGBUILD +++ b/libre/foomatic-filters-libre/PKGBUILD diff --git a/libre/ghostscript-libre/PKGBUILD b/libre/ghostscript-libre/PKGBUILD index 656f49fb5..656f49fb5 100755..100644 --- a/libre/ghostscript-libre/PKGBUILD +++ b/libre/ghostscript-libre/PKGBUILD diff --git a/libre/ghostscript-libre/svn_rev11948.diff b/libre/ghostscript-libre/svn_rev11948.diff index 92abb0d98..92abb0d98 100755..100644 --- a/libre/ghostscript-libre/svn_rev11948.diff +++ b/libre/ghostscript-libre/svn_rev11948.diff diff --git a/libre/gnu-ghostscript/PKGBUILD b/libre/gnu-ghostscript/PKGBUILD index eb3a148e2..eb3a148e2 100755..100644 --- a/libre/gnu-ghostscript/PKGBUILD +++ b/libre/gnu-ghostscript/PKGBUILD diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index 8a1c01434..8a1c01434 100755..100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD diff --git a/libre/grub/grub.install b/libre/grub/grub.install index 9188b357a..9188b357a 100755..100644 --- a/libre/grub/grub.install +++ b/libre/grub/grub.install diff --git a/libre/gst-plugins-bad-libre/PKGBUILD b/libre/gst-plugins-bad-libre/PKGBUILD index e96c047a8..5a20ba446 100644 --- a/libre/gst-plugins-bad-libre/PKGBUILD +++ b/libre/gst-plugins-bad-libre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 171693 2012-11-21 14:33:55Z heftig $ +# $Id: PKGBUILD 173502 2012-12-19 18:25:44Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> pkgbase=gst-plugins-bad pkgname=gst-plugins-bad-libre -pkgver=1.0.3 +pkgver=1.0.4 pkgrel=1 pkgdesc='GStreamer Multimedia Framework Bad Plugins, without nonfree faac support' arch=( @@ -57,7 +57,7 @@ source=( "$url/src/$pkgbase/$pkgbase-$pkgver.tar.xz" ) sha256sums=( - 2eae746be0b4c7fa2f1e057c91bd36940d7c25593ab612b707904461360031f0 + 198759adb10ceb1777245f5706a198708e4539cd1e19b8a900f5d573fc76089f ) build() { diff --git a/libre/gstreamer0.10-bad-libre/PKGBUILD b/libre/gstreamer0.10-bad-libre/PKGBUILD index 46e608da9..46e608da9 100755..100644 --- a/libre/gstreamer0.10-bad-libre/PKGBUILD +++ b/libre/gstreamer0.10-bad-libre/PKGBUILD diff --git a/libre/gstreamer0.10-bad-libre/gstreamer0.10-bad-plugins.install b/libre/gstreamer0.10-bad-libre/gstreamer0.10-bad-plugins.install index 3a36b0ccb..3a36b0ccb 100755..100644 --- a/libre/gstreamer0.10-bad-libre/gstreamer0.10-bad-plugins.install +++ b/libre/gstreamer0.10-bad-libre/gstreamer0.10-bad-plugins.install diff --git a/libre/gstreamer0.10-good/PKGBUILD b/libre/gstreamer0.10-good/PKGBUILD index abe7dc0ef..abe7dc0ef 100755..100644 --- a/libre/gstreamer0.10-good/PKGBUILD +++ b/libre/gstreamer0.10-good/PKGBUILD diff --git a/libre/gstreamer0.10-good/gstreamer0.10-good-plugins.install b/libre/gstreamer0.10-good/gstreamer0.10-good-plugins.install index e343beea5..e343beea5 100755..100644 --- a/libre/gstreamer0.10-good/gstreamer0.10-good-plugins.install +++ b/libre/gstreamer0.10-good/gstreamer0.10-good-plugins.install diff --git a/libre/h-client/PKGBUILD b/libre/h-client/PKGBUILD index 821517397..821517397 100755..100644 --- a/libre/h-client/PKGBUILD +++ b/libre/h-client/PKGBUILD diff --git a/libre/hardinfo/PKGBUILD b/libre/hardinfo/PKGBUILD index 1987e191e..1987e191e 100755..100644 --- a/libre/hardinfo/PKGBUILD +++ b/libre/hardinfo/PKGBUILD diff --git a/libre/hardinfo/fixsensors.patch b/libre/hardinfo/fixsensors.patch index 812c29458..812c29458 100755..100644 --- a/libre/hardinfo/fixsensors.patch +++ b/libre/hardinfo/fixsensors.patch diff --git a/libre/hardinfo/hardinfo.distro b/libre/hardinfo/hardinfo.distro index cf378523a..cf378523a 100755..100644 --- a/libre/hardinfo/hardinfo.distro +++ b/libre/hardinfo/hardinfo.distro diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD index 069fa612d..069fa612d 100755..100644 --- a/libre/hplip-libre/PKGBUILD +++ b/libre/hplip-libre/PKGBUILD diff --git a/libre/hplip-libre/hplip.install b/libre/hplip-libre/hplip.install index 74532cde3..74532cde3 100755..100644 --- a/libre/hplip-libre/hplip.install +++ b/libre/hplip-libre/hplip.install diff --git a/libre/iceape-i18n/Makefile b/libre/iceape-i18n/Makefile deleted file mode 100755 index 89aaccfdc..000000000 --- a/libre/iceape-i18n/Makefile +++ /dev/null @@ -1,59 +0,0 @@ -#!/usr/bin/make -f -# Use this script to update the PKGBUILD's list of langpacks. -# This script depends on: -# - coreutils -# - pacman -# - sed - -# Variables: -# This is to get it from Debian Sid -debname=iceape-l10n -debver=2.7.4+debian -debrel=2 -debrepo=http://ftp.debian.org/debian/pool/main/ - -pkgver=2.7.4 -pkgrel=1 - -# Guts: ############################################################## - -default: PHONY all -all: PHONY - $(MAKE) clean - $(MAKE) PKGBUILD -.PRECIOUS: PKGBUILD - -PKGBUILD.list: Makefile - sed \ - -e 's/@DEBNAME@/$(debname)/' \ - -e 's/@DEBVER@/$(debver)/' \ - -e 's/@DEBREL@/$(debrel)/' \ - -e 's%@DEBREPO@%$(debrepo)%' \ - -e 's/@PKGVER@/$(pkgver)/' \ - -e 's/@PKGREL@/$(pkgrel)/' \ - -e "s/@LANGPACKS@/(phony)/" \ - -e '/CUT HERE/,$$d' \ - PKGBUILD.in > $@ - echo 'package() { exit 0; }' >> $@ - makepkg -gp $@ >> $@ -langpacks.txt: PKGBUILD.list Makefile - makepkg -dp $< - ls src/*/upstream | sed 's/\.xpi//' > $@ -PKGBUILD: PKGBUILD.in langpacks.txt Makefile - sed \ - -e 's/@DEBNAME@/$(debname)/' \ - -e 's/@DEBVER@/$(debver)/' \ - -e 's/@DEBREL@/$(debrel)/' \ - -e 's%@DEBREPO@%$(debrepo)%' \ - -e 's/@PKGVER@/$(pkgver)/' \ - -e 's/@PKGREL@/$(pkgrel)/' \ - -e "s/@LANGPACKS@/(`xargs echo < langpacks.txt`)/" \ - -e '/CUT HERE/d' \ - -e '/md5sums/,$$d' \ - PKGBUILD.in > $@ - makepkg -dg >> $@ - -clean: PHONY - rm -f PKGBUILD.list langpacks.txt - -.PHONY: PHONY FORCE diff --git a/libre/iceape-i18n/PKGBUILD.in b/libre/iceape-i18n/PKGBUILD.in deleted file mode 100755 index 6891b2672..000000000 --- a/libre/iceape-i18n/PKGBUILD.in +++ /dev/null @@ -1,64 +0,0 @@ -# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> -# Contributor: fauno <fauno@kiwwwi.com.ar> -# Contributor: Figue <ffigue@gmail.com> -# Contributor: André Silva <andre.paulista@adinet.com.uy> -# Based on icecat-i18n package, which is in turn based on firefox-i18n - -# When updating to a newer upstream release: -# - Edit variables in in Makefile. -# - (optionally) edit PKGBUILD.in -# - Run 'make'. It will take care of everything else for you. - -_debname=@DEBNAME@ -_debver=@DEBVER@ -_debrel=@DEBREL@ -_debrepo=@DEBREPO@ -debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } - -_langpacks=@LANGPACKS@ - -pkgbase=iceape-i18n -pkgname=($(for lang in ${_langpacks[@]} - do echo $pkgbase-$lang | tr A-Z a-z - done)) -_pkgver=@PKGVER@ -pkgver=${_debver}.${_debrel} -pkgrel=@PKGREL@ - -pkgdesc="Language packs for Debian Iceape." -arch=('any') -url="http://packages.debian.org/source/sid/iceape" -license=('MPL') -depends=("iceape=$_pkgver") -source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.gz" - "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.diff.gz" - "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.dsc") -noextract=($(for lang in ${_langpacks[@]} - do echo $lang.xpi - done)) - -dpkg-source() { - # This will simulate dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc - cd "${_debname}-${_debver}" - patch -p1 -i "${srcdir}/${_debname}_${_debver}-${_debrel}.diff" - cd .. -} - -build() { - cd "${srcdir}" - dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc -} - -_path="/usr/lib/iceape-${_pkgver}/extensions" - -# CUT HERE <-- Separates package_*() functions from everything else. - -for lang in ${_langpacks[@]} -do - eval " -package_iceape-i18n-$(echo $lang | tr A-Z a-z) () { - install -Dm644 '$srcdir/'*'/upstream/$lang.xpi' \"\$pkgdir\"'$_path/langpack-$lang@firefox.mozilla.org.xpi' -} -" -done - diff --git a/libre/iceape-i18n/.gitignore b/libre/iceape-l10n/.gitignore index 3e1eb57b5..3e1eb57b5 100755..100644 --- a/libre/iceape-i18n/.gitignore +++ b/libre/iceape-l10n/.gitignore diff --git a/libre/iceape-i18n/PKGBUILD b/libre/iceape-l10n/PKGBUILD index ef9906627..1170df1d5 100755..100644 --- a/libre/iceape-i18n/PKGBUILD +++ b/libre/iceape-l10n/PKGBUILD @@ -18,19 +18,20 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _langpacks=(be ca cs de en-GB es-AR es-ES fi fr gl hu it ja lt nb-NO nl pl pt-PT ru sk sv-SE tr zh-CN) -pkgbase=iceape-i18n +pkgbase=iceape-l10n pkgname=($(for lang in ${_langpacks[@]} do echo $pkgbase-$lang | tr A-Z a-z done)) _pkgver=2.7.11 pkgver=${_debver}.${_debrel} -pkgrel=2 +pkgrel=1 pkgdesc="Language packs for Debian Iceape." -arch=('any') +arch=('i686' 'x86_64' 'mips64el') url="http://packages.debian.org/source/sid/iceape" license=('MPL') depends=("iceape-libre>=$pkgver") + source=() for lang in ${_langpacks[@]} do @@ -52,7 +53,10 @@ _path="/usr/lib/iceape/extensions" for lang in ${_langpacks[@]} do eval " -package_iceape-i18n-$(echo $lang | tr A-Z a-z)() { +package_iceape-l10n-$(echo $lang | tr A-Z a-z)() { + replaces=(iceape-i18n-$(echo $lang | tr A-Z a-z)) + conflicts=(iceape-i18n-$(echo $lang | tr A-Z a-z)) + provides=(iceape-i18n-$(echo $lang | tr A-Z a-z)) install -Dm644 \"\$srcdir$_path/langpack-$lang@iceape.mozilla.org.xpi\" \"\$pkgdir$_path/langpack-$lang@iceape.mozilla.org.xpi\" } " diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD index 2595a36f9..2595a36f9 100755..100644 --- a/libre/iceape-libre/PKGBUILD +++ b/libre/iceape-libre/PKGBUILD diff --git a/libre/iceape-libre/clrf.patch b/libre/iceape-libre/clrf.patch index 375708ac4..375708ac4 100755..100644 --- a/libre/iceape-libre/clrf.patch +++ b/libre/iceape-libre/clrf.patch diff --git a/libre/iceape-libre/gcc47.patch b/libre/iceape-libre/gcc47.patch index 115d65131..115d65131 100755..100644 --- a/libre/iceape-libre/gcc47.patch +++ b/libre/iceape-libre/gcc47.patch diff --git a/libre/iceape-libre/iceape-2.0-lang.patch b/libre/iceape-libre/iceape-2.0-lang.patch index b9f4a5cde..b9f4a5cde 100755..100644 --- a/libre/iceape-libre/iceape-2.0-lang.patch +++ b/libre/iceape-libre/iceape-2.0-lang.patch diff --git a/libre/iceape-libre/iceape.desktop b/libre/iceape-libre/iceape.desktop index 0868e5058..0868e5058 100755..100644 --- a/libre/iceape-libre/iceape.desktop +++ b/libre/iceape-libre/iceape.desktop diff --git a/libre/iceape-libre/iceape.install b/libre/iceape-libre/iceape.install index 709ad81f2..709ad81f2 100755..100644 --- a/libre/iceape-libre/iceape.install +++ b/libre/iceape-libre/iceape.install diff --git a/libre/iceape-libre/libre.patch b/libre/iceape-libre/libre.patch index 6273a05a9..6273a05a9 100755..100644 --- a/libre/iceape-libre/libre.patch +++ b/libre/iceape-libre/libre.patch diff --git a/libre/iceape-libre/mozconfig b/libre/iceape-libre/mozconfig index 5227d77a5..5227d77a5 100755..100644 --- a/libre/iceape-libre/mozconfig +++ b/libre/iceape-libre/mozconfig diff --git a/libre/icecat-i18n/.gitignore b/libre/icecat-i18n/.gitignore index 3987fdafb..3987fdafb 100755..100644 --- a/libre/icecat-i18n/.gitignore +++ b/libre/icecat-i18n/.gitignore diff --git a/libre/icecat-i18n/Makefile b/libre/icecat-i18n/Makefile index d1aaf7bff..d1aaf7bff 100755..100644 --- a/libre/icecat-i18n/Makefile +++ b/libre/icecat-i18n/Makefile diff --git a/libre/icecat-i18n/PKGBUILD b/libre/icecat-i18n/PKGBUILD index aebc6cef0..aebc6cef0 100755..100644 --- a/libre/icecat-i18n/PKGBUILD +++ b/libre/icecat-i18n/PKGBUILD diff --git a/libre/icecat-i18n/PKGBUILD.in b/libre/icecat-i18n/PKGBUILD.in index 90c901e31..90c901e31 100755..100644 --- a/libre/icecat-i18n/PKGBUILD.in +++ b/libre/icecat-i18n/PKGBUILD.in diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index cc5889c7a..cc5889c7a 100755..100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD diff --git a/libre/icecat/cairo.patch b/libre/icecat/cairo.patch index a1fabee90..a1fabee90 100755..100644 --- a/libre/icecat/cairo.patch +++ b/libre/icecat/cairo.patch diff --git a/libre/icecat/gcc47.patch b/libre/icecat/gcc47.patch index 829d59510..829d59510 100755..100644 --- a/libre/icecat/gcc47.patch +++ b/libre/icecat/gcc47.patch diff --git a/libre/icecat/icecat-safe.desktop b/libre/icecat/icecat-safe.desktop index 87acc970c..87acc970c 100755..100644 --- a/libre/icecat/icecat-safe.desktop +++ b/libre/icecat/icecat-safe.desktop diff --git a/libre/icecat/icecat.desktop b/libre/icecat/icecat.desktop index 8a7cad93d..8a7cad93d 100755..100644 --- a/libre/icecat/icecat.desktop +++ b/libre/icecat/icecat.desktop diff --git a/libre/icecat/icecat.install b/libre/icecat/icecat.install index c1fe8284a..c1fe8284a 100755..100644 --- a/libre/icecat/icecat.install +++ b/libre/icecat/icecat.install diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch index bf2dff437..bf2dff437 100755..100644 --- a/libre/icecat/libre.patch +++ b/libre/icecat/libre.patch diff --git a/libre/icecat/mozconfig b/libre/icecat/mozconfig index 5df8547f7..5df8547f7 100755..100644 --- a/libre/icecat/mozconfig +++ b/libre/icecat/mozconfig diff --git a/libre/icecat/mozconfig.pgo b/libre/icecat/mozconfig.pgo index b0c249ebf..b0c249ebf 100755..100644 --- a/libre/icecat/mozconfig.pgo +++ b/libre/icecat/mozconfig.pgo diff --git a/libre/icecat/vendor.js b/libre/icecat/vendor.js index d8d606bc1..d8d606bc1 100755..100644 --- a/libre/icecat/vendor.js +++ b/libre/icecat/vendor.js diff --git a/libre/icecat/xulrunner-copy-stub.patch b/libre/icecat/xulrunner-copy-stub.patch index 8ccf127df..8ccf127df 100755..100644 --- a/libre/icecat/xulrunner-copy-stub.patch +++ b/libre/icecat/xulrunner-copy-stub.patch diff --git a/libre/icedove-i18n/PKGBUILD b/libre/icedove-i18n/PKGBUILD deleted file mode 100755 index d7dbbb211..000000000 --- a/libre/icedove-i18n/PKGBUILD +++ /dev/null @@ -1,530 +0,0 @@ -# Maintainer: Márcio Silva <coadde@lavabit.com> -# Maintainer: André Silva <emulatorman@lavabit.com> - -pkgbase=icedove-i18n -pkgver=17.0.1 -pkgname=('icedove-i18n-ar' - 'icedove-i18n-ast' - 'icedove-i18n-be' - 'icedove-i18n-bg' - 'icedove-i18n-bn-bd' - 'icedove-i18n-br' - 'icedove-i18n-ca' - 'icedove-i18n-cs' - 'icedove-i18n-da' - 'icedove-i18n-de' - 'icedove-i18n-el' - 'icedove-i18n-en-gb' - 'icedove-i18n-en-us' - 'icedove-i18n-es-ar' - 'icedove-i18n-es-es' - 'icedove-i18n-et' - 'icedove-i18n-eu' - 'icedove-i18n-fi' - 'icedove-i18n-fr' - 'icedove-i18n-fy-nl' - 'icedove-i18n-ga-ie' - 'icedove-i18n-gd' - 'icedove-i18n-gl' - 'icedove-i18n-he' - 'icedove-i18n-hr' - 'icedove-i18n-hu' - 'icedove-i18n-hy-am' - 'icedove-i18n-id' - 'icedove-i18n-is' - 'icedove-i18n-it' - 'icedove-i18n-ja' - 'icedove-i18n-ko' - 'icedove-i18n-lt' - 'icedove-i18n-nb-no' - 'icedove-i18n-nl' - 'icedove-i18n-nn-no' - 'icedove-i18n-pa-in' - 'icedove-i18n-pl' - 'icedove-i18n-pt-br' - 'icedove-i18n-pt' - 'icedove-i18n-ro' - 'icedove-i18n-rm' - 'icedove-i18n-ru' - 'icedove-i18n-si' - 'icedove-i18n-sk' - 'icedove-i18n-sl' - 'icedove-i18n-sq' - 'icedove-i18n-sr' - 'icedove-i18n-sv-se' - 'icedove-i18n-ta-lk' - 'icedove-i18n-tr' - 'icedove-i18n-uk' - 'icedove-i18n-vi' - 'icedove-i18n-zh-cn' - 'icedove-i18n-zh-tw') - -pkgrel=1 -pkgdesc="Language pack for Debian Icedove" -arch=('any') -url="http://packages.debian.org/source/experimental/icedove" -license=('MPL' 'GPL') -depends=("icedove-libre>=$pkgver") -_url=http://repo.parabolagnulinux.org/other/$pkgbase/releases/$pkgver -source=(icedove-i18n-$pkgver-ar.xpi::$_url/ar.xpi - icedove-i18n-$pkgver-ast.xpi::$_url/ast.xpi - icedove-i18n-$pkgver-be.xpi::$_url/be.xpi - icedove-i18n-$pkgver-bg.xpi::$_url/bg.xpi - icedove-i18n-$pkgver-bn-BD.xpi::$_url/bn-BD.xpi - icedove-i18n-$pkgver-br.xpi::$_url/br.xpi - icedove-i18n-$pkgver-ca.xpi::$_url/ca.xpi - icedove-i18n-$pkgver-cs.xpi::$_url/cs.xpi - icedove-i18n-$pkgver-da.xpi::$_url/da.xpi - icedove-i18n-$pkgver-de.xpi::$_url/de.xpi - icedove-i18n-$pkgver-el.xpi::$_url/el.xpi - icedove-i18n-$pkgver-en-GB.xpi::$_url/en-GB.xpi - icedove-i18n-$pkgver-en-US.xpi::$_url/en-US.xpi - icedove-i18n-$pkgver-es-AR.xpi::$_url/es-AR.xpi - icedove-i18n-$pkgver-es-ES.xpi::$_url/es-ES.xpi - icedove-i18n-$pkgver-et.xpi::$_url/et.xpi - icedove-i18n-$pkgver-eu.xpi::$_url/eu.xpi - icedove-i18n-$pkgver-fi.xpi::$_url/fi.xpi - icedove-i18n-$pkgver-fr.xpi::$_url/fr.xpi - icedove-i18n-$pkgver-fy-NL.xpi::$_url/fy-NL.xpi - icedove-i18n-$pkgver-ga-IE.xpi::$_url/ga-IE.xpi - icedove-i18n-$pkgver-gd.xpi::$_url/gd.xpi - icedove-i18n-$pkgver-gl.xpi::$_url/gl.xpi - icedove-i18n-$pkgver-he.xpi::$_url/he.xpi - icedove-i18n-$pkgver-hr.xpi::$_url/hr.xpi - icedove-i18n-$pkgver-hu.xpi::$_url/hu.xpi - icedove-i18n-$pkgver-hy-AM.xpi::$_url/hy-AM.xpi - icedove-i18n-$pkgver-id.xpi::$_url/id.xpi - icedove-i18n-$pkgver-is.xpi::$_url/is.xpi - icedove-i18n-$pkgver-it.xpi::$_url/it.xpi - icedove-i18n-$pkgver-ja.xpi::$_url/ja.xpi - icedove-i18n-$pkgver-ko.xpi::$_url/ko.xpi - icedove-i18n-$pkgver-lt.xpi::$_url/lt.xpi - icedove-i18n-$pkgver-nb-NO.xpi::$_url/nb-NO.xpi - icedove-i18n-$pkgver-nl.xpi::$_url/nl.xpi - icedove-i18n-$pkgver-nn-NO.xpi::$_url/nn-NO.xpi - icedove-i18n-$pkgver-pa-IN.xpi::$_url/pa-IN.xpi - icedove-i18n-$pkgver-pl.xpi::$_url/pl.xpi - icedove-i18n-$pkgver-pt-BR.xpi::$_url/pt-BR.xpi - icedove-i18n-$pkgver-pt-PT.xpi::$_url/pt-PT.xpi - icedove-i18n-$pkgver-rm.xpi::$_url/rm.xpi - icedove-i18n-$pkgver-ro.xpi::$_url/ro.xpi - icedove-i18n-$pkgver-ru.xpi::$_url/ru.xpi - icedove-i18n-$pkgver-si.xpi::$_url/si.xpi - icedove-i18n-$pkgver-sk.xpi::$_url/sk.xpi - icedove-i18n-$pkgver-sl.xpi::$_url/sl.xpi - icedove-i18n-$pkgver-sq.xpi::$_url/sq.xpi - icedove-i18n-$pkgver-sr.xpi::$_url/sr.xpi - icedove-i18n-$pkgver-sv-SE.xpi::$_url/sv-SE.xpi - icedove-i18n-$pkgver-ta-LK.xpi::$_url/ta-LK.xpi - icedove-i18n-$pkgver-tr.xpi::$_url/tr.xpi - icedove-i18n-$pkgver-uk.xpi::$_url/uk.xpi - icedove-i18n-$pkgver-vi.xpi::$_url/vi.xpi - icedove-i18n-$pkgver-zh-CN.xpi::$_url/zh-CN.xpi - icedove-i18n-$pkgver-zh-TW.xpi::$_url/zh-TW.xpi) - -# Don't extract anything -noextract=(${source[@]##*/}) - -_path="/usr/lib/icedove/extensions/" - -package_icedove-i18n-ar() { - pkgdesc="Language packs for Debian Icedove." - cd ${srcdir} - install -Dm644 icedove-i18n-$pkgver-ar.xpi "${pkgdir}/$_path/langpack-ar@icedove.mozilla.org.xpi" -} - -package_icedove-i18n-ast() { - pkgdesc="Language packs for Debian Icedove." - cd ${srcdir} - install -Dm644 icedove-i18n-$pkgver-ast.xpi "${pkgdir}/$_path/langpack-ast@icedove.mozilla.org.xpi" -} - -package_icedove-i18n-af() { - pkgdesc="Language packs for Debian Icedove." - cd ${srcdir} - install -Dm644 icedove-i18n-$pkgver-af.xpi "${pkgdir}/$_path/langpack-af@icedove.mozilla.org.xpi" -} - -package_icedove-i18n-be() { - pkgdesc="Language packs for Debian Icedove." - cd ${srcdir} - install -Dm644 icedove-i18n-$pkgver-be.xpi "${pkgdir}/$_path/langpack-be@icedove.mozilla.org.xpi" -} - -package_icedove-i18n-bg() { - pkgdesc="Language packs for Debian Icedove." - cd ${srcdir} - install -Dm644 icedove-i18n-$pkgver-bg.xpi "${pkgdir}/$_path/langpack-bg@icedove.mozilla.org.xpi" -} - -package_icedove-i18n-bn-bd() { - pkgdesc="Language packs for Debian Icedove." - cd ${srcdir} - install -Dm644 icedove-i18n-$pkgver-bn-BD.xpi "${pkgdir}/$_path/langpack-bn-BD@icedove.mozilla.org.xpi" -} - -package_icedove-i18n-br() { - pkgdesc="Language packs for Debian Icedove." - cd ${srcdir} - install -Dm644 icedove-i18n-$pkgver-br.xpi "${pkgdir}/$_path/langpack-br@icedove.mozilla.org.xpi" -} - -package_icedove-i18n-ca() { - pkgdesc="Language packs for Debian Icedove." - cd ${srcdir} - install -Dm644 icedove-i18n-$pkgver-ca.xpi "${pkgdir}/$_path/langpack-ca@icedove.mozilla.org.xpi" -} - -package_icedove-i18n-cs() { - pkgdesc="Language packs for Debian Icedove." - cd ${srcdir} - install -Dm644 icedove-i18n-$pkgver-cs.xpi "${pkgdir}/$_path/langpack-cs@icedove.mozilla.org.xpi" -} - -package_icedove-i18n-da() { - pkgdesc="Language packs for Debian Icedove." - cd ${srcdir} - install -Dm644 icedove-i18n-$pkgver-da.xpi "${pkgdir}/$_path/langpack-da@icedove.mozilla.org.xpi" -} - -package_icedove-i18n-de() { - pkgdesc="Language packs for Debian Icedove." - cd ${srcdir} - install -Dm644 icedove-i18n-$pkgver-de.xpi "${pkgdir}/$_path/langpack-de@icedove.mozilla.org.xpi" -} - -package_icedove-i18n-el() { - pkgdesc="Language packs for Debian Icedove." - cd ${srcdir} - install -Dm644 icedove-i18n-$pkgver-el.xpi "${pkgdir}/$_path/langpack-el@icedove.mozilla.org.xpi" -} - -package_icedove-i18n-en-gb() { - pkgdesc="Language packs for Debian Icedove." - cd ${srcdir} - install -Dm644 icedove-i18n-$pkgver-en-GB.xpi "${pkgdir}/$_path/langpack-en-GB@icedove.mozilla.org.xpi" -} - -package_icedove-i18n-en-us() { - pkgdesc="Language packs for Debian Icedove." - cd ${srcdir} - install -Dm644 icedove-i18n-$pkgver-en-US.xpi "${pkgdir}/$_path/langpack-en-US@icedove.mozilla.org.xpi" -} - -package_icedove-i18n-es-ar() { - pkgdesc="Language packs for Debian Icedove." - cd ${srcdir} - install -Dm644 icedove-i18n-$pkgver-es-AR.xpi "${pkgdir}/$_path/langpack-es-AR@icedove.mozilla.org.xpi" -} - -package_icedove-i18n-es-es() { - pkgdesc="Language packs for Debian Icedove." - replaces=icedove-i18n-es - cd ${srcdir} - install -Dm644 icedove-i18n-$pkgver-es-ES.xpi "${pkgdir}/$_path/langpack-es-ES@icedove.mozilla.org.xpi" -} - -package_icedove-i18n-et() { - pkgdesc="Language packs for Debian Icedove." - cd ${srcdir} - install -Dm644 icedove-i18n-$pkgver-et.xpi "${pkgdir}/$_path/langpack-et@icedove.mozilla.org.xpi" -} - -package_icedove-i18n-eu() { - pkgdesc="Language packs for Debian Icedove." - cd ${srcdir} - install -Dm644 icedove-i18n-$pkgver-eu.xpi "${pkgdir}/$_path/langpack-eu@icedove.mozilla.org.xpi" -} - -package_icedove-i18n-fi() { - pkgdesc="Language packs for Debian Icedove." - cd ${srcdir} - install -Dm644 icedove-i18n-$pkgver-fi.xpi "${pkgdir}/$_path/langpack-fi@icedove.mozilla.org.xpi" -} - -package_icedove-i18n-fr() { - pkgdesc="Language packs for Debian Icedove." - cd ${srcdir} - install -Dm644 icedove-i18n-$pkgver-fr.xpi "${pkgdir}/$_path/langpack-fr@icedove.mozilla.org.xpi" -} - -package_icedove-i18n-fy-nl(){ - pkgdesc="Language packs for Debian Icedove." - cd ${srcdir} - install -Dm644 icedove-i18n-$pkgver-fy-NL.xpi "${pkgdir}/$_path/langpack-fy-NL@icedove.mozilla.org.xpi" -} - -package_icedove-i18n-ga-ie() { - pkgdesc="Language packs for Debian Icedove." - replaces=icedove-i18n-ga - cd ${srcdir} - install -Dm644 icedove-i18n-$pkgver-ga-IE.xpi "${pkgdir}/$_path/langpack-ga-IE@icedove.mozilla.org.xpi" -} - -package_icedove-i18n-gd() { - pkgdesc="Language packs for Debian Icedove." - cd ${srcdir} - install -Dm644 icedove-i18n-$pkgver-gd.xpi "${pkgdir}/$_path/langpack-gd@icedove.mozilla.org.xpi" -} - -package_icedove-i18n-gl() { - pkgdesc="Language packs for Debian Icedove." - cd ${srcdir} - install -Dm644 icedove-i18n-$pkgver-gl.xpi "${pkgdir}/$_path/langpack-gl@icedove.mozilla.org.xpi" -} - -package_icedove-i18n-he() { - pkgdesc="Language packs for Debian Icedove." - cd ${srcdir} - install -Dm644 icedove-i18n-$pkgver-he.xpi "${pkgdir}/$_path/langpack-he@icedove.mozilla.org.xpi" -} - -package_icedove-i18n-hr() { - pkgdesc="Language packs for Debian Icedove." - cd ${srcdir} - install -Dm644 icedove-i18n-$pkgver-hr.xpi "${pkgdir}/$_path/langpack-hr@icedove.mozilla.org.xpi" -} - -package_icedove-i18n-hu() { - pkgdesc="Language packs for Debian Icedove." - cd ${srcdir} - install -Dm644 icedove-i18n-$pkgver-hu.xpi "${pkgdir}/$_path/langpack-hu@icedove.mozilla.org.xpi" -} - -package_icedove-i18n-hy-am() { - pkgdesc="Language packs for Debian Icedove." - cd ${srcdir} - install -Dm644 icedove-i18n-$pkgver-hy-AM.xpi "${pkgdir}/$_path/langpack-hy-am@icedove.mozilla.org.xpi" -} - -package_icedove-i18n-id(){ - pkgdesc="Language packs for Debian Icedove." - cd ${srcdir} - install -Dm644 icedove-i18n-$pkgver-id.xpi "${pkgdir}/$_path/langpack-id@icedove.mozilla.org.xpi" -} - -package_icedove-i18n-is() { - pkgdesc="Language packs for Debian Icedove." - cd ${srcdir} - install -Dm644 icedove-i18n-$pkgver-is.xpi "${pkgdir}/$_path/langpack-is@icedove.mozilla.org.xpi" -} - -package_icedove-i18n-it() { - pkgdesc="Language packs for Debian Icedove." - cd ${srcdir} - install -Dm644 icedove-i18n-$pkgver-it.xpi "${pkgdir}/$_path/langpack-it@icedove.mozilla.org.xpi" -} - -package_icedove-i18n-ja() { - pkgdesc="Language packs for Debian Icedove." - cd ${srcdir} - install -Dm644 icedove-i18n-$pkgver-ja.xpi "${pkgdir}/$_path/langpack-ja@icedove.mozilla.org.xpi" -} - -package_icedove-i18n-ko() { - pkgdesc="Language packs for Debian Icedove." - cd ${srcdir} - install -Dm644 icedove-i18n-$pkgver-ko.xpi "${pkgdir}/$_path/langpack-ko@icedove.mozilla.org.xpi" -} - -package_icedove-i18n-lt() { - pkgdesc="Language packs for Debian Icedove." - cd ${srcdir} - install -Dm644 icedove-i18n-$pkgver-lt.xpi "${pkgdir}/$_path/langpack-lt@icedove.mozilla.org.xpi" -} - -package_icedove-i18n-nb-no() { - pkgdesc="Language packs for Debian Icedove." - replaces=icedove-i18n-nb - cd ${srcdir} - install -Dm644 icedove-i18n-$pkgver-nb-NO.xpi "${pkgdir}/$_path/langpack-nb-NO@icedove.mozilla.org.xpi" -} - -package_icedove-i18n-mk() { - pkgdesc="Language packs for Debian Icedove." - cd ${srcdir} - install -Dm644 icedove-i18n-$pkgver-mk.xpi "${pkgdir}/$_path/langpack-mk@icedove.mozilla.org.xpi" -} - -package_icedove-i18n-nl() { - pkgdesc="Language packs for Debian Icedove." - cd ${srcdir} - install -Dm644 icedove-i18n-$pkgver-nl.xpi "${pkgdir}/$_path/langpack-nl@icedove.mozilla.org.xpi" -} - -package_icedove-i18n-nn-no() { - pkgdesc="Language packs for Debian Icedove." - replaces=icedove-i18n-nn - cd ${srcdir} - install -Dm644 icedove-i18n-$pkgver-nn-NO.xpi "${pkgdir}/$_path/langpack-nn-NO@icedove.mozilla.org.xpi" -} - -package_icedove-i18n-pa-in() { - pkgdesc="Language packs for Debian Icedove." - replaces=icedove-i18n-pa - cd ${srcdir} - install -Dm644 icedove-i18n-$pkgver-pa-IN.xpi "${pkgdir}/$_path/langpack-pa-IN@icedove.mozilla.org.xpi" -} - -package_icedove-i18n-pl() { - pkgdesc="Language packs for Debian Icedove." - cd ${srcdir} - install -Dm644 icedove-i18n-$pkgver-pl.xpi "${pkgdir}/$_path/langpack-pl@icedove.mozilla.org.xpi" -} - -package_icedove-i18n-pt-br() { - pkgdesc="Language packs for Debian Icedove." - cd ${srcdir} - install -Dm644 icedove-i18n-$pkgver-pt-BR.xpi "${pkgdir}/$_path/langpack-pt-BR@icedove.mozilla.org.xpi" -} - -package_icedove-i18n-pt() { - pkgdesc="Language packs for Debian Icedove." - cd ${srcdir} - install -Dm644 icedove-i18n-$pkgver-pt-PT.xpi "${pkgdir}/$_path/langpack-pt-PT@icedove.mozilla.org.xpi" -} - -package_icedove-i18n-ro() { - pkgdesc="Language packs for Debian Icedove." - cd ${srcdir} - install -Dm644 icedove-i18n-$pkgver-ro.xpi "${pkgdir}/$_path/langpack-ro@icedove.mozilla.org.xpi" -} - -package_icedove-i18n-rm() { - pkgdesc="Language packs for Debian Icedove." - cd ${srcdir} - install -Dm644 icedove-i18n-$pkgver-rm.xpi "${pkgdir}/$_path/langpack-rm@icedove.mozilla.org.xpi" -} - -package_icedove-i18n-ru() { - pkgdesc="Language packs for Debian Icedove." - cd ${srcdir} - install -Dm644 icedove-i18n-$pkgver-ru.xpi "${pkgdir}/$_path/langpack-ru@icedove.mozilla.org.xpi" -} - -package_icedove-i18n-si() { - pkgdesc="Language packs for Debian Icedove." - cd ${srcdir} - install -Dm644 icedove-i18n-$pkgver-si.xpi "${pkgdir}/$_path/langpack-si@icedove.mozilla.org.xpi" -} - -package_icedove-i18n-sk() { - pkgdesc="Language packs for Debian Icedove." - cd ${srcdir} - install -Dm644 icedove-i18n-$pkgver-sk.xpi "${pkgdir}/$_path/langpack-sk@icedove.mozilla.org.xpi" -} - -package_icedove-i18n-sl() { - pkgdesc="Language packs for Debian Icedove." - cd ${srcdir} - install -Dm644 icedove-i18n-$pkgver-sl.xpi "${pkgdir}/$_path/langpack-sl@icedove.mozilla.org.xpi" -} - -package_icedove-i18n-sq() { - pkgdesc="Language packs for Debian Icedove." - cd ${srcdir} - install -Dm644 icedove-i18n-$pkgver-sq.xpi "${pkgdir}/$_path/langpack-sq@icedove.mozilla.org.xpi" -} - -package_icedove-i18n-sr() { - pkgdesc="Language packs for Debian Icedove." - cd ${srcdir} - install -Dm644 icedove-i18n-$pkgver-sr.xpi "${pkgdir}/$_path/langpack-sr@icedove.mozilla.org.xpi" -} - -package_icedove-i18n-sv-se() { - pkgdesc="Language packs for Debian Icedove." - replaces=icedove-i18n-sv - cd ${srcdir} - install -Dm644 icedove-i18n-$pkgver-sv-SE.xpi "${pkgdir}/$_path/langpack-sv-SE@icedove.mozilla.org.xpi" -} - -package_icedove-i18n-ta-lk() { - pkgdesc="Language packs for Debian Icedove." - cd ${srcdir} - install -Dm644 icedove-i18n-$pkgver-ta-LK.xpi "${pkgdir}/$_path/langpack-ta-LK@icedove.mozilla.org.xpi" -} - -package_icedove-i18n-tr() { - pkgdesc="Language packs for Debian Icedove." - cd ${srcdir} - install -Dm644 icedove-i18n-$pkgver-tr.xpi "${pkgdir}/$_path/langpack-tr@icedove.mozilla.org.xpi" -} - -package_icedove-i18n-uk() { - pkgdesc="Language packs for Debian Icedove." - cd ${srcdir} - install -Dm644 icedove-i18n-$pkgver-uk.xpi "${pkgdir}/$_path/langpack-uk@icedove.mozilla.org.xpi" -} - -package_icedove-i18n-vi() { - pkgdesc="Language packs for Debian Icedove." - cd ${srcdir} - install -Dm644 icedove-i18n-$pkgver-vi.xpi "${pkgdir}/$_path/langpack-vi@icedove.mozilla.org.xpi" -} -package_icedove-i18n-zh-cn() { - pkgdesc="Language packs for Debian Icedove." - cd ${srcdir} - install -Dm644 icedove-i18n-$pkgver-zh-CN.xpi "${pkgdir}/$_path/langpack-zh-CN@icedove.mozilla.org.xpi" -} - -package_icedove-i18n-zh-tw() { - pkgdesc="Language packs for Debian Icedove." - cd ${srcdir} - install -Dm644 icedove-i18n-$pkgver-zh-TW.xpi "${pkgdir}/$_path/langpack-zh-TW@icedove.mozilla.org.xpi" -} -md5sums=('15ededc2d92b095297c32682b1ea5556' - '21b066c8006bd37843873a0950b4dd17' - 'c531b388e48a2b964091cdabdc6ea843' - '02dd4a828cd62d3704b329cc0269c754' - 'aa058920d2e9e590a5f43371ec0c758a' - 'd2f6d97e73956b929812efc26cbb8a00' - '422ba52f874f376d97a74c79047bb07e' - 'ebc329dbdfd9533f237731f4ab13c0c7' - '372f5b371ef045fd9b1d87d0f5a02f1b' - 'f4833810e478a319360b144d1e4e5dd0' - 'dcd04ada6fc38908cd1a0b4c640d49b6' - 'f5805071746aaac4c977dc6104d81524' - '55fb0a3581661c71e8a8b4fdaa5f92c6' - 'f4f24e1b0a53d0dca2b8bef384173682' - '3beb64fc06de87f5b70f2ba08ab3359e' - '62d4a011ccdfdf4f24063caec6e881b2' - '230373349ab450147ff19f4afebde2ea' - 'c7eff1f39bf536a4da476d77a3e0a450' - '06a7c3143b493c96628e93a58f25550c' - '5017bdacb7ee1430fa73b9b7ca657497' - 'c7aa6657da6f2cd9dc90c323c6676bf9' - 'ee9a365773d95e7c31de8089aef0d847' - 'feebccca9f6eec21b81e26e1804b0140' - '65339aa37592def5a0fa6e5aaf416de5' - '64980f1186f4045574babcde77f11529' - '20f25644314ad2801db9156531ea290c' - 'fd7c8318ab9d946a49ef2873de0d8e0a' - 'd6612e0b47375fdb34341ed8386a621f' - '89295ed1c51be054d571609209641fa1' - 'b35e49dc04bf9134262ae7db57b0311b' - '15487ee85959928fa0b85fe99e3c7a82' - 'ed555ce92aa37545b4f62ea4bdca9187' - '5d83088d4bcd042acfecbb0a85215548' - '1f1a513aac9b1d3cbc6dce3e948c33ca' - '1b955a8dd7690991d06ced05fc2f1fae' - '1785e4bb27d71cc0226eab506f81669a' - 'fd9a007c75b8738f3b2e167087655526' - '6578b879762db29b40e1723ba59043d6' - 'afe8fff2c2707724d2ef5536180a0907' - 'b8befd7b5e781403c3c0797633f0f92b' - '2097f7218575732e448662b3d1d1a351' - '82c29288a115668f25d01d0e7175419f' - '8398d4a711dd73302b790a2b99d9e78f' - '1ed5155cd7f3be98b25d94a126d043bb' - '899f04c2629e648be0f32f1ec04b9b56' - '4af5b8985fdb1858c0c25b8452ca72fc' - '43189f0ad649e00cedc608c6197a6426' - 'aeed4c0b7e536c0b4f9b36a5dc3d1d63' - 'a8bbc0c2acf8defcf9c200cacd243536' - '9c35cfcbf9d66aa42abfaae4aa4a6937' - 'b19268362d73d7e3f66ff7f7f21ab6bd' - 'c45de9ad905bbdda655227e77b09a1ba' - '430bb7d6dc4037666fb452e5c2c03c83' - '6280326bb1fb7c2ddd5c3b5a5360651b' - '571688d2bce6597ae76a7ead8929420c') diff --git a/libre/icedove-l10n/PKGBUILD b/libre/icedove-l10n/PKGBUILD new file mode 100644 index 000000000..208e176ba --- /dev/null +++ b/libre/icedove-l10n/PKGBUILD @@ -0,0 +1,98 @@ +# Maintainer: Márcio Silva <coadde@lavabit.com> +# Maintainer: André Silva <emulatorman@lavabit.com> + +pkgbase=icedove-l10n +pkgver=17.0.2.1 + +_langpacks=(ar ast be bg bn-BD br ca cs da de el en-GB en-US es-AR es-ES et eu fi fr fy-NL ga-IE gd gl he hr hu hy-AM id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr uk vi zh-CN zh-TW) + +pkgname=($(for lang in ${_langpacks[@]} + do echo $pkgbase-$lang | tr A-Z a-z + done)) + +pkgrel=2 +pkgdesc="Language packs for Debian Icedove." +arch=('i686' 'x86_64' 'mips64el') +url="http://packages.debian.org/source/experimental/icedove" +license=('MPL' 'GPL') +depends=("icedove-libre>=$pkgver") +_url=http://repo.parabolagnulinux.org/other/$pkgbase/releases/$pkgver + +source=() +for lang in ${_langpacks[@]} +do + source+=("langpack-$lang@icedove.mozilla.org.xpi::$_url/$lang.xpi") +done + +# Don't extract anything +noextract=(${source[@]##*/}) + +_path="/usr/lib/icedove/extensions/" + +for lang in ${_langpacks[@]} +do + eval " +package_icedove-l10n-$(echo $lang | tr A-Z a-z)() { + replaces=(icedove-i18n-$(echo $lang | tr A-Z a-z)) + conflicts=(icedove-i18n-$(echo $lang | tr A-Z a-z)) + provides=(icedove-i18n-$(echo $lang | tr A-Z a-z)) + install -Dm644 \"\$srcdir/langpack-$lang@icedove.mozilla.org.xpi\" \"\$pkgdir$_path/langpack-$lang@icedove.mozilla.org.xpi\" +} +" +done + +md5sums=('2586db5adf22dd42ae272d9fdc1b230e' + '20c25addb6e2cb3ffec146c1aca81848' + 'b067b93b7f8adaf83fb8ea72d58b6581' + 'ec62aaa9fff666c7071869cf45d2d113' + '12b0e70965d7317a31d7d7b35195ee67' + 'ff10849757b8157b73707ccfe572edf4' + '89c7ea5ca764a2a4e4fbb9a720b8bd97' + 'bf5cf9401ac5b10fa65a1e37a69b134d' + 'fc97d1b7c0a209351d00e48075715986' + '9439304cb4c13fbebb24872904df98f9' + 'cc6f97d63af3686e08a8624930c7784b' + '35a840226d1b8b3a0484f6327bd43b64' + '26bf1309ee516fd183eb6afdaf3d703f' + '9885394265e334d5026430c70d83669e' + 'd39ac07026e6fea2b6e8cf9420cdae3c' + 'c3154fd92db6387052b67154eee2c6cb' + '5cd99e7414eebcc92724752d569ae18f' + '48517d7a3295cab360e102945c4724f0' + '27dfcf129c0e1e752149f1065e7683e2' + '0f24e9851e14537f2d245ff7e0aae9e1' + '839ffc54ae6593ec4d170957750bd2f2' + '1a16c57b85ab9805bb7bc9afe8438efb' + '1481869608ec96bdd2867ff3d507010b' + '4e9633d016998af326fb0d759e4c03ce' + 'bcf6664cf8667f5425bad0c4e261f5f8' + 'a625dd60dffacfff6adab1a764f57721' + '5c7b974dfc964abc0625ac770c558f08' + '4c40f6e2da31675609b8fd6473f255a3' + 'd57c319232421f43638b1af551704464' + '155143f28edcb18cc39b1ad2b36e4945' + 'f54217af7efb23324012d1bb3510a17d' + 'd55d65f2c2b813da2a005beb751d3a8d' + '23b699906a9ddae4589b2bf69bc40d66' + 'b5c87362efedd884a5dbecff2f5c5dad' + 'bec280e6279fb279143a99e348ce610f' + 'd2eed0961cf3f684b20b4eb0a1d89189' + 'ef85215d35b1e76e0058b98a9885e09d' + '821d982f3c859b90615cefc321854fee' + '03d7b26f8a60a1172b7dad3b45870b0f' + '78b1830da6f93d87a491704c03bca2f3' + 'da602151f86db7d701b1806ad0972734' + '2db261b975a9c1199ef707c96a3ee677' + 'b04a05cb6e66c2cdf9893954fd8dae49' + 'c3d3969d4f590dfad0def596d1f5521f' + '4892a9c3e0554815448d604de3857b37' + 'b6250637b5beacec9ae6223b9878a53a' + '987f9765fd6ee3d080533c071dff6492' + '07e375fb25b3bd39ada11b6e18e7a836' + '204ad4b577b3b23c664a442766e88cc1' + '40b03dd5114095fbd15c943e7da3abfc' + 'e14c994576b6824ff36b3e0e2bba6157' + '4d1674a0f9d106c5a05c422742802add' + '0c13d6c651ae5cca046d976df7576119' + 'fd6da709c6937c419d2962275e3efdf1' + '8fc2d9cb6724cd6fa010c5870d4d3122') diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD index d61b756f5..5ea3ff98f 100755..100644 --- a/libre/icedove-libre/PKGBUILD +++ b/libre/icedove-libre/PKGBUILD @@ -3,7 +3,7 @@ # We're getting this from Debian Experimental _debname=icedove -_debver=17.0 +_debver=17.0.2 _debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -33,8 +33,8 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" ${_pkgname}.desktop Icedove-branding.patch) options=(!emptydirs) -md5sums=('f011e0308a0758df772638836fb03709' - '8534a19b46ce21d80fce16b50f1f37bd' +md5sums=('3f7679bb98ae99be5adf73fd0025b00e' + '7440def324766bcc61b91185226f8824' 'd6d58d3104a44624e0a3d227cdf1c211' '476ec205162340fb0679f522c9d31c3b' '4eecc4fc5aafaf0da651a09eadc90bee' diff --git a/libre/icedove-libre/icedove.desktop b/libre/icedove-libre/icedove.desktop index ef2cd76e9..ef2cd76e9 100755..100644 --- a/libre/icedove-libre/icedove.desktop +++ b/libre/icedove-libre/icedove.desktop diff --git a/libre/icedove-libre/icedove.install b/libre/icedove-libre/icedove.install index 4d4a283db..4d4a283db 100755..100644 --- a/libre/icedove-libre/icedove.install +++ b/libre/icedove-libre/icedove.install diff --git a/libre/icedove-libre/makefile.patch b/libre/icedove-libre/makefile.patch index 8f8137bec..8f8137bec 100755..100644 --- a/libre/icedove-libre/makefile.patch +++ b/libre/icedove-libre/makefile.patch diff --git a/libre/icedove-libre/mozconfig b/libre/icedove-libre/mozconfig index 58f8ce24f..58f8ce24f 100755..100644 --- a/libre/icedove-libre/mozconfig +++ b/libre/icedove-libre/mozconfig diff --git a/libre/icedove-libre/vendor.js b/libre/icedove-libre/vendor.js index 279bdc158..279bdc158 100755..100644 --- a/libre/icedove-libre/vendor.js +++ b/libre/icedove-libre/vendor.js diff --git a/libre/iceweasel-i18n/PKGBUILD b/libre/iceweasel-i18n/PKGBUILD deleted file mode 100755 index 3476c68f5..000000000 --- a/libre/iceweasel-i18n/PKGBUILD +++ /dev/null @@ -1,146 +0,0 @@ -# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> -# Contributor: fauno <fauno@kiwwwi.com.ar> -# Contributor: Figue <ffigue@gmail.com> -# Based on icecat-i18n package, which is in turn based on firefox-i18n - -# When updating to a newer upstream release: -# - Edit variables in in Makefile. -# - (optionally) edit PKGBUILD.in -# - Run 'make'. It will take care of everything else for you. - -_debname=iceweasel -_debver=17.0.1 -_debrel=1 -_debrepo=http://ftp.debian.org/debian/pool/main/ -debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } - -_langpacks=(ach af ak ar as ast be bg bn-BD bn-IN br bs ca cs csb cy da de el en-GB en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gu-IN he hi-IN hr hu hy-AM id is it ja kk km kn ko ku lg lij lt lv mai mk ml mr nb-NO nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta ta-LK te th tr uk vi zh-CN zh-TW zu) - -pkgbase=iceweasel-i18n -pkgname=($(for lang in ${_langpacks[@]} - do echo $pkgbase-$lang | tr A-Z a-z - done)) -_pkgver=17.0.1 -pkgver=${_debver}.${_debrel} -pkgrel=1 - -pkgdesc="Language packs for Debian Iceweasel." -arch=('any') -url="http://www.geticeweasel.org/" -license=('MPL') -depends=("iceweasel-libre>=$pkgver") -source=() -for lang in ${_langpacks[@]} -do - source+=("${_debrepo}/`debfile ${_debname}`-l10n-$(echo $lang | tr A-Z a-z)_${_debver}-${_debrel}_all.deb") -done - -build() { - cd "${srcdir}" - for f in *.deb - do - bsdtar xf $f - bsdtar xf data.tar.xz - done -} - -_path="/usr/lib/iceweasel/extensions" - - -for lang in ${_langpacks[@]} -do - eval " -package_iceweasel-i18n-$(echo $lang | tr A-Z a-z)() { - install -Dm644 \"\$srcdir$_path/langpack-$lang@iceweasel.mozilla.org.xpi\" \"\$pkgdir$_path/langpack-$lang@iceweasel.mozilla.org.xpi\" -} -" -done - -md5sums=('9d0c6dcde68b688ba613c9704dad8cf6' - 'c3f7acd38f4fd0810a8bbc9c1a1ef990' - 'c806782ef309ecac56b0e736081555ac' - '41f9def213a2de76687be9bd36341c71' - '2aafaa1710de038f7741b1e5c1e40f19' - 'c536bdb01893b53346726cdf572cdda8' - '1b292d4cb415fb0b493fd88529d8add1' - 'eaa814301018cbcbcc9145fd60a0ad3e' - 'a7ffe62f5d1a676db58d6bcd0cb5a29e' - '25c8732aba36a5f8e58f35788a89b2f6' - '5ac90a12d8d1f0bbd0c32e6411168461' - 'f47b78c5f086ec511388a143330e22d5' - 'ae97555f6474f597a15da089b6ef0089' - '0c46ab829c0597dc3faa5e70d64bb903' - '555ccc2a64ce110308ae55569cf0d612' - 'f2bdc9390388552cebde424ccb533b56' - '0f857bdca9f2bcb24b5e8a2f46f398af' - '508928bf9b224786e3fdad9bcfda4230' - 'af8f928b3dcf59489291ed99ad216c10' - 'b97d8915f520de0d760070e7a058492c' - '5d894ccd869331f6ba81b79d66452d29' - 'c3e268cd4c829cb0852ed02c9de2dd4d' - '408c8e898900efc97d3c449382958607' - 'ad9568a88b73189cc73c25728d23db3a' - 'e6e84f910d33d75953a4abc4fb0e78d5' - '403991c8eaa55675b433701901042791' - '8b317a2f84f3ab4f20f213134fa4e89f' - 'f6e192717ea383206793b5ac51d94b9d' - '5a1f2ff1a18c58bf7eae079f0058d3ac' - 'd65eeba91a938d95466fb602919a8253' - '6719800c6c4ea969af4597386900eed5' - '09152085c533d5cfaa3281bd56791ab3' - '5c3b9ba64919931ba924aeb82b6d511d' - '0a5392e0edf416304fa3501e09a9e755' - '9d17cc7f1238db2edda76736ecee56af' - '56b19d666ae1df919b26d6c04ede6ec7' - '16648d2f5b226786487d9f6dd4bf1e11' - '5cc3b11c6dc4399d9024ce58be31dd0b' - '999685ea1e48118e0a033f9b64eec244' - '3b7cb8fb5da908558ad2843ab61bec57' - '7a566e091f024f9cb458e57c20f59fff' - 'eca90e7e61b2b628ddceb230229b8fda' - '58dc4acfb114088852c1e12708778f6a' - '6e6755330cea230f334a6618e5c06268' - 'bf1ffad887e9bf769f021790abdfe79b' - '83baeeed748511bdd7996aa34e074f39' - 'cecea99a977d0849a2077c7c4aca175d' - '01b9b43a1ed30e05f96c10365011b980' - 'e08db859318bd525f37fe5e90c15bc15' - 'e9ba8aeb43ba9465231d91ab4d9046af' - 'af84a3746532b3a1e71bbf173f37acae' - '0694facbec186997b5e3e56f16924371' - 'daeb31829220fc001c9fe63e2fe8de5e' - 'f1573ce43e917553c2720bca8f24569d' - '8afafca7d0a34532d77f9e22929b591c' - 'c67cbab5cb06b30e21c310e3d29fcaa8' - '201292f43d1c354bd0189906d03cbbd0' - '9cf84d585fea1ac3002e2cced729c8a3' - 'b32934822634ebd1a82f64ac70597ef9' - '63cb7e54400f55eb5b4995c299174b40' - '7bdb7601e9c21af7f6e8d4c6f2acc8d4' - 'd998310ca5c38ef8babcc18a4faffae0' - 'f9896f39830058b9b003568f4d67b73b' - '9568dedd80dc5401bd69880952ef42e1' - 'b8863db55f206abf8c4fcc34fd82347b' - '8f4df43a91550692497b599856323bf7' - '4b91b600a3fa5f520c3c0953128695f5' - '0a1fdc989d107d323fb80ea05b13b832' - 'ca6e721d01ee9ec6719c1813ebb7f35b' - '5c40e59819a74f47dc95b58d5e1005ea' - '6506433c61b5811cf600f48a0b5e8074' - 'e4410eaaece0a283bb4060d3eb428a96' - '635a91b20ba7ecde88de1bdf8517c7bb' - 'b884f988301169f17e5f181be5768e74' - '4358aa4e516f38b91e284eb75d729978' - 'f386732f9fb2629f35defe354e85ce02' - '9312ded30c12d367e9280ccfe5f22261' - 'a17cd6c8190d0a31938292b77c6c50fb' - '01187464580ccd34874e48e8113e4e5c' - 'af362b174706ab93851ac1e6e6078422' - 'a8291043c75079d9c66258897b30bba6' - '5ec754344dba9cfdc3021bb03ec118e0' - '04a79f1876c05c62f270f757cf34780c' - '494444bb9df2fbefc8689c3c3be61e6f' - '9b8c613d0f6cb51209021c436f7313d5' - '9ac2c4bab905675ab3cefbc10742f9cb' - 'c1a67c2551a9d0de73d72b3bad887159' - '2153d65575351ac1974fbb5874b4788b')
\ No newline at end of file diff --git a/libre/iceweasel-i18n/.gitignore b/libre/iceweasel-l10n/.gitignore index 3e1eb57b5..3e1eb57b5 100755..100644 --- a/libre/iceweasel-i18n/.gitignore +++ b/libre/iceweasel-l10n/.gitignore diff --git a/libre/iceweasel-i18n/Makefile b/libre/iceweasel-l10n/Makefile index d596111f3..d596111f3 100755..100644 --- a/libre/iceweasel-i18n/Makefile +++ b/libre/iceweasel-l10n/Makefile diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD new file mode 100644 index 000000000..7d75aa3ac --- /dev/null +++ b/libre/iceweasel-l10n/PKGBUILD @@ -0,0 +1,162 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> +# Contributor: fauno <fauno@kiwwwi.com.ar> +# Contributor: Figue <ffigue@gmail.com> +# Based on icecat-i18n package, which is in turn based on firefox-i18n + +# When updating to a newer upstream release: +# - Edit variables in in Makefile. +# - (optionally) edit PKGBUILD.in +# - Run 'make'. It will take care of everything else for you. + +_debname=iceweasel +_debver=18.0 +_debrel=1 +_debrepo=http://ftp.debian.org/debian/pool/main/ +debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } + +_langpacks=(ach af ak ar as ast be bg bn-BD bn-IN br bs ca cs csb cy da de el en-GB en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gu-IN he hi-IN hr hu hy-AM id is it ja kk km kn ko ku lg lij lt lv mai mk ml mr nb-NO nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta ta-LK te th tr uk vi zh-CN zh-TW zu) + +pkgbase=iceweasel-l10n +pkgname=($(for lang in ${_langpacks[@]} + do echo $pkgbase-$lang | tr A-Z a-z + done)) +_pkgver=18.0 +pkgver=$_debver.$_debrel +pkgrel=3 + +pkgdesc="Language packs for Debian Iceweasel." +arch=('any') +url="http://www.geticeweasel.org/" +license=('MPL') +depends=("iceweasel-libre>=$pkgver") +makedepends=('unzip' 'zip') +source=('region.properties') +for lang in ${_langpacks[@]} +do + source+=("${_debrepo}/`debfile ${_debname}`-l10n-$(echo $lang | tr A-Z a-z)_${_debver}-${_debrel}_all.deb") +done + +_path="/usr/lib/iceweasel/extensions" + +build() { + cd "${srcdir}" + for f in *.deb + do + bsdtar xf $f + bsdtar xf data.tar.xz + done + +cd $srcdir$_path + +for i in ${_langpacks[@]} +do + unzip -q langpack-$i@iceweasel.mozilla.org.xpi -d $i + rm langpack-$i@iceweasel.mozilla.org.xpi + install -Dm644 $srcdir/region.properties $i/chrome/$i/locale/browser-region + zip -q -r langpack-$i@iceweasel.mozilla.org.xpi $i +done + +cd $srcdir +} + +for lang in ${_langpacks[@]} +do + eval " +package_iceweasel-l10n-$(echo $lang | tr A-Z a-z)() { + replaces=(icedove-i18n-$(echo $lang | tr A-Z a-z)) + conflicts=(icedove-i18n-$(echo $lang | tr A-Z a-z)) + provides=(icedove-i18n-$(echo $lang | tr A-Z a-z)) + install -Dm644 \"\$srcdir$_path/langpack-$lang@iceweasel.mozilla.org.xpi\" \"\$pkgdir$_path/langpack-$lang@iceweasel.mozilla.org.xpi\" +} +" +done + +md5sums=('428246ef3fb64103ff2cf5eaae2a92ca' + '08556c8d27a4313b5e67e655d2e1e828' + '9fa01f43db09b12cd724f94c28883a9e' + '0d1ef852709fcae1842105d675c22312' + '56247c867b52a19808ca72f7fceb349a' + 'dd670bcc609c06139671bf953f26d7b8' + 'df233884b68c8f37ff9b757b6480ae94' + 'd2aa803c6e1d1ebbaf9d4f6ad73f2aa8' + 'd0f512e8bf97110a60b16de59b15869b' + '54045555373497393ded8bccc0dc1784' + '61cb757a64268141518ed9dad4795106' + '62f338f7bcd7fb50ef2f61936c0e4990' + '97b2c6a0de5d60b4e5696973aedd3cfc' + 'd916a0b470264a9271509ed7a109e360' + '6f442a2989b814f20f4b73975bc97a5c' + '6117d8d24dad056f143feb3e061702dd' + 'c759f731a415f99a73e20090f4893184' + 'b481b08da143ff45a84d32285249fcfd' + '828f9a5b69634b39d48bfdf472a957bd' + '12d4b6779cb50777303381d35f539c4c' + '8609fd343e1e91724f50d6833d3e2f82' + '331acfbad62badfd48713d9b461efcf3' + '49216a2ea50fcd01057bd7b0d14a78e2' + 'b0738cf3f5ce546134150e082cffaf61' + '9f03cd24990c897e75594229517c1e9a' + '5667260492203f29bba1b2732ce20b77' + 'a1dd5872ab73a1a14ce3e285138445da' + '03e82d09ba4026ab10df5cfc3b78ca5f' + '1e92e7b3725cdfa94fc705ab54c7c6aa' + '35d9a0ccfa3c95a3a56f29c7a5bc4e6b' + '656dbfb6ac9efbeb4e58b5b9fc5fda03' + '29a343077a3de07ce9bb3e4d24d6a11a' + '831e09a24d4d40cb1bb45f980b7fa251' + '8488c98293d6f16caf99cf556f999611' + '92b07db5dcb8fc95ac8f5706b94d7ed5' + 'fa9ee1b85adbd15c46ca075d94e62a14' + '19383d5cb3ed6de8599118dd9f54889e' + 'fdff305ce5b154b12907fa302419548c' + '24df7d71f1a70e8225e80d15a53d3777' + '793bfd1301c4e989e2f904ad9f6b3adc' + '06d4e4423df0908254e422d207292858' + 'd53dce3f9b3a5de374dd6c10ebe3665c' + '382e5237a81fbbbaab499c5c6646b308' + '1da9f5ce8cbd3bdcc46f932b7458574f' + 'd635c40c88a7430a2103c13cdf1b58d3' + 'd1eac26314ade41883b24b91cd9e01c6' + '6e65dd6b8cb0fbd4395e548926043e70' + '97e8c9b3db047651a38f29366867c92e' + '87433742c0b21c7655988d5586667d77' + 'ac5cab1c45e0accf718cf624c8545dea' + 'd3f2ff9a817dff71fa05ffe5f3f45db8' + 'd1909b644b4495343b6d041c15683ad2' + '5c79b17dd9d0d83f749f52d489b347a7' + '433f0456e52420955a3689d2b18b7a94' + '90ee54b793a100b74f1b91ca2acb103b' + '0544d0e7e26a0c07379f0c6ca22708d8' + 'c75d55a574f525f5f08574cb01a2ee20' + 'b43589a4b08112996c756db467015eab' + '82782fd09a815441622187ed8839b0ee' + '52de8e6386f0232d13c6768092089c23' + '091e065f1723fa7fa7701ced828e24ed' + 'a036b50e5915e5b37257fa048e8d7a60' + '1037213a49539a069b9e223dacfbdc94' + '251b43c207b4fb0842a913e658f868c3' + '1aac06560c3a0957087eab1d2034eba3' + '964b3edfd3221d8e412ef695bd9a7b00' + '45a900da3f1cc4834b32b190c67c42af' + 'cad9df2808fd8f009d27142a729f21d6' + '192eaff8883db984c42ee43e3a5303f4' + '1000e395379bc6ef3b9c2c891f615e44' + '1da3d8777bc0595dea09fdd7222b55f3' + '0fbdd7294e21936ae75aca56d4d7252c' + 'af481ef78e4ffe7b4cbf892c5cb10cc2' + 'fc884a9a8203c56196993f6ed65069ca' + '1bebdd6e194cbb746f81725e317eb9b4' + '4c75d146f27aa2a70b0219954baa8965' + 'd832ceafecac23a0659f7a766f6d98de' + 'ed056fa5b30ddf55042699713c629503' + '8e698f20270de2b2fbaf9c1f09257c06' + 'e864caf42db46efbaa229f36af572ee4' + '013864da4a811e894ba1605e7f93e80e' + '69be7804b3d6a6bb5683554cbc324bed' + 'efc6a8427f080706d7d590a7b0eacadd' + '40c41e04514e3cbcae33b15a062b3811' + '164850087cdf79d57569ee9d4e1a8d2d' + '226de7be23de61db7df718ef93f7c906' + 'fb331d7fd4f1c853192111663e2672a0' + '5dd0a89e43aa0f263fc7c1d4302dbfd6' + '8e602db8304ddafad17fd8098125d37b') diff --git a/libre/iceweasel-i18n/PKGBUILD.in b/libre/iceweasel-l10n/PKGBUILD.in index 05477caef..7dd82c7cc 100755..100644 --- a/libre/iceweasel-i18n/PKGBUILD.in +++ b/libre/iceweasel-l10n/PKGBUILD.in @@ -16,7 +16,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _langpacks=@LANGPACKS@ -pkgbase=iceweasel-i18n +pkgbase=iceweasel-l10n pkgname=($(for lang in ${_langpacks[@]} do echo $pkgbase-$lang | tr A-Z a-z done)) @@ -36,6 +36,8 @@ noextract=($(for lang in ${_langpacks[@]} do echo $lang.xpi done)) +_path="/usr/lib/iceweasel-${_pkgver}/extensions" + dpkg-source() { # This will simulate dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc cd "${_debname}-${_debver}" @@ -46,16 +48,31 @@ dpkg-source() { build() { cd "${srcdir}" dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc + +cd $srcdir$_path + +for i in ${_langpacks[@]} +do + unzip -q langpack-$i@iceweasel.mozilla.org.xpi -d $i + rm langpack-$i@iceweasel.mozilla.org.xpi + install -Dm644 $srcdir/region.properties $i/chrome/$i/locale/browser-region + zip -q -r langpack-$i@iceweasel.mozilla.org.xpi $i +done + +cd $srcdir } -_path="/usr/lib/iceweasel-${_pkgver}/extensions" + # CUT HERE <-- Separates package_*() functions from everything else. for lang in ${_langpacks[@]} do eval " -package_iceweasel-i18n-$(echo $lang | tr A-Z a-z) () { +package_iceweasel-l10n-$(echo $lang | tr A-Z a-z) () { + replaces=(icedove-i18n-$(echo $lang | tr A-Z a-z)) + conflicts=(icedove-i18n-$(echo $lang | tr A-Z a-z)) + provides=(icedove-i18n-$(echo $lang | tr A-Z a-z)) install -Dm644 '$srcdir/'*'/upstream/$lang.xpi' \"\$pkgdir\"'$_path/langpack-$lang@firefox.mozilla.org.xpi' } " diff --git a/libre/iceweasel-l10n/region.properties b/libre/iceweasel-l10n/region.properties new file mode 100644 index 000000000..4399d8db7 --- /dev/null +++ b/libre/iceweasel-l10n/region.properties @@ -0,0 +1,32 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +# Default search engine +browser.search.defaultenginename=DuckDuckGo HTML + +# Search engine order (order displayed in the search bar dropdown)s +browser.search.order.1=DuckDuckGo HTML +browser.search.order.2=DuckDuckGo Lite +browser.search.order.3=Seeks Search + +# URL for site-specific search engines +# TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site +# to be searched and the user's search query. Place them in the appropriate location +# for your locale's URL but do not translate them. +browser.search.siteSearchURL=https://duckduckgo.com/html/?q=site%3A{moz:domain}+{searchTerms} + +# increment this number when anything gets changed in the list below. This will +# cause Firefox to re-read these prefs and inject any new handlers into the +# profile database. Note that "new" is defined as "has a different URL"; this +# means that it's not possible to update the name of existing handler, so +# don't make any spelling errors here. +gecko.handlerService.defaultHandlersVersion=3 + +# The default set of protocol handlers for irc: +gecko.handlerService.schemes.irc.0.name=Freenode +gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/?channels=%s + +# The default set of protocol handlers for ircs: +gecko.handlerService.schemes.ircs.0.name=Freenode +gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/?channels=%s diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 56f1e4dfa..cbf402860 100755..100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -14,14 +14,14 @@ _pgo=false # We're getting this from Debian Experimental _debname=iceweasel -_debver=17.0.1 +_debver=18.0 _debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=iceweasel pkgname=iceweasel-libre -pkgver=${_debver}.${_debrel} +pkgver=$_debver.$_debrel pkgrel=4 if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi @@ -32,35 +32,38 @@ fi pkgdesc="A libre version of Debian Iceweasel, the Browser based on Mozilla Firefox." 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' 'mozilla-searchplugins' 'nss>=3.13.1' 'sqlite3' 'startup-notification') -makedepends=( 'autoconf2.13' 'diffutils' 'imagemagick' 'libidl2' 'librsvg' 'libxslt' 'mesa' 'pkg-config' 'python2' 'quilt' 'unzip' 'wireless_tools' 'zip') +depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss>=3.14.1' 'sqlite3' 'startup-notification') +makedepends=( 'autoconf2.13' 'diffutils' 'imagemagick' 'libidl2' 'librsvg' 'libxslt' 'mesa' 'pkg-config' 'python2' 'quilt' 'unzip' 'zip') [ "$CARCH" != "mips64el" ] && makedepends+=('yasm') if $_pgo; then makedepends+=('xorg-server-xvfb') options=(!ccache) fi +optdepends=('networkmanager: Location detection via available WiFi networks') url="http://www.geticeweasel.org/" install=iceweasel.install -source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" - "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz" +source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" + "$_debrepo/`debfile $_debname`_$_debver-$_debrel.debian.tar.gz" mozconfig mozconfig.pgo - xulrunner-copy-stub.patch libre.patch + iceweasel.desktop iceweasel-install-dir.patch vendor.js shared-libs.patch + bug677092.patch Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch) -md5sums=('37b9b7eafc8affa9b8a5942f8ff19f8f' - '1bbf435ff33f9824de23c0b13fbfb452' - 'eab149c1994ab14392e55af3abb08e80' +md5sums=('366e1e4847d7e00eba77ee5a4be0d3db' + '6a571d3a3b355c331f67d57702f4fccf' + '619e8f7c8596838a7daf2b7ce2e54cd3' 'ac29b01c189f20abae2f3eef1618ffc0' - 'a485a2b5dc544a8a2bd40c985d2e5813' - 'c8040002668fae7d1b950833bae51607' + '7d16be01a546d7733ab28db980d230f3' + '2823e0ecdefc16b590a9997f9228924a' 'abf5ecb74caa857abb42bcfbb3442d9c' '0d053487907de4376d67d8f499c5502b' '52e52f840a49eb1d14be1c0065b03a93' + 'e1204e0be964b6964ebfb6467e05141f' '65f68090d2a69b467bd2707d0c4ea3bd') if [ "$_pkgname" != "$pkgname" ]; then @@ -69,28 +72,37 @@ if [ "$_pkgname" != "$pkgname" ]; then fi build() { + # WebRTC build tries to execute "python" and expects Python 2 + # Workaround taken from chromium PKGBUILD on Archlinux + mkdir "$srcdir/python2-path" + ln -s /usr/bin/python2 "$srcdir/python2-path/python" + export PATH="$srcdir/python2-path:$PATH" + 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" export DEBIAN_BUILD="mozilla-release" - mv debian "${srcdir}/${DEBIAN_BUILD}" - cd "${srcdir}/${DEBIAN_BUILD}" + mv debian "$srcdir/$DEBIAN_BUILD" + cd "$srcdir/$DEBIAN_BUILD" # Doesn't apply and seems unimportant rm -v debian/patches/l10n/Place-google-and-gmail-before-yandex.patch || true - # This patch doesn't works in some parts due that has patches for others locales languages, source code doesn't has it + # This patch doesn't works in some parts due that has patches for others locales languages, source code hasn't it rm -v debian/patches/debian-hacks/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch || true quilt push -a patch -Np1 -i "$srcdir/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch" # Adding fixed Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch patch -Np1 -i "$srcdir/iceweasel-install-dir.patch" # install to /usr/lib/$_pkgname - patch -Np1 -i "$srcdir/xulrunner-copy-stub.patch" # small fix patch -Np1 -i "$srcdir/libre.patch" patch -Np1 -i "$srcdir/shared-libs.patch" + + # Back out https://bugzilla.mozilla.org/show_bug.cgi?id=677092 + # in order to fix https://bugzilla.mozilla.org/show_bug.cgi?id=818468 + patch -Rp1 -i ../bug677092.patch cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch @@ -98,7 +110,7 @@ build() { cat "$srcdir/mozconfig.pgo" >> .mozconfig fi -# From js on abslibre-mips64el.git + # From js on abslibre-mips64el.git if [ "$CARCH" = "mips64el" ]; then msg "Force disabling JIT." sed -ri 's/#define ENABLE_(JIT|ASSEMBLER) 1/#define ENABLE_\1 0/' \ @@ -113,7 +125,7 @@ build() { sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \ browser/base/Makefile.in - # This is a bug, we should fix it. + # This is a bug, we should fix it if [ "$CARCH" = "mips64el" ]; then # Fix MIPS N32 support. sed -i 's/defined(_ABIO32)/(defined(_ABIO32) || defined(_ABIN32))/' \ @@ -137,24 +149,23 @@ build() { } package() { - cd "${srcdir}/${DEBIAN_BUILD}" + cd "$srcdir/$DEBIAN_BUILD" make -j1 -f client.mk DESTDIR="$pkgdir" install - install -Dm644 "$srcdir"/vendor.js "$pkgdir/usr/lib/$_pkgname/defaults/preferences/vendor.js" + install -Dm644 "$srcdir/vendor.js" "$pkgdir/usr/lib/$_pkgname/defaults/preferences" - # I don't even know why we're hitting the objdir, and ConnOS didn't. + # I don't even know why we're hitting the objdir, and ConnOS didn't _brandingdir=debian/branding brandingdir=moz-objdir/$_brandingdir icondir="$pkgdir/usr/share/icons/hicolor" for i in 16x16 32x32 48x48 64x64; do install -Dm644 "$brandingdir/default${i/x*/}.png" "$icondir/$i/apps/$_pkgname.png" done - install -Dm644 "$brandingdir/mozicon128.png" "$icondir/128x128/apps/$_pkgname.png" + install -Dm644 "$brandingdir/mozicon128.png" "$icondir/128x128/apps/$_pkgname.png" install -Dm644 "$_brandingdir/iceweasel_icon.svg" "$icondir/scalable/apps/$_pkgname.svg" - install -d "$pkgdir/usr/share/applications" - install -m644 debian/iceweasel.desktop "$pkgdir/usr/share/applications" - #install -m644 debian/iceweasel-safe.desktop "$pkgdir/usr/share/applications" + install -d "$pkgdir/usr/share/applications" + install -m644 "$srcdir/iceweasel.desktop" "$pkgdir/usr/share/applications" rm -rf "$pkgdir/usr/lib/$_pkgname/"{dictionaries,hyphenation,searchplugins,plugins} ln -sf /usr/share/hunspell "$pkgdir/usr/lib/$_pkgname/dictionaries" diff --git a/libre/iceweasel-libre/bug677092.patch b/libre/iceweasel-libre/bug677092.patch new file mode 100644 index 000000000..aee09b451 --- /dev/null +++ b/libre/iceweasel-libre/bug677092.patch @@ -0,0 +1,330 @@ +exporting patch: +# HG changeset patch +# User Axel Hecht <axel@pike.org> +# Date 1348128099 -7200 +# Node ID 812d0ba8317507c4026958a740960384eac1507a +# Parent 97e49e7a33266a0680e5af59289264a07e4321f8 +bug 677092, make language packs restartless, r=Unfocused +Make language packs just trigger the chrome registration hooks, and +disable picking up bootstrap.js, and declare them restartless. + +diff -r 97e49e7a3326 -r 812d0ba83175 toolkit/mozapps/extensions/XPIProvider.jsm +--- a/toolkit/mozapps/extensions/XPIProvider.jsm Wed Sep 26 13:08:50 2012 +0200 ++++ b/toolkit/mozapps/extensions/XPIProvider.jsm Thu Sep 20 10:01:39 2012 +0200 +@@ -740,8 +740,8 @@ + } + } + else { +- // spell check dictionaries never require a restart +- if (addon.type == "dictionary") ++ // spell check dictionaries and language packs never require a restart ++ if (addon.type == "dictionary" || addon.type == "locale") + addon.bootstrap = true; + + // Only extensions are allowed to provide an optionsURL, optionsType or aboutURL. For +@@ -3695,6 +3695,11 @@ + Components.manager.addBootstrappedManifestLocation(aFile); + + try { ++ // Don't call bootstrap.js methods for language packs, ++ // they only contain chrome. ++ if (aType == "locale") ++ return; ++ + // Load the scope if it hasn't already been loaded + if (!(aId in this.bootstrapScopes)) + this.loadBootstrapScope(aId, aFile, aVersion, aType); +diff -r 97e49e7a3326 -r 812d0ba83175 toolkit/mozapps/extensions/test/addons/test_langpack/chrome.manifest +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ b/toolkit/mozapps/extensions/test/addons/test_langpack/chrome.manifest Thu Sep 20 10:01:39 2012 +0200 +@@ -0,0 +1,1 @@ ++locale test-langpack x-testing locale/x-testing +diff -r 97e49e7a3326 -r 812d0ba83175 toolkit/mozapps/extensions/test/addons/test_langpack/install.rdf +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ b/toolkit/mozapps/extensions/test/addons/test_langpack/install.rdf Thu Sep 20 10:01:39 2012 +0200 +@@ -0,0 +1,23 @@ ++<?xml version="1.0"?> ++ ++<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" ++ xmlns:em="http://www.mozilla.org/2004/em-rdf#"> ++ ++ <Description about="urn:mozilla:install-manifest"> ++ <em:id>langpack-x-testing@tests.mozilla.org</em:id> ++ <em:type>8</em:type> ++ <em:version>1.0</em:version> ++ ++ <!-- Front End MetaData --> ++ <em:name>Language Pack x-testing</em:name> ++ ++ <em:targetApplication> ++ <Description> ++ <em:id>xpcshell@tests.mozilla.org</em:id> ++ <em:minVersion>1</em:minVersion> ++ <em:maxVersion>2</em:maxVersion> ++ </Description> ++ </em:targetApplication> ++ ++ </Description> ++</RDF> +diff -r 97e49e7a3326 -r 812d0ba83175 toolkit/mozapps/extensions/test/xpcshell/test_langpack.js +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ b/toolkit/mozapps/extensions/test/xpcshell/test_langpack.js Thu Sep 20 10:01:39 2012 +0200 +@@ -0,0 +1,247 @@ ++/* Any copyright is dedicated to the Public Domain. ++ * http://creativecommons.org/publicdomain/zero/1.0/ ++ */ ++ ++// This verifies that language packs can be used without restarts. ++Components.utils.import("resource://gre/modules/Services.jsm"); ++ ++// Enable loading extensions from the user scopes ++Services.prefs.setIntPref("extensions.enabledScopes", ++ AddonManager.SCOPE_PROFILE + AddonManager.SCOPE_USER); ++ ++createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9.2"); ++ ++const profileDir = gProfD.clone(); ++profileDir.append("extensions"); ++const userExtDir = gProfD.clone(); ++userExtDir.append("extensions2"); ++userExtDir.append(gAppInfo.ID); ++registerDirectory("XREUSysExt", userExtDir.parent); ++ ++var chrome = Components.classes["@mozilla.org/chrome/chrome-registry;1"] ++ .getService(Components.interfaces.nsIXULChromeRegistry); ++ ++function do_check_locale_not_registered(provider) { ++ let didThrow = false; ++ try { ++ chrome.getSelectedLocale(provider); ++ } catch (e) { ++ didThrow = true; ++ } ++ do_check_true(didThrow); ++} ++ ++function run_test() { ++ do_test_pending(); ++ ++ startupManager(); ++ ++ run_test_1(); ++} ++ ++// Tests that installing doesn't require a restart ++function run_test_1() { ++ prepare_test({ }, [ ++ "onNewInstall" ++ ]); ++ ++ AddonManager.getInstallForFile(do_get_addon("test_langpack"), function(install) { ++ ensure_test_completed(); ++ ++ do_check_neq(install, null); ++ do_check_eq(install.type, "locale"); ++ do_check_eq(install.version, "1.0"); ++ do_check_eq(install.name, "Language Pack x-testing"); ++ do_check_eq(install.state, AddonManager.STATE_DOWNLOADED); ++ do_check_true(install.addon.hasResource("install.rdf")); ++ do_check_false(install.addon.hasResource("bootstrap.js")); ++ do_check_eq(install.addon.operationsRequiringRestart & ++ AddonManager.OP_NEEDS_RESTART_INSTALL, 0); ++ ++ let addon = install.addon; ++ prepare_test({ ++ "langpack-x-testing@tests.mozilla.org": [ ++ ["onInstalling", false], ++ "onInstalled" ++ ] ++ }, [ ++ "onInstallStarted", ++ "onInstallEnded", ++ ], function() { ++ do_check_true(addon.hasResource("install.rdf")); ++ check_test_1(); ++ }); ++ install.install(); ++ }); ++} ++ ++function check_test_1() { ++ AddonManager.getAllInstalls(function(installs) { ++ // There should be no active installs now since the install completed and ++ // doesn't require a restart. ++ do_check_eq(installs.length, 0); ++ ++ AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(b1) { ++ do_check_neq(b1, null); ++ do_check_eq(b1.version, "1.0"); ++ do_check_false(b1.appDisabled); ++ do_check_false(b1.userDisabled); ++ do_check_true(b1.isActive); ++ // check chrome reg that language pack is registered ++ do_check_eq(chrome.getSelectedLocale("test-langpack"), "x-testing"); ++ do_check_true(b1.hasResource("install.rdf")); ++ do_check_false(b1.hasResource("bootstrap.js")); ++ ++ let dir = do_get_addon_root_uri(profileDir, "langpack-x-testing@tests.mozilla.org"); ++ ++ AddonManager.getAddonsWithOperationsByTypes(null, function(list) { ++ do_check_eq(list.length, 0); ++ ++ run_test_2(); ++ }); ++ }); ++ }); ++} ++ ++// Tests that disabling doesn't require a restart ++function run_test_2() { ++ AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(b1) { ++ prepare_test({ ++ "langpack-x-testing@tests.mozilla.org": [ ++ ["onDisabling", false], ++ "onDisabled" ++ ] ++ }); ++ ++ do_check_eq(b1.operationsRequiringRestart & ++ AddonManager.OP_NEEDS_RESTART_DISABLE, 0); ++ b1.userDisabled = true; ++ ensure_test_completed(); ++ ++ do_check_neq(b1, null); ++ do_check_eq(b1.version, "1.0"); ++ do_check_false(b1.appDisabled); ++ do_check_true(b1.userDisabled); ++ do_check_false(b1.isActive); ++ // check chrome reg that language pack is not registered ++ do_check_locale_not_registered("test-langpack"); ++ ++ AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(newb1) { ++ do_check_neq(newb1, null); ++ do_check_eq(newb1.version, "1.0"); ++ do_check_false(newb1.appDisabled); ++ do_check_true(newb1.userDisabled); ++ do_check_false(newb1.isActive); ++ ++ run_test_3(); ++ }); ++ }); ++} ++ ++// Test that restarting doesn't accidentally re-enable ++function run_test_3() { ++ shutdownManager(); ++ startupManager(false); ++ // check chrome reg that language pack is not registered ++ do_check_locale_not_registered("test-langpack"); ++ ++ AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(b1) { ++ do_check_neq(b1, null); ++ do_check_eq(b1.version, "1.0"); ++ do_check_false(b1.appDisabled); ++ do_check_true(b1.userDisabled); ++ do_check_false(b1.isActive); ++ ++ run_test_4(); ++ }); ++} ++ ++// Tests that enabling doesn't require a restart ++function run_test_4() { ++ AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(b1) { ++ prepare_test({ ++ "langpack-x-testing@tests.mozilla.org": [ ++ ["onEnabling", false], ++ "onEnabled" ++ ] ++ }); ++ ++ do_check_eq(b1.operationsRequiringRestart & ++ AddonManager.OP_NEEDS_RESTART_ENABLE, 0); ++ b1.userDisabled = false; ++ ensure_test_completed(); ++ ++ do_check_neq(b1, null); ++ do_check_eq(b1.version, "1.0"); ++ do_check_false(b1.appDisabled); ++ do_check_false(b1.userDisabled); ++ do_check_true(b1.isActive); ++ // check chrome reg that language pack is registered ++ do_check_eq(chrome.getSelectedLocale("test-langpack"), "x-testing"); ++ ++ AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(newb1) { ++ do_check_neq(newb1, null); ++ do_check_eq(newb1.version, "1.0"); ++ do_check_false(newb1.appDisabled); ++ do_check_false(newb1.userDisabled); ++ do_check_true(newb1.isActive); ++ ++ run_test_5(); ++ }); ++ }); ++} ++ ++// Tests that a restart shuts down and restarts the add-on ++function run_test_5() { ++ shutdownManager(); ++ startupManager(false); ++ // check chrome reg that language pack is registered ++ do_check_eq(chrome.getSelectedLocale("test-langpack"), "x-testing"); ++ ++ AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(b1) { ++ do_check_neq(b1, null); ++ do_check_eq(b1.version, "1.0"); ++ do_check_false(b1.appDisabled); ++ do_check_false(b1.userDisabled); ++ do_check_true(b1.isActive); ++ do_check_false(isExtensionInAddonsList(profileDir, b1.id)); ++ ++ run_test_7(); ++ }); ++} ++ ++// Tests that uninstalling doesn't require a restart ++function run_test_7() { ++ AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(b1) { ++ prepare_test({ ++ "langpack-x-testing@tests.mozilla.org": [ ++ ["onUninstalling", false], ++ "onUninstalled" ++ ] ++ }); ++ ++ do_check_eq(b1.operationsRequiringRestart & ++ AddonManager.OP_NEEDS_RESTART_UNINSTALL, 0); ++ b1.uninstall(); ++ ++ check_test_7(); ++ }); ++} ++ ++function check_test_7() { ++ ensure_test_completed(); ++ // check chrome reg that language pack is not registered ++ do_check_locale_not_registered("test-langpack"); ++ ++ AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(b1) { ++ do_check_eq(b1, null); ++ ++ restartManager(); ++ ++ AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(newb1) { ++ do_check_eq(newb1, null); ++ ++ do_test_finished(); ++ }); ++ }); ++} +diff -r 97e49e7a3326 -r 812d0ba83175 toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini +--- a/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini Wed Sep 26 13:08:50 2012 +0200 ++++ b/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini Thu Sep 20 10:01:39 2012 +0200 +@@ -139,6 +139,7 @@ + [test_corrupt_strictcompat.js] + [test_db_sanity.js] + [test_dictionary.js] ++[test_langpack.js] + [test_disable.js] + [test_distribution.js] + [test_dss.js] diff --git a/libre/iceweasel-libre/iceweasel.desktop b/libre/iceweasel-libre/iceweasel.desktop new file mode 100644 index 000000000..e1aa6f0ca --- /dev/null +++ b/libre/iceweasel-libre/iceweasel.desktop @@ -0,0 +1,105 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Iceweasel +Name[bg]=Iceweasel +Name[ca]=Iceweasel +Name[cs]=Iceweasel +Name[el]=Iceweasel +Name[es]=Iceweasel +Name[fa]=Iceweasel +Name[fi]=Iceweasel +Name[fr]=Iceweasel +Name[hu]=Iceweasel +Name[it]=Iceweasel +Name[ja]=Iceweasel +Name[ko]=Iceweasel +Name[nb]=Iceweasel +Name[nl]=Iceweasel +Name[nn]=Iceweasel +Name[no]=Iceweasel +Name[pl]=Iceweasel +Name[pt]=Iceweasel +Name[pt_BR]=Iceweasel +Name[ru]=Iceweasel +Name[sk]=Iceweasel +Name[sv]=Iceweasel +Comment=Browse the World Wide Web +Comment[bg]=Сърфиране в Мрежата +Comment[ca]=Navegueu per el web +Comment[cs]=Prohlížení stránek World Wide Webu +Comment[de]=Im Internet surfen +Comment[el]=Περιηγηθείτε στον παγκόσμιο ιστό +Comment[es]=Navegue por la web +Comment[fa]=صفحات شبکه جهانی اینترنت را مرور نمایید +Comment[fi]=Selaa Internetin WWW-sivuja +Comment[fr]=Navigue sur Internet +Comment[hu]=A világháló böngészése +Comment[it]=Esplora il web +Comment[ja]=ウェブを閲覧します +Comment[ko]=웹을 돌아 다닙니다 +Comment[nb]=Surf på nettet +Comment[nl]=Verken het internet +Comment[nn]=Surf på nettet +Comment[no]=Surf på nettet +Comment[pl]=Przeglądanie stron WWW +Comment[pt]=Navegue na Internet +Comment[pt_BR]=Navegue na Internet +Comment[ru]=Обозреватель Всемирной Паутины +Comment[sk]=Prehliadanie internetu +Comment[sv]=Surfa på webben +GenericName=Web Browser +GenericName[bg]=Интернет браузър +GenericName[ca]=Navegador web +GenericName[cs]=Webový prohlížeč +GenericName[de]=Webbrowser +GenericName[el]=Περιηγητής ιστού +GenericName[es]=Navegador web +GenericName[fa]=مرورگر اینترنتی +GenericName[fi]=WWW-selain +GenericName[fr]=Navigateur Web +GenericName[hu]=Webböngésző +GenericName[it]=Browser Web +GenericName[ja]=ウェブ・ブラウザ +GenericName[ko]=웹 브라우저 +GenericName[nb]=Nettleser +GenericName[nl]=Webbrowser +GenericName[nn]=Nettlesar +GenericName[no]=Nettleser +GenericName[pl]=Przeglądarka WWW +GenericName[pt]=Navegador Web +GenericName[pt_BR]=Navegador Web +GenericName[ru]=Интернет-браузер +GenericName[sk]=Internetový prehliadač +GenericName[sv]=Webbläsare +X-GNOME-FullName=Iceweasel Web Browser +X-GNOME-FullName[bg]=Интернет браузър (Iceweasel) +X-GNOME-FullName[ca]=Navegador web Iceweasel +X-GNOME-FullName[cs]=Iceweasel Webový prohlížeč +X-GNOME-FullName[el]=Περιηγήτης Ιστού Iceweasel +X-GNOME-FullName[es]=Navegador web Iceweasel +X-GNOME-FullName[fa]=مرورگر اینترنتی Iceweasel +X-GNOME-FullName[fi]=Iceweasel-selain +X-GNOME-FullName[fr]=Navigateur Web Iceweasel +X-GNOME-FullName[hu]=Iceweasel webböngésző +X-GNOME-FullName[it]=Iceweasel Browser Web +X-GNOME-FullName[ja]=Iceweasel ウェブ・ブラウザ +X-GNOME-FullName[ko]=Iceweasel 웹 브라우저 +X-GNOME-FullName[nb]=Iceweasel Nettleser +X-GNOME-FullName[nl]=Iceweasel webbrowser +X-GNOME-FullName[nn]=Iceweasel Nettlesar +X-GNOME-FullName[no]=Iceweasel Nettleser +X-GNOME-FullName[pl]=Przeglądarka WWW Iceweasel +X-GNOME-FullName[pt]=Iceweasel Navegador Web +X-GNOME-FullName[pt_BR]=Navegador Web Iceweasel +X-GNOME-FullName[ru]=Интернет-браузер Iceweasel +X-GNOME-FullName[sk]=Internetový prehliadač Iceweasel +X-GNOME-FullName[sv]=Webbläsaren Iceweasel +Exec=iceweasel %u +Terminal=false +X-MultipleArgs=false +Type=Application +Icon=iceweasel +Categories=Network;WebBrowser; +MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/vnd.mozilla.xul+xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https; +StartupWMClass=Iceweasel +StartupNotify=true diff --git a/libre/iceweasel-libre/iceweasel.install b/libre/iceweasel-libre/iceweasel.install index c1fe8284a..c1fe8284a 100755..100644 --- a/libre/iceweasel-libre/iceweasel.install +++ b/libre/iceweasel-libre/iceweasel.install diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch index cd3d49f2f..83ba6e04e 100755..100644 --- a/libre/iceweasel-libre/libre.patch +++ b/libre/iceweasel-libre/libre.patch @@ -1,6 +1,6 @@ -diff -urN iceweasel-17.0.1.orig/browser/app/profile/firefox.js iceweasel-17.0.1/browser/app/profile/firefox.js ---- iceweasel-17.0.1.orig/browser/app/profile/firefox.js 2012-11-29 02:43:23.000000000 -0200 -+++ iceweasel-17.0.1/browser/app/profile/firefox.js 2012-12-04 17:00:51.691456154 -0200 +diff -urN iceweasel-18.0.orig/browser/app/profile/firefox.js iceweasel-18.0/browser/app/profile/firefox.js +--- iceweasel-18.0.orig/browser/app/profile/firefox.js 2013-01-10 01:04:16.600370827 -0200 ++++ iceweasel-18.0/browser/app/profile/firefox.js 2013-01-09 19:58:30.691632825 -0200 @@ -37,11 +37,10 @@ // Preferences for AMO integration pref("extensions.getAddons.cache.enabled", true); @@ -17,17 +17,7 @@ diff -urN iceweasel-17.0.1.orig/browser/app/profile/firefox.js iceweasel-17.0.1/ // Blocklist preferences pref("extensions.blocklist.enabled", true); -@@ -194,7 +193,8 @@ - pref("extensions.update.interval", 86400); // Check for updates to Extensions and - // Themes every day - // Non-symmetric (not shared by extensions) extension-specific [update] preferences --pref("extensions.getMoreThemesURL", "https://addons.mozilla.org/%LOCALE%/firefox/getpersonas"); -+pref("extensions.getMoreExtensionsURL", "http://www.gnu.org/software/gnuzilla/addons.html#addons"); -+pref("extensions.getMoreThemesURL", "http://www.gnu.org/software/gnuzilla/addons.html#themes"); - pref("extensions.dss.enabled", false); // Dynamic Skin Switching - pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next - // restart. -@@ -329,18 +328,18 @@ +@@ -328,18 +327,18 @@ pref("browser.download.panel.removeFinishedDownloads", false); // search engines URL @@ -51,7 +41,7 @@ diff -urN iceweasel-17.0.1.orig/browser/app/profile/firefox.js iceweasel-17.0.1/ // search bar results always open in a new tab pref("browser.search.openintab", false); -@@ -571,7 +570,7 @@ +@@ -570,7 +569,7 @@ pref("accessibility.typeaheadfind.flashBar", 1); // plugin finder service url @@ -60,7 +50,7 @@ diff -urN iceweasel-17.0.1.orig/browser/app/profile/firefox.js iceweasel-17.0.1/ // by default we show an infobar message when pages require plugins the user has not installed, or are outdated pref("plugins.hide_infobar_for_missing_plugin", false); -@@ -624,23 +623,23 @@ +@@ -622,23 +621,23 @@ pref("browser.send_pings", false); /* initial web feed readers list */ @@ -96,7 +86,7 @@ diff -urN iceweasel-17.0.1.orig/browser/app/profile/firefox.js iceweasel-17.0.1/ pref("browser.contentHandlers.types.5.type", "application/vnd.mozilla.maybe.feed"); pref("browser.feeds.handler", "ask"); -@@ -651,7 +650,7 @@ +@@ -649,7 +648,7 @@ // region.properties file is newer than the version number in the handler // service datastore, it will add any new handlers it finds in the prefs (as // seeded by this file) to its datastore. @@ -105,7 +95,7 @@ diff -urN iceweasel-17.0.1.orig/browser/app/profile/firefox.js iceweasel-17.0.1/ // The default set of web-based protocol handlers shown in the application // selection dialog for webcal: ; I've arbitrarily picked 4 default handlers -@@ -659,65 +658,65 @@ +@@ -657,65 +656,65 @@ // protocol not currently listed here), we should go ahead and add those. // webcal @@ -216,11 +206,10 @@ diff -urN iceweasel-17.0.1.orig/browser/app/profile/firefox.js iceweasel-17.0.1/ // Name of the about: page contributed by safebrowsing to handle display of error // pages on phishing/malware hits. (bug 399233) -@@ -1164,13 +1167,3 @@ - // might keep around more than this, but we'll try to get down to this value). +@@ -1168,14 +1167,4 @@ // (This is intentionally on the high side; see bug 746055.) pref("image.mem.max_decoded_image_kb", 256000); -- + -// Example social provider -pref("social.manifest.facebook", "{\"origin\":\"https://www.facebook.com\",\"name\":\"Facebook Messenger\",\"workerURL\":\"https://www.facebook.com/desktop/fbdesktop2/socialfox/fbworker.js.php\",\"iconURL\":\"data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8%2F9hAAAAX0lEQVQ4jWP4%2F%2F8%2FAyUYTFhHzjgDxP9JxGeQDSBVMxgTbUBCxer%2Fr999%2BQ8DJBuArJksA9A10s8AXIBoA0B%2BR%2FY%2FjD%2BEwoBoA1yT5v3PbdmCE8MAshhID%2FUMoDgzUYIBj0Cgi7ar4coAAAAASUVORK5CYII%3D\",\"sidebarURL\":\"https://www.facebook.com/desktop/fbdesktop2/?socialfox=true\"}"); -// Comma-separated list of nsIURI::prePaths that are allowed to activate @@ -230,6 +219,8 @@ diff -urN iceweasel-17.0.1.orig/browser/app/profile/firefox.js iceweasel-17.0.1/ -pref("social.sidebar.unload_timeout_ms", 10000); -pref("social.active", false); -pref("social.toast-notifications.enabled", true); +- + pref("dom.identity.enabled", false); diff -urN iceweasel-17.0.orig/browser/locales/en-US/chrome/browser-region/region.properties iceweasel-17.0/browser/locales/en-US/chrome/browser-region/region.properties --- iceweasel-17.0.orig/browser/locales/en-US/chrome/browser-region/region.properties 2012-11-20 00:45:50.000000000 -0200 +++ iceweasel-17.0/browser/locales/en-US/chrome/browser-region/region.properties 2012-11-28 21:45:00.486713730 -0200 @@ -461,10 +452,10 @@ diff -urN iceweasel-14.0.1.orig/browser/locales/generic/profile/bookmarks.html.i + <DT><A HREF="http://www.h-node.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAAAAABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAEAAAAAAAC7zrYAWYhNANjj1QA9fEcAEEwBAHTQkwAeVRkAPXMvALvOtwASVQEAHFcUAH/bpgB60p8AKnQmAGO1fgAjaRwALmA1AA5EAQDM2sgAN3ApAG7EjgC5zbQAVJxrAChwIgC0ya8ALmczAHXJmQBNf0EAgd6oADhwKgC8z7cA7vPtANTg0QANPwAARIhSADtyLQBzzpQAus21AEeKVQDC070AieyzALzPuAB93qEALGYvAO/z7gBEiVAAasWFAFuJTwBKil4AXotSAEuKXgAORQEAD0gBABlDFwBWpmoALGYwAGCNVQAbYBAAHGAQABBOAQCI6rIAjPG3AB1bDgAaXg4A////AGaRWwB/2qYAUYJEAEx+PwAZXAwAm7eUAD51MADN28oAJmwhACRiFAAzeTYAasaFAB9eDwBkt34Aus62AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPT09PT09PT09PT09PT09PT09PT0OIjALPRQmMkI9PT09PT09OkcHNQU+Q0oQPT09PT09PToVGDQtI0ABKz09PT09PT06JRg0Nh1ALxk9PT09PT09OiUYIS4TQC83PT09PT09PTpPSDsGG0BEAz09PT09PT06T0BGMRIsTRY9PT09PT09OgACJx8gQwooPT09PT09PToICAkJCUkkPT09PT09PT05HggETio9PT09PT09PT09Px4IERw9PT09PT09PT09PUUpCDMMPT09PT09PT09PT0NOEEEGj09PT09PT09PT09TBcPSzw9PT09PT09PT09PT09PT09PT09PT09PQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA%3D">h-node</A> </DL><p> </DL><p> -diff -urN iceweasel-17.0.1.orig/browser/base/content/abouthome/aboutHome.js iceweasel-17.0.1/browser/base/content/abouthome/aboutHome.js ---- iceweasel-17.0.1.orig/browser/base/content/abouthome/aboutHome.js 2012-11-29 02:43:23.000000000 -0200 -+++ iceweasel-17.0.1/browser/base/content/abouthome/aboutHome.js 2012-12-04 02:08:18.095477555 -0200 -@@ -5,99 +5,42 @@ +diff -urN iceweasel-18.0.orig/browser/base/content/abouthome/aboutHome.js iceweasel-18.0/browser/base/content/abouthome/aboutHome.js +--- iceweasel-18.0.orig/browser/base/content/abouthome/aboutHome.js 2013-01-04 21:44:27.000000000 -0200 ++++ iceweasel-18.0/browser/base/content/abouthome/aboutHome.js 2013-01-10 00:53:04.008909619 -0200 +@@ -5,70 +5,41 @@ // If a definition requires additional params, check that the final search url // is handled correctly by the engine. const SEARCH_ENGINES = { @@ -529,39 +520,10 @@ diff -urN iceweasel-17.0.1.orig/browser/base/content/abouthome/aboutHome.js icew - "tpbPbe8B2vmsi7+rl2Nf4yVaUlLHSQXu7r8tw1JyT+ivhQBaAhZUxBSC5EPpPtMKVDzi3z/+HZHJ" + - "7K/7IvC/CRhZ6Ep6evGGyXJS3kAsp3SGcgLKc7uSktBhrW7ZFq32r/HHCVbb0P9fBSYOTpIoJ5SE" + - "7GUnpHbrbG8EzsfWfwgwAEfC/ToQIhkhAAAAAElFTkSuQmCC" +-#ifdef XP_MACOSX +- , imageHD: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIwAAAA4CAYAAAAvmxBdAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAGrFJREFUeNrtfHt4VdW172+utZOASLJ5+BaIFrUeXkFsa0Fl++gDnznVVlvFxt7aqvUUarXtse3Bau35ak/rZ9XT26NtfOvV6wFET+FYCQEKWqsQIT5RCAgSXnlnrzXneNw/1lphJSSQ8BB7bub3zW+LO3uN+fiNMcf4jTEX0N/6W3/rb/2tv30smtnXB3zmRi2FQakxQNKX3WkW9S/tgW3HLpmQM543A0BWVSHMYGIwOTDxzxrOf3/RQQfMZ2/SLAvKhTFVBGUqKFONH2QAzwOMF38awHhYZAxWAqhe/iszp3+b970d/sInc57vz/J8L2eMB2MAEYkBQ6DQ3dRw4dq7AUjcP3rAfPZmLWXCLHKoIAcQAUxaB5EaEfc6AEBhjDEwmcx43/fO9HxT4vkReBIAAZgjgodW3NcPnn1sHgD/iHknn+0d6s8XEUhsXXac/34WAAGw8afuT8GZ3X055YeSJcIsG+pMZwFn0UihezRofPt3G54f/0E8cNMN+Myo8jVTCgYd823PLzrPeIBnABiUQ1F+UoWsVOYb33mkoKp/7/dKyT0AGc47X4s0sjBEoLxbBqAQAMfWRfe38B4BM+VHUkYOs8mi1FrABbK4dcvK73zwp1M3xYPOxANKBqbpCdXNGb0UwPKRF74xpfDQ0t+K54+IvlKoahmAhaO/mv/ZmicG3tqPgT61ZM2dZMQJOYhIdByRM/F3dCCOox4Bc3oEliqyyNoQCPPusXceKZqRsigu7pwaWBowiRb46+f9Q1V2wl1nDx09/R7jF30x9adNlN8yPx4DHwht+B/cBIBoRqeIE4hE/oshTcB0wNbT6/o/zrhFyohR5ZxmrVWE+fDxdx4puhGAH4OkPe5B6pykeJAc/7cDEMZ/095Y870P339m+BXs2v4kbCFsm9u2vnpJ3bzR7wAo2B/R2v+PjSnyXcRxtOLUSXFxwAFz5i2SZUIVO82SBWye/vLOIwNvjL8OYqCEfXCmJAZPHkC7sK1REbj2+lmbq86qTVmmfuuyN2cTiREWKCvACgml9kDL7HQksehsZmSdA6yVpsa6P38v3swg7m4vN1dGXrThKGP8yS5fP33j/LEvxKDbl2f2A0YFCtkZQDOaPjLAnP4jrmBGjh1AVhG2ttxfX33++vjY2eeNXf/siLUAzgEwMJZrY2vF/Vu/t4BRqCqgCmj07wMVHXUCzJQfUlZE72ICnANcqNj21h8eiK1AX46gXh29KT9H+rd9XxBjYGCgig7QHOgjPgMAKigXQZYpsi4uCOc3v35zY2wF9ufGSgxA7fdd9g8ho9ol4P4ojiQWnSUMMANECrJNy1NWYH8eGfsEvJbLv1IK1XIAUwEtA0xplJMwjcaYlTDeShg8dOgjj6/cJxNYfWIWkHJoh5yyjkSZ8RbB89YBZq4/pXafGeuzb9WciXJxo2B2houqgAjABJCLOwFMqFv57+bBxMIAJm1det3avnl1OYCLAeSgWhofaY1QXQSRuYc+/OiD3QLmUzNdqTBKhRVMADsF5beuToXJB90KtFz+lVIVniXOVUAUqjpXVB4WwPjGTPB8/0zjeTnjezl43szmKy6vNkDF4MeeXNc3oJyUhfAMkJsJkSxUVrLos6o6z/O8Ucb3phrPzyHKeVTwkpPXseg3Cqe+1SfG+swfaw6KGTAoJ5eyGF3IBeEIJB2AcXxb0FI/L45uFQBMGiu6Z3ai9eqrclBUClFWVatV5GERNT5wEVQnQLUcIuVNX75kFjn60rA5c1d0AoywlkcxfdwZ2LSgbOmBZAv70povu7RcyFUqcZYdPbxix44fnLv8pbYUOWh+P3ZM9uJRo34xoLDgq8b3YTxvqhqsaPzyJTdmn36msjdyqPqkMhWqBFGZMtV8uDX4zMjp2zemyEoPgGn4zyOvGzy48A54GcD3Sz1jFrqqE+4uOOvdmb0ASlYEs5mQE9afUdhy0yv3lHzwya/8ZcjgI0+5yssU3QKYkgQ4Ivp60LL1n8kBQfOWuvdnj6uLldgHQKoKxU7HV/eg2y1XXXmXEs1U0ZVb29o//4k5c5P5eQB+s+68aVeUFBTcCxUoS6kRWfjhueecc9SfX3ytA9QTr7eVACqYFDYEwnbB2qcHHg6gLY6ODhpomi77coUyVaojhKH9+ZHzF/wqXiztEg34APxNX/jCvQOLCi83fpy8UsCJXHLYnGdn785S0uKTyyBUBXJZcW5x4bSN56ciyLQcD4Bf/+ThVwwbUvRb+JkoswqAWX5b9Lm1M3uSM/UnUiaCKiZk2blvvnxX0ePxuBNAmpMur51wyLBPzjVeBBoVwIXBk6vuP+SG+LkcuwkWAA96/JjZKnKxkACkkFb5Nztz220xX9bJlWi+6opKFalQlpqlmzZNu6B6SaJ0knKJ/DW5qd8p8TO3x6ABqza1EE06cdmy9wDAY5LjmBTMkQnUnZ42H0ywNF52aU6FK4UY5NySI+cv+E3MCnMM5HyqtwFoO3rBgmuDMFjGjiCOIEQwzH9c+7lzju+JTaYlJ2ehUqXMWWFqeurFxqsAFMVf25Ss9kTOEZdvebClJbxTyUGZoEzwlL/b9tzRX+pOztSfSBZApSqyIrL45buKnkaUJEzLCN5+csxr+ab6fyILkI2OIZYBlx9/2bYvpLgw2+EqKLKdwoceVKJp+tfuEpYKZcaW1tZbLqheEsbj3GV+oxdV3x0GwQZrHUIiWKIST3VmDG54zFrKrBBWiGgSyx9Uv6Xh0n/MKlGlOII4h80trQ+kuJt8HGklZHg6FZF/Y/uOb7O1YOvAzkGtKxmoehe6SYNEpkErwZIFC4I2fuLKf2tLtDOPzumPhA6wAPJDLt1yuzjaAEcAMUCMApXfvPP7IcO6gkYFs4RRpgy49qanUsAPu/T8W48e/YwL6S/kYtBYwM8U/yu6KVlQUShr9CkKyK7b1vDVy0qVeaYygaxbdeK85/8a/z7sYR3zgXM1gXUInEPoCEw8PR6z8YQxaidQPh6RrgrPEOZS4chKjFuydEEKFD1xQgrAnfO3V98Jw/B5dhFgmByU+MK/nnrq6K6gcQtPyqlIubJAibCxPv/fsVVNgCI9yGEAQdBq71NHUEdQIoBo5PBBeklazuQfSpYFM0UAFsDmd2yMf9+1XkUT3otc8AiRwpFChCBCI0detGbSLtYr5uw6tk26XctZwgxhRt65ZSmr1t389M1Jk85wzKcHRAiJkCfasDnI/0sMGN+jlLMrAigMhp0+f+TBBIw4milEYOcQBHZZAoZeEIgKgIIgeJbD2MqEFhxaDAFmdAWMisxQFigzlAUnX9e4rA9yeHuTna3koBQBRogxwOPvxNbQAAA7VHQEFKSQKEFIu4lA5d3HiiuFNB4XQZlhUHBK11QO0oRdD7ouROVCkeJZG7ak/KBOYHlz4sTy1WVlVY5oYego2+bs82+3tFw6YcVrp01dteqpxNfyhKQuGlxCMSsKBh570ABT/8XP5dhRVpyDWAd2Ns0O9yrhWdfcMpvCEByEoNCCwhBgvgBdM+PM5TH5FPW+1ZLo8de2viehe12dhVoHOAtDPO61O4o+kYCTnE5wVuGsxlzKHul7BUDKdomKgwpB2QHAyNiP2Dl+0Z2WRXZ9YP0F55WJczvX0jp09U3fLiurWD1+/NqQaHZIVNbu3O1vt7aM+fSqVRWXvPvu0pRldwAkQ5brjO+NMh0kgMIvGjYZwIKETPxIrYt1U5M8iThKJil9yZGc++ab298dP36Jb8wZohqhQHRErKEeAA6fG5FT5yIlYYI6tzfOvtiQni3MYDw0ChqEgUMyejyAdwGwDeW4ZI9FAGQOmwzgv/cERmZbDXhnKBNUGMJkUhGVduSSJJ1P6rw8HIalJo7ilBkchgCgL48fVzLceDc4kZnWUdap1AQi10x+660n4jXyk1M7ZXEZgHhMUkMO4NjphQGMf8h56Fx++ZE1a+1xZC2Szjs3sk9uUEhUbSMvP3LeyOGZ0tKJiearo1J1DHVRPYmS7JUcG2g1pxxUsooBnpmQWAOb10YbKGygcKFCZOC0XqxrRKokCBQG5euX77In2k1P+2hhWEZBAAoCuCCEcW7E2xMn/m6oYo0jyjnmuc3Off6UN96YMvmtt5LILSmQ61r3xAA0I+xqPBiIejAd1f7e2MPPfvm4LQs/89a+bP6nZuSzfsaU+T7g+UBixYQVRFGS01kFO22srRy0EgA4CEvFRHS3MANMY/fGbybmlQqAFSBVsCp8kWwCGA5dqefFShnnRV77ecHYU37iXuqLoB0tsuIo34v3NfJR1GlJsrnOuiXGy1y8k+rwxh573srSD/6rbLdra7yMqgjUCGAULR8uWr0LJPYAGApCeCbKNygLPKIxJ65YOSU+YpLUUCYGiqBzQVy3Ft1zbevnJl60UARqACgcVDo9ZZr63Mqua68QxlpmrWJC1FmrmLSKCFVktcpZrbKhzg4D26E5Lgjg8vnoMwwh1hU/dvTRo/qcDyJqcESw5Dp6o3XNHVrqLDSubAdFjuXwwWZcX+Wc9APboKxQUoiLurXaIYfCpjlCDsoxZ6OCouLRt+xpbY3nA8aDMR6E2+9vffOWxl02cQ+Bbdjevt7l83D5ABRaKNHYO484YmgMkoJ4jElCOL8Lz9NN87YumrRDxc2DElQZKgIVhZcZcO1hZ74wtK/H0thvtuXGXdM2S0S/ziQ1FPJiG7pHwvbgDhtKnQ0VNhCEeUHQLmiuf2fymieGvJGY8DCfX+yCEC5xWIlwtO+P6+s4VESJGS4+liwxKjZ/2FGRZvPhYgktxEZdHWOAr2P34ihWIQWTgJ2CnWJbo9Ymz1g/5+h1QsF9wgKJ19Z4hV874fKNE3cnx8v4V8H4UOjqhvce+zW6qdWVlOvSjQsDlw/WUT4A5QNQGIJDizMPHXR+CiRBb4GSzlYr26Z7vYKSC42nUOPBqA9VU1I0ZOJPEYWj1NvVW/3AoEUAFgO4IzZ1hYk2jf9WUw7IjCIXHUVhXrFp/sQtKZPIoXXr/PjoSkZeoHo6gP/bFyeciECqcHG3IrXp37a2SF3xQNPxRAXgq5nS1bHsDWCYALYAu+h0W/impI8Pad9ec/vAoWVTjV84Nsn5FAwcvmDMN5rOqf1jyatdHzjuGjvThloKYH3b5qVXt77544ZuN1QEKknF3a6ImfDee4tWjBrV6R5Qoeq1AP6Avaxx8gDolhdPXAh2qzQmZFQ4ZhALrj/mvLpT+qhxya0BP5VVZQBkA6jNR0AJ2xUUcjKGjsx4k3PVYUwaJU6rJ3reLiHlHppjBjF3fLYSzU/noEZ83611VusoVJBVsFWAdezim/3jemSFe+SNIsvCpAhCXf7TBZI+PnTr4nO2t2xcME3ZroYKIouEEqDoxfHfav/GxOttFgBOucGWll0XVqrqXYDWNLz3aG7bsovWp4i2TvkhScLqNBezq/M/zxLBxV2Yx/75yCPP6usc04CJ+B3bcLMwQTiK+0UIwgz1ip8+4pyaYX0x0SnWMkjnYGygkm9nBO0MGzoI2TTDyQBw7ubNawPmeZYZNt5wZhrxX8OHX9yXSTJzGcVgIWasbs8/hc7XRzXM670cg0Vs5H+MHm6u74ucrb/KlAlFPoySoqFFn+rm+OCGV762df2cYWe4fP0M5qDWhoowRIm1/h+s1YZx3wrVOV1LDhXMaGzfXntF46vXtMQRS/clsqRRT9SNd0GMBo6edRStZbKeg4D//ciQIcP2CTDbqsdVKQePq1JMFkXxv4qO9AaMfPGoaeuG9kXp0LkU0wGgMFC1gYAdAeyg0m3IrE3W3mtTvodjRpHq9X3xL4h5Qsq63P/z9ra6LqScvvmBPkwOTex2lnf4wNee/47fa99NGGVJ8Zl1qP3UPfwkdr15mDDV+Y3Pf+Kh9c9kz9pee89J7dvevaRt+7qLbVv47y5UUKggp3BB/okNz0/aHI8332OaIgELxWDpptQtt6X+Qcu03nVYGQYxjxzl+7/eGyvjdYrCtv31JiW7QTjy6qWj83jF4AeP/MLaodiHRtZBXAihEEIWkq4eSgGmvKGhqpX5d1YEVhiWBaI6Zf6QITN7s5ELhw4tZZavkwhIZMOC1rZfo5s64nPv4+1NzXot2/hYiqKckglH4/7eRojCOospSt6u2ijfS1Hv3I0SdVy5aam9ecumBeOqN8w7aRkxSlMVdRDmRHa4m5xWPKPEusUA6maIrcy/cCKwInASKaCoXrlo2LAH+xpMpAEjLauu2ObaNnxVmZqUHaI8SaR+KnIhTPHCo6ZtOn6vk4qUPNNGnV2PJ0ptENweMq92zHBMcMwwIrfMLS6etKdJEnMlCYOZm9YE4dUPkWvsIUckJ/+SZwd5PCEOEBc5rh7jgrqf+VfvSc7mO/xZSihVAra3YMY/PqqrUhZVe7C8yRHTBqAVQJuQN5idgJ2ASQAz4PJjptWevKc0RZQ0TQATRWDd/dmFDQ2VeaLH0z4dRVTK9EXZ7IqFJSXH7W6eLw0blntp2NAydGOSqPGVs/5mW9ZcJGKbRSxELIRDCFuIuAmiBa8eMW37rcdc1JDtM+3PYdSp43k9/ulPgmDrsnz+vFBktRWBZYEVKSlUfeH5wYPP7u5Hfy4uzi4oLq50IjkSaXrf2vIfBPnV6PlKiwKg0XfyNe2BPkmJ8+oUGeh/bLjNu7En0Gy+w5sppLcyKRra9IZJ98hTvciop9MPSSFUwGTnEjHICsgpyKHYHzjquWMvrJ+wewUENPFjCIAxk3uStyIMbw5FVieWJvJpBE5kgqq+X1VcPGdRcfHMxSUluSUlJbmlUZ+1tKRkLRGVnrZ9Rw12rSLtsDpFg8vmfbpw0HH3wcuMMSaiao2XAbwMjPFhPL/ReN6DfsY8tHHekN0WXR929vqsCpWruFshPEqFo3IyADuWTxgea1rYTbRVeEMmc+SnCwp+OcB4l3kmLq0D4BnzkA/MMUBjvDMXC1DBqlkCFr9N9E//HIZpPyDsQVuTFwsMfP273k8GFeLbvo9izwe8DGA8VMPgIc/D2piALlPFDGWUMqNuazOun/RbeQU7L/zl0cfC+SPOXjG84NBRawCvJNoSE7PiBgr5Xx/MKf7jLnzIbUPKlHVF5C11KgJfD9+shY8Vxjd30780rEvP8bFDDvnVQGO+lU5MeTDwzM5aTbOzNyrw/XNbWx9JFLknk+sjqjobUHJq9XS/cNj3jZcZAc9PwBIDyAeMD2O8RhhvpTFYqYpGqMQOM2UhlFOhsvjfgNJ6ofxyoZaXbHPt8mDNjDU9ACYBbyGAAT/KZEZ/MpO5qciYyRlgROeJGSh0nQCL21Ufmx4EL8dMpqScRt4DFVAAYMCtORx+0Rhz7aFF+GJBBmNM/JKklGo1KlBtHZ474U79P9hZOZcQYb0unD/mwu05qADCZwE4C8Y7I3kTk4kFx+mUuzfMKf5e+rn+rUMq4PR4hFII0gw0xpdvGAWGoDqHf9m8IuV8m2Qtf1pQMPok37+50JhpHlC8EzwRcAzwOqs+Vkv06I+da04nInd3RvuxgCIAhcUTF5zvFQ79oucP+Cy8zIjE6qQnt5Pviu5IqAogVKNCNSrBUte6blnrqi/Vo3O9rI3Pc7cbP6sgGQcAf7rvl3zK908uBKjAGK5jrrmNKKHj/RS3E6L3V2USLUzkZAB4i75pTivwwQMyoKYQ685+QOtScvzUHPbIlJ54ZVsuDPTrZDmnQqUQggo1qkoNRDyFeJ6XGQfjF0fW3O9YWxW6adNzw36Dzm/JKEJ0k7QgtfiSygd1vSrkdZ3jlb6fneT7Y+MN1xrmVX9gbkw9q1MdsemFU5wkpwqSRSw49gfZAcPPHOsVlIww/sBjjPEVnqfGZEQlWKVCjWK31TW/dv56pCruU126TGxPl+USIrAgNQ7TQ+pNukQqfalLNimApvMt6CZMTvsiu3VOJ17XnrNWZ9m85oK8Qmz4sFB+CeXrF29dfOqG1PwKs6fOKyvKjrnb8wrHGD8TWfCOEoX85zb96dgXY9leN2NM+y3SJZG4u7XsSldIykFPz09NHxbRT2U3M11AsKf8aRqtnBqQoG91oWkGOS0/XaQo2Pf3u5mUDK9LukD7Mv5Tv9teSQ4VzipsINUtW9Zct/mFiRu7WbcOuQNP+MXQ4hGX3mEKBl1mjB9bbwAqSz6cf+TZ8Qaabta/u6hM92ItpZs5dvyor5R/dwvp9QAa6eFzfxRlpVMk2mXh93czeyPn1Bn5ShWtYAJsyEve+OPgC7Hzmgx3USDtejQedlbtDX7h0Ns6HChV5LcvP7rpb1+qx/690dHrtewL05c2c7ZLtrM91fOpDGjXyvT9+WYBPQAg3NPcey1n4vVtFUJSIfGNjJZNy2ekkqzpazIJOefSoTaA9q1VY+5Wbvs9NAoYVBkFh5Sesi9lJ/u6lt5+WETpoi2MPpZU/k9szmKGtVGRWBjQ6g3zP78pxfSGKb+tJ4LPAsi31S/+uXCUlVZmCIc+DlI15L4Cpr/1FA1d0VLqAilzgcCGChdQc5eoTXqpkNS66hv1YLsUElURiG1sOZj7lunf3v3fwlBKjRfX9EjEHKcscV98D40zRKIqgEpz4yvTVnfjU/VbmL/r4yhwTTbPCNsZNi8g50/OnvbCsXu5wQqVURCBuOb7seu98n7A/L23Tc8NX8mW6pL73UoOhYPH/GJv/I7Dzlqbg5pRUG1q++A//+Ng+4f9gDlATVzLHfErZiHioKrnH37uhgeG597sdYnIYeeszypQqQawre9dHNbd0Yj9/5KnfsB8DJpuXXj8Q+ryj3dUZglD1Uz3MsWvHX7uh1fv6QGHn7upAmrWQpEV2zSt+bVptamw+6C9VaP/hcoHrvkABgydUjPLywy6Oboh6HW6PgLjLYqStqYRQHKDMQflMhXOQrnata27tvGvufrEn8ZBfmdPP2AO7NpmAAw85B8qTyjKlt1svAHTjPGLk4w0jAcTAyllnBoh9Kxw/tEdS8cuT0WyH4vX1PYD5qMBzQDE2eFDxz09zsscWuwVHX6a8YwaFAiMNAkHr4vdUdf82rQN6JwnSl4N4vAxeKdxP2A+mjXuKTvcXcY9TdOnyxPk4zKZ/vbRAqe75C3QfZZY0P/y6/7299z+H4QrdGsoib8JAAAAAElFTkSuQmCC" +-#endif - , params: "source=hp&channel=np" -- } -- --, "Яндекс": -- { -- image: "data:image/png;base64," + -- "iVBORw0KGgoAAAANSUhEUgAAAEYAAAAcCAYAAADcO8kVAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ" + -- "bWFnZVJlYWR5ccllPAAABWFJREFUeNrsWWtsVEUUnltLH7tbaeuDbfCBojUoBTGmooLE+Igx+gON" + -- "RvEJhEQNUdEYA0Ji4xNf2Bg1iBJJrGBC+CEBNYoxxmh94CMKRE2MitBqoZRi6bbdZT3TfhM/TmZ2" + -- "u5jGsOEkX8/0ztzp3HPP4zu3UTabNUfEI9YwgzAxjUbBGkG7IAv0CwYE53rWC+KChFloRh329igN" + -- "zD8keJR+P2DvEbgnrjp4eWT65GerSZuU6FWii9Fj5pGHvC6ow/WpdP1C7SV3Bm18eNpDG2a0oA0P" + -- "v0qFSn3IMPOKxChsmBJ1/TpBEuNn1NxRB8XOoJSYRabfrCiG0FGiDXMZ9HeC73PfGpkOST0vmYGi" + -- "LEraMCdB/5jP46xhnhaj7C3Sal2qjFSDcU8eb4m2m4xpHvKWYwSTBd2Cr1HBrIwVnCXYIdiiNrDh" + -- "Wi8YQLVzZ+mDt/ar9acK5gqOE6wTvKvmE4JzsN83ghSu1+AMMcGngr/pnnHYM4nzrRX8EapKm5Fc" + -- "3/bwlAn/Jt/EtJdNmdvidjxcpyrjT+D6Fx7LPoA5jf3ktU5metY9rtZcRHNn0vV3cO0rtf6GwN9v" + -- "DCXfX6AbVLL1hJJOxIM6UtwnJG7ORuIaMl5W7W297g2MmwR3YLxQcDmty3jOdongCrrXyRTBaoyf" + -- "x5qdgjZ4qzfHbCQ3mzXcChcYH8hhIGf0zwQ3Ch6k8/Ae9yEM3hc8LFguWIm5uwIvwYXhPdA2RNbT" + -- "/BLoFsECwXsw1gUIZa9h7NvZivGLgkk010eHjv5jbitXD1HiWVMhuB7jDXR9E/R0Qa3nPvvmTxZc" + -- "7fGWyQhNK6/R9b8Ev4aSr0HyunWQ3Q/li8/hdh8JTiOD+DpPa7jegHtriUN35zDMRMEJGH9J17dB" + -- "18KzO9V9NvndjbH1sB9objp0u+CT4VYlJ5txKLvpDMFsIJ/EwYOs9bsEp+RYeyz0nx7y6ORsGu8K" + -- "EM2kx1ts7rkXL+YxNd8I/TOcoCDDOB5jY/Fj/P4cEmVTjr0SlKNCOcjJ8fQgodAcQ/d/i/BLK8Oo" + -- "ZtYcLVgGD1wq2K7mx0LvKITHaFlCbny/oI4M43uQDJJkL3KH5RWnB/auh96ax9AGnKQdoZNAyO4T" + -- "VHv4VobC+XzPntWUMgpivtwzufbgWbVpSHYh4V0DnrA6YETrCWdgvGUYIboX9KEahqlFcq0GT2HZ" + -- "jwrXBW4zJ/C8FYdqmEWUb94aZniUUbXJVbmm0N6/5zjbPnohcfKePiDlSfBJeO0r9Bx8pi7oEw/F" + -- "MPMp8S0roARHar+QYS6FXp9nv230dicVcA7LaZoxHo/ncfIbEdi6Qgxje4vFRL5aRqA/uxn6Vc9c" + -- "muK/lXqeuQXsPwZMdi0RPedxH1AFva0QwyygavDkCBjlFuy/HJWhksLQgOVyxWqh3mYx7RND2Pi8" + -- "0n1+baawmU9e2o6x/XR7raIQVb4mskGQQaO4ydNENlATeTE1kXOQc/agXDpZqhq42dQL2US9G1Wl" + -- "G5XEzaWJbyTBddzcTuSmAYTMOKybQWsmeppIbk5nqcbxJ1RHO37B10TeRL3KU543kUKF0J8leqgq" + -- "8ae8PdAd6ltPL954LXQV/m4HEbgaYqjT6KNZHWhAKd5+mzpDN4WflUdw5koweitv4lldX2QpxQSc" + -- "/UOfx9jvvTHBKP+/RmKRoHwIiYg8pgQJsszTKFYSV2qC0VcShyqnqlEKRpolqsAyFfnpKmLOnOgr" + -- "VAVirhYnYzsZLbgSe57nwtL375N8H+Oy3H2qKpAKEL5eVc65E04rD2NW66uWrUDobKnAnPs7PR5+" + -- "tLFQHjMS0knhEZLdim/8bxId+RetX/4RYACXlwEEPBQycwAAAABJRU5ErkJggg==" -- } + "iVBORw0KGgoAAAANSUhEUgAAAC8AAAAcCAYAAADxyeavAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI" + + "WXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH3AwBERgxGkWttAAABtVJREFUWMPtmGtwVdUVx397n3Pu" + + "K8m9uXlASCHQIBqeEooEDAymUEAKEaGlUoeOtbYdnSmdYjud6fjBdhytLS0zdRzbWkAGsCBtSktr" + @@ -595,11 +557,10 @@ diff -urN iceweasel-17.0.1.orig/browser/base/content/abouthome/aboutHome.js icew + "uctLJDeLcEG+cfMYjPvvxf/FuViX70QDg6gdO7Hbz2K/tg8ViyFCoVZZXl4f/ev2Izf83qZryvQ1" + + "Opn6vo7HTQBjdCWyrAxcB9V2Gu9sO0ipZTTab42rWhHetvnFz8yl08VM1NYtIZlcrNPpm73+AQtD" + + "ahkOJ3HVAWtW7a7wb596lf8f+A8mm/+hmETyjwAAAABJRU5ErkJggg==" -+ } + } }; - // The process of adding a new default snippet involves: -@@ -106,13 +49,15 @@ +@@ -78,8 +49,8 @@ // * add an entry here in the proper ordering (based on spans) // The <a/> part of the snippet will be linked to the corresponding url. const DEFAULT_SNIPPETS_URLS = [ @@ -610,33 +571,17 @@ diff -urN iceweasel-17.0.1.orig/browser/base/content/abouthome/aboutHome.js icew ]; const SNIPPETS_UPDATE_INTERVAL_MS = 86400000; // 1 Day. +@@ -141,10 +112,6 @@ + if (searchEngineInfo.image) { + let logoElt = document.getElementById("searchEngineLogo"); + logoElt.src = searchEngineInfo.image; +-#ifdef XP_MACOSX +- if (searchEngineInfo.imageHD && window.matchMedia("(min-resolution: 2dppx)")) +- logoElt.src = searchEngineInfo.imageHD; +-#endif + logoElt.alt = searchEngineName; + } --let gSearchEngine; -+// Bug with dom.storage.enabled set as false -+// We are using DDG HTML as a default in this case. -+let gSearchEngine = {"name": "DuckDuckGo HTML", "searchUrl": "https://duckduckgo.com/html/?q=_searchTerms_"}; - - document.addEventListener("DOMContentLoaded", function init() { - setupSearchEngine(); -@@ -142,13 +87,13 @@ - - function setupSearchEngine() - { -- gSearchEngine = JSON.parse(localStorage["search-engine"]); -- -- if (!gSearchEngine) -- return; -+ if (localStorage && localStorage["search-engine"]) { -+ gSearchEngine = JSON.parse(localStorage["search-engine"]); -+ } - -+ - // Look for extended information, like logo and links. -- let searchEngineInfo = SEARCH_ENGINES[gSearchEngine.name]; -+ var searchEngineInfo = SEARCH_ENGINES[gSearchEngine.name]; - if (searchEngineInfo) { - for (let prop in searchEngineInfo) - gSearchEngine[prop] = searchEngineInfo[prop]; diff -urN iceweasel-17.0.1.orig/debian/branding/locales/browserconfig.properties iceweasel-17.0.1/debian/branding/locales/browserconfig.properties --- iceweasel-17.0.1.orig/debian/branding/locales/browserconfig.properties 2012-12-01 07:21:01.000000000 -0200 +++ iceweasel-17.0.1/debian/branding/locales/browserconfig.properties 2012-12-04 16:47:47.039271071 -0200 @@ -668,25 +613,25 @@ diff -urN iceweasel-17.0.1.orig/debian/branding/locales/browserconfig.properties +# The default set of protocol handlers for ircs: +gecko.handlerService.schemes.ircs.0.name=Freenode +gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/ -diff -urN iceweasel-17.0.1.orig/debian/branding/firefox-branding.js iceweasel-17.0.1/debian/branding/firefox-branding.js ---- iceweasel-17.0.1.orig/debian/branding/firefox-branding.js 2012-12-01 07:21:01.000000000 -0200 -+++ iceweasel-17.0.1/debian/branding/firefox-branding.js 2012-12-04 16:22:08.817372515 -0200 -@@ -1,3 +1,7 @@ +diff -urN iceweasel-18.0.orig/debian/branding/firefox-branding.js iceweasel-18.0/debian/branding/firefox-branding.js +--- iceweasel-18.0.orig/debian/branding/firefox-branding.js 2013-01-08 17:55:47.000000000 -0200 ++++ iceweasel-18.0/debian/branding/firefox-branding.js 2013-01-10 01:49:05.807790675 -0200 +@@ -1,3 +1,6 @@ pref("startup.homepage_override_url",""); pref("startup.homepage_welcome_url",""); pref("app.releaseNotesURL", "http://mozilla.debian.net/%LOCALE%/%APP%/%VERSION%/releasenotes/"); + -+// Disable localstorage for privacy reasons. We will rewrite about:home js to -+// fix the bug. ++// Disable localstorage for privacy reasons. +pref("dom.storage.enabled", false); -diff -urN iceweasel-17.0.1.orig/browser/base/content/abouthome/aboutHome.css iceweasel-17.0.1/browser/base/content/abouthome/aboutHome.css ---- iceweasel-17.0.1.orig/browser/base/content/abouthome/aboutHome.css 2012-11-29 02:43:23.000000000 -0200 -+++ iceweasel-17.0.1/browser/base/content/abouthome/aboutHome.css 2012-12-04 06:31:10.410410656 -0200 -@@ -66,7 +66,7 @@ +diff -urN iceweasel-18.0.orig/browser/base/content/abouthome/aboutHome.css iceweasel-18.0/browser/base/content/abouthome/aboutHome.css +--- iceweasel-18.0.orig/browser/base/content/abouthome/aboutHome.css 2013-01-04 21:44:27.000000000 -0200 ++++ iceweasel-18.0/browser/base/content/abouthome/aboutHome.css 2013-01-10 01:35:44.497079456 -0200 +@@ -66,8 +66,7 @@ #searchEngineLogo { display: inline-block; height: 28px; - width: 70px; +- min-width: 70px; + width: 47px; } diff --git a/libre/iceweasel-libre/mozconfig b/libre/iceweasel-libre/mozconfig index e79896323..8b5e52d9e 100755..100644 --- a/libre/iceweasel-libre/mozconfig +++ b/libre/iceweasel-libre/mozconfig @@ -21,9 +21,6 @@ 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 @@ -32,9 +29,6 @@ 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 # Iceweasel diff --git a/libre/iceweasel-libre/mozconfig.pgo b/libre/iceweasel-libre/mozconfig.pgo index b0c249ebf..b0c249ebf 100755..100644 --- a/libre/iceweasel-libre/mozconfig.pgo +++ b/libre/iceweasel-libre/mozconfig.pgo diff --git a/libre/iceweasel-libre/shared-libs.patch b/libre/iceweasel-libre/shared-libs.patch index 1f22b2b0d..1f22b2b0d 100755..100644 --- a/libre/iceweasel-libre/shared-libs.patch +++ b/libre/iceweasel-libre/shared-libs.patch diff --git a/libre/iceweasel-libre/vendor.js b/libre/iceweasel-libre/vendor.js index d8d606bc1..d8d606bc1 100755..100644 --- a/libre/iceweasel-libre/vendor.js +++ b/libre/iceweasel-libre/vendor.js diff --git a/libre/iceweasel-libre/xulrunner-copy-stub.patch b/libre/iceweasel-libre/xulrunner-copy-stub.patch deleted file mode 100755 index e3b8e9376..000000000 --- a/libre/iceweasel-libre/xulrunner-copy-stub.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- iceweasel-9.0.1/browser/app/Makefile.in~ 2011-12-25 16:19:29.000000000 -0500 -+++ iceweasel-9.0.1/browser/app/Makefile.in 2011-12-25 16:19:55.000000000 -0500 -@@ -257,7 +257,7 @@ - else - ifdef LIBXUL_SDK - libs:: -- cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/firefox$(BIN_SUFFIX) -+ cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/iceweasel$(BIN_SUFFIX) - endif - endif - diff --git a/libre/initscripts/0001-remove-run-nologin-before-leaving-rc.multi.patch b/libre/initscripts/0001-remove-run-nologin-before-leaving-rc.multi.patch index a9b7a2423..a9b7a2423 100755..100644 --- a/libre/initscripts/0001-remove-run-nologin-before-leaving-rc.multi.patch +++ b/libre/initscripts/0001-remove-run-nologin-before-leaving-rc.multi.patch diff --git a/libre/initscripts/PKGBUILD b/libre/initscripts/PKGBUILD index 1f68a6356..1f68a6356 100755..100644 --- a/libre/initscripts/PKGBUILD +++ b/libre/initscripts/PKGBUILD diff --git a/libre/initscripts/initscripts.install b/libre/initscripts/initscripts.install index 557faafe4..557faafe4 100755..100644 --- a/libre/initscripts/initscripts.install +++ b/libre/initscripts/initscripts.install diff --git a/libre/initscripts/wireless.conf.d b/libre/initscripts/wireless.conf.d index 47540ef40..47540ef40 100755..100644 --- a/libre/initscripts/wireless.conf.d +++ b/libre/initscripts/wireless.conf.d diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD index 26b14ff86..91d74ba15 100755..100644 --- a/libre/kdebase-konqueror-libre/PKGBUILD +++ b/libre/kdebase-konqueror-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 172988 2012-12-08 05:56:10Z andrea $ +# $Id: PKGBUILD 174142 2013-01-02 15:56:20Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu> @@ -6,18 +6,16 @@ _pkgname='kdebase-konqueror' pkgname='kdebase-konqueror-libre' -pkgver=4.9.4 -pkgrel=2 +pkgver=4.9.5 +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.xz" - 'kde-baseapps-4.9.4-fix-bugs-311206-311246.diff' "konq-about-fsdg.diff") -sha1sums=('b68e76766331272a45b1d897adf4c1928a11e747' - '998f1db2309744dd2c054aec3462a717bc107c2e' +sha1sums=('67d1c2c83570aac1d3c026cdecd82833e8d8b568' 'd6cbb53c04179b8180f9439eca156b7ff2e76b3a') pkgdesc='KDE File Manager & Web Browser (without Google and nonfree software recommendation)' depends=('kdebase-dolphin' 'kdebase-keditbookmarks') @@ -29,12 +27,11 @@ provides=("kdebase-konqueror=$pkgver") build() { cd kde-baseapps-${pkgver} - patch -p1 -i "${srcdir}"/kde-baseapps-4.9.4-fix-bugs-311206-311246.diff # Don't recommend nonfree software or Google. patch -Np1 -i "${srcdir}/konq-about-fsdg.diff" - cd ../ + cd .. mkdir build cd build diff --git a/libre/kdebase-konqueror-libre/kdebase-konqueror.install b/libre/kdebase-konqueror-libre/kdebase-konqueror.install index 5495fb1b5..5495fb1b5 100755..100644 --- a/libre/kdebase-konqueror-libre/kdebase-konqueror.install +++ b/libre/kdebase-konqueror-libre/kdebase-konqueror.install diff --git a/libre/kdebase-konqueror-libre/konq-about-fsdg.diff b/libre/kdebase-konqueror-libre/konq-about-fsdg.diff index 93ef4016a..93ef4016a 100755..100644 --- a/libre/kdebase-konqueror-libre/konq-about-fsdg.diff +++ b/libre/kdebase-konqueror-libre/konq-about-fsdg.diff diff --git a/libre/kdebase-runtime-libre/PKGBUILD b/libre/kdebase-runtime-libre/PKGBUILD index 75c9a87da..20219e40a 100644 --- a/libre/kdebase-runtime-libre/PKGBUILD +++ b/libre/kdebase-runtime-libre/PKGBUILD @@ -5,7 +5,7 @@ _pkgname=kdebase-runtime pkgname=kdebase-runtime-libre -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc="Plugins and applications necessary for the running of KDE applications (without non-privacy search providers)" arch=('i686' 'x86_64' 'mips64el') @@ -26,7 +26,7 @@ install="${_pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.xz" 'duckduckgo_html.desktop' 'duckduckgo_lite.desktop') -sha1sums=('8988c3684c05efc676d1bfe454480f60d75fac3b' +sha1sums=('6e2abeb8cc2d40d248dfabd49da264ac375fe6b5' 'aa6f39f4b0ad3c110fd05cd6c41190afae9773dd' 'ac3bac94a2c4b1444642524bc5fb539c4c5dcc5b') diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD index bc71be0c1..e73cc2f36 100755..100644 --- a/libre/kdelibs-libre/PKGBUILD +++ b/libre/kdelibs-libre/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 172900 2012-12-06 14:03:01Z andrea $ +# $Id: PKGBUILD 174033 2013-01-02 10:59:35Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=kdelibs pkgname=kdelibs-libre -pkgver=4.9.4 -pkgrel=3 +pkgver=4.9.5 +pkgrel=1 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kdelibs' @@ -15,7 +15,7 @@ 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' - 'media-player-info' 'libxtst') + 'media-player-info' 'libxtst' 'libutempter') makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell' 'mesa') provides=("kdelibs=$pkgver") replaces=('kdelibs') @@ -23,13 +23,9 @@ conflicts=('kdelibs') install=${_pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz" 'kde-applications-menu.patch' - '0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch' - 'fix-crash-on-open-with.patch' 'khtml-fsdg.diff') -sha1sums=('b2fe70261207a96a26b5d8789379f134e3e070be' +sha1sums=('899a58c5cf2115a1a18fb1690c99b2b3815975c6' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' - 'f5d203932f67ab6d87c794e9cb78a3b1a22ef747' - '8faa5984ba37e9c6da04bc64f1fe21cd24f1cf07' 'a1502a964081ad583a00cf90c56e74bf60121830') build() { @@ -37,11 +33,6 @@ build() { # avoid file conflict with gnome-menus patch -p1 -i "${srcdir}"/kde-applications-menu.patch - - # Fixed upstream - patch -p1 -i "${srcdir}"/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch - patch -p1 -i "${srcdir}"/fix-crash-on-open-with.patch - # Don't ask the user to download a plugin, it's probably nonfree. patch -p1 -i "${srcdir}"/khtml-fsdg.diff diff --git a/libre/kdelibs-libre/fix-kmail-crash.patch b/libre/kdelibs-libre/fix-kmail-crash.patch index 27caa25f0..27caa25f0 100755..100644 --- a/libre/kdelibs-libre/fix-kmail-crash.patch +++ b/libre/kdelibs-libre/fix-kmail-crash.patch diff --git a/libre/kdelibs-libre/kde-applications-menu.patch b/libre/kdelibs-libre/kde-applications-menu.patch index 4b513298a..4b513298a 100755..100644 --- a/libre/kdelibs-libre/kde-applications-menu.patch +++ b/libre/kdelibs-libre/kde-applications-menu.patch diff --git a/libre/kdelibs-libre/kdelibs.install b/libre/kdelibs-libre/kdelibs.install index c77e68041..c77e68041 100755..100644 --- a/libre/kdelibs-libre/kdelibs.install +++ b/libre/kdelibs-libre/kdelibs.install diff --git a/libre/kdelibs-libre/khtml-fsdg.diff b/libre/kdelibs-libre/khtml-fsdg.diff index 1a531b3c8..1a531b3c8 100755..100644 --- a/libre/kdelibs-libre/khtml-fsdg.diff +++ b/libre/kdelibs-libre/khtml-fsdg.diff diff --git a/libre/kdelibs-libre/use-pythondontwritebytecode.patch b/libre/kdelibs-libre/use-pythondontwritebytecode.patch index 9b5d92042..9b5d92042 100755..100644 --- a/libre/kdelibs-libre/use-pythondontwritebytecode.patch +++ b/libre/kdelibs-libre/use-pythondontwritebytecode.patch diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD index 3ff2a4205..8fea1b1c3 100755..100644 --- a/libre/kdenetwork-kopete-libre/PKGBUILD +++ b/libre/kdenetwork-kopete-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 172278 2012-12-02 07:47:19Z andrea $ +# $Id: PKGBUILD 174113 2013-01-02 11:04:46Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> pkgbase=kdenetwork pkgname=('kdenetwork-kopete-libre') -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -17,7 +17,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr3' 'ppp' 'libktorrent' 'libmms' 'mediastreamer' 'telepathy-qt') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'use-libotr3.patch') -sha1sums=('1541bfd584fc86e29782dbfdbb94c2b183a2bd48' +sha1sums=('26a607742b83211575802781b287f6f7f1c3ebbc' '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384') build() { diff --git a/libre/kdenetwork-kopete-libre/kdenetwork-kopete.install b/libre/kdenetwork-kopete-libre/kdenetwork-kopete.install index 5495fb1b5..5495fb1b5 100755..100644 --- a/libre/kdenetwork-kopete-libre/kdenetwork-kopete.install +++ b/libre/kdenetwork-kopete-libre/kdenetwork-kopete.install diff --git a/libre/kdenetwork-kopete-libre/kdenetwork.install b/libre/kdenetwork-kopete-libre/kdenetwork.install index e70c054ec..e70c054ec 100755..100644 --- a/libre/kdenetwork-kopete-libre/kdenetwork.install +++ b/libre/kdenetwork-kopete-libre/kdenetwork.install diff --git a/libre/kdepim-libre/PKGBUILD b/libre/kdepim-libre/PKGBUILD new file mode 100644 index 000000000..af28566e8 --- /dev/null +++ b/libre/kdepim-libre/PKGBUILD @@ -0,0 +1,307 @@ +# $Id$ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> + +_pkgbase=kdepim +pkgbase=kdepim-libre +pkgname=('kdepim-akonadiconsole-libre' + 'kdepim-akregator-libre' + 'kdepim-blogilo-libre' + 'kdepim-console-libre' + 'kdepim-kaddressbook-libre' + 'kdepim-kalarm-libre' + 'kdepim-kjots-libre' + 'kdepim-kleopatra-libre' + 'kdepim-kmail-libre' + 'kdepim-knode-libre' + 'kdepim-knotes-libre' + 'kdepim-kontact-libre' + 'kdepim-korganizer-libre' + 'kdepim-kresources-libre' + 'kdepim-ktimetracker-libre' + 'kdepim-ktnef-libre' + 'kdepim-libkdepim-libre') +pkgver=4.9.5 +pkgrel=1 +arch=('i686' 'x86_64' 'mips64el') +url='http://pim.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdepim-libre') +makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'kde-agent') +source=("http://download.kde.org/stable/${pkgver}/src/${_pkgbase}-${pkgver}.tar.xz") +sha1sums=('a0d824dbb132cad8178767cfd881da2979ab399d') + +build() { + mkdir build + cd build + cmake ../${_pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DKDEPIM_BUILD_MOBILE=OFF + make +} + +package_kdepim-akonadiconsole-libre() { + pkgdesc='Akonadi Management and Debugging Console (without nonfree pilot-link support)' + depends=('kdepim-libkdepim') + url='http://pim.kde.org' + replaces=('kdepim-akonadiconsole') + conflicts=('kdepim-akonadiconsole') + provides=("kdepim-akonadiconsole=${pkgver}") + install='kdepim.install' + cd "${srcdir}"/build/akonadiconsole + make DESTDIR="${pkgdir}" install +} + +package_kdepim-akregator-libre() { + pkgdesc='A Feed Reader for KDE (without nonfree pilot-link support)' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/internet/akregator/" + replaces=('kdepim-akregator') + conflicts=('kdepim-akregator') + provides=("kdepim-akregator=${pkgver}") + install='kdepim.install' + cd "${srcdir}"/build/akregator + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/akregator + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/akregator + make DESTDIR="${pkgdir}" install +} + +package_kdepim-blogilo-libre() { + pkgdesc='A KDE Blogging Client (without nonfree pilot-link support)' + depends=('kdepim-runtime') + url="http://kde.org/applications/internet/blogilo/" + replaces=('kdepim-blogilo' 'blogilo') + conflicts=('kdepim-blogilo' 'blogilo') + provides=("kdepim-blogilo=${pkgver}") + install='kdepim.install' + cd "${srcdir}"/build/blogilo + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/blogilo + make DESTDIR="${pkgdir}" install +} + +package_kdepim-console-libre() { + pkgdesc='Command line tool for accessing calendar files (without nonfree pilot-link support)' + depends=('kdepim-runtime') + url='http://pim.kde.org' + replaces=('kdepim-console') + conflicts=('kdepim-console') + provides=("kdepim-console=${pkgver}") + install='kdepim.install' + cd "${srcdir}"/build/console + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/kabcclient + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/konsolekalendar + make DESTDIR="${pkgdir}" install +} + +package_kdepim-kaddressbook-libre() { + pkgdesc='Contact Manager (without nonfree pilot-link support)' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/office/kaddressbook/" + replaces=('kdepim-kaddressbook') + conflicts=('kdepim-kaddressbook') + provides=("kdepim-kaddressbook=${pkgver}") + install='kdepim.install' + cd "${srcdir}"/build/kaddressbook + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/kaddressbook + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/plugins/kaddressbook + make DESTDIR="${pkgdir}" install +} + +package_kdepim-kalarm-libre() { + pkgdesc='Personal Alarm Scheduler (without nonfree pilot-link support)' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/utilities/kalarm/" + replaces=('kdepim-kalarm') + conflicts=('kdepim-kalarm') + provides=("kdepim-kalarm=${pkgver}") + install='kdepim.install' + cd "${srcdir}"/build/kalarm + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/kalarm + make DESTDIR="${pkgdir}" install +} + +package_kdepim-kjots-libre() { + pkgdesc='Note Taker (without nonfree pilot-link support)' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/utilities/kjots/" + replaces=('kdepim-kjots') + conflicts=('kdepim-kjots') + provides=("kdepim-kjots=${pkgver}") + install='kdepim.install' + cd "${srcdir}"/build/kjots + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/kjots + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/kjots + make DESTDIR="${pkgdir}" install +} + +package_kdepim-kleopatra-libre() { + pkgdesc='Certificate Manager and Unified Crypto GUI (without nonfree pilot-link support)' + depends=('kdepim-libkdepim') + install='kdepim-kleopatra.install' + url="http://kde.org/applications/utilities/kleopatra/" + replaces=('kdepim-kleopatra') + conflicts=('kdepim-kleopatra') + provides=("kdepim-kleopatra=${pkgver}") + cd "${srcdir}"/build/kleopatra + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/kleopatra + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/kwatchgnupg + make DESTDIR="${pkgdir}" install +} + +package_kdepim-kmail-libre() { + pkgdesc='Mail Client (without nonfree pilot-link support)' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/internet/kmail/" + install='kdepim-kmail.install' + conflicts=('kdepim-kmail' 'kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve' + 'kdepim-mimelib' 'kdepim-plugins') + replaces=('kdepim-kmail' 'kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve' + 'kdepim-mimelib' 'kdepim-plugins') + provides=("kdepim-kmail=${pkgver}") + for i in kmail doc/kmail kmailcvt archivemailagent backupmail \ + importwizard ksendemail libksieve messagelist mailfilteragent \ + mailimporter ontologies kontact/plugins/kmail; do + cd "${srcdir}"/build/${i} + make DESTDIR="${pkgdir}" install + done +} + +package_kdepim-knode-libre() { + pkgdesc='News Reader (without nonfree pilot-link support)' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/internet/knode/" + replaces=('kdepim-knode') + conflicts=('kdepim-knode') + provides=("kdepim-knode=${pkgver}") + install='kdepim-knode.install' + cd "${srcdir}"/build/knode + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/knode + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/kioslave/news + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/knode + make DESTDIR="${pkgdir}" install +} + +package_kdepim-knotes-libre() { + pkgdesc='Popup Notes (without nonfree pilot-link support)' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/utilities/knotes/" + replaces=('kdepim-knotes') + conflicts=('kdepim-knotes') + provides=("kdepim-knotes=${pkgver}") + install='kdepim.install' + cd "${srcdir}"/build/knotes + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/knotes + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/knotes + make DESTDIR="${pkgdir}" install +} + +package_kdepim-kontact-libre() { + pkgdesc='Personal Information Manager (without nonfree pilot-link support)' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/office/kontact/" + install='kdepim.install' + conflicts=('kdepim-kontact' 'kdepim-kontactinterfaces') + replaces=('kdepim-kontact' 'kdepim-kontactinterfaces') + provides=("kdepim-kontact=${pkgver}") + for i in kontact/src doc/kontact kontact/plugins/summary \ + kontact/plugins/specialdates doc/kontact-admin; do + cd "${srcdir}"/build/${i} + make DESTDIR="${pkgdir}" install + done +} + +package_kdepim-korganizer-libre() { + pkgdesc='Calendar and Scheduling Program (without nonfree pilot-link support)' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/office/korganizer" + replaces=('kdepim-korganizer') + conflicts=('kdepim-korganizer') + provides=("kdepim-korganizer=${pkgver}") + install='kdepim-korganizer.install' + for i in korganizer doc/korganizer kontact/plugins/korganizer \ + calendarviews; do + cd "${srcdir}"/build/${i} + make DESTDIR="${pkgdir}" install + done +} + +package_kdepim-kresources-libre() { + pkgdesc='KDE PIM resources (without nonfree pilot-link support)' + depends=('kdepim-libkdepim') + url='http://pim.kde.org' + replaces=('kdepim-kresources') + conflicts=('kdepim-kresources') + provides=("kdepim-kresources=${pkgver}") + cd "${srcdir}"/build/kresources + make DESTDIR="${pkgdir}" install +} + +package_kdepim-ktimetracker-libre() { + pkgdesc='Personal Time Tracker (without nonfree pilot-link support)' + depends=('kdepim-kresources') + url="http://kde.org/applications/utilities/ktimetracker/" + replaces=('kdepim-ktimetracker') + conflicts=('kdepim-ktimetracker') + provides=("kdepim-ktimetracker=${pkgver}") + install='kdepim.install' + cd "${srcdir}"/build/ktimetracker + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/ktimetracker + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/ktimetracker + make DESTDIR="${pkgdir}" install +} + +package_kdepim-ktnef-libre() { + pkgdesc='A viewer/extractor for TNEF files (without nonfree pilot-link support)' + depends=('kdebase-runtime' 'kdepimlibs') + url="https://projects.kde.org/projects/kde/kdepim/ktnef" + replaces=('kdepim-ktnef') + conflicts=('kdepim-ktnef') + provides=("kdepim-ktnef=${pkgver}") + install=kdepim-ktnef.install + cd "${srcdir}"/build/ktnef + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/ktnef + make DESTDIR="${pkgdir}" install +} + +package_kdepim-libkdepim-libre() { + pkgdesc='Library for KDE PIM (without nonfree pilot-link support)' + groups=() + depends=('kde-agent' 'kdepim-runtime') + url='http://pim.kde.org' + conflicts=('kdepim-libkdepim' 'kdepim-icons' 'kdepim-libkleo' + 'kdepim-libkpgp' 'kdepim-strigi-analyzer' 'kdepim-akonadi') + replaces=('kdepim-libkdepim' 'kdepim-icons' 'kdepim-libkleo' + 'kdepim-libkpgp' 'kdepim-strigi-analyzer' 'kdepim-akonadi') + provides=("kdepim-libkdepim=${pkgver}") + for i in akonadi_next calendarsupport incidenceeditor-ng \ + kdgantt2 libkdepim libkdepimdbusinterfaces libkleo libkpgp \ + mailcommon messagecomposer messagecore messageviewer icons \ + strigi-analyzer templateparser plugins/messageviewer \ + plugins/ktexteditor; do + cd "${srcdir}"/build/${i} + make DESTDIR="${pkgdir}" install + done +} diff --git a/libre/kdepim-libre/kdepim-kleopatra.install b/libre/kdepim-libre/kdepim-kleopatra.install new file mode 100644 index 000000000..5787df72f --- /dev/null +++ b/libre/kdepim-libre/kdepim-kleopatra.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/libre/kdepim-libre/kdepim-kmail.install b/libre/kdepim-libre/kdepim-kmail.install new file mode 100644 index 000000000..5787df72f --- /dev/null +++ b/libre/kdepim-libre/kdepim-kmail.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/libre/kdepim-libre/kdepim-knode.install b/libre/kdepim-libre/kdepim-knode.install new file mode 100644 index 000000000..5787df72f --- /dev/null +++ b/libre/kdepim-libre/kdepim-knode.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/libre/kdepim-libre/kdepim-korganizer.install b/libre/kdepim-libre/kdepim-korganizer.install new file mode 100644 index 000000000..5787df72f --- /dev/null +++ b/libre/kdepim-libre/kdepim-korganizer.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/libre/kdepim-libre/kdepim-ktnef.install b/libre/kdepim-libre/kdepim-ktnef.install new file mode 100644 index 000000000..5787df72f --- /dev/null +++ b/libre/kdepim-libre/kdepim-ktnef.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/libre/kdepim-libre/kdepim.install b/libre/kdepim-libre/kdepim.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/libre/kdepim-libre/kdepim.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD index 20ac66607..d6a1cc01e 100755..100644 --- a/libre/kdeutils-ark-libre/PKGBUILD +++ b/libre/kdeutils-ark-libre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 172283 2012-12-02 07:47:38Z andrea $ +# $Id: PKGBUILD 174118 2013-01-02 11:05:08Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=kdeutils-ark pkgname=kdeutils-ark-libre -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc='Archiving Tool' url='http://kde.org/applications/utilities/ark/' @@ -18,11 +18,18 @@ install=${_pkgname}.install provides=("kdeutils-ark=$pkgver") replaces=('kdeutils-ark') conflicts=('kdeutils-ark') -source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.xz") -sha1sums=('074aece141ec229b5d72b39e4d31af4e5b4550cb') +source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.xz" + 'ark-unar-06.patch') +sha1sums=('71018a85d489af1e119d2454d9b4e3166f63455c' + 'a0a836950f185d9b2245204579f969203036fdec') build() { - cd "${srcdir}" + cd "${srcdir}/ark-${pkgver}" + + # This patch will allow Ark to use The Unarchiver command line utilities (unar/lsar) to operate on RAR files, particularly RARv3. + patch -Np1 -i "${srcdir}/ark-unar-06.patch" + + cd .. mkdir build cd build cmake ../ark-${pkgver} \ diff --git a/libre/kdeutils-ark-libre/ark-unar-06.patch b/libre/kdeutils-ark-libre/ark-unar-06.patch new file mode 100644 index 000000000..ab2ef274f --- /dev/null +++ b/libre/kdeutils-ark-libre/ark-unar-06.patch @@ -0,0 +1,236 @@ +diff --git a/plugins/cliunarchiverplugin/kerfuffle_cliunarchiver.desktop b/plugins/cliunarchiverplugin/kerfuffle_cliunarchiver.desktop +new file mode 100644 +index 0000000..2b5bd9e +--- /dev/null ++++ b/plugins/cliunarchiverplugin/kerfuffle_cliunarchiver.desktop +@@ -0,0 +1,15 @@ ++[Desktop Entry] ++Type=Service ++X-KDE-ServiceTypes=Kerfuffle/Plugin ++X-KDE-Library=kerfuffle_cliunarchiver ++X-KDE-PluginInfo-Author=Luke Shumaker ++X-KDE-PluginInfo-Email=lukeshu@sbcglobal.net ++X-KDE-PluginInfo-Name= kerfuffle_cliunarchiver ++X-KDE-PluginInfo-Version=0.0.1 ++X-KDE-PluginInfo-Website=http://www.kde.org ++X-KDE-PluginInfo-License=GPLv2+ ++X-KDE-Priority=150 ++X-KDE-Kerfuffle-APIRevision=1 ++X-KDE-Kerfuffle-ReadWrite=false ++Name=The Unarchiver plugin ++MimeType=application/x-rar; +diff --git a/plugins/cliunarchiverplugin/cliplugin.cpp b/plugins/cliunarchiverplugin/cliplugin.cpp +new file mode 100644 +index 0000000..e0adcf7 +--- /dev/null ++++ b/plugins/cliunarchiverplugin/cliplugin.cpp +@@ -0,0 +1,170 @@ ++ /* ++ * ark -- archiver for the KDE project ++ * ++ * Copyright (C) 2011 Luke Shumaker <lukeshu@sbcglobal.net> ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License ++ * as published by the Free Software Foundation; either version 2 ++ * of the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ * ++ */ ++ ++#include "kerfuffle/cliinterface.h" ++#include "kerfuffle/kerfuffle_export.h" ++ ++#include <KDebug> ++ ++#include <QDateTime> ++#include <QDir> ++#include <QRegExp> ++#include <QString> ++#include <QStringList> ++ ++using namespace Kerfuffle; ++ ++class CliPlugin: public CliInterface ++{ ++public: ++ explicit CliPlugin(QObject *parent, const QVariantList & args) ++ : CliInterface(parent, args) { ++ m_indentLevel = 0; ++ } ++ ++ virtual ~CliPlugin() { ++ } ++ ++ virtual ParameterList parameterList() const { ++ static ParameterList p; ++ if (p.isEmpty()) { ++ /* Limitations: ++ * 01 - creates an empty file upon entering wrong password ++ * 02 - unar detects if output is being redirected and then does not accept any input ++ */ ++ ++ ///////////////[ COMMON ]///////////// ++ ++ p[CaptureProgress] = false; ++ p[PasswordPromptPattern] = QLatin1String("Password (will not be shown): "); ++ ++ ///////////////[ LIST ]///////////// ++ ++ p[ListProgram] = QLatin1String("lsar"); ++ p[ListArgs] = QStringList() << QLatin1String("-json") << QLatin1String("$Archive"); ++ ++ ///////////////[ EXTRACT ]///////////// ++ ++ p[ExtractProgram] = QLatin1String("unar"); ++ p[ExtractArgs] = QStringList() << QLatin1String("$Archive") << QLatin1String("$Files") << QLatin1String("$PasswordSwitch") << QLatin1String("$RootNodeSwitch"); ++ p[NoTrailingSlashes] = true; ++ p[PasswordSwitch] = QStringList() << QLatin1String("-password") << QLatin1String("$Password"); ++ p[RootNodeSwitch] = QStringList() << QLatin1String("-output-directory") << QLatin1String("$Path"); ++ p[FileExistsExpression] = QLatin1String("^\\\"(.+)\\\" already exists."); ++ p[FileExistsInput] = QStringList() ++ << QLatin1String("o") //overwrite ++ << QLatin1String("s") //skip ++ << QLatin1String("O") //overwrite all ++ << QLatin1String("S") //autoskip ++ << QLatin1String("q") //cancel ++ ; ++ ++ ///////////////[ DELETE ]///////////// ++ ++ p[DeleteProgram] = QLatin1String("x-fakeprogram"); ++ //p[DeleteArgs] = ++ ++ ///////////////[ ADD ]///////////// ++ ++ p[AddProgram] = QLatin1String("x-fakeprogram"); ++ //p[AddArgs] = ++ ++ ///////////////[ ERRORS ]///////////// ++ ++ p[ExtractionFailedPatterns] = QStringList() ++ << QLatin1String("Failed! \\((.+)\\)$") ++ << QLatin1String("Segmentation fault$"); ++ ++ p[WrongPasswordPatterns] = QStringList() ++ << QLatin1String("Failed! \\((.+)\\)$"); ++ } ++ return p; ++ } ++ ++ QString m_entryFilename, m_internalId; ++ ArchiveEntry m_currentEntry; ++ int m_indentLevel; ++ ++ bool readListLine(const QString &line) { ++ /* lsar will give us JSON output. However, we actually parse based on ++ * the indentation. Ugly, I know, but ++ * 1. It's easier ++ * 2. lsar's JSON is invalid JSON, so actual parsers bork. ++ */ ++ ++ int spaces; ++ for(spaces=0;(spaces<line.size())&&(line[spaces]==QLatin1Char(' '));spaces++){} ++ // Since this is so ugly anyway, I'm not even going to check to ++ // make sure that spaces is even. I mean, what would I do about it? ++ int m_newIndentLevel = spaces/2; ++ ++ if (m_newIndentLevel>m_indentLevel) { ++ if (m_newIndentLevel==3) { ++ m_currentEntry.clear(); ++ m_currentEntry[IsDirectory] = false; ++ } ++ } else if (m_newIndentLevel<m_indentLevel) { ++ if ( (m_newIndentLevel<3) && (m_indentLevel>=3) ) { ++ EntryMetaDataType index = IsDirectory; ++ if (m_currentEntry[index].toBool()) { ++ m_currentEntry[FileName].toString().append(QLatin1String("/")); ++ } ++ kDebug() << "Added entry:" << m_currentEntry; ++ entry(m_currentEntry); ++ } ++ } ++ m_indentLevel = m_newIndentLevel; ++ ++ QRegExp rx(QLatin1String("^\\s*\"([^\"]*)\": (.*),$")); ++ if (rx.indexIn(line) >= 0) { ++ QRegExp rx_unquote(QLatin1String("^\"(.*)\"$")); ++ QString key = rx.cap(1); ++ QString value = rx.cap(2); ++ ++ if (false) { ++ } else if (key==QLatin1String("XADFileName")) { ++ rx_unquote.indexIn(value); ++ m_currentEntry[FileName] = m_currentEntry[InternalID] = rx_unquote.cap(1); ++ } else if (key==QLatin1String("XADFileSize")) { ++ m_currentEntry[Size] = value.toInt(); ++ } else if (key==QLatin1String("XADCompressedSize")) { ++ m_currentEntry[CompressedSize] = value.toInt(); ++ } else if (key==QLatin1String("XADLastModificationDate")) { ++ QDateTime ts(QDate::fromString(value, QLatin1String("\"YYYY-MM-DD hh:mm:ss"))); ++ m_currentEntry[Timestamp] = ts; ++ } else if (key==QLatin1String("XADIsDirectory")) { ++ m_currentEntry[IsDirectory] = (value==QLatin1String("1")); ++ } else if (key==QLatin1String("RARCRC32")) { ++ m_currentEntry[CRC] = value.toInt(); ++ } else if (key==QLatin1String("RARCompressionMethod")) { ++ m_currentEntry[Method] = value.toInt(); ++ } else if (key==QLatin1String("Encrypted")) { ++ m_currentEntry[IsPasswordProtected] = (value.toInt() != 0); ++ } ++ // TODO: add RAR version. ([Version]) ++ } ++ ++ return true; ++ } ++}; ++ ++KERFUFFLE_EXPORT_PLUGIN(CliPlugin) ++ +diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt +index 3619412..6368839 100644 +--- a/plugins/CMakeLists.txt ++++ b/plugins/CMakeLists.txt +@@ -20,6 +20,7 @@ if (LIBARCHIVE_FOUND) + endif (LIBARCHIVE_FOUND) + + add_subdirectory( clirarplugin ) ++add_subdirectory( cliunarchiverplugin ) + add_subdirectory( cli7zplugin ) + add_subdirectory( clizipplugin ) + add_subdirectory( libsinglefileplugin ) +diff --git a/plugins/cliunarchiverplugin/CMakeLists.txt b/plugins/cliunarchiverplugin/CMakeLists.txt +new file mode 100644 +index 0000000..ccd52e7 +--- /dev/null ++++ b/plugins/cliunarchiverplugin/CMakeLists.txt +@@ -0,0 +1,21 @@ ++ ++include_directories( ++ ${CMAKE_CURRENT_SOURCE_DIR}/../.. ++ ${CMAKE_CURRENT_BINARY_DIR}/../.. ++ ) ++ ++########### next target ############### ++ ++set(kerfuffle_cliunarchiver_SRCS cliplugin.cpp) ++ ++kde4_add_plugin(kerfuffle_cliunarchiver ${kerfuffle_cliunarchiver_SRCS}) ++ ++target_link_libraries(kerfuffle_cliunarchiver ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} kerfuffle ) ++ ++ ++ ++########### install files ############### ++ ++install(TARGETS kerfuffle_cliunarchiver DESTINATION ${PLUGIN_INSTALL_DIR} ) ++install( FILES kerfuffle_cliunarchiver.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) ++ diff --git a/libre/kdeutils-ark-libre/kdeutils-ark.install b/libre/kdeutils-ark-libre/kdeutils-ark.install index 78681144b..78681144b 100755..100644 --- a/libre/kdeutils-ark-libre/kdeutils-ark.install +++ b/libre/kdeutils-ark-libre/kdeutils-ark.install diff --git a/libre/kdeutils-ark-libre/rePKGBUILD b/libre/kdeutils-ark-libre/rePKGBUILD deleted file mode 100755 index f40b19d3f..000000000 --- a/libre/kdeutils-ark-libre/rePKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# Maintainer: Nicolás Reynolds <fauno@kiwwwi.com.ar> -source PKGBUILD -#CARCH=x86_64 -unset build package md5sums source -_repo=extra # Put the repo here -_mirror=ftp://mirrors.kernel.org/archlinux # Put mirror here -source=(PKGBUILD - "${_mirror}/${_repo}/os/${CARCH}/${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT" - # files for pkg modifications below this line - ) -options=(!strip) - -build() { - cd "${srcdir}/" - rm -vf .{INSTALL,PKGINFO} || true - # put actions for package modifications below this line - -} - -package() { - find ${srcdir} -maxdepth 1 -type l -delete - cp -a ${srcdir}/* ${pkgdir} -} - - -# vim:set ts=2 sw=2 et: diff --git a/libre/kernel26-libre-lts/PKGBUILD b/libre/kernel26-libre-lts/PKGBUILD index 7c444e8ff..7c444e8ff 100755..100644 --- a/libre/kernel26-libre-lts/PKGBUILD +++ b/libre/kernel26-libre-lts/PKGBUILD diff --git a/libre/kernel26-libre-lts/buildfix-gcc46.diff b/libre/kernel26-libre-lts/buildfix-gcc46.diff index 595f97d66..595f97d66 100755..100644 --- a/libre/kernel26-libre-lts/buildfix-gcc46.diff +++ b/libre/kernel26-libre-lts/buildfix-gcc46.diff diff --git a/libre/kernel26-libre-lts/config.i686 b/libre/kernel26-libre-lts/config.i686 index b9fc967af..b9fc967af 100755..100644 --- a/libre/kernel26-libre-lts/config.i686 +++ b/libre/kernel26-libre-lts/config.i686 diff --git a/libre/kernel26-libre-lts/config.x86_64 b/libre/kernel26-libre-lts/config.x86_64 index 751f759e6..751f759e6 100755..100644 --- a/libre/kernel26-libre-lts/config.x86_64 +++ b/libre/kernel26-libre-lts/config.x86_64 diff --git a/libre/kernel26-libre-lts/kernel26-libre-lts.install b/libre/kernel26-libre-lts/kernel26-libre-lts.install index 0e4b44fa3..0e4b44fa3 100755..100644 --- a/libre/kernel26-libre-lts/kernel26-libre-lts.install +++ b/libre/kernel26-libre-lts/kernel26-libre-lts.install diff --git a/libre/kernel26-libre-lts/kernel26-lts.preset b/libre/kernel26-libre-lts/kernel26-lts.preset index b65e064b4..b65e064b4 100755..100644 --- a/libre/kernel26-libre-lts/kernel26-lts.preset +++ b/libre/kernel26-libre-lts/kernel26-lts.preset diff --git a/libre/kernel26-libre-lts/libata-alignment.patch b/libre/kernel26-libre-lts/libata-alignment.patch index edd96f3b1..edd96f3b1 100755..100644 --- a/libre/kernel26-libre-lts/libata-alignment.patch +++ b/libre/kernel26-libre-lts/libata-alignment.patch diff --git a/libre/kernel26-libre-lts/packages/.svn/entries b/libre/kernel26-libre-lts/packages/.svn/entries index 809dc9428..809dc9428 100755..100644 --- a/libre/kernel26-libre-lts/packages/.svn/entries +++ b/libre/kernel26-libre-lts/packages/.svn/entries diff --git a/libre/kernel26-libre-manpages/PKGBUILD b/libre/kernel26-libre-manpages/PKGBUILD index 284d09de9..284d09de9 100755..100644 --- a/libre/kernel26-libre-manpages/PKGBUILD +++ b/libre/kernel26-libre-manpages/PKGBUILD diff --git a/libre/kile-libre/PKGBUILD b/libre/kile-libre/PKGBUILD index 525624001..525624001 100755..100644 --- a/libre/kile-libre/PKGBUILD +++ b/libre/kile-libre/PKGBUILD diff --git a/libre/kile-libre/kile.install b/libre/kile-libre/kile.install index 9fe93eeac..9fe93eeac 100755..100644 --- a/libre/kile-libre/kile.install +++ b/libre/kile-libre/kile.install diff --git a/libre/kile-libre/no-acroread.patch b/libre/kile-libre/no-acroread.patch index 7d305a2d0..7d305a2d0 100755..100644 --- a/libre/kile-libre/no-acroread.patch +++ b/libre/kile-libre/no-acroread.patch diff --git a/libre/lame-libre/PKGBUILD b/libre/lame-libre/PKGBUILD index 2dac12636..2dac12636 100755..100644 --- a/libre/lame-libre/PKGBUILD +++ b/libre/lame-libre/PKGBUILD diff --git a/libre/lesspipe-libre/PKGBUILD b/libre/lesspipe-libre/PKGBUILD index 48d5ebe0f..48d5ebe0f 100755..100644 --- a/libre/lesspipe-libre/PKGBUILD +++ b/libre/lesspipe-libre/PKGBUILD diff --git a/libre/lesspipe-libre/lesspipe.sh b/libre/lesspipe-libre/lesspipe.sh index 05526e46c..05526e46c 100755..100644 --- a/libre/lesspipe-libre/lesspipe.sh +++ b/libre/lesspipe-libre/lesspipe.sh diff --git a/libre/lesspipe-libre/rePKGBUILD b/libre/lesspipe-libre/rePKGBUILD index cb388a715..cb388a715 100755..100644 --- a/libre/lesspipe-libre/rePKGBUILD +++ b/libre/lesspipe-libre/rePKGBUILD diff --git a/libre/lib32-mesa-demos-libre/mesa-demos-libre.patch b/libre/lib32-mesa-demos-libre/mesa-demos-libre.patch index c5261f8e9..c5261f8e9 100755..100644 --- a/libre/lib32-mesa-demos-libre/mesa-demos-libre.patch +++ b/libre/lib32-mesa-demos-libre/mesa-demos-libre.patch diff --git a/libre/libquicktime-libre/PKGBUILD b/libre/libquicktime-libre/PKGBUILD index b800c1444..b800c1444 100755..100644 --- a/libre/libquicktime-libre/PKGBUILD +++ b/libre/libquicktime-libre/PKGBUILD diff --git a/libre/libui-sh/PKGBUILD b/libre/libui-sh/PKGBUILD index 075d8c0a6..075d8c0a6 100755..100644 --- a/libre/libui-sh/PKGBUILD +++ b/libre/libui-sh/PKGBUILD diff --git a/libre/licenses-libre/PKGBUILD b/libre/licenses-libre/PKGBUILD index 8a3d62929..8a3d62929 100755..100644 --- a/libre/licenses-libre/PKGBUILD +++ b/libre/licenses-libre/PKGBUILD diff --git a/libre/licenses-libre/ZopePublicLicense.txt b/libre/licenses-libre/ZopePublicLicense.txt index 0f06d960d..0f06d960d 100755..100644 --- a/libre/licenses-libre/ZopePublicLicense.txt +++ b/libre/licenses-libre/ZopePublicLicense.txt diff --git a/libre/licenses-libre/cc-by-3.0.txt b/libre/licenses-libre/cc-by-3.0.txt index 4c79aa8ae..4c79aa8ae 100755..100644 --- a/libre/licenses-libre/cc-by-3.0.txt +++ b/libre/licenses-libre/cc-by-3.0.txt diff --git a/libre/licenses-libre/cc-by-sa-3.0.txt b/libre/licenses-libre/cc-by-sa-3.0.txt index 7252d9ca5..7252d9ca5 100755..100644 --- a/libre/licenses-libre/cc-by-sa-3.0.txt +++ b/libre/licenses-libre/cc-by-sa-3.0.txt diff --git a/libre/licenses-libre/cc-readme.txt b/libre/licenses-libre/cc-readme.txt index d71e2254f..d71e2254f 100755..100644 --- a/libre/licenses-libre/cc-readme.txt +++ b/libre/licenses-libre/cc-readme.txt diff --git a/libre/licenses-libre/cddl-1.0.txt b/libre/licenses-libre/cddl-1.0.txt index d83893249..d83893249 100755..100644 --- a/libre/licenses-libre/cddl-1.0.txt +++ b/libre/licenses-libre/cddl-1.0.txt diff --git a/libre/licenses-libre/cpl-1.0.txt b/libre/licenses-libre/cpl-1.0.txt index c48081b33..c48081b33 100755..100644 --- a/libre/licenses-libre/cpl-1.0.txt +++ b/libre/licenses-libre/cpl-1.0.txt diff --git a/libre/licenses-libre/eclipse-1.0.txt b/libre/licenses-libre/eclipse-1.0.txt index f61d34dfe..f61d34dfe 100755..100644 --- a/libre/licenses-libre/eclipse-1.0.txt +++ b/libre/licenses-libre/eclipse-1.0.txt diff --git a/libre/licenses-libre/perlartistic.txt b/libre/licenses-libre/perlartistic.txt index aaf7c8801..aaf7c8801 100755..100644 --- a/libre/licenses-libre/perlartistic.txt +++ b/libre/licenses-libre/perlartistic.txt diff --git a/libre/licenses-libre/python-2.txt b/libre/licenses-libre/python-2.txt index 454f4ea69..454f4ea69 100755..100644 --- a/libre/licenses-libre/python-2.txt +++ b/libre/licenses-libre/python-2.txt diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD index 01ea9167c..84e095db4 100755..100644 --- a/libre/liferea-libre/PKGBUILD +++ b/libre/liferea-libre/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 170013 2012-10-31 00:54:28Z eric $ +# $Id: PKGBUILD 174301 2013-01-04 04:58:49Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Contributor (Parabola): bitlord # Contributor (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=liferea pkgname=liferea-libre -pkgver=1.8.10 -pkgrel=1.1 +pkgver=1.8.12 +pkgrel=1 pkgdesc="A desktop news aggregator for online news feeds and weblogs" arch=('i686' 'x86_64') url="http://liferea.sourceforge.net/" @@ -20,7 +20,7 @@ options=('!libtool' '!emptydirs') install=liferea.install source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.bz2 remove-non-free-suggestions.patch) -sha1sums=('1e71c56f4eb8ea7941fce53ced433491d0dd7c4d' +sha1sums=('f40c453af577e2870bc12981ef4df6418a627f78' '0d68c567c3d37932a49709c58c37c3f138fd19cb') build() { diff --git a/libre/liferea-libre/libnotify-0.7.patch b/libre/liferea-libre/libnotify-0.7.patch index 6dbbffb87..6dbbffb87 100755..100644 --- a/libre/liferea-libre/libnotify-0.7.patch +++ b/libre/liferea-libre/libnotify-0.7.patch diff --git a/libre/liferea-libre/liferea.install b/libre/liferea-libre/liferea.install index 7d812ccdb..7d812ccdb 100755..100644 --- a/libre/liferea-libre/liferea.install +++ b/libre/liferea-libre/liferea.install diff --git a/libre/liferea-libre/remove-non-free-suggestions.patch b/libre/liferea-libre/remove-non-free-suggestions.patch index 325017567..325017567 100755..100644 --- a/libre/liferea-libre/remove-non-free-suggestions.patch +++ b/libre/liferea-libre/remove-non-free-suggestions.patch diff --git a/libre/lilo/PKGBUILD b/libre/lilo/PKGBUILD index 8103a1ac1..8103a1ac1 100755..100644 --- a/libre/lilo/PKGBUILD +++ b/libre/lilo/PKGBUILD diff --git a/libre/lilo/lilo.conf b/libre/lilo/lilo.conf index dea0dbe58..dea0dbe58 100755..100644 --- a/libre/lilo/lilo.conf +++ b/libre/lilo/lilo.conf diff --git a/libre/lilo/lilo.install b/libre/lilo/lilo.install index 7375fddf8..7375fddf8 100755..100644 --- a/libre/lilo/lilo.install +++ b/libre/lilo/lilo.install diff --git a/libre/linux-libre-api-headers/PKGBUILD b/libre/linux-libre-api-headers/PKGBUILD index c420c2070..569568cb1 100755..100644 --- a/libre/linux-libre-api-headers/PKGBUILD +++ b/libre/linux-libre-api-headers/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 165111 2012-08-11 08:21:11Z allan $ +# $Id: PKGBUILD 173859 2012-12-26 01:09:36Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> # toolchain build order: linux-libre-api-headers->glibc->binutils->gcc->binutils->glibc pkgname=linux-libre-api-headers -_basekernel=3.6 -_sublevel=3 +_basekernel=3.7 +_sublevel=1 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -pkgdesc="Kernel libre headers sanitized for use in userspace" +pkgdesc="Kernel headers sanitized for use in userspace" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/libc" license=('GPL2') @@ -18,8 +18,8 @@ conflicts=('linux-api-headers') replaces=('linux-api-headers') 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}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz") -md5sums=('a2312edd0265b5b07bd4b50afae2b380' - '844bd14e9f58225274e096c31bbb8a8f') +md5sums=('06bf9601d859531e7378eb43d4ca7dd3' + '6f4bb80d3d91b69daf5ccfea836d02df') build() { cd ${srcdir}/linux-${_basekernel} diff --git a/libre/linux-libre-firmware/PKGBUILD b/libre/linux-libre-firmware/PKGBUILD index 57488f6de..ebdca122c 100644 --- a/libre/linux-libre-firmware/PKGBUILD +++ b/libre/linux-libre-firmware/PKGBUILD @@ -2,13 +2,13 @@ # Contributor: Márcio Silva <coadde@lavabit.com> pkgname=linux-libre-firmware -pkgver=3.6 -pkgrel=2 +pkgver=3.7 +pkgrel=4 pkgdesc='Free firmware files for Linux-libre' arch=('any') url='http://linux-libre.fsfla.org/' license=('GPL2') -provides=('linux-firmware=20120625' +provides=('linux-firmware' 'kernel26-firmware=2.6.34.99') conflicts=('linux-firmware' 'linux-firmware-git' @@ -36,14 +36,14 @@ replaces=('linux-firmware' 'rt2x00-rt61-fw' 'rt2x00-rt71w-fw') source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$pkgver-gnu/linux-libre-$pkgver-gnu.tar.xz") -md5sums=('a2312edd0265b5b07bd4b50afae2b380') +md5sums=('06bf9601d859531e7378eb43d4ca7dd3') package() { cd $srcdir/linux-$pkgver make INSTALL_FW_PATH=$pkgdir/usr/lib/firmware firmware_install - # move WHENCE file to linux-libre-firmware license folder + # move WHENCE file to linux-firmware license folder install -d -m755 $pkgdir/usr/share/licenses/$pkgname mv firmware/WHENCE $pkgdir/usr/share/licenses/$pkgname } diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD index 81c5088e3..335d35218 100644 --- a/libre/linux-libre-kmod-alx/PKGBUILD +++ b/libre/linux-libre-kmod-alx/PKGBUILD @@ -1,38 +1,41 @@ # Maintainer: André Silva <emulatorman@lavabit.com> -_kernver=3.6.10 -_kernrel=1 +_kernver=3.7.1 +_kernrel=2 pkgname=('linux-libre-kmod-alx') -_pkgver=2012-10-03 -pkgver=20121003 -pkgrel=7 +_pkgver=2012-12-19-u +pkgver=20121219 +pkgrel=1 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel' arch=('i686' 'x86_64') -url='http://linuxwireless.org/' +url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' license=('GPL2') depends=("linux-libre=$_kernver") makedepends=("linux-libre-headers=$_kernver") install=linux-libre-kmod-alx.install -source=(http://linuxwireless.org/download/compat-wireless-2.6/compat-wireless-$_pkgver-pc.tar.bz2) +replaces=('alx' 'alx-driver' 'dkms-alx') +provides=('alx' 'alx-driver' 'dkms-alx') +conflicts=('alx' 'alx-driver' 'dkms-alx') +source=(http://www.kernel.org/pub/linux/kernel/projects/backports/2012/12/19/compat-drivers-$_pkgver.tar.bz2) -md5sums=('7d541af2ae06eeaaadaba5b4fbcbfb13') +md5sums=('60756fde830487042a525ff17ccfe7ab') build() { # current extramodules version - _extraver=extramodules-3.6-LIBRE + _extraver=extramodules-3.7-LIBRE - cd $srcdir/compat-wireless-$_pkgver-pc + cd $srcdir/compat-drivers-$_pkgver # replacing to specific linux-libre kernel version sed -i -e "s/lib\/modules\/\$(shell uname -r)/usr\/lib\/modules\/$_kernver-$_kernrel-LIBRE/" Makefile ./scripts/driver-select alx make - cd $srcdir/compat-wireless-$_pkgver-pc/compat + cd $srcdir/compat-drivers-$_pkgver/compat gzip -9 compat.ko install -D -m 0644 compat.ko.gz $pkgdir/lib/modules/$_extraver/compat.ko.gz - cd $srcdir/compat-wireless-$_pkgver-pc/drivers/net/ethernet/atheros/alx + cd $srcdir/compat-drivers-$_pkgver/drivers/net/ethernet/atheros/alx gzip -9 alx.ko install -D -m 0644 alx.ko.gz $pkgdir/lib/modules/$_extraver/alx.ko.gz } diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD index 02e85467c..767609934 100644 --- a/libre/linux-libre-lts-kmod-alx/PKGBUILD +++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD @@ -1,38 +1,41 @@ # Maintainer: André Silva <emulatorman@lavabit.com> -_kernver=3.0.56 +_kernver=3.0.57 _kernrel=1 pkgname=('linux-libre-lts-kmod-alx') -_pkgver=2012-10-03 -pkgver=20121003 -pkgrel=8 +_pkgver=2012-12-04-1-u +pkgver=20121204 +pkgrel=1 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel' arch=('i686' 'x86_64') -url='http://linuxwireless.org/' +url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' license=('GPL2') depends=("linux-libre-lts=$_kernver") makedepends=("linux-libre-lts-headers=$_kernver") install=linux-libre-lts-kmod-alx.install -source=(http://linuxwireless.org/download/compat-wireless-2.6/compat-wireless-$_pkgver-pc.tar.bz2) +replaces=('alx' 'alx-driver' 'dkms-alx') +provides=('alx' 'alx-driver' 'dkms-alx') +conflicts=('alx' 'alx-driver' 'dkms-alx') +source=(http://www.kernel.org/pub/linux/kernel/projects/backports/2012/12/04/compat-drivers-$_pkgver.tar.bz2) -md5sums=('7d541af2ae06eeaaadaba5b4fbcbfb13') +md5sums=('bc46200e288acb862149a2af11f4b293') build() { # current extramodules version _extraver=extramodules-3.0-LIBRE-LTS - cd ${srcdir}/compat-wireless-$_pkgver-pc + cd $srcdir/compat-drivers-$_pkgver # replacing to specific linux-libre-lts kernel version sed -i -e "s/lib\/modules\/\$(shell uname -r)/usr\/lib\/modules\/$_kernver-$_kernrel-LIBRE-LTS/" Makefile ./scripts/driver-select alx make - cd $srcdir/compat-wireless-$_pkgver-pc/compat + cd $srcdir/compat-drivers-$_pkgver/compat gzip -9 compat.ko install -D -m 0644 compat.ko.gz $pkgdir/lib/modules/$_extraver/compat.ko.gz - cd $srcdir/compat-wireless-$_pkgver-pc/drivers/net/ethernet/atheros/alx + cd $srcdir/compat-drivers-$_pkgver/drivers/net/ethernet/atheros/alx gzip -9 alx.ko install -D -m 0644 alx.ko.gz $pkgdir/lib/modules/$_extraver/alx.ko.gz } diff --git a/libre/linux-libre-lts/Kbuild b/libre/linux-libre-lts/Kbuild index 8a9d7dceb..8a9d7dceb 100755..100644 --- a/libre/linux-libre-lts/Kbuild +++ b/libre/linux-libre-lts/Kbuild diff --git a/libre/linux-libre-lts/Kbuild.platforms b/libre/linux-libre-lts/Kbuild.platforms index 90a226888..90a226888 100755..100644 --- a/libre/linux-libre-lts/Kbuild.platforms +++ b/libre/linux-libre-lts/Kbuild.platforms diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 28fd3d71b..642d04d74 100755..100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -7,10 +7,10 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.0 -_sublevel=56 +_sublevel=58 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.55 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.57 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -32,9 +32,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'module-init-wait-3.0.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('5f64180fe7df4e574dac5911b78f5067' - '49061818ee1c6d38095f5614be9a0eac' - 'a5d98603d79d3ab7f979af49b2970f26' - '0ed396b368d8cdf8845f7ef2f62fc93c' + '239e8b47a9760212772c3081f9a0a804' + '34c234b48d663bd4b04b45b9789bd107' + '7ae9267fd5e8fd8993d9e2428e808afa' 'c072b17032e80debc6a8626299245d46' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' @@ -44,7 +44,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067' 'f36222e7ce20c8e4dc27376f9be60f6c' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' - '0dbe7bf91cc9461d7394cf46ac37ff68') + '21f93138b6d4410b095cc9998f89e47d') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre-lts/boot-logo.patch b/libre/linux-libre-lts/boot-logo.patch index c392928a5..c392928a5 100755..100644 --- a/libre/linux-libre-lts/boot-logo.patch +++ b/libre/linux-libre-lts/boot-logo.patch diff --git a/libre/linux-libre-lts/change-default-console-loglevel.patch b/libre/linux-libre-lts/change-default-console-loglevel.patch index 63435d84f..63435d84f 100755..100644 --- a/libre/linux-libre-lts/change-default-console-loglevel.patch +++ b/libre/linux-libre-lts/change-default-console-loglevel.patch diff --git a/libre/linux-libre-lts/config.i686 b/libre/linux-libre-lts/config.i686 index a4198fa07..bb9308500 100755..100644 --- a/libre/linux-libre-lts/config.i686 +++ b/libre/linux-libre-lts/config.i686 @@ -681,7 +681,7 @@ CONFIG_IP_MROUTE=y # CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set CONFIG_IP_PIMSM_V1=y CONFIG_IP_PIMSM_V2=y -# CONFIG_ARPD is not set +CONFIG_ARPD=y CONFIG_SYN_COOKIES=y CONFIG_INET_AH=m CONFIG_INET_ESP=m @@ -5321,7 +5321,7 @@ CONFIG_MMIOTRACE=y CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set -# CONFIG_DYNAMIC_DEBUG is not set +CONFIG_DYNAMIC_DEBUG=y # CONFIG_DMA_API_DEBUG is not set # CONFIG_ATOMIC64_SELFTEST is not set CONFIG_ASYNC_RAID6_TEST=m diff --git a/libre/linux-libre-lts/config.x86_64 b/libre/linux-libre-lts/config.x86_64 index ed86b4b62..5c1e98f9c 100755..100644 --- a/libre/linux-libre-lts/config.x86_64 +++ b/libre/linux-libre-lts/config.x86_64 @@ -649,7 +649,7 @@ CONFIG_IP_MROUTE=y # CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set CONFIG_IP_PIMSM_V1=y CONFIG_IP_PIMSM_V2=y -# CONFIG_ARPD is not set +CONFIG_ARPD=y CONFIG_SYN_COOKIES=y CONFIG_INET_AH=m CONFIG_INET_ESP=m @@ -5078,7 +5078,7 @@ CONFIG_MMIOTRACE=y CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set -# CONFIG_DYNAMIC_DEBUG is not set +CONFIG_DYNAMIC_DEBUG=y # CONFIG_DMA_API_DEBUG is not set # CONFIG_ATOMIC64_SELFTEST is not set CONFIG_ASYNC_RAID6_TEST=m diff --git a/libre/linux-libre-lts/ext4-options.patch b/libre/linux-libre-lts/ext4-options.patch index ef1b2417d..ef1b2417d 100755..100644 --- a/libre/linux-libre-lts/ext4-options.patch +++ b/libre/linux-libre-lts/ext4-options.patch diff --git a/libre/linux-libre-lts/i915-fix-ghost-tv-output.patch b/libre/linux-libre-lts/i915-fix-ghost-tv-output.patch index 3b631361a..3b631361a 100755..100644 --- a/libre/linux-libre-lts/i915-fix-ghost-tv-output.patch +++ b/libre/linux-libre-lts/i915-fix-ghost-tv-output.patch diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index a2029fd2e..7af5d70e7 100755..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.56-1-LIBRE-LTS +KERNEL_VERSION=3.0.58-1-LIBRE-LTS # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/linux-libre-lts/linux-libre-lts.preset b/libre/linux-libre-lts/linux-libre-lts.preset index 37cf35ed0..37cf35ed0 100755..100644 --- a/libre/linux-libre-lts/linux-libre-lts.preset +++ b/libre/linux-libre-lts/linux-libre-lts.preset diff --git a/libre/linux-libre-manpages/PKGBUILD b/libre/linux-libre-manpages/PKGBUILD index e6cc4238c..92f3778ca 100755..100644 --- a/libre/linux-libre-manpages/PKGBUILD +++ b/libre/linux-libre-manpages/PKGBUILD @@ -5,8 +5,8 @@ pkgname=linux-libre-manpages pkgver=3.1 -pkgrel=1.2 -pkgdesc="Kernel libre hackers manual - Section 9 manpages that comes with the linux-libre kernel" +pkgrel=1.3 +pkgdesc="Kernel hackers manual - Section 9 manpages that comes with the linux-libre kernel" arch=('any') url="http://linux-libre.fsfla.org/" license=('GPL2') diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD index 68b75c631..7e988e5dc 100755..100644 --- a/libre/linux-libre-tools/PKGBUILD +++ b/libre/linux-libre-tools/PKGBUILD @@ -8,7 +8,7 @@ _basekernel=3.7 #_sublevel=1 #pkgver=${_basekernel}.${_sublevel} pkgver=${_basekernel} -pkgrel=2 +pkgrel=3.1 license=('GPL2') arch=('i686' 'x86_64' 'mips64el') url='http://linux-libre.fsfla.org/' @@ -88,7 +88,8 @@ build() { } package_libtraceevent-libre() { - pkgdesc='Linux-libre kernel trace event library' + pkgdesc='Linux kernel trace event library' + depends=('glibc') replaces=('libtraceevent') conflicts=('libtraceevent') provides=("libtraceevent=$pkgver") @@ -99,7 +100,7 @@ package_libtraceevent-libre() { } package_perf-libre() { - pkgdesc='Linux-libre kernel performance auditing tool' + pkgdesc='Linux kernel performance auditing tool' depends=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind') replaces=('perf') conflicts=('perf') @@ -117,7 +118,7 @@ package_perf-libre() { } package_cpupower-libre() { - pkgdesc='Linux-libre kernel tool to examine and tune power saving related features of your processor' + pkgdesc='Linux kernel tool to examine and tune power saving related features of your processor' backup=('etc/conf.d/cpupower') depends=('bash' 'pciutils') replaces=('cpupower' 'cpufrequtils') diff --git a/libre/linux-libre-tools/cpupower.conf b/libre/linux-libre-tools/cpupower.conf index b5c522ea1..b5c522ea1 100755..100644 --- a/libre/linux-libre-tools/cpupower.conf +++ b/libre/linux-libre-tools/cpupower.conf diff --git a/libre/linux-libre-tools/cpupower.rc b/libre/linux-libre-tools/cpupower.rc index 88edaf791..88edaf791 100755..100644 --- a/libre/linux-libre-tools/cpupower.rc +++ b/libre/linux-libre-tools/cpupower.rc diff --git a/libre/linux-libre-tools/cpupower.service b/libre/linux-libre-tools/cpupower.service index aaeba2b08..aaeba2b08 100755..100644 --- a/libre/linux-libre-tools/cpupower.service +++ b/libre/linux-libre-tools/cpupower.service diff --git a/libre/linux-libre-tools/cpupower.systemd b/libre/linux-libre-tools/cpupower.systemd index f45b02bc8..f45b02bc8 100755..100644 --- a/libre/linux-libre-tools/cpupower.systemd +++ b/libre/linux-libre-tools/cpupower.systemd diff --git a/libre/linux-libre-tools/usbipd.conf b/libre/linux-libre-tools/usbipd.conf index 5990b857a..5990b857a 100755..100644 --- a/libre/linux-libre-tools/usbipd.conf +++ b/libre/linux-libre-tools/usbipd.conf diff --git a/libre/linux-libre-tools/usbipd.rc b/libre/linux-libre-tools/usbipd.rc index 15a1bcf00..15a1bcf00 100755..100644 --- a/libre/linux-libre-tools/usbipd.rc +++ b/libre/linux-libre-tools/usbipd.rc diff --git a/libre/linux-libre-tools/usbipd.service b/libre/linux-libre-tools/usbipd.service index ac2f5f7c1..ac2f5f7c1 100755..100644 --- a/libre/linux-libre-tools/usbipd.service +++ b/libre/linux-libre-tools/usbipd.service diff --git a/libre/linux-libre/ChangeLog b/libre/linux-libre/ChangeLog index b41198fe5..a4a67ef14 100755..100644 --- a/libre/linux-libre/ChangeLog +++ b/libre/linux-libre/ChangeLog @@ -1,3 +1,8 @@ +2012-12-19 André Silva <emulatorman@lavabit.com> + + * linux-libre-3.7.1-1 + * Replaced CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" to CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org" + 2012-06-23 André Silva <emulatorman@lavabit.com> * linux-libre-3.4.4-1 diff --git a/libre/linux-libre/Kbuild b/libre/linux-libre/Kbuild index 8a9d7dceb..8a9d7dceb 100755..100644 --- a/libre/linux-libre/Kbuild +++ b/libre/linux-libre/Kbuild diff --git a/libre/linux-libre/Kbuild.platforms b/libre/linux-libre/Kbuild.platforms index 90a226888..90a226888 100755..100644 --- a/libre/linux-libre/Kbuild.platforms +++ b/libre/linux-libre/Kbuild.platforms diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index b51d91446..5cb275f5e 100755..100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -9,11 +9,11 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name -_basekernel=3.6 -_sublevel=10 +_basekernel=3.7 +_sublevel=2 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.9 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.1 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -29,25 +29,23 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'Kbuild.platforms' 'boot-logo.patch' 'change-default-console-loglevel.patch' - 'module-symbol-waiting-3.6.patch' - 'module-init-wait-3.6.patch' - 'irq_cfg_pointer-3.6.6.patch' 'fat-3.6.x.patch' + 'fix-watchdog-3.7.patch' + 'drm-fix-track-free-areas-3.7.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") -md5sums=('a2312edd0265b5b07bd4b50afae2b380' - 'd0382e715c9ce5f28dea840fd89c6434' - 'e4a3a4677e1fac6ecf0e0fb44c41ca08' - '68fc36a4efb6ade0eca409b9444fef0c' +md5sums=('06bf9601d859531e7378eb43d4ca7dd3' + '60acd5c68e27a2b31ab8993f91ae7938' + '741f96278cbf12996166128a4657ce58' + '0665c18c1ba3abbea5cd4cde91300854' 'e49ac236dfeef709f91a3d993ea7b62c' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' '9d3c56a4b999c8bfbd4018089a62f662' - '670931649c60fcb3ef2e0119ed532bd4' - '8a71abc4224f575008f974a099b5cf6f' - '4909a0271af4e5f373136b382826717f' '88d501404f172dac6fcb248978251560' - '2f3ae0624acb4a4b12ea2c008b964bd2') + '3485d6c7ae3af35d16e09d6d9a7ed32a' + 'e365972f002482a7b25cd5360467d75f' + 'b56c33eaee920970151fffdfc7df0766') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -72,18 +70,17 @@ build() { # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch" - # fix module initialisation - # https://bugs.archlinux.org/task/32122 - patch -Np1 -i "${srcdir}/module-symbol-waiting-3.6.patch" - patch -Np1 -i "${srcdir}/module-init-wait-3.6.patch" - - # fix FS#32615 - Check for valid irq_cfg pointer in smp_irq_move_cleanup_interrupt - patch -Np1 -i "${srcdir}/irq_cfg_pointer-3.6.6.patch" - # fix cosmetic fat issue # https://bugs.archlinux.org/task/32916 patch -Np1 -i "${srcdir}/fat-3.6.x.patch" + # fix watchdog enable/disable regression + # https://bugs.archlinux.org/task/33095 + patch -Np1 -i "${srcdir}/fix-watchdog-3.7.patch" + # fix GPU hang + # https://bugs.archlinux.org/task/33160 + patch -Np1 -i "${srcdir}/drm-fix-track-free-areas-3.7.patch" + if [ "$CARCH" == "mips64el" ]; then sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \ @@ -268,7 +265,7 @@ _package-headers() { mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include" for i in acpi asm-generic config crypto drm generated linux math-emu \ - media mtd net pcmcia scsi sound trace video xen; do + media net pcmcia scsi sound trace uapi video xen; do cp -a include/${i} "${pkgdir}/usr/src/linux-${_kernver}/include/" done @@ -301,13 +298,22 @@ _package-headers() { cp arch/${KARCH}/kernel/asm-offsets.s "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/kernel/" # add headers for lirc package - mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video" - - cp drivers/media/video/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/" - - for i in bt8xx cpia2 cx25840 cx88 em28xx pwc saa7134 sn9c102; do - mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/${i}" - cp -a drivers/media/video/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/${i}" + # pci + for i in bt8xx cx88 saa7134; do + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/pci/${i}" + cp -a drivers/media/pci/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/pci/${i}" + done + # usb + for i in cpia2 em28xx pwc sn9c102; do + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/${i}" + cp -a drivers/media/usb/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/${i}" + done + # i2c + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c" + cp drivers/media/i2c/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/" + for i in cx25840; do + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/${i}" + cp -a drivers/media/i2c/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/${i}" done # add docbook makefile @@ -329,8 +335,8 @@ _package-headers() { # add dvb headers for external modules # in reference to: # http://bugs.archlinux.org/task/9912 - mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core" - cp drivers/media/dvb/dvb-core/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core/" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-core" + cp drivers/media/dvb-core/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-core/" # and... # http://bugs.archlinux.org/task/11194 mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/" @@ -339,19 +345,19 @@ _package-headers() { # add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new # in reference to: # http://bugs.archlinux.org/task/13146 - mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/" - cp drivers/media/dvb/frontends/lgdt330x.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/" - cp drivers/media/video/msp3400-driver.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends/" + cp drivers/media/dvb-frontends/lgdt330x.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends/" + cp drivers/media/i2c/msp3400-driver.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/" # add dvb headers # in reference to: # http://bugs.archlinux.org/task/20402 - mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb" - cp drivers/media/dvb/dvb-usb/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb/" - mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends" - cp drivers/media/dvb/frontends/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/" - mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners" - cp drivers/media/common/tuners/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners/" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/dvb-usb" + cp drivers/media/usb/dvb-usb/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/dvb-usb/" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends" + cp drivers/media/dvb-frontends/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends/" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/tuners" + cp drivers/media/tuners/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/tuners/" # add xfs and shmem for aufs building mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/fs/xfs" @@ -389,7 +395,7 @@ _package-headers() { } _package-docs() { - pkgdesc="Kernel libre hackers manual - HTML documentation that comes with the ${pkgbase} kernel" + pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase} kernel" provides=("kernel26${_kernelname}-docs=${pkgver}" "linux${_kernelname}-docs=${pkgver}") conflicts=("kernel26${_kernelname}-docs" "kernel26-libre${_kernelname}-docs" "linux${_kernelname}-docs") replaces=("kernel26${_kernelname}-docs" "kernel26-libre${_kernelname}-docs" "linux${_kernelname}-docs") diff --git a/libre/linux-libre/boot-logo.patch b/libre/linux-libre/boot-logo.patch index c392928a5..c392928a5 100755..100644 --- a/libre/linux-libre/boot-logo.patch +++ b/libre/linux-libre/boot-logo.patch diff --git a/libre/linux-libre/change-default-console-loglevel.patch b/libre/linux-libre/change-default-console-loglevel.patch index 63435d84f..63435d84f 100755..100644 --- a/libre/linux-libre/change-default-console-loglevel.patch +++ b/libre/linux-libre/change-default-console-loglevel.patch diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 index 6533b0402..5c6f3f62a 100755..100644 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -1,10 +1,9 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.6.3 Kernel Configuration +# Linux/i386 3.7.1-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y -# CONFIG_X86_64 is not set CONFIG_X86=y CONFIG_INSTRUCTION_DECODER=y CONFIG_OUTPUT_FORMAT="elf32-i386" @@ -20,7 +19,6 @@ CONFIG_GENERIC_BUG=y CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_GPIO=y CONFIG_ARCH_MAY_HAVE_PC_FDC=y -# CONFIG_RWSEM_GENERIC_SPINLOCK is not set CONFIG_RWSEM_XCHGADD_ALGORITHM=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_ARCH_HAS_CPU_RELAX=y @@ -71,13 +69,7 @@ CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y CONFIG_POSIX_MQUEUE=y CONFIG_POSIX_MQUEUE_SYSCTL=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_BSD_PROCESS_ACCT_V3=y CONFIG_FHANDLE=y -CONFIG_TASKSTATS=y -CONFIG_TASK_DELAY_ACCT=y -CONFIG_TASK_XACCT=y -CONFIG_TASK_IO_ACCOUNTING=y CONFIG_AUDIT=y CONFIG_AUDITSYSCALL=y CONFIG_AUDIT_WATCH=y @@ -112,6 +104,18 @@ CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y # +# CPU/Task time and stats accounting +# +CONFIG_TICK_CPU_ACCOUNTING=y +# CONFIG_IRQ_TIME_ACCOUNTING is not set +CONFIG_BSD_PROCESS_ACCT=y +CONFIG_BSD_PROCESS_ACCT_V3=y +CONFIG_TASKSTATS=y +CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_XACCT=y +CONFIG_TASK_IO_ACCOUNTING=y + +# # RCU Subsystem # CONFIG_TREE_PREEMPT_RCU=y @@ -153,6 +157,7 @@ CONFIG_IPC_NS=y CONFIG_PID_NS=y CONFIG_NET_NS=y CONFIG_SCHED_AUTOGROUP=y +CONFIG_MM_OWNER=y # CONFIG_SYSFS_DEPRECATED is not set CONFIG_RELAY=y CONFIG_BLK_DEV_INITRD=y @@ -166,8 +171,10 @@ CONFIG_RD_LZO=y CONFIG_SYSCTL=y CONFIG_ANON_INODES=y # CONFIG_EXPERT is not set +CONFIG_HAVE_UID16=y CONFIG_UID16=y # CONFIG_SYSCTL_SYSCALL is not set +CONFIG_SYSCTL_EXCEPTION_TRACE=y CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_ALL is not set CONFIG_HOTPLUG=y @@ -225,14 +232,21 @@ CONFIG_HAVE_HW_BREAKPOINT=y CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y CONFIG_HAVE_USER_RETURN_NOTIFIER=y CONFIG_HAVE_PERF_EVENTS_NMI=y +CONFIG_HAVE_PERF_REGS=y +CONFIG_HAVE_PERF_USER_STACK_DUMP=y CONFIG_HAVE_ARCH_JUMP_LABEL=y CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y CONFIG_HAVE_CMPXCHG_LOCAL=y CONFIG_HAVE_CMPXCHG_DOUBLE=y CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y +CONFIG_GENERIC_KERNEL_THREAD=y +CONFIG_GENERIC_KERNEL_EXECVE=y CONFIG_HAVE_ARCH_SECCOMP_FILTER=y CONFIG_SECCOMP_FILTER=y +CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y +CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y +CONFIG_MODULES_USE_ELF_REL=y # # GCOV-based kernel profiling @@ -248,6 +262,7 @@ CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MODVERSIONS=y # CONFIG_MODULE_SRCVERSION_ALL is not set +# CONFIG_MODULE_SIG is not set CONFIG_STOP_MACHINE=y CONFIG_BLOCK=y CONFIG_LBDAF=y @@ -292,35 +307,8 @@ CONFIG_DEFAULT_CFQ=y CONFIG_DEFAULT_IOSCHED="cfq" CONFIG_PREEMPT_NOTIFIERS=y CONFIG_PADATA=y -# CONFIG_INLINE_SPIN_TRYLOCK is not set -# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set -# CONFIG_INLINE_SPIN_LOCK is not set -# CONFIG_INLINE_SPIN_LOCK_BH is not set -# CONFIG_INLINE_SPIN_LOCK_IRQ is not set -# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set +CONFIG_ASN1=m CONFIG_UNINLINE_SPIN_UNLOCK=y -# CONFIG_INLINE_SPIN_UNLOCK_BH is not set -# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set -# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set -# CONFIG_INLINE_READ_TRYLOCK is not set -# CONFIG_INLINE_READ_LOCK is not set -# CONFIG_INLINE_READ_LOCK_BH is not set -# CONFIG_INLINE_READ_LOCK_IRQ is not set -# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set -# CONFIG_INLINE_READ_UNLOCK is not set -# CONFIG_INLINE_READ_UNLOCK_BH is not set -# CONFIG_INLINE_READ_UNLOCK_IRQ is not set -# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set -# CONFIG_INLINE_WRITE_TRYLOCK is not set -# CONFIG_INLINE_WRITE_LOCK is not set -# CONFIG_INLINE_WRITE_LOCK_BH is not set -# CONFIG_INLINE_WRITE_LOCK_IRQ is not set -# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set -# CONFIG_INLINE_WRITE_UNLOCK is not set -# CONFIG_INLINE_WRITE_UNLOCK_BH is not set -# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set -# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set -# CONFIG_MUTEX_SPIN_ON_OWNER is not set CONFIG_FREEZER=y # @@ -337,7 +325,6 @@ CONFIG_SCHED_OMIT_FRAME_POINTER=y CONFIG_PARAVIRT_GUEST=y CONFIG_PARAVIRT_TIME_ACCOUNTING=y # CONFIG_XEN_PRIVILEGED_GUEST is not set -CONFIG_KVM_CLOCK=y CONFIG_KVM_GUEST=y CONFIG_LGUEST_GUEST=y CONFIG_PARAVIRT=y @@ -395,11 +382,9 @@ CONFIG_CPU_SUP_TRANSMETA_32=y CONFIG_HPET_TIMER=y CONFIG_HPET_EMULATE_RTC=y CONFIG_DMI=y -# CONFIG_IOMMU_HELPER is not set CONFIG_NR_CPUS=8 CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y -# CONFIG_IRQ_TIME_ACCOUNTING is not set # CONFIG_PREEMPT_NONE is not set # CONFIG_PREEMPT_VOLUNTARY is not set CONFIG_PREEMPT=y @@ -429,8 +414,6 @@ CONFIG_HIGHMEM4G=y # CONFIG_HIGHMEM64G is not set CONFIG_PAGE_OFFSET=0xC0000000 CONFIG_HIGHMEM=y -# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set -# CONFIG_ARCH_DMA_ADDR_T_64BIT is not set CONFIG_ARCH_FLATMEM_ENABLE=y CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_ARCH_SELECT_MEMORY_MODEL=y @@ -477,6 +460,7 @@ CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 CONFIG_X86_PAT=y CONFIG_ARCH_USES_PG_UNCACHED=y CONFIG_ARCH_RANDOM=y +CONFIG_X86_SMAP=y CONFIG_EFI=y CONFIG_EFI_STUB=y CONFIG_SECCOMP=y @@ -546,7 +530,7 @@ CONFIG_ACPI_CONTAINER=m CONFIG_ACPI_SBS=m CONFIG_ACPI_HED=y CONFIG_ACPI_CUSTOM_METHOD=m -CONFIG_ACPI_BGRT=m +CONFIG_ACPI_BGRT=y CONFIG_ACPI_APEI=y CONFIG_ACPI_APEI_GHES=y CONFIG_ACPI_APEI_PCIEAER=y @@ -584,6 +568,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m # CONFIG_X86_PCC_CPUFREQ=m CONFIG_X86_ACPI_CPUFREQ=m +CONFIG_X86_ACPI_CPUFREQ_CPB=y CONFIG_X86_POWERNOW_K6=m CONFIG_X86_POWERNOW_K7=m CONFIG_X86_POWERNOW_K7_ACPI=y @@ -623,7 +608,6 @@ CONFIG_PCI_DIRECT=y CONFIG_PCI_MMCONFIG=y CONFIG_PCI_OLPC=y CONFIG_PCI_DOMAINS=y -# CONFIG_PCI_CNB20LE_QUIRK is not set CONFIG_PCIEPORTBUS=y CONFIG_HOTPLUG_PCI_PCIE=m CONFIG_PCIEAER=y @@ -681,7 +665,6 @@ CONFIG_TCIC=m CONFIG_PCMCIA_PROBE=y CONFIG_PCCARD_NONSTATIC=y CONFIG_HOTPLUG_PCI=m -CONFIG_HOTPLUG_PCI_FAKE=m CONFIG_HOTPLUG_PCI_COMPAQ=m # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set CONFIG_HOTPLUG_PCI_IBM=m @@ -712,6 +695,7 @@ CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y CONFIG_HAVE_AOUT=y CONFIG_BINFMT_AOUT=m CONFIG_BINFMT_MISC=y +CONFIG_COREDUMP=y CONFIG_HAVE_ATOMIC_IOMAP=y CONFIG_HAVE_TEXT_POKE_SMP=y CONFIG_NET=y @@ -720,6 +704,7 @@ CONFIG_NET=y # Networking options # CONFIG_PACKET=y +CONFIG_PACKET_DIAG=m CONFIG_UNIX=y CONFIG_UNIX_DIAG=m CONFIG_XFRM=y @@ -748,7 +733,7 @@ CONFIG_IP_MROUTE=y # CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set CONFIG_IP_PIMSM_V1=y CONFIG_IP_PIMSM_V2=y -# CONFIG_ARPD is not set +CONFIG_ARPD=y CONFIG_SYN_COOKIES=y CONFIG_NET_IPVTI=m CONFIG_INET_AH=m @@ -799,6 +784,7 @@ CONFIG_IPV6_SIT=m CONFIG_IPV6_SIT_6RD=y CONFIG_IPV6_NDISC_NODETYPE=y CONFIG_IPV6_TUNNEL=m +CONFIG_IPV6_GRE=m CONFIG_IPV6_MULTIPLE_TABLES=y CONFIG_IPV6_SUBTREES=y # CONFIG_IPV6_MROUTE is not set @@ -844,6 +830,16 @@ CONFIG_NF_CT_NETLINK=m CONFIG_NF_CT_NETLINK_TIMEOUT=m CONFIG_NF_CT_NETLINK_HELPER=m CONFIG_NETFILTER_NETLINK_QUEUE_CT=y +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_NF_NAT_PROTO_DCCP=m +CONFIG_NF_NAT_PROTO_UDPLITE=m +CONFIG_NF_NAT_PROTO_SCTP=m +CONFIG_NF_NAT_AMANDA=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +CONFIG_NF_NAT_SIP=m +CONFIG_NF_NAT_TFTP=m CONFIG_NETFILTER_TPROXY=m CONFIG_NETFILTER_XTABLES=m @@ -870,10 +866,11 @@ CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m CONFIG_NETFILTER_XT_TARGET_LED=m CONFIG_NETFILTER_XT_TARGET_LOG=m CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_NETMAP=m CONFIG_NETFILTER_XT_TARGET_NFLOG=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m -CONFIG_NETFILTER_XT_TARGET_NOTRACK=m CONFIG_NETFILTER_XT_TARGET_RATEEST=m +CONFIG_NETFILTER_XT_TARGET_REDIRECT=m CONFIG_NETFILTER_XT_TARGET_TEE=m CONFIG_NETFILTER_XT_TARGET_TPROXY=m CONFIG_NETFILTER_XT_TARGET_TRACE=m @@ -994,23 +991,14 @@ CONFIG_IP_NF_MATCH_TTL=m CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_ULOG=m -CONFIG_NF_NAT=m -CONFIG_NF_NAT_NEEDED=y +CONFIG_NF_NAT_IPV4=m CONFIG_IP_NF_TARGET_MASQUERADE=m CONFIG_IP_NF_TARGET_NETMAP=m CONFIG_IP_NF_TARGET_REDIRECT=m CONFIG_NF_NAT_SNMP_BASIC=m -CONFIG_NF_NAT_PROTO_DCCP=m CONFIG_NF_NAT_PROTO_GRE=m -CONFIG_NF_NAT_PROTO_UDPLITE=m -CONFIG_NF_NAT_PROTO_SCTP=m -CONFIG_NF_NAT_FTP=m -CONFIG_NF_NAT_IRC=m -CONFIG_NF_NAT_TFTP=m -CONFIG_NF_NAT_AMANDA=m CONFIG_NF_NAT_PPTP=m CONFIG_NF_NAT_H323=m -CONFIG_NF_NAT_SIP=m CONFIG_IP_NF_MANGLE=m CONFIG_IP_NF_TARGET_CLUSTERIP=m CONFIG_IP_NF_TARGET_ECN=m @@ -1042,6 +1030,9 @@ CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_MANGLE=m CONFIG_IP6_NF_RAW=m CONFIG_IP6_NF_SECURITY=m +CONFIG_NF_NAT_IPV6=m +CONFIG_IP6_NF_TARGET_MASQUERADE=m +CONFIG_IP6_NF_TARGET_NPT=m CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_T_FILTER=m @@ -1375,7 +1366,6 @@ CONFIG_NFC_HCI=m # # Near Field Communication (NFC) devices # -CONFIG_PN544_NFC=m CONFIG_NFC_PN533=m CONFIG_NFC_WILINK=m @@ -1403,6 +1393,11 @@ CONFIG_REGMAP_I2C=m CONFIG_REGMAP_IRQ=y CONFIG_DMA_SHARED_BUFFER=y # CONFIG_CMA is not set + +# +# Bus devices +# +CONFIG_OMAP_OCP2SCP=m CONFIG_CONNECTOR=y CONFIG_PROC_EVENTS=y CONFIG_MTD=m @@ -1505,7 +1500,6 @@ CONFIG_BCH_CONST_T=4 CONFIG_MTD_NAND_ECC=m CONFIG_MTD_NAND_ECC_SMC=y CONFIG_MTD_NAND=m -# CONFIG_MTD_NAND_VERIFY_WRITE is not set # CONFIG_MTD_NAND_ECC_BCH is not set CONFIG_MTD_SM_COMMON=m # CONFIG_MTD_NAND_MUSEUM_IDS is not set @@ -1531,7 +1525,8 @@ CONFIG_MTD_LPDDR=m CONFIG_MTD_QINFO_PROBE=m CONFIG_MTD_UBI=m CONFIG_MTD_UBI_WL_THRESHOLD=4096 -CONFIG_MTD_UBI_BEB_RESERVE=1 +CONFIG_MTD_UBI_BEB_LIMIT=20 +# CONFIG_MTD_UBI_FASTMAP is not set # CONFIG_MTD_UBI_GLUEBI is not set CONFIG_OF=y @@ -1589,7 +1584,6 @@ CONFIG_BLK_DEV_NBD=m CONFIG_BLK_DEV_NVME=m CONFIG_BLK_DEV_OSD=m CONFIG_BLK_DEV_SX8=m -# CONFIG_BLK_DEV_UB is not set CONFIG_BLK_DEV_RAM=m CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=16384 @@ -1856,6 +1850,7 @@ CONFIG_ATA_BMDMA=y # SATA SFF controllers with BMDMA # CONFIG_ATA_PIIX=m +CONFIG_SATA_HIGHBANK=m CONFIG_SATA_MV=m CONFIG_SATA_NV=m CONFIG_SATA_PROMISE=m @@ -1942,6 +1937,7 @@ CONFIG_MD_FAULTY=m CONFIG_BLK_DEV_DM=m # CONFIG_DM_DEBUG is not set CONFIG_DM_BUFIO=m +CONFIG_DM_BIO_PRISON=m CONFIG_DM_PERSISTENT_DATA=m CONFIG_DM_CRYPT=m CONFIG_DM_SNAPSHOT=m @@ -2000,9 +1996,6 @@ CONFIG_DUMMY=m CONFIG_EQUALIZER=m # CONFIG_NET_FC is not set CONFIG_MII=m -CONFIG_IEEE802154_DRIVERS=m -CONFIG_IEEE802154_FAKEHARD=m -CONFIG_IEEE802154_FAKELB=m CONFIG_IFB=m CONFIG_NET_TEAM=m CONFIG_NET_TEAM_MODE_BROADCAST=m @@ -2011,6 +2004,7 @@ CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m CONFIG_NET_TEAM_MODE_LOADBALANCE=m CONFIG_MACVLAN=m CONFIG_MACVTAP=m +CONFIG_VXLAN=m CONFIG_NETCONSOLE=m CONFIG_NETCONSOLE_DYNAMIC=y CONFIG_NETPOLL=y @@ -2240,6 +2234,7 @@ CONFIG_SFC=m CONFIG_SFC_MTD=y CONFIG_SFC_MCDI_MON=y CONFIG_SFC_SRIOV=y +CONFIG_SFC_PTP=y CONFIG_NET_VENDOR_SMSC=y CONFIG_SMC9194=m CONFIG_PCMCIA_SMC91C92=m @@ -2282,6 +2277,7 @@ CONFIG_PHYLIB=m # # MII PHY device drivers # +CONFIG_AT803X_PHY=m CONFIG_AMD_PHY=m CONFIG_MARVELL_PHY=m CONFIG_DAVICOM_PHY=m @@ -2301,6 +2297,7 @@ CONFIG_MICREL_PHY=m # CONFIG_MDIO_BITBANG is not set CONFIG_MDIO_BUS_MUX=m CONFIG_MDIO_BUS_MUX_GPIO=m +CONFIG_MDIO_BUS_MUX_MMIOREG=m CONFIG_PLIP=m CONFIG_PPP=m CONFIG_PPP_BSDCOMP=m @@ -2435,6 +2432,7 @@ CONFIG_BRCMFMAC=m CONFIG_BRCMFMAC_SDIO=y # CONFIG_BRCMFMAC_SDIO_OOB is not set CONFIG_BRCMFMAC_USB=y +# CONFIG_BRCMISCAN is not set # CONFIG_BRCMDBG is not set CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y @@ -2535,6 +2533,9 @@ CONFIG_WIMAX_I2400M=m CONFIG_WIMAX_I2400M_USB=m CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 # CONFIG_WAN is not set +CONFIG_IEEE802154_DRIVERS=m +CONFIG_IEEE802154_FAKEHARD=m +CONFIG_IEEE802154_FAKELB=m CONFIG_VMXNET3=m CONFIG_HYPERV_NET=m CONFIG_ISDN=y @@ -2933,10 +2934,10 @@ CONFIG_TRACE_SINK=m # Serial drivers # CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_PNP=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_FIX_EARLYCON_MEM=y CONFIG_SERIAL_8250_PCI=y -CONFIG_SERIAL_8250_PNP=y CONFIG_SERIAL_8250_CS=m CONFIG_SERIAL_8250_NR_UARTS=32 CONFIG_SERIAL_8250_RUNTIME_UARTS=4 @@ -2951,6 +2952,7 @@ CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_SERIAL_JSM=m CONFIG_SERIAL_OF_PLATFORM=m +CONFIG_SERIAL_SCCNXP=m # CONFIG_SERIAL_TIMBERDALE is not set CONFIG_SERIAL_ALTERA_JTAGUART=m CONFIG_SERIAL_ALTERA_UART=m @@ -2976,6 +2978,7 @@ CONFIG_HW_RANDOM_AMD=m CONFIG_HW_RANDOM_GEODE=m CONFIG_HW_RANDOM_VIA=m CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_HW_RANDOM_TPM=m CONFIG_NVRAM=m CONFIG_DTLK=m CONFIG_R3964=m @@ -2998,6 +3001,7 @@ CONFIG_HPET_MMAP=y CONFIG_HANGCHECK_TIMER=m CONFIG_TCG_TPM=m CONFIG_TCG_TIS=m +CONFIG_TCG_TIS_I2C_INFINEON=m CONFIG_TCG_NSC=m CONFIG_TCG_ATMEL=m CONFIG_TCG_INFINEON=m @@ -3070,8 +3074,8 @@ CONFIG_I2C_TINY_USB=m # Other I2C/SMBus bus drivers # CONFIG_I2C_PCA_ISA=m -# CONFIG_I2C_STUB is not set CONFIG_SCx200_ACB=m +# CONFIG_I2C_STUB is not set # CONFIG_I2C_DEBUG_CORE is not set # CONFIG_I2C_DEBUG_ALGO is not set # CONFIG_I2C_DEBUG_BUS is not set @@ -3126,6 +3130,7 @@ CONFIG_GPIO_ARIZONA=m # CONFIG_GPIO_PCA953X is not set # CONFIG_GPIO_PCF857X is not set # CONFIG_GPIO_ADP5588 is not set +# CONFIG_GPIO_ADNP is not set # # PCI GPIO expanders: @@ -3188,6 +3193,7 @@ CONFIG_SENSORS_ADM1026=m CONFIG_SENSORS_ADM1029=m CONFIG_SENSORS_ADM1031=m CONFIG_SENSORS_ADM9240=m +CONFIG_SENSORS_ADT7410=m CONFIG_SENSORS_ADT7411=m CONFIG_SENSORS_ADT7462=m CONFIG_SENSORS_ADT7470=m @@ -3237,6 +3243,7 @@ CONFIG_SENSORS_LM95245=m CONFIG_SENSORS_MAX16065=m CONFIG_SENSORS_MAX1619=m CONFIG_SENSORS_MAX1668=m +CONFIG_SENSORS_MAX197=m CONFIG_SENSORS_MAX6639=m CONFIG_SENSORS_MAX6642=m CONFIG_SENSORS_MAX6650=m @@ -3302,6 +3309,7 @@ CONFIG_SENSORS_ACPI_POWER=m CONFIG_SENSORS_ATK0110=m CONFIG_THERMAL=y CONFIG_THERMAL_HWMON=y +# CONFIG_CPU_THERMAL is not set CONFIG_WATCHDOG=y CONFIG_WATCHDOG_CORE=y # CONFIG_WATCHDOG_NOWAYOUT is not set @@ -3429,6 +3437,7 @@ CONFIG_MFD_RDC321X=m # CONFIG_MFD_JANZ_CMODIO is not set CONFIG_MFD_VX855=m CONFIG_MFD_WL1273_CORE=m +# CONFIG_MFD_SYSCON is not set # CONFIG_REGULATOR is not set CONFIG_MEDIA_SUPPORT=m @@ -3442,16 +3451,28 @@ CONFIG_MEDIA_RADIO_SUPPORT=y CONFIG_MEDIA_RC_SUPPORT=y CONFIG_MEDIA_CONTROLLER=y CONFIG_VIDEO_DEV=m -CONFIG_VIDEO_V4L2_COMMON=m CONFIG_VIDEO_V4L2_SUBDEV_API=y +CONFIG_VIDEO_V4L2=m +# CONFIG_VIDEO_ADV_DEBUG is not set +# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set +CONFIG_VIDEO_TUNER=m +CONFIG_V4L2_MEM2MEM_DEV=m +CONFIG_VIDEOBUF_GEN=m +CONFIG_VIDEOBUF_DMA_SG=m +CONFIG_VIDEOBUF_VMALLOC=m +CONFIG_VIDEOBUF_DVB=m +CONFIG_VIDEOBUF2_CORE=m +CONFIG_VIDEOBUF2_MEMOPS=m +CONFIG_VIDEOBUF2_DMA_CONTIG=m +CONFIG_VIDEOBUF2_VMALLOC=m CONFIG_DVB_CORE=m CONFIG_DVB_NET=y +CONFIG_DVB_MAX_ADAPTERS=8 +# CONFIG_DVB_DYNAMIC_MINORS is not set # # Media drivers # -CONFIG_VIDEO_SAA7146=m -CONFIG_VIDEO_SAA7146_VV=m CONFIG_RC_CORE=m CONFIG_RC_MAP=m CONFIG_RC_DECODERS=y @@ -3477,156 +3498,10 @@ CONFIG_IR_REDRAT3=m CONFIG_IR_STREAMZAP=m CONFIG_IR_WINBOND_CIR=m CONFIG_IR_IGUANA=m +CONFIG_IR_TTUSBIR=m CONFIG_RC_LOOPBACK=m CONFIG_IR_GPIO_CIR=m -CONFIG_MEDIA_ATTACH=y -CONFIG_MEDIA_TUNER=m -# CONFIG_MEDIA_TUNER_CUSTOMISE is not set -CONFIG_MEDIA_TUNER_SIMPLE=m -CONFIG_MEDIA_TUNER_TDA8290=m -CONFIG_MEDIA_TUNER_TDA827X=m -CONFIG_MEDIA_TUNER_TDA18271=m -CONFIG_MEDIA_TUNER_TDA9887=m -CONFIG_MEDIA_TUNER_TEA5761=m -CONFIG_MEDIA_TUNER_TEA5767=m -CONFIG_MEDIA_TUNER_MT20XX=m -CONFIG_MEDIA_TUNER_MT2060=m -CONFIG_MEDIA_TUNER_MT2063=m -CONFIG_MEDIA_TUNER_MT2266=m -CONFIG_MEDIA_TUNER_MT2131=m -CONFIG_MEDIA_TUNER_QT1010=m -CONFIG_MEDIA_TUNER_XC2028=m -CONFIG_MEDIA_TUNER_XC5000=m -CONFIG_MEDIA_TUNER_XC4000=m -CONFIG_MEDIA_TUNER_MXL5005S=m -CONFIG_MEDIA_TUNER_MXL5007T=m -CONFIG_MEDIA_TUNER_MC44S803=m -CONFIG_MEDIA_TUNER_MAX2165=m -CONFIG_MEDIA_TUNER_TDA18218=m -CONFIG_MEDIA_TUNER_FC0011=m -CONFIG_MEDIA_TUNER_FC0012=m -CONFIG_MEDIA_TUNER_FC0013=m -CONFIG_MEDIA_TUNER_TDA18212=m -CONFIG_MEDIA_TUNER_TUA9001=m -CONFIG_VIDEO_V4L2=m -CONFIG_VIDEOBUF_GEN=m -CONFIG_VIDEOBUF_DMA_SG=m -CONFIG_VIDEOBUF_VMALLOC=m -CONFIG_VIDEOBUF_DVB=m -CONFIG_VIDEO_BTCX=m -CONFIG_VIDEO_TVEEPROM=m -CONFIG_VIDEO_TUNER=m -CONFIG_V4L2_MEM2MEM_DEV=m -CONFIG_VIDEOBUF2_CORE=m -CONFIG_VIDEOBUF2_MEMOPS=m -CONFIG_VIDEOBUF2_DMA_CONTIG=m -CONFIG_VIDEOBUF2_VMALLOC=m -CONFIG_VIDEO_CAPTURE_DRIVERS=y -# CONFIG_VIDEO_ADV_DEBUG is not set -# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set -# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set -CONFIG_VIDEO_IR_I2C=m - -# -# Encoders, decoders, sensors and other helper chips -# - -# -# Audio decoders, processors and mixers -# -CONFIG_VIDEO_TVAUDIO=m -CONFIG_VIDEO_TDA7432=m -CONFIG_VIDEO_TDA9840=m -CONFIG_VIDEO_TEA6415C=m -CONFIG_VIDEO_TEA6420=m -CONFIG_VIDEO_MSP3400=m -CONFIG_VIDEO_CS5345=m -CONFIG_VIDEO_CS53L32A=m -CONFIG_VIDEO_TLV320AIC23B=m -CONFIG_VIDEO_WM8775=m -CONFIG_VIDEO_WM8739=m -CONFIG_VIDEO_VP27SMPX=m - -# -# RDS decoders -# -CONFIG_VIDEO_SAA6588=m - -# -# Video decoders -# -CONFIG_VIDEO_ADV7180=m -CONFIG_VIDEO_ADV7183=m -CONFIG_VIDEO_BT819=m -CONFIG_VIDEO_BT856=m -CONFIG_VIDEO_BT866=m -CONFIG_VIDEO_KS0127=m -CONFIG_VIDEO_SAA7110=m -CONFIG_VIDEO_SAA711X=m -CONFIG_VIDEO_SAA7191=m -CONFIG_VIDEO_TVP514X=m -CONFIG_VIDEO_TVP5150=m -CONFIG_VIDEO_TVP7002=m -CONFIG_VIDEO_VPX3220=m - -# -# Video and audio decoders -# -CONFIG_VIDEO_SAA717X=m -CONFIG_VIDEO_CX25840=m - -# -# MPEG video encoders -# -CONFIG_VIDEO_CX2341X=m - -# -# Video encoders -# -CONFIG_VIDEO_SAA7127=m -CONFIG_VIDEO_SAA7185=m -CONFIG_VIDEO_ADV7170=m -CONFIG_VIDEO_ADV7175=m -CONFIG_VIDEO_ADV7343=m -CONFIG_VIDEO_ADV7393=m -CONFIG_VIDEO_AK881X=m - -# -# Camera sensor devices -# -CONFIG_VIDEO_APTINA_PLL=m -CONFIG_VIDEO_OV7670=m -CONFIG_VIDEO_VS6624=m -CONFIG_VIDEO_MT9M032=m -CONFIG_VIDEO_MT9P031=m -CONFIG_VIDEO_MT9T001=m -CONFIG_VIDEO_MT9V011=m -CONFIG_VIDEO_MT9V032=m -CONFIG_VIDEO_TCM825X=m -CONFIG_VIDEO_SR030PC30=m -CONFIG_VIDEO_NOON010PC30=m -CONFIG_VIDEO_M5MOLS=m -CONFIG_VIDEO_S5K6AA=m - -# -# Flash devices -# -CONFIG_VIDEO_ADP1653=m -CONFIG_VIDEO_AS3645A=m - -# -# Video improvement chips -# -CONFIG_VIDEO_UPD64031A=m -CONFIG_VIDEO_UPD64083=m - -# -# Miscelaneous helper chips -# -CONFIG_VIDEO_THS7303=m -CONFIG_VIDEO_M52790=m -CONFIG_VIDEO_VIVI=m -CONFIG_V4L_USB_DRIVERS=y +CONFIG_MEDIA_USB_SUPPORT=y # # Webcam devices @@ -3690,15 +3565,7 @@ CONFIG_USB_S2255=m CONFIG_USB_SN9C102=m # -# Webcam and/or TV USB devices -# -CONFIG_VIDEO_EM28XX=m -CONFIG_VIDEO_EM28XX_ALSA=m -CONFIG_VIDEO_EM28XX_DVB=m -CONFIG_VIDEO_EM28XX_RC=m - -# -# TV USB devices +# Analog TV USB devices # CONFIG_VIDEO_AU0828=m CONFIG_VIDEO_PVRUSB2=m @@ -3707,6 +3574,13 @@ CONFIG_VIDEO_PVRUSB2_DVB=y # CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set CONFIG_VIDEO_HDPVR=m CONFIG_VIDEO_TLG2300=m +CONFIG_VIDEO_USBVISION=m +CONFIG_VIDEO_STK1160=m +CONFIG_VIDEO_STK1160_AC97=y + +# +# Analog/digital TV USB devices +# CONFIG_VIDEO_CX231XX=m CONFIG_VIDEO_CX231XX_RC=y CONFIG_VIDEO_CX231XX_ALSA=m @@ -3714,10 +3588,92 @@ CONFIG_VIDEO_CX231XX_DVB=m CONFIG_VIDEO_TM6000=m CONFIG_VIDEO_TM6000_ALSA=m CONFIG_VIDEO_TM6000_DVB=m -CONFIG_VIDEO_USBVISION=m -CONFIG_V4L_PCI_DRIVERS=y -CONFIG_VIDEO_BT848=m -CONFIG_VIDEO_BT848_DVB=y + +# +# Digital TV USB devices +# +CONFIG_DVB_USB=m +# CONFIG_DVB_USB_DEBUG is not set +CONFIG_DVB_USB_A800=m +CONFIG_DVB_USB_DIBUSB_MB=m +CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y +CONFIG_DVB_USB_DIBUSB_MC=m +CONFIG_DVB_USB_DIB0700=m +CONFIG_DVB_USB_UMT_010=m +CONFIG_DVB_USB_CXUSB=m +CONFIG_DVB_USB_M920X=m +CONFIG_DVB_USB_DIGITV=m +CONFIG_DVB_USB_VP7045=m +CONFIG_DVB_USB_VP702X=m +CONFIG_DVB_USB_GP8PSK=m +CONFIG_DVB_USB_NOVA_T_USB2=m +CONFIG_DVB_USB_TTUSB2=m +CONFIG_DVB_USB_DTT200U=m +CONFIG_DVB_USB_OPERA1=m +CONFIG_DVB_USB_AF9005=m +CONFIG_DVB_USB_AF9005_REMOTE=m +CONFIG_DVB_USB_PCTV452E=m +CONFIG_DVB_USB_DW2102=m +CONFIG_DVB_USB_CINERGY_T2=m +CONFIG_DVB_USB_DTV5100=m +CONFIG_DVB_USB_FRIIO=m +CONFIG_DVB_USB_AZ6027=m +CONFIG_DVB_USB_TECHNISAT_USB2=m +CONFIG_DVB_USB_V2=m +CONFIG_DVB_USB_CYPRESS_FIRMWARE=m +CONFIG_DVB_USB_AF9015=m +CONFIG_DVB_USB_AF9035=m +CONFIG_DVB_USB_ANYSEE=m +CONFIG_DVB_USB_AU6610=m +CONFIG_DVB_USB_AZ6007=m +CONFIG_DVB_USB_CE6230=m +CONFIG_DVB_USB_EC168=m +CONFIG_DVB_USB_GL861=m +CONFIG_DVB_USB_IT913X=m +CONFIG_DVB_USB_LME2510=m +CONFIG_DVB_USB_MXL111SF=m +CONFIG_DVB_USB_RTL28XXU=m +CONFIG_DVB_TTUSB_BUDGET=m +CONFIG_DVB_TTUSB_DEC=m +CONFIG_SMS_USB_DRV=m +CONFIG_DVB_B2C2_FLEXCOP_USB=m +# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set + +# +# Webcam, TV (analog/digital) USB devices +# +CONFIG_VIDEO_EM28XX=m +CONFIG_VIDEO_EM28XX_ALSA=m +CONFIG_VIDEO_EM28XX_DVB=m +CONFIG_VIDEO_EM28XX_RC=m +CONFIG_MEDIA_PCI_SUPPORT=y + +# +# Media capture support +# +CONFIG_VIDEO_MEYE=m + +# +# Media capture/analog TV support +# +CONFIG_VIDEO_IVTV=m +CONFIG_VIDEO_IVTV_ALSA=m +CONFIG_VIDEO_FB_IVTV=m +CONFIG_VIDEO_ZORAN=m +CONFIG_VIDEO_ZORAN_DC30=m +CONFIG_VIDEO_ZORAN_ZR36060=m +CONFIG_VIDEO_ZORAN_BUZ=m +CONFIG_VIDEO_ZORAN_DC10=m +CONFIG_VIDEO_ZORAN_LML33=m +CONFIG_VIDEO_ZORAN_LML33R10=m +CONFIG_VIDEO_ZORAN_AVS6EYES=m +CONFIG_VIDEO_HEXIUM_GEMINI=m +CONFIG_VIDEO_HEXIUM_ORION=m +CONFIG_VIDEO_MXB=m + +# +# Media capture/analog/hybrid TV support +# CONFIG_VIDEO_CX18=m CONFIG_VIDEO_CX18_ALSA=m CONFIG_VIDEO_CX23885=m @@ -3730,29 +3686,49 @@ CONFIG_VIDEO_CX88_BLACKBIRD=m CONFIG_VIDEO_CX88_DVB=m CONFIG_VIDEO_CX88_VP3054=m CONFIG_VIDEO_CX88_MPEG=m -CONFIG_VIDEO_HEXIUM_GEMINI=m -CONFIG_VIDEO_HEXIUM_ORION=m -CONFIG_VIDEO_IVTV=m -CONFIG_VIDEO_FB_IVTV=m -CONFIG_VIDEO_MEYE=m -CONFIG_VIDEO_MXB=m +CONFIG_VIDEO_BT848=m +CONFIG_DVB_BT8XX=m CONFIG_VIDEO_SAA7134=m CONFIG_VIDEO_SAA7134_ALSA=m CONFIG_VIDEO_SAA7134_RC=y CONFIG_VIDEO_SAA7134_DVB=m CONFIG_VIDEO_SAA7164=m -CONFIG_VIDEO_ZORAN=m -CONFIG_VIDEO_ZORAN_DC30=m -CONFIG_VIDEO_ZORAN_ZR36060=m -CONFIG_VIDEO_ZORAN_BUZ=m -CONFIG_VIDEO_ZORAN_DC10=m -CONFIG_VIDEO_ZORAN_LML33=m -CONFIG_VIDEO_ZORAN_LML33R10=m -CONFIG_VIDEO_ZORAN_AVS6EYES=m -# CONFIG_V4L_ISA_PARPORT_DRIVERS is not set + +# +# Media digital TV PCI Adapters +# +CONFIG_TTPCI_EEPROM=m +CONFIG_DVB_AV7110=m +CONFIG_DVB_AV7110_OSD=y +CONFIG_DVB_BUDGET_CORE=m +CONFIG_DVB_BUDGET=m +CONFIG_DVB_BUDGET_CI=m +CONFIG_DVB_BUDGET_AV=m +CONFIG_DVB_BUDGET_PATCH=m +CONFIG_DVB_B2C2_FLEXCOP_PCI=m +# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set +CONFIG_DVB_PLUTO2=m +CONFIG_DVB_DM1105=m +CONFIG_DVB_PT1=m +CONFIG_MANTIS_CORE=m +CONFIG_DVB_MANTIS=m +CONFIG_DVB_HOPPER=m +CONFIG_DVB_NGENE=m +CONFIG_DVB_DDBRIDGE=m # CONFIG_V4L_PLATFORM_DRIVERS is not set CONFIG_V4L_MEM2MEM_DRIVERS=y -CONFIG_VIDEO_MEM2MEM_TESTDEV=m +CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m +# CONFIG_V4L_TEST_DRIVERS is not set + +# +# Supported MMC/SDIO adapters +# +CONFIG_SMS_SDIO_DRV=m +CONFIG_MEDIA_PARPORT_SUPPORT=y +CONFIG_VIDEO_BWQCAM=m +CONFIG_VIDEO_CQCAM=m +CONFIG_VIDEO_PMS=m +CONFIG_VIDEO_W9966=m CONFIG_RADIO_ADAPTERS=y CONFIG_RADIO_SI470X=y CONFIG_USB_SI470X=m @@ -3775,128 +3751,129 @@ CONFIG_RADIO_WL1273=m # CONFIG_RADIO_WL128X=m # CONFIG_V4L_RADIO_ISA_DRIVERS is not set -CONFIG_DVB_MAX_ADAPTERS=8 -# CONFIG_DVB_DYNAMIC_MINORS is not set -CONFIG_DVB_CAPTURE_DRIVERS=y # -# Supported SAA7146 based PCI Adapters +# Supported FireWire (IEEE 1394) Adapters # -CONFIG_TTPCI_EEPROM=m -CONFIG_DVB_AV7110=m -CONFIG_DVB_AV7110_OSD=y -CONFIG_DVB_BUDGET_CORE=m -CONFIG_DVB_BUDGET=m -CONFIG_DVB_BUDGET_CI=m -CONFIG_DVB_BUDGET_AV=m -CONFIG_DVB_BUDGET_PATCH=m +CONFIG_DVB_FIREDTV=m +CONFIG_DVB_FIREDTV_INPUT=y +CONFIG_DVB_B2C2_FLEXCOP=m +CONFIG_VIDEO_SAA7146=m +CONFIG_VIDEO_SAA7146_VV=m +CONFIG_SMS_SIANO_MDTV=m +CONFIG_MEDIA_SUBDRV_AUTOSELECT=y # -# Supported USB Adapters +# Media ancillary drivers (tuners, sensors, i2c, frontends) # -CONFIG_DVB_USB=m -# CONFIG_DVB_USB_DEBUG is not set -CONFIG_DVB_USB_A800=m -CONFIG_DVB_USB_DIBUSB_MB=m -CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y -CONFIG_DVB_USB_DIBUSB_MC=m -CONFIG_DVB_USB_DIB0700=m -CONFIG_DVB_USB_UMT_010=m -CONFIG_DVB_USB_CXUSB=m -CONFIG_DVB_USB_M920X=m -CONFIG_DVB_USB_GL861=m -CONFIG_DVB_USB_AU6610=m -CONFIG_DVB_USB_DIGITV=m -CONFIG_DVB_USB_VP7045=m -CONFIG_DVB_USB_VP702X=m -CONFIG_DVB_USB_GP8PSK=m -CONFIG_DVB_USB_NOVA_T_USB2=m -CONFIG_DVB_USB_TTUSB2=m -CONFIG_DVB_USB_DTT200U=m -CONFIG_DVB_USB_OPERA1=m -CONFIG_DVB_USB_AF9005=m -CONFIG_DVB_USB_AF9005_REMOTE=m -CONFIG_DVB_USB_PCTV452E=m -CONFIG_DVB_USB_DW2102=m -CONFIG_DVB_USB_CINERGY_T2=m -CONFIG_DVB_USB_ANYSEE=m -CONFIG_DVB_USB_DTV5100=m -CONFIG_DVB_USB_AF9015=m -CONFIG_DVB_USB_CE6230=m -CONFIG_DVB_USB_FRIIO=m -CONFIG_DVB_USB_EC168=m -CONFIG_DVB_USB_AZ6007=m -CONFIG_DVB_USB_AZ6027=m -CONFIG_DVB_USB_LME2510=m -CONFIG_DVB_USB_TECHNISAT_USB2=m -CONFIG_DVB_USB_IT913X=m -CONFIG_DVB_USB_MXL111SF=m -CONFIG_DVB_USB_RTL28XXU=m -CONFIG_DVB_USB_AF9035=m -CONFIG_DVB_TTUSB_BUDGET=m -CONFIG_DVB_TTUSB_DEC=m -CONFIG_SMS_SIANO_MDTV=m +CONFIG_VIDEO_BTCX=m +CONFIG_VIDEO_TVEEPROM=m +CONFIG_VIDEO_IR_I2C=m # -# Siano module components +# Audio decoders, processors and mixers # -CONFIG_SMS_USB_DRV=m -CONFIG_SMS_SDIO_DRV=m +CONFIG_VIDEO_TVAUDIO=m +CONFIG_VIDEO_TDA7432=m +CONFIG_VIDEO_TDA9840=m +CONFIG_VIDEO_TEA6415C=m +CONFIG_VIDEO_TEA6420=m +CONFIG_VIDEO_MSP3400=m +CONFIG_VIDEO_CS5345=m +CONFIG_VIDEO_CS53L32A=m +CONFIG_VIDEO_WM8775=m +CONFIG_VIDEO_WM8739=m +CONFIG_VIDEO_VP27SMPX=m # -# Supported FlexCopII (B2C2) Adapters +# RDS decoders # -CONFIG_DVB_B2C2_FLEXCOP=m -CONFIG_DVB_B2C2_FLEXCOP_PCI=m -CONFIG_DVB_B2C2_FLEXCOP_USB=m -# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set +CONFIG_VIDEO_SAA6588=m # -# Supported BT878 Adapters +# Video decoders # -CONFIG_DVB_BT8XX=m +CONFIG_VIDEO_BT819=m +CONFIG_VIDEO_BT856=m +CONFIG_VIDEO_BT866=m +CONFIG_VIDEO_KS0127=m +CONFIG_VIDEO_SAA7110=m +CONFIG_VIDEO_SAA711X=m +CONFIG_VIDEO_TVP5150=m +CONFIG_VIDEO_VPX3220=m # -# Supported Pluto2 Adapters +# Video and audio decoders # -CONFIG_DVB_PLUTO2=m +CONFIG_VIDEO_SAA717X=m +CONFIG_VIDEO_CX25840=m # -# Supported SDMC DM1105 Adapters +# MPEG video encoders # -CONFIG_DVB_DM1105=m +CONFIG_VIDEO_CX2341X=m # -# Supported FireWire (IEEE 1394) Adapters +# Video encoders # -CONFIG_DVB_FIREDTV=m -CONFIG_DVB_FIREDTV_INPUT=y +CONFIG_VIDEO_SAA7127=m +CONFIG_VIDEO_SAA7185=m +CONFIG_VIDEO_ADV7170=m +CONFIG_VIDEO_ADV7175=m # -# Supported Earthsoft PT1 Adapters +# Camera sensor devices # -CONFIG_DVB_PT1=m +CONFIG_VIDEO_MT9V011=m # -# Supported Mantis Adapters +# Flash devices # -CONFIG_MANTIS_CORE=m -CONFIG_DVB_MANTIS=m -CONFIG_DVB_HOPPER=m # -# Supported nGene Adapters +# Video improvement chips # -CONFIG_DVB_NGENE=m +CONFIG_VIDEO_UPD64031A=m +CONFIG_VIDEO_UPD64083=m # -# Supported ddbridge ('Octopus') Adapters +# Miscelaneous helper chips # -CONFIG_DVB_DDBRIDGE=m +CONFIG_VIDEO_M52790=m # -# Supported DVB Frontends +# Sensors used on soc_camera driver # +CONFIG_MEDIA_ATTACH=y +CONFIG_MEDIA_TUNER=m +CONFIG_MEDIA_TUNER_SIMPLE=m +CONFIG_MEDIA_TUNER_TDA8290=m +CONFIG_MEDIA_TUNER_TDA827X=m +CONFIG_MEDIA_TUNER_TDA18271=m +CONFIG_MEDIA_TUNER_TDA9887=m +CONFIG_MEDIA_TUNER_TEA5761=m +CONFIG_MEDIA_TUNER_TEA5767=m +CONFIG_MEDIA_TUNER_MT20XX=m +CONFIG_MEDIA_TUNER_MT2060=m +CONFIG_MEDIA_TUNER_MT2063=m +CONFIG_MEDIA_TUNER_MT2266=m +CONFIG_MEDIA_TUNER_MT2131=m +CONFIG_MEDIA_TUNER_QT1010=m +CONFIG_MEDIA_TUNER_XC2028=m +CONFIG_MEDIA_TUNER_XC5000=m +CONFIG_MEDIA_TUNER_XC4000=m +CONFIG_MEDIA_TUNER_MXL5005S=m +CONFIG_MEDIA_TUNER_MXL5007T=m +CONFIG_MEDIA_TUNER_MC44S803=m +CONFIG_MEDIA_TUNER_MAX2165=m +CONFIG_MEDIA_TUNER_TDA18218=m +CONFIG_MEDIA_TUNER_FC0011=m +CONFIG_MEDIA_TUNER_FC0012=m +CONFIG_MEDIA_TUNER_FC0013=m +CONFIG_MEDIA_TUNER_TDA18212=m +CONFIG_MEDIA_TUNER_E4000=m +CONFIG_MEDIA_TUNER_FC2580=m +CONFIG_MEDIA_TUNER_TUA9001=m # # Multistandard (satellite) frontends @@ -4052,8 +4029,9 @@ CONFIG_DRM_R128=m CONFIG_DRM_RADEON=m CONFIG_DRM_RADEON_KMS=y CONFIG_DRM_NOUVEAU=m +CONFIG_NOUVEAU_DEBUG=5 +CONFIG_NOUVEAU_DEBUG_DEFAULT=3 CONFIG_DRM_NOUVEAU_BACKLIGHT=y -CONFIG_DRM_NOUVEAU_DEBUG=y # # I2C encoder or helper chips @@ -4158,14 +4136,16 @@ CONFIG_LCD_PLATFORM=m CONFIG_BACKLIGHT_CLASS_DEVICE=y # CONFIG_BACKLIGHT_GENERIC is not set CONFIG_BACKLIGHT_LM3533=m -CONFIG_BACKLIGHT_PROGEAR=m CONFIG_BACKLIGHT_APPLE=m # CONFIG_BACKLIGHT_SAHARA is not set # CONFIG_BACKLIGHT_ADP8860 is not set # CONFIG_BACKLIGHT_ADP8870 is not set CONFIG_BACKLIGHT_PCF50633=m +# CONFIG_BACKLIGHT_LM3630 is not set +# CONFIG_BACKLIGHT_LM3639 is not set # CONFIG_BACKLIGHT_LP855X is not set # CONFIG_BACKLIGHT_OT200 is not set +# CONFIG_BACKLIGHT_TPS65217 is not set # # Console display driver support @@ -4250,6 +4230,7 @@ CONFIG_SND_ALS100=m CONFIG_SND_AZT1605=m CONFIG_SND_AZT2316=m CONFIG_SND_AZT2320=m +CONFIG_SND_CMI8328=m CONFIG_SND_CMI8330=m CONFIG_SND_CS4231=m CONFIG_SND_CS4236=m @@ -4345,7 +4326,6 @@ CONFIG_SND_HDA_CODEC_CA0132=y CONFIG_SND_HDA_CODEC_CMEDIA=y CONFIG_SND_HDA_CODEC_SI3054=y CONFIG_SND_HDA_GENERIC=y -CONFIG_SND_HDA_POWER_SAVE=y CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 CONFIG_SND_HDSP=m CONFIG_SND_HDSPM=m @@ -4449,7 +4429,9 @@ CONFIG_HID_PICOLCD_FB=y CONFIG_HID_PICOLCD_BACKLIGHT=y CONFIG_HID_PICOLCD_LCD=y CONFIG_HID_PICOLCD_LEDS=y +CONFIG_HID_PICOLCD_CIR=y CONFIG_HID_PRIMAX=m +CONFIG_HID_PS3REMOTE=m CONFIG_HID_ROCCAT=m CONFIG_HID_SAITEK=m CONFIG_HID_SAMSUNG=m @@ -4471,6 +4453,7 @@ CONFIG_HID_WIIMOTE_EXT=y CONFIG_HID_ZEROPLUS=m CONFIG_ZEROPLUS_FF=y CONFIG_HID_ZYDACRON=m +CONFIG_HID_SENSOR_HUB=m # # USB HID support @@ -4571,8 +4554,6 @@ CONFIG_USB_STORAGE_ONETOUCH=m CONFIG_USB_STORAGE_KARMA=m CONFIG_USB_STORAGE_CYPRESS_ATACB=m CONFIG_USB_STORAGE_ENE_UB6250=m -CONFIG_USB_UAS=m -# CONFIG_USB_LIBUSUAL is not set # # USB Imaging devices @@ -4585,7 +4566,6 @@ CONFIG_USB_MICROTEK=m # CONFIG_USB_USS720=m CONFIG_USB_SERIAL=m -CONFIG_USB_EZUSB=y CONFIG_USB_SERIAL_GENERIC=y CONFIG_USB_SERIAL_AIRCABLE=m CONFIG_USB_SERIAL_ARK3116=m @@ -4650,6 +4630,7 @@ CONFIG_USB_SERIAL_OMNINET=m CONFIG_USB_SERIAL_OPTICON=m CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m CONFIG_USB_SERIAL_ZIO=m +CONFIG_USB_SERIAL_ZTE=m CONFIG_USB_SERIAL_SSU100=m CONFIG_USB_SERIAL_QT2=m # CONFIG_USB_SERIAL_DEBUG is not set @@ -4678,10 +4659,12 @@ CONFIG_USB_IOWARRIOR=m CONFIG_USB_TEST=m CONFIG_USB_ISIGHTFW=m CONFIG_USB_YUREX=m +CONFIG_USB_EZUSB_FX2=m # # USB Physical Layer drivers # +CONFIG_OMAP_USB2=m CONFIG_USB_ISP1301=m CONFIG_USB_ATM=m CONFIG_USB_SPEEDTOUCH=m @@ -4711,8 +4694,7 @@ CONFIG_USB_NET2280=m CONFIG_USB_GOKU=m CONFIG_USB_EG20T=m CONFIG_USB_DUMMY_HCD=m -CONFIG_USB_GADGET_DUALSPEED=y -CONFIG_USB_GADGET_SUPERSPEED=y +CONFIG_USB_LIBCOMPOSITE=m # CONFIG_USB_ZERO is not set CONFIG_USB_AUDIO=m # CONFIG_GADGET_UAC1 is not set @@ -4803,6 +4785,7 @@ CONFIG_LEDS_CLASS=y # CONFIG_LEDS_LM3530=m CONFIG_LEDS_LM3533=m +CONFIG_LEDS_LM3642=m CONFIG_LEDS_PCA9532=m # CONFIG_LEDS_PCA9532_GPIO is not set # CONFIG_LEDS_GPIO is not set @@ -4818,7 +4801,7 @@ CONFIG_LEDS_LT3593=m CONFIG_LEDS_DELL_NETBOOKS=m CONFIG_LEDS_MC13783=m CONFIG_LEDS_TCA6507=m -CONFIG_LEDS_LM3556=m +CONFIG_LEDS_LM355x=m CONFIG_LEDS_OT200=m CONFIG_LEDS_BLINKM=m CONFIG_LEDS_TRIGGERS=y @@ -4830,6 +4813,7 @@ CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_ONESHOT=m CONFIG_LEDS_TRIGGER_HEARTBEAT=m CONFIG_LEDS_TRIGGER_BACKLIGHT=m +# CONFIG_LEDS_TRIGGER_CPU is not set CONFIG_LEDS_TRIGGER_GPIO=m CONFIG_LEDS_TRIGGER_DEFAULT_ON=m @@ -4924,12 +4908,14 @@ CONFIG_RTC_DRV_MSM6242=m CONFIG_RTC_DRV_BQ4802=m CONFIG_RTC_DRV_RP5C01=m CONFIG_RTC_DRV_V3020=m +CONFIG_RTC_DRV_DS2404=m CONFIG_RTC_DRV_PCF50633=m # # on-CPU RTC drivers # CONFIG_RTC_DRV_MC13XXX=m +CONFIG_RTC_DRV_SNVS=m CONFIG_DMADEVICES=y # CONFIG_DMADEVICES_DEBUG is not set @@ -4965,7 +4951,6 @@ CONFIG_UIO_PCI_GENERIC=m CONFIG_UIO_NETX=m # CONFIG_VFIO is not set CONFIG_VIRTIO=y -CONFIG_VIRTIO_RING=y # # Virtio drivers @@ -5048,6 +5033,7 @@ CONFIG_COMEDI_PCMUIO=m CONFIG_COMEDI_MULTIQ3=m CONFIG_COMEDI_POC=m CONFIG_COMEDI_PCI_DRIVERS=y +CONFIG_COMEDI_8255_PCI=m CONFIG_COMEDI_ADDI_APCI_035=m CONFIG_COMEDI_ADDI_APCI_1032=m CONFIG_COMEDI_ADDI_APCI_1500=m @@ -5062,9 +5048,7 @@ 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_PCI7X3X=m CONFIG_COMEDI_ADL_PCI8164=m CONFIG_COMEDI_ADL_PCI9111=m CONFIG_COMEDI_ADL_PCI9118=m @@ -5090,7 +5074,6 @@ 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 @@ -5200,8 +5183,6 @@ CONFIG_DVB_CXD2099=m CONFIG_VIDEO_DT3155=m CONFIG_DT3155_CCIR=y CONFIG_DT3155_STREAMING=y -CONFIG_EASYCAP=m -# CONFIG_EASYCAP_DEBUG is not set CONFIG_VIDEO_GO7007=m CONFIG_VIDEO_GO7007_USB=m # CONFIG_VIDEO_GO7007_USB_S2250_BOARD is not set @@ -5222,7 +5203,6 @@ CONFIG_LIRC_SASEM=m CONFIG_LIRC_SERIAL=m CONFIG_LIRC_SERIAL_TRANSMITTER=y CONFIG_LIRC_SIR=m -CONFIG_LIRC_TTUSBIR=m CONFIG_LIRC_ZILOG=m # @@ -5242,6 +5222,11 @@ CONFIG_WIMAX_GDM72XX_USB=y # CONFIG_WIMAX_GDM72XX_SDIO is not set CONFIG_WIMAX_GDM72XX_USB_PM=y CONFIG_CSR_WIFI=m +CONFIG_NET_VENDOR_SILICOM=y +CONFIG_SBYPASS=m +CONFIG_BPCTL=m +CONFIG_CED1401=m +CONFIG_DGRP=m CONFIG_X86_PLATFORM_DEVICES=y CONFIG_ACER_WMI=m CONFIG_ACERHDF=m @@ -5309,6 +5294,8 @@ CONFIG_INTEL_IOMMU_FLOPPY_WA=y # # Remoteproc drivers (EXPERIMENTAL) # +CONFIG_REMOTEPROC=m +CONFIG_STE_MODEM_RPROC=m # # Rpmsg drivers (EXPERIMENTAL) @@ -5513,7 +5500,11 @@ CONFIG_NFS_V3=m CONFIG_NFS_V3_ACL=y CONFIG_NFS_V4=m # CONFIG_NFS_SWAP is not set -# CONFIG_NFS_V4_1 is not set +CONFIG_NFS_V4_1=y +CONFIG_PNFS_FILE_LAYOUT=m +CONFIG_PNFS_BLOCK=m +CONFIG_PNFS_OBJLAYOUT=m +CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org" CONFIG_NFS_FSCACHE=y # CONFIG_NFS_USE_LEGACY_DNS is not set CONFIG_NFS_USE_KERNEL_DNS=y @@ -5529,6 +5520,7 @@ CONFIG_NFS_ACL_SUPPORT=m CONFIG_NFS_COMMON=y CONFIG_SUNRPC=m CONFIG_SUNRPC_GSS=m +CONFIG_SUNRPC_BACKCHANNEL=y CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_SUNRPC_DEBUG is not set CONFIG_CEPH_FS=m @@ -5539,10 +5531,11 @@ CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_UPCALL=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y +CONFIG_CIFS_ACL=y # CONFIG_CIFS_DEBUG2 is not set CONFIG_CIFS_DFS_UPCALL=y +CONFIG_CIFS_SMB2=y CONFIG_CIFS_FSCACHE=y -CONFIG_CIFS_ACL=y CONFIG_NCP_FS=m # CONFIG_NCPFS_PACKET_SIGNING is not set # CONFIG_NCPFS_IOCTL_LOCKING is not set @@ -5649,6 +5642,7 @@ CONFIG_TIMER_STATS=y # CONFIG_DEBUG_OBJECTS is not set # CONFIG_SLUB_DEBUG_ON is not set # CONFIG_SLUB_STATS is not set +CONFIG_HAVE_DEBUG_KMEMLEAK=y # CONFIG_DEBUG_KMEMLEAK is not set # CONFIG_DEBUG_PREEMPT is not set # CONFIG_DEBUG_RT_MUTEXES is not set @@ -5657,6 +5651,7 @@ CONFIG_TIMER_STATS=y CONFIG_DEBUG_MUTEXES=y # CONFIG_DEBUG_LOCK_ALLOC is not set # CONFIG_PROVE_LOCKING is not set +# CONFIG_PROVE_RCU_DELAY is not set # CONFIG_SPARSE_RCU_POINTER is not set # CONFIG_LOCK_STAT is not set # CONFIG_DEBUG_ATOMIC_SLEEP is not set @@ -5705,6 +5700,7 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y CONFIG_HAVE_C_RECORDMCOUNT=y CONFIG_TRACER_MAX_TRACE=y +CONFIG_TRACE_CLOCK=y CONFIG_RING_BUFFER=y CONFIG_EVENT_TRACING=y CONFIG_EVENT_POWER_TRACING_DEPRECATED=y @@ -5735,9 +5731,11 @@ CONFIG_FTRACE_MCOUNT_RECORD=y CONFIG_MMIOTRACE=y # CONFIG_MMIOTRACE_TEST is not set CONFIG_RING_BUFFER_BENCHMARK=m +# CONFIG_RBTREE_TEST is not set +# CONFIG_INTERVAL_TREE_TEST is not set # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set -# CONFIG_DYNAMIC_DEBUG is not set +CONFIG_DYNAMIC_DEBUG=y # CONFIG_DMA_API_DEBUG is not set # CONFIG_ATOMIC64_SELFTEST is not set CONFIG_ASYNC_RAID6_TEST=m @@ -5892,7 +5890,7 @@ CONFIG_CRYPTO_WP512=m # # Ciphers # -CONFIG_CRYPTO_AES=m +CONFIG_CRYPTO_AES=y CONFIG_CRYPTO_AES_586=m CONFIG_CRYPTO_AES_NI_INTEL=m CONFIG_CRYPTO_ANUBIS=m @@ -5936,6 +5934,10 @@ CONFIG_CRYPTO_DEV_PADLOCK_SHA=m CONFIG_CRYPTO_DEV_GEODE=m CONFIG_CRYPTO_DEV_HIFN_795X=m CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y +CONFIG_ASYMMETRIC_KEY_TYPE=m +CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m +CONFIG_PUBLIC_KEY_ALGO_RSA=m +CONFIG_X509_CERTIFICATE_PARSER=m CONFIG_HAVE_KVM=y CONFIG_HAVE_KVM_IRQCHIP=y CONFIG_HAVE_KVM_EVENTFD=y @@ -5943,6 +5945,7 @@ CONFIG_KVM_APIC_ARCHITECTURE=y CONFIG_KVM_MMIO=y CONFIG_KVM_ASYNC_PF=y CONFIG_HAVE_KVM_MSI=y +CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y CONFIG_VIRTUALIZATION=y CONFIG_KVM=m CONFIG_KVM_INTEL=m @@ -6018,5 +6021,8 @@ CONFIG_NLATTR=y CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y CONFIG_LRU_CACHE=m CONFIG_AVERAGE=y +CONFIG_CLZ_TAB=y CONFIG_CORDIC=m CONFIG_DDR=y +CONFIG_MPILIB=m +CONFIG_OID_REGISTRY=m diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64 index fbc1c7588..c213f8707 100755..100644 --- a/libre/linux-libre/config.x86_64 +++ b/libre/linux-libre/config.x86_64 @@ -1,9 +1,8 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.6.3 Kernel Configuration +# Linux/x86_64 3.7.1-1 Kernel Configuration # CONFIG_64BIT=y -# CONFIG_X86_32 is not set CONFIG_X86_64=y CONFIG_X86=y CONFIG_INSTRUCTION_DECODER=y @@ -21,7 +20,6 @@ CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_GPIO=y CONFIG_ARCH_MAY_HAVE_PC_FDC=y -# CONFIG_RWSEM_GENERIC_SPINLOCK is not set CONFIG_RWSEM_XCHGADD_ALGORITHM=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_ARCH_HAS_CPU_RELAX=y @@ -72,13 +70,7 @@ CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y CONFIG_POSIX_MQUEUE=y CONFIG_POSIX_MQUEUE_SYSCTL=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_BSD_PROCESS_ACCT_V3=y CONFIG_FHANDLE=y -CONFIG_TASKSTATS=y -CONFIG_TASK_DELAY_ACCT=y -CONFIG_TASK_XACCT=y -CONFIG_TASK_IO_ACCOUNTING=y CONFIG_AUDIT=y CONFIG_AUDITSYSCALL=y CONFIG_AUDIT_WATCH=y @@ -114,10 +106,23 @@ CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y # +# CPU/Task time and stats accounting +# +CONFIG_TICK_CPU_ACCOUNTING=y +# CONFIG_IRQ_TIME_ACCOUNTING is not set +CONFIG_BSD_PROCESS_ACCT=y +CONFIG_BSD_PROCESS_ACCT_V3=y +CONFIG_TASKSTATS=y +CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_XACCT=y +CONFIG_TASK_IO_ACCOUNTING=y + +# # RCU Subsystem # CONFIG_TREE_PREEMPT_RCU=y CONFIG_PREEMPT_RCU=y +# CONFIG_RCU_USER_QS is not set CONFIG_RCU_FANOUT=64 CONFIG_RCU_FANOUT_LEAF=16 # CONFIG_RCU_FANOUT_EXACT is not set @@ -155,6 +160,7 @@ CONFIG_IPC_NS=y CONFIG_PID_NS=y CONFIG_NET_NS=y CONFIG_SCHED_AUTOGROUP=y +CONFIG_MM_OWNER=y # CONFIG_SYSFS_DEPRECATED is not set CONFIG_RELAY=y CONFIG_BLK_DEV_INITRD=y @@ -168,8 +174,10 @@ CONFIG_RD_LZO=y CONFIG_SYSCTL=y CONFIG_ANON_INODES=y # CONFIG_EXPERT is not set +CONFIG_HAVE_UID16=y CONFIG_UID16=y # CONFIG_SYSCTL_SYSCALL is not set +CONFIG_SYSCTL_EXCEPTION_TRACE=y CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_ALL is not set CONFIG_HOTPLUG=y @@ -226,6 +234,8 @@ CONFIG_HAVE_HW_BREAKPOINT=y CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y CONFIG_HAVE_USER_RETURN_NOTIFIER=y CONFIG_HAVE_PERF_EVENTS_NMI=y +CONFIG_HAVE_PERF_REGS=y +CONFIG_HAVE_PERF_USER_STACK_DUMP=y CONFIG_HAVE_ARCH_JUMP_LABEL=y CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y @@ -233,8 +243,14 @@ CONFIG_HAVE_CMPXCHG_LOCAL=y CONFIG_HAVE_CMPXCHG_DOUBLE=y CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y +CONFIG_GENERIC_KERNEL_THREAD=y +CONFIG_GENERIC_KERNEL_EXECVE=y CONFIG_HAVE_ARCH_SECCOMP_FILTER=y CONFIG_SECCOMP_FILTER=y +CONFIG_HAVE_RCU_USER_QS=y +CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y +CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y +CONFIG_MODULES_USE_ELF_RELA=y # # GCOV-based kernel profiling @@ -250,6 +266,7 @@ CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MODVERSIONS=y # CONFIG_MODULE_SRCVERSION_ALL is not set +# CONFIG_MODULE_SIG is not set CONFIG_STOP_MACHINE=y CONFIG_BLOCK=y CONFIG_BLK_DEV_BSG=y @@ -294,35 +311,8 @@ CONFIG_DEFAULT_CFQ=y CONFIG_DEFAULT_IOSCHED="cfq" CONFIG_PREEMPT_NOTIFIERS=y CONFIG_PADATA=y -# CONFIG_INLINE_SPIN_TRYLOCK is not set -# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set -# CONFIG_INLINE_SPIN_LOCK is not set -# CONFIG_INLINE_SPIN_LOCK_BH is not set -# CONFIG_INLINE_SPIN_LOCK_IRQ is not set -# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set +CONFIG_ASN1=m CONFIG_UNINLINE_SPIN_UNLOCK=y -# CONFIG_INLINE_SPIN_UNLOCK_BH is not set -# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set -# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set -# CONFIG_INLINE_READ_TRYLOCK is not set -# CONFIG_INLINE_READ_LOCK is not set -# CONFIG_INLINE_READ_LOCK_BH is not set -# CONFIG_INLINE_READ_LOCK_IRQ is not set -# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set -# CONFIG_INLINE_READ_UNLOCK is not set -# CONFIG_INLINE_READ_UNLOCK_BH is not set -# CONFIG_INLINE_READ_UNLOCK_IRQ is not set -# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set -# CONFIG_INLINE_WRITE_TRYLOCK is not set -# CONFIG_INLINE_WRITE_LOCK is not set -# CONFIG_INLINE_WRITE_LOCK_BH is not set -# CONFIG_INLINE_WRITE_LOCK_IRQ is not set -# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set -# CONFIG_INLINE_WRITE_UNLOCK is not set -# CONFIG_INLINE_WRITE_UNLOCK_BH is not set -# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set -# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set -# CONFIG_MUTEX_SPIN_ON_OWNER is not set CONFIG_FREEZER=y # @@ -344,7 +334,6 @@ CONFIG_XEN_PVHVM=y CONFIG_XEN_MAX_DOMAIN_MEMORY=500 CONFIG_XEN_SAVE_RESTORE=y # CONFIG_XEN_DEBUG_FS is not set -CONFIG_KVM_CLOCK=y CONFIG_KVM_GUEST=y CONFIG_PARAVIRT=y # CONFIG_PARAVIRT_SPINLOCKS is not set @@ -382,7 +371,6 @@ CONFIG_IOMMU_HELPER=y CONFIG_NR_CPUS=64 CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y -# CONFIG_IRQ_TIME_ACCOUNTING is not set # CONFIG_PREEMPT_NONE is not set # CONFIG_PREEMPT_VOLUNTARY is not set CONFIG_PREEMPT=y @@ -464,6 +452,7 @@ CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 CONFIG_X86_PAT=y CONFIG_ARCH_USES_PG_UNCACHED=y CONFIG_ARCH_RANDOM=y +CONFIG_X86_SMAP=y CONFIG_EFI=y CONFIG_EFI_STUB=y CONFIG_SECCOMP=y @@ -537,7 +526,7 @@ CONFIG_ACPI_HOTPLUG_MEMORY=m CONFIG_ACPI_SBS=m CONFIG_ACPI_HED=y CONFIG_ACPI_CUSTOM_METHOD=m -CONFIG_ACPI_BGRT=m +CONFIG_ACPI_BGRT=y CONFIG_ACPI_APEI=y CONFIG_ACPI_APEI_GHES=y CONFIG_ACPI_APEI_PCIEAER=y @@ -568,6 +557,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m # CONFIG_X86_PCC_CPUFREQ=m CONFIG_X86_ACPI_CPUFREQ=m +CONFIG_X86_ACPI_CPUFREQ_CPB=y CONFIG_X86_POWERNOW_K8=m # CONFIG_X86_SPEEDSTEP_CENTRINO is not set CONFIG_X86_P4_CLOCKMOD=m @@ -596,7 +586,6 @@ CONFIG_PCI_DIRECT=y CONFIG_PCI_MMCONFIG=y CONFIG_PCI_XEN=y CONFIG_PCI_DOMAINS=y -# CONFIG_PCI_CNB20LE_QUIRK is not set CONFIG_PCIEPORTBUS=y CONFIG_HOTPLUG_PCI_PCIE=m CONFIG_PCIEAER=y @@ -641,7 +630,6 @@ CONFIG_PD6729=m CONFIG_I82092=m CONFIG_PCCARD_NONSTATIC=y CONFIG_HOTPLUG_PCI=m -CONFIG_HOTPLUG_PCI_FAKE=m CONFIG_HOTPLUG_PCI_ACPI=m CONFIG_HOTPLUG_PCI_ACPI_IBM=m CONFIG_HOTPLUG_PCI_CPCI=y @@ -669,6 +657,7 @@ CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set # CONFIG_HAVE_AOUT is not set CONFIG_BINFMT_MISC=y +CONFIG_COREDUMP=y CONFIG_IA32_EMULATION=y CONFIG_IA32_AOUT=m CONFIG_X86_X32=y @@ -685,6 +674,7 @@ CONFIG_COMPAT_NETLINK_MESSAGES=y # Networking options # CONFIG_PACKET=y +CONFIG_PACKET_DIAG=m CONFIG_UNIX=y CONFIG_UNIX_DIAG=m CONFIG_XFRM=y @@ -713,7 +703,7 @@ CONFIG_IP_MROUTE=y # CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set CONFIG_IP_PIMSM_V1=y CONFIG_IP_PIMSM_V2=y -# CONFIG_ARPD is not set +CONFIG_ARPD=y CONFIG_SYN_COOKIES=y CONFIG_NET_IPVTI=m CONFIG_INET_AH=m @@ -764,6 +754,7 @@ CONFIG_IPV6_SIT=m CONFIG_IPV6_SIT_6RD=y CONFIG_IPV6_NDISC_NODETYPE=y CONFIG_IPV6_TUNNEL=m +CONFIG_IPV6_GRE=m CONFIG_IPV6_MULTIPLE_TABLES=y CONFIG_IPV6_SUBTREES=y # CONFIG_IPV6_MROUTE is not set @@ -809,6 +800,16 @@ CONFIG_NF_CT_NETLINK=m CONFIG_NF_CT_NETLINK_TIMEOUT=m CONFIG_NF_CT_NETLINK_HELPER=m CONFIG_NETFILTER_NETLINK_QUEUE_CT=y +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_NF_NAT_PROTO_DCCP=m +CONFIG_NF_NAT_PROTO_UDPLITE=m +CONFIG_NF_NAT_PROTO_SCTP=m +CONFIG_NF_NAT_AMANDA=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +CONFIG_NF_NAT_SIP=m +CONFIG_NF_NAT_TFTP=m CONFIG_NETFILTER_TPROXY=m CONFIG_NETFILTER_XTABLES=m @@ -835,10 +836,11 @@ CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m CONFIG_NETFILTER_XT_TARGET_LED=m CONFIG_NETFILTER_XT_TARGET_LOG=m CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_NETMAP=m CONFIG_NETFILTER_XT_TARGET_NFLOG=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m -CONFIG_NETFILTER_XT_TARGET_NOTRACK=m CONFIG_NETFILTER_XT_TARGET_RATEEST=m +CONFIG_NETFILTER_XT_TARGET_REDIRECT=m CONFIG_NETFILTER_XT_TARGET_TEE=m CONFIG_NETFILTER_XT_TARGET_TPROXY=m CONFIG_NETFILTER_XT_TARGET_TRACE=m @@ -959,23 +961,14 @@ CONFIG_IP_NF_MATCH_TTL=m CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_ULOG=m -CONFIG_NF_NAT=m -CONFIG_NF_NAT_NEEDED=y +CONFIG_NF_NAT_IPV4=m CONFIG_IP_NF_TARGET_MASQUERADE=m CONFIG_IP_NF_TARGET_NETMAP=m CONFIG_IP_NF_TARGET_REDIRECT=m CONFIG_NF_NAT_SNMP_BASIC=m -CONFIG_NF_NAT_PROTO_DCCP=m CONFIG_NF_NAT_PROTO_GRE=m -CONFIG_NF_NAT_PROTO_UDPLITE=m -CONFIG_NF_NAT_PROTO_SCTP=m -CONFIG_NF_NAT_FTP=m -CONFIG_NF_NAT_IRC=m -CONFIG_NF_NAT_TFTP=m -CONFIG_NF_NAT_AMANDA=m CONFIG_NF_NAT_PPTP=m CONFIG_NF_NAT_H323=m -CONFIG_NF_NAT_SIP=m CONFIG_IP_NF_MANGLE=m CONFIG_IP_NF_TARGET_CLUSTERIP=m CONFIG_IP_NF_TARGET_ECN=m @@ -1007,6 +1000,9 @@ CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_MANGLE=m CONFIG_IP6_NF_RAW=m CONFIG_IP6_NF_SECURITY=m +CONFIG_NF_NAT_IPV6=m +CONFIG_IP6_NF_TARGET_MASQUERADE=m +CONFIG_IP6_NF_TARGET_NPT=m CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_T_FILTER=m @@ -1332,7 +1328,6 @@ CONFIG_NFC_HCI=m # # Near Field Communication (NFC) devices # -CONFIG_PN544_NFC=m CONFIG_NFC_PN533=m CONFIG_NFC_WILINK=m CONFIG_HAVE_BPF_JIT=y @@ -1360,6 +1355,11 @@ CONFIG_REGMAP=y CONFIG_REGMAP_I2C=m CONFIG_REGMAP_IRQ=y CONFIG_DMA_SHARED_BUFFER=y + +# +# Bus devices +# +CONFIG_OMAP_OCP2SCP=m CONFIG_CONNECTOR=y CONFIG_PROC_EVENTS=y CONFIG_MTD=m @@ -1460,7 +1460,6 @@ CONFIG_BCH_CONST_T=4 CONFIG_MTD_NAND_ECC=m CONFIG_MTD_NAND_ECC_SMC=y CONFIG_MTD_NAND=m -# CONFIG_MTD_NAND_VERIFY_WRITE is not set # CONFIG_MTD_NAND_ECC_BCH is not set CONFIG_MTD_SM_COMMON=m # CONFIG_MTD_NAND_MUSEUM_IDS is not set @@ -1485,7 +1484,8 @@ CONFIG_MTD_LPDDR=m CONFIG_MTD_QINFO_PROBE=m CONFIG_MTD_UBI=m CONFIG_MTD_UBI_WL_THRESHOLD=4096 -CONFIG_MTD_UBI_BEB_RESERVE=1 +CONFIG_MTD_UBI_BEB_LIMIT=20 +# CONFIG_MTD_UBI_FASTMAP is not set # CONFIG_MTD_UBI_GLUEBI is not set CONFIG_PARPORT=m CONFIG_PARPORT_PC=m @@ -1523,7 +1523,6 @@ CONFIG_BLK_DEV_NBD=m CONFIG_BLK_DEV_NVME=m CONFIG_BLK_DEV_OSD=m CONFIG_BLK_DEV_SX8=m -# CONFIG_BLK_DEV_UB is not set CONFIG_BLK_DEV_RAM=m CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=16384 @@ -1771,6 +1770,7 @@ CONFIG_ATA_BMDMA=y # SATA SFF controllers with BMDMA # CONFIG_ATA_PIIX=m +CONFIG_SATA_HIGHBANK=m CONFIG_SATA_MV=m CONFIG_SATA_NV=m CONFIG_SATA_PROMISE=m @@ -1853,6 +1853,7 @@ CONFIG_MD_FAULTY=m CONFIG_BLK_DEV_DM=m # CONFIG_DM_DEBUG is not set CONFIG_DM_BUFIO=m +CONFIG_DM_BIO_PRISON=m CONFIG_DM_PERSISTENT_DATA=m CONFIG_DM_CRYPT=m CONFIG_DM_SNAPSHOT=m @@ -1912,9 +1913,6 @@ CONFIG_DUMMY=m CONFIG_EQUALIZER=m # CONFIG_NET_FC is not set CONFIG_MII=m -CONFIG_IEEE802154_DRIVERS=m -CONFIG_IEEE802154_FAKEHARD=m -CONFIG_IEEE802154_FAKELB=m CONFIG_IFB=m CONFIG_NET_TEAM=m CONFIG_NET_TEAM_MODE_BROADCAST=m @@ -1923,6 +1921,7 @@ CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m CONFIG_NET_TEAM_MODE_LOADBALANCE=m CONFIG_MACVLAN=m CONFIG_MACVTAP=m +CONFIG_VXLAN=m CONFIG_NETCONSOLE=m CONFIG_NETCONSOLE_DYNAMIC=y CONFIG_NETPOLL=y @@ -2124,6 +2123,7 @@ CONFIG_SFC=m CONFIG_SFC_MTD=y CONFIG_SFC_MCDI_MON=y CONFIG_SFC_SRIOV=y +CONFIG_SFC_PTP=y CONFIG_NET_VENDOR_SMSC=y CONFIG_PCMCIA_SMC91C92=m CONFIG_EPIC100=m @@ -2165,6 +2165,7 @@ CONFIG_PHYLIB=m # # MII PHY device drivers # +CONFIG_AT803X_PHY=m CONFIG_AMD_PHY=m CONFIG_MARVELL_PHY=m CONFIG_DAVICOM_PHY=m @@ -2316,6 +2317,7 @@ CONFIG_BRCMFMAC=m CONFIG_BRCMFMAC_SDIO=y # CONFIG_BRCMFMAC_SDIO_OOB is not set CONFIG_BRCMFMAC_USB=y +# CONFIG_BRCMISCAN is not set # CONFIG_BRCMDBG is not set CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y @@ -2416,6 +2418,9 @@ CONFIG_WIMAX_I2400M=m CONFIG_WIMAX_I2400M_USB=m CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 # CONFIG_WAN is not set +CONFIG_IEEE802154_DRIVERS=m +CONFIG_IEEE802154_FAKEHARD=m +CONFIG_IEEE802154_FAKELB=m CONFIG_XEN_NETDEV_FRONTEND=m CONFIG_XEN_NETDEV_BACKEND=m CONFIG_VMXNET3=m @@ -2664,7 +2669,6 @@ CONFIG_TOUCHSCREEN_CYTTSP_I2C=m CONFIG_TOUCHSCREEN_DYNAPRO=m CONFIG_TOUCHSCREEN_HAMPSHIRE=m CONFIG_TOUCHSCREEN_EETI=m -CONFIG_TOUCHSCREEN_EGALAX=m CONFIG_TOUCHSCREEN_FUJITSU=m CONFIG_TOUCHSCREEN_ILI210X=m CONFIG_TOUCHSCREEN_GUNZE=m @@ -2794,10 +2798,10 @@ CONFIG_TRACE_SINK=m # Serial drivers # CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_PNP=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_FIX_EARLYCON_MEM=y CONFIG_SERIAL_8250_PCI=y -CONFIG_SERIAL_8250_PNP=y CONFIG_SERIAL_8250_CS=m CONFIG_SERIAL_8250_NR_UARTS=32 CONFIG_SERIAL_8250_RUNTIME_UARTS=4 @@ -2810,6 +2814,7 @@ CONFIG_SERIAL_MFD_HSU=m CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_SERIAL_JSM=m +CONFIG_SERIAL_SCCNXP=m # CONFIG_SERIAL_TIMBERDALE is not set CONFIG_SERIAL_ALTERA_JTAGUART=m CONFIG_SERIAL_ALTERA_UART=m @@ -2837,6 +2842,7 @@ CONFIG_HW_RANDOM_INTEL=m CONFIG_HW_RANDOM_AMD=m CONFIG_HW_RANDOM_VIA=m CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_HW_RANDOM_TPM=m CONFIG_NVRAM=m CONFIG_R3964=m CONFIG_APPLICOM=m @@ -2855,6 +2861,7 @@ CONFIG_HPET_MMAP=y CONFIG_HANGCHECK_TIMER=m CONFIG_TCG_TPM=m CONFIG_TCG_TIS=m +CONFIG_TCG_TIS_I2C_INFINEON=m CONFIG_TCG_NSC=m CONFIG_TCG_ATMEL=m CONFIG_TCG_INFINEON=m @@ -3039,6 +3046,7 @@ CONFIG_SENSORS_ADM1026=m CONFIG_SENSORS_ADM1029=m CONFIG_SENSORS_ADM1031=m CONFIG_SENSORS_ADM9240=m +CONFIG_SENSORS_ADT7410=m CONFIG_SENSORS_ADT7411=m CONFIG_SENSORS_ADT7462=m CONFIG_SENSORS_ADT7470=m @@ -3088,6 +3096,7 @@ CONFIG_SENSORS_LM95245=m CONFIG_SENSORS_MAX16065=m CONFIG_SENSORS_MAX1619=m CONFIG_SENSORS_MAX1668=m +CONFIG_SENSORS_MAX197=m CONFIG_SENSORS_MAX6639=m CONFIG_SENSORS_MAX6642=m CONFIG_SENSORS_MAX6650=m @@ -3153,6 +3162,7 @@ CONFIG_SENSORS_ACPI_POWER=m CONFIG_SENSORS_ATK0110=m CONFIG_THERMAL=y CONFIG_THERMAL_HWMON=y +# CONFIG_CPU_THERMAL is not set CONFIG_WATCHDOG=y CONFIG_WATCHDOG_CORE=y # CONFIG_WATCHDOG_NOWAYOUT is not set @@ -3286,16 +3296,28 @@ CONFIG_MEDIA_RADIO_SUPPORT=y CONFIG_MEDIA_RC_SUPPORT=y CONFIG_MEDIA_CONTROLLER=y CONFIG_VIDEO_DEV=m -CONFIG_VIDEO_V4L2_COMMON=m CONFIG_VIDEO_V4L2_SUBDEV_API=y +CONFIG_VIDEO_V4L2=m +# CONFIG_VIDEO_ADV_DEBUG is not set +# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set +CONFIG_VIDEO_TUNER=m +CONFIG_V4L2_MEM2MEM_DEV=m +CONFIG_VIDEOBUF_GEN=m +CONFIG_VIDEOBUF_DMA_SG=m +CONFIG_VIDEOBUF_VMALLOC=m +CONFIG_VIDEOBUF_DVB=m +CONFIG_VIDEOBUF2_CORE=m +CONFIG_VIDEOBUF2_MEMOPS=m +CONFIG_VIDEOBUF2_DMA_CONTIG=m +CONFIG_VIDEOBUF2_VMALLOC=m CONFIG_DVB_CORE=m CONFIG_DVB_NET=y +CONFIG_DVB_MAX_ADAPTERS=8 +# CONFIG_DVB_DYNAMIC_MINORS is not set # # Media drivers # -CONFIG_VIDEO_SAA7146=m -CONFIG_VIDEO_SAA7146_VV=m CONFIG_RC_CORE=m CONFIG_RC_MAP=m CONFIG_RC_DECODERS=y @@ -3321,156 +3343,10 @@ CONFIG_IR_REDRAT3=m CONFIG_IR_STREAMZAP=m CONFIG_IR_WINBOND_CIR=m CONFIG_IR_IGUANA=m +CONFIG_IR_TTUSBIR=m CONFIG_RC_LOOPBACK=m CONFIG_IR_GPIO_CIR=m -CONFIG_MEDIA_ATTACH=y -CONFIG_MEDIA_TUNER=m -# CONFIG_MEDIA_TUNER_CUSTOMISE is not set -CONFIG_MEDIA_TUNER_SIMPLE=m -CONFIG_MEDIA_TUNER_TDA8290=m -CONFIG_MEDIA_TUNER_TDA827X=m -CONFIG_MEDIA_TUNER_TDA18271=m -CONFIG_MEDIA_TUNER_TDA9887=m -CONFIG_MEDIA_TUNER_TEA5761=m -CONFIG_MEDIA_TUNER_TEA5767=m -CONFIG_MEDIA_TUNER_MT20XX=m -CONFIG_MEDIA_TUNER_MT2060=m -CONFIG_MEDIA_TUNER_MT2063=m -CONFIG_MEDIA_TUNER_MT2266=m -CONFIG_MEDIA_TUNER_MT2131=m -CONFIG_MEDIA_TUNER_QT1010=m -CONFIG_MEDIA_TUNER_XC2028=m -CONFIG_MEDIA_TUNER_XC5000=m -CONFIG_MEDIA_TUNER_XC4000=m -CONFIG_MEDIA_TUNER_MXL5005S=m -CONFIG_MEDIA_TUNER_MXL5007T=m -CONFIG_MEDIA_TUNER_MC44S803=m -CONFIG_MEDIA_TUNER_MAX2165=m -CONFIG_MEDIA_TUNER_TDA18218=m -CONFIG_MEDIA_TUNER_FC0011=m -CONFIG_MEDIA_TUNER_FC0012=m -CONFIG_MEDIA_TUNER_FC0013=m -CONFIG_MEDIA_TUNER_TDA18212=m -CONFIG_MEDIA_TUNER_TUA9001=m -CONFIG_VIDEO_V4L2=m -CONFIG_VIDEOBUF_GEN=m -CONFIG_VIDEOBUF_DMA_SG=m -CONFIG_VIDEOBUF_VMALLOC=m -CONFIG_VIDEOBUF_DVB=m -CONFIG_VIDEO_BTCX=m -CONFIG_VIDEO_TVEEPROM=m -CONFIG_VIDEO_TUNER=m -CONFIG_V4L2_MEM2MEM_DEV=m -CONFIG_VIDEOBUF2_CORE=m -CONFIG_VIDEOBUF2_MEMOPS=m -CONFIG_VIDEOBUF2_DMA_CONTIG=m -CONFIG_VIDEOBUF2_VMALLOC=m -CONFIG_VIDEO_CAPTURE_DRIVERS=y -# CONFIG_VIDEO_ADV_DEBUG is not set -# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set -# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set -CONFIG_VIDEO_IR_I2C=m - -# -# Encoders, decoders, sensors and other helper chips -# - -# -# Audio decoders, processors and mixers -# -CONFIG_VIDEO_TVAUDIO=m -CONFIG_VIDEO_TDA7432=m -CONFIG_VIDEO_TDA9840=m -CONFIG_VIDEO_TEA6415C=m -CONFIG_VIDEO_TEA6420=m -CONFIG_VIDEO_MSP3400=m -CONFIG_VIDEO_CS5345=m -CONFIG_VIDEO_CS53L32A=m -CONFIG_VIDEO_TLV320AIC23B=m -CONFIG_VIDEO_WM8775=m -CONFIG_VIDEO_WM8739=m -CONFIG_VIDEO_VP27SMPX=m - -# -# RDS decoders -# -CONFIG_VIDEO_SAA6588=m - -# -# Video decoders -# -CONFIG_VIDEO_ADV7180=m -CONFIG_VIDEO_ADV7183=m -CONFIG_VIDEO_BT819=m -CONFIG_VIDEO_BT856=m -CONFIG_VIDEO_BT866=m -CONFIG_VIDEO_KS0127=m -CONFIG_VIDEO_SAA7110=m -CONFIG_VIDEO_SAA711X=m -CONFIG_VIDEO_SAA7191=m -CONFIG_VIDEO_TVP514X=m -CONFIG_VIDEO_TVP5150=m -CONFIG_VIDEO_TVP7002=m -CONFIG_VIDEO_VPX3220=m - -# -# Video and audio decoders -# -CONFIG_VIDEO_SAA717X=m -CONFIG_VIDEO_CX25840=m - -# -# MPEG video encoders -# -CONFIG_VIDEO_CX2341X=m - -# -# Video encoders -# -CONFIG_VIDEO_SAA7127=m -CONFIG_VIDEO_SAA7185=m -CONFIG_VIDEO_ADV7170=m -CONFIG_VIDEO_ADV7175=m -CONFIG_VIDEO_ADV7343=m -CONFIG_VIDEO_ADV7393=m -CONFIG_VIDEO_AK881X=m - -# -# Camera sensor devices -# -CONFIG_VIDEO_APTINA_PLL=m -CONFIG_VIDEO_OV7670=m -CONFIG_VIDEO_VS6624=m -CONFIG_VIDEO_MT9M032=m -CONFIG_VIDEO_MT9P031=m -CONFIG_VIDEO_MT9T001=m -CONFIG_VIDEO_MT9V011=m -CONFIG_VIDEO_MT9V032=m -CONFIG_VIDEO_TCM825X=m -CONFIG_VIDEO_SR030PC30=m -CONFIG_VIDEO_NOON010PC30=m -CONFIG_VIDEO_M5MOLS=m -CONFIG_VIDEO_S5K6AA=m - -# -# Flash devices -# -CONFIG_VIDEO_ADP1653=m -CONFIG_VIDEO_AS3645A=m - -# -# Video improvement chips -# -CONFIG_VIDEO_UPD64031A=m -CONFIG_VIDEO_UPD64083=m - -# -# Miscelaneous helper chips -# -CONFIG_VIDEO_THS7303=m -CONFIG_VIDEO_M52790=m -CONFIG_VIDEO_VIVI=m -CONFIG_V4L_USB_DRIVERS=y +CONFIG_MEDIA_USB_SUPPORT=y # # Webcam devices @@ -3534,15 +3410,7 @@ CONFIG_USB_S2255=m CONFIG_USB_SN9C102=m # -# Webcam and/or TV USB devices -# -CONFIG_VIDEO_EM28XX=m -CONFIG_VIDEO_EM28XX_ALSA=m -CONFIG_VIDEO_EM28XX_DVB=m -CONFIG_VIDEO_EM28XX_RC=m - -# -# TV USB devices +# Analog TV USB devices # CONFIG_VIDEO_AU0828=m CONFIG_VIDEO_PVRUSB2=m @@ -3551,6 +3419,13 @@ CONFIG_VIDEO_PVRUSB2_DVB=y # CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set CONFIG_VIDEO_HDPVR=m CONFIG_VIDEO_TLG2300=m +CONFIG_VIDEO_USBVISION=m +CONFIG_VIDEO_STK1160=m +CONFIG_VIDEO_STK1160_AC97=y + +# +# Analog/digital TV USB devices +# CONFIG_VIDEO_CX231XX=m CONFIG_VIDEO_CX231XX_RC=y CONFIG_VIDEO_CX231XX_ALSA=m @@ -3558,10 +3433,92 @@ CONFIG_VIDEO_CX231XX_DVB=m CONFIG_VIDEO_TM6000=m CONFIG_VIDEO_TM6000_ALSA=m CONFIG_VIDEO_TM6000_DVB=m -CONFIG_VIDEO_USBVISION=m -CONFIG_V4L_PCI_DRIVERS=y -CONFIG_VIDEO_BT848=m -CONFIG_VIDEO_BT848_DVB=y + +# +# Digital TV USB devices +# +CONFIG_DVB_USB=m +# CONFIG_DVB_USB_DEBUG is not set +CONFIG_DVB_USB_A800=m +CONFIG_DVB_USB_DIBUSB_MB=m +CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y +CONFIG_DVB_USB_DIBUSB_MC=m +CONFIG_DVB_USB_DIB0700=m +CONFIG_DVB_USB_UMT_010=m +CONFIG_DVB_USB_CXUSB=m +CONFIG_DVB_USB_M920X=m +CONFIG_DVB_USB_DIGITV=m +CONFIG_DVB_USB_VP7045=m +CONFIG_DVB_USB_VP702X=m +CONFIG_DVB_USB_GP8PSK=m +CONFIG_DVB_USB_NOVA_T_USB2=m +CONFIG_DVB_USB_TTUSB2=m +CONFIG_DVB_USB_DTT200U=m +CONFIG_DVB_USB_OPERA1=m +CONFIG_DVB_USB_AF9005=m +CONFIG_DVB_USB_AF9005_REMOTE=m +CONFIG_DVB_USB_PCTV452E=m +CONFIG_DVB_USB_DW2102=m +CONFIG_DVB_USB_CINERGY_T2=m +CONFIG_DVB_USB_DTV5100=m +CONFIG_DVB_USB_FRIIO=m +CONFIG_DVB_USB_AZ6027=m +CONFIG_DVB_USB_TECHNISAT_USB2=m +CONFIG_DVB_USB_V2=m +CONFIG_DVB_USB_CYPRESS_FIRMWARE=m +CONFIG_DVB_USB_AF9015=m +CONFIG_DVB_USB_AF9035=m +CONFIG_DVB_USB_ANYSEE=m +CONFIG_DVB_USB_AU6610=m +CONFIG_DVB_USB_AZ6007=m +CONFIG_DVB_USB_CE6230=m +CONFIG_DVB_USB_EC168=m +CONFIG_DVB_USB_GL861=m +CONFIG_DVB_USB_IT913X=m +CONFIG_DVB_USB_LME2510=m +CONFIG_DVB_USB_MXL111SF=m +CONFIG_DVB_USB_RTL28XXU=m +CONFIG_DVB_TTUSB_BUDGET=m +CONFIG_DVB_TTUSB_DEC=m +CONFIG_SMS_USB_DRV=m +CONFIG_DVB_B2C2_FLEXCOP_USB=m +# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set + +# +# Webcam, TV (analog/digital) USB devices +# +CONFIG_VIDEO_EM28XX=m +CONFIG_VIDEO_EM28XX_ALSA=m +CONFIG_VIDEO_EM28XX_DVB=m +CONFIG_VIDEO_EM28XX_RC=m +CONFIG_MEDIA_PCI_SUPPORT=y + +# +# Media capture support +# +CONFIG_VIDEO_MEYE=m + +# +# Media capture/analog TV support +# +CONFIG_VIDEO_IVTV=m +CONFIG_VIDEO_IVTV_ALSA=m +CONFIG_VIDEO_FB_IVTV=m +CONFIG_VIDEO_ZORAN=m +CONFIG_VIDEO_ZORAN_DC30=m +CONFIG_VIDEO_ZORAN_ZR36060=m +CONFIG_VIDEO_ZORAN_BUZ=m +CONFIG_VIDEO_ZORAN_DC10=m +CONFIG_VIDEO_ZORAN_LML33=m +CONFIG_VIDEO_ZORAN_LML33R10=m +CONFIG_VIDEO_ZORAN_AVS6EYES=m +CONFIG_VIDEO_HEXIUM_GEMINI=m +CONFIG_VIDEO_HEXIUM_ORION=m +CONFIG_VIDEO_MXB=m + +# +# Media capture/analog/hybrid TV support +# CONFIG_VIDEO_CX18=m CONFIG_VIDEO_CX18_ALSA=m CONFIG_VIDEO_CX23885=m @@ -3574,29 +3531,48 @@ CONFIG_VIDEO_CX88_BLACKBIRD=m CONFIG_VIDEO_CX88_DVB=m CONFIG_VIDEO_CX88_VP3054=m CONFIG_VIDEO_CX88_MPEG=m -CONFIG_VIDEO_HEXIUM_GEMINI=m -CONFIG_VIDEO_HEXIUM_ORION=m -CONFIG_VIDEO_IVTV=m -CONFIG_VIDEO_FB_IVTV=m -CONFIG_VIDEO_MEYE=m -CONFIG_VIDEO_MXB=m +CONFIG_VIDEO_BT848=m +CONFIG_DVB_BT8XX=m CONFIG_VIDEO_SAA7134=m CONFIG_VIDEO_SAA7134_ALSA=m CONFIG_VIDEO_SAA7134_RC=y CONFIG_VIDEO_SAA7134_DVB=m CONFIG_VIDEO_SAA7164=m -CONFIG_VIDEO_ZORAN=m -CONFIG_VIDEO_ZORAN_DC30=m -CONFIG_VIDEO_ZORAN_ZR36060=m -CONFIG_VIDEO_ZORAN_BUZ=m -CONFIG_VIDEO_ZORAN_DC10=m -CONFIG_VIDEO_ZORAN_LML33=m -CONFIG_VIDEO_ZORAN_LML33R10=m -CONFIG_VIDEO_ZORAN_AVS6EYES=m -# CONFIG_V4L_ISA_PARPORT_DRIVERS is not set + +# +# Media digital TV PCI Adapters +# +CONFIG_TTPCI_EEPROM=m +CONFIG_DVB_AV7110=m +CONFIG_DVB_AV7110_OSD=y +CONFIG_DVB_BUDGET_CORE=m +CONFIG_DVB_BUDGET=m +CONFIG_DVB_BUDGET_CI=m +CONFIG_DVB_BUDGET_AV=m +CONFIG_DVB_BUDGET_PATCH=m +CONFIG_DVB_B2C2_FLEXCOP_PCI=m +# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set +CONFIG_DVB_PLUTO2=m +CONFIG_DVB_DM1105=m +CONFIG_DVB_PT1=m +CONFIG_MANTIS_CORE=m +CONFIG_DVB_MANTIS=m +CONFIG_DVB_HOPPER=m +CONFIG_DVB_NGENE=m +CONFIG_DVB_DDBRIDGE=m # CONFIG_V4L_PLATFORM_DRIVERS is not set CONFIG_V4L_MEM2MEM_DRIVERS=y -CONFIG_VIDEO_MEM2MEM_TESTDEV=m +CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m +# CONFIG_V4L_TEST_DRIVERS is not set + +# +# Supported MMC/SDIO adapters +# +CONFIG_SMS_SDIO_DRV=m +CONFIG_MEDIA_PARPORT_SUPPORT=y +CONFIG_VIDEO_BWQCAM=m +CONFIG_VIDEO_CQCAM=m +CONFIG_VIDEO_W9966=m CONFIG_RADIO_ADAPTERS=y CONFIG_RADIO_SI470X=y CONFIG_USB_SI470X=m @@ -3618,128 +3594,129 @@ CONFIG_RADIO_WL1273=m # Texas Instruments WL128x FM driver (ST based) # CONFIG_RADIO_WL128X=m -CONFIG_DVB_MAX_ADAPTERS=8 -# CONFIG_DVB_DYNAMIC_MINORS is not set -CONFIG_DVB_CAPTURE_DRIVERS=y # -# Supported SAA7146 based PCI Adapters +# Supported FireWire (IEEE 1394) Adapters # -CONFIG_TTPCI_EEPROM=m -CONFIG_DVB_AV7110=m -CONFIG_DVB_AV7110_OSD=y -CONFIG_DVB_BUDGET_CORE=m -CONFIG_DVB_BUDGET=m -CONFIG_DVB_BUDGET_CI=m -CONFIG_DVB_BUDGET_AV=m -CONFIG_DVB_BUDGET_PATCH=m +CONFIG_DVB_FIREDTV=m +CONFIG_DVB_FIREDTV_INPUT=y +CONFIG_DVB_B2C2_FLEXCOP=m +CONFIG_VIDEO_SAA7146=m +CONFIG_VIDEO_SAA7146_VV=m +CONFIG_SMS_SIANO_MDTV=m +CONFIG_MEDIA_SUBDRV_AUTOSELECT=y # -# Supported USB Adapters +# Media ancillary drivers (tuners, sensors, i2c, frontends) # -CONFIG_DVB_USB=m -# CONFIG_DVB_USB_DEBUG is not set -CONFIG_DVB_USB_A800=m -CONFIG_DVB_USB_DIBUSB_MB=m -CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y -CONFIG_DVB_USB_DIBUSB_MC=m -CONFIG_DVB_USB_DIB0700=m -CONFIG_DVB_USB_UMT_010=m -CONFIG_DVB_USB_CXUSB=m -CONFIG_DVB_USB_M920X=m -CONFIG_DVB_USB_GL861=m -CONFIG_DVB_USB_AU6610=m -CONFIG_DVB_USB_DIGITV=m -CONFIG_DVB_USB_VP7045=m -CONFIG_DVB_USB_VP702X=m -CONFIG_DVB_USB_GP8PSK=m -CONFIG_DVB_USB_NOVA_T_USB2=m -CONFIG_DVB_USB_TTUSB2=m -CONFIG_DVB_USB_DTT200U=m -CONFIG_DVB_USB_OPERA1=m -CONFIG_DVB_USB_AF9005=m -CONFIG_DVB_USB_AF9005_REMOTE=m -CONFIG_DVB_USB_PCTV452E=m -CONFIG_DVB_USB_DW2102=m -CONFIG_DVB_USB_CINERGY_T2=m -CONFIG_DVB_USB_ANYSEE=m -CONFIG_DVB_USB_DTV5100=m -CONFIG_DVB_USB_AF9015=m -CONFIG_DVB_USB_CE6230=m -CONFIG_DVB_USB_FRIIO=m -CONFIG_DVB_USB_EC168=m -CONFIG_DVB_USB_AZ6007=m -CONFIG_DVB_USB_AZ6027=m -CONFIG_DVB_USB_LME2510=m -CONFIG_DVB_USB_TECHNISAT_USB2=m -CONFIG_DVB_USB_IT913X=m -CONFIG_DVB_USB_MXL111SF=m -CONFIG_DVB_USB_RTL28XXU=m -CONFIG_DVB_USB_AF9035=m -CONFIG_DVB_TTUSB_BUDGET=m -CONFIG_DVB_TTUSB_DEC=m -CONFIG_SMS_SIANO_MDTV=m +CONFIG_VIDEO_BTCX=m +CONFIG_VIDEO_TVEEPROM=m +CONFIG_VIDEO_IR_I2C=m # -# Siano module components +# Audio decoders, processors and mixers # -CONFIG_SMS_USB_DRV=m -CONFIG_SMS_SDIO_DRV=m +CONFIG_VIDEO_TVAUDIO=m +CONFIG_VIDEO_TDA7432=m +CONFIG_VIDEO_TDA9840=m +CONFIG_VIDEO_TEA6415C=m +CONFIG_VIDEO_TEA6420=m +CONFIG_VIDEO_MSP3400=m +CONFIG_VIDEO_CS5345=m +CONFIG_VIDEO_CS53L32A=m +CONFIG_VIDEO_WM8775=m +CONFIG_VIDEO_WM8739=m +CONFIG_VIDEO_VP27SMPX=m # -# Supported FlexCopII (B2C2) Adapters +# RDS decoders # -CONFIG_DVB_B2C2_FLEXCOP=m -CONFIG_DVB_B2C2_FLEXCOP_PCI=m -CONFIG_DVB_B2C2_FLEXCOP_USB=m -# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set +CONFIG_VIDEO_SAA6588=m # -# Supported BT878 Adapters +# Video decoders # -CONFIG_DVB_BT8XX=m +CONFIG_VIDEO_BT819=m +CONFIG_VIDEO_BT856=m +CONFIG_VIDEO_BT866=m +CONFIG_VIDEO_KS0127=m +CONFIG_VIDEO_SAA7110=m +CONFIG_VIDEO_SAA711X=m +CONFIG_VIDEO_TVP5150=m +CONFIG_VIDEO_VPX3220=m # -# Supported Pluto2 Adapters +# Video and audio decoders # -CONFIG_DVB_PLUTO2=m +CONFIG_VIDEO_SAA717X=m +CONFIG_VIDEO_CX25840=m # -# Supported SDMC DM1105 Adapters +# MPEG video encoders # -CONFIG_DVB_DM1105=m +CONFIG_VIDEO_CX2341X=m # -# Supported FireWire (IEEE 1394) Adapters +# Video encoders # -CONFIG_DVB_FIREDTV=m -CONFIG_DVB_FIREDTV_INPUT=y +CONFIG_VIDEO_SAA7127=m +CONFIG_VIDEO_SAA7185=m +CONFIG_VIDEO_ADV7170=m +CONFIG_VIDEO_ADV7175=m # -# Supported Earthsoft PT1 Adapters +# Camera sensor devices # -CONFIG_DVB_PT1=m +CONFIG_VIDEO_MT9V011=m # -# Supported Mantis Adapters +# Flash devices # -CONFIG_MANTIS_CORE=m -CONFIG_DVB_MANTIS=m -CONFIG_DVB_HOPPER=m # -# Supported nGene Adapters +# Video improvement chips # -CONFIG_DVB_NGENE=m +CONFIG_VIDEO_UPD64031A=m +CONFIG_VIDEO_UPD64083=m # -# Supported ddbridge ('Octopus') Adapters +# Miscelaneous helper chips # -CONFIG_DVB_DDBRIDGE=m +CONFIG_VIDEO_M52790=m # -# Supported DVB Frontends +# Sensors used on soc_camera driver # +CONFIG_MEDIA_ATTACH=y +CONFIG_MEDIA_TUNER=m +CONFIG_MEDIA_TUNER_SIMPLE=m +CONFIG_MEDIA_TUNER_TDA8290=m +CONFIG_MEDIA_TUNER_TDA827X=m +CONFIG_MEDIA_TUNER_TDA18271=m +CONFIG_MEDIA_TUNER_TDA9887=m +CONFIG_MEDIA_TUNER_TEA5761=m +CONFIG_MEDIA_TUNER_TEA5767=m +CONFIG_MEDIA_TUNER_MT20XX=m +CONFIG_MEDIA_TUNER_MT2060=m +CONFIG_MEDIA_TUNER_MT2063=m +CONFIG_MEDIA_TUNER_MT2266=m +CONFIG_MEDIA_TUNER_MT2131=m +CONFIG_MEDIA_TUNER_QT1010=m +CONFIG_MEDIA_TUNER_XC2028=m +CONFIG_MEDIA_TUNER_XC5000=m +CONFIG_MEDIA_TUNER_XC4000=m +CONFIG_MEDIA_TUNER_MXL5005S=m +CONFIG_MEDIA_TUNER_MXL5007T=m +CONFIG_MEDIA_TUNER_MC44S803=m +CONFIG_MEDIA_TUNER_MAX2165=m +CONFIG_MEDIA_TUNER_TDA18218=m +CONFIG_MEDIA_TUNER_FC0011=m +CONFIG_MEDIA_TUNER_FC0012=m +CONFIG_MEDIA_TUNER_FC0013=m +CONFIG_MEDIA_TUNER_TDA18212=m +CONFIG_MEDIA_TUNER_E4000=m +CONFIG_MEDIA_TUNER_FC2580=m +CONFIG_MEDIA_TUNER_TUA9001=m # # Multistandard (satellite) frontends @@ -3889,8 +3866,9 @@ CONFIG_DRM_R128=m CONFIG_DRM_RADEON=m CONFIG_DRM_RADEON_KMS=y CONFIG_DRM_NOUVEAU=m +CONFIG_NOUVEAU_DEBUG=5 +CONFIG_NOUVEAU_DEBUG_DEFAULT=3 CONFIG_DRM_NOUVEAU_BACKLIGHT=y -CONFIG_DRM_NOUVEAU_DEBUG=y # # I2C encoder or helper chips @@ -3993,14 +3971,16 @@ CONFIG_LCD_PLATFORM=m CONFIG_BACKLIGHT_CLASS_DEVICE=y # CONFIG_BACKLIGHT_GENERIC is not set CONFIG_BACKLIGHT_LM3533=m -CONFIG_BACKLIGHT_PROGEAR=m CONFIG_BACKLIGHT_APPLE=m # CONFIG_BACKLIGHT_SAHARA is not set # CONFIG_BACKLIGHT_ADP8860 is not set # CONFIG_BACKLIGHT_ADP8870 is not set CONFIG_BACKLIGHT_PCF50633=m +# CONFIG_BACKLIGHT_LM3630 is not set +# CONFIG_BACKLIGHT_LM3639 is not set # CONFIG_BACKLIGHT_LP855X is not set # CONFIG_BACKLIGHT_OT200 is not set +# CONFIG_BACKLIGHT_TPS65217 is not set # # Console display driver support @@ -4143,7 +4123,6 @@ CONFIG_SND_HDA_CODEC_CA0132=y CONFIG_SND_HDA_CODEC_CMEDIA=y CONFIG_SND_HDA_CODEC_SI3054=y CONFIG_SND_HDA_GENERIC=y -CONFIG_SND_HDA_POWER_SAVE=y CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 CONFIG_SND_HDSP=m CONFIG_SND_HDSPM=m @@ -4246,7 +4225,9 @@ CONFIG_HID_PICOLCD_FB=y CONFIG_HID_PICOLCD_BACKLIGHT=y CONFIG_HID_PICOLCD_LCD=y CONFIG_HID_PICOLCD_LEDS=y +CONFIG_HID_PICOLCD_CIR=y CONFIG_HID_PRIMAX=m +CONFIG_HID_PS3REMOTE=m CONFIG_HID_ROCCAT=m CONFIG_HID_SAITEK=m CONFIG_HID_SAMSUNG=m @@ -4268,6 +4249,7 @@ CONFIG_HID_WIIMOTE_EXT=y CONFIG_HID_ZEROPLUS=m CONFIG_ZEROPLUS_FF=y CONFIG_HID_ZYDACRON=m +CONFIG_HID_SENSOR_HUB=m # # USB HID support @@ -4368,8 +4350,6 @@ CONFIG_USB_STORAGE_ONETOUCH=m CONFIG_USB_STORAGE_KARMA=m CONFIG_USB_STORAGE_CYPRESS_ATACB=m CONFIG_USB_STORAGE_ENE_UB6250=m -CONFIG_USB_UAS=m -# CONFIG_USB_LIBUSUAL is not set # # USB Imaging devices @@ -4382,7 +4362,6 @@ CONFIG_USB_MICROTEK=m # CONFIG_USB_USS720=m CONFIG_USB_SERIAL=m -CONFIG_USB_EZUSB=y CONFIG_USB_SERIAL_GENERIC=y CONFIG_USB_SERIAL_AIRCABLE=m CONFIG_USB_SERIAL_ARK3116=m @@ -4447,6 +4426,7 @@ CONFIG_USB_SERIAL_OMNINET=m CONFIG_USB_SERIAL_OPTICON=m CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m CONFIG_USB_SERIAL_ZIO=m +CONFIG_USB_SERIAL_ZTE=m CONFIG_USB_SERIAL_SSU100=m CONFIG_USB_SERIAL_QT2=m # CONFIG_USB_SERIAL_DEBUG is not set @@ -4475,10 +4455,12 @@ CONFIG_USB_IOWARRIOR=m CONFIG_USB_TEST=m CONFIG_USB_ISIGHTFW=m CONFIG_USB_YUREX=m +CONFIG_USB_EZUSB_FX2=m # # USB Physical Layer drivers # +CONFIG_OMAP_USB2=m CONFIG_USB_ISP1301=m CONFIG_USB_ATM=m CONFIG_USB_SPEEDTOUCH=m @@ -4507,8 +4489,7 @@ CONFIG_USB_NET2280=m CONFIG_USB_GOKU=m CONFIG_USB_EG20T=m CONFIG_USB_DUMMY_HCD=m -CONFIG_USB_GADGET_DUALSPEED=y -CONFIG_USB_GADGET_SUPERSPEED=y +CONFIG_USB_LIBCOMPOSITE=m # CONFIG_USB_ZERO is not set CONFIG_USB_AUDIO=m # CONFIG_GADGET_UAC1 is not set @@ -4599,6 +4580,7 @@ CONFIG_LEDS_CLASS=y # CONFIG_LEDS_LM3530=m CONFIG_LEDS_LM3533=m +CONFIG_LEDS_LM3642=m CONFIG_LEDS_PCA9532=m # CONFIG_LEDS_PCA9532_GPIO is not set # CONFIG_LEDS_GPIO is not set @@ -4614,7 +4596,7 @@ CONFIG_LEDS_LT3593=m CONFIG_LEDS_DELL_NETBOOKS=m CONFIG_LEDS_MC13783=m CONFIG_LEDS_TCA6507=m -CONFIG_LEDS_LM3556=m +CONFIG_LEDS_LM355x=m CONFIG_LEDS_OT200=m CONFIG_LEDS_BLINKM=m CONFIG_LEDS_TRIGGERS=y @@ -4626,6 +4608,7 @@ CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_ONESHOT=m CONFIG_LEDS_TRIGGER_HEARTBEAT=m CONFIG_LEDS_TRIGGER_BACKLIGHT=m +# CONFIG_LEDS_TRIGGER_CPU is not set CONFIG_LEDS_TRIGGER_GPIO=m CONFIG_LEDS_TRIGGER_DEFAULT_ON=m @@ -4718,6 +4701,7 @@ CONFIG_RTC_DRV_MSM6242=m CONFIG_RTC_DRV_BQ4802=m CONFIG_RTC_DRV_RP5C01=m CONFIG_RTC_DRV_V3020=m +CONFIG_RTC_DRV_DS2404=m CONFIG_RTC_DRV_PCF50633=m # @@ -4759,7 +4743,6 @@ CONFIG_UIO_PCI_GENERIC=m CONFIG_UIO_NETX=m # CONFIG_VFIO is not set CONFIG_VIRTIO=m -CONFIG_VIRTIO_RING=m # # Virtio drivers @@ -4818,6 +4801,7 @@ CONFIG_COMEDI_PARPORT=m CONFIG_COMEDI_SERIAL2002=m CONFIG_COMEDI_SKEL=m CONFIG_COMEDI_PCI_DRIVERS=y +CONFIG_COMEDI_8255_PCI=m CONFIG_COMEDI_ADDI_APCI_035=m CONFIG_COMEDI_ADDI_APCI_1032=m CONFIG_COMEDI_ADDI_APCI_1500=m @@ -4832,9 +4816,7 @@ 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_PCI7X3X=m CONFIG_COMEDI_ADL_PCI8164=m CONFIG_COMEDI_ADL_PCI9111=m CONFIG_COMEDI_ADL_PCI9118=m @@ -4860,7 +4842,6 @@ 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 @@ -4969,8 +4950,6 @@ CONFIG_DVB_CXD2099=m CONFIG_VIDEO_DT3155=m CONFIG_DT3155_CCIR=y CONFIG_DT3155_STREAMING=y -CONFIG_EASYCAP=m -# CONFIG_EASYCAP_DEBUG is not set CONFIG_VIDEO_GO7007=m CONFIG_VIDEO_GO7007_USB=m # CONFIG_VIDEO_GO7007_USB_S2250_BOARD is not set @@ -4991,7 +4970,6 @@ CONFIG_LIRC_SASEM=m CONFIG_LIRC_SERIAL=m CONFIG_LIRC_SERIAL_TRANSMITTER=y CONFIG_LIRC_SIR=m -CONFIG_LIRC_TTUSBIR=m CONFIG_LIRC_ZILOG=m # @@ -5011,6 +4989,11 @@ CONFIG_WIMAX_GDM72XX_USB=y # CONFIG_WIMAX_GDM72XX_SDIO is not set CONFIG_WIMAX_GDM72XX_USB_PM=y CONFIG_CSR_WIFI=m +CONFIG_NET_VENDOR_SILICOM=y +CONFIG_SBYPASS=m +CONFIG_BPCTL=m +CONFIG_CED1401=m +CONFIG_DGRP=m CONFIG_X86_PLATFORM_DEVICES=y CONFIG_ACER_WMI=m CONFIG_ACERHDF=m @@ -5078,6 +5061,8 @@ CONFIG_IRQ_REMAP=y # # Remoteproc drivers (EXPERIMENTAL) # +CONFIG_REMOTEPROC=m +CONFIG_STE_MODEM_RPROC=m # # Rpmsg drivers (EXPERIMENTAL) @@ -5283,7 +5268,11 @@ CONFIG_NFS_V3=m CONFIG_NFS_V3_ACL=y CONFIG_NFS_V4=m # CONFIG_NFS_SWAP is not set -# CONFIG_NFS_V4_1 is not set +CONFIG_NFS_V4_1=y +CONFIG_PNFS_FILE_LAYOUT=m +CONFIG_PNFS_BLOCK=m +CONFIG_PNFS_OBJLAYOUT=m +CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org" CONFIG_NFS_FSCACHE=y # CONFIG_NFS_USE_LEGACY_DNS is not set CONFIG_NFS_USE_KERNEL_DNS=y @@ -5299,6 +5288,7 @@ CONFIG_NFS_ACL_SUPPORT=m CONFIG_NFS_COMMON=y CONFIG_SUNRPC=m CONFIG_SUNRPC_GSS=m +CONFIG_SUNRPC_BACKCHANNEL=y CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_SUNRPC_DEBUG is not set CONFIG_CEPH_FS=m @@ -5309,10 +5299,11 @@ CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_UPCALL=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y +CONFIG_CIFS_ACL=y # CONFIG_CIFS_DEBUG2 is not set CONFIG_CIFS_DFS_UPCALL=y +CONFIG_CIFS_SMB2=y CONFIG_CIFS_FSCACHE=y -CONFIG_CIFS_ACL=y CONFIG_NCP_FS=m # CONFIG_NCPFS_PACKET_SIGNING is not set # CONFIG_NCPFS_IOCTL_LOCKING is not set @@ -5419,6 +5410,7 @@ CONFIG_TIMER_STATS=y # CONFIG_DEBUG_OBJECTS is not set # CONFIG_SLUB_DEBUG_ON is not set # CONFIG_SLUB_STATS is not set +CONFIG_HAVE_DEBUG_KMEMLEAK=y # CONFIG_DEBUG_KMEMLEAK is not set # CONFIG_DEBUG_PREEMPT is not set # CONFIG_DEBUG_RT_MUTEXES is not set @@ -5427,6 +5419,7 @@ CONFIG_TIMER_STATS=y CONFIG_DEBUG_MUTEXES=y # CONFIG_DEBUG_LOCK_ALLOC is not set # CONFIG_PROVE_LOCKING is not set +# CONFIG_PROVE_RCU_DELAY is not set # CONFIG_SPARSE_RCU_POINTER is not set # CONFIG_LOCK_STAT is not set # CONFIG_DEBUG_ATOMIC_SLEEP is not set @@ -5472,8 +5465,10 @@ CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y +CONFIG_HAVE_FENTRY=y CONFIG_HAVE_C_RECORDMCOUNT=y CONFIG_TRACER_MAX_TRACE=y +CONFIG_TRACE_CLOCK=y CONFIG_RING_BUFFER=y CONFIG_EVENT_TRACING=y CONFIG_EVENT_POWER_TRACING_DEPRECATED=y @@ -5504,9 +5499,11 @@ CONFIG_FTRACE_MCOUNT_RECORD=y CONFIG_MMIOTRACE=y # CONFIG_MMIOTRACE_TEST is not set CONFIG_RING_BUFFER_BENCHMARK=m +# CONFIG_RBTREE_TEST is not set +# CONFIG_INTERVAL_TREE_TEST is not set # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set -# CONFIG_DYNAMIC_DEBUG is not set +CONFIG_DYNAMIC_DEBUG=y # CONFIG_DMA_API_DEBUG is not set # CONFIG_ATOMIC64_SELFTEST is not set CONFIG_ASYNC_RAID6_TEST=m @@ -5663,7 +5660,7 @@ CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m # # Ciphers # -CONFIG_CRYPTO_AES=m +CONFIG_CRYPTO_AES=y CONFIG_CRYPTO_AES_X86_64=m CONFIG_CRYPTO_AES_NI_INTEL=m CONFIG_CRYPTO_ANUBIS=m @@ -5674,7 +5671,9 @@ CONFIG_CRYPTO_BLOWFISH_X86_64=m CONFIG_CRYPTO_CAMELLIA=m CONFIG_CRYPTO_CAMELLIA_X86_64=m CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST5_AVX_X86_64=m CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_CAST6_AVX_X86_64=m CONFIG_CRYPTO_DES=m CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_KHAZAD=m @@ -5709,6 +5708,10 @@ CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_DEV_PADLOCK=m CONFIG_CRYPTO_DEV_PADLOCK_AES=m CONFIG_CRYPTO_DEV_PADLOCK_SHA=m +CONFIG_ASYMMETRIC_KEY_TYPE=m +CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m +CONFIG_PUBLIC_KEY_ALGO_RSA=m +CONFIG_X509_CERTIFICATE_PARSER=m CONFIG_HAVE_KVM=y CONFIG_HAVE_KVM_IRQCHIP=y CONFIG_HAVE_KVM_EVENTFD=y @@ -5716,6 +5719,7 @@ CONFIG_KVM_APIC_ARCHITECTURE=y CONFIG_KVM_MMIO=y CONFIG_KVM_ASYNC_PF=y CONFIG_HAVE_KVM_MSI=y +CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y CONFIG_VIRTUALIZATION=y CONFIG_KVM=m CONFIG_KVM_INTEL=m @@ -5789,5 +5793,8 @@ CONFIG_NLATTR=y CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y CONFIG_LRU_CACHE=m CONFIG_AVERAGE=y +CONFIG_CLZ_TAB=y CONFIG_CORDIC=m CONFIG_DDR=y +CONFIG_MPILIB=m +CONFIG_OID_REGISTRY=m diff --git a/libre/linux-libre/drm-fix-track-free-areas-3.7.patch b/libre/linux-libre/drm-fix-track-free-areas-3.7.patch new file mode 100644 index 000000000..6d00c6d3e --- /dev/null +++ b/libre/linux-libre/drm-fix-track-free-areas-3.7.patch @@ -0,0 +1,153 @@ +From 9ff0ab9881bd47f7d8a95c07a2fa61f594a91d0a Mon Sep 17 00:00:00 2001 +From: Chris Wilson <chris@chris-wilson.co.uk> +Date: Sun, 16 Dec 2012 16:15:00 +0000 +Subject: [PATCH] drm: Only evict the blocks required to create the requested + hole + +Avoid clobbering adjacent blocks if they happen to expire earlier and +amalgamate together to form the requested hole. + +In passing this fixes a regression from +commit ea7b1dd44867e9cd6bac67e7c9fc3f128b5b255c +Author: Daniel Vetter <daniel.vetter@ffwll.ch> +Date: Fri Feb 18 17:59:12 2011 +0100 + + drm: mm: track free areas implicitly + +which swaps the end address for size (with a potential overflow) and +effectively causes the eviction code to clobber almost all earlier +buffers above the evictee. + +v2: Check the original hole not the adjusted as the coloring may confuse +us when later searching for the overlapping nodes. Also make sure that +we do apply the range restriction and color adjustment in the same +order for both scanning, searching and insertion. + +Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> +Cc: Daniel Vetter <daniel.vetter@ffwll.ch> +--- + drivers/gpu/drm/drm_mm.c | 45 +++++++++++++++++---------------------------- + include/drm/drm_mm.h | 2 +- + 2 files changed, 18 insertions(+), 29 deletions(-) + +diff --git a/drivers/gpu/drm/drm_mm.c b/drivers/gpu/drm/drm_mm.c +index 0761a03..665553c 100644 +--- a/drivers/gpu/drm/drm_mm.c ++++ b/drivers/gpu/drm/drm_mm.c +@@ -213,11 +213,13 @@ static void drm_mm_insert_helper_range(struct drm_mm_node *hole_node, + + BUG_ON(!hole_node->hole_follows || node->allocated); + +- if (mm->color_adjust) +- mm->color_adjust(hole_node, color, &adj_start, &adj_end); +- + if (adj_start < start) + adj_start = start; ++ if (adj_end > end) ++ adj_end = end; ++ ++ if (mm->color_adjust) ++ mm->color_adjust(hole_node, color, &adj_start, &adj_end); + + if (alignment) { + unsigned tmp = adj_start % alignment; +@@ -489,7 +491,7 @@ void drm_mm_init_scan(struct drm_mm *mm, + mm->scan_size = size; + mm->scanned_blocks = 0; + mm->scan_hit_start = 0; +- mm->scan_hit_size = 0; ++ mm->scan_hit_end = 0; + mm->scan_check_range = 0; + mm->prev_scanned_node = NULL; + } +@@ -516,7 +518,7 @@ void drm_mm_init_scan_with_range(struct drm_mm *mm, + mm->scan_size = size; + mm->scanned_blocks = 0; + mm->scan_hit_start = 0; +- mm->scan_hit_size = 0; ++ mm->scan_hit_end = 0; + mm->scan_start = start; + mm->scan_end = end; + mm->scan_check_range = 1; +@@ -535,8 +537,7 @@ int drm_mm_scan_add_block(struct drm_mm_node *node) + struct drm_mm *mm = node->mm; + struct drm_mm_node *prev_node; + unsigned long hole_start, hole_end; +- unsigned long adj_start; +- unsigned long adj_end; ++ unsigned long adj_start, adj_end; + + mm->scanned_blocks++; + +@@ -553,14 +554,8 @@ int drm_mm_scan_add_block(struct drm_mm_node *node) + node->node_list.next = &mm->prev_scanned_node->node_list; + mm->prev_scanned_node = node; + +- hole_start = drm_mm_hole_node_start(prev_node); +- hole_end = drm_mm_hole_node_end(prev_node); +- +- adj_start = hole_start; +- adj_end = hole_end; +- +- if (mm->color_adjust) +- mm->color_adjust(prev_node, mm->scan_color, &adj_start, &adj_end); ++ adj_start = hole_start = drm_mm_hole_node_start(prev_node); ++ adj_end = hole_end = drm_mm_hole_node_end(prev_node); + + if (mm->scan_check_range) { + if (adj_start < mm->scan_start) +@@ -569,11 +564,14 @@ int drm_mm_scan_add_block(struct drm_mm_node *node) + adj_end = mm->scan_end; + } + ++ if (mm->color_adjust) ++ mm->color_adjust(prev_node, mm->scan_color, ++ &adj_start, &adj_end); ++ + if (check_free_hole(adj_start, adj_end, + mm->scan_size, mm->scan_alignment)) { + mm->scan_hit_start = hole_start; +- mm->scan_hit_size = hole_end; +- ++ mm->scan_hit_end = hole_end; + return 1; + } + +@@ -609,19 +607,10 @@ int drm_mm_scan_remove_block(struct drm_mm_node *node) + node_list); + + prev_node->hole_follows = node->scanned_preceeds_hole; +- INIT_LIST_HEAD(&node->node_list); + list_add(&node->node_list, &prev_node->node_list); + +- /* Only need to check for containement because start&size for the +- * complete resulting free block (not just the desired part) is +- * stored. */ +- if (node->start >= mm->scan_hit_start && +- node->start + node->size +- <= mm->scan_hit_start + mm->scan_hit_size) { +- return 1; +- } +- +- return 0; ++ return (drm_mm_hole_node_end(node) > mm->scan_hit_start && ++ node->start < mm->scan_hit_end); + } + EXPORT_SYMBOL(drm_mm_scan_remove_block); + +diff --git a/include/drm/drm_mm.h b/include/drm/drm_mm.h +index 06d7f79..a1b66b7 100644 +--- a/include/drm/drm_mm.h ++++ b/include/drm/drm_mm.h +@@ -70,7 +70,7 @@ struct drm_mm { + unsigned long scan_color; + unsigned long scan_size; + unsigned long scan_hit_start; +- unsigned scan_hit_size; ++ unsigned long scan_hit_end; + unsigned scanned_blocks; + unsigned long scan_start; + unsigned long scan_end; +-- +1.7.10.4 + diff --git a/libre/linux-libre/fix-watchdog-3.7.patch b/libre/linux-libre/fix-watchdog-3.7.patch new file mode 100644 index 000000000..fe4431604 --- /dev/null +++ b/libre/linux-libre/fix-watchdog-3.7.patch @@ -0,0 +1,38 @@ +X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux.git;a=blobdiff_plain;f=kernel%2Fwatchdog.c;h=75a2ab3d0b0208dfa51e40339ffd00206622732e;hp=997c6a16ec2278969a10f251f63f237e7559d42e;hb=3935e89505a1c3ab3f3b0c7ef0eae54124f48905;hpb=74779e22261172ea728b989310f6ecc991b57d62 + +diff --git a/kernel/watchdog.c b/kernel/watchdog.c +index 997c6a1..75a2ab3 100644 +--- a/kernel/watchdog.c ++++ b/kernel/watchdog.c +@@ -344,6 +344,10 @@ static void watchdog_enable(unsigned int cpu) + { + struct hrtimer *hrtimer = &__raw_get_cpu_var(watchdog_hrtimer); + ++ /* kick off the timer for the hardlockup detector */ ++ hrtimer_init(hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); ++ hrtimer->function = watchdog_timer_fn; ++ + if (!watchdog_enabled) { + kthread_park(current); + return; +@@ -352,10 +356,6 @@ static void watchdog_enable(unsigned int cpu) + /* Enable the perf event */ + watchdog_nmi_enable(cpu); + +- /* kick off the timer for the hardlockup detector */ +- hrtimer_init(hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); +- hrtimer->function = watchdog_timer_fn; +- + /* done here because hrtimer_start can only pin to smp_processor_id() */ + hrtimer_start(hrtimer, ns_to_ktime(sample_period), + HRTIMER_MODE_REL_PINNED); +@@ -369,9 +369,6 @@ static void watchdog_disable(unsigned int cpu) + { + struct hrtimer *hrtimer = &__raw_get_cpu_var(watchdog_hrtimer); + +- if (!watchdog_enabled) +- return; +- + watchdog_set_prio(SCHED_NORMAL, 0); + hrtimer_cancel(hrtimer); + /* disable the perf event */ diff --git a/libre/linux-libre/irq_cfg_pointer-3.6.6.patch b/libre/linux-libre/irq_cfg_pointer-3.6.6.patch deleted file mode 100644 index 32583c0ac..000000000 --- a/libre/linux-libre/irq_cfg_pointer-3.6.6.patch +++ /dev/null @@ -1,16 +0,0 @@ -X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux.git;a=blobdiff_plain;f=arch%2Fx86%2Fkernel%2Fapic%2Fio_apic.c;h=1817fa911024f07151d3edf91bd350722c9f79f8;hp=c265593ec2cdc3df35fda1586aaf91514fab62fa;hb=94777fc51b3ad85ff9f705ddf7cdd0eb3bbad5a6;hpb=3e8fa263a97079c74880675c451587bb6899e661 - -diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c -index c265593..1817fa9 100644 ---- a/arch/x86/kernel/apic/io_apic.c -+++ b/arch/x86/kernel/apic/io_apic.c -@@ -2257,6 +2257,9 @@ asmlinkage void smp_irq_move_cleanup_interrupt(void) - continue; - - cfg = irq_cfg(irq); -+ if (!cfg) -+ continue; -+ - raw_spin_lock(&desc->lock); - - /* diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index 1e065da77..e958abbf4 100755..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.6.10-1-LIBRE +KERNEL_VERSION=3.7.2-1-LIBRE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/linux-libre/linux-libre.preset b/libre/linux-libre/linux-libre.preset index 0ac59eb14..0ac59eb14 100755..100644 --- a/libre/linux-libre/linux-libre.preset +++ b/libre/linux-libre/linux-libre.preset diff --git a/libre/linux-libre/module-init-wait-3.6.patch b/libre/linux-libre/module-init-wait-3.6.patch deleted file mode 100644 index 1bcfd2491..000000000 --- a/libre/linux-libre/module-init-wait-3.6.patch +++ /dev/null @@ -1,77 +0,0 @@ -From: Rusty Russell <rusty@rustcorp.com.au> -Date: Fri, 28 Sep 2012 05:01:03 +0000 (+0930) -Subject: module: wait when loading a module which is currently initializing. -X-Git-Tag: v3.7-rc1~2^2~32 -X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=9bb9c3be568346538 - -module: wait when loading a module which is currently initializing. - -The original module-init-tools module loader used a fnctl lock on the -.ko file to avoid attempts to simultaneously load a module. -Unfortunately, you can't get an exclusive fcntl lock on a read-only -fd, making this not work for read-only mounted filesystems. -module-init-tools has a hacky sleep-and-loop for this now. - -It's not that hard to wait in the kernel, and only return -EEXIST once -the first module has finished loading (or continue loading the module -if the first one failed to initialize for some reason). It's also -consistent with what we do for dependent modules which are still loading. - -Suggested-by: Lucas De Marchi <lucas.demarchi@profusion.mobi> -Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> ---- - -diff --git a/kernel/module.c b/kernel/module.c -index 63cf6e7..74bc195 100644 ---- a/kernel/module.c -+++ b/kernel/module.c -@@ -2845,6 +2845,20 @@ static int post_relocation(struct module *mod, const struct load_info *info) - return module_finalize(info->hdr, info->sechdrs, mod); - } - -+/* Is this module of this name done loading? No locks held. */ -+static bool finished_loading(const char *name) -+{ -+ struct module *mod; -+ bool ret; -+ -+ mutex_lock(&module_mutex); -+ mod = find_module(name); -+ ret = !mod || mod->state != MODULE_STATE_COMING; -+ mutex_unlock(&module_mutex); -+ -+ return ret; -+} -+ - /* Allocate and load the module: note that size of section 0 is always - zero, and we rely on this for optional sections. */ - static struct module *load_module(void __user *umod, -@@ -2852,7 +2866,7 @@ static struct module *load_module(void __user *umod, - const char __user *uargs) - { - struct load_info info = { NULL, }; -- struct module *mod; -+ struct module *mod, *old; - long err; - - pr_debug("load_module: umod=%p, len=%lu, uargs=%p\n", -@@ -2918,8 +2932,18 @@ static struct module *load_module(void __user *umod, - * function to insert in a way safe to concurrent readers. - * The mutex protects against concurrent writers. - */ -+again: - mutex_lock(&module_mutex); -- if (find_module(mod->name)) { -+ if ((old = find_module(mod->name)) != NULL) { -+ if (old->state == MODULE_STATE_COMING) { -+ /* Wait in case it fails to load. */ -+ mutex_unlock(&module_mutex); -+ err = wait_event_interruptible(module_wq, -+ finished_loading(mod->name)); -+ if (err) -+ goto free_arch_cleanup; -+ goto again; -+ } - err = -EEXIST; - goto unlock; - } diff --git a/libre/linux-libre/module-symbol-waiting-3.6.patch b/libre/linux-libre/module-symbol-waiting-3.6.patch deleted file mode 100644 index b87a38ff5..000000000 --- a/libre/linux-libre/module-symbol-waiting-3.6.patch +++ /dev/null @@ -1,66 +0,0 @@ -From: Rusty Russell <rusty@rustcorp.com.au> -Date: Fri, 28 Sep 2012 05:01:03 +0000 (+0930) -Subject: module: fix symbol waiting when module fails before init -X-Git-Tag: v3.7-rc1~2^2~33 -X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=6f13909f4fe9652f1 - -module: fix symbol waiting when module fails before init - -We use resolve_symbol_wait(), which blocks if the module containing -the symbol is still loading. However: - -1) The module_wq we use is only woken after calling the modules' init - function, but there are other failure paths after the module is - placed in the linked list where we need to do the same thing. - -2) wake_up() only wakes one waiter, and our waitqueue is shared by all - modules, so we need to wake them all. - -3) wake_up_all() doesn't imply a memory barrier: I feel happier calling - it after we've grabbed and dropped the module_mutex, not just after - the state assignment. - -Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> ---- - -diff --git a/kernel/module.c b/kernel/module.c -index 7f2ee45f..63cf6e7 100644 ---- a/kernel/module.c -+++ b/kernel/module.c -@@ -2959,7 +2959,7 @@ static struct module *load_module(void __user *umod, - /* Unlink carefully: kallsyms could be walking list. */ - list_del_rcu(&mod->list); - module_bug_cleanup(mod); -- -+ wake_up_all(&module_wq); - ddebug: - dynamic_debug_remove(info.debug); - unlock: -@@ -3034,7 +3034,7 @@ SYSCALL_DEFINE3(init_module, void __user *, umod, - blocking_notifier_call_chain(&module_notify_list, - MODULE_STATE_GOING, mod); - free_module(mod); -- wake_up(&module_wq); -+ wake_up_all(&module_wq); - return ret; - } - if (ret > 0) { -@@ -3046,9 +3046,8 @@ SYSCALL_DEFINE3(init_module, void __user *, umod, - dump_stack(); - } - -- /* Now it's a first class citizen! Wake up anyone waiting for it. */ -+ /* Now it's a first class citizen! */ - mod->state = MODULE_STATE_LIVE; -- wake_up(&module_wq); - blocking_notifier_call_chain(&module_notify_list, - MODULE_STATE_LIVE, mod); - -@@ -3071,6 +3070,7 @@ SYSCALL_DEFINE3(init_module, void __user *, umod, - mod->init_ro_size = 0; - mod->init_text_size = 0; - mutex_unlock(&module_mutex); -+ wake_up_all(&module_wq); - - return 0; - } diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD index 2d7f3be5f..7da492643 100755..100644 --- a/libre/lirc-libre/PKGBUILD +++ b/libre/lirc-libre/PKGBUILD @@ -6,14 +6,14 @@ _pkgbase=lirc pkgbase=lirc-libre pkgname=('lirc-libre' 'lirc-utils-libre') pkgver=0.9.0 -pkgrel=34 +pkgrel=35.1 epoch=1 -_extramodules=extramodules-3.6-LIBRE +_extramodules=extramodules-3.7-LIBRE arch=('i686' 'x86_64' 'mips64el') url="http://www.lirc.org/" license=('GPL') ### NOTICE don't forget to bump version in depends in package_lirc -makedepends=('help2man' 'linux-libre-headers>=3.6' 'linux-libre-headers<3.7' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2') +makedepends=('help2man' 'linux-libre-headers>=3.7' 'linux-libre-headers<3.8' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2') options=('!makeflags' '!strip') source=(http://prdownloads.sourceforge.net/${_pkgbase}/${_pkgbase}-${pkgver}.tar.bz2 lirc_wpc8769l.patch @@ -55,8 +55,8 @@ build() { } package_lirc-libre() { - pkgdesc="Linux-libre Infrared Remote Control kernel modules for stock kernel libre" - depends=('lirc-utils-libre' 'linux-libre>=3.6' 'linux-libre<3.7') + pkgdesc="Linux Infrared Remote Control kernel modules for stock kernel (built for the linux-libre kernel package) " + depends=('lirc-utils-libre' 'linux-libre>=3.7' 'linux-libre<3.8') replaces=('lirc' 'lirc+pctv') conflicts=('lirc') provides=("lirc=$pkgver") @@ -72,7 +72,7 @@ package_lirc-libre() { } package_lirc-utils-libre() { - pkgdesc="Linux-libre Infrared Remote Control utils" + pkgdesc="Linux Infrared Remote Control utils" depends=('alsa-lib' 'libx11' 'libftdi' 'libirman') optdepends=('python2: pronto2lirc utility') options=('strip' '!libtool') diff --git a/libre/lirc-libre/irexec.conf b/libre/lirc-libre/irexec.conf index f911c7515..f911c7515 100755..100644 --- a/libre/lirc-libre/irexec.conf +++ b/libre/lirc-libre/irexec.conf diff --git a/libre/lirc-libre/irexecd b/libre/lirc-libre/irexecd index a64b033a5..a64b033a5 100755..100644 --- a/libre/lirc-libre/irexecd +++ b/libre/lirc-libre/irexecd diff --git a/libre/lirc-libre/kernel-2.6.39.patch b/libre/lirc-libre/kernel-2.6.39.patch index 7353d61ca..7353d61ca 100755..100644 --- a/libre/lirc-libre/kernel-2.6.39.patch +++ b/libre/lirc-libre/kernel-2.6.39.patch diff --git a/libre/lirc-libre/lirc.install b/libre/lirc-libre/lirc.install index 976f5ab8a..a6694836f 100755..100644 --- a/libre/lirc-libre/lirc.install +++ b/libre/lirc-libre/lirc.install @@ -1,4 +1,4 @@ -EXTRAMODULES=extramodules-3.6-LIBRE +EXTRAMODULES=extramodules-3.7-LIBRE post_install() { # updating module dependencies diff --git a/libre/lirc-libre/lirc.logrotate b/libre/lirc-libre/lirc.logrotate index 623c4f328..623c4f328 100755..100644 --- a/libre/lirc-libre/lirc.logrotate +++ b/libre/lirc-libre/lirc.logrotate diff --git a/libre/lirc-libre/lirc_atiusb-kfifo.patch b/libre/lirc-libre/lirc_atiusb-kfifo.patch index a64984dce..a64984dce 100755..100644 --- a/libre/lirc-libre/lirc_atiusb-kfifo.patch +++ b/libre/lirc-libre/lirc_atiusb-kfifo.patch diff --git a/libre/lirc-libre/lirc_wpc8769l.patch b/libre/lirc-libre/lirc_wpc8769l.patch index e4e2a049b..e4e2a049b 100755..100644 --- a/libre/lirc-libre/lirc_wpc8769l.patch +++ b/libre/lirc-libre/lirc_wpc8769l.patch diff --git a/libre/lirc-libre/lircd b/libre/lirc-libre/lircd index e9739b36e..e9739b36e 100755..100644 --- a/libre/lirc-libre/lircd +++ b/libre/lirc-libre/lircd diff --git a/libre/lirc-libre/lircd-handle-large-config.patch b/libre/lirc-libre/lircd-handle-large-config.patch index 85bc20518..85bc20518 100755..100644 --- a/libre/lirc-libre/lircd-handle-large-config.patch +++ b/libre/lirc-libre/lircd-handle-large-config.patch diff --git a/libre/lirc-libre/lircd.conf b/libre/lirc-libre/lircd.conf index 760dab065..760dab065 100755..100644 --- a/libre/lirc-libre/lircd.conf +++ b/libre/lirc-libre/lircd.conf diff --git a/libre/lirc-libre/lircmd b/libre/lirc-libre/lircmd index 220c47c9c..220c47c9c 100755..100644 --- a/libre/lirc-libre/lircmd +++ b/libre/lirc-libre/lircmd diff --git a/libre/lsb-release-libre/PKGBUILD b/libre/lsb-release-libre/PKGBUILD index 51ec79bea..51ec79bea 100755..100644 --- a/libre/lsb-release-libre/PKGBUILD +++ b/libre/lsb-release-libre/PKGBUILD diff --git a/libre/lsb-release-libre/lsb-release.install b/libre/lsb-release-libre/lsb-release.install index 62d404892..62d404892 100755..100644 --- a/libre/lsb-release-libre/lsb-release.install +++ b/libre/lsb-release-libre/lsb-release.install diff --git a/libre/mariadb/PKGBUILD b/libre/mariadb/PKGBUILD index a5b733e9f..a5b733e9f 100755..100644 --- a/libre/mariadb/PKGBUILD +++ b/libre/mariadb/PKGBUILD diff --git a/libre/mariadb/mariadb.install b/libre/mariadb/mariadb.install index f56a0dcaa..f56a0dcaa 100755..100644 --- a/libre/mariadb/mariadb.install +++ b/libre/mariadb/mariadb.install diff --git a/libre/mariadb/my.cnf b/libre/mariadb/my.cnf index 9a41b4fc3..9a41b4fc3 100755..100644 --- a/libre/mariadb/my.cnf +++ b/libre/mariadb/my.cnf diff --git a/libre/mariadb/mysql.install b/libre/mariadb/mysql.install index 9a4479215..9a4479215 100755..100644 --- a/libre/mariadb/mysql.install +++ b/libre/mariadb/mysql.install diff --git a/libre/mariadb/mysqld b/libre/mariadb/mysqld index 1ac88a7cc..1ac88a7cc 100755..100644 --- a/libre/mariadb/mysqld +++ b/libre/mariadb/mysqld diff --git a/libre/mesa-demos-libre/LICENSE b/libre/mesa-demos-libre/LICENSE index ae33d2709..ae33d2709 100755..100644 --- a/libre/mesa-demos-libre/LICENSE +++ b/libre/mesa-demos-libre/LICENSE diff --git a/libre/mesa-demos-libre/PKGBUILD b/libre/mesa-demos-libre/PKGBUILD index 31170b19f..31170b19f 100755..100644 --- a/libre/mesa-demos-libre/PKGBUILD +++ b/libre/mesa-demos-libre/PKGBUILD diff --git a/libre/mesa-demos-libre/mesa-demos-libre.patch b/libre/mesa-demos-libre/mesa-demos-libre.patch index c5261f8e9..c5261f8e9 100755..100644 --- a/libre/mesa-demos-libre/mesa-demos-libre.patch +++ b/libre/mesa-demos-libre/mesa-demos-libre.patch diff --git a/libre/mozilla-devscripts/PKGBUILD b/libre/mozilla-devscripts/PKGBUILD deleted file mode 100755 index ef7ea7641..000000000 --- a/libre/mozilla-devscripts/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# Maintainer: Michał Masłowski <mtjm@mtjm.eu> -# Contributor: Márcio Silva <coadde@lavabit.com> - -pkgname=mozilla-devscripts -pkgver=0.32 -pkgrel=1 -pkgdesc="Development scripts used by Debian Mozilla's addons packages" -arch=("any") -url="http://packages.debian.org/source/unstable/mozilla-devscripts" -license=('GPL' 'custom') -depends=("python2" "zip" "unzip") -_debrepo=http://ftp.debian.org/debian/pool/main/ -source=("${_debrepo}/m/${pkgname}/${pkgname}_${pkgver}.dsc" - "${_debrepo}/m/${pkgname}/${pkgname}_${pkgver}.tar.gz") -md5sums=("386a5854601f29dca4a293f90f6c2a69" - "230126afa15fa654eb254bb4e61b4a93") - -build() { - cd "$srcdir/$pkgname-$pkgver" - # Adapt it to Arch's Python naming. - find . -type f | xargs -L1 sed -i "s:#!/usr/bin/python:#!/usr/bin/python2:" -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - # The Makefile expects the system to have standard Python name, so - # do this directly here. - python2 setup.py install --root="$pkgdir/" - install -Dm644 debian/copyright "${pkgdir}/usr/share/licenses/${pkgname}/copyright" -} - -# vim:set ts=2 sw=2 et: diff --git a/libre/mozilla-searchplugins/PKGBUILD b/libre/mozilla-searchplugins/PKGBUILD index 3810fe495..4e4f94494 100644 --- a/libre/mozilla-searchplugins/PKGBUILD +++ b/libre/mozilla-searchplugins/PKGBUILD @@ -10,7 +10,7 @@ pkgname=mozilla-searchplugins pkgver=1.3 -pkgrel=2 +pkgrel=4 pkgdesc="System-wide OpenSearch plugins common for Mozilla based browsers." arch=('any') license=('MPL' 'GPL' 'LGPL') @@ -23,7 +23,7 @@ source=( jamendo.ico::http://www.jamendo.com/favicon.ico parabola-packages.xml parabola-wiki-en.xml - seeks-search.xml::http://www.seeks-project.info/search.php/opensearch.xml + seeks-search.xml::http://www.seeks.fr/opensearch.xml yacybluebox.xml::http://yacy.dyndns.org:8000/opensearchdescription.xml wikipedia-en.xml::https://en.wikipedia.org/w/opensearch_desc.php ) @@ -45,6 +45,6 @@ md5sums=('b4cc6bd8353af36ade441916217619e4' 'e50a847cec81357e8730e0d327515a9c' '3c4a7f901bfe9000a702c68f7f78428c' '5bf9ca2558026fa3f4ec52d8e64fee47' - '3c68938db88b6ea552742718a08f3bf8' + 'dc6c76acf4c68a40710383513d72fa8b' 'bdb2640c643493063051bc72eeeff920' 'cb281f07933210c812a6153f32109645') diff --git a/libre/mplayer-libre/.directory b/libre/mplayer-libre/.directory deleted file mode 100755 index b3a1c5dc3..000000000 --- a/libre/mplayer-libre/.directory +++ /dev/null @@ -1,3 +0,0 @@ -[Dolphin] -Timestamp=2012,11,17,0,31,48 -Version=3 diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD index 583b679ca..583b679ca 100755..100644 --- a/libre/mplayer-libre/PKGBUILD +++ b/libre/mplayer-libre/PKGBUILD diff --git a/libre/mplayer-libre/mplayer.desktop b/libre/mplayer-libre/mplayer.desktop index 07acea13f..07acea13f 100755..100644 --- a/libre/mplayer-libre/mplayer.desktop +++ b/libre/mplayer-libre/mplayer.desktop diff --git a/libre/mplayer-libre/mplayer.install b/libre/mplayer-libre/mplayer.install index 660593cf5..660593cf5 100755..100644 --- a/libre/mplayer-libre/mplayer.install +++ b/libre/mplayer-libre/mplayer.install diff --git a/libre/mplayer-libre/mplayer.png b/libre/mplayer-libre/mplayer.png Binary files differindex 799769335..799769335 100755..100644 --- a/libre/mplayer-libre/mplayer.png +++ b/libre/mplayer-libre/mplayer.png diff --git a/libre/mplayer-vaapi-libre/PKGBUILD b/libre/mplayer-vaapi-libre/PKGBUILD index c5b33cf75..c5b33cf75 100755..100644 --- a/libre/mplayer-vaapi-libre/PKGBUILD +++ b/libre/mplayer-vaapi-libre/PKGBUILD diff --git a/libre/mplayer-vaapi-libre/mplayer-vaapi.install b/libre/mplayer-vaapi-libre/mplayer-vaapi.install index a44f19aef..a44f19aef 100755..100644 --- a/libre/mplayer-vaapi-libre/mplayer-vaapi.install +++ b/libre/mplayer-vaapi-libre/mplayer-vaapi.install diff --git a/libre/mplayer-vaapi-libre/tweak-desktop-file.patch b/libre/mplayer-vaapi-libre/tweak-desktop-file.patch index 606e356b0..606e356b0 100755..100644 --- a/libre/mplayer-vaapi-libre/tweak-desktop-file.patch +++ b/libre/mplayer-vaapi-libre/tweak-desktop-file.patch diff --git a/libre/p7zip-libre/7zFM.desktop b/libre/p7zip-libre/7zFM.desktop index 62b8e8562..62b8e8562 100755..100644 --- a/libre/p7zip-libre/7zFM.desktop +++ b/libre/p7zip-libre/7zFM.desktop diff --git a/libre/p7zip-libre/9.04-makefile.patch b/libre/p7zip-libre/9.04-makefile.patch index 93a99cc90..93a99cc90 100755..100644 --- a/libre/p7zip-libre/9.04-makefile.patch +++ b/libre/p7zip-libre/9.04-makefile.patch diff --git a/libre/p7zip-libre/PKGBUILD b/libre/p7zip-libre/PKGBUILD index 2e6ab6e01..2e6ab6e01 100755..100644 --- a/libre/p7zip-libre/PKGBUILD +++ b/libre/p7zip-libre/PKGBUILD diff --git a/libre/p7zip-libre/install b/libre/p7zip-libre/install index 7f3cc4358..7f3cc4358 100755..100644 --- a/libre/p7zip-libre/install +++ b/libre/p7zip-libre/install diff --git a/libre/p7zip-libre/p7zip-libre.patch b/libre/p7zip-libre/p7zip-libre.patch index 742faf52d..742faf52d 100755..100644 --- a/libre/p7zip-libre/p7zip-libre.patch +++ b/libre/p7zip-libre/p7zip-libre.patch diff --git a/libre/pacman-mirrorlist-libre/PKGBUILD b/libre/pacman-mirrorlist-libre/PKGBUILD index 9117277a7..9117277a7 100755..100644 --- a/libre/pacman-mirrorlist-libre/PKGBUILD +++ b/libre/pacman-mirrorlist-libre/PKGBUILD diff --git a/libre/pacman/0001-Add-conflict-for-replacing-owned-empty-directory.patch b/libre/pacman/0001-Add-conflict-for-replacing-owned-empty-directory.patch index 85622aaac..85622aaac 100755..100644 --- a/libre/pacman/0001-Add-conflict-for-replacing-owned-empty-directory.patch +++ b/libre/pacman/0001-Add-conflict-for-replacing-owned-empty-directory.patch diff --git a/libre/pacman/0002-Check-empty-subdirectory-ownership.patch b/libre/pacman/0002-Check-empty-subdirectory-ownership.patch index 6cf496d16..6cf496d16 100755..100644 --- a/libre/pacman/0002-Check-empty-subdirectory-ownership.patch +++ b/libre/pacman/0002-Check-empty-subdirectory-ownership.patch diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD index 85ae5cc5f..85ae5cc5f 100755..100644 --- a/libre/pacman/PKGBUILD +++ b/libre/pacman/PKGBUILD diff --git a/libre/pacman/makepkg.conf b/libre/pacman/makepkg.conf index 08a44167b..08a44167b 100755..100644 --- a/libre/pacman/makepkg.conf +++ b/libre/pacman/makepkg.conf diff --git a/libre/pacman/pacman.conf b/libre/pacman/pacman.conf index 115217b59..115217b59 100755..100644 --- a/libre/pacman/pacman.conf +++ b/libre/pacman/pacman.conf diff --git a/libre/pacman/pacman.conf.mips64el b/libre/pacman/pacman.conf.mips64el index f286c3290..f286c3290 100755..100644 --- a/libre/pacman/pacman.conf.mips64el +++ b/libre/pacman/pacman.conf.mips64el diff --git a/libre/pacman/pacman.conf.x86_64 b/libre/pacman/pacman.conf.x86_64 index 4c67b089f..4c67b089f 100755..100644 --- a/libre/pacman/pacman.conf.x86_64 +++ b/libre/pacman/pacman.conf.x86_64 diff --git a/libre/pacman/pacman.install b/libre/pacman/pacman.install index 5dc55c0c2..5dc55c0c2 100755..100644 --- a/libre/pacman/pacman.install +++ b/libre/pacman/pacman.install diff --git a/libre/pacman/rePKGBUILD b/libre/pacman/rePKGBUILD index 810eff5b9..810eff5b9 100755..100644 --- a/libre/pacman/rePKGBUILD +++ b/libre/pacman/rePKGBUILD diff --git a/libre/parabola-archiso-git/PKGBUILD b/libre/parabola-archiso-git/PKGBUILD index 0b07ddf8d..0b07ddf8d 100755..100644 --- a/libre/parabola-archiso-git/PKGBUILD +++ b/libre/parabola-archiso-git/PKGBUILD diff --git a/libre/parabola-archiso/PKGBUILD b/libre/parabola-archiso/PKGBUILD index 336892373..336892373 100755..100644 --- a/libre/parabola-archiso/PKGBUILD +++ b/libre/parabola-archiso/PKGBUILD diff --git a/libre/parabola-keyring/PKGBUILD b/libre/parabola-keyring/PKGBUILD index 8292119d8..8292119d8 100755..100644 --- a/libre/parabola-keyring/PKGBUILD +++ b/libre/parabola-keyring/PKGBUILD diff --git a/libre/parabola-keyring/parabola-keyring.install b/libre/parabola-keyring/parabola-keyring.install index 1c70f1a8d..1c70f1a8d 100755..100644 --- a/libre/parabola-keyring/parabola-keyring.install +++ b/libre/parabola-keyring/parabola-keyring.install diff --git a/libre/parabola-themes-slim/PKGBUILD b/libre/parabola-themes-slim/PKGBUILD index a921253da..a921253da 100755..100644 --- a/libre/parabola-themes-slim/PKGBUILD +++ b/libre/parabola-themes-slim/PKGBUILD diff --git a/libre/psutils-libre/PKGBUILD b/libre/psutils-libre/PKGBUILD index 3679222b1..3679222b1 100755..100644 --- a/libre/psutils-libre/PKGBUILD +++ b/libre/psutils-libre/PKGBUILD diff --git a/libre/psutils-libre/psutils-1.17.diff b/libre/psutils-libre/psutils-1.17.diff index 4af32bd7f..4af32bd7f 100755..100644 --- a/libre/psutils-libre/psutils-1.17.diff +++ b/libre/psutils-libre/psutils-1.17.diff diff --git a/libre/python2-ply/PKGBUILD b/libre/python2-ply/PKGBUILD index fec80926a..fec80926a 100755..100644 --- a/libre/python2-ply/PKGBUILD +++ b/libre/python2-ply/PKGBUILD diff --git a/libre/python2-reportlab-libre/PKGBUILD b/libre/python2-reportlab-libre/PKGBUILD index 27014d100..27014d100 100755..100644 --- a/libre/python2-reportlab-libre/PKGBUILD +++ b/libre/python2-reportlab-libre/PKGBUILD diff --git a/libre/rp-pppoe-libre/PKGBUILD b/libre/rp-pppoe-libre/PKGBUILD index f418684b5..f418684b5 100755..100644 --- a/libre/rp-pppoe-libre/PKGBUILD +++ b/libre/rp-pppoe-libre/PKGBUILD diff --git a/libre/rp-pppoe-libre/adsl b/libre/rp-pppoe-libre/adsl index 33bd91839..33bd91839 100755..100644 --- a/libre/rp-pppoe-libre/adsl +++ b/libre/rp-pppoe-libre/adsl diff --git a/libre/rp-pppoe-libre/rp-pppoe.install b/libre/rp-pppoe-libre/rp-pppoe.install index 1d4bccce2..1d4bccce2 100755..100644 --- a/libre/rp-pppoe-libre/rp-pppoe.install +++ b/libre/rp-pppoe-libre/rp-pppoe.install diff --git a/libre/sdl-libre/PKGBUILD b/libre/sdl-libre/PKGBUILD index 9822d5df7..9822d5df7 100755..100644 --- a/libre/sdl-libre/PKGBUILD +++ b/libre/sdl-libre/PKGBUILD diff --git a/libre/sdl-libre/sdl-1.2.14-disable-mmx.patch b/libre/sdl-libre/sdl-1.2.14-disable-mmx.patch index 1bb6e0e47..1bb6e0e47 100755..100644 --- a/libre/sdl-libre/sdl-1.2.14-disable-mmx.patch +++ b/libre/sdl-libre/sdl-1.2.14-disable-mmx.patch diff --git a/libre/sdl-libre/sdl-1.2.14-fix-mouse-clicking.patch b/libre/sdl-libre/sdl-1.2.14-fix-mouse-clicking.patch index 7d3e5acfc..7d3e5acfc 100755..100644 --- a/libre/sdl-libre/sdl-1.2.14-fix-mouse-clicking.patch +++ b/libre/sdl-libre/sdl-1.2.14-fix-mouse-clicking.patch diff --git a/libre/seamonkey-libre/PKGBUILD b/libre/seamonkey-libre/PKGBUILD index dd4bcd0a9..dd4bcd0a9 100755..100644 --- a/libre/seamonkey-libre/PKGBUILD +++ b/libre/seamonkey-libre/PKGBUILD diff --git a/libre/seamonkey-libre/clrf.patch b/libre/seamonkey-libre/clrf.patch index 5a77f2b01..5a77f2b01 100755..100644 --- a/libre/seamonkey-libre/clrf.patch +++ b/libre/seamonkey-libre/clrf.patch diff --git a/libre/seamonkey-libre/gcc47.patch b/libre/seamonkey-libre/gcc47.patch index 080502c23..080502c23 100755..100644 --- a/libre/seamonkey-libre/gcc47.patch +++ b/libre/seamonkey-libre/gcc47.patch diff --git a/libre/seamonkey-libre/gnuzilla-addons.patch b/libre/seamonkey-libre/gnuzilla-addons.patch index 32a28b3e4..32a28b3e4 100755..100644 --- a/libre/seamonkey-libre/gnuzilla-addons.patch +++ b/libre/seamonkey-libre/gnuzilla-addons.patch diff --git a/libre/seamonkey-libre/libvpx.patch b/libre/seamonkey-libre/libvpx.patch index d0f9a0f4c..d0f9a0f4c 100755..100644 --- a/libre/seamonkey-libre/libvpx.patch +++ b/libre/seamonkey-libre/libvpx.patch diff --git a/libre/seamonkey-libre/mozconfig b/libre/seamonkey-libre/mozconfig index 4d04c96d5..4d04c96d5 100755..100644 --- a/libre/seamonkey-libre/mozconfig +++ b/libre/seamonkey-libre/mozconfig diff --git a/libre/seamonkey-libre/python27.patch b/libre/seamonkey-libre/python27.patch index f00681fd2..f00681fd2 100755..100644 --- a/libre/seamonkey-libre/python27.patch +++ b/libre/seamonkey-libre/python27.patch diff --git a/libre/seamonkey-libre/seamonkey-2.0-lang.patch b/libre/seamonkey-libre/seamonkey-2.0-lang.patch index b9f4a5cde..b9f4a5cde 100755..100644 --- a/libre/seamonkey-libre/seamonkey-2.0-lang.patch +++ b/libre/seamonkey-libre/seamonkey-2.0-lang.patch diff --git a/libre/seamonkey-libre/seamonkey.desktop b/libre/seamonkey-libre/seamonkey.desktop index dd92a2432..dd92a2432 100755..100644 --- a/libre/seamonkey-libre/seamonkey.desktop +++ b/libre/seamonkey-libre/seamonkey.desktop diff --git a/libre/seamonkey-libre/seamonkey.install b/libre/seamonkey-libre/seamonkey.install index 709ad81f2..709ad81f2 100755..100644 --- a/libre/seamonkey-libre/seamonkey.install +++ b/libre/seamonkey-libre/seamonkey.install diff --git a/libre/syslinux/PKGBUILD b/libre/syslinux/PKGBUILD index b4e9fa35a..b4e9fa35a 100755..100644 --- a/libre/syslinux/PKGBUILD +++ b/libre/syslinux/PKGBUILD diff --git a/libre/syslinux/avoid-using-ext2_fs.patch b/libre/syslinux/avoid-using-ext2_fs.patch index 9a166eefc..9a166eefc 100755..100644 --- a/libre/syslinux/avoid-using-ext2_fs.patch +++ b/libre/syslinux/avoid-using-ext2_fs.patch diff --git a/libre/syslinux/fix-undefined-type-umode_t.patch b/libre/syslinux/fix-undefined-type-umode_t.patch index 33ac6d323..33ac6d323 100755..100644 --- a/libre/syslinux/fix-undefined-type-umode_t.patch +++ b/libre/syslinux/fix-undefined-type-umode_t.patch diff --git a/libre/syslinux/handle-ctors-dtors-via-init_array-and-fini_array.patch b/libre/syslinux/handle-ctors-dtors-via-init_array-and-fini_array.patch index aa513312b..aa513312b 100755..100644 --- a/libre/syslinux/handle-ctors-dtors-via-init_array-and-fini_array.patch +++ b/libre/syslinux/handle-ctors-dtors-via-init_array-and-fini_array.patch diff --git a/libre/syslinux/rePKGBUILD b/libre/syslinux/rePKGBUILD index 33a96d1a1..33a96d1a1 100755..100644 --- a/libre/syslinux/rePKGBUILD +++ b/libre/syslinux/rePKGBUILD diff --git a/libre/syslinux/splash.png b/libre/syslinux/splash.png Binary files differindex 43d4692ab..43d4692ab 100755..100644 --- a/libre/syslinux/splash.png +++ b/libre/syslinux/splash.png diff --git a/libre/syslinux/syslinux-dont-build-dos-windows-targets.patch b/libre/syslinux/syslinux-dont-build-dos-windows-targets.patch index 2b86ab828..2b86ab828 100755..100644 --- a/libre/syslinux/syslinux-dont-build-dos-windows-targets.patch +++ b/libre/syslinux/syslinux-dont-build-dos-windows-targets.patch diff --git a/libre/syslinux/syslinux-install_update b/libre/syslinux/syslinux-install_update index cd1baa572..cd1baa572 100755..100644 --- a/libre/syslinux/syslinux-install_update +++ b/libre/syslinux/syslinux-install_update diff --git a/libre/syslinux/syslinux.cfg b/libre/syslinux/syslinux.cfg index 5debfef9c..5debfef9c 100755..100644 --- a/libre/syslinux/syslinux.cfg +++ b/libre/syslinux/syslinux.cfg diff --git a/libre/syslinux/syslinux.install b/libre/syslinux/syslinux.install index 0dc0ece36..0dc0ece36 100755..100644 --- a/libre/syslinux/syslinux.install +++ b/libre/syslinux/syslinux.install diff --git a/libre/texlive-bin-libre/09-texlive-fonts.conf b/libre/texlive-bin-libre/09-texlive-fonts.conf index f870fbd7a..f870fbd7a 100755..100644 --- a/libre/texlive-bin-libre/09-texlive-fonts.conf +++ b/libre/texlive-bin-libre/09-texlive-fonts.conf diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD index 14ed8bdb1..4a9d427ef 100755..100644 --- a/libre/texlive-bin-libre/PKGBUILD +++ b/libre/texlive-bin-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 169309 2012-10-19 08:03:07Z eric $ +# $Id: PKGBUILD 174736 2013-01-05 21:14:18Z remy $ # Maintainer: Rémy Oudompheng <remy@archlinux.org> # Contributor: francois <francois.archlinux.org> # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu> @@ -6,11 +6,11 @@ pkgname=texlive-bin-libre pkgver=2012.0 -pkgrel=5 +pkgrel=7 pkgdesc="TeX Live binaries" license=('GPL') arch=('i686' 'x86_64' 'mips64el') -depends=('t1lib' 'gd' 'poppler' 'libsigsegv' 'zziplib' 'libpng' 'libjpeg' 'freetype2') +depends=('t1lib' 'gd' 'poppler>=0.22.0' 'libsigsegv' 'zziplib' 'libpng' 'libjpeg' 'freetype2') makedepends=('perl' 'clisp' 'ffcall') optdepends=('ed: for texconfig') provides=('lcdf-typetools' 'kpathsea' 'xindy' 'pdfjam' 'texlive-bin') @@ -49,12 +49,13 @@ md5sums=('220a4f4cc0d915bf8fcbcb553dcee1ae' '5190f3295eb9a604c5f17f5bd607299b') build() { + cd "$srcdir" + if [ "${CARCH}" != "i686" ]; then export CFLAGS="${CFLAGS} -fPIC" export CXXFLAGS="${CXXFLAGS} -fPIC" fi - cd "$srcdir" # this patch removes spurious error message with locale "xx_YY.utf8" patch -Np0 -i fix-fontforge-encoding.patch # fix build with poppler >= 0.20 @@ -201,7 +202,7 @@ package() { ## install Perl libraries mkdir -p "$pkgdir"/usr/share/tlpkg/TeXLive - install -m644 "${srcdir}"/source/utils/biber/TeXLive/*.pm "$pkgdir"/usr/share/tlpkg/TeXLive + install -m644 "${srcdir}"/source/utils/biber/TeXLive/*.pm "${pkgdir}/usr/share/tlpkg/TeXLive" # create symlinks for formats echo "--> Create symlinks for TeX formats ..." diff --git a/libre/texlive-bin-libre/fix-fontforge-encoding.patch b/libre/texlive-bin-libre/fix-fontforge-encoding.patch index 8104b3289..8104b3289 100755..100644 --- a/libre/texlive-bin-libre/fix-fontforge-encoding.patch +++ b/libre/texlive-bin-libre/fix-fontforge-encoding.patch diff --git a/libre/texlive-bin-libre/luatex-poppler-0.20.patch b/libre/texlive-bin-libre/luatex-poppler-0.20.patch index 175824f3e..175824f3e 100755..100644 --- a/libre/texlive-bin-libre/luatex-poppler-0.20.patch +++ b/libre/texlive-bin-libre/luatex-poppler-0.20.patch diff --git a/libre/texlive-bin-libre/luatex-r4449-radical-rule-thickness.patch b/libre/texlive-bin-libre/luatex-r4449-radical-rule-thickness.patch index f925a1a93..f925a1a93 100755..100644 --- a/libre/texlive-bin-libre/luatex-r4449-radical-rule-thickness.patch +++ b/libre/texlive-bin-libre/luatex-r4449-radical-rule-thickness.patch diff --git a/libre/texlive-bin-libre/poppler-0.20.patch b/libre/texlive-bin-libre/poppler-0.20.patch index 3bd8183ab..3bd8183ab 100755..100644 --- a/libre/texlive-bin-libre/poppler-0.20.patch +++ b/libre/texlive-bin-libre/poppler-0.20.patch diff --git a/libre/texlive-bin-libre/texlive.install b/libre/texlive-bin-libre/texlive.install index 06a40a3b3..06a40a3b3 100755..100644 --- a/libre/texlive-bin-libre/texlive.install +++ b/libre/texlive-bin-libre/texlive.install diff --git a/libre/texlive-bin-libre/texmf.cnf b/libre/texlive-bin-libre/texmf.cnf index 76975ee5c..76975ee5c 100755..100644 --- a/libre/texlive-bin-libre/texmf.cnf +++ b/libre/texlive-bin-libre/texmf.cnf diff --git a/libre/texlive-core-libre/PKGBUILD b/libre/texlive-core-libre/PKGBUILD index 1e3d5534b..1e3d5534b 100755..100644 --- a/libre/texlive-core-libre/PKGBUILD +++ b/libre/texlive-core-libre/PKGBUILD diff --git a/libre/texlive-core-libre/texlive-core.maps b/libre/texlive-core-libre/texlive-core.maps index 013f15e94..013f15e94 100755..100644 --- a/libre/texlive-core-libre/texlive-core.maps +++ b/libre/texlive-core-libre/texlive-core.maps diff --git a/libre/texlive-core-libre/texlive.install b/libre/texlive-core-libre/texlive.install index 14ca7c531..14ca7c531 100755..100644 --- a/libre/texlive-core-libre/texlive.install +++ b/libre/texlive-core-libre/texlive.install diff --git a/libre/texlive-fontsextra-libre/PKGBUILD b/libre/texlive-fontsextra-libre/PKGBUILD index a445de005..a445de005 100755..100644 --- a/libre/texlive-fontsextra-libre/PKGBUILD +++ b/libre/texlive-fontsextra-libre/PKGBUILD diff --git a/libre/texlive-fontsextra-libre/texlive-fontsextra.maps b/libre/texlive-fontsextra-libre/texlive-fontsextra.maps index 771bf3607..771bf3607 100755..100644 --- a/libre/texlive-fontsextra-libre/texlive-fontsextra.maps +++ b/libre/texlive-fontsextra-libre/texlive-fontsextra.maps diff --git a/libre/texlive-fontsextra-libre/texlive.install b/libre/texlive-fontsextra-libre/texlive.install index 6f81bd4ba..6f81bd4ba 100755..100644 --- a/libre/texlive-fontsextra-libre/texlive.install +++ b/libre/texlive-fontsextra-libre/texlive.install diff --git a/libre/texlive-latexextra-libre/PKGBUILD b/libre/texlive-latexextra-libre/PKGBUILD index 533a0aa6e..533a0aa6e 100755..100644 --- a/libre/texlive-latexextra-libre/PKGBUILD +++ b/libre/texlive-latexextra-libre/PKGBUILD diff --git a/libre/texlive-latexextra-libre/texlive-latexextra.maps b/libre/texlive-latexextra-libre/texlive-latexextra.maps index b97f37fdd..b97f37fdd 100755..100644 --- a/libre/texlive-latexextra-libre/texlive-latexextra.maps +++ b/libre/texlive-latexextra-libre/texlive-latexextra.maps diff --git a/libre/texlive-latexextra-libre/texlive.install b/libre/texlive-latexextra-libre/texlive.install index 3416a2732..3416a2732 100755..100644 --- a/libre/texlive-latexextra-libre/texlive.install +++ b/libre/texlive-latexextra-libre/texlive.install diff --git a/libre/tp_smapi-libre-lts/PKGBUILD b/libre/tp_smapi-libre-lts/PKGBUILD index 01502f813..cf38b1882 100644 --- a/libre/tp_smapi-libre-lts/PKGBUILD +++ b/libre/tp_smapi-libre-lts/PKGBUILD @@ -12,9 +12,9 @@ pkgname=tp_smapi-libre-lts _pkgname=tp_smapi _extramodules=/usr/lib/modules/extramodules-3.0-LIBRE-LTS pkgver=0.41 -pkgrel=9.3 -pkgdesc="linux-libre-lts modules for ThinkPad's SMAPI functionality" -arch=('i686' 'x86_64') +pkgrel=9.4 +pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre-lts kernel package)" +arch=('i686' 'x86_64' 'mips64el') url='https://github.com/evgeni/tp_smapi' license=('GPL') depends=('linux-libre-lts>=3.0' 'linux-libre-lts<3.1') diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD index 27e9ce6ea..d7c900f2a 100644 --- a/libre/tp_smapi-libre/PKGBUILD +++ b/libre/tp_smapi-libre/PKGBUILD @@ -11,13 +11,13 @@ _pkgname=tp_smapi pkgname=tp_smapi-libre pkgver=0.41 -pkgrel=11 -pkgdesc="Modules for ThinkPad's SMAPI functionality" -arch=('i686' 'x86_64') +pkgrel=12.1 +pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre kernel package)" +arch=('i686' 'x86_64' 'mips64el') url='https://github.com/evgeni/tp_smapi' license=('GPL') -depends=('linux-libre>=3.6' 'linux-libre<3.7') -makedepends=('linux-libre-headers>=3.6' 'linux-libre-headers<3.7') +depends=('linux-libre>=3.7' 'linux-libre<3.8') +makedepends=('linux-libre-headers>=3.7' 'linux-libre-headers<3.8') replaces=("${_pkgname}") conflicts=("${_pkgname}") provides=("${_pkgname}=${pkgver}") diff --git a/libre/tp_smapi-libre/tp_smapi.install b/libre/tp_smapi-libre/tp_smapi.install index 3662e7f34..3e1c13750 100644 --- a/libre/tp_smapi-libre/tp_smapi.install +++ b/libre/tp_smapi-libre/tp_smapi.install @@ -1,4 +1,4 @@ -extramodules=/usr/lib/modules/extramodules-3.6-ARCH +extramodules=/usr/lib/modules/extramodules-3.7-ARCH post_install() { depmod -v $(< "$extramodules/version") &>/dev/null diff --git a/libre/ttf-thai-libre/PKGBUILD b/libre/ttf-thai-libre/PKGBUILD index 3d1d4ec3d..3d1d4ec3d 100755..100644 --- a/libre/ttf-thai-libre/PKGBUILD +++ b/libre/ttf-thai-libre/PKGBUILD diff --git a/libre/ttf-thai-libre/ttf.install b/libre/ttf-thai-libre/ttf.install index 203190187..203190187 100755..100644 --- a/libre/ttf-thai-libre/ttf.install +++ b/libre/ttf-thai-libre/ttf.install diff --git a/libre/unar/PKGBUILD b/libre/unar/PKGBUILD index e1664e809..85366a600 100755..100644 --- a/libre/unar/PKGBUILD +++ b/libre/unar/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: N30N <archlinux@alunamation.com> pkgname=unar -pkgver=1.4 +pkgver=1.5 pkgrel=1 pkgdesc="An Objective-C application for uncompressing archive files" arch=('x86_64' 'i686' 'mips64el') @@ -38,5 +38,5 @@ package() { } # vim:set ts=2 sw=2 et: -md5sums=('ae5233dd835229f867f0948d28dde0d6' +md5sums=('d493957a56844ef9c1ad7b7dd24571fc' '4fa4ecc6e4ba14d3b6952d064e728511') diff --git a/libre/unar/libz.patch b/libre/unar/libz.patch index acba51463..acba51463 100755..100644 --- a/libre/unar/libz.patch +++ b/libre/unar/libz.patch diff --git a/libre/unar/native_obj_exceptions.patch b/libre/unar/native_obj_exceptions.patch index 9c84918b2..9c84918b2 100755..100644 --- a/libre/unar/native_obj_exceptions.patch +++ b/libre/unar/native_obj_exceptions.patch diff --git a/libre/ununrar/PKGBUILD b/libre/ununrar/PKGBUILD index 2e5aa615c..e4ac77b11 100755..100644 --- a/libre/ununrar/PKGBUILD +++ b/libre/ununrar/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Michał Masłowski <mtjm@mtjm.eu> pkgname=ununrar -pkgver=0.0a0dev20120412 +pkgver=0.0a0dev20130105 pkgrel=1 pkgdesc="An unrar-compatible interface to Unarchiver" arch=('any') @@ -12,7 +12,7 @@ provides=('unrar' 'unrar-libre') conflicts=('unrar' 'unrar-libre') options=(!emptydirs) source=("http://mtjm.eu/releases/Ununrar-${pkgver}.tar.gz") -sha512sums=('3593198e76643b8873d06db770bf24a8d2fdab6d2ab7880850e29cb6c2f94836bcc032f6cc919dfe39deb030c2bcd942ab870231def3aee14e8e89cf78fc3d6f') +sha512sums=('d8872d529b8e813b44f353f2958712c7e602776810ed51c6de7b6364e024cde9058e724569f83445a324edf41ca25757f3d94d67018ba18e3db027a9ee6c9200') package() { cd "$srcdir/Ununrar-$pkgver" diff --git a/libre/unzip-libre/PKGBUILD b/libre/unzip-libre/PKGBUILD index 20c3885f9..020740313 100755..100644 --- a/libre/unzip-libre/PKGBUILD +++ b/libre/unzip-libre/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 70615 2010-02-27 15:46:11Z thayer $ -# Maintainer: Thayer Williams <thayer@archlinux.org> +# $Id: PKGBUILD 150452 2012-02-17 23:21:23Z allan $ +# Maintainer: # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Contributor: Robson Peixoto _pkgname=unzip pkgname=unzip-libre pkgver=6.0 -pkgrel=5 +pkgrel=6 pkgdesc="Unpacks .zip archives such as those made by PKZIP" arch=('i686' 'x86_64') url="http://www.info-zip.org/" @@ -15,22 +15,28 @@ depends=('bzip2' 'bash') provides=("${_pkgname}=${pkgver}") conflicts=("${_pkgname}") replaces=("${_pkgname}") -source=("https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-${pkgrel}-any.src.tar.xz") - +source=('http://downloads.sourceforge.net/infozip/unzip60.tar.gz' + 'match.patch') +md5sums=('62b490407489521db863b523a7f86375' + 'e6d9f0c204c2abe6a57dc5e1637d5140') build() { cd ${srcdir}/${_pkgname}${pkgver/./} + # from http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/DATA/unzip/match.patch + patch -Np0 -i ${srcdir}/match.patch + # set CFLAGS -- from Debian export CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -DACORN_FTYPE_NFS \ -DWILD_STOP_AT_DIR -DLARGE_FILE_SUPPORT -DUNICODE_SUPPORT \ -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE -DNO_LCHMOD -DDATE_FORMAT=DF_YMD \ -DUSE_BZIP2 -DNATIVE" + sed -i "/MANDIR =/s#)/#)/share/#" unix/Makefile + # make -- from Debian make -f unix/Makefile LOCAL_UNZIP="$CFLAGS" prefix=/usr LF2="" \ D_USE_BZ2=-DUSE_BZIP2 L_BZ2=-lbz2 unzips - } package(){ @@ -41,10 +47,5 @@ package(){ # install the license file install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/unzip/LICENSE - - # fix manpage location - mkdir -p ${pkgdir}/usr/share - mv ${pkgdir}/usr/man ${pkgdir}/usr/share/ } -md5sums=('8e8a774e2006617d8787d095bb78c78a') diff --git a/libre/unzip-libre/SRCBUILD b/libre/unzip-libre/SRCBUILD deleted file mode 100755 index a9ada936b..000000000 --- a/libre/unzip-libre/SRCBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 70615 2010-02-27 15:46:11Z thayer $ -# Maintainer: Thayer Williams <thayer@archlinux.org> -# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> -# Contributor: Robson Peixoto - -_pkgname=unzip -pkgname=unzip-libre -pkgver=6.0 -pkgrel=5 -pkgdesc="Unpacks .zip archives such as those made by PKZIP" -arch=('any') -url="http://www.info-zip.org/" -license=('custom') -depends=('bzip2' 'bash') -source=('http://downloads.sourceforge.net/infozip/unzip60.tar.gz' -# from http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/DATA/unzip/match.patch - 'match.patch') -md5sums=('62b490407489521db863b523a7f86375' - 'e6d9f0c204c2abe6a57dc5e1637d5140') - -build() { - cd ${srcdir}/${_pkgname}${pkgver/./} - - patch -Np0 -i ${srcdir}/match.patch -} - -package() { - export PKGEXT=.src.tar.xz - export PKGDEST=${SRCDEST} - - mv ${srcdir}/${_pkgname}${pkgver/./} ${pkgdir}/ - -} diff --git a/libre/unzip-libre/match.patch b/libre/unzip-libre/match.patch index 6ba65fee0..6ba65fee0 100755..100644 --- a/libre/unzip-libre/match.patch +++ b/libre/unzip-libre/match.patch diff --git a/libre/vhba-module-libre/60-vhba.rules b/libre/vhba-module-libre/60-vhba.rules index e4de1dca7..e4de1dca7 100755..100644 --- a/libre/vhba-module-libre/60-vhba.rules +++ b/libre/vhba-module-libre/60-vhba.rules diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD index febefacfa..394379a3c 100755..100644 --- a/libre/vhba-module-libre/PKGBUILD +++ b/libre/vhba-module-libre/PKGBUILD @@ -7,13 +7,13 @@ _pkgname=vhba-module pkgname=vhba-module-libre pkgver=20120422 -_extramodules=extramodules-3.6-LIBRE -pkgrel=14 -pkgdesc="Kernel libre module that emulates SCSI devices" -arch=('i686' 'x86_64') +_extramodules=extramodules-3.7-LIBRE +pkgrel=15.1 +pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre kernel package)" +arch=('i686' 'x86_64' 'mips64el') url="http://cdemu.sourceforge.net/" license=('GPL') -depends=('linux-libre>=3.6' 'linux-libre<3.7') +depends=('linux-libre>=3.7' 'linux-libre<3.8') makedepends=('linux-libre-headers') options=(!makeflags) install=$_pkgname.install diff --git a/libre/vhba-module-libre/vhba-module.install b/libre/vhba-module-libre/vhba-module.install index 8bd740943..9f376f541 100755..100644 --- a/libre/vhba-module-libre/vhba-module.install +++ b/libre/vhba-module-libre/vhba-module.install @@ -1,6 +1,6 @@ _updatemod() { echo " > Updating module dependencies..." - EXTRAMODULES='extramodules-3.6-LIBRE' + EXTRAMODULES='extramodules-3.7-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } diff --git a/libre/virtualbox-libre-modules-lts/PKGBUILD b/libre/virtualbox-libre-modules-lts/PKGBUILD index d836a3a37..1833f020e 100644 --- a/libre/virtualbox-libre-modules-lts/PKGBUILD +++ b/libre/virtualbox-libre-modules-lts/PKGBUILD @@ -7,19 +7,20 @@ pkgbase=virtualbox-libre-modules-lts pkgname=('virtualbox-libre-host-modules-lts' 'virtualbox-libre-guest-modules-lts') -pkgver=4.2.4 -pkgrel=1.1 +pkgver=4.2.6 +pkgrel=4 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') makedepends=('linux-libre-lts-headers' - "virtualbox-libre-host-source>=$pkgver" - "virtualbox-libre-guest-source>=$pkgver" - 'expac') + "virtualbox-libre-host-dkms>=$pkgver" + "virtualbox-libre-guest-dkms>=$pkgver" + 'expac' + 'bc') build() { - # current kernel libre version _kernver=$(expac -Q '%v' linux-libre-lts-headers)-LIBRE-LTS + # dkms need modification to be run as user cp -r /var/lib/dkms . echo "dkms_tree='$srcdir/dkms'" > dkms.conf @@ -32,16 +33,17 @@ build() { } package_virtualbox-libre-host-modules-lts(){ - pkgdesc='Host kernel libre modules for VirtualBox' + _kernver=$(expac -Q '%v' linux-libre-lts-headers)-LIBRE-LTS + _extraver=extramodules-${_kernver%.*}-LIBRE-LTS + + pkgdesc='Host kernel modules for VirtualBox (built for the linux-libre-lts kernel package)' +# depends=("linux-libre-lts>=${_kernver%.*}" "linux-libre-lts<$(echo "${_kernver%.*}+0.1"|bc)") depends=('linux-libre-lts>=3.0' 'linux-libre-lts<3.1') replaces=('virtualbox-host-modules-lts' 'virtualbox-modules-lts' 'virtualbox-libre-modules-lts') conflicts=('virtualbox-host-modules-lts' 'virtualbox-modules-lts' 'virtualbox-libre-modules-lts') provides=("virtualbox-host-modules-lts=$pkgver" "virtualbox-libre-host-modules=$pkgver") install=virtualbox-libre-host-modules-lts.install - _kernver=$(expac -Q '%v' linux-libre-lts-headers)-LIBRE-LTS - _extraver=extramodules-${_kernver%.*}-LIBRE-LTS - install -dm755 "$pkgdir/usr/lib/modules/$_extraver" cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module" install -m644 * "$pkgdir/usr/lib/modules/$_extraver" @@ -50,17 +52,18 @@ package_virtualbox-libre-host-modules-lts(){ } package_virtualbox-libre-guest-modules-lts(){ - pkgdesc='Guest kernel libre modules for VirtualBox' + _kernver=$(expac -Q '%v' linux-libre-lts-headers)-LIBRE-LTS + _extraver=extramodules-${_kernver%.*}-LIBRE-LTS + + pkgdesc='Guest kernel modules for VirtualBox (built for the linux-libre-lts kernel package)' license=('GPL') +# depends=("linux-libre-lts>=${_kernver%.*}" "linux-libre-lts<$(echo "${_kernver%.*}+0.1"|bc)") depends=('linux-libre-lts>=3.0' 'linux-libre-lts<3.1') replaces=('virtualbox-guest-modules-lts' 'virtualbox-archlinux-modules-lts' 'virtualbox-libre-parabola-modules-lts') conflicts=('virtualbox-guest-modules-lts' 'virtualbox-archlinux-modules-lts' 'virtualbox-libre-parabola-modules-lts') provides=("virtualbox-guest-modules-lts=$pkgver" "virtualbox-libre-host-modules=$pkgver") install=virtualbox-libre-guest-modules-lts.install - _kernver=$(expac -Q '%v' linux-libre-lts-headers)-LIBRE-LTS - _extraver=extramodules-${_kernver%.*}-LIBRE-LTS - install -dm755 "$pkgdir/usr/lib/modules/$_extraver" cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module" install -m644 * "$pkgdir/usr/lib/modules/$_extraver" diff --git a/libre/virtualbox-libre-modules-lts/build.sh b/libre/virtualbox-libre-modules-lts/build.sh index 4c3c29e30..d1bfb72ce 100755 --- a/libre/virtualbox-libre-modules-lts/build.sh +++ b/libre/virtualbox-libre-modules-lts/build.sh @@ -6,12 +6,12 @@ if (( $# != 1 )); then exit 1 fi -linux32 makechrootpkg -cu -I ../../virtualbox/trunk/virtualbox-libre-host-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 -linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-guest-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 +linux32 makechrootpkg -cu -I ../../virtualbox/trunk/virtualbox-libre-host-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 +linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-guest-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 linux32 makechrootpkg -r /var/lib/archbuild/$1-i686 -makechrootpkg -cu -I ../../virtualbox/trunk/virtualbox-libre-host-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 -makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-guest-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 +makechrootpkg -cu -I ../../virtualbox/trunk/virtualbox-libre-host-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 +makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-guest-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 makechrootpkg -r /var/lib/archbuild/$1-x86_64 diff --git a/libre/virtualbox-libre-modules/.directory b/libre/virtualbox-libre-modules/.directory deleted file mode 100755 index 9f6471595..000000000 --- a/libre/virtualbox-libre-modules/.directory +++ /dev/null @@ -1,3 +0,0 @@ -[Dolphin] -Timestamp=2012,8,16,6,34,39 -Version=3 diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD index 1ecee7b2c..067a95fdd 100755..100644 --- a/libre/virtualbox-libre-modules/PKGBUILD +++ b/libre/virtualbox-libre-modules/PKGBUILD @@ -6,19 +6,20 @@ pkgbase=virtualbox-libre-modules pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules') -pkgver=4.2.4 -pkgrel=2 +pkgver=4.2.6 +pkgrel=4 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') makedepends=('linux-libre-headers' - "virtualbox-libre-host-source>=$pkgver" - "virtualbox-libre-guest-source>=$pkgver" - 'expac') + "virtualbox-libre-host-dkms>=$pkgver" + "virtualbox-libre-guest-dkms>=$pkgver" + 'expac' + 'bc') build() { - # current kernel libre version _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE + # dkms need modification to be run as user cp -r /var/lib/dkms . echo "dkms_tree='$srcdir/dkms'" > dkms.conf @@ -31,16 +32,17 @@ build() { } package_virtualbox-libre-host-modules(){ - pkgdesc='Host kernel libre modules for VirtualBox' - depends=('linux-libre>=3.6' 'linux-libre<3.7') + _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE + _extraver=extramodules-${_kernver%.*}-LIBRE + + pkgdesc='Host kernel modules for VirtualBox (built for the linux-libre kernel package)' +# depends=("linux-libre>=${_kernver%.*}" "linux-libre<$(echo "${_kernver%.*}+0.1"|bc)") + depends=('linux-libre>=3.7' 'linux-libre<3.8') provides=("virtualbox-host-modules=${pkgver}") replaces=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules') conflicts=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules') install=virtualbox-libre-host-modules.install - _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE - _extraver=extramodules-${_kernver%.*}-LIBRE - install -dm755 "$pkgdir/usr/lib/modules/$_extraver" cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module" install -m644 * "$pkgdir/usr/lib/modules/$_extraver" @@ -49,17 +51,18 @@ package_virtualbox-libre-host-modules(){ } package_virtualbox-libre-guest-modules(){ - pkgdesc='Guest kernel libre modules for VirtualBox' + _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE + _extraver=extramodules-${_kernver%.*}-LIBRE + + pkgdesc='Guest kernel modules for VirtualBox (built for the linux-libre kernel package)' license=('GPL') - depends=('linux-libre>=3.6' 'linux-libre<3.7') +# depends=("linux-libre>=${_kernver%.*}" "linux-libre<$(echo "${_kernver%.*}+0.1"|bc)") + depends=('linux-libre>=3.7' 'linux-libre<3.8') provides=("virtualbox-guest-modules=${pkgver}") replaces=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules') conflicts=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules') install=virtualbox-libre-guest-modules.install - _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE - _extraver=extramodules-${_kernver%.*}-LIBRE - install -dm755 "$pkgdir/usr/lib/modules/$_extraver" cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module" install -m644 * "$pkgdir/usr/lib/modules/$_extraver" @@ -67,5 +70,4 @@ package_virtualbox-libre-guest-modules(){ sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-libre-guest-modules.install" } - # vim:set ts=2 sw=2 et: diff --git a/libre/virtualbox-libre-modules/build.sh b/libre/virtualbox-libre-modules/build.sh index f798a615d..6152ec21d 100755 --- a/libre/virtualbox-libre-modules/build.sh +++ b/libre/virtualbox-libre-modules/build.sh @@ -6,12 +6,12 @@ if (( $# != 1 )); then exit 1 fi -linux32 makechrootpkg -cuI ../../virtualbox/trunk/virtualbox-libre-host-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 -linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-guest-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 +linux32 makechrootpkg -cuI ../../virtualbox/trunk/virtualbox-libre-host-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 +linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-guest-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 linux32 makechrootpkg -r /var/lib/archbuild/$1-i686 -makechrootpkg -cuI ../../virtualbox/trunk/virtualbox-libre-host-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 -makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-guest-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 +makechrootpkg -cuI ../../virtualbox/trunk/virtualbox-libre-host-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 +makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-guest-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 makechrootpkg -r /var/lib/archbuild/$1-x86_64 diff --git a/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install b/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install index caf59aa13..41b5ac73a 100755..100644 --- a/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install +++ b/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install @@ -2,16 +2,16 @@ post_install() { cat << EOF ===> You may want to load vboxguest, vboxsf and vboxvideo EOF - EXTRAMODULES='extramodules-3.6-LIBRE' + EXTRAMODULES='extramodules-3.7-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_upgrade() { - EXTRAMODULES='extramodules-3.6-LIBRE' + EXTRAMODULES='extramodules-3.7-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_remove() { - EXTRAMODULES='extramodules-3.6-LIBRE' + EXTRAMODULES='extramodules-3.7-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } diff --git a/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install b/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install index 8605cf20a..1ac430c3b 100755..100644 --- a/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install +++ b/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install @@ -3,17 +3,17 @@ cat << EOF ===> You must load vboxdrv module before starting VirtualBox: ===> # modprobe vboxdrv EOF - EXTRAMODULES='extramodules-3.5-LIBRE' + EXTRAMODULES='extramodules-3.7-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_upgrade() { - EXTRAMODULES='extramodules-3.5-LIBRE' + EXTRAMODULES='extramodules-3.7-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) echo 'In order to use the new version, reload all virtualbox modules manually.' } post_remove() { - EXTRAMODULES='extramodules-3.5-LIBRE' + EXTRAMODULES='extramodules-3.7-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } diff --git a/libre/virtualbox-libre/001-vboxdrv-reference.patch b/libre/virtualbox-libre/001-vboxdrv-reference.patch index 51fd6361c..b75c3c565 100644 --- a/libre/virtualbox-libre/001-vboxdrv-reference.patch +++ b/libre/virtualbox-libre/001-vboxdrv-reference.patch @@ -1,88 +1,44 @@ diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-4.1.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp --- VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp 2011-11-04 17:22:13.636083176 +0000 +++ VirtualBox-4.1.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp 2011-11-04 17:48:58.915541368 +0000 -@@ -67,38 +67,34 @@ - - /* XXX Temporarily. Don't rely on the user to hack the Makefile himself! */ - QString g_QStrHintLinuxNoMemory = QApplication::tr( -- "This error means that the kernel driver was either not able to " -+ "This error means that the kernel libre driver was either not able to " - "allocate enough memory or that some mapping operation failed." - ); - - QString g_QStrHintLinuxNoDriver = QApplication::tr( -- "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or " -+ "The VirtualBox Linux-libre kernel driver (vboxdrv) is either not loaded or " +@@ -75,10 +75,9 @@ + "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or " "there is a permission problem with /dev/vboxdrv. Please reinstall the kernel " -- "module by executing<br/><br/>" + "module by executing<br/><br/>" - " <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>" - "as root. If it is available in your distribution, you should install the " - "DKMS package first. This package keeps track of Linux kernel changes and " - "recompiles the vboxdrv kernel module if necessary." -+ "libre module by executing<br/><br/>" + " <font color=blue>'pacman -S virtualbox-libre-host-modules'</font><br/><br/>" -+ "as root. If you don't use our stock kernel libre, install virtualbox-libre-host-source and " ++ "as root. If you don't use our stock kernel, install virtualbox-libre-host-source and " + "execute dkms autoinstall ." ); QString g_QStrHintOtherWrongDriverVersion = QApplication::tr( -- "The VirtualBox kernel modules do not match this version of " -+ "The VirtualBox kernel libre modules do not match this version of " - "VirtualBox. The installation of VirtualBox was apparently not " - "successful. Please try completely uninstalling and reinstalling " - "VirtualBox." - ); +@@ -90,11 +89,8 @@ QString g_QStrHintLinuxWrongDriverVersion = QApplication::tr( -- "The VirtualBox kernel modules do not match this version of " + "The VirtualBox kernel modules do not match this version of " - "VirtualBox. The installation of VirtualBox was apparently not " - "successful. Executing<br/><br/>" - " <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>" - "may correct this. Make sure that you do not mix the " - "OSE version and the PUEL version of VirtualBox." -+ "The VirtualBox kernel libre modules do not match this version of " -+ "VirtualBox. Reload the modules or if you don't use our stock kernel libre execute<br/><br/> " ++ "VirtualBox. Reload the modules or if you don't use our stock kernel execute<br/><br/> " + " <font color=blue>'dkms autoinstall'</font><br/><br/>" ); QString g_QStrHintOtherNoDriver = QApplication::tr( -- "Make sure the kernel module has been loaded successfully." -+ "Make sure the kernel libre module has been loaded successfully." - ); - - /* I hope this isn't (C), (TM) or (R) Microsoft support ;-) */ -@@ -590,7 +586,7 @@ - case VERR_VM_DRIVER_NOT_INSTALLED: - case VERR_VM_DRIVER_LOAD_ERROR: - msgText += QApplication::tr ( -- "<b>Cannot access the kernel driver!</b><br/><br/>"); -+ "<b>Cannot access the kernel libre driver!</b><br/><br/>"); - # ifdef RT_OS_LINUX - msgText += g_QStrHintLinuxNoDriver; - # else -@@ -603,7 +599,7 @@ - break; - # endif - case VERR_VM_DRIVER_NOT_ACCESSIBLE: -- msgText += QApplication::tr ("Kernel driver not accessible"); -+ msgText += QApplication::tr ("Kernel libre driver not accessible"); - break; - case VERR_VM_DRIVER_VERSION_MISMATCH: - # ifdef RT_OS_LINUX diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox-4.1.6_OSE/src/VBox/Installer/linux/VBox.sh --- VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh 2011-11-04 17:22:13.549415814 +0000 +++ VirtualBox-4.1.6_OSE/src/VBox/Installer/linux/VBox.sh 2011-11-04 17:56:50.735874087 +0000 -@@ -30,19 +30,20 @@ - SHUTDOWN="true" - elif ! lsmod|grep -q vboxdrv; then +@@ -32,17 +32,18 @@ cat << EOF --WARNING: The vboxdrv kernel module is not loaded. Either there is no module -- available for the current kernel (`uname -r`) or it failed to + WARNING: The vboxdrv kernel module is not loaded. Either there is no module + available for the current kernel (`uname -r`) or it failed to - load. Please recompile the kernel module and install it by -+WARNING: The vboxdrv kernel libre module is not loaded. Either there is no module -+ available for the current kernel libre (`uname -r`) or it failed to -+ load. Please reinstall the kernel libre module virtualbox-libre-host-modules or -+ if you don't use our stock kernel libre compile the modules with ++ load. Please reinstall the kernel module virtualbox-libre-host-modules or ++ if you don't use our stock kernel compile the modules with - sudo /etc/init.d/vboxdrv setup + sudo dkms autoinstall @@ -99,14 +55,3 @@ diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox- and if that is not successful, try to re-install the package. -@@ -52,9 +53,8 @@ - - if [ -f /etc/vbox/module_not_compiled ]; then - cat << EOF --WARNING: The compilation of the vboxdrv.ko kernel module failed during the -+WARNING: The compilation of the vboxdrv.ko kernel libre module failed during the - installation for some reason. Starting a VM will not be possible. -- Please consult the User Manual for build instructions. - EOF - fi -
\ No newline at end of file diff --git a/libre/virtualbox-libre/002-change_default_driver_dir.patch b/libre/virtualbox-libre/002-change_default_driver_dir.patch index d8531499d..d8531499d 100755..100644 --- a/libre/virtualbox-libre/002-change_default_driver_dir.patch +++ b/libre/virtualbox-libre/002-change_default_driver_dir.patch diff --git a/libre/virtualbox-libre/10-vboxdrv.rules b/libre/virtualbox-libre/10-vboxdrv.rules index 37403ae2f..37403ae2f 100755..100644 --- a/libre/virtualbox-libre/10-vboxdrv.rules +++ b/libre/virtualbox-libre/10-vboxdrv.rules diff --git a/libre/virtualbox-libre/LocalConfig.kmk b/libre/virtualbox-libre/LocalConfig.kmk index 6eca06d9b..6eca06d9b 100755..100644 --- a/libre/virtualbox-libre/LocalConfig.kmk +++ b/libre/virtualbox-libre/LocalConfig.kmk diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD index 54978ea3c..dc94a2a33 100755..100644 --- a/libre/virtualbox-libre/PKGBUILD +++ b/libre/virtualbox-libre/PKGBUILD @@ -8,18 +8,18 @@ pkgbase=virtualbox-libre pkgname=('virtualbox-libre' + 'virtualbox-libre-host-dkms' + 'virtualbox-libre-guest-dkms' 'virtualbox-libre-sdk' - 'virtualbox-libre-host-source' - 'virtualbox-libre-guest-utils' - 'virtualbox-libre-guest-source') -pkgver=4.2.4 -pkgrel=1 + 'virtualbox-libre-guest-utils') +pkgver=4.2.6 +pkgrel=1.1 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL' 'custom') makedepends=('alsa-lib' 'bin86' - 'cdrkit-libre' + 'cdrkit' 'curl' 'dev86' 'gsoap' @@ -28,7 +28,6 @@ makedepends=('alsa-lib' 'libidl2' 'libpulse' 'libstdc++5' - 'libvncserver' 'libxcursor' 'libxinerama' 'libxml2' @@ -41,7 +40,7 @@ makedepends=('alsa-lib' 'glu' 'python2' 'qt' - 'sdl-libre' + 'sdl' 'sdl_ttf' 'vde2' 'xalan-c') @@ -78,7 +77,7 @@ source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.ta 'os_venenux.png' 'libre.patch' 'free-distros.patch') -md5sums=('d1ec2d2a3f2f3f0b277dfe2c520c2e33' +md5sums=('d680aeb3b4379b8281527aeb012b2df5' '5f85710e0b8606de967716ded7b2d351' 'ed1341881437455d9735875ddf455fbe' '58d6e5bb4b4c1c6f3f0b3daa6aaeed03' @@ -88,7 +87,7 @@ md5sums=('d1ec2d2a3f2f3f0b277dfe2c520c2e33' '7e9483b1069a54f181546083ac7e5469' 'c159d683ba1947290fc2ad2c64194150' 'bc9efed88e0469cd7fc460d5a5cd7b4b' - '4f1692638d6740df4c4ad9766ba4e179' + 'f4e4c7895ede9c524109589bf16ae660' '97e193f050574dd272a38e5ee5ebe62b' '8538dba8686d7449cb481c9bae9d722a' '545c925b46f2ac95e5f8ae407fad101a' @@ -108,8 +107,8 @@ md5sums=('d1ec2d2a3f2f3f0b277dfe2c520c2e33' 'c7951fe6888d939f3a7d0dafe477e82b' '4da8eeb2ece7e475fc7a0d1003da26c6' '5e4187af59726d71c5be48d0cd816c34' - '85141ccd2621a8e004b8f55c9a1f83eb' - 'c7b29fbf4c24a00e8646ca6dd73f38a1') + '05d166104a66ee479896c941ac27a3d0' + '78168f8699aa01a632603f0d5b1b8281') build() { cd "VirtualBox-$pkgver" @@ -150,33 +149,37 @@ build() { ./configure --disable-docs \ --enable-webservice \ --enable-vde \ - --enable-vnc \ --disable-kmods -# --with-linux=/usr/src/linux-${_kernver} source ./env.sh kmk all + + # fix python2 sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' "out/linux.$BUILD_PLATFORM_ARCH/release/bin/vboxshell.py" + # build rdesktop-vrdp (broken from LocalConfig.kmk) - cd src/VBox/RDP/client + pushd src/VBox/RDP/client cp "$srcdir/LocalConfig.kmk" . + # fix keymap path FS#32548 + sed -i 's:/opt/VirtualBox:/usr/share/virtualbox:' Makefile.kmk kmk all + popd } package_virtualbox-libre() { pkgdesc='Powerful x86 virtualization for enterprise as well as home use (with free GNU/Linux distros presets and Oracle VM VirtualBox Extension Pack support removed)' depends=('curl' 'libpng' - 'libvncserver' 'libxcursor' 'libxinerama' 'libxml2' 'libxmu' - 'sdl-libre' + 'sdl' + 'shared-mime-info' 'virtualbox-libre-host-modules') optdepends=('qt: VirtualBox GUI support' 'vde2: Virtual Distributed Ethernet support' 'virtualbox-libre-sdk: Developer kit' - 'virtualbox-libre-host-source: Host kernel libre source modules for non-stock kernels' + 'virtualbox-libre-host-dkms: Host kernel source modules for non-stock kernels' 'net-tools: Host-only or bridged networking support') backup=('etc/vbox/vbox.cfg' 'etc/conf.d/vboxweb') replaces=('virtualbox' 'virtualbox-ose') @@ -275,15 +278,15 @@ package_virtualbox-libre-sdk() { mv sdk "$pkgdir/usr/lib/virtualbox" } -package_virtualbox-libre-host-source() { - pkgdesc='VirtualBox Host kernel libre modules source (DKMS)' +package_virtualbox-libre-host-dkms() { + pkgdesc='VirtualBox Host kernel modules sources' depends=('dkms' 'gcc' 'make') - provides=("virtualbox-host-source=$pkgver" 'virtualbox-libre-host-modules') - replaces=('virtualbox-host-source' 'virtualbox-source' 'virtualbox-libre-source') - conflicts=('virtualbox-host-source' 'virtualbox-source' 'virtualbox-libre-source') + provides=("virtualbox-host-dkms=$pkgver" 'virtualbox-libre-host-modules') + replaces=('virtualbox-host-dkms' 'virtualbox-source' 'virtualbox-libre-source' 'virtualbox-host-source' 'virtualbox-libre-host-source') + conflicts=('virtualbox-host-dkms' 'virtualbox-source' 'virtualbox-libre-source' 'virtualbox-host-source' 'virtualbox-libre-host-source') optdepends=('linux-libre-headers' 'linux-libre-lts-headers') - install=virtualbox-libre-host-source.install + install=virtualbox-libre-host-dkms.install install -dm755 "$pkgdir/usr/src" source "VirtualBox-$pkgver/env.sh" @@ -291,15 +294,15 @@ package_virtualbox-libre-host-source() { cp -r src "$pkgdir/usr/src/vboxhost-$pkgver" } -package_virtualbox-libre-guest-source() { - pkgdesc='VirtualBox Guest kernel libre modules source (DKMS)' +package_virtualbox-libre-guest-dkms() { + pkgdesc='VirtualBox Guest kernel modules sources' depends=('dkms' 'gcc' 'make') - provides=("virtualbox-guest-source=$pkgver" 'virtualbox-libre-guest-modules') - replaces=('virtualbox-guest-source' 'virtualbox-archlinux-source' 'virtualbox-parabola-source') - conflicts=('virtualbox-guest-source' 'virtualbox-archlinux-source' 'virtualbox-parabola-source') + provides=("virtualbox-guest-dkms=$pkgver" 'virtualbox-libre-guest-modules') + replaces=('virtualbox-guest-dkms' 'virtualbox-archlinux-source' 'virtualbox-parabola-source' 'virtualbox-guest-source' 'virtualbox-libre-guest-source') + conflicts=('virtualbox-guest-dkms' 'virtualbox-archlinux-source' 'virtualbox-parabola-source' 'virtualbox-guest-source' 'virtualbox-libre-guest-source') optdepends=('linux-libre-headers' 'linux-libre-lts-headers') - install=virtualbox-libre-guest-source.install + install=virtualbox-libre-guest-dkms.install install -dm755 "$pkgdir/usr/src" source "VirtualBox-$pkgver/env.sh" @@ -310,7 +313,7 @@ package_virtualbox-libre-guest-source() { package_virtualbox-libre-guest-utils(){ pkgdesc='VirtualBox Guest userspace utilities' depends=('virtualbox-libre-guest-modules' 'gcc-libs' 'libxmu' 'xorg-xrandr' 'libxfixes') - optdepends=('virtualbox-guest-source: Guest kernel libre source modules for non-stock kernels') + optdepends=('virtualbox-guest-source: Guest kernel source modules for non-stock kernels') provides=("virtualbox-guest-utils=$pkgver") replaces=('virtualbox-guest-utils' 'virtualbox-archlinux-additions' 'virtualbox-parabola-additions' 'virtualbox-guest-additions' 'virtualbox-libre-guest-additions') conflicts=('virtualbox-guest-utils' 'virtualbox-archlinux-additions' 'virtualbox-parabola-additions' 'virtualbox-guest-additions' 'virtualbox-libre-guest-additions') diff --git a/libre/virtualbox-libre/free-distros.patch b/libre/virtualbox-libre/free-distros.patch index fcdb3c631..91d15e380 100644 --- a/libre/virtualbox-libre/free-distros.patch +++ b/libre/virtualbox-libre/free-distros.patch @@ -1,6 +1,8 @@ ---- VirtualBox-4.2.0.orig/src/VBox/Main/src-all/Global.cpp 2012-09-08 06:36:02.000000000 -0300 -+++ VirtualBox-4.2.0/src/VBox/Main/src-all/Global.cpp 2012-10-16 23:00:19.998701465 -0200 -@@ -33,289 +33,365 @@ +diff --git a/src/VBox/Main/src-all/Global.cpp b/src/VBox/Main/src-all/Global.cpp +index 6ae0372..df65e60 100644 +--- a/src/VBox/Main/src-all/Global.cpp ++++ b/src/VBox/Main/src-all/Global.cpp +@@ -33,289 +33,365 @@ const Global::OSType Global::sOSTypes[] = VBOXOSTYPE_Unknown, VBOXOSHINT_NONE, 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, @@ -190,318 +192,320 @@ + VBOXOSTYPE_Venenux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, + 384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "ArchLinux", "Arch Linux", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "ArchLinux", "Arch Linux", VBOXOSTYPE_ArchLinux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "ArchLinux_64", "Arch Linux (64 bit)", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "ArchLinux_64", "Arch Linux (64 bit)", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "ArchLinux_64", "Arch Linux (64 bit)", VBOXOSTYPE_ArchLinux_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Debian", "Debian", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Debian", "Debian", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Debian", "Debian", VBOXOSTYPE_Debian, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Debian_64", "Debian (64 bit)", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Debian_64", "Debian (64 bit)", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Debian_64", "Debian (64 bit)", VBOXOSTYPE_Debian_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97}, - { "Linux", "Linux", "OpenSUSE", "openSUSE", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "OpenSUSE", "openSUSE", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "OpenSUSE", "openSUSE", VBOXOSTYPE_OpenSUSE, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "OpenSUSE_64", "openSUSE (64 bit)", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "OpenSUSE_64", "openSUSE (64 bit)", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "OpenSUSE_64", "openSUSE (64 bit)", VBOXOSTYPE_OpenSUSE_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Fedora", "Fedora", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Fedora", "Fedora", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Fedora", "Fedora", VBOXOSTYPE_FedoraCore, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 768, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Fedora_64", "Fedora (64 bit)", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Fedora_64", "Fedora (64 bit)", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Fedora_64", "Fedora (64 bit)", VBOXOSTYPE_FedoraCore_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 768, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Gentoo", "Gentoo", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Gentoo", "Gentoo", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Gentoo", "Gentoo", VBOXOSTYPE_Gentoo, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Gentoo_64", "Gentoo (64 bit)", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Gentoo_64", "Gentoo (64 bit)", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Gentoo_64", "Gentoo (64 bit)", VBOXOSTYPE_Gentoo_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Mandriva", "Mandriva", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Mandriva", "Mandriva", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Mandriva", "Mandriva", VBOXOSTYPE_Mandriva, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Mandriva_64", "Mandriva (64 bit)", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Mandriva_64", "Mandriva (64 bit)", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Mandriva_64", "Mandriva (64 bit)", VBOXOSTYPE_Mandriva_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "RedHat", "Red Hat", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "RedHat", "Red Hat", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "RedHat", "Red Hat", VBOXOSTYPE_RedHat, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE, 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "RedHat_64", "Red Hat (64 bit)", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "RedHat_64", "Red Hat (64 bit)", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "RedHat_64", "Red Hat (64 bit)", VBOXOSTYPE_RedHat_x64, VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC, 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Turbolinux", "Turbolinux", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Turbolinux", "Turbolinux", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Turbolinux", "Turbolinux", VBOXOSTYPE_Turbolinux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Turbolinux_64", "Turbolinux (64 bit)", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Turbolinux_64", "Turbolinux (64 bit)", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Turbolinux_64", "Turbolinux (64 bit)", VBOXOSTYPE_Turbolinux_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Ubuntu", "Ubuntu", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Ubuntu", "Ubuntu", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Ubuntu", "Ubuntu", VBOXOSTYPE_Ubuntu, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE | VBOXOSHINT_USBTABLET, 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Ubuntu_64", "Ubuntu (64 bit)", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Ubuntu_64", "Ubuntu (64 bit)", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Ubuntu_64", "Ubuntu (64 bit)", VBOXOSTYPE_Ubuntu_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Xandros", "Xandros", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Xandros", "Xandros", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Xandros", "Xandros", VBOXOSTYPE_Xandros, VBOXOSHINT_RTCUTC, 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Xandros_64", "Xandros (64 bit)", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Xandros_64", "Xandros (64 bit)", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Xandros_64", "Xandros (64 bit)", VBOXOSTYPE_Xandros_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC, 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Oracle", "Oracle", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Oracle", "Oracle", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Oracle", "Oracle", VBOXOSTYPE_Oracle, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE, 512, 12, 12 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Oracle_64", "Oracle (64 bit)", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Oracle_64", "Oracle (64 bit)", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Oracle_64", "Oracle (64 bit)", VBOXOSTYPE_Oracle_x64, VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC, 512, 12, 12 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Linux", "Other Linux", - VBOXOSTYPE_Linux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, - 256, 12, 8 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows31", "Windows 3.1", ++ { "Non-free OSs", "Non-free Operating Systems", "Windows31", "Windows 3.1", + VBOXOSTYPE_Win31, VBOXOSHINT_FLOPPY, + 32, 4, 1 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows95", "Windows 95", ++ { "Non-free OSs", "Non-free Operating Systems", "Windows95", "Windows 95", + VBOXOSTYPE_Win95, VBOXOSHINT_FLOPPY, + 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows98", "Windows 98", ++ { "Non-free OSs", "Non-free Operating Systems", "Windows98", "Windows 98", + VBOXOSTYPE_Win98, VBOXOSHINT_FLOPPY, + 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "WindowsMe", "Windows ME", ++ { "Non-free OSs", "Non-free Operating Systems", "WindowsMe", "Windows ME", + VBOXOSTYPE_WinMe, VBOXOSHINT_FLOPPY | VBOXOSHINT_USBTABLET, + 128, 4, 4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "WindowsNT4", "Windows NT 4", ++ { "Non-free OSs", "Non-free Operating Systems", "WindowsNT4", "Windows NT 4", + VBOXOSTYPE_WinNT4, VBOXOSHINT_NONE, + 128, 16, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows2000", "Windows 2000", ++ { "Non-free OSs", "Non-free Operating Systems", "Windows2000", "Windows 2000", + VBOXOSTYPE_Win2k, VBOXOSHINT_USBTABLET, + 168, 16, 4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "WindowsXP", "Windows XP", ++ { "Non-free OSs", "Non-free Operating Systems", "WindowsXP", "Windows XP", + VBOXOSTYPE_WinXP, VBOXOSHINT_USBTABLET, + 192, 16, 10 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "WindowsXP_64", "Windows XP (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems", "WindowsXP_64", "Windows XP (64 bit)", + VBOXOSTYPE_WinXP_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, + 192, 16, 10 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows2003", "Windows 2003", ++ { "Non-free OSs", "Non-free Operating Systems", "Windows2003", "Windows 2003", + VBOXOSTYPE_Win2k3, VBOXOSHINT_USBTABLET, + 256, 16, 20 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows2003_64", "Windows 2003 (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems", "Windows2003_64", "Windows 2003 (64 bit)", + VBOXOSTYPE_Win2k3_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, + 256, 16, 20 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_HDA }, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "WindowsVista", "Windows Vista", ++ { "Non-free OSs", "Non-free Operating Systems", "WindowsVista", "Windows Vista", + VBOXOSTYPE_WinVista, VBOXOSHINT_USBTABLET, + 512, 16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "WindowsVista_64", "Windows Vista (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems", "WindowsVista_64", "Windows Vista (64 bit)", + VBOXOSTYPE_WinVista_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, + 512, 16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows2008", "Windows 2008", ++ { "Non-free OSs", "Non-free Operating Systems", "Windows2008", "Windows 2008", + VBOXOSTYPE_Win2k8, VBOXOSHINT_USBTABLET, + 512, 16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows2008_64", "Windows 2008 (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems", "Windows2008_64", "Windows 2008 (64 bit)", + VBOXOSTYPE_Win2k8_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, + 512, 16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows7", "Windows 7", ++ { "Non-free OSs", "Non-free Operating Systems", "Windows7", "Windows 7", + VBOXOSTYPE_Win7, VBOXOSHINT_USBTABLET, + 512, 16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows7_64", "Windows 7 (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems", "Windows7_64", "Windows 7 (64 bit)", + VBOXOSTYPE_Win7_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, + 512, 16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows8", "Windows 8", ++ { "Non-free OSs", "Non-free Operating Systems", "Windows8", "Windows 8", + VBOXOSTYPE_Win8, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_PAE, + 1024,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows8_64", "Windows 8 (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems", "Windows8_64", "Windows 8 (64 bit)", + VBOXOSTYPE_Win8_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, + 2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows2012_64", "Windows 2012 (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems", "Windows2012_64", "Windows 2012 (64 bit)", + VBOXOSTYPE_Win2k12_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, + 2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "WindowsNT", "Other Windows", ++ { "Non-free OSs", "Non-free Operating Systems", "WindowsNT", "Other Windows", + VBOXOSTYPE_WinNT, VBOXOSHINT_NONE, + 512, 16, 20 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Solaris", "Solaris", "Solaris", "Oracle Solaris 10 5/09 and earlier", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Solaris", "Oracle Solaris 10 5/09 and earlier", ++ { "Non-free OSs", "Non-free Operating Systems", "Solaris", "Oracle Solaris 10 5/09 and earlier", VBOXOSTYPE_Solaris, VBOXOSHINT_NONE, 768, 12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Solaris", "Solaris", "Solaris_64", "Oracle Solaris 10 5/09 and earlier (64 bit)", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Solaris_64", "Oracle Solaris 10 5/09 and earlier (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems", "Solaris_64", "Oracle Solaris 10 5/09 and earlier (64 bit)", VBOXOSTYPE_Solaris_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 1536, 12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Solaris", "Solaris", "OpenSolaris", "Oracle Solaris 10 10/09 and later", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "OpenSolaris", "Oracle Solaris 10 10/09 and later", ++ { "Non-free OSs", "Non-free Operating Systems", "OpenSolaris", "Oracle Solaris 10 10/09 and later", VBOXOSTYPE_OpenSolaris, VBOXOSHINT_USBTABLET, 768, 12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Solaris", "Solaris", "OpenSolaris_64", "Oracle Solaris 10 10/09 and later (64 bit)", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "OpenSolaris_64", "Oracle Solaris 10 10/09 and later (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems", "OpenSolaris_64", "Oracle Solaris 10 10/09 and later (64 bit)", VBOXOSTYPE_OpenSolaris_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, 1536, 12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Solaris", "Solaris", "Solaris11_64", "Oracle Solaris 11 (64 bit)", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Solaris11_64", "Oracle Solaris 11 (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems", "Solaris11_64", "Oracle Solaris 11 (64 bit)", VBOXOSTYPE_Solaris11_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, 1536, 12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "BSD", "BSD", "FreeBSD", "FreeBSD", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "FreeBSD", "FreeBSD", ++ { "Non-free OSs", "Non-free Operating Systems", "FreeBSD", "FreeBSD", VBOXOSTYPE_FreeBSD, VBOXOSHINT_NONE, 128, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "BSD", "BSD", "FreeBSD_64", "FreeBSD (64 bit)", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "FreeBSD_64", "FreeBSD (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems", "FreeBSD_64", "FreeBSD (64 bit)", VBOXOSTYPE_FreeBSD_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 128, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "BSD", "BSD", "OpenBSD", "OpenBSD", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "OpenBSD", "OpenBSD", ++ { "Non-free OSs", "Non-free Operating Systems", "OpenBSD", "OpenBSD", VBOXOSTYPE_OpenBSD, VBOXOSHINT_HWVIRTEX, 64, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "BSD", "BSD", "OpenBSD_64", "OpenBSD (64 bit)", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "OpenBSD_64", "OpenBSD (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems", "OpenBSD_64", "OpenBSD (64 bit)", VBOXOSTYPE_OpenBSD_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 64, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "BSD", "BSD", "NetBSD", "NetBSD", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "NetBSD", "NetBSD", ++ { "Non-free OSs", "Non-free Operating Systems", "NetBSD", "NetBSD", VBOXOSTYPE_NetBSD, VBOXOSHINT_NONE, 64, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "BSD", "BSD", "NetBSD_64", "NetBSD (64 bit)", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "NetBSD_64", "NetBSD (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems", "NetBSD_64", "NetBSD (64 bit)", VBOXOSTYPE_NetBSD_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 64, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "OS2", "IBM OS/2", "OS2Warp3", "OS/2 Warp 3", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "OS2Warp3", "OS/2 Warp 3", ++ { "Non-free OSs", "Non-free Operating Systems", "OS2Warp3", "OS/2 Warp 3", VBOXOSTYPE_OS2Warp3, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY, 48, 4, 1 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, - { "OS2", "IBM OS/2", "OS2Warp4", "OS/2 Warp 4", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "OS2Warp4", "OS/2 Warp 4", ++ { "Non-free OSs", "Non-free Operating Systems", "OS2Warp4", "OS/2 Warp 4", VBOXOSTYPE_OS2Warp4, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY, 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, - { "OS2", "IBM OS/2", "OS2Warp45", "OS/2 Warp 4.5", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "OS2Warp45", "OS/2 Warp 4.5", ++ { "Non-free OSs", "Non-free Operating Systems", "OS2Warp45", "OS/2 Warp 4.5", VBOXOSTYPE_OS2Warp45, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY, 128, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, - { "OS2", "IBM OS/2", "OS2eCS", "eComStation", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "OS2eCS", "eComStation", ++ { "Non-free OSs", "Non-free Operating Systems", "OS2eCS", "eComStation", VBOXOSTYPE_ECS, VBOXOSHINT_HWVIRTEX, 256, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "OS2", "IBM OS/2", "OS2", "Other OS/2", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "OS2", "Other OS/2", ++ { "Non-free OSs", "Non-free Operating Systems", "OS2", "Other OS/2", VBOXOSTYPE_OS2, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY | VBOXOSHINT_NOUSB, 96, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, - { "MacOS", "Mac OS X", "MacOS", "Mac OS X", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "MacOS", "Mac OS X", ++ { "Non-free OSs", "Non-free Operating Systems", "MacOS", "Mac OS X", VBOXOSTYPE_MacOS, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE | VBOXOSHINT_USBHID | VBOXOSHINT_HPET | VBOXOSHINT_USBTABLET, 2048, 4, 20 * _1G64, NetworkAdapterType_I82543GC, 0, StorageControllerType_ICH6, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_ICH9, AudioControllerType_HDA }, - { "MacOS", "Mac OS X", "MacOS_64", "Mac OS X (64 bit)", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "MacOS_64", "Mac OS X (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems", "MacOS_64", "Mac OS X (64 bit)", VBOXOSTYPE_MacOS_x64, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE | VBOXOSHINT_64BIT | VBOXOSHINT_USBHID | VBOXOSHINT_HPET | VBOXOSHINT_USBTABLET, 2048, 4, 20 * _1G64, NetworkAdapterType_I82543GC, 0, StorageControllerType_ICH6, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_ICH9, AudioControllerType_HDA }, - { "Other", "Other", "DOS", "DOS", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "DOS", "DOS", ++ { "Non-free OSs", "Non-free Operating Systems", "DOS", "DOS", VBOXOSTYPE_DOS, VBOXOSHINT_FLOPPY | VBOXOSHINT_NOUSB, 32, 4, 500 * _1M, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, - { "Other", "Other", "Netware", "Netware", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Netware", "Netware", ++ { "Non-free OSs", "Non-free Operating Systems", "Netware", "Netware", VBOXOSTYPE_Netware, VBOXOSHINT_HWVIRTEX, 512, 4, 4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Other", "Other", "L4", "L4", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "L4", "L4", ++ { "Non-free OSs", "Non-free Operating Systems", "L4", "L4", VBOXOSTYPE_L4, VBOXOSHINT_NONE, 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Other", "Other", "QNX", "QNX", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "QNX", "QNX", ++ { "Non-free OSs", "Non-free Operating Systems", "QNX", "QNX", VBOXOSTYPE_QNX, VBOXOSHINT_HWVIRTEX, 512, 4, 4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Other", "Other", "JRockitVE", "JRockitVE", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "JRockitVE", "JRockitVE", ++ { "Non-free OSs", "Non-free Operating Systems", "JRockitVE", "JRockitVE", VBOXOSTYPE_JRockitVE, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_PAE, 1024, 4, 8 * _1G64, NetworkAdapterType_I82545EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_BusLogic, StorageBus_SCSI, ChipsetType_PIIX3, AudioControllerType_AC97 }, ---- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2012-08-29 11:13:40.000000000 -0300 -+++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2012-10-16 22:44:37.177454655 -0200 -@@ -44,45 +44,33 @@ +diff --git a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp +index c5a4cfe..7d2b363 100644 +--- a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp ++++ b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp +@@ -44,46 +44,33 @@ struct osTypePattern static const osTypePattern gs_OSTypePattern[] = { @@ -519,6 +523,7 @@ - { QRegExp("(Wi.*2003)|(W2K3)", Qt::CaseInsensitive), "Windows2003" }, - { QRegExp("((Wi.*V)|(Vista)).*64", Qt::CaseInsensitive), "WindowsVista_64" }, - { QRegExp("(Wi.*V)|(Vista)", Qt::CaseInsensitive), "WindowsVista" }, +- { QRegExp("(Wi.*2012)|(W2K12)", Qt::CaseInsensitive), "Windows2012_64" }, - { QRegExp("((Wi.*2008)|(W2K8)).*64", Qt::CaseInsensitive), "Windows2008_64" }, - { QRegExp("(Wi.*2008)|(W2K8)", Qt::CaseInsensitive), "Windows2008" }, - { QRegExp("(Wi.*2000)|(W2K)", Qt::CaseInsensitive), "Windows2000" }, @@ -542,6 +547,8 @@ - { QRegExp("OS[/|!-]{,1}2.*W", Qt::CaseInsensitive), "OS2Warp3" }, - { QRegExp("(OS[/|!-]{,1}2.*e)|(eCS.*)", Qt::CaseInsensitive), "OS2eCS" }, - { QRegExp("OS[/|!-]{,1}2", Qt::CaseInsensitive), "OS2" }, +- +- /* Code names for Linux distributions: */ + /* Code names for free GNU/Linux distributions */ + { QRegExp("((Taranis)|(Dagda)|(Brigantia)).*64", Qt::CaseInsensitive), "Trisquel_64" }, + { QRegExp("(Taranis)|(Dagda)|(Brigantia)", Qt::CaseInsensitive), "Trisquel" }, @@ -567,13 +574,12 @@ + { QRegExp("Tri", Qt::CaseInsensitive), "Trisquel" }, + { QRegExp("Dyn", Qt::CaseInsensitive), "Dynebolic" }, + { QRegExp("Ven", Qt::CaseInsensitive), "Venenux" }, - -- /* Code names for Linux distributions: */ ++ + /* Code names for non-free GNU/Linux distributions: */ { QRegExp("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)).*64", Qt::CaseInsensitive), "Ubuntu_64" }, { QRegExp("(edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)", Qt::CaseInsensitive), "Ubuntu" }, { QRegExp("((sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(sid)).*64", Qt::CaseInsensitive), "Debian_64" }, -@@ -90,7 +78,7 @@ +@@ -91,7 +78,7 @@ static const osTypePattern gs_OSTypePattern[] = { QRegExp("((moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)).*64", Qt::CaseInsensitive), "Fedora_64" }, { QRegExp("(moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)", Qt::CaseInsensitive), "Fedora" }, @@ -582,7 +588,7 @@ { QRegExp("Arc.*64", Qt::CaseInsensitive), "ArchLinux_64" }, { QRegExp("Arc", Qt::CaseInsensitive), "ArchLinux" }, { QRegExp("Deb.*64", Qt::CaseInsensitive), "Debian_64" }, -@@ -115,15 +103,50 @@ +@@ -116,15 +103,51 @@ static const osTypePattern gs_OSTypePattern[] = { QRegExp("(Or)|(oel)", Qt::CaseInsensitive), "Oracle" }, { QRegExp("Knoppix", Qt::CaseInsensitive), "Linux26" }, { QRegExp("Dsl", Qt::CaseInsensitive), "Linux24" }, @@ -619,6 +625,7 @@ + { QRegExp("(Wi.*2003)|(W2K3)", Qt::CaseInsensitive), "Windows2003" }, + { QRegExp("((Wi.*V)|(Vista)).*64", Qt::CaseInsensitive), "WindowsVista_64" }, + { QRegExp("(Wi.*V)|(Vista)", Qt::CaseInsensitive), "WindowsVista" }, ++ { QRegExp("(Wi.*2012)|(W2K12)", Qt::CaseInsensitive), "Windows2012_64" }, + { QRegExp("((Wi.*2008)|(W2K8)).*64", Qt::CaseInsensitive), "Windows2008_64" }, + { QRegExp("(Wi.*2008)|(W2K8)", Qt::CaseInsensitive), "Windows2008" }, + { QRegExp("(Wi.*2000)|(W2K)", Qt::CaseInsensitive), "Windows2000" }, @@ -641,18 +648,37 @@ { QRegExp("L4", Qt::CaseInsensitive), "L4" }, { QRegExp("((Fr.*B)|(fbsd)).*64", Qt::CaseInsensitive), "FreeBSD_64" }, { QRegExp("(Fr.*B)|(fbsd)", Qt::CaseInsensitive), "FreeBSD" }, -@@ -136,6 +159,8 @@ +@@ -137,6 +160,8 @@ static const osTypePattern gs_OSTypePattern[] = { QRegExp("(Mac)|(Tig)|(Leop)|(osx)", Qt::CaseInsensitive), "MacOS" }, { QRegExp("Net", Qt::CaseInsensitive), "Netware" }, { QRegExp("Rocki", Qt::CaseInsensitive), "JRockitVE" }, -+ ++ + /* Other: */ { QRegExp("Ot", Qt::CaseInsensitive), "Other" }, }; ---- VirtualBox-4.2.0.orig/src/VBox/Main/xml/Settings.cpp 2012-08-29 11:13:34.000000000 -0300 -+++ VirtualBox-4.2.0/src/VBox/Main/xml/Settings.cpp 2012-10-03 17:02:44.581501053 -0300 -@@ -3405,7 +3405,18 @@ +@@ -231,11 +256,13 @@ UIWizardNewVMPageBasic1::UIWizardNewVMPageBasic1(const QString &strGroup) + /* Create widgets: */ + QVBoxLayout *pMainLayout = new QVBoxLayout(this); + { ++ pMainLayout->setContentsMargins(8, 6, 8, 6); + m_pLabel = new QIRichTextLabel(this); ++ m_pLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); + m_pNameAndSystemEditor = new UINameAndSystemEditor(this); +- pMainLayout->addWidget(m_pLabel); +- pMainLayout->addWidget(m_pNameAndSystemEditor); +- pMainLayout->addStretch(); ++ m_pNameAndSystemEditor->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding); ++ pMainLayout->addWidget(m_pLabel, 1); ++ pMainLayout->addWidget(m_pNameAndSystemEditor, 1); + } + + /* Setup connections: */ +diff --git a/src/VBox/Main/xml/Settings.cpp b/src/VBox/Main/xml/Settings.cpp +index 8cb1e12..20e3eda 100644 +--- a/src/VBox/Main/xml/Settings.cpp ++++ b/src/VBox/Main/xml/Settings.cpp +@@ -3405,7 +3405,18 @@ const struct { { "netware", "Netware" }, { "solaris", "Solaris" }, { "opensolaris", "OpenSolaris" }, @@ -672,9 +698,11 @@ }; void MachineConfigFile::convertOldOSType_pre1_5(Utf8Str &str) ---- VirtualBox-4.2.0.orig/src/VBox/Main/xml/SettingsConverter.xsl 2012-09-04 09:48:43.000000000 -0300 -+++ VirtualBox-4.2.0/src/VBox/Main/xml/SettingsConverter.xsl 2012-10-03 17:02:10.780019131 -0300 -@@ -763,6 +763,17 @@ +diff --git a/src/VBox/Main/xml/SettingsConverter.xsl b/src/VBox/Main/xml/SettingsConverter.xsl +index 9a31a4c..7db11ad 100644 +--- a/src/VBox/Main/xml/SettingsConverter.xsl ++++ b/src/VBox/Main/xml/SettingsConverter.xsl +@@ -763,6 +763,17 @@ Value '<xsl:value-of select="@type"/>' of 'HardDisk::type' attribute is invalid. <xsl:when test="@OSType='solaris'">Solaris</xsl:when> <xsl:when test="@OSType='opensolaris'">OpenSolaris</xsl:when> <xsl:when test="@OSType='l4'">L4</xsl:when> @@ -692,9 +720,11 @@ </xsl:choose> </xsl:attribute> <xsl:apply-templates select="@*[name()!='OSType']" mode="v1.5"/> ---- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2012-05-30 07:39:18.000000000 -0300 -+++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2012-10-03 00:13:20.408089706 -0300 -@@ -70,6 +70,24 @@ +diff --git a/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc b/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc +index 4523dad..38ae21a 100644 +--- a/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc ++++ b/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc +@@ -71,6 +71,24 @@ <file alias="os_oracle_64.png">images/os_oracle_64.png</file> <file alias="os_macosx.png">images/os_macosx.png</file> <file alias="os_macosx_64.png">images/os_macosx_64.png</file> @@ -719,9 +749,11 @@ <file alias="hd_16px.png">images/hd_16px.png</file> <file alias="hd_disabled_16px.png">images/hd_disabled_16px.png</file> <file alias="hd_32px.png">images/hd_32px.png</file> ---- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp 2012-09-04 09:48:45.000000000 -0300 -+++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp 2012-10-03 17:03:46.114796857 -0300 -@@ -4310,11 +4310,11 @@ +diff --git a/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp b/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp +index 8af9597..39a8d39 100644 +--- a/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp ++++ b/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp +@@ -4336,11 +4336,11 @@ void VBoxGlobal::init() {"OS2Warp45", ":/os_os2warp45.png"}, {"OS2eCS", ":/os_os2ecs.png"}, {"OS2", ":/os_os2_other.png"}, @@ -738,7 +770,7 @@ {"ArchLinux", ":/os_archlinux.png"}, {"ArchLinux_64", ":/os_archlinux_64.png"}, {"Debian", ":/os_debian.png"}, -@@ -4337,7 +4337,7 @@ +@@ -4363,7 +4363,7 @@ void VBoxGlobal::init() {"Xandros_64", ":/os_xandros_64.png"}, {"Oracle", ":/os_oracle.png"}, {"Oracle_64", ":/os_oracle_64.png"}, @@ -747,7 +779,7 @@ {"FreeBSD", ":/os_freebsd.png"}, {"FreeBSD_64", ":/os_freebsd_64.png"}, {"OpenBSD", ":/os_openbsd.png"}, -@@ -4353,6 +4353,25 @@ +@@ -4379,6 +4379,25 @@ void VBoxGlobal::init() {"MacOS", ":/os_macosx.png"}, {"MacOS_64", ":/os_macosx_64.png"}, {"JRockitVE", ":/os_jrockitve.png"}, @@ -773,9 +805,11 @@ }; for (uint n = 0; n < SIZEOF_ARRAY (kOSTypeIcons); ++ n) { ---- VirtualBox-4.2.0.orig/include/VBox/ostypes.h 2012-09-08 06:35:56.000000000 -0300 -+++ VirtualBox-4.2.0/include/VBox/ostypes.h 2012-10-03 17:07:12.143504689 -0300 -@@ -116,6 +116,25 @@ +diff --git a/include/VBox/ostypes.h b/include/VBox/ostypes.h +index cbc0b73..31516cd 100644 +--- a/include/VBox/ostypes.h ++++ b/include/VBox/ostypes.h +@@ -116,6 +116,25 @@ typedef enum VBOXOSTYPE VBOXOSTYPE_MacOS = 0xB0000, VBOXOSTYPE_MacOS_x64 = 0xB0100, VBOXOSTYPE_JRockitVE = 0xC0000, @@ -801,9 +835,11 @@ /** The bit number which indicates 64-bit or 32-bit. */ #define VBOXOSTYPE_x64_BIT 8 /** The mask which indicates 64-bit. */ ---- VirtualBox-4.2.0.orig/src/VBox/Main/src-server/ApplianceImpl.cpp 2012-08-03 09:28:30.000000000 -0300 -+++ VirtualBox-4.2.0/src/VBox/Main/src-server/ApplianceImpl.cpp 2012-10-03 17:11:27.739487250 -0300 -@@ -84,7 +84,32 @@ +diff --git a/src/VBox/Main/src-server/ApplianceImpl.cpp b/src/VBox/Main/src-server/ApplianceImpl.cpp +index 05fc3b6..ce24d92 100644 +--- a/src/VBox/Main/src-server/ApplianceImpl.cpp ++++ b/src/VBox/Main/src-server/ApplianceImpl.cpp +@@ -84,7 +84,32 @@ g_osTypes[] = { ovf::CIMOSType_CIMOS_MACOS, VBOXOSTYPE_MacOS }, { ovf::CIMOSType_CIMOS_MACOS, VBOXOSTYPE_MacOS_x64 }, // there is no CIM 64-bit type for this @@ -837,7 +873,7 @@ { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux, VBOXOSTYPE_RedHat }, { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux_64, VBOXOSTYPE_RedHat_x64 }, { ovf::CIMOSType_CIMOS_Solaris_64, VBOXOSTYPE_Solaris_x64 }, -@@ -110,7 +135,7 @@ +@@ -110,7 +135,7 @@ g_osTypes[] = { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_Linux26_x64 }, { ovf::CIMOSType_CIMOS_Linux_64, VBOXOSTYPE_Linux26_x64 }, @@ -846,7 +882,7 @@ { ovf::CIMOSType_CIMOS_Linux_2_6_x, VBOXOSTYPE_ArchLinux }, { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_ArchLinux_x64 }, { ovf::CIMOSType_CIMOS_Linux_2_6_x, VBOXOSTYPE_FedoraCore }, -@@ -151,53 +176,72 @@ +@@ -151,53 +176,72 @@ struct osTypePattern /* These are the 32-Bit ones. They are sorted by priority. */ static const osTypePattern g_osTypesPattern[] = { @@ -961,9 +997,11 @@ }; /** ---- VirtualBox-4.2.0.orig/src/VBox/Main/include/ovfreader.h 2011-04-28 05:00:56.000000000 -0300 -+++ VirtualBox-4.2.0/src/VBox/Main/include/ovfreader.h 2012-10-03 17:13:50.738308572 -0300 -@@ -145,8 +145,20 @@ +diff --git a/src/VBox/Main/include/ovfreader.h b/src/VBox/Main/include/ovfreader.h +index e1e21d5..6d2da12 100644 +--- a/src/VBox/Main/include/ovfreader.h ++++ b/src/VBox/Main/include/ovfreader.h +@@ -145,8 +145,20 @@ enum CIMOSType_T CIMOSType_CIMOS_CentOS_64 = 107, CIMOSType_CIMOS_OracleEnterpriseLinux = 108, CIMOSType_CIMOS_OracleEnterpriseLinux_64 = 109, @@ -985,9 +1023,11 @@ }; ---- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp 2012-07-18 05:58:09.000000000 -0300 -+++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp 2012-10-03 22:49:11.871882837 -0300 -@@ -141,7 +141,7 @@ +diff --git a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp +index 59749be..8e2b425 100644 +--- a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp ++++ b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp +@@ -141,7 +141,7 @@ void UIMachineSettingsDisplay::setGuestOSType(CGuestOSType guestOSType) #ifdef VBOX_WITH_VIDEOHWACCEL /* Check if 2D video acceleration supported by the guest OS type: */ QString strguestOSTypeFamily = m_guestOSType.GetFamilyId(); @@ -996,3 +1036,737 @@ #endif /* VBOX_WITH_VIDEOHWACCEL */ #ifdef VBOX_WITH_CRHGSMI /* Check if WDDM mode supported by the guest OS type: */ +diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp b/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp +index f67cfc2..438ffee 100644 +--- a/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp ++++ b/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp +@@ -32,6 +32,11 @@ enum + TypeID = Qt::UserRole + 1 + }; + ++const char* FreedomLabel = "We hope you don't use non-free " ++ "GNU/Linux distros and non-free operating " ++ "systems, since to use them is to surrender " ++ "your freedom."; ++ + UINameAndSystemEditor::UINameAndSystemEditor(QWidget *pParent) + : QIWithRetranslateUI<QWidget>(pParent) + { +@@ -39,55 +44,91 @@ UINameAndSystemEditor::UINameAndSystemEditor(QWidget *pParent) + qRegisterMetaType<CGuestOSType>(); + + /* Create widgets: */ +- QGridLayout *pMainLayout = new QGridLayout(this); ++ QVBoxLayout *pMainLayout = new QVBoxLayout(this); + { + pMainLayout->setContentsMargins(0, 0, 0, 0); +- m_pNameLabel = new QLabel(this); +- { +- m_pNameLabel->setAlignment(Qt::AlignRight); +- m_pNameLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed); +- } +- m_pNameEditor = new QLineEdit(this); +- { +- m_pNameEditor->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); +- m_pNameLabel->setBuddy(m_pNameEditor); +- } +- m_pFamilyLabel = new QLabel(this); +- { +- m_pFamilyLabel->setAlignment(Qt::AlignRight); +- m_pFamilyLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed); +- } +- m_pFamilyCombo = new QComboBox(this); +- { +- m_pFamilyCombo->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed); +- m_pFamilyLabel->setBuddy(m_pFamilyCombo); +- } +- m_pTypeLabel = new QLabel(this); +- { +- m_pTypeLabel->setAlignment(Qt::AlignRight); +- m_pTypeLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed); +- } +- m_pTypeCombo = new QComboBox(this); +- { +- m_pTypeCombo->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed); +- m_pTypeLabel->setBuddy(m_pTypeCombo); +- } +- QVBoxLayout *pIconLayout = new QVBoxLayout; +- { +- m_pTypeIcon = new QLabel(this); ++ ++ /* Top QWidget */ ++ m_pGlobalCnt = new QFrame; ++ m_pGlobalCnt->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum); ++ ++ QVBoxLayout *pGlobalLayout = new QVBoxLayout(m_pGlobalCnt); ++ { ++ m_pGridCnt = new QFrame; ++ m_pGridCnt->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum); ++ m_pGridCnt->setMinimumWidth(500); ++ ++ QGridLayout *pGridLayout = new QGridLayout(m_pGridCnt); + { +- m_pTypeIcon->setFixedSize(32, 32); +- } +- pIconLayout->addWidget(m_pTypeIcon); +- pIconLayout->addStretch(); +- } +- pMainLayout->addWidget(m_pNameLabel, 0, 0); +- pMainLayout->addWidget(m_pNameEditor, 0, 1, 1, 2); +- pMainLayout->addWidget(m_pFamilyLabel, 1, 0); +- pMainLayout->addWidget(m_pFamilyCombo, 1, 1); +- pMainLayout->addWidget(m_pTypeLabel, 2, 0); +- pMainLayout->addWidget(m_pTypeCombo, 2, 1); +- pMainLayout->addLayout(pIconLayout, 1, 2, 2, 1); ++ pGridLayout->setContentsMargins(4, 4, 4, 4); ++ m_pNameLabel = new QLabel(m_pGridCnt); ++ { ++ m_pNameLabel->setAlignment(Qt::AlignRight); ++ m_pNameLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed); ++ } ++ m_pNameEditor = new QLineEdit(m_pGridCnt); ++ { ++ m_pNameEditor->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); ++ m_pNameLabel->setBuddy(m_pNameEditor); ++ } ++ m_pFamilyLabel = new QLabel(m_pGridCnt); ++ { ++ m_pFamilyLabel->setAlignment(Qt::AlignRight); ++ m_pFamilyLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed); ++ } ++ m_pFamilyCombo = new QComboBox(m_pGridCnt); ++ { ++ m_pFamilyCombo->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed); ++ m_pFamilyLabel->setBuddy(m_pFamilyCombo); ++ } ++ m_pTypeLabel = new QLabel(m_pGridCnt); ++ { ++ m_pTypeLabel->setAlignment(Qt::AlignRight); ++ m_pTypeLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed); ++ } ++ m_pTypeCombo = new QComboBox(m_pGridCnt); ++ { ++ m_pTypeCombo->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed); ++ m_pTypeLabel->setBuddy(m_pTypeCombo); ++ } ++ QVBoxLayout *pIconLayout = new QVBoxLayout; ++ { ++ m_pTypeIcon = new QLabel; ++ { ++ m_pTypeIcon->setFixedSize(32, 32); ++ } ++ pIconLayout->addWidget(m_pTypeIcon); ++ pIconLayout->addStretch(); ++ } ++ ++ pGridLayout->addWidget(m_pNameLabel, 0, 0); ++ pGridLayout->addWidget(m_pNameEditor, 0, 1, 1, 2); ++ pGridLayout->addWidget(m_pFamilyLabel, 1, 0); ++ pGridLayout->addWidget(m_pFamilyCombo, 1, 1); ++ pGridLayout->addWidget(m_pTypeLabel, 2, 0); ++ pGridLayout->addWidget(m_pTypeCombo, 2, 1); ++ pGridLayout->addLayout(pIconLayout, 1, 2, 2, 1); ++ } ++ ++ m_pFreedomLabel = new QLabel(m_pGlobalCnt); ++ { ++ m_pFreedomLabel->setStyleSheet("color: red;" ++ "border-radius: 4px;" ++ "padding: 2px;" ++ "background-color: #DDDDDD;"); ++ m_pFreedomLabel->setWordWrap(true); ++ m_pFreedomLabel->setAlignment(Qt::AlignCenter); ++ m_pFreedomLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum); ++ m_pFreedomLabel->hide(); ++ } ++ ++ pGlobalLayout->addStretch(); ++ pGlobalLayout->addWidget(m_pGridCnt, 0, Qt::AlignCenter); ++ pGlobalLayout->addWidget(m_pFreedomLabel); ++ pGlobalLayout->addStretch(); ++ } ++ ++ pMainLayout->addWidget(m_pGlobalCnt); + } + + /* Check if host supports (AMD-V or VT-x) and long mode: */ +@@ -165,6 +206,7 @@ void UINameAndSystemEditor::retranslateUi() + m_pTypeCombo->setWhatsThis(tr("Displays the operating system type that " + "you plan to install into this virtual machine " + "(called a guest operating system).")); ++ m_pFreedomLabel->setText(tr(FreedomLabel)); + } + + void UINameAndSystemEditor::sltFamilyChanged(int iIndex) +@@ -210,6 +252,20 @@ void UINameAndSystemEditor::sltFamilyChanged(int iIndex) + /* Else simply select the first one present: */ + else m_pTypeCombo->setCurrentIndex(0); + ++ /* Hide or show the freedom label if it is translated to the active language */ ++ int isEnglish = QLocale::system().language(); ++ if (m_pFreedomLabel->text() != FreedomLabel || isEnglish == 1 || isEnglish == 31) ++ { ++ if (strFamilyId == "Non-free OSs" || strFamilyId == "Non-free Distros") ++ { ++ m_pFreedomLabel->show(); ++ } ++ else ++ { ++ m_pFreedomLabel->hide(); ++ } ++ } ++ + /* Update all the stuff: */ + sltTypeChanged(m_pTypeCombo->currentIndex()); + +diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.h b/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.h +index 6a698c0..3c23845 100644 +--- a/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.h ++++ b/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.h +@@ -30,6 +30,7 @@ + class QLabel; + class QLineEdit; + class QComboBox; ++class QFrame; + + /* QWidget reimplementation providing editor for basic VM parameters: */ + class UINameAndSystemEditor : public QIWithRetranslateUI<QWidget> +@@ -76,6 +77,8 @@ private slots: + private: + + /* Widgets: */ ++ QFrame *m_pGlobalCnt; ++ QFrame *m_pGridCnt; + QLabel *m_pNameLabel; + QLabel *m_pFamilyLabel; + QLabel *m_pTypeLabel; +@@ -83,6 +86,7 @@ private: + QLineEdit *m_pNameEditor; + QComboBox *m_pFamilyCombo; + QComboBox *m_pTypeCombo; ++ QLabel *m_pFreedomLabel; + + /* Variables: */ + CGuestOSType m_type; +diff --git a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp +index 100cb8c..5ab98ad 100644 +--- a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp ++++ b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp +@@ -19,7 +19,7 @@ + + /* Global includes: */ + #include <QVBoxLayout> +-#include <QHBoxLayout> ++#include <QVBoxLayout> + #include <QGroupBox> + #include <QGridLayout> + #include <QSpacerItem> +@@ -47,8 +47,11 @@ UIWizardNewVMPageExpert::UIWizardNewVMPageExpert(const QString &strGroup) + m_pNameAndSystemCnt = new QGroupBox(this); + { + m_pNameAndSystemCnt->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed); +- QHBoxLayout *pNameAndSystemCntLayout = new QHBoxLayout(m_pNameAndSystemCnt); ++ m_pNameAndSystemCnt->setFixedHeight(170); ++ ++ QVBoxLayout *pNameAndSystemCntLayout = new QVBoxLayout(m_pNameAndSystemCnt); + { ++ pNameAndSystemCntLayout->setContentsMargins(8, 2, 8, 2); + m_pNameAndSystemEditor = new UINameAndSystemEditor(m_pNameAndSystemCnt); + pNameAndSystemCntLayout->addWidget(m_pNameAndSystemEditor); + } +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_bg.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_bg.ts +index cea825b..7ade350 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_bg.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_bg.ts +@@ -7235,6 +7235,10 @@ p, li { white-space: pre-wrap; } + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation>Показва вида на операционната система, която планирате да инсталирате на виртуалната машина (наричана виртуална операционна система).</translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished">Надяваме се, че не ползвате несвободни дистрибуции на GNU/Линукс и несвободни операционни системи, тъй като използването им означава, че се отказвате от свободата си.</translation> ++ </message> + </context> + <context> + <name>UINetworkManagerDialog</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca.ts +index e41d97d..f449069 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca.ts +@@ -7667,6 +7667,10 @@ p, li { white-space: pre-wrap; } + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation type="unfinished">Mostra el tipus de sistema operatiu que voleu instal·lar a dins d'aquesta màquina virtual (anomenat sistema operatiu client).</translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished"></translation> ++ </message> + </context> + <context> + <name>UINetworkManagerDialog</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca_VA.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca_VA.ts +index e82fc7c..a98be2c 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca_VA.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca_VA.ts +@@ -7667,6 +7667,10 @@ p, li { white-space: pre-wrap; } + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation type="unfinished">Mostra el tipus de sistema operatiu que voleu instal·lar a dins d'esta màquina virtual (anomenat sistema operatiu client).</translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished"></translation> ++ </message> + </context> + <context> + <name>UINetworkManagerDialog</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_cs.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_cs.ts +index 176f417..bb58906 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_cs.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_cs.ts +@@ -7659,6 +7659,10 @@ p, li { white-space: pre-wrap; } + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation>Zobrazuje typ operačního systému, který se chystáte instalovat na tento virtuální počítač (nazývaný hostovaný operační systém).</translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished"></translation> ++ </message> + </context> + <context> + <name>UINetworkManager</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_da.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_da.ts +index 3f88de8..1d48468 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_da.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_da.ts +@@ -7085,6 +7085,10 @@ p, li { white-space: pre-wrap; } + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation>Viser typen af operativsystem som du planlægger at installere i denne virtuelle maskine (kaldet gæsteoperativsystemet).</translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished"></translation> ++ </message> + </context> + <context> + <name>UINetworkManagerDialog</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts +index 14a3721..945d554 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts +@@ -4838,6 +4838,10 @@ + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation>Zeigt den Typ des Betriebssystems, das Sie in der virtuellen Maschine installieren wollen (auch als Gast bezeichnet).</translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished">Wir hoffen, dass keine unfreie GNU/Linux-Distributionen und unfreie Betriebssysteme genutzt werden, da deren Nutzung bedeutet, die Freiheit aufzugeben.</translation> ++ </message> + </context> + <context> + <name>UINetworkManagerDialog</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts +index 4e52534..3d7dba6 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts +@@ -7518,6 +7518,10 @@ p, li { white-space: pre-wrap; } + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation>Muestra el tipo de sistema operativo que planea instalar en esta máquina virtual (llamado sistema operativo invitado).</translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished">Esperamos que no uses distros no libres de GNU/Linux y sistemas operativos no libres, ya que al hacerlo pierdes tu libertad.</translation> ++ </message> + </context> + <context> + <name>UINetworkManagerDialog</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_eu.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_eu.ts +index 275e1e6..34171eb 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_eu.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_eu.ts +@@ -5951,6 +5951,10 @@ + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation type="unfinished">Makina birtual honetan instalatzea pentsatzen duzun sistema eragilea erakusten du (sistema eragile bezeroa deiturikoa).</translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished"></translation> ++ </message> + </context> + <context> + <name>UINetworkManagerDialog</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts +index f902373..625da36 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts +@@ -4850,6 +4850,10 @@ + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation>نوع سیستم عاملی که شما قصد دارید داخل ماشین مجازی را نصب کنید نشان میدهد،که بعنوان سیستم عامل مهمان شناخته میشود.</translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished"></translation> ++ </message> + </context> + <context> + <name>UINetworkManagerDialog</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts +index 3f31f8f..9248344 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts +@@ -6717,6 +6717,10 @@ p, li { white-space: pre-wrap; } + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation type="unfinished">Näyttää virtuaalikoneeseen asennettavan käyttöjärjestelmän tyypin.</translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished"></translation> ++ </message> + </context> + <context> + <name>UINetworkManagerDialog</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fr.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fr.ts +index b918edb..a6868a4 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fr.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fr.ts +@@ -6432,6 +6432,10 @@ + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation type="unfinished">Affiche le type du système d'exploitation (dit système d'exploitation invité) que vous allez installer dans cette machine virtuelle.</translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished">Nous espérons que vous n'utilisez pas de distribution GNU/Linux non libre ni de système d'exploitation non libre car, si vous le faites, vous abdiquez votre liberté.</translation> ++ </message> + </context> + <context> + <name>UINetworkManagerDialog</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_gl_ES.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_gl_ES.ts +index b04f31b..77a389f 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_gl_ES.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_gl_ES.ts +@@ -6508,6 +6508,10 @@ p, li { white-space: pre-wrap; } + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation type="unfinished">Mostrar o tipo do sistema operativo que planeas instalar nesta máquina virtual (chamado un sistema operativo convidado).</translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished"></translation> ++ </message> + </context> + <context> + <name>UINetworkManagerDialog</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts +index 76d4371..c1aff65 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts +@@ -7486,6 +7486,10 @@ p, li { white-space: pre-wrap; } + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation>A tervezett vendég operációs rendszer típusa.</translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished"></translation> ++ </message> + </context> + <context> + <name>UINetworkManagerDialog</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_id.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_id.ts +index 349d776..fb81c2c 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_id.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_id.ts +@@ -6768,6 +6768,10 @@ + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation type="unfinished"></translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished"></translation> ++ </message> + </context> + <context> + <name>UINetworkManagerDialog</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_it.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_it.ts +index 61f6a37..70e66b9 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_it.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_it.ts +@@ -8063,6 +8063,10 @@ p, li { white-space: pre-wrap; } + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation>Visualizza il tipo di sistema operativo che intendi installare nella macchina virtuale (chiamato sistema operativo Guest).</translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished">Sconsigliamo di utilizzare distribuzioni GNU/Linux non libere e sistemi operativi non liberi, poiché usarli equivale a cedere la propria libertà.</translation> ++ </message> + </context> + <context> + <name>UINetworkManager</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts +index 9ab3823..40006f9 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts +@@ -8727,6 +8727,11 @@ p, li { white-space: pre-wrap; } + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation>仮想マシンで実行するOS(ゲストOSと呼びます)のタイプを表示します。</translation> + </message> ++ <message> ++ <location filename="../src/widgets/UINameAndSystemEditor.cpp" line="180"/> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished">わたしたちは、あなたが不自由なGNU/Linuxディストロや不自由なオペレーティング・システムを使わないことを願います。それを使うことは、あなた自身の自由を放棄することだからです。</translation> ++ </message> + </context> + <context> + <name>UINetworkManagerDialog</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_km_KH.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_km_KH.ts +index be82aab..7d73e23 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_km_KH.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_km_KH.ts +@@ -6451,6 +6451,10 @@ medium</comment> + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation type="unfinished">បង្ហាញប្រភេទប្រព័ន្ធប្រតិបត្តិការដែលអ្នកមានគម្រោងដំឡើងម៉ាស៊ីននិម្មិតនេះ (បានហៅប្រព័ន្ធប្រតិបត្តិរបស់ម៉ាស៊ីនភ្ញៀវ) ។</translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished"></translation> ++ </message> + </context> + <context> + <name>UINetworkManagerDialog</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ko.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ko.ts +index 05ccf51..3fb2a07 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ko.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ko.ts +@@ -7351,6 +7351,10 @@ p, li { white-space: pre-wrap; } + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation>이 가상 머신에 설치할 운영 체제(게스트 운영 체제라고도 함) 종류를 표시합니다.</translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished">자유롭지 못한 GNU/Linux 배포판과 독점 운영체제를 사용하는 것은 우 리의 자유를 포기하는 것과 마찬가지 이므로, 사용하지 않을 것을 권유합니다.</translation> ++ </message> + </context> + <context> + <name>UINetworkManagerDialog</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_lt.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_lt.ts +index 3e06e93..cadd54b 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_lt.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_lt.ts +@@ -6767,6 +6767,10 @@ + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation type="unfinished">Rodo operacinės sistemos tipą, kurį ketinate įdiegti šioje virtualioje mašinoje (pastaroji dar vadinama svečio operacine sistema).</translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished"></translation> ++ </message> + </context> + <context> + <name>UINetworkManagerDialog</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_nl.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_nl.ts +index 2b81abd..610dad8 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_nl.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_nl.ts +@@ -5894,6 +5894,10 @@ + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation>Toont het type besturingssysteem dat u van plan bent op deze virtuele machine te installeren (dit wordt het gastbesturingssysteem genoemd).</translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished">Hopelijk gebruik je geen niet-vrije GNU/Linux distributies of gesloten besturingssystemen want daarmee geef je je vrijheid op.</translation> ++ </message> + </context> + <context> + <name>UINetworkManagerDialog</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pl.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pl.ts +index 7122389..ca0b4b2 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pl.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pl.ts +@@ -7311,6 +7311,10 @@ p, li { white-space: pre-wrap; } + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation type="unfinished"></translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished">Mamy nadzieję, że nie używasz niewolnych dystrybucji GNU/Linuksa aniniewolnych systemów operacyjnych, gdyż używanie ich to oddanie Twojej wolności.</translation> ++ </message> + </context> + <context> + <name>UINetworkManagerDialog</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt.ts +index ebcba39..0bb693b 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt.ts +@@ -6816,6 +6816,10 @@ + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation type="unfinished">Mostra o tipo de sistema operativo que planeia instalar nesta máquina virtual (chamado de sistema operativo convidado).</translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished"></translation> ++ </message> + </context> + <context> + <name>UINetworkManagerDialog</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt_BR.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt_BR.ts +index 6a82c7e..c866fa4 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt_BR.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt_BR.ts +@@ -8029,6 +8029,10 @@ p, li { white-space: pre-wrap; } + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation>Exibe o tipo de sistema operacional que você planeja instalar nesta máquina virtual (chamado de sistema operacional convidado).</translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished">Esperamos que não se usem distros não-livres de GNU/Linux e sistemas operacionais não-livres, pois ao usá-los abre-se mão de sua liberdade.</translation> ++ </message> + </context> + <context> + <name>UINetworkManager</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ro.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ro.ts +index 3b79282..345725c 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ro.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ro.ts +@@ -6919,6 +6919,10 @@ Acest director este folosit, dacă nu este explicit specificat altfel, atunci c + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation type="unfinished">Afișează tipul sistemului de operare pe care plănuiți să îl instalați în această mașină virtuală (denumit sistem de operare musafir).</translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished"></translation> ++ </message> + </context> + <context> + <name>UINetworkManagerDialog</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts +index c2230a2..653f436 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts +@@ -7406,6 +7406,10 @@ p, li { white-space: pre-wrap; } + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation>Определяет версию операционной системы, которую вы хотите установить на эту виртуальную машину (эта операционная система называется "гостевая ОС").</translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished">Мы надеемся, что вы не пользуетесь несвободными дистрибутивами GNU/Linux и несвободными операционными системами, поскольку пользование ими означает, что вы отказываетесь от своей свободы.</translation> ++ </message> + </context> + <context> + <name>UINetworkManagerDialog</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sk.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sk.ts +index 40eec9d..dcecd31 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sk.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sk.ts +@@ -6762,6 +6762,10 @@ + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation type="unfinished">Zobrazí typ operačného systému, ktorý sa chystáte nainštalovať na tento virtuálny stroj (nazýva sa hosťovský operačný systém).</translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished"></translation> ++ </message> + </context> + <context> + <name>UINetworkManagerDialog</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sr.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sr.ts +index 9eeef05..649c108 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sr.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sr.ts +@@ -7171,6 +7171,10 @@ p, li { white-space: pre-wrap; } + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation type="unfinished">Показује тип система који планирате да инсталирате на машину (позвано гост систем).</translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished"></translation> ++ </message> + </context> + <context> + <name>UINetworkManagerDialog</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sv.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sv.ts +index 800d10b..239a8d4 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sv.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sv.ts +@@ -7768,6 +7768,10 @@ serial ports</comment> + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation type="unfinished"></translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished">Vi hoppas att du inte använder en begränsad, icke fri GNU/Linux distribution eller annat kommersiellt operativsystem, eftersom att du ger bort din frihet genom att göra detta.</translation> ++ </message> + </context> + <context> + <name>UINetworkManager</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_tr.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_tr.ts +index cdb888e..4c8d86c 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_tr.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_tr.ts +@@ -6312,6 +6312,10 @@ + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation>Bu sanal makine içerisine kurmayı planladığınız işletim sistemi türünü gösterir (misafir işletim sistemi olarak adlandırılır).</translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished"></translation> ++ </message> + </context> + <context> + <name>UINetworkManagerDialog</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_uk.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_uk.ts +index 8b51e82..2557231 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_uk.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_uk.ts +@@ -7179,6 +7179,10 @@ p, li { white-space: pre-wrap; } + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation>Показує тип операційної системи, котру ви плануєте встановити на цю віртуальну машину, тобто гостьова операційна система.</translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished"></translation> ++ </message> + </context> + <context> + <name>UINetworkManager</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_xx_YY.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_xx_YY.ts +index 2690322..0ea229a 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_xx_YY.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_xx_YY.ts +@@ -4810,6 +4810,10 @@ + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation type="unfinished"></translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished"></translation> ++ </message> + </context> + <context> + <name>UINetworkManagerDialog</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts +index 5b567f7..8709191 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts +@@ -5858,6 +5858,10 @@ + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation>显示你要安装到虚拟电脑的操作系统类型.</translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished">我们真心希望您能拒绝使用非自由的操作系统，包括非自由的GNU/Linux发 行版。因为使用非自由的软件将会损害您的权利。</translation> ++ </message> + </context> + <context> + <name>UINetworkManagerDialog</name> +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_TW.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_TW.ts +index 5d1d136..095c169 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_TW.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_TW.ts +@@ -4834,6 +4834,10 @@ + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation>顯示計畫安裝到此虛擬機器的作業系統類型 (稱為客體作業系統)。</translation> + </message> ++ <message> ++ <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> ++ <translation type="unfinished"></translation> ++ </message> + </context> + <context> + <name>UINetworkManagerDialog</name> diff --git a/libre/virtualbox-libre/libre.patch b/libre/virtualbox-libre/libre.patch index 138bbd612..e93fe80e8 100755..100644 --- a/libre/virtualbox-libre/libre.patch +++ b/libre/virtualbox-libre/libre.patch @@ -1,5 +1,5 @@ ---- VirtualBox-4.2.0.orig/Config.kmk 2012-09-13 05:26:16.000000000 -0300 -+++ VirtualBox-4.2.0/Config.kmk 2012-09-18 21:35:33.118487052 -0300 +--- VirtualBox-4.2.6.orig/Config.kmk 2012-12-19 16:24:34.000000000 -0200 ++++ VirtualBox-4.2.6/Config.kmk 2012-12-27 14:28:22.897125304 -0200 @@ -56,9 +56,6 @@ PROPS_SYSMODS_ACCUMULATE_L += INTERMEDIATES PROPS_MISCBINS_ACCUMULATE_L += INTERMEDIATES @@ -55,7 +55,16 @@ ifdef VBOX_WITH_PCI_PASSTHROUGH VBOX_WITH_PCI_PASSTHROUGH_IMPL = 1 endif -@@ -609,17 +596,6 @@ +@@ -580,8 +567,6 @@ + if1of ($(KBUILD_TARGET), darwin freebsd linux solaris win) + VBOX_WITH_CROGL = 1 + endif +-# Enable the VNC server extension pack (GPL only). +-#VBOX_WITH_EXTPACK_VNC = 1 + # Enable S3 support (requires libcurl) + VBOX_WITH_S3 = 1 + # Enable Host=>Guest Drag'n'Drop +@@ -621,17 +606,6 @@ endif ## @} @@ -73,7 +82,7 @@ ## @name Misc ## @{ # Enable Seamless mode -@@ -810,14 +786,6 @@ +@@ -822,14 +796,6 @@ # Skip stuff. # @@ -88,7 +97,7 @@ # VBOX_QUICK can be used by core developers to speed to the build ifdef VBOX_QUICK # undefine variables by assigning blank. -@@ -872,7 +840,6 @@ +@@ -884,7 +850,6 @@ VBOX_WITH_TESTSUITE= VBOX_WITH_QTGUI= VBOX_WITH_USB= @@ -96,7 +105,7 @@ VBOX_WITH_DOCS= VBOX_WITH_PDM_ASYNC_COMPLETION= VBOX_WITH_KCHMVIEWER= -@@ -894,7 +861,6 @@ +@@ -906,7 +871,6 @@ VBOX_WITH_CROGL= VBOX_WITH_DEBUGGER= VBOX_WITH_DOCS= @@ -104,7 +113,16 @@ VBOX_WITH_HARDENING= VBOX_WITH_HEADLESS= VBOX_WITH_HGCM= -@@ -985,9 +951,6 @@ +@@ -979,7 +943,7 @@ + # + # Indicate VBOX_ONLY build if any of the VBOX_ONLY_* variables are set. + # +-VBOX_ONLY_BUILD := $(strip $(foreach x, ADDITIONS DOCS EXTPACKS SDK TESTSUITE\ ++VBOX_ONLY_BUILD := $(strip $(foreach x, ADDITIONS DOCS SDK TESTSUITE\ + , $(if-expr defined(VBOX_ONLY_$(x)),VBOX_ONLY_$(x)))) + if $(words $(VBOX_ONLY_BUILD)) > 1 + $(error VBox: More than one VBOX_ONLY build enabled! $(VBOX_ONLY_BUILD)) +@@ -997,9 +961,6 @@ # ifdef VBOX_OSE VBOX_WITH_VRDP= @@ -114,7 +132,7 @@ VBOX_WITH_PCI_PASSTHROUGH_IMPL= VBOX_WITH_OS2_ADDITIONS_BIN= VBOX_WITH_SECURELABEL= -@@ -1118,10 +1081,6 @@ +@@ -1130,10 +1091,6 @@ VBOX_WITH_KCHMVIEWER= endif @@ -125,7 +143,7 @@ # # Mark OSE builds clearly, helps figuring out limitations more easily. # -@@ -1744,9 +1703,6 @@ +@@ -1738,9 +1695,6 @@ # bin2c (convert binary files into C arrays) VBOX_BIN2C ?= $(PATH_OBJ)/bin2c/bin2c$(HOSTSUFF_EXE) @@ -135,7 +153,7 @@ # VBoxCmp (simple /bin/cmp with more sensible output) VBOX_VBOXCMP ?= $(PATH_OBJ)/VBoxCmp/VBoxCmp$(HOSTSUFF_EXE) -@@ -2638,13 +2594,6 @@ +@@ -2632,13 +2586,6 @@ SDK_VBOX_OPENSSL2_LIBS = $(NO_SUCH_VARIABLE) endif @@ -149,7 +167,7 @@ SDK_VBOX_BLD_OPENSSL = . SDK_VBOX_BLD_OPENSSL_EXTENDS = VBOX_OPENSSL SDK_VBOX_BLD_OPENSSL_LIBS ?= \ -@@ -4100,99 +4049,6 @@ +@@ -4099,99 +4046,6 @@ TEMPLATE_VBOXMAINCLIENTDLL_LDFLAGS.darwin = $(filter-out -bind_at_load,$(TEMPLATE_VBOXMAINCLIENTEXE_LDFLAGS.darwin)) @@ -249,6 +267,131 @@ # # Qt 4 # Qt 4 +--- VirtualBox-4.2.6.orig/configure 2012-12-19 16:24:34.000000000 -0200 ++++ VirtualBox-4.2.6/configure 2012-12-27 14:26:25.743442978 -0200 +@@ -90,8 +90,6 @@ + WITH_HARDENING=1 + WITH_UDPTUNNEL=1 + WITH_VDE=0 +-WITH_VNC=0 +-WITH_EXTPACK=1 + WITH_DOCS=1 + BUILD_LIBXML2= + BUILD_LIBCURL= +@@ -124,8 +122,6 @@ + MESA="-lGL" + INCZ="" + LIBZ="-lz" +-INCVNCSERVER="" +-LIBVNCSERVER="-lvncserver" + INCDEVMAPPER="" + LIBDEVMAPPER="-ldevmapper" + CXX_FLAGS="" +@@ -930,47 +926,6 @@ + } + + # +-# Check for libvncserver, needed for VNC in OSE +-# +-check_vncserver() +-{ +- test_header libvncserver +- cat > $ODIR.tmp_src.cc <<EOF +-#include <cstdio> +-#include <rfb/rfbconfig.h> +- +-extern "C" int main() +-{ +- const char* v=LIBVNCSERVER_VERSION; +- unsigned int major = 0, minor = 0, micro = 0; +- +- for (; *v !='.' && *v != '\0'; v++) major = major*10 + *v-'0'; +- if (*v == '.') v++; +- for (; *v !='.' && *v != '\0'; v++) minor = minor*10 + *v-'0'; +- if (*v == '.') v++; +- for (; *v !='.' && *v != '\0'; v++) micro = micro*10 + *v-'0'; +- +- printf("found version %s", LIBVNCSERVER_PACKAGE_VERSION); +- if (major*10000 + minor*100 + micro >= 900) +- { +- printf(", OK.\n"); +- return 0; +- } +- else +- { +- printf(", expected version 0.9 or higher\n"); +- return 1; +- } +-} +-EOF +- if test_compile "$LIBVNCSERVER $INCVNCSERVER" libvncserver libvncserver; then +- if test_execute; then +- cnf_append "VBOX_WITH_EXTPACK_VNC" "1" +- fi +- fi +-} +- +-# + # Check for libcurl, needed by S3 + # + check_curl() +@@ -2173,8 +2128,6 @@ + [ $WITH_KMODS -eq 1 ] && echo " --disable-kmods don't build Linux kernel modules (host and guest)" + [ $WITH_OPENGL -eq 1 ] && echo " --disable-opengl disable OpenGL support (2D & 3D)" + [ $WITH_GSOAP -eq 0 ] && echo " --enable-webservice enable the webservice stuff" +-[ $OSE -eq 1 ] && echo " --enable-vnc enable the VNC server" +-[ $OSE -eq 0 ] && echo " --disable-extpack don't build the extpack" + [ $WITH_DOCS -eq 1 ] && echo " --disable-docs don't build the documentation" + [ "$OS" = "linux" -o "$OS" = "freebsd" ] && echo " --enable-vde enable VDE networking" + cat << EOF +@@ -2346,15 +2299,9 @@ + --enable-webservice) + [ $WITH_GSOAP -eq 0 ] && WITH_GSOAP=1 + ;; +- --enable-vnc) +- WITH_VNC=1 +- ;; + --disable-hardening) + WITH_HARDENING=0 + ;; +- --disable-extpack) +- WITH_EXTPACK=0 +- ;; + --disable-docs) + WITH_DOCS=0 + ;; +@@ -2512,15 +2459,6 @@ + echo >> $CNF + fi + +-# extpack +-if [ $OSE -eq 0 ]; then +- if [ $WITH_EXTPACK -eq 1 ]; then +- BUILD_LIBSSL=1 +- else +- cnf_append "VBOX_WITH_EXTPACK_PUEL_BUILD" "" +- fi +-fi +- + # headless + if [ -n "$HEADLESS" ]; then + cnf_append "VBOX_HEADLESS" "1" +@@ -2646,15 +2584,6 @@ + cnf_append "VBOX_WITH_DOCS_PACKING" "" + fi + +-# VNC server support +-if [ $OSE -ge 1 ]; then +- if [ $WITH_VNC = 1 ]; then +- check_vncserver +- else +- cnf_append "VBOX_WITH_EXTPACK_VNC" "" +- fi +-fi +- + # success! + echo + echo "Successfully generated '$CNF' and '$ENV'." --- VirtualBox-4.2.0.orig/Makefile.kmk 2012-08-29 11:13:46.000000000 -0300 +++ VirtualBox-4.2.0/Makefile.kmk 2012-09-18 23:43:54.750454776 -0300 @@ -378,7 +378,6 @@ diff --git a/libre/virtualbox-libre/os_blag.png b/libre/virtualbox-libre/os_blag.png Binary files differindex 61995ca10..61995ca10 100755..100644 --- a/libre/virtualbox-libre/os_blag.png +++ b/libre/virtualbox-libre/os_blag.png diff --git a/libre/virtualbox-libre/os_blag_64.png b/libre/virtualbox-libre/os_blag_64.png Binary files differindex aa4463a97..aa4463a97 100755..100644 --- a/libre/virtualbox-libre/os_blag_64.png +++ b/libre/virtualbox-libre/os_blag_64.png diff --git a/libre/virtualbox-libre/os_dragora.png b/libre/virtualbox-libre/os_dragora.png Binary files differindex d1df45880..d1df45880 100755..100644 --- a/libre/virtualbox-libre/os_dragora.png +++ b/libre/virtualbox-libre/os_dragora.png diff --git a/libre/virtualbox-libre/os_dragora_64.png b/libre/virtualbox-libre/os_dragora_64.png Binary files differindex 64bcecf20..64bcecf20 100755..100644 --- a/libre/virtualbox-libre/os_dragora_64.png +++ b/libre/virtualbox-libre/os_dragora_64.png diff --git a/libre/virtualbox-libre/os_dynebolic.png b/libre/virtualbox-libre/os_dynebolic.png Binary files differindex 67b07d4c0..67b07d4c0 100755..100644 --- a/libre/virtualbox-libre/os_dynebolic.png +++ b/libre/virtualbox-libre/os_dynebolic.png diff --git a/libre/virtualbox-libre/os_gnewsense.png b/libre/virtualbox-libre/os_gnewsense.png Binary files differindex 76d9e38b3..76d9e38b3 100755..100644 --- a/libre/virtualbox-libre/os_gnewsense.png +++ b/libre/virtualbox-libre/os_gnewsense.png diff --git a/libre/virtualbox-libre/os_gnewsense_64.png b/libre/virtualbox-libre/os_gnewsense_64.png Binary files differindex 8859c34e8..8859c34e8 100755..100644 --- a/libre/virtualbox-libre/os_gnewsense_64.png +++ b/libre/virtualbox-libre/os_gnewsense_64.png diff --git a/libre/virtualbox-libre/os_gnu.png b/libre/virtualbox-libre/os_gnu.png Binary files differindex 26c4550f9..26c4550f9 100755..100644 --- a/libre/virtualbox-libre/os_gnu.png +++ b/libre/virtualbox-libre/os_gnu.png diff --git a/libre/virtualbox-libre/os_gnu_64.png b/libre/virtualbox-libre/os_gnu_64.png Binary files differindex 4161634e9..4161634e9 100755..100644 --- a/libre/virtualbox-libre/os_gnu_64.png +++ b/libre/virtualbox-libre/os_gnu_64.png diff --git a/libre/virtualbox-libre/os_gnuhurd.png b/libre/virtualbox-libre/os_gnuhurd.png Binary files differindex 26c4550f9..26c4550f9 100755..100644 --- a/libre/virtualbox-libre/os_gnuhurd.png +++ b/libre/virtualbox-libre/os_gnuhurd.png diff --git a/libre/virtualbox-libre/os_gnulinux.png b/libre/virtualbox-libre/os_gnulinux.png Binary files differindex 26c4550f9..26c4550f9 100755..100644 --- a/libre/virtualbox-libre/os_gnulinux.png +++ b/libre/virtualbox-libre/os_gnulinux.png diff --git a/libre/virtualbox-libre/os_gnulinux_64.png b/libre/virtualbox-libre/os_gnulinux_64.png Binary files differindex 4161634e9..4161634e9 100755..100644 --- a/libre/virtualbox-libre/os_gnulinux_64.png +++ b/libre/virtualbox-libre/os_gnulinux_64.png diff --git a/libre/virtualbox-libre/os_musix.png b/libre/virtualbox-libre/os_musix.png Binary files differindex fb7b94577..fb7b94577 100755..100644 --- a/libre/virtualbox-libre/os_musix.png +++ b/libre/virtualbox-libre/os_musix.png diff --git a/libre/virtualbox-libre/os_musix_64.png b/libre/virtualbox-libre/os_musix_64.png Binary files differindex a1bbbbf3a..a1bbbbf3a 100755..100644 --- a/libre/virtualbox-libre/os_musix_64.png +++ b/libre/virtualbox-libre/os_musix_64.png diff --git a/libre/virtualbox-libre/os_os64base.png b/libre/virtualbox-libre/os_os64base.png Binary files differindex 7aec20314..7aec20314 100755..100644 --- a/libre/virtualbox-libre/os_os64base.png +++ b/libre/virtualbox-libre/os_os64base.png diff --git a/libre/virtualbox-libre/os_os64base.xcf b/libre/virtualbox-libre/os_os64base.xcf Binary files differindex d8e28e35e..d8e28e35e 100755..100644 --- a/libre/virtualbox-libre/os_os64base.xcf +++ b/libre/virtualbox-libre/os_os64base.xcf diff --git a/libre/virtualbox-libre/os_osbase.png b/libre/virtualbox-libre/os_osbase.png Binary files differindex 00f197fca..00f197fca 100755..100644 --- a/libre/virtualbox-libre/os_osbase.png +++ b/libre/virtualbox-libre/os_osbase.png diff --git a/libre/virtualbox-libre/os_osbase.xcf b/libre/virtualbox-libre/os_osbase.xcf Binary files differindex c4463c857..c4463c857 100755..100644 --- a/libre/virtualbox-libre/os_osbase.xcf +++ b/libre/virtualbox-libre/os_osbase.xcf diff --git a/libre/virtualbox-libre/os_parabola.png b/libre/virtualbox-libre/os_parabola.png Binary files differindex 757abc484..757abc484 100755..100644 --- a/libre/virtualbox-libre/os_parabola.png +++ b/libre/virtualbox-libre/os_parabola.png diff --git a/libre/virtualbox-libre/os_parabola_64.png b/libre/virtualbox-libre/os_parabola_64.png Binary files differindex 5ac7c2767..5ac7c2767 100755..100644 --- a/libre/virtualbox-libre/os_parabola_64.png +++ b/libre/virtualbox-libre/os_parabola_64.png diff --git a/libre/virtualbox-libre/os_trisquel.png b/libre/virtualbox-libre/os_trisquel.png Binary files differindex c6f0d3d7a..c6f0d3d7a 100755..100644 --- a/libre/virtualbox-libre/os_trisquel.png +++ b/libre/virtualbox-libre/os_trisquel.png diff --git a/libre/virtualbox-libre/os_trisquel_64.png b/libre/virtualbox-libre/os_trisquel_64.png Binary files differindex ebca3dd43..ebca3dd43 100755..100644 --- a/libre/virtualbox-libre/os_trisquel_64.png +++ b/libre/virtualbox-libre/os_trisquel_64.png diff --git a/libre/virtualbox-libre/os_ututo.png b/libre/virtualbox-libre/os_ututo.png Binary files differindex e1dffb575..e1dffb575 100755..100644 --- a/libre/virtualbox-libre/os_ututo.png +++ b/libre/virtualbox-libre/os_ututo.png diff --git a/libre/virtualbox-libre/os_ututo_64.png b/libre/virtualbox-libre/os_ututo_64.png Binary files differindex 158468e0a..158468e0a 100755..100644 --- a/libre/virtualbox-libre/os_ututo_64.png +++ b/libre/virtualbox-libre/os_ututo_64.png diff --git a/libre/virtualbox-libre/os_venenux.png b/libre/virtualbox-libre/os_venenux.png Binary files differindex 5e0c1585d..5e0c1585d 100755..100644 --- a/libre/virtualbox-libre/os_venenux.png +++ b/libre/virtualbox-libre/os_venenux.png diff --git a/libre/virtualbox-libre/vboxservice.conf b/libre/virtualbox-libre/vboxservice.conf index 9d4ec629f..9d4ec629f 100755..100644 --- a/libre/virtualbox-libre/vboxservice.conf +++ b/libre/virtualbox-libre/vboxservice.conf diff --git a/libre/virtualbox-libre/vboxservice.rc b/libre/virtualbox-libre/vboxservice.rc index 5a62d69a3..5a62d69a3 100755..100644 --- a/libre/virtualbox-libre/vboxservice.rc +++ b/libre/virtualbox-libre/vboxservice.rc diff --git a/libre/virtualbox-libre/vboxservice.service b/libre/virtualbox-libre/vboxservice.service index bbd61617d..bbd61617d 100755..100644 --- a/libre/virtualbox-libre/vboxservice.service +++ b/libre/virtualbox-libre/vboxservice.service diff --git a/libre/virtualbox-libre/vboxweb.conf b/libre/virtualbox-libre/vboxweb.conf index c36f6a143..c36f6a143 100755..100644 --- a/libre/virtualbox-libre/vboxweb.conf +++ b/libre/virtualbox-libre/vboxweb.conf diff --git a/libre/virtualbox-libre/vboxweb.rc b/libre/virtualbox-libre/vboxweb.rc index 97273e3c7..97273e3c7 100755..100644 --- a/libre/virtualbox-libre/vboxweb.rc +++ b/libre/virtualbox-libre/vboxweb.rc diff --git a/libre/virtualbox-libre/vboxweb.service b/libre/virtualbox-libre/vboxweb.service index 303381597..303381597 100755..100644 --- a/libre/virtualbox-libre/vboxweb.service +++ b/libre/virtualbox-libre/vboxweb.service diff --git a/libre/virtualbox-libre/virtualbox-libre-guest-source.install b/libre/virtualbox-libre/virtualbox-libre-guest-dkms.install index 2d62eae43..2d62eae43 100755..100644 --- a/libre/virtualbox-libre/virtualbox-libre-guest-source.install +++ b/libre/virtualbox-libre/virtualbox-libre-guest-dkms.install diff --git a/libre/virtualbox-libre/virtualbox-libre-guest-utils.install b/libre/virtualbox-libre/virtualbox-libre-guest-utils.install index 38bbe807d..38bbe807d 100755..100644 --- a/libre/virtualbox-libre/virtualbox-libre-guest-utils.install +++ b/libre/virtualbox-libre/virtualbox-libre-guest-utils.install diff --git a/libre/virtualbox-libre/virtualbox-libre-host-source.install b/libre/virtualbox-libre/virtualbox-libre-host-dkms.install index 8028cb7e0..8028cb7e0 100755..100644 --- a/libre/virtualbox-libre/virtualbox-libre-host-source.install +++ b/libre/virtualbox-libre/virtualbox-libre-host-dkms.install diff --git a/libre/virtualbox-libre/virtualbox-libre.install b/libre/virtualbox-libre/virtualbox-libre.install index b6d804eb7..90d8a8739 100755..100644 --- a/libre/virtualbox-libre/virtualbox-libre.install +++ b/libre/virtualbox-libre/virtualbox-libre.install @@ -30,8 +30,8 @@ post_upgrade() { post_install "$1" if [ "$(vercmp $2 4.1.6-1)" -lt 0 ]; then cat << EOF -===> Starting with virtualbox-libre version 4.1.6-1, kernel libre modules handling is done by virtualbox-libre-modules. -===> Use virtualbox-libre-source package if you don't use our stock linux-libre package. +===> Starting with virtualbox-libre version 4.1.6-1, kernel modules handling is done by virtualbox-libre-host-modules. +===> Use virtualbox-libre-host-dkms package if you don't use our stock linux-libre package. EOF fi } diff --git a/libre/xarchiver-libre/PKGBUILD b/libre/xarchiver-libre/PKGBUILD index 87d775d4e..87d775d4e 100755..100644 --- a/libre/xarchiver-libre/PKGBUILD +++ b/libre/xarchiver-libre/PKGBUILD diff --git a/libre/xarchiver-libre/rePKGBUILD b/libre/xarchiver-libre/rePKGBUILD index 7f435d23f..7f435d23f 100755..100644 --- a/libre/xarchiver-libre/rePKGBUILD +++ b/libre/xarchiver-libre/rePKGBUILD 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 f7ff098c0..f7ff098c0 100755..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 diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-rpm2cpio.patch b/libre/xarchiver-libre/xarchiver-0.5.2-rpm2cpio.patch index d962a44af..d962a44af 100755..100644 --- a/libre/xarchiver-libre/xarchiver-0.5.2-rpm2cpio.patch +++ b/libre/xarchiver-libre/xarchiver-0.5.2-rpm2cpio.patch 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 e29d40c41..e29d40c41 100755..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 diff --git a/libre/xarchiver-libre/xarchiver.install b/libre/xarchiver-libre/xarchiver.install index c317fbaca..c317fbaca 100755..100644 --- a/libre/xarchiver-libre/xarchiver.install +++ b/libre/xarchiver-libre/xarchiver.install diff --git a/libre/xchat-libre/ChangeLog b/libre/xchat-libre/ChangeLog index faa8383c8..faa8383c8 100755..100644 --- a/libre/xchat-libre/ChangeLog +++ b/libre/xchat-libre/ChangeLog diff --git a/libre/xchat-libre/PKGBUILD b/libre/xchat-libre/PKGBUILD index 223eaff72..223eaff72 100755..100644 --- a/libre/xchat-libre/PKGBUILD +++ b/libre/xchat-libre/PKGBUILD diff --git a/libre/xchat-libre/no-firefox.patch b/libre/xchat-libre/no-firefox.patch index f1ecd6631..f1ecd6631 100755..100644 --- a/libre/xchat-libre/no-firefox.patch +++ b/libre/xchat-libre/no-firefox.patch diff --git a/libre/xchat-libre/remove-non-free-suggestion.patch b/libre/xchat-libre/remove-non-free-suggestion.patch index 9383db521..9383db521 100755..100644 --- a/libre/xchat-libre/remove-non-free-suggestion.patch +++ b/libre/xchat-libre/remove-non-free-suggestion.patch diff --git a/libre/xchat-libre/xchat-2.8.8-glib-2.31.patch b/libre/xchat-libre/xchat-2.8.8-glib-2.31.patch index 63f562ff8..63f562ff8 100755..100644 --- a/libre/xchat-libre/xchat-2.8.8-glib-2.31.patch +++ b/libre/xchat-libre/xchat-2.8.8-glib-2.31.patch diff --git a/libre/xchat-libre/xchat-2.8.8-libnotify07.patch b/libre/xchat-libre/xchat-2.8.8-libnotify07.patch index 2a6dce9a2..2a6dce9a2 100755..100644 --- a/libre/xchat-libre/xchat-2.8.8-libnotify07.patch +++ b/libre/xchat-libre/xchat-2.8.8-libnotify07.patch diff --git a/libre/xchat-libre/xchat-2.8.8-link-against-libnotify.patch b/libre/xchat-libre/xchat-2.8.8-link-against-libnotify.patch index 31e6c0854..31e6c0854 100755..100644 --- a/libre/xchat-libre/xchat-2.8.8-link-against-libnotify.patch +++ b/libre/xchat-libre/xchat-2.8.8-link-against-libnotify.patch diff --git a/libre/xchat-libre/xchat.install b/libre/xchat-libre/xchat.install index eab82d16f..eab82d16f 100755..100644 --- a/libre/xchat-libre/xchat.install +++ b/libre/xchat-libre/xchat.install diff --git a/libre/xmlstarlet/PKGBUILD b/libre/xmlstarlet/PKGBUILD index a06daf063..a06daf063 100755..100644 --- a/libre/xmlstarlet/PKGBUILD +++ b/libre/xmlstarlet/PKGBUILD diff --git a/libre/xorg-fonts-100dpi-libre/PKGBUILD b/libre/xorg-fonts-100dpi-libre/PKGBUILD index 3f88f1cee..3f88f1cee 100755..100644 --- a/libre/xorg-fonts-100dpi-libre/PKGBUILD +++ b/libre/xorg-fonts-100dpi-libre/PKGBUILD diff --git a/libre/xorg-fonts-100dpi-libre/xfonts.install b/libre/xorg-fonts-100dpi-libre/xfonts.install index 5c5e8a2b4..5c5e8a2b4 100755..100644 --- a/libre/xorg-fonts-100dpi-libre/xfonts.install +++ b/libre/xorg-fonts-100dpi-libre/xfonts.install diff --git a/libre/xorg-fonts-75dpi-libre/PKGBUILD b/libre/xorg-fonts-75dpi-libre/PKGBUILD index c262229fc..c262229fc 100755..100644 --- a/libre/xorg-fonts-75dpi-libre/PKGBUILD +++ b/libre/xorg-fonts-75dpi-libre/PKGBUILD diff --git a/libre/xorg-fonts-75dpi-libre/xfonts.install b/libre/xorg-fonts-75dpi-libre/xfonts.install index e52603946..e52603946 100755..100644 --- a/libre/xorg-fonts-75dpi-libre/xfonts.install +++ b/libre/xorg-fonts-75dpi-libre/xfonts.install diff --git a/libre/xorg-fonts-type1-libre/PKGBUILD b/libre/xorg-fonts-type1-libre/PKGBUILD index 3e52ef85a..3e52ef85a 100755..100644 --- a/libre/xorg-fonts-type1-libre/PKGBUILD +++ b/libre/xorg-fonts-type1-libre/PKGBUILD diff --git a/libre/xorg-fonts-type1-libre/xfonts.install b/libre/xorg-fonts-type1-libre/xfonts.install index 51688a1d1..51688a1d1 100755..100644 --- a/libre/xorg-fonts-type1-libre/xfonts.install +++ b/libre/xorg-fonts-type1-libre/xfonts.install diff --git a/libre/xscreensaver-libre/LICENSE b/libre/xscreensaver-libre/LICENSE index 4f587b5a3..4f587b5a3 100755..100644 --- a/libre/xscreensaver-libre/LICENSE +++ b/libre/xscreensaver-libre/LICENSE diff --git a/libre/xscreensaver-libre/PKGBUILD b/libre/xscreensaver-libre/PKGBUILD index 2404ba154..2404ba154 100755..100644 --- a/libre/xscreensaver-libre/PKGBUILD +++ b/libre/xscreensaver-libre/PKGBUILD diff --git a/libre/xscreensaver-libre/add-electricsheep.diff b/libre/xscreensaver-libre/add-electricsheep.diff index 18b4dea97..18b4dea97 100755..100644 --- a/libre/xscreensaver-libre/add-electricsheep.diff +++ b/libre/xscreensaver-libre/add-electricsheep.diff diff --git a/libre/xscreensaver-libre/libre.patch b/libre/xscreensaver-libre/libre.patch index 569f8435c..569f8435c 100755..100644 --- a/libre/xscreensaver-libre/libre.patch +++ b/libre/xscreensaver-libre/libre.patch diff --git a/libre/xscreensaver-libre/xscreensaver.pam b/libre/xscreensaver-libre/xscreensaver.pam index b4d80c21f..b4d80c21f 100755..100644 --- a/libre/xscreensaver-libre/xscreensaver.pam +++ b/libre/xscreensaver-libre/xscreensaver.pam diff --git a/libre/xulrunner-libre/PKGBUILD b/libre/xulrunner-libre/PKGBUILD index 1d485e6d5..1d485e6d5 100755..100644 --- a/libre/xulrunner-libre/PKGBUILD +++ b/libre/xulrunner-libre/PKGBUILD diff --git a/libre/xulrunner-libre/mozconfig b/libre/xulrunner-libre/mozconfig index 34c5a6137..34c5a6137 100755..100644 --- a/libre/xulrunner-libre/mozconfig +++ b/libre/xulrunner-libre/mozconfig diff --git a/libre/xulrunner-libre/mozilla-pkgconfig.patch b/libre/xulrunner-libre/mozilla-pkgconfig.patch index 037d4aee0..037d4aee0 100755..100644 --- a/libre/xulrunner-libre/mozilla-pkgconfig.patch +++ b/libre/xulrunner-libre/mozilla-pkgconfig.patch diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD index 8aad59fe4..8aad59fe4 100755..100644 --- a/libre/your-freedom/PKGBUILD +++ b/libre/your-freedom/PKGBUILD diff --git a/libre/your-freedom/your-freedom.install b/libre/your-freedom/your-freedom.install index 0786adabf..0786adabf 100755..100644 --- a/libre/your-freedom/your-freedom.install +++ b/libre/your-freedom/your-freedom.install |
